IntenseWebs/sphinx
3
0
Fork 0
mirror of https://github.com/sphinx-doc/sphinx.git synced 2025-02-25 18:55:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

merge with 0.6

Browse Source
This commit is contained in:
Georg Brandl 2009-11-09 00:33:49 +01:00
commit 5590675955
16 changed files with 128 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGES
View File

@ -40,8 +40,13 @@ Release 1.0 (in development)
Release 0.6.4 (in development) Release 0.6.4 (in development)
============================== ==============================
* #238: In autodoc, catch all errors that occur on module import,
not just ``ImportError``.
* Fix the handling of non-data, but non-method descriptors in autodoc. * Fix the handling of non-data, but non-method descriptors in autodoc.
* When copying file times, ignore OSErrors raised by ``os.utime()``.
Release 0.6.3 (Sep 03, 2009) Release 0.6.3 (Sep 03, 2009)
============================ ============================

6
EXAMPLES
View File

@ -6,7 +6,9 @@ experimenting with using it for their documentation. If you like to be
included, please mail to `the Google group included, please mail to `the Google group
<http://groups.google.com/group/sphinx-dev>`_. <http://groups.google.com/group/sphinx-dev>`_.
* Applied Mathematics at the Stellenbosch University: http://dip.sun.ac.za/
* APSW: http://apsw.googlecode.com/svn/publish/index.html * APSW: http://apsw.googlecode.com/svn/publish/index.html
* ASE: https://wiki.fysik.dtu.dk/ase/
* boostmpi: http://documen.tician.de/boostmpi/ * boostmpi: http://documen.tician.de/boostmpi/
* Calibre: http://calibre.kovidgoyal.net/user_manual/ * Calibre: http://calibre.kovidgoyal.net/user_manual/
* Chaco: http://code.enthought.com/projects/chaco/docs/html/ * Chaco: http://code.enthought.com/projects/chaco/docs/html/
@ -17,13 +19,17 @@ included, please mail to `the Google group
* Djagios: http://djagios.org/ * Djagios: http://djagios.org/
* Django: http://docs.djangoproject.com/ * Django: http://docs.djangoproject.com/
* F2py: http://www.f2py.org/html/ * F2py: http://www.f2py.org/html/
* Fityk: http://www.unipress.waw.pl/fityk/
* GeoDjango: http://geodjango.org/docs/ * GeoDjango: http://geodjango.org/docs/
* GeoServer: http://docs.geoserver.org/ * GeoServer: http://docs.geoserver.org/
* Glashammer: http://glashammer.org/ * Glashammer: http://glashammer.org/
* GPAW: https://wiki.fysik.dtu.dk/gpaw/
* Grok: http://grok.zope.org/doc/current/ * Grok: http://grok.zope.org/doc/current/
* GSL Shell: http://www.nongnu.org/gsl-shell/
* Hedge: http://documen.tician.de/hedge/ * Hedge: http://documen.tician.de/hedge/
* IFM: http://fluffybunny.memebot.com/ifm-docs/index.html * IFM: http://fluffybunny.memebot.com/ifm-docs/index.html
* Jinja: http://jinja.pocoo.org/2/documentation/ * Jinja: http://jinja.pocoo.org/2/documentation/
* Kaa: http://doc.freevo.org/api/kaa/
* LEPL: http://www.acooke.org/lepl/ * LEPL: http://www.acooke.org/lepl/
* MapServer: http://mapserver.org/ * MapServer: http://mapserver.org/
* Matplotlib: http://matplotlib.sourceforge.net/ * Matplotlib: http://matplotlib.sourceforge.net/

9
doc/_templates/index.html vendored
View File

@ -58,6 +58,7 @@
</p> </p>
<h2>Documentation</h2> <h2>Documentation</h2>
<table class="contentstable" align="center" style="margin-left: 30px"><tr> <table class="contentstable" align="center" style="margin-left: 30px"><tr>
<td width="50%"> <td width="50%">
<p class="biglink"><a class="biglink" href="{{ pathto("contents") }}">Contents</a><br/> <p class="biglink"><a class="biglink" href="{{ pathto("contents") }}">Contents</a><br/>
@ -72,6 +73,14 @@
</td></tr> </td></tr>
</table> </table>
<p>You may also be interested in the very nice
<a href="http://matplotlib.sourceforge.net/sampledoc/">tutorial</a> on how to
create a customized documentation using Sphinx written by the matplotlib
developers.</p>
<p>There is a <a href="http://sphinx.shibu.jp/">Japanese translation</a>
of this documentation, thanks to Yoshiki Shibukawa.</p>
<h2>Get Sphinx</h2> <h2>Get Sphinx</h2>
<p> <p>
Sphinx is available as an <a Sphinx is available as an <a

5
doc/builders.rst
View File

@ -84,6 +84,11 @@ The builder's "name" must be given to the **-b** command-line option of
Its name is ``latex``. Its name is ``latex``.
Note that a direct PDF builder using ReportLab is available in `rst2pdf
<http://rst2pdf.googlecode.com>`_ version 0.12 or greater. You need to add
``'rst2pdf.pdfbuilder'`` to your :confval:`extensions` to enable it, its name is
``pdf``.
.. module:: sphinx.builders.text .. module:: sphinx.builders.text
.. class:: TextBuilder .. class:: TextBuilder

10
doc/ext/inheritance.rst
View File

@ -37,10 +37,20 @@ New config values are:
A dictionary of graphviz graph attributes for inheritance diagrams. A dictionary of graphviz graph attributes for inheritance diagrams.
For example::
inheritance_graph_attrs = dict(rankdir="LR", size='"6.0, 8.0"',
fontsize=14, ratio='compress')
.. confval:: inheritance_node_attrs .. confval:: inheritance_node_attrs
A dictionary of graphviz node attributes for inheritance diagrams. A dictionary of graphviz node attributes for inheritance diagrams.
For example::
inheritance_node_attrs = dict(shape='ellipse', fontsize=14, height=0.75,
color='dodgerblue1', style='filled')
.. confval:: inheritance_edge_attrs .. confval:: inheritance_edge_attrs
A dictionary of graphviz edge attributes for inheritance diagrams. A dictionary of graphviz edge attributes for inheritance diagrams.

5
doc/faq.rst
View File

@ -9,6 +9,11 @@ suggest new entries!
How do I... How do I...
----------- -----------
... create PDF files without LaTeX?
You can use `rst2pdf <http://rst2pdf.googlecode.com>`_ version 0.12 or greater
which comes with built-in Sphinx integration. See the :ref:`builders`
section for details.
... get section numbers? ... get section numbers?
They are automatic in LaTeX output; for HTML, give a ``:numbered:`` option to They are automatic in LaTeX output; for HTML, give a ``:numbered:`` option to
the :dir:`toctree` directive where you want to start numbering. the :dir:`toctree` directive where you want to start numbering.

4
sphinx/ext/autodoc.py
View File

@ -322,7 +322,9 @@ class Documenter(object):
obj = self.get_attr(obj, part) obj = self.get_attr(obj, part)
self.object = obj self.object = obj
return True return True
except (SyntaxError, ImportError, AttributeError), err: # this used to only catch SyntaxError, ImportError and AttributeError,
# but importing modules with side effects can raise all kinds of errors
except Exception, err:
self.directive.warn( self.directive.warn(
'autodoc can\'t import/find %s %r, it reported error: ' 'autodoc can\'t import/find %s %r, it reported error: '
'"%s", please check your spelling and sys.path' % '"%s", please check your spelling and sys.path' %

2
sphinx/ext/jsmath.py
View File

@ -13,7 +13,7 @@
from docutils import nodes from docutils import nodes
from sphinx.application import ExtensionError from sphinx.application import ExtensionError
from sphinx.ext.mathbase import setup as mathbase_setup from sphinx.ext.mathbase import setup_math as mathbase_setup
def html_visit_math(self, node): def html_visit_math(self, node):

2
sphinx/ext/mathbase.py
View File

@ -132,7 +132,7 @@ def number_equations(app, doctree, docname):
node[0] = nodes.Text(num, num) node[0] = nodes.Text(num, num)
def setup(app, htmlinlinevisitors, htmldisplayvisitors): def setup_math(app, htmlinlinevisitors, htmldisplayvisitors):
app.add_node(math, app.add_node(math,
latex=(latex_visit_math, None), latex=(latex_visit_math, None),
text=(text_visit_math, None), text=(text_visit_math, None),

2
sphinx/ext/pngmath.py
View File

@ -25,7 +25,7 @@ from docutils import nodes
from sphinx.errors import SphinxError from sphinx.errors import SphinxError
from sphinx.util import ensuredir from sphinx.util import ensuredir
from sphinx.util.png import read_png_depth, write_png_depth from sphinx.util.png import read_png_depth, write_png_depth
from sphinx.ext.mathbase import setup as mathbase_setup, wrap_displaymath from sphinx.ext.mathbase import setup_math as mathbase_setup, wrap_displaymath
class MathExtError(SphinxError): class MathExtError(SphinxError):
category = 'Math extension error' category = 'Math extension error'

10
sphinx/highlighting.py
View File

@ -12,9 +12,14 @@
import sys import sys
import cgi import cgi
import re import re
import parser
import textwrap import textwrap
try:
import parser
except ImportError:
# parser is not available on Jython
parser = None
from sphinx.util.texescape import tex_hl_escape_map from sphinx.util.texescape import tex_hl_escape_map
try: try:
@ -158,6 +163,9 @@ class PygmentsBridge(object):
# just replace all non-ASCII characters. # just replace all non-ASCII characters.
src = src.encode('ascii', 'replace') src = src.encode('ascii', 'replace')
if parser is None:
return True
try: try:
parser.suite(src) parser.suite(src)
except parsing_exceptions: except parsing_exceptions:

4
sphinx/locale/nl/LC_MESSAGES/sphinx.js
View File

@ -1 +1,3 @@
Documentation.addTranslations({"locale": "nl", "plural_expr": "(n != 1)", "messages": {"Search Results": "Zoekresultaten", "Preparing search...": "Het zoeken wordt voorbereid", "Your search did not match any documents. Please make sure that all words are spelled correctly and that you've selected enough categories.": "Uw zoekopdracht leverde geen resultaten op. Controleer of alle woordencorrect gespeld zijn en dat u genoeg categori\u00ebn hebt geselecteerd.", "Search finished, found %s page(s) matching the search query.": "Zoeken voltooid, %s pagina(s) gevonden.", ", in ": "", "Permalink to this headline": "Permanente link naar deze titel", "Searching": "Zoeken", "Permalink to this definition": "Permanente link naar deze definitie", "module, in ": "module", "Hide Search Matches": "Zoekresultaten verbergen"}}); <<<<<<< local
Documentation.addTranslations({"locale": "nl", "plural_expr": "(n != 1)", "messages": {"Search Results": "Zoekresultaten", "Preparing search...": "Het zoeken wordt voorbereid", "Your search did not match any documents. Please make sure that all words are spelled correctly and that you've selected enough categories.": "Uw zoekopdracht leverde geen resultaten op. Controleer of alle woordencorrect gespeld zijn en dat u genoeg categori\u00ebn hebt geselecteerd.", "Search finished, found %s page(s) matching the search query.": "Zoeken voltooid, %s pagina(s) gevonden.", ", in ": "", "Permalink to this headline": "Permanente link naar deze titel", "Searching": "Zoeken", "Permalink to this definition": "Permanente link naar deze definitie", "module, in ": "module", "Hide Search Matches": "Zoekresultaten verbergen"}});=======
Documentation.addTranslations({"locale": "nl", "plural_expr": "(n != 1)", "messages": {"Search Results": "Zoekresultaten", "Preparing search...": "Het zoeken wordt voorbereid...", "Your search did not match any documents. Please make sure that all words are spelled correctly and that you've selected enough categories.": "Uw zoekopdracht leverde geen resultaten op. Controleer of alle woorden correct gespeld zijn en dat u genoeg categori\u00ebn hebt geselecteerd.", "Search finished, found %s page(s) matching the search query.": "Zoeken voltooid, %s pagina(s) gevonden.", ", in ": ", in ", "Permalink to this headline": "Permanente link naar deze titel", "Searching": "Zoeken", "Permalink to this definition": "Permanente link naar deze definitie", "module, in ": "module, in", "Hide Search Matches": "Zoekresultaten verbergen"}});>>>>>>> other

BIN
sphinx/locale/nl/LC_MESSAGES/sphinx.mo
View File

Binary file not shown.

129
sphinx/locale/nl/LC_MESSAGES/sphinx.po
View File

@ -6,42 +6,49 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Sphinx 0.5\n" "Project-Id-Version: Sphinx 0.5\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2008-09-11 23:58+0200\n" "POT-Creation-Date: 2009-08-06 23:04+0200\n"
"PO-Revision-Date: 2009-08-06 23:04+0200\n" "PO-Revision-Date: 2009-11-03 15:55+0100\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: Marijn van der Zee <marijn.vanderzee@gmail.com>\n"
"Language-Team: nl <LL@li.org>\n" "Language-Team: nl <LL@li.org>\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
"Generated-By: Babel 0.9.4\n" "Generated-By: Babel 0.9.4\n"
#: sphinx/environment.py:103 sphinx/writers/latex.py:184 #: sphinx/environment.py:103
#: sphinx/writers/latex.py:184
#, python-format #, python-format
msgid "%B %d, %Y" msgid "%B %d, %Y"
msgstr "%d. %B %Y" msgstr "%d. %B %Y"
#: sphinx/environment.py:324 sphinx/themes/basic/genindex-single.html:2 #: sphinx/environment.py:324
#: sphinx/themes/basic/genindex-single.html:2
#: sphinx/themes/basic/genindex-split.html:2 #: sphinx/themes/basic/genindex-split.html:2
#: sphinx/themes/basic/genindex-split.html:5 #: sphinx/themes/basic/genindex-split.html:5
#: sphinx/themes/basic/genindex.html:2 sphinx/themes/basic/genindex.html:5 #: sphinx/themes/basic/genindex.html:2
#: sphinx/themes/basic/genindex.html:48 sphinx/themes/basic/layout.html:134 #: sphinx/themes/basic/genindex.html:5
#: sphinx/themes/basic/genindex.html:48
#: sphinx/themes/basic/layout.html:134
#: sphinx/writers/latex.py:190 #: sphinx/writers/latex.py:190
msgid "Index" msgid "Index"
msgstr "Index" msgstr "Index"
#: sphinx/environment.py:325 sphinx/writers/latex.py:189 #: sphinx/environment.py:325
#: sphinx/writers/latex.py:189
msgid "Module Index" msgid "Module Index"
msgstr "Module-index" msgstr "Module-index"
#: sphinx/environment.py:326 sphinx/themes/basic/defindex.html:16 #: sphinx/environment.py:326
#: sphinx/themes/basic/defindex.html:16
msgid "Search Page" msgid "Search Page"
msgstr "Zoekpagina" msgstr "Zoekpagina"
#: sphinx/roles.py:55 sphinx/directives/desc.py:747 #: sphinx/roles.py:55
#: sphinx/directives/desc.py:747
#, python-format #, python-format
msgid "environment variable; %s" msgid "environment variable; %s"
msgstr "Omgevingsvariabele; %s" msgstr "omgevingsvariabele; %s"
#: sphinx/roles.py:62 #: sphinx/roles.py:62
#, python-format #, python-format
@ -61,7 +68,8 @@ msgstr "Moduleniveau"
msgid "%b %d, %Y" msgid "%b %d, %Y"
msgstr "%d.%b.%Y" msgstr "%d.%b.%Y"
#: sphinx/builders/html.py:241 sphinx/themes/basic/defindex.html:21 #: sphinx/builders/html.py:241
#: sphinx/themes/basic/defindex.html:21
msgid "General Index" msgid "General Index"
msgstr "Algemene index" msgstr "Algemene index"
@ -69,9 +77,12 @@ msgstr "Algemene index"
msgid "index" msgid "index"
msgstr "Index" msgstr "Index"
#: sphinx/builders/html.py:243 sphinx/builders/htmlhelp.py:219 #: sphinx/builders/html.py:243
#: sphinx/builders/qthelp.py:133 sphinx/themes/basic/defindex.html:19 #: sphinx/builders/htmlhelp.py:219
#: sphinx/themes/basic/modindex.html:2 sphinx/themes/basic/modindex.html:13 #: sphinx/builders/qthelp.py:133
#: sphinx/themes/basic/defindex.html:19
#: sphinx/themes/basic/modindex.html:2
#: sphinx/themes/basic/modindex.html:13
msgid "Global Module Index" msgid "Global Module Index"
msgstr "Globale Module-index" msgstr "Globale Module-index"
@ -108,9 +119,8 @@ msgid "Return type"
msgstr "Return type" msgstr "Return type"
#: sphinx/directives/desc.py:186 #: sphinx/directives/desc.py:186
#, fuzzy
msgid "Parameter" msgid "Parameter"
msgstr "Parameters" msgstr "Parameter"
#: sphinx/directives/desc.py:190 #: sphinx/directives/desc.py:190
msgid "Parameters" msgid "Parameters"
@ -121,7 +131,8 @@ msgstr "Parameters"
msgid "%s() (built-in function)" msgid "%s() (built-in function)"
msgstr "%s() (geïntegreerde functie)" msgstr "%s() (geïntegreerde functie)"
#: sphinx/directives/desc.py:419 sphinx/directives/desc.py:476 #: sphinx/directives/desc.py:419
#: sphinx/directives/desc.py:476
#: sphinx/directives/desc.py:488 #: sphinx/directives/desc.py:488
#, python-format #, python-format
msgid "%s() (in module %s)" msgid "%s() (in module %s)"
@ -132,15 +143,16 @@ msgstr "%s() (in module %s)"
msgid "%s (built-in variable)" msgid "%s (built-in variable)"
msgstr "%s (geïntegreerde variabele)" msgstr "%s (geïntegreerde variabele)"
#: sphinx/directives/desc.py:423 sphinx/directives/desc.py:514 #: sphinx/directives/desc.py:423
#: sphinx/directives/desc.py:514
#, python-format #, python-format
msgid "%s (in module %s)" msgid "%s (in module %s)"
msgstr "%s (in module %s)" msgstr "%s (in module %s)"
#: sphinx/directives/desc.py:439 #: sphinx/directives/desc.py:439
#, fuzzy, python-format #, python-format
msgid "%s (built-in class)" msgid "%s (built-in class)"
msgstr "%s (geïntegreerde variabele)" msgstr "%s (geïntegreerde klasse)"
#: sphinx/directives/desc.py:440 #: sphinx/directives/desc.py:440
#, python-format #, python-format
@ -203,9 +215,9 @@ msgid "%s (C variable)"
msgstr "%s (C-variabele)" msgstr "%s (C-variabele)"
#: sphinx/directives/desc.py:665 #: sphinx/directives/desc.py:665
#, fuzzy, python-format #, python-format
msgid "%scommand line option; %s" msgid "%scommand line option; %s"
msgstr "%scommandolijn optie; %s" msgstr "%sopdrachtregel optie; %s"
#: sphinx/directives/other.py:140 #: sphinx/directives/other.py:140
msgid "Platforms: " msgid "Platforms: "
@ -244,16 +256,16 @@ msgstr ""
#: sphinx/ext/todo.py:41 #: sphinx/ext/todo.py:41
msgid "Todo" msgid "Todo"
msgstr "" msgstr "Te doen"
#: sphinx/ext/todo.py:99 #: sphinx/ext/todo.py:99
#, python-format #, python-format
msgid "(The original entry is located in %s, line %d and can be found " msgid "(The original entry is located in %s, line %d and can be found "
msgstr "" msgstr "(Het originele item is te vinden in %s, regel %d en kan gevonden worden hier"
#: sphinx/ext/todo.py:105 #: sphinx/ext/todo.py:105
msgid "here" msgid "here"
msgstr "" msgstr "hier"
#: sphinx/locale/__init__.py:15 #: sphinx/locale/__init__.py:15
msgid "Attention" msgid "Attention"
@ -285,7 +297,7 @@ msgstr "Notitie"
#: sphinx/locale/__init__.py:22 #: sphinx/locale/__init__.py:22
msgid "See Also" msgid "See Also"
msgstr "Zie Ook" msgstr "Zie ook"
#: sphinx/locale/__init__.py:23 #: sphinx/locale/__init__.py:23
msgid "Tip" msgid "Tip"
@ -348,7 +360,7 @@ msgstr "Indices en tabellen:"
#: sphinx/themes/basic/defindex.html:14 #: sphinx/themes/basic/defindex.html:14
msgid "Complete Table of Contents" msgid "Complete Table of Contents"
msgstr "Volledige inhoudstafel" msgstr "Volledige inhoudsopgave"
#: sphinx/themes/basic/defindex.html:15 #: sphinx/themes/basic/defindex.html:15
msgid "lists all sections and subsections" msgid "lists all sections and subsections"
@ -392,7 +404,7 @@ msgstr "Navigatie"
#: sphinx/themes/basic/layout.html:42 #: sphinx/themes/basic/layout.html:42
msgid "Table Of Contents" msgid "Table Of Contents"
msgstr "Inhoudstafel" msgstr "Inhoudsopgave"
#: sphinx/themes/basic/layout.html:48 #: sphinx/themes/basic/layout.html:48
msgid "Previous topic" msgid "Previous topic"
@ -412,7 +424,7 @@ msgstr "volgend hoofdstuk"
#: sphinx/themes/basic/layout.html:60 #: sphinx/themes/basic/layout.html:60
msgid "This Page" msgid "This Page"
msgstr "Deze Pagina" msgstr "Deze pagina"
#: sphinx/themes/basic/layout.html:63 #: sphinx/themes/basic/layout.html:63
msgid "Show Source" msgid "Show Source"
@ -424,12 +436,11 @@ msgstr "Snel zoeken"
#: sphinx/themes/basic/layout.html:76 #: sphinx/themes/basic/layout.html:76
msgid "Go" msgid "Go"
msgstr "Go" msgstr "Ga"
#: sphinx/themes/basic/layout.html:81 #: sphinx/themes/basic/layout.html:81
#, fuzzy
msgid "Enter search terms or a module, class or function name." msgid "Enter search terms or a module, class or function name."
msgstr "Geef de naam van een module, klasse of functie." msgstr "Geef zoekterm of de naam van een module, klasse of functie."
#: sphinx/themes/basic/layout.html:122 #: sphinx/themes/basic/layout.html:122
#, python-format #, python-format
@ -440,7 +451,8 @@ msgstr "Zoeken in %(docstitle)s"
msgid "About these documents" msgid "About these documents"
msgstr "Over deze documenten" msgstr "Over deze documenten"
#: sphinx/themes/basic/layout.html:137 sphinx/themes/basic/search.html:2 #: sphinx/themes/basic/layout.html:137
#: sphinx/themes/basic/search.html:2
#: sphinx/themes/basic/search.html:5 #: sphinx/themes/basic/search.html:5
msgid "Search" msgid "Search"
msgstr "Zoeken" msgstr "Zoeken"
@ -466,12 +478,8 @@ msgstr "Laatste aanpassing op %(last_updated)s."
#: sphinx/themes/basic/layout.html:196 #: sphinx/themes/basic/layout.html:196
#, python-format #, python-format
msgid "" msgid "Created using <a href=\"http://sphinx.pocoo.org/\">Sphinx</a> %(sphinx_version)s."
"Created using <a href=\"http://sphinx.pocoo.org/\">Sphinx</a> " msgstr "Aangemaakt met <a href=\"http://sphinx.pocoo.org/\">Sphinx</a> %(sphinx_version)s."
"%(sphinx_version)s."
msgstr ""
"Aangemaakt met <a href=\"http://sphinx.pocoo.org/\">Sphinx</a> "
"%(sphinx_version)s."
#: sphinx/themes/basic/modindex.html:36 #: sphinx/themes/basic/modindex.html:36
msgid "Deprecated" msgid "Deprecated"
@ -486,10 +494,9 @@ msgstr "Zoeken %(docstitle)s"
msgid "" msgid ""
"Please activate JavaScript to enable the search\n" "Please activate JavaScript to enable the search\n"
" functionality." " functionality."
msgstr "" msgstr "Activeer JavaSscript om de zoekfunctionaliteit in te schakelen."
#: sphinx/themes/basic/search.html:14 #: sphinx/themes/basic/search.html:14
#, fuzzy
msgid "" msgid ""
"From here you can search these documents. Enter your search\n" "From here you can search these documents. Enter your search\n"
" words into the box below and click \"search\". Note that the search\n" " words into the box below and click \"search\". Note that the search\n"
@ -497,10 +504,8 @@ msgid ""
" containing fewer words won't appear in the result list." " containing fewer words won't appear in the result list."
msgstr "" msgstr ""
"Hier kan u de documenten doorzoeken. Geef enkele trefwoorden\n" "Hier kan u de documenten doorzoeken. Geef enkele trefwoorden\n"
" in het veld hieronder en klik \"zoeken\". Merk op dat de zoekfunctie" " in het veld hieronder en klik \"zoeken\". Merk op dat de zoekfunctie\n"
"\n" " steeds naar alle woorden zoekt. Pagina's die minder woorden bevatten\n"
" steeds naar alle woorden zoekt. Pagina's die minder woorden bevatten"
"\n"
" zullen niet tussen de resultaten verschijnen." " zullen niet tussen de resultaten verschijnen."
#: sphinx/themes/basic/search.html:21 #: sphinx/themes/basic/search.html:21
@ -544,12 +549,14 @@ msgstr "Veranderingen in de C-API"
msgid "Other changes" msgid "Other changes"
msgstr "Andere veranderingen" msgstr "Andere veranderingen"
#: sphinx/themes/basic/static/doctools.js:139 sphinx/writers/html.py:473 #: sphinx/themes/basic/static/doctools.js:139
#: sphinx/writers/html.py:473
#: sphinx/writers/html.py:478 #: sphinx/writers/html.py:478
msgid "Permalink to this headline" msgid "Permalink to this headline"
msgstr "Permanente link naar deze titel" msgstr "Permanente link naar deze titel"
#: sphinx/themes/basic/static/doctools.js:145 sphinx/writers/html.py:80 #: sphinx/themes/basic/static/doctools.js:145
#: sphinx/writers/html.py:80
msgid "Permalink to this definition" msgid "Permalink to this definition"
msgstr "Permanente link naar deze definitie" msgstr "Permanente link naar deze definitie"
@ -563,24 +570,19 @@ msgstr "Zoeken"
#: sphinx/themes/basic/static/searchtools.js:279 #: sphinx/themes/basic/static/searchtools.js:279
msgid "Preparing search..." msgid "Preparing search..."
msgstr "Het zoeken wordt voorbereid" msgstr "Het zoeken wordt voorbereid..."
#: sphinx/themes/basic/static/searchtools.js:347 #: sphinx/themes/basic/static/searchtools.js:347
#, fuzzy
msgid "module, in " msgid "module, in "
msgstr "module" msgstr "module, in"
#: sphinx/themes/basic/static/searchtools.js:356 #: sphinx/themes/basic/static/searchtools.js:356
msgid ", in " msgid ", in "
msgstr "" msgstr ", in "
#: sphinx/themes/basic/static/searchtools.js:464 #: sphinx/themes/basic/static/searchtools.js:464
msgid "" msgid "Your search did not match any documents. Please make sure that all words are spelled correctly and that you've selected enough categories."
"Your search did not match any documents. Please make sure that all words " msgstr "Uw zoekopdracht leverde geen resultaten op. Controleer of alle woorden correct gespeld zijn en dat u genoeg categoriën hebt geselecteerd."
"are spelled correctly and that you've selected enough categories."
msgstr ""
"Uw zoekopdracht leverde geen resultaten op. Controleer of alle "
"woordencorrect gespeld zijn en dat u genoeg categoriën hebt geselecteerd."
#: sphinx/themes/basic/static/searchtools.js:466 #: sphinx/themes/basic/static/searchtools.js:466
#, python-format #, python-format
@ -593,16 +595,15 @@ msgstr "Release"
#: sphinx/writers/latex.py:578 #: sphinx/writers/latex.py:578
msgid "Footnotes" msgid "Footnotes"
msgstr "" msgstr "Voetnoten"
#: sphinx/writers/latex.py:646 #: sphinx/writers/latex.py:646
msgid "continued from previous page" msgid "continued from previous page"
msgstr "" msgstr "Vervolgd van vorige pagina"
#: sphinx/writers/latex.py:651 #: sphinx/writers/latex.py:651
#, fuzzy
msgid "Continued on next page" msgid "Continued on next page"
msgstr "Volledige index op een pagina" msgstr "Vervolgd op volgende pagina"
#: sphinx/writers/text.py:166 #: sphinx/writers/text.py:166
#, python-format #, python-format

2
sphinx/themes/basic/layout.html
View File

@ -93,7 +93,7 @@
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset={{ encoding }}" /> <meta http-equiv="Content-Type" content="text/html; charset={{ encoding }}" />
{{ metatags }} {{ metatags }}
{%- if not embedded %} {%- if not embedded and docstitle %}
{%- set titlesuffix = " &mdash; "|safe + docstitle|e %} {%- set titlesuffix = " &mdash; "|safe + docstitle|e %}
{%- else %} {%- else %}
{%- set titlesuffix = "" %} {%- set titlesuffix = "" %}

6
sphinx/util/__init__.py
View File

@ -14,6 +14,7 @@ import re
import sys import sys
import stat import stat
import time import time
import errno
import types import types
import shutil import shutil
import fnmatch import fnmatch
@ -68,7 +69,8 @@ def ensuredir(path):
try: try:
os.makedirs(path) os.makedirs(path)
except OSError, err: except OSError, err:
if not err.errno == 17: # 0 for Jython/Win32
if err.errno not in [0, getattr(errno, 'EEXIST', 0)]:
raise raise
@ -415,7 +417,7 @@ def copyfile(source, dest):
try: try:
# don't do full copystat because the source may be read-only # don't do full copystat because the source may be read-only
copytimes(source, dest) copytimes(source, dest)
except shutil.Error: except OSError:
pass pass