Bazaar

Merge lp:~bialix/bzr/ignore-help-rstx into lp:bzr/2.3

  1. ignore-help-rstx
  2. Merge into 2.3
Proposed by Alexander Belchenko
Status: Merged
Approved by: John A Meinel
Approved revision: no longer in the source branch.
Merged at revision: 5645
Proposed branch: lp:~bialix/bzr/ignore-help-rstx
Merge into: lp:bzr/2.3
Diff against target: 12 lines (+1/-1)
1 file modified
bzrlib/builtins.py (+1/-1)
To merge this branch: bzr merge lp:~bialix/bzr/ignore-help-rstx
Reviewer Review Type Date Requested Status
John A Meinel Approve
Review via email: mp+61014@code.launchpad.net

Commit message

Tweak rest in ignore help.

Description of the change

This branch fixes docutils warning:

C:\work\Bazaar\bzr-2a\2.3\doc\en\user-reference\ignore-help.txt:80: (WARNING/2) Inline emphasis start-string without end-string.

* is emphasis marker in rstx. I've just wrapped *~ into rstx literal block.

To post a comment you must log in.
Revision history for this message
John A Meinel (jameinel) wrote :

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

On 05/15/2011 09:29 AM, Alexander Belchenko wrote:
> Alexander Belchenko has proposed merging lp:~bialix/bzr/ignore-help-rstx into lp:bzr/2.3.
>
> Requested reviews:
> bzr-core (bzr-core)
>
> For more details, see:
> https://code.launchpad.net/~bialix/bzr/ignore-help-rstx/+merge/61014
>
> This branch fixes docutils warning:
>
> C:\work\Bazaar\bzr-2a\2.3\doc\en\user-reference\ignore-help.txt:80: (WARNING/2) Inline emphasis start-string without end-string.
>
> * is emphasis marker in rstx. I've just wrapped *~ into rstx literal block.

 merge: approve

John
=:->

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAk3PlzYACgkQJdeBCYSNAAP1RACfd/ZRhDOliQZ/Src0YX3307u9
z0oAmwbswz1SI375hsYrpx7+qzG5REw4
=g9JF
-----END PGP SIGNATURE-----

review: Approve
Revision history for this message
Vincent Ladeuil (vila) wrote :

sent to pqm by email

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bzrlib/builtins.py'
2--- bzrlib/builtins.py 2011-04-20 09:46:28 +0000
3+++ bzrlib/builtins.py 2011-05-15 07:29:29 +0000
4@@ -2726,7 +2726,7 @@
5 bzr ignore "RE:(?!debian/).*"
6
7 Ignore everything except the "local" toplevel directory,
8- but always ignore "*~" autosave files, even under local/::
9+ but always ignore ``*~`` autosave files, even under local/::
10
11 bzr ignore "*"
12 bzr ignore "!./local"

Subscribers

People subscribed via source and target branches