Rev 5869: (mbp) add licence to documentation files (Jonathan Riddell) in file:///home/pqm/archives/thelove/bzr/%2Btrunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Mon May 16 16:41:04 UTC 2011
At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 5869 [merge]
revision-id: pqm at pqm.ubuntu.com-20110516164050-frzpzaz8l2v33b6k
parent: pqm at pqm.ubuntu.com-20110516153522-iogtcwn5jgh15vzj
parent: jriddell at canonical.com-20110516112737-gep642p24rtzp3jt
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2011-05-16 16:40:50 +0000
message:
(mbp) add licence to documentation files (Jonathan Riddell)
added:
doc/en/admin-guide/licence.txt licence.txt-20110516100505-rzct1ax5ylsfzmc3-1
doc/en/tutorials/licence.txt licence.txt-20110516101124-4itjp3eq2gy59hhb-1
doc/en/upgrade-guide/licence.txt licence.txt-20110516101216-tbovp3i2pcj1mfus-1
doc/en/user-guide/licence.txt licence.txt-20110516112604-bjygaxb5kvavfm7b-1
modified:
bzrlib/doc_generate/conf.py sphinx_conf.py-20090908163544-ajoym05j0fmvn3sh-1
doc/developers/index.txt index.txt-20070508041241-qznziunkg0nffhiw-1
doc/en/admin-guide/index-plain.txt indexplain.txt-20091207173249-l6b7b8lzol70mol0-1
doc/en/admin-guide/index.txt index.txt-20080305140741-ecw0lap8dxkxc05g-1
doc/en/mini-tutorial/index.txt index.txt-20070813141352-2u64ooqzo0or4hss-2
doc/en/tutorials/index.txt index.txt-20090722133816-63ik5s6s5gsnz7zy-10
doc/en/upgrade-guide/index.txt index.txt-20090702082510-q2pocf7uhntljqnl-3
doc/en/user-guide/index-plain.txt indexplain.txt-20090909123806-96yfsgrqwra8cwq7-2
doc/en/user-guide/index.txt indexfor2x.txt-20090722150335-qt9yh29f930m4v0r-1
=== modified file 'bzrlib/doc_generate/conf.py'
--- a/bzrlib/doc_generate/conf.py 2010-07-07 11:32:03 +0000
+++ b/bzrlib/doc_generate/conf.py 2011-05-16 10:19:33 +0000
@@ -38,7 +38,7 @@
# General information about the project.
project = u'Bazaar'
-copyright = u'2009, 2010 Canonical Ltd'
+copyright = u'2009-2011 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/developers/index.txt'
--- a/doc/developers/index.txt 2011-04-08 14:59:29 +0000
+++ b/doc/developers/index.txt 2011-05-16 10:35:04 +0000
@@ -80,6 +80,14 @@
miscellaneous-notes
+Licence
+============
+
+Copyright 2005-2011 Canonical Ltd. Bazaar is free software, and you
+may use, modify and redistribute both Bazaar and this document under
+the terms of the GNU General Public License version 2 or later. See
+<http://www.gnu.org/licenses/>.
+
.. |--| unicode:: U+2014
..
=== modified file 'doc/en/admin-guide/index-plain.txt'
--- a/doc/en/admin-guide/index-plain.txt 2009-12-07 18:12:21 +0000
+++ b/doc/en/admin-guide/index-plain.txt 2011-05-16 10:05:25 +0000
@@ -21,3 +21,4 @@
.. include:: backup.txt
.. include:: upgrade.txt
.. include:: advanced.txt
+.. include:: licence.txt
=== modified file 'doc/en/admin-guide/index.txt'
--- a/doc/en/admin-guide/index.txt 2009-12-07 18:12:21 +0000
+++ b/doc/en/admin-guide/index.txt 2011-05-16 10:05:25 +0000
@@ -23,3 +23,4 @@
backup
upgrade
advanced
+ licence
=== added file 'doc/en/admin-guide/licence.txt'
--- a/doc/en/admin-guide/licence.txt 1970-01-01 00:00:00 +0000
+++ b/doc/en/admin-guide/licence.txt 2011-05-16 10:05:25 +0000
@@ -0,0 +1,7 @@
+Licence
+===============
+
+Copyright 2008-2011 Canonical Ltd. Bazaar is free software, and you
+may use, modify and redistribute both Bazaar and this document under
+the terms of the GNU General Public License version 2 or later. See
+<http://www.gnu.org/licenses/>.
=== modified file 'doc/en/mini-tutorial/index.txt'
--- a/doc/en/mini-tutorial/index.txt 2011-04-06 07:00:12 +0000
+++ b/doc/en/mini-tutorial/index.txt 2011-05-16 10:22:06 +0000
@@ -252,3 +252,11 @@
To learn about the ''foo'' topic or command::
$ bzr help foo
+
+Licence
+=============
+
+Copyright 2007-2011 Canonical Ltd. Bazaar is free software, and you
+may use, modify and redistribute both Bazaar and this document under
+the terms of the GNU General Public License version 2 or later. See
+<http://www.gnu.org/licenses/>.
=== modified file 'doc/en/tutorials/index.txt'
--- a/doc/en/tutorials/index.txt 2009-07-22 13:41:01 +0000
+++ b/doc/en/tutorials/index.txt 2011-05-16 10:22:06 +0000
@@ -8,4 +8,4 @@
tutorial
using_bazaar_with_launchpad
centralized_workflow
-
+ licence
=== added file 'doc/en/tutorials/licence.txt'
--- a/doc/en/tutorials/licence.txt 1970-01-01 00:00:00 +0000
+++ b/doc/en/tutorials/licence.txt 2011-05-16 10:22:06 +0000
@@ -0,0 +1,7 @@
+Licence
+===============
+
+Copyright 2005-2011 Canonical Ltd. Bazaar is free software, and you
+may use, modify and redistribute both Bazaar and this document under
+the terms of the GNU General Public License version 2 or later. See
+<http://www.gnu.org/licenses/>.
=== modified file 'doc/en/upgrade-guide/index.txt'
--- a/doc/en/upgrade-guide/index.txt 2010-12-17 10:16:48 +0000
+++ b/doc/en/upgrade-guide/index.txt 2011-05-16 10:22:06 +0000
@@ -11,3 +11,5 @@
.. include:: overview.txt
.. include:: data_migration.txt
.. include:: tips_and_tricks.txt
+.. include:: licence.txt
+
=== added file 'doc/en/upgrade-guide/licence.txt'
--- a/doc/en/upgrade-guide/licence.txt 1970-01-01 00:00:00 +0000
+++ b/doc/en/upgrade-guide/licence.txt 2011-05-16 10:22:06 +0000
@@ -0,0 +1,7 @@
+Licence
+===============
+
+Copyright 2009-2011 Canonical Ltd. Bazaar is free software, and you
+may use, modify and redistribute both Bazaar and this document under
+the terms of the GNU General Public License version 2 or later. See
+<http://www.gnu.org/licenses/>.
=== modified file 'doc/en/user-guide/index-plain.txt'
--- a/doc/en/user-guide/index-plain.txt 2010-07-07 11:32:03 +0000
+++ b/doc/en/user-guide/index-plain.txt 2011-05-16 10:22:06 +0000
@@ -114,6 +114,7 @@
.. include:: setting_up_email.txt
.. include:: http_smart_server.txt
.. include:: writing_a_plugin.txt
+.. include:: licence.txt
.. |--| unicode:: U+2014
=== modified file 'doc/en/user-guide/index.txt'
--- a/doc/en/user-guide/index.txt 2010-07-07 11:21:19 +0000
+++ b/doc/en/user-guide/index.txt 2011-05-16 10:22:06 +0000
@@ -137,5 +137,6 @@
setting_up_email
http_smart_server
writing_a_plugin
+ licence
.. |--| unicode:: U+2014
=== added file 'doc/en/user-guide/licence.txt'
--- a/doc/en/user-guide/licence.txt 1970-01-01 00:00:00 +0000
+++ b/doc/en/user-guide/licence.txt 2011-05-16 11:27:37 +0000
@@ -0,0 +1,7 @@
+Licence
+===============
+
+Copyright 2009-2011 Canonical Ltd. Bazaar is free software, and you
+may use, modify and redistribute both Bazaar and this document under
+the terms of the GNU General Public License version 2 or later. See
+<http://www.gnu.org/licenses/>.
More information about the bazaar-commits
mailing list