Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
git
提交
0d181cbb
G
git
项目概览
李少辉-开发者
/
git
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
git
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
0d181cbb
编写于
12月 12, 2010
作者:
J
Junio C Hamano
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'jk/asciidoc-update'
* jk/asciidoc-update: docs: default to more modern toolset
上级
73fd7f37
79c461d5
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
27 addition
and
29 deletion
+27
-29
Documentation/Makefile
Documentation/Makefile
+8
-15
Documentation/RelNotes/1.7.4.txt
Documentation/RelNotes/1.7.4.txt
+4
-0
INSTALL
INSTALL
+3
-2
Makefile
Makefile
+5
-5
config.mak.in
config.mak.in
+1
-1
configure.ac
configure.ac
+6
-6
未找到文件。
Documentation/Makefile
浏览文件 @
0d181cbb
...
...
@@ -63,35 +63,28 @@ endif
#
# For asciidoc ...
# -7.1.2,
no extra settings are needed.
# 8.0-,
set ASCIIDOC8.
# -7.1.2,
set ASCIIDOC7
# 8.0-,
no extra settings are needed
#
#
# For docbook-xsl ...
# -1.68.1,
set ASCIIDOC_NO_ROFF? (based on changelog from 1.73.0)
# 1.69.0,
no extra settings are needed
?
# -1.68.1,
no extra settings are needed?
# 1.69.0,
set ASCIIDOC_ROFF
?
# 1.69.1-1.71.0, set DOCBOOK_SUPPRESS_SP?
# 1.71.1,
no extra settings are needed
?
# 1.71.1,
set ASCIIDOC_ROFF
?
# 1.72.0, set DOCBOOK_XSL_172.
# 1.73.0-,
set ASCIIDOC_NO_ROFF
# 1.73.0-,
no extra settings are needed
#
#
# If you had been using DOCBOOK_XSL_172 in an attempt to get rid
# of 'the ".ft C" problem' in your generated manpages, and you
# instead ended up with weird characters around callouts, try
# using ASCIIDOC_NO_ROFF instead (it works fine with ASCIIDOC8).
#
ifdef
ASCIIDOC8
ifndef
ASCIIDOC7
ASCIIDOC_EXTRA
+=
-a
asciidoc7compatible
-a
no-inline-literal
endif
ifdef
DOCBOOK_XSL_172
ASCIIDOC_EXTRA
+=
-a
git-asciidoc-no-roff
MANPAGE_XSL
=
manpage-1.72.xsl
else
if
def
ASCIIDOC_NO
_ROFF
if
ndef
ASCIIDOC
_ROFF
# docbook-xsl after 1.72 needs the regular XSL, but will not
# pass-thru raw roff codes from asciidoc.conf, so turn them off.
ASCIIDOC_EXTRA
+=
-a
git-asciidoc-no-roff
...
...
Documentation/RelNotes/1.7.4.txt
浏览文件 @
0d181cbb
...
...
@@ -4,6 +4,10 @@ Git v1.7.4 Release Notes (draft)
Updates since v1.7.3
--------------------
* The documentation Makefile now assumes by default asciidoc 8 and
docbook-xsl >= 1.73. If you have older versions, you can set
ASCIIDOC7 and ASCIIDOC_ROFF, respectively.
* The option parsers of various commands that create new branch (or
rename existing ones to a new name) were too loose and users were
allowed to call a branch with a name that begins with a dash by
...
...
INSTALL
浏览文件 @
0d181cbb
...
...
@@ -122,8 +122,9 @@ Issues of note:
Building and installing the pdf file additionally requires
dblatex. Version 0.2.7 with asciidoc >= 8.2.7 is known to work.
The documentation is written for AsciiDoc 7, but "make
ASCIIDOC8=YesPlease doc" will let you format with AsciiDoc 8.
The documentation is written for AsciiDoc 7, but by default
uses some compatibility wrappers to work on AsciiDoc 8. If you have
AsciiDoc 7, try "make ASCIIDOC7=YesPlease".
Alternatively, pre-formatted documentation is available in
"html" and "man" branches of the git repository itself. For
...
...
Makefile
浏览文件 @
0d181cbb
...
...
@@ -167,13 +167,13 @@ 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 ASCIIDOC
8 if you want to format documentation with AsciiDoc 8
# Define ASCIIDOC
7 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).
#
# Define ASCIIDOC_
NO_ROFF if your DocBook XSL escapes
raw roff directives
# (versions 1.
72 and later and 1.68.1 and earlier
).
# Define ASCIIDOC_
ROFF if your DocBook XSL does not escape
raw roff directives
# (versions 1.
68.1 through v1.72
).
#
# Define GNU_ROFF if your target system uses GNU groff. This forces
# apostrophes to be ASCII so that cut&pasting examples to the shell
...
...
@@ -1579,8 +1579,8 @@ ifndef V
endif
endif
ifdef
ASCIIDOC
8
export
ASCIIDOC
8
ifdef
ASCIIDOC
7
export
ASCIIDOC
7
endif
# Shell quote (do not use $(call) to accommodate ancient setups);
...
...
config.mak.in
浏览文件 @
0d181cbb
...
...
@@ -27,7 +27,7 @@ VPATH = @srcdir@
export exec_prefix mandir
export srcdir VPATH
ASCIIDOC
8=@ASCIIDOC8
@
ASCIIDOC
7=@ASCIIDOC7
@
NEEDS_SSL_WITH_CRYPTO=@NEEDS_SSL_WITH_CRYPTO@
NO_OPENSSL=@NO_OPENSSL@
NO_CURL=@NO_CURL@
...
...
configure.ac
浏览文件 @
0d181cbb
...
...
@@ -398,21 +398,21 @@ if test -n "$ASCIIDOC"; then
AC_MSG_CHECKING([for asciidoc version])
asciidoc_version=`$ASCIIDOC --version 2>/dev/null`
case "${asciidoc_version}" in
asciidoc' '
8
*)
ASCIIDOC
8
=YesPlease
asciidoc' '
7
*)
ASCIIDOC
7
=YesPlease
AC_MSG_RESULT([${asciidoc_version} > 7])
;;
asciidoc' '
7
*)
ASCIIDOC
8
=
asciidoc' '
8
*)
ASCIIDOC
7
=
AC_MSG_RESULT([${asciidoc_version}])
;;
*)
ASCIIDOC
8
=
ASCIIDOC
7
=
AC_MSG_RESULT([${asciidoc_version} (unknown)])
;;
esac
fi
AC_SUBST(ASCIIDOC
8
)
AC_SUBST(ASCIIDOC
7
)
## Checks for libraries.
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录