Rev 6568: Fix formattting. in file:///home/vila/src/bzr/cleanup/mergetool-doc/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/cleanup/mergetool-doc/

------------------------------------------------------------
revno: 6568
revision-id: v.ladeuil+lp at free.fr-20121010182939-iv6e9wj26rp61nc2
parent: v.ladeuil+lp at free.fr-20121010182835-mb3r5c7ntbsl12jq
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: mergetool-doc
timestamp: Wed 2012-10-10 20:29:39 +0200
message:
  Fix formattting.
-------------- next part --------------
=== modified file 'bzrlib/help_topics/en/configuration.txt'
--- a/bzrlib/help_topics/en/configuration.txt	2012-10-10 18:28:35 +0000
+++ b/bzrlib/help_topics/en/configuration.txt	2012-10-10 18:29:39 +0000
@@ -713,16 +713,16 @@
 
   bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}
 
-Because mergetool and config itself both use curly braces as interpolation
-markers, trying to display the mergetool line results in the following
-problem::
+Because ``mergetool`` and ``config`` itself both use curly braces as
+interpolation markers, trying to display the mergetool line results in the
+following problem::
 
 
   $ bzr config bzr.mergetool.kdiff3='kdiff3 {base} {this} {other} -o {result}'
   $ bzr config bzr.mergetool.kdiff3
   bzr: ERROR: Option base is not defined while expanding "kdiff3 {base} {this} {other} -o {result}".
 
-To avoid this, config can be instructed not to try expanding variables::
+To avoid this, ``config`` can be instructed not to try expanding variables::
 
   $ bzr config --all bzr.mergetool.kdiff3
   branch: