Fernando Apesteguía
2021-05-21 10:28:12 UTC
The branch main has been updated by fernape:
URL: https://cgit.FreeBSD.org/doc/commit/?id=17f753900c2530abaa1d6953582a4ffe203bdc0f
commit 17f753900c2530abaa1d6953582a4ffe203bdc0f
Author: Fernando Apesteguía <***@FreeBSD.org>
AuthorDate: 2021-04-22 13:30:28 +0000
Commit: Fernando Apesteguía <***@FreeBSD.org>
CommitDate: 2021-05-21 10:24:14 +0000
Replace references to svnadmin branch
In committers-guide, handbook and the new-account page in the website.
There were references to the old `svnadmin` branch.
Approved by: 0mp (mentor)
Differential Revision: https://reviews.freebsd.org/D29922
---
.../content/en/articles/committers-guide/_index.adoc | 19 +++----------------
.../content/en/books/handbook/mirrors/_index.adoc | 1 +
website/content/en/internal/new-account.adoc | 10 +++++++---
3 files changed, 11 insertions(+), 19 deletions(-)
diff --git a/documentation/content/en/articles/committers-guide/_index.adoc b/documentation/content/en/articles/committers-guide/_index.adoc
index e1ea6a26d6..540a408a51 100644
--- a/documentation/content/en/articles/committers-guide/_index.adoc
+++ b/documentation/content/en/articles/committers-guide/_index.adoc
@@ -2429,22 +2429,9 @@ The mentor is also personally responsible for the mentee's actions during this i
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
index 736314acf7..c2ef4eb4d9 100644
--- a/documentation/content/en/books/handbook/mirrors/_index.adoc
+++ b/documentation/content/en/books/handbook/mirrors/_index.adoc
@@ -627,6 +627,7 @@ Again, note that `gitrepo.freebsd.org` will be canonicalized to `repo.freebsd.or
% 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
index 530db544c1..fc368068b3 100644
--- a/website/content/en/internal/new-account.adoc
+++ b/website/content/en/internal/new-account.adoc
@@ -55,7 +55,9 @@ 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 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 @@ Reading the link:{committers-guide}[Committer's Guide] is considered a good firs
== 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.
URL: https://cgit.FreeBSD.org/doc/commit/?id=17f753900c2530abaa1d6953582a4ffe203bdc0f
commit 17f753900c2530abaa1d6953582a4ffe203bdc0f
Author: Fernando Apesteguía <***@FreeBSD.org>
AuthorDate: 2021-04-22 13:30:28 +0000
Commit: Fernando Apesteguía <***@FreeBSD.org>
CommitDate: 2021-05-21 10:24:14 +0000
Replace references to svnadmin branch
In committers-guide, handbook and the new-account page in the website.
There were references to the old `svnadmin` branch.
Approved by: 0mp (mentor)
Differential Revision: https://reviews.freebsd.org/D29922
---
.../content/en/articles/committers-guide/_index.adoc | 19 +++----------------
.../content/en/books/handbook/mirrors/_index.adoc | 1 +
website/content/en/internal/new-account.adoc | 10 +++++++---
3 files changed, 11 insertions(+), 19 deletions(-)
diff --git a/documentation/content/en/articles/committers-guide/_index.adoc b/documentation/content/en/articles/committers-guide/_index.adoc
index e1ea6a26d6..540a408a51 100644
--- a/documentation/content/en/articles/committers-guide/_index.adoc
+++ b/documentation/content/en/articles/committers-guide/_index.adoc
@@ -2429,22 +2429,9 @@ The mentor is also personally responsible for the mentee's actions during this i
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
index 736314acf7..c2ef4eb4d9 100644
--- a/documentation/content/en/books/handbook/mirrors/_index.adoc
+++ b/documentation/content/en/books/handbook/mirrors/_index.adoc
@@ -627,6 +627,7 @@ Again, note that `gitrepo.freebsd.org` will be canonicalized to `repo.freebsd.or
% 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
index 530db544c1..fc368068b3 100644
--- a/website/content/en/internal/new-account.adoc
+++ b/website/content/en/internal/new-account.adoc
@@ -55,7 +55,9 @@ 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 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 @@ Reading the link:{committers-guide}[Committer's Guide] is considered a good firs
== 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.