diff --git a/en_US.ISO8859-1/articles/committers-guide/article.xml b/en_US.ISO8859-1/articles/committers-guide/article.xml index df78812d2f..3270a67ff5 100644 --- a/en_US.ISO8859-1/articles/committers-guide/article.xml +++ b/en_US.ISO8859-1/articles/committers-guide/article.xml @@ -323,17 +323,20 @@ You need a Passphrase to protect your secret key. Kerberos and LDAP web Password for &os; Cluster - The &os; cluster requires a Kerberos password to access certain - services. The Kerberos password also serves as the LDAP web password, - since LDAP is proxying to Kerberos in the cluster. Some of the services + The &os; cluster requires a Kerberos password to access + certain services. The Kerberos password also serves as the + LDAP web password, since LDAP is proxying to Kerberos in the + cluster. Some of the services which require this include: - Bugzilla + Bugzilla - Jenkins + Jenkins @@ -416,15 +419,15 @@ You need a Passphrase to protect your secret key. of the tree where the work is occurring. - Policy for Committer Activity In Other Trees + Policy for Committer Activity in Other Trees All committers may modify - base/head/share/misc/committers-*.dot, - base/head/usr.bin/calendar/calendars/calendar.freebsd, - and - ports/head/astro/xearth/files. + base/head/share/misc/committers-*.dot, + base/head/usr.bin/calendar/calendars/calendar.freebsd, + and + ports/head/astro/xearth/files. @@ -2462,8 +2465,7 @@ ControlPersist yes Avoid obfuscating the email address of the submitter as this adds additional work when searching - logs. - + logs. @@ -2928,7 +2930,8 @@ Relnotes: yes build infrastructure, approving new documentation committers, and ensuring that the &os; website and documentation on the FTP site is up to date with respect - to the subversion tree. It is not a conflict resolution body. + to the subversion tree. It is + not a conflict resolution body. The vast majority of documentation related discussion takes place on the &a.doc;. More details regarding the doceng team can be found in its Tier 3 platforms are architectures in the early stages of development, for non-mainstream hardware platforms, or which are considered legacy systems unlikely to see broad future - use. Initial support for Tier 3 platforms should be worked on in - external SCM repositories. + use. Initial support for Tier 3 platforms should be worked on + in external SCM repositories. The transition to &os;'s subversion should take place after the platform boots multi-user on hardware; sharing via subversion is needed for wider exposure; and multiple developers are actively working on the platform. Platforms that transition to Tier 3 status may be - removed from the tree if they are no longer actively supported by the - &os; developer community at the discretion of the release - engineer. + removed from the tree if they are no longer actively supported + by the &os; developer community at the discretion of the + release engineer. Tier 3 platforms may have ports support, either integrated or external, but do not require it. @@ -3830,8 +3833,8 @@ Relnotes: yes project. All systems not otherwise classified into a support tier - are Tier 4 systems. The &arch.ia64; platform is transitioning to - Tier 4 status in &os; 11. + are Tier 4 systems. The &arch.ia64; platform is transitioning + to Tier 4 status in &os; 11. @@ -4003,9 +4006,9 @@ Relnotes: yes Do not use svn add to add the - port. Follow these steps. If they are unclear, or are - not working, ask for help, do not just svn - add the port. + port. Follow these steps. If they are unclear, or + are not working, ask for help, do not just + svn add the port. @@ -4684,7 +4687,7 @@ bak/packages packages from last complete <major_version> run on <arch& MFH: line, for example: MFH: 2014Q1 - + It will automatically notify &a.ports-secteam; and &a.portmgr;. They will then decide if the commit can be merged and answer with the procedure. @@ -4755,8 +4758,7 @@ Property changes on: 2015Q1 ___________________________________________________________________ Modified: svn:mergeinfo Merged /head:r380362 -Do you want to commit? (no = start a shell) [y/n] - +Do you want to commit? (no = start a shell) [y/n] At that point, the script will either open a shell for you to fix things, or open your text editor with the @@ -4987,7 +4989,7 @@ Do you want to commit? (no = start a shell) [y/n] Are there any perks of being an &os; committer? - + Recognition as a competent software engineer is the longest lasting value. In addition, getting a chance @@ -5002,9 +5004,11 @@ Do you want to commit? (no = start a shell) [y/n] In addition, developers may request a cloaked hostmask for their account on the Freenode IRC network in the form of - freebsd/developer/freefall name + freebsd/developer/freefall + name or - freebsd/developer/NickServ name. + freebsd/developer/NickServ + name. To request a cloak, send an email to &a.irc.email; with your requested hostmask and NickServ account name.