commit d9764691fa812da9fcce4ea0650bc9610d2ffcf7 Author: Damian Johnson atagar@torproject.org Date: Sun Dec 21 16:29:35 2014 -0800
Reordering tutorials
The hidden service tutorial is closer to client usage than descriptor handling, so swapping the two. --- docs/_templates/layout.html | 2 +- docs/tutorials.rst | 32 ++++++++++++++++---------------- 2 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/docs/_templates/layout.html b/docs/_templates/layout.html index 32657da..bc80512 100644 --- a/docs/_templates/layout.html +++ b/docs/_templates/layout.html @@ -25,8 +25,8 @@ <li><a href="{{ pathto('tutorials/the_little_relay_that_could') }}">Hello World</a></li> <li><a href="{{ pathto('tutorials/to_russia_with_love') }}">Client Usage</a></li> <li><a href="{{ pathto('tutorials/tortoise_and_the_hare') }}">Event Listening</a></li> - <li><a href="{{ pathto('tutorials/mirror_mirror_on_the_wall') }}">Tor Descriptors</a></li> <li><a href="{{ pathto('tutorials/over_the_river') }}">Hidden Services</a></li> + <li><a href="{{ pathto('tutorials/mirror_mirror_on_the_wall') }}">Tor Descriptors</a></li> <li><a href="{{ pathto('tutorials/east_of_the_sun') }}">Utilities</a></li> <li><a href="{{ pathto('tutorials/down_the_rabbit_hole') }}">Interpreter</a></li> <li><a href="{{ pathto('tutorials/double_double_toil_and_trouble') }}">Examples</a></li> diff --git a/docs/tutorials.rst b/docs/tutorials.rst index f4db5bd..b5f6063 100644 --- a/docs/tutorials.rst +++ b/docs/tutorials.rst @@ -20,17 +20,17 @@ Tutorial Author: arking License: Public Domain
+ * Over the River and Through the Wood - riding_hood.png + Source: https://openclipart.org/detail/163771/little-red-riding-hood-by-tzunghaor + Author: tzunghaor + License: Public Domain + * Mirror Mirror On The Wall - mirror.png Source: https://openclipart.org/detail/152155/mirror-frame-by-gsagri04 Author: Unknown (gsagri04?) License: Public Domain Alternate: https://openclipart.org/detail/174179/miroir-rectangulaire-by-defaz36-174179
- * Over the River and Through the Wood - riding_hood.png - Source: https://openclipart.org/detail/163771/little-red-riding-hood-by-tzunghaor - Author: tzunghaor - License: Public Domain - * East of the Sun & West of the Moon - windrose.png Source: https://commons.wikimedia.org/wiki/File:Compass_card_%28sl%29.svg Author: Andrejj @@ -84,17 +84,6 @@ by jumping straight in with some tutorials... subscribe to be notified of. In this tutorial we'll do just that, writing a curses application that graphs the bandwidth usage of Tor.
- * - .. image:: /_static/section/tutorials/mirror.png - :target: tutorials/mirror_mirror_on_the_wall.html - - - .. image:: /_static/label/mirror_mirror_on_the_wall.png - :target: tutorials/mirror_mirror_on_the_wall.html - - Getting and acting upon information about relays in the Tor network. - Relay information is provided through documents called **descriptors**. - This walks you through both where to get them and a small script to tell - you the fastest Tor exits. - * - .. image:: /_static/section/tutorials/riding_hood.png :target: tutorials/over_the_river.html
@@ -107,6 +96,17 @@ by jumping straight in with some tutorials... instance, this could let you safely publish a blog without getting your door kicked down. Here we'll walk you through an example.
+ * - .. image:: /_static/section/tutorials/mirror.png + :target: tutorials/mirror_mirror_on_the_wall.html + + - .. image:: /_static/label/mirror_mirror_on_the_wall.png + :target: tutorials/mirror_mirror_on_the_wall.html + + Getting and acting upon information about relays in the Tor network. + Relay information is provided through documents called **descriptors**. + This walks you through both where to get them and a small script to tell + you the fastest Tor exits. + * - .. image:: /_static/section/tutorials/windrose.png :target: tutorials/east_of_the_sun.html