diff --git a/hgext/mq.py b/hgext/mq.py
index 0939726959..71f211d49f 100644
--- a/hgext/mq.py
+++ b/hgext/mq.py
@@ -2174,7 +2174,9 @@ def guard(ui, repo, *args, **opts):
 
     With no arguments, print the currently active guards.
     With arguments, set guards for the named patch.
-    NOTE: Specifying negative guards now requires '--'.
+
+    .. note::
+       Specifying negative guards now requires '--'.
 
     To set guards on another patch::
 
diff --git a/hgext/share.py b/hgext/share.py
index 689dd9fd68..cc3314896a 100644
--- a/hgext/share.py
+++ b/hgext/share.py
@@ -14,15 +14,16 @@ def share(ui, source, dest=None, noupdate=False):
     Initialize a new repository and working directory that shares its
     history with another repository.
 
-    NOTE: using rollback or extensions that destroy/modify history
-    (mq, rebase, etc.) can cause considerable confusion with shared
-    clones. In particular, if two shared clones are both updated to
-    the same changeset, and one of them destroys that changeset with
-    rollback, the other clone will suddenly stop working: all
-    operations will fail with "abort: working directory has unknown
-    parent". The only known workaround is to use debugsetparents on
-    the broken clone to reset it to a changeset that still exists
-    (e.g. tip).
+    .. note::
+       using rollback or extensions that destroy/modify history (mq,
+       rebase, etc.) can cause considerable confusion with shared
+       clones. In particular, if two shared clones are both updated to
+       the same changeset, and one of them destroys that changeset
+       with rollback, the other clone will suddenly stop working: all
+       operations will fail with "abort: working directory has unknown
+       parent". The only known workaround is to use debugsetparents on
+       the broken clone to reset it to a changeset that still exists
+       (e.g. tip).
     """
 
     return hg.share(ui, source, dest, not noupdate)
diff --git a/mercurial/commands.py b/mercurial/commands.py
index 3053c750cc..308d38bfad 100644
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -1432,9 +1432,10 @@ def diff(ui, repo, *pats, **opts):
 
     Differences between files are shown using the unified diff format.
 
-    NOTE: diff may generate unexpected results for merges, as it will
-    default to comparing against the working directory's first parent
-    changeset if no revisions are specified.
+    .. note::
+       diff may generate unexpected results for merges, as it will
+       default to comparing against the working directory's first
+       parent changeset if no revisions are specified.
 
     When two revision arguments are given, then changes are shown
     between those revisions. If only one revision is specified then
diff --git a/tests/test-help.t b/tests/test-help.t
index 4a263c2f39..5aa144b4e6 100644
--- a/tests/test-help.t
+++ b/tests/test-help.t
@@ -439,9 +439,10 @@ Test command without options
   
       Differences between files are shown using the unified diff format.
   
-      NOTE: diff may generate unexpected results for merges, as it will default
-      to comparing against the working directory's first parent changeset if no
-      revisions are specified.
+      Note:
+         diff may generate unexpected results for merges, as it will default to
+         comparing against the working directory's first parent changeset if no
+         revisions are specified.
   
       When two revision arguments are given, then changes are shown between
       those revisions. If only one revision is specified then that revision is