[Python-modules-commits] r20234 - in packages/sphinx/branches/1.1/debian (3 files)
jwilk at users.alioth.debian.org
jwilk at users.alioth.debian.org
Wed Feb 1 11:58:49 UTC 2012
Date: Wednesday, February 1, 2012 @ 11:58:47
Author: jwilk
Revision: 20234
Revert all the changes to manual pages that accumulated over the years.
Modified:
packages/sphinx/branches/1.1/debian/changelog
packages/sphinx/branches/1.1/debian/patches/series
Deleted:
packages/sphinx/branches/1.1/debian/patches/merge_debian_manpages.diff
Modified: packages/sphinx/branches/1.1/debian/changelog
===================================================================
--- packages/sphinx/branches/1.1/debian/changelog 2012-01-31 23:44:17 UTC (rev 20233)
+++ packages/sphinx/branches/1.1/debian/changelog 2012-02-01 11:58:47 UTC (rev 20234)
@@ -9,8 +9,9 @@
script is being ignored than when it's a fatal error.
* Make the get-orig-source script create temporary files in /tmp (or
$TMPDIR).
+ * Revert all the changes to manual pages that accumulated over the years.
- -- Jakub Wilk <jwilk at debian.org> Sat, 26 Nov 2011 15:24:48 +0100
+ -- Jakub Wilk <jwilk at debian.org> Wed, 01 Feb 2012 12:57:53 +0100
sphinx (1.1.2+dfsg-1) experimental; urgency=low
Deleted: packages/sphinx/branches/1.1/debian/patches/merge_debian_manpages.diff
===================================================================
--- packages/sphinx/branches/1.1/debian/patches/merge_debian_manpages.diff 2012-01-31 23:44:17 UTC (rev 20233)
+++ packages/sphinx/branches/1.1/debian/patches/merge_debian_manpages.diff 2012-02-01 11:58:47 UTC (rev 20234)
@@ -1,167 +0,0 @@
-Description: Merge changes to Debian manpages into upstream manpages.
-Author: Jakub Wilk <jwilk at debian.org>
-Forwarded: no
-Last-Update: 2011-10-14
-
---- a/doc/man/sphinx-quickstart.rst
-+++ b/doc/man/sphinx-quickstart.rst
-@@ -13,7 +13,7 @@
- -----------
-
- :program:`sphinx-quickstart` is an interactive tool that asks some questions
--about your project and then generates a complete documentation directory and
-+about your project and then generates a template documentation directory and
- sample Makefile to be used with :manpage:`sphinx-build(1)`.
-
-
---- a/doc/man/sphinx-build.rst
-+++ b/doc/man/sphinx-build.rst
-@@ -13,83 +13,105 @@
- -----------
-
- :program:`sphinx-build` generates documentation from the files in
--``<sourcedir>`` and places it in the ``<outdir>``.
-+:file:`<sourcedir>` and places it to the :file:`<outdir>`.
-
--:program:`sphinx-build` looks for ``<sourcedir>/conf.py`` for the configuration
-+:program:`sphinx-build` reads :file:`<sourcedir>/conf.py` for the configuration
- settings. :manpage:`sphinx-quickstart(1)` may be used to generate template
--files, including ``conf.py``.
-+files, including :file:`conf.py`.
-
--:program:`sphinx-build` can create documentation in different formats. A format
--is selected by specifying the builder name on the command line; it defaults to
--HTML. Builders can also perform other tasks related to documentation
--processing.
-+:program:`sphinx-build` can create documentation in different formats. The
-+output format is selected by specifying the builder name on the command line;
-+it defaults to HTML. Builders can also perform other tasks related to
-+documentation processing.
-
- By default, everything that is outdated is built. Output only for selected
- files can be built by specifying individual filenames.
-
-+.. XXX ^^^ The Debian manpage didn't have this paragraph. It probably
-+.. needs rephrasing.
-+
- List of available builders:
-
- html
-- HTML file generation. This is the default builder.
-+ Build HTML pages. This is the default builder.
-
--htmlhelp
-- Generates files for CHM (compiled help files) generation.
-+singlehtml
-+ Build a single HTML with the whole content.
-
--qthelp
-- Generates files for Qt help collection generation.
-+dirhtml
-+ Build HTML pages, but with a single directory per document.
-
--devhelp
-- Generates files for the GNOME Devhelp help viewer.
-+htmlhelp, qthelp, devhelp, epub
-+ Build HTML pages with additional information for building a documentation
-+ collection in one of these formats.
-
- latex
-- Generates LaTeX output that can be compiled to a PDF document.
-+ Build LaTeX sources that can be compiled to a PDF document using
-+ :program:`pdflatex`. This builder uses the :envvar:`PAPER` environment
-+ variable (e.g. :samp:`PAPER=a4` or :samp:`PAPER=letter`) if available.
-
- man
-- Generates manual pages.
-+ Build manual pages in groff format for UNIX systems.
-
- texinfo
-- Generates Texinfo output that can be processed by :program:`makeinfo` to
-+ Build Texinfo output that can be processed by :program:`makeinfo` to
- generate an Info document.
-
- text
-- Generates a plain-text version of the documentation.
-+ Build plain text files.
-
- changes
-- Generates HTML files listing changed/added/deprecated items for
-- the current version of the documented project.
-+ Generate HTML files listing changed/added/deprecated items for the current
-+ version of the documented project.
-
- linkcheck
-- Checks the integrity of all external links in the source.
-+ Check the integrity of all external links in the source.
-
--pickle / json
-- Generates serialized HTML files for use in web applications.
-+pickle, json
-+ Produce a directory with pickle/JSON files containing mostly HTML fragments
-+ and TOC information, for use of a web application (or a custom
-+ postprocessing tool) that doesn't use the standard HTML templates.
-
-
- Options
- -------
-
---b <builder> Builder to use; defaults to html. See the full list
-- of builders above.
---a Generate output for all files; without this option only
-- output for new and changed files is generated.
---E Ignore cached files, forces to re-read all source files
-- from disk.
---c <path> Locate the conf.py file in the specified path instead of
-- <sourcedir>.
---C Specify that no conf.py file at all is to be used.
-- Configuration can only be set with the -D option.
---D <setting=value> Override a setting from the configuration file.
---d <path> Path to cached files; defaults to <outdir>/.doctrees.
---A <name=value> Pass a value into the HTML templates (only for HTML builders).
-+-b <builder> Select a builder. The default is ``html``. See the full
-+ list of builders above.
-+-a Write all output files. (The default is to only write
-+ output files for new and changed source files.)
-+-E Don't use a saved environment (the structure caching all
-+ cross-references), but rebuild completely. (The default
-+ is to only read and parse source files that are new or
-+ have changed since the last run.)
-+-t <tag> Define the `tag`. This is relevant for :rst:dir:`only`
-+ directives that only include their content if this tag is
-+ set.
-+-c <path> Don't look for the :file:`conf.py` in the
-+ :file:`<sourcedir>`, but use the given configuration
-+ directory instead. Various other files and paths given by
-+ configuration values are expected to be relative to the
-+ configuration directory, so they will have to be present
-+ at this location too.
-+-C Don't look for a configuration file; only take options
-+ via the -D option.
-+-D <setting=value> Override a configuration value set in the configuation file.
-+-d <path> Select cache directory. The default is
-+ :file:`<outdir>/.doctrees/`.
-+-A <name=value> Make the `name` assigned to `value` in the HTML templates
-+ (only for HTML builders).
- -n Run in nit-picky mode, warn about all missing references.
---N Prevent colored output.
---q Quiet operation, just print warnings and errors on stderr.
---Q Very quiet operation, don't print anything except for errors.
---w <file> Write warnings and errors into the given file, in addition
-- to stderr.
-+-N Do not emit colored output.
-+-q Do not output anything on standard output, only write
-+ warnings and errors to standard error.
-+-Q Do not output anything on standard output, also suppress
-+ warnings. Only errors are written to standard error.
-+-w <file> Turn warnings into errors. This means that the build
-+ stops at the first warning and :program:`sphinx-build`
-+ exits with exit status 1.
- -W Turn warnings into errors.
---P Run Pdb on exception.
--
-+-P Run the Python debugger, :manpage:`pdb(1)`, if an
-+ unhandled exception occurs while building.
-
- See also
- --------
Modified: packages/sphinx/branches/1.1/debian/patches/series
===================================================================
--- packages/sphinx/branches/1.1/debian/patches/series 2012-01-31 23:44:17 UTC (rev 20233)
+++ packages/sphinx/branches/1.1/debian/patches/series 2012-02-01 11:58:47 UTC (rev 20234)
@@ -1,5 +1,4 @@
disable_distribute_setup.diff
unversioned_grammar_pickle.diff
show_more_stack_frames.diff
-merge_debian_manpages.diff
sphinxcontrib_namespace.diff
More information about the Python-modules-commits
mailing list