diff --git a/README.md b/README.md index 76d9d8753..452837e9b 100644 --- a/README.md +++ b/README.md @@ -50,11 +50,11 @@ The source code is inside the release package (see /source and /htroot). ## Where is the documentation? Documentation can be found at: -- (Home Page) https://yacy.net/ -- (German Forum) http://forum.yacy.de/ -- (Wiki:de) http://www.yacy-websuche.de/wiki/index.php/De:Start -- (Wiki:en) http://www.yacy-websearch.net/wiki/index.php/En:Start -- (Tutorial Videos) https://yacy.net/en/Tutorials.html and https://yacy.net/de/Lehrfilme.html +- (Home Page) https://yacy.net/ +- (International Forum) https://searchlab.eu +- (Wiki:de) http://www.yacy-websuche.de/wiki/index.php/De:Start +- (Wiki:en) http://www.yacy-websearch.net/wiki/index.php/En:Start +- (Tutorial Videos) https://yacy.net/en/Tutorials.html and https://yacy.net/de/Lehrfilme.html Every of these locations has a (YaCy) search functionality which combines all these locations into one search result. diff --git a/htroot/Status.html b/htroot/Status.html index 21081eb18..d50b8b698 100644 --- a/htroot/Status.html +++ b/htroot/Status.html @@ -178,7 +178,7 @@ #(hintSupport)#::
idea
-
If you need professional support, please write to support@yacy.net
For community support, please visit our forum. +
If you need professional support, please write to support@yacy.net
For community support, please visit our forum.
#(/hintSupport)# diff --git a/htroot/Steering.html b/htroot/Steering.html index 0055941d9..9d49eac38 100644 --- a/htroot/Steering.html +++ b/htroot/Steering.html @@ -192,7 +192,7 @@ XDtoU7vQ/wIAAP//AwBb7ktEXQ4nqQAAAABJRU5ErkJggg==" width="128" height="64" alt="K

Please send us feed-back about your experience with an
anonymous message
or a
- posting to our web forums
+ posting to our web forums
or a
bug report!

Professional Support

diff --git a/htroot/env/templates/header.template b/htroot/env/templates/header.template index 6cb7cb7a4..023524f2b 100644 --- a/htroot/env/templates/header.template +++ b/htroot/env/templates/header.template @@ -111,7 +111,7 @@
  • JavaScript information
  • external   Download YaCy
    • -
  • external   Community (Web Forums)
    • +
  • external   Community (Web Forums)
  • external   Project Wiki
  • external   Git Repository
  • external   Bugtracker
    • diff --git a/htroot/env/templates/simpleSearchHeader.template b/htroot/env/templates/simpleSearchHeader.template index dea156f36..dff437c3a 100644 --- a/htroot/env/templates/simpleSearchHeader.template +++ b/htroot/env/templates/simpleSearchHeader.template @@ -62,7 +62,7 @@
  • JavaScript information
  • external   Download YaCy
    • -
  • external   Community (Web Forums)
    • +
  • external   Community (Web Forums)
  • external   Project Wiki
  • external   Git Repository
  • external   Bugtracker
    • diff --git a/htroot/env/templates/simpleheader.template b/htroot/env/templates/simpleheader.template index edb4084dd..5c45f1a79 100644 --- a/htroot/env/templates/simpleheader.template +++ b/htroot/env/templates/simpleheader.template @@ -42,7 +42,7 @@
  • JavaScript information
  • external   Download YaCy
    • -
  • external   Community (Web Forums)
    • +
  • external   Community (Web Forums)
  • external   Project Wiki
  • external   Git Repository
  • external   Bugtracker
    • diff --git a/htroot/yacy/ui/yacyui-admin.html b/htroot/yacy/ui/yacyui-admin.html index aecb66b58..a7696f6f9 100644 --- a/htroot/yacy/ui/yacyui-admin.html +++ b/htroot/yacy/ui/yacyui-admin.html @@ -135,7 +135,7 @@ $(function() { - + YaCy Forum
    Forum diff --git a/htroot/yacy/ui/yacyui-welcome.html b/htroot/yacy/ui/yacyui-welcome.html index 19ad27bcd..c476f0d17 100644 --- a/htroot/yacy/ui/yacyui-welcome.html +++ b/htroot/yacy/ui/yacyui-welcome.html @@ -38,7 +38,7 @@ apfelmaennchen

    Bug Tracker

     diff --git a/locales/de.lng b/locales/de.lng index dd810f99c..c0c9cb5fb 100644 --- a/locales/de.lng +++ b/locales/de.lng @@ -1815,7 +1815,7 @@ deselect the partial import flag==Den teilweisen Import Flag abschalten When an export is started, surrogate files are generated into DATA/SURROGATE/in which are automatically fetched by an indexer thread.==Wenn ein Export gestartet wird werden Hilfsdateien in DATA/SURROGATE/in erzeugt, die automatisch von einem Indexer Thread geholt und verarbeitet werden. All indexed surrogate files are then moved to DATA/SURROGATE/out and can be re-cycled when an index is deleted.==Alle indexierten Hilfsdateien werden dann nach DATA/SURROGATE/out verschoben und können recycelt werden wenn ein Index gelöscht wird. The URL stub==Der Teil der URL -like http://forum.yacy-websuche.de==wie z.B. http://forum.yacy-websuche.de +like https://searchlab.eu==wie z.B. https://searchlab.eu this must be the path right in front of '/viewtopic.php?'==dies muss den kompletten Pfad vor '/viewtopic.php?' enthalten Type==Typ > of database<==> der Datenbank< diff --git a/locales/fr.lng b/locales/fr.lng index f6c4976f6..85f14d94e 100644 --- a/locales/fr.lng +++ b/locales/fr.lng @@ -2161,7 +2161,7 @@ where it can be retrieved using the URL==d'où elle peut être r&eacu Your Web Page Indexer is idle. You can start your own web crawl here==Votre indexeur de pages web est inactif. Vous pouvez démarrer votre propre balayage du web ici Your Web Page Indexer is busy. You can monitor your web crawl here.==Votre indexeur de pages web est actif. Vous pouvez surveiller votre balayage du web ici. If you need professional support, please write to==Si vous avez besoin d'une assistance professionnelle, vous pouvez écrire à -For community support, please visit our forum==Si vous cherchez l'aide de la communauté, vous pouvez visiter notre forum +For community support, please visit our forum==Si vous cherchez l'aide de la communauté, vous pouvez visiter notre forum "Follow YaCy on Twitter"=="Suivez YaCy sur Twitter" @@ -2306,7 +2306,7 @@ Therefore we like to ask you: do you like YaCy? Will you use it again... if not, Please send us feed-back about your experience with an==Vous pouvez nous faire parvenir vos commentaires avec un anonymous message==message anonyme or a
    ==ou un
    -posting to our web forums
    ==message sur nos forums
    +posting to our web forums
    ==message sur nos forums
    bug report==rapport de bogue

    Professional Support

    ==

    Support professionnel

    If you are a professional user and you would like to use YaCy in your company in combination with consulting services by YaCy specialists, please see==Si vous souhaitez utiliser YaCy dans votre entreprise en association avec un service de consultations d'expertise par des spécialistes de YaCy, veuillez consulter diff --git a/locales/master.lng.xlf b/locales/master.lng.xlf index b055dee1e..fe03af411 100644 --- a/locales/master.lng.xlf +++ b/locales/master.lng.xlf @@ -2527,7 +2527,7 @@ The URL stub - like http://forum.yacy-websuche.de + like https://searchlab.eu this must be the path right in front of '/viewtopic.php?' diff --git a/locales/ru.lng b/locales/ru.lng index a6a9758d7..94d7713b4 100644 --- a/locales/ru.lng +++ b/locales/ru.lng @@ -1942,7 +1942,7 @@ deselect the partial import flag==снимите флаг частичного When an export is started, surrogate files are generated into DATA/SURROGATE/in which are automatically fetched by an indexer thread.==После начала экспорта, замещающие файлы создаются в DATA/SURROGATE/in и автоматически добавляются в индексатор. All indexed surrogate files are then moved to DATA/SURROGATE/out and can be re-cycled when an index is deleted.==Все проиндексированные замещающие файлы перемещаются в DATA/SURROGATE/out и могут быть использованы повторно в случае удаления индекса. The URL stub==Часть ссылки -like http://forum.yacy-websuche.de==например, http://forum.yacy-websuche.de +like https://searchlab.eu==например, https://searchlab.eu this must be the path right in front of '/viewtopic.php?'==(путь до '/viewtopic.php?') Type==Тип > of database<==> базы данных< diff --git a/locales/uk.lng b/locales/uk.lng index 4b2969e20..28e2bb8de 100644 --- a/locales/uk.lng +++ b/locales/uk.lng @@ -1558,7 +1558,7 @@ in phpmyadmin/config.inc.php and place your dump file in /tmp (Otherwise it is n deselect the partial import flag==Зніміть прапорець часткового імпорту When an export is started, surrogate files are generated into DATA/SURROGATE/in which are automatically fetched by an indexer thread.==При запуску експорту в DATA/SURROGATE/in створюються допоміжні файли, які автоматично вилучаються та опрацьовуються потоком індексувача. All indexed surrogate files are then moved to DATA/SURROGATE/out and can be re-cycled when an index is deleted.==Всі проіндексовані допоміжні файли потім переміщуються в DATA/SURROGATE/out, і можуть бути знову оброблені, якщо індекс буде видалено. -The URL stub,
    like http://forum.yacy-websuche.de==Частина URL, як наприклад,
    http://forum.yacy-websuche.de +The URL stub,
    like https://searchlab.eu==Частина URL, як наприклад,
    https://searchlab.eu this must be the path right in front of '/viewtopic.php?'==повний шлях перед "/viewtopic.php?" Type==Тип Host of the database<==Ім’я хосту БД< diff --git a/locales/zh.lng b/locales/zh.lng index c5293ba45..c58298602 100644 --- a/locales/zh.lng +++ b/locales/zh.lng @@ -1042,7 +1042,7 @@ deselect the partial import flag==取消部分导入 When an export is started, surrogate files are generated into DATA/SURROGATE/in which are automatically fetched by an indexer thread.==导出过程开始时, 在 DATA/SURROGATE/in 目录下自动生成备份文件, 并且会被索引器自动爬取. All indexed surrogate files are then moved to DATA/SURROGATE/out and can be re-cycled when an index is deleted.==所有被索引的备份文件都在 DATA/SURROGATE/out 目录下, 并被索引器循环利用. The URL stub==URL根域名 -like http://forum.yacy-websuche.de==比如链接 http://forum.yacy-websuche.de +like https://searchlab.eu==比如链接 https://searchlab.eu this must be the path right in front of '/viewtopic.php?'==必须在'/viewtopic.php?'前面 Type==数据库 > of database<==> 类型< diff --git a/startYACY.sh b/startYACY.sh index 3dea48cca..157a42154 100755 --- a/startYACY.sh +++ b/startYACY.sh @@ -246,7 +246,7 @@ else echo "**** USE AT YOUR OWN RISK! Project home and releases: http://yacy.net/ ****" echo "** LOG of YaCy: DATA/LOG/yacy00.log (and yacy.log) **" echo "** STOP YaCy: execute stopYACY.sh and wait some seconds **" - echo "** GET HELP for YaCy: see http://wiki.yacy.net and http://forum.yacy.de **" + echo "** GET HELP for YaCy: join our community at https://searchlab.eu **" echo "*******************************************************************************" if [ $DEBUG -eq 1 ] #debug then diff --git a/startYACY_debug.bat b/startYACY_debug.bat index bbce5915d..a5eb9a3ee 100644 --- a/startYACY_debug.bat +++ b/startYACY_debug.bat @@ -29,7 +29,7 @@ Echo **** (C) by Michael Peter Christen, usage granted under the GPL Version 2 Echo **** USE AT YOUR OWN RISK! Project home and releases: http://yacy.net/ **** Echo ** LOG of YaCy: DATA/LOG/yacy00.log (and yacy^.log) ** Echo ** STOP YaCy: execute stopYACY.bat and wait some seconds ** -Echo ** GET HELP for YaCy: see www.yacy-websearch.net/wiki and forum.yacy.de ** +Echo ** GET HELP for YaCy: join our community at https://searchlab.eu ** Echo ******************************************************************************* Echo ^>^> YaCy started as daemon process. Administration at http://localhost:%port% ^<^< diff --git a/test/java/net/yacy/document/parser/GenericXMLParserTest.java b/test/java/net/yacy/document/parser/GenericXMLParserTest.java index 18b6cb438..d18ed22bc 100644 --- a/test/java/net/yacy/document/parser/GenericXMLParserTest.java +++ b/test/java/net/yacy/document/parser/GenericXMLParserTest.java @@ -279,7 +279,7 @@ public class GenericXMLParserTest { + "" + "" + "" + "XHTML attributes URLs test" + "" + "" - + "Here are YaCyhome page and International Forum." + + "Here are YaCyhome page and International Forum." + "And this is a relative link to a sub document." + "" + ""; @@ -296,7 +296,7 @@ public class GenericXMLParserTest { assertEquals(3, detectedAnchors.size()); assertTrue(detectedAnchors.contains(new AnchorURL("http://www.w3.org/1999/xhtml"))); assertTrue(detectedAnchors.contains(new AnchorURL("http://yacy.net"))); - assertTrue(detectedAnchors.contains(new AnchorURL("http://forum.yacy.de"))); + assertTrue(detectedAnchors.contains(new AnchorURL("https://searchlab.eu"))); } finally { inStream.close(); } @@ -316,7 +316,7 @@ public class GenericXMLParserTest { + "" + "XHTML content URLs test" + "" + "" + "Here are some YaCy links:" + "
    " + "
    Home page
    " + "
    http://yacy.net
    " + "
    International Forum
    " - + "
    http://forum.yacy.de
    " + "
    " + + "
    https://searchlab.eu
    " + "" + "And this is a mention to a relative link : /document.html " + "" + ""; InputStream inStream = new ByteArrayInputStream(xhtml.getBytes(StandardCharsets.UTF_8.name())); @@ -332,7 +332,7 @@ public class GenericXMLParserTest { assertEquals(3, detectedAnchors.size()); assertTrue(detectedAnchors.contains(new AnchorURL("http://www.w3.org/1999/xhtml"))); assertTrue(detectedAnchors.contains(new AnchorURL("http://yacy.net"))); - assertTrue(detectedAnchors.contains(new AnchorURL("http://forum.yacy.de"))); + assertTrue(detectedAnchors.contains(new AnchorURL("https://searchlab.eu"))); } finally { inStream.close(); } @@ -374,7 +374,7 @@ public class GenericXMLParserTest { + "" + "XHTML content URLs test" + "" + "" + "

    Here are some YaCy URLs: " + "Home page : http://yacy.net - International Forum : " - + "http://forum.yacy.de " + + "https://searchlab.eu " + "and this is a mention to a relative URL : /document.html

    " + "

    Here are YaCybug tracker and Wiki." + "And this is a relative link to another sub document

    " @@ -397,7 +397,7 @@ public class GenericXMLParserTest { assertEquals(5, detectedAnchors.size()); assertTrue(detectedAnchors.contains(new AnchorURL("http://www.w3.org/1999/xhtml"))); assertTrue(detectedAnchors.contains(new AnchorURL("http://yacy.net"))); - assertTrue(detectedAnchors.contains(new AnchorURL("http://forum.yacy.de"))); + assertTrue(detectedAnchors.contains(new AnchorURL("https://searchlab.eu"))); assertTrue(detectedAnchors.contains(new AnchorURL("http://mantis.tokeek.de"))); assertTrue(detectedAnchors.contains(new AnchorURL("http://www.yacy-websearch.net/wiki/"))); } finally { @@ -434,7 +434,7 @@ public class GenericXMLParserTest { .append("") .append("

    Here are some YaCy URLs: ") .append("Home page : http://yacy.net - International Forum : ") - .append("http://forum.yacy.de ") + .append("https://searchlab.eu ") .append("and this is a mention to a relative URL : /document.html

    "); /* Add some filler text to reach a total size beyond SAX parser internal input stream buffers */ @@ -460,7 +460,7 @@ public class GenericXMLParserTest { assertEquals(3, detectedAnchors.size()); assertTrue(detectedAnchors.contains(new AnchorURL("http://www.w3.org/1999/xhtml"))); assertTrue(detectedAnchors.contains(new AnchorURL("http://yacy.net"))); - assertTrue(detectedAnchors.contains(new AnchorURL("http://forum.yacy.de"))); + assertTrue(detectedAnchors.contains(new AnchorURL("https://searchlab.eu"))); } finally { inStream.close(); } diff --git a/test/java/net/yacy/document/parser/html/ContentScraperTest.java b/test/java/net/yacy/document/parser/html/ContentScraperTest.java index 1990a2fcd..105303166 100644 --- a/test/java/net/yacy/document/parser/html/ContentScraperTest.java +++ b/test/java/net/yacy/document/parser/html/ContentScraperTest.java @@ -173,7 +173,7 @@ public class ContentScraperTest { */ @Test public void testFindAbsoluteURLs() throws MalformedURLException { - final String[] urlStrings = { "http://yacy.net", "http://forum.yacy.de", "https://en.wikipedia.org" }; + final String[] urlStrings = { "http://yacy.net", "https://searchlab.eu", "https://en.wikipedia.org" }; final List urls = new ArrayList<>(); for (String urlString : urlStrings) { urls.add(new AnchorURL(urlString)); @@ -277,7 +277,7 @@ public class ContentScraperTest { */ @Test public void testFindAbsoluteURLsMaxURLs() throws MalformedURLException { - final String text = "Some test URLS : http://yacy.net - http://forum.yacy.de - https://en.wikipedia.org"; + final String text = "Some test URLS : http://yacy.net - https://searchlab.eu - https://en.wikipedia.org"; /* No limit */ ArrayList detectedURLs = new ArrayList<>(); diff --git a/test/java/net/yacy/document/parser/ooxmlParserTest.java b/test/java/net/yacy/document/parser/ooxmlParserTest.java index 1839f2fc9..5500be0ea 100644 --- a/test/java/net/yacy/document/parser/ooxmlParserTest.java +++ b/test/java/net/yacy/document/parser/ooxmlParserTest.java @@ -153,7 +153,7 @@ public class ooxmlParserTest { assertNotNull("Detected URLs must not be null", anchors); assertEquals("2 URLs should be detected", 2, anchors.size()); assertTrue("YaCy home page URL should have been parsed", anchors.contains(new AnchorURL("http://yacy.net"))); - assertTrue("YaCy forum URL should have been parsed", anchors.contains(new AnchorURL("http://forum.yacy-websuche.de/"))); + assertTrue("YaCy forum URL should have been parsed", anchors.contains(new AnchorURL("https://searchlab.eu"))); } }