Mercurial > public > mercurial-scm > hg-stable
diff mercurial/help/merge-tools.txt @ 17267:979b107eaea2 stable
doc: unify section level between help topics
Some help topics use "-" for the top level underlining section mark,
but "-" is used also for the top level categorization in generated
documents: "hg.1.html", for example.
So, TOC in such documents contain "sections in each topics", too.
This patch changes underlining section mark in some help topics to
unify section level in generated documents.
After this patching, levels of each section marks are:
level0
""""""
level1
======
level2
------
level3
......
level4
######
And use of section markers in each documents are:
- mercurial/help/*.txt can use level1 or more
(now these use level1 and level2)
- help for core commands can use level2 or more
(now these use no section marker)
- descriptions of extensions can use level2 or more
(now hgext/acl uses level2)
- help for commands defined in extension can use level4 or more
(now "convert" of hgext/convert uses level4)
"Level0" is used as top level categorization only in "doc/hg.1.txt"
and the intermediate file generated by "doc/gendoc.py", so end users
don't see it in "hg help" outoput and so on.
author | FUJIWARA Katsunori <foozy@lares.dti.ne.jp> |
---|---|
date | Wed, 25 Jul 2012 16:40:38 +0900 |
parents | 0c4bec9596d8 |
children | f1a3ae7c15df |
line wrap: on
line diff
--- a/mercurial/help/merge-tools.txt Mon Jul 23 19:03:32 2012 +0200 +++ b/mercurial/help/merge-tools.txt Wed Jul 25 16:40:38 2012 +0900 @@ -17,7 +17,7 @@ programs but relies on external tools for that. Available merge tools -""""""""""""""""""""" +===================== External merge tools and their properties are configured in the merge-tools configuration section - see hgrc(5) - but they can often just @@ -40,7 +40,7 @@ not handle symlinks or binary files. Choosing a merge tool -""""""""""""""""""""" +===================== Mercurial uses these rules when deciding which merge tool to use: