summaryrefslogtreecommitdiff
path: root/Doc
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2011-05-15 17:51:24 +0200
committerGeorg Brandl <georg@python.org>2011-05-15 17:51:24 +0200
commit4e6b4b3f823f27a4aaa91ac688c2922c3391cfd0 (patch)
tree0f0530c8d0d9cef5e0a871fb2b8d53e1c0ebeb29 /Doc
parent451a97145a654e342d1e9af48aead4e35e03059c (diff)
downloadcpython-4e6b4b3f823f27a4aaa91ac688c2922c3391cfd0.tar.gz
Update pydoc topics and handle suspicious markup.
Diffstat (limited to 'Doc')
-rw-r--r--Doc/c-api/veryhigh.rst20
-rw-r--r--Doc/tools/sphinxext/susp-ignored.csv11
2 files changed, 20 insertions, 11 deletions
diff --git a/Doc/c-api/veryhigh.rst b/Doc/c-api/veryhigh.rst
index 8bece6d034..41cdd6b0a4 100644
--- a/Doc/c-api/veryhigh.rst
+++ b/Doc/c-api/veryhigh.rst
@@ -27,17 +27,15 @@ the same library that the Python runtime is using.
.. c:function:: int Py_Main(int argc, wchar_t **argv)
- The main program for the standard interpreter. This is made
- available for programs which embed Python. The *argc* and *argv*
- parameters should be prepared exactly as those which are passed to
- a C program's :c:func:`main` function (converted to wchar_t
- according to the user's locale). It is important to note that the
- argument list may be modified (but the contents of the strings
- pointed to by the argument list are not). The return value will be
- ```0``` if the interpreter exits normally (ie, without an
- exception), ``1`` if the interpreter exits due to an exception, or
- ``2`` if the parameter list does not represent a valid Python
- command line.
+ The main program for the standard interpreter. This is made available for
+ programs which embed Python. The *argc* and *argv* parameters should be
+ prepared exactly as those which are passed to a C program's :c:func:`main`
+ function (converted to wchar_t according to the user's locale). It is
+ important to note that the argument list may be modified (but the contents of
+ the strings pointed to by the argument list are not). The return value will
+ be ``0`` if the interpreter exits normally (i.e., without an exception),
+ ``1`` if the interpreter exits due to an exception, or ``2`` if the parameter
+ list does not represent a valid Python command line.
Note that if an otherwise unhandled :exc:`SystemExit` is raised, this
function will not return ``1``, but exit the process, as long as
diff --git a/Doc/tools/sphinxext/susp-ignored.csv b/Doc/tools/sphinxext/susp-ignored.csv
index c8260f43e0..65aac4d3a9 100644
--- a/Doc/tools/sphinxext/susp-ignored.csv
+++ b/Doc/tools/sphinxext/susp-ignored.csv
@@ -391,3 +391,14 @@ documenting/markup,864,`,": [""else"" "":"" `suite`]"
documenting/markup,864,`,": [""finally"" "":"" `suite`]"
documenting/markup,864,`,"try2_stmt: ""try"" "":"" `suite`"
documenting/markup,864,`,": ""finally"" "":"" `suite`"
+library/pprint,209,::,"'classifiers': ['Development Status :: 4 - Beta',"
+library/pprint,209,::,"'Intended Audience :: Developers',"
+library/pprint,209,::,"'License :: OSI Approved :: MIT License',"
+library/pprint,209,::,"'Natural Language :: English',"
+library/pprint,209,::,"'Operating System :: OS Independent',"
+library/pprint,209,::,"'Programming Language :: Python',"
+library/pprint,209,::,"'Programming Language :: Python :: 2',"
+library/pprint,209,::,"'Programming Language :: Python :: 2.6',"
+library/pprint,209,::,"'Programming Language :: Python :: 2.7',"
+library/pprint,209,::,"'Topic :: Software Development :: Libraries',"
+library/pprint,209,::,"'Topic :: Software Development :: Libraries :: Python Modules'],"