Rev 5466: Add some more documentation. in file:///home/vila/src/bzr/experimental/config/

[Vincent Ladeuil]

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

------------------------------------------------------------
revno: 5466
revision-id: v.ladeuil+lp at free.fr-20101015073521-1gd4g49pbch0kbmj
parent: v.ladeuil+lp at free.fr-20101013141710-6md6yjsia3ld4mr5
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: config-modify
timestamp: Fri 2010-10-15 09:35:21 +0200
message:
  Add some more documentation.
-------------- next part --------------
=== modified file 'bzrlib/config.py'
--- a/bzrlib/config.py	2010-10-13 14:14:37 +0000
+++ b/bzrlib/config.py	2010-10-15 07:35:21 +0000
@@ -1770,7 +1770,15 @@
 
 
 class cmd_config(commands.Command):
-    __doc__ = """Display informations about configuration options.
+    __doc__ = """Display, set or remove a configuration option.
+
+    Display the MATCHING configuration options mentioning their scope (the
+    configuration file they are defined in). The active value that bzr will
+    take into account is the first one displayed.
+
+    Setting a value is achieved by using name=value without spaces. The value
+    is set in the most relevant scope and can be checked by displaying the
+    option again.
     """
 
     aliases = ['conf']

=== modified file 'doc/en/whats-new/whats-new-in-2.3.txt'
--- a/doc/en/whats-new/whats-new-in-2.3.txt	2010-10-13 07:04:50 +0000
+++ b/doc/en/whats-new/whats-new-in-2.3.txt	2010-10-15 07:35:21 +0000
@@ -97,6 +97,14 @@
   format, used by emacs and the standalone ``info`` reader.
   (Vincent Ladeuil, #219334)
 
+Configuration
+*************
+
+``bzr`` can be configure via environment variables, command-line options
+and configurations files. We've started working on unifying this and give
+access to more options. The first step is a new ``bzr config`` command that
+can be used to display the active configuration options in the current
+working tree or branch as well as the ability to set or remove an option.
 
 Expected releases for the 2.3 series
 ************************************