Rev 5221: Merge unify-confs into texinfo in file:///home/vila/src/bzr/bugs/219334-texinfo/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/bugs/219334-texinfo/

------------------------------------------------------------
revno: 5221 [merge]
revision-id: v.ladeuil+lp at free.fr-20100707113203-hhdq1cp04un2r1d6
parent: v.ladeuil+lp at free.fr-20100706132232-d9byjdy2i882asgr
parent: v.ladeuil+lp at free.fr-20100707113203-rfntdjtesu83f9v6
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: texinfo
timestamp: Wed 2010-07-07 13:32:03 +0200
message:
  Merge unify-confs into texinfo
modified:
  bzrlib/doc_generate/conf.py    sphinx_conf.py-20090908163544-ajoym05j0fmvn3sh-1
  doc/en/user-guide/index-plain.txt indexplain.txt-20090909123806-96yfsgrqwra8cwq7-2
-------------- next part --------------
=== modified file 'bzrlib/doc_generate/conf.py'
--- a/bzrlib/doc_generate/conf.py	2010-07-05 15:50:19 +0000
+++ b/bzrlib/doc_generate/conf.py	2010-07-07 11:32:03 +0000
@@ -38,7 +38,7 @@
 
 # General information about the project.
 project = u'Bazaar'
-copyright = u'2009, 2010, Canonical Ltd'
+copyright = u'2009, 2010 Canonical Ltd'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the

=== modified file 'doc/en/user-guide/index-plain.txt'
--- a/doc/en/user-guide/index-plain.txt	2010-07-05 15:50:19 +0000
+++ b/doc/en/user-guide/index-plain.txt	2010-07-07 11:32:03 +0000
@@ -115,3 +115,5 @@
 .. include:: http_smart_server.txt
 .. include:: writing_a_plugin.txt
 
+.. |--| unicode:: U+2014
+