diff options
Diffstat (limited to 'en_US.ISO8859-1/articles')
7 files changed, 27 insertions, 155 deletions
diff --git a/en_US.ISO8859-1/articles/5-roadmap/article.sgml b/en_US.ISO8859-1/articles/5-roadmap/article.sgml index 2162705c34..0c32bd2981 100644 --- a/en_US.ISO8859-1/articles/5-roadmap/article.sgml +++ b/en_US.ISO8859-1/articles/5-roadmap/article.sgml @@ -83,7 +83,7 @@ <para>Our intent is to avoid repeating that scenario with &os; 5.x. Delaying the &t.releng.5; branch until it is stable and production quality will ensure that it stays maintainable and provides a compelling reason - to upgrade from 4.<replaceable>X</replaceable>. To do this, we must + to upgrade from 4.<replaceable>X</replaceable>, To do this, we must identify the current areas of weakness and set clear goals for resolving them. This document contains what we as the release engineering team feel are the milestones and issues that must be diff --git a/en_US.ISO8859-1/articles/committers-guide/article.sgml b/en_US.ISO8859-1/articles/committers-guide/article.sgml index 762cfd8a80..185ea29d92 100644 --- a/en_US.ISO8859-1/articles/committers-guide/article.sgml +++ b/en_US.ISO8859-1/articles/committers-guide/article.sgml @@ -91,16 +91,12 @@ <row> <entry><emphasis>Mailing Lists</emphasis></entry> - <entry>&a.doc-developers;, &a.doc-committers;; - &a.ports-developers;, &a.ports-committers;; - &a.src-developers;, &a.src-committers;. (Each project - repository has its own -developers and -committers mailing - lists. Archives for these lists may be found in files - <filename>/home/mail/<replaceable>repository-name</replaceable>-developers-archive</filename> - and - <filename>/home/mail/<replaceable>repository-name</replaceable>-committers-archive</filename> - on the <hostid role="domainname">FreeBSD.org</hostid> - cluster.) + <entry>&a.developers;, &a.committers; + (Both of these are private lists; archives can be found + in <filename>/home/mail/developers-archive</filename> + and <filename>/home/mail/committers-archive</filename> + on the <hostid role="domainname">FreeBSD.org</hostid> + cluster.) </entry> </row> @@ -685,11 +681,11 @@ alias scvs env CVS_RSH=ssh cvs -d <replaceable>user</replaceable>@ncvs.FreeBSD.o </itemizedlist> <para>You will almost certainly get a conflict because - of the <literal>$Id: article.sgml,v 1.193 2004-05-22 12:57:44 simon Exp $</literal> (or in FreeBSD's case, + of the <literal>$Id: article.sgml,v 1.191 2004-05-11 13:29:46 den Exp $</literal> (or in FreeBSD's case, <literal>$<!-- stop expansion -->FreeBSD<!-- stop expansion -->$</literal>) lines, so you will have to edit the file to resolve the conflict - (remove the marker lines and the second <literal>$Id: article.sgml,v 1.193 2004-05-22 12:57:44 simon Exp $</literal> line, - leaving the original <literal>$Id: article.sgml,v 1.193 2004-05-22 12:57:44 simon Exp $</literal> line intact).</para> + (remove the marker lines and the second <literal>$Id: article.sgml,v 1.191 2004-05-11 13:29:46 den Exp $</literal> line, + leaving the original <literal>$Id: article.sgml,v 1.191 2004-05-11 13:29:46 den Exp $</literal> line intact).</para> </listitem> <listitem> @@ -2805,8 +2801,8 @@ docs:Documentation Bug:freebsd-doc:</programlisting> <answer> <para>No. The ports manager will regenerate the - <filename>INDEX</filename> and commit it for each - &os; release.</para> + <filename>INDEX</filename> and commit it every few + days.</para> </answer> </qandaentry> diff --git a/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml b/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml index 529dfbdd54..c967fcbf4d 100644 --- a/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml +++ b/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml @@ -256,11 +256,6 @@ </listitem> <listitem> - <para>Alexey Y. Mikhailov - <email>karma@ez.pereslavl.ru</email></para> - </listitem> - - <listitem> <para>Alexey V. Neyman <email>alex.neyman@auriga.ru</email></para> </listitem> @@ -506,11 +501,6 @@ </listitem> <listitem> - <para>Andrey Slusar - <email>vasallia@ukr.net</email></para> - </listitem> - - <listitem> <para>Andrey Sverdlichenko <email>rblaze@users.sourceforge.net</email></para> </listitem> @@ -531,11 +521,6 @@ </listitem> <listitem> - <para>Andy Miller - <email>andy@trit.org</email></para> - </listitem> - - <listitem> <para>Andy Pavlo <email>amp0928@rit.edu</email></para> </listitem> @@ -1326,11 +1311,6 @@ </listitem> <listitem> - <para>Daniel Roethlisberger - <email>daniel@roe.ch</email></para> - </listitem> - - <listitem> <para>Daniel W. McRobb <email>dwm@caimis.com</email></para> </listitem> @@ -1571,11 +1551,6 @@ </listitem> <listitem> - <para>Dermot Tynan - <email>dtynan@kalopa.com</email></para> - </listitem> - - <listitem> <para>Diane Bruce <email>db@db.net</email></para> </listitem> @@ -1606,11 +1581,6 @@ </listitem> <listitem> - <para>Dmitri Nikulin - <email>setagllib@optusnet.com.au</email></para> - </listitem> - - <listitem> <para>Dmitry A. Yanko <email>fm@astral.ntu-kpi.kiev.ua</email></para> </listitem> @@ -5771,11 +5741,6 @@ </listitem> <listitem> - <para>Robin Schoonover - <email>end@endif.cjb.net</email></para> - </listitem> - - <listitem> <para>Rod Taylor <email>rod@idiotswitch.org</email></para> </listitem> @@ -5796,11 +5761,6 @@ </listitem> <listitem> - <para>Roman Neuhauser - <email>neuhauser@chello.cz</email></para> - </listitem> - - <listitem> <para>Roman V. Palagin <email>romanp@unshadow.net</email></para> </listitem> @@ -6261,6 +6221,11 @@ </listitem> <listitem> + <para>Stefan Farfeleder + <email>e0026813@stud3.tuwien.ac.at</email></para> + </listitem> + + <listitem> <para>Stefan Jahn <email>stefan.jahn@nemesis-sektor.de</email></para> </listitem> @@ -6651,11 +6616,6 @@ </listitem> <listitem> - <para>Thomas Spreng - <email>spreng@socket.ch</email></para> - </listitem> - - <listitem> <para>Thomas Stromberg <email>tstrombe@rtci.com</email></para> </listitem> @@ -6691,11 +6651,6 @@ </listitem> <listitem> - <para>Tijl Coosemans - <email>tijl@ulyssis.org</email></para> - </listitem> - - <listitem> <para>Tillman Hodgson <email>tillman@seekingfire.com</email></para> </listitem> @@ -6736,21 +6691,11 @@ </listitem> <listitem> - <para>Timur I. Bakeyev - <email>timur@gnu.org</email></para> - </listitem> - - <listitem> <para>Tobias Reifenberger <email>treif@mayn.de</email></para> </listitem> <listitem> - <para>Tobias Roth - <email>ports@fsck.ch</email></para> - </listitem> - - <listitem> <para>Toby Allsopp <email>toby@mi6.gen.nz</email></para> </listitem> diff --git a/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml b/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml index e2a35c1b06..ed51b994b7 100644 --- a/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml +++ b/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml @@ -659,10 +659,6 @@ </listitem> <listitem> - <para>&a.stefanf;</para> - </listitem> - - <listitem> <para>&a.stephane;</para> </listitem> @@ -771,10 +767,6 @@ </listitem> <listitem> - <para>&a.mezz;</para> - </listitem> - - <listitem> <para>&a.dinoex;</para> </listitem> @@ -933,11 +925,7 @@ <listitem> <para>&a.alfred;</para> </listitem> - - <listitem> - <para>&a.csjp;</para> - </listitem> - + <listitem> <para>&a.wes;</para> </listitem> @@ -951,11 +939,11 @@ </listitem> <listitem> - <para>&a.krion;</para> + <para>&a.bp;</para> </listitem> <listitem> - <para>&a.bp;</para> + <para>&a.krion;</para> </listitem> <listitem> @@ -1207,10 +1195,6 @@ </listitem> <listitem> - <para>&a.metal;</para> - </listitem> - - <listitem> <para>&a.suz;</para> </listitem> diff --git a/en_US.ISO8859-1/articles/contributors/contrib.staff.sgml b/en_US.ISO8859-1/articles/contributors/contrib.staff.sgml index 076df9c55a..1603054c4b 100644 --- a/en_US.ISO8859-1/articles/contributors/contrib.staff.sgml +++ b/en_US.ISO8859-1/articles/contributors/contrib.staff.sgml @@ -149,55 +149,6 @@ </itemizedlist> </sect2> - <sect2 id="staff-secteam"> - <title>The &os; Security Team:</title> - - <para>The current security team in &os; consists of:</para> - - <itemizedlist> - <listitem> - <para>&a.rwatson</para> - </listitem> - - <listitem> - <para>&a.bms;</para> - </listitem> - - <listitem> - <para>&a.cperciva;</para> - </listitem> - - <listitem> - <para>&a.des;</para> - </listitem> - - <listitem> - <para>&a.gshapiro;</para> - </listitem> - - <listitem> - <para>&a.guido;</para> - </listitem> - - <listitem> - <para>&a.imp;</para> - </listitem> - - <listitem> - <para>&a.julian;</para> - </listitem> - - <listitem> - <para>&a.nectar;</para> - </listitem> - - <listitem> - <para>&a.trhodes;</para> - </listitem> - </itemizedlist> - </sect2> - - <sect2> <title>Misc Hats</title> @@ -221,14 +172,6 @@ </listitem> </itemizedlist> - <para>Current &os; security officer deputy</para> - - <itemizedlist> - <listitem> - <para>&a.des;</para> - </listitem> - </itemizedlist> - <para>Current &os; core team secretary:</para> <itemizedlist> <listitem> diff --git a/en_US.ISO8859-1/articles/dialup-firewall/article.sgml b/en_US.ISO8859-1/articles/dialup-firewall/article.sgml index 6ea1502af6..3e1e488ef2 100644 --- a/en_US.ISO8859-1/articles/dialup-firewall/article.sgml +++ b/en_US.ISO8859-1/articles/dialup-firewall/article.sgml @@ -166,7 +166,7 @@ ppp_profile="<replaceable>your_profile</replaceable>"</programlisting> is that you add the rules for everything you would like to allow, and then everything else is automatically denied.</para> - <para>Following that, let's create the directory where we will store our + <para>First off, let's create the directory where we will store our firewall rules. In this example, we'll use <filename class="directory">/etc/firewall</filename>. Change into the directory and edit the file <filename>fwrules</filename> as we @@ -226,9 +226,9 @@ $fwcmd add deny log ip from any to any</programlisting> <para>You now have a fully functional firewall that only allows connections to ports 22 and 80 and will log any other connection - attempts. You may now safely reboot and the firewall should + attempts. You may now safely safely reboot and the firewall should be automatically started and the ruleset loaded. If you find this - incorrect in any way or experience any problems, or have any + incorrect in anyway or experience any problems, or have any suggestions to improve this page, please email me.</para> </sect1> diff --git a/en_US.ISO8859-1/articles/hubs/article.sgml b/en_US.ISO8859-1/articles/hubs/article.sgml index fcfd492cff..ec3f90fa13 100644 --- a/en_US.ISO8859-1/articles/hubs/article.sgml +++ b/en_US.ISO8859-1/articles/hubs/article.sgml @@ -1106,6 +1106,10 @@ cvspserver stream tcp nowait root /usr/bin/cvs cvs -f -l -R -T /anoncvstmp --all <title>CVSup site stats</title> <itemizedlist> <listitem> + <para>cvsup5.FreeBSD.org - <email>staff@blackened.com</email> - <ulink + url="http://cvsup.freebsd.blackened.com/cvsup.freebsd.html">(CVSup processes)</ulink></para> + </listitem> + <listitem> <para>cvsup[23456].jp.FreeBSD.org - <email>kuriyama@FreeBSD.org</email> - <ulink url="http://home.jp.FreeBSD.org/stats/mrtg/cvsup/">(CVSup processes)</ulink></para> </listitem> |