merge with stable

1 files changed, 32 insertions, 3 deletions

diff --git a/EXAMPLES b/EXAMPLES
index c6801511..1d182d4a 100644
--- a/EXAMPLES
+++ b/EXAMPLES
@@ -4,7 +4,7 @@ Projects using Sphinx
 This is an (incomplete) alphabetic list of projects that use Sphinx or
 are experimenting with using it for their documentation.  If you like to
 be included, please mail to `the Google group
-<http://groups.google.com/group/sphinx-dev>`_.
+<http://groups.google.com/group/sphinx-users>`_.
 
 I've grouped the list into sections to make it easier to find
 interesting examples.
@@ -67,9 +67,12 @@ Documentation using a customized version of the default theme
 * Advanced Generic Widgets:
   http://xoomer.virgilio.it/infinity77/AGW_Docs/index.html
 * Bazaar: http://doc.bazaar.canonical.com/en/
+* CakePHP: http://book.cakephp.org/2.0/en/index.html
 * Chaco: http://code.enthought.com/projects/chaco/docs/html/
+* Chef: http://docs.opscode.com/
 * Djagios: http://djagios.org/
 * GetFEM++: http://home.gna.org/getfem/
+* Google or-tools: https://or-tools.googlecode.com/svn/trunk/documentation/user_manual/index.html
 * GPAW: https://wiki.fysik.dtu.dk/gpaw/
 * Grok: http://grok.zope.org/doc/current/
 * IFM: http://fluffybunny.memebot.com/ifm-docs/index.html
@@ -77,6 +80,7 @@ Documentation using a customized version of the default theme
 * Mayavi: http://code.enthought.com/projects/mayavi/docs/development/html/mayavi
 * NOC: http://redmine.nocproject.org/projects/noc
 * NumPy: http://docs.scipy.org/doc/numpy/reference/
+* OpenCV: http://docs.opencv.org/
 * Peach^3: http://peach3.nl/doc/latest/userdoc/
 * PyLit: http://pylit.berlios.de/
 * Sage: http://sagemath.org/doc/
@@ -103,12 +107,15 @@ Documentation using the sphinxdoc theme
 * Pysparse: http://pysparse.sourceforge.net/
 * PyTango:
   http://www.tango-controls.org/static/PyTango/latest/doc/html/index.html
+* Python Wild Magic:
+  http://python-wild-magic.googlecode.com/svn/doc/html/index.html
 * Reteisi: http://www.reteisi.org/contents.html
 * Satchmo: http://www.satchmoproject.com/docs/dev/
-* Sphinx: http://sphinx.pocoo.org/
+* Sphinx: http://sphinx-doc.org/
 * Sqlkit: http://sqlkit.argolinux.org/
 * Tau: http://www.tango-controls.org/static/tau/latest/doc/html/index.html
 * Total Open Station: http://tops.berlios.de/
+* Turbulenz: http://docs.turbulenz.com/
 * WebFaction: http://docs.webfaction.com/
 
 
@@ -119,6 +126,7 @@ Documentation using another builtin theme
 * Distribute: http://packages.python.org/distribute/ (nature)
 * Jinja: http://jinja.pocoo.org/ (scrolls)
 * jsFiddle: http://doc.jsfiddle.net/ (nature)
+* MPipe: http://vmlaker.github.io/mpipe/ (sphinx13)
 * pip: http://pip.openplans.org/ (nature)
 * Programmieren mit PyGTK und Glade (German):
   http://www.florian-diesch.de/doc/python-und-glade/online/ (agogo)
@@ -128,6 +136,7 @@ Documentation using another builtin theme
   (agogo)
 * Sylli: http://sylli.sourceforge.net/ (nature)
 * libLAS: http://liblas.org/ (nature)
+* Valence: http://docs.valence.desire2learn.com/ (haiku)
 
 
 Documentation using a custom theme/integrated in a site
@@ -135,21 +144,28 @@ Documentation using a custom theme/integrated in a site
 
 * Blender: http://www.blender.org/documentation/250PythonDoc/
 * Blinker: http://discorporate.us/projects/Blinker/docs/
-* Classy: classy: http://classy.pocoo.org/
+* Classy: http://classy.pocoo.org/
+* DEAP: http://deap.gel.ulaval.ca/doc/0.8/index.html
 * Django: http://docs.djangoproject.com/
+* Enterprise Toolkit for Acrobat products: http://www.adobe.com/devnet-docs/acrobatetk/
 * e-cidadania: http://e-cidadania.readthedocs.org/en/latest/
 * Flask: http://flask.pocoo.org/docs/
 * Flask-OpenID: http://packages.python.org/Flask-OpenID/
 * Gameduino: http://excamera.com/sphinx/gameduino/
 * GeoServer: http://docs.geoserver.org/
 * Glashammer: http://glashammer.org/
+* Istihza (Turkish Python documentation project): http://www.istihza.com/py2/icindekiler_python.html
+* MathJax: http://docs.mathjax.org/en/latest/
 * MirrorBrain: http://mirrorbrain.org/docs/
 * nose: http://somethingaboutorange.com/mrl/projects/nose/
+* NoTex: https://notex.ch/overview/
 * ObjectListView: http://objectlistview.sourceforge.net/python
 * Open ERP: http://doc.openerp.com/
+* OpenCV: http://docs.opencv.org/
 * OpenLayers: http://docs.openlayers.org/
 * PyEphem: http://rhodesmill.org/pyephem/
 * German Plone user manual: http://www.hasecke.com/plone-benutzerhandbuch/
+* PSI4: http://sirius.chem.vt.edu/psi4manual/latest/index.html
 * Pylons: http://pylonshq.com/docs/en/0.9.7/
 * PyMOTW: http://www.doughellmann.com/PyMOTW/
 * pypol: http://pypol.altervista.org/ (celery)
@@ -161,6 +177,7 @@ Documentation using a custom theme/integrated in a site
 * SQLAlchemy: http://www.sqlalchemy.org/docs/
 * tinyTiM: http://tinytim.sourceforge.net/docs/2.0/
 * tipfy: http://www.tipfy.org/docs/
+* Ubuntu packaging guide: http://developer.ubuntu.com/packaging/html/
 * Werkzeug: http://werkzeug.pocoo.org/docs/
 * WFront: http://discorporate.us/projects/WFront/
 
@@ -185,9 +202,21 @@ Books produced using Sphinx
 * A Theoretical Physics Reference book: http://theoretical-physics.net/
 * "Simple and Steady Way of Learning for Software Engineering" (in Japanese):
   http://www.amazon.co.jp/dp/477414259X/
+* "Expert Python Programming":
+  http://www.packtpub.com/expert-python-programming/book
 * "Expert Python Programming" (Japanese translation):
   http://www.amazon.co.jp/dp/4048686291/
 * "Pomodoro Technique Illustrated" (Japanese translation):
   http://www.amazon.co.jp/dp/4048689525/
+* "Python Professional Programming" (in Japanese):
+  http://www.amazon.co.jp/dp/4798032948/
 * "Die Wahrheit des Sehens. Der DEKALOG von Krzysztof Kieślowski":
   http://www.hasecke.eu/Dekalog/
+
+
+Thesis using Sphinx
+-------------------
+
+* "A Web-Based System for Comparative Analysis of OpenStreetMap Data
+  by the Use of CouchDB":
+  http://gisforge.no-ip.org/files/MasterThesis_MarkusMayr_0542042.pdf