Skip to content

Commit aa971cb

Browse files
Junio C Hamanogitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 553589f commit aa971cb

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

Documentation/user-manual.txt

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ to build and test a particular version of a software project, search for
1313
regressions, and so on.
1414

1515
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>>.
1717

1818
Further chapters cover more specialized topics.
1919

@@ -389,7 +389,7 @@ the order it uses to decide which to choose when there are multiple
389389
references with the same shorthand name, see the "SPECIFYING
390390
REVISIONS" section of linkgit:git-rev-parse[1].
391391

392-
[[Updating-a-repository-with-git-fetch]]
392+
[[Updating-a-repository-With-git-fetch]]
393393
Updating a repository with git-fetch
394394
------------------------------------
395395

@@ -945,7 +945,7 @@ echo "git diff --stat --summary -M v$last v$new > ../diffstat-$new"
945945
and then he just cut-and-pastes the output commands after verifying that
946946
they look OK.
947947

948-
[[Finding-comments-with-given-content]]
948+
[[Finding-comments-With-given-Content]]
949949
Finding commits referencing a file with given content
950950
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
951951

@@ -962,7 +962,7 @@ Figuring out why this works is left as an exercise to the (advanced)
962962
student. The linkgit:git-log[1], linkgit:git-diff-tree[1], and
963963
linkgit:git-hash-object[1] man pages may prove helpful.
964964

965-
[[Developing-with-git]]
965+
[[Developing-With-git]]
966966
Developing with git
967967
===================
968968

@@ -1665,15 +1665,15 @@ dangling objects can arise in other situations.
16651665
Sharing development with others
16661666
===============================
16671667

1668-
[[getting-updates-with-git-pull]]
1668+
[[getting-updates-With-git-pull]]
16691669
Getting updates with git-pull
16701670
-----------------------------
16711671

16721672
After you clone a repository and make a few changes of your own, you
16731673
may wish to check the original repository for updates and merge them
16741674
into your own work.
16751675

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
16771677
keep remote tracking branches up to date>> with linkgit:git-fetch[1],
16781678
and how to merge two branches. So you can merge in changes from the
16791679
original repository's master branch with:
@@ -1784,7 +1784,7 @@ Public git repositories
17841784

17851785
Another way to submit changes to a project is to tell the maintainer
17861786
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,
17881788
Getting updates with git-pull>>" we described this as a way to get
17891789
updates from the "main" repository, but it works just as well in the
17901790
other direction.
@@ -1994,7 +1994,7 @@ $ git push ssh://yourserver.com/~you/proj.git +master
19941994
Normally whenever a branch head in a public repository is modified, it
19951995
is modified to point to a descendant of the commit that it pointed to
19961996
before. By forcing a push in this situation, you break that convention.
1997-
(See <<problems-with-rewriting-history>>.)
1997+
(See <<problems-With-rewriting-history>>.)
19981998

19991999
Nevertheless, this is a common practice for people that need a simple
20002000
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
25632563
purpose of maintaining a patch series. These are outside of the scope of
25642564
this manual.
25652565

2566-
[[problems-with-rewriting-history]]
2566+
[[problems-With-rewriting-history]]
25672567
Problems with rewriting history
25682568
-------------------------------
25692569

0 commit comments

Comments
 (0)