aboutsummaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorJake Hunsaker <jhunsake@redhat.com>2021-08-18 12:26:31 -0400
committerJake Hunsaker <jhunsake@redhat.com>2021-08-23 10:56:17 -0400
commitc60ae2dc1a4008cef074ab113163ed407fac6350 (patch)
treea6d7bcb0a9c01ba7c1467a11f538786007d2ab53 /docs
parent417a962a8f7af764d2107b1432a391649cd078bb (diff)
downloadsos-c60ae2dc1a4008cef074ab113163ed407fac6350.tar.gz
[collect,docs] Drop `--master` and update internal references
This commit follows up on the previous changes from #2555 by fully dropping the `--master` option in favor of `--primary`, `--manager`, and `--controller`. Internal references have been updated as well, using the term `primary` across all instances. Note that within OCP cluster profile, 'primary' labeling and option setting still relies on the 'master' label/role reported by the environment, as that remains the term used to identify such nodes. Resolves: #2329 Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>
Diffstat (limited to 'docs')
-rw-r--r--docs/index.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/index.rst b/docs/index.rst
index bb4904b6..16f765a2 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -13,7 +13,7 @@ https://github.com/sosreport/sos
For the latest version, to contribute, and for more information, please visit the project pages or join the mailing list.
-To clone the current master (development) branch run:
+To clone the current main (development) branch run:
.. code::
@@ -32,7 +32,7 @@ Mailing list
Patches and pull requests
^^^^^^^^^^^^^^^^^^^^^^^^^
-Patches can be submitted via the mailing list or as GitHub pull requests. If using GitHub please make sure your branch applies to the current master as a 'fast forward' merge (i.e. without creating a merge commit). Use the git rebase command to update your branch to the current master if necessary.
+Patches can be submitted via the mailing list or as GitHub pull requests. If using GitHub please make sure your branch applies to the current main branch as a 'fast forward' merge (i.e. without creating a merge commit). Use the git rebase command to update your branch to the current main branch if necessary.
Documentation
=============