Update sphinx documentation

sebastinas · sebastinas · commit b960bc7d082a · 2014-05-10T02:37:38.000+02:00
Merge changes from AUTHORS and other small fixes
diff --git a/doc/sphinx/source/authors.rst b/doc/sphinx/source/authors.rst
@@ -5,23 +5,25 @@ Authors
 If you contributed to bpython and want to be on this list please find us
 (:ref:`community`) and let us know!
 
-bpython is written and maintained by Bob Farrell and Andreas Stuehrk
-<robertanthonyfarrell at gmail dot com>,
-<andy-python at hammerhartes dot de>.
-
+bpython is written and maintained by Bob Farrell
+<robertanthonyfarrell at gmail dot com>.
 
 Other contributors are (in alphabetical order):
 
+* Thomas Ballinger <thomasballinger at gmail dot com>
 * Federico Ceratto <federico dot ceratto at gmail dot com>
 * Ingrid Cheung
+* Maja Frydrychowicz
 * Martha Girdler <martha at cheezburger dot com>
 * Eike Hein <sho at eikehein dot com>
 * Allison Kaptur <allison dot kaptur at gmail dot com>
+* Jason Laster <jason dot laster dot 11 at gmail dot com>
 * Brandon Navra <brandon dot navra at gmail dot com>
 * Michele Orrù <maker dot py at gmail dot com>
 * Pavel Panchekha <pavpanchekha at gmail dot com>
-* Sebastian Ramacher <s dot ramacher at gmx dot at>
+* Sebastian Ramacher <sebastian+dev@ramacher.at>
 * Amjith Ramanujam <amjith dot r at gmail dot com>
+* Andreas Stührk <andy@hammerhartes.de>
 * Simon de Vlieger <simon at ikanobori dot jp>
 * Marien Zwart <marien dot zwart at gmail dot com>
 
diff --git a/doc/sphinx/source/man-bpython.rst b/doc/sphinx/source/man-bpython.rst
@@ -12,6 +12,8 @@ Synopsis
 
 **bpython-urwid** [*options*] [*file* [*args*]]
 
+**bpython-curtsies** [*options*] [*file* [*args*]]
+
 
 Description
 -----------
@@ -88,7 +90,7 @@ Files
 **$XDG_CONFIG_HOME/bpython/config**
 
 Your bpython config. See sample-config (in /usr/share/doc/bpython/examples on
-Debian) for various options you can use, or read :manpage:`python-config(5)`.
+Debian) for various options you can use, or read :manpage:`bpython-config(5)`.
 
 Known bugs
 ----------
diff --git a/doc/sphinx/source/tips.rst b/doc/sphinx/source/tips.rst
@@ -20,5 +20,5 @@ Where the `~/python/bpython`-path is the path to where your bpython source code
 resides.
 
 You can offcourse add multiple aliasses (make sure you have pygments installed
-on all python versions though), so you can run bpython with 2.4, 2.5, 2.6, 2.7
-and the 3 series.
+on all python versions though), so you can run bpython with 2.6, 2.7 and the 3
+series.
