Rev 6364: Fix as per jelmer's review. in file:///home/vila/src/bzr/experimental/config-explained/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/experimental/config-explained/

------------------------------------------------------------
revno: 6364
revision-id: v.ladeuil+lp at free.fr-20111214163009-ed32rropyxxky4ka
parent: v.ladeuil+lp at free.fr-20111214105915-fjmlk4zvbv9n1jvo
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: config-explained
timestamp: Wed 2011-12-14 17:30:09 +0100
message:
  Fix as per jelmer's review.
-------------- next part --------------
=== modified file 'bzrlib/config.py'
--- a/bzrlib/config.py	2011-12-14 10:59:15 +0000
+++ b/bzrlib/config.py	2011-12-14 16:30:09 +0000
@@ -3410,12 +3410,10 @@
     """
 
     def __init__(self):
-        # Get a GlobalStore
         gstore = GlobalStore()
         super(GlobalStack, self).__init__(
             [self._get_overrides,
              NameMatcher(gstore, 'DEFAULT').get_sections],
-            # For modifications
             gstore, mutable_section_id='DEFAULT')
 
 
@@ -3449,7 +3447,6 @@
             [self._get_overrides,
              LocationMatcher(lstore, location).get_sections,
              NameMatcher(gstore, 'DEFAULT').get_sections],
-            # For modifications
             lstore, mutable_section_id=location)
 
 
@@ -3469,6 +3466,7 @@
     * the ``DEFAULT`` section in ``bazaar.conf``.
 
     This stack will use the no-name section in ``branch.conf`` as its
+    MutableSection.
     """
 
     def __init__(self, branch):
@@ -3480,7 +3478,6 @@
              LocationMatcher(lstore, branch.base).get_sections,
              NameMatcher(bstore, None).get_sections,
              NameMatcher(gstore, 'DEFAULT').get_sections],
-            # For modifications
             bstore)
         self.branch = branch
 
@@ -3496,7 +3493,6 @@
         cstore = bzrdir._get_config_store()
         super(RemoteControlStack, self).__init__(
             [NameMatcher(cstore, None).get_sections],
-            # For modifications
             cstore)
         self.bzrdir = bzrdir
 
@@ -3512,7 +3508,6 @@
         bstore = branch._get_config_store()
         super(RemoteBranchStack, self).__init__(
             [NameMatcher(bstore, None).get_sections],
-            # For modifications
             bstore)
         self.branch = branch
 

=== modified file 'doc/developers/configuration.txt'
--- a/doc/developers/configuration.txt	2011-12-14 10:59:15 +0000
+++ b/doc/developers/configuration.txt	2011-12-14 16:30:09 +0000
@@ -7,11 +7,11 @@
 As a Bazaar developer there are a few things you need to know about
 configuration:
 
-* add a new option,
-
-* add a new stack,
-
-* add a new store.
+* how to add a new option,
+
+* how add a new stack,
+
+* how add a new store.
 
 The first sections in this document summarize the steps needed when adding a
 new configuration item, the rest of the document gives more internal details
@@ -87,7 +87,7 @@
   * ``BranchConfig`` became ``BranchStack`` (or in this case,
     ``get_config()`` became ``get_config_stack()``.
 
-* replace the custom accessor calls by ``conf.get(option_name)``.
+* replace the custom accessor calls with ``conf.get(option_name)``.
 
 The new config code provides some help for commonly encountered use cases
 that can allow further simplifications like:

=== modified file 'doc/developers/new-config-rationale.txt'
--- a/doc/developers/new-config-rationale.txt	2011-12-14 10:59:15 +0000
+++ b/doc/developers/new-config-rationale.txt	2011-12-14 16:30:09 +0000
@@ -82,8 +82,8 @@
   doesn't give access to the specific section. This is a concern if the user
   has no other way to address a specific configuration option including
   Store and Section when using ``bzr config`` (see
-  http://pad.lv/725234). Plugins defining their own staks and/or stores also
-  have no way to properly plug into ``bzr config`` (see
+  http://pad.lv/725234). Plugins defining their own stacks and/or stores
+  also have no way to properly plug into ``bzr config`` (see
   http://pad.lv/788991).
 
 * Rules for configuration options are not clearly defined for remote