From a3e1fa97bc7a62073ede49a7f307c2fc629e465f Mon Sep 17 00:00:00 2001 From: Xue Fuqiao Date: Thu, 22 Oct 2015 20:59:00 +0800 Subject: [PATCH 1/3] Documentation: fix header markup Asciidoctor is stricter than AsciiDoc when deciding if underlining is a section title or the start of preformatted text. Make the length of the underlining match the text to ensure that it renders correctly in all implementations. Signed-off-by: Xue Fuqiao Signed-off-by: Junio C Hamano --- Documentation/user-manual.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt index 46aa6bc1a..3193bd6ba 100644 --- a/Documentation/user-manual.txt +++ b/Documentation/user-manual.txt @@ -1491,7 +1491,7 @@ resolving a merge>>. [[fixing-a-mistake-by-rewriting-history]] Fixing a mistake by rewriting history -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ If the problematic commit is the most recent commit, and you have not yet made that commit public, then you may just From 142d035a022fb76c96877254e95aa70879332076 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Thu, 22 Oct 2015 10:09:07 -0700 Subject: [PATCH 2/3] Documentation: match underline with the text Even though AsciiDoc is more lenient when deciding if an underline is for the contents on the previous line to find section headers, we should match the length of them for other formatters to help them. Signed-off-by: Junio C Hamano --- Documentation/git-bisect.txt | 2 +- Documentation/git-remote.txt | 2 +- Documentation/git-upload-archive.txt | 2 +- Documentation/gitrevisions.txt | 2 +- Documentation/urls-remotes.txt | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Documentation/git-bisect.txt b/Documentation/git-bisect.txt index f986c5cb3..edd964fe7 100644 --- a/Documentation/git-bisect.txt +++ b/Documentation/git-bisect.txt @@ -167,7 +167,7 @@ Then compile and test the chosen revision, and afterwards mark the revision as good or bad in the usual manner. Bisect skip -~~~~~~~~~~~~ +~~~~~~~~~~~ Instead of choosing by yourself a nearby commit, you can ask Git to do it for you by issuing the command: diff --git a/Documentation/git-remote.txt b/Documentation/git-remote.txt index cb103c8b6..a941dece6 100644 --- a/Documentation/git-remote.txt +++ b/Documentation/git-remote.txt @@ -1,5 +1,5 @@ git-remote(1) -============ +============= NAME ---- diff --git a/Documentation/git-upload-archive.txt b/Documentation/git-upload-archive.txt index cbef61ba8..fba0f1c1b 100644 --- a/Documentation/git-upload-archive.txt +++ b/Documentation/git-upload-archive.txt @@ -1,5 +1,5 @@ git-upload-archive(1) -==================== +===================== NAME ---- diff --git a/Documentation/gitrevisions.txt b/Documentation/gitrevisions.txt index c0ed6d192..e903eb786 100644 --- a/Documentation/gitrevisions.txt +++ b/Documentation/gitrevisions.txt @@ -1,5 +1,5 @@ gitrevisions(7) -================ +=============== NAME ---- diff --git a/Documentation/urls-remotes.txt b/Documentation/urls-remotes.txt index 282758e76..bd184cd65 100644 --- a/Documentation/urls-remotes.txt +++ b/Documentation/urls-remotes.txt @@ -36,7 +36,7 @@ The `` is used for pushes only. It is optional and defaults to ``. Named file in `$GIT_DIR/remotes` -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ You can choose to provide the name of a file in `$GIT_DIR/remotes`. The URL From 77d5f715c24f1c2f3469aab35536b06237a5883d Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Thu, 22 Oct 2015 10:11:41 -0700 Subject: [PATCH 3/3] Documentation: match undefline with the text in old release notes These are not processed with AsciiDoc, but it is better to be consistent. Signed-off-by: Junio C Hamano --- Documentation/RelNotes/1.8.3.1.txt | 2 +- Documentation/RelNotes/1.8.4.1.txt | 2 +- Documentation/RelNotes/1.8.4.2.txt | 2 +- Documentation/RelNotes/1.8.4.3.txt | 2 +- Documentation/RelNotes/1.8.4.4.txt | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Documentation/RelNotes/1.8.3.1.txt b/Documentation/RelNotes/1.8.3.1.txt index fc3ea185a..986637b75 100644 --- a/Documentation/RelNotes/1.8.3.1.txt +++ b/Documentation/RelNotes/1.8.3.1.txt @@ -1,5 +1,5 @@ Git v1.8.3.1 Release Notes -======================== +========================== Fixes since v1.8.3 ------------------ diff --git a/Documentation/RelNotes/1.8.4.1.txt b/Documentation/RelNotes/1.8.4.1.txt index 3aa25a274..96090ef59 100644 --- a/Documentation/RelNotes/1.8.4.1.txt +++ b/Documentation/RelNotes/1.8.4.1.txt @@ -1,5 +1,5 @@ Git v1.8.4.1 Release Notes -======================== +========================== Fixes since v1.8.4 ------------------ diff --git a/Documentation/RelNotes/1.8.4.2.txt b/Documentation/RelNotes/1.8.4.2.txt index 9adccb1ef..bf6fb1a02 100644 --- a/Documentation/RelNotes/1.8.4.2.txt +++ b/Documentation/RelNotes/1.8.4.2.txt @@ -1,5 +1,5 @@ Git v1.8.4.2 Release Notes -======================== +========================== Fixes since v1.8.4.1 -------------------- diff --git a/Documentation/RelNotes/1.8.4.3.txt b/Documentation/RelNotes/1.8.4.3.txt index 03f3d1775..267a1b34b 100644 --- a/Documentation/RelNotes/1.8.4.3.txt +++ b/Documentation/RelNotes/1.8.4.3.txt @@ -1,5 +1,5 @@ Git v1.8.4.3 Release Notes -======================== +========================== Fixes since v1.8.4.2 -------------------- diff --git a/Documentation/RelNotes/1.8.4.4.txt b/Documentation/RelNotes/1.8.4.4.txt index 7bc4c5dcc..a7c1ce15c 100644 --- a/Documentation/RelNotes/1.8.4.4.txt +++ b/Documentation/RelNotes/1.8.4.4.txt @@ -1,5 +1,5 @@ Git v1.8.4.4 Release Notes -======================== +========================== Fixes since v1.8.4.3 --------------------