H0llyW00dzZ/git
H0llyW00dzZ/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2025-03-27 18:58:22 +00:00
Code Releases Activity

Merge branch 'jk/no-more-asciidoc7'

Browse Source 
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
This commit is contained in:
Junio C Hamano 2012-06-25 11:24:10 -07:00
commit 10fcd5194f
4 changed files with 0 additions and 32 deletions

18
Documentation/Makefile

@ -65,12 +65,6 @@ endif
-include ../config.mak.autogen -include ../config.mak.autogen
-include ../config.mak -include ../config.mak
#
# For asciidoc ...
# -7.1.2, set ASCIIDOC7
# 8.0-, no extra settings are needed
#
# #
# For docbook-xsl ... # For docbook-xsl ...
# -1.68.1, no extra settings are needed? # -1.68.1, no extra settings are needed?
@ -81,9 +75,6 @@ endif
# 1.73.0-, no extra settings are needed # 1.73.0-, no extra settings are needed
# #
ifndef ASCIIDOC7
ASCIIDOC_EXTRA += -a asciidoc7compatible
endif
ifdef DOCBOOK_XSL_172 ifdef DOCBOOK_XSL_172
ASCIIDOC_EXTRA += -a git-asciidoc-no-roff ASCIIDOC_EXTRA += -a git-asciidoc-no-roff
MANPAGE_XSL = manpage-1.72.xsl MANPAGE_XSL = manpage-1.72.xsl
@ -134,15 +125,6 @@ DEFAULT_EDITOR_SQ = $(subst ','\'',$(DEFAULT_EDITOR))
ASCIIDOC_EXTRA += -a 'git-default-editor=$(DEFAULT_EDITOR_SQ)' ASCIIDOC_EXTRA += -a 'git-default-editor=$(DEFAULT_EDITOR_SQ)'
endif 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_SUBDIR0 = +$(MAKE) -C # space to separate -C and subdir
QUIET_SUBDIR1 = QUIET_SUBDIR1 =

6
Makefile

@ -203,8 +203,6 @@ all::
# Define NO_ST_BLOCKS_IN_STRUCT_STAT if your platform does not have st_blocks # 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. # 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 # Define DOCBOOK_XSL_172 if you want to format man pages with DocBook XSL v1.72
# (not v1.73 or v1.71). # (not v1.73 or v1.71).
# #
@ -1845,10 +1843,6 @@ ifndef V
endif endif
endif endif
ifdef ASCIIDOC7
export ASCIIDOC7
endif
ifdef NO_INSTALL_HARDLINKS ifdef NO_INSTALL_HARDLINKS
export NO_INSTALL_HARDLINKS export NO_INSTALL_HARDLINKS
endif endif

1
config.mak.in

@ -28,7 +28,6 @@ VPATH = @srcdir@
export exec_prefix mandir export exec_prefix mandir
export srcdir VPATH export srcdir VPATH
ASCIIDOC7=@ASCIIDOC7@
NEEDS_SSL_WITH_CRYPTO=@NEEDS_SSL_WITH_CRYPTO@ NEEDS_SSL_WITH_CRYPTO=@NEEDS_SSL_WITH_CRYPTO@
NO_OPENSSL=@NO_OPENSSL@ NO_OPENSSL=@NO_OPENSSL@
NO_CURL=@NO_CURL@ NO_CURL=@NO_CURL@

7
configure.ac

@ -437,21 +437,14 @@ if test -n "$ASCIIDOC"; then
AC_MSG_CHECKING([for asciidoc version]) AC_MSG_CHECKING([for asciidoc version])
asciidoc_version=`$ASCIIDOC --version 2>/dev/null` asciidoc_version=`$ASCIIDOC --version 2>/dev/null`
case "${asciidoc_version}" in case "${asciidoc_version}" in
asciidoc' '7*)
ASCIIDOC7=YesPlease
AC_MSG_RESULT([${asciidoc_version} > 7])
;;
asciidoc' '8*) asciidoc' '8*)
ASCIIDOC7=
AC_MSG_RESULT([${asciidoc_version}]) AC_MSG_RESULT([${asciidoc_version}])
;; ;;
*) *)
ASCIIDOC7=
AC_MSG_RESULT([${asciidoc_version} (unknown)]) AC_MSG_RESULT([${asciidoc_version} (unknown)])
;; ;;
esac esac
fi fi
AC_SUBST(ASCIIDOC7)
## Checks for libraries. ## Checks for libraries.