From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 12 Jun 2008 21:19:09 +0000 (-0700)
Subject: Documentation/git-pull.txt: Use more standard [NOTE] markup
X-Git-Tag: v1.5.6-rc3~25
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=6bfa3c99292dad8f88b2c8ac22e557421d57fd46;p=git.git

Documentation/git-pull.txt: Use more standard [NOTE] markup

Unlike other manual pages (e.g. git-blame.txt), this used *NOTE:*
to show a side note headed with boldface string "NOTE".  Use a paragraph
headed by [NOTE] like others instead.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt
index 5f55f6494..d0f1595f7 100644
--- a/Documentation/git-pull.txt
+++ b/Documentation/git-pull.txt
@@ -38,7 +38,8 @@ include::merge-options.txt[]
 	for branch `<name>`, set configuration `branch.<name>.rebase`
 	to `true`.
 +
-*NOTE:* This is a potentially _dangerous_ mode of operation.
+[NOTE]
+This is a potentially _dangerous_ mode of operation.
 It rewrites history, which does not bode well when you
 published that history already.  Do *not* use this option
 unless you have read linkgit:git-rebase[1] carefully.