docs: Inclusive language Includes updating contributing docs to push to main branch. Change-Id: I14dc01999e519b6fd1bf9335842640f63fa0a808 Bug: 386, 209 Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/48583 Reviewed-by: Armando Montanez <amontanez@google.com> Commit-Queue: Rob Mohr <mohrr@google.com>
diff --git a/docs/build_system.rst b/docs/build_system.rst index 3bb4492..b8eb09f 100644 --- a/docs/build_system.rst +++ b/docs/build_system.rst
@@ -567,8 +567,7 @@ and platforms in the '//pw_build/platforms' and '//pw_build/constraints' directories. -.. inclusive-language: ignore -.. _Bazel platforms reference: https://docs.bazel.build/versions/master/platforms.html +.. _Bazel platforms reference: https://docs.bazel.build/versions/main/platforms.html Testing ^^^^^^^ @@ -718,15 +717,11 @@ -.. inclusive-language: disable +.. _Bazel selects reference: https://docs.bazel.build/versions/main/configurable-attributes.html#select-and-dependencies -.. _Bazel selects reference: https://docs.bazel.build/versions/master/configurable-attributes.html#select-and-dependencies +.. _Bazel target_compatible_with reference: https://docs.bazel.build/versions/main/platforms.html#skipping-incompatible-targets -.. _Bazel target_compatible_with reference: https://docs.bazel.build/versions/master/platforms.html#skipping-incompatible-targets - -.. _Bazel config reference: https://docs.bazel.build/versions/master/skylark/config.html - -.. inclusive-language: enable +.. _Bazel config reference: https://docs.bazel.build/versions/main/skylark/config.html Pigweeds configuration
diff --git a/docs/contributing.rst b/docs/contributing.rst index 5a0defa..33c0d9d 100644 --- a/docs/contributing.rst +++ b/docs/contributing.rst
@@ -28,20 +28,16 @@ line to your commit - Install the Pigweed presubmit check hook with ``pw presubmit --install`` -.. TODO(pwbug/209) inclusive-language: disable - #. Ensure all files include the correct copyright and license headers #. Include any necessary changes to the documentation #. Run :ref:`module-pw_presubmit` to detect style or compilation issues before uploading -#. Upload the change with ``git push origin HEAD:refs/for/master`` +#. Upload the change with ``git push origin HEAD:refs/for/main`` #. Address any reviewer feedback by amending the commit (``git commit --amend``) #. Submit change to CI builders to merge. If you are not part of Pigweed's core team, you can ask the reviewer to add the `+2 CQ` vote, which will trigger a rebase and submit once the builders pass -.. TODO(pwbug/209) inclusive-language: enable - .. note:: If you have any trouble with this flow, reach out in our `chat room @@ -235,11 +231,6 @@ If you ever need to bypass the presubmit hook (due to it being broken, for example) you may push using this command: -.. TODO(pwbug/209) inclusive-language: disable - .. code:: bash - $ git push origin HEAD:refs/for/master --no-verify - -.. TODO(pwbug/209) inclusive-language: enable - + $ git push origin HEAD:refs/for/main --no-verify