Rev 5655: Fix typos caught by Jonathan. in file:///home/vila/src/bzr/bugs/786980-url-aliases/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/bugs/786980-url-aliases/

------------------------------------------------------------
revno: 5655
revision-id: v.ladeuil+lp at free.fr-20110712164825-9fpq2soa453hqrji
parent: v.ladeuil+lp at free.fr-20110708155343-mqvck9jn15e4g9tu
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 786980-url-aliases
timestamp: Tue 2011-07-12 18:48:25 +0200
message:
  Fix typos caught by Jonathan.
-------------- next part --------------
=== modified file 'bzrlib/branch.py'
--- a/bzrlib/branch.py	2011-07-08 15:53:43 +0000
+++ b/bzrlib/branch.py	2011-07-12 16:48:25 +0000
@@ -3468,8 +3468,8 @@
         master_branch = None
         source_is_master = False
         if bound_location:
-            # bond_location comes from a config file, some care has to be taken
-            # to relate it to source.user_url
+            # bound_location comes from a config file, some care has to be
+            # taken to relate it to source.user_url
             normalized = urlutils.normalize_url(bound_location)
             try:
                 relpath = self.source.user_transport.relpath(normalized)

=== modified file 'doc/en/release-notes/bzr-2.3.txt'
--- a/doc/en/release-notes/bzr-2.3.txt	2011-07-08 15:53:43 +0000
+++ b/doc/en/release-notes/bzr-2.3.txt	2011-07-12 16:48:25 +0000
@@ -33,8 +33,9 @@
 .. Fixes for situations where bzr would previously crash or give incorrect
    or undesirable results.
 
-* Accept some differences for ``bound_location`` fron the config files.
-  (Vincent Ladeuil, #786980)
+* Accept some differences for ``bound_location`` from the config files that
+  were leading to a 'ReadOnlyError: A write attempt was made in a read only
+  transaction' error.  (Vincent Ladeuil, #786980)
 
 * Don't fail with traceback if `bzr serve` is running as a service on Windows,
   and there is no USERNAME, nor BZR_EMAIL or other whoami-related environment