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 stable

Browse Source
This commit is contained in:
Georg Brandl 2012-05-08 12:48:33 +02:00
commit a0a7f37ab2
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
doc/ext/autodoc.rst
View File

@ -194,12 +194,13 @@ inserting them into the page source under a suitable :rst:dir:`py:module`,
automethod automethod
autoattribute autoattribute
These work exactly like :rst:dir:`autoclass` etc., but do not offer the options These work exactly like :rst:dir:`autoclass` etc., but do not offer the
used for automatic member documentation. options used for automatic member documentation.
For module data members and class attributes, documentation can either be put For module data members and class attributes, documentation can either be put
into a special-formatted comment, or in a docstring *after* the definition. into a comment with special formatting (using a ``#:`` to start the comment
Comments need to be either on a line of their own *before* the definition, or instead of just ``#``), or in a docstring *after* the definition. Comments
need to be either on a line of their own *before* the definition, or
immediately after the assignment *on the same line*. The latter form is immediately after the assignment *on the same line*. The latter form is
restricted to one line only. restricted to one line only.

3
sphinx/builders/html.py
View File

@ -610,7 +610,8 @@ class StandaloneHTMLBuilder(Builder):
""" """
Builder.post_process_images(self, doctree) Builder.post_process_images(self, doctree)
for node in doctree.traverse(nodes.image): for node in doctree.traverse(nodes.image):
if not node.has_key('scale') or \ scale_keys = ('scale', 'width', 'height')
if not any((key in node) for key in scale_keys) or \
isinstance(node.parent, nodes.reference): isinstance(node.parent, nodes.reference):
# docutils does unfortunately not preserve the # docutils does unfortunately not preserve the
# ``target`` attribute on images, so we need to check # ``target`` attribute on images, so we need to check

6
sphinx/locale/ne/LC_MESSAGES/sphinx.po
View File

@ -600,7 +600,7 @@ msgstr "नेभिगेसन "
#: sphinx/themes/basic/layout.html:122 #: sphinx/themes/basic/layout.html:122
#, python-format #, python-format
msgid "Search within %(docstitle)s" msgid "Search within %(docstitle)s"
msgstr "भित्र-भित्रै खोज्नुहोस्" msgstr ""
#: sphinx/themes/basic/layout.html:131 #: sphinx/themes/basic/layout.html:131
msgid "About these documents" msgid "About these documents"
@ -630,12 +630,12 @@ msgstr "यो भन्दा अगाडी %(last_updated)s मा अपड
msgid "" msgid ""
"Created using <a href=\"http://sphinx.pocoo.org/\">Sphinx</a> " "Created using <a href=\"http://sphinx.pocoo.org/\">Sphinx</a> "
"%(sphinx_version)s." "%(sphinx_version)s."
msgstr "<a href=\"http://sphinx.pocoo.org/\">Sphinx</a> प्रयोग गरेर बनाइएको" msgstr ""
#: sphinx/themes/basic/opensearch.xml:4 #: sphinx/themes/basic/opensearch.xml:4
#, python-format #, python-format
msgid "Search %(docstitle)s" msgid "Search %(docstitle)s"
msgstr "खोज्नुहोस्" msgstr ""
#: sphinx/themes/basic/relations.html:11 #: sphinx/themes/basic/relations.html:11
msgid "Previous topic" msgid "Previous topic"