Rev 6095: Fix typos. in file:///home/vila/src/bzr/experimental/expand-in-stack/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/experimental/expand-in-stack/

------------------------------------------------------------
revno: 6095
revision-id: v.ladeuil+lp at free.fr-20110902154210-p67n9k5sdkid5pge
parent: v.ladeuil+lp at free.fr-20110902151556-6nr1f3tvpa0d9tc0
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: expand-in-stack
timestamp: Fri 2011-09-02 17:42:10 +0200
message:
  Fix typos.
-------------- next part --------------
=== modified file 'bzrlib/config.py'
--- a/bzrlib/config.py	2011-09-02 15:15:56 +0000
+++ b/bzrlib/config.py	2011-09-02 15:42:10 +0000
@@ -3049,7 +3049,7 @@
             # Not registered
             opt = None
         def expand_and_convert(val):
-            # This may need to be called twice if the value is None and ends up
+            # This may need to be called twice if the value is None or ends up
             # being None during expansion or conversion.
             if val is not None:
                 if expand:

=== modified file 'bzrlib/tests/test_config.py'
--- a/bzrlib/tests/test_config.py	2011-09-02 14:30:23 +0000
+++ b/bzrlib/tests/test_config.py	2011-09-02 15:42:10 +0000
@@ -2640,7 +2640,7 @@
 
 
 class TestIniFileStoreContent(tests.TestCaseWithTransport):
-    """Simulate loading a config store without content of various encodings.
+    """Simulate loading a config store with content of various encodings.
 
     All files produced by bzr are in utf8 content.
 
@@ -2680,7 +2680,7 @@
 
 
 class TestIniConfigContent(tests.TestCaseWithTransport):
-    """Simulate loading a IniBasedConfig without content of various encodings.
+    """Simulate loading a IniBasedConfig with content of various encodings.
 
     All files produced by bzr are in utf8 content.
 
@@ -3450,7 +3450,7 @@
 end=bar}
 hidden={start}{middle}{end}
 ''')
-        # What matters is what the registration says, the conversion happends
+        # What matters is what the registration says, the conversion happens
         # only after all expansions have been performed
         self.registry.register(
             config.Option('hidden', from_unicode=config.list_from_store))