Rev 3454: User Guide tweaks (Benjamin Rister) in file:///home/pqm/archives/thelove/bzr/%2Btrunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Thu May 29 01:50:08 BST 2008
At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 3454
revision-id:pqm at pqm.ubuntu.com-20080529004957-2tz3cdbcogwn39df
parent: pqm at pqm.ubuntu.com-20080527013230-8qjaju10duxpy3e2
parent: ian.clatworthy at canonical.com-20080529002509-089xnwk6uq1bs26v
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2008-05-29 01:49:57 +0100
message:
User Guide tweaks (Benjamin Rister)
modified:
doc/en/user-guide/partner_intro.txt partner_workflow.txt-20071122141511-0knao2lklsdsvb1q-4
doc/en/user-guide/releasing_a_project.txt releasing_a_project.-20071121073725-0corxykv5irjal00-5
doc/en/user-guide/svn_plugin.txt svn_plugin.txt-20080509065016-cjc90f46407vi9a0-2
doc/en/user-guide/undoing_mistakes.txt undoing_mistakes.txt-20071121092300-8fyacngt1w98e5mp-1
------------------------------------------------------------
revno: 3453.1.1
revision-id:ian.clatworthy at canonical.com-20080529002509-089xnwk6uq1bs26v
parent: pqm at pqm.ubuntu.com-20080527013230-8qjaju10duxpy3e2
parent: bdr at decimus.net-20080519124138-xo3bqhbkx3lexooi
committer: Ian Clatworthy <ian.clatworthy at canonical.com>
branch nick: ianc-integration
timestamp: Thu 2008-05-29 10:25:09 +1000
message:
User Guide tweaks (Benjamin Rister)
modified:
doc/en/user-guide/partner_intro.txt partner_workflow.txt-20071122141511-0knao2lklsdsvb1q-4
doc/en/user-guide/releasing_a_project.txt releasing_a_project.-20071121073725-0corxykv5irjal00-5
doc/en/user-guide/svn_plugin.txt svn_plugin.txt-20080509065016-cjc90f46407vi9a0-2
doc/en/user-guide/undoing_mistakes.txt undoing_mistakes.txt-20071121092300-8fyacngt1w98e5mp-1
------------------------------------------------------------
revno: 3431.4.4
revision-id:bdr at decimus.net-20080519124138-xo3bqhbkx3lexooi
parent: bdr at decimus.net-20080519001624-80caaxg8d9niawr7
committer: Benjamin Rister <bdr at decimus.net>
branch nick: doc-work
timestamp: Mon 2008-05-19 08:41:38 -0400
message:
Added missing quotes.
modified:
doc/en/user-guide/svn_plugin.txt svn_plugin.txt-20080509065016-cjc90f46407vi9a0-2
------------------------------------------------------------
revno: 3431.4.3
revision-id:bdr at decimus.net-20080519001624-80caaxg8d9niawr7
parent: bdr at decimus.net-20080519001139-uums0l71gs3wx20d
committer: Benjamin Rister <bdr at decimus.net>
branch nick: doc-work
timestamp: Sun 2008-05-18 20:16:24 -0400
message:
'Straitjacket' isn't hyphenated
modified:
doc/en/user-guide/partner_intro.txt partner_workflow.txt-20071122141511-0knao2lklsdsvb1q-4
------------------------------------------------------------
revno: 3431.4.2
revision-id:bdr at decimus.net-20080519001139-uums0l71gs3wx20d
parent: bdr at decimus.net-20080519000528-je8gvu02bpxpz2bl
committer: Benjamin Rister <bdr at decimus.net>
branch nick: doc-work
timestamp: Sun 2008-05-18 20:11:39 -0400
message:
Clarified docs on bzr remove --force
modified:
doc/en/user-guide/undoing_mistakes.txt undoing_mistakes.txt-20071121092300-8fyacngt1w98e5mp-1
------------------------------------------------------------
revno: 3431.4.1
revision-id:bdr at decimus.net-20080519000528-je8gvu02bpxpz2bl
parent: pqm at pqm.ubuntu.com-20080518104127-7dezgqfdvymf4xvu
committer: Benjamin Rister <bdr at decimus.net>
branch nick: doc-work
timestamp: Sun 2008-05-18 20:05:28 -0400
message:
Cleaned up a sentence's structure
modified:
doc/en/user-guide/releasing_a_project.txt releasing_a_project.-20071121073725-0corxykv5irjal00-5
=== modified file 'doc/en/user-guide/partner_intro.txt'
--- a/doc/en/user-guide/partner_intro.txt 2008-03-27 00:06:02 +0000
+++ b/doc/en/user-guide/partner_intro.txt 2008-05-19 00:16:24 +0000
@@ -14,7 +14,7 @@
Imagine if you were not allowed to call someone on the phone directly
and the only way to talk to them was by registering a conference call first?
Companies and communities that only share code via a central VCS
-repository are living with a similar strait-jacket to that every day.
+repository are living with a similar straitjacket to that every day.
There are times when central control makes a lot of sense and times
when peer-to-peer rocks. Either way, Bazaar is designed to help.
=== modified file 'doc/en/user-guide/releasing_a_project.txt'
--- a/doc/en/user-guide/releasing_a_project.txt 2007-11-21 07:39:16 +0000
+++ b/doc/en/user-guide/releasing_a_project.txt 2008-05-19 00:05:28 +0000
@@ -25,7 +25,7 @@
zip .zip
================= =========================
-If you wish to package a different version to the last one, use
+If you wish to package a revision other than the last one, use
the ``-r`` option. If you wish to tune the root directory inside
the archive, use the ``--root`` option. See the online help or
User Reference for further details on the options supported by
=== modified file 'doc/en/user-guide/svn_plugin.txt'
--- a/doc/en/user-guide/svn_plugin.txt 2008-05-16 21:00:25 +0000
+++ b/doc/en/user-guide/svn_plugin.txt 2008-05-19 12:41:38 +0000
@@ -92,7 +92,7 @@
To commit back to the master Subversion trunk, an additional command
(``bzr push``) is required.
-Note: You'll need to give ``pull and ``push`` the relevant URLs
+Note: You'll need to give ``pull`` and ``push`` the relevant URLs
the first time you use those commands in the trunk branch. After that,
bzr remembers them.
=== modified file 'doc/en/user-guide/undoing_mistakes.txt'
--- a/doc/en/user-guide/undoing_mistakes.txt 2008-03-27 04:57:30 +0000
+++ b/doc/en/user-guide/undoing_mistakes.txt 2008-05-19 00:11:39 +0000
@@ -29,15 +29,15 @@
This will complain about the file being modified or unknown.
If you want to keep the file, use the ``--keep`` option.
-Alternatively, if you want to remove the file, use the ``--force`` option.
+Alternatively, if you want to delete the file, use the ``--force`` option.
For example::
bzr add foo.html
(oops - didn't mean that)
bzr remove --keep foo.html
- (foo.html left on disk)
+ (foo.html left on disk, but deregistered)
-On the other hand, the ``TODO`` file is deregistered and
+On the other hand, the unchanged ``TODO`` file is deregistered and
removed from disk without complaint in this example::
bzr add TODO
More information about the bazaar-commits
mailing list