[MERGE] User manual patch

[Alexandre Jasmin]

> K, seems good to me.
> 
> Care to submit it as an attachment with [MERGE] in the subject so that
> Bundle Buggy will track it?
> 

Here you go.



# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: alexandre.jasmin at gmail.com-20090709045016-\
#   to1kprhtuw282mr4
# target_branch: file:///home/alex/bzr/dev/
# testament_sha1: 4facfcf501fb2b920963502dd7dbb1897f46e240
# timestamp: 2009-07-09 02:20:53 -0400
# base_revision_id: pqm at pqm.ubuntu.com-20090709014400-y2e7prh8mejs2j26
# 
# Begin patch
=== modified file 'doc/en/user-guide/publishing_a_branch.txt'
--- doc/en/user-guide/publishing_a_branch.txt	2009-02-26 11:28:50 +0000
+++ doc/en/user-guide/publishing_a_branch.txt	2009-07-09 04:50:16 +0000
@@ -54,8 +54,6 @@
   cp -ar ~/PROJECT .     (copy files in using OS-specific tools)
   bzr add                (populate repository; start version control)
   bzr commit -m "Initial import"
-                         (publish to central repository)
-  bzr push sftp://centralhost/srv/bzr/project/trunk
 
 Note that committing inside a working tree created using
 the ``checkout`` command implicitly commits the content to

=== modified file 'doc/en/user-guide/shared_repository_layouts.txt'
--- doc/en/user-guide/shared_repository_layouts.txt	2009-02-26 11:28:50 +0000
+++ doc/en/user-guide/shared_repository_layouts.txt	2009-07-09 03:36:09 +0000
@@ -299,7 +299,7 @@
 Simple developer naming (``project/joe/foo``, ``project/barry/bar``)
 --------------------------------------------------------------------
 
-Another possibly layout is to give each developer a directory, and then
+Another possible layout is to give each developer a directory, and then
 have a single sub-directory for branches. Something like::
 
   project/      # Overall repository

=== modified file 'doc/en/user-guide/specifying_revisions.txt'
--- doc/en/user-guide/specifying_revisions.txt	2009-04-04 02:57:47 +0000
+++ doc/en/user-guide/specifying_revisions.txt	2009-07-09 03:36:09 +0000
@@ -80,7 +80,7 @@
 revid
 ~~~~~
 
-**revid** allows specifying a an internal revision ID, as shown by ``bzr
+**revid** allows specifying an internal revision ID, as shown by ``bzr
 log`` and some other commands.
 
 For example::

# Begin bundle
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
kpet5/4u5IpwoSBewuga