[Python-modules-commits] r18925 - in packages/sphinx/branches/1.1/debian (2 files)

[jwilk at users.alioth.debian.org]

    Date: Saturday, October 15, 2011 @ 12:50:31
  Author: jwilk
Revision: 18925

sphinx-quickstart.rst: keep "an interactive tool", "complete documentation directory" -> "template documentation directory".

Modified:
  packages/sphinx/branches/1.1/debian/changelog
  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	2011-10-15 12:46:57 UTC (rev 18924)
+++ packages/sphinx/branches/1.1/debian/changelog	2011-10-15 12:50:31 UTC (rev 18925)
@@ -30,7 +30,8 @@
     Rename some variables to make them lowercase. Don't use CURDIR where it's
     not necessary.
   * Build manual pages (except for sphinx-autogen) from upstream sources.
-    Merge changes that were made for Debian into them.
+    Merge changes that were made for Debian into them. Thanks to Stefano
+    Rivera for help.
   * Run nosetests with --verbose --no-skip.
   * Run ln with -f, so that the build target can be re-run if it's
     interrupted.

Modified: packages/sphinx/branches/1.1/debian/patches/merge_debian_manpages.diff
===================================================================
--- packages/sphinx/branches/1.1/debian/patches/merge_debian_manpages.diff	2011-10-15 12:46:57 UTC (rev 18924)
+++ packages/sphinx/branches/1.1/debian/patches/merge_debian_manpages.diff	2011-10-15 12:50:31 UTC (rev 18925)
@@ -5,20 +5,15 @@
 
 --- a/doc/man/sphinx-quickstart.rst
 +++ b/doc/man/sphinx-quickstart.rst
-@@ -12,10 +12,12 @@
- Description
+@@ -13,7 +13,7 @@
  -----------
  
--:program:`sphinx-quickstart` is an interactive tool that asks some questions
-+:program:`sphinx-quickstart` is the interactive tool that asks some questions
- about your project and then generates a complete documentation directory and
+ :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)`.
  
-+.. XXX ^^^ The Debian manpage had s/a complete/a template/.
-+
  
- See also
- --------
 --- a/doc/man/sphinx-build.rst
 +++ b/doc/man/sphinx-build.rst
 @@ -13,83 +13,105 @@