- Take the outdated sections of articles/contributors out of circulation
in doc/ Discussed with: joel Reviewed by: joel Approved by: gabor (mentor)
This commit is contained in:
parent
eef11d136d
commit
d67493361d
Notes:
svn2git
2020-12-08 03:00:23 +00:00
svn path=/head/; revision=32673
3 changed files with 12 additions and 13 deletions
|
|
@ -750,11 +750,11 @@ alias scvs cvs -d <replaceable>user</replaceable>@ncvs.FreeBSD.org:/home/ncvs</p
|
||||||
</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.277 2008-08-06 22:03:48 pgj Exp $</literal> (or in FreeBSD's case,
|
of the <literal>$Id: article.sgml,v 1.278 2008-08-16 21:42:35 pgj Exp $</literal> (or in FreeBSD's case,
|
||||||
<literal>$<!-- stop expansion -->FreeBSD<!-- stop expansion -->$</literal>)
|
<literal>$<!-- stop expansion -->FreeBSD<!-- stop expansion -->$</literal>)
|
||||||
lines, so you will have to edit the file to resolve the conflict
|
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.277 2008-08-06 22:03:48 pgj Exp $</literal> line,
|
(remove the marker lines and the second <literal>$Id: article.sgml,v 1.278 2008-08-16 21:42:35 pgj Exp $</literal> line,
|
||||||
leaving the original <literal>$Id: article.sgml,v 1.277 2008-08-06 22:03:48 pgj Exp $</literal> line intact).</para>
|
leaving the original <literal>$Id: article.sgml,v 1.278 2008-08-16 21:42:35 pgj Exp $</literal> line intact).</para>
|
||||||
</listitem>
|
</listitem>
|
||||||
|
|
||||||
<listitem>
|
<listitem>
|
||||||
|
|
@ -2020,8 +2020,7 @@ docs:Documentation Bug:freebsd-doc:</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="&url.articles.contributors;/staff-who.html">
|
url="&url.base;/administration.html"></ulink>
|
||||||
http://www.FreeBSD.org/doc/en_US.ISO8859-1/articles/contributors/staff-who.html</ulink>
|
|
||||||
for more information on this.</para>
|
for more information on this.</para>
|
||||||
</listitem>
|
</listitem>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1113,8 +1113,8 @@ applicable.</para>
|
||||||
url="http://www.FreeBSD.org/doc/en_US.ISO8859-1/articles/contributors/staff-committers.html"></ulink>
|
url="http://www.FreeBSD.org/doc/en_US.ISO8859-1/articles/contributors/staff-committers.html"></ulink>
|
||||||
</para>
|
</para>
|
||||||
|
|
||||||
<para>[6] FreeBSD Core-Team
|
<para>[6] FreeBSD Core Team
|
||||||
<ulink url="http://www.FreeBSD.org/doc/en_US.ISO8859-1/articles/contributors/staff-core.html"></ulink></para>
|
<ulink url="&url.base;/administration.html#t-core"></ulink></para>
|
||||||
|
|
||||||
<para>[7] FreeBSD Handbook
|
<para>[7] FreeBSD Handbook
|
||||||
<ulink url="http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook"></ulink>
|
<ulink url="http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook"></ulink>
|
||||||
|
|
|
||||||
|
|
@ -267,7 +267,7 @@ obrien@FreeBSD.org - 30 March 1997</programlisting>
|
||||||
|
|
||||||
<listitem>
|
<listitem>
|
||||||
<para>Any encumbered file requires specific approval from the
|
<para>Any encumbered file requires specific approval from the
|
||||||
<ulink url="&url.articles.contributors;/staff-core.html">Core team</ulink> before it is added to the
|
<ulink url="&url.base;/administration.html#t-core">Core Team</ulink> before it is added to the
|
||||||
CVS repository.</para>
|
CVS repository.</para>
|
||||||
</listitem>
|
</listitem>
|
||||||
|
|
||||||
|
|
@ -298,9 +298,9 @@ obrien@FreeBSD.org - 30 March 1997</programlisting>
|
||||||
|
|
||||||
<listitem>
|
<listitem>
|
||||||
<para>Should always be in <filename>LINT</filename>, but the
|
<para>Should always be in <filename>LINT</filename>, but the
|
||||||
<ulink url="&url.articles.contributors;/staff-core.html">Core team</ulink> decides per case if it
|
<ulink url="&url.base;/administration.html#t-core">Core Team</ulink> decides per case if it
|
||||||
should be commented out or not. The
|
should be commented out or not. The
|
||||||
<ulink url="&url.articles.contributors;/staff-core.html">Core team</ulink> can, of course, change
|
<ulink url="&url.base;/administration.html#t-core">Core Team</ulink> can, of course, change
|
||||||
their minds later on.</para>
|
their minds later on.</para>
|
||||||
</listitem>
|
</listitem>
|
||||||
|
|
||||||
|
|
@ -317,13 +317,13 @@ obrien@FreeBSD.org - 30 March 1997</programlisting>
|
||||||
<orderedlist>
|
<orderedlist>
|
||||||
<listitem>
|
<listitem>
|
||||||
<indexterm><primary>core team</primary></indexterm>
|
<indexterm><primary>core team</primary></indexterm>
|
||||||
<para>The <ulink url="&url.articles.contributors;/staff-core.html">Core team</ulink> decides if
|
<para>The <ulink url="&url.base;/administration.html#t-core">Core team</ulink> decides if
|
||||||
the code should be part of <command>make world</command>.</para>
|
the code should be part of <command>make world</command>.</para>
|
||||||
</listitem>
|
</listitem>
|
||||||
|
|
||||||
<listitem>
|
<listitem>
|
||||||
<indexterm><primary>release engineer</primary></indexterm>
|
<indexterm><primary>release engineering</primary></indexterm>
|
||||||
<para>The <ulink url="&url.articles.contributors;/staff-who.html">Release Engineer</ulink>
|
<para>The <ulink url="&url.base;/administration.html#t-re">Release Engineering</ulink>
|
||||||
decides if it goes into the release.</para>
|
decides if it goes into the release.</para>
|
||||||
</listitem>
|
</listitem>
|
||||||
</orderedlist>
|
</orderedlist>
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue