Date: Wed, 2 Oct 2013 14:37:46 +0000 (UTC) From: Glen Barber <gjb@FreeBSD.org> To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org Subject: svn commit: r42805 - in projects/sysctl: de_DE.ISO8859-1/htdocs de_DE.ISO8859-1/share/xml el_GR.ISO8859-7/share/xml en_US.ISO8859-1/articles/committers-guide en_US.ISO8859-1/articles/contributors e... Message-ID: <201310021437.r92Ebkcm069452@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gjb Date: Wed Oct 2 14:37:45 2013 New Revision: 42805 URL: http://svnweb.freebsd.org/changeset/doc/42805 Log: MFH: Merged /head/de_DE.ISO8859-1:r42573-42802 Merged /head/el_GR.ISO8859-7:r42573-42802 Merged /projects/ISBN_1-57176-407-0/en_US.ISO8859-1:r41456 Merged /head/en_US.ISO8859-1:r42573-42802 Merged /head/fr_FR.ISO8859-1:r42573-42802 Merged /head/hu_HU.ISO8859-2:r42573-42802 Merged /head/ja_JP.eucJP:r42573-42802 Merged /head/mn_MN.UTF-8:r42573-42802 Merged /head/nl_NL.ISO8859-1:r42573-42802 Merged /head/pl_PL.ISO8859-2:r42573-42802 Merged /head/ru_RU.KOI8-R:r42573-42802 Merged /head/share:r42573-42802 Merged /head/zh_CN.GB2312:r42573-42802 Approved by: doceng (implicit) Sponsored by: The FreeBSD Foundation Added: projects/sysctl/en_US.ISO8859-1/books/porters-handbook/versions.xml - copied unchanged from r42802, head/en_US.ISO8859-1/books/porters-handbook/versions.xml projects/sysctl/en_US.ISO8859-1/htdocs/news/status/report-2013-07-2013-09.xml - copied unchanged from r42802, head/en_US.ISO8859-1/htdocs/news/status/report-2013-07-2013-09.xml projects/sysctl/en_US.ISO8859-1/htdocs/releases/9.2R/announce.xml - copied unchanged from r42802, head/en_US.ISO8859-1/htdocs/releases/9.2R/announce.xml projects/sysctl/en_US.ISO8859-1/htdocs/releases/9.2R/errata.html - copied unchanged from r42802, head/en_US.ISO8859-1/htdocs/releases/9.2R/errata.html projects/sysctl/en_US.ISO8859-1/htdocs/releases/9.2R/hardware.html - copied unchanged from r42802, head/en_US.ISO8859-1/htdocs/releases/9.2R/hardware.html projects/sysctl/en_US.ISO8859-1/htdocs/releases/9.2R/installation.html - copied unchanged from r42802, head/en_US.ISO8859-1/htdocs/releases/9.2R/installation.html projects/sysctl/en_US.ISO8859-1/htdocs/releases/9.2R/readme.html - copied unchanged from r42802, head/en_US.ISO8859-1/htdocs/releases/9.2R/readme.html projects/sysctl/en_US.ISO8859-1/htdocs/releases/9.2R/relnotes.xml - copied unchanged from r42802, head/en_US.ISO8859-1/htdocs/releases/9.2R/relnotes.xml projects/sysctl/ja_JP.eucJP/htdocs/releases/9.2R/ - copied from r42802, head/ja_JP.eucJP/htdocs/releases/9.2R/ projects/sysctl/share/pgpkeys/arundel.key - copied unchanged from r42802, head/share/pgpkeys/arundel.key projects/sysctl/share/pgpkeys/br.key - copied unchanged from r42802, head/share/pgpkeys/br.key projects/sysctl/share/pgpkeys/danilo.key - copied unchanged from r42802, head/share/pgpkeys/danilo.key projects/sysctl/share/pgpkeys/secteam-secretary.key - copied unchanged from r42802, head/share/pgpkeys/secteam-secretary.key projects/sysctl/share/pgpkeys/zbb.key - copied unchanged from r42802, head/share/pgpkeys/zbb.key projects/sysctl/share/security/advisories/FreeBSD-SA-13:11.sendfile.asc - copied unchanged from r42802, head/share/security/advisories/FreeBSD-SA-13:11.sendfile.asc projects/sysctl/share/security/advisories/FreeBSD-SA-13:12.ifioctl.asc - copied unchanged from r42802, head/share/security/advisories/FreeBSD-SA-13:12.ifioctl.asc projects/sysctl/share/security/advisories/FreeBSD-SA-13:13.nullfs.asc - copied unchanged from r42802, head/share/security/advisories/FreeBSD-SA-13:13.nullfs.asc projects/sysctl/share/security/patches/SA-13:11/ - copied from r42802, head/share/security/patches/SA-13:11/ projects/sysctl/share/security/patches/SA-13:12/ - copied from r42802, head/share/security/patches/SA-13:12/ projects/sysctl/share/security/patches/SA-13:13/ - copied from r42802, head/share/security/patches/SA-13:13/ Deleted: projects/sysctl/en_US.ISO8859-1/htdocs/projects/c99/ Modified: projects/sysctl/de_DE.ISO8859-1/htdocs/where.xml projects/sysctl/de_DE.ISO8859-1/share/xml/news.xml projects/sysctl/de_DE.ISO8859-1/share/xml/release.l10n.ent projects/sysctl/el_GR.ISO8859-7/share/xml/teams.ent projects/sysctl/en_US.ISO8859-1/articles/committers-guide/article.xml projects/sysctl/en_US.ISO8859-1/articles/contributors/contrib.additional.xml projects/sysctl/en_US.ISO8859-1/articles/contributors/contrib.committers.xml projects/sysctl/en_US.ISO8859-1/books/dev-model/book.xml projects/sysctl/en_US.ISO8859-1/books/faq/book.xml projects/sysctl/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml projects/sysctl/en_US.ISO8859-1/books/handbook/basics/chapter.xml projects/sysctl/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml projects/sysctl/en_US.ISO8859-1/books/handbook/desktop/chapter.xml projects/sysctl/en_US.ISO8859-1/books/handbook/dtrace/chapter.xml projects/sysctl/en_US.ISO8859-1/books/handbook/multimedia/chapter.xml projects/sysctl/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml projects/sysctl/en_US.ISO8859-1/books/handbook/ports/chapter.xml projects/sysctl/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml projects/sysctl/en_US.ISO8859-1/books/handbook/security/chapter.xml projects/sysctl/en_US.ISO8859-1/books/handbook/x11/chapter.xml projects/sysctl/en_US.ISO8859-1/books/porters-handbook/Makefile projects/sysctl/en_US.ISO8859-1/books/porters-handbook/book.xml projects/sysctl/en_US.ISO8859-1/books/porters-handbook/uses.xml projects/sysctl/en_US.ISO8859-1/htdocs/administration.xml projects/sysctl/en_US.ISO8859-1/htdocs/advocacy/myths.xml projects/sysctl/en_US.ISO8859-1/htdocs/cgi/man.cgi projects/sysctl/en_US.ISO8859-1/htdocs/donations/donors.xml projects/sysctl/en_US.ISO8859-1/htdocs/news/status/Makefile projects/sysctl/en_US.ISO8859-1/htdocs/news/status/README projects/sysctl/en_US.ISO8859-1/htdocs/projects/Makefile projects/sysctl/en_US.ISO8859-1/htdocs/projects/projects.xml projects/sysctl/en_US.ISO8859-1/htdocs/releases/10.0R/schedule.xml projects/sysctl/en_US.ISO8859-1/htdocs/releases/9.2R/Makefile projects/sysctl/en_US.ISO8859-1/htdocs/releases/9.2R/schedule.xml projects/sysctl/en_US.ISO8859-1/htdocs/releases/Makefile projects/sysctl/en_US.ISO8859-1/htdocs/releng/index.xml projects/sysctl/en_US.ISO8859-1/htdocs/security/security.xml projects/sysctl/en_US.ISO8859-1/htdocs/where.xml projects/sysctl/en_US.ISO8859-1/share/xml/release.l10n.ent projects/sysctl/en_US.ISO8859-1/share/xml/teams.ent projects/sysctl/fr_FR.ISO8859-1/share/xml/release.l10n.ent (contents, props changed) projects/sysctl/fr_FR.ISO8859-1/share/xml/teams.ent projects/sysctl/hu_HU.ISO8859-2/share/xml/teams.ent projects/sysctl/ja_JP.eucJP/books/handbook/cutting-edge/chapter.xml projects/sysctl/ja_JP.eucJP/books/handbook/desktop/chapter.xml projects/sysctl/ja_JP.eucJP/books/handbook/install/chapter.xml projects/sysctl/ja_JP.eucJP/books/handbook/introduction/chapter.xml projects/sysctl/ja_JP.eucJP/books/handbook/ports/chapter.xml projects/sysctl/ja_JP.eucJP/books/handbook/x11/chapter.xml projects/sysctl/ja_JP.eucJP/htdocs/projects/Makefile projects/sysctl/ja_JP.eucJP/htdocs/projects/projects.xml projects/sysctl/ja_JP.eucJP/htdocs/releases/Makefile projects/sysctl/ja_JP.eucJP/htdocs/security/security.xml projects/sysctl/ja_JP.eucJP/htdocs/where.xml projects/sysctl/ja_JP.eucJP/share/xml/l10n.ent projects/sysctl/ja_JP.eucJP/share/xml/news.xml projects/sysctl/ja_JP.eucJP/share/xml/release.l10n.ent projects/sysctl/mn_MN.UTF-8/share/xml/teams.ent projects/sysctl/nl_NL.ISO8859-1/share/xml/release.l10n.ent (contents, props changed) projects/sysctl/nl_NL.ISO8859-1/share/xml/teams.ent projects/sysctl/pl_PL.ISO8859-2/share/xml/teams.ent projects/sysctl/ru_RU.KOI8-R/share/xml/teams.ent projects/sysctl/share/pgpkeys/addkey.sh projects/sysctl/share/pgpkeys/arved.key projects/sysctl/share/pgpkeys/avg.key projects/sysctl/share/pgpkeys/bf.key projects/sysctl/share/pgpkeys/des.key projects/sysctl/share/pgpkeys/erwin.key projects/sysctl/share/pgpkeys/gahr.key projects/sysctl/share/pgpkeys/gavin.key projects/sysctl/share/pgpkeys/gjb.key projects/sysctl/share/pgpkeys/issyl0.key projects/sysctl/share/pgpkeys/jase.key projects/sysctl/share/pgpkeys/jkim.key projects/sysctl/share/pgpkeys/loos.key projects/sysctl/share/pgpkeys/marius.key projects/sysctl/share/pgpkeys/mat.key projects/sysctl/share/pgpkeys/matthew.key projects/sysctl/share/pgpkeys/pgollucci.key projects/sysctl/share/pgpkeys/pgpkeys-developers.xml projects/sysctl/share/pgpkeys/pgpkeys-officers.xml projects/sysctl/share/pgpkeys/pgpkeys-other.xml projects/sysctl/share/pgpkeys/pgpkeys.ent projects/sysctl/share/pgpkeys/roberto.key projects/sysctl/share/pgpkeys/security-officer.key projects/sysctl/share/pgpkeys/skreuzer.key projects/sysctl/share/pgpkeys/stas.key projects/sysctl/share/pgpkeys/syrinx.key projects/sysctl/share/pgpkeys/thierry.key projects/sysctl/share/security/advisories/FreeBSD-SA-13:09.ip_multicast.asc projects/sysctl/share/security/advisories/FreeBSD-SA-13:10.sctp.asc projects/sysctl/share/xml/advisories.xml projects/sysctl/share/xml/authors.ent projects/sysctl/share/xml/commercial.consult.xml projects/sysctl/share/xml/events2013.xml projects/sysctl/share/xml/mirrors.xml projects/sysctl/share/xml/news.dtd projects/sysctl/share/xml/news.xml projects/sysctl/share/xml/release.ent projects/sysctl/zh_CN.GB2312/share/xml/teams.ent Directory Properties: projects/sysctl/de_DE.ISO8859-1/ (props changed) projects/sysctl/el_GR.ISO8859-7/ (props changed) projects/sysctl/en_US.ISO8859-1/ (props changed) projects/sysctl/fr_FR.ISO8859-1/ (props changed) projects/sysctl/hu_HU.ISO8859-2/ (props changed) projects/sysctl/ja_JP.eucJP/ (props changed) projects/sysctl/mn_MN.UTF-8/ (props changed) projects/sysctl/nl_NL.ISO8859-1/ (props changed) projects/sysctl/pl_PL.ISO8859-2/ (props changed) projects/sysctl/ru_RU.KOI8-R/ (props changed) projects/sysctl/share/ (props changed) projects/sysctl/zh_CN.GB2312/ (props changed) Modified: projects/sysctl/de_DE.ISO8859-1/htdocs/where.xml ============================================================================== --- projects/sysctl/de_DE.ISO8859-1/htdocs/where.xml Wed Oct 2 14:37:14 2013 (r42804) +++ projects/sysctl/de_DE.ISO8859-1/htdocs/where.xml Wed Oct 2 14:37:45 2013 (r42805) @@ -2,7 +2,7 @@ <!DOCTYPE html PUBLIC "-//FreeBSD//DTD XHTML 1.0 Transitional-Based Extension//EN" "http://www.FreeBSD.org/XML/doc/share/xml/xhtml10-freebsd.dtd" [ <!ENTITY dedate "$FreeBSDde$"> -<!ENTITY reference "basiert auf: r41269"> +<!ENTITY reference "basiert auf: r42767"> <!ENTITY title "FreeBSD Bezugsquellen"> <!ENTITY url.rel "ftp://ftp.FreeBSD.org/pub/FreeBSD/releases">; ]> @@ -69,10 +69,10 @@ <tr> <td colspan="2">FreeBSD &rel.current;-RELEASE</td> <td colspan="2"></td> - <td rowspan="5"><a href="&enbase;/releases/&rel.current;R/relnotes.html">[Lesen]</a></td> - <td rowspan="5"><a href="&enbase;/releases/&rel.current;R/hardware.html">[Lesen]</a></td> - <td rowspan="5"><a href="&enbase;/releases/&rel.current;R/installation.html">[Lesen]</a></td> - <td rowspan="5"><a href="&enbase;/releases/&rel.current;R/errata.html">[Lesen]</a></td> + <td rowspan="7"><a href="&enbase;/releases/&rel.current;R/relnotes.html">[Lesen]</a></td> + <td rowspan="7"><a href="&enbase;/releases/&rel.current;R/hardware.html">[Lesen]</a></td> + <td rowspan="7"><a href="&enbase;/releases/&rel.current;R/installation.html">[Lesen]</a></td> + <td rowspan="7"><a href="&enbase;/releases/&rel.current;R/errata.html">[Lesen]</a></td> </tr> <tr> <td></td> @@ -86,7 +86,6 @@ <td><a href="&url.rel;/i386/i386/&rel.current;-RELEASE">[Distribution]</a></td> <td><a href="&url.rel;/i386/i386/ISO-IMAGES/&rel.current;/">[ISO]</a></td> </tr> - <!-- <tr> <td></td> <td>ia64</td> @@ -99,7 +98,6 @@ <td><a href="&url.rel;/powerpc/powerpc/&rel.current;-RELEASE">[Distribution]</a></td> <td><a href="&url.rel;/powerpc/powerpc/ISO-IMAGES/&rel.current;/">[ISO]</a></td> </tr> - --> <tr> <td></td> <td>powerpc64</td> Modified: projects/sysctl/de_DE.ISO8859-1/share/xml/news.xml ============================================================================== --- projects/sysctl/de_DE.ISO8859-1/share/xml/news.xml Wed Oct 2 14:37:14 2013 (r42804) +++ projects/sysctl/de_DE.ISO8859-1/share/xml/news.xml Wed Oct 2 14:37:45 2013 (r42805) @@ -4,7 +4,7 @@ <!-- $FreeBSD$ $FreeBSDde$ - basiert auf: r42555 + basiert auf: r42766 --> <!-- Simple schema for FreeBSD Project news. @@ -39,9 +39,132 @@ <name>2013</name> <month> + <name>9</name> + + <day> + <name>30</name> + + <event> + <title>&os; 9.2-RELEASE verfügbar</title> + + <p><a href="&enbase;/releases/9.2R/announce.html">&os; + 9.2-RELEASE</a> ist verfügbar. Lesen Sie unbedingt + die <a + href="&enbase;/releases/9.2R/relnotes.html">Release Notes</a> + sowie die <a + href="&enbase;/releases/9.2R/errata.html">Release Errata</a>, + bevor Sie mit der Installation beginnen, um + sich über aktuelle Neuigkeiten und/oder eventuelle + Probleme im Umgang mit 9.2-RELEASE zu informieren. + Weitere Informationen zu verschiedenen FreeBSD-Versionen + finden Sie auf der Seite <a + href="&base;/releases/index.html">Release Information</a>.</p> + </event> + </day> + + <day> + <name>29</name> + + <event> + <title>&os; 10.0-ALPHA4 verfügbar</title> + + <p>Die vierte ALPHA-Version aus dem &os;-10.0-Releasezyklus ist + <a href="&lists.current;/2013-September/044951.html">verfügbar</a>. + ISO-Images für die Architekturen amd64, i386, ia64, powerpc + sowie sparc64 sind inzwischen auf den meisten <a + href="&enbase;/doc/de_DE.ISO8859-1/books/handbook/mirrors-ftp.html">&os; + Spiegelservern</a> vorhanden.</p> + </event> + </day> + + <day> + <name>23</name> + + <event> + <p>Neuer Committer: <a + href="mailto:danilo@FreeBSD.org">Danilo Egêa Gondolfo</a> (ports)</p> + </event> + </day> + + <day> + <name>18</name> + + <event> + <title>&os; 10.0-ALPHA2 verfügbar</title> + + <p>Die zweite ALPHA-Version aus dem &os;-10.0-Releasezyklus ist + <a href="&lists.current;/2013-September/044676.html">verfügbar</a>. + ISO-Images für die Architekturen amd64, i386, ia64, powerpc + sowie sparc64 sind inzwischen auf den meisten <a + href="&enbase;/doc/de_DE.ISO8859-1/books/handbook/mirrors-ftp.html">&os; + Spiegelservern</a> vorhanden.</p> + </event> + </day> + + <day> + <name>13</name> + + <event> + <title>&os; 10.0-ALPHA1 verfügbar</title> + + <p>Die erste ALPHA-Version aus dem &os;-10.0-Releasezyklus ist + <a href="&lists.current;/2013-September/044522.html">verfügbar</a>. + ISO-Images für die Architekturen amd64, i386, ia64, powerpc + sowie sparc64 sind inzwischen auf den meisten <a + href="&enbase;/doc/de_DE.ISO8859-1/books/handbook/mirrors-ftp.html">&os; + Spiegelservern</a> vorhanden.</p> + </event> + </day> + + <day> + <name>12</name> + + <event> + <title>&os; 9.2-RC4 verfügbar</title> + + <p>Der vierte Release Candidate aus dem &os;-9.2 Releasezyklus ist + <a href="&lists.stable;/2013-September/075163.html">verfügbar</a>. + ISO-Images für die Architekturen amd64, i386, ia64, powerpc, + powerpc64 sowie sparc64 sind inzwischen auf den meisten <a + href="&enbase;/doc/de_DE.ISO8859-1/books/handbook/mirrors-ftp.html">&os; + Spiegelservern</a> vorhanden.</p> + </event> + </day> + + <day> + <name>2</name> + + <event> + <p>Neuer Committer: <a + href="mailto:br@FreeBSD.org">Ruslan Bukin</a> (src)</p> + </event> + + <event> + <p>Neuer Committer: <a + href="mailto:zbb@FreeBSD.org">Zbigniew Bodek</a> (src)</p> + </event> + </day> + </month> + + <month> <name>8</name> <day> + <name>26</name> + + <event> + <title>&os; 9.2-RC3 verfügbar</title> + + <p>Der dritte Release Candidate aus dem &os;-9.2 Releasezyklus ist + <a href="&lists.stable;/2013-August/074920.html">verfügbar</a>. + ISO-Images für die Architekturen amd64, i386, ia64, powerpc, + powerpc64 sowie sparc64 sind inzwischen auf den meisten <a + href="&enbase;/doc/de_DE.ISO8859-1/books/handbook/mirrors-ftp.html">&os; + Spiegelservern</a> vorhanden.</p> + </event> + </day> + + <day> <name>16</name> <event> Modified: projects/sysctl/de_DE.ISO8859-1/share/xml/release.l10n.ent ============================================================================== --- projects/sysctl/de_DE.ISO8859-1/share/xml/release.l10n.ent Wed Oct 2 14:37:14 2013 (r42804) +++ projects/sysctl/de_DE.ISO8859-1/share/xml/release.l10n.ent Wed Oct 2 14:37:45 2013 (r42805) @@ -2,7 +2,7 @@ <!-- $FreeBSD$ $FreeBSDde$ - basiert auf: r42493 + basiert auf: r42658 --> <![%beta2.testing;[ <!ENTITY beta.plural 'en'> @@ -18,15 +18,15 @@ <td>Distribution</td> <td title="ISO9660 CD image"><a href="&enbase;/doc/de_DE.ISO8859-1/books/handbook/install-diff-media.html#install-cdrom">ISO</a></td> - <td>Statusseite</td> + <!--<td>Statusseite</td>--> </tr> </thead> <tbody> <tr> <td colspan="2">FreeBSD &betarel2.current;-&betarel2.vers;</td> - <td colspan="2"></td> - <td rowspan="7"><a href="http://wiki.freebsd.org/Releng/7.4TODO">[Lesen]</a></td>; - + <td colspan="2"></td> + <!--<td><a href="&base;/releases/&betarel2.current;R/todo.html">[View]</a></td>--> + <!--<td rowspan="7"><a href="http://wiki.freebsd.org/Releng/7.4TODO">[Lesen]</a></td>-->; </tr> <tr> <td></td> @@ -52,12 +52,14 @@ <td><a href="&url.rel;/powerpc/powerpc/&betarel2.current;-&betarel2.vers;">[Distribution]</a></td> <td><a href="&url.rel;/powerpc/powerpc/ISO-IMAGES/&betarel2.current;/">[ISO]</a></td> </tr> + <!-- <tr> <td></td> <td>powerpc64</td> <td><a href="&url.rel;/powerpc/powerpc64/&betarel2.current;-&betarel2.vers;">[Distribution]</a></td> <td><a href="&url.rel;/powerpc/powerpc64/ISO-IMAGES/&betarel2.current;/">[ISO]</a></td> </tr> + --> <tr> <td></td> <td>sparc64</td> Modified: projects/sysctl/el_GR.ISO8859-7/share/xml/teams.ent ============================================================================== --- projects/sysctl/el_GR.ISO8859-7/share/xml/teams.ent Wed Oct 2 14:37:14 2013 (r42804) +++ projects/sysctl/el_GR.ISO8859-7/share/xml/teams.ent Wed Oct 2 14:37:45 2013 (r42805) @@ -61,3 +61,5 @@ <!ENTITY a.re "ÏìÜäá ÏñãÜíùóçò ôùí Åêäüóåùí <email>re@FreeBSD.org</email>"> <!ENTITY a.security-officer "ÏìÜäá ÁóöÜëåéáò <email>security-officer@FreeBSD.org</email>"> + +<!ENTITY a.secteam-secretary "Security Team Secretary <email>secteam-secretary@FreeBSD.org</email>"> Modified: projects/sysctl/en_US.ISO8859-1/articles/committers-guide/article.xml ============================================================================== --- projects/sysctl/en_US.ISO8859-1/articles/committers-guide/article.xml Wed Oct 2 14:37:14 2013 (r42804) +++ projects/sysctl/en_US.ISO8859-1/articles/committers-guide/article.xml Wed Oct 2 14:37:45 2013 (r42805) @@ -1567,7 +1567,7 @@ U stable/9/share/man/man4/netmap.4 contain the original version tags. To do this:</para> <screen>&prompt.user; <userinput>svn propdel svn:keywords -R .</userinput> -&prompt.root; <userinput>svn commit</userinput></screen> +&prompt.user; <userinput>svn commit</userinput></screen> </sect5> <sect5> @@ -2346,6 +2346,45 @@ ControlPersist yes</screen> will review code.</para> </sect1> + <sect1 id="if-in-doubt"> + <title>If in doubt...</title> + + <para>When you are not sure about something, whether it be a + technical issue or a project convention be sure to ask. If you + stay silent you will never make progress.</para> + + <para>If it relates to a technical issue ask on the public + mailing lists. Avoid the temptation to email the individual + person that knows the answer. This way everyone will be able to + learn from the question and the answer.</para> + + <para>For project specific or administrative questions you should + ask, in order: </para> + + <itemizedlist> + <listitem> + <para>Your mentor or former mentor.</para> + </listitem> + + <listitem> + <para>An experienced committer on IRC, email, etc.</para> + </listitem> + + <listitem> + <para>Any team with a "hat", as they should give you a + definitive answer.</para> + </listitem> + + <listitem> + <para>If still not sure, ask on &a.developers;.</para> + </listitem> + </itemizedlist> + + <para>Once your question is answered, if no one pointed you to + documentation that spelled out the answer to your question, + document it, as others will have the same question.</para> + </sect1> + <sect1 id="gnats"> <title>GNATS</title> Modified: projects/sysctl/en_US.ISO8859-1/articles/contributors/contrib.additional.xml ============================================================================== --- projects/sysctl/en_US.ISO8859-1/articles/contributors/contrib.additional.xml Wed Oct 2 14:37:14 2013 (r42804) +++ projects/sysctl/en_US.ISO8859-1/articles/contributors/contrib.additional.xml Wed Oct 2 14:37:45 2013 (r42805) @@ -2129,11 +2129,6 @@ </listitem> <listitem> - <para>Danilo Egêa Gondolfo - <email>danilogondolfo@gmail.com</email></para> - </listitem> - - <listitem> <para>Danny Braniss <email>danny@cs.huji.ac.il</email></para> </listitem> @@ -4856,6 +4851,11 @@ </listitem> <listitem> + <para>Johannes Meixner + <email>xmj@chaot.net</email></para> + </listitem> + + <listitem> <para>Johannes Stille</para> </listitem> Modified: projects/sysctl/en_US.ISO8859-1/articles/contributors/contrib.committers.xml ============================================================================== --- projects/sysctl/en_US.ISO8859-1/articles/contributors/contrib.committers.xml Wed Oct 2 14:37:14 2013 (r42804) +++ projects/sysctl/en_US.ISO8859-1/articles/contributors/contrib.committers.xml Wed Oct 2 14:37:45 2013 (r42805) @@ -116,6 +116,10 @@ </listitem> <listitem> + <para>&a.zbb.email;</para> + </listitem> + + <listitem> <para>&a.novel.email;</para> </listitem> @@ -156,6 +160,10 @@ </listitem> <listitem> + <para>&a.br.email;</para> + </listitem> + + <listitem> <para>&a.oleg.email;</para> </listitem> @@ -404,6 +412,10 @@ </listitem> <listitem> + <para>&a.danilo.email;</para> + </listitem> + + <listitem> <para>&a.daichi.email;</para> </listitem> Modified: projects/sysctl/en_US.ISO8859-1/books/dev-model/book.xml ============================================================================== --- projects/sysctl/en_US.ISO8859-1/books/dev-model/book.xml Wed Oct 2 14:37:14 2013 (r42804) +++ projects/sysctl/en_US.ISO8859-1/books/dev-model/book.xml Wed Oct 2 14:37:45 2013 (r42805) @@ -46,6 +46,12 @@ </copyright> <revhistory> <revision> + <revnumber>1.4</revnumber> + <date>September, 2013</date> + <revremark>Remove mention of CVS and CVSup which are no + longer used by the project.</revremark> + </revision> + <revision> <revnumber>1.3</revnumber> <date>October, 2012</date> <revremark>Remove hats held by specific people, these @@ -896,22 +902,6 @@ </para> </section> - <section id="role-cvsup-coordinator" xreflabel="CVSup Mirror Site Coordinator"> - <title>CVSup Mirror Site Coordinator</title> - <para> - The CVSup Mirror Site Coordinator coordinates all the - <xref linkend="role-cvsup-sitemaint"/>s to ensure that they - are distributing current versions of the software, that they - have the capacity to update themselves when major updates - are in progress, and making it easy for the general public - to find their closest CVSup mirror. - </para> - <para> - Hat currently held by: - The CVSup-master team <email>cvsup-master@FreeBSD.org</email>. - </para> - </section> - <section id="role-postmaster" xreflabel="Postmaster"> <title>Postmaster</title> <para> @@ -1030,11 +1020,11 @@ responsibility to ensure that technical problems that arise in the repository are resolved quickly. The source repository manager has the authority to back out commits if this is - necessary to resolve a CVS technical problem. + necessary to resolve a SVN technical problem. </para> <para> Hat held by: - the Source Repository Manager <email>cvs@FreeBSD.org</email>. + the Source Repository Manager <email>clusteradm@FreeBSD.org</email>. </para> </section> @@ -1240,20 +1230,6 @@ for review is posted. </para> </section> - - <section id="role-cvsup-sitemaint" xreflabel="CVSup Mirror Site - Admin"> - <title>CVSup Mirror Site Admin</title> - <para> - A CVSup Mirror Site Admin has accesses to a server that he/she - uses to mirror the CVS repository. The admin works with the - <xref linkend="role-cvsup-coordinator"/> to ensure the site - remains up-to-date and is following the general policy of - official mirror sites. - </para> - </section> - - </section> @@ -1402,93 +1378,6 @@ </section> - <section id="process-cvsupmirror" xreflabel="Adding an official - CVSup Mirror"> - <title>Adding/Removing an official CVSup Mirror</title> - - <para> - A <xref linkend="tool-cvsup"/> mirror is a replica of the - official CVSup master that contains all the up-to-date source - code for all the branches in the FreeBSD project, ports and - documentation. - </para> - - <para> - Adding an official CVSup mirror starts with the potential - <xref linkend="role-cvsup-sitemaint"/> installing the - <quote>cvsup-mirror</quote> package. Having done this and - updated the source code with a mirror site, he now runs a - fairly recent unofficial CVSup mirror. - </para> - - <para> - Deciding he has a stable environment, the processing - power, the network capacity and the - storage capacity to run an official mirror, he mails the - <xref linkend="role-cvsup-coordinator"/> who decides whether - the mirror should become an official mirror or not. - </para> - - <para> - In making this decision, the <xref linkend="role-cvsup-coordinator"/> - has to determine whether that geographical area needs - another mirror site, if the mirror administrator has the - skills to run it reliably, if the network bandwidth is - adequate and if the master server has the capacity to server - another mirror. - </para> - - <para> - If <xref linkend="role-cvsup-coordinator"/> decides that the - mirror should become an official mirror, he obtains an - authentication key from the mirror admin that he installs so - the mirror admin can update the mirror from the master server. - </para> - - <para> - <figure> - <title>Process summary: adding a CVSup mirror</title> - <graphic fileref="proc-add-cvsup"/> - </figure> - </para> - - <para> - When a CVSup mirror administrator of an unofficial mirror - offers to become an official mirror site, the CVSup - coordinator decides if another mirror is needed and if - there is sufficient capacity to accommodate it. If so, - an authorisation key is requested and the mirror is given - access to the main distribution site and added to the - list of official mirrors. - </para> - - - <para> - Tools used in this process: - <itemizedlist> - <listitem><para> - <xref linkend="tool-cvsup"/> - </para></listitem> - <listitem><para> - <xref linkend="tool-ssh2"/> - </para></listitem> - </itemizedlist> - </para> - - <para> - Hats involved in this process: - <itemizedlist> - <listitem><para> - <xref linkend="role-cvsup-coordinator"/> - </para></listitem> - <listitem><para> - <xref linkend="role-cvsup-sitemaint"/> - </para></listitem> - </itemizedlist> - </para> - - </section> - <section id="committing"> <title>Committing code</title> @@ -2183,9 +2072,8 @@ <para> The major support tools for supporting the development process are - CVS, CVSup, Perforce, GNATS, Mailman and OpenSSH. Except for - CVSup, these are externally - developed tools. These tools are commonly used in the open source world. + Perforce, GNATS, Mailman and OpenSSH. These are externally + developed tools and are commonly used in the open source world. </para> <section id="tool-svn" xreflabel="SVN"> @@ -2198,18 +2086,6 @@ </para> </section> - <section id="tool-cvsup" xreflabel="CVSup"> - <title>CVSup</title> - <para> - CVSup is a software package for distributing and updating - collections of files across a network. It consists of a - client program, cvsup, and a server program, cvsupd. The - package is tailored specifically for distributing CVS - repositories, and by taking advantage of CVS' properties, it - performs updates much faster than traditional systems. - </para> - </section> - <section id="tool-gnats" xreflabel="GNATS"> <title>GNATS</title> <para> Modified: projects/sysctl/en_US.ISO8859-1/books/faq/book.xml ============================================================================== --- projects/sysctl/en_US.ISO8859-1/books/faq/book.xml Wed Oct 2 14:37:14 2013 (r42804) +++ projects/sysctl/en_US.ISO8859-1/books/faq/book.xml Wed Oct 2 14:37:45 2013 (r42805) @@ -964,7 +964,7 @@ </listitem> <listitem> - <para>Channel <literal>##FreeBSD</literal> on <ulink + <para>Channel <literal>#FreeBSD</literal> on <ulink url="http://freenode.net/">Freenode</ulink>; is a general help channel with many users at any time. The conversations have been known to run off-topic for a @@ -5238,9 +5238,12 @@ ttyvb "/usr/libexec/getty Pc" </question> <answer> - <para>Run the command <command>xmodmap -e "pointer = 3 2 1"</command> - from <filename>.xinitrc</filename> or - <filename>.xsession</filename>.</para> + <para>Run the command + <command>xmodmap -e "pointer = 3 2 1"</command>.</para> + <para>You add the above command to + <filename>.xinitrc</filename> or + <filename>.xsession</filename> to make it happen + automatically.</para> </answer> </qandaentry> @@ -7233,7 +7236,7 @@ hint.sio.7.irq="12"</programlisting> <qandaset> <qandaentry> <question id="more-swap"> - <para>&os; a lot of swap space even when the computer has + <para>&os; uses a lot of swap space even when the computer has free memory left. Why?</para> </question> Modified: projects/sysctl/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml ============================================================================== --- projects/sysctl/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml Wed Oct 2 14:37:14 2013 (r42804) +++ projects/sysctl/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml Wed Oct 2 14:37:45 2013 (r42805) @@ -5021,17 +5021,25 @@ redirect_port tcp 192.168.0.3:80 80</pro <itemizedlist> <listitem> - <para>Running out of addresses. Today this is not so much of - a concern, since RFC1918 private address space (<hostid - role="ipaddr">10.0.0.0/8</hostid>, <hostid - role="ipaddr">172.16.0.0/12</hostid>, and <hostid - role="ipaddr">192.168.0.0/16</hostid>) and - <acronym>NAT</acronym> are being employed.</para> + <para>Running out of addresses. For years the use of + RFC1918 private address space + (<hostid role="ipaddr">10.0.0.0/8</hostid>, + <hostid role="ipaddr">172.16.0.0/12</hostid>, and + <hostid role="ipaddr">192.168.0.0/16</hostid>) and NAT + has slowed down the exhaustion. Even though, there are + very few remaining IPv4 addresses. The Internet + Assigned Numbers Authority (<acronym>IANA</acronym>) has + issued the last of the available major blocks to the + Regional Registries. Once each Regional Registry runs + out, there will be no more available and switching to + <acronym>IPv6</acronym> will be critical.</para> </listitem> <listitem> - <para>Router table entries were getting too large. This is - still a concern today.</para> + <para>Every block of IPv4 addresses allocated required + routing information to be exchanged between many routers + on the Internet, and these routing tables were getting + too large to allow efficient routing.</para> </listitem> </itemizedlist> @@ -5054,7 +5062,7 @@ redirect_port tcp 192.168.0.3:80 80</pro </listitem> </itemizedlist> - <para>There are other useful features of + <para>There are many other useful features of <acronym>IPv6</acronym>:</para> <itemizedlist> @@ -5280,6 +5288,12 @@ redirect_port tcp 192.168.0.3:80 80</pro <para><ulink url="http://www.sixxs.net">SixXS</ulink>; offers tunnels with end-points all around the globe.</para> </listitem> + + <listitem> + <para><ulink url="http://www.tunnelbroker.net">Hurricane + Electric</ulink> offers tunnels with end-points all around + the globe.</para> + </listitem> <listitem> <para>Tunnel via 6-to-4 as described in <ulink @@ -5295,53 +5309,44 @@ redirect_port tcp 192.168.0.3:80 80</pro </sect2> <sect2> - <title><acronym>DNS</acronym> in the <acronym>IPv6</acronym> - World</title> - - <para>There used to be two types of <acronym>DNS</acronym> - records for <acronym>IPv6</acronym>. The - <acronym>IETF</acronym> has declared <acronym>AAAA</acronym> - records as the current standard.</para> - - <para>Using <acronym>AAAA</acronym> records is straightforward. - Assign the hostname to the <acronym>IPv6</acronym> address - in the primary zone <acronym>DNS</acronym> file:</para> - - <programlisting>MYHOSTNAME AAAA MYIPv6ADDR</programlisting> - - <para>Current versions of &man.named.8; and <filename - role="package">dns/djbdns</filename> support - <acronym>AAAA</acronym> records.</para> - </sect2> - - <sect2> <title>Applying the Needed Changes to <filename>/etc/rc.conf</filename></title> <sect3> - <title><acronym>IPv6</acronym> Client Settings</title> + <title><acronym>IPv6</acronym> Client + Auto-Configuration</title> - <para>These settings configure a machine on a + <para>To automatically configure a machine on a <acronym>LAN</acronym> which acts as a client, not a - router. To instruct &man.rtsol.8; to autoconfigure the - interface on boot on - &os; 9.<replaceable>x</replaceable> and later, add - this line to <filename>rc.conf</filename>:</para> - - <programlisting>ipv6_prefer="YES"</programlisting> + router, two items are required. First to enable the + <devicename>em0</devicename> to receive the router + solicitation messages, add this line to + <filename>rc.conf</filename>:</para> + + <programlisting>ifconfig_<replaceable>em0</replaceable>_ipv6="inet6 accept_rtadv"</programlisting> + + <para>Secondly, the router solicitation daemon, &man.rtsol.8;, + should be enabled by adding the following to + <filename>rc.conf</filename>:</para> + + <programlisting>rtsold_enable="YES"</programlisting> <para>For &os; 8.<replaceable>x</replaceable>, add:</para> <programlisting>ipv6_enable="YES"</programlisting> + </sect3> + <sect3> + <title><acronym>IPv6</acronym> Client Static + Configuration</title> <para>To statically assign the <acronym>IPv6</acronym> address, <hostid - role="ip6addr">2001:471:1f11:251:290:27ff:fee0:2093</hostid>, + role="ip6addr">2001:db8:4672:6565:2026:5043:2d42:5344</hostid>, to <devicename>fxp0</devicename>, add the following for &os; 9.<replaceable>x</replaceable>:</para> - <programlisting>ifconfig_fxp0_ipv6="inet6 2001:471:1f11:251:290:27ff:fee0:2093 prefixlen <replaceable>64</replaceable>"</programlisting> + <programlisting>ifconfig_<replaceable>fxp0</replaceable>_ipv6="inet6 2001:db8:4672:6565:2026:5043:2d42:5344 prefixlen 64"</programlisting> <note> <para>Be sure to change <replaceable>prefixlen @@ -5349,16 +5354,16 @@ redirect_port tcp 192.168.0.3:80 80</pro subnet.</para> </note> - <para>For &os; 8<replaceable>x</replaceable>, + <para>For &os; 8.<replaceable>x</replaceable>, add:</para> - <programlisting>ipv6_ifconfig_fxp0="2001:471:1f11:251:290:27ff:fee0:2093"</programlisting> + <programlisting>ipv6_ifconfig_<replaceable>fxp0</replaceable>="2001:db8:4672:6565:2026:5043:2d42:5344"</programlisting> <para>To assign a default router of <hostid - role="ip6addr">2001:471:1f11:251::1</hostid>, add the + role="ip6addr">2001:db8:4672:6565::1</hostid>, add the following to <filename>/etc/rc.conf</filename>:</para> - <programlisting>ipv6_defaultrouter="2001:471:1f11:251::1"</programlisting> + <programlisting>ipv6_defaultrouter="2001:db8:4672:6565::1"</programlisting> </sect3> <sect3> @@ -5372,9 +5377,9 @@ redirect_port tcp 192.168.0.3:80 80</pro <para>The first entry lists the generic tunneling interfaces to be configured. This example configures one interface, - <devicename>gif0</devicename>:</para> + <devicename>gif<replaceable>0</replaceable></devicename>:</para> - <programlisting>gif_interfaces="gif0"</programlisting> + <programlisting>gif_interfaces="gif<replaceable>0</replaceable>"</programlisting> <para>To configure that interface with a local endpoint of <replaceable>MY_IPv4_ADDR</replaceable> to a remote endpoint @@ -5476,6 +5481,23 @@ redirect_port tcp 192.168.0.3:80 80</pro section 3.6 and 3.7 as well as <acronym>RFC</acronym> 4038 section 4.2 may be useful to some adminstrators.</para> </sect2> + + <sect2> + <title>Application Use of <acronym>IPv6</acronym></title> + + <para>Currently <acronym>IPv6</acronym> support for many + applications and services is very good, though for some + software it still needs work. For authoritative + information about the support of + <acronym>IPv6</acronym>, please consult the Official + Documentation for the software in question.</para> + + <para>Web, <acronym>DNS</acronym> and Mail applications + and servers have the best support for + <acronym>IPv6</acronym> because they are the most common + use case. Other applications may have varying degrees + of <acronym>IPv6</acronym> support.</para> + </sect2> </sect1> <sect1 id="network-atm"> Modified: projects/sysctl/en_US.ISO8859-1/books/handbook/basics/chapter.xml ============================================================================== --- projects/sysctl/en_US.ISO8859-1/books/handbook/basics/chapter.xml Wed Oct 2 14:37:14 2013 (r42804) +++ projects/sysctl/en_US.ISO8859-1/books/handbook/basics/chapter.xml Wed Oct 2 14:37:45 2013 (r42805) @@ -70,10 +70,6 @@ </listitem> <listitem> - <para>What binary format is used under &os;.</para> - </listitem> - - <listitem> <para>How to read manual pages for more information.</para> </listitem> </itemizedlist> @@ -97,8 +93,8 @@ <indexterm><primary>console</primary></indexterm> - <para>Unless &os; has been configured to automatically start - a graphical environment during startup, the system will boot + <para>Unless &os; has been configured to automatically start a + graphical environment during startup, the system will boot into a command line login prompt, as seen in this example:</para> @@ -106,10 +102,10 @@ login:</screen> - <para>The first line contains some information about the - system. The <literal>amd64</literal> indicates that the - system in this example is running a 64-bit version of &os;. - The hostname is <hostid>pc3.example.org</hostid>, and + <para>The first line contains some information about the system. + The <literal>amd64</literal> indicates that the system in this + example is running a 64-bit version of &os;. The hostname is + <hostid>pc3.example.org</hostid>, and <devicename>ttyv0</devicename> indicates that this is the system console.</para> @@ -120,10 +116,10 @@ login:</screen> <sect2 id="consoles-login"> <title>Logging into &os;</title> - <para>&os; is a multiuser, multiprocessing system. This is - the formal description that is usually given to a system that - can be used by many different people, who simultaneously run a - lot of programs on a single machine.</para> + <para>&os; is a multiuser, multiprocessing system. This is the + formal description that is usually given to a system that can + be used by many different people, who simultaneously run a lot + of programs on a single machine.</para> <para>Every multiuser system needs some way to distinguish one <quote>user</quote> from the rest. In &os; (and all the @@ -131,9 +127,8 @@ login:</screen> requiring that every user must <quote>log into</quote> the system before being able to run programs. Every user has a unique name (the <quote>username</quote>) and a personal, - secret key (the <quote>password</quote>). &os; will ask - for these two before allowing a user to run any - programs.</para> + secret key (the <quote>password</quote>). &os; will ask for + these two before allowing a user to run any programs.</para> <indexterm><primary>startup scripts</primary></indexterm> <para>When a &os; system boots, startup scripts are @@ -145,8 +140,8 @@ login:</screen> <screen>login:</screen> <para>Type the username that was configured during system - installation, as described in <xref - linkend="bsdinstall-addusers"/>, and press + installation, as described in + <xref linkend="bsdinstall-addusers"/>, and press <keycap>Enter</keycap>. Then enter the password associated with the username and press <keycap>Enter</keycap>. The password is <emphasis>not echoed</emphasis> for security @@ -274,8 +269,8 @@ console none <screen>&prompt.root; <userinput>vidcontrol -i mode</userinput></screen> - <para>The output of this command lists the video modes that - are supported by the hardware. To select a new video mode, + <para>The output of this command lists the video modes that are + supported by the hardware. To select a new video mode, specify the mode using &man.vidcontrol.1; as the <username>root</username> user:</para> @@ -294,9 +289,9 @@ console none <indexterm><primary>UNIX</primary></indexterm> - <para>&os;, being a direct descendant of BSD &unix;, is based - on several key &unix; concepts. The first and most pronounced - is that &os; is a multi-user operating system that can handle + <para>&os;, being a direct descendant of BSD &unix;, is based on + several key &unix; concepts. The first and most pronounced is + that &os; is a multi-user operating system that can handle several users working simultaneously on completely unrelated tasks. The system is responsible for properly sharing and managing requests for hardware devices, peripherals, memory, and @@ -304,12 +299,12 @@ console none <para>Much more information about user accounts is in the chapter about <link linkend="users">accounts</link>. It is important to - understand that each person (user) who uses the computer should be - given their own username and password. The system keeps track - of the people using the computer based on this username. Since - it is often the case that several people are working on the same - project &unix; also provides groups. Several users can be placed - in the same group.</para> + understand that each person (user) who uses the computer should + be given their own username and password. The system keeps + track of the people using the computer based on this username. + Since it is often the case that several people are working on + the same project &unix; also provides groups. Several users can + be placed in the same group.</para> <para>Because the system is capable of supporting multiple users, everything the system manages has a set of permissions governing @@ -321,9 +316,10 @@ console none <note> <para>This section will discuss the traditional &unix; - permissions. For finer grained file system access - control, see the <link linkend="fs-acl">File System - Access Control Lists</link> section.</para> + permissions. For finer grained file system access control, + see the + <link linkend="fs-acl">File System Access Control Lists</link> + section.</para> </note> <indexterm><primary>permissions</primary></indexterm> @@ -391,6 +387,7 @@ console none </tbody> </tgroup> </informaltable> + <indexterm> <primary>&man.ls.1;</primary> </indexterm> @@ -1026,9 +1023,9 @@ root 5211 0.0 0.2 3620 1724 2 class="directory">/var/</filename></entry> <entry>Multi-purpose log, temporary, transient, and spool files. A memory-based file system is sometimes - mounted at <filename - class="directory">/var</filename>. This can be - automated using the varmfs-related variables in + mounted at + <filename class="directory">/var</filename>. This can + be automated using the varmfs-related variables in &man.rc.conf.5; or with an entry in <filename>/etc/fstab</filename>; refer to &man.mdmfs.8; for details.</entry> @@ -1057,8 +1054,8 @@ root 5211 0.0 0.2 3620 1724 2 <entry><filename class="directory">/var/tmp/</filename></entry> <entry>Temporary files which are usually preserved - across a system reboot, unless <filename - class="directory">/var</filename> is a + across a system reboot, unless + <filename class="directory">/var</filename> is a memory-based file system.</entry> </row> @@ -1091,8 +1088,8 @@ root 5211 0.0 0.2 3620 1724 2 <para>Files and directories are referenced by giving the file or directory name, followed by a forward slash, <literal>/</literal>, followed by any other directory names that - are necessary. For example, if the directory <filename - class="directory">foo</filename> contains a directory + are necessary. For example, if the directory + <filename class="directory">foo</filename> contains a directory <filename class="directory">bar</filename> which contains the file <filename>readme.txt</filename>, the full name, or <firstterm>path</firstterm>, to the file is @@ -1107,11 +1104,12 @@ root 5211 0.0 0.2 3620 1724 2 file system contains exactly one directory at the very top level, called the <firstterm>root directory</firstterm> for that file system. This root directory can contain other directories. - One file system is designated the <firstterm>root file - system</firstterm> or <literal>/</literal>. Every other file - system is <firstterm>mounted</firstterm> under the root file - system. No matter how many disks are on the &os; system, every - directory appears to be part of the same disk.</para> + One file system is designated the + <firstterm>root file system</firstterm> or <literal>/</literal>. + Every other file system is <firstterm>mounted</firstterm> under + the root file system. No matter how many disks are on the &os; + system, every directory appears to be part of the same + disk.</para> <para>Consider three file systems, called <literal>A</literal>, <literal>B</literal>, and <literal>C</literal>. Each file @@ -1167,10 +1165,10 @@ root 5211 0.0 0.2 3620 1724 2 <para>Any files that are in the <literal>B1</literal> or <literal>B2</literal> directories can be reached with the path - <filename class="directory">/A1/B1</filename> or <filename - class="directory">/A1/B2</filename> as necessary. Any files - that were in <filename class="directory">/A1</filename> have - been temporarily hidden. They will reappear if + <filename class="directory">/A1/B1</filename> or + <filename class="directory">/A1/B2</filename> as necessary. Any + files that were in <filename class="directory">/A1</filename> + have been temporarily hidden. They will reappear if <literal>B</literal> is <firstterm>unmounted</firstterm> from <literal>A</literal>.</para> @@ -1197,8 +1195,9 @@ root 5211 0.0 0.2 3620 1724 2 </mediaobject> <para>and the paths would be - <filename class="directory">/A2/B1</filename> and <filename - class="directory">/A2/B2</filename> respectively.</para> + <filename class="directory">/A2/B1</filename> and + <filename class="directory">/A2/B2</filename> *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310021437.r92Ebkcm069452>