git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
* [PATCH] Fix Dcoumentation typos surrounding the word 'handful'.
@ 2009-01-12 20:02 Jon Loeliger
  2009-01-13  0:31 ` Markus Heidelberg
                   ` (2 more replies)
  0 siblings, 3 replies; 6+ messages in thread
From: Jon Loeliger @ 2009-01-12 20:02 UTC (permalink / raw
  To: git; +Cc: Jon Loeliger

Some instances replaced by "handful of", others use
the word "few", a couple get a slight rewording.

Signed-off-by: Jon Loeliger <jdl@freescale.com>
---

Junio,

I wasn't sure that fixing the release notes was important.
I can hit those too if you would like.

jdl


 Documentation/diff-options.txt                     |    2 +-
 Documentation/git-describe.txt                     |    2 +-
 Documentation/git-ls-files.txt                     |    2 +-
 Documentation/git-ls-tree.txt                      |    2 +-
 Documentation/gitcore-tutorial.txt                 |    8 ++++----
 Documentation/githooks.txt                         |    2 +-
 .../howto/rebase-from-internal-branch.txt          |    2 +-
 Documentation/pretty-options.txt                   |    2 +-
 8 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index 671f533..43793d7 100644
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -116,7 +116,7 @@ endif::git-format-patch[]
 --abbrev[=<n>]::
 	Instead of showing the full 40-byte hexadecimal object
 	name in diff-raw format output and diff-tree header
-	lines, show only handful hexdigits prefix.  This is
+	lines, show only a partial prefix.  This is
 	independent of --full-index option above, which controls
 	the diff-patch output format.  Non default number of
 	digits can be specified with --abbrev=<n>.
diff --git a/Documentation/git-describe.txt b/Documentation/git-describe.txt
index 3d79f05..a99b4ef 100644
--- a/Documentation/git-describe.txt
+++ b/Documentation/git-describe.txt
@@ -87,7 +87,7 @@ With something like git.git current tree, I get:
 	v1.0.4-14-g2414721
 
 i.e. the current head of my "parent" branch is based on v1.0.4,
-but since it has a handful commits on top of that,
+but since it has a few commits on top of that,
 describe has added the number of additional commits ("14") and
 an abbreviated object name for the commit itself ("2414721")
 at the end.
diff --git a/Documentation/git-ls-files.txt b/Documentation/git-ls-files.txt
index 9f85d60..057a021 100644
--- a/Documentation/git-ls-files.txt
+++ b/Documentation/git-ls-files.txt
@@ -126,7 +126,7 @@ OPTIONS
 
 --abbrev[=<n>]::
 	Instead of showing the full 40-byte hexadecimal object
-	lines, show only handful hexdigits prefix.
+	lines, show only a partial prefix.
 	Non default number of digits can be specified with --abbrev=<n>.
 
 \--::
diff --git a/Documentation/git-ls-tree.txt b/Documentation/git-ls-tree.txt
index 4c7262f..b345f4d 100644
--- a/Documentation/git-ls-tree.txt
+++ b/Documentation/git-ls-tree.txt
@@ -59,7 +59,7 @@ OPTIONS
 
 --abbrev[=<n>]::
 	Instead of showing the full 40-byte hexadecimal object
-	lines, show only handful hexdigits prefix.
+	lines, show only a partal prefix.
 	Non default number of digits can be specified with --abbrev=<n>.
 
 --full-name::
diff --git a/Documentation/gitcore-tutorial.txt b/Documentation/gitcore-tutorial.txt
index e4dd551..7ba5e58 100644
--- a/Documentation/gitcore-tutorial.txt
+++ b/Documentation/gitcore-tutorial.txt
@@ -1243,10 +1243,10 @@ $ git ls-files --stage
 ------------
 
 In our example of only two files, we did not have unchanged
-files so only 'example' resulted in collapsing, but in real-life
-large projects, only small number of files change in one commit,
-and this 'collapsing' tends to trivially merge most of the paths
-fairly quickly, leaving only a handful the real changes in non-zero
+files so only 'example' resulted in collapsing.  But in real-life
+large projects, when only a small number of files change in one commit,
+this 'collapsing' tends to trivially merge most of the paths
+fairly quickly, leaving only a handful of real changes in non-zero
 stages.
 
 To look at only non-zero stages, use `\--unmerged` flag:
diff --git a/Documentation/githooks.txt b/Documentation/githooks.txt
index cfdae1e..e4d61d5 100644
--- a/Documentation/githooks.txt
+++ b/Documentation/githooks.txt
@@ -15,7 +15,7 @@ DESCRIPTION
 
 Hooks are little scripts you can place in `$GIT_DIR/hooks`
 directory to trigger action at certain points.  When
-'git-init' is run, a handful example hooks are copied in the
+'git-init' is run, a handful of example hooks are copied into the
 `hooks` directory of the new repository, but by default they are
 all disabled.  To enable a hook, rename it by removing its `.sample`
 suffix.
diff --git a/Documentation/howto/rebase-from-internal-branch.txt b/Documentation/howto/rebase-from-internal-branch.txt
index d214d4b..74a1c0c 100644
--- a/Documentation/howto/rebase-from-internal-branch.txt
+++ b/Documentation/howto/rebase-from-internal-branch.txt
@@ -27,7 +27,7 @@ the kind of task StGIT is designed to do.
 I just have done a simpler one, this time using only the core
 GIT tools.
 
-I had a handful commits that were ahead of master in pu, and I
+I had a handful of commits that were ahead of master in pu, and I
 wanted to add some documentation bypassing my usual habit of
 placing new things in pu first.  At the beginning, the commit
 ancestry graph looked like this:
diff --git a/Documentation/pretty-options.txt b/Documentation/pretty-options.txt
index 6d66c74..5f21efe 100644
--- a/Documentation/pretty-options.txt
+++ b/Documentation/pretty-options.txt
@@ -10,7 +10,7 @@ configuration (see linkgit:git-config[1]).
 
 --abbrev-commit::
 	Instead of showing the full 40-byte hexadecimal commit object
-	name, show only handful hexdigits prefix.  Non default number of
+	name, show only a partial prefix.  Non default number of
 	digits can be specified with "--abbrev=<n>" (which also modifies
 	diff output, if it is displayed).
 +
-- 
1.6.0.4.761.g47577

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* Re: [PATCH] Fix Dcoumentation typos surrounding the word 'handful'.
  2009-01-12 20:02 [PATCH] Fix Dcoumentation typos surrounding the word 'handful' Jon Loeliger
@ 2009-01-13  0:31 ` Markus Heidelberg
  2009-01-13  2:02 ` Sam Vilain
  2009-01-13  9:24 ` [PATCH] Fix Documentation " Junio C Hamano
  2 siblings, 0 replies; 6+ messages in thread
From: Markus Heidelberg @ 2009-01-13  0:31 UTC (permalink / raw
  To: Jon Loeliger; +Cc: git

Jon Loeliger, 12.01.2009:
> +++ b/Documentation/git-ls-tree.txt
> @@ -59,7 +59,7 @@ OPTIONS
>  
>  --abbrev[=<n>]::
>  	Instead of showing the full 40-byte hexadecimal object
> -	lines, show only handful hexdigits prefix.
> +	lines, show only a partal prefix.

partial :)

Markus

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] Fix Dcoumentation typos surrounding the word 'handful'.
  2009-01-12 20:02 [PATCH] Fix Dcoumentation typos surrounding the word 'handful' Jon Loeliger
  2009-01-13  0:31 ` Markus Heidelberg
@ 2009-01-13  2:02 ` Sam Vilain
  2009-01-13  9:24 ` [PATCH] Fix Documentation " Junio C Hamano
  2 siblings, 0 replies; 6+ messages in thread
From: Sam Vilain @ 2009-01-13  2:02 UTC (permalink / raw
  To: Jon Loeliger; +Cc: git

Jon Loeliger wrote:
> Subject: Fix Dcoumentation typos surrounding the word 'handful'.
>   

Do ironic subjects meet acceptance criteria? :)

Sam.

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] Fix Documentation typos surrounding the word 'handful'.
  2009-01-12 20:02 [PATCH] Fix Dcoumentation typos surrounding the word 'handful' Jon Loeliger
  2009-01-13  0:31 ` Markus Heidelberg
  2009-01-13  2:02 ` Sam Vilain
@ 2009-01-13  9:24 ` Junio C Hamano
  2009-01-13 17:59   ` Jon Loeliger
  2 siblings, 1 reply; 6+ messages in thread
From: Junio C Hamano @ 2009-01-13  9:24 UTC (permalink / raw
  To: Jon Loeliger; +Cc: git

Thanks, applied with fix from Markus and Sam.

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] Fix Documentation typos surrounding the word 'handful'.
  2009-01-13  9:24 ` [PATCH] Fix Documentation " Junio C Hamano
@ 2009-01-13 17:59   ` Jon Loeliger
  2009-01-13 22:45     ` Johannes Schindelin
  0 siblings, 1 reply; 6+ messages in thread
From: Jon Loeliger @ 2009-01-13 17:59 UTC (permalink / raw
  To: Junio C Hamano; +Cc: Git List

On Tue, 2009-01-13 at 01:24 -0800, Junio C Hamano wrote:
> Thanks, applied with fix from Markus and Sam.

Thanks, Junio, for fixinf my lameness... :-)

jdl

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] Fix Documentation typos surrounding the word 'handful'.
  2009-01-13 17:59   ` Jon Loeliger
@ 2009-01-13 22:45     ` Johannes Schindelin
  0 siblings, 0 replies; 6+ messages in thread
From: Johannes Schindelin @ 2009-01-13 22:45 UTC (permalink / raw
  To: Jon Loeliger; +Cc: Junio C Hamano, Git List

Hi,

On Tue, 13 Jan 2009, Jon Loeliger wrote:

> On Tue, 2009-01-13 at 01:24 -0800, Junio C Hamano wrote:
> > Thanks, applied with fix from Markus and Sam.
> 
> Thanks, Junio, for fixinf my lameness... :-)

Heh, I found this quote from Gerald M. Weinberg today:

	The computer "doth make fools of us all," so that any fool without 
	the ability to share a laugh on himself will be unable to tolerate 
	programming for long.

Chuckles,
Dscho

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2009-01-13 22:46 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-01-12 20:02 [PATCH] Fix Dcoumentation typos surrounding the word 'handful' Jon Loeliger
2009-01-13  0:31 ` Markus Heidelberg
2009-01-13  2:02 ` Sam Vilain
2009-01-13  9:24 ` [PATCH] Fix Documentation " Junio C Hamano
2009-01-13 17:59   ` Jon Loeliger
2009-01-13 22:45     ` Johannes Schindelin

Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).