Date: Fri, 6 Nov 2015 08:52:11 +0000 (UTC) From: Remko Lodder <remko@FreeBSD.org> To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-translations@freebsd.org Subject: svn commit: r47747 - in translations: en_US.ISO8859-1/articles/committers-guide en_US.ISO8859-1/articles/contributing en_US.ISO8859-1/articles/contributors en_US.ISO8859-1/articles/explaining-bsd e... Message-ID: <201511060852.tA68qBX7037664@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: remko Date: Fri Nov 6 08:52:10 2015 New Revision: 47747 URL: https://svnweb.freebsd.org/changeset/doc/47747 Log: Merge head/en_US.ISO8859-1 and head/share to the translation area. Added: translations/en_US.ISO8859-1/books/handbook/basics/disk-layout.eps - copied unchanged from r47746, head/en_US.ISO8859-1/books/handbook/basics/disk-layout.eps translations/en_US.ISO8859-1/books/handbook/basics/disk-layout.ps - copied unchanged from r47746, head/en_US.ISO8859-1/books/handbook/basics/disk-layout.ps translations/en_US.ISO8859-1/htdocs/news/status/report-2015-07-2015-09.xml - copied unchanged from r47746, head/en_US.ISO8859-1/htdocs/news/status/report-2015-07-2015-09.xml translations/en_US.ISO8859-1/htdocs/releases/10.3R/ - copied from r47746, head/en_US.ISO8859-1/htdocs/releases/10.3R/ translations/en_US.ISO8859-1/htdocs/releases/11.0R/index.xml - copied unchanged from r47746, head/en_US.ISO8859-1/htdocs/releases/11.0R/index.xml translations/share/images/books/handbook/basics/ - copied from r47746, head/share/images/books/handbook/basics/ translations/share/pgpkeys/avos.key - copied unchanged from r47746, head/share/pgpkeys/avos.key translations/share/pgpkeys/jtl.key - copied unchanged from r47746, head/share/pgpkeys/jtl.key translations/share/pgpkeys/lidl.key - copied unchanged from r47746, head/share/pgpkeys/lidl.key translations/share/pgpkeys/mckusick.key - copied unchanged from r47746, head/share/pgpkeys/mckusick.key translations/share/pgpkeys/mmel.key - copied unchanged from r47746, head/share/pgpkeys/mmel.key translations/share/pgpkeys/skra.key - copied unchanged from r47746, head/share/pgpkeys/skra.key translations/share/security/advisories/FreeBSD-EN-15:16.pw.asc - copied unchanged from r47746, head/share/security/advisories/FreeBSD-EN-15:16.pw.asc translations/share/security/advisories/FreeBSD-EN-15:17.libc.asc - copied unchanged from r47746, head/share/security/advisories/FreeBSD-EN-15:17.libc.asc translations/share/security/advisories/FreeBSD-EN-15:18.pkg.asc - copied unchanged from r47746, head/share/security/advisories/FreeBSD-EN-15:18.pkg.asc translations/share/security/advisories/FreeBSD-EN-15:19.kqueue.asc - copied unchanged from r47746, head/share/security/advisories/FreeBSD-EN-15:19.kqueue.asc translations/share/security/advisories/FreeBSD-EN-15:20.vm.asc - copied unchanged from r47746, head/share/security/advisories/FreeBSD-EN-15:20.vm.asc translations/share/security/advisories/FreeBSD-SA-15:24.rpcbind.asc - copied unchanged from r47746, head/share/security/advisories/FreeBSD-SA-15:24.rpcbind.asc translations/share/security/advisories/FreeBSD-SA-15:25.ntp.asc - copied unchanged from r47746, head/share/security/advisories/FreeBSD-SA-15:25.ntp.asc translations/share/security/patches/EN-15:16/ - copied from r47746, head/share/security/patches/EN-15:16/ translations/share/security/patches/EN-15:17/ - copied from r47746, head/share/security/patches/EN-15:17/ translations/share/security/patches/EN-15:18/ - copied from r47746, head/share/security/patches/EN-15:18/ translations/share/security/patches/EN-15:19/ - copied from r47746, head/share/security/patches/EN-15:19/ translations/share/security/patches/EN-15:20/ - copied from r47746, head/share/security/patches/EN-15:20/ translations/share/security/patches/SA-15:24/ - copied from r47746, head/share/security/patches/SA-15:24/ translations/share/security/patches/SA-15:25/ - copied from r47746, head/share/security/patches/SA-15:25/ Deleted: translations/en_US.ISO8859-1/books/handbook/basics/disk-layout.kil Modified: translations/en_US.ISO8859-1/articles/committers-guide/article.xml translations/en_US.ISO8859-1/articles/contributing/article.xml translations/en_US.ISO8859-1/articles/contributors/contrib.additional.xml translations/en_US.ISO8859-1/articles/contributors/contrib.committers.xml translations/en_US.ISO8859-1/articles/explaining-bsd/article.xml translations/en_US.ISO8859-1/books/developers-handbook/tools/chapter.xml translations/en_US.ISO8859-1/books/developers-handbook/x86/chapter.xml translations/en_US.ISO8859-1/books/faq/book.xml translations/en_US.ISO8859-1/books/fdp-primer/po-translations/chapter.xml translations/en_US.ISO8859-1/books/fdp-primer/tools/chapter.xml translations/en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.xml translations/en_US.ISO8859-1/books/fdp-primer/xhtml-markup/chapter.xml translations/en_US.ISO8859-1/books/handbook/Makefile translations/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml translations/en_US.ISO8859-1/books/handbook/basics/chapter.xml translations/en_US.ISO8859-1/books/handbook/bsdinstall/chapter.xml translations/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml translations/en_US.ISO8859-1/books/handbook/disks/chapter.xml translations/en_US.ISO8859-1/books/handbook/dtrace/chapter.xml translations/en_US.ISO8859-1/books/handbook/eresources/chapter.xml translations/en_US.ISO8859-1/books/handbook/firewalls/chapter.xml translations/en_US.ISO8859-1/books/handbook/geom/chapter.xml translations/en_US.ISO8859-1/books/handbook/introduction/chapter.xml translations/en_US.ISO8859-1/books/handbook/jails/chapter.xml translations/en_US.ISO8859-1/books/handbook/l10n/chapter.xml translations/en_US.ISO8859-1/books/handbook/mac/chapter.xml translations/en_US.ISO8859-1/books/handbook/mail/chapter.xml translations/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml translations/en_US.ISO8859-1/books/handbook/multimedia/chapter.xml translations/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml translations/en_US.ISO8859-1/books/handbook/ports/chapter.xml translations/en_US.ISO8859-1/books/handbook/security/chapter.xml translations/en_US.ISO8859-1/books/handbook/serialcomms/chapter.xml translations/en_US.ISO8859-1/books/handbook/virtualization/chapter.xml translations/en_US.ISO8859-1/books/handbook/x11/chapter.xml translations/en_US.ISO8859-1/books/porters-handbook/makefiles/chapter.xml translations/en_US.ISO8859-1/books/porters-handbook/pkg-files/chapter.xml translations/en_US.ISO8859-1/books/porters-handbook/plist/chapter.xml translations/en_US.ISO8859-1/books/porters-handbook/special/chapter.xml translations/en_US.ISO8859-1/books/porters-handbook/testing/chapter.xml translations/en_US.ISO8859-1/books/porters-handbook/upgrading/chapter.xml translations/en_US.ISO8859-1/books/porters-handbook/uses/chapter.xml translations/en_US.ISO8859-1/books/porters-handbook/versions/chapter.xml translations/en_US.ISO8859-1/htdocs/administration.xml translations/en_US.ISO8859-1/htdocs/index.xsl translations/en_US.ISO8859-1/htdocs/internal/code-of-conduct.xml translations/en_US.ISO8859-1/htdocs/internal/machines.xml translations/en_US.ISO8859-1/htdocs/java/index.xml translations/en_US.ISO8859-1/htdocs/layout/css/fixed.css translations/en_US.ISO8859-1/htdocs/layout/css/global.css translations/en_US.ISO8859-1/htdocs/layout/css/layout.css translations/en_US.ISO8859-1/htdocs/layout/css/navigation.css translations/en_US.ISO8859-1/htdocs/news/status/Makefile translations/en_US.ISO8859-1/htdocs/news/status/status.xml translations/en_US.ISO8859-1/htdocs/projects/newbies.xml translations/en_US.ISO8859-1/htdocs/releases/10.2R/errata.html translations/en_US.ISO8859-1/htdocs/releases/11.0R/Makefile translations/en_US.ISO8859-1/htdocs/releases/9.3R/errata.html translations/en_US.ISO8859-1/htdocs/releases/Makefile translations/en_US.ISO8859-1/htdocs/releases/index.xml translations/en_US.ISO8859-1/htdocs/releng/index.xml translations/en_US.ISO8859-1/share/xml/mailing-lists.ent translations/share/mk/doc.docbook.mk translations/share/pgpkeys/danger.key translations/share/pgpkeys/danilo.key translations/share/pgpkeys/gblach.key translations/share/pgpkeys/pgpkeys-developers.xml translations/share/pgpkeys/pgpkeys.ent translations/share/pgpkeys/security-officer.key translations/share/pgpkeys/tijl.key translations/share/xml/advisories.xml translations/share/xml/authors.ent translations/share/xml/events2015.xml translations/share/xml/man-refs.ent translations/share/xml/news.xml translations/share/xml/notices.xml translations/share/xml/press.xml translations/share/xml/release.ent Directory Properties: translations/en_US.ISO8859-1/ (props changed) translations/share/ (props changed) Modified: translations/en_US.ISO8859-1/articles/committers-guide/article.xml ============================================================================== --- translations/en_US.ISO8859-1/articles/committers-guide/article.xml Fri Nov 6 07:57:09 2015 (r47746) +++ translations/en_US.ISO8859-1/articles/committers-guide/article.xml Fri Nov 6 08:52:10 2015 (r47747) @@ -237,8 +237,8 @@ cert-digest-algo SHA512</programlisting> <step> <para>Generate a key:</para> - <screen>&prompt.user; <userinput>gpg --gen-key</userinput> -gpg (GnuPG) 2.0.22; Copyright (C) 2013 Free Software Foundation, Inc. + <screen>&prompt.user; <userinput>gpg --full-gen-key</userinput> +gpg (GnuPG) 2.1.8; Copyright (C) 2015 Free Software Foundation, Inc. This is free software: you are free to change and redistribute it. There is NO WARRANTY, to the extent permitted by law. @@ -822,12 +822,11 @@ You need a Passphrase to protect your se to the main repository. To do this, use the following command:</para> - <screen>&prompt.user; <userinput>svn co <replaceable>https://svn0.us-west.FreeBSD.org</replaceable>/base/head /usr/src</userinput></screen> + <screen>&prompt.user; <userinput>svn co https://svn.FreeBSD.org/base/head /usr/src</userinput></screen> - <para>Select the closest mirror and verify the mirror server - certificate from the list of <link - xlink:href="&url.books.handbook;/svn.html#svn-mirrors">Subversion - mirror sites</link>.</para> + <para>More details on using Subversion this way can be found in <link + xlink:href="&url.books.handbook;/svn.html">Using + Subversion</link>.</para> </sect3> <sect3 xml:id="svn-daily-use-updating-the-tree"> @@ -2378,8 +2377,8 @@ freebsd-mfc-after = 2 weeks</programlist well as any other mail addressed to the &a.committers; and the &a.developers;. Really large mailboxes which have taken up permanent residence on - <systemitem>hub</systemitem> often get - <quote>accidentally</quote> truncated without warning, so + <systemitem>freefall</systemitem> may get + truncated without warning if space needs to be freed, so forward it or read it and you will not lose it.</para> <para>Due to the severe load dealing with SPAM places on the @@ -4957,10 +4956,9 @@ Do you want to commit? (no = start a she <answer> <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;. This - location is accessible from any machine on the &os; - cluster.</para> + <filename>/local/mail</filename> on <systemitem + class="fqdomainname" + >freefall.FreeBSD.org</systemitem>.</para> </answer> </qandaentry> Modified: translations/en_US.ISO8859-1/articles/contributing/article.xml ============================================================================== --- translations/en_US.ISO8859-1/articles/contributing/article.xml Fri Nov 6 07:57:09 2015 (r47746) +++ translations/en_US.ISO8859-1/articles/contributing/article.xml Fri Nov 6 08:52:10 2015 (r47747) @@ -890,7 +890,7 @@ </listitem> <listitem> - <para>When their ports tree amd + <para>When their ports tree and <filename>INDEX</filename> was last updated</para> </listitem> </itemizedlist> @@ -1133,7 +1133,7 @@ being a maintainer. In this way we can go ahead and allow other people to try to work on existing problems with the port without waiting for your response. Remember, &os; is a volunteer - project, so if maintaining a port is no fun anymore, it is + project, so if maintaining a port is no fun any more, it is probably time to let someone else do it!</para> <para>In any case, the Ports Management Team @@ -1176,7 +1176,7 @@ <para><package>ports-mgmt/poudriere</package> is the most thorough way to test a port through the entire cycle of installation, packaging, and deinstallation. - documentation is located at the + Documentation is located at the <link xlink:href="https://fossil.etoilebsd.net/poudriere/">poudriere home page</link></para> <para>&man.portlint.1; is an application which can be used to Modified: translations/en_US.ISO8859-1/articles/contributors/contrib.additional.xml ============================================================================== --- translations/en_US.ISO8859-1/articles/contributors/contrib.additional.xml Fri Nov 6 07:57:09 2015 (r47746) +++ translations/en_US.ISO8859-1/articles/contributors/contrib.additional.xml Fri Nov 6 08:52:10 2015 (r47747) @@ -3116,6 +3116,11 @@ </listitem> <listitem> + <para>Fabiano Sidler + <email>fabianosidler@swissonline.ch</email></para> + </listitem> + + <listitem> <para>Fabien Devaux <email>fab@gcu.info</email></para> </listitem> @@ -4253,6 +4258,11 @@ </listitem> <listitem> + <para>James Buren + <email>ryu0@ymail.com</email></para> + </listitem> + + <listitem> <para>James Clark <email>jjc@jclark.com</email></para> </listitem> @@ -6753,6 +6763,11 @@ </listitem> <listitem> + <para>Maxim Filimonov + <email>che@bein.link</email></para> + </listitem> + + <listitem> <para>Maxim Ignatenko <email>gelraen.ua@gmail.com</email></para> </listitem> Modified: translations/en_US.ISO8859-1/articles/contributors/contrib.committers.xml ============================================================================== --- translations/en_US.ISO8859-1/articles/contributors/contrib.committers.xml Fri Nov 6 07:57:09 2015 (r47746) +++ translations/en_US.ISO8859-1/articles/contributors/contrib.committers.xml Fri Nov 6 08:52:10 2015 (r47747) @@ -687,6 +687,10 @@ </listitem> <listitem> + <para>&a.skra.email;</para> + </listitem> + + <listitem> <para>&a.skreuzer.email;</para> </listitem> @@ -787,6 +791,10 @@ </listitem> <listitem> + <para>&a.lidl.email;</para> + </listitem> + + <listitem> <para>&a.yzlin.email;</para> </listitem> @@ -823,6 +831,10 @@ </listitem> <listitem> + <para>&a.jtl.email;</para> + </listitem> + + <listitem> <para>&a.imp.email;</para> </listitem> @@ -915,6 +927,10 @@ </listitem> <listitem> + <para>&a.mmel.email;</para> + </listitem> + + <listitem> <para>&a.jmmv.email;</para> </listitem> @@ -1511,6 +1527,10 @@ </listitem> <listitem> + <para>&a.avos.email;</para> + </listitem> + + <listitem> <para>&a.stefan.email;</para> </listitem> Modified: translations/en_US.ISO8859-1/articles/explaining-bsd/article.xml ============================================================================== --- translations/en_US.ISO8859-1/articles/explaining-bsd/article.xml Fri Nov 6 07:57:09 2015 (r47746) +++ translations/en_US.ISO8859-1/articles/explaining-bsd/article.xml Fri Nov 6 08:52:10 2015 (r47747) @@ -207,7 +207,7 @@ the vendor of BSD/386, alleging that the product contained AT&T-copyrighted code. The case was settled out of court in 1994, but the spectre of the litigation continues to haunt people. - As recently as March 2000 an article published on the web claimed + In March 2000 an article published on the web claimed that the court case had been <quote>recently settled</quote>.</para> <para>One detail that the lawsuit did clarify is the naming: in the @@ -218,15 +218,6 @@ system</quote> and <quote>the 4.4BSD operating system</quote>.</para> </listitem> - - <listitem> - <para>There is a perception that the BSD projects are fragmented and - belligerent. The - <link xlink:href="http://interactive.wsj.com/bin/login?Tag=/&URI=/archive/retrieve.cgi%253Fid%253DSB952470579348918651.djm&">Wall Street - Journal</link> spoke of <quote>balkanization</quote> of the - BSD projects. Like the law suit, this perception bases mainly - on ancient history.</para> - </listitem> </orderedlist> </sect1> @@ -258,10 +249,10 @@ <para>The BSD kernels are developed and updated following the Open Source development model. Each project maintains a publicly - accessible <emphasis>source tree</emphasis> under the - <link xlink:href="http://www.cvshome.org/">Concurrent Versions - System</link> (CVS), which contains all source files for the - project, including documentation and other incidental files. CVS + accessible <emphasis>source tree</emphasis> under + <link xlink:href="https://subversion.apache.org/">Subversion</link>; + (SVN), which contains all source files for the + project, including documentation and other incidental files. SVN allows users to <quote>check out</quote> (in other words, to extract a copy of) any desired version of the system.</para> @@ -336,10 +327,10 @@ </listitem> <listitem> - <para>As a result of the formalized maintenance of a single CVS + <para>As a result of the formalized maintenance of a single SVN source tree, BSD development is clear, and it is possible to access any version of the system by release number or by date. - CVS also allows incremental updates to the system: for example, + SVN also allows incremental updates to the system: for example, the FreeBSD repository is updated about 100 times a day. Most of these changes are small.</para> </listitem> @@ -378,11 +369,12 @@ <listitem> <para>As bugs are found in a RELEASE version, they are fixed, and - the fixes are added to the CVS tree. In FreeBSD, the resultant + the fixes are added to the SVN tree. In FreeBSD, the resultant version is called the <firstterm>STABLE</firstterm> version, while in NetBSD and OpenBSD it continues to be called the RELEASE version. Smaller new features can also be added to this branch after a period of test - in the CURRENT branch.</para> + in the CURRENT branch. Security and other important bug fixes + are also applied to all supported RELEASE versions.</para> </listitem> </orderedlist> Modified: translations/en_US.ISO8859-1/books/developers-handbook/tools/chapter.xml ============================================================================== --- translations/en_US.ISO8859-1/books/developers-handbook/tools/chapter.xml Fri Nov 6 07:57:09 2015 (r47746) +++ translations/en_US.ISO8859-1/books/developers-handbook/tools/chapter.xml Fri Nov 6 08:52:10 2015 (r47747) @@ -221,9 +221,8 @@ <para>Logo is a language that is easy to learn, and has been used as an introductory programming language in various courses. It is an excellent tool to work with - when teaching programming in small ages, as it makes the - creation of elaborate geometric shapes an easy task even - for very small children.</para> + when teaching programming to smaller age groups, as it makes + creation of elaborate geometric shapes an easy task.</para> <para>The latest version of Logo for &os; is available from the Ports Collection in Modified: translations/en_US.ISO8859-1/books/developers-handbook/x86/chapter.xml ============================================================================== --- translations/en_US.ISO8859-1/books/developers-handbook/x86/chapter.xml Fri Nov 6 07:57:09 2015 (r47746) +++ translations/en_US.ISO8859-1/books/developers-handbook/x86/chapter.xml Fri Nov 6 08:52:10 2015 (r47747) @@ -66,8 +66,8 @@ online course in assembly language, see <link xlink:href="http://webster.cs.ucr.edu/">Art of Assembly Language</link>; or if you prefer a printed book, take a look at Jeff Duntemann's -<link xlink:href="http://www.int80h.org/cgi-bin/isbn?isbn=0471375233">Assembly -Language Step-by-Step</link>). However, +Assembly +Language Step-by-Step (ISBN: 0471375233). However, once the chapter is finished, any assembly language programmer will be able to write programs for FreeBSD quickly and efficiently. Modified: translations/en_US.ISO8859-1/books/faq/book.xml ============================================================================== --- translations/en_US.ISO8859-1/books/faq/book.xml Fri Nov 6 07:57:09 2015 (r47746) +++ translations/en_US.ISO8859-1/books/faq/book.xml Fri Nov 6 08:52:10 2015 (r47747) @@ -2,7 +2,7 @@ <!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN" "http://www.FreeBSD.org/XML/share/xml/freebsd50.dtd" [ <!ENTITY bibliography SYSTEM "../../../share/xml/bibliography.xml"> -<!ENTITY rel.numbranch "4"> <!-- number of branches that follow in this list --> +<!ENTITY rel.numbranch "3"> <!-- number of branches that follow in this list --> <!ENTITY rel.head "<emphasis xmlns='http://docbook.org/ns/docbook'>11-CURRENT</emphasis>">; <!ENTITY rel.head.relx "11.<replaceable xmlns='http://docbook.org/ns/docbook'>X</replaceable>">; <!ENTITY rel.head.releng "<symbol xmlns='http://docbook.org/ns/docbook'>head/</symbol>">; @@ -14,10 +14,6 @@ <!ENTITY rel2.stable "<emphasis xmlns='http://docbook.org/ns/docbook'>9-STABLE</emphasis>">; <!ENTITY rel2.releng "<symbol xmlns='http://docbook.org/ns/docbook'>stable/9/</symbol>">; <!ENTITY rel2.relengdate "September 2011"> -<!ENTITY rel3.relx "8.<replaceable xmlns='http://docbook.org/ns/docbook'>X</replaceable>">; -<!ENTITY rel3.stable "<emphasis xmlns='http://docbook.org/ns/docbook'>8-STABLE</emphasis>">; -<!ENTITY rel3.releng "<symbol xmlns='http://docbook.org/ns/docbook'>stable/8/</symbol>">; -<!ENTITY rel3.relengdate "August 2009"> ]> <book xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:lang="en"> <info> @@ -73,7 +69,7 @@ <abstract> <para>This is the Frequently Asked Questions - <acronym>FAQ</acronym> for &os; versions &rel3.relx;, + <acronym>FAQ</acronym> for &os; versions &rel2.relx; and &rel.relx;. Every effort has been made to make this <acronym>FAQ</acronym> as informative as possible; if you have any suggestions as to how it may be improved, send @@ -1561,8 +1557,8 @@ <answer> <para>Yes. &os; divides support into multiple tiers. Tier 1 architectures, such as i386 or amd64; are fully - supported. Tiers 2 and 3 are supported on an - if-possible basis. A full explanation of the tier + supported. Tiers 2 and 3 are supported on a + best-effort basis. A full explanation of the tier system is available in the <link xlink:href="&url.articles.committers-guide;/archs.html">Committer's Guide.</link></para> @@ -2318,8 +2314,8 @@ kern.timecounter.hardware: TSC -> i82 <note> <para>Problematic <acronym>LOR</acronym>s tend to get - fixed quickly, so check &a.current.url; before posting - to the mailing lists.</para> + fixed quickly, so check the &a.current; before posting + to it.</para> </note> </answer> </qandaentry> @@ -2655,17 +2651,22 @@ kern.timecounter.hardware: TSC -> i82 <answer> <para><literal>GENERIC</literal> kernels shipped with &os; - and later are compiled in <emphasis>debug mode</emphasis>. - Kernels built in debug mode contain many symbols in - separate files that are used for debugging, thus greatly - increasing the size of <filename>/boot/kernel/</filename>. + are compiled in <emphasis>debug mode</emphasis>. + Kernels built in debug mode contain debug data in + separate files that are used for debugging. + &os; releases prior to 11.0 store these debug files in + the same directory as the kernel itself, + <filename>/boot/kernel/</filename>. + In &os; 11.0 and later the debug files are stored in + <filename>/usr/lib/debug/boot/kernel/</filename>. Note that there will be little or no performance loss from running a debug kernel, and it is useful to keep one around in case of a system panic.</para> - <para>However, when running low on disk space, there + <para>When running low on disk space, there are different options to reduce the size of - <filename>/boot/kernel/</filename>.</para> + <filename>/boot/kernel/</filename> and + <filename>/usr/lib/debug/</filename>.</para> <para>To not install the symbol files, make sure the following line exists in @@ -2675,8 +2676,8 @@ kern.timecounter.hardware: TSC -> i82 <para>For more information see &man.src.conf.5;.</para> - <para>If you do not want to build a debug kernel, make sure - that both of the following are true:</para> + <para>If you want to avoid building debug files altogether, + make sure that both of the following are true:</para> <itemizedlist> <listitem> @@ -2717,9 +2718,9 @@ kern.timecounter.hardware: TSC -> i82 xlink:href="&url.books.handbook;/kernelconfig-building.html">build and install</link> the new kernel.</para> - <para>Most kernels - (<filename>/boot/kernel/kernel</filename>) tend to be - around 12 MB to 16 MB.</para> + <para>For reference, the &os; 11 &arch.amd64; kernel + (<filename>/boot/kernel/kernel</filename>) is + approximately 25 MB.</para> </answer> </qandaentry> @@ -3366,12 +3367,12 @@ kern.sched.name: ULE</screen> deleted, the file is not really removed from the file system until the program stops using it. The file is immediately deleted from the directory listing, however. - As an example, consider a file that is large enough that - its presence affects the output of - <command>du</command> and <command>df</command>. If this - file is deleted while using <command>more</command> on it, - <command>more</command> does not immediately choke and - complain that it cannot view the file. The entry is + As an example, consider a file large enough + to affect the output of + <command>du</command> and <command>df</command>. A + file being viewed with <command>more</command> can be + deleted wihout causing an error. + The entry is removed from the directory so no other program or user can access it. However, <command>du</command> shows that it is gone as it has walked the directory tree and the @@ -3458,12 +3459,13 @@ kern.sched.name: ULE</screen> </question> <answer> - <para>&os; does a short memory test early in the boot - process. This test usually only takes several seconds, - however if the system has many 10s or 100s of gigabytes - of memory it can take up to a few minutes. This test can - be disabled by setting <literal>hw.memtest.tests</literal> - to <literal>0</literal> in + <para>&os; 10.1 and earlier executes a memory test early + in the boot process. + When the system has a small amount of memory, the test + takes a few seconds. Computers with tens or hundreds of + gigabytes of memory can take several minutes to complete + the test. The memory test can be disabled by adding + <literal>hw.memtest.tests=0</literal> to <filename>/boot/loader.conf</filename>.</para> <para>For more details, see &man.loader.conf.5;.</para> @@ -3494,7 +3496,7 @@ kern.sched.name: ULE</screen> </question> <answer> - <para>The <acronym>ZIL</acronym> ((<acronym>ZFS</acronym> + <para>The <acronym>ZIL</acronym> (<acronym>ZFS</acronym> intent log) is a write log used to implement posix write commitment semantics across crashes. Normally writes are bundled up into transaction groups and written to @@ -3753,9 +3755,8 @@ kern.sched.name: ULE</screen> <para>In order to use a full screen editor such as &man.vi.1; or &man.emacs.1;, run - <command>export TERM=xterm</command> on &os; 9.0+, or - <command>export TERM=cons25</command> on &os; 8.X so that - these editors can load the correct data from the + <command>export TERM=xterm</command> on &os; 9.0+ + so that these editors can load the correct data from the &man.termcap.5; database.</para> <para>After performing these steps, edit @@ -7230,11 +7231,6 @@ hint.sio.7.irq="12"</programlisting> <itemizedlist> <listitem> - <para>&rel3.releng; AKA - &rel3.stable;</para> - </listitem> - - <listitem> <para>&rel2.releng; AKA &rel2.stable;</para> </listitem> Modified: translations/en_US.ISO8859-1/books/fdp-primer/po-translations/chapter.xml ============================================================================== --- translations/en_US.ISO8859-1/books/fdp-primer/po-translations/chapter.xml Fri Nov 6 07:57:09 2015 (r47746) +++ translations/en_US.ISO8859-1/books/fdp-primer/po-translations/chapter.xml Fri Nov 6 08:52:10 2015 (r47747) @@ -412,7 +412,7 @@ A Makefile</screen> <filename>book.xml</filename>:</para> <programlisting># -# $FreeBSD$ +# $FreeBSD$ # # Build the FreeBSD Porter's Handbook. # @@ -502,7 +502,7 @@ A Makefile</screen> version control system when this file is committed.</para> <programlisting># -# $FreeBSD$ +# $FreeBSD$ # # Article: PGP Keys @@ -676,6 +676,38 @@ DOC_PREFIX?= ${.CURDIR}/../../.. </itemizedlist> </sect2> + <sect2 xml:id="po-translations-literal-dollar"> + <title><literal>$FreeBSD$</literal> + Strings</title> + + <para>The $FreeBSD$ version strings used in + files require special handling. In examples like + <xref linkend="po-translations-creating-example"/>, these + strings are not meant to be expanded. The English documents + use <literal>&dollar;</literal> entities to avoid + including actual literal dollar signs in the file:</para> + + <programlisting>&dollar;FreeBSD&dollar;</programlisting> + + <para>The <literal>&dollar;</literal> entities are not seen + as dollar signs by the version control system and so the + string is not expanded into a version string.</para> + + <para>When a <acronym>PO</acronym> file is created, the + <literal>&dollar;</literal> entities used in examples are + replaced with actual dollar signs. The resulting literal + <literal>$FreeBSD$</literal> string will be + wrongly expanded by the version control system when the file + is committed.</para> + + <para>The same technique as used in the English documents can be + used in the translation. The <literal>&dollar;</literal> + is used to replace the dollar sign in the translation entered + into the <acronym>PO</acronym> editor:</para> + + <programlisting>&dollar;FreeBSD&dollar;</programlisting> + </sect2> + <!-- <sect2 xml:id="po-translations-tips-makefile"> <title>Modifying the <filename>Makefile</filename></title> @@ -758,4 +790,68 @@ DOC_PREFIX?= ${.CURDIR}/../../.. </procedure> </example> </sect1> + + <sect1 xml:id="po-translations-submitting"> + <title>Submitting the New Translation</title> + + <para>Prepare the new translation files for submission. This + example shows a new Spanish translation of the NanoBSD + article in + <filename>~/doc/es_ES.ISO8859-1/articles/nanobsd</filename>.</para> + + <procedure> + <step> + <para>The <acronym>PO</acronym> file must contain a &os; + version string comment on the first line:</para> + + <programlisting>#$FreeBSD$</programlisting> + </step> + + <step> + <para>The <filename>Makefile</filename>, the + <acronym>PO</acronym> file, and the generated + <acronym>XML</acronym> translation must all be added to + version control:</para> + + <screen>&prompt.user; <userinput>cd ~/doc/es_ES.ISO8859-1/articles/nanobsd/</userinput> +&prompt.user; <userinput>ls</userinput> +Makefile article.xml es_ES.po +&prompt.user; <userinput>svn add Makefile article.xml es_ES.po</userinput> +A Makefile +A article.xml +A es_ES.po</screen> + </step> + + <step> + <para>These files must also have the + <application>Subversion</application> + <literal>svn:keywords</literal> property set to + <literal>FreeBSD=%H</literal> so + <literal>$FreeBSD$</literal> strings are expanded into + the path, revision, date, and author when committed:</para> + + <screen>&prompt.user; <userinput>svn propset svn:keywords FreeBSD=%H Makefile article.xml es_ES.po</userinput> +property 'svn:keywords' set on 'Makefile' +property 'svn:keywords' set on 'article.xml' +property 'svn:keywords' set on 'es_ES.po'</screen> + </step> + + <step> + <para>A diff of these new files is created from the + <filename>~/doc/</filename> base directory so the full path + is shown with the filenames. This helps committers identify + the target language directory.</para> + + <screen>&prompt.user; <userinput>cd ~/doc</userinput> +<userinput>svn diff es_ES.ISO8859-1/articles/nanobsd/ > /tmp/es_nanobsd.diff</userinput></screen> + + <para>The diff file is now ready for attachment to a + <link + xlink:href="https://bugs.freebsd.org/bugzilla/enter_bug.cgi?product=Documentation">documentation + bug report</link> or <link + xlink:href="https://reviews.freebsd.org/">code + review</link>.</para> + </step> + </procedure> + </sect1> </chapter> Modified: translations/en_US.ISO8859-1/books/fdp-primer/tools/chapter.xml ============================================================================== --- translations/en_US.ISO8859-1/books/fdp-primer/tools/chapter.xml Fri Nov 6 07:57:09 2015 (r47746) +++ translations/en_US.ISO8859-1/books/fdp-primer/tools/chapter.xml Fri Nov 6 08:52:10 2015 (r47747) @@ -108,29 +108,6 @@ <title>Software</title> <variablelist> - <varlistentry> - <term><application>JadeTeX</application>, - <application>teTeX</application> and Modular DocBook - Stylesheets - (<package>print/jadetex</package>, - <package>print/teTeX</package> and - <package>textproc/dsssl-docbook-modular</package>)</term> - - <listitem> - <para><application>Jade</application>, - <application>teTeX</application> and Modular DocBook - Stylesheets are used to convert DocBook documents to - DVI, Postscript, and PDF formats. The - <application>JadeTeX</application> macros are needed to - do this.</para> - - <para>If <acronym>XHTML</acronym> and plain text output - formats are adequate, then this program is not needed - and the option to install it from the - <package>textproc/docproj</package> - configuration screen can be disabled.</para> - </listitem> - </varlistentry> <varlistentry> <term><application>Vim</application> Modified: translations/en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.xml ============================================================================== --- translations/en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.xml Fri Nov 6 07:57:09 2015 (r47746) +++ translations/en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.xml Fri Nov 6 08:52:10 2015 (r47747) @@ -196,7 +196,7 @@ <para>For example, commands:</para> <informalexample> - <para>Wrong: Use the command <command>svn</command> to + <para>Wrong: Use the <command>svn</command> command to update sources.</para> </informalexample> Modified: translations/en_US.ISO8859-1/books/fdp-primer/xhtml-markup/chapter.xml ============================================================================== --- translations/en_US.ISO8859-1/books/fdp-primer/xhtml-markup/chapter.xml Fri Nov 6 07:57:09 2015 (r47746) +++ translations/en_US.ISO8859-1/books/fdp-primer/xhtml-markup/chapter.xml Fri Nov 6 08:52:10 2015 (r47747) @@ -182,7 +182,7 @@ element, <tag>p</tag>.</para> <example> - <title><tag>p</tag></title> + <title><tag>p</tag> Example</title> <para>Usage:</para> @@ -198,7 +198,7 @@ document that will appear in a separate paragraph.</para> <example> - <title><tag>blockquote</tag></title> + <title><tag>blockquote</tag> Example</title> <para>Usage:</para> @@ -243,7 +243,7 @@ <example> <title><tag>ul</tag> and - <tag>ol</tag></title> + <tag>ol</tag> Example</title> <para>Usage:</para> @@ -309,7 +309,7 @@ element.</para> <example> - <title><tag>pre</tag></title> + <title><tag>pre</tag> Example</title> <para>For example, the <tag>pre</tag> tags could be used to mark up an email message:</para> @@ -480,7 +480,7 @@ <example> <title><tag>em</tag> and - <tag>strong</tag></title> + <tag>strong</tag> Example</title> <para>Usage:</para> @@ -497,7 +497,7 @@ (for <quote>teletype</quote>).</para> <example> - <title><tag>tt</tag></title> + <title><tag>tt</tag> Example</title> <para>Usage:</para> Modified: translations/en_US.ISO8859-1/books/handbook/Makefile ============================================================================== --- translations/en_US.ISO8859-1/books/handbook/Makefile Fri Nov 6 07:57:09 2015 (r47746) +++ translations/en_US.ISO8859-1/books/handbook/Makefile Fri Nov 6 08:52:10 2015 (r47747) @@ -29,6 +29,12 @@ IMAGES_EN+= advanced-networking/natd.eps IMAGES_EN+= advanced-networking/net-routing.pic IMAGES_EN+= advanced-networking/pxe-nfs.png IMAGES_EN+= advanced-networking/static-routes.pic +IMAGES_EN+= basics/disk-layout.eps +IMAGES_EN+= basics/example-dir1.eps +IMAGES_EN+= basics/example-dir2.eps +IMAGES_EN+= basics/example-dir3.eps +IMAGES_EN+= basics/example-dir4.eps +IMAGES_EN+= basics/example-dir5.eps IMAGES_EN+= bsdinstall/bsdinstall-adduser1.png IMAGES_EN+= bsdinstall/bsdinstall-adduser2.png IMAGES_EN+= bsdinstall/bsdinstall-adduser3.png Modified: translations/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml ============================================================================== --- translations/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml Fri Nov 6 07:57:09 2015 (r47746) +++ translations/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml Fri Nov 6 08:52:10 2015 (r47747) @@ -2212,10 +2212,7 @@ freebsdap 00:11:95:c3:0d:ac 1 <listitem> <para>There are many lower-level debugging tools. Debugging messages can be enabled in the 802.11 protocol - support layer using &man.wlandebug.8;. On a &os; system - prior to &os; 9.1, this program can be found in - <filename - >/usr/src/tools/tools/net80211</filename>. + support layer using &man.wlandebug.8;. For example, to enable console messages related to scanning for access points and the 802.11 protocol handshakes required to arrange communication:</para> @@ -3223,7 +3220,7 @@ bridge0: flags=8843<UP,BROADCAST,RUNN <term>sticky</term> <listitem> <para>If a bridge member interface is marked as sticky, - dynamically learned address entries are treated at + dynamically learned address entries are treated as static entries in the forwarding cache. Sticky entries are never aged out of the cache or replaced, even if the address is seen on a different interface. This gives @@ -4610,22 +4607,12 @@ rtsold_enable="YES"</programlisting> router solicitation messages. The second line enables the router solicitation daemon, &man.rtsol.8;.</para> - <para>For &os; 8.<replaceable>x</replaceable>, add a third - line:</para> - - <programlisting>ipv6_enable="YES"</programlisting> - <para>If the interface needs a statically assigned <acronym>IPv6</acronym> address, add an entry to specify the static address and associated prefix length:</para> <programlisting>ifconfig_<replaceable>rl0</replaceable>_ipv6="inet6 <replaceable>2001:db8:4672:6565:2026:5043:2d42:5344</replaceable> prefixlen <replaceable>64</replaceable>"</programlisting> - <para>On a &os; 8.<replaceable>x</replaceable> system, that - line uses this format instead:</para> - - <programlisting>ipv6_ifconfig_<replaceable>rl0</replaceable>="<replaceable>2001:db8:4672:6565:2026:5043:2d42:5344</replaceable>"</programlisting> - <para>To assign a default router, specify its address:</para> <programlisting>ipv6_defaultrouter="<replaceable>2001:db8:4672:6565::1</replaceable>"</programlisting> @@ -4690,11 +4677,6 @@ rtsold_enable="YES"</programlisting> <programlisting>ifconfig_gif0_ipv6="inet6 <replaceable>MY_ASSIGNED_IPv6_TUNNEL_ENDPOINT_ADDR</replaceable>"</programlisting> - <para>For &os; 8.<replaceable>x</replaceable>, that line - should instead use this format:</para> - - <programlisting>ipv6_ifconfig_gif0="<replaceable>MY_ASSIGNED_IPv6_TUNNEL_ENDPOINT_ADDR</replaceable>"</programlisting> - <para>Then, set the default route for the other side of the <acronym>IPv6</acronym> tunnel. Replace <replaceable>MY_IPv6_REMOTE_TUNNEL_ENDPOINT_ADDR</replaceable> Modified: translations/en_US.ISO8859-1/books/handbook/basics/chapter.xml ============================================================================== --- translations/en_US.ISO8859-1/books/handbook/basics/chapter.xml Fri Nov 6 07:57:09 2015 (r47746) +++ translations/en_US.ISO8859-1/books/handbook/basics/chapter.xml Fri Nov 6 08:52:10 2015 (r47747) @@ -1926,7 +1926,7 @@ root 5211 0.0 0.2 3620 1724 2 <mediaobject> <imageobject> - <imagedata fileref="install/example-dir1"/> + <imagedata fileref="basics/example-dir1"/> </imageobject> <textobject> @@ -1947,7 +1947,7 @@ root 5211 0.0 0.2 3620 1724 2 <mediaobject> <imageobject> - <imagedata fileref="install/example-dir2"/> + <imagedata fileref="basics/example-dir2"/> </imageobject> <textobject> @@ -1978,7 +1978,7 @@ root 5211 0.0 0.2 3620 1724 2 <mediaobject> <imageobject> - <imagedata fileref="install/example-dir3"/> + <imagedata fileref="basics/example-dir3"/> </imageobject> <textobject> @@ -2007,7 +2007,7 @@ root 5211 0.0 0.2 3620 1724 2 <mediaobject> <imageobject> - <imagedata fileref="install/example-dir4"/> + <imagedata fileref="basics/example-dir4"/> </imageobject> <textobject> @@ -2033,7 +2033,7 @@ root 5211 0.0 0.2 3620 1724 2 <mediaobject> <imageobject> - <imagedata fileref="install/example-dir5"/> + <imagedata fileref="basics/example-dir5"/> </imageobject> <textobject> @@ -2330,7 +2330,7 @@ root 5211 0.0 0.2 3620 1724 2 <row> <entry><literal>ada0s1a</literal></entry> <entry>The first partition (<literal>a</literal>) on the - first slice (<literal>s1</literal>) on the first IDE + first slice (<literal>s1</literal>) on the first <acronym>SATA</acronym> disk (<literal>ada0</literal>).</entry> </row> @@ -2348,55 +2348,27 @@ root 5211 0.0 0.2 3620 1724 2 <example xml:id="basics-concept-disk-model"> <title>Conceptual Model of a Disk</title> - <para>This diagram shows &os;'s view of the first IDE disk - attached to the system. Assume that the disk is 4 GB in - size, and contains two 2 GB slices (&ms-dos; partitions). - The first slice contains a &ms-dos; disk, + <para>This diagram shows &os;'s view of the first <acronym>SATA</acronym> disk + attached to the system. Assume that the disk is 250 GB in + size, and contains an 80 GB slice and a 170 GB slice (&ms-dos; partitions). + The first slice contains a &windows; <acronym>NTFS</acronym> file system, <filename>C:</filename>, and the second slice contains a - &os; installation. This example &os; installation has three - data partitions, and a swap partition.</para> + &os; installation. This example &os; installation has four + data partitions and a swap partition.</para> - <para>The three partitions will each hold a file system. - Partition <literal>a</literal> will be used for the root file - system, <literal>e</literal> for the - <filename>/var/</filename> directory - hierarchy, and <literal>f</literal> for the - <filename>/usr/</filename> directory - hierarchy.</para> + <para>The four partitions each hold a file system. + Partition <literal>a</literal> is used for the root file + system, <literal>d</literal> for + <filename>/var/</filename>, + <literal>e</literal> for <filename>/tmp/</filename>, and <literal>f</literal> for + <filename>/usr/</filename>. Partition letter + <literal>c</literal> refers to the entire slice, and so is not + used for ordinary partitions.</para> <mediaobject> <imageobject> - <imagedata fileref="install/disk-layout"/> + <imagedata fileref="basics/disk-layout"/> </imageobject> - - <textobject> - <literallayout class="monospaced">.-----------------. --. -| | | -| DOS / Windows | | -: : > First slice, ad0s1 -: : | -| | | -:=================: ==: --. -| | | Partition a, mounted as / | -| | > referred to as ad0s2a | -| | | | -:-----------------: ==: | -| | | Partition b, used as swap | -| | > referred to as ad0s2b | -| | | | -:-----------------: ==: | Partition c, no -| | | Partition e, used as /var > file system, all -| | > referred to as ad0s2e | of FreeBSD slice, -| | | | ad0s2c -:-----------------: ==: | -| | | | -: : | Partition f, used as /usr | -: : > referred to as ad0s2f | -: : | | -| | | | -| | --' | -`-----------------' --'</literallayout> - </textobject> </mediaobject> </example> </sect1> @@ -2837,12 +2809,12 @@ Swap: 2048M Total, 2048M Free have open, and attempt to finish what it is doing before shutting down. In some cases, a process may ignore <literal>SIGTERM</literal> if it is in the middle of some task - that can not be interrupted.</para> + that cannot be interrupted.</para> - <para><literal>SIGKILL</literal> can not be ignored by a + <para><literal>SIGKILL</literal> cannot be ignored by a process. Sending a <literal>SIGKILL</literal> to a process will usually stop that process there and then. - <footnote><para>There are a few tasks that can not be + <footnote><para>There are a few tasks that cannot be interrupted. For example, if the process is trying to read from a file that is on another computer on the network, and the other computer is unavailable, the Copied: translations/en_US.ISO8859-1/books/handbook/basics/disk-layout.eps (from r47746, head/en_US.ISO8859-1/books/handbook/basics/disk-layout.eps) ============================================================================== Binary file (source and/or target). No diff available. Copied: translations/en_US.ISO8859-1/books/handbook/basics/disk-layout.ps (from r47746, head/en_US.ISO8859-1/books/handbook/basics/disk-layout.ps) ============================================================================== Binary file (source and/or target). No diff available. Modified: translations/en_US.ISO8859-1/books/handbook/bsdinstall/chapter.xml ============================================================================== --- translations/en_US.ISO8859-1/books/handbook/bsdinstall/chapter.xml Fri Nov 6 07:57:09 2015 (r47746) +++ translations/en_US.ISO8859-1/books/handbook/bsdinstall/chapter.xml Fri Nov 6 08:52:10 2015 (r47747) @@ -91,7 +91,7 @@ by the PC-BSD Project. It can be used to install either a graphical desktop (PC-BSD) or a command line version of &os;. Refer to the PC-BSD Users Handbook for details (<link - xlink:href="http://wiki.pcbsd.org/index.php/PC-BSD%C2%AE_Users_Handbook/10.1">http://wiki.pcbsd.org/index.php/PC-BSD%C2%AE_Users_Handbook/10.1</link>).</para>; + xlink:href="http://wiki.pcbsd.org/index.php/Colophon">http://wiki.pcbsd.org/index.php/Colophon</link>).</para>; </note> <para>After reading this chapter, you will know:</para> @@ -145,8 +145,8 @@ <sect1 xml:id="bsdinstall-hardware"> <title>Minimum Hardware Requirements</title> - <para>The hardware requirements to install &os; vary by the &os; - version and the hardware architecture. Hardware architectures + <para>The hardware requirements to install &os; vary by the + hardware architecture. Hardware architectures and devices supported by a &os; release are listed on the Release Information page of the &os; web site (<link xlink:href="&url.base;/releases/index.html">http://www.FreeBSD.org/releases/index.html</link>).</para>; @@ -437,9 +437,9 @@ xlink:href="&url.base;/where.html#download">www.freebsd.org/where.html#download</link>. Each installation file's name includes the release version of &os;, the architecture, and the type of file. For example, to - install &os; 10.0 on an &arch.amd64; system from a + install &os; 10.2 on an &arch.amd64; system from a <acronym>DVD</acronym>, download - <filename>FreeBSD-10.0-RELEASE-amd64-dvd1.iso</filename>, burn + <filename>FreeBSD-10.2-RELEASE-amd64-dvd1.iso</filename>, burn this file to a <acronym>DVD</acronym>, and boot the system with the <acronym>DVD</acronym> inserted.</para> @@ -537,7 +537,7 @@ <acronym>USB</acronym> device on an existing &os; system.</para> - <screen>&prompt.root; <userinput>dd if=<replaceable>FreeBSD-10.0-RELEASE-amd64-memstick.img</replaceable> of=/dev/<replaceable>da0</replaceable> bs=1m conv=sync</userinput></screen> + <screen>&prompt.root; <userinput>dd if=<replaceable>FreeBSD-10.2-RELEASE-amd64-memstick.img</replaceable> of=/dev/<replaceable>da0</replaceable> bs=1m conv=sync</userinput></screen> <para>If this command fails, verify that the <acronym>USB</acronym> stick is not mounted and that the Modified: translations/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml ============================================================================== --- translations/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml Fri Nov 6 07:57:09 2015 (r47746) +++ translations/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml Fri Nov 6 08:52:10 2015 (r47747) @@ -336,9 +336,8 @@ Uninstalling updates... done.</screen> <para>Always keep a copy of the <filename>GENERIC</filename> kernel in <filename>/boot/GENERIC</filename>. It will be helpful in diagnosing a variety of problems and in - performing version upgrades. Refer to either <xref - linkend="freebsd-update-custom-kernel-9x"/> or <xref - linkend="freebsd-update-custom-kernel-8x"/> for + performing version upgrades. Refer to <xref + linkend="freebsd-update-custom-kernel-9x"/> for instructions on how to get a copy of the <filename>GENERIC</filename> kernel.</para> </note> @@ -383,9 +382,8 @@ Uninstalling updates... done.</screen> <para>If the system is running a custom kernel, make sure that a copy of the <filename>GENERIC</filename> kernel exists in <filename>/boot/GENERIC</filename> before starting the - upgrade. Refer to either <xref - linkend="freebsd-update-custom-kernel-9x"/> or <xref - linkend="freebsd-update-custom-kernel-8x"/> for + upgrade. Refer to <xref + linkend="freebsd-update-custom-kernel-9x"/> for instructions on how to get a copy of the <filename>GENERIC</filename> kernel.</para> </note> @@ -548,47 +546,6 @@ before running "/usr/sbin/freebsd-update needs <filename>/boot/GENERIC</filename> to exist.</para> </sect3> - <sect3 xml:id="freebsd-update-custom-kernel-8x"> - <title>Custom Kernels with &os; 8.X</title> - - <para>On an &os; 8.X system, the instructions for - obtaining or building a <filename>GENERIC</filename> kernel - differ slightly.</para> - - <para>Assuming physical access to the machine is possible, a - copy of the <filename>GENERIC</filename> kernel can be - installed from the installation media using the following - commands:</para> - - <screen>&prompt.root; <userinput>mount /cdrom</userinput> -&prompt.root; <userinput>cd /cdrom/<replaceable>X.Y-RELEASE</replaceable>/kernels</userinput> -&prompt.root; <userinput>./install.sh GENERIC</userinput></screen> - - <para>Replace <filename - ><replaceable>X.Y-RELEASE</replaceable></filename> - with the version of the release being used. The - <filename>GENERIC</filename> kernel will be installed in - <filename>/boot/GENERIC</filename> by default.</para> - - <para>To instead build the <filename>GENERIC</filename> kernel - from source:</para> - - <screen>&prompt.root; <userinput>cd /usr/src</userinput> -&prompt.root; <userinput>env DESTDIR=/boot/GENERIC make kernel __MAKE_CONF=/dev/null SRCCONF=/dev/null</userinput> -&prompt.root; <userinput>mv /boot/GENERIC/boot/kernel/* /boot/GENERIC</userinput> -&prompt.root; <userinput>rm -rf /boot/GENERIC/boot</userinput></screen> - *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201511060852.tA68qBX7037664>