Merge pull request #2972 from freedomofpress/docs-wip-dachary-contrib…

…utor-privilege

Docs wip dachary contributor privilege

docs/development/contributor_guidelines.rst

@@ -118,16 +118,36 @@ should be removed. If you are unfamiliar with how to squash commits with rebase,
 check out this
 `blog post <http://gitready.com/advanced/2009/02/10/squashing-commits-with-rebase.html>`__.
 
+.. _contributor-permissions:
+
 Privileges
 ----------
 
+.. note:: The privilege escalation workflow is different for
+          :ref:`code maintainers <contributor-permissions>` and
+          :ref:`translation maintainers <i18n-administrator-permissions>`.
+
 Dedicated contributors to SecureDrop will be granted extra privileges
-such as the right to push new branches or to merge pull
-requests. There is no formal process at the moment but the general
-idea is that any contributor with the right technical and social
-skills is entitled to ask. The people who have the power to grant such
-privileges are committed to do so in a transparent way to avoid any
-disputes.
+such as the right to push new branches or to merge pull requests. Any
+contributor with the right technical and social skills is entitled to
+ask. The people who have the power to grant such privileges are
+committed to do so in a transparent way as follows:
+
+#. The contributor posts a message `in the forum
+   <https://forum.securedrop.club/>`__ asking for privileges (review or
+   merge, etc.).
+#. After at least a week someone with permissions to grant such
+   privilege reviews the thread and either:
+
+   * grants the privilege if there are no objections from current
+     maintainers and adds a message to the thread; or
+   * explains what is expected from the contributor before they can
+     be granted the privilege.
+
+#. The thread is closed.
+
+The privileges of a developer who has not been active for six months or
+more are revoked. They can apply again at any time.
 
 Other Tips
 ----------

docs/development/i18n.rst

@@ -297,9 +297,15 @@ We do not want to publish the translator emails so we strip them:
        git log --pretty='%aN' $previous_version..lab/i18n -- \
         securedrop/translations install_files/ansible-base/roles/tails-config/templates | sort -u
 
+.. _i18n-administrator-permissions:
+
 Translations administrators
 ---------------------------
 
+.. note:: The privilege escalation workflow is different for
+          :ref:`code maintainers <contributor-permissions>` and
+          :ref:`translation maintainers <i18n-administrator-permissions>`.
+
 A translation administrator is a person who is actively performing
 administrative duties. They have special permissions on the
 repositories and the translation platform. When someone is willing to
@@ -313,9 +319,8 @@ among the current administrators.
 All administrators are listed in the `forum introduction page
 <https://forum.securedrop.club/t/about-the-translations-category/16/1>`_
 
-An administrator who has not be active for two months or more is
-removed from the list and their permissions revoked. They can apply
-again at anytime.
+The privileges of an administrator who has not been active for six months
+or more are revoked. They can apply again at any time.
 
 The community of SecureDrop translators works very closely with the
 SecureDrop developers and some of them participate in both