git: 7ff1d2be5dc2 - main - MAINTAINERS/CODEOWNERS: Fix intro wrap + gitadm

The branch main has been updated by ziaee:

URL: https://cgit.FreeBSD.org/src/commit/?id=7ff1d2be5dc2384562bb755f9c0e4c0e37ee1e73

commit 7ff1d2be5dc2384562bb755f9c0e4c0e37ee1e73
Author:     Alexander Ziaee <ziaee@FreeBSD.org>
AuthorDate: 2026-01-12 14:30:29 +0000
Commit:     Alexander Ziaee <ziaee@FreeBSD.org>
CommitDate: 2026-01-12 14:36:18 +0000

    MAINTAINERS/CODEOWNERS: Fix intro wrap + gitadm
    
    + svnadmin has apparently been superceeded by gitadm@
    + fix intro prose wrapping to be consistent at 72 for trad console
    
    MFC after:      3 days
---
 .github/CODEOWNERS | 30 +++++++++++++++---------------
 MAINTAINERS        | 25 ++++++++++++-------------
 2 files changed, 27 insertions(+), 28 deletions(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 49a625e579e9..85b5b116f635 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,34 +1,34 @@
 # Please note that the content of this file is strictly advisory.
-# No locks listed here are valid.  The only strict review requirements
-# are granted by core.  These are documented in head/LOCKS and enforced
-# by svnadmin/conf/approvers.
+# No locks listed here are valid. The only strict review requirements
+# are granted by core. These are documented in head/LOCKS and enforced
+# by gitadm@.
 #
-# The source tree is a community effort.  However, some folks go to the
-# trouble of looking after particular areas of the tree.  In return for
+# The source tree is a community effort. However, some folks go to the
+# trouble of looking after particular areas of the tree. In return for
 # their active caretaking of the code it is polite to coordinate changes
 # with them.  This is a list of people who have expressed an interest in
 # part of the code or listed their active caretaking role so that other
-# committers can easily find somebody who is familiar with it.  The notes
+# committers can easily find somebody who is familiar with it. The notes
 # should specify if there is a 3rd party source tree involved or other
 # things that should be kept in mind.
 #
-# However, this is not a 'big stick', it is an offer to help and a source
-# of guidance.  It does not override the communal nature of the tree.
-# It is not a registry of 'turf' or private property.
+# However, this is not a 'big stick', it is an offer to help and a
+# source of guidance. It does not override the communal nature of the
+# tree. It is not a registry of 'turf' or private property.
 #
 # ***
-# This list is prone to becoming stale quickly.  The best way to find the recent
-# maintainer of a sub-system is to check recent logs for that directory or
-# sub-system.
+# This list is prone to becoming stale quickly. The best way to find the
+# recent maintainer of a sub-system is to check recent logs for that
+# directory or sub-system.
 # ***
 #
 # ***
 # Maintainers are encouraged to visit:
 # https://reviews.freebsd.org/herald
 #
-# and configure Phabricator notifications for parts of the tree which they
-# maintain.  Notifications can automatically be sent when someone proposes a
-# revision or makes a commit to the specified subtree.
+# and configure Phabricator notifications for parts of the tree which
+# they maintain. Notifications can automatically be sent when someone
+# proposes a revision or makes a commit to the specified subtree.
 # ***
 
 /bin/sh		@jillest
diff --git a/MAINTAINERS b/MAINTAINERS
index 80c4bf5ce900..494a20f39298 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1,26 +1,25 @@
-
 Please note that the content of this file is strictly advisory.
-No locks listed here are valid.  The only strict review requirements
-are granted by core.  These are documented in LOCKS and enforced
+No locks listed here are valid. The only strict review requirements
+are granted by core. These are documented in LOCKS and enforced
 by gitadm@.
 
-The source tree is a community effort.  However, some folks go to the
-trouble of looking after particular areas of the tree.  In return for
+The source tree is a community effort. However, some folks go to the
+trouble of looking after particular areas of the tree. In return for
 their active caretaking of the code it is polite to coordinate changes
-with them.  This is a list of people who have expressed an interest in
+with them. This is a list of people who have expressed an interest in
 part of the code or listed their active caretaking role so that other
-committers can easily find somebody who is familiar with it.  The notes
+committers can easily find somebody who is familiar with it. The notes
 should specify if there is a 3rd party source tree involved or other
 things that should be kept in mind.
 
 However, this is not a 'big stick', it is an offer to help and a source
-of guidance.  It does not override the communal nature of the tree.
+of guidance. It does not override the communal nature of the tree.
 It is not a registry of 'turf' or private property.
 
 ***
-This list is prone to becoming stale quickly.  The best way to find the recent
-maintainer of a sub-system is to check recent logs for that directory or
-sub-system.
+This list is prone to becoming stale quickly. The best way to find the
+recent maintainer of a sub-system is to check recent logs for that
+directory or sub-system.
 ***
 
 ***
@@ -28,8 +27,8 @@ Maintainers are encouraged to visit:
   https://reviews.freebsd.org/herald
 
 and configure notifications for parts of the tree which they maintain.
-Notifications can automatically be sent when someone proposes a revision or
-makes a commit to the specified subtree.
+Notifications can automatically be sent when someone proposes a revision
+or makes a commit to the specified subtree.
 ***
 
 subsystem	login	notes