os/doc
3
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Wrap lines && fix some spelling errors. This was not introduced during my

Browse source 
last commit.
This commit is contained in:
Tom Rhodes 2002-12-26 17:46:53 +00:00
parent 5d9fa5e183
commit fcbbf2c56b
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=15438
1 changed files with 36 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
en_US.ISO8859-1/articles/committers-guide/article.sgml
View file

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