work around Python warnings from AsciiDoc
It appears that a reference to an anchor defined as [[anchor-name]] from another place using <<anchor-name>> syntax, when the anchor name contains a string "-with-" in its name, triggers these warnings from Python interpreter. asciidoc -b docbook -d book user-manual.txt <string>:1: Warning: 'with' will become a reserved keyword in Python 2.6 <string>:1: Warning: 'with' will become a reserved keyword in Python 2.6 <string>:1: Warning: 'with' will become a reserved keyword in Python 2.6 <string>:1: Warning: 'with' will become a reserved keyword in Python 2.6 There currently is no reference to "Finding comments with given content", but for consistency and for futureproofing, the anchor is also updated as the other ones that are actually used and trigger these warnings. Signed-off-by: Junio C Hamano <junio@pobox.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Dec 7, 2008 at 18:38 UTC
aa971cb9bf4105eefb435b9e6f282f019529c35f
1 file changed
+9
-9
Documentation/user-manual.txt
+9
-9
@@ -13,7 +13,7 @@ to build and test a particular version of a software project, search for
13
regressions, and so on.
14
15
People needing to do actual development will also want to read
16
-<<Developing-with-git>> and <<sharing-development>>.
16
+<<Developing-With-git>> and <<sharing-development>>.
17
18
Further chapters cover more specialized topics.
19
@@ -389,7 +389,7 @@ the order it uses to decide which to choose when there are multiple
389
references with the same shorthand name, see the "SPECIFYING
390
REVISIONS" section of linkgit:git-rev-parse[1].
391
392
-[[Updating-a-repository-with-git-fetch]]
392
+[[Updating-a-repository-With-git-fetch]]
393
Updating a repository with git-fetch
394
------------------------------------
395
@@ -945,7 +945,7 @@ echo "git diff --stat --summary -M v$last v$new > ../diffstat-$new"
945
and then he just cut-and-pastes the output commands after verifying that
946
they look OK.
947
948
-[[Finding-comments-with-given-content]]
948
+[[Finding-comments-With-given-Content]]
949
Finding commits referencing a file with given content
950
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
951
@@ -962,7 +962,7 @@ Figuring out why this works is left as an exercise to the (advanced)
962
student. The linkgit:git-log[1], linkgit:git-diff-tree[1], and
963
linkgit:git-hash-object[1] man pages may prove helpful.
964
965
-[[Developing-with-git]]
965
+[[Developing-With-git]]
966
Developing with git
967
===================
968
@@ -1665,7 +1665,7 @@ dangling objects can arise in other situations.
1665
Sharing development with others
1666
===============================
1667
1668
-[[getting-updates-with-git-pull]]
1668
+[[getting-updates-With-git-pull]]
1669
Getting updates with git-pull
1670
-----------------------------
1671
@@ -1673,7 +1673,7 @@ After you clone a repository and make a few changes of your own, you
1673
may wish to check the original repository for updates and merge them
1674
into your own work.
1675
1676
-We have already seen <<Updating-a-repository-with-git-fetch,how to
1676
+We have already seen <<Updating-a-repository-With-git-fetch,how to
1677
keep remote tracking branches up to date>> with linkgit:git-fetch[1],
1678
and how to merge two branches. So you can merge in changes from the
1679
original repository's master branch with:
@@ -1784,7 +1784,7 @@ Public git repositories
1784
1785
Another way to submit changes to a project is to tell the maintainer
1786
of that project to pull the changes from your repository using
1787
-linkgit:git-pull[1]. In the section "<<getting-updates-with-git-pull,
1787
+linkgit:git-pull[1]. In the section "<<getting-updates-With-git-pull,
1788
Getting updates with git-pull>>" we described this as a way to get
1789
updates from the "main" repository, but it works just as well in the
1790
other direction.
@@ -1994,7 +1994,7 @@ $ git push ssh://yourserver.com/~you/proj.git +master
1994
Normally whenever a branch head in a public repository is modified, it
1995
is modified to point to a descendant of the commit that it pointed to
1996
before. By forcing a push in this situation, you break that convention.
1997
-(See <<problems-with-rewriting-history>>.)
1997
+(See <<problems-With-rewriting-history>>.)
1998
1999
Nevertheless, this is a common practice for people that need a simple
2000
way to publish a work-in-progress patch series, and it is an acceptable
@@ -2563,7 +2563,7 @@ There are numerous other tools, such as StGIT, which exist for the
2563
purpose of maintaining a patch series. These are outside of the scope of
2564
this manual.
2565
2566
-[[problems-with-rewriting-history]]
2566
+[[problems-With-rewriting-history]]
2567
Problems with rewriting history
2568
-------------------------------
2569