Merge the projects/entities branch into head/
The primary purposes are to clean up duplicated author definitions in
both share/xml/authors.ent and share/xml/developers.ent, and as a added
bonus simplify writing up author names/email addresses in web pages.
Apart from merging developers.ent into authors.ent, removing the former,
and updating the Committers Guide there should be little user-visible changes:
- a.portmgr renamed to a.portmgr.members
- a.doceng renamed to a.doceng.members
- team.re renamed to a.re.members.email and moved from
share/xml/freebsd.ent to share/xml/authors.ent
- a.core updated and moved from share/xml/mailing-lists.ent to
share/xml/teams.ent
- share/pgpkeys/{addkey.sh|README} updated
Translations are untouched except for build fixes.
Approved by: doceng (gjb)
Approved by: gjb (mentor)
This commit is contained in:
parent
ef5f908611
commit
1d9bea10ed
Notes:
svn2git
2020-12-08 03:00:23 +00:00
svn path=/head/; revision=42226
55 changed files with 3018 additions and 2922 deletions
|
|
@ -98,9 +98,6 @@ used in both environments.
|
|||
<!ENTITY os.numports "24,000">
|
||||
<!ENTITY ports.size "500 MB">
|
||||
|
||||
<!-- Teams and Hats -->
|
||||
<!ENTITY team.re "&a.kib;, &a.blackend;, &a.jpaetzel;, &a.hrs;, &a.kensmith;">
|
||||
|
||||
<!-- GUI-buttons -->
|
||||
<!ENTITY gui.ok "<guibutton>[ OK ]</guibutton>">
|
||||
<!ENTITY gui.cancel "<guibutton>[ Cancel ]</guibutton>">
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue