[tor-commits] [webwml/staging] be a bit clearer about what's worth learning about

[sebastian@xxxxxxxxxxxxxx]

commit 79e1199f102182b80a4bf2b941b3111190edb787
Author: Roger Dingledine <arma@xxxxxxxxxxxxxx>
Date:   Sat Apr 16 20:59:23 2016 -0400

    be a bit clearer about what's worth learning about
---
 docs/en/sidenav.wmi | 49 ++++++++++++++++++++++++-------------------------
 1 file changed, 24 insertions(+), 25 deletions(-)

diff --git a/docs/en/sidenav.wmi b/docs/en/sidenav.wmi
index 43ed5ec..984fea0 100644
--- a/docs/en/sidenav.wmi
+++ b/docs/en/sidenav.wmi
@@ -20,35 +20,31 @@
       {'url'  => 'docs/documentation',
        'txt'  => 'Documentation Overview',
       },
+      {'url'  => 'projects/torbrowser',
+       'txt'  => 'Install Tor Browser',
+      },
+      {'url'  => 'https://guardianproject.info/apps/orbot/',
+       'txt'  => 'Tor on Android',
+      },
+      {'url'  => 'projects/projects',
+       'txt'  => 'Other Tor software',
+      },
       {
        'url'  => 'docs/installguide',
-       'txt'  => 'Installation Guides',
+       'txt'  => 'Expert guides',
        'subelements' => [
-          {'url'  => 'docs/tor-doc-windows',
-           'txt'  => 'Installing on Windows',
-          },
-          {'url'  => 'docs/tor-doc-unix',
-           'txt'  => 'Installing on Linux/BSD/Unix',
-          },
           {'url'  => 'docs/debian',
            'txt'  => 'Installing Tor on Debian/Ubuntu',
           },
           {'url'  => 'docs/rpms',
            'txt'  => 'Installing Tor on Fedora/CentOS',
           },
-          {'url'  => 'docs/tor-doc-osx',
-           'txt'  => 'Installing Tor on Mac OS X',
+          {'url'  => 'docs/tor-doc-unix',
+           'txt'  => 'Installing Tor Source',
           },
-          {'url'  => 'docs/android',
-           'txt'  => 'Installing Tor on Android',
+          {'url'  => 'docs/tor-doc-osx',
+           'txt'  => 'MacPorts',
           },
-          {'url'  => 'docs/verifying-signatures',
-           'txt'  => 'Verify our GPG signatures',
-          }],
-      },
-      {'url'  => 'docs/manual',
-       'txt'  => 'Manuals',
-       'subelements' => [
           {'url'  => 'docs/tor-relay-debian',
            'txt'  => 'Configuring a Relay manually',
           },
@@ -59,17 +55,23 @@
            'txt'  => 'Configuring a Hidden Service',
           },
           {'url'  => 'docs/bridges',
-           'txt'  => 'Using a Bridge Relay',
+           'txt'  => 'Understanding bridges',
           },
+          {'url'  => 'docs/verifying-signatures',
+           'txt'  => 'Verify package signatures',
+          }],
+      },
+      {'url'  => 'docs/manual',
+       'txt'  => 'Manuals',
+       'subelements' => [
           {'url'  => 'docs/tor-manual',
            'txt'  => 'Tor -stable Manual',
           },
           {'url'  => 'docs/tor-manual-dev',
            'txt'  => 'Tor -alpha Manual',
-          }]
+          }],
       },
-      {
-       'url'  => '<wiki>',
+      {'url'  => '<wiki>',
        'txt'  => 'Tor Wiki',
       },
       {'url'  => 'docs/faq',
@@ -84,8 +86,5 @@
       {'url'  => 'eff/tor-legal-faq',
        'txt'  => 'Tor Legal FAQ',
       },
-      {'url'  => 'eff/tor-dmca-response',
-       'txt'  => 'Tor DMCA Response',
-      },
   ];
 :>



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits