{"thread":{"id":"36322","subject":"[PATCH 3/6] Fix misuses of \"nor\" in comments.","startedAt":"2014-03-31T21:04:18Z","lastAt":"2014-03-31T21:05:25Z","messageCount":2,"participants":["Justin Lebar"],"isPatch":true,"patchVersion":1,"patchTotal":6},"messages":[{"id":"238145","messageId":"1396299858-31240-1-git-send-email-jlebar@google.com","threadId":"36322","inReplyTo":null,"subject":"[PATCH 3/6] Fix misuses of \"nor\" in comments.","fromName":"Justin Lebar","fromEmail":"jlebar@google.com","sentAt":"2014-03-31T21:04:18Z","receivedAt":"2014-03-31T21:04:18Z","isPatch":true,"sender":{"key":"jlebar@google.com","avatar":"https://gravatar.com/avatar/d902057bd97387117efab9784adbc2208a3d0053c462e0e77c19e4323f23dd91?d=mp&s=160"},"body":"Signed-off-by: Justin Lebar <jlebar@google.com>\n---\n Makefile                                    | 2 +-\n builtin/apply.c                             | 2 +-\n builtin/checkout.c                          | 2 +-\n builtin/log.c                               | 2 +-\n builtin/pack-objects.c                      | 2 +-\n column.c                                    | 4 ++--\n contrib/examples/git-checkout.sh            | 2 +-\n contrib/examples/git-reset.sh               | 4 ++--\n contrib/fast-import/import-directories.perl | 4 ++--\n delta.h                                     | 2 +-\n diff.c                                      | 2 +-\n git-am.sh                                   | 2 +-\n gitweb/gitweb.perl                          | 2 +-\n http.h                                      | 3 +--\n perl/Git/SVN.pm                             | 2 +-\n perl/Git/SVN/Migration.pm                   | 2 +-\n pkt-line.h                                  | 8 ++++----\n remote.c                                    | 2 +-\n sha1_file.c                                 | 2 +-\n test-chmtime.c                              | 2 +-\n 20 files changed, 26 insertions(+), 27 deletions(-)\n\ndiff --git a/Makefile b/Makefile\nindex dddaf4f..fc02788 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -159,7 +159,7 @@ all::\n #\n # Define NEEDS_LIBINTL_BEFORE_LIBICONV if you need libintl before libiconv.\n #\n-# Define NO_INTPTR_T if you don't have intptr_t nor uintptr_t.\n+# Define NO_INTPTR_T if you don't have intptr_t or uintptr_t.\n #\n # Define NO_UINTMAX_T if you don't have uintmax_t.\n #\ndiff --git a/builtin/apply.c b/builtin/apply.c\nindex b0d0986..6013e19 100644\n--- a/builtin/apply.c\n+++ b/builtin/apply.c\n@@ -4061,7 +4061,7 @@ static int write_out_one_reject(struct patch *patch)\n \t\treturn error(_(\"cannot open %s: %s\"), namebuf, strerror(errno));\n \n \t/* Normal git tools never deal with .rej, so do not pretend\n-\t * this is a git patch by saying --git nor give extended\n+\t * this is a git patch by saying --git or giving extended\n \t * headers.  While at it, maybe please \"kompare\" that wants\n \t * the trailing TAB and some garbage at the end of line ;-).\n \t */\ndiff --git a/builtin/checkout.c b/builtin/checkout.c\nindex ada51fa..7f37d1a 100644\n--- a/builtin/checkout.c\n+++ b/builtin/checkout.c\n@@ -895,7 +895,7 @@ static int parse_branchname_arg(int argc, const char **argv,\n \t *       between A and B, A...B names that merge base.\n \t *\n \t *   (b) If <something> is _not_ a commit, either \"--\" is present\n-\t *       or <something> is not a path, no -t nor -b was given, and\n+\t *       or <something> is not a path, no -t or -b was given, and\n \t *       and there is a tracking branch whose name is <something>\n \t *       in one and only one remote, then this is a short-hand to\n \t *       fork local <something> from that remote-tracking branch.\ndiff --git a/builtin/log.c b/builtin/log.c\nindex b97373d..39e8836 100644\n--- a/builtin/log.c\n+++ b/builtin/log.c\n@@ -503,7 +503,7 @@ static void show_rev_tweak_rev(struct rev_info *rev, struct setup_revision_opt *\n \t\t/* There was no \"-m\" on the command line */\n \t\trev->ignore_merges = 0;\n \t\tif (!rev->first_parent_only && !rev->combine_merges) {\n-\t\t\t/* No \"--first-parent\", \"-c\", nor \"--cc\" */\n+\t\t\t/* No \"--first-parent\", \"-c\", or \"--cc\" */\n \t\t\trev->combine_merges = 1;\n \t\t\trev->dense_combined_merges = 1;\n \t\t}\ndiff --git a/builtin/pack-objects.c b/builtin/pack-objects.c\nindex 541667f..ef1f20e 100644\n--- a/builtin/pack-objects.c\n+++ b/builtin/pack-objects.c\n@@ -999,7 +999,7 @@ static int pbase_tree_cache_ix_incr(int ix)\n static struct pbase_tree {\n \tstruct pbase_tree *next;\n \t/* This is a phony \"cache\" entry; we are not\n-\t * going to evict it nor find it through _get()\n+\t * going to evict it or find it through _get()\n \t * mechanism -- this is for the toplevel node that\n \t * would almost always change with any commit.\n \t */\ndiff --git a/column.c b/column.c\nindex 9367ba5..8d1ce88 100644\n--- a/column.c\n+++ b/column.c\n@@ -311,8 +311,8 @@ static int parse_config(unsigned int *colopts, const char *value)\n \t\tvalue += strspn(value, sep);\n \t}\n \t/*\n-\t * Setting layout implies \"always\" if neither always, never\n-\t * nor auto is specified.\n+\t * If none of \"always\", \"never\", and \"auto\" is specified, then setting\n+\t * layout implies \"always\".\n \t *\n \t * Current value in COL_ENABLE_MASK is disregarded. This means if\n \t * you set column.ui = auto and pass --column=row, then \"auto\"\ndiff --git a/contrib/examples/git-checkout.sh b/contrib/examples/git-checkout.sh\nindex 1a7689a..d2c1f98 100755\n--- a/contrib/examples/git-checkout.sh\n+++ b/contrib/examples/git-checkout.sh\n@@ -168,7 +168,7 @@ cd_to_toplevel\n # branch.  However, if \"git checkout HEAD\" detaches the HEAD\n # from the current branch, even though that may be logically\n # correct, it feels somewhat funny.  More importantly, we do not\n-# want \"git checkout\" nor \"git checkout -f\" to detach HEAD.\n+# want \"git checkout\" or \"git checkout -f\" to detach HEAD.\n \n detached=\n detach_warn=\ndiff --git a/contrib/examples/git-reset.sh b/contrib/examples/git-reset.sh\nindex bafeb52..cb1bbf3 100755\n--- a/contrib/examples/git-reset.sh\n+++ b/contrib/examples/git-reset.sh\n@@ -40,7 +40,7 @@ case \"$1\" in --) shift ;; esac\n \n # git reset --mixed tree [--] paths... can be used to\n # load chosen paths from the tree into the index without\n-# affecting the working tree nor HEAD.\n+# affecting the working tree or HEAD.\n if test $# != 0\n then\n \ttest \"$reset_type\" = \"--mixed\" ||\n@@ -60,7 +60,7 @@ then\n \tupdate=-u\n fi\n \n-# Soft reset does not touch the index file nor the working tree\n+# Soft reset does not touch the index file or the working tree\n # at all, but requires them in a good order.  Other resets reset\n # the index file to the tree object we are switching to.\n if test \"$reset_type\" = \"--soft\"\ndiff --git a/contrib/fast-import/import-directories.perl b/contrib/fast-import/import-directories.perl\nindex 7f3afa5..4dec1f1 100755\n--- a/contrib/fast-import/import-directories.perl\n+++ b/contrib/fast-import/import-directories.perl\n@@ -109,8 +109,8 @@ was available previously is not included in this revision, it will\n be removed.\n \n If an on-disk revision is incomplete, you can point to files from\n-a previous revision. There are no restriction as to where the source\n-files are located, nor to the names of them.\n+a previous revision. There are no restrictions on where the source\n+files are located, nor on their names.\n \n  [3.files]\n  ; the key is the path inside the repository, the value is the path\ndiff --git a/delta.h b/delta.h\nindex b9d333d..9b67531 100644\n--- a/delta.h\n+++ b/delta.h\n@@ -9,7 +9,7 @@ struct delta_index;\n  *\n  * This returns a pointer to a struct delta_index that should be passed to\n  * subsequent create_delta() calls, or to free_delta_index().  A NULL pointer\n- * is returned on failure.  The given buffer must not be freed nor altered\n+ * is returned on failure.  The given buffer must not be freed or altered\n  * before free_delta_index() is called.  The returned pointer must be freed\n  * using free_delta_index().\n  */\ndiff --git a/diff.c b/diff.c\nindex 1cd4672..635dee2 100644\n--- a/diff.c\n+++ b/diff.c\n@@ -3942,7 +3942,7 @@ static int diff_scoreopt_parse(const char *opt)\n \t\t}\n \t}\n \tif (cmd != 'M' && cmd != 'C' && cmd != 'B')\n-\t\treturn -1; /* that is not a -M, -C nor -B option */\n+\t\treturn -1; /* that is not a -M, -C, or -B option */\n \n \topt1 = parse_rename_score(&opt);\n \tif (cmd != 'B')\ndiff --git a/git-am.sh b/git-am.sh\nindex bbea430..e92e5bb 100755\n--- a/git-am.sh\n+++ b/git-am.sh\n@@ -523,7 +523,7 @@ Use \\\"git am --abort\\\" to remove it.\")\"\n \t\tesac\n \tfi\n \n-\t# Make sure we are not given --skip, --continue, nor --abort\n+\t# Make sure we are not given --skip, --continue, or --abort\n \ttest \"$skip$resolved$abort\" = \"\" ||\n \t\tdie \"$(gettext \"Resolve operation not in progress, we are not resuming.\")\"\n \ndiff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl\nindex 3bc0f0b..52108b9 100755\n--- a/gitweb/gitweb.perl\n+++ b/gitweb/gitweb.perl\n@@ -1490,7 +1490,7 @@ sub is_valid_pathname {\n \tmy $input = shift;\n \n \treturn undef unless defined $input;\n-\t# no '.' or '..' as elements of path, i.e. no '.' nor '..'\n+\t# no '.' or '..' as elements of path, i.e. no '.' or '..'\n \t# at the beginning, at the end, and between slashes.\n \t# also this catches doubled slashes\n \tif ($input =~ m!(^|/)(|\\.|\\.\\.)(/|$)!) {\ndiff --git a/http.h b/http.h\nindex cd37d58..a766066 100644\n--- a/http.h\n+++ b/http.h\n@@ -13,8 +13,7 @@\n /*\n  * We detect based on the cURL version if multi-transfer is\n  * usable in this implementation and define this symbol accordingly.\n- * This is not something Makefile should set nor users should pass\n- * via CFLAGS.\n+ * This shouldn't be set by the Makefile or by the user (e.g. via CFLAGS).\n  */\n #undef USE_CURL_MULTI\n \ndiff --git a/perl/Git/SVN.pm b/perl/Git/SVN.pm\nindex 6e804a2..62f3293 100644\n--- a/perl/Git/SVN.pm\n+++ b/perl/Git/SVN.pm\n@@ -1191,7 +1191,7 @@ sub do_fetch {\n \t\t# we can have a branch that was deleted, then re-added\n \t\t# under the same name but copied from another path, in\n \t\t# which case we'll have multiple parents (we don't\n-\t\t# want to break the original ref, nor lose copypath info):\n+\t\t# want to break the original ref or lose copypath info):\n \t\tif (my $log_entry = $self->find_parent_branch($paths, $rev)) {\n \t\t\tpush @{$log_entry->{parents}}, $lc;\n \t\t\treturn $log_entry;\ndiff --git a/perl/Git/SVN/Migration.pm b/perl/Git/SVN/Migration.pm\nindex 30daf35..cf6ffa7 100644\n--- a/perl/Git/SVN/Migration.pm\n+++ b/perl/Git/SVN/Migration.pm\n@@ -1,6 +1,6 @@\n package Git::SVN::Migration;\n # these version numbers do NOT correspond to actual version numbers\n-# of git nor git-svn.  They are just relative.\n+# of git or git-svn.  They are just relative.\n #\n # v0 layout: .git/$id/info/url, refs/heads/$id-HEAD\n #\ndiff --git a/pkt-line.h b/pkt-line.h\nindex 0a838d1..3cb9d91 100644\n--- a/pkt-line.h\n+++ b/pkt-line.h\n@@ -28,10 +28,10 @@ void packet_buf_write(struct strbuf *buf, const char *fmt, ...) __attribute__((f\n  * Read a packetized line into the buffer, which must be at least size bytes\n  * long. The return value specifies the number of bytes read into the buffer.\n  *\n- * If src_buffer is not NULL (and nor is *src_buffer), it should point to a\n- * buffer containing the packet data to parse, of at least *src_len bytes.\n- * After the function returns, src_buf will be incremented and src_len\n- * decremented by the number of bytes consumed.\n+ * If src_buffer and *src_buffer are not NULL, it should point to a buffer\n+ * containing the packet data to parse, of at least *src_len bytes.  After the\n+ * function returns, src_buf will be incremented and src_len decremented by the\n+ * number of bytes consumed.\n  *\n  * If src_buffer (or *src_buffer) is NULL, then data is read from the\n  * descriptor \"fd\".\ndiff --git a/remote.c b/remote.c\nindex 5f63d55..f43c7a9 100644\n--- a/remote.c\n+++ b/remote.c\n@@ -1409,7 +1409,7 @@ int match_push_refs(struct ref *src, struct ref **dst,\n \t\t\t\t/*\n \t\t\t\t * Remote doesn't have it, and we have no\n \t\t\t\t * explicit pattern, and we don't have\n-\t\t\t\t * --all nor --mirror.\n+\t\t\t\t * --all or --mirror.\n \t\t\t\t */\n \t\t\t\tgoto free_name;\n \ndiff --git a/sha1_file.c b/sha1_file.c\nindex 6e8c05d..b79efe4 100644\n--- a/sha1_file.c\n+++ b/sha1_file.c\n@@ -787,7 +787,7 @@ void close_pack_index(struct packed_git *p)\n  * contain the same set of objects as an existing one.  In that case\n  * the resulting file might be different even if its name would be the\n  * same.  It is best to close any reference to the old pack before it is\n- * replaced on disk.  Of course no index pointers nor windows for given pack\n+ * replaced on disk.  Of course no index pointers or windows for given pack\n  * must subsist at this point.  If ever objects from this pack are requested\n  * again, the new version of the pack will be reinitialized through\n  * reprepare_packed_git().\ndiff --git a/test-chmtime.c b/test-chmtime.c\nindex 0df7487..dfe8a83 100644\n--- a/test-chmtime.c\n+++ b/test-chmtime.c\n@@ -1,6 +1,6 @@\n /*\n  * This program can either change modification time of the given\n- * file(s) or just print it. The program does not change atime nor\n+ * file(s) or just print it. The program does not change atime or\n  * ctime (their values are explicitly preserved).\n  *\n  * The mtime can be changed to an absolute value:\n-- \n1.9.1.423.g4596e3a\n"},{"id":"238147","messageId":"CAMuNMfokUe_RzDG+XOZRA2G0_DLkPQotDy5wzby83eCuaApH+g@mail.gmail.com","threadId":"36322","inReplyTo":"1396299858-31240-1-git-send-email-jlebar@google.com","subject":"Re: [PATCH 3/6] Fix misuses of \"nor\" in comments.","fromName":"Justin Lebar","fromEmail":"jlebar@google.com","sentAt":"2014-03-31T21:05:25Z","receivedAt":"2014-03-31T21:05:25Z","isPatch":true,"sender":{"key":"jlebar@google.com","avatar":"https://gravatar.com/avatar/d902057bd97387117efab9784adbc2208a3d0053c462e0e77c19e4323f23dd91?d=mp&s=160"},"body":"Sorry, still figuring out the right workflow here: The subject should\nsay v4, and it should say patch 3/4.\n\nOn Mon, Mar 31, 2014 at 2:04 PM, Justin Lebar <jlebar@google.com> wrote:\n> Signed-off-by: Justin Lebar <jlebar@google.com>\n> ---\n>  Makefile                                    | 2 +-\n>  builtin/apply.c                             | 2 +-\n>  builtin/checkout.c                          | 2 +-\n>  builtin/log.c                               | 2 +-\n>  builtin/pack-objects.c                      | 2 +-\n>  column.c                                    | 4 ++--\n>  contrib/examples/git-checkout.sh            | 2 +-\n>  contrib/examples/git-reset.sh               | 4 ++--\n>  contrib/fast-import/import-directories.perl | 4 ++--\n>  delta.h                                     | 2 +-\n>  diff.c                                      | 2 +-\n>  git-am.sh                                   | 2 +-\n>  gitweb/gitweb.perl                          | 2 +-\n>  http.h                                      | 3 +--\n>  perl/Git/SVN.pm                             | 2 +-\n>  perl/Git/SVN/Migration.pm                   | 2 +-\n>  pkt-line.h                                  | 8 ++++----\n>  remote.c                                    | 2 +-\n>  sha1_file.c                                 | 2 +-\n>  test-chmtime.c                              | 2 +-\n>  20 files changed, 26 insertions(+), 27 deletions(-)\n>\n> diff --git a/Makefile b/Makefile\n> index dddaf4f..fc02788 100644\n> --- a/Makefile\n> +++ b/Makefile\n> @@ -159,7 +159,7 @@ all::\n>  #\n>  # Define NEEDS_LIBINTL_BEFORE_LIBICONV if you need libintl before libiconv.\n>  #\n> -# Define NO_INTPTR_T if you don't have intptr_t nor uintptr_t.\n> +# Define NO_INTPTR_T if you don't have intptr_t or uintptr_t.\n>  #\n>  # Define NO_UINTMAX_T if you don't have uintmax_t.\n>  #\n> diff --git a/builtin/apply.c b/builtin/apply.c\n> index b0d0986..6013e19 100644\n> --- a/builtin/apply.c\n> +++ b/builtin/apply.c\n> @@ -4061,7 +4061,7 @@ static int write_out_one_reject(struct patch *patch)\n>                 return error(_(\"cannot open %s: %s\"), namebuf, strerror(errno));\n>\n>         /* Normal git tools never deal with .rej, so do not pretend\n> -        * this is a git patch by saying --git nor give extended\n> +        * this is a git patch by saying --git or giving extended\n>          * headers.  While at it, maybe please \"kompare\" that wants\n>          * the trailing TAB and some garbage at the end of line ;-).\n>          */\n> diff --git a/builtin/checkout.c b/builtin/checkout.c\n> index ada51fa..7f37d1a 100644\n> --- a/builtin/checkout.c\n> +++ b/builtin/checkout.c\n> @@ -895,7 +895,7 @@ static int parse_branchname_arg(int argc, const char **argv,\n>          *       between A and B, A...B names that merge base.\n>          *\n>          *   (b) If <something> is _not_ a commit, either \"--\" is present\n> -        *       or <something> is not a path, no -t nor -b was given, and\n> +        *       or <something> is not a path, no -t or -b was given, and\n>          *       and there is a tracking branch whose name is <something>\n>          *       in one and only one remote, then this is a short-hand to\n>          *       fork local <something> from that remote-tracking branch.\n> diff --git a/builtin/log.c b/builtin/log.c\n> index b97373d..39e8836 100644\n> --- a/builtin/log.c\n> +++ b/builtin/log.c\n> @@ -503,7 +503,7 @@ static void show_rev_tweak_rev(struct rev_info *rev, struct setup_revision_opt *\n>                 /* There was no \"-m\" on the command line */\n>                 rev->ignore_merges = 0;\n>                 if (!rev->first_parent_only && !rev->combine_merges) {\n> -                       /* No \"--first-parent\", \"-c\", nor \"--cc\" */\n> +                       /* No \"--first-parent\", \"-c\", or \"--cc\" */\n>                         rev->combine_merges = 1;\n>                         rev->dense_combined_merges = 1;\n>                 }\n> diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c\n> index 541667f..ef1f20e 100644\n> --- a/builtin/pack-objects.c\n> +++ b/builtin/pack-objects.c\n> @@ -999,7 +999,7 @@ static int pbase_tree_cache_ix_incr(int ix)\n>  static struct pbase_tree {\n>         struct pbase_tree *next;\n>         /* This is a phony \"cache\" entry; we are not\n> -        * going to evict it nor find it through _get()\n> +        * going to evict it or find it through _get()\n>          * mechanism -- this is for the toplevel node that\n>          * would almost always change with any commit.\n>          */\n> diff --git a/column.c b/column.c\n> index 9367ba5..8d1ce88 100644\n> --- a/column.c\n> +++ b/column.c\n> @@ -311,8 +311,8 @@ static int parse_config(unsigned int *colopts, const char *value)\n>                 value += strspn(value, sep);\n>         }\n>         /*\n> -        * Setting layout implies \"always\" if neither always, never\n> -        * nor auto is specified.\n> +        * If none of \"always\", \"never\", and \"auto\" is specified, then setting\n> +        * layout implies \"always\".\n>          *\n>          * Current value in COL_ENABLE_MASK is disregarded. This means if\n>          * you set column.ui = auto and pass --column=row, then \"auto\"\n> diff --git a/contrib/examples/git-checkout.sh b/contrib/examples/git-checkout.sh\n> index 1a7689a..d2c1f98 100755\n> --- a/contrib/examples/git-checkout.sh\n> +++ b/contrib/examples/git-checkout.sh\n> @@ -168,7 +168,7 @@ cd_to_toplevel\n>  # branch.  However, if \"git checkout HEAD\" detaches the HEAD\n>  # from the current branch, even though that may be logically\n>  # correct, it feels somewhat funny.  More importantly, we do not\n> -# want \"git checkout\" nor \"git checkout -f\" to detach HEAD.\n> +# want \"git checkout\" or \"git checkout -f\" to detach HEAD.\n>\n>  detached=\n>  detach_warn=\n> diff --git a/contrib/examples/git-reset.sh b/contrib/examples/git-reset.sh\n> index bafeb52..cb1bbf3 100755\n> --- a/contrib/examples/git-reset.sh\n> +++ b/contrib/examples/git-reset.sh\n> @@ -40,7 +40,7 @@ case \"$1\" in --) shift ;; esac\n>\n>  # git reset --mixed tree [--] paths... can be used to\n>  # load chosen paths from the tree into the index without\n> -# affecting the working tree nor HEAD.\n> +# affecting the working tree or HEAD.\n>  if test $# != 0\n>  then\n>         test \"$reset_type\" = \"--mixed\" ||\n> @@ -60,7 +60,7 @@ then\n>         update=-u\n>  fi\n>\n> -# Soft reset does not touch the index file nor the working tree\n> +# Soft reset does not touch the index file or the working tree\n>  # at all, but requires them in a good order.  Other resets reset\n>  # the index file to the tree object we are switching to.\n>  if test \"$reset_type\" = \"--soft\"\n> diff --git a/contrib/fast-import/import-directories.perl b/contrib/fast-import/import-directories.perl\n> index 7f3afa5..4dec1f1 100755\n> --- a/contrib/fast-import/import-directories.perl\n> +++ b/contrib/fast-import/import-directories.perl\n> @@ -109,8 +109,8 @@ was available previously is not included in this revision, it will\n>  be removed.\n>\n>  If an on-disk revision is incomplete, you can point to files from\n> -a previous revision. There are no restriction as to where the source\n> -files are located, nor to the names of them.\n> +a previous revision. There are no restrictions on where the source\n> +files are located, nor on their names.\n>\n>   [3.files]\n>   ; the key is the path inside the repository, the value is the path\n> diff --git a/delta.h b/delta.h\n> index b9d333d..9b67531 100644\n> --- a/delta.h\n> +++ b/delta.h\n> @@ -9,7 +9,7 @@ struct delta_index;\n>   *\n>   * This returns a pointer to a struct delta_index that should be passed to\n>   * subsequent create_delta() calls, or to free_delta_index().  A NULL pointer\n> - * is returned on failure.  The given buffer must not be freed nor altered\n> + * is returned on failure.  The given buffer must not be freed or altered\n>   * before free_delta_index() is called.  The returned pointer must be freed\n>   * using free_delta_index().\n>   */\n> diff --git a/diff.c b/diff.c\n> index 1cd4672..635dee2 100644\n> --- a/diff.c\n> +++ b/diff.c\n> @@ -3942,7 +3942,7 @@ static int diff_scoreopt_parse(const char *opt)\n>                 }\n>         }\n>         if (cmd != 'M' && cmd != 'C' && cmd != 'B')\n> -               return -1; /* that is not a -M, -C nor -B option */\n> +               return -1; /* that is not a -M, -C, or -B option */\n>\n>         opt1 = parse_rename_score(&opt);\n>         if (cmd != 'B')\n> diff --git a/git-am.sh b/git-am.sh\n> index bbea430..e92e5bb 100755\n> --- a/git-am.sh\n> +++ b/git-am.sh\n> @@ -523,7 +523,7 @@ Use \\\"git am --abort\\\" to remove it.\")\"\n>                 esac\n>         fi\n>\n> -       # Make sure we are not given --skip, --continue, nor --abort\n> +       # Make sure we are not given --skip, --continue, or --abort\n>         test \"$skip$resolved$abort\" = \"\" ||\n>                 die \"$(gettext \"Resolve operation not in progress, we are not resuming.\")\"\n>\n> diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl\n> index 3bc0f0b..52108b9 100755\n> --- a/gitweb/gitweb.perl\n> +++ b/gitweb/gitweb.perl\n> @@ -1490,7 +1490,7 @@ sub is_valid_pathname {\n>         my $input = shift;\n>\n>         return undef unless defined $input;\n> -       # no '.' or '..' as elements of path, i.e. no '.' nor '..'\n> +       # no '.' or '..' as elements of path, i.e. no '.' or '..'\n>         # at the beginning, at the end, and between slashes.\n>         # also this catches doubled slashes\n>         if ($input =~ m!(^|/)(|\\.|\\.\\.)(/|$)!) {\n> diff --git a/http.h b/http.h\n> index cd37d58..a766066 100644\n> --- a/http.h\n> +++ b/http.h\n> @@ -13,8 +13,7 @@\n>  /*\n>   * We detect based on the cURL version if multi-transfer is\n>   * usable in this implementation and define this symbol accordingly.\n> - * This is not something Makefile should set nor users should pass\n> - * via CFLAGS.\n> + * This shouldn't be set by the Makefile or by the user (e.g. via CFLAGS).\n>   */\n>  #undef USE_CURL_MULTI\n>\n> diff --git a/perl/Git/SVN.pm b/perl/Git/SVN.pm\n> index 6e804a2..62f3293 100644\n> --- a/perl/Git/SVN.pm\n> +++ b/perl/Git/SVN.pm\n> @@ -1191,7 +1191,7 @@ sub do_fetch {\n>                 # we can have a branch that was deleted, then re-added\n>                 # under the same name but copied from another path, in\n>                 # which case we'll have multiple parents (we don't\n> -               # want to break the original ref, nor lose copypath info):\n> +               # want to break the original ref or lose copypath info):\n>                 if (my $log_entry = $self->find_parent_branch($paths, $rev)) {\n>                         push @{$log_entry->{parents}}, $lc;\n>                         return $log_entry;\n> diff --git a/perl/Git/SVN/Migration.pm b/perl/Git/SVN/Migration.pm\n> index 30daf35..cf6ffa7 100644\n> --- a/perl/Git/SVN/Migration.pm\n> +++ b/perl/Git/SVN/Migration.pm\n> @@ -1,6 +1,6 @@\n>  package Git::SVN::Migration;\n>  # these version numbers do NOT correspond to actual version numbers\n> -# of git nor git-svn.  They are just relative.\n> +# of git or git-svn.  They are just relative.\n>  #\n>  # v0 layout: .git/$id/info/url, refs/heads/$id-HEAD\n>  #\n> diff --git a/pkt-line.h b/pkt-line.h\n> index 0a838d1..3cb9d91 100644\n> --- a/pkt-line.h\n> +++ b/pkt-line.h\n> @@ -28,10 +28,10 @@ void packet_buf_write(struct strbuf *buf, const char *fmt, ...) __attribute__((f\n>   * Read a packetized line into the buffer, which must be at least size bytes\n>   * long. The return value specifies the number of bytes read into the buffer.\n>   *\n> - * If src_buffer is not NULL (and nor is *src_buffer), it should point to a\n> - * buffer containing the packet data to parse, of at least *src_len bytes.\n> - * After the function returns, src_buf will be incremented and src_len\n> - * decremented by the number of bytes consumed.\n> + * If src_buffer and *src_buffer are not NULL, it should point to a buffer\n> + * containing the packet data to parse, of at least *src_len bytes.  After the\n> + * function returns, src_buf will be incremented and src_len decremented by the\n> + * number of bytes consumed.\n>   *\n>   * If src_buffer (or *src_buffer) is NULL, then data is read from the\n>   * descriptor \"fd\".\n> diff --git a/remote.c b/remote.c\n> index 5f63d55..f43c7a9 100644\n> --- a/remote.c\n> +++ b/remote.c\n> @@ -1409,7 +1409,7 @@ int match_push_refs(struct ref *src, struct ref **dst,\n>                                 /*\n>                                  * Remote doesn't have it, and we have no\n>                                  * explicit pattern, and we don't have\n> -                                * --all nor --mirror.\n> +                                * --all or --mirror.\n>                                  */\n>                                 goto free_name;\n>\n> diff --git a/sha1_file.c b/sha1_file.c\n> index 6e8c05d..b79efe4 100644\n> --- a/sha1_file.c\n> +++ b/sha1_file.c\n> @@ -787,7 +787,7 @@ void close_pack_index(struct packed_git *p)\n>   * contain the same set of objects as an existing one.  In that case\n>   * the resulting file might be different even if its name would be the\n>   * same.  It is best to close any reference to the old pack before it is\n> - * replaced on disk.  Of course no index pointers nor windows for given pack\n> + * replaced on disk.  Of course no index pointers or windows for given pack\n>   * must subsist at this point.  If ever objects from this pack are requested\n>   * again, the new version of the pack will be reinitialized through\n>   * reprepare_packed_git().\n> diff --git a/test-chmtime.c b/test-chmtime.c\n> index 0df7487..dfe8a83 100644\n> --- a/test-chmtime.c\n> +++ b/test-chmtime.c\n> @@ -1,6 +1,6 @@\n>  /*\n>   * This program can either change modification time of the given\n> - * file(s) or just print it. The program does not change atime nor\n> + * file(s) or just print it. The program does not change atime or\n>   * ctime (their values are explicitly preserved).\n>   *\n>   * The mtime can be changed to an absolute value:\n> --\n> 1.9.1.423.g4596e3a\n>\n"}]}