[PATCH 1 of 1 STABLE] i18n: prevent note directives to interpret text as options

[Matt Mackall]

On Mon, 2013-10-21 at 23:18 +0200, Simon Heimberg wrote:
> # HG changeset patch
> # User Simon Heimberg <simohe at besonet.ch>
> # Date 1382388487 -7200
> # Node ID 9177f7f9a3e17e57f7879bfe46ff24da61de9b74
> # Parent  ab2362e1672e341d13b0f2546b672122b2eb5ced
> i18n: prevent note directives to interpret text as options
> 
> directives like note may have options. They are written like this:
> .. note::
>   :option1: value1
>   :option2: value2

Unfortunately, this doesn't quite work, due to something in minirst.py.
Something goes screwy with the line wrap and the "Note:" marker
disappears. I suspect it's now being treated as a literal block.

--- b	2013-10-21 15:08:58.000000000 -0700
+++ a	2013-10-21 15:08:51.000000000 -0700
@@ -9,8 +9,8 @@
     committed automatically. Otherwise, hg needs to merge the changes and the
     merged result is left uncommitted.
 
-    Note:
-      backout cannot be used to fix either an unwanted or incorrect merge.
+      backout cannot be used to fix either an unwanted or
+      incorrect merge.
 
     See "hg help dates" for a list of formats valid for -d/--date.
 
-- 
Mathematics is the supreme nostalgia of our time.