Page MenuHomeFreeBSD
Files F170888219

D29922.diff
No OneTemporary
Actions

D29922.diff
View Options

diff --git a/documentation/content/en/articles/committers-guide/_index.adoc b/documentation/content/en/articles/committers-guide/_index.adoc
--- a/documentation/content/en/articles/committers-guide/_index.adoc
+++ b/documentation/content/en/articles/committers-guide/_index.adoc
@@ -2429,22 +2429,9 @@
For committers: do not commit anything without first getting mentor approval.
Document that approval with an `Approved by:` line in the commit message.
-When the mentor decides that a mentee has learned the ropes and is ready to commit on their own, the mentor announces it with a commit to [.filename]#conf/mentors#.
-This file is in the [.filename]#svnadmin# branch of each repository:
-
-[.informaltable]
-[cols="1,1", frame="none"]
-|===
-
-|`src`
-|[.filename]#base/svnadmin/conf/mentors#
-
-|`doc`
-|[.filename]#doc/svnadmin/conf/mentors#
-
-|`ports`
-|[.filename]#ports/svnadmin/conf/mentors#
-|===
+When the mentor decides that a mentee has learned the ropes and is ready to commit on their own, the mentor announces it with a commit to [.filename]#mentors#.
+This file is in the [.filename]#admin# orphan branch of each repository.
+Detailed information on how to access these branches can be found in link:{handbook}mirror/#admin-branch["admin" branch].
[[pre-commit-review]]
== Pre-Commit Review
diff --git a/documentation/content/en/books/handbook/mirrors/_index.adoc b/documentation/content/en/books/handbook/mirrors/_index.adoc
--- a/documentation/content/en/books/handbook/mirrors/_index.adoc
+++ b/documentation/content/en/books/handbook/mirrors/_index.adoc
@@ -627,6 +627,7 @@
% chmod 755 .git/hooks/prepare-commit-msg
....
+[[admin-branch]]
==== "admin" branch
The `access` and `mentors` files are stored in an orphan branch, `internal/admin`, in each repository.
diff --git a/website/content/en/internal/new-account.adoc b/website/content/en/internal/new-account.adoc
--- a/website/content/en/internal/new-account.adoc
+++ b/website/content/en/internal/new-account.adoc
@@ -55,7 +55,9 @@
== 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 Git repository to indicate the mentor relationship. Having done all that, the new committer and mentor jointly go through the first commit operations.
+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.
+Having done all that, the new committer and mentor jointly go through the first commit operations.
== Additional Services
@@ -65,8 +67,10 @@
== End Of Mentorship
-There is no pre-set duration for a mentorship. Once the mentor feels the mentee is ready to 'fly solo' the mentor notifies the developer community by removing the entry from the `mentors` file in Git.
+There is no pre-set duration for a mentorship.
+Once the mentor feels the mentee is ready to 'fly solo' the mentor notifies the developer community by removing the entry from the `mentors` file in Git.
== 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. In Git, the `mentors` file should be updated.
+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.

File Metadata

Mime Type
text/plain
Expires
Tue, Sep 8, 8:15 AM (10 h, 6 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
38368088
Default Alt Text
D29922.diff (4 KB)

Event Timeline