From owner-svn-doc-translations@FreeBSD.ORG Sun Sep 8 00:16:30 2013 Return-Path: Delivered-To: svn-doc-translations@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id D98AA6A8; Sun, 8 Sep 2013 00:16:30 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id C36D22C64; Sun, 8 Sep 2013 00:16:30 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r880GU1L000661; Sun, 8 Sep 2013 00:16:30 GMT (envelope-from gjb@svn.freebsd.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r880GU0x000659; Sun, 8 Sep 2013 00:16:30 GMT (envelope-from gjb@svn.freebsd.org) Message-Id: <201309080016.r880GU0x000659@svn.freebsd.org> From: Glen Barber Date: Sun, 8 Sep 2013 00:16:30 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-translations@freebsd.org Subject: svn commit: r42627 - in translations/en_US.ISO8859-1: articles/committers-guide articles/console-server articles/contributing articles/contributors articles/cvs-freebsd articles/freebsd-update-serv... 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.14 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: Sun, 08 Sep 2013 00:16:30 -0000 Author: gjb Date: Sun Sep 8 00:16:29 2013 New Revision: 42627 URL: http://svnweb.freebsd.org/changeset/doc/42627 Log: MFH: Merged /projects/print2013/en_US.ISO8859-1:r40693-40726 Merged /projects/entities/en_US.ISO8859-1:r40180-42225 Merged /projects/ISBN_1-57176-407-0/en_US.ISO8859-1:r40727-41455, 41457-41469,41472-41477,41479-41513,41515-41521,41523-41577, 41579-41581,41583-42013 Merged /head/en_US.ISO8859-1:r41736-42626 Approved by: doceng (implicit) Added: translations/en_US.ISO8859-1/books/fdp-primer/docbook-markup/ - copied from r42626, head/en_US.ISO8859-1/books/fdp-primer/docbook-markup/ translations/en_US.ISO8859-1/books/fdp-primer/editor-config/ - copied from r42626, head/en_US.ISO8859-1/books/fdp-primer/editor-config/ translations/en_US.ISO8859-1/books/fdp-primer/working-copy/ - copied from r42626, head/en_US.ISO8859-1/books/fdp-primer/working-copy/ translations/en_US.ISO8859-1/books/fdp-primer/xhtml-markup/ - copied from r42626, head/en_US.ISO8859-1/books/fdp-primer/xhtml-markup/ translations/en_US.ISO8859-1/books/fdp-primer/xml-primer/ - copied from r42626, head/en_US.ISO8859-1/books/fdp-primer/xml-primer/ translations/en_US.ISO8859-1/htdocs/java/links.xml - copied unchanged from r42626, head/en_US.ISO8859-1/htdocs/java/links.xml translations/en_US.ISO8859-1/htdocs/news/status/report-2013-04-2013-06.xml - copied unchanged from r42626, head/en_US.ISO8859-1/htdocs/news/status/report-2013-04-2013-06.xml translations/en_US.ISO8859-1/htdocs/news/status/report-2013-05-devsummit.xml - copied unchanged from r42626, head/en_US.ISO8859-1/htdocs/news/status/report-2013-05-devsummit.xml translations/en_US.ISO8859-1/htdocs/releases/10.0R/ - copied from r42626, head/en_US.ISO8859-1/htdocs/releases/10.0R/ translations/en_US.ISO8859-1/htdocs/releases/8.4R/announce.xml - copied unchanged from r42626, head/en_US.ISO8859-1/htdocs/releases/8.4R/announce.xml translations/en_US.ISO8859-1/htdocs/releases/8.4R/errata.html - copied unchanged from r42626, head/en_US.ISO8859-1/htdocs/releases/8.4R/errata.html translations/en_US.ISO8859-1/htdocs/releases/8.4R/hardware.html - copied unchanged from r42626, head/en_US.ISO8859-1/htdocs/releases/8.4R/hardware.html translations/en_US.ISO8859-1/htdocs/releases/8.4R/installation.html - copied unchanged from r42626, head/en_US.ISO8859-1/htdocs/releases/8.4R/installation.html translations/en_US.ISO8859-1/htdocs/releases/8.4R/readme.html - copied unchanged from r42626, head/en_US.ISO8859-1/htdocs/releases/8.4R/readme.html translations/en_US.ISO8859-1/htdocs/releases/8.4R/relnotes-detailed.html - copied unchanged from r42626, head/en_US.ISO8859-1/htdocs/releases/8.4R/relnotes-detailed.html translations/en_US.ISO8859-1/htdocs/releases/8.4R/relnotes.xml - copied unchanged from r42626, head/en_US.ISO8859-1/htdocs/releases/8.4R/relnotes.xml translations/en_US.ISO8859-1/htdocs/releases/9.2R/ - copied from r42626, head/en_US.ISO8859-1/htdocs/releases/9.2R/ Deleted: translations/en_US.ISO8859-1/books/fdp-primer/psgml-mode/ translations/en_US.ISO8859-1/books/fdp-primer/sgml-markup/ translations/en_US.ISO8859-1/books/fdp-primer/sgml-primer/ translations/en_US.ISO8859-1/books/handbook/vinum/ translations/en_US.ISO8859-1/htdocs/docproj/todo.xml translations/en_US.ISO8859-1/htdocs/java/advocacy.xml translations/en_US.ISO8859-1/htdocs/java/dists/15.xml translations/en_US.ISO8859-1/htdocs/java/docs/ translations/en_US.ISO8859-1/htdocs/java/links/ translations/en_US.ISO8859-1/htdocs/projects/bigdisk/ translations/en_US.ISO8859-1/htdocs/search/opensearch/cvsweb.xml Modified: translations/en_US.ISO8859-1/articles/committers-guide/article.xml translations/en_US.ISO8859-1/articles/console-server/article.xml translations/en_US.ISO8859-1/articles/contributing/article.xml translations/en_US.ISO8859-1/articles/contributors/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/contributors/contrib.corealumni.xml translations/en_US.ISO8859-1/articles/contributors/contrib.develalumni.xml translations/en_US.ISO8859-1/articles/contributors/contrib.develinmemoriam.xml translations/en_US.ISO8859-1/articles/contributors/contrib.portmgralumni.xml translations/en_US.ISO8859-1/articles/cvs-freebsd/article.xml translations/en_US.ISO8859-1/articles/freebsd-update-server/article.xml translations/en_US.ISO8859-1/articles/gjournal-desktop/article.xml translations/en_US.ISO8859-1/articles/hubs/article.xml translations/en_US.ISO8859-1/articles/linux-emulation/article.xml translations/en_US.ISO8859-1/articles/mailing-list-faq/article.xml translations/en_US.ISO8859-1/articles/nanobsd/article.xml translations/en_US.ISO8859-1/articles/pam/article.xml translations/en_US.ISO8859-1/articles/releng-packages/article.xml translations/en_US.ISO8859-1/articles/releng/article.xml translations/en_US.ISO8859-1/articles/remote-install/article.xml translations/en_US.ISO8859-1/articles/serial-uart/article.xml translations/en_US.ISO8859-1/articles/vm-design/article.xml translations/en_US.ISO8859-1/books/arch-handbook/scsi/chapter.xml translations/en_US.ISO8859-1/books/arch-handbook/sound/chapter.xml translations/en_US.ISO8859-1/books/dev-model/book.xml translations/en_US.ISO8859-1/books/developers-handbook/policies/chapter.xml translations/en_US.ISO8859-1/books/developers-handbook/testing/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/Makefile translations/en_US.ISO8859-1/books/fdp-primer/book.xml translations/en_US.ISO8859-1/books/fdp-primer/chapters.ent translations/en_US.ISO8859-1/books/fdp-primer/doc-build/chapter.xml translations/en_US.ISO8859-1/books/fdp-primer/examples/appendix.xml translations/en_US.ISO8859-1/books/fdp-primer/overview/chapter.xml translations/en_US.ISO8859-1/books/fdp-primer/structure/chapter.xml translations/en_US.ISO8859-1/books/fdp-primer/stylesheets/chapter.xml translations/en_US.ISO8859-1/books/fdp-primer/the-website/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/handbook/Makefile translations/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml translations/en_US.ISO8859-1/books/handbook/audit/chapter.xml translations/en_US.ISO8859-1/books/handbook/basics/chapter.xml translations/en_US.ISO8859-1/books/handbook/book.xml translations/en_US.ISO8859-1/books/handbook/boot/chapter.xml translations/en_US.ISO8859-1/books/handbook/bsdinstall/chapter.xml translations/en_US.ISO8859-1/books/handbook/chapters.ent translations/en_US.ISO8859-1/books/handbook/config/chapter.xml translations/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml translations/en_US.ISO8859-1/books/handbook/desktop/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/filesystems/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/install/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/kernelconfig/chapter.xml translations/en_US.ISO8859-1/books/handbook/l10n/chapter.xml translations/en_US.ISO8859-1/books/handbook/linuxemu/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/ppp-and-slip/chapter.xml translations/en_US.ISO8859-1/books/handbook/preface/preface.xml translations/en_US.ISO8859-1/books/handbook/printing/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/users/chapter.xml translations/en_US.ISO8859-1/books/handbook/x11/chapter.xml translations/en_US.ISO8859-1/books/pmake/gods/chapter.xml translations/en_US.ISO8859-1/books/porters-handbook/book.xml translations/en_US.ISO8859-1/books/porters-handbook/uses.xml translations/en_US.ISO8859-1/htdocs/administration.xml translations/en_US.ISO8859-1/htdocs/advocacy/myths.xml translations/en_US.ISO8859-1/htdocs/cgi/cgi-style.pl translations/en_US.ISO8859-1/htdocs/cgi/man.cgi translations/en_US.ISO8859-1/htdocs/cgi/monthly.cgi translations/en_US.ISO8859-1/htdocs/community/mailinglists.xml translations/en_US.ISO8859-1/htdocs/docproj/Makefile translations/en_US.ISO8859-1/htdocs/docproj/current.xml translations/en_US.ISO8859-1/htdocs/docs/books.xml translations/en_US.ISO8859-1/htdocs/donations/donors.xml translations/en_US.ISO8859-1/htdocs/internal/doceng.xml translations/en_US.ISO8859-1/htdocs/internal/machines.xml translations/en_US.ISO8859-1/htdocs/java/Makefile translations/en_US.ISO8859-1/htdocs/java/dists/Makefile translations/en_US.ISO8859-1/htdocs/java/dists/index.xml translations/en_US.ISO8859-1/htdocs/java/howhelp.xml translations/en_US.ISO8859-1/htdocs/java/index.xml translations/en_US.ISO8859-1/htdocs/java/install.xml translations/en_US.ISO8859-1/htdocs/layout/js/google.js translations/en_US.ISO8859-1/htdocs/news/status/Makefile translations/en_US.ISO8859-1/htdocs/news/status/README translations/en_US.ISO8859-1/htdocs/news/status/status.xml translations/en_US.ISO8859-1/htdocs/platforms/alpha.xml translations/en_US.ISO8859-1/htdocs/platforms/arm.xml translations/en_US.ISO8859-1/htdocs/platforms/sparc.xml translations/en_US.ISO8859-1/htdocs/platforms/xbox.xml translations/en_US.ISO8859-1/htdocs/portmgr/index.xml translations/en_US.ISO8859-1/htdocs/ports/installing.xml translations/en_US.ISO8859-1/htdocs/ports/references.xml translations/en_US.ISO8859-1/htdocs/ports/updating.xml translations/en_US.ISO8859-1/htdocs/projects/Makefile translations/en_US.ISO8859-1/htdocs/projects/c99/index.xml translations/en_US.ISO8859-1/htdocs/projects/cvsweb.xml translations/en_US.ISO8859-1/htdocs/projects/projects.xml translations/en_US.ISO8859-1/htdocs/projects/summerofcode-2005.xml translations/en_US.ISO8859-1/htdocs/projects/summerofcode-2006.xml translations/en_US.ISO8859-1/htdocs/releases/8.4R/Makefile translations/en_US.ISO8859-1/htdocs/releases/8.4R/schedule.xml 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/htdocs/relnotes.xml translations/en_US.ISO8859-1/htdocs/relnotes/Makefile translations/en_US.ISO8859-1/htdocs/robots.txt translations/en_US.ISO8859-1/htdocs/search/opensearch/Makefile translations/en_US.ISO8859-1/htdocs/search/opensearch/opensearch.xml translations/en_US.ISO8859-1/htdocs/security/reporting.xml translations/en_US.ISO8859-1/htdocs/security/security.xml translations/en_US.ISO8859-1/htdocs/send-pr.xml translations/en_US.ISO8859-1/htdocs/where.xml translations/en_US.ISO8859-1/share/xml/mailing-lists.ent translations/en_US.ISO8859-1/share/xml/release.l10n.ent translations/en_US.ISO8859-1/share/xml/teams.ent Directory Properties: translations/en_US.ISO8859-1/ (props changed) Modified: translations/en_US.ISO8859-1/articles/committers-guide/article.xml ============================================================================== --- translations/en_US.ISO8859-1/articles/committers-guide/article.xml Sat Sep 7 23:27:36 2013 (r42626) +++ translations/en_US.ISO8859-1/articles/committers-guide/article.xml Sun Sep 8 00:16:29 2013 (r42627) @@ -26,7 +26,7 @@ 2011 2012 2013 - The FreeBSD Documentation Project + The &os; Documentation Project @@ -43,12 +43,12 @@ $FreeBSD$ - This document provides information for the FreeBSD + This document provides information for the &os; committer community. All new committers should read this document before they start, and existing committers are strongly encouraged to review it from time to time. - Almost all FreeBSD developers have commit rights to one or + Almost all &os; developers have commit rights to one or more repositories. However, a few developers do not, and some of the information here applies to them as well. (For instance, some people only have rights to work with the @@ -56,7 +56,7 @@ linkend="non-committers"/> for more information. This document may also be of interest to members of the - FreeBSD community who want to learn more about how the project + &os; community who want to learn more about how the project works. @@ -83,32 +83,32 @@ src/ Subversion Root - - svn+ssh://svn+ssh://svn.FreeBSD.org/base - (see also ). + (see also ). + doc/ Subversion Root - - svn+ssh://svn+ssh://svn.FreeBSD.org/doc - (see also ). + (see also ). ports/ Subversion Root - - svn+ssh://svn+ssh://svn.FreeBSD.org/ports - (see also ). + (see also ). Internal Mailing Lists - developers (technically called all-developers), doc-developers, doc-committers, ports-developers, ports-committers, src-developers, src-committers. (Each @@ -128,8 +128,7 @@ reports /home/core/public/monthly-reports on the FreeBSD.org - cluster. - + cluster. @@ -143,46 +142,47 @@ Noteworthy src/ SVN Branches - stable/8 (8.X-STABLE), stable/9 (9.X-STABLE), - head (-CURRENT) - + head (-CURRENT) - It is required that you use &man.ssh.1; - to connect to the project hosts. - If you do - not know anything about &man.ssh.1;, please see - . + &man.ssh.1; is required to connect to the project hosts. + For more information, see . Useful links: - FreeBSD - Project Internal Pages + + &os; + Project Internal Pages + - FreeBSD Project - Hosts - - FreeBSD Project - Administrative Groups + + &os; Project + Hosts + + + + &os; Project + Administrative Groups + Commit Bit Types - The FreeBSD repository has a number of components which, + The &os; repository has a number of components which, when combined, support the basic operating system source, documentation, third party application ports infrastructure, and - various maintained utilities. When FreeBSD commit bits are + various maintained utilities. When &os; commit bits are allocated, the areas of the tree where the bit may be used are specified. Generally, the areas associated with a bit reflect who authorized the allocation of the commit bit. Additional @@ -237,34 +237,40 @@ of the tree where the work is occurring. - Policy for <filename>doc/</filename> committer activity - in <filename>src/</filename> + Policy for <filename>doc/</filename> Committer Activity + in <filename>src/</filename> - doc committers may commit documentation - changes to src files, such as man pages, READMEs, fortune - databases, calendar files, and comment fixes without - approval from a src committer, subject to the normal care - and tending of commits. - - doc committers may commit minor src changes - and fixes, such as build fixes, small features, etc, with an - "Approved by" from a src committer. - - doc committers may seek an upgrade to a src - commit bit by acquiring a mentor, who will propose the doc - committer to core. When approved, they will be added to - 'access' and the normal mentoring period will ensue, which - will involve a continuing of Approved by for - some period. - - "Approved by" is only acceptable from - non-mentored src committers -- mentored committers can - provide a "Reviewed by" but not an "Approved - by". + + doc committers may commit documentation changes to src + files, such as man pages, READMEs, fortune databases, + calendar files, and comment fixes without approval from a + src committer, subject to the normal care and tending of + commits. + + + + doc committers may commit minor src changes and fixes, + such as build fixes, small features, etc, with an + "Approved by" from a src committer. + + + + doc committers may seek an upgrade to a src commit bit + by acquiring a mentor, who will propose the doc committer + to core. When approved, they will be added to 'access' + and the normal mentoring period will ensue, which will + involve a continuing of Approved by for + some period. + + + + "Approved by" is only acceptable from non-mentored src + committers -- mentored committers can provide a "Reviewed + by" but not an "Approved by". + - @@ -274,13 +280,13 @@ operation of the version control systems in use. Traditionally this was CVS. Subversion is used for the src tree as of May 2008, the doc/www tree as of - May 2012 and the ports tree as of July 2012. - + May 2012 and the ports tree as of July + 2012. There - is a list of things missing in Subversion when compared to CVS - . The notes at + is a list of things missing in Subversion when compared to + CVS. The notes at might also be useful. @@ -336,37 +342,44 @@ Commits are atomic. + Revision numbers apply across the repository—all files that were modified in the same commit have the same revision number. + Branching and tagging are namespace operations. + Directories are versioned. + Files and directories can have arbitrary, versioned metadata attached to them. + Files and directories can be copied, with full history tracking. + No more contortions due to CVS weakness such as applying &man.patch.1; files at compile time in order to avoid touching vendor branch code. + No more repo-copies. Subversion can be installed from the &os; Ports - Collection, by issuing the following commands: + Collection by issuing these commands: &prompt.root; cd /usr/ports/devel/subversion &prompt.root; make clean install @@ -378,7 +391,7 @@ There are a few ways to obtain a working copy of the tree from Subversion. This section will explain them. - + Direct Checkout The first is to check out directly from the main @@ -445,7 +458,7 @@ - + Checkout from a Mirror Check out a working copy from a mirror by @@ -455,13 +468,14 @@ using svnsync. There is a serious disadvantage to this method: every - time something is to be committed, a svn switch - --relocate to the master repository has to be - done, remembering to svn switch back to - the mirror after the commit. Also, since svn - switch only works between repositories that have - the same UUID, some hacking of the local repository's UUID - has to occur before it is possible to start using it. + time something is to be committed, a + svn relocate to the master repository has + to be done, remembering to svn relocate + back to the mirror after the commit. Also, since + svn relocate only works between + repositories that have the same UUID, some hacking of the + local repository's UUID has to occur before it is possible + to start using it. Unlike with CVS, the hassle of a local @@ -471,7 +485,7 @@ information on how to set one up. - + <literal>RELENG_*</literal> Branches and General Layout @@ -489,26 +503,29 @@ - /head/ - which corresponds to HEAD, also known as - -CURRENT. - + /head/ which corresponds to + HEAD, also known as + -CURRENT. + /stable/n which corresponds to RELENG_n. + /releng/n.n which corresponds to RELENG_n_n. + /release/n.n.n which corresponds to RELENG_n_n_n_RELEASE. + /vendor* is the vendor branch import work area. This directory itself does not @@ -517,6 +534,7 @@ releng and release directories. + /projects and /user feature a branch work area, @@ -527,21 +545,21 @@ - + &os; Documentation Project Branches and Layout In svn+ssh://svn.freebsd.org/doc, - doc refers repository root of the - source tree. + doc refers to the repository root of + the source tree. In general, most &os; Documentation Project work will be done within the head/ branch of the - source tree. + documentation source tree. &os; documentation is written and/or translated to - various languages, each of which within a separate - directory within the head/ + various languages, each in a separate + directory in the head/ branch. Each translation set contains several subdirectories for @@ -554,11 +572,13 @@ code for articles written by various &os; contributors. + /books/ contains the source code for the different books, such as the &os; Handbook. + /htdocs/ contains the source code for the &os; website. @@ -566,11 +586,11 @@ - + &os; Ports Tree Branches and Layout In svn+ssh://svn.freebsd.org/ports, - ports refers repository root of the + ports refers to the repository root of the ports tree. In general, most &os; port work will be done within @@ -580,17 +600,20 @@ - /branches/RELENG_n_n_n - which corresponds to - RELENG_n_n_n + /branches/RELENG_n_n_n + which corresponds to + RELENG_n_n_n is used to merge back security updates in preparation for a release. + /tags/RELEASE_n_n_n - which corresponds to RELEASE_n_n_n + which corresponds to + RELEASE_n_n_n represents a release tag of the ports tree. + /tags/RELEASE_n_EOL represents the end of life tag of a specific &os; @@ -604,22 +627,22 @@ Daily Use This section will explain how to perform common day-to-day - operations with Subversion. There should be no difference - between SVN and SVK in - daily use, except for the revision renumbering mentioned - earlier. + operations with Subversion. - + Help - Both SVN and SVK - have built in help documentation. It can be accessed by - typing the following command: + SVN has built in help documentation. + It can be accessed by typing the following command: &prompt.user; svn help + + Additional information can be found in the + Subversion + Book. - + Checkout As seen earlier, to check out the &os; head @@ -682,13 +705,13 @@ - + Anonymous Checkout It is possible to anonymously check out the &os; repository with Subversion. This will give access to a - read-only tree that can be updated, but not committed - to. To do this, use the following command: + read-only tree that can be updated, but not committed back + 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 @@ -698,7 +721,7 @@ mirror sites. - + Updating the Tree To update a working copy to either the latest revision, @@ -708,7 +731,7 @@ &prompt.user; svn update -r12345 - + Status To view the local changes that have been made to the @@ -716,17 +739,17 @@ &prompt.user; svn status - To show local changes and files that are out-of-date do: + To show local changes and files that are out-of-date + do: &prompt.user; svn status --show-updates - + Editing and Committing - Unlike Perforce, - SVN and SVK do not - need to be told in advance about file editing. + Unlike Perforce, SVN does not need to + be told in advance about file editing. svn commit works like the equivalent CVS command. To commit all changes in @@ -742,15 +765,15 @@ &prompt.user; svn commit lib/libfetch usr/bin/fetch - There is also a commit wrapper for the ports tree - to handle the properties and sanity checking your + There is also a commit wrapper for the ports tree to + handle the properties and sanity checking your changes: &prompt.user; /usr/ports/Tools/scripts/psvn commit - + Adding and Removing Files @@ -761,13 +784,12 @@ ports tree specific version) and add it to ~/.subversion/config according to the instructions in the file. If you added - something before you've read this, you may use + something before reading this, use svn rm --keep-local for just added files, fix your config file and re-add them again. The initial config file is created when you first run a svn - command, even something as simple as svn - help. - + command, even something as simple as + svn help. Files are added to a @@ -777,85 +799,88 @@ &prompt.user; svn add foo + + Most new source files should include a + $&os;$ string near the start of the + file. On commit, svn will expand + the $&os;$ string, + adding the file path, revision number, date and time of + commit, and the username of the committer. Files which + cannot be modified may be committed without the + $&os;$ string. + + Files can be removed with svn remove: &prompt.user; svn remove foo - Subversion does not require rming the - file before svn rming it, and indeed - complains if that happens. + Subversion does not require deleting the file before + using svn rm, and indeed complains if + that happens. - It is possible to add directories with svn - add: + It is possible to add directories with + svn add: &prompt.user; mkdir bar &prompt.user; svn add bar - Although svn mkdir makes this - easier by combining the creation of the directory and the - adding of it: + Although svn mkdir makes this easier + by combining the creation of the directory and the adding of + it: &prompt.user; svn mkdir bar - The directory is not immediately - created in the repository when you use svn - mkdir. Subversion - allows directories to be removed using svn - rm, however there is no svn - rmdir: + Like files, directories are removed with + svn rm. There is no separate command + specifically for removing directories. &prompt.user; svn rm bar - + Copying and Moving Files - The following (obviously) creates a copy of - foo.c, named - bar.c: + This command creates a copy of + foo.c named bar.c, + with the new file also under version control: &prompt.user; svn copy foo.c bar.c - To move and rename a file: + The example above is equivalent to: - &prompt.user; svn move foo.c bar.c + &prompt.user; cp foo.c bar.c +&prompt.user; svn add bar.c - The above command is the exact equivalent of: + To move and rename a file: - &prompt.user; svn copy foo.c bar.c -&prompt.user; svn remove foo.c + &prompt.user; svn move foo.c bar.c - + Log and Annotate - svn log will show all the - revisions that affect a directory and files within that - directory in reverse chronological order, if run on a - directory. This contrasts with cvs log - in that CVS shows the complete log for - each file in the directory, including duplicate entries for - revisions that affect multiple files. + svn log shows revisions and commit + messages, most recent first, for files or directories. When + used on a directory, all revisions that affected the + directory and files within that directory are shown. svn annotate, or equally svn - praise or svn blame, is - equivalent to cvs annotate in everything - but output format. + praise or svn blame, shows + the most recent revision number and who committed that + revision for each line of a file. - + Diffs svn diff displays changes to the - working copy of the repository. Diffs generated by - SVN are unified - and include new files by default - in the diff output. - - svn - diff can show the changes between two revisions - of the same file: + working copy. Diffs generated by SVN are + unified and include new files by default in the diff + output. + + svn diff can show the changes between + two revisions of the same file: &prompt.user; svn diff -r179453:179454 ROADMAP.txt @@ -867,20 +892,19 @@ &prompt.user; svn diff -c179454 . - + Reverting Local changes (including additions and deletions) can be - reverted using svn revert. - It does not update out-of-date - files—it just replaces them with pristine copies of - the original version. + reverted using svn revert. It does not + update out-of-date files, but just replaces them with + pristine copies of the original version. - + Conflicts - If a svn update resulted in a merge + If an svn update resulted in a merge conflict, Subversion will remember which files have conflicts and refuse to commit any changes to those files until explicitly told that the conflicts have been resolved. @@ -902,22 +926,26 @@ working directory (which one presumes has been edited to resolve the conflicts). + base: use a pristine copy of the version you had before svn update, discarding your own changes, the conflicting changes, and possibly other intervening changes as well. + mine-full: use what you had before svn update, including your own changes, but discarding the conflicting changes, and possibly other intervening changes as well. + theirs-full: use the version that - was retrieved when you did svn - update, discarding your own changes. + was retrieved when you did + svn update, discarding your own + changes. @@ -926,27 +954,15 @@ Advanced Use - + Sparse Checkouts - The equivalent to cvs checkout -l, - which checks out a directory without its subdirectories, is - svn checkout -N. Unlike - CVS, SVN remembers the - -N so that a svn - update does not end up pulling down the - subdirectories. In Subversion 1.5 and newer, - -N has been deprecated in favour of the - --depth option which allows for precise - control. Therefore: - - &prompt.user; svn checkout -N svn+ssh://svn.freebsd.org/base ~/freebsd - - is equivalent to: + SVN allows + sparse, or partial checkouts of a + directory by adding to a + svn checkout. - &prompt.user; svn checkout --depth=empty svn+ssh://svn.freebsd.org/base ~/freebsd - - Valid arguments to --depth + Valid arguments to are: @@ -954,15 +970,18 @@ empty: the directory itself without any of its contents. + files: the directory and any files it contains. + immediates: the directory and any files and directories it contains, but none of the subdirectories' contents. + infinity: anything. @@ -987,39 +1006,44 @@ ROADMAP.txt and empty subdirectories, and nothing will happen when svn update is executed on the subdirectories. However, the following - command will set the depth for head (in this case) to - infinity, and fully populate it: + command will set the depth for + head (in this case) to infinity, + and fully populate it: &prompt.user; svn update --set-depth=infinity head - + Direct Operation Certain operations can be performed directly on the - repository, without touching the working copy. - Specifically, this applies to any operation that does not - require editing a file, including: + repository without touching the working copy. Specifically, + this applies to any operation that does not require editing + a file, including: log, - diff. + diff + - mkdir. + mkdir + remove, copy, - rename. + rename + propset, propedit, - propdel. + propdel + - merge. + merge @@ -1028,8 +1052,8 @@ &prompt.user; svn copy svn+ssh://svn.freebsd.org/base/head svn+ssh://svn.freebsd.org/base/stable/8 - This is equivalent to the following set of - commands which take minutes and hours as opposed to seconds, + This is equivalent to the following set of commands + which take minutes and hours as opposed to seconds, depending on your network connection: &prompt.user; svn checkout --depth=immediates svn+ssh://svn.freebsd.org/base @@ -1039,7 +1063,7 @@ &prompt.user; svn commit stable/8 - + Merging with <acronym>SVN</acronym> This section deals with merging code from one branch to @@ -1066,37 +1090,39 @@ It is not inherited. For instance, stable/6/contrib/openpam/ - does not implicitly inherit mergeinfo from stable/6/, or stable/6/contrib/. Doing - so would make partial checkouts very hard to manage. + class="directory">stable/6/contrib/openpam/ + does not implicitly inherit mergeinfo from + stable/6/, or + stable/6/contrib/. + Doing so would make partial checkouts very hard to manage. Instead, mergeinfo is explicitly propagated down the tree. - For merging something into branch/foo/bar/, the - following rules apply: + For merging something into + branch/foo/bar/, + the following rules apply: - If branch/foo/bar/ doesn't - already have a mergeinfo record, but a direct ancestor - (for instance, branch/foo/) does, - then that record will be propagated down to + If + branch/foo/bar/ + does not already have a mergeinfo record, but a direct + ancestor (for instance, + branch/foo/) + does, then that record will be propagated down to branch/foo/bar/ - before information - about the current merge is recorded. + before information about the current merge is + recorded. + Information about the current merge will not be propagated back up that ancestor. + - If a direct descendant of branch/foo/bar/ (for - instance, If a direct descendant of + branch/foo/bar/ + (for instance, branch/foo/bar/baz/) already has a mergeinfo record, information about the current merge will be propagated down to it. @@ -1131,43 +1157,51 @@ Never merge directly to a file. + Never, ever merge directly to a file. + Never, ever, ever merge directly to a file. + Changes to kernel code should be merged to sys/. For instance, a change to the &man.ichwd.4; driver should - be merged to sys/, not sys/dev/ichwd/. + be merged to + + sys/, not + sys/dev/ichwd/. Likewise, a change to the TCP/IP stack should be merged to sys/, not sys/netinet/. + - Changes to code under etc/ should be merged - at etc/, not - below it. + Changes to code under + etc/ should be + merged at etc/, + not below it. *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-doc-translations@FreeBSD.ORG Sun Sep 8 00:16:55 2013 Return-Path: Delivered-To: svn-doc-translations@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id A915370B; Sun, 8 Sep 2013 00:16:55 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 9346F2C6B; Sun, 8 Sep 2013 00:16:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r880Gtkk000812; Sun, 8 Sep 2013 00:16:55 GMT (envelope-from gjb@svn.freebsd.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r880Gr8m000788; Sun, 8 Sep 2013 00:16:53 GMT (envelope-from gjb@svn.freebsd.org) Message-Id: <201309080016.r880Gr8m000788@svn.freebsd.org> From: Glen Barber Date: Sun, 8 Sep 2013 00:16:53 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-translations@freebsd.org Subject: svn commit: r42628 - in translations/share: images/articles/releng misc mk pgpkeys security/advisories security/patches/EN-13:01 security/patches/EN-13:02 security/patches/EN-13:03 security/patches... 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.14 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: Sun, 08 Sep 2013 00:16:55 -0000 Author: gjb Date: Sun Sep 8 00:16:53 2013 New Revision: 42628 URL: http://svnweb.freebsd.org/changeset/doc/42628 Log: MFH: Merged /projects/ISBN_1-57176-407-0/share:r40727-42011 Merged /head/share:r41736-42626 Merged /projects/print2013/share:r40693-40726 Merged /projects/entities/share:r40180-42225 Approved by: doceng (implicit) Added: translations/share/pgpkeys/alc.key - copied unchanged from r42626, head/share/pgpkeys/alc.key translations/share/pgpkeys/br.key - copied unchanged from r42626, head/share/pgpkeys/br.key translations/share/pgpkeys/feld.key - copied unchanged from r42626, head/share/pgpkeys/feld.key translations/share/pgpkeys/loos.key - copied unchanged from r42626, head/share/pgpkeys/loos.key translations/share/pgpkeys/marino.key - copied unchanged from r42626, head/share/pgpkeys/marino.key translations/share/pgpkeys/markm.key - copied unchanged from r42626, head/share/pgpkeys/markm.key translations/share/pgpkeys/nemysis.key - copied unchanged from r42626, head/share/pgpkeys/nemysis.key translations/share/pgpkeys/qingli.key - copied unchanged from r42626, head/share/pgpkeys/qingli.key translations/share/pgpkeys/vg.key - copied unchanged from r42626, head/share/pgpkeys/vg.key translations/share/pgpkeys/zbb.key - copied unchanged from r42626, head/share/pgpkeys/zbb.key translations/share/security/advisories/FreeBSD-EN-13:01.fxp.asc - copied unchanged from r42626, head/share/security/advisories/FreeBSD-EN-13:01.fxp.asc translations/share/security/advisories/FreeBSD-EN-13:02.vtnet.asc - copied unchanged from r42626, head/share/security/advisories/FreeBSD-EN-13:02.vtnet.asc translations/share/security/advisories/FreeBSD-EN-13:03.mfi.asc - copied unchanged from r42626, head/share/security/advisories/FreeBSD-EN-13:03.mfi.asc translations/share/security/advisories/FreeBSD-SA-13:06.mmap.asc - copied unchanged from r42626, head/share/security/advisories/FreeBSD-SA-13:06.mmap.asc translations/share/security/advisories/FreeBSD-SA-13:07.bind.asc - copied unchanged from r42626, head/share/security/advisories/FreeBSD-SA-13:07.bind.asc translations/share/security/advisories/FreeBSD-SA-13:08.nfsserver.asc - copied unchanged from r42626, head/share/security/advisories/FreeBSD-SA-13:08.nfsserver.asc translations/share/security/advisories/FreeBSD-SA-13:09.ip_multicast.asc - copied unchanged from r42626, head/share/security/advisories/FreeBSD-SA-13:09.ip_multicast.asc translations/share/security/advisories/FreeBSD-SA-13:10.sctp.asc - copied unchanged from r42626, head/share/security/advisories/FreeBSD-SA-13:10.sctp.asc translations/share/security/patches/EN-13:01/ - copied from r42626, head/share/security/patches/EN-13:01/ translations/share/security/patches/EN-13:02/ - copied from r42626, head/share/security/patches/EN-13:02/ translations/share/security/patches/EN-13:03/ - copied from r42626, head/share/security/patches/EN-13:03/ translations/share/security/patches/SA-13:06/ - copied from r42626, head/share/security/patches/SA-13:06/ translations/share/security/patches/SA-13:07/ - copied from r42626, head/share/security/patches/SA-13:07/ translations/share/security/patches/SA-13:08/ - copied from r42626, head/share/security/patches/SA-13:08/ translations/share/security/patches/SA-13:09/ - copied from r42626, head/share/security/patches/SA-13:09/ translations/share/security/patches/SA-13:10/ - copied from r42626, head/share/security/patches/SA-13:10/ Deleted: translations/share/xml/developers.ent Modified: translations/share/images/articles/releng/branches-releng8.pic translations/share/misc/docbook.css translations/share/mk/doc.commands.mk translations/share/mk/doc.docbook.mk translations/share/pgpkeys/README translations/share/pgpkeys/addkey.sh translations/share/pgpkeys/gavin.key translations/share/pgpkeys/hrs.key translations/share/pgpkeys/pgj.key translations/share/pgpkeys/pgollucci.key translations/share/pgpkeys/pgpkeys-core.xml translations/share/pgpkeys/pgpkeys-developers.xml translations/share/pgpkeys/pgpkeys.ent translations/share/pgpkeys/rm.key translations/share/pgpkeys/tdb.key translations/share/xml/advisories.xml translations/share/xml/authors.ent translations/share/xml/catalog.xml translations/share/xml/events2013.xml translations/share/xml/freebsd.ent translations/share/xml/freebsd.sch translations/share/xml/header.ent translations/share/xml/man-refs.ent translations/share/xml/mirrors.xml translations/share/xml/navibar.ent translations/share/xml/news.xml translations/share/xml/notices.xml translations/share/xml/press.xml translations/share/xml/release.ent translations/share/xml/templates.events.xsl translations/share/xml/xhtml.xsl translations/share/xml/xhtml10-freebsd.dtd translations/share/xml/xslt10-freebsd.dtd translations/share/xsl/freebsd-common.xsl translations/share/xsl/freebsd-xhtml-common.xsl Directory Properties: translations/share/ (props changed) Modified: translations/share/images/articles/releng/branches-releng8.pic ============================================================================== --- translations/share/images/articles/releng/branches-releng8.pic Sun Sep 8 00:16:29 2013 (r42627) +++ translations/share/images/articles/releng/branches-releng8.pic Sun Sep 8 00:16:53 2013 (r42628) @@ -38,6 +38,14 @@ RELENG_8_3: box width .9 "\s-3RELENG_8_3\s+3" dashed line -> right from RELENG_8_3_0_RELEASE.e +RELENG_8_4_0_RELEASE: + ellipse width .9 "\s-28.4-RELEASE\s+2" + + line -> down from RELENG_8_4_0_RELEASE.s +RELENG_8_4: + box width .9 "\s-3releng/8.4\s+3" dashed + + line -> right from RELENG_8_4_0_RELEASE.e RELENG_8:box "\s-28-STABLE\s+2" .PE Modified: translations/share/misc/docbook.css ============================================================================== --- translations/share/misc/docbook.css Sun Sep 8 00:16:29 2013 (r42627) +++ translations/share/misc/docbook.css Sun Sep 8 00:16:53 2013 (r42628) @@ -107,6 +107,7 @@ body address { html body { margin: 1em 8% 1em 10%; line-height: 1.2; + font-family: sans-serif; } .legalnotice { @@ -186,7 +187,7 @@ body img.navheader { } ol { - margin: 0 0 0 5%; + margin: 0 0 0 1em; line-height: 1.2; } @@ -198,10 +199,11 @@ body pre { body td, body th { line-height: 1.2; + padding-right: 1.5em; } ul, body dir, body menu { - margin: 0 0 0 5%; + margin: 0 0 0 1em; line-height: 1.2; } @@ -238,6 +240,10 @@ div.screen { white-space: pre; font-family: monospace; padding: 1ex; + background-color: #edc; + border: 1px solid #ccc; + border-radius: 6px; + line-height: 1.1; } div.programlisting { @@ -262,7 +268,7 @@ div.programlisting { .note, .tip, .important, .warning, .caution, .example, div.procedure { border-radius: 6px; padding: 2ex 2ex; - margin: .75em 3em .75em 3em; + margin: .75em 3em .75em 1em; line-height: 1.3; } @@ -270,14 +276,14 @@ div.programlisting { color: #222; background: #eee; border: 1px solid #ccc; - width: 85%; + width: 90%; } .tip { color: #004F00; background: #d8ecd6; border: 1px solid green; - width: 85%; + width: 90%; } .important { @@ -290,14 +296,14 @@ div.programlisting { color: #9F1313; background: #f8e8e8; border: 1px solid #e59595; - width: 85%; + width: 90%; } .caution { color: #3E3535; background: #FFC; border: 1px solid #e59595; - width: 85%; + width: 90%; } .example { @@ -320,7 +326,7 @@ div.programlisting { margin-right: 0; } -.note p, .tip p, .important p, .warning p, .caution p, .example p { +.note p, .tip p, .important p, .warning p, .caution p, { display: inline; } @@ -338,9 +344,14 @@ div.programlisting { } .userinput { - font-weight: normal; + font-weight: bold; } pre.screen strong { font-weight: normal; } + +.procedure ol { + line-height: 1.2; + margin: 0 0 0 -1em; +} Modified: translations/share/mk/doc.commands.mk ============================================================================== --- translations/share/mk/doc.commands.mk Sun Sep 8 00:16:29 2013 (r42627) +++ translations/share/mk/doc.commands.mk Sun Sep 8 00:16:53 2013 (r42628) @@ -66,7 +66,7 @@ GROFF?= groff HTML2PDB?= ${PREFIX}/bin/iSiloBSD HTML2PDBOPTS?= -y -d0 -Idef ${HTML2PDBFLAGS} -HTML2TXT?= ${PREFIX}/bin/w3m +HTML2TXT?= ${PREFIX}/bin/links HTML2TXTOPTS?= -dump ${HTML2TXTFLAGS} .if exists(${PREFIX}/bin/jade) && !defined(OPENJADE) Modified: translations/share/mk/doc.docbook.mk ============================================================================== --- translations/share/mk/doc.docbook.mk Sun Sep 8 00:16:29 2013 (r42627) +++ translations/share/mk/doc.docbook.mk Sun Sep 8 00:16:53 2013 (r42628) @@ -705,11 +705,7 @@ install-${_curformat}: ${DOC}.${_curform .endif @[ -d ${DESTDIR} ] || ${MKDIR} -p ${DESTDIR} .if ${_cf} == "html-split" -.for f in ${_html_docs} -.if exists(${f}) - ${INSTALL_DOCS} ${f} ${DESTDIR} -.endif -.endfor + ${INSTALL_DOCS} $$(${XARGS} < HTML.manifest) ${DESTDIR} .else ${INSTALL_DOCS} ${.ALLSRC} ${DESTDIR} .endif Modified: translations/share/pgpkeys/README ============================================================================== --- translations/share/pgpkeys/README Sun Sep 8 00:16:29 2013 (r42627) +++ translations/share/pgpkeys/README Sun Sep 8 00:16:53 2013 (r42628) @@ -31,7 +31,7 @@ address. For instance, in my case: | or pgpkeys-core.xml). Remember to keep the list sorted by last name! | | -| &a.des; +| &a.des.email; | &pgpkey.des; | | Modified: translations/share/pgpkeys/addkey.sh ============================================================================== --- translations/share/pgpkeys/addkey.sh Sun Sep 8 00:16:29 2013 (r42627) +++ translations/share/pgpkeys/addkey.sh Sun Sep 8 00:16:53 2013 (r42628) @@ -78,7 +78,7 @@ echo "pgpkeys-officers.xml or pgpkeys-co echo "Remember to keep the list sorted by last name!" echo echo " " -echo " &a.${me};" +echo " &a.${me}.email;" echo " &pgpkey.${me};" echo " " echo Copied: translations/share/pgpkeys/alc.key (from r42626, head/share/pgpkeys/alc.key) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ translations/share/pgpkeys/alc.key Sun Sep 8 00:16:53 2013 (r42628, copy of r42626, head/share/pgpkeys/alc.key) @@ -0,0 +1,62 @@ + + + +uid Alan Cox +uid Alan Cox +sub 2048R/693757AA 2013-06-15 +]]> + Copied: translations/share/pgpkeys/br.key (from r42626, head/share/pgpkeys/br.key) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ translations/share/pgpkeys/br.key Sun Sep 8 00:16:53 2013 (r42628, copy of r42626, head/share/pgpkeys/br.key) @@ -0,0 +1,41 @@ + + + +sub 2048R/A33057CA 2013-09-04 +]]> + Copied: translations/share/pgpkeys/feld.key (from r42626, head/share/pgpkeys/feld.key) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ translations/share/pgpkeys/feld.key Sun Sep 8 00:16:53 2013 (r42628, copy of r42626, head/share/pgpkeys/feld.key) @@ -0,0 +1,41 @@ + + + +sub 2048R/FDC20CA9 2013-06-25 +]]> + Modified: translations/share/pgpkeys/gavin.key ============================================================================== --- translations/share/pgpkeys/gavin.key Sun Sep 8 00:16:29 2013 (r42627) +++ translations/share/pgpkeys/gavin.key Sun Sep 8 00:16:53 2013 (r42628) @@ -5,10 +5,11 @@ sh ./addkey.sh gavin A093262B; uid Gavin Atkinson (FreeBSD key) uid Gavin Atkinson (Work e-mail) +uid Gavin Atkinson uid Gavin Atkinson +uid Gavin Atkinson (Work e-mail) sub 2048g/58F40B3D 2005-02-18 ]]> Delivered-To: svn-doc-translations@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id D03A9883; Sun, 8 Sep 2013 22:24:45 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id BA1C624C5; Sun, 8 Sep 2013 22:24:45 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r88MOj9e009034; Sun, 8 Sep 2013 22:24:45 GMT (envelope-from rene@svn.freebsd.org) Received: (from rene@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r88MOhSh009014; Sun, 8 Sep 2013 22:24:43 GMT (envelope-from rene@svn.freebsd.org) Message-Id: <201309082224.r88MOhSh009014@svn.freebsd.org> From: Rene Ladan Date: Sun, 8 Sep 2013 22:24:43 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-translations@freebsd.org Subject: svn commit: r42630 - in translations/nl_NL.ISO8859-1: articles/contributing books/handbook books/handbook/cutting-edge books/handbook/disks books/handbook/eresources books/handbook/filesystems book... 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.14 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: Sun, 08 Sep 2013 22:24:45 -0000 Author: rene Date: Sun Sep 8 22:24:42 2013 New Revision: 42630 URL: http://svnweb.freebsd.org/changeset/doc/42630 Log: Merged /projects/print2013/nl_NL.ISO8859-1:r40693-40726 Merged /projects/entities/nl_NL.ISO8859-1:r40180-42225 Merged /projects/ISBN_1-57176-407-0/nl_NL.ISO8859-1:r40727-42011 Merged /head/nl_NL.ISO8859-1:r41736-42629 Deleted: translations/nl_NL.ISO8859-1/books/handbook/vinum/ Modified: translations/nl_NL.ISO8859-1/articles/contributing/article.xml translations/nl_NL.ISO8859-1/books/handbook/Makefile translations/nl_NL.ISO8859-1/books/handbook/book.xml translations/nl_NL.ISO8859-1/books/handbook/chapters.ent translations/nl_NL.ISO8859-1/books/handbook/colophon.xml translations/nl_NL.ISO8859-1/books/handbook/cutting-edge/chapter.xml translations/nl_NL.ISO8859-1/books/handbook/disks/chapter.xml translations/nl_NL.ISO8859-1/books/handbook/eresources/chapter.xml translations/nl_NL.ISO8859-1/books/handbook/filesystems/chapter.xml translations/nl_NL.ISO8859-1/books/handbook/firewalls/chapter.xml translations/nl_NL.ISO8859-1/books/handbook/geom/chapter.xml translations/nl_NL.ISO8859-1/books/handbook/install/chapter.xml translations/nl_NL.ISO8859-1/books/handbook/introduction/chapter.xml translations/nl_NL.ISO8859-1/books/handbook/jails/chapter.xml translations/nl_NL.ISO8859-1/books/handbook/l10n/chapter.xml translations/nl_NL.ISO8859-1/books/handbook/linuxemu/chapter.xml translations/nl_NL.ISO8859-1/books/handbook/mail/chapter.xml translations/nl_NL.ISO8859-1/books/handbook/mirrors/chapter.xml translations/nl_NL.ISO8859-1/books/handbook/multimedia/chapter.xml translations/nl_NL.ISO8859-1/books/handbook/network-servers/chapter.xml translations/nl_NL.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml translations/nl_NL.ISO8859-1/books/handbook/preface/preface.xml translations/nl_NL.ISO8859-1/books/handbook/printing/chapter.xml translations/nl_NL.ISO8859-1/books/handbook/serialcomms/chapter.xml translations/nl_NL.ISO8859-1/htdocs/administration.xml translations/nl_NL.ISO8859-1/htdocs/send-pr.xml translations/nl_NL.ISO8859-1/htdocs/where.xml translations/nl_NL.ISO8859-1/share/xml/mailing-lists.ent Directory Properties: translations/nl_NL.ISO8859-1/ (props changed) translations/nl_NL.ISO8859-1/share/xml/entities.ent (props changed) Modified: translations/nl_NL.ISO8859-1/articles/contributing/article.xml ============================================================================== --- translations/nl_NL.ISO8859-1/articles/contributing/article.xml Sun Sep 8 12:04:02 2013 (r42629) +++ translations/nl_NL.ISO8859-1/articles/contributing/article.xml Sun Sep 8 22:24:42 2013 (r42630) @@ -431,10 +431,8 @@ zijn: - BSD-copyright - - Het BSD-copyright. Dit copyright wordt het meeste + Het BSD-copyrightBSD-copyright. Dit copyright wordt het meeste verkozen wegens zijn natuur van geen voorwaarden en de algemene aantrekkelijkheid voor commerciële ondernemingen. Ver van het ontmoedigen van @@ -445,15 +443,7 @@ - - GPL - - GNU General Public License - - - GNU General Public License - - De GNU General Public License, of GPL. + De GNU General Public LicenseGNU General Public License, of GPLGPLGNU General Public License. Deze licentie is niet zo populair bij ons wegens de extra hoeveelheid moeite die gevraagd wordt van iedereen die de code voor commerciële doeleinden gebruikt, maar vanwege @@ -524,8 +514,8 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE PO over het algemeen aan de middelen ontbreekt om zelf zulke dingen te kopen. - - <anchor id="donations"/>Geld doneren + + Geld doneren De &os; Foundation is een non-profit, belastinguitgesloten stichting die opgericht is om de doelen van het &os; Project @@ -561,11 +551,9 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE PO Hardware doneren - donaties - Het &os; Project accepteert graag hardwaredonaties die het goed kan gebruiken. Als u geïnteresseerd bent in het - doneren van hardware, neem dan contact op met het donaties van hardware, neem dan contact op met het Donations Liaison Office. Modified: translations/nl_NL.ISO8859-1/books/handbook/Makefile ============================================================================== --- translations/nl_NL.ISO8859-1/books/handbook/Makefile Sun Sep 8 12:04:02 2013 (r42629) +++ translations/nl_NL.ISO8859-1/books/handbook/Makefile Sun Sep 8 22:24:42 2013 (r42630) @@ -2,7 +2,7 @@ # $FreeBSD$ # # %SOURCE% en_US.ISO8859-1/books/handbook/Makefile -# %SRCID% 41651 +# %SRCID% 42118 # # Bouw het Nederlandse FreeBSD Handboek. # @@ -181,13 +181,6 @@ IMAGES_EN+= security/ipsec-network.pic IMAGES_EN+= security/ipsec-crypt-pkt.pic IMAGES_EN+= security/ipsec-encap-pkt.pic IMAGES_EN+= security/ipsec-out-pkt.pic -IMAGES_EN+= vinum/vinum-concat.pic -IMAGES_EN+= vinum/vinum-mirrored-vol.pic -IMAGES_EN+= vinum/vinum-raid10-vol.pic -IMAGES_EN+= vinum/vinum-raid5-org.pic -IMAGES_EN+= vinum/vinum-simple-vol.pic -IMAGES_EN+= vinum/vinum-striped-vol.pic -IMAGES_EN+= vinum/vinum-striped.pic IMAGES_EN+= virtualization/parallels-freebsd1.png IMAGES_EN+= virtualization/parallels-freebsd2.png IMAGES_EN+= virtualization/parallels-freebsd3.png @@ -286,7 +279,6 @@ SRCS+= printing/chapter.xml SRCS+= security/chapter.xml SRCS+= serialcomms/chapter.xml SRCS+= users/chapter.xml -SRCS+= vinum/chapter.xml SRCS+= virtualization/chapter.xml SRCS+= x11/chapter.xml @@ -302,7 +294,7 @@ XMLFLAGS+= ${CHAPTERS:S/\/chapter.xml//: XMLFLAGS+= -i chap.freebsd-glossary pgpkeyring: pgpkeys/chapter.xml - @${JADE} -V nochunks ${JADEOPTS} -d ${DSLPGP} -t xml ${XMLDECL} ${DOC}.parsed.print.xml + @${XSLTPROC} ${XSLPGP} ${DOC}.parsed.xml # # Handboekspecifieke variablen Modified: translations/nl_NL.ISO8859-1/books/handbook/book.xml ============================================================================== --- translations/nl_NL.ISO8859-1/books/handbook/book.xml Sun Sep 8 12:04:02 2013 (r42629) +++ translations/nl_NL.ISO8859-1/books/handbook/book.xml Sun Sep 8 22:24:42 2013 (r42630) @@ -5,7 +5,7 @@ $FreeBSD$ %SOURCE% en_US.ISO8859-1/books/handbook/book.xml - %SRCID% 41645 + %SRCID% 42118 --> @@ -74,12 +74,10 @@ &tm-attrib.nexthop; &tm-attrib.opengroup; &tm-attrib.oracle; - &tm-attrib.powerquest; &tm-attrib.realnetworks; &tm-attrib.redhat; &tm-attrib.sap; &tm-attrib.sun; - &tm-attrib.symantec; &tm-attrib.themathworks; &tm-attrib.thomson; &tm-attrib.usrobotics; @@ -242,7 +240,6 @@ &chap.disks; &chap.geom; &chap.filesystems; - &chap.vinum; &chap.virtualization; &chap.l10n; &chap.cutting-edge; Modified: translations/nl_NL.ISO8859-1/books/handbook/chapters.ent ============================================================================== --- translations/nl_NL.ISO8859-1/books/handbook/chapters.ent Sun Sep 8 12:04:02 2013 (r42629) +++ translations/nl_NL.ISO8859-1/books/handbook/chapters.ent Sun Sep 8 22:24:42 2013 (r42630) @@ -11,7 +11,7 @@ $FreeBSD$ %SOURCE% en_US.ISO8859-1/books/handbook/chapters.ent - %SRCID% 41645 + %SRCID% 42118 --> @@ -43,7 +43,6 @@ - Modified: translations/nl_NL.ISO8859-1/books/handbook/colophon.xml ============================================================================== --- translations/nl_NL.ISO8859-1/books/handbook/colophon.xml Sun Sep 8 12:04:02 2013 (r42629) +++ translations/nl_NL.ISO8859-1/books/handbook/colophon.xml Sun Sep 8 22:24:42 2013 (r42630) @@ -5,18 +5,15 @@ $FreeBSD$ %SOURCE% en_US.ISO8859-1/books/handbook/colophon.xml - %SRCID% 41645 + %SRCID% 41678 --> Dit boek bevat het gecombineerde werk van honderden vrijwilligers die bijdragen aan Het &os; Documentatie - Project. De tekst is geschreven in SGML volgens de - DocBook DTD en wordt vanuit SGML geformatteerd naar vele - verschillende presentatieformaten met gebruik van de open source - DSSSL engine Jade. De - presentatie-instructies voor Jade zijn - verkregen door uitbreiding van Norm Walsh's DSSSL stijlbladen. De + Project. De tekst is geschreven in XML volgens de + DocBook DTD en wordt vanuit XML geformatteerd naar vele + verschillende presentatieformaten met gebruik van XSLT. De gedrukte versie van dit boek was niet mogelijk geweest zonder Donald Knuth's &tex; typesetting taal, Leslie Lamport's LaTeX, of Sebastian Modified: translations/nl_NL.ISO8859-1/books/handbook/cutting-edge/chapter.xml ============================================================================== --- translations/nl_NL.ISO8859-1/books/handbook/cutting-edge/chapter.xml Sun Sep 8 12:04:02 2013 (r42629) +++ translations/nl_NL.ISO8859-1/books/handbook/cutting-edge/chapter.xml Sun Sep 8 22:24:42 2013 (r42630) @@ -1390,20 +1390,9 @@ Fetching 133 new ports or files... done. de volgende twee manieren: - cvsup - - cron - - - -CURRENT - - Synchroniseren met - CVSup - - Gebruik het programma cvsup met de + linkend="cvsup">cvsupcvsup met de supfile genaamd standard-supfile uit /usr/share/examples/cvsup. Dit @@ -1411,10 +1400,10 @@ Fetching 133 new ports or files... done. in één keer wordt binnengehaald en daarna alleen hetgeen wat gewijzigd is. Veel mensen draaien cvsup vanuit de - cron en houden daarmee hun + croncron en houden daarmee hun broncode automatisch bijgewerkt. De voorbeeld supfile dient aangepast te - worden om cvsup in te + worden om cvsup-CURRENTSynchroniseren met CVSup in te stellen voor uw omgeving. @@ -1614,28 +1603,17 @@ Fetching 133 new ports or files... done. manieren: - cvsup - - cron - - - &os.stable; - - synchroniseren met - CVSup - - Gebruik het programma cvsup met de + linkend="cvsup">cvsupcvsup met de supfile - stable-supfile uit de map + stable-supfile&os.stable;synchroniseren met CVSup uit de map /usr/share/examples/cvsup. Dit is de aanbevolen methode omdat het hiermee mogelijk is de volledige collectie te downloaden en daarna alleen hetgeen wat veranderd is. Veel mensen draaien cvsup vanuit de - cron om de broncodes automatisch + croncron om de broncodes automatisch bij te werken. Het voorbeeld van de supfile dient aangepast en ingesteld te worden voor de omgeving waarin het @@ -1643,14 +1621,8 @@ Fetching 133 new ports or files... done. - - &os.stable; - - synchroniseren met CTM - - Gebruik CTM als er geen + linkend="ctm">CTM&os.stable;synchroniseren met CTM als er geen snelle, goedkope verbinding is met internet. Dan is dit de methode om te gebruiken. @@ -1665,13 +1637,7 @@ Fetching 133 new ports or files... done. - - &os.stable; - - compileren - - - Lees alvorens &os.stable; te compileren goed de + Lees alvorens &os.stable; te compileren&os.stable;compileren goed de Makefile in /usr/src. Het is handig om de eerste keer op zijn minst de @@ -1737,9 +1703,7 @@ Fetching 133 new ports or files... done. doen, maar anonieme CVS is makkelijker in het gebruik. - CTM - - CTM aan de andere kant maakt geen + CTMCTM aan de andere kant maakt geen vergelijking tussen de aanwezige bronnen en die op de master server. In plaats daarvan wordt een script uitgevoerd dat wijzigingen in bestanden ziet sinds de vorige keer dat is @@ -2889,11 +2853,9 @@ Script done, … - signal 11 - Het compileren gaat fout met veel meldingen van - signal 11 (of andere signalnummers). Wat is er aan de - hand? + signal 11signal 11 + (of andere signalnummers). Wat is er aan de hand? Modified: translations/nl_NL.ISO8859-1/books/handbook/disks/chapter.xml ============================================================================== --- translations/nl_NL.ISO8859-1/books/handbook/disks/chapter.xml Sun Sep 8 12:04:02 2013 (r42629) +++ translations/nl_NL.ISO8859-1/books/handbook/disks/chapter.xml Sun Sep 8 22:24:42 2013 (r42630) @@ -6,6 +6,7 @@ %SOURCE% en_US.ISO8859-1/books/handbook/disks/chapter.xml %SRCID% 40792 + (+42118,42226) --> @@ -527,12 +528,13 @@ ad3: 29333MB <WDC WD307AA> [59598/ van de juiste jumper dient de documentatie van de schijf geraadpleegd te worden. - + @@ -709,9 +711,10 @@ e: 60074784 0 4.2BSD 0 0 0 # (Cyl. 0 - schijfopslag. &man.vinum.4; implementeert de modellen RAID-0, RAID-1 en RAID-5, zowel individueel als als combinatie. - + @@ -3977,11 +3980,6 @@ gbde_lockdir="/etc/gbde" &prompt.root; gbde detach /dev/ad4s1c - - gbde kan niet met - vinum volumes gebruikt worden, - omdat &man.vinum.4; geen gebruik maakt van het subsysteem - &man.geom.4;. @@ -4001,7 +3999,7 @@ gbde_lockdir="/etc/gbde"Een alternatieve cryptografische GEOM klassie is beschikbaar - geli. Deze wordt - op het moment ontwikkeld door &a.pjd;. geli + op het moment ontwikkeld door &a.pjd.email;. geli verschilt van gbde in de mogelijkheden en in het gebruik van een andere methode voor het versleutelen. @@ -4390,7 +4388,7 @@ Device 1K-blocks Used Av toepassingen en hoog beschikbare opslag is een sleutelonderdeel in zulke omgevingen. Hoog beschikbare opslag, of HASTHighly Available STorage, werd - ontwikkeld door &a.pjd; als een raamwerk dat transparante opslag van + ontwikkeld door &a.pjd.email; als een raamwerk dat transparante opslag van dezelfde gegevens toestaat over fysiek gescheiden machines die verbonden zijn door een TCP/IP-netwerk. HAST kan gezien worden als een netwerkgebaseerde RAID1 (spiegel) en is vergelijkbaar met het Modified: translations/nl_NL.ISO8859-1/books/handbook/eresources/chapter.xml ============================================================================== --- translations/nl_NL.ISO8859-1/books/handbook/eresources/chapter.xml Sun Sep 8 12:04:02 2013 (r42629) +++ translations/nl_NL.ISO8859-1/books/handbook/eresources/chapter.xml Sun Sep 8 22:24:42 2013 (r42630) @@ -6,7 +6,7 @@ Vertaald door: Siebrand Mazeland / Rene Ladan %SOURCE% en_US.ISO8859-1/books/handbook/eresources/chapter.xml - %SRCID% 41682 + %SRCID% 41722 --> @@ -296,6 +296,12 @@ + &a.dtrace.name; + + DTrace op &os; gebruiken en ontwikkelen + + + &a.eclipse.name; Gebruikers van Eclipse IDE, hulpprogramma's, @@ -631,6 +637,13 @@ + &a.tex.name; + + TeX en haar toepassingen op + &os; overzetten + + + &a.threads.name; Threading in &os; @@ -1320,6 +1333,21 @@ + &a.dtrace.name; + + + DTrace op &os; gebruiken en + ontwikkelen + + DTrace is een geïntegreerd component van &os; dat een + raamwerk biedt om de kernel en de gebruikersprogramma's tijdens + het draaien te begrijpen. De mailinglijst is een gearchiveerde + discussie voor ontwikkelaars van de code en voor de gebruikers + ervan. + + + + &a.eclipse.name; @@ -1969,6 +1997,22 @@ + &a.tex.name; + + + TeX en haar toepassingen + op &os; overzetten + + Dit is een technische mailinglijst voor discussies over TeX + en haar toepassingen op &os;. Het is bedoeld voor degenen die + actief werken aan het overzetten van TeX op &os;, om problemen + te bespreken of alternatieve oplossingen aan te dragen. Personen + die geïnteresseerd zijn in het volgen van de technische discussie + zijn ook welkom. + + + + &a.toolchain.name; Modified: translations/nl_NL.ISO8859-1/books/handbook/filesystems/chapter.xml ============================================================================== --- translations/nl_NL.ISO8859-1/books/handbook/filesystems/chapter.xml Sun Sep 8 12:04:02 2013 (r42629) +++ translations/nl_NL.ISO8859-1/books/handbook/filesystems/chapter.xml Sun Sep 8 22:24:42 2013 (r42630) @@ -5,6 +5,7 @@ %SOURCE% en_US.ISO8859-1/books/handbook/filesystems/chapter.xml %SRCID% 40792 + (+r42226) --> @@ -840,7 +841,7 @@ errors: No known data errors broncode is vrijgegeven onder de GNU Public License. Kijk op deze pagina voor meer details. De &os;-port werd gestart door - Russel Cattelan, &a.kan; en &a.rodrigc;. + Russel Cattelan, &a.kan.email; en &a.rodrigc.email;. Om XFS als een kernelmodule te laden: @@ -873,7 +874,7 @@ errors: No known data errors ReiserFS Het Reiser bestandssysteem, ReiserFS, was overgebracht naar &os; - door &a.dumbbell; en is vrijgegeven onder de GNU + door &a.dumbbell.email; en is vrijgegeven onder de GNU Public License. Het stuurprogramma voor ReiserFS stelt de &os;-kernel momenteel in Modified: translations/nl_NL.ISO8859-1/books/handbook/firewalls/chapter.xml ============================================================================== --- translations/nl_NL.ISO8859-1/books/handbook/firewalls/chapter.xml Sun Sep 8 12:04:02 2013 (r42629) +++ translations/nl_NL.ISO8859-1/books/handbook/firewalls/chapter.xml Sun Sep 8 22:24:42 2013 (r42630) @@ -5,7 +5,7 @@ $FreeBSD$ %SOURCE% en_US.ISO8859-1/books/handbook/firewalls/chapter.xml - %SRCID% 40792 + %SRCID% 40732 --> @@ -409,11 +409,13 @@ pflog_flags="" # aanvul &man.pfctl.8; voor alle beschikbare opties): - + Commando Doel + + @@ -422,12 +424,20 @@ pflog_flags="" # aanvul pfctl PF aanzetten + + + + pfctl PF uitzetten + + + + @@ -448,6 +458,10 @@ pflog_flags="" # aanvul Controleer /etc/pf.conf op fouten, maar laad de regelverzameling niet + + + + @@ -901,7 +915,12 @@ LOG_ERR – gelogde pakketten die ee /etc/syslog.conf actief te maken kan er opnieuw opgestart worden of is het mogelijk de daemon &man.syslogd.8; een schop te geven zodat /etc/syslog.conf opnieuw - wordt ingelezen met service syslogd reload. + wordt ingelezen met /etc/rc.d/syslogd + reload. Het PID (procesnummer) is te achterhalen + door een overzicht van taken te tonen met + ps -ax. Het PID is het nummer in de + linker kolom voor de regel waarop syslog + staat. Vaak wordt vergeten /etc/newsyslog.conf te wijzigen om het Modified: translations/nl_NL.ISO8859-1/books/handbook/geom/chapter.xml ============================================================================== --- translations/nl_NL.ISO8859-1/books/handbook/geom/chapter.xml Sun Sep 8 12:04:02 2013 (r42629) +++ translations/nl_NL.ISO8859-1/books/handbook/geom/chapter.xml Sun Sep 8 22:24:42 2013 (r42630) @@ -28,7 +28,7 @@ GEOM: Modulair schijftransformatie raamwerk - + Overzicht GEOM Modified: translations/nl_NL.ISO8859-1/books/handbook/install/chapter.xml ============================================================================== --- translations/nl_NL.ISO8859-1/books/handbook/install/chapter.xml Sun Sep 8 12:04:02 2013 (r42629) +++ translations/nl_NL.ISO8859-1/books/handbook/install/chapter.xml Sun Sep 8 22:24:42 2013 (r42630) @@ -4483,17 +4483,12 @@ Please press any key to reboot. - - kleur - - contrast - - Wanneer sysinstall in een X11-terminal wordt gebruikt, is het moeilijk om het gele font op de lichtgrijze achtergrond te lezen. Is er een - manier om het contrast van deze applicatie te - verhogen? + manier om het contrast + kleurcontrast + van deze applicatie te verhogen? Modified: translations/nl_NL.ISO8859-1/books/handbook/introduction/chapter.xml ============================================================================== --- translations/nl_NL.ISO8859-1/books/handbook/introduction/chapter.xml Sun Sep 8 12:04:02 2013 (r42629) +++ translations/nl_NL.ISO8859-1/books/handbook/introduction/chapter.xml Sun Sep 8 22:24:42 2013 (r42630) @@ -87,20 +87,16 @@ Hier zijn er enkele op een rij gezet: - preemptive multitasking - - Preemptive multitasking zorgt + Preemptive multitaskingpreemptive multitasking zorgt ervoor dat meerdere programma's en gebruikers op dezelfde computer kunnen werken, zonder dat de systeemrespons of stabiliteit beïnvloed wordt. - Meerdere gebruikers - Ondersteuning voor meerdere - gebruikers maakt het mogelijk dat + gebruikersMeerdere gebruikers maakt het mogelijk dat verschillende mensen een &os; systeem tegelijkertijd kunnen gebruiken voor een groot aantal taken. Dit betekent bijvoorbeeld dat randapparaten als printers en @@ -112,10 +108,8 @@ - TCP/IP netwerken - Krachtige mogelijkheden voor TCP/IP - netwerken met ondersteuning voor + netwerkenTCP/IP netwerken met ondersteuning voor industriestandaarden als SCTP, DHCP, NFS, NIS, PPP, SLIP, IPsec en IPv6. Dit betekent dat een &os;-systeem makkelijk kan samenwerken met andere systemen en dat het kan @@ -126,9 +120,7 @@ - Geheugenbeveiliging - - Geheugenbeveiliging garandeert dat + GeheugenbeveiligingGeheugenbeveiliging garandeert dat applicaties (of gebruikers) elkaar niet kunnen storen. Een crashende applicatie heeft totaal geen effect op andere applicaties. @@ -142,49 +134,19 @@ - - X Window systeem - - - Het X Window systeem + Het X Window systeemX Window systeem (X11R7), een industriële standaard, biedt een grafische gebruikersinterface (GUI) met als enige benodigdheden een VGA-kaart en een beeldscherm. - - binaire compatibiliteit - - Linux - - - - binaire compatibiliteit - - SCO - - - - binaire compatibiliteit - - SVR4 - - - - binaire compatibiliteit - - BSD/OS - - - - binaire compatibiliteit - - NetBSD - - Door binaire compatibiliteit met - veel programma's voor &linux;, SCO, SVR4, BSDI en NetBSD + veel programma's voor &linux;binaire compatibiliteitLinux, + SCObinaire compatibiliteitSCO, + SVR4binaire compatibiliteitSVR4, + BSDIbinaire compatibiliteitBSD/OS en + NetBSDbinaire compatibiliteitNetBSD is het mogelijk om deze programma's zonder snelheidsverlies op &os; te draaien. @@ -206,9 +168,7 @@ - Virtueel geheugen - - Het demand-paged virtueel geheugen + Het demand-paged virtueel geheugenVirtueel geheugen en de gecombineerde VM/buffer cache van &os; zorgen ervoor dat applicaties met grote geheugenbehoeften niets te kort komen, terwijl de systeemrespons niet @@ -216,29 +176,13 @@ - - Symmetric Multi-Processing (SMP) - - - SMP-ondersteuning voor computers + SMP-ondersteuningSymmetric Multi-Processing (SMP) voor computers met meerdere processoren. - - compilers - - C - - - - compilers - - C++ - - - Een volledige C en - C++ + Een volledige CcompilersC en + C++compilersC++ ontwikkelomgeving. Vele andere programmeertalen, te gebruiken voor onderzoek of @@ -247,9 +191,7 @@ - broncode - - De broncode van het hele + De broncodebroncode van het hele systeem is beschikbaar, zodat gebruikers de volledige controle over het systeem in handen hebben. Waarom genoegen nemen met alleen het erewoord van de @@ -314,15 +256,11 @@ - FTP servers - - FTP servers; + FTP servers;FTP servers - webservers - - World Wide Webservers (standaard of beveiligd + World Wide Webserverswebservers (standaard of beveiligd [SSL]); @@ -331,30 +269,16 @@ - firewall - - NAT - - Firewalls en NAT (IP-maskering) + Firewallsfirewall en NATNAT (IP-maskering) gateways; - - elektronische mail - - e-mail - - - e-mail - - E-mail servers; + E-mail servers;e-mail - USENET - - USENET nieuws of Bulletin Board (BBS) + USENETUSENET nieuws of Bulletin Board (BBS) systemen; @@ -395,12 +319,8 @@ - router - - DNS Server - - Netwerken: nieuwe router nodig? - Of een nameserver (DNS)? Een firewall om een intern netwerk + Netwerken: nieuwe routerrouter nodig? + Of een nameserver (DNS)DNS Server? Een firewall om een intern netwerk te beschermen? &os; kan die ongebruikte 486 of Pentium PC die nog ergens in een hoekje ligt gemakkelijk omtoveren tot een geavanceerde router met uitgebreide pakketfilter @@ -408,11 +328,7 @@ - - X Window systeem - - - X Window werkstation: &os; is een + X Window werkstation:X Window systeem &os; is een prima keuze als goedkope X terminal oplossing, door gebruik te maken van de gratis beschikbare X11 server. In tegenstelling tot een pure X terminal kan &os; ook @@ -434,14 +350,10 @@ - - GNU Compiler Collection - - Software Ontwikkeling: bij het standaard &os;-systeem zit al een volledige verzameling van ontwikkelgereedschappen, inclusief de bekende - GNU C/C++ compiler en debugger. + GNU C/C++ compilerGNU Compiler Collection en debugger. @@ -464,27 +376,19 @@ - Apple - - Apple + AppleApple - Cisco - - Cisco + CiscoCisco - Juniper - - Juniper + JuniperJuniper - NetApp - - NetApp + NetAppNetApp @@ -493,83 +397,59 @@ - Yahoo! - Yahoo! + url="http://www.yahoo.com/">Yahoo!Yahoo! - Yandex - - Yandex + YandexYandex - Apache - Apache + url="http://www.apache.org/">ApacheApache - Rambler - - Rambler + RamblerRambler - Sina - - Sina + SinaSina - Pair Networks - Pair - Networks + NetworksPair Networks - Sony Japan - Sony - Japan + JapanSony Japan - Netcraft - Netcraft + url="http://www.netcraft.com/">NetcraftNetcraft - NetEase - - NetEase + NetEaseNetEase - Weathernews - Weathernews + url="http://www.wni.com/">WeathernewsWeathernews - TELEHOUSE America - TELEHOUSE - America + AmericaTELEHOUSE America - Experts Exchange - Experts - Exchange + ExchangeExperts Exchange @@ -893,49 +773,21 @@ id="development-cvs-repository"/> - - CVS - - - - CVS-archief - - - - Concurrent Versions System - - CVS - - - - Subversion - - - - Subversion-archief - - - - SVN - - - - Gedurende een aantal jaren werd de centrale broncode voor &os; bijgehouden door CVS *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***