[tor-commits] [stem/master] Dropping subsections from the main page

[atagar at torproject.org]

commit 38fec343eaacd0c80f5cc5a378a71f3b2d0835b8
Author: Damian Johnson <atagar at torproject.org>
Date:   Sat Dec 6 14:12:08 2014 -0800

    Dropping subsections from the main page
    
    On reflection just about none of these were really useful...
    
      * Development Wiki - Not useful to anyone except me. It's hardly used any
        longer, and the only handy bit is the release checklist. Moved into the
        menu.
    
      * Contact - Ok, this one *is* useful. Moved to be a top level menu item so
        it's even more visible.
    
      * Index, Module Index, Search, and Contents - *shrug*
    
      * Automated Testing - Nobody except me has a reason to care about this. Moved
        the link to the wiki.
    
    I also tweaked the wording on the page to make it even shorter. Short is good,
    and there's no reason to continue to mention TorCtl.
---
 docs/_templates/layout.html |    2 ++
 docs/contents.rst           |    1 +
 docs/index.rst              |   14 +-------------
 3 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/docs/_templates/layout.html b/docs/_templates/layout.html
index 00caace..450bb4f 100644
--- a/docs/_templates/layout.html
+++ b/docs/_templates/layout.html
@@ -49,9 +49,11 @@
               <li><a href="{{ pathto('faq') }}">FAQ</a></li>
               <li><a href="{{ pathto('change_log') }}">Change Log</a></li>
               <li><a href="https://trac.torproject.org/projects/tor/wiki/doc/stem/bugs">Bug Tracker</a></li>
+              <li><a href="https://trac.torproject.org/projects/tor/wiki/doc/stem">Wiki</a></li>
               <li><a href="{{ pathto('download') }}">Download</a></li>
             </ul>
           </li>
+          <li><a href="https://www.atagar.com/contact/">Contact</a></li>
         </ul>
 
         {%- block haikurel2 %}
diff --git a/docs/contents.rst b/docs/contents.rst
index f7a49d2..cb4e578 100644
--- a/docs/contents.rst
+++ b/docs/contents.rst
@@ -18,6 +18,7 @@ Contents
    tutorials/examples/list_circuits
    tutorials/examples/outdated_relays
    tutorials/examples/persisting_a_consensus
+   tutorials/examples/votes_by_bandwidth_authorities
 
    change_log
    download
diff --git a/docs/index.rst b/docs/index.rst
index 78920bc..bcc2269 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -1,7 +1,7 @@
 Welcome to Stem!
 ================
 
-Stem is a Python controller library for `Tor <https://www.torproject.org/>`_. Like its predecessor, `TorCtl <https://gitweb.torproject.org/pytorctl.git>`_, it uses Tor's `control protocol <https://gitweb.torproject.org/torspec.git/tree/control-spec.txt>`_ to help developers program against the Tor process, enabling them to build things similar to `Vidalia <https://www.torproject.org/getinvolved/volunteer.html.en#project-vidalia>`_ and `arm <https://www.atagar.com/arm/>`_. Stem's latest version is **1.2.2** (released June 7th, 2014).
+Stem is a Python controller library for `Tor <https://www.torproject.org/>`_. With it you can use Tor's `control protocol <https://gitweb.torproject.org/torspec.git/tree/control-spec.txt>`_ to script against the Tor process, or build things similar to `Vidalia <https://www.torproject.org/projects/vidalia.html.en>`_ and `arm <https://www.atagar.com/arm/>`_. Stem's latest version is **1.2.2** (released June 7th, 2014).
 
 .. Main Stem Logo
    Source: http://www.wpclipart.com/plants/assorted/P/plant_stem.png.html
@@ -64,18 +64,6 @@ Stem is a Python controller library for `Tor <https://www.torproject.org/>`_. Li
 .. image:: /_static/buttons/download.png
    :target: download.html
 
-Subsections
-===========
-
-* `Development Wiki <https://trac.torproject.org/projects/tor/wiki/doc/stem>`_
-* `Contact <https://www.atagar.com/contact/>`_
-* :ref:`genindex`
-* :ref:`modindex`
-* :ref:`search`
-* `Automated Testing <https://jenkins.torproject.org/job/stem-tor-ci/>`_
-
 .. toctree::
    :maxdepth: 1
 
-   contents
-