Reorganized several URLs

i2p2www/pages/global/nav.html

@@ -6,11 +6,11 @@
       <li><a href="{{ site_url('about/intro') }}"><div class="menuitem"><span>{{ _('Introduction to I2P') }}</span></div></a></li>
       <li class="has-sub"><div class="menuitem"><span>{{ _('Comparisons') }}</span></div>
         <ul>
-          <li><a href="{{ site_url('about/comparison') }}"><div class="menuitem"><span>{{ _('Overview of comparisons') }}</span></div></a></li>
-          <li><a href="{{ site_url('about/comparison/tor') }}"><div class="menuitem"><span>{{ _('Tor') }}</span></div></a></li>
-          <li><a href="{{ site_url('about/comparison/freenet') }}"><div class="menuitem"><span>{{ _('Freenet') }}</span></div></a></li>
-          {#<li><a href="{{ site_url('about/comparison/gnunet') }}"><div class="menuitem"><span>{{ _('GNUnet') }}</span></div></a></li> #}
-          <li><a href="{{ site_url('about/comparison/other-networks') }}"><div class="menuitem"><span>{{ _('Other anonymous networks') }}</span></div></a></li>
+          <li><a href="{{ site_url('comparison') }}"><div class="menuitem"><span>{{ _('Overview of comparisons') }}</span></div></a></li>
+          <li><a href="{{ site_url('comparison/tor') }}"><div class="menuitem"><span>{{ _('Tor') }}</span></div></a></li>
+          <li><a href="{{ site_url('comparison/freenet') }}"><div class="menuitem"><span>{{ _('Freenet') }}</span></div></a></li>
+          {#<li><a href="{{ site_url('comparison/gnunet') }}"><div class="menuitem"><span>{{ _('GNUnet') }}</span></div></a></li> #}
+          <li><a href="{{ site_url('comparison/other-networks') }}"><div class="menuitem"><span>{{ _('Other anonymous networks') }}</span></div></a></li>
         </ul>
       </li>
   <li class="has-sub"><div class="menuitem"><span>{{ _('Documentation') }}</span></div>
@@ -93,15 +93,15 @@
       <li><a href="{{ site_url('about/hall-of-fame') }}"><div class="menuitem"><span>{{ _('Hall of Fame') }}</span></div></a></li>
       <li><a href="{{ site_url('research/papers') }}"><div class="menuitem"><span>{{ _('Academic papers and peer review') }}</span></div></a></li>
       <li><a href="{{ site_url('about/media') }}"><div class="menuitem"><span>{{ _('Presentations, tutorials and articles') }}</span></div></a></li>
-      <li><a href="{{ site_url('about/contact') }}"><div class="menuitem"><span>{{ _('Contact us') }}</span></div></a></li>
+      <li><a href="{{ site_url('contact') }}"><div class="menuitem"><span>{{ _('Contact us') }}</span></div></a></li>
     </ul>
   </li>
   <li class="has-sub"><div class="menuitem"><span>{{ _('Help') }}</span></div>
     <ul>
-      <li><a href="{{ site_url('support/faq') }}"><div class="menuitem"><span>{{ _('FAQ') }}</span></div></a></li>
-      <li><a href="{{ site_url('support/browser-config') }}"><div class="menuitem"><span>{{ _('How to browse I2P') }}</span></div></a></li>
-      <li><a href="{{ site_url('support/glossary') }}"><div class="menuitem"><span>{{ _('Glossary') }}</span></div></a></li>
-      <li><a href="{{ site_url('support/performance') }}"><div class="menuitem"><span>{{ _('Performance') }}</span></div></a></li>
+      <li><a href="{{ site_url('faq') }}"><div class="menuitem"><span>{{ _('FAQ') }}</span></div></a></li>
+      <li><a href="{{ site_url('about/browser-config') }}"><div class="menuitem"><span>{{ _('How to browse I2P') }}</span></div></a></li>
+      <li><a href="{{ site_url('about/glossary') }}"><div class="menuitem"><span>{{ _('Glossary') }}</span></div></a></li>
+      <li><a href="{{ site_url('about/performance') }}"><div class="menuitem"><span>{{ _('Performance') }}</span></div></a></li>
       <li><a href="http://{{ i2pconv('forum.i2p') }}/"><div class="menuitem"><span>{{ _('Forums') }}</span></div></a></li>
     </ul>
   </li>

i2p2www/pages/site/about/performance/future.html

@@ -9,7 +9,7 @@ related, and others still are protocol related.  However, all of those
 dimensions affect the latency, throughput, and perceived performance of the
 network, as they reduce contention for scarce resources.  This list is of course
 not comprehensive, but it does cover the major ones that are seen.</p>
-<p>For past performance improvements see the <a href="{{ site_url('support/performance/history') }}">
+<p>For past performance improvements see the <a href="{{ site_url('about/performance/history') }}">
 Performance History</a>.
 
 <h2>Better peer profiling and selection</h2>

i2p2www/pages/site/about/performance/history.html

@@ -2,7 +2,7 @@
 {% block title %}Performance History{% endblock %}
 {% block content %}
 <p>Notable performance improvements have been made using the techniques below.
-There is more to do, see the <a href="{{ site_url('support/performance') }}">Performance</a> page
+There is more to do, see the <a href="{{ site_url('about/performance') }}">Performance</a> page
 for current issues and thoughts.</p>
 
 <h2>Native math <b>[implemented]</b></h2>

i2p2www/pages/site/about/performance/index.html

@@ -97,9 +97,9 @@ It will be faster if you use I2P and build more tunnels, e.g. use a torrent or w
 <h2>Performance Improvements</h2>
 
 <p>For possible future performance improvements see
-<a href="{{ site_url('support/performance/future') }}">Future Performance Improvements</a>.</p>
+<a href="{{ site_url('about/performance/future') }}">Future Performance Improvements</a>.</p>
 
-<p>For past performance improvements see the <a href="{{ site_url('support/performance/history') }}">
+<p>For past performance improvements see the <a href="{{ site_url('about/performance/history') }}">
 Performance History</a>.</p>
 
 {% endblock %}

i2p2www/pages/site/comparison/index.html

@@ -12,13 +12,13 @@ comparison. The following have individual comparison pages:
 </p>
 
 <ul>
-  <li><a href="{{ site_url('about/comparison/tor') }}">Tor / Onion Routing</a></li>
-  <li><a href="{{ site_url('about/comparison/freenet') }}">Freenet</a></li>
-  {#<li><a href="{{ site_url('about/comparison/gnunet') }}">GNUnet</a></li>#}
+  <li><a href="{{ site_url('comparison/tor') }}">Tor / Onion Routing</a></li>
+  <li><a href="{{ site_url('comparison/freenet') }}">Freenet</a></li>
+  {#<li><a href="{{ site_url('comparison/gnunet') }}">GNUnet</a></li>#}
 </ul>
 
 <p>
-The following are discussed on the <a href="{{ site_url('about/comparison/othernetworks') }}">other networks page:</a>
+The following are discussed on the <a href="{{ site_url('comparison/other-networks') }}">other networks page:</a>
 </p>
 
 <ul>

i2p2www/pages/site/comparison/other-networks.html

@@ -14,7 +14,7 @@
 
 <p>Most of the following sections are fairly old, and may not be accurate.
 For an overview of available comparisons, see the
-<a href="{{ site_url('about/comparison') }}">main network comparisons page</a>.
+<a href="{{ site_url('comparison') }}">main network comparisons page</a>.
 You may contribute an analysis by entering a
 <a href="http://{{ i2pconv('trac.i2p2.i2p') }}/report/1">new ticket on trac.i2p2.de</a>.
 </p>