aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--documentation/content/en/articles/committers-guide/_index.adoc2
-rw-r--r--website/content/en/internal/new-account.adoc29
2 files changed, 21 insertions, 10 deletions
diff --git a/documentation/content/en/articles/committers-guide/_index.adoc b/documentation/content/en/articles/committers-guide/_index.adoc
index ade98950b1..216afb4458 100644
--- a/documentation/content/en/articles/committers-guide/_index.adoc
+++ b/documentation/content/en/articles/committers-guide/_index.adoc
@@ -2475,7 +2475,7 @@ Those who have been given commit rights to the FreeBSD repositories must follow
[[commit-steps]]
[.procedure]
====
-*Procedure 1. Steps for New Committers*
+*Steps for New Committers*
. Add an Author Entity
+
diff --git a/website/content/en/internal/new-account.adoc b/website/content/en/internal/new-account.adoc
index fc368068b3..2b5391aff4 100644
--- a/website/content/en/internal/new-account.adoc
+++ b/website/content/en/internal/new-account.adoc
@@ -15,7 +15,8 @@ If you want to propose a new committer, you should send the following informatio
* Who has volunteered to become the mentor for the new committer.
* The email address of the nominee (remarkably often this is omitted).
-Any commit bit requests that do not follow the guidelines outlined above will be delayed (at best) or earn you negative vibrations from the respective team/team secretary. For some guidelines on how the proposal itself should be written, please see link:../proposing-committers[a brief summary].
+Any commit bit requests that do not follow the guidelines outlined above will be delayed (at best) or earn you negative vibrations from the respective team/team secretary.
+For some guidelines on how the proposal itself should be written, please see link:../proposing-committers[a brief summary].
Responsible party for this procedure is:
@@ -23,11 +24,13 @@ Responsible party for this procedure is:
* doc -> doceng@
* ports -> portmgr@
-You will get ACK after the message is seen, and core@, doceng@ and portmgr@ will give you a response after voting is finished or when the timeout is hit. The timeout for core@ and portmgr@ is set to 7 days while for doceng@ it is 14 days, however, as indicated, this is just a worst case and team members may finish voting earlier.
+You will get ACK after the message is seen, and core@, doceng@ and portmgr@ will give you a response after voting is finished or when the timeout is hit.
+The timeout for core@ and portmgr@ is set to 7 days while for doceng@ it is 14 days, however, as indicated, this is just a worst case and team members may finish voting earlier.
== Authorizing A New Account
-Someone from the list below sends a PGP-signed email to accounts@, the person assigned as the mentor to the new committer, and copied to core@FreeBSD.org confirming the approval of the new account. This email should include a link to this document so the mentor/mentee know what is expected of them.
+Someone from the list below sends a PGP-signed email to accounts@, the person assigned as the mentor to the new committer, and copied to core@FreeBSD.org confirming the approval of the new account.
+This email should include a link to this document so the mentor/mentee know what is expected of them.
New account approvals are only valid from these PGP entities:
@@ -35,7 +38,9 @@ New account approvals are only valid from these PGP entities:
* portmgr-secretary (for ports commit bits)
* doceng-secretary (for doc commit bits)
-_NOTE: New account requests from anyone other than these entities or requests signed with PGP keys other than from these entities will not be acted upon. No exceptions. In case of a new ports or doc committer the account request email should be CC:-ed to core._
+_NOTE: New account requests from anyone other than these entities or requests signed with PGP keys other than from these entities will not be acted upon.
+No exceptions.
+In case of a new ports or doc committer the account request email should be CC:-ed to core._
== Information Needed From The Mentor
@@ -47,7 +52,11 @@ The person assigned as the new committers' mentor needs to collect and send the
* shell (sh, csh/tcsh, bash, zsh are available)
* ssh V2 public key
-The mentor is responsible for obtaining this information from the new committer in a secure fashion, and providing it to accounts@ in a secure fashion. PGP-signed email, with the mentor's public key already committed to the Handbook, is the preferred method for the mentor to send the information to accounts@. If this is impossible for some reason an acceptable substitute is for the mentor to place the account information in their home directory on freefall and then tell accounts@ where to find it. We need to be sure the account information really is coming from the Mentor and unsigned email is not sufficient for this these days. Since accounts@ has no way to verify anything from the new Committer this information needs to be sent to accounts@ by the Mentor, not the new Committer.
+The mentor is responsible for obtaining this information from the new committer in a secure fashion, and providing it to accounts@ in a secure fashion.
+PGP-signed email, with the mentor's public key already committed to the Handbook, is the preferred method for the mentor to send the information to accounts@.
+If this is impossible for some reason an acceptable substitute is for the mentor to place the account information in their home directory on freefall and then tell accounts@ where to find it.
+We need to be sure the account information really is coming from the Mentor and unsigned email is not sufficient for this these days.
+Since accounts@ has no way to verify anything from the new Committer this information needs to be sent to accounts@ by the Mentor, not the new Committer.
== accounts@ Creates New Account
@@ -55,15 +64,16 @@ accounts@ creates the new account with the above information on the FreeBSD.org
== Mentor Activates New Committer's Commit Bit
-After the new committer confirms that the account works, the mentor adds the new committer to the correct `access` file, using an appropriate commit message. The commit message should at least contain the committer's full name and username, the mentor's name and what area the new committer will start to work in.
-An entry should also be added to the `mentors` file in the respective link:{handbook}mirror/#admin-branch[Git repository] to indicate the mentor relationship.
+After the new committer confirms that the account works, the mentor adds the new committer to the correct `access` file, using an appropriate commit message.
+The commit message should at least contain the committer's full name and username, the mentor's name and what area the new committer will start to work in.
+An entry should also be added to the `mentors` file in the respective link:{committers-guide}/#admin-branch[Git repository] to indicate the mentor relationship.
Having done all that, the new committer and mentor jointly go through the first commit operations.
== Additional Services
The mentor should add the new committer to the https://wiki.freebsd.org/DevelopersGroup[Developers group] on the wiki and to the https://reviews.freebsd.org/project/view/3/[committer] project on Phabricator.
-Reading the link:{committers-guide}[Committer's Guide] is considered a good first step for new committers, especially the link:{committers-guide}#"conventions.html[Conventions and Traditions] section.
+Reading the link:{committers-guide}[Committer's Guide] is considered a good first step for new committers, especially the link:{committers-guide}/#conventions/[Conventions and Traditions] section.
== End Of Mentorship
@@ -72,5 +82,6 @@ Once the mentor feels the mentee is ready to 'fly solo' the mentor notifies the
== Transfer Of Mentorship
-Should a need arise to transfer mentorship for a committer please email the responsible party, as described for a new account proposal. Typically this request is rubberstamped as-is.
+Should a need arise to transfer mentorship for a committer please email the responsible party, as described for a new account proposal.
+Typically this request is rubberstamped as-is.
In Git, the `mentors` file should be updated.