From owner-svn-doc-translations@freebsd.org Fri Nov 6 08:52:14 2015 Return-Path: Delivered-To: svn-doc-translations@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 64CCAA27ACC; Fri, 6 Nov 2015 08:52:14 +0000 (UTC) (envelope-from remko@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0F44110BB; Fri, 6 Nov 2015 08:52:13 +0000 (UTC) (envelope-from remko@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tA68qDda037684; Fri, 6 Nov 2015 08:52:13 GMT (envelope-from remko@FreeBSD.org) Received: (from remko@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tA68qBX7037664; Fri, 6 Nov 2015 08:52:11 GMT (envelope-from remko@FreeBSD.org) Message-Id: <201511060852.tA68qBX7037664@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: remko set sender to remko@FreeBSD.org using -f From: Remko Lodder Date: Fri, 6 Nov 2015 08:52:11 +0000 (UTC) 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... X-SVN-Group: doc-translations MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-translations@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for doc translations trees List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Nov 2015 08:52:14 -0000 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 Generate a key: - &prompt.user; gpg --gen-key -gpg (GnuPG) 2.0.22; Copyright (C) 2013 Free Software Foundation, Inc. + &prompt.user; gpg --full-gen-key +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: - &prompt.user; svn co https://svn0.us-west.FreeBSD.org/base/head /usr/src + &prompt.user; svn co https://svn.FreeBSD.org/base/head /usr/src - Select the closest mirror and verify the mirror server - certificate from the list of Subversion - mirror sites. + More details on using Subversion this way can be found in Using + Subversion. @@ -2378,8 +2377,8 @@ freebsd-mfc-after = 2 weekshub often get - accidentally truncated without warning, so + freefall may get + truncated without warning if space needs to be freed, so forward it or read it and you will not lose it. Due to the severe load dealing with SPAM places on the @@ -4957,10 +4956,9 @@ Do you want to commit? (no = start a she The mailing lists are archived under - /g/mail which will show up as - /hub/g/mail with &man.pwd.1;. This - location is accessible from any machine on the &os; - cluster. + /local/mail on freefall.FreeBSD.org. 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 @@ - When their ports tree amd + When their ports tree and INDEX was last updated @@ -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! In any case, the Ports Management Team @@ -1176,7 +1176,7 @@ ports-mgmt/poudriere 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 poudriere home page &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 @@ + Fabiano Sidler + fabianosidler@swissonline.ch + + + Fabien Devaux fab@gcu.info @@ -4253,6 +4258,11 @@ + James Buren + ryu0@ymail.com + + + James Clark jjc@jclark.com @@ -6753,6 +6763,11 @@ + Maxim Filimonov + che@bein.link + + + Maxim Ignatenko gelraen.ua@gmail.com 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 @@ + &a.skra.email; + + + &a.skreuzer.email; @@ -787,6 +791,10 @@ + &a.lidl.email; + + + &a.yzlin.email; @@ -823,6 +831,10 @@ + &a.jtl.email; + + + &a.imp.email; @@ -915,6 +927,10 @@ + &a.mmel.email; + + + &a.jmmv.email; @@ -1511,6 +1527,10 @@ + &a.avos.email; + + + &a.stefan.email; 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 recently settled. One detail that the lawsuit did clarify is the naming: in the @@ -218,15 +218,6 @@ system and the 4.4BSD operating system. - - - There is a perception that the BSD projects are fragmented and - belligerent. The - Wall Street - Journal spoke of balkanization of the - BSD projects. Like the law suit, this perception bases mainly - on ancient history. - @@ -258,10 +249,10 @@ The BSD kernels are developed and updated following the Open Source development model. Each project maintains a publicly - accessible source tree under the - Concurrent Versions - System (CVS), which contains all source files for the - project, including documentation and other incidental files. CVS + accessible source tree under + Subversion + (SVN), which contains all source files for the + project, including documentation and other incidental files. SVN allows users to check out (in other words, to extract a copy of) any desired version of the system. @@ -336,10 +327,10 @@ - As a result of the formalized maintenance of a single CVS + 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. @@ -378,11 +369,12 @@ 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 STABLE 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. + in the CURRENT branch. Security and other important bug fixes + are also applied to all supported RELEASE versions. 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 @@ 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. + when teaching programming to smaller age groups, as it makes + creation of elaborate geometric shapes an easy task. 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 Art of Assembly Language; or if you prefer a printed book, take a look at Jeff Duntemann's -Assembly -Language Step-by-Step). 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 @@ - + 11-CURRENT"> X"> head/"> @@ -14,10 +14,6 @@ 9-STABLE"> stable/9/"> -X"> -8-STABLE"> -stable/8/"> - ]> @@ -73,7 +69,7 @@ This is the Frequently Asked Questions - FAQ for &os; versions &rel3.relx;, + FAQ for &os; versions &rel2.relx; and &rel.relx;. Every effort has been made to make this FAQ as informative as possible; if you have any suggestions as to how it may be improved, send @@ -1561,8 +1557,8 @@ 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 Committer's Guide. @@ -2318,8 +2314,8 @@ kern.timecounter.hardware: TSC -> i82 Problematic LORs tend to get - fixed quickly, so check &a.current.url; before posting - to the mailing lists. + fixed quickly, so check the &a.current; before posting + to it. @@ -2655,17 +2651,22 @@ kern.timecounter.hardware: TSC -> i82 GENERIC kernels shipped with &os; - and later are compiled in debug mode. - Kernels built in debug mode contain many symbols in - separate files that are used for debugging, thus greatly - increasing the size of /boot/kernel/. + are compiled in debug mode. + 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, + /boot/kernel/. + In &os; 11.0 and later the debug files are stored in + /usr/lib/debug/boot/kernel/. 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. - However, when running low on disk space, there + When running low on disk space, there are different options to reduce the size of - /boot/kernel/. + /boot/kernel/ and + /usr/lib/debug/. To not install the symbol files, make sure the following line exists in @@ -2675,8 +2676,8 @@ kern.timecounter.hardware: TSC -> i82 For more information see &man.src.conf.5;. - If you do not want to build a debug kernel, make sure - that both of the following are true: + If you want to avoid building debug files altogether, + make sure that both of the following are true: @@ -2717,9 +2718,9 @@ kern.timecounter.hardware: TSC -> i82 xlink:href="&url.books.handbook;/kernelconfig-building.html">build and install the new kernel. - Most kernels - (/boot/kernel/kernel) tend to be - around 12 MB to 16 MB. + For reference, the &os; 11 &arch.amd64; kernel + (/boot/kernel/kernel) is + approximately 25 MB. @@ -3366,12 +3367,12 @@ kern.sched.name: ULE 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 - du and df. If this - file is deleted while using more on it, - more 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 + du and df. A + file being viewed with more can be + deleted wihout causing an error. + The entry is removed from the directory so no other program or user can access it. However, du shows that it is gone as it has walked the directory tree and the @@ -3458,12 +3459,13 @@ kern.sched.name: ULE - &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 hw.memtest.tests - to 0 in + &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 + hw.memtest.tests=0 to /boot/loader.conf. For more details, see &man.loader.conf.5;. @@ -3494,7 +3496,7 @@ kern.sched.name: ULE - The ZIL ((ZFS + The ZIL (ZFS 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 In order to use a full screen editor such as &man.vi.1; or &man.emacs.1;, run - export TERM=xterm on &os; 9.0+, or - export TERM=cons25 on &os; 8.X so that - these editors can load the correct data from the + export TERM=xterm on &os; 9.0+ + so that these editors can load the correct data from the &man.termcap.5; database. After performing these steps, edit @@ -7230,11 +7231,6 @@ hint.sio.7.irq="12" - &rel3.releng; AKA - &rel3.stable; - - - &rel2.releng; AKA &rel2.stable; 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 book.xml: # -# $FreeBSD$ +# $FreeBSD$ # # Build the FreeBSD Porter's Handbook. # @@ -502,7 +502,7 @@ A Makefile version control system when this file is committed. # -# $FreeBSD$ +# $FreeBSD$ # # Article: PGP Keys @@ -676,6 +676,38 @@ DOC_PREFIX?= ${.CURDIR}/../../.. + + <literal>$FreeBSD$</literal> + Strings + + The $FreeBSD$ version strings used in + files require special handling. In examples like + , these + strings are not meant to be expanded. The English documents + use &dollar; entities to avoid + including actual literal dollar signs in the file: + + &dollar;FreeBSD&dollar; + + The &dollar; entities are not seen + as dollar signs by the version control system and so the + string is not expanded into a version string. + + When a PO file is created, the + &dollar; entities used in examples are + replaced with actual dollar signs. The resulting literal + $FreeBSD$ string will be + wrongly expanded by the version control system when the file + is committed. + + The same technique as used in the English documents can be + used in the translation. The &dollar; + is used to replace the dollar sign in the translation entered + into the PO editor: + + &dollar;FreeBSD&dollar; + +