From e9ea680446d2260c4679ca02ab9ecd5613cfa095 Mon Sep 17 00:00:00 2001 From: "Alexander J. Pfleger" <70842573+AJPfleger@users.noreply.github.com> Date: Thu, 21 Mar 2024 15:05:35 +0100 Subject: [PATCH] docs: remove empty style guide and fix gender neutral language (#3049) The (empty) style guide seems to be unnecessary, since we already have a separate section [Code guidelines](https://acts.readthedocs.io/en/v33.0.0/codeguide.html) and also talk about formatting in the [Contribution guidelines](https://acts.readthedocs.io/en/v33.0.0/contribution/guide.html#contribution-guidelines). --- CONTRIBUTING.rst | 2 +- docs/contribution/contribution.md | 1 - docs/contribution/style_guide.md | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) delete mode 100644 docs/contribution/style_guide.md diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 630c8b6bd98..d846d2e5e21 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -154,7 +154,7 @@ familiar with development process in the Acts project. #. **Prefer git pull --rebase!** If you work with a colleague on a new - development, you may want to include his latest changes. This is + development, you may want to include their latest changes. This is usually done by calling ``git pull`` which will synchronise your local working copy with the remote repository (which may have been updated by your colleague). By default, this action creates a merge diff --git a/docs/contribution/contribution.md b/docs/contribution/contribution.md index ae3540b0392..4799e6b9583 100644 --- a/docs/contribution/contribution.md +++ b/docs/contribution/contribution.md @@ -12,5 +12,4 @@ physmon root_hash_checks release profiling -style_guide ::: diff --git a/docs/contribution/style_guide.md b/docs/contribution/style_guide.md deleted file mode 100644 index ba9396f383d..00000000000 --- a/docs/contribution/style_guide.md +++ /dev/null @@ -1 +0,0 @@ -# Style guide