Merge branch 'jk/no-more-asciidoc7'

We no longer use AsciiDoc7 syntax in our documentation and favor a
more modern style.

* jk/no-more-asciidoc7:
docs: drop antique comment from Makefile
docs: drop asciidoc7compatible flag

diff --combined Documentation/Makefile
index 5d76a840781bcd4b48157057bb439bdac691766e,eb1b6ad56c806b4febb9975440d73c6d931693b5..063fa696c9eff617e4fc6ad37f0b6e49d32d58f9
--- 1/Documentation/Makefile
--- 2/Documentation/Makefile
+++ b/Documentation/Makefile
@@@ -65,12 -65,6 +65,6 @@@ endi
  -include ../config.mak.autogen
  -include ../config.mak
  
- #
- # For asciidoc ...
- #     -7.1.2, set ASCIIDOC7
- #     8.0-,   no extra settings are needed
- #
- 
  #
  # For docbook-xsl ...
  #     -1.68.1,        no extra settings are needed?
@@@ -81,9 -75,6 +75,6 @@@
  #     1.73.0-,        no extra settings are needed
  #
  
- ifndef ASCIIDOC7
- ASCIIDOC_EXTRA += -a asciidoc7compatible
- endif
  ifdef DOCBOOK_XSL_172
  ASCIIDOC_EXTRA += -a git-asciidoc-no-roff
  MANPAGE_XSL = manpage-1.72.xsl
@@@ -134,15 -125,6 +125,6 @@@ DEFAULT_EDITOR_SQ = $(subst ','\'',$(DE
  ASCIIDOC_EXTRA += -a 'git-default-editor=$(DEFAULT_EDITOR_SQ)'
  endif
  
- #
- # Please note that there is a minor bug in asciidoc.
- # The version after 6.0.3 _will_ include the patch found here:
- #   http://marc.theaimsgroup.com/?l=git&m=111558757202243&w=2
- #
- # Until that version is released you may have to apply the patch
- # yourself - yes, all 6 characters of it!
- #
- 
  QUIET_SUBDIR0  = +$(MAKE) -C # space to separate -C and subdir
  QUIET_SUBDIR1  =
  
@@@ -280,7 -262,6 +262,7 @@@ technical/api-index.txt: technical/api-
        technical/api-index.sh $(patsubst %,%.txt,$(API_DOCS))
        $(QUIET_GEN)cd technical && '$(SHELL_PATH_SQ)' ./api-index.sh
  
 +technical/%.html: ASCIIDOC_EXTRA += -a git-relative-html-prefix=../
  $(patsubst %,%.html,$(API_DOCS) technical/api-index): %.html : %.txt
        $(QUIET_ASCIIDOC)$(ASCIIDOC) -b xhtml11 -f asciidoc.conf \
                $(ASCIIDOC_EXTRA) -agit_version=$(GIT_VERSION) $*.txt
@@@ -334,7 -315,6 +316,7 @@@ $(patsubst %,%.html,$(ARTICLES)) : %.ht
  
  WEBDOC_DEST = /pub/software/scm/git/docs
  
 +howto/%.html: ASCIIDOC_EXTRA += -a git-relative-html-prefix=../
  $(patsubst %.txt,%.html,$(wildcard howto/*.txt)): %.html : %.txt
        $(QUIET_ASCIIDOC)$(RM) $@+ $@ && \
        sed -e '1,/^$$/d' $< | $(ASCIIDOC) $(ASCIIDOC_EXTRA) -b xhtml11 - >$@+ && \

diff --combined Makefile
index f62ca2aebb28758ea164b65dab7dff19ddd4c3e0,55943a9982639dccc4dcf392656b96b35cf9faf0..cba9f7788ddd8e9e9c405f331df6f7a3e7d02c54
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -203,8 -203,6 +203,6 @@@ all:
  # Define NO_ST_BLOCKS_IN_STRUCT_STAT if your platform does not have st_blocks
  # field that counts the on-disk footprint in 512-byte blocks.
  #
- # Define ASCIIDOC7 if you want to format documentation with AsciiDoc 7
- #
  # Define DOCBOOK_XSL_172 if you want to format man pages with DocBook XSL v1.72
  # (not v1.73 or v1.71).
  #
@@@ -296,13 -294,6 +294,13 @@@
  # the diff algorithm.  It gives a nice speedup if your processor has
  # fast unaligned word loads.  Does NOT work on big-endian systems!
  # Enabled by default on x86_64.
 +#
 +# Define GIT_USER_AGENT if you want to change how git identifies itself during
 +# network interactions.  The default is "git/$(GIT_VERSION)".
 +#
 +# Define DEFAULT_HELP_FORMAT to "man", "info" or "html"
 +# (defaults to "man") if you want to have a different default when
 +# "git help" is called without a parameter specifying the format.
  
  GIT-VERSION-FILE: FORCE
        @$(SHELL_PATH) ./GIT-VERSION-GEN
@@@ -806,7 -797,6 +804,7 @@@ LIB_OBJS += usage.
  LIB_OBJS += userdiff.o
  LIB_OBJS += utf8.o
  LIB_OBJS += varint.o
 +LIB_OBJS += version.o
  LIB_OBJS += walker.o
  LIB_OBJS += wrapper.o
  LIB_OBJS += write_or_die.o
@@@ -912,8 -902,6 +910,8 @@@ BUILTIN_OBJS += builtin/write-tree.
  GITLIBS = $(LIB_FILE) $(XDIFF_LIB)
  EXTLIBS =
  
 +GIT_USER_AGENT = git/$(GIT_VERSION)
 +
  #
  # Platform specific tweaks
  #
@@@ -1246,7 -1234,6 +1244,7 @@@ ifeq ($(uname_S),Windows
        BLK_SHA1 = YesPlease
        NO_POSIX_GOODIES = UnfortunatelyYes
        NATIVE_CRLF = YesPlease
 +      DEFAULT_HELP_FORMAT = html
  
        CC = compat/vcbuild/scripts/clink.pl
        AR = compat/vcbuild/scripts/lib.pl
@@@ -1845,10 -1832,6 +1843,6 @@@ ifndef 
  endif
  endif
  
- ifdef ASCIIDOC7
-       export ASCIIDOC7
- endif
- 
  ifdef NO_INSTALL_HARDLINKS
        export NO_INSTALL_HARDLINKS
  endif
@@@ -1926,15 -1909,6 +1920,15 @@@ SHELL_PATH_CQ_SQ = $(subst ','\'',$(SHE
  BASIC_CFLAGS += -DSHELL_PATH='$(SHELL_PATH_CQ_SQ)'
  endif
  
 +GIT_USER_AGENT_SQ = $(subst ','\'',$(GIT_USER_AGENT))
 +GIT_USER_AGENT_CQ = "$(subst ",\",$(subst \,\\,$(GIT_USER_AGENT)))"
 +GIT_USER_AGENT_CQ_SQ = $(subst ','\'',$(GIT_USER_AGENT_CQ))
 +BASIC_CFLAGS += -DGIT_USER_AGENT='$(GIT_USER_AGENT_CQ_SQ)'
 +
 +ifdef DEFAULT_HELP_FORMAT
 +BASIC_CFLAGS += -DDEFAULT_HELP_FORMAT='"$(DEFAULT_HELP_FORMAT)"'
 +endif
 +
  ALL_CFLAGS += $(BASIC_CFLAGS)
  ALL_LDFLAGS += $(BASIC_LDFLAGS)
  
@@@ -1982,7 -1956,7 +1976,7 @@@ strip: $(PROGRAMS) git$
        $(STRIP) $(STRIP_OPTS) $(PROGRAMS) git$X
  
  git.o: common-cmds.h
 -git.sp git.s git.o: EXTRA_CPPFLAGS = -DGIT_VERSION='"$(GIT_VERSION)"' \
 +git.sp git.s git.o: EXTRA_CPPFLAGS = \
        '-DGIT_HTML_PATH="$(htmldir_SQ)"' \
        '-DGIT_MAN_PATH="$(mandir_SQ)"' \
        '-DGIT_INFO_PATH="$(infodir_SQ)"'
@@@ -1999,9 -1973,6 +1993,9 @@@ builtin/help.sp builtin/help.s builtin/
        '-DGIT_MAN_PATH="$(mandir_SQ)"' \
        '-DGIT_INFO_PATH="$(infodir_SQ)"'
  
 +version.sp version.s version.o: EXTRA_CPPFLAGS = \
 +      '-DGIT_VERSION="$(GIT_VERSION)"'
 +
  $(BUILT_INS): git$X
        $(QUIET_BUILT_IN)$(RM) $@ && \
        ln git$X $@ 2>/dev/null || \
@@@ -2019,7 -1990,6 +2013,7 @@@ sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|
      -e 's|@SHELL_PATH@|$(SHELL_PATH_SQ)|' \
      -e 's|@@DIFF@@|$(DIFF_SQ)|' \
      -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \
 +    -e 's|@@GIT_USER_AGENT@@|$(GIT_USER_AGENT_SQ)|g' \
      -e 's|@@LOCALEDIR@@|$(localedir_SQ)|g' \
      -e 's/@@NO_CURL@@/$(NO_CURL)/g' \
      -e 's/@@USE_GETTEXT_SCHEME@@/$(USE_GETTEXT_SCHEME)/g' \
@@@ -2113,7 -2083,7 +2107,7 @@@ configure: configure.a
        $(RM) $<+
  
  # These can record GIT_VERSION
 -git.o git.spec \
 +version.o git.spec \
        $(patsubst %.sh,%,$(SCRIPT_SH)) \
        $(patsubst %.perl,%,$(SCRIPT_PERL)) \
        : GIT-VERSION-FILE
@@@ -2283,6 -2253,9 +2277,6 @@@ attr.sp attr.s attr.o: EXTRA_CPPFLAGS 
  gettext.sp gettext.s gettext.o: EXTRA_CPPFLAGS = \
        -DGIT_LOCALE_PATH='"$(localedir_SQ)"'
  
 -http.sp http.s http.o: EXTRA_CPPFLAGS = \
 -      -DGIT_HTTP_USER_AGENT='"git/$(GIT_VERSION)"'
 -
  ifdef NO_EXPAT
  http-walker.sp http-walker.s http-walker.o: EXTRA_CPPFLAGS = -DNO_EXPAT
  endif