-windows-script echoes correct port-number now

-minor changes

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@3053 6c8d7289-2bf4-0310-a012-ef5d649a1542

doc/News.html

@@ -99,7 +99,7 @@ globalheader();
 <li>New Database Structures for Index and URL storage</li>
   <ul>
   <li>The new 'Collections' Data Structure is now the default data structure.</li>
-  <li>Index entries and URL entries carry more ranking and selection attributes, b.o. for image, video, audio and application search.</li>
+  <li>Index entries and URL entries carry more ranking and selection attributes, e.g. for image, video, audio and application search.</li>
   <li>Enhanced Storage of URLs: they are now divided into different creation times. This enables easy deletion
       of outdated URLs, enables a index-limitation function and solves the problem that the URL database was too
       big to fit into a 2 GB file.</li>
@@ -113,10 +113,10 @@ globalheader();
   <ul>
   <li>Added protocol for peer administration, custom services, status queries, blacklist management,
       file share management, support for outgoing transfer- and content-encoding, better error handling,
-      function to get and set message forwarding, handling of yacy bookmarks, log display,
+      function to get and set message forwarding, handling of YaCy bookmarks, log display,
       manage peer messages, get and set peer profile, query peer status, query the pause/resume state of the crawling queues,
-      and a check if a specific url is blacklisted.</li>
+      and a check if a specific URL is blacklisted.</li>
-  <li>Added new ant target to allow generation of client stub classes for yacy soap api.</li>
+  <li>Added new ANT target to allow generation of client stub classes for YaCy SOAP api.</li>
   </ul>
 <li>Other new Features</li>
   <ul>
@@ -130,15 +130,15 @@ globalheader();
   <li>Better object caching for kelondro database (combined read/write object cache with synergy effects).</li>
   <li>More anonymization in logging.</li>
   <li>New HTCACHE layout using files hashes; tree- and hash-layout can be used simultanously; hash-layout is now default.</li>
-  <li>Access to wiki is now limited to administrator, if wanted. This can be confugured at the wiki page.</li>
+  <li>Access to wiki is now limited to administrator, if wanted. This can be configured at the wiki page.</li>
   <li>..and many bugfixes.</>
   </ul>
-<li>New 'Sattelite' Projects: these applications work as service applications for the YaCy application (start-up/experimental status)</li>
+<li>New 'satellite' Projects: these applications work as service applications for the YaCy application (start-up/experimental status)</li>
   <ul>
   <li>YaCy admin: a swing-based client, that is able to administrate yacy using the SOAP interface.</li>
   <li>YaCy Screen Saver: presentation of the peer status in a screen saver</li>
   <li>YaCy Updater: automated donwloads/updates</li>
-  <li>YaCy logalizer: analyze of the YaCy log</li>
+  <li>YaCy logalizer: analyzer for the YaCy log</li>
   </ul>
 </ul>
 

htroot/CookieMonitorOutgoing_p.html

@@ -8,7 +8,7 @@
     #%env/templates/header.template%#
     #%env/templates/submenuCookie.template%#
     <h2>Cookie Monitor: Outgoing Cookies</h2>
-    <p>This is a list of Cookies that a browser using the YaCy Proxy has sent to a web server:</p>
+    <p>This is a list of cookies that browsers using the YaCy proxy sent to webservers:</p>
     <p>Showing #[num]# entries from a total of #[total]# Cookies.</p>
     <table border="0" cellpadding="2" cellspacing="1">
     <colgroup>

htroot/DetailedSearch.java

@@ -79,7 +79,7 @@ public class DetailedSearch {
             prop.put("localWDist", 999);
             //prop.put("globalChecked", "checked");
             prop.put("globalChecked", "");
-            prop.put("postsortChecked", "checked");
+            prop.put("postsortChecked", "checked=\"checked\"");
             prop.put("localTime", 6);
             prop.put("results", "");
             prop.put("urlmaskoptions", 0);
@@ -195,8 +195,8 @@ public class DetailedSearch {
         prop.put("type", "0");
         prop.put("localCount", count);
         prop.put("localWDist", wdist);
-        prop.put("globalChecked", (global) ? "checked" : "");
+        prop.put("globalChecked", (global) ? "checked=\"checked\"" : "");
-        prop.put("postsortChecked", (postsort) ? "checked" : "");
+        prop.put("postsortChecked", (postsort) ? "checked=\"checked\"" : "");
         prop.put("localTime", searchtime/1000);
         prop.put("search", post.get("search", ""));
         prop.putAll(localRanking.toExternalMap("local"));

htroot/env/templates/metas.template

@@ -1,9 +1,9 @@
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
   <link rel="shortcut icon" href="favicon.ico" />
   <meta name="Content-Language" content="English, Englisch" />
-  <meta name="keywords" content="Anomic HTTP Proxy search engine spider indexer java network open free download Mac Windows Linux Software development" />
+  <meta name="keywords" content="Anomic YaCy HTTP Proxy search engine spider indexer java network open free download Mac Windows Linux Software development" />
   <meta name="description" content="Anomic Software HTTP Proxy Freeware Home Page" />
-  <meta name="copyright" content="Michael Christen" />
+  <meta name="copyright" content="Michael Christen et al." />
   <link rel="stylesheet" type="text/css" media="all" href="/env/base.css" />
   <link rel="stylesheet" type="text/css" media="screen" href="/env/style.css" />
 <!-- (C), Architecture and Realisation: Michael Peter Christen; Contact: mc <at> anomic.de -->

locales/de.lng

@@ -257,7 +257,7 @@ Waiting for new request nr.==Warte auf neue Anfrage Nr.
 #---------------------------
 Incoming Cookies Monitor==Überwachung eingehender Cookies
 Cookie Monitor: Incoming Cookies==Cookie Überwachung: Eingehende Cookies
-This is a list of Cookies that a web server has sent to clients of the YaCy Proxy:==Dies ist eine Auflistung aller Cookies, die ein Webserver an diesen YaCy Proxy geschickt hat:
+This is a list of cookies that browsers using the YaCy proxy sent to webservers:==Dies ist eine Liste aller Cookies, die die Browser, die den YaCy-Proxy benutzen, an Webserver versandt haben:
 Showing==Angezeigt werden
 entries from a total of==Einträge von insgesamt
 Cookies==Cookies
@@ -1194,6 +1194,7 @@ Message Forwarding \(optional\)==Nachrichten Weiterleitung (optional)
 
 #-----------------------------
 
+
 #File: Settings_ProxyAccess.inc
 #---------------------------
 Proxy Access Settings==Proxyzugangs Einstellungen

startYACY.bat

@@ -26,7 +26,7 @@ Echo JRE Parameters:%javacmd%
 	Echo **  STOP         YaCy: execute stopYACY.bat and wait some seconds            **
 	Echo **  GET HELP for YaCy: see www.yacy-websearch.net/wiki and www.yacy-forum.de **
 	Echo *******************************************************************************
-	Echo  ^>^> YaCy started as daemon process. Administration at http://localhost:8080 ^<^<
+	Echo  ^>^> YaCy started as daemon process. Administration at http://localhost:%port% ^<^<
     
 java %javacmd% -classpath %CLASSPATH% yacy
 
@@ -37,9 +37,11 @@ Rem This target is used to read java runtime parameters out of the yacy config f
 for /F "tokens=1,2 delims==" %%i in (DATA\SETTINGS\httpProxy.conf) do (
 	if "%%i"=="javastart_Xmx" set jmx=%%j
 	if "%%i"=="javastart_Xms" set jms=%%j
+	if "%%i"=="port" set port=%%j
 )
 if defined jmx set javacmd=-%jmx%
 if defined jms set javacmd=-%jms% %javacmd%
+if not defined port set port=8080
 
 GoTo :STARTJAVA