All of lore.kernel.org
 help / color / mirror / Atom feed
From: Thomas Ackermann <th.acker@arcor.de>
To: git@vger.kernel.org
Cc: gitster@pobox.com
Subject: [PATCH] Fix two typos
Date: Thu, 26 Mar 2015 21:29:47 +0100 (CET)	[thread overview]
Message-ID: <431731492.918875.1427401787310.JavaMail.ngmail@webmail10.arcor-online.net> (raw)


Signed-off-by: Thomas Ackermann <th.acker@arcor.de>
---
 Documentation/RelNotes/2.4.0.txt               | 2 +-
 Documentation/technical/api-error-handling.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Documentation/RelNotes/2.4.0.txt b/Documentation/RelNotes/2.4.0.txt
index 386c75d..cdfd578 100644
--- a/Documentation/RelNotes/2.4.0.txt
+++ b/Documentation/RelNotes/2.4.0.txt
@@ -296,7 +296,7 @@ notes for details).
    (merge 35840a3 jc/conf-var-doc later to maint).
 
  * An earlier workaround to squelch unhelpful deprecation warnings
-   from the complier on Mac OSX unnecessarily set minimum required
+   from the compiler on Mac OSX unnecessarily set minimum required
    version of the OS, which the user might want to raise (or lower)
    for other reasons.
    (merge 88c03eb es/squelch-openssl-warnings-on-macosx later to maint).
diff --git a/Documentation/technical/api-error-handling.txt b/Documentation/technical/api-error-handling.txt
index fc68db1..ceeedd4 100644
--- a/Documentation/technical/api-error-handling.txt
+++ b/Documentation/technical/api-error-handling.txt
@@ -58,7 +58,7 @@ to `die` or `error` as-is.  For example:
 	if (ref_transaction_commit(transaction, &err))
 		die("%s", err.buf);
 
-The 'err' parameter will be untouched if no error occured, so multiple
+The 'err' parameter will be untouched if no error occurred, so multiple
 function calls can be chained:
 
 	t = ref_transaction_begin(&err);
-- 
1.9.5.msysgit.0

             reply	other threads:[~2015-03-26 20:29 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-03-26 20:29 Thomas Ackermann [this message]
2017-12-06 15:17 [PATCH] Fix two typos Thiago Rafael Becker

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=431731492.918875.1427401787310.JavaMail.ngmail@webmail10.arcor-online.net \
    --to=th.acker@arcor.de \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.