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. ...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
--
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 ...Thanks for your attention to the details. Will apply. --
