Git development
 help / color / mirror / Atom feed
From: Jonathan Nieder <jrnieder@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Stefano Lattarini <stefano.lattarini@gmail.com>,
	sunshine@sunshineco.com, git@vger.kernel.org
Subject: [PATCH 01/10] doc: various spelling fixes
Date: Thu, 11 Apr 2013 23:49:53 -0700	[thread overview]
Message-ID: <20130412064953.GB5710@elie.Belkin> (raw)
In-Reply-To: <20130412064837.GA5710@elie.Belkin>

From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Fri, 12 Apr 2013 00:36:10 +0200

Most of these were found using Lucas De Marchi's codespell tool.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
---
I like this one.

 Documentation/git-credential.txt              | 2 +-
 Documentation/git-remote-ext.txt              | 2 +-
 Documentation/git-svn.txt                     | 4 ++--
 Documentation/git-tools.txt                   | 2 +-
 Documentation/revisions.txt                   | 2 +-
 Documentation/technical/api-argv-array.txt    | 2 +-
 Documentation/technical/api-credentials.txt   | 2 +-
 Documentation/technical/api-ref-iteration.txt | 2 +-
 gitweb/INSTALL                                | 2 +-
 po/README                                     | 6 +++---
 10 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/Documentation/git-credential.txt b/Documentation/git-credential.txt
index 472f00f6..7da0f13a 100644
--- a/Documentation/git-credential.txt
+++ b/Documentation/git-credential.txt
@@ -56,7 +56,7 @@ For example, if we want a password for
 `https://example.com/foo.git`, we might generate the following
 credential description (don't forget the blank line at the end; it
 tells `git credential` that the application finished feeding all the
-infomation it has):
+information it has):
 
 	 protocol=https
 	 host=example.com
diff --git a/Documentation/git-remote-ext.txt b/Documentation/git-remote-ext.txt
index 58b7facb..8cfc748a 100644
--- a/Documentation/git-remote-ext.txt
+++ b/Documentation/git-remote-ext.txt
@@ -86,7 +86,7 @@ begins with `ext::`.  Examples:
 	edit .ssh/config.
 
 "ext::socat -t3600 - ABSTRACT-CONNECT:/git-server %G/somerepo"::
-	Represents repository with path /somerepo accessable over
+	Represents repository with path /somerepo accessible over
 	git protocol at abstract namespace address /git-server.
 
 "ext::git-server-alias foo %G/repo"::
diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt
index 1b8b6498..7706d41c 100644
--- a/Documentation/git-svn.txt
+++ b/Documentation/git-svn.txt
@@ -245,7 +245,7 @@ first have already been pushed into SVN.
 	patch), "all" (accept all patches), or "quit".
 	+
 	'git svn dcommit' returns immediately if answer if "no" or "quit", without
-	commiting anything to SVN.
+	committing anything to SVN.
 
 'branch'::
 	Create a branch in the SVN repository.
@@ -856,7 +856,7 @@ HANDLING OF SVN BRANCHES
 ------------------------
 If 'git svn' is configured to fetch branches (and --follow-branches
 is in effect), it sometimes creates multiple Git branches for one
-SVN branch, where the addtional branches have names of the form
+SVN branch, where the additional branches have names of the form
 'branchname@nnn' (with nnn an SVN revision number).  These additional
 branches are created if 'git svn' cannot find a parent commit for the
 first commit in an SVN branch, to connect the branch to the history of
diff --git a/Documentation/git-tools.txt b/Documentation/git-tools.txt
index ad8b823f..78a0d955 100644
--- a/Documentation/git-tools.txt
+++ b/Documentation/git-tools.txt
@@ -109,7 +109,7 @@ Others
 
    - *git.el* (contrib/)
 
-   This is an Emacs interface for Git. The user interface is modeled on
+   This is an Emacs interface for Git. The user interface is modelled on
    pcl-cvs. It has been developed on Emacs 21 and will probably need some
    tweaking to work on XEmacs.
 
diff --git a/Documentation/revisions.txt b/Documentation/revisions.txt
index 314e25da..b0f72206 100644
--- a/Documentation/revisions.txt
+++ b/Documentation/revisions.txt
@@ -55,7 +55,7 @@ when you run `git cherry-pick`.
 +
 Note that any of the 'refs/*' cases above may come either from
 the '$GIT_DIR/refs' directory or from the '$GIT_DIR/packed-refs' file.
-While the ref name encoding is unspecified, UTF-8 is prefered as
+While the ref name encoding is unspecified, UTF-8 is preferred as
 some output processing may assume ref names in UTF-8.
 
 '<refname>@\{<date>\}', e.g. 'master@\{yesterday\}', 'HEAD@\{5 minutes ago\}'::
diff --git a/Documentation/technical/api-argv-array.txt b/Documentation/technical/api-argv-array.txt
index a959517b..a6b7d83a 100644
--- a/Documentation/technical/api-argv-array.txt
+++ b/Documentation/technical/api-argv-array.txt
@@ -55,7 +55,7 @@ Functions
 	initial, empty state.
 
 `argv_array_detach`::
-	Detach the argv array from the `struct argv_array`, transfering
+	Detach the argv array from the `struct argv_array`, transferring
 	ownership of the allocated array and strings.
 
 `argv_array_free_detached`::
diff --git a/Documentation/technical/api-credentials.txt b/Documentation/technical/api-credentials.txt
index 516fda74..c1b42a40 100644
--- a/Documentation/technical/api-credentials.txt
+++ b/Documentation/technical/api-credentials.txt
@@ -160,7 +160,7 @@ int foo_login(struct foo_connection *f)
 		break;
 	default:
 		/*
-		 * Some other error occured. We don't know if the
+		 * Some other error occurred. We don't know if the
 		 * credential is good or bad, so report nothing to the
 		 * credential subsystem.
 		 */
diff --git a/Documentation/technical/api-ref-iteration.txt b/Documentation/technical/api-ref-iteration.txt
index dbbea95d..aa1c50f1 100644
--- a/Documentation/technical/api-ref-iteration.txt
+++ b/Documentation/technical/api-ref-iteration.txt
@@ -35,7 +35,7 @@ Iteration functions
 * `head_ref_submodule()`, `for_each_ref_submodule()`,
   `for_each_ref_in_submodule()`, `for_each_tag_ref_submodule()`,
   `for_each_branch_ref_submodule()`, `for_each_remote_ref_submodule()`
-  do the same as the functions descibed above but for a specified
+  do the same as the functions described above but for a specified
   submodule.
 
 * `for_each_rawref()` can be used to learn about broken ref and symref.
diff --git a/gitweb/INSTALL b/gitweb/INSTALL
index 6d454067..08f3dda0 100644
--- a/gitweb/INSTALL
+++ b/gitweb/INSTALL
@@ -244,7 +244,7 @@ for gitweb (in gitweb/README), and gitweb.conf(5) manpage.
   through the GITWEB_CONFIG_SYSTEM environment variable.
 
   Note that if per-instance configuration file exists, then system-wide
-  configuration is _not used at all_.  This is quite untypical and suprising
+  configuration is _not used at all_.  This is quite untypical and surprising
   behavior.  On the other hand changing current behavior would break backwards
   compatibility and can lead to unexpected changes in gitweb behavior.
   Therefore gitweb also looks for common system-wide configuration file,
diff --git a/po/README b/po/README
index c1520e8c..d8c9111c 100644
--- a/po/README
+++ b/po/README
@@ -232,7 +232,7 @@ Shell:
 
        # To interpolate variables:
        details="oh noes"
-       eval_gettext "An error occured: \$details"; echo
+       eval_gettext "An error occurred: \$details"; echo
 
    In addition we have wrappers for messages that end with a trailing
    newline. I.e. you could write the above as:
@@ -242,7 +242,7 @@ Shell:
 
        # To interpolate variables:
        details="oh noes"
-       eval_gettextln "An error occured: \$details"
+       eval_gettextln "An error occurred: \$details"
 
    More documentation about the interface is available in the GNU info
    page: `info '(gettext)sh'`. Looking at git-am.sh (the first shell
@@ -257,7 +257,7 @@ Perl:
 
        use Git::I18N;
        print __("Welcome to Git!\n");
-       printf __("The following error occured: %s\n"), $error;
+       printf __("The following error occurred: %s\n"), $error;
 
    Run `perldoc perl/Git/I18N.pm` for more info.
 
-- 
1.8.2.1

  reply	other threads:[~2013-04-12  6:50 UTC|newest]

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-04-11 20:55 [PATCH] Various typofixes Stefano Lattarini
2013-04-11 21:43 ` Eric Sunshine
2013-04-11 22:36   ` [PATCH v2] Fix various typos and grammaros Stefano Lattarini
2013-04-12  0:45     ` Junio C Hamano
2013-04-12  6:48       ` [RFC/PATCH maint 0/10] " Jonathan Nieder
2013-04-12  6:49         ` Jonathan Nieder [this message]
2013-04-12 19:12           ` [PATCH 01/10] doc: various spelling fixes Junio C Hamano
2013-04-12 22:20             ` [PATCH] gitweb/INSTALL: Simplify description of GITWEB_CONFIG_SYSTEM Jakub Narębski
2013-04-16  3:10               ` Drew Northup
2013-04-16  4:36                 ` Junio C Hamano
2013-04-16  7:11                   ` Jakub Narębski
2013-04-16 11:51                     ` Drew Northup
2013-04-16 11:56                   ` Drew Northup
2013-04-16 12:26                     ` [PATCH] gitweb/INSTALL: GITWEB_CONFIG_SYSTEM is for backward compatibility Jakub Narębski
2013-04-16 12:47                       ` Drew Northup
2013-04-16 12:52                         ` Drew Northup
2013-04-16 22:26                         ` Jonathan Nieder
2013-04-18  1:00                           ` Drew Northup
2013-04-18  1:44                             ` Junio C Hamano
2013-04-12  6:50         ` [PATCH 02/10] git-remote-mediawiki: spelling fixes Jonathan Nieder
2013-04-12 11:16           ` Matthieu Moy
2013-04-12  6:54         ` [PATCH 03/10] contrib/subtree: fix spelling of accidentally Jonathan Nieder
2013-04-12  6:57         ` [PATCH 04/10] obstack: fix spelling of similar Jonathan Nieder
2013-04-12  7:01         ` [PATCH 05/10] compat/regex: fix spelling and grammar in comments Jonathan Nieder
2013-04-12  7:06         ` [PATCH 06/10] compat/nedmalloc: fix spelling " Jonathan Nieder
2013-04-12  7:17           ` Sebastian Schuberth
2013-04-12  7:07         ` [PATCH 07/10] precompose-utf8: fix spelling of "want" in error message Jonathan Nieder
2013-04-12  7:09         ` [PATCH 08/10] kwset: fix spelling in comments Jonathan Nieder
2013-04-12  7:10         ` [PATCH 09/10] git-gui: " Jonathan Nieder
2013-04-12  7:11         ` [PATCH 10/10] Correct common spelling mistakes in comments and tests Jonathan Nieder
2013-04-12 20:39           ` Junio C Hamano
2013-04-12 16:09         ` [RFC/PATCH maint 0/10] Re: [PATCH v2] Fix various typos and grammaros Junio C Hamano
2013-04-12  8:16       ` Stefano Lattarini
2013-04-12 16:10         ` Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20130412064953.GB5710@elie.Belkin \
    --to=jrnieder@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=stefano.lattarini@gmail.com \
    --cc=sunshine@sunshineco.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox