Documentation: quote {non-attributes} for asciidoc

Asciidoc treats {foo} as an attribute to be substituted; if
'foo' doesn't exist as an attribute, then the entire line
gets dropped. When the literal {foo} is desired, \{foo} is
required.

The exceptions to this rule are:
- inside literal blocks
- if the 'foo' contains non-alphanumeric characters (e.g.,
{foo|bar} is assumed not to be an attribute)

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt
index 8d72bb93680332da560b5b1e55a3d42c4755247c..9713f906bf734f540ad6713acb349d84b14cfec4 100644 (file)
--- a/Documentation/git-branch.txt
+++ b/Documentation/git-branch.txt
@@ -56,7 +56,7 @@ OPTIONS
 -l::
        Create the branch's ref log.  This activates recording of
        all changes to made the branch ref, enabling use of date
 -l::
        Create the branch's ref log.  This activates recording of
        all changes to made the branch ref, enabling use of date

-       based sha1 expressions such as "<branchname>@{yesterday}".
+       based sha1 expressions such as "<branchname>@\{yesterday}".

 
 -f::
        Force the creation of a new branch even if it means deleting
 
 -f::
        Force the creation of a new branch even if it means deleting

diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt
index ea26da8e21030883e3655dcbc28ad06a4e3816f5..a6571d2d8d7441ca23c3073414ef382a795ff668 100644 (file)
--- a/Documentation/git-checkout.txt
+++ b/Documentation/git-checkout.txt
@@ -64,7 +64,7 @@ OPTIONS
 -l::
        Create the new branch's ref log.  This activates recording of
        all changes to made the branch ref, enabling use of date
 -l::
        Create the new branch's ref log.  This activates recording of
        all changes to made the branch ref, enabling use of date

-       based sha1 expressions such as "<branchname>@{yesterday}".
+       based sha1 expressions such as "<branchname>@\{yesterday}".

 
 -m::
        If you have local modifications to one or more files that
 
 -m::
        If you have local modifications to one or more files that

diff --git a/Documentation/git-receive-pack.txt b/Documentation/git-receive-pack.txt
index 6914aa59c3ae6b8174e865e3c46b68bef4d375ca..4ef18404722e045bbc0b010545b3a34cac2d6586 100644 (file)
--- a/Documentation/git-receive-pack.txt
+++ b/Documentation/git-receive-pack.txt
@@ -48,8 +48,8 @@ standard input of the hook will be one line per ref to be updated:
 The refname value is relative to $GIT_DIR; e.g. for the master
 head this is "refs/heads/master".  The two sha1 values before
 each refname are the object names for the refname before and after
 The refname value is relative to $GIT_DIR; e.g. for the master
 head this is "refs/heads/master".  The two sha1 values before
 each refname are the object names for the refname before and after

-the update.  Refs to be created will have sha1-old equal to 0{40},
-while refs to be deleted will have sha1-new equal to 0{40}, otherwise
+the update.  Refs to be created will have sha1-old equal to 0\{40},
+while refs to be deleted will have sha1-new equal to 0\{40}, otherwise

 sha1-old and sha1-new should be valid objects in the repository.
 
 This hook is called before any refname is updated and before any
 sha1-old and sha1-new should be valid objects in the repository.
 
 This hook is called before any refname is updated and before any


@@ -71,7 +71,7 @@ The refname parameter is relative to $GIT_DIR; e.g. for the master
 head this is "refs/heads/master".  The two sha1 arguments are
 the object names for the refname before and after the update.
 Note that the hook is called before the refname is updated,
 head this is "refs/heads/master".  The two sha1 arguments are
 the object names for the refname before and after the update.
 Note that the hook is called before the refname is updated,

-so either sha1-old is 0{40} (meaning there is no such ref yet),
+so either sha1-old is 0\{40} (meaning there is no such ref yet),

 or it should match what is recorded in refname.
 
 The hook should exit with non-zero status if it wants to disallow
 or it should match what is recorded in refname.
 
 The hook should exit with non-zero status if it wants to disallow


@@ -96,8 +96,8 @@ The refname value is relative to $GIT_DIR; e.g. for the master
 head this is "refs/heads/master".  The two sha1 values before
 each refname are the object names for the refname before and after
 the update.  Refs that were created will have sha1-old equal to
 head this is "refs/heads/master".  The two sha1 values before
 each refname are the object names for the refname before and after
 the update.  Refs that were created will have sha1-old equal to

-0{40}, while refs that were deleted will have sha1-new equal to
-0{40}, otherwise sha1-old and sha1-new should be valid objects in
+0\{40}, while refs that were deleted will have sha1-new equal to
+0\{40}, otherwise sha1-old and sha1-new should be valid objects in

 the repository.
 
 Using this hook, it is easy to generate mails describing the updates
 the repository.
 
 Using this hook, it is easy to generate mails describing the updates

diff --git a/Documentation/git-rev-list.txt b/Documentation/git-rev-list.txt
index 32cb13faec8abc08d72912dbaf6bfc668ac4abd9..20dcac625204869cf6c426d338f2fafd567368b9 100644 (file)
--- a/Documentation/git-rev-list.txt
+++ b/Documentation/git-rev-list.txt
@@ -284,9 +284,9 @@ excluded from the output.
 +
 With '\--pretty' format other than oneline (for obvious reasons),
 this causes the output to have two extra lines of information
 +
 With '\--pretty' format other than oneline (for obvious reasons),
 this causes the output to have two extra lines of information

-taken from the reflog.  By default, 'commit@{Nth}' notation is
+taken from the reflog.  By default, 'commit@\{Nth}' notation is

 used in the output.  When the starting commit is specified as
 used in the output.  When the starting commit is specified as

-'commit@{now}', output also uses 'commit@{timestamp}' notation
+'commit@{now}', output also uses 'commit@\{timestamp}' notation

 instead.  Under '\--pretty=oneline', the commit message is
 prefixed with this information on the same line.
 
 instead.  Under '\--pretty=oneline', the commit message is
 prefixed with this information on the same line.