[PATCH] Fix typos in the documentation

Previous thread: Web browser and Git wiki (kernel.org) not getting along.... by Drew Northup on Saturday, January 1, 2011 - 9:16 pm. (2 messages)

Next thread: [PATCH] Consistent use of AC_LANG_PROGRAM in configure.ac and aclocal.m4. by Ralf Wildenhues on Saturday, January 1, 2011 - 11:00 pm. (5 messages)
From: Ralf Wildenhues
Date: Saturday, January 1, 2011 - 10:56 pm

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
---

Based on master not maint as the former has more typos.

Thanks for git,
Ralf

 Documentation/CodingGuidelines           |    2 +-
 Documentation/RelNotes/1.7.4.txt         |    9 ++++-----
 Documentation/config.txt                 |    4 ++--
 Documentation/git-add.txt                |    2 +-
 Documentation/git-bundle.txt             |    2 +-
 Documentation/git-fmt-merge-msg.txt      |    2 +-
 Documentation/git-remote-ext.txt         |   16 ++++++++--------
 Documentation/git-remote-fd.txt          |    8 ++++----
 Documentation/git-svn.txt                |    2 +-
 Documentation/gitmodules.txt             |    2 +-
 Documentation/merge-config.txt           |    2 +-
 Documentation/technical/api-sigchain.txt |    2 +-
 12 files changed, 26 insertions(+), 27 deletions(-)

diff --git a/Documentation/CodingGuidelines b/Documentation/CodingGuidelines
index 1b1c45d..ba2006d 100644
--- a/Documentation/CodingGuidelines
+++ b/Documentation/CodingGuidelines
@@ -157,7 +157,7 @@ Writing Documentation:
    --sort=<key>
    --abbrev[=<n>]
 
- Possibility of multiple occurences is indicated by three dots:
+ Possibility of multiple occurrences is indicated by three dots:
    <file>...
    (One or more of <file>.)
 
diff --git a/Documentation/RelNotes/1.7.4.txt b/Documentation/RelNotes/1.7.4.txt
index b736d39..5619641 100644
--- a/Documentation/RelNotes/1.7.4.txt
+++ b/Documentation/RelNotes/1.7.4.txt
@@ -8,12 +8,11 @@ Updates since v1.7.3
    docbook-xsl >= 1.73. If you have older versions, you can set
    ASCIIDOC7 and ASCIIDOC_ROFF, respectively.
 
- * The option parsers of various commands that create new branch (or
+ * The option parsers of various commands that create new branches (or
    rename existing ones to a new name) were too loose and users were
-   allowed to call a branch with a name that begins with a dash by
-   creative abuse of their command line options, which only lead to
-   burn themselves. ...
From: Drew Northup
Date: Monday, January 3, 2011 - 10:57 am

On Sun, 2011-01-02 at 06:56 +0100, Ralf Wildenhues wrote:

<snip for clarity>

Ralf,
Perhaps that should be:

- * The option parsers of various commands that create new branch (or
+ * The option parsers of various commands that create new branches (or
    rename existing ones to a new name) were too loose and users were
-   allowed to call a branch with a name that begins with a dash by
-   creative abuse of their command line options, which only lead to
-   burn themselves.  The name of a branch cannot begin with a dash
-   now.
+   allowed to give a branch a name that begins with a dash by creative
+   abuse of their command line options, which only led to burning 
+   themselves. The name of a branch cannot begin with a dash now.

(for consistency)?

-- 
-Drew Northup N1XIM
   AKA RvnPhnx on OPN
________________________________________________
"As opposed to vegetable or mineral error?"
-John Pescatore, SANS NewsBites Vol. 12 Num. 59

--

From: Ralf Wildenhues
Date: Monday, January 3, 2011 - 12:03 pm

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
---

Hello Drew,


As far as I can see, the only difference between my and your change is
"burn" vs. "burning" (ignoring trailing white space).  I don't see what
your version is consistent to that mine isn't, but I think that yours
is the grammatically correct way.  I'm not a native speaker though.
Anyway, here's the updated patch.

Thanks,
Ralf

 Documentation/CodingGuidelines           |    2 +-
 Documentation/RelNotes/1.7.4.txt         |    9 ++++-----
 Documentation/config.txt                 |    4 ++--
 Documentation/git-add.txt                |    2 +-
 Documentation/git-bundle.txt             |    2 +-
 Documentation/git-fmt-merge-msg.txt      |    2 +-
 Documentation/git-remote-ext.txt         |   16 ++++++++--------
 Documentation/git-remote-fd.txt          |    8 ++++----
 Documentation/git-svn.txt                |    2 +-
 Documentation/gitmodules.txt             |    2 +-
 Documentation/merge-config.txt           |    2 +-
 Documentation/technical/api-sigchain.txt |    2 +-
 12 files changed, 26 insertions(+), 27 deletions(-)

diff --git a/Documentation/CodingGuidelines b/Documentation/CodingGuidelines
index 1b1c45d..ba2006d 100644
--- a/Documentation/CodingGuidelines
+++ b/Documentation/CodingGuidelines
@@ -157,7 +157,7 @@ Writing Documentation:
    --sort=<key>
    --abbrev[=<n>]
 
- Possibility of multiple occurences is indicated by three dots:
+ Possibility of multiple occurrences is indicated by three dots:
    <file>...
    (One or more of <file>.)
 
diff --git a/Documentation/RelNotes/1.7.4.txt b/Documentation/RelNotes/1.7.4.txt
index b736d39..375fea1 100644
--- a/Documentation/RelNotes/1.7.4.txt
+++ b/Documentation/RelNotes/1.7.4.txt
@@ -8,12 +8,11 @@ Updates since v1.7.3
    docbook-xsl >= 1.73. If you have older versions, you can set
    ASCIIDOC7 and ASCIIDOC_ROFF, respectively.
 
- * The option parsers of various commands that create new branch (or
+ * The option parsers of ...
From: Junio C Hamano
Date: Tuesday, January 4, 2011 - 12:18 pm

Thanks for your attention to the details.  Will apply.
--

Previous thread: Web browser and Git wiki (kernel.org) not getting along.... by Drew Northup on Saturday, January 1, 2011 - 9:16 pm. (2 messages)

Next thread: [PATCH] Consistent use of AC_LANG_PROGRAM in configure.ac and aclocal.m4. by Ralf Wildenhues on Saturday, January 1, 2011 - 11:00 pm. (5 messages)