diff options
| author | Leo Famulari <leo@famulari.name> | 2016-07-22 18:57:40 -0400 |
|---|---|---|
| committer | Leo Famulari <leo@famulari.name> | 2016-07-22 18:58:31 -0400 |
| commit | d227260d2f7833b6bdc55b8e3792378626ef3b69 (patch) | |
| tree | 26d47d5d8ee8efb102323bca215429a8f8fe1095 /doc/contributing.texi | |
| parent | d778fa5ff6f4a860919eaf13db3f84cfc68cbee8 (diff) | |
| parent | 26ad4adb5568c6ff370f446431b079520fb09615 (diff) | |
| download | guix-patches-d227260d2f7833b6bdc55b8e3792378626ef3b69.tar guix-patches-d227260d2f7833b6bdc55b8e3792378626ef3b69.tar.gz | |
Merge branch 'master' into core-updates
Resolved conflicts:
* gnu/packages/scheme.scm: Conflict in import of (guix licenses). On master,
"#:hide (openssl)" was used. On core-updates, "#:select (some licenses)" was
used. The latter won the conflict.
* gnu/packages/version-control.scm (git)[arguments]: Whitespace conflict
in 'install-shell-completion.
Diffstat (limited to 'doc/contributing.texi')
| -rw-r--r-- | doc/contributing.texi | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/doc/contributing.texi b/doc/contributing.texi index 208c6af5e8..dc554d2c76 100644 --- a/doc/contributing.texi +++ b/doc/contributing.texi @@ -323,6 +323,12 @@ related to the hardware---e.g., use of different instruction set extensions---or to the operating system kernel---e.g., reliance on @code{uname} or @file{/proc} files. +@item +When writing documentation, please use gender-neutral wording when +referring to people, such as +@uref{https://en.wikipedia.org/wiki/Singular_they, singular +``they''@comma{} ``their''@comma{} ``them''}, and so forth. + @end enumerate When posting a patch to the mailing list, use @samp{[PATCH] @dots{}} as |