Merge branch 'ds/gender-neutral-doc'
Update the documentation not to assume users are of certain gender
and adds to guidelines to do so.
*: fix typos
comments: avoid using the gender of our users
doc: avoid using the gender of other people
diff --git a/Documentation/SubmittingPatches b/Documentation/SubmittingPatches
index 55287d7..3e215f4 100644
@@ -373,9 +373,8 @@
. `Acked-by:` says that the person who is more familiar with the area
the patch attempts to modify liked the patch.
. `Reviewed-by:`, unlike the other tags, can only be offered by the
- reviewer and means that she is completely satisfied that the patch
- is ready for application. It is usually offered only after a
- detailed review.
+ reviewers themselves when they are completely satisfied with the
+ patch after a detailed analysis.
. `Tested-by:` is used to indicate that the person applied the patch
and found it to have the desired effect.
diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt
index a953c7c..2f25aa3 100644
@@ -244,8 +244,8 @@
You will have to bypass the "must fast-forward" rule in order to
replace the history you originally published with the rebased history.
If somebody else built on top of your original history while you are
-rebasing, the tip of the branch at the remote may advance with her
-commit, and blindly pushing with `--force` will lose her work.
+rebasing, the tip of the branch at the remote may advance with their
+commit, and blindly pushing with `--force` will lose their work.
This option allows you to say that you expect the history you are
updating is what you rebased and want to replace. If the remote ref
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index f9e54b8..9624059 100644
@@ -2792,7 +2792,7 @@
In some cases it is possible that the new head will *not* actually be
a descendant of the old head. For example, the developer may have
-realized she made a serious mistake, and decided to backtrack,
+realized a serious mistake was made and decided to backtrack,
resulting in a situation like:
diff --git a/commit.c b/commit.c
index 8ea55a4..143f472 100644
@@ -1178,7 +1178,7 @@
* We could verify this signature and either omit the tag when
* it does not validate, but the integrator may not have the
- * public key of the signer of the tag he is merging, while a
+ * public key of the signer of the tag being merged, while a
* later auditor may have it while auditing, so let's not run
* verify-signed-buffer here for now...
diff --git a/config.c b/config.c
index c4dcb40..f33abea 100644
@@ -2838,7 +2838,7 @@
begin = store->parsed[i].begin;
- * Next, make sure that we are removing he last key(s) in the section,
+ * Next, make sure that we are removing the last key(s) in the section,
* and that there are no comments that are possibly about the current
diff --git a/config.h b/config.h
index 9038538..a2200f3 100644
@@ -450,8 +450,8 @@
* Parses the file and adds the variable-value pairs to the `config_set`,
* dies if there is an error in parsing the file. Returns 0 on success, or
- * -1 if the file does not exist or is inaccessible. The user has to decide
- * if he wants to free the incomplete configset or continue using it when
+ * -1 if the file does not exist or is inaccessible. The caller decides
+ * whether to free the incomplete configset or continue using it when
* the function returns -1.
int git_configset_add_file(struct config_set *cs, const char *filename);
diff --git a/date.c b/date.c
index f9ea807..c55ea47 100644
@@ -908,7 +908,7 @@
* We take over "now" here, which usually translates
* to the current timestamp. This is because the user
- * really means to expire everything she has done in
+ * really means to expire everything that was done in
* the past, and by definition reflogs are the record
* of the past, and there is nothing from the future
* to be kept.
diff --git a/pathspec.h b/pathspec.h
index fceebb8..2341dc9 100644
@@ -108,7 +108,7 @@
* A similar process is applied when a new pathspec magic is added. The designer
* lifts the GUARD_PATHSPEC restriction in the functions that support the new
- * magic. At the same time (s)he has to make sure this new feature will be
+ * magic while at the same time making sure this new feature will be
* caught at parse_pathspec() in commands that cannot handle the new magic in
* some cases. grepping parse_pathspec() should help.
diff --git a/strbuf.h b/strbuf.h
index 223ee20..a86dcaa 100644
@@ -337,8 +337,8 @@
* placeholder is unknown, then the percent sign is copied, too.
* In order to facilitate caching and to make it possible to give
- * parameters to the callback, `strbuf_expand()` passes a context pointer,
- * which can be used by the programmer of the callback as she sees fit.
+ * parameters to the callback, `strbuf_expand()` passes a context
+ * pointer with any kind of data.
typedef size_t (*expand_fn_t) (struct strbuf *sb,
const char *placeholder,
diff --git a/t/t9300-fast-import.sh b/t/t9300-fast-import.sh
index 1aea943..aa55b41 100755
@@ -1538,7 +1538,6 @@
# -- ignore all of this text
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
- # $GIT_COMMITTER_NAME has inserted here for his benefit.
dirty directory copy
diff --git a/wt-status.c b/wt-status.c
index b5a3e1c..c0dbf96 100644
@@ -639,7 +639,7 @@
* mode by passing a command line option we do not ignore any
* changed submodule SHA-1s when comparing index and HEAD, no
* matter what is configured. Otherwise the user won't be
- * shown any submodules she manually added (and which are
+ * shown any submodules manually added (and which are
* staged to be committed), which would be really confusing.