git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: "Martin Ågren" <martin.agren@gmail.com>
To: git@vger.kernel.org
Cc: Jeff King <peff@peff.net>
Subject: [PATCH 0/7] Fix more AsciiDoc/tor differences
Date: Sat,  7 Sep 2019 16:12:46 +0200	[thread overview]
Message-ID: <cover.1567707999.git.martin.agren@gmail.com> (raw)

This series roughly halves the line count of `./doc-diff --from-asciidoc
--to-asciidoctor --cut-header-footer HEAD HEAD`. Together with my recent
(independent) mini-series [1], I claim that Asciidoctor 1.5.5 now
processes the manpages better than AsciiDoc 8.6.10 does.

Patch 6/7 actually changes the rendering with both engines, so that they
look nice and the same. The other patches are all no-ops with one engine
while fixing things with the other -- they all improve the situation
with Asciidoctor (which is what I care most about) except patch 1/7
which goes the other way (it reduces the doc-diff, which helps).

Patch 7/7 has an element of black magic to it. I wouldn't be too
surprised if I've managed to appease my particular versions of these
tools while not fixing -- or maybe even breaking? -- some other versions
[that people actually use]. That's where I think a quick test would be
the most valuable.

I've based this on maint on the assumption that these are bugfixes. (I
know I've been bad on basing similar work off of maint.) This causes a
conflict with master and pu in config.txt, which has learned about
"includeIf onbranch:foo-branch" in the meantime. Maybe I've made the
wrong call here -- Junio, if you'd rather have me submit this on master,
just let me know.

[1] https://public-inbox.org/git/cover.1567534373.git.martin.agren@gmail.com/

Martin Ågren (7):
  Documentation: wrap blocks with "--"
  git-merge-base.txt: render indentations correctly under Asciidoctor
  Documentation: wrap config listings in "----"
  git-ls-remote.txt: wrap shell listing in "----"
  git-receive-pack.txt: wrap shell [script] listing in "----"
  git-merge-index.txt: wrap shell listing in "----"
  gitweb.conf.txt: switch pluses to backticks to help Asciidoctor

 Documentation/config.txt           | 84 ++++++++++++-------------
 Documentation/git-commit.txt       |  8 ++-
 Documentation/git-config.txt       | 56 +++++++++--------
 Documentation/git-ls-remote.txt    | 32 +++++-----
 Documentation/git-merge-base.txt   | 98 +++++++++++++++++-------------
 Documentation/git-merge-index.txt  | 26 ++++----
 Documentation/git-receive-pack.txt | 52 ++++++++--------
 Documentation/git-send-email.txt   | 12 ++--
 Documentation/git-status.txt       | 18 +++---
 Documentation/gitmodules.txt       | 15 ++---
 Documentation/gitweb.conf.txt      |  6 +-
 11 files changed, 223 insertions(+), 184 deletions(-)

-- 
2.23.0


             reply	other threads:[~2019-09-07 14:13 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-09-07 14:12 Martin Ågren [this message]
2019-09-07 14:12 ` [PATCH 1/7] Documentation: wrap blocks with "--" Martin Ågren
2019-09-07 14:12 ` [PATCH 2/7] git-merge-base.txt: render indentations correctly under Asciidoctor Martin Ågren
2019-09-07 14:12 ` [PATCH 3/7] Documentation: wrap config listings in "----" Martin Ågren
2019-09-07 14:12 ` [PATCH 4/7] git-ls-remote.txt: wrap shell listing " Martin Ågren
2019-09-07 14:12 ` [PATCH 5/7] git-receive-pack.txt: wrap shell [script] " Martin Ågren
2019-09-07 14:12 ` [PATCH 6/7] git-merge-index.txt: wrap shell " Martin Ågren
2019-09-07 14:12 ` [PATCH 7/7] gitweb.conf.txt: switch pluses to backticks to help Asciidoctor Martin Ågren
2019-09-13  4:48 ` [PATCH 0/7] Fix more AsciiDoc/tor differences Jeff King
2019-09-13 12:21   ` Martin Ågren

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

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=cover.1567707999.git.martin.agren@gmail.com \
    --to=martin.agren@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=peff@peff.net \
    /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.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).