Rev 5349: (vila) Cleanup some bogus rest constructs in the doc. (Vincent Ladeuil) in file:///home/pqm/archives/thelove/bzr/%2Btrunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Fri Jul 16 21:52:58 BST 2010
At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 5349 [merge]
revision-id: pqm at pqm.ubuntu.com-20100716205254-j0m65wckb90rj54w
parent: pqm at pqm.ubuntu.com-20100716140258-js1p8i24w8nodz6t
parent: v.ladeuil+lp at free.fr-20100707112205-1lcnz9tmiq54466q
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2010-07-16 21:52:54 +0100
message:
(vila) Cleanup some bogus rest constructs in the doc. (Vincent Ladeuil)
modified:
bzrlib/doc_generate/sphinx_conf.py sphinx_conf.py-20090908163544-ajoym05j0fmvn3sh-1
bzrlib/help_topics/en/conflict-types.txt conflicts.txt-20070723221841-ns3jvwxdb4okn6fk-1
doc/en/mini-tutorial/index.txt index.txt-20070813141352-2u64ooqzo0or4hss-2
=== modified file 'bzrlib/doc_generate/sphinx_conf.py'
--- a/bzrlib/doc_generate/sphinx_conf.py 2009-09-08 16:37:05 +0000
+++ b/bzrlib/doc_generate/sphinx_conf.py 2010-07-07 10:27:54 +0000
@@ -34,7 +34,7 @@
# General information about the project.
project = u'Bazaar'
-copyright = u'2009, 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 'bzrlib/help_topics/en/conflict-types.txt'
--- a/bzrlib/help_topics/en/conflict-types.txt 2010-02-04 13:29:34 +0000
+++ b/bzrlib/help_topics/en/conflict-types.txt 2010-04-28 13:15:14 +0000
@@ -28,11 +28,11 @@
Whatever the conflict is, resolving it is roughly done in two steps::
-- modify the working tree content so that the conflicted item is now in the
- state you want to keep,
+ - modify the working tree content so that the conflicted item is now in the
+ state you want to keep,
-- inform Bazaar that the conflict is now solved and ask to cleanup any
- remaining generated information (``bzr resolve <item>``).
+ - inform Bazaar that the conflict is now solved and ask to cleanup any
+ remaining generated information (``bzr resolve <item>``).
For most conflict types, there are some obvious ways to modify the working
tree and put it into the desired state. For some types of conflicts, Bazaar
@@ -126,9 +126,9 @@
``bzr resolve`` recognizes the following actions:
-- ``--action=take-this`` will issue ``bzr mv FILE.THIS FILE``,
-- ``--action=take-other`` will issue ``bzr mv FILE.OTHER FILE``,
-- ``--action=done`` will just mark the conflict as resolved.
+ - ``--action=take-this`` will issue ``bzr mv FILE.THIS FILE``,
+ - ``--action=take-other`` will issue ``bzr mv FILE.OTHER FILE``,
+ - ``--action=done`` will just mark the conflict as resolved.
Any action will also delete the previously generated ``.BASE``, ``.THIS`` and
``.OTHER`` files if they are still present in the working tree.
@@ -174,9 +174,9 @@
``bzr resolve`` recognizes the following actions::
-- ``--action=take-this`` will issue ``bzr rm FILE ; bzr mv FILE.moved FILE``,
-- ``--action=take-other`` will issue ``bzr rm FILE.moved``,
-- ``--action=done`` will just mark the conflict as resolved.
+ - ``--action=take-this`` will issue ``bzr rm FILE ; bzr mv FILE.moved FILE``,
+ - ``--action=take-other`` will issue ``bzr rm FILE.moved``,
+ - ``--action=done`` will just mark the conflict as resolved.
Note that you must get rid of FILE.moved before using ``--action=done``.
@@ -215,10 +215,11 @@
``bzr resolve`` recognizes the following actions::
-- ``--action=take-this`` will issue ``bzr rm directory`` including the children,
-- ``--action=take-other`` will acknowledge Bazaar choice to keep the children
- and restoring the directory,
-- ``--action=done`` will just mark the conflict as resolved.
+ - ``--action=take-this`` will issue ``bzr rm directory`` including the
+ children,
+ - ``--action=take-other`` will acknowledge Bazaar choice to keep the children
+ and restoring the directory,
+ - ``--action=done`` will just mark the conflict as resolved.
Bazaar cannot auto-detect when conflicts of this kind have been resolved.
@@ -238,10 +239,10 @@
``bzr resolve`` recognizes the following actions::
-- ``--action=take-this`` will acknowledge Bazaar choice to keep the directory,
-- ``--action=take-other`` will issue ``bzr rm directory`` including the
- children,
-- ``--action=done`` will just mark the conflict as resolved.
+ - ``--action=take-this`` will acknowledge Bazaar choice to keep the directory,
+ - ``--action=take-other`` will issue ``bzr rm directory`` including the
+ children,
+ - ``--action=done`` will just mark the conflict as resolved.
Bazaar cannot auto-detect when conflicts of this kind have been resolved.
@@ -260,10 +261,10 @@
``bzr resolve`` recognizes the following actions::
-- ``--action=take-this`` will revert Bazaar choice and keep ``PATH1`` by
- issuing ``bzr mv PATH2 PATH1``,
-- ``--action=take-other`` will acknowledge Bazaar choice of keeping ``PATH2``,
-- ``--action=done`` will just mark the conflict as resolved.
+ - ``--action=take-this`` will revert Bazaar choice and keep ``PATH1`` by
+ issuing ``bzr mv PATH2 PATH1``,
+ - ``--action=take-other`` will acknowledge Bazaar choice of keeping ``PATH2``,
+ - ``--action=done`` will just mark the conflict as resolved.
Bazaar cannot auto-detect when conflicts of this kind have been resolved.
@@ -295,11 +296,11 @@
``bzr resolve`` recognizes the following actions::
-- ``--action=take-this`` will acknowledge Bazaar choice of leaving ``white``
- in ``black``,
-- ``--action=take-other`` will revert Bazaar choice and move ``black`` in
- ``white`` by issuing ``bzr mv black/white white ; bzr mv black white``,
-- ``--action=done`` will just mark the conflict as resolved.
+ - ``--action=take-this`` will acknowledge Bazaar choice of leaving ``white``
+ in ``black``,
+ - ``--action=take-other`` will revert Bazaar choice and move ``black`` in
+ ``white`` by issuing ``bzr mv black/white white ; bzr mv black white``,
+ - ``--action=done`` will just mark the conflict as resolved.
Bazaar cannot auto-detect when conflicts of this kind have been resolved.
@@ -330,11 +331,11 @@
``bzr resolve`` recognizes the following actions::
-- ``--action=take-this`` will issue ``bzr rm --force foo.new`` and
- ``bzr add foo``,
-- ``--action=take-other`` will issue ``bzr rm --force foo`` and
- ``bzr mv foo.new foo``,
-- ``--action=done`` will just mark the conflict as resolved.
+ - ``--action=take-this`` will issue ``bzr rm --force foo.new`` and
+ ``bzr add foo``,
+ - ``--action=take-other`` will issue ``bzr rm --force foo`` and
+ ``bzr mv foo.new foo``,
+ - ``--action=done`` will just mark the conflict as resolved.
Bazaar cannot auto-detect when conflicts of this kind have been resolved.
=== modified file 'doc/en/mini-tutorial/index.txt'
--- a/doc/en/mini-tutorial/index.txt 2009-12-03 00:44:16 +0000
+++ b/doc/en/mini-tutorial/index.txt 2010-07-05 12:50:01 +0000
@@ -64,7 +64,7 @@
$ mkdir subdirectory
$ touch test1.txt test2.txt test3.txt subdirectory/test4.txt
-**Note for Windows users:** use Windows Explorer to create your
+**Note for Windows users**: use Windows Explorer to create your
directories, then right-click in those directories and select
``New file`` to create your files.
@@ -164,7 +164,7 @@
$ bzr branch http://www.example.com/myproject
-**Note:** to use sftp, you may need to install ``paramiko`` and
+**Note**: to use sftp, you may need to install ``paramiko`` and
``pyCrypto``. See http://bazaar-vcs.org/InstallationFaq for details.
@@ -186,7 +186,7 @@
.. [#] Use of the ``lp:`` URL scheme requires bzr 0.92 or later.
-**Note:** ``+junk`` means that this branch isn't associated with any particular
+**Note**: ``+junk`` means that this branch isn't associated with any particular
project in Launchpad.
Now, anyone can create their own copy of your branch by typing::
More information about the bazaar-commits
mailing list