undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'js/asciidoctor-tweaks'

Browse Source 
Adjust documentation to help AsciiDoctor render better while not
breaking the rendering done by AsciiDoc.

* js/asciidoctor-tweaks:
  asciidoctor: fix user-manual to be built by `asciidoctor`
  giteveryday: unbreak rendering with AsciiDoctor
This commit is contained in:
Junio C Hamano 2017-01-18 15:12:17 -08:00
commit 0abfede3ae
3 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/Makefile
View File

@ -337,7 +337,7 @@ manpage-base-url.xsl: manpage-base-url.xsl.in
user-manual.xml: user-manual.txt user-manual.conf user-manual.xml: user-manual.txt user-manual.conf
$(QUIET_ASCIIDOC)$(RM) $@+ $@ && \ $(QUIET_ASCIIDOC)$(RM) $@+ $@ && \
$(TXT_TO_XML) -d article -o $@+ $< && \ $(TXT_TO_XML) -d book -o $@+ $< && \
mv $@+ $@ mv $@+ $@
technical/api-index.txt: technical/api-index-skel.txt \ technical/api-index.txt: technical/api-index-skel.txt \

17
Documentation/giteveryday.txt
View File

@ -307,9 +307,16 @@ master or exposed as a part of a stable branch.
<9> backport a critical fix. <9> backport a critical fix.
<10> create a signed tag. <10> create a signed tag.
<11> make sure master was not accidentally rewound beyond that <11> make sure master was not accidentally rewound beyond that
already pushed out. `ko` shorthand points at the Git maintainer's already pushed out.
<12> In the output from `git show-branch`, `master` should have
everything `ko/master` has, and `next` should have
everything `ko/next` has, etc.
<13> push out the bleeding edge, together with new tags that point
into the pushed history.
In this example, the `ko` shorthand points at the Git maintainer's
repository at kernel.org, and looks like this: repository at kernel.org, and looks like this:
+
------------ ------------
(in .git/config) (in .git/config)
[remote "ko"] [remote "ko"]
@ -320,12 +327,6 @@ repository at kernel.org, and looks like this:
push = +refs/heads/pu push = +refs/heads/pu
push = refs/heads/maint push = refs/heads/maint
------------ ------------
+
<12> In the output from `git show-branch`, `master` should have
everything `ko/master` has, and `next` should have
everything `ko/next` has, etc.
<13> push out the bleeding edge, together with new tags that point
into the pushed history.
Repository Administration[[ADMINISTRATION]] Repository Administration[[ADMINISTRATION]]

8
Documentation/user-manual.txt
View File

@ -4395,6 +4395,10 @@ itself!
Git Glossary Git Glossary
============ ============
[[git-explained]]
Git explained
-------------
include::glossary-content.txt[] include::glossary-content.txt[]
[[git-quick-start]] [[git-quick-start]]
@ -4636,6 +4640,10 @@ $ git gc
Appendix B: Notes and todo list for this manual Appendix B: Notes and todo list for this manual
=============================================== ===============================================
[[todo-list]]
Todo list
---------
This is a work in progress. This is a work in progress.
The basic requirements: The basic requirements: