From: Junio C Hamano <gitster@pobox.com>
To: git@vger.kernel.org
Cc: Alexander Riesen <alexander.riesen@cetitec.com>,
Thomas Ackermann <th.acker@arcor.de>
Subject: [PATCH] Documentation: AsciiDoc spells em-dash as double-dashes, not triple
Date: Thu, 22 Oct 2015 13:10:53 -0700 [thread overview]
Message-ID: <xmqqpp06r7ea.fsf_-_@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <xmqqzizarb7y.fsf@gitster.mtv.corp.google.com> (Junio C. Hamano's message of "Thu, 22 Oct 2015 11:48:17 -0700")
Again, we do not usually process release notes with AsciiDoc, but it
is better to be consistent.
This incidentally reveals breakages left by an ancient 5e00439f
(Documentation: build html for all files in technical and howto,
2012-10-23). The index-format documentation was originally written
to be read as straight text without formatting and when the commit
forced everything in Documentation/ to go through AsciiDoc, it did
not do any adjustment--hence the double-dashes will be seen in the
resulting text that is rendered as preformatted fixed-width without
converted into em-dashes.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
* An follow-up to recent AsciiDoc markup fixes.
Documentation/RelNotes/1.7.7.txt | 2 +-
Documentation/RelNotes/1.9.0.txt | 2 +-
Documentation/git-bisect.txt | 2 +-
Documentation/git-fetch.txt | 2 +-
Documentation/git-push.txt | 2 +-
Documentation/technical/index-format.txt | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Documentation/RelNotes/1.7.7.txt b/Documentation/RelNotes/1.7.7.txt
index 7655ccc..6eff128 100644
--- a/Documentation/RelNotes/1.7.7.txt
+++ b/Documentation/RelNotes/1.7.7.txt
@@ -84,7 +84,7 @@ Updates since v1.7.6
logic used by "git diff" to determine the hunk header.
* Invoking the low-level "git http-fetch" without "-a" option (which
- git itself never did---normal users should not have to worry about
+ git itself never did--normal users should not have to worry about
this) is now deprecated.
* The "--decorate" option to "git log" and its family learned to
diff --git a/Documentation/RelNotes/1.9.0.txt b/Documentation/RelNotes/1.9.0.txt
index 752d791..4e4b88a 100644
--- a/Documentation/RelNotes/1.9.0.txt
+++ b/Documentation/RelNotes/1.9.0.txt
@@ -177,7 +177,7 @@ Performance, Internal Implementation, etc.
* The naming convention of the packfiles has been updated; it used to
be based on the enumeration of names of the objects that are
contained in the pack, but now it also depends on how the packed
- result is represented---packing the same set of objects using
+ result is represented--packing the same set of objects using
different settings (or delta order) would produce a pack with
different name.
diff --git a/Documentation/git-bisect.txt b/Documentation/git-bisect.txt
index 4cb52a7..617efa0 100644
--- a/Documentation/git-bisect.txt
+++ b/Documentation/git-bisect.txt
@@ -245,7 +245,7 @@ cannot be tested. If the script exits with this code, the current
revision will be skipped (see `git bisect skip` above). 125 was chosen
as the highest sensible value to use for this purpose, because 126 and 127
are used by POSIX shells to signal specific error status (127 is for
-command not found, 126 is for command found but not executable---these
+command not found, 126 is for command found but not executable--these
details do not matter, as they are normal errors in the script, as far as
"bisect run" is concerned).
diff --git a/Documentation/git-fetch.txt b/Documentation/git-fetch.txt
index 8deb614..ee51c1a 100644
--- a/Documentation/git-fetch.txt
+++ b/Documentation/git-fetch.txt
@@ -71,7 +71,7 @@ This configuration is used in two ways:
* When `git fetch` is run without specifying what branches
and/or tags to fetch on the command line, e.g. `git fetch origin`
or `git fetch`, `remote.<repository>.fetch` values are used as
- the refspecs---they specify which refs to fetch and which local refs
+ the refspecs--they specify which refs to fetch and which local refs
to update. The example above will fetch
all branches that exist in the `origin` (i.e. any ref that matches
the left-hand side of the value, `refs/heads/*`) and update the
diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt
index b17283a..3267e21 100644
--- a/Documentation/git-push.txt
+++ b/Documentation/git-push.txt
@@ -61,7 +61,7 @@ be named.
If `git push [<repository>]` without any `<refspec>` argument is set to
update some ref at the destination with `<src>` with
`remote.<repository>.push` configuration variable, `:<dst>` part can
-be omitted---such a push will update a ref that `<src>` normally updates
+be omitted--such a push will update a ref that `<src>` normally updates
without any `<refspec>` on the command line. Otherwise, missing
`:<dst>` means to update the same ref as the `<src>`.
+
diff --git a/Documentation/technical/index-format.txt b/Documentation/technical/index-format.txt
index 1250b5c..61cb55d 100644
--- a/Documentation/technical/index-format.txt
+++ b/Documentation/technical/index-format.txt
@@ -170,7 +170,7 @@ Git index format
The entries are written out in the top-down, depth-first order. The
first entry represents the root level of the repository, followed by the
- first subtree---let's call this A---of the root level (with its name
+ first subtree--let's call this A--of the root level (with its name
relative to the root level), followed by the first subtree of A (with
its name relative to A), ...
--
2.6.2-390-g2f019b7
next prev parent reply other threads:[~2015-10-22 20:11 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-15 11:28 [PATCH] Use the alternates of the source repository for dissociating clone Alexander Riesen
2015-10-15 14:11 ` Johannes Schindelin
2015-10-15 14:38 ` [PATCH] Allow "clone --dissociate" to dissociate from alternates Alexander Riesen
2015-10-21 8:13 ` Alexander Riesen
2015-10-21 17:52 ` Junio C Hamano
2015-10-22 13:59 ` [PATCH] Consider object stores in alternates during a dissociating clone Alexander Riesen
2015-10-22 16:12 ` Junio C Hamano
2015-10-22 16:41 ` Alexander Riesen
2015-10-22 17:50 ` Junio C Hamano
2015-10-22 18:08 ` Alexander Riesen
2015-10-22 18:33 ` Junio C Hamano
2015-10-22 18:48 ` Junio C Hamano
2015-10-22 20:10 ` Junio C Hamano [this message]
2015-10-23 1:14 ` Johannes Löthberg
2015-10-15 21:59 ` [PATCH] Use the alternates of the source repository for " Junio C Hamano
2015-10-16 7:00 ` Alexander Riesen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqpp06r7ea.fsf_-_@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=alexander.riesen@cetitec.com \
--cc=git@vger.kernel.org \
--cc=th.acker@arcor.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.