diff --git a/en_US.ISO8859-1/articles/committers-guide/article.sgml b/en_US.ISO8859-1/articles/committers-guide/article.sgml index 98b74006ca..d610afa1f3 100644 --- a/en_US.ISO8859-1/articles/committers-guide/article.sgml +++ b/en_US.ISO8859-1/articles/committers-guide/article.sgml @@ -168,8 +168,8 @@ responsible for direct modification of it for the purposes of cleanup or fixing some grievous abuse of CVS by a committer. Should you cause some - repository accident, say a bad cvs import or cvs tag operation, - mail the &a.cvs; (or call one of them) and report the problem to + repository accident, say a bad cvs import or cvs tag + operation, mail the &a.cvs; (or call one of them) and report the problem to one of them. The only ones able to directly fiddle the repository bits on the repository hosts are the repomeisters. There are no login shells on @@ -592,11 +592,11 @@ You will almost certainly get a conflict because - of the $Id: article.sgml,v 1.144 2002-12-26 17:17:45 trhodes Exp $ (or in FreeBSD's case, - $FreeBSD$) lines, so you will have to edit - the file to resolve the conflict (remove the marker lines and - the second $Id: article.sgml,v 1.144 2002-12-26 17:17:45 trhodes Exp $ line, leaving the original - $Id: article.sgml,v 1.144 2002-12-26 17:17:45 trhodes Exp $ line intact). + of the $Id: article.sgml,v 1.145 2002-12-26 17:46:53 trhodes Exp $ (or in FreeBSD's case, + $FreeBSD$) + lines, so you will have to edit the file to resolve the conflict + (remove the marker lines and the second $Id: article.sgml,v 1.145 2002-12-26 17:46:53 trhodes Exp $ line, + leaving the original $Id: article.sgml,v 1.145 2002-12-26 17:46:53 trhodes Exp $ line intact). @@ -634,7 +634,8 @@ You always want to use , since unified diffs are much easier to read than almost any other - diff format (in some circumstances, context diffs generated with the option may be + diff format (in some circumstances, context diffs generated with + the option may be better, but they are much bulkier). A unified diff consists of a series of hunks. Each hunk begins with a line that starts with two @ signs and specifies where in the @@ -847,7 +848,8 @@ checkout -P properly (tabs often look wrong in diffs because of the extra character in front of each line). - http://people.FreeBSD.org/~eivind/cdiff + + http://people.FreeBSD.org/~eivind/cdiff Simply use it instead of &man.more.1; or &man.less.1;: @@ -931,7 +933,8 @@ checkout -P - Some people add an entry for themselves to src/usr.bin/calendar/calendars/calendar.freebsd. + Some people add an entry for themselves to + src/usr.bin/calendar/calendars/calendar.freebsd. @@ -1038,7 +1041,8 @@ checkout -P - http://www.cs.utah.edu/csinfo/texinfo/gnats/gnats.html + + http://www.cs.utah.edu/csinfo/texinfo/gnats/gnats.html @@ -1088,7 +1092,7 @@ checkout -P The rest of these examples assume you have only supped the docs category. Adjust them as necessary, - depending on the categories you are synching. + depending on the categories you are syncing. @@ -1106,7 +1110,7 @@ checkout -P &prompt.root; ln -s /usr/gnats/docs Repeat as necessary, depending on how many GNATS categories you - are synching. + are syncing. @@ -1493,8 +1497,9 @@ docs:Documentation Bug:nik: Respect all code freezes and read the - committers and developers mailing lists in a timely manner - so you know when a code freeze is in effect. + committers and developers + mailing lists in a timely manner so you know when a code freeze is + in effect. @@ -1550,8 +1555,8 @@ docs:Documentation Bug:nik: that they have special dispensation to step outside of any of the lines painted here; core's special powers only kick in when it acts as a group, not on an individual - basis. As individuals, the core team members are all committers first and core - second. + basis. As individuals, the core team members are all committers + first and core second. Details @@ -1649,7 +1654,8 @@ docs:Documentation Bug:nik: Makefile for any package or subtree which is being actively maintained by one or more people; see http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/developers-handbook/policies.html + url="../../books/developers-handbook/policies.html"> + http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/developers-handbook/policies.html for documentation on this. Where sections of code have several maintainers, commits to affected areas by one maintainer need to be reviewed by at least one other @@ -1663,7 +1669,9 @@ docs:Documentation Bug:nik: someone who manages an overall category of FreeBSD evolution, such as internationalization or networking. See http://www.FreeBSD.org/doc/en_US.ISO8859-1/articles/contributors/staff-who.html for more information on this. + url="../contributors/article.html"> + http://www.FreeBSD.org/doc/en_US.ISO8859-1/articles/contributors/staff-who.html + for more information on this. @@ -1760,8 +1768,8 @@ docs:Documentation Bug:nik: to continue to attract new members. There will be occasions when, despite everyone's very best attempts at self-control, tempers are lost and angry words are - exchanged. The best thing that can be done in such cases is to minimize the - effects of this until everyone has cooled back down. That + exchanged. The best thing that can be done in such cases is to minimize + the effects of this until everyone has cooled back down. That means that you should not air your angry words in public and you should not forward private correspondence to public mailing lists or aliases. What people say @@ -1785,8 +1793,9 @@ docs:Documentation Bug:nik: Respect all code freezes and read the - committers and developers mailing list on a timely - basis so you know when a code freeze is in effect. + committers and developers + mailing list on a timely basis so you know when a code freeze is + in effect. Committing unapproved changes during a code freeze is a really big mistake and committers are expected to keep up-to-date @@ -2065,7 +2074,7 @@ docs:Documentation Bug:nik: and release engineering teams. At the discretion of the toolchain maintainer, they may be supported in the toolchain. Tier 3 platforms are architectures for which hardware is not or will not - be available to the project in the forseeable future, for which + be available to the project in the foreseeable future, for which there are two or fewer active developers, that can not boot to at least single-user mode on real hardware (or simulator for new hardware platforms), or which are considered legacy systems @@ -2407,7 +2416,8 @@ docs:Documentation Bug:nik: First, go check - http://bento.FreeBSD.org/~asami/errorlogs/. + + http://bento.FreeBSD.org/~asami/errorlogs/. There you will find error logs from the latest package building runs on 3-stable, 4-stable and 5-current. @@ -2837,7 +2847,7 @@ MFC after: 1 month The mailing lists are archived under /g/mail which will show up as /hub/g/mail with &man.pwd.1;. - This location is accessable from any machine on the FreeBSD cluster. + This location is accessible from any machine on the FreeBSD cluster.