merged conflicting changes

cinder-superhero/nav.html

@@ -52,9 +52,15 @@
             {%- endblock %}
 
             <ul class="nav navbar-nav navbar-right">
-		    <li>
-                        <a href="https://community.searchlab.eu">Community Forum</a>
-                    </li>
+            <li>
+                <a href="https://community.searchlab.eu">{%- if page.url == '' -%}<img src="img/discourse_icon.png" alt="YaCy User Forum" height="16" width="16">{% else %}<img src="../img/discourse_icon.png" alt="YaCy User Forum" height="16" width="16">{%- endif %} User Forum</a>
+            </li>
+	    <li>
+                <a href="https://chatgpt.com/g/g-h7fLnaDuI-yacy-support">{%- if page.url == '' -%}<img src="img/openai-white-logomark.png" alt="YaCy Support GPT" height="16" width="16">{% else %}<img src="../img/openai-white-logomark.png" alt="YaCy Support GPT" height="16" width="16">{%- endif %} Support GPT</a>
+            </li>
+	    <li>
+                <a href="https://yacystats.de">{%- if page.url == '' -%}<img src="img/yacystats.png" alt="yacystats" height="16" width="16">{% else %}<img src="../img/yacystats.png" alt="yacystats" height="16" width="16">{%- endif %} Stats</a>
+            </li>
 
                 {%- block next_prev %}
                     {%- if page and (page.next_page or page.previous_page) %}
@@ -75,20 +81,15 @@
 
 
                 {%- block repo %}
-                    <li>
-                        <a href="https://github.com/yacy/yacy_search_server">
-                            <i class="fab fa-github"></i> GitHub
-                        </a>
-                    </li>
+		    <li>
+                       <a href="https://github.com/yacy/yacy_search_server">
+                           <i class="fab fa-github"></i> GitHub
+                       </a>
+                   </li>
                 {%- endblock %}
 
                 {%- block search_button %}
                     {%- if 'search' in config['plugins'] %}
-                    <li>
-                        <a href="#" data-toggle="modal" data-target="#mkdocs_search_modal">
-                            <i class="fas fa-search"></i> Search
-                        </a>
-                    </li>
                     {%- endif %}
                 {%- endblock %}
 

docs/download_installation.md

@@ -26,7 +26,7 @@ If you don't hava Docker installed, get it from [https://docs.docker.com/get-doc
 
 * <a class="btn btn-success btn" href="https://download.yacy.net/yacy_v1.924_20201214_10042.exe" role="button">Download YaCy for Windows</a> from [https://download.yacy.net/yacy_v1.924_20201214_10042.exe](https://download.yacy.net/yacy_v1.924_20201214_10042.exe)
 * <a class="btn btn-success btn" href="https://download.yacy.net/yacy_v1.930_202405130205_59c0cb0f3.tar.gz" role="button">Download Yacy for Linux</a> from [https://download.yacy.net/yacy_v1.930_202405130205_59c0cb0f3.tar.gz](https://download.yacy.net/yacy_v1.930_202405130205_59c0cb0f3.tar.gz)
-* <a class="btn btn-success btn" href="https://download.yacy.net/yacy_v1.924_20201214_10042.dmg" role="button">Download YaCy for macOS</a> from [https://download.yacy.net/yacy_v1.924_20201214_10042.dmg](https://download.yacy.net/yacy_v1.924_20201214_10042.dmg)
+* <a class="btn btn-success btn" href="https://download.yacy.net/yacy_v1.930_202405130205_59c0cb0f3.dmg" role="button">Download YaCy for macOS</a> from [https://download.yacy.net/yacy_v1.930_202405130205_59c0cb0f3.dmg](https://download.yacy.net/yacy_v1.930_202405130205_59c0cb0f3.dmg)
 * <a class="btn btn-success btn" href="https://release.yacy.net/yacy_latest.tar.gz" role="button">Download latest developer release</A> for Linux from [https://release.yacy.net/](https://release.yacy.net/)
 
 ### With Docker
@@ -88,6 +88,8 @@ cd yacy
 * Double-click the downloaded `.dmg`-file and copy the Yacy.app to the "Application" folder.
 * To run YaCy, just double-click the YaCy app icon in your "Application" folder.
 
+The Macintosh application does not store it's index within the application folder (like the linux version does); instead the index is written to `~/Library/Application\ Support/net.yacy.YaCy/DATA/`. If you want to migrate YaCy index on Mac you don't need to do anything, the new YaCy version simply takes the same location again.
+
 ### Any OS with Java >= 11
 Automatic development builds can be obtained from
 [https://release.yacy.net/](https://release.yacy.net/).