Bazaar

Merge lp://staging/~vila/bzr/996401-doc-config into lp://staging/bzr

996401-doc-config
Merge into bzr.dev

Proposed by Vincent Ladeuil on 2012-09-18

Status:

Merged

Approved by:

John A Meinel on 2012-09-19

Approved revision:

no longer in the source branch.

Merged at revision:

6562

Proposed branch:

lp://staging/~vila/bzr/996401-doc-config

Merge into:

lp://staging/bzr

Diff against target:

94 lines (+44/-7)

3 files modified

bzrlib/config.py (+11/-7)
doc/en/release-notes/bzr-2.6.txt (+3/-0)
doc/en/user-guide/configuring_bazaar.txt (+30/-0)

To merge this branch:

bzr merge lp://staging/~vila/bzr/996401-doc-config

High

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
John A Meinel		2012-09-18	Approve on 2012-09-19
Review via email: mp+124984@code.staging.launchpad.net

Commit message

Clarify option references expansion for `bzr config`.

Description of the change

This addresses bug #996401 by clarifying the command online help especially
around when option references are expanded.

Option references are described in bzrlib/help_topics/en/configuration.txt
which still seems to be the best place for that.

Revision history for this message

John A Meinel (jameinel) wrote on 2012-09-19:

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 9/18/2012 8:42 PM, Vincent Ladeuil wrote:
> Vincent Ladeuil has proposed merging lp:~vila/bzr/996401-doc-config
> into lp:bzr.
>
> Requested reviews: bzr-core (bzr-core) Related bugs: Bug #996401 in
> Bazaar: "'bzr config' fails to display config templates referring
> to "unknown" options" https://bugs.launchpad.net/bzr/+bug/996401
>
> For more details, see:
> https://code.launchpad.net/~vila/bzr/996401-doc-config/+merge/124984
>
> This addresses bug #996401 by clarifying the command online help
> especially around when option references are expanded.
>
> Option references are described in
> bzrlib/help_topics/en/configuration.txt which still seems to be the
> best place for that.
>

merge: approve

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://www.enigmail.net/

iEYEARECAAYFAlBZTLgACgkQJdeBCYSNAAN6VgCfaopIU9M+UmUrNToA77LE02jS
s38An2lcvtTnYDUApvJrf5qJh1cd/wIz
=1j3N
-----END PGP SIGNATURE-----