Rev 6088: (vila) Fix typos (Vincent Ladeuil) in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 6088 [merge]
revision-id: pqm at pqm.ubuntu.com-20110820144112-k4tz334t1ga9yzrw
parent: pqm at pqm.ubuntu.com-20110820114938-wwxmzhexrielxpq3
parent: v.ladeuil+lp at free.fr-20110820105609-0ndrnwinw5atlfvd
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2011-08-20 14:41:12 +0000
message:
  (vila) Fix typos (Vincent Ladeuil)
modified:
  doc/developers/configuration.txt configuration.txt-20110408142435-korjxxnskvq44sta-1
  doc/en/release-notes/bzr-2.5.txt bzr2.5.txt-20110708125756-587p0hpw7oke4h05-1
=== modified file 'doc/developers/configuration.txt'
--- a/doc/developers/configuration.txt	2011-08-19 12:54:18 +0000
+++ b/doc/developers/configuration.txt	2011-08-19 14:10:32 +0000
@@ -21,7 +21,7 @@
 
 * default_from_env: a list of environment variables. The first variable set
   will provide a default value overriding 'default' which remains the
-  default value is *no* environment variable is set.
+  default value if *no* environment variable is set.
 
 * help: a doc string describing the option, the first line should be a
   summary and can be followed by a blank line and a more detailed

=== modified file 'doc/en/release-notes/bzr-2.5.txt'
--- a/doc/en/release-notes/bzr-2.5.txt	2011-08-20 11:49:38 +0000
+++ b/doc/en/release-notes/bzr-2.5.txt	2011-08-20 14:41:12 +0000
@@ -72,7 +72,7 @@
   while --match-message, --match-author, --match-committer and
   --match-bugs match each of those fields.
 
-* ``config.Option`` can now declares ``default_from_env``, a list of
+* ``config.Option`` can now declare ``default_from_env``, a list of
   environment variables to get a default value from. (Vincent Ladeuil)
 
 * New builtin ``bzr branches`` command, which lists all colocated branches