Merge branch 'master' of ssh://git@gitorious.org/yacy/rc1.git

htroot/BlacklistImpExp_p.html

@@ -65,7 +65,7 @@
     <fieldset class="exportListItems">
         <legend>Export blacklist items to...</legend>
 
-        <form action="xml/blacklists_p.xml" method="get" accept-charset="UTF-8">
+        <form action="api/blacklists_p.xml" method="get" accept-charset="UTF-8">
             <fieldset>
                 <legend>XML file:</legend>
                 Here you can export a blacklist as an XML file. This file will contain additional

htroot/api/bookmarks/get_bookmarks.xml

@@ -37,7 +37,7 @@
 <rss version="2.0">
 	<channel>
 		<title><![CDATA[YaCy '#[peer]#': Bookmarks]]></title>
-		<link>http://#[address]#/xml/bookmarks/get_bookmarks.xml</link>
+		<link>http://#[address]#/api/bookmarks/get_bookmarks.xml</link>
 		<description><![CDATA[#[user]#'s Bookmark-Feed]]></description>
 	</channel>
 	#{bookmarks}#<item>

htroot/yacy/ui/yacyui-search.html

@@ -143,7 +143,7 @@
            		var query = "&url="+url+"&title="+title+"&description="+desc+"&tags="+tags+"&path="+path+"&public="+pub+"&add=create";            		
            		$.ajax({
 					type: "POST",
-					url: "/xml/bookmarks/posts/add_p.xml?login="+query,			
+					url: "/api/bookmarks/posts/add_p.xml?login="+query,			
 					dataType: "xml",
 					success: function(xml) {
            				alert("Debug: posted bookmark for: "+url);            					

htroot/yacy/ui/yacyuisearch.html

@@ -121,7 +121,7 @@
 		           		var query = "&url="+url+"&title="+title+"&description="+desc+"&tags="+tags+"&path="+path+"&public="+pub+"&add=create";            		
 		           		$.ajax({
 							type: "POST",
-							url: "/xml/bookmarks/posts/add_p.xml?login="+query,			
+							url: "/api/bookmarks/posts/add_p.xml?login="+query,			
 							dataType: "xml",
 							success: function(xml) {
 		           				alert("Debug: posted bookmark for: "+url);