Date: Sat, 13 Apr 2013 03:13:47 +0000 (UTC) From: Glen Barber <gjb@FreeBSD.org> To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org Subject: svn commit: r41416 - in projects/entities/en_US.ISO8859-1: articles/contributors articles/freebsd-update-server articles/releng books/handbook/basics books/handbook/kernelconfig htdocs htdocs/portm... Message-ID: <201304130313.r3D3DlGJ067037@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gjb Date: Sat Apr 13 03:13:47 2013 New Revision: 41416 URL: http://svnweb.freebsd.org/changeset/doc/41416 Log: Merged /head/en_US.ISO8859-1:r41354-41414 Approved by: doceng (implicit) Modified: projects/entities/en_US.ISO8859-1/articles/contributors/contrib.additional.xml projects/entities/en_US.ISO8859-1/articles/contributors/contrib.committers.xml projects/entities/en_US.ISO8859-1/articles/freebsd-update-server/article.xml projects/entities/en_US.ISO8859-1/articles/releng/article.xml projects/entities/en_US.ISO8859-1/books/handbook/basics/chapter.xml projects/entities/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.xml projects/entities/en_US.ISO8859-1/htdocs/administration.xml projects/entities/en_US.ISO8859-1/htdocs/portmgr/policies_eol.xml projects/entities/en_US.ISO8859-1/htdocs/ports/Makefile projects/entities/en_US.ISO8859-1/htdocs/releases/8.4R/schedule.xml projects/entities/en_US.ISO8859-1/htdocs/security/security.xml projects/entities/en_US.ISO8859-1/htdocs/where.xml projects/entities/en_US.ISO8859-1/share/xml/release.l10n.ent Directory Properties: projects/entities/en_US.ISO8859-1/ (props changed) Modified: projects/entities/en_US.ISO8859-1/articles/contributors/contrib.additional.xml ============================================================================== --- projects/entities/en_US.ISO8859-1/articles/contributors/contrib.additional.xml Sat Apr 13 03:13:31 2013 (r41415) +++ projects/entities/en_US.ISO8859-1/articles/contributors/contrib.additional.xml Sat Apr 13 03:13:47 2013 (r41416) @@ -10809,11 +10809,6 @@ </listitem> <listitem> - <para>William Grzybowski - <email>william88@gmail.com</email></para> - </listitem> - - <listitem> <para>William Jolitz <email>withheld</email></para> </listitem> Modified: projects/entities/en_US.ISO8859-1/articles/contributors/contrib.committers.xml ============================================================================== --- projects/entities/en_US.ISO8859-1/articles/contributors/contrib.committers.xml Sat Apr 13 03:13:31 2013 (r41415) +++ projects/entities/en_US.ISO8859-1/articles/contributors/contrib.committers.xml Sat Apr 13 03:13:47 2013 (r41416) @@ -508,6 +508,10 @@ </listitem> <listitem> + <para>&a.wg.email;</para> + </listitem> + + <listitem> <para>&a.jmg.email;</para> </listitem> @@ -1108,6 +1112,10 @@ </listitem> <listitem> + <para>&a.hiren.email;</para> + </listitem> + + <listitem> <para>&a.fluffy.email;</para> </listitem> Modified: projects/entities/en_US.ISO8859-1/articles/freebsd-update-server/article.xml ============================================================================== --- projects/entities/en_US.ISO8859-1/articles/freebsd-update-server/article.xml Sat Apr 13 03:13:31 2013 (r41415) +++ projects/entities/en_US.ISO8859-1/articles/freebsd-update-server/article.xml Sat Apr 13 03:13:47 2013 (r41416) @@ -507,7 +507,7 @@ Wed Aug 26 12:50:07 PDT 2009 Cleaning st <literal>ServerName</literal> in <filename>/etc/freebsd-update.conf</filename>, and perform updates as instructed in the <ulink - url="&url.books.handbook;/updating-freebsdupdate.html">&os; + url="&url.books.handbook;/updating-upgrading-freebsdupdate.html">&os; Update</ulink> <!-- One sentence, two instances of 'in'. We can probably reword this part to avoid repetition. --> Modified: projects/entities/en_US.ISO8859-1/articles/releng/article.xml ============================================================================== --- projects/entities/en_US.ISO8859-1/articles/releng/article.xml Sat Apr 13 03:13:31 2013 (r41415) +++ projects/entities/en_US.ISO8859-1/articles/releng/article.xml Sat Apr 13 03:13:47 2013 (r41416) @@ -46,8 +46,6 @@ <pubdate>$FreeBSD$</pubdate> - <releaseinfo>$FreeBSD$</releaseinfo> - <abstract> <para> <warning> Modified: projects/entities/en_US.ISO8859-1/books/handbook/basics/chapter.xml ============================================================================== --- projects/entities/en_US.ISO8859-1/books/handbook/basics/chapter.xml Sat Apr 13 03:13:31 2013 (r41415) +++ projects/entities/en_US.ISO8859-1/books/handbook/basics/chapter.xml Sat Apr 13 03:13:47 2013 (r41416) @@ -606,7 +606,7 @@ total 530 <programlisting>-rw-r--r-- 1 trhodes trhodes sunlnk 0 Mar 1 05:54 file1</programlisting> - <para>Several file flags may only added or removed by the + <para>Several file flags may only be added or removed by the <username>root</username> user. In other cases, the file owner may set its file flags. Refer to &man.chflags.1; and &man.chflags.2; for more information.</para> @@ -1401,8 +1401,8 @@ root 5211 0.0 0.2 3620 1724 2 <firstterm>partitions</firstterm>, which are represented as letters from <literal>a</literal> to <literal>h</literal>. This letter is appended to the device name, so - <quote>da0<emphasis>a</emphasis></quote> is the a partition on - the first da drive, which is <quote>dangerously + <quote>da0<emphasis>a</emphasis></quote> is the <literal>a</literal> partition on + the first <literal>da</literal> drive, which is <quote>dangerously dedicated</quote>. <quote>ad1s3<emphasis>e</emphasis></quote> is the fifth partition in the third slice of the second IDE disk drive.</para> Modified: projects/entities/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.xml ============================================================================== --- projects/entities/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.xml Sat Apr 13 03:13:31 2013 (r41415) +++ projects/entities/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.xml Sat Apr 13 03:13:47 2013 (r41416) @@ -291,8 +291,8 @@ following line in &man.loader.conf.5;: <para>If <filename class="directory">/usr/src/</filename> does not exist or it is empty, source has not been installed. The easiest way to install source is to use - <application>svn</application> as described in <link - linkend="svn"></link>. One should also create a symlink to + <application>svn</application> as described in <xref + linkend="svn"></xref>. One should also create a symlink to <filename class="directory">/usr/src/sys/</filename>:</para> <screen>&prompt.root; <userinput>ln -s /usr/src/sys /sys</userinput></screen> @@ -614,7 +614,7 @@ cpu I686_CPU</programlisting> <para>This option enables kernel support for access control lists (<acronym>ACL</acronym>s). This relies on the use of extended attributes and <acronym>UFS2</acronym>, and the feature is - described in detail in <link linkend="fs-acl"></link>. + described in detail in <xref linkend="fs-acl"></xref>. <acronym>ACL</acronym>s are enabled by default and should not be disabled in the kernel if they have been used previously on a file system, as this will remove the ACLs, changing the way Modified: projects/entities/en_US.ISO8859-1/htdocs/administration.xml ============================================================================== --- projects/entities/en_US.ISO8859-1/htdocs/administration.xml Sat Apr 13 03:13:31 2013 (r41415) +++ projects/entities/en_US.ISO8859-1/htdocs/administration.xml Sat Apr 13 03:13:47 2013 (r41416) @@ -237,13 +237,14 @@ <li>&a.cperciva.email; (Officer Emeritus)</li> <li>&a.csjp.email;</li> <li>&a.delphij.email; (Officer Deputy)</li> - <li>&a.des.email;</li> + <li>&a.des.email; (Officer)</li> <li>&a.gavin.email; (Core Team Liaison)</li> + <li>&a.gnn.email; (Secretary)</li> <li>&a.jonathan.email;</li> <li>&a.philip.email;</li> <li>&a.remko.email;</li> <li>&a.rwatson.email;</li> - <li>&a.simon.email; (Officer)</li> + <li>&a.simon.email; (Officer Emeritus)</li> <li>&a.stas.email;</li> <li>&a.trasz.email;</li> </ul> @@ -300,7 +301,7 @@ Team Secretary does not handle Security Officer Team items.</p> <ul> - <li>&a.remko.email;</li> + <li>&a.gnn.email;</li> </ul> <hr/> Modified: projects/entities/en_US.ISO8859-1/htdocs/portmgr/policies_eol.xml ============================================================================== --- projects/entities/en_US.ISO8859-1/htdocs/portmgr/policies_eol.xml Sat Apr 13 03:13:31 2013 (r41415) +++ projects/entities/en_US.ISO8859-1/htdocs/portmgr/policies_eol.xml Sat Apr 13 03:13:47 2013 (r41416) @@ -56,52 +56,38 @@ <th>Estimated EoL</th> </tr> <tr> - <td>RELENG_7</td> - <td>n/a</td> - <td>RELENG_7_3</td> - <td>packages-7-stable</td> - <td>February 28, 2013</td> - </tr> - <tr> - <td>RELENG_7_3</td> - <td>7.3-RELEASE</td> - <td>RELENG_7_3</td> - <td>packages-7-stable</td> - <td>March 31, 2012</td> - </tr> - <tr> - <td>RELENG_7_4</td> - <td>7.4-RELEASE</td> - <td>RELENG_7_3</td> - <td>packages-7-stable</td> - <td>February 28, 2013</td> - </tr> - <tr> <td>RELENG_8</td> <td>n/a</td> - <td>RELENG_8_1</td> + <td>RELENG_8_3</td> <td>packages-8-stable</td> <td>last release + 2 years</td> </tr> <tr> - <td>RELENG_8_1</td> - <td>8.1-RELEASE</td> - <td>RELENG_8_1</td> + <td>RELENG_8_3</td> + <td>8.3-RELEASE</td> + <td>RELENG_8_3</td> <td>packages-8-stable</td> - <td>July 31, 2012</td> + <td>April 30, 2014</td> </tr> - <tr> - <td>RELENG_8_2</td> - <td>8.2-RELEASE</td> - <td>RELENG_8_1</td> - <td>packages-8-stable</td> - <td>February 29, 2012</td> + <tr> + <td>RELENG_9</td> + <td>n/a</td> + <td>RELENG_9_1</td> + <td>packages-9-stable</td> + <td>last release + 2 years</td> </tr> - <tr> + <tr> + <td>RELENG_9_1</td> + <td>9.1-RELEASE</td> + <td>RELENG_9_1</td> + <td>packages-9-stable</td> + <td>December 31, 2014</td> + </tr> + <tr> <td>HEAD</td> <td>n/a</td> <td>HEAD</td> - <td>packages-9-current</td> + <td>packages-10-current</td> <td>Best Effort</td> </tr> </table> Modified: projects/entities/en_US.ISO8859-1/htdocs/ports/Makefile ============================================================================== --- projects/entities/en_US.ISO8859-1/htdocs/ports/Makefile Sat Apr 13 03:13:31 2013 (r41415) +++ projects/entities/en_US.ISO8859-1/htdocs/ports/Makefile Sat Apr 13 03:13:47 2013 (r41416) @@ -25,7 +25,7 @@ ${INDEX}: .endif HOSTNAME!= hostname -.if ${HOSTNAME} == "hub.freebsd.org" || ${HOSTNAME} == "freefall.freebsd.org" || ${HOSTNAME} == "www.freebsd.org" +.if ${HOSTNAME} == "hub.freebsd.org" || ${HOSTNAME} == "freefall.freebsd.org" || ${HOSTNAME} == "www.freebsd.org" || ${HOSTNAME} == "build-web.stream.FreeBSD.org" CLUSTER_MACHINE= YES .endif Modified: projects/entities/en_US.ISO8859-1/htdocs/releases/8.4R/schedule.xml ============================================================================== --- projects/entities/en_US.ISO8859-1/htdocs/releases/8.4R/schedule.xml Sat Apr 13 03:13:31 2013 (r41415) +++ projects/entities/en_US.ISO8859-1/htdocs/releases/8.4R/schedule.xml Sat Apr 13 03:13:47 2013 (r41416) @@ -81,6 +81,14 @@ </tr> <tr> + <td><tt>ports/</tt> tree freeze</td> + <td>30 March 2013</td> + <td>30 March 2013</td> + <td>Only security updates and critical fixes will be allowed + to the tree during this freeze.</td> + </tr> + + <tr> <td>releng/&local.rel; branch</td> <td>18 March 2013</td> <td>28 March 2013</td> @@ -91,7 +99,7 @@ <tr> <td>RC1</td> <td>30 March 2013</td> - <td>-</td> + <td>10 April 2013</td> <td>First release candidate.</td> </tr> Modified: projects/entities/en_US.ISO8859-1/htdocs/security/security.xml ============================================================================== --- projects/entities/en_US.ISO8859-1/htdocs/security/security.xml Sat Apr 13 03:13:31 2013 (r41415) +++ projects/entities/en_US.ISO8859-1/htdocs/security/security.xml Sat Apr 13 03:13:47 2013 (r41416) @@ -86,10 +86,21 @@ <table> <tr valign="top"> - <td>&a.simon.email;</td> + <td>&a.des.email; <a + href="mailto:des@FreeBSD.org"><des@FreeBSD.org></a></td> <td>Security Officer</td> </tr> <tr valign="top"> + <td>&a.delphij.email; <a + href="mailto:delphij@FreeBSD.org"><delphij@FreeBSD.org></a></td> + <td>Deputy Security Officer</td> + </tr> + <tr valign="top"> + <td>&a.simon.email; <a + href="mailto:simon@FreeBSD.org"><simon@FreeBSD.org></a></td> + <td>Security Officer Emeritus</td> + </tr> + <tr valign="top"> <td>&a.cperciva.email;</td> <td>Security Officer Emeritus</td> </tr> @@ -98,11 +109,6 @@ <td>Release Engineering liaison,<br/> TrustedBSD Project liaison, system security architecture expert</td> </tr> - <tr valign="top"> - <td>&a.delphij; <a - href="mailto:delphij@FreeBSD.org"><delphij@FreeBSD.org></a></td> - <td>Deputy Security Officer</td> - </tr> </table> <p>The Security Officer is supported by the <a Modified: projects/entities/en_US.ISO8859-1/htdocs/where.xml ============================================================================== --- projects/entities/en_US.ISO8859-1/htdocs/where.xml Sat Apr 13 03:13:31 2013 (r41415) +++ projects/entities/en_US.ISO8859-1/htdocs/where.xml Sat Apr 13 03:13:47 2013 (r41416) @@ -59,7 +59,7 @@ <tr style="text-align: center;"> <td colspan="2">Version & Platform</td> <td>Distribution</td> - <td title="ISO9660 CD image"><a href="&base;/doc/en_US.ISO8859-1/books/handbook/install-diff-media.html#INSTALL-CDROM">ISO</a></td> + <td title="ISO9660 CD image"><a href="&base;/doc/en_US.ISO8859-1/books/handbook/install-diff-media.html#install-cdrom">ISO</a></td> <td>Release<br/>Notes</td> <td>Hardware<br/>Notes</td> <td>Installation<br/>Notes</td> Modified: projects/entities/en_US.ISO8859-1/share/xml/release.l10n.ent ============================================================================== --- projects/entities/en_US.ISO8859-1/share/xml/release.l10n.ent Sat Apr 13 03:13:31 2013 (r41415) +++ projects/entities/en_US.ISO8859-1/share/xml/release.l10n.ent Sat Apr 13 03:13:47 2013 (r41416) @@ -13,7 +13,7 @@ <tr style="text-align: center;"> <td colspan="2">Version & Platform</td> <td>Distribution</td> - <td title="ISO9660 CD image"><a href="&base;/doc/en_US.ISO8859-1/books/handbook/install-diff-media.html#INSTALL-CDROM">ISO</a></td> + <td title="ISO9660 CD image"><a href="&base;/doc/en_US.ISO8859-1/books/handbook/install-diff-media.html#install-cdrom">ISO</a></td> <td>TODO List</td> </tr> </thead> @@ -87,7 +87,7 @@ <tr style="text-align: center;"> <td colspan="2">Version & Platform</td> <td>Distribution</td> - <td title="ISO9660 CD image"><a href="&base;/doc/en_US.ISO8859-1/books/handbook/install-diff-media.html#INSTALL-CDROM">ISO</a></td> + <td title="ISO9660 CD image"><a href="&base;/doc/en_US.ISO8859-1/books/handbook/install-diff-media.html#install-cdrom">ISO</a></td> <!--<td>Status page</td>--> </tr> </thead>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201304130313.r3D3DlGJ067037>