From owner-svn-doc-head@FreeBSD.ORG Sun Feb 9 01:50:54 2014 Return-Path: Delivered-To: svn-doc-head@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 ESMTPS id EBA47ABD; Sun, 9 Feb 2014 01:50:54 +0000 (UTC) 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 D27E71322; Sun, 9 Feb 2014 01:50:54 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s191osnn016340; Sun, 9 Feb 2014 01:50:54 GMT (envelope-from trhodes@svn.freebsd.org) Received: (from trhodes@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s191osWP016334; Sun, 9 Feb 2014 01:50:54 GMT (envelope-from trhodes@svn.freebsd.org) Message-Id: <201402090150.s191osWP016334@svn.freebsd.org> From: Tom Rhodes Date: Sun, 9 Feb 2014 01:50:54 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r43840 - in head/en_US.ISO8859-1/books/porters-handbook: . appendices keeping-up makefiles new-port pkg-files plist porting-dads porting-samplem porting-why quick-porting security slow-... X-SVN-Group: doc-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the doc tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Feb 2014 01:50:55 -0000 Author: trhodes Date: Sun Feb 9 01:50:53 2014 New Revision: 43840 URL: http://svnweb.freebsd.org/changeset/doc/43840 Log: Break the porters handbook out into individual chapters like our other books (fdp primer, handbook dev handbook, etc). I've done some small naming changes for cleaner chapters but not much. Thumbs up: wblock, mat Added: head/en_US.ISO8859-1/books/porters-handbook/appendices/ head/en_US.ISO8859-1/books/porters-handbook/appendices/Makefile (contents, props changed) head/en_US.ISO8859-1/books/porters-handbook/appendices/chapter.xml (contents, props changed) head/en_US.ISO8859-1/books/porters-handbook/chapters.ent (contents, props changed) head/en_US.ISO8859-1/books/porters-handbook/keeping-up/ head/en_US.ISO8859-1/books/porters-handbook/keeping-up/Makefile (contents, props changed) head/en_US.ISO8859-1/books/porters-handbook/keeping-up/chapter.xml (contents, props changed) head/en_US.ISO8859-1/books/porters-handbook/makefiles/ head/en_US.ISO8859-1/books/porters-handbook/makefiles/Makefile (contents, props changed) head/en_US.ISO8859-1/books/porters-handbook/makefiles/chapter.xml (contents, props changed) head/en_US.ISO8859-1/books/porters-handbook/new-port/ head/en_US.ISO8859-1/books/porters-handbook/new-port/Makefile (contents, props changed) head/en_US.ISO8859-1/books/porters-handbook/new-port/chapter.xml (contents, props changed) head/en_US.ISO8859-1/books/porters-handbook/pkg-files/ head/en_US.ISO8859-1/books/porters-handbook/pkg-files/Makefile (contents, props changed) head/en_US.ISO8859-1/books/porters-handbook/pkg-files/chapter.xml (contents, props changed) head/en_US.ISO8859-1/books/porters-handbook/plist/ head/en_US.ISO8859-1/books/porters-handbook/plist/Makefile (contents, props changed) head/en_US.ISO8859-1/books/porters-handbook/plist/chapter.xml (contents, props changed) head/en_US.ISO8859-1/books/porters-handbook/porting-dads/ head/en_US.ISO8859-1/books/porters-handbook/porting-dads/Makefile (contents, props changed) head/en_US.ISO8859-1/books/porters-handbook/porting-dads/chapter.xml (contents, props changed) head/en_US.ISO8859-1/books/porters-handbook/porting-samplem/ head/en_US.ISO8859-1/books/porters-handbook/porting-samplem/Makefile (contents, props changed) head/en_US.ISO8859-1/books/porters-handbook/porting-samplem/chapter.xml (contents, props changed) head/en_US.ISO8859-1/books/porters-handbook/porting-why/ head/en_US.ISO8859-1/books/porters-handbook/porting-why/Makefile (contents, props changed) head/en_US.ISO8859-1/books/porters-handbook/porting-why/chapter.xml (contents, props changed) head/en_US.ISO8859-1/books/porters-handbook/quick-porting/ head/en_US.ISO8859-1/books/porters-handbook/quick-porting/Makefile (contents, props changed) head/en_US.ISO8859-1/books/porters-handbook/quick-porting/chapter.xml (contents, props changed) head/en_US.ISO8859-1/books/porters-handbook/security/ head/en_US.ISO8859-1/books/porters-handbook/security/Makefile (contents, props changed) head/en_US.ISO8859-1/books/porters-handbook/security/chapter.xml (contents, props changed) head/en_US.ISO8859-1/books/porters-handbook/slow-porting/ head/en_US.ISO8859-1/books/porters-handbook/slow-porting/Makefile (contents, props changed) head/en_US.ISO8859-1/books/porters-handbook/slow-porting/chapter.xml (contents, props changed) head/en_US.ISO8859-1/books/porters-handbook/special/ head/en_US.ISO8859-1/books/porters-handbook/special/Makefile (contents, props changed) head/en_US.ISO8859-1/books/porters-handbook/special/chapter.xml (contents, props changed) head/en_US.ISO8859-1/books/porters-handbook/testing/ head/en_US.ISO8859-1/books/porters-handbook/testing/Makefile (contents, props changed) head/en_US.ISO8859-1/books/porters-handbook/testing/chapter.xml (contents, props changed) head/en_US.ISO8859-1/books/porters-handbook/upgrading/ head/en_US.ISO8859-1/books/porters-handbook/upgrading/Makefile (contents, props changed) head/en_US.ISO8859-1/books/porters-handbook/upgrading/chapter.xml (contents, props changed) Modified: head/en_US.ISO8859-1/books/porters-handbook/Makefile head/en_US.ISO8859-1/books/porters-handbook/book.xml Modified: head/en_US.ISO8859-1/books/porters-handbook/Makefile ============================================================================== --- head/en_US.ISO8859-1/books/porters-handbook/Makefile Sat Feb 8 22:08:51 2014 (r43839) +++ head/en_US.ISO8859-1/books/porters-handbook/Makefile Sun Feb 9 01:50:53 2014 (r43840) @@ -19,6 +19,22 @@ INSTALL_ONLY_COMPRESSED?= # # XML content +#SRCS+= quick-porting/chapter.xml +#SRCS+= own-port/chapter.xml +#SRCS+= porting-why/chapter.xml +SRCS+= makefiles/chapter.xml +#SRCS+= plist/chapter.xml +#SRCS+= testing/chapter.xml +#SRCS+= security/chapter.xml +#SRCS+= porting-samplem/chapter.xml +#SRCS+= appendices/chapter.xml +#SRCS+= keeping-up/chapter.xml +#SRCS+= porting-dads/chapter.xml +#SRCS+= upgrading/chapter.xml +#SRCS+= pkg-files/chapter.xml +#SRCS+= specials/chapter.xml +#SRCS+= slow-porting/chapter.xml + SRCS= book.xml SRCS+= uses.xml SRCS+= versions.xml @@ -49,4 +65,14 @@ IMAGES_LIB+= callouts/21.png URL_RELPREFIX?= ../../../.. DOC_PREFIX?= ${.CURDIR}/../../.. +# Entities +SRCS+= chapters.ent + +SYMLINKS= ${DESTDIR} index.html handbook.html + +# Turn on all the chapters. +CHAPTERS?= ${SRCS:M*chapter.xml} + +XMLFLAGS+= ${CHAPTERS:S/\/chapter.xml//:S/^/-i chap./} + .include "${DOC_PREFIX}/share/mk/doc.project.mk" Added: head/en_US.ISO8859-1/books/porters-handbook/appendices/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/en_US.ISO8859-1/books/porters-handbook/appendices/Makefile Sun Feb 9 01:50:53 2014 (r43840) @@ -0,0 +1,15 @@ +# +# Build the Porters Handbook with just the content from this chapter. +# +# $FreeBSD$ +# + +CHAPTERS= appendices/chapter.xml + +VPATH= .. + +MASTERDOC= ${.CURDIR}/../${DOC}.${DOCBOOKSUFFIX} + +DOC_PREFIX?= ${.CURDIR}/../../../.. + +.include "../Makefile" Added: head/en_US.ISO8859-1/books/porters-handbook/appendices/chapter.xml ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/en_US.ISO8859-1/books/porters-handbook/appendices/chapter.xml Sun Feb 9 01:50:53 2014 (r43840) @@ -0,0 +1,72 @@ + + + + + Appendices + + + Values of <varname>USES</varname> + + + Values of <varname>USES</varname> + + + + + Feature + Arguments + Description + + + + + &values.uses; + + +
+ + + + <literal>__FreeBSD_version</literal> Values + + Here is a convenient list of + __FreeBSD_version values as defined in + sys/param.h: + + + <literal>__FreeBSD_version</literal> Values + + + + + Value + Date + Release + + + + + &values.versions; + + +
+ + + Note that 2.2-STABLE sometimes identifies itself as + 2.2.5-STABLE after the 2.2.5-RELEASE. The + pattern used to be year followed by the month, but we + decided to change it to a more straightforward major/minor + system starting from 2.2. This is because the parallel + development on several branches made it infeasible to + classify the releases simply by their real release dates. + If you are making a port now, you do not have to worry about + old -CURRENTs; they are listed here just for your + reference. + + + Modified: head/en_US.ISO8859-1/books/porters-handbook/book.xml ============================================================================== --- head/en_US.ISO8859-1/books/porters-handbook/book.xml Sat Feb 8 22:08:51 2014 (r43839) +++ head/en_US.ISO8859-1/books/porters-handbook/book.xml Sun Feb 9 01:50:53 2014 (r43840) @@ -3,13 +3,17 @@ "http://www.FreeBSD.org/XML/share/xml/freebsd50.dtd" [ -]> + + +%chapters; +]> + @@ -56,12747 +60,19 @@ $FreeBSD$ - - Introduction - - The &os; Ports Collection is the way almost everyone - installs applications ("ports") on &os;. Like everything - else about &os;, it is primarily a volunteer effort. - It is important to keep this in mind when reading this - document. - - In &os;, anyone may submit a new port, or volunteer - to maintain an existing port if it is unmaintained—you - do not need any special commit privileges to do so. - - - - - Making a New Port Yourself - - So, you are interested in making your own port or - upgrading an existing one? Great! - - What follows are some guidelines for creating a new port for - &os;. If you want to upgrade an existing port, you should - read this and then read . - - When this document is not sufficiently detailed, you should - refer to /usr/ports/Mk/bsd.port.mk, which - all port Makefiles include. Even if you do not hack Makefiles - daily, it is well commented, and you will still gain much - knowledge from it. Additionally, you may send specific - questions to the &a.ports;. - - - Only a fraction of the variables - (VAR) that can - be overridden are mentioned in this document. Most (if not - all) are documented at the start of - /usr/ports/Mk/bsd.port.mk; the others - probably ought to be. Note that this file uses a non-standard - tab setting: Emacs and - Vim should recognize the setting on - loading the file. Both &man.vi.1; and &man.ex.1; can be set - to use the correct value by typing - :set tabstop=4 once the file has been - loaded. - - - - Looking for something easy to start with? Take a look at the - list of - requested ports and see if you can work on one (or - more). - - - - Quick Porting - - This section tells you how to quickly create a new port. In - many cases, it is not sufficient, so you will have to read - further on into the document. - - First, get the original tarball and put it into - DISTDIR, which defaults to - /usr/ports/distfiles. - - - The following assumes that the software compiled - out-of-the-box, i.e., there was absolutely no change required - for the port to work on your &os; box. If you needed to - change something, you will have to refer to the next section - too. - - - - It is recommended to set the DEVELOPER - &man.make.1; variable in /etc/make.conf - before getting into porting. - - &prompt.root; echo DEVELOPER=yes >> /etc/make.conf - - This setting enables the developer mode - that displays deprecation warnings and activates some further - quality checks on calling make. - - - - Writing the <filename>Makefile</filename> - - The minimal Makefile would look - something like this: - - # $FreeBSD$ - -PORTNAME= oneko -PORTVERSION= 1.1b -CATEGORIES= games -MASTER_SITES= ftp://ftp.cs.columbia.edu/archives/X11R5/contrib/ - -MAINTAINER= youremail@example.com -COMMENT= Cat chasing a mouse all over the screen - -.include <bsd.port.mk> - - - In some cases, the Makefile of an - existing port may contain additional lines in the header, - such as the name of the port and the date it was created. - This additional information has been declared obsolete, and - is being phased out. - - - See if you can figure it out. Do not worry about the - contents of the $FreeBSD$ - line, it will be filled in automatically by - Subversion when the port is - imported to our main ports tree. You can find a more detailed - example in the - sample Makefile - section. - - - - Writing the Description Files - - There are two description files that are required for - any port, whether they actually package or not. They are - pkg-descr and - pkg-plist. Their - pkg- prefix distinguishes them from other - files. - - - <filename>pkg-descr</filename> - - This is a longer description of the port. One to a few - paragraphs concisely explaining what the port does is - sufficient. - - - This is not a manual or an - in-depth description on how to use or compile the port! - Please be careful if you are copying from the - README or manpage; too - often they are not a concise description of the port or - are in an awkward format (e.g., manpages have justified - spacing, which looks particularly bad with monospaced - fonts). - - - A well-written pkg-descr describes - the port completely enough that users would not have to - consult the documentation or visit the website to understand - what the software does, how it can be useful, or what - particularly nice features it has. Mentioning certain - requirements like a graphical toolkit, heavy dependencies, - runtime environment, or implementation languages help users - decide whether this port will work for them. - - Include a URL to the official WWW homepage. Prepend - one of the websites (pick the most - common one) with WWW: (followed by single - space) so that automated tools will work correctly. If the - URI is the root of the website or directory, it should be - terminated with a slash. - - - If the listed webpage for a port is not available, try - to search the Internet first to see if the official site - moved, was renamed, or is hosted elsewhere. - - - The following example shows how your - pkg-descr should look: - - This is a port of oneko, in which a cat chases a poor mouse all over -the screen. - : -(etc.) - -WWW: http://www.oneko.org/ - - - - <filename>pkg-plist</filename> - - This file lists all the files installed by the port. It - is also called the packing list because the - package is generated by packing the files listed here. The - pathnames are relative to the installation prefix (usually - /usr/local. - If the - port creates directories during installation, make sure to - add @dirrm lines to remove them when the - package is deleted. - - Here is a small example: - - bin/oneko -man/man1/oneko.1.gz -lib/X11/app-defaults/Oneko -lib/X11/oneko/cat1.xpm -lib/X11/oneko/cat2.xpm -lib/X11/oneko/mouse.xpm -@dirrm lib/X11/oneko - - Refer to the &man.pkg-create.8; manual page for details - on the packing list. - - - It is recommended that you keep all the filenames in - this file sorted alphabetically. It will make verifying - the changes when you upgrade the port much easier. - - - - Creating a packing list manually can be a very tedious - task. If the port installs a large numbers of files, - creating the packing list - automatically might save time. - - - There is only one case when - pkg-plist can be omitted from a port. - If the port installs just a handful of files, and perhaps - directories, the files and directories may be listed in the - variables PLIST_FILES and - PLIST_DIRS, respectively, within the - port's Makefile. For instance, we - could get along without pkg-plist in - the above oneko port by adding the - following lines to the Makefile: - - PLIST_FILES= bin/oneko \ - man/man1/oneko.1.gz \ - lib/X11/app-defaults/Oneko \ - lib/X11/oneko/cat1.xpm \ - lib/X11/oneko/cat2.xpm \ - lib/X11/oneko/mouse.xpm -PLIST_DIRS= lib/X11/oneko - - Of course, PLIST_DIRS should be left - unset if a port installs no directories of its own. - - - - Several ports can share a common directory. In that - case, PLIST_DIRS should be replaced by - PLIST_DIRSTRY so that the directory is - removed only if empty, otherwise it is silently ignored. - PLIST_DIRS and - PLIST_DIRSTRY are equivalent to using - @dirrm and @dirrmtry - in pkg-plist, as described in - . - - - The price for this way of listing port's files and - directories is that you cannot use command sequences - described in &man.pkg-create.8;. Therefore, it is suitable - only for simple ports and makes them even simpler. At the - same time, it has the advantage of reducing the number of - files in the ports collection. Please consider using this - technique before you resort to - pkg-plist. - - Later we will see how pkg-plist - and PLIST_FILES can be used to fulfill - more sophisticated - tasks. - - - - - Creating the Checksum File - - Just type make makesum. The ports make - rules will automatically generate the file - distinfo. - - If a file fetched has its checksum changed regularly and - you are certain the source is trusted (i.e., it comes from - manufacturer CDs or documentation generated daily), you should - specify these files in the IGNOREFILES - variable. Then the checksum is not calculated for that file - when you run make makesum, but set to - IGNORE. - - - - Testing the Port - - You should make sure that the port rules do exactly what - you want them to do, including packaging up the port. These - are the important points you need to verify. - - - - pkg-plist does not contain - anything not installed by the port. - - - - pkg-plist contains everything - that is installed by the port. - - - - The port can be installed using the - install target. This verifies - that the install script works correctly. - - - - The port can be deinstalled properly using the - deinstall target. This - verifies that the deinstall script works correctly. - - - - Make sure that make package can be - run as a normal user (that is, not as - root). If that - fails, NEED_ROOT=yes must be added to - the port Makefile. - - - - - Recommended Test Ordering - - - make stage - - - - make check-orphans - - - - make package - - - - make install - - - - make deinstall - - - - pkg add package-filename - - - - make package (as user) - - - - Make certain no warnings are shown in any of - the stages. - - Thorough automated testing can be done with - ports-mgmt/tinderbox or - ports-mgmt/poudriere from the - Ports Collection. These applications maintain - jails where all of the steps shown above - can be tested without affecting the state of the host - system. - - - - Checking Your Port with - <command>portlint</command> - - Please use portlint to see if your port - conforms to our guidelines. The - ports-mgmt/portlint - program is part of the ports collection. In particular, you - may want to check if the - Makefile is in the - right shape and the - package is named - appropriately. - - - - Submitting the New Port - - Before submitting the new port, read - the DOs and DON'Ts - section. - - Once happy with your port, the only thing remaining is to - put it in the main &os; ports tree and make everybody else - happy about it too. We do not need the - work directory or the - pkgname.tgz package, so delete them - now. - - Next, build the &man.shar.1; file. Assuming the port is - called oneko, cd to the - directory above where the oneko directory - is located, and then type: - shar `find oneko` > oneko.shar - - Include oneko.shar in a bug - report and send it with &man.send-pr.1;. See - Bug - Reports and General Commentary for more information - about &man.send-pr.1;. - - Classify the bug report as Category - ports and Class - change-request. Do - not mark the report - confidential! Add a short description of - the program to the Description field of the PR (perhaps a - short version of the COMMENT), and add the - .shar file to the Fix field. - - - Giving a good description in the synopsis of the problem - report makes the work of port committers a lot easier. We - prefer something like New port: - <category>/<portname> <short description of - the port> for new ports. Using this - scheme makes it easier and faster to begin the work of - committing the new port. - - - One more time, do not include the original - source distfile, the work directory, or - the package you built with - make package; and, do use - &man.shar.1; for new ports, not &man.diff.1;. - - After submitting the port, please be patient. The time - needed to include a new port in &os; can vary from a few days - to a few months. The list of pending port - PRs can be viewed at . - - After looking at the new port, we will reply if necessary, - and put it in the tree. Your name will also be added to the - list of Additional - &os; Contributors and other files. - - - - - Slow Porting - - Okay, so it was not that simple, and the port required some - modifications to get it to work. In this section, we will - explain, step by step, how to modify it to get it to work with - the ports paradigm. - - - How Things Work - - First, this is the sequence of events which occurs when - the user first types make in your port's - directory. You may find that having - bsd.port.mk in another window while you - read this really helps to understand it. - - But do not worry if you do not really understand what - bsd.port.mk is doing, not many people - do... :-) - - - - The fetch target is run. - The fetch target is responsible - for making sure that the tarball exists locally in - DISTDIR. If - fetch cannot find the required - files in DISTDIR it will look up the - URL MASTER_SITES, which is set in the - Makefile, as well as our FTP mirrors where we put - distfiles as backup. It will then attempt to fetch the - named distribution file with FETCH, - assuming that the requesting site has direct access to the - Internet. If that succeeds, it will save the file in - DISTDIR for future use and - proceed. - - - - The extract target is run. - It looks for your port's distribution file (typically a - gzipped tarball) in - DISTDIR and unpacks it into a temporary - subdirectory specified by WRKDIR - (defaults to work). - - - - The patch target is run. - First, any patches defined in - PATCHFILES are applied. Second, if any - patch files named - patch-* - are found in PATCHDIR (defaults to the - files subdirectory), they are applied - at this time in alphabetical order. - - - - The configure target is - run. This can do any one of many different things. - - - - If it exists, - scripts/configure is run. - - - - If HAS_CONFIGURE or - GNU_CONFIGURE is set, - WRKSRC/configure - is run. - - - - - - - The build target is run. - This is responsible for descending into the port's private - working directory (WRKSRC) and building - it. - - - - The stage target is run. - This puts the final set of built files into a temporary - directory (STAGEDIR, see - ). The hierarchy of this - directory mirrors that of the system on which the package - will be installed. - - - - The install target is run. - This copies the files listed in the port's pkg-plist to - the host system. - - - - The above are the default actions. In addition, you can - define targets - pre-something - or - post-something, - or put scripts with those names, in the - scripts subdirectory, and they will be - run before or after the default actions are done. - - For example, if you have a - post-extract target defined in your - Makefile, and a file - pre-build in the - scripts subdirectory, the - post-extract target will be called - after the regular extraction actions, and the - pre-build script will be executed before - the default build rules are done. It is recommended that you - use Makefile targets if the actions are - simple enough, because it will be easier for someone to figure - out what kind of non-default action the port requires. - - The default actions are done by the - bsd.port.mk targets - do-something. - For example, the commands to extract a port are in the target - do-extract. If you are not happy - with the default target, you can fix it by redefining the - do-something - target in your Makefile. - - - The main targets (e.g., - extract, - configure, etc.) do nothing more - than make sure all the stages up to that one are completed - and call the real targets or scripts, and they are not - intended to be changed. If you want to fix the extraction, - fix do-extract, but never ever - change the way extract - operates! Additionally, the target - post-deinstall is invalid and - is not run by the ports infrastructure. - - - Now that you understand what goes on when the user types - make install, let - us go through the recommended steps to create the perfect - port. - - - - Getting the Original Sources - - Get the original sources (normally) as a compressed - tarball - (foo.tar.gz or - foo.tar.bz2) - and copy it into DISTDIR. Always use - mainstream sources when and where you - can. - - You will need to set the variable - MASTER_SITES to reflect where the original - tarball resides. You will find convenient shorthand - definitions for most mainstream sites in - bsd.sites.mk. Please use these - sites—and the associated definitions—if at all - possible, to help avoid the problem of having the same - information repeated over again many times in the source base. - As these sites tend to change over time, this becomes a - maintenance nightmare for everyone involved. - - If you cannot find a FTP/HTTP site that is well-connected - to the net, or can only find sites that have irritatingly - non-standard formats, you might want to put a copy on a - reliable FTP or HTTP server that you control (e.g., your home - page). - - If you cannot find somewhere convenient and reliable to - put the distfile we can house it ourselves on - ftp.FreeBSD.org; however, this is the - least-preferred solution. The distfile must be placed into - ~/public_distfiles/ of someone's - freefall account. Ask the person who - commits your port to do this. This person will also set - MASTER_SITES to - MASTER_SITE_LOCAL and - MASTER_SITE_SUBDIR to their - freefall username. - - If your port's distfile changes all the time without any - kind of version update by the author, consider putting the - distfile on your home page and listing it as the first - MASTER_SITES. If you can, try to talk the - port author out of doing this; it really does help to - establish some kind of source code control. Hosting your own - version will prevent users from getting - checksum mismatch errors, and also - reduce the workload of maintainers of our FTP site. Also, if - there is only one master site for the port, it is recommended - that you house a backup at your site and list it as the second - MASTER_SITES. - - If your port requires some additional `patches' that are - available on the Internet, fetch them too and put them in - DISTDIR. Do not worry if they come from a - site other than where you got the main source tarball, we have - a way to handle these situations (see the description of - PATCHFILES - below). - - - - Modifying the Port - - Unpack a copy of the tarball in a private directory and - make whatever changes are necessary to get the port to compile - properly under the current version of &os;. Keep - careful track of everything you do, as - you will be automating the process shortly. Everything, - including the deletion, addition, or modification of files - should be doable using an automated script or patch file when - your port is finished. - - If your port requires significant user - interaction/customization to compile or install, you should - take a look at one of Larry Wall's classic - Configure scripts and perhaps do - something similar yourself. The goal of the new ports - collection is to make each port as - plug-and-play as possible for the end-user - while using a minimum of disk space. - - - Unless explicitly stated, patch files, scripts, and - other files you have created and contributed to the &os; - ports collection are assumed to be covered by the standard - BSD copyright conditions. - - - - - Patching - - In the preparation of the port, files that have been added - or changed can be recorded with &man.diff.1; for later - feeding to &man.patch.1;. Doing this with a typical file - involves saving a copy of the original file before making any - changes. - - &prompt.user; cp file file.orig - - Patches are saved into files named - patch-* where - * indicates the pathname of the - file that is patched, such as - patch-Imakefile or - patch-src-config.h. - - After the file has been modified, &man.diff.1; is used to - record the differences between the original and the modified - version. causes &man.diff.1; to produce - unified diffs, the preferred form. - - &prompt.user; diff -u file.orig file > patch-pathname-file - - When generating patches for new, added files, - is added to tell &man.diff.1; to treat the - non-existent original file as if it existed but was - empty: - - &prompt.user; diff -u -N newfile.orig newfile > patch-pathname-newfile - - Patch files are stored in PATCHDIR - (usually files/, from - where they will be automatically applied. All patches must be - relative to WRKSRC (generally the directory - the port's tarball unpacks itself into, that being where the - build is done). To make fixes and upgrades easier, avoid - having more than one patch fix the same file (that is, - patch-file and - patch-file2 both changing - WRKSRC/foobar.c). Note that if the path - of a patched file contains an underscore - (_) character, the patch needs to have two - underscores instead in its name. For example, to patch a file - named src/freeglut_joystick.c, the - corresponding patch should be named - patch-src-freeglut__joystick.c. - - Please only use characters - [-+._a-zA-Z0-9] for naming patches. Do not - use any other characters besides them. Do not name patches - like patch-aa or - patch-ab, always mention the path and - file name in patch names. - - There is an alternate, easier method for creating patches - to existing files. The first steps are the same, make a copy - of the unmodified file with an .orig - extension, then make modifications. Then use - make makepatch to write updated patch files - to the files directory of the - port. - - Do not put RCS strings in patches. - Subversion will mangle them when we - put the files into the ports tree, and when we check them out - again, they will come out different and the patch will fail. - RCS strings are surrounded by dollar - ($) signs, and typically start with - $Id or - $RCS. - - Using the recurse () option to - &man.diff.1; to generate patches is fine, but please - look at the resulting patches to make sure there is no - unnecessary junk in there. In particular, diffs between two - backup files, Makefiles when the port - uses Imake or GNU - configure, etc., are unnecessary and should - be deleted. If it was necessary to edit - configure.in and run - autoconf to regenerate - configure, do not take the diffs of - configure (it often grows to a few thousand - lines!). Instead, define - USE_AUTOTOOLS=autoconf:261 and take the - diffs of configure.in. - - Try to minimize the amount of non-functional whitespace - changes in patches. It is common in the Open Source world for - projects to share large amounts of a code base, but obey - different style and indenting rules. When taking a working - piece of functionality from one project to fix similar areas - in another, please be careful: the resulting line patch may be - full of non-functional changes. It not only increases the - size of the Subversion repository - but makes it hard to find out what exactly caused the problem - and what was changed at all. - - If a file must be deleted, do it in the - post-extract target rather than as - part of the patch. - - Simple replacements can be performed directly from the - port Makefile using the in-place mode of - &man.sed.1;. This is useful when changes use the value of a - variable: - - post-patch: - @${REINPLACE_CMD} -e 's|for Linux|for FreeBSD|g' ${WRKSRC}/README - - Quite often, software being ported uses the CR/LF - convention in source files. This may cause problems with - further patching, compiler warnings, or script execution (like - /bin/sh^M not found.) To quickly convert - all files from CR/LF to just LF, add this entry to the port - Makefile: - - USES= dos2unix - - A list of specific files to convert can - be given: - - USES= dos2unix -DOS2UNIX_FILES= util.c util.h - - Use DOS2UNIX_REGEX to convert a group - of files across subdirectories. Its argument is a - &man.find.1;-compatible regular expression. More on the - format is in &man.re.format.7;. This option is useful for - converting all files of a given extension. For example, - convert all source code files, leaving binary files - intact: - - USES= dos2unix -DOS2UNIX_REGEX= .*\.([ch]|cpp) - - A similar option is DOS2UNIX_GLOB, - which invokes find for each element listed - in it. - - USES= dos2unix -DOS2UNIX_GLOB= *.c *.cpp *.h - - *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-doc-head@FreeBSD.ORG Sun Feb 9 02:03:12 2014 Return-Path: Delivered-To: svn-doc-head@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 ESMTPS id 20AB9FF6; Sun, 9 Feb 2014 02:03:12 +0000 (UTC) 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 09E8513E2; Sun, 9 Feb 2014 02:03:12 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1923BDQ023711; Sun, 9 Feb 2014 02:03:11 GMT (envelope-from trhodes@svn.freebsd.org) Received: (from trhodes@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1923B4e023710; Sun, 9 Feb 2014 02:03:11 GMT (envelope-from trhodes@svn.freebsd.org) Message-Id: <201402090203.s1923B4e023710@svn.freebsd.org> From: Tom Rhodes Date: Sun, 9 Feb 2014 02:03:11 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r43841 - head/en_US.ISO8859-1/books/porters-handbook X-SVN-Group: doc-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the doc tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Feb 2014 02:03:12 -0000 Author: trhodes Date: Sun Feb 9 02:03:11 2014 New Revision: 43841 URL: http://svnweb.freebsd.org/changeset/doc/43841 Log: Uncomment and sort SRCS. This doesn't break the build because the docproj makefile glue will descend into the directories regardless but this is more clear with the intent. Modified: head/en_US.ISO8859-1/books/porters-handbook/Makefile Modified: head/en_US.ISO8859-1/books/porters-handbook/Makefile ============================================================================== --- head/en_US.ISO8859-1/books/porters-handbook/Makefile Sun Feb 9 01:50:53 2014 (r43840) +++ head/en_US.ISO8859-1/books/porters-handbook/Makefile Sun Feb 9 02:03:11 2014 (r43841) @@ -19,21 +19,21 @@ INSTALL_ONLY_COMPRESSED?= # # XML content -#SRCS+= quick-porting/chapter.xml -#SRCS+= own-port/chapter.xml -#SRCS+= porting-why/chapter.xml +SRCS+= porting-why/chapter.xml +SRCS+= new-port/chapter.xml +SRCS+= quick-porting/chapter.xml +SRCS+= slow-porting/chapter.xml SRCS+= makefiles/chapter.xml -#SRCS+= plist/chapter.xml -#SRCS+= testing/chapter.xml -#SRCS+= security/chapter.xml -#SRCS+= porting-samplem/chapter.xml -#SRCS+= appendices/chapter.xml -#SRCS+= keeping-up/chapter.xml -#SRCS+= porting-dads/chapter.xml -#SRCS+= upgrading/chapter.xml -#SRCS+= pkg-files/chapter.xml -#SRCS+= specials/chapter.xml -#SRCS+= slow-porting/chapter.xml +SRCS+= special/chapter.xml +SRCS+= plist/chapter.xml +SRCS+= pkg-files/chapter.xml +SRCS+= testing/chapter.xml +SRCS+= upgrading/chapter.xml +SRCS+= security/chapter.xml +SRCS+= porting-dads/chapter.xml +SRCS+= porting-samplem/chapter.xml +SRCS+= keeping-up/chapter.xml +SRCS+= appendices/chapter.xml SRCS= book.xml SRCS+= uses.xml From owner-svn-doc-head@FreeBSD.ORG Sun Feb 9 02:36:59 2014 Return-Path: Delivered-To: svn-doc-head@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 ESMTPS id BCC996A2; Sun, 9 Feb 2014 02:36:59 +0000 (UTC) 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 978141649; Sun, 9 Feb 2014 02:36:59 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s192axG0038984; Sun, 9 Feb 2014 02:36:59 GMT (envelope-from wblock@svn.freebsd.org) Received: (from wblock@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s192axtF038983; Sun, 9 Feb 2014 02:36:59 GMT (envelope-from wblock@svn.freebsd.org) Message-Id: <201402090236.s192axtF038983@svn.freebsd.org> From: Warren Block Date: Sun, 9 Feb 2014 02:36:59 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r43842 - head/en_US.ISO8859-1/books/porters-handbook/upgrading X-SVN-Group: doc-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the doc tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Feb 2014 02:36:59 -0000 Author: wblock Date: Sun Feb 9 02:36:59 2014 New Revision: 43842 URL: http://svnweb.freebsd.org/changeset/doc/43842 Log: Whitespace-only fixes, translators please ignore. Modified: head/en_US.ISO8859-1/books/porters-handbook/upgrading/chapter.xml Modified: head/en_US.ISO8859-1/books/porters-handbook/upgrading/chapter.xml ============================================================================== --- head/en_US.ISO8859-1/books/porters-handbook/upgrading/chapter.xml Sun Feb 9 02:03:11 2014 (r43841) +++ head/en_US.ISO8859-1/books/porters-handbook/upgrading/chapter.xml Sun Feb 9 02:36:59 2014 (r43842) @@ -5,293 +5,294 @@ $FreeBSD$ --> - + + + Upgrading a Port + + When you notice that a port is out of date compared to the + latest version from the original authors, you should first ensure + that you have the latest port. You can find them in the + ports/ports-current directory of the &os; FTP + mirror sites. However, if you are working with more than a few + ports, you will probably find it easier to use + Subversion or &man.portsnap.8; to keep + your whole ports collection up-to-date, as described in the Handbook. + This will have the added benefit of tracking all the port's + dependencies. + + The next step is to see if there is an update already pending. + To do this, you have two options. There is a searchable interface + to the FreeBSD + Problem Report (PR) database (also known as + GNATS). Select ports in + the dropdown, and enter the name of the port. + + However, sometimes people forget to put the name of the port + into the Synopsis field in an unambiguous fashion. In that + case, you can try the + &os; Ports Monitoring System + (also known as portsmon). This system + attempts to classify port PRs by portname. To search for PRs + about a particular port, use the Overview + of One Port. + + If there is no pending PR, the next step is to send an email + to the port's maintainer, as shown by + make maintainer. That person may already be + working on an upgrade, or have a reason to not upgrade the port + right now (because of, for example, stability problems of the + new version); you would not want to duplicate their work. Note + that unmaintained ports are listed with a maintainer of + ports@FreeBSD.org, which is just the general + ports mailing list, so sending mail there probably will not help + in this case. + + If the maintainer asks you to do the upgrade or there is + no maintainer, then you have a chance to help out &os; by + preparing the update yourself! Please do this by using the + &man.diff.1; command in the base system. + + To create a suitable diff for a single + patch, copy the file that needs patching to + something.orig, save your changes to + something and then create your + patch: + + + &prompt.user; diff -u something.orig something > something.diff + + + Otherwise, you should either use the + svn diff method () + or copy the contents of the port to an entire different + directory and use the result of the recursive &man.diff.1; + output of the new and old ports directories (e.g., if your + modified port directory is called superedit + and the original is in our tree as + superedit.bak, then save the result of + diff -ruN superedit.bak superedit). Either + unified or context diff is fine, but port committers generally + prefer unified diffs. Note the use of the -N + option—this is the accepted way to force diff to properly + deal with the case of new files being added or old files being + deleted. Before sending us the diff, please examine the output + to make sure all the changes make sense. (In particular, make + sure you first clean out the work directories with + make clean). + + To simplify common operations with patch files, you can use + /usr/ports/Tools/scripts/patchtool.py. + Before using it, please read + /usr/ports/Tools/scripts/README.patchtool. + + If the port is unmaintained, and you are actively using + it yourself, please consider volunteering to become its + maintainer. &os; has over 4000 ports without maintainers, and + this is an area where more volunteers are always needed. (For a + detailed description of the responsibilities of maintainers, + refer to the section in the Developer's + Handbook.) + + The best way to send us the diff is by including it via + &man.send-pr.1; (category ports). If you are + maintaining the port, be sure to put [maintainer + update] at the beginning of your synopsis line and set + the Class of your PR to + maintainer-update. Otherwise, the + Class of your PR should be + change-request. Please mention any added or + deleted files in the message, as they have to be explicitly + specified to &man.svn.1; when doing a commit. If the diff is + more than about 20KB, please compress and uuencode it; + otherwise, just include it in the PR as is. + + Before using &man.send-pr.1;, review the + Writing the problem report section in the Problem + Reports article. It contains far more information about how to + write useful problem reports. + + + If the upgrade is motivated by security concerns or a + serious fault in the currently committed port, please notify + the &a.portmgr; to request immediate rebuilding and + redistribution of the port's package. Unsuspecting users + of pkg will otherwise continue to install + the old version via pkg install for several + weeks. + + + + Once again, please use &man.diff.1; and not &man.shar.1; + to send updates to existing ports! This helps ports + committers understand exactly what is being changed. + + + Now that you have done all that, read about + how to keep up-to-date in . + + + Using <application>Subversion</application> to Make + Patches + + When possible, please submit a &man.svn.1; diff. They + are easier to handle than diffs between + new and old directories. It is easier + to see what has changed, and to update the diff if + something was modified in the Ports Collection since you + began work on it, or if the + committer asks for something to be fixed. - Upgrading a Port - - When you notice that a port is out of date compared to the - latest version from the original authors, you should first - ensure that you have the latest port. You can find them in the - ports/ports-current directory of the &os; - FTP mirror sites. However, if you are working with more than a - few ports, you will probably find it easier to use - Subversion or &man.portsnap.8; - to keep your whole ports collection up-to-date, as described in - the Handbook. - This will have the added benefit of tracking all the port's - dependencies. - - The next step is to see if there is an update already - pending. To do this, you have two options. There is a - searchable interface to the FreeBSD - Problem Report (PR) database (also known as - GNATS). Select ports in - the dropdown, and enter the name of the port. - - However, sometimes people forget to put the name of the port - into the Synopsis field in an unambiguous fashion. In that - case, you can try the - &os; Ports Monitoring System - (also known as portsmon). This system - attempts to classify port PRs by portname. To search for PRs - about a particular port, use the Overview - of One Port. - - If there is no pending PR, the next step is to send an email - to the port's maintainer, as shown by - make maintainer. That person may already be - working on an upgrade, or have a reason to not upgrade the port - right now (because of, for example, stability problems of the - new version); you would not want to duplicate their work. Note - that unmaintained ports are listed with a maintainer of - ports@FreeBSD.org, which is just the general - ports mailing list, so sending mail there probably will not help - in this case. - - If the maintainer asks you to do the upgrade or there is - no maintainer, then you have a chance to help out &os; by - preparing the update yourself! Please do this by using the - &man.diff.1; command in the base system. - - To create a suitable diff for a single - patch, copy the file that needs patching to - something.orig, save your changes to - something and then create your - patch: - - - &prompt.user; diff -u something.orig something > something.diff - - - Otherwise, you should either use the - svn diff method () - or copy the contents of the port to an entire different - directory and use the result of the recursive &man.diff.1; - output of the new and old ports directories (e.g., if your - modified port directory is called superedit - and the original is in our tree as - superedit.bak, then save the result of - diff -ruN superedit.bak superedit). Either - unified or context diff is fine, but port committers generally - prefer unified diffs. Note the use of the -N - option—this is the accepted way to force diff to properly - deal with the case of new files being added or old files being - deleted. Before sending us the diff, please examine the output - to make sure all the changes make sense. (In particular, make - sure you first clean out the work directories with - make clean). - - To simplify common operations with patch files, you can use - /usr/ports/Tools/scripts/patchtool.py. - Before using it, please read - /usr/ports/Tools/scripts/README.patchtool. - - If the port is unmaintained, and you are actively using - it yourself, please consider volunteering to become its - maintainer. &os; has over 4000 ports without maintainers, and - this is an area where more volunteers are always needed. (For a - detailed description of the responsibilities of maintainers, - refer to the section in the Developer's - Handbook.) - - The best way to send us the diff is by including it via - &man.send-pr.1; (category ports). If you are - maintaining the port, be sure to put [maintainer - update] at the beginning of your synopsis line and set - the Class of your PR to - maintainer-update. Otherwise, the - Class of your PR should be - change-request. Please mention any added or - deleted files in the message, as they have to be explicitly - specified to &man.svn.1; when doing a commit. If the diff is - more than about 20KB, please compress and uuencode it; - otherwise, just include it in the PR as is. - - Before using &man.send-pr.1;, review the - Writing the problem report section in the Problem - Reports article. It contains far more information about how to - write useful problem reports. - - - If the upgrade is motivated by security concerns or a - serious fault in the currently committed port, please notify - the &a.portmgr; to request immediate rebuilding and - redistribution of the port's package. Unsuspecting users - of pkg will otherwise continue to install - the old version via pkg install for several - weeks. - - - - Once again, please use &man.diff.1; and not &man.shar.1; - to send updates to existing ports! This helps ports - committers understand exactly what is being changed. - - - Now that you have done all that, read about - how to keep up-to-date in . - - - Using <application>Subversion</application> to Make - Patches - - When possible, please submit a &man.svn.1; diff. They - are easier to handle than diffs between - new and old directories. It is easier - to see what has changed, and to update the diff if - something was modified in the Ports Collection since you - began work on it, or if the - committer asks for something to be fixed. - - &prompt.user; cd ~/my_wrkdir + &prompt.user; cd ~/my_wrkdir &prompt.user; svn co https://svn0.us-west.FreeBSD.org/ports/head/dns/pdnsd &prompt.user; cd ~/my_wrkdir/pdnsd - - + + - This can be anywhere you want, of course; building - ports is not limited to within - /usr/ports/. - - - - svn0.us-west.FreeBSD.org - is a public Subversion server. - Select the closest mirror and verify the mirror server - certificate from the list of Subversion - mirror sites. - - - - While in the working directory, make any changes that you - would usually make to the port. If you add or remove a file, - use svn to track these changes: + This can be anywhere you want, of course; building + ports is not limited to within + /usr/ports/. + + + + svn0.us-west.FreeBSD.org + is a public Subversion server. + Select the closest mirror and verify the mirror server + certificate from the list of Subversion + mirror sites. + + + + While in the working directory, make any changes that you + would usually make to the port. If you add or remove a file, + use svn to track these changes: - &prompt.user; svn add new_file + &prompt.user; svn add new_file &prompt.user; svn remove deleted_file - Make sure that you check the port using the checklist in - and - . + Make sure that you check the port using the checklist in + and + . - &prompt.user; svn status + &prompt.user; svn status &prompt.user; svn update - - - This will try to merge the differences between your - patch and current repository version; watch the output - carefully. The letter in front of each file name - indicates what was done with it. See - for a complete list. - - - - - <application>Subversion</application> Update File - Prefixes - - - - - U - The file was updated without problems. - - - - G - The file was updated without problems (you will - only see this when working against a remote - repository). - - - - M - The file had been modified, and was merged - without conflicts. - - - - C - The file had been modified, and was merged with - conflicts. - - - -
- - If C is displayed as a result of - svn update, it means something changed in - the Subversion repository and - &man.svn.1; was not able to merge the local changes with those - from the repository. It is always a good idea to inspect the - changes anyway, since &man.svn.1; does not know anything about - how a port should be, so it might (and probably will) merge - things that do not make sense. - - The last step is to make a unified &man.diff.1; - of the changes: - - &prompt.user; svn diff > ../`basename ${PWD}`.diff - - - Any files that have been removed should be explicitly - mentioned in the PR, because file removal may not be obvious - to the committer. - - - Send your patch following the guidelines in - . - - - - The Files <filename>UPDATING</filename> and - <filename>MOVED</filename> - - If upgrading the port requires special steps like - changing configuration files or running a specific program, - you should document this in the file - /usr/ports/UPDATING. The format of - an entry in this file is as follows: + + + This will try to merge the differences between your + patch and current repository version; watch the output + carefully. The letter in front of each file name + indicates what was done with it. See + for a complete list. + + + + + <application>Subversion</application> Update File + Prefixes + + + + + U + The file was updated without problems. + + + + G + The file was updated without problems (you will + only see this when working against a remote + repository). + + + + M + The file had been modified, and was merged + without conflicts. + + + + C + The file had been modified, and was merged with + conflicts. + + + +
+ + If C is displayed as a result of + svn update, it means something changed in + the Subversion repository and + &man.svn.1; was not able to merge the local changes with those + from the repository. It is always a good idea to inspect the + changes anyway, since &man.svn.1; does not know anything about + how a port should be, so it might (and probably will) merge + things that do not make sense. + + The last step is to make a unified &man.diff.1; + of the changes: + + &prompt.user; svn diff > ../`basename ${PWD}`.diff + + + Any files that have been removed should be explicitly + mentioned in the PR, because file removal may not be obvious + to the committer. + + + Send your patch following the guidelines in + . + + + + The Files <filename>UPDATING</filename> and + <filename>MOVED</filename> + + If upgrading the port requires special steps like + changing configuration files or running a specific program, + you should document this in the file + /usr/ports/UPDATING. The format of + an entry in this file is as follows: - YYYYMMDD: + YYYYMMDD: AFFECTS: users of portcategory/portname AUTHOR: Your name <Your email address> Special instructions - If you are including exact portmaster or portupgrading - instructions, please make sure to get the shell escaping - right. - - The /usr/ports/MOVED file is used to - list moved or removed ports. Each line in the file is made - up of the name of the port, where the port was moved to, when, - and why. If the port was removed, the section detailing where - it was moved to can be left blank. Each section must be - separated by the | (pipe) character, like - so: - - old name|new name (blank for deleted)|date of move|reason - - The date should be entered in the form - YYYY-MM-DD. New entries should be added to - the end of the file to keep it in chronological order. - - If a port was removed but has since been restored, - delete the line in this file that states that it was - removed. - - The changes can be validated with - Tools/scripts/MOVEDlint.awk. - - + If you are including exact portmaster or portupgrading + instructions, please make sure to get the shell escaping + right. + + The /usr/ports/MOVED file is used to + list moved or removed ports. Each line in the file is made + up of the name of the port, where the port was moved to, when, + and why. If the port was removed, the section detailing where + it was moved to can be left blank. Each section must be + separated by the | (pipe) character, like + so: + + old name|new name (blank for deleted)|date of move|reason + + The date should be entered in the form + YYYY-MM-DD. New entries should be added to + the end of the file to keep it in chronological order. + + If a port was removed but has since been restored, + delete the line in this file that states that it was + removed. + + The changes can be validated with + Tools/scripts/MOVEDlint.awk. + + From owner-svn-doc-head@FreeBSD.ORG Sun Feb 9 02:41:30 2014 Return-Path: Delivered-To: svn-doc-head@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 ESMTPS id BC0FA870; Sun, 9 Feb 2014 02:41:30 +0000 (UTC) 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 A70D916C0; Sun, 9 Feb 2014 02:41:30 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s192fUOK042561; Sun, 9 Feb 2014 02:41:30 GMT (envelope-from wblock@svn.freebsd.org) Received: (from wblock@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s192fU1g042560; Sun, 9 Feb 2014 02:41:30 GMT (envelope-from wblock@svn.freebsd.org) Message-Id: <201402090241.s192fU1g042560@svn.freebsd.org> From: Warren Block Date: Sun, 9 Feb 2014 02:41:30 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r43843 - head/en_US.ISO8859-1/books/porters-handbook/appendices X-SVN-Group: doc-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the doc tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Feb 2014 02:41:30 -0000 Author: wblock Date: Sun Feb 9 02:41:30 2014 New Revision: 43843 URL: http://svnweb.freebsd.org/changeset/doc/43843 Log: Whitespace-only fixes, translators please ignore. Modified: head/en_US.ISO8859-1/books/porters-handbook/appendices/chapter.xml Modified: head/en_US.ISO8859-1/books/porters-handbook/appendices/chapter.xml ============================================================================== --- head/en_US.ISO8859-1/books/porters-handbook/appendices/chapter.xml Sun Feb 9 02:36:59 2014 (r43842) +++ head/en_US.ISO8859-1/books/porters-handbook/appendices/chapter.xml Sun Feb 9 02:41:30 2014 (r43843) @@ -5,68 +5,70 @@ $FreeBSD$ --> - - Appendices + - - Values of <varname>USES</varname> + Appendices + + + Values of <varname>USES</varname> - - Values of <varname>USES</varname> +
+ Values of <varname>USES</varname> - - - - Feature - Arguments - Description - - - - - &values.uses; - - -
- + + + + Feature + Arguments + Description + + + + + &values.uses; + + + + + + + <literal>__FreeBSD_version</literal> Values + + Here is a convenient list of + __FreeBSD_version values as defined in + sys/param.h: - + <literal>__FreeBSD_version</literal> Values - Here is a convenient list of - __FreeBSD_version values as defined in - sys/param.h: - -
- <literal>__FreeBSD_version</literal> Values - - - - - Value - Date - Release - - - - - &values.versions; - - -
- - - Note that 2.2-STABLE sometimes identifies itself as - 2.2.5-STABLE after the 2.2.5-RELEASE. The - pattern used to be year followed by the month, but we - decided to change it to a more straightforward major/minor - system starting from 2.2. This is because the parallel - development on several branches made it infeasible to - classify the releases simply by their real release dates. - If you are making a port now, you do not have to worry about - old -CURRENTs; they are listed here just for your - reference. - - - + + + + Value + Date + Release + + + + + &values.versions; + + + + + + Note that 2.2-STABLE sometimes identifies itself as + 2.2.5-STABLE after the 2.2.5-RELEASE. The + pattern used to be year followed by the month, but we decided + to change it to a more straightforward major/minor system + starting from 2.2. This is because the parallel development + on several branches made it infeasible to classify the + releases simply by their real release dates. If you are + making a port now, you do not have to worry about old + -CURRENTs; they are listed here just for your + reference. + + + From owner-svn-doc-head@FreeBSD.ORG Sun Feb 9 02:42:48 2014 Return-Path: Delivered-To: svn-doc-head@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 ESMTPS id BA08E8DC; Sun, 9 Feb 2014 02:42:48 +0000 (UTC) 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 A301A16C7; Sun, 9 Feb 2014 02:42:48 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s192gmlx042823; Sun, 9 Feb 2014 02:42:48 GMT (envelope-from wblock@svn.freebsd.org) Received: (from wblock@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s192gmG5042822; Sun, 9 Feb 2014 02:42:48 GMT (envelope-from wblock@svn.freebsd.org) Message-Id: <201402090242.s192gmG5042822@svn.freebsd.org> From: Warren Block Date: Sun, 9 Feb 2014 02:42:48 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r43844 - head/en_US.ISO8859-1/books/porters-handbook/appendices X-SVN-Group: doc-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the doc tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Feb 2014 02:42:48 -0000 Author: wblock Date: Sun Feb 9 02:42:48 2014 New Revision: 43844 URL: http://svnweb.freebsd.org/changeset/doc/43844 Log: Fix typo in ID. Modified: head/en_US.ISO8859-1/books/porters-handbook/appendices/chapter.xml Modified: head/en_US.ISO8859-1/books/porters-handbook/appendices/chapter.xml ============================================================================== --- head/en_US.ISO8859-1/books/porters-handbook/appendices/chapter.xml Sun Feb 9 02:41:30 2014 (r43843) +++ head/en_US.ISO8859-1/books/porters-handbook/appendices/chapter.xml Sun Feb 9 02:42:48 2014 (r43844) @@ -6,7 +6,7 @@ --> + "http://www.w3.org/1999/xlink" version="5.0" xml:id="appendices"> Appendices From owner-svn-doc-head@FreeBSD.ORG Sun Feb 9 02:57:23 2014 Return-Path: Delivered-To: svn-doc-head@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 ESMTPS id D21C6A9B; Sun, 9 Feb 2014 02:57:23 +0000 (UTC) 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 BD4211786; Sun, 9 Feb 2014 02:57:23 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s192vNcR048287; Sun, 9 Feb 2014 02:57:23 GMT (envelope-from wblock@svn.freebsd.org) Received: (from wblock@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s192vNc3048286; Sun, 9 Feb 2014 02:57:23 GMT (envelope-from wblock@svn.freebsd.org) Message-Id: <201402090257.s192vNc3048286@svn.freebsd.org> From: Warren Block Date: Sun, 9 Feb 2014 02:57:23 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r43845 - head/en_US.ISO8859-1/books/porters-handbook X-SVN-Group: doc-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the doc tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Feb 2014 02:57:23 -0000 Author: wblock Date: Sun Feb 9 02:57:22 2014 New Revision: 43845 URL: http://svnweb.freebsd.org/changeset/doc/43845 Log: Whitespace-only fixes, translators please ignore. Modified: head/en_US.ISO8859-1/books/porters-handbook/book.xml Modified: head/en_US.ISO8859-1/books/porters-handbook/book.xml ============================================================================== --- head/en_US.ISO8859-1/books/porters-handbook/book.xml Sun Feb 9 02:42:48 2014 (r43844) +++ head/en_US.ISO8859-1/books/porters-handbook/book.xml Sun Feb 9 02:57:22 2014 (r43845) @@ -60,19 +60,19 @@ $FreeBSD$ -&chap.porting-why; -&chap.new-port; -&chap.quick-porting; -&chap.slow-porting; -&chap.makefiles; -&chap.special; -&chap.plist; -&chap.pkg-files; -&chap.testing; -&chap.upgrading; -&chap.security; -&chap.porting-dads; -&chap.porting-samplem; -&chap.keeping-up; -&chap.appendices; + &chap.porting-why; + &chap.new-port; + &chap.quick-porting; + &chap.slow-porting; + &chap.makefiles; + &chap.special; + &chap.plist; + &chap.pkg-files; + &chap.testing; + &chap.upgrading; + &chap.security; + &chap.porting-dads; + &chap.porting-samplem; + &chap.keeping-up; + &chap.appendices; From owner-svn-doc-head@FreeBSD.ORG Sun Feb 9 03:04:11 2014 Return-Path: Delivered-To: svn-doc-head@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 ESMTPS id EC49FFAE; Sun, 9 Feb 2014 03:04:10 +0000 (UTC) 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 B3F191B3A; Sun, 9 Feb 2014 03:04:10 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1934ArZ053245; Sun, 9 Feb 2014 03:04:10 GMT (envelope-from wblock@svn.freebsd.org) Received: (from wblock@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1934AEN053244; Sun, 9 Feb 2014 03:04:10 GMT (envelope-from wblock@svn.freebsd.org) Message-Id: <201402090304.s1934AEN053244@svn.freebsd.org> From: Warren Block Date: Sun, 9 Feb 2014 03:04:10 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r43846 - head/en_US.ISO8859-1/books/porters-handbook/keeping-up X-SVN-Group: doc-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the doc tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Feb 2014 03:04:11 -0000 Author: wblock Date: Sun Feb 9 03:04:10 2014 New Revision: 43846 URL: http://svnweb.freebsd.org/changeset/doc/43846 Log: Whitespace-only fixes, translators please ignore. Modified: head/en_US.ISO8859-1/books/porters-handbook/keeping-up/chapter.xml Modified: head/en_US.ISO8859-1/books/porters-handbook/keeping-up/chapter.xml ============================================================================== --- head/en_US.ISO8859-1/books/porters-handbook/keeping-up/chapter.xml Sun Feb 9 02:57:22 2014 (r43845) +++ head/en_US.ISO8859-1/books/porters-handbook/keeping-up/chapter.xml Sun Feb 9 03:04:10 2014 (r43846) @@ -5,155 +5,155 @@ $FreeBSD$ --> - + - Keeping Up + Keeping Up - The &os; Ports Collection is constantly changing. Here is - some information on how to keep up. + The &os; Ports Collection is constantly changing. Here is + some information on how to keep up. - - FreshPorts - - One of the easiest ways to learn about updates that have - already been committed is by subscribing to FreshPorts. - You can select multiple ports to monitor. Maintainers are - strongly encouraged to subscribe, because they will receive - notification of not only their own changes, but also any - changes that any other &os; committer has made. (These are - often necessary to keep up with changes in the underlying - ports framework—although it would be most polite to - receive an advance heads-up from those committing such - changes, sometimes this is overlooked or just simply - impractical. Also, in some cases, the changes are very minor - in nature. We expect everyone to use their best judgement in - these cases.) - - If you wish to use FreshPorts, all you need is an account. - If your registered email address is - @FreeBSD.org, you will see the opt-in link - on the right hand side of the webpages. For those of you who - already have a FreshPorts account, but are not using your - @FreeBSD.org email address, just change - your email to @FreeBSD.org, subscribe, then - change it back again. - - FreshPorts also has a sanity test feature which - automatically tests each commit to the &os; ports tree. If - subscribed to this service, you will be notified of any errors - which FreshPorts detects during sanity testing of your - commits. - - - - The Web Interface to the Source Repository - - It is possible to browse the files in the source - repository by using a web interface. Changes that affect the - entire port system are now documented in the CHANGES - file. Changes that affect individual ports are now documented - in the UPDATING - file. However, the definitive answer to any question is - undoubtedly to read the source code of bsd.port.mk, - and associated files. - - - - The &os; Ports Mailing List - - If you maintain ports, you should consider following the - &a.ports;. Important changes to the way ports work will be - announced there, and then committed to - CHANGES. - - If this mailing list is too high volume you may consider - following &a.ports-announce; which is moderated and has no - discussion. - - - - The &os; Port Building Cluster - - One of the least-publicized strengths of &os; is that - an entire cluster of machines is dedicated to continually - building the Ports Collection, for each of the major OS - releases and for each Tier-1 architecture. - - Individual ports are built unless they are specifically - marked with IGNORE. Ports that are - marked with BROKEN will still be attempted, - to see if the underlying problem has been resolved. (This - is done by passing TRYBROKEN to the - port's Makefile.) - - - - Portscout: the &os; Ports Distfile Scanner - - The build cluster is dedicated to building the latest - release of each port with distfiles that have already been - fetched. However, as the Internet continually changes, - distfiles can quickly go missing. + FreshPorts + + One of the easiest ways to learn about updates that have + already been committed is by subscribing to FreshPorts. + You can select multiple ports to monitor. Maintainers are + strongly encouraged to subscribe, because they will receive + notification of not only their own changes, but also any changes + that any other &os; committer has made. (These are often + necessary to keep up with changes in the underlying ports + framework—although it would be most polite to receive an + advance heads-up from those committing such changes, sometimes + this is overlooked or just simply impractical. Also, in some + cases, the changes are very minor in nature. We expect everyone + to use their best judgement in these cases.) + + If you wish to use FreshPorts, all you need is an account. + If your registered email address is + @FreeBSD.org, you will see the opt-in link on + the right hand side of the webpages. For those of you who + already have a FreshPorts account, but are not using your + @FreeBSD.org email address, just change your + email to @FreeBSD.org, subscribe, then change + it back again. + + FreshPorts also has a sanity test feature which + automatically tests each commit to the &os; ports tree. If + subscribed to this service, you will be notified of any errors + which FreshPorts detects during sanity testing of your + commits. + + + + The Web Interface to the Source Repository + + It is possible to browse the files in the source + repository by using a web interface. Changes that affect the + entire port system are now documented in the CHANGES + file. Changes that affect individual ports are now documented + in the UPDATING + file. However, the definitive answer to any question is + undoubtedly to read the source code of bsd.port.mk, + and associated files. + + + + The &os; Ports Mailing List + + If you maintain ports, you should consider following the + &a.ports;. Important changes to the way ports work will be + announced there, and then committed to + CHANGES. + + If this mailing list is too high volume you may consider + following &a.ports-announce; which is moderated and has no + discussion. + + + + The &os; Port Building Cluster + + One of the least-publicized strengths of &os; is that + an entire cluster of machines is dedicated to continually + building the Ports Collection, for each of the major OS releases + and for each Tier-1 architecture. + + Individual ports are built unless they are specifically + marked with IGNORE. Ports that are marked + with BROKEN will still be attempted, to see + if the underlying problem has been resolved. (This is done by + passing TRYBROKEN to the port's + Makefile.) + + + + Portscout: the &os; Ports Distfile Scanner + + The build cluster is dedicated to building the latest + release of each port with distfiles that have already been + fetched. However, as the Internet continually changes, + distfiles can quickly go missing. Portscout, - the &os; Ports distfile scanner, attempts to query every - download site for every port to find out if each distfile is - still available. Portscout can - generate HTML reports and send emails about - newly available ports to those who request them. Unless not - otherwise subscribed, maintainers are asked to check - periodically for changes, either by hand or using the - RSS feed. - - Portscout's first page gives - the email address of the port maintainer, the number of ports - the maintainer is responsible for, the number of those ports - with new distfiles, and the percentage of those ports that are - out-of-date. The search function allows for searching by - email address for a specific maintainer, and for selecting - whether or not only out-of-date ports should be shown. - - Upon clicking on a maintainer's email address, a list of - all of their ports is displayed, along with port category, - current version number, whether or not there is a new version, - when the port was last updated, and finally when it was last - checked. A search function on this page allows the user to - search for a specific port. - - Clicking on a port name in the list displays the FreshPorts port - information. - - - - The &os; Ports Monitoring System - - Another handy resource is the - &os; Ports - Monitoring System (also known as - portsmon). This system comprises a - database that processes information from several sources and - allows it to be browsed via a web interface. Currently, the - ports Problem Reports (PRs), the error logs from the build - cluster, and individual files from the ports collection are - used. In the future, this will be expanded to include the - distfile survey, as well as other sources. - - To get started, you can view all information about a - particular port by using the Overview - of One Port. - - As of this writing, this is the only resource available - that maps GNATS PR entries to portnames. (PR submitters do - not always include the portname in their Synopsis, although we - would prefer that they did.) So, portsmon - is a good place to start if you want to find out whether an - existing port has any PRs filed against it and/or any build - errors; or, to find out if a new port that you may be thinking - about creating has already been submitted. - - + the &os; Ports distfile scanner, attempts to query every + download site for every port to find out if each distfile is + still available. Portscout can + generate HTML reports and send emails about + newly available ports to those who request them. Unless not + otherwise subscribed, maintainers are asked to check + periodically for changes, either by hand or using the + RSS feed. + + Portscout's first page gives + the email address of the port maintainer, the number of ports + the maintainer is responsible for, the number of those ports + with new distfiles, and the percentage of those ports that are + out-of-date. The search function allows for searching by email + address for a specific maintainer, and for selecting whether or + not only out-of-date ports should be shown. + + Upon clicking on a maintainer's email address, a list of + all of their ports is displayed, along with port category, + current version number, whether or not there is a new version, + when the port was last updated, and finally when it was last + checked. A search function on this page allows the user to + search for a specific port. + + Clicking on a port name in the list displays the FreshPorts port + information. + + + + The &os; Ports Monitoring System + + Another handy resource is the &os; Ports + Monitoring System (also known as + portsmon). This system comprises a database + that processes information from several sources and allows it to + be browsed via a web interface. Currently, the ports Problem + Reports (PRs), the error logs from the build cluster, and + individual files from the ports collection are used. In the + future, this will be expanded to include the distfile survey, as + well as other sources. + + To get started, you can view all information about a + particular port by using the Overview + of One Port. + + As of this writing, this is the only resource available that + maps GNATS PR entries to portnames. (PR submitters do not + always include the portname in their Synopsis, although we would + prefer that they did.) So, portsmon is a + good place to start if you want to find out whether an existing + port has any PRs filed against it and/or any build errors; or, + to find out if a new port that you may be thinking about + creating has already been submitted. + + From owner-svn-doc-head@FreeBSD.ORG Sun Feb 9 03:26:09 2014 Return-Path: Delivered-To: svn-doc-head@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 ESMTPS id B803A746; Sun, 9 Feb 2014 03:26:09 +0000 (UTC) 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 A2DB11D43; Sun, 9 Feb 2014 03:26:09 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s193Q9ui063544; Sun, 9 Feb 2014 03:26:09 GMT (envelope-from wblock@svn.freebsd.org) Received: (from wblock@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s193Q9Zk063543; Sun, 9 Feb 2014 03:26:09 GMT (envelope-from wblock@svn.freebsd.org) Message-Id: <201402090326.s193Q9Zk063543@svn.freebsd.org> From: Warren Block Date: Sun, 9 Feb 2014 03:26:09 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r43847 - head/en_US.ISO8859-1/books/porters-handbook/new-port X-SVN-Group: doc-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the doc tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Feb 2014 03:26:09 -0000 Author: wblock Date: Sun Feb 9 03:26:08 2014 New Revision: 43847 URL: http://svnweb.freebsd.org/changeset/doc/43847 Log: Whitespace-only fixes, translators please ignore. Modified: head/en_US.ISO8859-1/books/porters-handbook/new-port/chapter.xml Modified: head/en_US.ISO8859-1/books/porters-handbook/new-port/chapter.xml ============================================================================== --- head/en_US.ISO8859-1/books/porters-handbook/new-port/chapter.xml Sun Feb 9 03:04:10 2014 (r43846) +++ head/en_US.ISO8859-1/books/porters-handbook/new-port/chapter.xml Sun Feb 9 03:26:08 2014 (r43847) @@ -5,43 +5,45 @@ $FreeBSD$ --> - - - Making a New Port - - So, you are interested in making your own port or - upgrading an existing one? Great! - - What follows are some guidelines for creating a new port for - &os;. If you want to upgrade an existing port, you should - read this and then read . - - When this document is not sufficiently detailed, you should - refer to /usr/ports/Mk/bsd.port.mk, which - all port Makefiles include. Even if you do not hack Makefiles - daily, it is well commented, and you will still gain much - knowledge from it. Additionally, you may send specific - questions to the &a.ports;. - - - Only a fraction of the variables - (VAR) that can - be overridden are mentioned in this document. Most (if not - all) are documented at the start of - /usr/ports/Mk/bsd.port.mk; the others - probably ought to be. Note that this file uses a non-standard - tab setting: Emacs and - Vim should recognize the setting on - loading the file. Both &man.vi.1; and &man.ex.1; can be set - to use the correct value by typing - :set tabstop=4 once the file has been - loaded. - - - - Looking for something easy to start with? Take a look at the - list of - requested ports and see if you can work on one (or - more). - + + + Making a New Port + + So, you are interested in making your own port or + upgrading an existing one? Great! + + What follows are some guidelines for creating a new port for + &os;. If you want to upgrade an existing port, you should read + this and then read . + + When this document is not sufficiently detailed, you should + refer to /usr/ports/Mk/bsd.port.mk, which all + port Makefiles include. Even if you do not hack Makefiles daily, + it is well commented, and you will still gain much knowledge from + it. Additionally, you may send specific questions to the + &a.ports;. + + + Only a fraction of the variables + (VAR) that can be + overridden are mentioned in this document. Most (if not all) + are documented at the start of + /usr/ports/Mk/bsd.port.mk; the others + probably ought to be. Note that this file uses a non-standard + tab setting: Emacs and + Vim should recognize the setting on + loading the file. Both &man.vi.1; and &man.ex.1; can be set to + use the correct value by typing + :set tabstop=4 once the file has been + loaded. + + + + Looking for something easy to start with? Take a look at the + list of + requested ports and see if you can work on one (or + more). + From owner-svn-doc-head@FreeBSD.ORG Sun Feb 9 03:37:58 2014 Return-Path: Delivered-To: svn-doc-head@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 ESMTPS id 80041BA3; Sun, 9 Feb 2014 03:37:58 +0000 (UTC) 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 699E41E02; Sun, 9 Feb 2014 03:37:58 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s193bwPO068485; Sun, 9 Feb 2014 03:37:58 GMT (envelope-from wblock@svn.freebsd.org) Received: (from wblock@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s193bwsO068484; Sun, 9 Feb 2014 03:37:58 GMT (envelope-from wblock@svn.freebsd.org) Message-Id: <201402090337.s193bwsO068484@svn.freebsd.org> From: Warren Block Date: Sun, 9 Feb 2014 03:37:58 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r43848 - head/en_US.ISO8859-1/books/porters-handbook/pkg-files X-SVN-Group: doc-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the doc tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Feb 2014 03:37:58 -0000 Author: wblock Date: Sun Feb 9 03:37:57 2014 New Revision: 43848 URL: http://svnweb.freebsd.org/changeset/doc/43848 Log: Whitespace-only fixes, translators please ignore. Modified: head/en_US.ISO8859-1/books/porters-handbook/pkg-files/chapter.xml Modified: head/en_US.ISO8859-1/books/porters-handbook/pkg-files/chapter.xml ============================================================================== --- head/en_US.ISO8859-1/books/porters-handbook/pkg-files/chapter.xml Sun Feb 9 03:26:08 2014 (r43847) +++ head/en_US.ISO8859-1/books/porters-handbook/pkg-files/chapter.xml Sun Feb 9 03:37:57 2014 (r43848) @@ -5,211 +5,206 @@ $FreeBSD$ --> - + + + The <filename>pkg-*</filename> Files + + There are some tricks we have not mentioned yet about the + pkg-* files that come in handy + sometimes. + + + <filename>pkg-message</filename> + + If you need to display a message to the installer, you may + place the message in pkg-message. This + capability is often useful to display additional installation + steps to be taken after a pkg install or to + display licensing information. + + When some lines about the build-time knobs or warnings + have to be displayed, use ECHO_MSG. The + pkg-message file is only for + post-installation steps. Likewise, the distinction between + ECHO_MSG and ECHO_CMD + should be kept in mind. The former is for printing + informational text to the screen, while the latter is for + command pipelining: - The <filename>pkg-*</filename> - Files - - There are some tricks we have not mentioned yet about the - pkg-* files - that come in handy sometimes. - - - <filename>pkg-message</filename> - - If you need to display a message to the installer, you may - place the message in pkg-message. This - capability is often useful to display additional installation - steps to be taken after a pkg install or to - display licensing information. - - When some lines about the build-time knobs or warnings - have to be displayed, use ECHO_MSG. The - pkg-message file is only for - post-installation steps. Likewise, the distinction between - ECHO_MSG and ECHO_CMD - should be kept in mind. The former is for printing - informational text to the screen, while the latter is for - command pipelining: - - update-etc-shells: + update-etc-shells: @${ECHO_MSG} "updating /etc/shells" @${CP} /etc/shells /etc/shells.bak @( ${GREP} -v ${PREFIX}/bin/bash /etc/shells.bak; \ ${ECHO_CMD} ${PREFIX}/bin/bash) >/etc/shells @${RM} /etc/shells.bak - - The pkg-message file does not need - to be added to pkg-plist. - - - - - <filename>pkg-install</filename> - - If your port needs to execute commands when the binary - package is installed with pkg add or - pkg install you can do this via the - pkg-install script. This script will - automatically be added to the package, and will be run twice - by pkg the first time as - ${SH} pkg-install ${PKGNAME} - PRE-INSTALL and the second time as - ${SH} pkg-install ${PKGNAME} - POST-INSTALL. $2 can be - tested to determine which mode the script is being run in. - The PKG_PREFIX environmental variable will be - set to the package installation directory. - - - This script is not run automatically if you install the - port with make install. If you are - depending on it being run, you will have to explicitly call - it from your port's Makefile, with a - line like PKG_PREFIX=${PREFIX} ${SH} - ${PKGINSTALL} ${PKGNAME} - PRE-INSTALL. - - - - - <filename>pkg-deinstall</filename> - - This script executes when a package is removed. - - This script will be run twice by pkg - delete The first time as ${SH} - pkg-deinstall ${PKGNAME} DEINSTALL and the - second time as ${SH} pkg-deinstall - ${PKGNAME} POST-DEINSTALL. - - - - Changing the Names of - <filename>pkg-*</filename> - Files - - All the names of - pkg-* files - are defined using variables so you can change them in your - Makefile if need be. This is especially - useful when you are sharing the same - pkg-* files - among several ports or have to write to one of the above files - (see writing to places other - than WRKDIR for why it is a bad - idea to write directly into the - pkg-* - subdirectory). - - Here is a list of variable names and their default values. - (PKGDIR defaults to - ${MASTERDIR}.) - - - - - - Variable - Default value - - - - - - DESCR - ${PKGDIR}/pkg-descr - - - - PLIST - ${PKGDIR}/pkg-plist - - - - PKGINSTALL - ${PKGDIR}/pkg-install - - - - PKGDEINSTALL - ${PKGDIR}/pkg-deinstall - - - - PKGMESSAGE - ${PKGDIR}/pkg-message - - - - - - Please change these variables rather than overriding - PKG_ARGS. If you change - PKG_ARGS, those files will not correctly be - installed in /var/db/pkg upon install - from a port. - - - - Making Use of <varname>SUB_FILES</varname> and - <varname>SUB_LIST</varname> - - The SUB_FILES and - SUB_LIST variables are useful for dynamic - values in port files, such as the installation - PREFIX in - pkg-message. - - The SUB_FILES variable specifies a list - of files to be automatically modified. Each - file in the - SUB_FILES list must have a corresponding - file.in - present in FILESDIR. A modified version - will be created in WRKDIR. Files defined - as a value of USE_RC_SUBR (or the - deprecated USE_RCORDER) are automatically - added to the SUB_FILES. For the files - pkg-message, - pkg-install, - and - pkg-deinstall, - the corresponding Makefile - variable is automatically set to point to the processed - version. - - The SUB_LIST variable is a list of - VAR=VALUE pairs. For each pair - %%VAR%% will get replaced with - VALUE in each file listed in - SUB_FILES. Several common pairs are - automatically defined: PREFIX, - LOCALBASE, DATADIR, - DOCSDIR, EXAMPLESDIR, - WWWDIR, and ETCDIR. - Any line beginning with @comment will be - deleted from resulting files after a variable - substitution. - - The following example will replace - %%ARCH%% with the system architecture in a - pkg-message: + + The pkg-message file does not need + to be added to pkg-plist. + + + + + <filename>pkg-install</filename> + + If your port needs to execute commands when the binary + package is installed with pkg add or + pkg install you can do this via the + pkg-install script. This script will + automatically be added to the package, and will be run twice by + pkg the first time as + + ${SH} pkg-install ${PKGNAME} + PRE-INSTALL and the second time as + ${SH} pkg-install ${PKGNAME} + POST-INSTALL. $2 can be + tested to determine which mode the script is being run in. + The PKG_PREFIX environmental variable will be + set to the package installation directory. + + + This script is not run automatically if you install the + port with make install. If you are + depending on it being run, you will have to explicitly call + it from your port's Makefile, with a + line like PKG_PREFIX=${PREFIX} ${SH} + ${PKGINSTALL} ${PKGNAME} + PRE-INSTALL. + + + + + <filename>pkg-deinstall</filename> + + This script executes when a package is removed. + + This script will be run twice by + pkg delete The first time as + ${SH} pkg-deinstall ${PKGNAME} + DEINSTALL and the second time as + ${SH} pkg-deinstall + ${PKGNAME} POST-DEINSTALL. + + + + Changing the Names of + <filename>pkg-*</filename> Files + + All the names of pkg-* files are + defined using variables so you can change them in your + Makefile if need be. This is especially + useful when you are sharing the same pkg-* + files among several ports or have to write to one of the above + files (see writing to places + other than WRKDIR for why it is a + bad idea to write directly into the pkg-* + subdirectory). + + Here is a list of variable names and their default values. + (PKGDIR defaults to + ${MASTERDIR}.) + + + + + + Variable + Default value + + + + + + DESCR + ${PKGDIR}/pkg-descr + + + + PLIST + ${PKGDIR}/pkg-plist + + + + PKGINSTALL + ${PKGDIR}/pkg-install + + + + PKGDEINSTALL + ${PKGDIR}/pkg-deinstall + + + + PKGMESSAGE + ${PKGDIR}/pkg-message + + + + + + Please change these variables rather than overriding + PKG_ARGS. If you change + PKG_ARGS, those files will not correctly be + installed in /var/db/pkg upon install + from a port. + + + + Making Use of <varname>SUB_FILES</varname> and + <varname>SUB_LIST</varname> + + The SUB_FILES and + SUB_LIST variables are useful for dynamic + values in port files, such as the installation + PREFIX in + pkg-message. + + The SUB_FILES variable specifies a list + of files to be automatically modified. Each + file in the + SUB_FILES list must have a corresponding + file.in present in + FILESDIR. A modified version will be created + in WRKDIR. Files defined as a value of + USE_RC_SUBR (or the deprecated + USE_RCORDER) are automatically added to the + SUB_FILES. For the files + pkg-message, + pkg-install, and + pkg-deinstall, the corresponding Makefile + variable is automatically set to point to the processed + version. + + The SUB_LIST variable is a list of + VAR=VALUE pairs. For each pair + %%VAR%% will get replaced with + VALUE in each file listed in + SUB_FILES. Several common pairs are + automatically defined: PREFIX, + LOCALBASE, DATADIR, + DOCSDIR, EXAMPLESDIR, + WWWDIR, and ETCDIR. Any + line beginning with @comment will be deleted + from resulting files after a variable substitution. + + The following example will replace + %%ARCH%% with the system architecture in a + pkg-message: - SUB_FILES= pkg-message + SUB_FILES= pkg-message SUB_LIST= ARCH=${ARCH} - Note that for this example, the - pkg-message.in file must exist in - FILESDIR. + Note that for this example, the + pkg-message.in file must exist in + FILESDIR. - Example of a good - pkg-message.in: + Example of a good + pkg-message.in: - Now it is time to configure this package. + Now it is time to configure this package. Copy %%PREFIX%%/share/examples/putsy/%%ARCH%%.conf into your home directory as .putsy.conf and edit it. - - - + + From owner-svn-doc-head@FreeBSD.ORG Sun Feb 9 03:46:05 2014 Return-Path: Delivered-To: svn-doc-head@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 ESMTPS id D454ECCC; Sun, 9 Feb 2014 03:46:05 +0000 (UTC) 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 BFFF21F95; Sun, 9 Feb 2014 03:46:05 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s193k5uC072666; Sun, 9 Feb 2014 03:46:05 GMT (envelope-from wblock@svn.freebsd.org) Received: (from wblock@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s193k5Zx072665; Sun, 9 Feb 2014 03:46:05 GMT (envelope-from wblock@svn.freebsd.org) Message-Id: <201402090346.s193k5Zx072665@svn.freebsd.org> From: Warren Block Date: Sun, 9 Feb 2014 03:46:05 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r43849 - head/en_US.ISO8859-1/books/porters-handbook X-SVN-Group: doc-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the doc tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Feb 2014 03:46:05 -0000 Author: wblock Date: Sun Feb 9 03:46:05 2014 New Revision: 43849 URL: http://svnweb.freebsd.org/changeset/doc/43849 Log: Fix the SRCS declaration. Modified: head/en_US.ISO8859-1/books/porters-handbook/Makefile Modified: head/en_US.ISO8859-1/books/porters-handbook/Makefile ============================================================================== --- head/en_US.ISO8859-1/books/porters-handbook/Makefile Sun Feb 9 03:37:57 2014 (r43848) +++ head/en_US.ISO8859-1/books/porters-handbook/Makefile Sun Feb 9 03:46:05 2014 (r43849) @@ -19,6 +19,7 @@ INSTALL_ONLY_COMPRESSED?= # # XML content +SRCS= book.xml SRCS+= porting-why/chapter.xml SRCS+= new-port/chapter.xml SRCS+= quick-porting/chapter.xml @@ -34,8 +35,6 @@ SRCS+= porting-dads/chapter.xml SRCS+= porting-samplem/chapter.xml SRCS+= keeping-up/chapter.xml SRCS+= appendices/chapter.xml - -SRCS= book.xml SRCS+= uses.xml SRCS+= versions.xml From owner-svn-doc-head@FreeBSD.ORG Sun Feb 9 04:05:25 2014 Return-Path: Delivered-To: svn-doc-head@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 ESMTPS id B1E451DA; Sun, 9 Feb 2014 04:05:25 +0000 (UTC) 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 9BBC310DE; Sun, 9 Feb 2014 04:05:25 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1945PYI081945; Sun, 9 Feb 2014 04:05:25 GMT (envelope-from wblock@svn.freebsd.org) Received: (from wblock@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1945PhX081944; Sun, 9 Feb 2014 04:05:25 GMT (envelope-from wblock@svn.freebsd.org) Message-Id: <201402090405.s1945PhX081944@svn.freebsd.org> From: Warren Block Date: Sun, 9 Feb 2014 04:05:25 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r43850 - head/en_US.ISO8859-1/books/porters-handbook/plist X-SVN-Group: doc-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the doc tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Feb 2014 04:05:25 -0000 Author: wblock Date: Sun Feb 9 04:05:25 2014 New Revision: 43850 URL: http://svnweb.freebsd.org/changeset/doc/43850 Log: Whitespace-only fixes, translators please ignore. Modified: head/en_US.ISO8859-1/books/porters-handbook/plist/chapter.xml Modified: head/en_US.ISO8859-1/books/porters-handbook/plist/chapter.xml ============================================================================== --- head/en_US.ISO8859-1/books/porters-handbook/plist/chapter.xml Sun Feb 9 03:46:05 2014 (r43849) +++ head/en_US.ISO8859-1/books/porters-handbook/plist/chapter.xml Sun Feb 9 04:05:25 2014 (r43850) @@ -5,127 +5,121 @@ $FreeBSD$ --> - + + + Advanced <filename>pkg-plist</filename> Practices + + + Changing <filename>pkg-plist</filename> Based on Make + Variables + + Some ports, particularly the p5- ports, + need to change their pkg-plist depending on + what options they are configured with (or version of + perl, in the case of p5- + ports). To make this easy, any instances in the + pkg-plist of %%OSREL%%, + %%PERL_VER%%, and + %%PERL_VERSION%% will be substituted for + appropriately. The value of %%OSREL%% is the + numeric revision of the operating system (e.g., + 4.9). %%PERL_VERSION%% + and %%PERL_VER%% is the full version number + of perl (e.g., 5.8.9). + Several other %%VARS%% related to port's + documentation files are described in + the relevant + section. + + If you need to make other substitutions, you can set the + PLIST_SUB variable with a list of + VAR=VALUE pairs and instances of + %%VAR%% will be substituted with + VALUE in the + pkg-plist. + + For instance, if you have a port that installs many files + in a version-specific subdirectory, you can put something + like - Advanced <filename>pkg-plist</filename> Practices - - - Changing <filename>pkg-plist</filename> Based on Make - Variables - - Some ports, particularly the p5- ports, - need to change their pkg-plist depending - on what options they are configured with (or version of - perl, in the case of p5- - ports). To make this easy, any instances in the - pkg-plist of - %%OSREL%%, %%PERL_VER%%, - and %%PERL_VERSION%% will be substituted - for appropriately. The value of %%OSREL%% - is the numeric revision of the operating system (e.g., - 4.9). %%PERL_VERSION%% - and %%PERL_VER%% is the full version number - of perl (e.g., 5.8.9). - Several other - %%VARS%% related - to port's documentation files are described in - the relevant - section. - - If you need to make other substitutions, you can set the - PLIST_SUB variable with a list of - VAR=VALUE - pairs and instances of - %%VAR%% will be - substituted with VALUE in the - pkg-plist. - - For instance, if you have a port that installs many files - in a version-specific subdirectory, you can put something - like - - OCTAVE_VERSION= 2.0.13 + OCTAVE_VERSION= 2.0.13 PLIST_SUB= OCTAVE_VERSION=${OCTAVE_VERSION} - in the Makefile and use - %%OCTAVE_VERSION%% wherever the version - shows up in pkg-plist. That way, when - you upgrade the port, you will not have to change dozens (or - in some cases, hundreds) of lines in the - pkg-plist. - - If your port installs files conditionally on the options - set in the port, the usual way of handling it is prefixing the - pkg-plist lines with a - %%TAG%% and adding that - TAG to the PLIST_SUB - variable inside the Makefile with a - special value of @comment, which makes - package tools to ignore the line: + in the Makefile and use + %%OCTAVE_VERSION%% wherever the version shows + up in pkg-plist. That way, when you + upgrade the port, you will not have to change dozens (or in some + cases, hundreds) of lines in the + pkg-plist. + + If your port installs files conditionally on the options + set in the port, the usual way of handling it is prefixing the + pkg-plist lines with a + %%TAG%% and adding that + TAG to the PLIST_SUB + variable inside the Makefile with a special + value of @comment, which makes package tools + to ignore the line: - .if defined(WITH_X11) + .if defined(WITH_X11) PLIST_SUB+= X11="" .else PLIST_SUB+= X11="@comment " .endif - and in the pkg-plist: + and in the pkg-plist: - %%X11%%bin/foo-gui + %%X11%%bin/foo-gui - This substitution - will be - done between the pre-install and - do-install targets, by reading from - PLIST and writing to - TMPPLIST (default: - WRKDIR/.PLIST.mktmp). - So if your port builds - PLIST on the fly, do - so in or before pre-install. Also, - if your port needs to edit the resulting file, do so in - post-install to a file named - TMPPLIST. - - Another way of modifying a port's packing list is based - on setting the variables PLIST_FILES, - PLIST_DIRS, and - PLIST_DIRSTRY. The value of each variable - is regarded as a list of pathnames to write to - TMPPLIST along with - PLIST contents. Names - listed in PLIST_FILES, - PLIST_DIRS, and - PLIST_DIRSTRY are subject to - %%VAR%% - substitution as described above. Except for that, names from - PLIST_FILES will appear in the final - packing list unchanged, while @dirrm and - @dirrmtry will - be prepended to names from PLIST_DIRS - and PLIST_DIRSTRY, respectively. To - take effect, PLIST_FILES, - PLIST_DIRS, and - PLIST_DIRSTRY must be set before - TMPPLIST is written, - i.e., in pre-install or - earlier. - - - - Empty Directories - - - Cleaning Up Empty Directories - - Do make your ports remove empty directories when they - are de-installed. This is usually accomplished by adding - @dirrm lines for all directories that are - specifically created by the port. You need to delete - subdirectories before you can delete parent - directories. + This substitution will be done between the + pre-install and + do-install targets, by reading from + PLIST and writing to + TMPPLIST (default: + WRKDIR/.PLIST.mktmp). So if your port + builds PLIST on the fly, do so in or before + pre-install. Also, if your port + needs to edit the resulting file, do so in + post-install to a file named + TMPPLIST. + + Another way of modifying a port's packing list is based on + setting the variables PLIST_FILES, + PLIST_DIRS, and + PLIST_DIRSTRY. The value of each variable is + regarded as a list of pathnames to write to + TMPPLIST along with + PLIST contents. Names listed in + PLIST_FILES, PLIST_DIRS, + and PLIST_DIRSTRY are subject to + %%VAR%% substitution as described above. + Except for that, names from PLIST_FILES will + appear in the final packing list unchanged, while + @dirrm and @dirrmtry will + be prepended to names from PLIST_DIRS and + PLIST_DIRSTRY, respectively. To take effect, + PLIST_FILES, PLIST_DIRS, + and PLIST_DIRSTRY must be set before + TMPPLIST is written, i.e., in + pre-install or earlier. + + + + Empty Directories + + + Cleaning Up Empty Directories + + Do make your ports remove empty directories when they are + de-installed. This is usually accomplished by adding + @dirrm lines for all directories that are + specifically created by the port. You need to delete + subdirectories before you can delete parent + directories. - : + : lib/X11/oneko/pixmaps/cat.xpm lib/X11/oneko/sounds/cat.au : @@ -133,156 +127,151 @@ lib/X11/oneko/sounds/cat.au @dirrm lib/X11/oneko/sounds @dirrm lib/X11/oneko - However, sometimes @dirrm will give - you errors because other ports share the same directory. - You can use @dirrmtry to remove only - empty directories without warning. - - @dirrmtry share/doc/gimp - - This will neither print any error messages nor cause - pkg delete (see &man.pkg-delete.8;) to - exit abnormally even if - ${PREFIX}/share/doc/gimp is not empty - due to other ports installing some files in there. - - - - Creating Empty Directories - - Empty directories created during port installation need - special attention. They will not get created when - installing the package, because packages only store the - files, and both pkg add and pkg - install creates directories for them as needed. - To make sure the empty directory is created when installing - the package, add this line to pkg-plist - above the corresponding @dirrm - line: + However, sometimes @dirrm will give + you errors because other ports share the same directory. You + can use @dirrmtry to remove only empty + directories without warning. + + @dirrmtry share/doc/gimp + + This will neither print any error messages nor cause + pkg delete (see &man.pkg-delete.8;) to + exit abnormally even if + ${PREFIX}/share/doc/gimp is not empty + due to other ports installing some files in there. + + + + Creating Empty Directories + + Empty directories created during port installation need + special attention. They will not get created when installing + the package, because packages only store the files, and both + pkg add and pkg install + creates directories for them as needed. To make sure the + empty directory is created when installing the package, add + this line to pkg-plist above the + corresponding @dirrm line: @exec mkdir -p %D/share/foo/templates - - + + - - Configuration Files + + Configuration Files - If your port installs configuration files to - PREFIX/etc (or - elsewhere) do not simply list them in the - pkg-plist. That will cause pkg - delete to remove the files carefully edited by the - user, and a re-installation will wipe them out. - - Instead, install sample file(s) with a - filename.sample - suffix. Then copy the sample file to the real configuration - file name, if it does not already exist. On deinstall - delete the configuration file, but only if it is identical - to the .sample file. - You need to handle this both in the port - Makefile, and in the - pkg-plist (for installation from the - package). + If your port installs configuration files to + PREFIX/etc (or elsewhere) do + not simply list them in the + pkg-plist. That will cause + pkg delete to remove the files carefully + edited by the user, and a re-installation will wipe them + out. + + Instead, install sample file(s) with a + filename.sample suffix. Then copy the + sample file to the real configuration file name, if it does not + already exist. On deinstall delete the configuration file, but + only if it is identical to the .sample + file. You need to handle this both in the port + Makefile, and in the + pkg-plist (for installation from the + package). - Example of the Makefile part: + Example of the Makefile part: - post-install: + post-install: @if [ ! -f ${PREFIX}/etc/orbit.conf ]; then \ ${CP} -p ${PREFIX}/etc/orbit.conf.sample ${STAGEDIR}${PREFIX}/etc/orbit.conf ; \ fi - For each configuration file, create the following three - lines in pkg-plist: + For each configuration file, create the following three + lines in pkg-plist: - @unexec if cmp -s %D/etc/orbit.conf.sample %D/etc/orbit.conf; then rm -f %D/etc/orbit.conf; fi + @unexec if cmp -s %D/etc/orbit.conf.sample %D/etc/orbit.conf; then rm -f %D/etc/orbit.conf; fi etc/orbit.conf.sample @exec if [ ! -f %D/etc/orbit.conf ] ; then cp -p %D/%F %B/orbit.conf; fi - The order of these lines is important. On deinstallation, - the sample file is compared to the actual configuration file. - If these files are identical, no changes have been made by the - user and the actual file can be safely deleted. Because the - sample file must still exist for the comparison, the - @unexec line comes before the sample - configuration file name. On installation, if an actual - configuration file is not already present, the sample file is - copied to the actual file. The sample file must be present - before it can be copied, so the @exec line - comes after the sample configuration file name. - - To debug any issues, temporarily remove the - -s flag to &man.cmp.1; for more - output. - - See &man.pkg-create.8; for more information on - %D and related substitution markers. - - If there is a very good reason not to install a working - configuration file by default, leave the - @exec line out of - pkg-plist and add a - message pointing out - that the user must copy and edit the file before the software - will work. - - - - Dynamic Versus Static Package List - - A static package list is a package - list which is available in the Ports Collection either as a - pkg-plist file (with or without variable - substitution), or embedded into the - Makefile via - PLIST_FILES, - PLIST_DIRS, and - PLIST_DIRSTRY. Even if the contents are - auto-generated by a tool or a target in the Makefile - before the inclusion into the Ports - Collection by a committer, this is still considered a static - list, since it is possible to examine it without having to - download or compile the distfile. - - A dynamic package list is a package - list which is generated at the time the port is compiled based - upon the files and directories which are installed. It is not - possible to examine it before the source code of the ported - application is downloaded and compiled, or after running a - make clean. - - While the use of dynamic package lists is not forbidden, - maintainers should use static package lists wherever possible, - as it enables users to &man.grep.1; through available ports to - discover, for example, which port installs a certain file. - Dynamic lists should be primarily used for complex ports where - the package list changes drastically based upon optional - features of the port (and thus maintaining a static package - list is infeasible), or ports which change the package list - based upon the version of dependent software used (e.g., ports - which generate docs with - Javadoc). - - - - Automated Package List Creation - - First, make sure your port is almost complete, with only - pkg-plist missing. You may then run - make makeplist to - generate a pkg-plist automatically. This - file must be double checked for correctness. - - User configuration files should be - removed, or installed as - filename.sample. - The info/dir file should not be listed - and appropriate install-info lines should - be added as noted in the - info files section. Any - libraries installed by the port should be listed as specified - in the shared libraries - section. - - - + The order of these lines is important. On deinstallation, + the sample file is compared to the actual configuration file. + If these files are identical, no changes have been made by the + user and the actual file can be safely deleted. Because the + sample file must still exist for the comparison, the + @unexec line comes before the sample + configuration file name. On installation, if an actual + configuration file is not already present, the sample file is + copied to the actual file. The sample file must be present + before it can be copied, so the @exec line + comes after the sample configuration file name. + + To debug any issues, temporarily remove the + -s flag to &man.cmp.1; for more + output. + + See &man.pkg-create.8; for more information on + %D and related substitution markers. + + If there is a very good reason not to install a working + configuration file by default, leave the + @exec line out of + pkg-plist and add a + message pointing out that + the user must copy and edit the file before the software will + work. + + + + Dynamic Versus Static Package List + + A static package list is a package + list which is available in the Ports Collection either as a + pkg-plist file (with or without variable + substitution), or embedded into the + Makefile via + PLIST_FILES, PLIST_DIRS, + and PLIST_DIRSTRY. Even if the contents are + auto-generated by a tool or a target in the Makefile + before the inclusion into the Ports + Collection by a committer, this is still considered a static + list, since it is possible to examine it without having to + download or compile the distfile. + + A dynamic package list is a package + list which is generated at the time the port is compiled based + upon the files and directories which are installed. It is not + possible to examine it before the source code of the ported + application is downloaded and compiled, or after running a + make clean. + + While the use of dynamic package lists is not forbidden, + maintainers should use static package lists wherever possible, + as it enables users to &man.grep.1; through available ports to + discover, for example, which port installs a certain file. + Dynamic lists should be primarily used for complex ports where + the package list changes drastically based upon optional + features of the port (and thus maintaining a static package list + is infeasible), or ports which change the package list based + upon the version of dependent software used (e.g., ports which + generate docs with Javadoc). + + + + Automated Package List Creation + + First, make sure your port is almost complete, with only + pkg-plist missing. You may then run + make makeplist to generate a + pkg-plist automatically. This file must be + double checked for correctness. + + User configuration files should be removed, or installed as + filename.sample. The + info/dir file should not be listed and + appropriate install-info lines should be + added as noted in the + info files section. Any + libraries installed by the port should be listed as specified in + the shared libraries + section. + + From owner-svn-doc-head@FreeBSD.ORG Sun Feb 9 08:19:56 2014 Return-Path: Delivered-To: svn-doc-head@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 ESMTPS id 156C2663; Sun, 9 Feb 2014 08:19:56 +0000 (UTC) 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 F2B1D1FCD; Sun, 9 Feb 2014 08:19:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s198Jtsb097536; Sun, 9 Feb 2014 08:19:55 GMT (envelope-from ryusuke@svn.freebsd.org) Received: (from ryusuke@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s198Jtpu097531; Sun, 9 Feb 2014 08:19:55 GMT (envelope-from ryusuke@svn.freebsd.org) Message-Id: <201402090819.s198Jtpu097531@svn.freebsd.org> From: Ryusuke SUZUKI Date: Sun, 9 Feb 2014 08:19:55 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r43851 - in head/ja_JP.eucJP/htdocs/java: . dists X-SVN-Group: doc-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the doc tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Feb 2014 08:19:56 -0000 Author: ryusuke Date: Sun Feb 9 08:19:54 2014 New Revision: 43851 URL: http://svnweb.freebsd.org/changeset/doc/43851 Log: - Merge the following from the English version: r42048 -> r43646 head/ja_JP.eucJP/htdocs/java/Makefile r42026 -> r43646 head/ja_JP.eucJP/htdocs/java/dists/index.xml r42047 -> r43646 head/ja_JP.eucJP/htdocs/java/index.xml r42154 -> r43646 head/ja_JP.eucJP/htdocs/java/install.xml r31298 -> (dead) head/ja_JP.eucJP/htdocs/java/java-rss.xsl r24043 -> (dead) head/ja_JP.eucJP/htdocs/java/links.xml r41555 -> (dead) head/ja_JP.eucJP/htdocs/java/news.xml r31289 -> (dead) head/ja_JP.eucJP/htdocs/java/newsflash.xsl Deleted: head/ja_JP.eucJP/htdocs/java/java-rss.xsl head/ja_JP.eucJP/htdocs/java/links.xml head/ja_JP.eucJP/htdocs/java/news.xml head/ja_JP.eucJP/htdocs/java/newsflash.xsl Modified: head/ja_JP.eucJP/htdocs/java/Makefile head/ja_JP.eucJP/htdocs/java/dists/index.xml head/ja_JP.eucJP/htdocs/java/index.xml head/ja_JP.eucJP/htdocs/java/install.xml Modified: head/ja_JP.eucJP/htdocs/java/Makefile ============================================================================== --- head/ja_JP.eucJP/htdocs/java/Makefile Sun Feb 9 04:05:25 2014 (r43850) +++ head/ja_JP.eucJP/htdocs/java/Makefile Sun Feb 9 08:19:54 2014 (r43851) @@ -1,6 +1,6 @@ # $FreeBSD$ # The FreeBSD Japanese Documentation Project -# Original revision: r42048 +# Original revision: r43646 .if exists(../Makefile.conf) .include "../Makefile.conf" @@ -14,10 +14,5 @@ SUBDIR = dists DOCS+= howhelp.xml DOCS+= index.xml DOCS+= install.xml -DOCS+= links.xml - -XML.DEFAULT= news.xml -XMLDOCS= newsflash -XMLDOCS+= news:java-rss.xsl::rss.xml .include "${DOC_PREFIX}/share/mk/web.site.mk" Modified: head/ja_JP.eucJP/htdocs/java/dists/index.xml ============================================================================== --- head/ja_JP.eucJP/htdocs/java/dists/index.xml Sun Feb 9 04:05:25 2014 (r43850) +++ head/ja_JP.eucJP/htdocs/java/dists/index.xml Sun Feb 9 08:19:54 2014 (r43851) @@ -1,10 +1,10 @@ - + ]> @@ -36,12 +36,12 @@

&jdk; 1.6.x

JDK 1.6 ¤ò¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤¹¡£ ¸½ºßÂбþ¤·¤Æ¤¤¤ë¥Ð¡¼¥¸¥ç¥ó¤Ï (i386 ¤ª¤è¤Ó amd64 ¥¢¡¼¥­¥Æ¥¯¥Á¥ãÍѤÎ) - FreeBSD 6.2 °Ê¹ß¤Ç¤¹¡£

+ FreeBSD 8.4 °Ê¹ß¤Ç¤¹¡£

&jdk; 1.7.x

JDK 1.7 ¤ò¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤¹¡£ ¸½ºßÂбþ¤·¤Æ¤¤¤ë¥Ð¡¼¥¸¥ç¥ó¤Ï (i386 ¤ª¤è¤Ó amd64 ¥¢¡¼¥­¥Æ¥¯¥Á¥ãÍѤÎ) - FreeBSD 7.0 °Ê¹ß¤Ç¤¹¡£

+ FreeBSD 8.4 °Ê¹ß¤Ç¤¹¡£

Modified: head/ja_JP.eucJP/htdocs/java/index.xml ============================================================================== --- head/ja_JP.eucJP/htdocs/java/index.xml Sun Feb 9 04:05:25 2014 (r43850) +++ head/ja_JP.eucJP/htdocs/java/index.xml Sun Feb 9 08:19:54 2014 (r43851) @@ -1,11 +1,11 @@ - + ]> @@ -28,7 +28,7 @@ (¤½¤ì¤¾¤ì openjdk6 ¤È openjdk7) ¤òÍѤ¤¤Æ¡¢ ¥½¡¼¥¹¥³¡¼¥É¤«¤é¹½ÃÛ¤·¤Æ¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤­¤Þ¤¹¡£ ¤½¤·¤Æ¡¢¥³¥ó¥Ñ¥¤¥ëºÑ¤ß¤Î¥Ð¥¤¥Ê¥ê package ¤¬ FreeBSD mirrors ¤òÄ̤¸¤ÆÇÛÉÛ¤µ¤ì¤Æ¤ª¤ê¡¢ - pkg_add(1) ¤òÍѤ¤¤ÆľÀÜ¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£

+ pkg(8) ¤òÍѤ¤¤ÆľÀÜ¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£

&openjdk; ¤Ï¡¢FreeBSD ¤Ë¤ª¤¤¤Æ¿ä¾©¤µ¤ì¤ë &java; ¤Î¼ÂÁõ¤Ç¤¹¡£ FreeBSD Foundation ¤Ï¡¢º£¸å Sun ¤Î¥Ñ¡¼¥È¥Ê¡¼¥½¡¼¥¹¥Ù¡¼¥¹¤Î @@ -41,12 +41,6 @@ FreeBSD Foundation Java ¥À¥¦¥ó¥í¡¼¥É ¤ò¤´Í÷¤¯¤À¤µ¤¤¡£

-

¥Ë¥å¡¼¥¹

- - -

¥½¥Õ¥È¥¦¥§¥¢

    @@ -66,7 +60,6 @@ Modified: head/ja_JP.eucJP/htdocs/java/install.xml ============================================================================== --- head/ja_JP.eucJP/htdocs/java/install.xml Sun Feb 9 04:05:25 2014 (r43850) +++ head/ja_JP.eucJP/htdocs/java/install.xml Sun Feb 9 08:19:54 2014 (r43851) @@ -1,10 +1,10 @@ - + ]> @@ -25,9 +25,19 @@

    FreeBSD ¤Î OpenJDK

    +

    &openjdk; 6 package ¤Î¥¤¥ó¥¹¥È¡¼¥ë¤Ë¤Ï¡¢pkg(8) ¥æ¡¼¥Æ¥£¥ê¥Æ¥£¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤¡£

    + +

    pkg install openjdk6 +

    + +

    pkg(8) ¤Î»ÈÍѤ˴ؤ¹¤ë¤è¤ê¾ÜºÙ¤Ê¾ðÊó¤Ë¤Ä¤¤¤Æ¤Ï¡¢ + +FreeBSD ¥Ï¥ó¥É¥Ö¥Ã¥¯ ¤ò¤´Í÷¤¯¤À¤µ¤¤¡£ +

    +

    OpenJDK ¤Î FreeBSD ¥Í¥¤¥Æ¥£¥Ö¤Ê port ¤Ç¤¹¡£

    -

    cd /usr/ports/java/openjdk16
    +

    cd /usr/ports/java/openjdk17
    make install clean

    From owner-svn-doc-head@FreeBSD.ORG Sun Feb 9 23:16:49 2014 Return-Path: Delivered-To: svn-doc-head@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 ESMTPS id E38CDF82; Sun, 9 Feb 2014 23:16:49 +0000 (UTC) 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 CA95B124F; Sun, 9 Feb 2014 23:16:49 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s19NGnsQ084646; Sun, 9 Feb 2014 23:16:49 GMT (envelope-from wblock@svn.freebsd.org) Received: (from wblock@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s19NGnNx084645; Sun, 9 Feb 2014 23:16:49 GMT (envelope-from wblock@svn.freebsd.org) Message-Id: <201402092316.s19NGnNx084645@svn.freebsd.org> From: Warren Block Date: Sun, 9 Feb 2014 23:16:49 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r43852 - head/en_US.ISO8859-1/books/porters-handbook/porting-dads X-SVN-Group: doc-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the doc tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Feb 2014 23:16:50 -0000 Author: wblock Date: Sun Feb 9 23:16:49 2014 New Revision: 43852 URL: http://svnweb.freebsd.org/changeset/doc/43852 Log: Whitespace-only fixes, translators please ignore. Modified: head/en_US.ISO8859-1/books/porters-handbook/porting-dads/chapter.xml Modified: head/en_US.ISO8859-1/books/porters-handbook/porting-dads/chapter.xml ============================================================================== --- head/en_US.ISO8859-1/books/porters-handbook/porting-dads/chapter.xml Sun Feb 9 08:19:54 2014 (r43851) +++ head/en_US.ISO8859-1/books/porters-handbook/porting-dads/chapter.xml Sun Feb 9 23:16:49 2014 (r43852) @@ -5,720 +5,715 @@ $FreeBSD$ --> - + + + Dos and Don'ts + + + Introduction + + Here is a list of common dos and don'ts that are encountered + during the porting process. Check the port against this list, + but also check ports in the PR + database that others have submitted. Submit any + comments on ports you check as described in Bug + Reports and General Commentary. Checking ports in the + PR database will both make it faster for us to commit them, and + prove that you know what you are doing. + + + + <varname>WRKDIR</varname> + + Do not write anything to files outside + WRKDIR. WRKDIR is the + only place that is guaranteed to be writable during the port + build (see + installing ports from a CDROM for an example of + building ports from a read-only tree). If you need to modify + one of the pkg-* files, do so by + redefining a variable, + not by writing over it. + + + + <varname>WRKDIRPREFIX</varname> + + Make sure your port honors WRKDIRPREFIX. + Most ports do not have to worry about this. In particular, if + you are referring to a WRKDIR of another + port, note that the correct location is + WRKDIRPREFIXPORTSDIR/subdir/name/work not + PORTSDIR/subdir/name/work or + .CURDIR/../../subdir/name/work or some + such. + + Also, if you are defining WRKDIR + yourself, make sure you prepend + ${WRKDIRPREFIX}${.CURDIR} in + the front. + + + + Differentiating Operating Systems and OS Versions + + You may come across code that needs modifications or + conditional compilation based upon what version of &os; Unix it + is running under. The preferred way to tell &os; versions apart + are the __FreeBSD_version and + __FreeBSD__ macros defined in sys/param.h. + If this file is not included add the code, + + #include <sys/param.h> + + to the proper place in the .c + file. + + __FreeBSD__ is defined in all versions + of &os; as their major version number. For example, in &os; + 9.x, __FreeBSD__ is defined to be + 9. - Dos and Don'ts - - - Introduction - - Here is a list of common dos and don'ts that are - encountered during the porting process. Check the port - against this list, but also check ports in the PR - database that others have submitted. Submit any - comments on ports you check as described in Bug - Reports and General Commentary. Checking ports in - the PR database will both make it faster for us to commit - them, and prove that you know what you are doing. - - - - <varname>WRKDIR</varname> - - Do not write anything to files outside - WRKDIR. WRKDIR is the - only place that is guaranteed to be writable during the port - build (see - installing ports from a CDROM for an example of - building ports from a read-only tree). If you need to modify - one of the pkg-* files, do so by - redefining a variable, - not by writing over it. - - - - <varname>WRKDIRPREFIX</varname> - - Make sure your port honors - WRKDIRPREFIX. Most ports do not have to - worry about this. In particular, if you are referring to a - WRKDIR of another port, note that the - correct location is - WRKDIRPREFIXPORTSDIR/subdir/name/work - not - PORTSDIR/subdir/name/work - or - .CURDIR/../../subdir/name/work - or some such. - - Also, if you are defining WRKDIR - yourself, make sure you prepend - ${WRKDIRPREFIX}${.CURDIR} in - the front. - - - - Differentiating Operating Systems and OS Versions - - You may come across code that needs modifications or - conditional compilation based upon what version of &os; Unix - it is running under. The preferred way to tell &os; versions - apart are the __FreeBSD_version and - __FreeBSD__ macros defined in sys/param.h. - If this file is not included add the code, - - #include <sys/param.h> - - to the proper place in the .c - file. - - __FreeBSD__ is defined in all - versions of &os; as their major version number. For - example, in &os; 9.x, __FreeBSD__ is - defined to be 9. - - #if __FreeBSD__ >= 9 + #if __FreeBSD__ >= 9 # if __FreeBSD_version >= 901000 /* 9.1+ release specific code here */ # endif #endif - + - - Writing Something After - <filename>bsd.port.mk</filename> - - Do not write anything after the .include - <bsd.port.mk> line. It usually can be - avoided by including bsd.port.pre.mk - somewhere in the middle of your Makefile - and bsd.port.post.mk at the end. - - - Include either the - bsd.port.pre.mk/bsd.port.post.mk - pair or bsd.port.mk only; do not mix - these two usages. - - - bsd.port.pre.mk only defines a few - variables, which can be used in tests in the - Makefile, - bsd.port.post.mk defines the rest. - - Here are some important variables defined in - bsd.port.pre.mk (this is not the complete - list, please read bsd.port.mk for the - complete list). - - - - - - Variable - Description - - - - - - ARCH - The architecture as returned by uname - -m (e.g., i386) - - - - OPSYS - The operating system type, as returned by - uname -s (e.g., - FreeBSD) - - - - OSREL - The release version of the operating system - (e.g., 2.1.5 or - 2.2.7) - - - - OSVERSION - The numeric version of the operating system; the - same as __FreeBSD_version. - - - - LOCALBASE - The base of the local tree (e.g., - /usr/local) - - - - PREFIX - - Where the port installs itself (see - more on - PREFIX). - - - - - - - If you have to define the variable - MASTERDIR, do so before including - bsd.port.pre.mk. - + + Writing Something After + <filename>bsd.port.mk</filename> + + Do not write anything after the + .include <bsd.port.mk> line. It + usually can be avoided by including + bsd.port.pre.mk somewhere in the middle of + your Makefile and + bsd.port.post.mk at the end. + + + Include either the + bsd.port.pre.mk/bsd.port.post.mk + pair or bsd.port.mk only; do not mix + these two usages. + + + bsd.port.pre.mk only defines a few + variables, which can be used in tests in the + Makefile, + bsd.port.post.mk defines the rest. + + Here are some important variables defined in + bsd.port.pre.mk (this is not the complete + list, please read bsd.port.mk for the + complete list). + + + + + + Variable + Description + + + + + + ARCH + The architecture as returned by uname + -m (e.g., i386) + + + + OPSYS + The operating system type, as returned by + uname -s (e.g., + FreeBSD) + + + + OSREL + The release version of the operating system + (e.g., 2.1.5 or + 2.2.7) + + + + OSVERSION + The numeric version of the operating system; the + same as __FreeBSD_version. + + + + LOCALBASE + The base of the local tree (e.g., + /usr/local) + + + + PREFIX + + Where the port installs itself (see + more on + PREFIX). + + + + + + + If you have to define the variable + MASTERDIR, do so before including + bsd.port.pre.mk. + - Here are some examples of things you can write after - bsd.port.pre.mk: + Here are some examples of things you can write after + bsd.port.pre.mk: - # no need to compile lang/perl5 if perl5 is already in system + # no need to compile lang/perl5 if perl5 is already in system .if ${OSVERSION} > 300003 BROKEN= perl is in system .endif - You did remember to use tab instead of spaces after - BROKEN= and - :-). - - - - Use the <function>exec</function> Statement in Wrapper - Scripts - - If the port installs a shell script whose purpose is to - launch another program, and if launching that program is the - last action performed by the script, make sure to launch the - program using the exec statement, for - instance: + You did remember to use tab instead of spaces after + BROKEN= and + :-). + + + + Use the <function>exec</function> Statement in Wrapper + Scripts + + If the port installs a shell script whose purpose is to + launch another program, and if launching that program is the + last action performed by the script, make sure to launch the + program using the exec statement, for + instance: - #!/bin/sh + #!/bin/sh exec %%LOCALBASE%%/bin/java -jar %%DATADIR%%/foo.jar "$@" - The exec statement replaces the shell - process with the specified program. If - exec is omitted, the shell process - remains in memory while the program is executing, and - needlessly consumes system resources. - - - - Do Things Rationally - - The Makefile should do things simply - and reasonably. If you can make it a couple of lines shorter - or more readable, then do so. Examples include using a make - .if construct instead of a shell - if construct, not redefining - do-extract if you can redefine - EXTRACT* instead, and using - GNU_CONFIGURE instead of - CONFIGURE_ARGS - += --prefix=${PREFIX}. - - If you find yourself having to write a lot of new code to - try to do something, please go back and review - bsd.port.mk to see if it contains an - existing implementation of what you are trying to do. While - hard to read, there are a great many seemingly-hard problems - for which bsd.port.mk already provides a - shorthand solution. - - - - Respect Both <varname>CC</varname> and - <varname>CXX</varname> - - The port must respect both CC and - CXX variables. What we mean by this is - that the port must not set the values of these variables - absolutely, overriding existing values; instead, it may - append whatever values it needs to the existing values. This - is so that build options that affect all ports can be set - globally. - - If the port does not respect these variables, - please add - NO_PACKAGE=ignores either cc or cxx to the - Makefile. - - An example of a Makefile respecting - both CC and CXX - variables follows. Note the ?=: - - CC?= gcc - - CXX?= g++ - - Here is an example which respects neither - CC nor CXX - variables: - - CC= gcc - - CXX= g++ - - Both CC and CXX - variables can be defined on &os; systems in - /etc/make.conf. The first example - defines a value if it was not previously set in - /etc/make.conf, preserving any - system-wide definitions. The second example clobbers - anything previously defined. - - - - Respect <varname>CFLAGS</varname> - - The port must respect the CFLAGS - variable. What we mean by this is that the port must not - set the value of this variable absolutely, overriding the - existing value; instead, it may append whatever values it - needs to the existing value. This is so that build options - that affect all ports can be set globally. - - If it does not, please add - NO_PACKAGE=ignores cflags to the - Makefile. - - An example of a Makefile respecting - the CFLAGS variable follows. Note the - +=: - - CFLAGS+= -Wall -Werror - - Here is an example which does not respect the - CFLAGS variable: - - CFLAGS= -Wall -Werror - - The CFLAGS variable is defined on - &os; systems in /etc/make.conf. The - first example appends additional flags to the - CFLAGS variable, preserving any system-wide - definitions. The second example clobbers anything previously - defined. - - You should remove optimization flags from the third party - Makefiles. System - CFLAGS contains system-wide optimization - flags. An example from an unmodified - Makefile: - - CFLAGS= -O3 -funroll-loops -DHAVE_SOUND - - Using system optimization flags, the - Makefile would look similar to the - following example: - - CFLAGS+= -DHAVE_SOUND - - - - Threading Libraries - - The threading library must be linked to the binaries using - a special flag -pthread on &os;. If - a port insists on linking -lpthread - directly, patch it to use -pthread. - - - If building the port errors out with - unrecognized option '-pthread', it may be - desirable to use cc as linker by setting - CONFIGURE_ENV to - LD=${CC}. The - -pthread option is not supported by - ld directly. - - - - - Feedback - - Do send applicable changes/patches to the original - author/maintainer for inclusion in next release of the code. - This will only make your job that much easier for the next - release. - - - - <filename>README.html</filename> - - README.html is not part of the port, - but generated by make readme. Do not - include this file in patches or commits. - - - If make readme fails, make sure that - the default value of ECHO_MSG has not - been modified by the port. - - - - - Marking a Port Not Installable with - <varname>BROKEN</varname>, <varname>FORBIDDEN</varname>, or - <varname>IGNORE</varname> - - In certain cases users should be prevented from installing - a port. To tell a user that a port should not be installed, - there are several make variables that can - be used in a port's Makefile. The value - of the following make variables will be the - reason that is given back to users for why the port refuses to - install itself. Please use the correct - make variable as each make variable conveys - radically different meanings to both users, and to automated - systems that depend on the Makefiles, - such as the ports build - cluster, FreshPorts, - and portsmon. - - - Variables - - - - BROKEN is reserved for ports that - currently do not compile, install, or deinstall - correctly. It should be used for ports where the - problem is believed to be temporary. - - If instructed, the build cluster will still attempt - to try to build them to see if the underlying problem - has been resolved. (However, in general, the cluster is - run without this.) - - For instance, use BROKEN when a - port: - - - - does not compile - - - - fails its configuration or installation - process - - - - installs files outside of - ${LOCALBASE} - - - - does not remove all its files cleanly upon - deinstall (however, it may be acceptable, and - desirable, for the port to leave user-modified files - behind) - - - - - - FORBIDDEN is used for ports that - contain a security vulnerability or induce grave concern - regarding the security of a &os; system with a given - port installed (e.g., a reputably insecure program or a - program that provides easily exploitable services). - Ports should be marked as FORBIDDEN - as soon as a particular piece of software has a - vulnerability and there is no released upgrade. Ideally - ports should be upgraded as soon as possible when a - security vulnerability is discovered so as to reduce the - number of vulnerable &os; hosts (we like being known - for being secure), however sometimes there is a - noticeable time gap between disclosure of a - vulnerability and an updated release of the vulnerable - software. Do not mark a port - FORBIDDEN for any reason other than - security. - - - - IGNORE is reserved for ports that - should not be built for some other reason. It should be - used for ports where the problem is believed to be - structural. The build cluster will not, under any - circumstances, build ports marked as - IGNORE. For instance, use - IGNORE when a port: - - - - compiles but does not run properly - - - - does not work on the installed version of - &os; - - - - has a distfile which may not be automatically - fetched due to licensing restrictions - - - - does not work with some other currently - installed port (for instance, the port depends on - www/apache20 but - www/apache22 is - installed) - - - - - If a port would conflict with a currently - installed port (for example, if they install a file in - the same place that performs a different function), - use - CONFLICTS instead. - CONFLICTS will set - IGNORE by itself. - - - - - If a port should be marked IGNORE - only on certain architectures, there are two other - convenience variables that will automatically set - IGNORE for you: - ONLY_FOR_ARCHS and - NOT_FOR_ARCHS. Examples: - - ONLY_FOR_ARCHS= i386 amd64 - - NOT_FOR_ARCHS= ia64 sparc64 - - A custom IGNORE message can be - set using ONLY_FOR_ARCHS_REASON and - NOT_FOR_ARCHS_REASON. Per - architecture entries are possible with - ONLY_FOR_ARCHS_REASON_ARCH - and - NOT_FOR_ARCHS_REASON_ARCH. - - - - If a port fetches i386 binaries and installs them, - IA32_BINARY_PORT should be set. If - this variable is set, it will be checked whether the - /usr/lib32 directory is available - for IA32 versions of libraries and whether the kernel - has IA32 compatibility compiled in. If one of these two - dependencies is not satisfied, IGNORE - will be set automatically. - - - - - - Implementation Notes - - The strings should not be quoted. - Also, the wording of the string should be somewhat - different due to the way the information is shown to the - user. Examples: - - BROKEN= fails to link with base -lcrypto - - IGNORE= unsupported on recent versions - - resulting in the following output from - make describe: - - ===> foobar-0.1 is marked as broken: fails to link with base -lcrypto. - - ===> foobar-0.1 is unsupported on recent versions. - - - - - Marking a Port for Removal with - <varname>DEPRECATED</varname> or - <varname>EXPIRATION_DATE</varname> - - Do remember that BROKEN and - FORBIDDEN are to be used as a temporary - resort if a port is not working. Permanently broken ports - should be removed from the tree entirely. - - When it makes sense to do so, users can be warned about - a pending port removal with DEPRECATED - and EXPIRATION_DATE. The former is - simply a string stating why the port is scheduled for removal; - the latter is a string in ISO 8601 format (YYYY-MM-DD). Both - will be shown to the user. - - It is possible to set DEPRECATED - without an EXPIRATION_DATE (for instance, - recommending a newer version of the port), but the converse - does not make any sense. - - There is no set policy on how much notice to give. - Current practice seems to be one month for security-related - issues and two months for build issues. This also gives any - interested committers a little time to fix the - problems. - - - - Avoid Use of the <literal>.error</literal> - Construct - - The correct way for a Makefile to - signal that the port can not be installed due to some external - factor (for instance, the user has specified an illegal - combination of build options) is to set a non-blank value to - IGNORE. This value will be formatted and - shown to the user by make install. - - It is a common mistake to use .error - for this purpose. The problem with this is that many - automated tools that work with the ports tree will fail in - this situation. The most common occurrence of this is seen - when trying to build /usr/ports/INDEX - (see ). However, even more - trivial commands such as make maintainer - also fail in this scenario. This is not acceptable. - - - How to Avoid Using <literal>.error</literal> - - The first of the - next two Makefile snippets will cause - make index to fail, while the second one - will not: - - .error "option is not supported" - - IGNORE=option is not supported - - - - - Usage of <filename>sysctl</filename> - - The usage of sysctl is discouraged - except in targets. This is because the evaluation of any - makevars, such as used during - make index, then has to run the command, - further slowing down that process. - - Usage of &man.sysctl.8; should always be done with the - SYSCTL variable, as it contains the fully - qualified path and can be overridden, if one has such a - special need. - - - - Rerolling Distfiles - - Sometimes the authors of software change the content of - released distfiles without changing the file's name. You have - to verify that the changes are official and have been - performed by the author. It has happened in the past that the - distfile was silently altered on the download servers with the - intent to cause harm or compromise end user security. - - Put the old distfile aside, download the new one, unpack - them and compare the content with &man.diff.1;. If you see - nothing suspicious, you can update - distinfo. Be sure to summarize the - differences in your PR or commit log, so that other people - know that you have taken care to ensure that nothing bad has - happened. - - You might also want to contact the authors of the software - and confirm the changes with them. - - - - Avoiding Linuxisms - - Do not use /proc if there are any - other ways of getting the information, e.g., - setprogname(argv[0]) in - main() and then &man.getprogname.3; if - you want to know your name. - - Do not rely on behaviour that is undocumented by - POSIX. - - Do not record timestamps in the critical path of the - application if it also works without. Getting timestamps may - be slow, depending on the accuracy of timestamps in the - OS. If timestamps are really needed, - determine how precise they have to be and use an - API which is documented to just deliver the - needed precision. - - A number of simple syscalls (for example - &man.gettimeofday.2;, &man.getpid.2;) are much faster on - &linux; than on any other operating system due to caching and - the vsyscall performance optimizations. Do not rely on them - being cheap in performance-critical applications. In general, - try hard to avoid syscalls if possible. - - Do not rely on &linux;-specific socket behaviour. In - particular, default socket buffer sizes are different (call - &man.setsockopt.2; with SO_SNDBUF and - SO_RCVBUF, and while &linux;'s &man.send.2; - blocks when the socket buffer is full, &os;'s will fail and - set ENOBUFS in errno. - - If relying on non-standard behaviour is required, - encapsulate it properly into a generic API, - do a check for the behaviour in the configure stage, and stop - if it is missing. - - Check the - man - pages to see if the function used is a - POSIX interface (in the - STANDARDS section of the man page). - - Do not assume that /bin/sh is - bash. Ensure that a command line - passed to &man.system.3; will work with a - POSIX compliant shell. - - A list of common bashisms is - available here. - - Check that headers are included in the - POSIX or man page recommended way, e.g., - sys/types.h is often forgotten, which is - not as much of a problem for &linux; as it is for &os;. - - Compile threaded applications with - -pthread, not -lpthread or - variations thereof. - - - - Miscellanea - - The files pkg-descr and - pkg-plist should each be double-checked. - If you are reviewing a port and feel they can be worded - better, do so. - - Do not copy more copies of the GNU General Public License - into our system, please. - - Please be careful to note any legal issues! Do not let us - illegally distribute software! - - - + The exec statement replaces the shell + process with the specified program. If + exec is omitted, the shell process remains + in memory while the program is executing, and needlessly + consumes system resources. + + + + Do Things Rationally + + The Makefile should do things simply + and reasonably. If you can make it a couple of lines shorter or + more readable, then do so. Examples include using a make + .if construct instead of a shell + if construct, not redefining + do-extract if you can redefine + EXTRACT* instead, and using + GNU_CONFIGURE instead of + CONFIGURE_ARGS + += --prefix=${PREFIX}. + + If you find yourself having to write a lot of new code to + try to do something, please go back and review + bsd.port.mk to see if it contains an + existing implementation of what you are trying to do. While + hard to read, there are a great many seemingly-hard problems for + which bsd.port.mk already provides a + shorthand solution. + + + + Respect Both <varname>CC</varname> and + <varname>CXX</varname> + + The port must respect both CC and + CXX variables. What we mean by this is that + the port must not set the values of these variables absolutely, + overriding existing values; instead, it may append whatever + values it needs to the existing values. This is so that build + options that affect all ports can be set globally. + + If the port does not respect these variables, + please add + NO_PACKAGE=ignores either cc or cxx to the + Makefile. + + An example of a Makefile respecting + both CC and CXX + variables follows. Note the ?=: + + CC?= gcc + + CXX?= g++ + + Here is an example which respects neither + CC nor CXX + variables: + + CC= gcc + + CXX= g++ + + Both CC and CXX + variables can be defined on &os; systems in + /etc/make.conf. The first example defines + a value if it was not previously set in + /etc/make.conf, preserving any system-wide + definitions. The second example clobbers anything previously + defined. + + + + Respect <varname>CFLAGS</varname> + + The port must respect the CFLAGS + variable. What we mean by this is that the port must not set + the value of this variable absolutely, overriding the existing + value; instead, it may append whatever values it needs to the + existing value. This is so that build options that affect all + ports can be set globally. + + If it does not, please add + NO_PACKAGE=ignores cflags to the + Makefile. + + An example of a Makefile respecting + the CFLAGS variable follows. Note the + +=: + + CFLAGS+= -Wall -Werror + + Here is an example which does not respect the + CFLAGS variable: + + CFLAGS= -Wall -Werror + *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-doc-head@FreeBSD.ORG Sun Feb 9 23:19:18 2014 Return-Path: Delivered-To: svn-doc-head@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 ESMTPS id 2338614C; Sun, 9 Feb 2014 23:19:18 +0000 (UTC) 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 E83AA1261; Sun, 9 Feb 2014 23:19:17 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s19NJHt5085149; Sun, 9 Feb 2014 23:19:17 GMT (envelope-from wblock@svn.freebsd.org) Received: (from wblock@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s19NJHlS085148; Sun, 9 Feb 2014 23:19:17 GMT (envelope-from wblock@svn.freebsd.org) Message-Id: <201402092319.s19NJHlS085148@svn.freebsd.org> From: Warren Block Date: Sun, 9 Feb 2014 23:19:17 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r43853 - head/en_US.ISO8859-1/books/porters-handbook/porting-samplem X-SVN-Group: doc-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the doc tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Feb 2014 23:19:18 -0000 Author: wblock Date: Sun Feb 9 23:19:17 2014 New Revision: 43853 URL: http://svnweb.freebsd.org/changeset/doc/43853 Log: Whitespace-only fixes, translators please ignore. Modified: head/en_US.ISO8859-1/books/porters-handbook/porting-samplem/chapter.xml Modified: head/en_US.ISO8859-1/books/porters-handbook/porting-samplem/chapter.xml ============================================================================== --- head/en_US.ISO8859-1/books/porters-handbook/porting-samplem/chapter.xml Sun Feb 9 23:16:49 2014 (r43852) +++ head/en_US.ISO8859-1/books/porters-handbook/porting-samplem/chapter.xml Sun Feb 9 23:19:17 2014 (r43853) @@ -5,22 +5,24 @@ $FreeBSD$ --> - + + + A Sample <filename>Makefile</filename> + + Here is a sample Makefile that you can + use to create a new port. Make sure you remove all the extra + comments (ones between brackets)! + + It is recommended that you follow this format (ordering of + variables, empty lines between sections, etc.). This format is + designed so that the most important information is easy to locate. + We recommend that you use + portlint to check the + Makefile. - A Sample <filename>Makefile</filename> - - Here is a sample Makefile that you can - use to create a new port. Make sure you remove all the extra - comments (ones between brackets)! - - It is recommended that you follow this format (ordering of - variables, empty lines between sections, etc.). This format is - designed so that the most important information is easy to - locate. We recommend that you use - portlint to check the - Makefile. - - [the header...just to make it easier for us to identify the ports.] + [the header...just to make it easier for us to identify the ports.] # Created by: Satoshi Asami <asami@FreeBSD.org> [The optional Created by: line names the person who originally created the port. Note that the : is followed by a space @@ -99,5 +101,4 @@ pre-install: [and then the epilogue] .include <bsd.port.mk> - - + From owner-svn-doc-head@FreeBSD.ORG Sun Feb 9 23:21:15 2014 Return-Path: Delivered-To: svn-doc-head@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 ESMTPS id 7E7591B8; Sun, 9 Feb 2014 23:21:15 +0000 (UTC) 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 66BE112C8; Sun, 9 Feb 2014 23:21:15 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s19NLFG5087853; Sun, 9 Feb 2014 23:21:15 GMT (envelope-from wblock@svn.freebsd.org) Received: (from wblock@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s19NLFxm087852; Sun, 9 Feb 2014 23:21:15 GMT (envelope-from wblock@svn.freebsd.org) Message-Id: <201402092321.s19NLFxm087852@svn.freebsd.org> From: Warren Block Date: Sun, 9 Feb 2014 23:21:15 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r43854 - head/en_US.ISO8859-1/books/porters-handbook/porting-why X-SVN-Group: doc-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the doc tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Feb 2014 23:21:15 -0000 Author: wblock Date: Sun Feb 9 23:21:14 2014 New Revision: 43854 URL: http://svnweb.freebsd.org/changeset/doc/43854 Log: Whitespace-only fixes, translators please ignore. Modified: head/en_US.ISO8859-1/books/porters-handbook/porting-why/chapter.xml Modified: head/en_US.ISO8859-1/books/porters-handbook/porting-why/chapter.xml ============================================================================== --- head/en_US.ISO8859-1/books/porters-handbook/porting-why/chapter.xml Sun Feb 9 23:19:17 2014 (r43853) +++ head/en_US.ISO8859-1/books/porters-handbook/porting-why/chapter.xml Sun Feb 9 23:21:14 2014 (r43854) @@ -4,19 +4,19 @@ $FreeBSD$ --> - - - Introduction - - The &os; Ports Collection is the way almost everyone - installs applications ("ports") on &os;. Like everything - else about &os;, it is primarily a volunteer effort. - It is important to keep this in mind when reading this - document. - - In &os;, anyone may submit a new port, or volunteer - to maintain an existing port if it is unmaintained—you - do not need any special commit privileges to do so. - - + + + Introduction + + The &os; Ports Collection is the way almost everyone installs + applications ("ports") on &os;. Like everything else about &os;, + it is primarily a volunteer effort. It is important to keep this + in mind when reading this document. + + In &os;, anyone may submit a new port, or volunteer to + maintain an existing port if it is unmaintained—you do not + need any special commit privileges to do so. + From owner-svn-doc-head@FreeBSD.ORG Mon Feb 10 15:33:03 2014 Return-Path: Delivered-To: svn-doc-head@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 ESMTPS id 081D669D; Mon, 10 Feb 2014 15:33:03 +0000 (UTC) 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 CD7761895; Mon, 10 Feb 2014 15:33:02 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1AFX2ba084786; Mon, 10 Feb 2014 15:33:02 GMT (envelope-from ryusuke@svn.freebsd.org) Received: (from ryusuke@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1AFX2qi084785; Mon, 10 Feb 2014 15:33:02 GMT (envelope-from ryusuke@svn.freebsd.org) Message-Id: <201402101533.s1AFX2qi084785@svn.freebsd.org> From: Ryusuke SUZUKI Date: Mon, 10 Feb 2014 15:33:02 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r43858 - head/ja_JP.eucJP/books/handbook/preface X-SVN-Group: doc-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the doc tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Feb 2014 15:33:03 -0000 Author: ryusuke Date: Mon Feb 10 15:33:02 2014 New Revision: 43858 URL: http://svnweb.freebsd.org/changeset/doc/43858 Log: - Merge the following from the English version: r21372 -> r21473 head/ja_JP.eucJP/books/handbook/preface/preface.xml Modified: head/ja_JP.eucJP/books/handbook/preface/preface.xml Modified: head/ja_JP.eucJP/books/handbook/preface/preface.xml ============================================================================== --- head/ja_JP.eucJP/books/handbook/preface/preface.xml Mon Feb 10 12:11:12 2014 (r43857) +++ head/ja_JP.eucJP/books/handbook/preface/preface.xml Mon Feb 10 15:33:02 2014 (r43858) @@ -3,7 +3,7 @@ The FreeBSD Documentation Project The FreeBSD Japanese Documentation Project - Original revision: 1.20 + Original revision: r21473 $FreeBSD$ --> @@ -211,6 +211,14 @@ ¥Í¥Ã¥È¥ï¡¼¥¯¥Õ¥¡¥¤¥¢¥¦¥©¡¼¥ë¤È¤¤¤Ã¤¿ÍøÍѲÄǽ¤ÊÍÍ¡¹¤Ê¥Ä¡¼¥ë¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Æ¤¤¤Þ¤¹¡£ + , ¥×¥ê¥ó¥¿¤ÎÍøÍÑ @@ -267,11 +275,18 @@ , ¹âÅ٤ʥͥåȥ¥¯ LAN ¾å¤Î¾¤Î¥³¥ó¥Ô¥å¡¼¥¿¤È¥¤¥ó¥¿¡¼¥Í¥Ã¥ÈÀܳ¤Î¶¦Í­¡¢ - ¥Í¥Ã¥È¥ï¡¼¥¯¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤ÎÍøÍÑ¡¢NIS ·Ðͳ¤Î¥¢¥«¥¦¥ó¥È¾ðÊó¤Î¶¦Í­¡¢ - ¥É¥á¥¤¥ó¥Í¡¼¥à¥µ¡¼¥Ð¤ÎÀßÄêÅù¡¹¡¢ - ¥Í¥Ã¥È¥ï¡¼¥¯¤Ë´Ø¤¹¤ëÍÍ¡¹¤ÊÏÃÂê¤ò¼è¤ê°·¤Ã¤Æ¤¤¤Þ¤¹¡£ + ¹âÅ٤ʥ롼¥Æ¥£¥ó¥°¤Ë´Ø¤¹¤ë¥È¥Ô¥Ã¥¯¥¹¡¢¥ï¥¤¥ä¥ì¥¹¥Í¥Ã¥È¥ï¡¼¥¯¡¢ + bluetooth, ATM, IPv6 Åù¡¹¡¢ + ¥Í¥Ã¥È¥ï¡¼¥¯¤Ë´Ø¤¹¤ë¤µ¤Þ¤¶¤Þ¤ÊÏÃÂê¤ò¼è¤ê°·¤Ã¤Æ¤¤¤Þ¤¹¡£ + , ÅŻҥ᡼¥ë From owner-svn-doc-head@FreeBSD.ORG Mon Feb 10 15:49:03 2014 Return-Path: Delivered-To: svn-doc-head@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 ESMTPS id A7D55C18; Mon, 10 Feb 2014 15:49:03 +0000 (UTC) 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 920CD19B4; Mon, 10 Feb 2014 15:49:03 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1AFn3IB089262; Mon, 10 Feb 2014 15:49:03 GMT (envelope-from jgh@svn.freebsd.org) Received: (from jgh@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1AFn3Pi089261; Mon, 10 Feb 2014 15:49:03 GMT (envelope-from jgh@svn.freebsd.org) Message-Id: <201402101549.s1AFn3Pi089261@svn.freebsd.org> From: Jason Helfman Date: Mon, 10 Feb 2014 15:49:03 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r43859 - head/en_US.ISO8859-1/htdocs/news X-SVN-Group: doc-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the doc tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Feb 2014 15:49:03 -0000 Author: jgh Date: Mon Feb 10 15:49:03 2014 New Revision: 43859 URL: http://svnweb.freebsd.org/changeset/doc/43859 Log: - cleanup
  • empty content on news page - while here remov bsdnews.{com,org} as they have not resurfaced since 2008 Approved by: remko (mentor) Modified: head/en_US.ISO8859-1/htdocs/news/news.xml Modified: head/en_US.ISO8859-1/htdocs/news/news.xml ============================================================================== --- head/en_US.ISO8859-1/htdocs/news/news.xml Mon Feb 10 15:33:02 2014 (r43858) +++ head/en_US.ISO8859-1/htdocs/news/news.xml Mon Feb 10 15:49:03 2014 (r43859) @@ -54,17 +54,6 @@ Active online forums and news community site dedicated to FreeBSD and other BSDs.

    • - -
  • - -

  • FreeBSD Diary: From owner-svn-doc-head@FreeBSD.ORG Mon Feb 10 16:01:59 2014 Return-Path: Delivered-To: svn-doc-head@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 ESMTPS id 05ABDEA6; Mon, 10 Feb 2014 16:01:59 +0000 (UTC) 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 DD27B1AF3; Mon, 10 Feb 2014 16:01:58 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1AG1w6D095310; Mon, 10 Feb 2014 16:01:58 GMT (envelope-from dru@svn.freebsd.org) Received: (from dru@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1AG1wHK095309; Mon, 10 Feb 2014 16:01:58 GMT (envelope-from dru@svn.freebsd.org) Message-Id: <201402101601.s1AG1wHK095309@svn.freebsd.org> From: Dru Lavigne Date: Mon, 10 Feb 2014 16:01:58 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r43860 - head/en_US.ISO8859-1/books/handbook/l10n X-SVN-Group: doc-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the doc tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Feb 2014 16:01:59 -0000 Author: dru Date: Mon Feb 10 16:01:57 2014 New Revision: 43860 URL: http://svnweb.freebsd.org/changeset/doc/43860 Log: Incorporate "The Basics" into the Synopsis. Sponsored by: iXsystems Modified: head/en_US.ISO8859-1/books/handbook/l10n/chapter.xml Modified: head/en_US.ISO8859-1/books/handbook/l10n/chapter.xml ============================================================================== --- head/en_US.ISO8859-1/books/handbook/l10n/chapter.xml Mon Feb 10 15:49:03 2014 (r43859) +++ head/en_US.ISO8859-1/books/handbook/l10n/chapter.xml Mon Feb 10 16:01:57 2014 (r43860) @@ -23,11 +23,38 @@ Synopsis &os; is a distributed project with users and contributors - located all over the world. This chapter discusses the - internationalization and localization features of &os; that - allow non-English speaking users to get real work done. Since + located all over the world. As such, &os; supports localization + into many languages. This allows a user to view, input, or process data in non-English + languages. Currently, one can choose from most of the + major languages, including but not limited to: Chinese, + German, Japanese, Korean, French, Russian, and + Vietnamese. + + + internationalization + localization + + localization + + The term internationalization has been shortened to + i18n, which represents the number of + letters between the first and the last letters of + internationalization. L10n uses the + same naming scheme, coming from localization. + Combined together, + i18n/L10n methods, + protocols, and applications allow users to use languages of + their choice. + + i18n applications are programmed using + i18n kits under libraries. These allow + developers to write a simple file and translate displayed + menus and texts to each language. + + This chapter discusses the + internationalization and localization features of &os;. Since there are many aspects of the i18n - implementation in both the system and application levels, more + implementation at both the system and application levels, more specific sources of documentation are referred to, where applicable. @@ -68,55 +95,6 @@ - - The Basics - - - What Is - <acronym>i18n</acronym>/<acronym>L10n</acronym>? - - - internationalization - localization - - localization - - The term internationalization has been shortened to - i18n, which represents the number of - letters between the first and the last letters of - internationalization. L10n uses the - same naming scheme, coming from localization. - Combined together, - i18n/L10n methods, - protocols, and applications allow users to use languages of - their choice. - - i18n applications are programmed using - i18n kits under libraries. These allow - developers to write a simple file and translate displayed - menus and texts to each language. - - - - Why Use - <acronym>i18n</acronym>/<acronym>L10n</acronym>? - - Using i18n/L10n - allows a user to view, input, or process data in non-English - languages. - - - - Which Languages Are Supported? - - i18n and L10n are - not &os; specific. Currently, one can choose from most of the - major languages, including but not limited to: Chinese, - German, Japanese, Korean, French, Russian, and - Vietnamese. - - - Using Localization From owner-svn-doc-head@FreeBSD.ORG Mon Feb 10 16:12:23 2014 Return-Path: Delivered-To: svn-doc-head@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 ESMTPS id 49D97155; Mon, 10 Feb 2014 16:12:23 +0000 (UTC) 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 262721BEC; Mon, 10 Feb 2014 16:12:23 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1AGCN9P099561; Mon, 10 Feb 2014 16:12:23 GMT (envelope-from dru@svn.freebsd.org) Received: (from dru@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1AGCNQu099560; Mon, 10 Feb 2014 16:12:23 GMT (envelope-from dru@svn.freebsd.org) Message-Id: <201402101612.s1AGCNQu099560@svn.freebsd.org> From: Dru Lavigne Date: Mon, 10 Feb 2014 16:12:22 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r43861 - head/en_US.ISO8859-1/books/handbook/l10n X-SVN-Group: doc-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the doc tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Feb 2014 16:12:23 -0000 Author: dru Date: Mon Feb 10 16:12:22 2014 New Revision: 43861 URL: http://svnweb.freebsd.org/changeset/doc/43861 Log: White space fix only. Translators can ignore. Sponsored by: iXsystems Modified: head/en_US.ISO8859-1/books/handbook/l10n/chapter.xml Modified: head/en_US.ISO8859-1/books/handbook/l10n/chapter.xml ============================================================================== --- head/en_US.ISO8859-1/books/handbook/l10n/chapter.xml Mon Feb 10 16:01:57 2014 (r43860) +++ head/en_US.ISO8859-1/books/handbook/l10n/chapter.xml Mon Feb 10 16:12:22 2014 (r43861) @@ -5,58 +5,59 @@ $FreeBSD$ --> - Localization - - <acronym>i18n</acronym>/<acronym>L10n</acronym> Usage and - Setup + + Localization - + <acronym>i18n</acronym>/<acronym>L10n</acronym> Usage and + Setup + - AndreyChernovContributed by + AndreyChernovContributed + by - Michael C.WuRewritten by + Michael + C.WuRewritten + by - - Synopsis &os; is a distributed project with users and contributors located all over the world. As such, &os; supports localization - into many languages. This allows a user to view, input, or process data in non-English - languages. Currently, one can choose from most of the - major languages, including but not limited to: Chinese, - German, Japanese, Korean, French, Russian, and - Vietnamese. + into many languages. This allows a user to view, input, or + process data in non-English languages. Currently, one can + choose from most of the major languages, including but not + limited to: Chinese, German, Japanese, Korean, French, Russian, + and Vietnamese. - - internationalization + + internationalization localization - - localization + + localization - The term internationalization has been shortened to - i18n, which represents the number of - letters between the first and the last letters of - internationalization. L10n uses the - same naming scheme, coming from localization. - Combined together, - i18n/L10n methods, - protocols, and applications allow users to use languages of - their choice. - - i18n applications are programmed using - i18n kits under libraries. These allow - developers to write a simple file and translate displayed - menus and texts to each language. - - This chapter discusses the - internationalization and localization features of &os;. Since - there are many aspects of the i18n - implementation at both the system and application levels, more - specific sources of documentation are referred to, where - applicable. + The term internationalization has been shortened to + i18n, which represents the number of letters + between the first and the last letters of internationalization. + L10n uses the same naming scheme, coming from + localization. Combined together, + i18n/L10n methods, + protocols, and applications allow users to use languages of + their choice. + + i18n applications are programmed using + i18n kits under libraries. These allow + developers to write a simple file and translate displayed menus + and texts to each language. + + This chapter discusses the internationalization and + localization features of &os;. Since there are many aspects of + the i18n implementation at both the system + and application levels, more specific sources of documentation + are referred to, where applicable. After reading this chapter, you will know: @@ -193,7 +194,8 @@ The active list of character sets can be found at the - IANA + IANA Registry. @@ -402,7 +404,8 @@ me:\ This method is not recommended because it requires - a different setup for each shell. Use the Login Class Method + a different setup for each shell. Use the Login Class Method instead. @@ -496,10 +499,11 @@ keychange="fkey_number sequ mousechar_start=3 The keymap_name in the above - example is taken from /usr/share/syscons/keymaps, - without the .kbd suffix. When uncertain - as to which keymap to use, &man.kbdmap.1; can be used to test - keymaps without rebooting. + example is taken from + /usr/share/syscons/keymaps, without the + .kbd suffix. When uncertain as to which + keymap to use, &man.kbdmap.1; can be used to test keymaps + without rebooting. The keychange is usually needed to program function keys to match the selected terminal type @@ -695,12 +699,14 @@ keychange="fkey_number sequ Localizing &os; to Specific Languages - Russian Language (KOI8-R Encoding) + + Russian Language (KOI8-R Encoding) + - AndreyChernovOriginally contributed by + AndreyChernovOriginally + contributed by - localization @@ -790,7 +796,8 @@ mousechar_start=3 When using &xorg;, - install the x11-fonts/xorg-fonts-cyrillic + install the + x11-fonts/xorg-fonts-cyrillic package. Check the "Files" section in @@ -819,11 +826,13 @@ Option "XkbOptions" "grp:toggle"For grp:toggle use Right Alt, for - grp:ctrl_shift_toggle use CtrlShift. + grp:ctrl_shift_toggle use CtrlShift. For grp:caps_toggle use CapsLock. The old CapsLock function is still available - in LAT mode only using ShiftCapsLock. + in LAT mode only using ShiftCapsLock. grp:caps_toggle does not work in &xorg; for some unknown reason. @@ -863,7 +872,8 @@ Option "XkbOptions" "grp:toggle"Traditional Chinese The &os;-Taiwan Project has a Chinese HOWTO for - &os; at http://netlab.cse.yzu.edu.tw/~statue/freebsd/zh-tut/ + &os; at http://netlab.cse.yzu.edu.tw/~statue/freebsd/zh-tut/ using many Chinese ports. The current editor for the &os; Chinese HOWTO is Shen Chuan-Hsing statue@freebsd.sinica.edu.tw. @@ -880,7 +890,8 @@ Option "XkbOptions" "grp:toggle"Slaven Rezic eserte@cs.tu-berlin.de wrote a tutorial on using umlauts on &os;. The tutorial - is written in German and is available at http://user.cs.tu-berlin.de/~eserte/FreeBSD/doc/umlaute/umlaute.html. + is written in German and is available at http://user.cs.tu-berlin.de/~eserte/FreeBSD/doc/umlaute/umlaute.html. @@ -892,7 +903,8 @@ Option "XkbOptions" "grp:toggle" Nikos Kokkalis nickkokkalis@gmail.com has written a complete article on Greek support in &os;. It is - available here, + available here, in Greek only, as part of the official &os; Greek documentation. @@ -908,10 +920,10 @@ Option "XkbOptions" "grp:toggle"localization Korean - For Japanese, refer to - http://www.jp.FreeBSD.org/, - and for Korean, refer to - http://www.kr.FreeBSD.org/. + For Japanese, refer to http://www.jp.FreeBSD.org/, + and for Korean, refer to http://www.kr.FreeBSD.org/. @@ -919,8 +931,8 @@ Option "XkbOptions" "grp:toggle"Some &os; contributors have translated parts of the &os; documentation to other languages. They are available - through links on the - main site or in + through links on the main site or in /usr/share/doc. From owner-svn-doc-head@FreeBSD.ORG Mon Feb 10 16:17:00 2014 Return-Path: Delivered-To: svn-doc-head@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 ESMTPS id 543C8446; Mon, 10 Feb 2014 16:17:00 +0000 (UTC) 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 3F7A01C2D; Mon, 10 Feb 2014 16:17:00 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1AGH0HE000380; Mon, 10 Feb 2014 16:17:00 GMT (envelope-from ryusuke@svn.freebsd.org) Received: (from ryusuke@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1AGH0mw000379; Mon, 10 Feb 2014 16:17:00 GMT (envelope-from ryusuke@svn.freebsd.org) Message-Id: <201402101617.s1AGH0mw000379@svn.freebsd.org> From: Ryusuke SUZUKI Date: Mon, 10 Feb 2014 16:17:00 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r43862 - head/ja_JP.eucJP/books/handbook/preface X-SVN-Group: doc-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the doc tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Feb 2014 16:17:00 -0000 Author: ryusuke Date: Mon Feb 10 16:16:59 2014 New Revision: 43862 URL: http://svnweb.freebsd.org/changeset/doc/43862 Log: - Merge the following from the English version: r21473 -> r21479 head/ja_JP.eucJP/books/handbook/preface/preface.xml Modified: head/ja_JP.eucJP/books/handbook/preface/preface.xml Modified: head/ja_JP.eucJP/books/handbook/preface/preface.xml ============================================================================== --- head/ja_JP.eucJP/books/handbook/preface/preface.xml Mon Feb 10 16:12:22 2014 (r43861) +++ head/ja_JP.eucJP/books/handbook/preface/preface.xml Mon Feb 10 16:16:59 2014 (r43862) @@ -3,7 +3,7 @@ The FreeBSD Documentation Project The FreeBSD Japanese Documentation Project - Original revision: r21473 + Original revision: r21479 $FreeBSD$ --> @@ -118,19 +118,26 @@ ¤³¤Îʸ½ñ¤Î¹½À® - ¤³¤Îʸ½ñ¤Ï 3 Éô¹½À®¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£ + ¤³¤Îʸ½ñ¤Ï 5 Éô¹½À®¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£ Âè 1 ÉôƳÆþ¤Ç¤Ï¡¢ FreeBSD ¤Î¥¤¥ó¥¹¥È¡¼¥ë¤È´ðËÜŪ¤Ê»È¤¤Êý¤ò°·¤¤¤Þ¤¹¡£ ³Æ¾Ï¤Ï½ç¤ËÆɤळ¤È¤òÁÛÄꤷ¤Æ¤¤¤Þ¤¹¤¬¡¢ ÆëÀ÷¤ß¿¼¤¤ÏÃÂê¤ò°·¤Ã¤¿¾Ï¤ÏÈô¤Ð¤·¤Æ¤â¤è¤¤¤Ç¤·¤ç¤¦¡£ - Âè 2 Éô¥·¥¹¥Æ¥à´ÉÍý¤Ï¡¢¤è¤ê¾åµé¤Î - FreeBSD ¥æ¡¼¥¶¤Î´Ø¿´¤ò¤Ò¤¯ÏÃÂê¤ò¹­¤¯°·¤Ã¤Æ¤¤¤Þ¤¹¡£ + Âè 2 ÉôÆü¡¹¤ÎÀ¸³è¤Ç¤Ï¡¢ + FreeBSD ¤ÇÎɤ¯»È¤ï¤ì¤ëµ¡Ç½¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Þ¤¹¡£ + ¤³¤Î¾Ï¤È¤½¤ì¤Ë³¤¯¾Ï¤Ï¡¢½çÉÔƱ¤ËÆɤळ¤È¤¬¤Ç¤­¤Þ¤¹¡£ ³Æ¾Ï¤Î»Ï¤á¤Ë¤Ï¤½¤Î¾Ï¤¬²¿¤ò°·¤Ã¤Æ¤¤¤Æ¡¢ ÆɼԤˤɤó¤ÊͽÈ÷Ã챤¬´üÂÔ¤µ¤ì¤ë¤«¤ò´Ê·é¤Ë½Ò¤Ù¤¿³µÍפ¬¤ª¤«¤ì¤Æ¤¤¤Þ¤¹¡£ - ¤³¤ì¤Ï¡¢¤½¤Î¾Ï¤Ë´Ø¿´¤Î¤Ê¤¤ÆɼԤ¬¤½¤³¤òÈô¤Ð¤·¤Æ¶½Ì£¤Î¤¢¤ë¾Ï¤ò¸«¤Ä¤±¤é¤ì¤ë¤è¤¦¤Ë¤¹¤ë¤¿¤á¤Ç¤¹¡£ - Âè 3 Éô¤Ï»²¹Í¾ðÊ󤫤é¤Ê¤ëÉÕÏ¿¤Ç¤¹¡£ + Âè 3 Éô¥·¥¹¥Æ¥à´ÉÍý¤Ï¡¢ + ¥·¥¹¥Æ¥à´ÉÍý¤Ë´Ø¤¹¤ëÏÃÂê¤ò°·¤Ã¤Æ¤¤¤Þ¤¹¡£ + Âè 4 Éô¥Í¥Ã¥È¥ï¡¼¥¯ÄÌ¿®¤Ç¤Ï¡¢ + ¥Í¥Ã¥È¥ï¡¼¥¯¤ª¤è¤Ó¥µ¡¼¥Ð¤Ë´Ø¤¹¤ëÏÃÂê¤ò°·¤Ã¤Æ¤¤¤Þ¤¹¡£ + Âè 5 Éô¤Ï»²¹Í¾ðÊ󤫤é¤Ê¤ëÉÕÏ¿¤Ç¤¹¡£ + + + , ¤Ï¤¸¤á¤Ë @@ -171,6 +178,52 @@ ¤Î¤è¤¦¤Ê°ìÈÌŪ¤Ê¥Ç¥¹¥¯¥È¥Ã¥×´Ä¶­¤Ë¤â¿¨¤ì¤Æ¤¤¤Þ¤¹¡£ + + + + + , ¥Ç¥¹¥¯¥È¥Ã¥×¥¢¥×¥ê¥±¡¼¥·¥ç¥ó + + Web ¥Ö¥é¥¦¥¶¤äÀ¸»ºÀ­¸þ¾å¥Ä¡¼¥ë¤Î¤è¤¦¤Ê°ìÈÌŪ¤Ê¥Ç¥¹¥¯¥È¥Ã¥×¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤ò¤¤¤¯¤Ä¤«µó¤²¡¢ + FreeBSD ¤Ë¤ª¤±¤ë¥¤¥ó¥¹¥È¡¼¥ëÊýË¡¤òÀâÌÀ¤·¤Æ¤¤¤Þ¤¹¡£ + + + + , ¥Þ¥ë¥Á¥á¥Ç¥£¥¢ + + ¥·¥¹¥Æ¥à¤ò²»À¼¤ä¥Ó¥Ç¥ªºÆÀ¸¤ËÂбþ¤µ¤»¤ë¤¿¤á¤Ë¤É¤¦ÀßÄꤹ¤ë¤«¤òÀâÌÀ¤·¤Þ¤¹¡£ + ¤Þ¤¿¡¢²»À¼¤ä¥Ó¥Ç¥ª¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤âÎ㼨¤·¤Æ¤¤¤Þ¤¹¡£ + + + + , FreeBSD + ¥«¡¼¥Í¥ë¤Î¥³¥ó¥Õ¥£¥°¥ì¡¼¥·¥ç¥ó + + ¤É¤Î¤è¤¦¤Ê¾ì¹ç¤Ë¿·¤¿¤Ë¥«¡¼¥Í¥ë¤ò¹½À®¤¹¤ëɬÍפ¬¤¢¤ë¤«¤òÀâÌÀ¤·¡¢ + ¥«¥¹¥¿¥à¥«¡¼¥Í¥ë¤Î¥³¥ó¥Õ¥£¥°¥ì¡¼¥·¥ç¥ó¡¢¹½ÃÛ¡¢ + ¥¤¥ó¥¹¥È¡¼¥ë¤Ë¤Ä¤¤¤Æ¾Ü¤·¤¯ÀâÌÀ¤·¤Æ¤¤¤Þ¤¹¡£ + + + + , ¥×¥ê¥ó¥¿¤ÎÍøÍÑ + + FreeBSD ¤Ë¤ª¤±¤ë¥×¥ê¥ó¥¿¤Î¼è¤ê°·¤¤¤òÀâÌÀ¤·¤Æ¤¤¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢ + ¥Ð¥Ê¡¼¥Ú¡¼¥¸¡¢¥×¥ê¥ó¥¿¡¼¤Î²Ý¶â¡¢½é´üÀßÄê¤È¤¤¤Ã¤¿¤³¤È¤Ç¤¹¡£ + + + + , Linux ¥Ð¥¤¥Ê¥ê¸ß´¹µ¡Ç½ + + FreeBSD ¤Î Linux ¥Ð¥¤¥Ê¥ê¸ß´¹µ¡Ç½¤òÀâÌÀ¤·¤Æ¤¤¤Þ¤¹¡£¤Þ¤¿¡¢ + &oracle;, + &sap.r3;, + &mathematica; ¤È¤¤¤Ã¤¿¿Íµ¤¤Î¹â¤¤ + Linux ¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Î¥¤¥ó¥¹¥È¡¼¥ë¤ò¾Ü¤·¤¯ÀâÌÀ¤·¤Æ¤¤¤Þ¤¹¡£ + + + + + , ÀßÄê¤È¥Á¥å¡¼¥Ë¥ó¥° @@ -196,15 +249,6 @@ - , FreeBSD - ¥«¡¼¥Í¥ë¤Î¥³¥ó¥Õ¥£¥°¥ì¡¼¥·¥ç¥ó - - ¤É¤Î¤è¤¦¤Ê¾ì¹ç¤Ë¿·¤¿¤Ë¥«¡¼¥Í¥ë¤ò¹½À®¤¹¤ëɬÍפ¬¤¢¤ë¤«¤òÀâÌÀ¤·¡¢ - ¥«¥¹¥¿¥à¥«¡¼¥Í¥ë¤Î¥³¥ó¥Õ¥£¥°¥ì¡¼¥·¥ç¥ó¡¢¹½ÃÛ¡¢ - ¥¤¥ó¥¹¥È¡¼¥ë¤Ë¤Ä¤¤¤Æ¾Ü¤·¤¯ÀâÌÀ¤·¤Æ¤¤¤Þ¤¹¡£ - - - , ¥»¥­¥å¥ê¥Æ¥£ FreeBSD ¥·¥¹¥Æ¥à¤ò°ÂÁ´¤ËÊݤĤ¿¤á¤ËÌòΩ¤Ä Kerberos, IPsec, OpenSSH, @@ -220,13 +264,6 @@ --> - , ¥×¥ê¥ó¥¿¤ÎÍøÍÑ - - FreeBSD ¤Ë¤ª¤±¤ë¥×¥ê¥ó¥¿¤Î¼è¤ê°·¤¤¤òÀâÌÀ¤·¤Æ¤¤¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢ - ¥Ð¥Ê¡¼¥Ú¡¼¥¸¡¢¥×¥ê¥ó¥¿¡¼¤Î²Ý¶â¡¢½é´üÀßÄê¤È¤¤¤Ã¤¿¤³¤È¤Ç¤¹¡£ - - - , ¥¹¥È¥ì¡¼¥¸ FreeBSD @@ -243,18 +280,16 @@ ¥·¥¹¥Æ¥à¤È¥¢¥×¥ê¥±¡¼¥·¥ç¥óξÊý¤Î¥ì¥Ù¥ë¤ÎÃÏ°è²½¤ò°·¤Ã¤Æ¤¤¤Þ¤¹¡£ + + + - , ¥Ç¥¹¥¯¥È¥Ã¥×¥¢¥×¥ê¥±¡¼¥·¥ç¥ó - - Web ¥Ö¥é¥¦¥¶¤äÀ¸»ºÀ­¸þ¾å¥Ä¡¼¥ë¤Î¤è¤¦¤Ê°ìÈÌŪ¤Ê¥Ç¥¹¥¯¥È¥Ã¥×¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤ò¤¤¤¯¤Ä¤«µó¤²¡¢ - FreeBSD ¤Ë¤ª¤±¤ë¥¤¥ó¥¹¥È¡¼¥ëÊýË¡¤òÀâÌÀ¤·¤Æ¤¤¤Þ¤¹¡£ - - - - , ¥Þ¥ë¥Á¥á¥Ç¥£¥¢ + , ³«È¯¤ÎºÇÁ°Àþ - ¥·¥¹¥Æ¥à¤ò²»À¼¤ä¥Ó¥Ç¥ªºÆÀ¸¤ËÂбþ¤µ¤»¤ë¤¿¤á¤Ë¤É¤¦ÀßÄꤹ¤ë¤«¤òÀâÌÀ¤·¤Þ¤¹¡£ - ¤Þ¤¿¡¢²»À¼¤ä¥Ó¥Ç¥ª¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤âÎ㼨¤·¤Æ¤¤¤Þ¤¹¡£ + FreeBSD-STABLE, FreeBSD-CURRENT ¤È FreeBSD + ¤Î¥ê¥ê¡¼¥¹¤Î°ã¤¤¤òÀâÌÀ¤·¤Þ¤¹¡£ + ¤É¤ó¤Ê¥æ¡¼¥¶¤Ë¤È¤Ã¤Æ³«È¯¥·¥¹¥Æ¥à¤òÄɿ魯¤ë¤Î¤¬Í­ÍѤ«¤ò½Ò¤Ù¡¢ + ¤½¤ÎÊýË¡¤Î³µÍפò¤Þ¤È¤á¤Æ¤¤¤Þ¤¹¡£ @@ -272,22 +307,6 @@ - , ¹âÅ٤ʥͥåȥ¥¯ - - LAN ¾å¤Î¾¤Î¥³¥ó¥Ô¥å¡¼¥¿¤È¥¤¥ó¥¿¡¼¥Í¥Ã¥ÈÀܳ¤Î¶¦Í­¡¢ - ¹âÅ٤ʥ롼¥Æ¥£¥ó¥°¤Ë´Ø¤¹¤ë¥È¥Ô¥Ã¥¯¥¹¡¢¥ï¥¤¥ä¥ì¥¹¥Í¥Ã¥È¥ï¡¼¥¯¡¢ - bluetooth, ATM, IPv6 Åù¡¹¡¢ - ¥Í¥Ã¥È¥ï¡¼¥¯¤Ë´Ø¤¹¤ë¤µ¤Þ¤¶¤Þ¤ÊÏÃÂê¤ò¼è¤ê°·¤Ã¤Æ¤¤¤Þ¤¹¡£ - - - - , ÅŻҥ᡼¥ë ÅŻҥ᡼¥ë¥µ¡¼¥Ð¤Î¹½À®Í×ÁǤò¤½¤ì¤¾¤ìÀâÌÀ¤·¡¢ @@ -296,23 +315,20 @@ ñ½ã¤ÊÀßÄê¤ò¤È¤ê¤¢¤²¤Æ¤¤¤Þ¤¹¡£ - - , ³«È¯¤ÎºÇÁ°Àþ + - , Linux ¥Ð¥¤¥Ê¥ê¸ß´¹µ¡Ç½ + , ¹âÅ٤ʥͥåȥ¥¯ - FreeBSD ¤Î Linux ¥Ð¥¤¥Ê¥ê¸ß´¹µ¡Ç½¤òÀâÌÀ¤·¤Æ¤¤¤Þ¤¹¡£¤Þ¤¿¡¢ - &oracle;, - &sap.r3;, - &mathematica; ¤È¤¤¤Ã¤¿¿Íµ¤¤Î¹â¤¤ - Linux ¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Î¥¤¥ó¥¹¥È¡¼¥ë¤ò¾Ü¤·¤¯ÀâÌÀ¤·¤Æ¤¤¤Þ¤¹¡£ + LAN ¾å¤Î¾¤Î¥³¥ó¥Ô¥å¡¼¥¿¤È¥¤¥ó¥¿¡¼¥Í¥Ã¥ÈÀܳ¤Î¶¦Í­¡¢ + ¹âÅ٤ʥ롼¥Æ¥£¥ó¥°¤Ë´Ø¤¹¤ë¥È¥Ô¥Ã¥¯¥¹¡¢¥ï¥¤¥ä¥ì¥¹¥Í¥Ã¥È¥ï¡¼¥¯¡¢ + bluetooth, ATM, IPv6 Åù¡¹¡¢ + ¥Í¥Ã¥È¥ï¡¼¥¯¤Ë´Ø¤¹¤ë¤µ¤Þ¤¶¤Þ¤ÊÏÃÂê¤ò¼è¤ê°·¤Ã¤Æ¤¤¤Þ¤¹¡£ From owner-svn-doc-head@FreeBSD.ORG Mon Feb 10 17:29:57 2014 Return-Path: Delivered-To: svn-doc-head@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 ESMTPS id 5D02E3B6; Mon, 10 Feb 2014 17:29:57 +0000 (UTC) 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 2C26513B6; Mon, 10 Feb 2014 17:29:57 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1AHTvpb028673; Mon, 10 Feb 2014 17:29:57 GMT (envelope-from wblock@svn.freebsd.org) Received: (from wblock@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1AHTvBE028672; Mon, 10 Feb 2014 17:29:57 GMT (envelope-from wblock@svn.freebsd.org) Message-Id: <201402101729.s1AHTvBE028672@svn.freebsd.org> From: Warren Block Date: Mon, 10 Feb 2014 17:29:57 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r43863 - head/en_US.ISO8859-1/articles/committers-guide X-SVN-Group: doc-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the doc tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Feb 2014 17:29:57 -0000 Author: wblock Date: Mon Feb 10 17:29:56 2014 New Revision: 43863 URL: http://svnweb.freebsd.org/changeset/doc/43863 Log: Add a tip to the Vendor Imports with SVN section showing how to deal with vendor merges for packages which were in the tree before the cvs2svn conversion. Submitted by: gshapiro@ Reviewed by: gshapiro@ Modified: head/en_US.ISO8859-1/articles/committers-guide/article.xml Modified: head/en_US.ISO8859-1/articles/committers-guide/article.xml ============================================================================== --- head/en_US.ISO8859-1/articles/committers-guide/article.xml Mon Feb 10 16:16:59 2014 (r43862) +++ head/en_US.ISO8859-1/articles/committers-guide/article.xml Mon Feb 10 17:29:56 2014 (r43863) @@ -1826,6 +1826,29 @@ U stable/9/share/man/man4/netmap.4 Subversion that it should not complain because merge conflicts will be taken care of manually. + + The cvs2svn changeover occurred + on June 3, 2008. When performing vendor merges for + packages which were already present and converted by the + cvs2vn process, the command used to + merge + /vendor/package_name/dist + to + /head/package_location + (for example, + head/contrib/sendmail) must use + to + indicate the revision to merge from the + /vendor tree. For example: + + &prompt.user; svn checkout svn+ssh://svn.freebsd.org/base/head/contrib/sendmail +&prompt.user; cd sendmail +&prompt.user; svn merge -c r261190 ^/vendor/sendmail/dist . + + ^ is an alias for the the + repository path. + + It is necessary to resolve any merge conflicts. This process is the same in SVN as in CVS. From owner-svn-doc-head@FreeBSD.ORG Mon Feb 10 21:55:13 2014 Return-Path: Delivered-To: svn-doc-head@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 ESMTPS id 3157DC7E; Mon, 10 Feb 2014 21:55:13 +0000 (UTC) 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 17CB81D0C; Mon, 10 Feb 2014 21:55:13 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1ALtDfT035050; Mon, 10 Feb 2014 21:55:13 GMT (envelope-from bcr@svn.freebsd.org) Received: (from bcr@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1ALtDTj035049; Mon, 10 Feb 2014 21:55:13 GMT (envelope-from bcr@svn.freebsd.org) Message-Id: <201402102155.s1ALtDTj035049@svn.freebsd.org> From: Benedict Reuschling Date: Mon, 10 Feb 2014 21:55:13 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r43864 - head/de_DE.ISO8859-1/books/handbook/introduction X-SVN-Group: doc-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the doc tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Feb 2014 21:55:13 -0000 Author: bcr Date: Mon Feb 10 21:55:12 2014 New Revision: 43864 URL: http://svnweb.freebsd.org/changeset/doc/43864 Log: Resync this chapter with the latest english revision. I tried a new approach translating this chapter using various tools that might help us build a translation memory in the long run. For now, this represents my early tests so there might be some rough edges to fix. However, it is more efficient than to try to catch up using individual revisions, as this (and many other) files were last edited when we were still using CVS. All errors that show up are my own and I will try to fix them as best I can. Obtained from: The FreeBSD German Documentation Project Modified: head/de_DE.ISO8859-1/books/handbook/introduction/chapter.xml Modified: head/de_DE.ISO8859-1/books/handbook/introduction/chapter.xml ============================================================================== --- head/de_DE.ISO8859-1/books/handbook/introduction/chapter.xml Mon Feb 10 17:29:56 2014 (r43863) +++ head/de_DE.ISO8859-1/books/handbook/introduction/chapter.xml Mon Feb 10 21:55:12 2014 (r43864) @@ -4,45 +4,50 @@ The FreeBSD German Documentation Project $FreeBSD$ - $FreeBSDde: de-docproj/books/handbook/introduction/chapter.xml,v 1.67 2011/03/27 15:44:48 bcr Exp $ - basiert auf: 1.140 ---> - - Einführung - - JimMockNeu zusammengestellt, umstrukturiert und um - Abschnitte erweitert durch - + basiert auf: r43599 + --> + + + + + Einleitung + - SaschaEdelburgÜbersetzt von + + + Jim + Mock + + Restrukturiert, umorganisiert und Abschnitte neu + geschrieben von + - - - Übersicht + Überblick - Herzlichen Dank für Ihr Interesse an &os;! Das - folgende Kapitel behandelt verschiedene Aspekte des - &os; Projects wie dessen geschichtliche Entwicklung, - dessen Ziele oder dessen Entwicklungsmodell. + Herzlichen Dank für Ihr Interesse an &os;! Das folgende + Kapitel behandelt verschiedene Aspekte des &os; Projekts wie + dessen geschichtliche Entwicklung, seine Ziele oder das + Entwicklungsmodell. - Nach dem Durcharbeiten des Kapitels wissen Sie über + Nach dem Durcharbeiten des Kapitels wissen Sie über folgende Punkte Bescheid: Wo &os; im Vergleich zu anderen Betriebssystemen - steht - + steht - Die Geschichte des &os; Projects + Die Geschichte des &os; Projekts - Die Ziele des &os; Projects + Die Ziele des &os; Projekts @@ -51,1121 +56,1297 @@ - Und natürlich wo der Name &os; - herrührt + Und natürlich woher der Name &os; + kommt. - Willkommen bei &os;! + Willkommen zu &os; - - 4.4BSD-Lite - + 4.4BSD-Lite &os; ist ein auf 4.4BSD-Lite basierendes Betriebssystem - für Intel (x86 und &itanium;), AMD64 - und Sun &ultrasparc; Rechner. An - Portierungen zu anderen Architekturen wird derzeit gearbeitet. - Mehr zu Geschichte von &os; können Sie im kurzen geschichtlichen Abriss zu &os; - oder im Abschnitt Das aktuelle - &os;-Release nachlesen. - Falls Sie das &os; Project unterstützen wollen - (mit Quellcode, Hardware- oder Geldspenden), sollten Sie den - Artikel - &os; unterstützen lesen. + für Intel (x86 und &itanium;), AMD64 und Sun &ultrasparc; + Rechner. An Portierungen zu anderen Architekturen wird derzeit + gearbeitet. Mehr zur Geschichte von &os; erfahren Sie in die Geschichte von &os; oder aus den + aktuellen Release-Informationen. + Falls Sie das &os; Projekt unterstützen wollen (z.B. mit + Quellcode, Hardware- oder Geldspenden), lesen Sie den &os; + unterstützen Artikel. Was kann &os;? - &os; hat zahlreiche bemerkenswerte Eigenschaften. - Um nur einige zu nennen: + &os; hat zahlreiche bemerkenswerte Eigenschaften. Um nur + einige zu nennen: - - Präemptives Multitasking - - - Präemptives Multitasking mit - dynamischer Prioritätsanpassung zum reibungslosen und - ausgeglichenen Teilen der Systemressourcen zwischen - Anwendungen und Anwendern, selbst unter schwerster - Last. + Präemptives Multitasking + + Präemptives Multitasking + mit dynamischer Prioritätsanpassung zum + reibungslosen und ausgeglichenen Teilen der + Systemressourcen zwischen Anwendungen und Anwendern, + selbst unter schwerster Last. - - Mehrbenutzerbetrieb - - - Der Mehrbenutzerbetrieb von - &os; erlaubt es, viele Anwender gleichzeitig am System - mit verschiedenen Aufgaben arbeiten zu lassen. - Beispielsweise Geräte wie Drucker oder Bandlaufwerke, + Mehrbenutzerbetrieb + Mehrbenutzerbetrieb + erlaubt es, viele &os;-Anwender gleichzeitig am System mit + verschiedenen Aufgaben arbeiten zu lassen. Beispielsweise + können Geräte wie Drucker oder Bandlaufwerke, die sich nur schwerlich unter allen Anwendern des Systems - oder im Netzwerk teilen lassen, können durch Setzen - von Verwendungsbeschränkungen auf Benutzer oder - Benutzergruppen wichtige Systemressourcen vor - Überbeanspruchung schützen. + oder im Netzwerk teilen lassen, durch setzen von + Beschränkungen auf Benutzer oder Gruppen wichtige + Systemressourcen vor Überbeanspruchung geschützt + werden. - - TCP/IP-Netzwerkfähigkeit - - - Hervorragende - TCP/IP-Netzwerkfähigkeit mit - Unterstützung von Industriestandards wie SCTP, DHCP, - NFS, NIS, PPP, SLIP, IPsec und IPv6. Das heißt, - Ihr &os;-System kann in einfachster Weise mit anderen - Systemen interagieren. Zudem kann es als Server-System im - Unternehmen wichtige Aufgaben übernehmen, + StarkeTCP/IP-Netzwerkfähigkeit + TCP/IP-Netzwerkfähigkeit + mit Unterstützung von + Industriestandards wie SCTP, DHCP, NFS, NIS, PPP, + SLIP, IPsec und IPv6. Das bedeutet, Ihr &os;-System kann + in einfachster Weise mit anderen Systemen + interagieren. Zudem kann es als Server-System im + Unternehmen wichtige Aufgaben übernehmen, beispielsweise als NFS- oder E-Mail-Server oder es kann Ihren Betrieb durch HTTP- und FTP-Server beziehungsweise - durch Routing und Firewalling Internet-fähig machen. - - - - - Speicherschutz - - - Der Speicherschutz stellt sicher, - dass Anwendungen (oder Anwender) sich nicht gegenseitig - stören. Stürzt eine Anwendung ab, hat das - keine Auswirkung auf andere Prozesse. + durch Routing und Firewalling Internetfähig + machen. - &os; ist ein - 32-Bit-Betriebssystem - (64-Bit auf &itanium;, AMD64, - und &ultrasparc;) und wurde als solches von Grund auf - neu entworfen. + Speicherschutz + Speicherschutz stellt + sicher, dass Anwendungen (oder Anwender) sich + nicht gegenseitig stören. Stürzt eine Anwendung + ab, hat das keine Auswirkung auf andere Prozesse. - - X-Window-System - - - Das X-Window-System (X11R7) als - Industriestandard bietet eine grafische Benutzeroberfläche - (GUI). Minimale Voraussetzung zur Verwendung ist - lediglich eine Grafikkarte und ein Bildschirm, die beide - den VGA-Modus unterstützen. - + Der Industriestandard X-Window-System + X-Window-System + (X11R7) als Industriestandard bietet eine grafische + Benutzeroberfläche (GUI). Minimale Voraussetzung + zur Verwendung ist lediglich eine Grafikkarte und ein + Bildschirm, die beide den VGA-Modus + unterstützen. + - - Binärkompatibilität - Linux - - - - Binärkompatibilität - SCO - - - - Binärkompatibilität - SVR4 - - - - Binärkompatibilität - BSD/OS - - - - Binärkompatibilität - NetBSD - - - Binärkompatibilität mit - vielen unter verschiedenen Betriebssystemen erstellten + + + Binärkompatibilität + Linux + + + Binärkompatibilität + SCO + + + Binärkompatibilität + SVR4 + + + Binärkompatibilität + BSD/OS + + + Binärkompatibilität + NetBSD + + Binärkompatibilität mit + vielen auf anderen Betriebssystemen erstellten Programmen wie Linux, SCO, SVR4, BSDI und NetBSD. - Tausende von sofort - lauffähigen Anwendungen sind aus den - Ports- und - Packages-Sammlungen für &os; - verfügbar. Warum mühselig im Netz Software - suchen, wenn sie bereits hier vorhanden ist? - + Tausende zusätzliche leicht zu + portierende Anwendungen sind über die &os; + Ports und + Paket-Sammlung verfügbar. Warum + mühselig im Netz nach Software suchen, wenn diese + bereits vorhanden ist? - Tausende zusätzliche leicht zu - portierende Anwendungen sind über das + Tausende zusätzliche leicht zu + portierende Anwendungen sind über das Internet zu beziehen. &os; ist Quellcode-kompatibel mit den meisten kommerziellen &unix; Systemen. Daher - bedürfen Anwendungen häufig nur geringer oder + bedürfen Anwendungen häufig nur geringer oder gar keiner Anpassung, um auf einem &os;-System zu kompilieren. - + - - virtueller Speicher - - - Seitenweise anforderbarer Virtueller - Speicher und der merged VM/buffer - cache-Entwurf bedient effektiv den großen + Seitenweise anforderbarer virtueller + Speicher virtueller + Speicher + und merged VM/buffer cache + -Entwurf bedient effektiv den großen Speicherhunger mancher Anwendungen bei gleichzeitigem - Aufrechterhalten der Bedienbarkeit des Systems für + Aufrechterhalten der Bedienbarkeit des Systems für weitere Benutzer. - - Symmetrisches Multi-Processing (SMP) - - - SMP-Unterstützung für - Mehrprozessorsysteme + SMP + Symmetrisches Multi-Processing (SMP) + -Unterstützung für Systeme mit + mehreren CPUs. - - Kompiler - C - - - - Kompiler - C++ - - - - Kompiler - FORTRAN - - - Ein voller Satz von C, - C++ und Fortran- - Entwicklungswerkzeugen. Viele - zusätzliche Programmiersprachen für Wissenschaft - und Entwicklung sind aus der Ports- und Packages-Sammlung - zu haben. + + + Compiler + C + + + Compiler + C++ + + Ein voller Satz von C und + C++ Entwicklungswerkzeugen. Viele + zusätzliche Programmiersprachen für höhere + Wissenschaft und Entwicklung sind in der Ports- und + Packages-Sammlung verfügbar. - - Quellcode - - - Quellcode für das gesamte - System bedeutet größtmögliche Kontrolle - über Ihre Umgebung. Warum sollte man sich durch - proprietäre Lösungen knebeln und sich auf Gedeih - und Verderb der Gnade eines Herstellers ausliefern, wenn - man doch ein wahrhaft offenes System haben kann? + Quellcode + Quellcode + für das gesamte System bedeutet + größtmögliche Kontrolle über Ihre + Umgebung. Warum sollte man sich durch proprietäre + Lösungen knebeln und sich auf Gedeih und Verderb der + Gnade eines Herstellers ausliefern, wenn man doch ein + wahrhaft offenes System haben kann? Umfangreiche Online-Dokumentation. - - - 4.4BSD-Lite - - - - Computer Systems Research Group (CSRG) - - - - U.C. Berkeley - + + und viele weitere! + + - &os; basiert auf dem 4.4BSD-Lite-Release der Computer - Systems Research Group (CSRG) der Universität von - Kalifornien in Berkeley und führt die namhafte - Tradition der Entwicklung von BSD-Systemen fort. - Zusätzlich zu der herausragenden Arbeit der CSRG hat das - &os; Project tausende weitere Arbeitsstunden investiert, - um das System zu verfeinern und maximale Leistung und - Zuverlässigkeit bei Alltagslast zu bieten. Während - viele kommerzielle Riesen Probleme haben PC-Betriebssysteme - mit derartigen Funktionen, Leistungpotential und - Zuverlässigkeit anzubieten, kann &os; damit schon - jetzt aufwarten! + &os; basiert auf dem 4.4BSD-Lite- + 4.4BSD-Lite + Release der Computer Systems Research Group + (CSRG) Computer Systems Research Group + (CSRG) + der Universität von Kalifornien in + Berkeley und führt die namhafte Tradition der + Entwicklung von BSD-Systemen fort. Zusätzlich zu der + herausragenden Arbeit der CSRG hat das &os; Projekt tausende + weitere Arbeitsstunden investiert, um das System zu + verfeinern und maximale Leistung und Zuverlässigkeit + bei Alltagslast zu bieten. Während viele + kommerzielle Riesen Probleme damit haben, PC-Betriebssysteme + mit derartigen Funktionen, Leistungspotential und + Zuverlässigkeit anzubieten, kann &os; damit schon jetzt + aufwarten! - Die Anwendungsmöglichkeiten von &os; werden nur + Die Anwendungsmöglichkeiten von &os; werden nur durch Ihre Vorstellungskraft begrenzt. Von Software-Entwicklung bis zu Produktionsautomatisierung, von - Lagerverwaltung über Abweichungskorrektur bei Satelliten; - Falls etwas mit kommerziellen &unix; Produkten machbar ist, dann - ist es höchstwahrscheinlich auch mit &os; - möglich. &os; profitiert stark von tausenden + Lagerverwaltung über Abweichungskorrektur bei Satelliten; + Falls etwas mit kommerziellen &unix; Produkten machbar ist, + dann ist es höchstwahrscheinlich auch mit &os; + möglich. &os; profitiert stark von tausenden hochwertigen Anwendungen aus wissenschaftlichen Instituten und - Universitäten in aller Welt. Häufig sind diese - für wenig Geld oder sogar kostenlos zu bekommen. - Kommerzielle Anwendungen sind ebenso verfügbar und es - werden täglich mehr. + Universitäten in aller Welt. Häufig sind diese + für wenig Geld oder sogar kostenlos zu bekommen. + Kommerzielle Anwendungen sind ebenso verfügbar und es + werden täglich mehr. Durch den freien Zugang zum Quellcode von &os; ist es - in unvergleichbarer Weise möglich, das System für + in unvergleichbarer Weise möglich, das System für spezielle Anwendungen oder Projekte anzupassen. Dies ist mit den meisten kommerziellen Betriebssystemen einfach nicht - möglich. Beispiele für Anwendungen, die unter + möglich. Beispiele für Anwendungen, die unter &os; laufen, sind: - Internet-Dienste: Die robuste + Internet-Dienste: Die robuste TCP/IP-Implementierung in &os; macht es zu einer - idealen Plattform für verschiedenste + idealen Plattform für verschiedenste Internet-Dienste, wie zum Beispiel: - - FTP-Server - - - FTP-Server - - - - - HTTP-Server - - - HTTP-Server (Standard-Web-Server oder mit - SSL-Verschlüsselung) + HTTP-Server + Webserver (Standard + oder mit SSL-Verschlüsselung) IPv4- und IPv6-Routing - + - + Firewall Firewall - - - - NAT - - - Firewalls und NAT-Gateways - (IP-Masquerading) + + NAT NAT + + (IP-Masquerading)-Gateways - - E-Mail - - - E-Mail-Server + FTP-Server + FTP-Server + - - Usenet - + + + E-Mail + E-Mail + + + E-Mail + + E-Mail-Server + - Usenet-News und Foren (BBS) + + Und mehr... - - Zum Betreiben von &os; reicht schon ein - günstiger 386-PC. Wenn es das Wachstum Ihres - Unternehmens verlangt, kann &os; aber auch auf einem - hochgerüsteten 4-Wege-System mit Xeon-Prozessoren - und RAID-Plattenspeicher Verwendung finden. - Bildung: Sind Sie + Bildung: Sind Sie Informatikstudent oder Student eines verwandten - Studiengangs? Die praktischen Einblicke in &os; sind - die beste Möglichkeit etwas über Betriebssysteme, + Studiengangs? Die praktischen Einblicke in &os; sind die + beste Möglichkeit etwas über Betriebssysteme, Rechnerarchitektur und Netzwerke zu lernen. Einige frei - erhältliche CAD-, mathematische und grafische Anwendungen - sind sehr nützlich, gerade für diejenigen, die - &os; nicht zum Selbstzweck, sondern als - Arbeitsmittel einsetzen. + erhältliche CAD-, mathematische und grafische + Anwendungen sind sehr nützlich, gerade für + diejenigen, deren Hauptinteresse in einem Computer darin + besteht, andere Arbeit zu + erledigen! - Wissenschaft: Mit dem frei - verfügbaren Quellcode für das gesamte System + Forschung: Mit dem frei + verfügbaren Quellcode für das gesamte System bildet &os; ein exzellentes Studienobjekt in der Disziplin der Betriebssysteme, wie auch in anderen Zweigen der Informatik. Es ist beispielsweise denkbar, das - räumlich getrennte Gruppen gemeinsam an einer Idee + räumlich getrennte Gruppen gemeinsam an einer Idee oder Entwicklung arbeiten. Das Konzept der freien - Verfügbarkeit und -nutzung von &os; - ermöglicht so einen Gebrauch, auch ohne sich - groß Gedanken über Lizenzbedingungen oder - -beschränkungen machen zu müssen. - - - - - Router - - - - DNS-Server - - - Netzwerkfähigkeit: Brauchen - Sie einen neuen Router? Oder einen Name-Server (DNS)? Eine - Firewall zum Schutze Ihres Intranets vor Fremdzugriff? - &os; macht aus dem in der Ecke verstaubenden 386- oder - 486-PC im Handumdrehen einen leistungsfähigen Router - mit anspruchsvollen Packet-Filter-Fähigkeiten. - - - - - X-Window-System - Accelerated-X - - - X-Window-Workstation: &os; ist - eine gute Wahl für kostengünstige X-Terminals - mit dem frei verfügbaren X11-Server. - Im Gegensatz zu einem X-Terminal erlaubt es &os;, viele - Anwendungen lokal laufen zu lassen, was die Last eines - zentralen Servers erleichtern kann. &os; kann selbst - plattenlos starten, was einzelne - Workstations noch günstiger macht und die Wartung - erleichtert. - - - - - GNU-Compiler-Collection - - - Software-Entwicklung: Das - Standard-System von &os; wird mit einem kompletten Satz - an Entwicklungswerkzeugen bereitgestellt, unter anderem - mit dem bekannten GNU C/C++-Kompiler und -Debugger. + Verfügbarkeit und -nutzung von &os; + ermöglicht so die freie Verwendung, ohne sich + groß Gedanken über Lizenzbedingungen zu machen + oder aufgrund von Beschränkungen evtl. in einem + offenen Forum bestimmte Dinge nicht diskutieren zu + dürfen. + + + + Netzwerkfähigkeit: Brauchen + Sie einen neuen Router? + Router + Oder einen Name-Server (DNS)? + DNS-Server + + Eine Firewall zum Schutze Ihres Intranets vor + Fremdzugriff? &os; macht aus dem in der Ecke verstaubenden + 386- oder 486-PC im Handumdrehen einen + leistungsfähigen Router mit anspruchsvollen + Paketfilter-Funktionen. + + + + Embedded: &os; ist eine + exzellente Plattform, um auf embedded Systemen + aufzubauen. embedded + Mit der Unterstützung für die + &arm;-, &mips;- und &powerpc;-Plattformen, verbunden mit + dem robusten Netzwerkstack, aktuellen Neuerungen und der + freizügigen BSD-Lizenz + stellt &os; eine ausgezeichnete Basis für embedded + Router, Firewalls und andere Geräte dar. + + + + + + X-Window-System + + + GNOME + + + KDE + + Desktop: &os; ist eine gute Wahl + für kostengünstige X-Terminals mit dem frei + verfügbaren X11-Server. &os; bietet die Auswahl aus + vielen Open Source Desktop Umgebungen, dazu gehören + auch die GNOME und + KDE GUIs. &os; kann sogar + plattenlos booten, was einzelne + Workstations sogar noch günstiger macht und die + Verwaltung erleichtert. + + + + Software-Entwicklung: Das + Standard-&os;-System wird mit einem kompletten Satz an + Entwicklungswerkzeugen bereitgestellt, unter anderem einem + vollständigen C/C++-Compiler und + -Debugger. Compiler + Entwicklungswerkzeugen. Viele + zusätzliche Programmiersprachen für Wissenschaft + und Entwicklung sind aus der Ports- und Packages-Sammlung + zu haben. &os; ist sowohl in Form von Quellcode als auch in - Binärform auf CD-ROM, DVD und über anonymous FTP - erhältlich. Näheres zum Bezug von &os; - enthält . - + Binärform auf CD-ROM, DVD und über Anonymus FTP + erhältlich. Lesen Sie dazu , + um weitere Informationen zum Bezug von &os; zu + erhalten. - Wer benutzt &os;? + Wer verwendet &os;? Anwender - Bekannte &os;-Anwender + Grosse, bekannte &os;-Anwender - &os; dient als Plattform für Geräte und Produkte - einiger der weltgrößten IT-Firmen, darunter: + &os;s fortgeschrittene Eigenschaften, bewährte + Sicherheit und vorhersehbare Release-Zyklen, genauso wie seine + tolerante Lizenz haben dazu geführt, dass es als + Plattform zum Aufbau vieler kommerzieller und quelloffener + Geräte und Produkte verwendet wird, dazu gehören ein + paar der weltgrössten IT-Unternehmen: - AppleApple - - - CiscoCisco + Apache + + Apache + - Die Apache Software Foundation lässt + den Grossteil seiner der Öffentlichkeit + zugänglichen Infrastruktur, inklusive des + möglicherweise grössten SVN-Repositories der + Welt mit über 1,4 Millionen Commits, auf &os; + laufen. + + + + Apple + + Apple + - OS X verwendet viel von &os;s eigenem + Netzwerkstack, virtuellem Dateisystem und den + Benutzerumgebungskomponenten für sein eigenes System. + Apple iOS nutzt ebenso Elemente, die es von &os; + übernommen hat. + + + Cisco + + Cisco + - IronPort Network Sicherheits- und + Anti-Spam-Appliance verwendet einen modifizierten + &os;-Kernel. + + + Citrix + + Citrix + - Die NetScaler Reihe von + Sicherheits-Appliances bietet auf den Schichten 4-7 + Load-Balancing, Content Caching, Anwendungsfirewall, + gesichertes VPN und mobilen Cloud-Netzwerkzugriff, gepaart + mit der Mächtigkeit der &os;-Shell. + + + + Dell + KACE Dell KACE + - Die KACE Systemmanagement-Appliances nutzen + &os; wegen seiner Zuverlässigkeit, Skalierbarkeit und + Gemeinschaft, welche deren zukünftige + Weiterentwicklung fördert. + + + + Experts + Exchange + + Experts Exchange + - Alle öffentlich zugänglichen + Webserver werden von &os; betrieben und machen starken + Gebrauch von Jails, ohne den Überhang von + Virtualisierung, um Entwicklungs- und Testumgebung + voneinander zu isolieren. + + + + Isilon + + Isilon - Isilons + Unternehmens-Speicherappliances basieren auf &os;. Die + extrem liberale &os;-Lizenz erlaubt Isilon ihr + intellektuelles Eigentum durch den gesamten Kernel zu + integrieren und kann sich so auf das Erstellen ihres + Produktes und nicht des Betriebssystems + fokussieren. + + + + iXsystems + iXsystems + - Die TrueNAS-Linie von vereinheitlichten + Speicherappliances beruht auf &os;. Zusätzlich zu + deren kommerziellen Produkten, managed iXsystems auch noch + die beiden Open Source Projekte PC-BSD und FreeNAS. + + + + Juniper + + Juniper - Das JunOS + Betriebssystem, welches alle Juniper Netzwerkgeräte + (inklusive Router, Switche, Sicherheits- und + Netzwerkappliances) antreibt, verwendet &os; Juniper ist + einer der vielen Hersteller, welcher das symbolische + Verhältnis zwischen dem Projekt und dem Hersteller + von kommerziellen Produkten darstellt. Verbesserungen, die + Juniper entwickelt hat, werden ebenso in &os; aufgenommen, + um die Komplexität der Integration neuer + Eigenschaften von &os; zurück in zukünftige + JunOS Versionen zu vereinfachen. + + + + McAfee + + McAfee + - SecurOS, die Basis von McAfee + Enterprise-Firewallprodukten inkl. Sidewinder basiert auf + &os;. + + + + NetApp + + NetApp + - Die Data ONTAP GX Reihe von + Speicherappliances basieren auf &os;. Zusätzlich hat + NetApp viele Neuheiten beigesteuert, inklusive des neuen + BSD-lizensierten Hypervisors bhyve. + + + + Netflix + + Netflix + - Die OpenConnect-Appliance, die Netflix + verwendet, um Filme zu seinen Kunden zu streamen basiert + auf &os;. Netflix hat weitreichende Beiträge zum + Quellcode von &os; beigetragen und arbeitet daran, ein + möglichst geringes Delta zur normalen Version + beizubehalten. Netflix OpenConnect-Appliances sind + für mehr als 32% vom gesamten Internetverkehr in + Nordamerika verantwortlich. + + + + Sandvine + + Sandvine + - Sandvine nutzt &os; as die Basis für + deren Echtzeit Hochgeschwindigkeits-Netzwerkplattform, + welche den Kern deren intelligenter + Netzwerkpolicy-Kontrollprodukte darstellt. + + + + Sony + + Sony + - Sowohl die PlayStation 3 und PlayStation 4 + Spielekonsolen verwenden modifizierte Versionen von + &os;. + + + + Sophos + + Sophos + - Das Sophos Email-Appliance Produkt basiert + auf einem abgesicherten &os; und scannt eingehende E-Mail + auf Spam und Viren, während es gleichzeitig + ausgehende Mail auf Schadsoftware und versehentlichen + Versand von vertraulichen Informationen + überwacht. + + + + Spectra + Logic Spectra + Logic - Die nTier Reihe von + archivspeicherfähigen Appliances nutzt &os; und + OpenZFS. + + + + The Weather + Channel + The Weather Channel + + - Die IntelliStar Appliance, welche am + Kopfende eines jeden Kabelversorgers installiert ist und + für das Einspeisen von lokalen Wettervorhersagen in + das Kabelfernsehprogramm verantwortlich ist, läuft + auf &os;. + + + + Verisign + + Verisign + + - Verisign ist für den Betrieb der .com + und .net Root-Domainregistries genauso verantwortlich wie + für die dazugehörige DNS-Infrastruktur. Sie + verlassen sich auf einen Reihe von verschiedenen + Netzwerkbetriebssystemen inklusive &os;, um zu + gewährleisten, dass es keine gemeinsame Fehlerstelle + in deren Infrastruktur gibt. + + + + WhatsApp + + WhatsApp + - Als WhatsApp eine Plattform benötigte, + die in der Lage ist, mehr als 1 Million gleichzeitiger + TCP-Verbindungen pro Server abzuarbeiten, entschied man + sich für &os;. Anschliessend fuhren Sie damit fort, + auf 2,5 Millionen Verbindungen pro Server + hochzuskalieren. + + + *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-doc-head@FreeBSD.ORG Mon Feb 10 22:42:23 2014 Return-Path: Delivered-To: svn-doc-head@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 ESMTPS id 9D657E68; Mon, 10 Feb 2014 22:42:23 +0000 (UTC) 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 584FF1205; Mon, 10 Feb 2014 22:42:23 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1AMgNJj054978; Mon, 10 Feb 2014 22:42:23 GMT (envelope-from wblock@svn.freebsd.org) Received: (from wblock@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1AMgNUD054977; Mon, 10 Feb 2014 22:42:23 GMT (envelope-from wblock@svn.freebsd.org) Message-Id: <201402102242.s1AMgNUD054977@svn.freebsd.org> From: Warren Block Date: Mon, 10 Feb 2014 22:42:23 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r43865 - head/en_US.ISO8859-1/articles/committers-guide X-SVN-Group: doc-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the doc tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Feb 2014 22:42:23 -0000 Author: wblock Date: Mon Feb 10 22:42:22 2014 New Revision: 43865 URL: http://svnweb.freebsd.org/changeset/doc/43865 Log: Typo fix. Submitted by: jgh Modified: head/en_US.ISO8859-1/articles/committers-guide/article.xml Modified: head/en_US.ISO8859-1/articles/committers-guide/article.xml ============================================================================== --- head/en_US.ISO8859-1/articles/committers-guide/article.xml Mon Feb 10 21:55:12 2014 (r43864) +++ head/en_US.ISO8859-1/articles/committers-guide/article.xml Mon Feb 10 22:42:22 2014 (r43865) @@ -1830,7 +1830,7 @@ U stable/9/share/man/man4/netmap.4 The cvs2svn changeover occurred on June 3, 2008. When performing vendor merges for packages which were already present and converted by the - cvs2vn process, the command used to + cvs2svn process, the command used to merge /vendor/package_name/dist to From owner-svn-doc-head@FreeBSD.ORG Tue Feb 11 03:07:20 2014 Return-Path: Delivered-To: svn-doc-head@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 ESMTPS id EE3BE81C; Tue, 11 Feb 2014 03:07:20 +0000 (UTC) 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 D96E21B40; Tue, 11 Feb 2014 03:07:20 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1B37KE5059974; Tue, 11 Feb 2014 03:07:20 GMT (envelope-from gjb@svn.freebsd.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1B37K8h059973; Tue, 11 Feb 2014 03:07:20 GMT (envelope-from gjb@svn.freebsd.org) Message-Id: <201402110307.s1B37K8h059973@svn.freebsd.org> From: Glen Barber Date: Tue, 11 Feb 2014 03:07:20 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r43866 - head/en_US.ISO8859-1/htdocs/donations X-SVN-Group: doc-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the doc tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Feb 2014 03:07:21 -0000 Author: gjb Date: Tue Feb 11 03:07:20 2014 New Revision: 43866 URL: http://svnweb.freebsd.org/changeset/doc/43866 Log: Unlink wantlist.html from the build. Sponsored by: The FreeBSD Foundation Modified: head/en_US.ISO8859-1/htdocs/donations/Makefile Modified: head/en_US.ISO8859-1/htdocs/donations/Makefile ============================================================================== --- head/en_US.ISO8859-1/htdocs/donations/Makefile Mon Feb 10 22:42:22 2014 (r43865) +++ head/en_US.ISO8859-1/htdocs/donations/Makefile Tue Feb 11 03:07:20 2014 (r43866) @@ -8,6 +8,5 @@ .endif DOCS= index.xml donors.xml -DATA= wantlist.html .include "${DOC_PREFIX}/share/mk/web.site.mk" From owner-svn-doc-head@FreeBSD.ORG Tue Feb 11 03:17:13 2014 Return-Path: Delivered-To: svn-doc-head@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 ESMTPS id 75E2FA5C; Tue, 11 Feb 2014 03:17:13 +0000 (UTC) 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 48B9B1C68; Tue, 11 Feb 2014 03:17:13 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1B3HDoh064120; Tue, 11 Feb 2014 03:17:13 GMT (envelope-from gjb@svn.freebsd.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1B3HDlV064119; Tue, 11 Feb 2014 03:17:13 GMT (envelope-from gjb@svn.freebsd.org) Message-Id: <201402110317.s1B3HDlV064119@svn.freebsd.org> From: Glen Barber Date: Tue, 11 Feb 2014 03:17:13 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r43867 - head/en_US.ISO8859-1/htdocs/donations X-SVN-Group: doc-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the doc tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Feb 2014 03:17:13 -0000 Author: gjb Date: Tue Feb 11 03:17:12 2014 New Revision: 43867 URL: http://svnweb.freebsd.org/changeset/doc/43867 Log: Goodbye, wantlist.html. Sponsored by: The FreeBSD Foundation Deleted: head/en_US.ISO8859-1/htdocs/donations/wantlist.html From owner-svn-doc-head@FreeBSD.ORG Tue Feb 11 04:12:05 2014 Return-Path: Delivered-To: svn-doc-head@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 ESMTPS id E675D70; Tue, 11 Feb 2014 04:12:05 +0000 (UTC) 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 D26B41146; Tue, 11 Feb 2014 04:12:05 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1B4C5Jg086425; Tue, 11 Feb 2014 04:12:05 GMT (envelope-from gjb@svn.freebsd.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1B4C5QG086424; Tue, 11 Feb 2014 04:12:05 GMT (envelope-from gjb@svn.freebsd.org) Message-Id: <201402110412.s1B4C5QG086424@svn.freebsd.org> From: Glen Barber Date: Tue, 11 Feb 2014 04:12:05 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r43868 - head/share/xml X-SVN-Group: doc-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the doc tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Feb 2014 04:12:06 -0000 Author: gjb Date: Tue Feb 11 04:12:05 2014 New Revision: 43868 URL: http://svnweb.freebsd.org/changeset/doc/43868 Log: Add a news entry about the first FreeBSD Journal publication. Sponsored by: The FreeBSD Foundation Modified: head/share/xml/news.xml Modified: head/share/xml/news.xml ============================================================================== --- head/share/xml/news.xml Tue Feb 11 03:17:12 2014 (r43867) +++ head/share/xml/news.xml Tue Feb 11 04:12:05 2014 (r43868) @@ -31,6 +31,25 @@ 2014 + 2 + + + 10 + + + &os; Journal First Edition Available + +

    We are pleased to announce the availability of the + &os; Journal! It is the new online Journal, that the + &os; Foundation is publishing, that is all about + &os;. Click here + to find out how to get the first issue that is focused on + &os; 10.

    + + + + + 1 From owner-svn-doc-head@FreeBSD.ORG Tue Feb 11 12:29:39 2014 Return-Path: Delivered-To: svn-doc-head@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 ESMTPS id 0E125468; Tue, 11 Feb 2014 12:29:39 +0000 (UTC) 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 EC3941B44; Tue, 11 Feb 2014 12:29:38 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1BCTcQw078801; Tue, 11 Feb 2014 12:29:38 GMT (envelope-from ryusuke@svn.freebsd.org) Received: (from ryusuke@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1BCTcIb078800; Tue, 11 Feb 2014 12:29:38 GMT (envelope-from ryusuke@svn.freebsd.org) Message-Id: <201402111229.s1BCTcIb078800@svn.freebsd.org> From: Ryusuke SUZUKI Date: Tue, 11 Feb 2014 12:29:38 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r43869 - head/ja_JP.eucJP/share/xml X-SVN-Group: doc-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the doc tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Feb 2014 12:29:39 -0000 Author: ryusuke Date: Tue Feb 11 12:29:38 2014 New Revision: 43869 URL: http://svnweb.freebsd.org/changeset/doc/43869 Log: - Merge the following from the English version: r43658 -> r43868 head/ja_JP.eucJP/share/xml/news.xml Modified: head/ja_JP.eucJP/share/xml/news.xml Modified: head/ja_JP.eucJP/share/xml/news.xml ============================================================================== --- head/ja_JP.eucJP/share/xml/news.xml Tue Feb 11 04:12:05 2014 (r43868) +++ head/ja_JP.eucJP/share/xml/news.xml Tue Feb 11 12:29:38 2014 (r43869) @@ -20,7 +20,7 @@ the contents of will be preferred over <p>. $FreeBSD$ - Original revision: r43658 + Original revision: r43868 --> <news> <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS"> @@ -31,6 +31,26 @@ <name>2014</name> <month> + <name>2</name> + + <day> + <name>10</name> + + <event> + <title>&os; Journal ÁÏ´© + +

    &os; Journal ¤ÎÁÏ´©¤ò¤ªÃΤ餻¤·¤Þ¤¹! + &os; Journal ¤Ï¡¢ + &os; Foundation ¤¬È¯¹Ô¤¹¤ë &os; + ¤Ë´Ø¤¹¤ë¿·¤·¤¤¥ª¥ó¥é¥¤¥ó¥¸¥ã¡¼¥Ê¥ë¤Ç¤¹¡£ + ¹ØÆþÊýË¡¤Ë¤Ä¤¤¤Æ¤Ï + ¤³¤Á¤é ¤ò¤´Í÷¤¯¤À¤µ¤¤¡£ + ÁÏ´©¹æ¤Ï &os; 10 ¤ÎÆý¸¤Ç¤¹¡£

    + +     +     + + 1 From owner-svn-doc-head@FreeBSD.ORG Tue Feb 11 12:50:19 2014 Return-Path: Delivered-To: svn-doc-head@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 ESMTPS id D462EB03; Tue, 11 Feb 2014 12:50:19 +0000 (UTC) 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 BF0E21D11; Tue, 11 Feb 2014 12:50:19 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1BCoJ0h086728; Tue, 11 Feb 2014 12:50:19 GMT (envelope-from ryusuke@svn.freebsd.org) Received: (from ryusuke@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1BCoJrF086727; Tue, 11 Feb 2014 12:50:19 GMT (envelope-from ryusuke@svn.freebsd.org) Message-Id: <201402111250.s1BCoJrF086727@svn.freebsd.org> From: Ryusuke SUZUKI Date: Tue, 11 Feb 2014 12:50:19 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r43870 - head/ja_JP.eucJP/htdocs/news X-SVN-Group: doc-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the doc tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Feb 2014 12:50:19 -0000 Author: ryusuke Date: Tue Feb 11 12:50:19 2014 New Revision: 43870 URL: http://svnweb.freebsd.org/changeset/doc/43870 Log: - Merge the following from the English version: r37575 -> r43859 head/ja_JP.eucJP/htdocs/news/news.xml Modified: head/ja_JP.eucJP/htdocs/news/news.xml Modified: head/ja_JP.eucJP/htdocs/news/news.xml ============================================================================== --- head/ja_JP.eucJP/htdocs/news/news.xml Tue Feb 11 12:29:38 2014 (r43869) +++ head/ja_JP.eucJP/htdocs/news/news.xml Tue Feb 11 12:50:19 2014 (r43870) @@ -4,7 +4,7 @@ ]> - + @@ -63,18 +63,6 @@ ¤Ë´Ø¤¹¤ë³èȯ¤Ê¥ª¥ó¥é¥¤¥ó¥Õ¥©¡¼¥é¥à¤È¥Ë¥å¡¼¥¹¥³¥ß¥å¥Ë¥Æ¥£¥µ¥¤¥È¡£

    • - -
  • - -
    • -

  • FreeBSD Diary: ¤¢¤ëÃˤΠFreeBSD ¤Ë¤è¤ëÄ©Àï¤È¾¡Íø¤Îµ­Ï¿¡£

    From owner-svn-doc-head@FreeBSD.ORG Tue Feb 11 14:59:29 2014 Return-Path: Delivered-To: svn-doc-head@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 ESMTPS id 97B2BD62; Tue, 11 Feb 2014 14:59:29 +0000 (UTC) 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 758271AC1; Tue, 11 Feb 2014 14:59:29 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1BExTTb038084; Tue, 11 Feb 2014 14:59:29 GMT (envelope-from dru@svn.freebsd.org) Received: (from dru@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1BExTVK038082; Tue, 11 Feb 2014 14:59:29 GMT (envelope-from dru@svn.freebsd.org) Message-Id: <201402111459.s1BExTVK038082@svn.freebsd.org> From: Dru Lavigne Date: Tue, 11 Feb 2014 14:59:29 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r43871 - head/en_US.ISO8859-1/books/handbook/l10n X-SVN-Group: doc-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the doc tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Feb 2014 14:59:29 -0000 Author: dru Date: Tue Feb 11 14:59:28 2014 New Revision: 43871 URL: http://svnweb.freebsd.org/changeset/doc/43871 Log: Initial pass at improving the flow and readability of this section. Several more commits to follow. Sponsored by: iXsystems Modified: head/en_US.ISO8859-1/books/handbook/l10n/chapter.xml Modified: head/en_US.ISO8859-1/books/handbook/l10n/chapter.xml ============================================================================== --- head/en_US.ISO8859-1/books/handbook/l10n/chapter.xml Tue Feb 11 12:50:19 2014 (r43870) +++ head/en_US.ISO8859-1/books/handbook/l10n/chapter.xml Tue Feb 11 14:59:28 2014 (r43871) @@ -101,29 +101,27 @@ locale - Localization settings are based on three main terms: - Language Code, Country Code, and Encoding. Locale names are + Localization settings are based on three components: + the language code, country code, and encoding. Locale names are constructed from these parts as follows: LanguageCode_CountryCode.Encoding - - Language and Country Codes - language codes country codes - In order to localize a &os; system to a specific language, - the user needs to determine the codes for the specific country - and language as the country code tells applications which - variation of the given language to use. The following are - examples of language/country codes: + The LanguageCode and CountryCode are used + to determine the country + and the specific language + variation. provides some + examples of LanguageCode_CountryCode: - + + Common Language and Country Codes - Language/Country Code + LanguageCode_Country Code Description @@ -131,86 +129,49 @@ en_US - English - United States + English, United States ru_RU - Russian for Russia + Russian, Russia zh_TW - Traditional Chinese for Taiwan + Traditional Chinese, Taiwan - - - A complete listing of available locales can be found by - typing: - - &prompt.user; locale -a - - - - Encodings +
    encodings ASCII - Some languages use non-ASCII encodings that are 8-bit, - wide, or multibyte characters. For more information on these - encodings, refer to &man.multibyte.3;. Older applications do - not recognize these encodings and mistake them for control - characters. Newer applications usually recognize 8-bit + Some languages, such as Chinese or Japanese, cannot be represented using ASCII characters + and require an extended language encoding using either + wide or multibyte characters. Older applications + may mistake these encodings for control + characters while newer applications usually recognize 8-bit characters. Depending on the implementation, users may be required to compile an application with wide or multibyte - character support, or configure it correctly. To provide - application support for wide or multibyte characters, the - &os; Ports - Collection contains programs for several languages. - Refer to the i18n documentation in the - respective &os; port. - - Specifically, the user needs to look at the application - documentation to decide how to configure it correctly or to - determine which compile options to use when building the - port. - - Some things to keep in mind are: - - - - Language specific single C chars character sets - such as ISO8859-1, ISO8859-15, KOI8-R, and CP437. These - are described in &man.multibyte.3;. - + character support, or configure it correctly. The rest of + this section describes the various methods for configuring the + locale on a &os; system. The next section will discuss the + considerations for finding or compiling applications with i18n + support. - - Wide or multibyte encodings such as EUC and - Big5. - - - - The active list of character sets can be found at the - IANA - Registry. + A complete listing of available locales can be found by + typing: - - &os; uses Xorg-compatible locale encodings - instead. - - - In the &os; Ports Collection, i18n - applications include i18n in their names - for easy identification. However, they do not always support - the language needed. -     + &prompt.user; locale -a | more + + To determine the current locale setting: + + &prompt.user; locale - Setting Locale + Setting Locale for Login Shell Usually it is sufficient to export the value of the locale name as LANG in the login shell. This @@ -246,9 +207,6 @@ specific application configuration, and the Xorg configuration. - - Setting Locale Methods - locale login class @@ -260,25 +218,20 @@ system's shell startup file.     - + Login Classes Method - This method allows environment variables needed for - locale name and MIME character sets to be assigned once - for every possible shell instead of adding specific shell - assignments to each shell's startup file. - User Level Setup can be - performed by each user while - Administrator Level Setup - requires superuser privileges. - - - User Level Setup - - This provides a minimal example of a - .login_conf located in a user's - home directory which has both variables set for the - Latin-1 encoding: + This method assigns the required environment variables for + locale name and MIME character sets + for every possible shell. + This setup can be either be + performed by each user or it can be performed for all users by the + superuser. + + This minimal example sets both variables for the + Latin-1 encoding. These lines were added to the + .login_conf in an individual user's + home directory: me:\ :charset=ISO-8859-1:\ @@ -291,7 +244,7 @@ for Traditional Chinese in BIG-5 encoding. More variables are set because some applications do not correctly respect locale variables for Chinese, - Japanese, and Korean. + Japanese, and Korean: #Users who do not wish to use monetary units or time formats #of Taiwan can manually change each variable @@ -307,16 +260,11 @@ me:\ :charset=big5:\ :xmodifiers="@im=gcin": #Set gcin as the XIM Input Server - See Administrator Level - Setup and &man.login.conf.5; for more + See &man.login.conf.5; for more details. - - - - Administrator Level Setup - Verify that the user's login class in - /etc/login.conf sets the correct + Alternately, the superuser can configure all users of the system for localization. The following variables in the user's login class in + /etc/login.conf set the correct language: language_name|Account Type Description:\ @@ -332,13 +280,14 @@ me:\ :lang=de_DE.ISO8859-1:\ :tc=default: - Whenever this file is edited, execute the following + Whenever /etc/login.conf is edited, remember to execute the following command to update the capability database: &prompt.root; cap_mkdb /etc/login.conf - Changing Login Classes with - &man.vipw.8; + + Changing Login Classes with + &man.vipw.8; vipw @@ -348,9 +297,11 @@ me:\ language: user:password:1111:11:language:0:0:User Name:/home/user:/bin/sh + - Changing Login Classes with - &man.adduser.8; + + Changing Login Classes with + &man.adduser.8; adduser @@ -386,9 +337,11 @@ me:\ &prompt.root; adduser -class language + - Changing Login Classes with - &man.pw.8; + + Changing Login Classes with + &man.pw.8; pw @@ -396,10 +349,10 @@ me:\ it in this form: &prompt.root; pw useradd user_name -L language - - + + - + Shell Startup File Method @@ -439,7 +392,6 @@ me:\ LANG=de_DE.ISO8859-1; export LANG setenv LANG de_DE.ISO8859-1 - @@ -677,6 +629,46 @@ keychange="fkey_number sequ Compiling <acronym>i18n</acronym> Programs + The &os; + &os; Ports + Collection contains programs which provide + application support for wide or multibyte characters for several languages. + Refer to the i18n documentation in the + respective &os; port + for more information on how to configure the application correctly or to + determine which compile options to use when building the + port. + + Some things to keep in mind are: + + + + Language specific single C chars character sets + such as ISO8859-1, ISO8859-15, KOI8-R, and CP437. These + are described in &man.multibyte.3;. + + + + Wide or multibyte encodings such as EUC and + Big5. + + + + The active list of character sets can be found at the + IANA + Registry. + + + &os; uses Xorg-compatible locale encodings + instead. + + + In the &os; Ports Collection, i18n + applications include i18n in their names + for easy identification. However, they do not always support + the language needed. + Many applications in the &os; Ports Collection have been ported with i18n support. Some of these include -i18n in the port name. These From owner-svn-doc-head@FreeBSD.ORG Tue Feb 11 15:38:08 2014 Return-Path: Delivered-To: svn-doc-head@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 ESMTPS id 2B582756; Tue, 11 Feb 2014 15:38:08 +0000 (UTC) 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 15BF31F55; Tue, 11 Feb 2014 15:38:08 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1BFc7A8053740; Tue, 11 Feb 2014 15:38:07 GMT (envelope-from pawel@svn.freebsd.org) Received: (from pawel@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1BFc7eB053739; Tue, 11 Feb 2014 15:38:07 GMT (envelope-from pawel@svn.freebsd.org) Message-Id: <201402111538.s1BFc7eB053739@svn.freebsd.org> From: Pawel Pekala Date: Tue, 11 Feb 2014 15:38:07 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r43872 - head/en_US.ISO8859-1/articles/contributors X-SVN-Group: doc-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the doc tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Feb 2014 15:38:08 -0000 Author: pawel (ports committer) Date: Tue Feb 11 15:38:07 2014 New Revision: 43872 URL: http://svnweb.freebsd.org/changeset/doc/43872 Log: Add Jim Ohlstein for math/pecl-trader PR: ports/186226 Modified: head/en_US.ISO8859-1/articles/contributors/contrib.additional.xml Modified: head/en_US.ISO8859-1/articles/contributors/contrib.additional.xml ============================================================================== --- head/en_US.ISO8859-1/articles/contributors/contrib.additional.xml Tue Feb 11 14:59:28 2014 (r43871) +++ head/en_US.ISO8859-1/articles/contributors/contrib.additional.xml Tue Feb 11 15:38:07 2014 (r43872) @@ -4675,6 +4675,11 @@ + Jim Ohlstein + jim@ohlste.in + + + Jim Pirzyk pirzyk@uiuc.edu From owner-svn-doc-head@FreeBSD.ORG Tue Feb 11 16:35:55 2014 Return-Path: Delivered-To: svn-doc-head@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 ESMTPS id 6800B2CA; Tue, 11 Feb 2014 16:35:55 +0000 (UTC) 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 4F9A914D6; Tue, 11 Feb 2014 16:35:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1BGZtP7076615; Tue, 11 Feb 2014 16:35:55 GMT (envelope-from dru@svn.freebsd.org) Received: (from dru@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1BGZt2o076614; Tue, 11 Feb 2014 16:35:55 GMT (envelope-from dru@svn.freebsd.org) Message-Id: <201402111635.s1BGZt2o076614@svn.freebsd.org> From: Dru Lavigne Date: Tue, 11 Feb 2014 16:35:55 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r43873 - head/en_US.ISO8859-1/books/handbook/l10n X-SVN-Group: doc-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the doc tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Feb 2014 16:35:55 -0000 Author: dru Date: Tue Feb 11 16:35:54 2014 New Revision: 43873 URL: http://svnweb.freebsd.org/changeset/doc/43873 Log: More tightening and clarification in this chapter. More commits to follow. Sponsored by: iXsystems Modified: head/en_US.ISO8859-1/books/handbook/l10n/chapter.xml Modified: head/en_US.ISO8859-1/books/handbook/l10n/chapter.xml ============================================================================== --- head/en_US.ISO8859-1/books/handbook/l10n/chapter.xml Tue Feb 11 15:38:07 2014 (r43872) +++ head/en_US.ISO8859-1/books/handbook/l10n/chapter.xml Tue Feb 11 16:35:54 2014 (r43873) @@ -173,64 +173,60 @@ Setting Locale for Login Shell - Usually it is sufficient to export the value of the - locale name as LANG in the login shell. This - could be done in the user's ~/.login_conf + Locale settings are configured either in a user's + ~/.login_conf or in the startup file of the user's shell: - (~/.profile, + ~/.profile, ~/.bashrc, or - ~/.cshrc). There is no need to set the - locale subsets such as LC_CTYPE or - LC_CTIME. Refer to language-specific &os; - documentation for more information. + ~/.cshrc. - Each user should set the following two environment - variables in their configuration files: + Two environment + variables should be set: - LANG for &posix; + LANG, which sets the locale POSIX - - &man.setlocale.3; family functions + MIME - MM_CHARSET for applications' MIME - character set + MM_CHARSET which sets the MIME + character set used by applications - These should be set in the user's shell configuration, the - specific application configuration, and the + In addition to the user's shell configuration, these + variables should also be set for + specific application configuration and Xorg configuration. locale login class - This section describes the two methods for setting - locale. The first is recommended and assigns the - environment variables in the - login class. The second - method adds the environment variable assignments to the - system's shell - startup file. + Two methods are available for making the needed variable + assignments: the + login class method, which + is the recommended method, and the + startup file method. + The next two sections demonstrate how to use both methods. Login Classes Method - This method assigns the required environment variables for + This first method is the recommended method as it + assigns the required environment variables for locale name and MIME character sets for every possible shell. - This setup can be either be - performed by each user or it can be performed for all users by the + This setup can either be + performed by each user or it can be configured for all users by the superuser. - This minimal example sets both variables for the - Latin-1 encoding. These lines were added to the - .login_conf in an individual user's + This minimal example sets both variables for + Latin-1 encoding in the + .login_conf of an individual user's home directory: me:\ @@ -240,9 +236,9 @@ Traditional Chinese BIG-5 encoding Here is an example of a user's - .login_conf that sets the variables + ~/.login_conf that sets the variables for Traditional Chinese in BIG-5 encoding. More - variables are set because some applications do not + variables are needed because some applications do not correctly respect locale variables for Chinese, Japanese, and Korean: @@ -260,19 +256,16 @@ me:\ :charset=big5:\ :xmodifiers="@im=gcin": #Set gcin as the XIM Input Server - See &man.login.conf.5; for more - details. - - Alternately, the superuser can configure all users of the system for localization. The following variables in the user's login class in - /etc/login.conf set the correct - language: + Alternately, the superuser can configure all users of the system for localization. The following variables in + /etc/login.conf are used to set the locale and + MIME character sete: language_name|Account Type Description:\ :charset=MIME_charset:\ :lang=locale_name:\ :tc=default: - The previous Latin-1 example would look like + So, the previous Latin-1 example would look like this: german|German Users Accounts:\ @@ -280,73 +273,61 @@ me:\ :lang=de_DE.ISO8859-1:\ :tc=default: + See &man.login.conf.5; for more + details about these variables. + Whenever /etc/login.conf is edited, remember to execute the following command to update the capability database: &prompt.root; cap_mkdb /etc/login.conf - Changing Login Classes with - &man.vipw.8; + Utilities Which Change Login Classes vipw + + In addition to manually editing + /etc/login.conf, several utilities + are available for setting the locale for newly created + users. + When using vipw to add new users, - use language to set the - language: + specify the language to set the + locale: user:password:1111:11:language:0:0:User Name:/home/user:/bin/sh - - - - Changing Login Classes with - &man.adduser.8; adduser login class When using adduser to add new - users, configure the language as follows: + users, the default language can be pre-configured for + all new users or specified for an individual user. - - If all new users use the same language, set defaultclass = language in /etc/adduser.conf. - - - Alternatively, input the specified language at - this prompt: + To override this setting when creating a + user, either input the required locale at + this prompt: Enter login class: default []: - when creating a new user using - &man.adduser.8;. - - - - Another alternative is to use the following - when creating a user that uses a different language - than the one set in - /etc/adduser.conf: + or specify the locale to set when invoking + adduser: &prompt.root; adduser -class language - - - - - Changing Login Classes with - &man.pw.8; pw - If &man.pw.8; is used to add new users, call - it in this form: + If pw is used to add new users, specify the + locale as follows: &prompt.root; pw useradd user_name -L language @@ -355,39 +336,33 @@ me:\ Shell Startup File Method - - This method is not recommended because it requires - a different setup for each shell. Use the Login Class Method - instead. - - - MIME - locale - To add the locale name and MIME character set, set - the two environment variables shown below in the - /etc/profile or - /etc/csh.login shell startup files. - This example sets the German language: - - In /etc/profile: + This method is not recommended as each shell that is used requires + manual configuration, where each shell has a different configuration file + and differing syntax. As an example, to set the German + language for the sh shell, these + lines could be added to ~/.profile to set the shell for that user only. + Thse lines could also be added to /etc/profile or + /usr/share/skel/dot.profile to set that shell for all users: LANG=de_DE.ISO8859-1; export LANG MM_CHARSET=ISO-8859-1; export MM_CHARSET - Or in /etc/csh.login: + However, the name of the configuration file and the + syntax used differs for the + csh shell. These are the equivalent + settings for ~/.csh.login, + /etc/csh.login, or + /usr/share/skel/dot.login: setenv LANG de_DE.ISO8859-1 setenv MM_CHARSET ISO-8859-1 - Alternatively, add the above settings to - /usr/share/skel/dot.profile or - /usr/share/skel/dot.login. - - To configure Xorg, add - one of the following to - ~/.xinitrc, depending upon the - shell: + To complicate matters, the syntax needed to configure + Xorg in + ~/.xinitrc also depends upon the + shell. The first example is for the sh + shell and the second is for the csh + shell. LANG=de_DE.ISO8859-1; export LANG From owner-svn-doc-head@FreeBSD.ORG Tue Feb 11 16:55:42 2014 Return-Path: Delivered-To: svn-doc-head@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 ESMTPS id 840F3FED; Tue, 11 Feb 2014 16:55:42 +0000 (UTC) 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 6D704167F; Tue, 11 Feb 2014 16:55:42 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1BGtg7T085017; Tue, 11 Feb 2014 16:55:42 GMT (envelope-from dru@svn.freebsd.org) Received: (from dru@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1BGtghf085016; Tue, 11 Feb 2014 16:55:42 GMT (envelope-from dru@svn.freebsd.org) Message-Id: <201402111655.s1BGtghf085016@svn.freebsd.org> From: Dru Lavigne Date: Tue, 11 Feb 2014 16:55:42 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r43874 - head/en_US.ISO8859-1/books/handbook/l10n X-SVN-Group: doc-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the doc tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Feb 2014 16:55:42 -0000 Author: dru Date: Tue Feb 11 16:55:42 2014 New Revision: 43874 URL: http://svnweb.freebsd.org/changeset/doc/43874 Log: White space fix only. Translators can ignore. Sponsored by: iXsystems Modified: head/en_US.ISO8859-1/books/handbook/l10n/chapter.xml Modified: head/en_US.ISO8859-1/books/handbook/l10n/chapter.xml ============================================================================== --- head/en_US.ISO8859-1/books/handbook/l10n/chapter.xml Tue Feb 11 16:35:54 2014 (r43873) +++ head/en_US.ISO8859-1/books/handbook/l10n/chapter.xml Tue Feb 11 16:55:42 2014 (r43874) @@ -110,14 +110,15 @@ language codes country codes - The LanguageCode and CountryCode are used - to determine the country - and the specific language - variation. provides some - examples of LanguageCode_CountryCode: + The LanguageCode and + CountryCode are used to determine + the country and the specific language variation. provides some examples of + LanguageCode_CountryCode: Common Language and Country Codes + @@ -148,10 +149,10 @@ encodings ASCII - Some languages, such as Chinese or Japanese, cannot be represented using ASCII characters - and require an extended language encoding using either - wide or multibyte characters. Older applications - may mistake these encodings for control + Some languages, such as Chinese or Japanese, cannot be + represented using ASCII characters and require an extended + language encoding using either wide or multibyte characters. + Older applications may mistake these encodings for control characters while newer applications usually recognize 8-bit characters. Depending on the implementation, users may be required to compile an application with wide or multibyte @@ -161,13 +162,13 @@ considerations for finding or compiling applications with i18n support. - A complete listing of available locales can be found by + A complete listing of available locales can be found by typing: &prompt.user; locale -a | more - + To determine the current locale setting: - + &prompt.user; locale @@ -186,8 +187,7 @@ LANG, which sets the locale - POSIX - + POSIX @@ -203,46 +203,44 @@ specific application configuration and Xorg configuration. - locale - login class + locale + login class - Two methods are available for making the needed variable - assignments: the - login class method, which - is the recommended method, and the - startup file method. - The next two sections demonstrate how to use both methods. - - - Login Classes Method - - This first method is the recommended method as it - assigns the required environment variables for - locale name and MIME character sets - for every possible shell. - This setup can either be - performed by each user or it can be configured for all users by the - superuser. - - This minimal example sets both variables for - Latin-1 encoding in the - .login_conf of an individual user's - home directory: + Two methods are available for making the needed variable + assignments: the login + class method, which is the recommended method, and + the startup file method. + The next two sections demonstrate how to use both + methods. + + + Login Classes Method + + This first method is the recommended method as it + assigns the required environment variables for locale name + and MIME character sets for every possible shell. This + setup can either be performed by each user or it can be + configured for all users by the superuser. + + This minimal example sets both variables for Latin-1 + encoding in the .login_conf of an + individual user's home directory: - me:\ + me:\ :charset=ISO-8859-1:\ :lang=de_DE.ISO8859-1: - Traditional Chinese - BIG-5 encoding - Here is an example of a user's - ~/.login_conf that sets the variables - for Traditional Chinese in BIG-5 encoding. More - variables are needed because some applications do not - correctly respect locale variables for Chinese, - Japanese, and Korean: + Traditional Chinese + BIG-5 encoding + + Here is an example of a user's + ~/.login_conf that sets the variables + for Traditional Chinese in BIG-5 encoding. More variables + are needed because some applications do not correctly + respect locale variables for Chinese, Japanese, and + Korean: - #Users who do not wish to use monetary units or time formats + #Users who do not wish to use monetary units or time formats #of Taiwan can manually change each variable me:\ :lang=zh_TW.Big5:\ @@ -256,103 +254,108 @@ me:\ :charset=big5:\ :xmodifiers="@im=gcin": #Set gcin as the XIM Input Server - Alternately, the superuser can configure all users of the system for localization. The following variables in - /etc/login.conf are used to set the locale and - MIME character sete: + Alternately, the superuser can configure all users of + the system for localization. The following variables in + /etc/login.conf are used to set the + locale and MIME character sete: - language_name|Account Type Description:\ + language_name|Account Type Description:\ :charset=MIME_charset:\ :lang=locale_name:\ :tc=default: - So, the previous Latin-1 example would look like - this: + So, the previous Latin-1 example would look like + this: - german|German Users Accounts:\ + german|German Users Accounts:\ :charset=ISO-8859-1:\ :lang=de_DE.ISO8859-1:\ :tc=default: - See &man.login.conf.5; for more - details about these variables. + See &man.login.conf.5; for more details about these + variables. + + Whenever /etc/login.conf is edited, + remember to execute the following command to update the + capability database: + + &prompt.root; cap_mkdb /etc/login.conf + + + Utilities Which Change Login Classes + + + vipw + + + In addition to manually editing + /etc/login.conf, several utilities + are available for setting the locale for newly created + users. + + When using vipw to add new users, + specify the language to set the + locale: + + user:password:1111:11:language:0:0:User Name:/home/user:/bin/sh + + + adduser + + login class + + When using adduser to add new + users, the default language can be pre-configured for all + new users or specified for an individual user. + + If all new users use the same language, set + defaultclass = language in + /etc/adduser.conf. - Whenever /etc/login.conf is edited, remember to execute the following - command to update the capability database: + To override this setting when creating a user, either + input the required locale at this prompt: - &prompt.root; cap_mkdb /etc/login.conf + Enter login class: default []: - - Utilities Which Change Login Classes - - - vipw - - - In addition to manually editing - /etc/login.conf, several utilities - are available for setting the locale for newly created - users. - - When using vipw to add new users, - specify the language to set the - locale: - - user:password:1111:11:language:0:0:User Name:/home/user:/bin/sh - - - adduser - - login class - When using adduser to add new - users, the default language can be pre-configured for - all new users or specified for an individual user. - - If all new users use the same language, set - defaultclass = - language in - /etc/adduser.conf. - - To override this setting when creating a - user, either input the required locale at - this prompt: - - Enter login class: default []: - - or specify the locale to set when invoking - adduser: - - &prompt.root; adduser -class language - - - pw - - If pw is used to add new users, specify the - locale as follows: + or specify the locale to set when invoking + adduser: - &prompt.root; pw useradd user_name -L language + &prompt.root; adduser -class language + + + pw + + + If pw is used to add new users, + specify the locale as follows: + + &prompt.root; pw useradd user_name -L language Shell Startup File Method - This method is not recommended as each shell that is used requires - manual configuration, where each shell has a different configuration file - and differing syntax. As an example, to set the German - language for the sh shell, these - lines could be added to ~/.profile to set the shell for that user only. - Thse lines could also be added to /etc/profile or - /usr/share/skel/dot.profile to set that shell for all users: + This method is not recommended as each shell that is + used requires manual configuration, where each shell has a + different configuration file and differing syntax. As an + example, to set the German language for the + sh shell, these lines could be added to + ~/.profile to set the shell for that + user only. Thse lines could also be added to + /etc/profile or + /usr/share/skel/dot.profile to set + that shell for all users: LANG=de_DE.ISO8859-1; export LANG MM_CHARSET=ISO-8859-1; export MM_CHARSET - However, the name of the configuration file and the - syntax used differs for the - csh shell. These are the equivalent - settings for ~/.csh.login, - /etc/csh.login, or - /usr/share/skel/dot.login: + However, the name of the configuration file and the + syntax used differs for the csh shell. + These are the equivalent settings for + ~/.csh.login, + /etc/csh.login, or + /usr/share/skel/dot.login: setenv LANG de_DE.ISO8859-1 setenv MM_CHARSET ISO-8859-1 @@ -604,45 +607,40 @@ keychange="fkey_number sequ Compiling <acronym>i18n</acronym> Programs - The &os; - &os; Ports - Collection contains programs which provide - application support for wide or multibyte characters for several languages. - Refer to the i18n documentation in the - respective &os; port - for more information on how to configure the application correctly or to - determine which compile options to use when building the - port. - - Some things to keep in mind are: - - - - Language specific single C chars character sets - such as ISO8859-1, ISO8859-15, KOI8-R, and CP437. These - are described in &man.multibyte.3;. - - - - Wide or multibyte encodings such as EUC and - Big5. - - - - The active list of character sets can be found at the - IANA - Registry. - - - &os; uses Xorg-compatible locale encodings - instead. - - - In the &os; Ports Collection, i18n - applications include i18n in their names - for easy identification. However, they do not always support - the language needed. + The &os; &os; + Ports Collection contains programs which provide + application support for wide or multibyte characters for several + languages. Refer to the i18n documentation + in the respective &os; port for more information on how to + configure the application correctly or to determine which + compile options to use when building the port. + + Some things to keep in mind are: + + + + Language specific single C chars character sets such as + ISO8859-1, ISO8859-15, KOI8-R, and CP437. These are + described in &man.multibyte.3;. + + + + Wide or multibyte encodings such as EUC and Big5. + + + + The active list of character sets can be found at the IANA + Registry. + + + &os; uses Xorg-compatible locale encodings instead. + + + In the &os; Ports Collection, i18n + applications include i18n in their names for + easy identification. However, they do not always support the + language needed. Many applications in the &os; Ports Collection have been ported with i18n support. Some of these From owner-svn-doc-head@FreeBSD.ORG Tue Feb 11 18:40:01 2014 Return-Path: Delivered-To: svn-doc-head@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 ESMTPS id AA9EA456; Tue, 11 Feb 2014 18:40:01 +0000 (UTC) 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 88D67125C; Tue, 11 Feb 2014 18:40:01 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1BIe1YF026747; Tue, 11 Feb 2014 18:40:01 GMT (envelope-from dru@svn.freebsd.org) Received: (from dru@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1BIe1OP026746; Tue, 11 Feb 2014 18:40:01 GMT (envelope-from dru@svn.freebsd.org) Message-Id: <201402111840.s1BIe1OP026746@svn.freebsd.org> From: Dru Lavigne Date: Tue, 11 Feb 2014 18:40:01 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r43875 - head/en_US.ISO8859-1/books/handbook/l10n X-SVN-Group: doc-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the doc tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Feb 2014 18:40:01 -0000 Author: dru Date: Tue Feb 11 18:40:01 2014 New Revision: 43875 URL: http://svnweb.freebsd.org/changeset/doc/43875 Log: Finish section 22.2.2 Console Setup. Update table on available consoles. Sponsored by: iXsystems Modified: head/en_US.ISO8859-1/books/handbook/l10n/chapter.xml Modified: head/en_US.ISO8859-1/books/handbook/l10n/chapter.xml ============================================================================== --- head/en_US.ISO8859-1/books/handbook/l10n/chapter.xml Tue Feb 11 16:55:42 2014 (r43874) +++ head/en_US.ISO8859-1/books/handbook/l10n/chapter.xml Tue Feb 11 18:40:01 2014 (r43875) @@ -342,7 +342,7 @@ me:\ example, to set the German language for the sh shell, these lines could be added to ~/.profile to set the shell for that - user only. Thse lines could also be added to + user only. These lines could also be added to /etc/profile or /usr/share/skel/dot.profile to set that shell for all users: @@ -365,7 +365,7 @@ me:\ ~/.xinitrc also depends upon the shell. The first example is for the sh shell and the second is for the csh - shell. + shell: LANG=de_DE.ISO8859-1; export LANG @@ -376,75 +376,59 @@ me:\ Console Setup - For all single C chars character sets, set the correct - console fonts in /etc/rc.conf for the - language in question with: + Several localized fonts + are available for the console. To see a listing of + available fonts, type + ls /usr/share/syscons/fonts. To configure + the console font, specify the + font_name, + without the .fnt suffix, + in /etc/rc.conf: font8x16=font_name font8x14=font_name font8x8=font_name - The font_name is taken from - /usr/share/syscons/fonts, - without the .fnt suffix. - - - sysinstall - keymap screenmap - The keymap and screenmap for the single C chars character - set can be set using sysinstall. Once - inside sysinstall, choose - Configure, then - Console. Alternatively, - add the following to /etc/rc.conf: + The keymap and screenmap + can be set by + adding the following to /etc/rc.conf: scrnmap=screenmap_name keymap=keymap_name keychange="fkey_number sequence" - The screenmap_name is taken - from /usr/share/syscons/scrnmaps, - without the .scm suffix. A screenmap + To see the list of available screenmaps, type + ls /usr/share/syscons/scrnmaps. Do + not include the .scm suffix when + specifying screenmap_name. A screenmap with a corresponding mapped font is usually needed as a workaround for expanding bit 8 to bit 9 on a VGA adapter's - font character matrix. This will move letters out of the + font character matrix so that letters are moved out of the pseudographics area if the screen font uses a bit 8 column. - If moused is enabled in - /etc/rc.conf, review the mouse cursor - information in the next paragraph. - - - moused - - By default, the mouse cursor of the &man.syscons.4; driver - occupies the 0xd0-0xd3 range in the character set. If the - language uses this range, move the cursor's range. To enable - this workaround for &os;, add the following line to - /etc/rc.conf: - - mousechar_start=3 - - The keymap_name in the above - example is taken from - /usr/share/syscons/keymaps, without the + To see the list of available keymaps, type + ls /usr/share/syscons/keymaps. When + specifying the keymap_name, do not include the .kbd suffix. When uncertain as to which keymap to use, &man.kbdmap.1; can be used to test keymaps without rebooting. - The keychange is usually needed to + The keychange entry is usually needed to program function keys to match the selected terminal type - because function key sequences cannot be defined in the key - map. + because function key sequences cannot be defined in the keymap. - Be sure to set the correct console terminal type in + Next, set the correct console terminal type in /etc/ttys for all virtual terminal - entries. Current pre-defined correspondences are: + entries. summarizes the available + terminal types.: + +
    + Defined Terminal Types for Character Sets - @@ -490,22 +474,27 @@ keychange="fkey_number sequ - +
    + + + moused + + + For languages with wide or multibyte characters, install a + console for that language from the &os; Ports Collection. The + available ports are summarized in . Once installed, refer to the + port's pkg-message or man pages for + configuration and usage instructions. - For languages with wide or multibyte characters, use the - correct &os; port in /usr/ports/language. - Some applications appear as serial terminals to the system. - Reserve enough terminals in /etc/ttys - for both Xorg and the pseudo-serial - console. Here is a partial list of applications for using - other languages in the console: + + Available Console From Ports Collection - Language - Location + Port Location @@ -516,19 +505,45 @@ keychange="fkey_number sequ + Chinese/Japanese/Korean + chinese/cce + + + + Japanese + chinese/kon2 + + + + Chinese/Japanese/Korean + chinese/zhcon + + + Japanese - japanese/kon2-16dot or - japanese/mule-freewnn + japanese/kon2-14dot - Korean - korean/han + Japanese + japanese/kon2-16dot - - +
    + + If moused is enabled in + /etc/rc.conf, additional configuration + may be required. + By default, the mouse cursor of the &man.syscons.4; driver + occupies the 0xd0-0xd3 range in the character set. If the + language uses this range, move the cursor's range. To enable + this workaround for &os;, add the following line to + /etc/rc.conf: + + mousechar_start=3 + +     Xorg Setup From owner-svn-doc-head@FreeBSD.ORG Tue Feb 11 19:48:00 2014 Return-Path: Delivered-To: svn-doc-head@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 ESMTPS id 9E6B0DC4; Tue, 11 Feb 2014 19:48:00 +0000 (UTC) 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 79FA01982; Tue, 11 Feb 2014 19:48:00 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1BJm0sS053678; Tue, 11 Feb 2014 19:48:00 GMT (envelope-from jhb@svn.freebsd.org) Received: (from jhb@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1BJlxPP053665; Tue, 11 Feb 2014 19:47:59 GMT (envelope-from jhb@svn.freebsd.org) Message-Id: <201402111947.s1BJlxPP053665@svn.freebsd.org> From: John Baldwin Date: Tue, 11 Feb 2014 19:47:59 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r43876 - head/en_US.ISO8859-1/htdocs/internal X-SVN-Group: doc-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the doc tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Feb 2014 19:48:00 -0000 Author: jhb Date: Tue Feb 11 19:47:59 2014 New Revision: 43876 URL: http://svnweb.freebsd.org/changeset/doc/43876 Log: Formally publish the FreeBSD Project's software license policy as approved by core@ in February of 2008. Requested by: bz Reviewed by: gjb Added: head/en_US.ISO8859-1/htdocs/internal/software-license.xml (contents, props changed) Modified: head/en_US.ISO8859-1/htdocs/internal/Makefile head/en_US.ISO8859-1/htdocs/internal/policies.xml Modified: head/en_US.ISO8859-1/htdocs/internal/Makefile ============================================================================== --- head/en_US.ISO8859-1/htdocs/internal/Makefile Tue Feb 11 18:40:01 2014 (r43875) +++ head/en_US.ISO8859-1/htdocs/internal/Makefile Tue Feb 11 19:47:59 2014 (r43876) @@ -26,6 +26,7 @@ DOCS+= policies.xml DOCS+= proposing-committers.xml DOCS+= releng.xml DOCS+= resources.xml +DOCS+= software-license.xml DOCS+= statistic.xml DOCS+= working-with-hats.xml Modified: head/en_US.ISO8859-1/htdocs/internal/policies.xml ============================================================================== --- head/en_US.ISO8859-1/htdocs/internal/policies.xml Tue Feb 11 18:40:01 2014 (r43875) +++ head/en_US.ISO8859-1/htdocs/internal/policies.xml Tue Feb 11 19:47:59 2014 (r43876) @@ -44,6 +44,7 @@ below, for more info.

  • Internationalization Policy
  • New Account Creation Procedure
  • Problem Report Handling Guidelines
    • +
  • Software License Policy
  • User Data Policy
Added: head/en_US.ISO8859-1/htdocs/internal/software-license.xml ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/en_US.ISO8859-1/htdocs/internal/software-license.xml Tue Feb 11 19:47:59 2014 (r43876) @@ -0,0 +1,231 @@ + + +]> + + + + &title; + + $FreeBSD$ + + + + +

Philosophy

+ +

The FreeBSD Project aims to produce a complete, BSD-licensed + operating system allowing consumers of the system to produce + derivative products without constraint or further license + obligations. We invite and greatly appreciate the contribution of + both changes and additions under the two-clause BSD license, and + encourage the adoption of this license by other open source + projects. Use of the BSD license is key to encouraging the + adoption of advanced operating system technology, and on many + notable occasions has been pivotal to widespread use of new + technology.

+ +

We accept however that compelling reasons exist to allow + differently-licensed software to be included in the FreeBSD source + tree.

+ +

We require any software under alternative licenses to be + carefully isolated in the source tree so that it cannot + contaminate BSD-only components. Such cautious management + encourages licensing clarity and facilitates the production of + BSD-only derivative products.

+ +

Unless a special exception is made, no existing BSD-licensed + components may be replaced with differently-licensed software. We + instead encourage FreeBSD and third party developers to seek the + relicensing or reimplementation of critical components under the + BSD license. Such would ease their more integral adoption into + the FreeBSD operating system.

+ +

Policy

+ +
    +
  • +

    The import of new software licensed under any licenses + other than the BSD license and BSD-Like Licenses (as defined + below) requires the prior approval of the FreeBSD Core Team. + Requests for import must include:

    + +
      +
    • +

      A list of features or bug fixes that the new version or + patches contain, along with evidence that our users need + those features. PRs or references to mailing list + discussions are ideal forms of evidence.

      + +

      This process should be used for all software imports, + not just those that require Core Team review. The mere + existence of a new version does not justify an import of + software to source or ports.

      +
      • + +
    • +

      A list of FreeBSD branches that may be affected. + Expansions of scope require a new request to and approval + from the FreeBSD Core Team.

      +
      • +
    +
    • + +
  • +

    We will allow existing GPLv2 licensed software to be + converted to GPLv3 or other similar license changes on a + case-by-case basis provided that the FreeBSD Core Team is + given appropriate technical justification.

    + +

    Each piece of software that is being converted to a + different license must be submitted to the FreeBSD Core Team + for approval through this process as though it were a new + piece of software.

    + +

    For Free Software Foundation maintained software except + GCC, GDB, and binutils, all patches posted after the date the + software switched to GPLv3 will be considered to be covered by + the GPLv3 and thus will be subject to this rule. For GCC, GDB + and binutils we accept the community practice of allowing + patches to be relicensed under GPLv2 at the patch author's + discretion. The author's permission must be documented in the + commit message for each patch that is committed.

    +
    • +
+ +

Acceptable licenses

+ +

The following licenses are considered to be acceptable BSD-Like + Licenses for the purpose of this Policy. They must be reproduced + verbatim on any new code. Deviations or the use of any other + license must be approved by the FreeBSD Core Team:

+ +
    +
  • +

    The 2 clause version of the BSD license

    + + 
    +/*-
+ * Copyright (c) [year] [your name]
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * [id for your version control system, if any]
+ */
+
    +
    • + +
  • +

    The 3 clause version of the BSD license

    + + 
    +/*-
+ * Copyright (c) [year] [your name]
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the author nor the names of its contributors may
+ *    be used to endorse or promote products derived from this software
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * [id for your version control system, if any]
+ */
+
    +
    • + +
  • +

    The ISC License

    + + 
    +/*-
+ * Copyright (c) [year] [copyright holder]
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * [id for your version control system, if any]
+ */
+
    +
    • + +
  • +

    The MIT License

    + + 
    +/*-
+ * Copyright (c) [year] [copyright holders]
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * [id for your version control system, if any]
+ */
+
    +
    • +
+ + From owner-svn-doc-head@FreeBSD.ORG Tue Feb 11 20:09:29 2014 Return-Path: Delivered-To: svn-doc-head@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 ESMTPS id 542DD22E; Tue, 11 Feb 2014 20:09:29 +0000 (UTC) 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 3F6BB1BD4; Tue, 11 Feb 2014 20:09:29 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1BK9T7g062331; Tue, 11 Feb 2014 20:09:29 GMT (envelope-from dru@svn.freebsd.org) Received: (from dru@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1BK9Txb062330; Tue, 11 Feb 2014 20:09:29 GMT (envelope-from dru@svn.freebsd.org) Message-Id: <201402112009.s1BK9Txb062330@svn.freebsd.org> From: Dru Lavigne Date: Tue, 11 Feb 2014 20:09:29 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r43877 - head/en_US.ISO8859-1/books/handbook/l10n X-SVN-Group: doc-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the doc tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Feb 2014 20:09:29 -0000 Author: dru Date: Tue Feb 11 20:09:28 2014 New Revision: 43877 URL: http://svnweb.freebsd.org/changeset/doc/43877 Log: Cleanup 22.2.3 Xorg Setup. Add table which summarizes available input methods. Sponsored by: iXsystems Modified: head/en_US.ISO8859-1/books/handbook/l10n/chapter.xml Modified: head/en_US.ISO8859-1/books/handbook/l10n/chapter.xml ============================================================================== --- head/en_US.ISO8859-1/books/handbook/l10n/chapter.xml Tue Feb 11 19:47:59 2014 (r43876) +++ head/en_US.ISO8859-1/books/handbook/l10n/chapter.xml Tue Feb 11 20:09:28 2014 (r43877) @@ -548,41 +548,201 @@ keychange="fkey_number sequ Xorg Setup - Although Xorg is not installed - with &os;, it can be installed from the Ports Collection. - Refer to for more information on - how to do this. This section discusses how to localize - Xorg once it is installed. - - Application specific i18n settings such + describes how to install and + configure Xorg. When configuring + Xorg for localization, additional + fonts and input methods are available from the &os; Ports + Collection. Application specific i18n settings such as fonts and menus can be tuned in - ~/.Xresources. - - - Displaying Fonts - - Xorg True Type font - server - After installing - x11-servers/xorg-server, - install the language's &truetype; fonts. Setting the - correct locale should allow users to view their selected + ~/.Xresources and + should allow users to view their selected language in graphical application menus. - - - - Inputting Non-English Characters X Input Method (XIM) The X Input Method (XIM) protocol - is an input standard for Xorg - clients. All Xorg applications - should be written as XIM clients that take input from XIM - input servers. There are several XIM servers available for - different languages. - + is an Xorg standard for + inputting non-English characters. summarizes the input method applications which are + available in the &os; Ports Collection. Additional Fcitx + and Uim applications are also available. + + + Available Input Methods + + + + + Language + Input Method + + + + + + + Chinese + chinese/gcin + + + + Chinese + chinese/ibus-chewing + + + + Chinese + chinese/ibus-pinyin + + + + Chinese + chinese/oxim + + + + Chinese + chinese/scim-fcitx + + + + Chinese + chinese/scim-pinyin + + + + Chinese + chinese/scim-tables + + + + Japanese + japanese/ibus-anthy + + + + Japanese + japanese/ibus-mozc + + + + Japanese + japanese/ibus-skk + + + + Japanese + japanese/im-ja + + + + Japanese + japanese/kinput2 + + + + Japanese + japanese/scim-anthy + + + + Japanese + japanese/scim-canna + + + + Japanese + japanese/scim-honoka + + + + Japanese + japanese/scim-honoka-plugin-romkan + + + + Japanese + japanese/scim-honoka-plugin-wnn + + + + Japanese + japanese/scim-prime + + + + Japanese + japanese/scim-skk + + + + Japanese + japanese/scim-tables + + + + Japanese + japanese/scim-tomoe + + + + Japanese + japanese/scim-uim + + + + Japanese + japanese/skkinput + + + + Japanese + japanese/skkinput3 + + + + Japanese + japanese/uim-anthy + + + + Korean + korean/ibus-hangul + + + + Korean + korean/imhangul + + + + Korean + korean/nabi + + + + Korean + korean/scim-hangul + + + + Korean + korean/scim-tables + + + + Vietnamese + vietnamese/xvnkb + + + + Vietnamese + vietnamese/x-unikey + + + +
From owner-svn-doc-head@FreeBSD.ORG Tue Feb 11 20:17:37 2014 Return-Path: Delivered-To: svn-doc-head@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 ESMTPS id 30B1C681; Tue, 11 Feb 2014 20:17:37 +0000 (UTC) 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 0E2731C8C; Tue, 11 Feb 2014 20:17:37 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1BKHa3j066470; Tue, 11 Feb 2014 20:17:36 GMT (envelope-from dru@svn.freebsd.org) Received: (from dru@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1BKHa8I066469; Tue, 11 Feb 2014 20:17:36 GMT (envelope-from dru@svn.freebsd.org) Message-Id: <201402112017.s1BKHa8I066469@svn.freebsd.org> From: Dru Lavigne Date: Tue, 11 Feb 2014 20:17:36 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r43878 - head/en_US.ISO8859-1/books/handbook/l10n X-SVN-Group: doc-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the doc tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Feb 2014 20:17:37 -0000 Author: dru Date: Tue Feb 11 20:17:36 2014 New Revision: 43878 URL: http://svnweb.freebsd.org/changeset/doc/43878 Log: White space fix only. Translators can ignore. Sponsored by: iXsystems Modified: head/en_US.ISO8859-1/books/handbook/l10n/chapter.xml Modified: head/en_US.ISO8859-1/books/handbook/l10n/chapter.xml ============================================================================== --- head/en_US.ISO8859-1/books/handbook/l10n/chapter.xml Tue Feb 11 20:09:28 2014 (r43877) +++ head/en_US.ISO8859-1/books/handbook/l10n/chapter.xml Tue Feb 11 20:17:36 2014 (r43878) @@ -376,14 +376,13 @@ me:\ Console Setup - Several localized fonts - are available for the console. To see a listing of - available fonts, type + Several localized fonts are available for the console. To + see a listing of available fonts, type ls /usr/share/syscons/fonts. To configure the console font, specify the font_name, - without the .fnt suffix, - in /etc/rc.conf: + without the .fnt suffix, in + /etc/rc.conf: font8x16=font_name font8x14=font_name @@ -391,40 +390,38 @@ font8x8=font_namekeymap screenmap - The keymap and screenmap - can be set by - adding the following to /etc/rc.conf: + The keymap and screenmap can be set by adding the + following to /etc/rc.conf: scrnmap=screenmap_name keymap=keymap_name keychange="fkey_number sequence" To see the list of available screenmaps, type - ls /usr/share/syscons/scrnmaps. Do - not include the .scm suffix when - specifying screenmap_name. A screenmap - with a corresponding mapped font is usually needed as a - workaround for expanding bit 8 to bit 9 on a VGA adapter's - font character matrix so that letters are moved out of the - pseudographics area if the screen font uses a bit 8 - column. + ls /usr/share/syscons/scrnmaps. Do not + include the .scm suffix when specifying + screenmap_name. A screenmap with a + corresponding mapped font is usually needed as a workaround + for expanding bit 8 to bit 9 on a VGA adapter's font character + matrix so that letters are moved out of the pseudographics + area if the screen font uses a bit 8 column. To see the list of available keymaps, type ls /usr/share/syscons/keymaps. When - specifying the keymap_name, do not include the - .kbd suffix. When uncertain as to which - keymap to use, &man.kbdmap.1; can be used to test keymaps - without rebooting. - - The keychange entry is usually needed to - program function keys to match the selected terminal type - because function key sequences cannot be defined in the keymap. + specifying the keymap_name, do not + include the .kbd suffix. When uncertain + as to which keymap to use, &man.kbdmap.1; can be used to test + keymaps without rebooting. + + The keychange entry is usually needed + to program function keys to match the selected terminal type + because function key sequences cannot be defined in the + keymap. Next, set the correct console terminal type in /etc/ttys for all virtual terminal - entries. summarizes the available - terminal types.: + entries. summarizes the + available terminal types.: Defined Terminal Types for Character Sets @@ -532,18 +529,17 @@ keychange="fkey_number sequ
- If moused is enabled in + If moused is enabled in /etc/rc.conf, additional configuration - may be required. - By default, the mouse cursor of the &man.syscons.4; driver - occupies the 0xd0-0xd3 range in the character set. If the - language uses this range, move the cursor's range. To enable - this workaround for &os;, add the following line to - /etc/rc.conf: + may be required. By default, the mouse cursor of the + &man.syscons.4; driver occupies the + 0xd0-0xd3 range in the + character set. If the language uses this range, move the + cursor's range. To enable this workaround for &os;, add the + following line to /etc/rc.conf: - mousechar_start=3 - - + mousechar_start=3 + Xorg Setup @@ -552,22 +548,21 @@ keychange="fkey_number sequ configure Xorg. When configuring Xorg for localization, additional fonts and input methods are available from the &os; Ports - Collection. Application specific i18n settings such - as fonts and menus can be tuned in - ~/.Xresources and - should allow users to view their selected - language in graphical application menus. - - X Input Method - (XIM) - - The X Input Method (XIM) protocol - is an Xorg standard for - inputting non-English characters. summarizes the input method applications which are - available in the &os; Ports Collection. Additional Fcitx - and Uim applications are also available. - + Collection. Application specific i18n + settings such as fonts and menus can be tuned in + ~/.Xresources and should allow users to + view their selected language in graphical application + menus. + + X Input Method (XIM) + + The X Input Method (XIM) protocol is an + Xorg standard for inputting + non-English characters. + summarizes the input method applications which are available + in the &os; Ports Collection. Additional Fcitx and Uim + applications are also available. + Available Input Methods @@ -615,7 +610,7 @@ keychange="fkey_number sequ Chinese chinese/scim-tables - + Japanese japanese/ibus-anthy @@ -629,17 +624,17 @@ keychange="fkey_number sequ Japanese japanese/ibus-skk - + Japanese japanese/im-ja - + Japanese japanese/kinput2 - + Japanese @@ -649,12 +644,12 @@ keychange="fkey_number sequ Japanese japanese/scim-canna - + Japanese japanese/scim-honoka - + Japanese @@ -699,8 +694,8 @@ keychange="fkey_number sequ Japanese japanese/skkinput3 - - + + Japanese japanese/uim-anthy From owner-svn-doc-head@FreeBSD.ORG Tue Feb 11 22:06:20 2014 Return-Path: Delivered-To: svn-doc-head@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 ESMTPS id 945B2119; Tue, 11 Feb 2014 22:06:20 +0000 (UTC) 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 72D9B17B7; Tue, 11 Feb 2014 22:06:20 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1BM6Kpx011633; Tue, 11 Feb 2014 22:06:20 GMT (envelope-from dru@svn.freebsd.org) Received: (from dru@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1BM6KX8011632; Tue, 11 Feb 2014 22:06:20 GMT (envelope-from dru@svn.freebsd.org) Message-Id: <201402112206.s1BM6KX8011632@svn.freebsd.org> From: Dru Lavigne Date: Tue, 11 Feb 2014 22:06:20 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r43879 - head/en_US.ISO8859-1/books/handbook/l10n X-SVN-Group: doc-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the doc tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Feb 2014 22:06:20 -0000 Author: dru Date: Tue Feb 11 22:06:19 2014 New Revision: 43879 URL: http://svnweb.freebsd.org/changeset/doc/43879 Log: Initial pass through 22.4 Locale Configuration for Specific Languages. More commits to come. Sponsored by: iXsystems Modified: head/en_US.ISO8859-1/books/handbook/l10n/chapter.xml Modified: head/en_US.ISO8859-1/books/handbook/l10n/chapter.xml ============================================================================== --- head/en_US.ISO8859-1/books/handbook/l10n/chapter.xml Tue Feb 11 20:17:36 2014 (r43878) +++ head/en_US.ISO8859-1/books/handbook/l10n/chapter.xml Tue Feb 11 22:06:19 2014 (r43879) @@ -739,7 +739,8 @@ keychange="fkey_number sequ
- + Kernel and File Systems @@ -831,7 +832,12 @@ keychange="fkey_number sequ - Localizing &os; to Specific Languages + Locale Configuration for Specific Languages + + This section provides configuration examples for localizing + a &os; system for the + Russian language. It then provides some + additional resources for localizing other languages. @@ -848,27 +854,14 @@ keychange="fkey_number sequ Russian - For more information about KOI8-R encoding, refer to - KOI8-R References - (Russian Net Character Set). - - - Locale Setup - - To set this locale, put the following lines into each + To set this locale for the login shell, add the following lines into each user's ~/.login_conf: me:My Account:\ :charset=KOI8-R:\ :lang=ru_RU.KOI8-R: - - - Console Setup - - - - Add the following lines to + To configure the console, add the following lines to /etc/rc.conf: keymap="ru.koi8-r" @@ -877,78 +870,49 @@ font8x16="cp866b-8x16" font8x14="cp866-8x14" font8x8="cp866-8x8" mousechar_start=3 - - For each ttyv entry in /etc/ttys, use cons25r as the terminal type. - - - - - - Printer Setup printers - Since most printers with Russian characters come with - hardware code page CP866, a special output filter is needed - to convert from KOI8-R to CP866. &os; installs a default - filter as /usr/libexec/lpr/ru/koi2alt. - A Russian printer /etc/printcap entry - should look like: + To configure printing, a special output filter is needed + to convert from KOI8-R to CP866 since most printers with Russian characters come with + hardware code page CP866. &os; includes a default + filter for this purpose, /usr/libexec/lpr/ru/koi2alt. + To use this filter, add this entry to /etc/printcap: lp|Russian local line printer:\ :sh:of=/usr/libexec/lpr/ru/koi2alt:\ :lp=/dev/lpt0:sd=/var/spool/output/lpd:lf=/var/log/lpd-errs: Refer to &man.printcap.5; for a more detailed - description. - + explanation. - - &ms-dos; and Russian Filenames - - The following example &man.fstab.5; entry enables + To configure support for Russian filenames in mounted &ms-dos; - filesystems: + file systems, include and the locale name when adding an entry to + /etc/fstab: /dev/ad0s2 /dos/c msdos rw,-Lru_RU.KOI8-R 0 0 - selects the locale name. Refer to + Refer to &man.mount.msdosfs.8; for more details. - - - - <application>Xorg</application> Setup - - - First, configure the - non-X locale - setup. - - - When using &xorg;, + To configure Russian fonts for &xorg;, install the x11-fonts/xorg-fonts-cyrillic - package. - - Check the "Files" section in + package. Then, check the "Files" section in /etc/X11/xorg.conf. The following line must be added before any other FontPath entries: FontPath "/usr/local/lib/X11/fonts/cyrillic" - - Search the Ports Collection for more Cyrillic - fonts. - - + Additional Cyrillic + fonts are available in the Ports Collection. - To activate a Russian keyboard, add the following to the "Keyboard" section of /etc/xorg.conf: @@ -983,10 +947,7 @@ Option "XkbOptions" "grp:toggle"The Russian XKB keyboard may not work with non-localized applications. - - - Minimally localized applications should call a XtSetLanguageProc (NULL, NULL, NULL); function early in the program. @@ -994,81 +955,100 @@ Option "XkbOptions" "grp:toggle"See KOI8-R for X Window for more instructions on localizing Xorg - applications. - - + applications. For more general + information about KOI8-R encoding, refer to + KOI8-R - + Russian Net Character Set. - Traditional Chinese Localization for Taiwan + Additional Language-Specific Resources + + Some intro text here... localization Traditional Chinese + + localization + German + + + localization + Greek + + + localization + Japanese + + + localization + Korean + + + + + Traditional Chinese for Taiwan + + The &os;-Taiwan Project has a Chinese HOWTO for &os; at http://netlab.cse.yzu.edu.tw/~statue/freebsd/zh-tut/ using many Chinese ports. The current editor for the &os; Chinese HOWTO is Shen Chuan-Hsing statue@freebsd.sinica.edu.tw. - - - - German Language Localization for All ISO 8859-1 - Languages - - - localization - German - + + + + + German Language Localization for All ISO 8859-1 + Languages + Slaven Rezic eserte@cs.tu-berlin.de wrote a tutorial on using umlauts on &os;. The tutorial is written in German and is available at http://user.cs.tu-berlin.de/~eserte/FreeBSD/doc/umlaute/umlaute.html. - - - - Greek Language Localization + + + + + Greek Language Localization - - localization - Greek - + Nikos Kokkalis nickkokkalis@gmail.com has written a complete article on Greek support in &os;. It is available here, in Greek only, as part of the official &os; Greek documentation. - + + - - Japanese and Korean Language Localization + + Japanese and Korean Language Localization - - localization - Japanese - - - localization - Korean - + For Japanese, refer to http://www.jp.FreeBSD.org/, and for Korean, refer to http://www.kr.FreeBSD.org/. - + + - - Non-English &os; Documentation + + Non-English &os; Documentation + Some &os; contributors have translated parts of the &os; documentation to other languages. They are available through links on the main site or in /usr/share/doc. + + + From owner-svn-doc-head@FreeBSD.ORG Tue Feb 11 22:36:06 2014 Return-Path: Delivered-To: svn-doc-head@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 ESMTPS id D59FCF66; Tue, 11 Feb 2014 22:36:06 +0000 (UTC) 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 A56D81A86; Tue, 11 Feb 2014 22:36:06 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1BMa6dO034409; Tue, 11 Feb 2014 22:36:06 GMT (envelope-from dru@svn.freebsd.org) Received: (from dru@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1BMa6f8034408; Tue, 11 Feb 2014 22:36:06 GMT (envelope-from dru@svn.freebsd.org) Message-Id: <201402112236.s1BMa6f8034408@svn.freebsd.org> From: Dru Lavigne Date: Tue, 11 Feb 2014 22:36:06 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r43880 - head/en_US.ISO8859-1/books/handbook/l10n X-SVN-Group: doc-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the doc tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Feb 2014 22:36:07 -0000 Author: dru Date: Tue Feb 11 22:36:06 2014 New Revision: 43880 URL: http://svnweb.freebsd.org/changeset/doc/43880 Log: White space fix only. Translators can ignore. Sponsored by: iXsystems Modified: head/en_US.ISO8859-1/books/handbook/l10n/chapter.xml Modified: head/en_US.ISO8859-1/books/handbook/l10n/chapter.xml ============================================================================== --- head/en_US.ISO8859-1/books/handbook/l10n/chapter.xml Tue Feb 11 22:06:19 2014 (r43879) +++ head/en_US.ISO8859-1/books/handbook/l10n/chapter.xml Tue Feb 11 22:36:06 2014 (r43880) @@ -833,11 +833,10 @@ Comment out for now. If needed, can be a Locale Configuration for Specific Languages - + This section provides configuration examples for localizing - a &os; system for the - Russian language. It then provides some - additional resources for localizing other languages. + a &os; system for the Russian language. It then provides some + additional resources for localizing other languages. @@ -854,130 +853,129 @@ Comment out for now. If needed, can be a Russian - To set this locale for the login shell, add the following lines into each - user's ~/.login_conf: + To set this locale for the login shell, add the following + lines into each user's + ~/.login_conf: - me:My Account:\ + me:My Account:\ :charset=KOI8-R:\ :lang=ru_RU.KOI8-R: - To configure the console, add the following lines to - /etc/rc.conf: + To configure the console, add the following lines to + /etc/rc.conf: - keymap="ru.koi8-r" + keymap="ru.koi8-r" scrnmap="koi8-r2cp866" font8x16="cp866b-8x16" font8x14="cp866-8x14" font8x8="cp866-8x8" mousechar_start=3 - For each ttyv entry in - /etc/ttys, use - cons25r as the terminal type. - - printers - To configure printing, a special output filter is needed - to convert from KOI8-R to CP866 since most printers with Russian characters come with - hardware code page CP866. &os; includes a default - filter for this purpose, /usr/libexec/lpr/ru/koi2alt. - To use this filter, add this entry to /etc/printcap: + For each ttyv entry in + /etc/ttys, use + cons25r as the terminal type. + + printers + To configure printing, a special output filter is needed + to convert from KOI8-R to CP866 since most printers with + Russian characters come with hardware code page CP866. &os; + includes a default filter for this purpose, + /usr/libexec/lpr/ru/koi2alt. To use this + filter, add this entry to + /etc/printcap: - lp|Russian local line printer:\ + lp|Russian local line printer:\ :sh:of=/usr/libexec/lpr/ru/koi2alt:\ :lp=/dev/lpt0:sd=/var/spool/output/lpd:lf=/var/log/lpd-errs: - Refer to &man.printcap.5; for a more detailed - explanation. - - To configure - support for Russian filenames in mounted &ms-dos; - file systems, include and the locale name when adding an entry to - /etc/fstab: + Refer to &man.printcap.5; for a more detailed + explanation. - /dev/ad0s2 /dos/c msdos rw,-Lru_RU.KOI8-R 0 0 + To configure support for Russian filenames in mounted + &ms-dos; file systems, include and the + locale name when adding an entry to + /etc/fstab: - Refer to - &man.mount.msdosfs.8; for more details. + /dev/ad0s2 /dos/c msdos rw,-Lru_RU.KOI8-R 0 0 + Refer to &man.mount.msdosfs.8; for more details. - To configure Russian fonts for &xorg;, - install the - x11-fonts/xorg-fonts-cyrillic - package. Then, check the "Files" section in - /etc/X11/xorg.conf. The - following line must be added before - any other FontPath entries: + To configure Russian fonts for + &xorg;, install the + x11-fonts/xorg-fonts-cyrillic package. + Then, check the "Files" section in + /etc/X11/xorg.conf. The following line + must be added before any other + FontPath entries: - FontPath "/usr/local/lib/X11/fonts/cyrillic" + FontPath "/usr/local/lib/X11/fonts/cyrillic" - Additional Cyrillic - fonts are available in the Ports Collection. + Additional Cyrillic fonts are available in the Ports + Collection. - To activate a Russian keyboard, add the following - to the "Keyboard" section of - /etc/xorg.conf: + To activate a Russian keyboard, add the following to the + "Keyboard" section of + /etc/xorg.conf: - Option "XkbLayout" "us,ru" + Option "XkbLayout" "us,ru" Option "XkbOptions" "grp:toggle" - Make sure that XkbDisable is - commented out in that file. + Make sure that XkbDisable is + commented out in that file. - For grp:toggle use - Right Alt, for - grp:ctrl_shift_toggle use CtrlShift. - For grp:caps_toggle use - CapsLock. The old - CapsLock function is still available - in LAT mode only using ShiftCapsLock. - grp:caps_toggle - does not work in &xorg; for - some unknown reason. - - If the keyboard has &windows; keys, - and some non-alphabetical keys are mapped incorrectly, - add the following line to - /etc/xorg.conf: - - Option "XkbVariant" ",winkeys" - - - The Russian XKB keyboard may not work with - non-localized applications. - - - Minimally localized applications should call a - XtSetLanguageProc (NULL, NULL, NULL); - function early in the program. - - See - KOI8-R for X Window for more instructions on - localizing Xorg - applications. For more general - information about KOI8-R encoding, refer to + For grp:toggle use + Right Alt, for + grp:ctrl_shift_toggle use CtrlShift. + For grp:caps_toggle use + CapsLock. The old + CapsLock function is still available in LAT + mode only using ShiftCapsLock. + grp:caps_toggle does not work in + &xorg; for some unknown + reason. + + If the keyboard has &windows; keys, and + some non-alphabetical keys are mapped incorrectly, add the + following line to /etc/xorg.conf: + + Option "XkbVariant" ",winkeys" + + + The Russian XKB keyboard may not work with + non-localized applications. + + + Minimally localized applications should call a + XtSetLanguageProc (NULL, NULL, NULL); + function early in the program. + + See + KOI8-R for X Window for more instructions on + localizing Xorg applications. For + more general information about KOI8-R encoding, refer to KOI8-R - - Russian Net Character Set. + Russian Net Character Set. Additional Language-Specific Resources - + Some intro text here... localization Traditional Chinese - + localization German - - + + localization Greek - + localization Japanese @@ -986,69 +984,70 @@ Option "XkbOptions" "grp:toggle"localization Korean - + - - Traditional Chinese for Taiwan + + Traditional Chinese for Taiwan - - The &os;-Taiwan Project has a Chinese HOWTO for - &os; at http://netlab.cse.yzu.edu.tw/~statue/freebsd/zh-tut/ - using many Chinese ports. The current editor for the - &os; Chinese HOWTO is Shen Chuan-Hsing - statue@freebsd.sinica.edu.tw. - - - - - German Language Localization for All ISO 8859-1 - Languages - - - Slaven Rezic eserte@cs.tu-berlin.de wrote a - tutorial on using umlauts on &os;. The tutorial - is written in German and is available at http://user.cs.tu-berlin.de/~eserte/FreeBSD/doc/umlaute/umlaute.html. - - - - - Greek Language Localization - - - Nikos Kokkalis nickkokkalis@gmail.com has - written a complete article on Greek support in &os;. It is - available here, - in Greek only, as part of the official &os; Greek - documentation. - - - - - Japanese and Korean Language Localization - - - For Japanese, refer to http://www.jp.FreeBSD.org/, - and for Korean, refer to http://www.kr.FreeBSD.org/. - - - - - Non-English &os; Documentation - - - Some &os; contributors have translated parts of the - &os; documentation to other languages. They are available - through links on the main site or in - /usr/share/doc. - - - + + The &os;-Taiwan Project has a Chinese HOWTO for &os; + at http://netlab.cse.yzu.edu.tw/~statue/freebsd/zh-tut/ + using many Chinese ports. The current editor for the + &os; Chinese HOWTO is Shen + Chuan-Hsing + statue@freebsd.sinica.edu.tw. + + + + + German Language Localization for All ISO 8859-1 + Languages + + + Slaven eserte@cs.tu-berlin.de wrote a + tutorial on using umlauts on &os;. The tutorial is + written in German and is available at http://user.cs.tu-berlin.de/~eserte/FreeBSD/doc/umlaute/umlaute.html. + + + + + Greek Language Localization + + + Nikos Kokkalis nickkokkalis@gmail.com + has written a complete article on Greek support in &os;. + It is available here, + in Greek only, as part of the official &os; Greek + documentation. + + + + + Japanese and Korean Language Localization + + + For Japanese, refer to http://www.jp.FreeBSD.org/, + and for Korean, refer to http://www.kr.FreeBSD.org/. + + + + + Non-English &os; Documentation + + + Some &os; contributors have translated parts of the + &os; documentation to other languages. They are + available through links on the main site or + in /usr/share/doc. + + + From owner-svn-doc-head@FreeBSD.ORG Tue Feb 11 23:12:35 2014 Return-Path: Delivered-To: svn-doc-head@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 ESMTPS id 7C186ABB; Tue, 11 Feb 2014 23:12:35 +0000 (UTC) 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 61DA41D2E; Tue, 11 Feb 2014 23:12:35 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1BNCZu3061182; Tue, 11 Feb 2014 23:12:35 GMT (envelope-from hrs@svn.freebsd.org) Received: (from hrs@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1BNCZsG061181; Tue, 11 Feb 2014 23:12:35 GMT (envelope-from hrs@svn.freebsd.org) Message-Id: <201402112312.s1BNCZsG061181@svn.freebsd.org> From: Hiroki Sato Date: Tue, 11 Feb 2014 23:12:35 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r43881 - head/en_US.ISO8859-1/htdocs/releases/10.0R X-SVN-Group: doc-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the doc tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Feb 2014 23:12:35 -0000 Author: hrs Date: Tue Feb 11 23:12:34 2014 New Revision: 43881 URL: http://svnweb.freebsd.org/changeset/doc/43881 Log: Regen from r261784. Modified: head/en_US.ISO8859-1/htdocs/releases/10.0R/errata.html Modified: head/en_US.ISO8859-1/htdocs/releases/10.0R/errata.html ============================================================================== --- head/en_US.ISO8859-1/htdocs/releases/10.0R/errata.html Tue Feb 11 22:36:06 2014 (r43880) +++ head/en_US.ISO8859-1/htdocs/releases/10.0R/errata.html Tue Feb 11 23:12:34 2014 (r43881) @@ -1,5 +1,5 @@ -FreeBSD 10.0-RELEASE Errata

FreeBSD 10.0-RELEASE Errata

The FreeBSD Project

Copyright © 2014 The FreeBSD Documentation Project

FreeBSD is a registered trademark of +FreeBSD 10.0-RELEASE Errata

FreeBSD 10.0-RELEASE Errata

The FreeBSD Project

Copyright © 2014 The FreeBSD Documentation Project

FreeBSD is a registered trademark of the FreeBSD Foundation.

Intel, Celeron, EtherExpress, i386, i486, Itanium, Pentium, and Xeon are trademarks or registered trademarks of Intel Corporation or its subsidiaries in the United @@ -12,7 +12,7 @@ as trademarks. Where those designations appear in this document, and the FreeBSD Project was aware of the trademark claim, the designations have been followed by the “™” or the - “®” symbol.

Last modified on 2014-01-20 by hrs.
Abstract

This document lists errata items for FreeBSD 10.0-RELEASE, + “®” symbol.

Last modified on 2014-02-11 by hrs.
Abstract

This document lists errata items for FreeBSD 10.0-RELEASE, containing significant information discovered after the release or too late in the release cycle to be otherwise included in the release documentation. @@ -88,7 +88,9 @@ boot

4. Late-Breaking News

No news.

This file, and other release-related documents, + 10.0-STABLE.

  • The mount_udf(8) utility has a bug which prevents + it from mounting any UDF file system. This has been fixed + in FreeBSD-CURRENT and FreeBSD 10.0-STABLE.

    • 4. Late-Breaking News

    No news.

    This file, and other release-related documents, can be downloaded from http://www.FreeBSD.org/snapshots/.

    For questions about FreeBSD, read the documentation before contacting <questions@FreeBSD.org>.

    All users of FreeBSD stable should From owner-svn-doc-head@FreeBSD.ORG Tue Feb 11 23:27:56 2014 Return-Path: Delivered-To: svn-doc-head@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 ESMTPS id C4116DAF; Tue, 11 Feb 2014 23:27:56 +0000 (UTC) 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 AF59E1E32; Tue, 11 Feb 2014 23:27:56 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1BNRul8065925; Tue, 11 Feb 2014 23:27:56 GMT (envelope-from hrs@svn.freebsd.org) Received: (from hrs@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1BNRuXU065924; Tue, 11 Feb 2014 23:27:56 GMT (envelope-from hrs@svn.freebsd.org) Message-Id: <201402112327.s1BNRuXU065924@svn.freebsd.org> From: Hiroki Sato Date: Tue, 11 Feb 2014 23:27:56 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r43882 - head/en_US.ISO8859-1/books/handbook/l10n X-SVN-Group: doc-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the doc tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Feb 2014 23:27:56 -0000 Author: hrs Date: Tue Feb 11 23:27:56 2014 New Revision: 43882 URL: http://svnweb.freebsd.org/changeset/doc/43882 Log: Fix build. Modified: head/en_US.ISO8859-1/books/handbook/l10n/chapter.xml Modified: head/en_US.ISO8859-1/books/handbook/l10n/chapter.xml ============================================================================== --- head/en_US.ISO8859-1/books/handbook/l10n/chapter.xml Tue Feb 11 23:12:34 2014 (r43881) +++ head/en_US.ISO8859-1/books/handbook/l10n/chapter.xml Tue Feb 11 23:27:56 2014 (r43882) @@ -1043,7 +1043,7 @@ Option "XkbOptions" "grp:toggle"Some &os; contributors have translated parts of the &os; documentation to other languages. They are available through links on the main site or + xlink:href="&url.base;/index.html">main site or in /usr/share/doc. From owner-svn-doc-head@FreeBSD.ORG Wed Feb 12 16:37:35 2014 Return-Path: Delivered-To: svn-doc-head@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 ESMTPS id D3786C38; Wed, 12 Feb 2014 16:37:35 +0000 (UTC) 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 BBE521505; Wed, 12 Feb 2014 16:37:35 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1CGbZfD077351; Wed, 12 Feb 2014 16:37:35 GMT (envelope-from dru@svn.freebsd.org) Received: (from dru@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1CGbZWC077350; Wed, 12 Feb 2014 16:37:35 GMT (envelope-from dru@svn.freebsd.org) Message-Id: <201402121637.s1CGbZWC077350@svn.freebsd.org> From: Dru Lavigne Date: Wed, 12 Feb 2014 16:37:35 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r43883 - head/en_US.ISO8859-1/books/handbook/l10n X-SVN-Group: doc-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the doc tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Feb 2014 16:37:36 -0000 Author: dru Date: Wed Feb 12 16:37:35 2014 New Revision: 43883 URL: http://svnweb.freebsd.org/changeset/doc/43883 Log: Finish cleaning up this chapter. Sponsored by: iXsystems Modified: head/en_US.ISO8859-1/books/handbook/l10n/chapter.xml Modified: head/en_US.ISO8859-1/books/handbook/l10n/chapter.xml ============================================================================== --- head/en_US.ISO8859-1/books/handbook/l10n/chapter.xml Tue Feb 11 23:27:56 2014 (r43882) +++ head/en_US.ISO8859-1/books/handbook/l10n/chapter.xml Wed Feb 12 16:37:35 2014 (r43883) @@ -27,9 +27,9 @@ &os; is a distributed project with users and contributors located all over the world. As such, &os; supports localization - into many languages. This allows a user to view, input, or - process data in non-English languages. Currently, one can - choose from most of the major languages, including but not + into many languages, allowing users to view, input, or + process data in non-English languages. One can + choose from most of the major languages, including, but not limited to: Chinese, German, Japanese, Korean, French, Russian, and Vietnamese. @@ -41,30 +41,20 @@ The term internationalization has been shortened to i18n, which represents the number of letters - between the first and the last letters of internationalization. - L10n uses the same naming scheme, coming from - localization. Combined together, + between the first and the last letters of internationalization. + L10n uses the same naming scheme, but from + localization. The i18n/L10n methods, protocols, and applications allow users to use languages of their choice. - i18n applications are programmed using - i18n kits under libraries. These allow - developers to write a simple file and translate displayed menus - and texts to each language. - This chapter discusses the internationalization and - localization features of &os;. Since there are many aspects of - the i18n implementation at both the system - and application levels, more specific sources of documentation - are referred to, where applicable. - - After reading this chapter, you will know: + localization features of &os;. After reading this chapter, you + will know: - How different languages and locales are encoded on - modern operating systems. + How locale names are constructed. @@ -77,13 +67,17 @@ - How to use Xorg effectively - with different languages. + How to configure Xorg for + different languages. + + + + How to find i18n-compliant applications. - Where to find more information about writing - i18n-compliant applications. + Where to find more information for configuring specific + languages. @@ -146,31 +140,43 @@ + A complete listing of available locales can be found by + typing: + + &prompt.user; locale -a | more + + To determine the current locale setting: + + &prompt.user; locale encodings ASCII + Language specific character sets, such as + ISO8859-1, ISO8859-15, KOI8-R, and CP437, are + described in &man.multibyte.3;. The active list of character sets can be found at the IANA + Registry. + Some languages, such as Chinese or Japanese, cannot be - represented using ASCII characters and require an extended + represented using ASCII characters and require an extended language encoding using either wide or multibyte characters. + Examples of wide or multibyte encodings include EUC and Big5. Older applications may mistake these encodings for control - characters while newer applications usually recognize 8-bit + characters while newer applications usually recognize these characters. Depending on the implementation, users may be required to compile an application with wide or multibyte - character support, or configure it correctly. The rest of + character support, or to configure it correctly. + + + &os; uses Xorg-compatible locale encodings. + + + The rest of this section describes the various methods for configuring the locale on a &os; system. The next section will discuss the - considerations for finding or compiling applications with i18n + considerations for finding and compiling applications with i18n support. - A complete listing of available locales can be found by - typing: - - &prompt.user; locale -a | more - - To determine the current locale setting: - - &prompt.user; locale - Setting Locale for Login Shell @@ -193,7 +199,7 @@ MIME - MM_CHARSET which sets the MIME + MM_CHARSET, which sets the MIME character set used by applications @@ -218,7 +224,7 @@ This first method is the recommended method as it assigns the required environment variables for locale name - and MIME character sets for every possible shell. This + and MIME character sets for every possible shell. This setup can either be performed by each user or it can be configured for all users by the superuser. @@ -257,7 +263,7 @@ me:\ Alternately, the superuser can configure all users of the system for localization. The following variables in /etc/login.conf are used to set the - locale and MIME character sete: + locale and MIME character set: language_name|Account Type Description:\ :charset=MIME_charset:\ @@ -336,7 +342,7 @@ me:\ Shell Startup File Method - This method is not recommended as each shell that is + This second method is not recommended as each shell that is used requires manual configuration, where each shell has a different configuration file and differing syntax. As an example, to set the German language for the @@ -407,11 +413,11 @@ keychange="fkey_number sequ area if the screen font uses a bit 8 column. To see the list of available keymaps, type - ls /usr/share/syscons/keymaps. When + ls /usr/share/syscons/keymaps. When specifying the keymap_name, do not - include the .kbd suffix. When uncertain - as to which keymap to use, &man.kbdmap.1; can be used to test - keymaps without rebooting. + include the .kbd suffix. To test + keymaps without rebooting, + use &man.kbdmap.1;. The keychange entry is usually needed to program function keys to match the selected terminal type @@ -507,13 +513,13 @@ keychange="fkey_number sequ - Japanese - chinese/kon2 + Chinese/Japanese/Korean + chinese/zhcon - Chinese/Japanese/Korean - chinese/zhcon + Japanese + chinese/kon2 @@ -535,7 +541,7 @@ keychange="fkey_number sequ &man.syscons.4; driver occupies the 0xd0-0xd3 range in the character set. If the language uses this range, move the - cursor's range. To enable this workaround for &os;, add the + cursor's range by adding the following line to /etc/rc.conf: mousechar_start=3 @@ -751,7 +757,7 @@ Comment out for now. If needed, can be a converted to &postscript; or PDF formats using language specific converters. - --> +Not sure where to put this section, perhaps as a note in the File system chapter? Kernel and File Systems @@ -773,62 +779,32 @@ Comment out for now. If needed, can be a character sets, and chosen &os; filesystem character sets. Refer to &man.mount.msdosfs.8; for details. + --> - Compiling <acronym>i18n</acronym> Programs - - The &os; &os; - Ports Collection contains programs which provide - application support for wide or multibyte characters for several - languages. Refer to the i18n documentation - in the respective &os; port for more information on how to - configure the application correctly or to determine which - compile options to use when building the port. - - Some things to keep in mind are: + Finding <acronym>i18n</acronym> Applications - - - Language specific single C chars character sets such as - ISO8859-1, ISO8859-15, KOI8-R, and CP437. These are - described in &man.multibyte.3;. - - - - Wide or multibyte encodings such as EUC and Big5. - - - - The active list of character sets can be found at the IANA - Registry. - - - &os; uses Xorg-compatible locale encodings instead. - - - In the &os; Ports Collection, i18n - applications include i18n in their names for + i18n applications are programmed using + i18n kits under libraries. These allow + developers to write a simple file and translate displayed menus + and texts to each language. + The &os; + Ports Collection contains many + applications with built-in support for wide or multibyte characters for several + languages. Such applications include i18n in their names for easy identification. However, they do not always support the language needed. - Many applications in the &os; Ports Collection have been - ported with i18n support. Some of these - include -i18n in the port name. These - and many other programs have built in support for - i18n and need no special - consideration. - - - MySQL - - However, some applications such as - MySQL need to have their - Makefile configured with the specific + Some applications can be compiled + with the specific charset. This is usually done in the port's Makefile or by passing a value to - configure in the source. + configure. Refer to the i18n documentation + in the respective &os; port's source for more information on how to + determine the needed configure value + or the port's Makefile to determine which + compile options to use when building the port. @@ -853,8 +829,13 @@ Comment out for now. If needed, can be a Russian + This section shows the specific settings needed to + localize a &os; system for the Russian language. Refer to + Using Localization for + a more complete description of each type of setting. + To set this locale for the login shell, add the following - lines into each user's + lines to each user's ~/.login_conf: me:My Account:\ @@ -944,25 +925,23 @@ Option "XkbOptions" "grp:toggle" The Russian XKB keyboard may not work with - non-localized applications. - - - Minimally localized applications should call a + non-localized applications. Minimally localized applications should call a XtSetLanguageProc (NULL, NULL, NULL); function early in the program. + - See - KOI8-R for X Window for more instructions on + See http://koi8.pp.ru/xwin.html + for more instructions on localizing Xorg applications. For more general information about KOI8-R encoding, refer to - KOI8-R - - Russian Net Character Set. + http://koi8.pp.ru/. Additional Language-Specific Resources - Some intro text here... + This section lists some additional resources for + configuring other locales. localization @@ -992,11 +971,7 @@ Option "XkbOptions" "grp:toggle" The &os;-Taiwan Project has a Chinese HOWTO for &os; at http://netlab.cse.yzu.edu.tw/~statue/freebsd/zh-tut/ - using many Chinese ports. The current editor for the - &os; Chinese HOWTO is Shen - Chuan-Hsing - statue@freebsd.sinica.edu.tw. + xlink:href="http://netlab.cse.yzu.edu.tw/~statue/freebsd/zh-tut/">http://netlab.cse.yzu.edu.tw/~statue/freebsd/zh-tut/. @@ -1005,9 +980,9 @@ Option "XkbOptions" "grp:toggle" - Slaven eserte@cs.tu-berlin.de wrote a - tutorial on using umlauts on &os;. The tutorial is - written in German and is available at A + tutorial on using umlauts on &os; is + available in German at http://user.cs.tu-berlin.de/~eserte/FreeBSD/doc/umlaute/umlaute.html. @@ -1016,9 +991,8 @@ Option "XkbOptions" "grp:toggle"Greek Language Localization - Nikos Kokkalis nickkokkalis@gmail.com - has written a complete article on Greek support in &os;. - It is available A complete article on Greek support in &os; + is available here, in Greek only, as part of the official &os; Greek documentation. @@ -1043,7 +1017,7 @@ Option "XkbOptions" "grp:toggle"Some &os; contributors have translated parts of the &os; documentation to other languages. They are available through links on the main site or + xlink:href="&url.base;/index.html">&os; web site or in /usr/share/doc. From owner-svn-doc-head@FreeBSD.ORG Wed Feb 12 16:48:57 2014 Return-Path: Delivered-To: svn-doc-head@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 ESMTPS id 2EEE7456; Wed, 12 Feb 2014 16:48:57 +0000 (UTC) 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 0CC8C1653; Wed, 12 Feb 2014 16:48:57 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1CGmuaV081763; Wed, 12 Feb 2014 16:48:56 GMT (envelope-from dru@svn.freebsd.org) Received: (from dru@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1CGmulB081762; Wed, 12 Feb 2014 16:48:56 GMT (envelope-from dru@svn.freebsd.org) Message-Id: <201402121648.s1CGmulB081762@svn.freebsd.org> From: Dru Lavigne Date: Wed, 12 Feb 2014 16:48:56 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r43884 - head/en_US.ISO8859-1/books/handbook/l10n X-SVN-Group: doc-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the doc tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Feb 2014 16:48:57 -0000 Author: dru Date: Wed Feb 12 16:48:56 2014 New Revision: 43884 URL: http://svnweb.freebsd.org/changeset/doc/43884 Log: White space fix only. Translators can ignore. Sponsored by: iXsystems Modified: head/en_US.ISO8859-1/books/handbook/l10n/chapter.xml Modified: head/en_US.ISO8859-1/books/handbook/l10n/chapter.xml ============================================================================== --- head/en_US.ISO8859-1/books/handbook/l10n/chapter.xml Wed Feb 12 16:37:35 2014 (r43883) +++ head/en_US.ISO8859-1/books/handbook/l10n/chapter.xml Wed Feb 12 16:48:56 2014 (r43884) @@ -27,11 +27,11 @@ &os; is a distributed project with users and contributors located all over the world. As such, &os; supports localization - into many languages, allowing users to view, input, or - process data in non-English languages. One can - choose from most of the major languages, including, but not - limited to: Chinese, German, Japanese, Korean, French, Russian, - and Vietnamese. + into many languages, allowing users to view, input, or process + data in non-English languages. One can choose from most of the + major languages, including, but not limited to: Chinese, + German, Japanese, Korean, French, Russian, and + Vietnamese. internationalization @@ -41,7 +41,8 @@ The term internationalization has been shortened to i18n, which represents the number of letters - between the first and the last letters of internationalization. + between the first and the last letters of + internationalization. L10n uses the same naming scheme, but from localization. The i18n/L10n methods, @@ -72,7 +73,8 @@ - How to find i18n-compliant applications. + How to find i18n-compliant + applications. @@ -148,34 +150,36 @@ To determine the current locale setting: &prompt.user; locale + encodings ASCII - Language specific character sets, such as - ISO8859-1, ISO8859-15, KOI8-R, and CP437, are - described in &man.multibyte.3;. The active list of character sets can be found at the IANA - Registry. + Language specific character sets, such as ISO8859-1, + ISO8859-15, KOI8-R, and CP437, are described in + &man.multibyte.3;. The active list of character sets can be + found at the IANA + Registry. Some languages, such as Chinese or Japanese, cannot be - represented using ASCII characters and require an extended - language encoding using either wide or multibyte characters. - Examples of wide or multibyte encodings include EUC and Big5. - Older applications may mistake these encodings for control - characters while newer applications usually recognize these - characters. Depending on the implementation, users may be - required to compile an application with wide or multibyte - character support, or to configure it correctly. - - - &os; uses Xorg-compatible locale encodings. - - - The rest of - this section describes the various methods for configuring the - locale on a &os; system. The next section will discuss the - considerations for finding and compiling applications with i18n - support. + represented using ASCII characters and + require an extended language encoding using either wide or + multibyte characters. Examples of wide or multibyte encodings + include EUC and Big5. Older applications may mistake these + encodings for control characters while newer applications + usually recognize these characters. Depending on the + implementation, users may be required to compile an + application with wide or multibyte character support, or to + configure it correctly. + + + &os; uses Xorg-compatible locale encodings. + + + The rest of this section describes the various methods for + configuring the locale on a &os; system. The next section + will discuss the considerations for finding and compiling + applications with i18n support. Setting Locale for Login Shell @@ -199,15 +203,16 @@ MIME - MM_CHARSET, which sets the MIME - character set used by applications + MM_CHARSET, which sets the + MIME character set used by + applications In addition to the user's shell configuration, these - variables should also be set for - specific application configuration and - Xorg configuration. + variables should also be set for specific application + configuration and Xorg + configuration. locale login class @@ -224,9 +229,10 @@ This first method is the recommended method as it assigns the required environment variables for locale name - and MIME character sets for every possible shell. This - setup can either be performed by each user or it can be - configured for all users by the superuser. + and MIME character sets for every + possible shell. This setup can either be performed by each + user or it can be configured for all users by the + superuser. This minimal example sets both variables for Latin-1 encoding in the .login_conf of an @@ -342,10 +348,10 @@ me:\ Shell Startup File Method - This second method is not recommended as each shell that is - used requires manual configuration, where each shell has a - different configuration file and differing syntax. As an - example, to set the German language for the + This second method is not recommended as each shell + that is used requires manual configuration, where each + shell has a different configuration file and differing + syntax. As an example, to set the German language for the sh shell, these lines could be added to ~/.profile to set the shell for that user only. These lines could also be added to @@ -789,22 +795,23 @@ Not sure where to put this section, perh i18n kits under libraries. These allow developers to write a simple file and translate displayed menus and texts to each language. + The &os; - Ports Collection contains many - applications with built-in support for wide or multibyte characters for several - languages. Such applications include i18n in their names for - easy identification. However, they do not always support the - language needed. + Ports Collection contains many applications with + built-in support for wide or multibyte characters for several + languages. Such applications include i18n in + their names for easy identification. However, they do not + always support the language needed. - Some applications can be compiled - with the specific + Some applications can be compiled with the specific charset. This is usually done in the port's Makefile or by passing a value to - configure. Refer to the i18n documentation - in the respective &os; port's source for more information on how to - determine the needed configure value - or the port's Makefile to determine which - compile options to use when building the port. + configure. Refer to the + i18n documentation in the respective &os; + port's source for more information on how to determine the + needed configure value or the port's + Makefile to determine which compile options + to use when building the port. @@ -831,8 +838,9 @@ Not sure where to put this section, perh This section shows the specific settings needed to localize a &os; system for the Russian language. Refer to - Using Localization for - a more complete description of each type of setting. + Using Localization + for a more complete description of each type of + setting. To set this locale for the login shell, add the following lines to each user's @@ -925,16 +933,18 @@ Option "XkbOptions" "grp:toggle" The Russian XKB keyboard may not work with - non-localized applications. Minimally localized applications should call a - XtSetLanguageProc (NULL, NULL, NULL); - function early in the program. + non-localized applications. Minimally localized + applications should call a XtSetLanguageProc + (NULL, NULL, NULL); function early in the + program. - See http://koi8.pp.ru/xwin.html - for more instructions on - localizing Xorg applications. For - more general information about KOI8-R encoding, refer to - http://koi8.pp.ru/. + See http://koi8.pp.ru/xwin.html + for more instructions on localizing + Xorg applications. For more + general information about KOI8-R encoding, refer to http://koi8.pp.ru/. @@ -1017,8 +1027,9 @@ Option "XkbOptions" "grp:toggle"Some &os; contributors have translated parts of the &os; documentation to other languages. They are available through links on the &os; web site or - in /usr/share/doc. + xlink:href="&url.base;/index.html">&os; web + site or in + /usr/share/doc. From owner-svn-doc-head@FreeBSD.ORG Wed Feb 12 19:08:16 2014 Return-Path: Delivered-To: svn-doc-head@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 ESMTPS id 9B76B13B; Wed, 12 Feb 2014 19:08:16 +0000 (UTC) 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 854CD130E; Wed, 12 Feb 2014 19:08:16 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1CJ8G72037207; Wed, 12 Feb 2014 19:08:16 GMT (envelope-from dru@svn.freebsd.org) Received: (from dru@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1CJ8Ged037206; Wed, 12 Feb 2014 19:08:16 GMT (envelope-from dru@svn.freebsd.org) Message-Id: <201402121908.s1CJ8Ged037206@svn.freebsd.org> From: Dru Lavigne Date: Wed, 12 Feb 2014 19:08:16 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r43885 - head/en_US.ISO8859-1/books/handbook/mirrors X-SVN-Group: doc-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the doc tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Feb 2014 19:08:16 -0000 Author: dru Date: Wed Feb 12 19:08:16 2014 New Revision: 43885 URL: http://svnweb.freebsd.org/changeset/doc/43885 Log: First pass at improving the flow of this chapter. More commits to come. Sponsored by: iXsystems Modified: head/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml Modified: head/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml ============================================================================== --- head/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml Wed Feb 12 16:48:56 2014 (r43884) +++ head/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml Wed Feb 12 19:08:16 2014 (r43885) @@ -84,26 +84,26 @@ - FTP Sites + <acronym>FTP</acronym> Sites The official sources for &os; are available via anonymous - FTP from a worldwide set of mirror sites. The site + FTP from a worldwide set of mirror sites. The site ftp://ftp.FreeBSD.org/pub/FreeBSD/ is well connected and allows a large number of connections to it, but you are probably better off finding a closer mirror site (especially if you decide to set up some sort of mirror site). - Additionally, &os; is available via anonymous FTP from the + Additionally, &os; is available via anonymous FTP from the following mirror sites. If you choose to obtain &os; via - anonymous FTP, please try to use a site near you. The mirror + anonymous FTP, please try to use a site near you. The mirror sites listed as Primary Mirror Sites typically have the entire &os; archive (all the currently available versions for each of the architectures) but you will probably have faster download times from a site that is in your country or region. The regional sites carry the most recent versions for the most popular architecture(s) but might not carry the - entire &os; archive. All sites provide access via anonymous FTP + entire &os; archive. All sites provide access via anonymous FTP but some sites also provide access via other methods. The access methods available for each site are provided in parentheses after the hostname. @@ -138,99 +138,117 @@ CTM is a method for keeping a - remote directory tree in sync with a central one. It has been - developed for usage with &os;'s source trees, though other - people may find it useful for other purposes as time goes by. - Little, if any, documentation currently exists at this time on - the process of creating deltas, so contact the - &a.ctm-users.name; mailing list for more information and if you - wish to use CTM for other - things. + remote directory tree in sync with a central one. It is built into &os; + and can be used to synchronize a system with &os;'s source repositories. + It supports synchronization of an entire repository or just the specified branches. + + CTM is specifically designed for use on + lousy or non-existent TCP/IP connections. It provides the ability + for changes to be automatically sent by email. It requires the user + to obtain up to three deltas per day for the most active + branches. Update sizes are always kept as + small as possible and are typically less than 5K. About one in very ten + update is 10-50K in size and rarely there will be an update + larger than 100K+. - - Why Should I Use <application>CTM</application>? + When using CTM to track &os; development, + refer to the + caveats related to working directly from the development + sources rather than a pre-packaged release. These are discussed + in Tracking a Development Branch. - CTM will give you a local copy - of the &os; source trees. There are a number of - flavors of the tree available. Whether you - wish to track the entire CVS tree or just one of the branches, - CTM can provide you the - information. If you are an active developer on &os;, but have - lousy or non-existent TCP/IP connectivity, or simply wish to - have the changes automatically sent to you, - CTM was made for you. You will - need to obtain up to three deltas per day for the most active - branches. However, you should consider having them sent by - automatic email. The sizes of the updates are always kept as - small as possible. This is typically less than 5K, with an - occasional (one in ten) being 10-50K and every now and then a - large 100K+ or more coming around. + Little documentation exists on + the process of creating deltas or using CTM + for other purposes. Contact the + &a.ctm-users.name; mailing list for questions on using + CTM. - You will also need to make yourself aware of the various - caveats related to working directly from the development - sources rather than a pre-packaged release. This is - particularly true if you choose the current - sources. It is recommended that you read Staying current with &os;. - + + Getting Deltas - - What Do I Need to Use - <application>CTM</application>? + The deltas used by + CTM can be obtained either through + anonymous FTP or + email. + + FTP deltas can be obtained from the following mirror sites. + Download the relevant directory and read its + README. When using anonymous FTP to obtain CTM deltas, + select a geographically close mirror. + In case of problems, contact the &a.ctm-users.name; + mailing list. - You will need two things: The - CTM program, and the initial deltas - to feed it (to get up to current - levels). + + + California, Bay Area, official source + + + + + ftp://ftp.FreeBSD.org/pub/FreeBSD/development/CTM/ + + + ftp://ftp.FreeBSD.org/pub/FreeBSD/CTM/ + + + + - The CTM program has been part - of &os; ever since version 2.0 was released, and lives in - /usr/src/usr.sbin/ctm if you have a copy - of the source available. + + South Africa, backup server for old deltas - The deltas you feed - CTM can be had two ways, FTP or - email. If you have general FTP access to the Internet then - the following FTP sites support access to - CTM: + + + + ftp://ftp.za.FreeBSD.org/pub/FreeBSD/CTM/ + + + + - ftp://ftp.FreeBSD.org/pub/FreeBSD/CTM/ + + Taiwan/R.O.C. - or see section mirrors. + + + + ftp://ctm.tw.FreeBSD.org/pub/FreeBSD/development/CTM/ + - FTP the relevant directory and fetch the - README file, starting from there. + + ftp://ctm2.tw.FreeBSD.org/pub/FreeBSD/development/CTM/ + - If you wish to get your deltas via email: + + ftp://ctm3.tw.FreeBSD.org/pub/FreeBSD/development/CTM/ + + + + + - Subscribe to one of the + To instead receive deltas through email, subscribe to one of the CTM distribution lists. - &a.ctm-src-cur.name; supports the entire Subversion tree. - &a.ctm-src-cur.name; supports the head of the development - branch. &a.ctm-src-9.name; supports the 9.X release branch, - etc.. (If you do not know how to subscribe yourself to a - list, click on the list name above or go to - &a.mailman.lists.link; and click on the list that you wish to - subscribe to. The list page should contain all of the - necessary subscription instructions.) - - When you begin receiving your - CTM updates in the mail, you may - use the ctm_rmail program to unpack and - apply them. You can actually use the - ctm_rmail program directly from a entry in - /etc/aliases if you want to have the - process run in a fully automated fashion. Check the - ctm_rmail manual page for more + &a.ctm-src-cur.name; supports the entire source tree, + &a.ctm-src-cur.name; supports the HEAD of the development + branch, and &a.ctm-src-9.name; supports the 9.X release branch. + + As + CTM updates arrive through email, + use ctm_rmail to unpack and + apply them. This command can be run directly from an entry in + /etc/aliases in order to + automate this process. Refer to + &man.ctm.rmail.1; for more details. - No matter what method you use to get the - CTM deltas, you should subscribe - to the &a.ctm-announce.name; mailing list. In the future, - this will be the only place where announcements concerning - the operations of the CTM system - will be posted. Click on the list name above and follow the - instructions to subscribe to the list. + Regardless of the method which is used to get deltas, + CTM users should subscribe + to the &a.ctm-announce.name; mailing list as + this is the only place where announcements concerning + the operation of the CTM system + are posted. @@ -238,18 +256,11 @@ Using <application>CTM</application> for the First Time - Before you can start using CTM - deltas, you will need to get to a starting point for the - deltas produced subsequently to it. - - First you should determine what you already have. - Everyone can start from an empty directory. - You must use an initial Empty delta to start - off your CTM supported tree. At - some point it is intended that one of these - started deltas be distributed on the CD for - your convenience, however, this does not currently - happen. + Before CTM + deltas can be used, a starting point for the + deltas must be produced from an empty directory. + An initial Empty delta is used to start + the local CTM-supported tree. Since the trees are many tens of megabytes, you should prefer to start from something already at hand. If you have a @@ -409,76 +420,11 @@ counter intuitive. - - - - Miscellaneous Stuff There is a sequence of deltas for the ports collection too, but interest has not been all that high yet. - - - CTM Mirrors - - CTM/&os; is available via - anonymous FTP from the following mirror sites. If you choose - to obtain CTM via anonymous FTP, - please try to use a site near you. - - In case of problems, please contact the &a.ctm-users.name; - mailing list. - - - - California, Bay Area, official source - - - - - ftp://ftp.FreeBSD.org/pub/FreeBSD/development/CTM/ - - - - - - - South Africa, backup server for old deltas - - - - - ftp://ftp.za.FreeBSD.org/pub/FreeBSD/CTM/ - - - - - - - Taiwan/R.O.C. - - - - - ftp://ctm.tw.FreeBSD.org/pub/FreeBSD/development/CTM/ - - - - ftp://ctm2.tw.FreeBSD.org/pub/FreeBSD/development/CTM/ - - - - ftp://ctm3.tw.FreeBSD.org/pub/FreeBSD/development/CTM/ - - - - - - - If you did not find a mirror near to you or the mirror is - incomplete, try to use a search engine such as alltheweb. - @@ -2507,7 +2453,7 @@ usr.bin/ which transfers only the differences between two sets of files, thus greatly speeding up the synchronization over the network. This is most useful if you are a mirror site for the - &os; FTP server, or the CVS repository. The + &os; FTP server, or the CVS repository. The rsync suite is available for many operating systems, on &os;, see the net/rsync @@ -2523,12 +2469,12 @@ usr.bin/ Available collections: - ftp: A partial mirror of the &os; FTP + ftp: A partial mirror of the &os; FTP server. - &os;: A full mirror of the &os; FTP server. + &os;: A full mirror of the &os; FTP server. @@ -2543,7 +2489,7 @@ usr.bin/ Available collections: - &os;: A full mirror of the &os; FTP server. + &os;: A full mirror of the &os; FTP server. @@ -2559,7 +2505,7 @@ usr.bin/ - &os;: A full mirror of the &os; FTP server. + &os;: A full mirror of the &os; FTP server. @@ -2569,7 +2515,7 @@ usr.bin/ &os;-Archive: The mirror of &os; Archive - FTP server. + FTP server. @@ -2584,7 +2530,7 @@ usr.bin/ Available collections: - &os;: A full mirror of the &os; FTP server. + &os;: A full mirror of the &os; FTP server. @@ -2603,7 +2549,7 @@ usr.bin/ Available collections: - &os;: A full mirror of the &os; FTP server. + &os;: A full mirror of the &os; FTP server. @@ -2619,7 +2565,7 @@ usr.bin/ ftp.freebsd.org: A full mirror of the &os; - FTP server. + FTP server. @@ -2636,7 +2582,7 @@ usr.bin/ Available collections: - &os;: The master archive of the &os; FTP + &os;: The master archive of the &os; FTP server. @@ -2651,7 +2597,7 @@ usr.bin/ - &os;: A full mirror of the &os; FTP server. + &os;: A full mirror of the &os; FTP server. From owner-svn-doc-head@FreeBSD.ORG Wed Feb 12 19:38:42 2014 Return-Path: Delivered-To: svn-doc-head@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 ESMTPS id BA149513; Wed, 12 Feb 2014 19:38:42 +0000 (UTC) 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 8AE1215F8; Wed, 12 Feb 2014 19:38:42 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1CJcgRp053159; Wed, 12 Feb 2014 19:38:42 GMT (envelope-from jgh@svn.freebsd.org) Received: (from jgh@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1CJcgAZ053158; Wed, 12 Feb 2014 19:38:42 GMT (envelope-from jgh@svn.freebsd.org) Message-Id: <201402121938.s1CJcgAZ053158@svn.freebsd.org> From: Jason Helfman Date: Wed, 12 Feb 2014 19:38:42 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r43886 - head/en_US.ISO8859-1/books/handbook/ports X-SVN-Group: doc-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the doc tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Feb 2014 19:38:42 -0000 Author: jgh Date: Wed Feb 12 19:38:42 2014 New Revision: 43886 URL: http://svnweb.freebsd.org/changeset/doc/43886 Log: - consolidate instructions for pkg installation of subversion - while here, place FQDN in tags Submitted by: lamproschaidas@aol.com (doc@ mailing list) Approved by: wblock (mentor) Modified: head/en_US.ISO8859-1/books/handbook/ports/chapter.xml Modified: head/en_US.ISO8859-1/books/handbook/ports/chapter.xml ============================================================================== --- head/en_US.ISO8859-1/books/handbook/ports/chapter.xml Wed Feb 12 19:08:16 2014 (r43885) +++ head/en_US.ISO8859-1/books/handbook/ports/chapter.xml Wed Feb 12 19:38:42 2014 (r43886) @@ -952,17 +952,13 @@ Deinstalling ca_root_nss-3.15.1_1... don &prompt.root; cd /usr/ports/devel/subversion &prompt.root; make install clean - If the ports tree is not available, - Subversion can be installed as - a package: + If the ports tree is not available, or + pkgng is being used to manage + packages, Subversion can be + installed as a package: &prompt.root; pkg install subversion - If pkgng is being used to - manage packages, Subversion can - be installed with it instead: - - &prompt.root; pkg install subversion @@ -973,7 +969,7 @@ Deinstalling ca_root_nss-3.15.1_1... don xlink:href="&url.books.handbook;/svn-mirrors.html">Subversion mirror close to your geographic location: - &prompt.root; svn checkout https://svn0.us-east.FreeBSD.org/ports/head /usr/ports + &prompt.root; svn checkout https://svn0.us-east.FreeBSD.org/ports/head /usr/ports From owner-svn-doc-head@FreeBSD.ORG Wed Feb 12 21:01:00 2014 Return-Path: Delivered-To: svn-doc-head@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 ESMTPS id 065C4F8D; Wed, 12 Feb 2014 21:01:00 +0000 (UTC) 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 D75091CC8; Wed, 12 Feb 2014 21:00:59 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1CL0xoE085738; Wed, 12 Feb 2014 21:00:59 GMT (envelope-from dru@svn.freebsd.org) Received: (from dru@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1CL0xpL085737; Wed, 12 Feb 2014 21:00:59 GMT (envelope-from dru@svn.freebsd.org) Message-Id: <201402122100.s1CL0xpL085737@svn.freebsd.org> From: Dru Lavigne Date: Wed, 12 Feb 2014 21:00:59 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r43887 - head/en_US.ISO8859-1/books/handbook/mirrors X-SVN-Group: doc-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the doc tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Feb 2014 21:01:00 -0000 Author: dru Date: Wed Feb 12 21:00:59 2014 New Revision: 43887 URL: http://svnweb.freebsd.org/changeset/doc/43887 Log: Finish initial pass through CTM chapter. Sponsored by: iXsystems Modified: head/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml Modified: head/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml ============================================================================== --- head/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml Wed Feb 12 19:38:42 2014 (r43886) +++ head/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml Wed Feb 12 21:00:59 2014 (r43887) @@ -148,7 +148,7 @@ to obtain up to three deltas per day for the most active branches. Update sizes are always kept as small as possible and are typically less than 5K. About one in very ten - update is 10-50K in size and rarely there will be an update + updates is 10-50K in size, and there will occasionally be an update larger than 100K+. When using CTM to track &os; development, @@ -172,8 +172,7 @@ email. FTP deltas can be obtained from the following mirror sites. - Download the relevant directory and read its - README. When using anonymous FTP to obtain CTM deltas, + When using anonymous FTP to obtain CTM deltas, select a geographically close mirror. In case of problems, contact the &a.ctm-users.name; mailing list. @@ -228,10 +227,10 @@ To instead receive deltas through email, subscribe to one of the - CTM distribution lists. - &a.ctm-src-cur.name; supports the entire source tree, + ctm-src distribution lists available from + http://lists.freebsd.org/mailman/listinfo. For example, &a.ctm-src-cur.name; supports the HEAD of the development - branch, and &a.ctm-src-9.name; supports the 9.X release branch. + branch and &a.ctm-src-9.name; supports the 9.X release branch. As CTM updates arrive through email, @@ -253,154 +252,142 @@ - Using <application>CTM</application> for the First - Time + <application>CTM</application> Usage Before CTM - deltas can be used, a starting point for the - deltas must be produced from an empty directory. - An initial Empty delta is used to start - the local CTM-supported tree. - - Since the trees are many tens of megabytes, you should - prefer to start from something already at hand. If you have a - -RELEASE CD, you can copy or extract an initial source from - it. This will save a significant transfer of data. - - You can recognize these starter deltas by - the X appended to the number - (src-cur.3210XEmpty.gz for instance). + deltas can be used for the first time, a starting point + must be produced. + + One method is to apply a starter delta to an + empty directory. A + starter delta can be recognized by + the XEmpty in its name, such as + src-cur.3210XEmpty.gz. The designation following the X corresponds - to the origin of your initial seed. - Empty is an empty directory. As a rule a + to the origin of the initial seed, where + Empty is an empty directory. As a rule, a base transition from Empty is produced - every 100 deltas. By the way, they are large! 70 to 80 + every 100 deltas. Be aware that starter deltas are large and + 70 to 80 Megabytes of gzip'd data is common for the XEmpty deltas. - Once you have picked a base delta to start from, you will - also need all deltas with higher numbers following it. - - - - Using <application>CTM</application> in Your Daily - Life - - To apply the deltas, simply say: - - &prompt.root; cd /where/ever/you/want/the/stuff -&prompt.root; ctm -v -v /where/you/store/your/deltas/src-xxx.* - - CTM understands deltas which - have been put through gzip, so you do not - need to gunzip them first, this saves disk + Another method is to copy or extract an initial source from + a + RELEASE media as this can + save a significant transfer of data from the Internet. + + Once a base delta has been created, apply + all deltas with higher numbers. To apply the deltas: + + &prompt.root; cd /directory/to/store/the/stuff +&prompt.root; ctm -v -v /directory/which/stores/the/deltas/src-xxx.* + + Multiple deltas can be applied at one time as they + will be processed one at a time and any deltas that are already + applied will be ignored. CTM understands deltas which + have been put through gzip, which saves disk space. - Unless it feels very secure about the entire process, - CTM will not touch your tree. To - verify a delta you can also use the flag - and CTM will not actually touch - your tree; it will merely verify the integrity of the delta - and see if it would apply cleanly to your current tree. - - There are other options to CTM - as well, see the manual pages or look in the sources for more - information. - - That is really all there is to it. Every time you get a - new delta, just run it through CTM - to keep your sources up to date. - - Do not remove the deltas if they are hard to download - again. You just might want to keep them around in case - something bad happens. Even if you only have floppy disks, - consider using fdwrite to make a - copy. + To + verify a delta without applying it, include . + CTM will not actually touch + the local tree but will instead verify the integrity of the delta + to see if it would apply cleanly. Refer to &man.ctm.1; for + more information about available switches and an overview of + the process CTM uses when applying + deltas. + + To keep the local source tree up-to-date, every time a + new delta becomes available, apply it through CTM. + + Once applied, it is recommended to not delete the deltas if it is a burden to download + them again. This way, a local copy is available in case + something bad happens. - Keeping Your Local Changes + Keeping Local Changes - As a developer one would like to experiment with and - change files in the source tree. + Developers often experiment with and + change files in thier local source tree. CTM supports local modifications in - a limited way: before checking for the presence of a file - foo, it first looks for - foo.ctm. If this file exists, - CTM will operate on it instead of - foo. - - This behavior gives us a simple way to maintain local - changes: simply copy the files you plan to modify to the - corresponding file names with a .ctm - suffix. Then you can freely hack the code, while - CTM keeps the - .ctm file up-to-date. + a limited way: before checking for the presence of a file, + it first looks for a file with the same name and a + .ctm extension. If this file exists, + CTM will operate on it instead of the + original filename. + + This behavior provides a simple way to maintain local + changes. Before modifying a file, make a copy with a + .ctm + suffix. Make any changes to the original filename, knowing that + CTM will only apply updates to the file with the + .ctm suffix. - Other Interesting <application>CTM</application> + <title>Other <application>CTM</application> Options - - Finding Out Exactly What Would Be Touched by an - Update - - You can determine the list of changes that - CTM will make on your source - repository using the option to - CTM. - - This is useful if you would like to keep logs of the - changes, pre- or post- process the modified files in any - manner, or just are feeling a tad paranoid. - + + + Finding Out Exactly What Would Be Touched by an + Update - - Making Backups Before Updating + + To determine the list of changes that + CTM will make to the local source + repository, use . This option is useful for creating logs of the + changes or when performing pre- or post-processing on any of the modified files. + + - Sometimes you may want to backup all the files that - would be changed by a CTM - update. + + Making Backups Before Updating - Specifying the option - causes CTM to backup all files - that would be touched by a given + + To backup all of the files that + would be changed by a CTM + update, specify . This option + tells CTM to backup all files + touched by the applied CTM delta to backup-file. - + + - - Restricting the Files Touched by an Update + + Restricting the Files Touched by an Update - Sometimes you would be interested in restricting the + + To restrict the scope of a given CTM update, or - may be interested in extracting just a few files from a - sequence of deltas. - - You can control the list of files that - CTM would operate on by - specifying filtering regular expressions using the - and options. + to extract just a few files from a + sequence of deltas, + filtering regular expressions can be specified using + , which specifies which files to process, or , which specifies which files to ignore. For example, to extract an up-to-date copy of - lib/libc/Makefile from your collection - of saved CTM deltas, run the - commands: + lib/libc/Makefile from a collection + of saved CTM deltas: - &prompt.root; cd /where/ever/you/want/to/extract/it/ -&prompt.root; ctm -e '^lib/libc/Makefile' ~ctm/src-xxx.* + &prompt.root; cd /directory/to/extract/to/ +&prompt.root; ctm -e '^lib/libc/Makefile' /directory/which/stores/the/deltas/src-xxx.* For every file specified in a - CTM delta, the - and options are - applied in the order given on the command line. The file is + CTM delta, + and are + applied in the order given on the command line. A file is processed by CTM only if it is - marked as eligible after all the and - options are applied to it. - + marked as eligible after all and + options are applied. + + + - + From owner-svn-doc-head@FreeBSD.ORG Wed Feb 12 21:31:34 2014 Return-Path: Delivered-To: svn-doc-head@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 ESMTPS id EF244AD3; Wed, 12 Feb 2014 21:31:34 +0000 (UTC) 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 D691510A2; Wed, 12 Feb 2014 21:31:34 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1CLVYbY000202; Wed, 12 Feb 2014 21:31:34 GMT (envelope-from dru@svn.freebsd.org) Received: (from dru@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1CLVY5S000200; Wed, 12 Feb 2014 21:31:34 GMT (envelope-from dru@svn.freebsd.org) Message-Id: <201402122131.s1CLVY5S000200@svn.freebsd.org> From: Dru Lavigne Date: Wed, 12 Feb 2014 21:31:34 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r43888 - head/en_US.ISO8859-1/books/handbook/mirrors X-SVN-Group: doc-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the doc tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Feb 2014 21:31:35 -0000 Author: dru Date: Wed Feb 12 21:31:34 2014 New Revision: 43888 URL: http://svnweb.freebsd.org/changeset/doc/43888 Log: White space fix only. Translators can ignore. Sponsored by: iXsystems Modified: head/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml Modified: head/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml ============================================================================== --- head/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml Wed Feb 12 21:00:59 2014 (r43887) +++ head/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml Wed Feb 12 21:31:34 2014 (r43888) @@ -28,7 +28,8 @@ Phone: +1 925 240-6652 Fax: +1 925 674-0821 Email: info@freebsdmall.com - WWW: http://www.freebsdmall.com/ + WWW: http://www.freebsdmall.com/ @@ -39,7 +40,8 @@ D-81371 München Germany Phone: (0177) 428 419 0 - WWW: http://www.hinner.de/linux/freebsd.html + WWW: http://www.hinner.de/linux/freebsd.html @@ -50,7 +52,8 @@ Margate CT9 2TB United Kingdom - WWW: https://linux-distro.co.uk/ + WWW: https://linux-distro.co.uk/ @@ -63,7 +66,8 @@ United Kingdom Phone: +44 (0)247 615 8121 Fax: +44 1491 837016 - WWW: http://www.linuxemporium.co.uk/products/bsd/ + WWW: http://www.linuxemporium.co.uk/products/bsd/ @@ -76,7 +80,8 @@ Russia Phone: +7-812-3125208 Email: info@linuxcenter.ru - WWW: http://linuxcenter.ru/shop/freebsd + WWW: http://linuxcenter.ru/shop/freebsd @@ -87,26 +92,28 @@ <acronym>FTP</acronym> Sites The official sources for &os; are available via anonymous - FTP from a worldwide set of mirror sites. The site - ftp://ftp.FreeBSD.org/pub/FreeBSD/ is well - connected and allows a large number of connections to it, but - you are probably better off finding a closer - mirror site (especially if you decide to set up some sort of - mirror site). - - Additionally, &os; is available via anonymous FTP from the - following mirror sites. If you choose to obtain &os; via - anonymous FTP, please try to use a site near you. The mirror - sites listed as Primary Mirror Sites typically - have the entire &os; archive (all the currently available - versions for each of the architectures) but you will probably - have faster download times from a site that is in your country - or region. The regional sites carry the most recent versions - for the most popular architecture(s) but might not carry the - entire &os; archive. All sites provide access via anonymous FTP - but some sites also provide access via other methods. The - access methods available for each site are provided in - parentheses after the hostname. + FTP from a worldwide set of mirror sites. + The site ftp://ftp.FreeBSD.org/pub/FreeBSD/ + is well connected and allows a large number of connections to + it, but you are probably better off finding a + closer mirror site (especially if you decide to + set up some sort of mirror site). + + Additionally, &os; is available via anonymous + FTP from the following mirror sites. If you + choose to obtain &os; via anonymous FTP, + please try to use a site near you. The mirror sites listed as + Primary Mirror Sites typically have the entire + &os; archive (all the currently available versions for each of + the architectures) but you will probably have faster download + times from a site that is in your country or region. The + regional sites carry the most recent versions for the most + popular architecture(s) but might not carry the entire &os; + archive. All sites provide access via anonymous + FTP but some sites also provide access via + other methods. The access methods available for each site are + provided in parentheses after the hostname. &chap.mirrors.ftp.index.inc; @@ -123,8 +130,8 @@ CVS has been deprecated by the project, and its use is - not recommended. - Subversion + not recommended. Subversion should be used instead. @@ -138,44 +145,44 @@ CTM is a method for keeping a - remote directory tree in sync with a central one. It is built into &os; - and can be used to synchronize a system with &os;'s source repositories. - It supports synchronization of an entire repository or just the specified branches. - - CTM is specifically designed for use on - lousy or non-existent TCP/IP connections. It provides the ability - for changes to be automatically sent by email. It requires the user - to obtain up to three deltas per day for the most active - branches. Update sizes are always kept as - small as possible and are typically less than 5K. About one in very ten - updates is 10-50K in size, and there will occasionally be an update - larger than 100K+. - - When using CTM to track &os; development, - refer to the - caveats related to working directly from the development - sources rather than a pre-packaged release. These are discussed - in Tracking a Development Branch. - - Little documentation exists on - the process of creating deltas or using CTM - for other purposes. Contact the - &a.ctm-users.name; mailing list for questions on using - CTM. + remote directory tree in sync with a central one. It is built + into &os; and can be used to synchronize a system with &os;'s + source repositories. It supports synchronization of an entire + repository or just the specified branches. + + CTM is specifically designed for + use on lousy or non-existent TCP/IP connections. It provides + the ability for changes to be automatically sent by email. It + requires the user to obtain up to three deltas per day for the + most active branches. Update sizes are always kept as small as + possible and are typically less than 5K. About one in very ten + updates is 10-50K in size, and there will occasionally be an + update larger than 100K+. + + When using CTM to track &os; + development, refer to the caveats related to working directly + from the development sources rather than a pre-packaged release. + These are discussed in Tracking + a Development Branch. + + Little documentation exists on the process of creating + deltas or using CTM for other + purposes. Contact the &a.ctm-users.name; mailing list for + questions on using CTM. Getting Deltas The deltas used by CTM can be obtained either through - anonymous FTP or - email. - - FTP deltas can be obtained from the following mirror sites. - When using anonymous FTP to obtain CTM deltas, - select a geographically close mirror. - In case of problems, contact the &a.ctm-users.name; - mailing list. + anonymous FTP or email. + + FTP deltas can be obtained from the + following mirror sites. When using anonymous + FTP to obtain + CTM deltas, select a geographically + close mirror. In case of problems, contact the + &a.ctm-users.name; mailing list. @@ -184,10 +191,12 @@ - ftp://ftp.FreeBSD.org/pub/FreeBSD/development/CTM/ + ftp://ftp.FreeBSD.org/pub/FreeBSD/development/CTM/ - ftp://ftp.FreeBSD.org/pub/FreeBSD/CTM/ + ftp://ftp.FreeBSD.org/pub/FreeBSD/CTM/ @@ -199,7 +208,8 @@ - ftp://ftp.za.FreeBSD.org/pub/FreeBSD/CTM/ + ftp://ftp.za.FreeBSD.org/pub/FreeBSD/CTM/ @@ -211,99 +221,97 @@ - ftp://ctm.tw.FreeBSD.org/pub/FreeBSD/development/CTM/ + ftp://ctm.tw.FreeBSD.org/pub/FreeBSD/development/CTM/ - ftp://ctm2.tw.FreeBSD.org/pub/FreeBSD/development/CTM/ + ftp://ctm2.tw.FreeBSD.org/pub/FreeBSD/development/CTM/ - ftp://ctm3.tw.FreeBSD.org/pub/FreeBSD/development/CTM/ + ftp://ctm3.tw.FreeBSD.org/pub/FreeBSD/development/CTM/ - To instead receive deltas through email, subscribe to one of the - ctm-src distribution lists available from - http://lists.freebsd.org/mailman/listinfo. For example, - &a.ctm-src-cur.name; supports the HEAD of the development - branch and &a.ctm-src-9.name; supports the 9.X release branch. - - As - CTM updates arrive through email, - use ctm_rmail to unpack and - apply them. This command can be run directly from an entry in - /etc/aliases in order to - automate this process. Refer to - &man.ctm.rmail.1; for more - details. + To instead receive deltas through email, subscribe to one + of the ctm-src distribution lists available + from http://lists.freebsd.org/mailman/listinfo. + For example, &a.ctm-src-cur.name; supports the HEAD of the + development branch and &a.ctm-src-9.name; supports the 9.X + release branch. + + As CTM updates arrive through + email, use ctm_rmail to unpack and apply + them. This command can be run directly from an entry in + /etc/aliases in order to automate this + process. Refer to &man.ctm.rmail.1; for more details. Regardless of the method which is used to get deltas, CTM users should subscribe - to the &a.ctm-announce.name; mailing list as - this is the only place where announcements concerning - the operation of the CTM system - are posted. + to the &a.ctm-announce.name; mailing list as this is the + only place where announcements concerning the operation of + the CTM system are posted. <application>CTM</application> Usage - Before CTM - deltas can be used for the first time, a starting point - must be produced. - - One method is to apply a starter delta to an - empty directory. A - starter delta can be recognized by - the XEmpty in its name, such as - src-cur.3210XEmpty.gz. - The designation following the X corresponds - to the origin of the initial seed, where - Empty is an empty directory. As a rule, a - base transition from Empty is produced + Before CTM deltas can be used + for the first time, a starting point must be produced. + + One method is to apply a starter delta to + an empty directory. A starter delta can be recognized by the + XEmpty in its name, such as + src-cur.3210XEmpty.gz. The designation + following the X corresponds to the origin + of the initial seed, where + Empty is an empty directory. As a rule, + a base transition from Empty is produced every 100 deltas. Be aware that starter deltas are large and - 70 to 80 - Megabytes of gzip'd data is common for the - XEmpty deltas. - - Another method is to copy or extract an initial source from - a - RELEASE media as this can - save a significant transfer of data from the Internet. + 70 to 80 Megabytes of gzip'd data is common + for the XEmpty deltas. + + Another method is to copy or extract an initial source + from a RELEASE media as this can save a significant transfer + of data from the Internet. - Once a base delta has been created, apply - all deltas with higher numbers. To apply the deltas: + Once a base delta has been created, apply all deltas with + higher numbers. To apply the deltas: &prompt.root; cd /directory/to/store/the/stuff &prompt.root; ctm -v -v /directory/which/stores/the/deltas/src-xxx.* - Multiple deltas can be applied at one time as they - will be processed one at a time and any deltas that are already - applied will be ignored. CTM understands deltas which - have been put through gzip, which saves disk - space. - - To - verify a delta without applying it, include . - CTM will not actually touch - the local tree but will instead verify the integrity of the delta - to see if it would apply cleanly. Refer to &man.ctm.1; for - more information about available switches and an overview of - the process CTM uses when applying + Multiple deltas can be applied at one time as they will + be processed one at a time and any deltas that are already + applied will be ignored. CTM + understands deltas which have been put through + gzip, which saves disk space. + + To verify a delta without applying it, include + . CTM will not + actually touch the local tree but will instead verify the + integrity of the delta to see if it would apply cleanly. + Refer to &man.ctm.1; for more information about available + switches and an overview of the process + CTM uses when applying deltas. To keep the local source tree up-to-date, every time a - new delta becomes available, apply it through CTM. + new delta becomes available, apply it through + CTM. - Once applied, it is recommended to not delete the deltas if it is a burden to download - them again. This way, a local copy is available in case - something bad happens. + Once applied, it is recommended to not delete the deltas + if it is a burden to download them again. This way, a loca + copy is available in case something bad happens. @@ -315,76 +323,77 @@ a limited way: before checking for the presence of a file, it first looks for a file with the same name and a .ctm extension. If this file exists, - CTM will operate on it instead of the - original filename. + CTM will operate on it instead of + the original filename. This behavior provides a simple way to maintain local - changes. Before modifying a file, make a copy with a - .ctm - suffix. Make any changes to the original filename, knowing that - CTM will only apply updates to the file with the - .ctm suffix. + changes. Before modifying a file, make a copy with a + .ctm suffix. Make any changes to the + original filename, knowing that + CTM will only apply updates to the + file with the .ctm suffix. - Other <application>CTM</application> - Options + Other <application>CTM</application> Options - - Finding Out Exactly What Would Be Touched by an - Update + + Finding Out Exactly What Would Be Touched by an + Update - - To determine the list of changes that - CTM will make to the local source - repository, use . This option is useful for creating logs of the - changes or when performing pre- or post-processing on any of the modified files. - - + + To determine the list of changes that + CTM will make to the local + source repository, use . This option + is useful for creating logs of the changes or when + performing pre- or post-processing on any of the + modified files. + + - - Making Backups Before Updating + + Making Backups Before Updating - - To backup all of the files that - would be changed by a CTM - update, specify . This option - tells CTM to backup all files - touched by the applied - CTM delta to - backup-file. - - + + To backup all of the files that would be changed by + a CTM update, specify + . This option tells + CTM to backup all files + touched by the applied CTM + delta to backup-file. + + - - Restricting the Files Touched by an Update + + Restricting the Files Touched by an Update + + + To restrict the scope of a given + CTM update, or to extract + just a few files from a sequence of deltas, filtering + regular expressions can be specified using + , which specifies which files to + process, or , which specifies which + files to ignore. - - To restrict the - scope of a given CTM update, or - to extract just a few files from a - sequence of deltas, - filtering regular expressions can be specified using - , which specifies which files to process, or , which specifies which files to ignore. - - For example, to extract an up-to-date copy of - lib/libc/Makefile from a collection - of saved CTM deltas: + For example, to extract an up-to-date copy of + lib/libc/Makefile from a collection + of saved CTM deltas: - &prompt.root; cd /directory/to/extract/to/ + &prompt.root; cd /directory/to/extract/to/ &prompt.root; ctm -e '^lib/libc/Makefile' /directory/which/stores/the/deltas/src-xxx.* - For every file specified in a - CTM delta, - and are - applied in the order given on the command line. A file is - processed by CTM only if it is - marked as eligible after all and - options are applied. - - - + For every file specified in a + CTM delta, + and are + applied in the order given on the command line. A file + is processed by CTM only if + it is marked as eligible after all + and options are applied. + + + Common Address Redundancy Protocol (<acronym>CARP</acronym>) From owner-svn-doc-head@FreeBSD.ORG Wed Feb 12 23:20:57 2014 Return-Path: Delivered-To: svn-doc-head@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 ESMTPS id D07C1A6C; Wed, 12 Feb 2014 23:20:57 +0000 (UTC) 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 B9F0B19C8; Wed, 12 Feb 2014 23:20:57 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1CNKv6b042859; Wed, 12 Feb 2014 23:20:57 GMT (envelope-from dru@svn.freebsd.org) Received: (from dru@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1CNKvuF042812; Wed, 12 Feb 2014 23:20:57 GMT (envelope-from dru@svn.freebsd.org) Message-Id: <201402122320.s1CNKvuF042812@svn.freebsd.org> From: Dru Lavigne Date: Wed, 12 Feb 2014 23:20:57 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r43892 - head/en_US.ISO8859-1/books/handbook/advanced-networking X-SVN-Group: doc-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the doc tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Feb 2014 23:20:57 -0000 Author: dru Date: Wed Feb 12 23:20:57 2014 New Revision: 43892 URL: http://svnweb.freebsd.org/changeset/doc/43892 Log: White space fix only. Translators can ignore. Sponsored by: iXsystems Modified: head/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml Modified: head/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml ============================================================================== --- head/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml Wed Feb 12 22:32:41 2014 (r43891) +++ head/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml Wed Feb 12 23:20:57 2014 (r43892) @@ -86,14 +86,15 @@ - Gateways and Routes - - CoranthGryphonContributed by + + Gateways and Routes + + + CoranthGryphonContributed + by - - routing gateway subnet @@ -151,12 +152,13 @@ host2.example.com link#1 UC Ethernet MAC address - The addresses beginning with 0:e0: are Ethernet hardware addresses, - also known as MAC addresses. &os; will - automatically identify any hosts, test0 in - the example, on the local Ethernet and add a route for that - host over the Ethernet interface, - ed0. This type of route has a + The addresses beginning with 0:e0: are Ethernet + hardware addresses, also known as MAC + addresses. &os; will automatically identify any hosts, + test0 in the example, on the local + Ethernet and add a route for that host over the Ethernet + interface, ed0. This type of route has a timeout, seen in the Expire column, which is used if the host does not respond in a specific amount of time. When this happens, the route to this host will be @@ -168,10 +170,11 @@ host2.example.com link#1 UC subnet &os; will add subnet routes for the local subnet. - 10.20.30.255 is the broadcast - address for the subnet 10.20.30 - and example.com is the - domain name associated with that subnet. The designation + 10.20.30.255 is the + broadcast address for the subnet 10.20.30 and example.com is the domain + name associated with that subnet. The designation link#1 refers to the first Ethernet card in the machine. @@ -189,13 +192,14 @@ host2.example.com link#1 UC The two host2 lines represent aliases which were created using &man.ifconfig.8;. The => symbol after the - lo0 interface says that an alias - has been set in addition to the loopback address. Such routes - only show up on the host that supports the alias; all other - hosts on the local network will have a + lo0 interface says that an alias has been + set in addition to the loopback address. Such routes only + show up on the host that supports the alias; all other hosts + on the local network will have a link#1 line for such routes. - The final line (destination subnet 224) deals with + The final line (destination subnet 224) deals with multicasting. Finally, various attributes of each route can be seen in @@ -332,25 +336,28 @@ host2.example.com link#1 UC A common question is Why is - T1-GW configured as the default gateway for - Local1, rather than the + T1-GW configured as the default + gateway for Local1, rather than the ISP server it is connected to?. Since the PPP interface is using an - address on the ISP's local network for - the local side of the connection, routes for any other - machines on the ISP's local network will - be automatically generated. The system already knows how - to reach the T1-GW machine, so there is no - need for the intermediate step of sending traffic to the + address on the ISP's local network for the + local side of the connection, routes for any other machines on + the ISP's local network will be + automatically generated. The system already knows how to + reach the T1-GW machine, so there is + no need for the intermediate step of sending traffic to the ISP's server. - It is common to use the address X.X.X.1 as the gateway address for - the local network. So, if the local class C address space is - 10.20.30 and the - ISP is using 10.9.9, the default routes would - be: + It is common to use the address X.X.X.1 as the gateway + address for the local network. So, if the local class C + address space is 10.20.30 and the + ISP is using 10.9.9, the default routes + would be: @@ -452,13 +459,15 @@ host2.example.com link#1 UC - Setting Up Static Routes + + Setting Up Static Routes + - AlHoangContributed by + AlHoangContributed + by - Manual Configuration @@ -497,14 +506,18 @@ host2.example.com link#1 UC - In this scenario, RouterA is a &os; - machine that is acting as a router to the rest of the - Internet. It has a default route set to 10.0.0.1 which allows it to - connect with the outside world. RouterB is - already configured properly as it uses 192.168.1.1 as the gateway. + In this scenario, RouterA is a + &os; machine that is acting as a router to the rest of the + Internet. It has a default route set to 10.0.0.1 which allows it to + connect with the outside world. + RouterB is already configured + properly as it uses 192.168.1.1 as the + gateway. - The routing table on RouterA looks - something like this: + The routing table on RouterA + looks something like this: &prompt.user; netstat -nr Routing tables @@ -516,17 +529,20 @@ default 10.0.0.1 UG 10.0.0.0/24 link#1 UC 0 0 xl0 192.168.1.0/24 link#2 UC 0 0 xl1 - With the current routing table, RouterA - cannot reach Internal Net 2 as it does not have a route for - 192.168.2.0/24. The + With the current routing table, + RouterA cannot reach Internal Net + 2 as it does not have a route for 192.168.2.0/24. The following command adds the Internal Net 2 network to - RouterA's routing table using 192.168.1.2 as the next - hop: + RouterA's routing table using + 192.168.1.2 as + the next hop: &prompt.root; route add -net 192.168.2.0/24 192.168.1.2 - Now RouterA can reach any hosts on the - 192.168.2.0/24 + Now RouterA can reach any hosts + on the 192.168.2.0/24 network. @@ -558,8 +574,9 @@ route_internalnet2="-net 192.168.2.0/24 Using more than one string in static_routes creates multiple static routes. The following shows an example of adding static - routes for the 192.168.0.0/24 - and 192.168.1.0/24 + routes for the 192.168.0.0/24 and + 192.168.1.0/24 networks: static_routes="net1 net2" @@ -644,13 +661,16 @@ route_net2="-net 192.168.1.0/24 192.168. which has largely been replaced by &man.pim.4; in many multicast installations. &man.mrouted.8; and the related &man.map-mbone.8; and &man.mrinfo.8; utilities are available - in the &os; Ports Collection as net/mrouted. + in the &os; Ports Collection as + net/mrouted. - Wireless Networking + + Wireless Networking + Loader @@ -659,7 +679,6 @@ route_net2="-net 192.168.1.0/24 192.168. MurrayStokely - wireless networking @@ -800,11 +819,13 @@ route_net2="-net 192.168.1.0/24 192.168. changed according to the configuration. A list of available wireless drivers and supported adapters can be found in the &os; Hardware Notes, available on - the Release + the Release Information page of the &os; website. If a native &os; driver for the wireless device does not exist, it may be possible to use the &windows; driver - with the help of the NDIS driver + with the help of the NDIS driver wrapper. @@ -980,7 +1001,8 @@ freebsdap 00:11:95:c3:0d:ac 1 This section provides a simple example of how to make the wireless network adapter work in &os; without encryption. Once familiar with these concepts, it is - strongly recommend to use WPA to set up + strongly recommend to use WPA to set up the wireless network. There are three basic steps to configure a wireless @@ -1057,7 +1079,8 @@ ifconfig_wlan0="mode 11gWPA-PSK, also known as WPA Personal, which is - described in . + described in . If using an &apple; &airport; Extreme base @@ -1079,7 +1102,8 @@ ifconfig_wlan0="authmode shared wepmode with legacy devices, it is better to use WEP with open authentication. More information regarding - WEP can be found in . + WEP can be found in . @@ -1339,17 +1363,19 @@ wlan0: flags=8843<UP,BROADCAST,RUNNIN (EAP-TLS) is a well-supported wireless authentication protocol since it was the first EAP method to be certified - by the Wi-Fi alliance. - EAP-TLS requires three certificates - to run: the certificate of the Certificate Authority - (CA) installed on all machines, the - server certificate for the authentication server, and - one client certificate for each wireless client. In - this EAP method, both the - authentication server and wireless client authenticate - each other by presenting their respective certificates, - and then verify that these certificates were signed by - the organization's CA. + by the Wi-Fi + alliance. EAP-TLS requires + three certificates to run: the certificate of the + Certificate Authority (CA) installed + on all machines, the server certificate for the + authentication server, and one client certificate for + each wireless client. In this EAP + method, both the authentication server and wireless + client authenticate each other by presenting their + respective certificates, and then verify that these + certificates were signed by the organization's + CA. As previously, the configuration is done via /etc/wpa_supplicant.conf: @@ -1742,8 +1768,8 @@ Associated with 00:13:46:49:41:76IBSS mode, also called ad-hoc mode, is designed for point to point connections. For example, to establish an ad-hoc network between the machines - A and B, choose two - IP addresses and a + A and B, + choose two IP addresses and a SSID. On A: @@ -1773,8 +1799,8 @@ Associated with 00:13:46:49:41:76The I in the output confirms that A is in ad-hoc mode. Now, configure - B with a different IP - address: + B with a different + IP address: &prompt.root; ifconfig wlan0 inet 192.168.0.2 netmask 255.255.255.0 ssid freebsdap &prompt.root; ifconfig wlan0 @@ -1787,8 +1813,9 @@ Associated with 00:13:46:49:41:76 - Both A and B are now - ready to exchange information. + Both A and + B are now ready to exchange + information. @@ -1807,7 +1834,8 @@ Associated with 00:13:46:49:41:76AP, the kernel must be configured with the appropriate networking support for the wireless card as well as the security protocols being used. For more - details, see . + details, see . The NDIS driver wrapper for @@ -1914,8 +1942,8 @@ freebsdap 00:11:95:c3:0d:ac 1 AP using the WPA security protocol. More details regarding WPA and the configuration of - WPA-based - wireless clients can be found in . + WPA-based wireless clients can be found + in . The &man.hostapd.8; daemon is used to deal with client authentication and key management on the @@ -1931,7 +1959,8 @@ freebsdap 00:11:95:c3:0d:ac 1 hostapd_enable="YES" Before trying to configure &man.hostapd.8;, first - configure the basic settings introduced in . + configure the basic settings introduced in . <acronym>WPA-PSK</acronym> @@ -2042,10 +2071,10 @@ wpa_pairwise=CCMP TKIP for more details. - It is possible to see the stations associated with the - AP using ifconfig - wlan0 list + clients can associate with it. See for more details. It + is possible to see the stations associated with the + AP using ifconfig wlan0 list sta. @@ -2112,7 +2141,8 @@ freebsdap 00:11:95:c3:0d:ac 1 In this example, the client machine found the AP and can associate with it using the - correct parameters. See for more details. + correct parameters. See for more details. @@ -2131,8 +2161,10 @@ freebsdap 00:11:95:c3:0d:ac 1 and the operating system switches automatically when the link state changes. - Link aggregation and failover is covered in and an example for using - both wired and wireless connections is provided at . + Link aggregation and failover is covered in and an example for using + both wired and wireless connections is provided at . @@ -2228,16 +2260,17 @@ freebsdap 00:11:95:c3:0d:ac 1 - Bluetooth + + Bluetooth + - PavLucistnikWritten by + PavLucistnikWritten + by

    pav@FreeBSD.org
    - - Bluetooth Introduction @@ -2804,8 +2837,9 @@ Success, response: OK, Success (0x20)In order to provide the OPUSH service, &man.sdpd.8; must be running and a root folder, where all incoming objects will be stored, must be created. The - default path to the root folder is /var/spool/obex. Finally, - start the OBEX server on a valid + default path to the root folder is + /var/spool/obex. Finally, start the + OBEX server on a valid RFCOMM channel number. The OBEX server will automatically register the OPUSH service with the local @@ -2877,12 +2911,14 @@ rfcomm_sppd[94692]: Starting on /dev/tty - Bridging + + Bridging + - AndrewThompsonWritten by + AndrewThompsonWritten + by - Introduction @@ -3206,23 +3242,25 @@ bridge0: flags=8843<UP,BROADCAST,RUNN forwarding table. Clients learned on a particular segment of the bridge can not roam to another segment. - Another example of using sticky addresses is to - combine the bridge with VLANs to create - a router where customer networks are isolated without - wasting IP address space. Consider that - CustomerA is on - vlan100 and CustomerB is on + Another example of using sticky addresses is to combine + the bridge with VLANs to create a router + where customer networks are isolated without wasting + IP address space. Consider that + CustomerA is + on vlan100 and CustomerB is on vlan101. The bridge has the address - 192.168.0.1 and is also an - Internet router. + 192.168.0.1 and + is also an Internet router. &prompt.root; ifconfig bridge0 addm vlan100 sticky vlan100 addm vlan101 sticky vlan101 &prompt.root; ifconfig bridge0 inet 192.168.0.1/24 - In this example, both clients see 192.168.0.1 as their default - gateway. Since the bridge cache is sticky, one host can not - spoof the MAC address of the other - customer in order to intercept their traffic. + In this example, both clients see 192.168.0.1 as their + default gateway. Since the bridge cache is sticky, one host + can not spoof the MAC address of the + other customer in order to intercept their traffic. Any communication between the VLANs can be blocked using a firewall or, as seen in this example, @@ -3231,8 +3269,8 @@ bridge0: flags=8843<UP,BROADCAST,RUNN &prompt.root; ifconfig bridge0 private vlan100 private vlan101 The customers are completely isolated from each other - and the full /24 address - range can be allocated without subnetting. + and the full /24 + address range can be allocated without subnetting. @@ -3245,7 +3283,8 @@ bridge0: flags=8843<UP,BROADCAST,RUNN is removed. The following example sets the maximum number of - Ethernet devices for CustomerA on + Ethernet devices for CustomerA on vlan100 to 10: &prompt.root; ifconfig bridge0 ifmaxaddr vlan100 10 @@ -3272,11 +3311,13 @@ bridge0: flags=8843<UP,BROADCAST,RUNN information. The following examples use the - Net-SNMP software (net-mgmt/net-snmp) to query a - bridge from a client system. The net-mgmt/bsnmptools port can - also be used. From the SNMP client - which is running Net-SNMP, add - the following lines to + Net-SNMP software + (net-mgmt/net-snmp) to query a bridge + from a client system. The + net-mgmt/bsnmptools port can also be + used. From the SNMP client which is + running Net-SNMP, add the + following lines to $HOME/.snmp/snmp.conf in order to import the bridge MIB definitions: @@ -3340,12 +3381,14 @@ BEGEMOT-BRIDGE-MIB::begemotBridgeDefault - Link Aggregation and Failover + + Link Aggregation and Failover + - AndrewThompsonWritten by + AndrewThompsonWritten + by - lagg failover @@ -3685,15 +3728,18 @@ ifconfig_lagg0="laggp - Diskless Operation + + Diskless Operation + - Jean-FrançoisDockèsUpdated by + Jean-FrançoisDockèsUpdated + by - AlexDupreReorganized and enhanced by + AlexDupreReorganized + and enhanced by - diskless workstation diskless operation @@ -3717,8 +3763,9 @@ ifconfig_lagg0="laggp file system on the server. The script will probably require a little customization. - Standard system startup files exist in /etc to detect and support a - diskless system startup. + Standard system startup files exist in + /etc to detect and support a diskless + system startup. Swapping, if needed, can be done either to an NFS file or to a local disk. @@ -3736,10 +3783,10 @@ ifconfig_lagg0="laggp / and /usr. - The root file system is a copy of a standard &os; - root, with some configuration files overridden by ones - specific to diskless operation or, possibly, to the - workstation they belong to. + The root file system is a copy of a standard &os; root, + with some configuration files overridden by ones specific to + diskless operation or, possibly, to the workstation they + belong to. The parts of the root which have to be writable are overlaid with &man.md.4; file systems. Any changes will be @@ -3855,8 +3902,9 @@ ifconfig_lagg0="laggp answer both BOOTP and DHCP requests. - ISC DHCP is not part of - the base system. Install the net/isc-dhcp42-server port or + ISC DHCP is not part of the + base system. Install the + net/isc-dhcp42-server port or package. Once ISC DHCP is installed, @@ -3980,7 +4028,8 @@ subnet 192.168.4.0 netmask 255.255.255.0 Create a directory from which &man.tftpd.8; will - serve the files, such as /tftpboot. + serve the files, such as + /tftpboot. @@ -4152,7 +4201,8 @@ cd /usr/src/etc; make distributionMiscellaneous Issues - Running with a Read-only <filename>/usr</filename> + Running with a Read-only + <filename>/usr</filename> diskless operation @@ -4162,7 +4212,8 @@ cd /usr/src/etc; make distributionIf the diskless workstation is configured to run &xorg;, adjust the XDM configuration file as it - puts the error log on /usr by default. + puts the error log on /usr by + default. @@ -4174,27 +4225,28 @@ cd /usr/src/etc; make distribution In this situation, there are sometimes problems with - the special files in /dev, due to differing - major/minor integer sizes. A solution to this problem - is to export a directory from the non-&os; server, mount - this directory onto a &os; machine, and use &man.devfs.5; - to allocate device nodes transparently for the - user. + the special files in /dev, due to + differing major/minor integer sizes. A solution to this + problem is to export a directory from the non-&os; server, + mount this directory onto a &os; machine, and use + &man.devfs.5; to allocate device nodes transparently for + the user. - PXE Booting with an <acronym>NFS</acronym> Root File + <info> + <title>PXE Booting with an <acronym>NFS</acronym> Root File System + CraigRodrigues
    rodrigc@FreeBSD.org
    Written by     - The &intel; Preboot eXecution Environment (PXE) allows booting the operating system @@ -4211,7 +4263,8 @@ cd /usr/src/etc; make distributionTFTP. After the host computer receives this information, it downloads the boot loader via TFTP and then executes the boot loader. - This is documented in section 2.2.1 of the Preboot + This is documented in section 2.2.1 of the Preboot Execution Environment (PXE) Specification. In &os;, the boot loader retrieved during the PXE process is @@ -4229,8 +4282,9 @@ cd /usr/src/etc; make distribution Choose a directory which will have a &os; installation which will be NFS - mountable. For example, a directory such as /b/tftpboot/FreeBSD/install - can be used. + mountable. For example, a directory such as + /b/tftpboot/FreeBSD/install can be + used. &prompt.root; export NFSROOTDIR=/b/tftpboot/FreeBSD/install &prompt.root; mkdir -p ${NFSROOTDIR} @@ -4238,7 +4292,8 @@ cd /usr/src/etc; make distribution Enable the NFS server by following - the instructions in . + the instructions in . @@ -4274,7 +4329,8 @@ cd /usr/src/etc; make distribution - Rebuild the &os; kernel and userland (): + Rebuild the &os; kernel and userland (): &prompt.root; cd /usr/src &prompt.root; make buildworld @@ -4358,17 +4414,19 @@ myhost.example.com:/b/tftpboot/FreeBSD/i NFS boot and runs /etc/rc.initdiskless. Read the comments in this script to understand what is going on. In this case, - /etc and /var need to be memory backed - file systems so that these directories are writable but the - NFS root directory is read-only: + /etc and /var need + to be memory backed file systems so that these directories are + writable but the NFS root directory is + read-only: &prompt.root; chroot ${NFSROOTDIR} &prompt.root; mkdir -p conf/base &prompt.root; tar -c -v -f conf/base/etc.cpio.gz --format cpio --gzip etc &prompt.root; tar -c -v -f conf/base/var.cpio.gz --format cpio --gzip var - When the system boots, memory file systems for /etc and /var will be created and - mounted and the contents of the + When the system boots, memory file systems for + /etc and /var will + be created and mounted and the contents of the cpio.gz files will be copied into them. @@ -4385,7 +4443,8 @@ myhost.example.com:/b/tftpboot/FreeBSD/i Install the DHCP server by - following the instructions documented at . Make sure that + following the instructions documented at . Make sure that /etc/rc.conf and /usr/local/etc/dhcpd.conf are correctly configured. @@ -4443,7 +4502,8 @@ myhost.example.com:/b/tftpboot/FreeBSD/i Use the net/wireshark package or port to debug the network traffic involved during the PXE booting process, as illustrated - in the diagram below. In , an example + in the diagram below. In , an example configuration is shown where the DHCP, TFTP, and NFS servers are on the same machine. However, these @@ -4456,11 +4516,16 @@ myhost.example.com:/b/tftpboot/FreeBSD/i - - - - - + + + + + @@ -4547,12 +4612,14 @@ Received 264951 bytes in 0.1 seconds - Network Address Translation + + Network Address Translation + - ChernLeeContributed by + ChernLeeContributed + by - Overview @@ -4768,20 +4835,27 @@ redirect_port tcp 192.168.0.3:80 80Each machine and interface behind the LAN should be assigned IP addresses in the private network space, - as defined by RFC + as defined by RFC 1918, and have a default gateway of the &man.natd.8; machine's internal IP address. For example, client A and - B behind the LAN have - IP addresses of 192.168.0.2 and 192.168.0.3, while the &man.natd.8; - machine's LAN interface has an - IP address of 192.168.0.1. The default gateway - of clients A and B must be - set to that of the &man.natd.8; machine, 192.168.0.1. The &man.natd.8; - machine's external Internet interface does not require any - special modification for &man.natd.8; to work. + B behind the LAN + have IP addresses of 192.168.0.2 and 192.168.0.3, while the + &man.natd.8; machine's LAN interface has an + IP address of 192.168.0.1. The default + gateway of clients A and + B must be set to that of the + &man.natd.8; machine, 192.168.0.1. The + &man.natd.8; machine's external Internet interface does not + require any special modification for &man.natd.8; to + work. @@ -4798,10 +4872,10 @@ redirect_port tcp 192.168.0.3:80 80 For example, an IRC server runs on - client A and a web server runs on client - B. For this to work properly, connections - received on ports 6667 (IRC) and 80 - (HTTP) must be redirected to the + client A and a web server runs on + client B. For this to work properly, + connections received on ports 6667 (IRC) + and 80 (HTTP) must be redirected to the respective machines. The syntax for is as @@ -4823,7 +4897,8 @@ redirect_port tcp 192.168.0.3:80 80-redirect_port. For example, tcp 192.168.0.2:2000-3000 2000-3000 would redirect all connections received on ports 2000 to 3000 - to ports 2000 to 3000 on client A. + to ports 2000 to 3000 on client + A. These options can be used when directly running &man.natd.8;, placed within the @@ -4849,12 +4924,17 @@ redirect_port tcp 192.168.0.3:80 80IP address back to the specific LAN client. This is also known as static NAT. For example, - if IP addresses 128.1.1.1, 128.1.1.2, and 128.1.1.3 are available, 128.1.1.1 can be used as the - &man.natd.8; machine's external IP - address, while 128.1.1.2 and - 128.1.1.3 are forwarded back - to LAN clients A and - B. + if IP addresses 128.1.1.1, 128.1.1.2, and 128.1.1.3 are available, + 128.1.1.1 can be + used as the &man.natd.8; machine's external + IP address, while 128.1.1.2 and 128.1.1.3 are forwarded back + to LAN clients A + and B. The syntax is as follows: @@ -4901,25 +4981,29 @@ redirect_port tcp 192.168.0.3:80 80 - <acronym>IPv6</acronym> + + <acronym>IPv6</acronym> + - AaronKaplanOriginally Written by + AaronKaplanOriginally + Written by - TomRhodesRestructured and Added by + TomRhodesRestructured + and Added by - BradDavisExtended by + BradDavisExtended + by - - IPv6, also known as IPng IP next generation, is the new version of the well known IP protocol, also known as - IPv4. &os; includes the KAME + IPv4. &os; includes the KAME IPv6 reference implementation. &os; comes with everything needed to use IPv6. This section focuses on getting IPv6 configured @@ -4933,16 +5017,17 @@ redirect_port tcp 192.168.0.3:80 80 Running out of addresses. For years the use of - RFC1918 private address space - (10.0.0.0/8, - 172.16.0.0/12, and - 192.168.0.0/16) and NAT + RFC1918 private address space (10.0.0.0/8, 172.16.0.0/12, and + 192.168.0.0/16) and NAT has slowed down the exhaustion. Even though, there are very few remaining IPv4 addresses. The Internet Assigned Numbers Authority (IANA) has issued the last of the available major blocks to the Regional Registries. Once each Regional Registry runs - out, there will be no more available and switching to + out, there will be no more available and switching to IPv6 will be critical. @@ -4978,7 +5063,8 @@ redirect_port tcp 192.168.0.3:80 80 - Address autoconfiguration (RFC2462). + Address autoconfiguration (RFC2462). @@ -5014,7 +5100,8 @@ redirect_port tcp 192.168.0.3:80 80 - KAME.net + KAME.net @@ -5040,8 +5127,9 @@ redirect_port tcp 192.168.0.3:80 80 The IPv4 broadcast address, usually - xxx.xxx.xxx.255, is expressed - by multicast addresses in IPv6. + xxx.xxx.xxx.255, + is expressed by multicast addresses in + IPv6. @@ -5062,7 +5150,8 @@ redirect_port tcp 192.168.0.3:80 80::128 bitsunspecified - Equivalent to 0.0.0.0 in *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-doc-head@FreeBSD.ORG Thu Feb 13 04:16:46 2014 Return-Path: Delivered-To: svn-doc-head@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 ESMTPS id E8529301; Thu, 13 Feb 2014 04:16:46 +0000 (UTC) Received: from dmz-mailsec-scanner-1.mit.edu (dmz-mailsec-scanner-1.mit.edu [18.9.25.12]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 27DC914A0; Thu, 13 Feb 2014 04:16:45 +0000 (UTC) X-AuditID: 1209190c-f794a6d000000c27-c4-52fc4726a828 Received: from mailhub-auth-4.mit.edu ( [18.7.62.39]) (using TLS with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by dmz-mailsec-scanner-1.mit.edu (Symantec Messaging Gateway) with SMTP id 91.20.03111.6274CF25; Wed, 12 Feb 2014 23:16:38 -0500 (EST) Received: from outgoing.mit.edu (outgoing-auth-1.mit.edu [18.9.28.11]) by mailhub-auth-4.mit.edu (8.13.8/8.9.2) with ESMTP id s1D4GbmH021849; Wed, 12 Feb 2014 23:16:38 -0500 Received: from multics.mit.edu (system-low-sipb.mit.edu [18.187.2.37]) (authenticated bits=56) (User authenticated as kaduk@ATHENA.MIT.EDU) by outgoing.mit.edu (8.13.8/8.12.4) with ESMTP id s1D4GZBe013213 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT); Wed, 12 Feb 2014 23:16:37 -0500 Received: (from kaduk@localhost) by multics.mit.edu (8.12.9.20060308) id s1D4GYUG003117; Wed, 12 Feb 2014 23:16:34 -0500 (EST) Date: Wed, 12 Feb 2014 23:16:34 -0500 (EST) From: Benjamin Kaduk X-X-Sender: kaduk@multics.mit.edu To: Dru Lavigne Subject: Re: svn commit: r43885 - head/en_US.ISO8859-1/books/handbook/mirrors In-Reply-To: <201402121908.s1CJ8Ged037206@svn.freebsd.org> Message-ID: References: <201402121908.s1CJ8Ged037206@svn.freebsd.org> User-Agent: Alpine 1.10 (GSO 962 2008-03-14) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrDIsWRmVeSWpSXmKPExsUixG6nrqvm/ifI4OMXVYsfHw8xWXQ1qVrc WLSfyWJ3fy+zA4vHjE/zWQIYo7hsUlJzMstSi/TtErgyLv4/z1ywRb6ib/15xgbGmZJdjJwc EgImErsPN7JA2GISF+6tZ+ti5OIQEpjNJLHt9Cd2kISQwEZGib1XSiESh5gk+ndPZIVwGhgl VsxaxwpSxSKgLTF1/xUmEJtNQE3i8d5mVoixihKbT01iBrFFgOynX/cygtjMAlESe5Y2gtUI C/hLvDj0GizOKWAlsaNlI9AcDg5eAQeJiU9cII6wlNjR8BhsjKiAjsTq/VPAruYVEJQ4OfMJ C8RIS4lzf66zTWAUmoUkNQtJagEj0ypG2ZTcKt3cxMyc4tRk3eLkxLy81CJdQ73czBK91JTS TYygQOaU5NnB+Oag0iFGAQ5GJR5ejRm/g4RYE8uKK3MPMUpyMCmJ8uo7/wkS4kvKT6nMSCzO iC8qzUktPsQowcGsJMIrIwGU401JrKxKLcqHSUlzsCiJ89Za/AoSEkhPLEnNTk0tSC2Cycpw cChJ8Hq4ATUKFqWmp1akZeaUIKSZODhBhvMADdcFqeEtLkjMLc5Mh8ifYlSUEuetdwVKCIAk Mkrz4HphieYVozjQK8K8riDtPMAkBdf9CmgwE9Dg1KjfIINLEhFSUg2MaRvdbx74W8ZW9Hpr z6YfS1Yx7y67Kh2h4H9dd/vUptWW3X26LZKvBb6WzJmsX+Prum2t+4evJn0dRddWx7zl0fze eq3XbDXLE80JEX7W5zgmHhcV1T+8+IqEsVLo/Gv7jTgv6ImJrnB99Knug/tj1Zuq/X/vXsw6 d+7OrCde81X9WS594L2/TYmlOCPRUIu5qDgRANLcBSYPAwAA Cc: svn-doc-head@freebsd.org, svn-doc-all@freebsd.org, doc-committers@freebsd.org X-BeenThere: svn-doc-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the doc tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Feb 2014 04:16:47 -0000 On Wed, 12 Feb 2014, Dru Lavigne wrote: > > Modified: head/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml > ============================================================================== > --- head/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml Wed Feb 12 16:48:56 2014 (r43884) > +++ head/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml Wed Feb 12 19:08:16 2014 (r43885) > @@ -138,99 +138,117 @@ > > > CTM is a method for keeping a > - remote directory tree in sync with a central one. It has been > - developed for usage with &os;'s source trees, though other > - people may find it useful for other purposes as time goes by. > - Little, if any, documentation currently exists at this time on > - the process of creating deltas, so contact the > - &a.ctm-users.name; mailing list for more information and if you > - wish to use CTM for other > - things. > + remote directory tree in sync with a central one. It is built into &os; > + and can be used to synchronize a system with &os;'s source repositories. > + It supports synchronization of an entire repository or just the specified branches. "just the specified branches" is strange with no prior mention of specifying branches. I don't have a great alternative offhand, but something like "just a specified subset of branches" or similar would be better. > + CTM is specifically designed for use on > + lousy or non-existent TCP/IP connections. It provides the ability > + for changes to be automatically sent by email. It requires the user > + to obtain up to three deltas per day for the most active > + branches. Update sizes are always kept as > + small as possible and are typically less than 5K. About one in very ten > + update is 10-50K in size and rarely there will be an update > + larger than 100K+. Lots of short, declarative sentences in this paragraph, which is potentially suboptimal. Might be better as an itemized list, actually. > + for other purposes. Contact the > + &a.ctm-users.name; mailing list for questions on using > + CTM. Er, I would hope that ctm-users would be able to provide answers, not questions :) (maybe s/for/with/?) > + FTP deltas can be obtained from the following mirror sites. > + Download the relevant directory and read its > + README. When using anonymous FTP to obtain CTM deltas, > + select a geographically close mirror. Something about "geographically close mirror" is sounding funny to me, though I can't place why. "selecting a mirror that is geographically nearby" changes things a bit but is maybe better. > + In case of problems, contact the &a.ctm-users.name; > + mailing list. > > + &a.ctm-src-cur.name; supports the entire source tree, > + &a.ctm-src-cur.name; supports the HEAD of the development > + branch, and &a.ctm-src-9.name; supports the 9.X release branch. "the HEAD of the development branch" seems odd (with that capitalization). I would have expected "the HEAD development branch" (which really goes back to the CVS days), "the head development branch" (using svn's lowercase), "the tip of the development branch", or something like that. > + Regardless of the method which is used to get deltas, > + CTM users should subscribe > + to the &a.ctm-announce.name; mailing list as > + this is the only place where announcements concerning > + the operation of the CTM system > + are posted. Nitpicking: a mailing list is not really a place where things are posted; maybe "mechanism by which announcements are posted" -Ben From owner-svn-doc-head@FreeBSD.ORG Thu Feb 13 04:37:41 2014 Return-Path: Delivered-To: svn-doc-head@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 ESMTPS id 736D24EE; Thu, 13 Feb 2014 04:37:41 +0000 (UTC) Received: from dmz-mailsec-scanner-5.mit.edu (dmz-mailsec-scanner-5.mit.edu [18.7.68.34]) by mx1.freebsd.org (Postfix) with ESMTP id C028F1621; Thu, 13 Feb 2014 04:37:40 +0000 (UTC) X-AuditID: 12074422-f79526d000000c47-10-52fc4ae0613b Received: from mailhub-auth-3.mit.edu ( [18.9.21.43]) (using TLS with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by dmz-mailsec-scanner-5.mit.edu (Symantec Messaging Gateway) with SMTP id B1.DA.03143.1EA4CF25; Wed, 12 Feb 2014 23:32:33 -0500 (EST) Received: from outgoing.mit.edu (outgoing-auth-1.mit.edu [18.9.28.11]) by mailhub-auth-3.mit.edu (8.13.8/8.9.2) with ESMTP id s1D4WWBH011507; Wed, 12 Feb 2014 23:32:32 -0500 Received: from multics.mit.edu (system-low-sipb.mit.edu [18.187.2.37]) (authenticated bits=56) (User authenticated as kaduk@ATHENA.MIT.EDU) by outgoing.mit.edu (8.13.8/8.12.4) with ESMTP id s1D4WUYY017507 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT); Wed, 12 Feb 2014 23:32:31 -0500 Received: (from kaduk@localhost) by multics.mit.edu (8.12.9.20060308) id s1D4WTML005168; Wed, 12 Feb 2014 23:32:29 -0500 (EST) Date: Wed, 12 Feb 2014 23:32:29 -0500 (EST) From: Benjamin Kaduk X-X-Sender: kaduk@multics.mit.edu To: Dru Lavigne Subject: Re: svn commit: r43887 - head/en_US.ISO8859-1/books/handbook/mirrors In-Reply-To: <201402122100.s1CL0xpL085737@svn.freebsd.org> Message-ID: References: <201402122100.s1CL0xpL085737@svn.freebsd.org> User-Agent: Alpine 1.10 (GSO 962 2008-03-14) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrNIsWRmVeSWpSXmKPExsUixCmqrfvQ60+QwZ+FrBY/Ph5isuhqUrW4 sWg/k8Xu/l5mBxaPGZ/mswQwRnHZpKTmZJalFunbJXBlHP14gL1gn1BFb4t5A+MXvi5GTg4J AROJ1neb2CBsMYkL99YD2VwcQgKzmSRmLHzIDOFsZJRoO/SABcI5xCRx9/BiqEwDo8TXxx1M XYwcHCwC2hKf1huDjGITUJN4vLeZFWKsosTmU5OYQWwRIPvp172MIDazQJTEnqWNYDXCAv4S 066vAjuDU8BK4mDfVyYQm1fAQeLc0XvMIOOFBCwlfjTpgYRFBXQkVu+fwgJRIihxcuYTFoiR lhLn/lxnm8AoNAtJahaS1AJGplWMsim5Vbq5iZk5xanJusXJiXl5qUW6pnq5mSV6qSmlmxhB YczuorSD8edBpUOMAhyMSjy8GjN+BwmxJpYVV+YeYpTkYFIS5dV3/hMkxJeUn1KZkVicEV9U mpNafIhRgoNZSYRXRgIox5uSWFmVWpQPk5LmYFES5621+BUkJJCeWJKanZpakFoEk5Xh4FCS 4A33BGoULEpNT61Iy8wpQUgzcXCCDOcBGl4BUsNbXJCYW5yZDpE/xagoJc57ACQhAJLIKM2D 64WlmVeM4kCvCPNyAJOOEA8wRcF1vwIazAQ0ODXqN8jgkkSElFQDY37eqZyfnMU3T13ONTjt Vbp4/tPMevW5YZp83EouvW+PT/UK0r4eW+aToNBwvXbaJmWXvmN78u2yPI8EvpUWcD2+efKk cNafonoadk+2lgnkyCxi+VNZX3nvl8aE5293Gmb6sZ9fr/aK8b6Z/nuGjU6iGetrpFtnneC6 L/brxOTLfdcOfTpyQImlOCPRUIu5qDgRAEUpE20OAwAA Cc: svn-doc-head@freebsd.org, svn-doc-all@freebsd.org, doc-committers@freebsd.org X-BeenThere: svn-doc-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the doc tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Feb 2014 04:37:41 -0000 On Wed, 12 Feb 2014, Dru Lavigne wrote: > Modified: head/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml > ============================================================================== > --- head/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml Wed Feb 12 19:38:42 2014 (r43886) > +++ head/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml Wed Feb 12 21:00:59 2014 (r43887) > + > + Multiple deltas can be applied at one time as they > + will be processed one at a time and any deltas that are already > + applied will be ignored. CTM understands deltas which > + have been put through gzip, which saves disk > space. "can be applied at one time" doesn't match with "one at a time"; I think "can be applied with a single command" is more likely to be correct (but I don't use CTM, so who knows!). "which have been put through gzip" is a strange phrasing; "which have been compressed using gzip" should be better. > + To > + verify a delta without applying it, include . I think this would be "include -c in the command line" or "add -c". > + CTM will not actually touch s/touch/modify/ ? > + the local tree but will instead verify the integrity of the delta > + to see if it would apply cleanly. Refer to &man.ctm.1; for > + more information about available switches and an overview of I sort of have the impression that we're moving away from using "switch" to describe options to utilities (and that "option" would be better), but don't have a citation. > + Once applied, it is recommended to not delete the deltas if it is a burden to download > + them again. This way, a local copy is available in case > + something bad happens. "something bad happens" is a bit informal; maybe "they are needed for future disaster recovery" or something similar. > + > + To backup all of the files that > + would be changed by a CTM > + update, specify . This option ? -Ben > + tells CTM to backup all files > + touched by the applied > CTM delta to > backup-file. From owner-svn-doc-head@FreeBSD.ORG Thu Feb 13 07:54:27 2014 Return-Path: Delivered-To: svn-doc-head@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 ESMTPS id 457DBCD0; Thu, 13 Feb 2014 07:54:27 +0000 (UTC) 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 31BB41585; Thu, 13 Feb 2014 07:54:27 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1D7sRX5043710; Thu, 13 Feb 2014 07:54:27 GMT (envelope-from jkois@svn.freebsd.org) Received: (from jkois@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1D7sRIR043709; Thu, 13 Feb 2014 07:54:27 GMT (envelope-from jkois@svn.freebsd.org) Message-Id: <201402130754.s1D7sRIR043709@svn.freebsd.org> From: Johann Kois Date: Thu, 13 Feb 2014 07:54:27 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r43893 - head/de_DE.ISO8859-1/share/xml X-SVN-Group: doc-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the doc tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Feb 2014 07:54:27 -0000 Author: jkois Date: Thu Feb 13 07:54:26 2014 New Revision: 43893 URL: http://svnweb.freebsd.org/changeset/doc/43893 Log: r43658 -> r43868 MFde: Resync the project news. Obtained from: The FreeBSD German Documentation Project Modified: head/de_DE.ISO8859-1/share/xml/news.xml Modified: head/de_DE.ISO8859-1/share/xml/news.xml ============================================================================== --- head/de_DE.ISO8859-1/share/xml/news.xml Wed Feb 12 23:20:57 2014 (r43892) +++ head/de_DE.ISO8859-1/share/xml/news.xml Thu Feb 13 07:54:26 2014 (r43893) @@ -4,7 +4,7 @@ - - &os; ¤Î¥¢¥Ã¥×¥Ç¡¼¥È¤È¥¢¥Ã¥×¥°¥ì¡¼¥É + + + + &os; ¤Î¥¢¥Ã¥×¥Ç¡¼¥È¤È¥¢¥Ã¥×¥°¥ì¡¼¥É + - JimMockºÆ¹½À®¡¢ºÆÊÔÀ®¤ª¤è¤Ó²þÄû: + + + Jim + Mock + + ºÆ¹½À®¡¢ºÆÊÔÀ®¤ª¤è¤Ó²þÄû: + + - JordanHubbard¸¶ºî: - Poul-HenningKamp - JohnPolstra - NikClayton + + + Jordan + Hubbard + + ¸¶ºî: + + + + + Poul-Henning + Kamp + + + + + + John + Polstra + + + + + + Nik + Clayton + + - - - ¤³¤Î¾Ï¤Ç¤Ï @@ -78,7 +111,8 @@ - ¥Í¥Ã¥È¥ï¡¼¥¯Àܳ¤ÎŬÀÚ¤ÊÀßÄê () + ¥Í¥Ã¥È¥ï¡¼¥¯Àܳ¤ÎŬÀÚ¤ÊÀßÄê + () ¥µ¡¼¥É¥Ñ¡¼¥Æ¥£À½¤Î¥½¥Õ¥È¥¦¥§¥¢¤Î¥¤¥ó¥¹¥È¡¼¥ëÊýË¡¤Î½¬ÆÀ () @@ -94,17 +128,33 @@ - &os; Update + + &os; Update + - TomRhodes´ó¹Æ: + + + Tom + Rhodes + + ´ó¹Æ: + + - ColinPercival¥Ù¡¼¥¹¤È¤Ê¤Ã¤¿¥Î¡¼¥È¤ÎÄó¶¡: + + + Colin + Percival + + ¥Ù¡¼¥¹¤È¤Ê¤Ã¤¿¥Î¡¼¥È¤ÎÄó¶¡: + - - Updating and Upgrading + + Updating and Upgrading + freebsd-update updating-upgrading @@ -130,8 +180,8 @@ ¿·¤·¤¤¥ê¥ê¡¼¥¹¤Ë¥¢¥Ã¥×¥Ç¡¼¥È¤¹¤ëÁ°¤Ë¡¢ ¥¢¥Ã¥×¥Ç¡¼¥È¤·¤è¤¦¤È¤·¤Æ¤¤¤ë¥ê¥ê¡¼¥¹¤Î¥¢¥Ê¥¦¥ó¥¹¤ËÌܤòÄ̤·¡¢ ½ÅÍפʾðÊ󤬤ʤ¤¤«¤É¤¦¤«¤ò³Îǧ¤·¤Æ¤¯¤À¤µ¤¤¡£ - ¥ê¥ê¡¼¥¹¤Î¥¢¥Ê¥¦¥ó¥¹¤Ï - http://www.FreeBSD.org/ja/releases/ + ¥ê¥ê¡¼¥¹¤Î¥¢¥Ê¥¦¥ó¥¹¤Ï http://www.FreeBSD.org/ja/releases/ ¤Ç³Îǧ¤Ç¤­¤Þ¤¹¡£ @@ -258,7 +308,8 @@ MergeChanges /etc/ /var/named/etc/root °¸¤Æ¤Ë¥á¡¼¥ë¤ÇÄÌÃΤµ¤ì¤Þ¤¹¡£ + root + °¸¤Æ¤Ë¥á¡¼¥ë¤ÇÄÌÃΤµ¤ì¤Þ¤¹¡£ ¤¦¤Þ¤¯¹Ô¤«¤Ê¤«¤Ã¤¿¾ì¹ç¤Ë¤Ï¡¢freebsd-update ¤ò°Ê²¼¤Î¤è¤¦¤Ë¼Â¹Ô¤¹¤ë¤È¡¢ºÇ¸å¤ÎÊѹ¹¤Þ¤Ç¥í¡¼¥ë¥Ð¥Ã¥¯¤Ç¤­¤Þ¤¹¡£ @@ -275,8 +326,8 @@ MergeChanges /etc/ /var/named/etc/freebsd-update ¤¬Â¾¤ÎÉôʬ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤¿¸å¡¢ ¥«¡¼¥Í¥ë¤òºÆ¹½ÃÛ¤·¡¢¤â¤¦°ìÅÙ¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£ - ¤·¤«¤·¤Ê¤¬¤é¡¢GENERIC ¥«¡¼¥Í¥ë¤¬ /boot/GENERIC - ¤Ë¸ºß¤¹¤ë¾ì¹ç¤Ë¤Ï¡¢ + ¤·¤«¤·¤Ê¤¬¤é¡¢GENERIC ¥«¡¼¥Í¥ë¤¬ + /boot/GENERIC ¤Ë¸ºß¤¹¤ë¾ì¹ç¤Ë¤Ï¡¢ ¸½ºß¤Î¥·¥¹¥Æ¥à¤Ç¼Â¹Ô¤µ¤ì¤Æ¤¤¤ë¥«¡¼¥Í¥ë¤Ç¤Ê¤¯¤È¤â¡¢ freebsd-update ¤Ë¤è¤ê¥¢¥Ã¥×¥Ç¡¼¥È¤µ¤ì¤Þ¤¹¡£ @@ -666,17 +717,33 @@ before running "/usr/sbin/freebsd-update - Portsnap: Ports Collection ¥¢¥Ã¥×¥Ç¡¼¥È¥Ä¡¼¥ë + + Portsnap: Ports Collection ¥¢¥Ã¥×¥Ç¡¼¥È¥Ä¡¼¥ë + - TomRhodes´ó¹Æ: + + + Tom + Rhodes + + ´ó¹Æ: + + - ColinPercival¥Ù¡¼¥¹¤È¤Ê¤Ã¤¿¥Î¡¼¥È¤ÎÄó¶¡: + + + Colin + Percival + + ¥Ù¡¼¥¹¤È¤Ê¤Ã¤¿¥Î¡¼¥È¤ÎÄó¶¡: + - - ¥¢¥Ã¥×¥Ç¡¼¥È¤È¥¢¥Ã¥×¥°¥ì¡¼¥É + + ¥¢¥Ã¥×¥Ç¡¼¥È¤È¥¢¥Ã¥×¥°¥ì¡¼¥É + Portsnap ¥¢¥Ã¥×¥Ç¡¼¥È¤È¥¢¥Ã¥×¥°¥ì¡¼¥É @@ -763,7 +830,8 @@ Fetching 133 new ports or files... done. ¥É¥­¥å¥á¥ó¥È¤Ï¡¢&os; ¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à¤Îɬ¿ÜÍ×ÁǤǤ¹¡£ - &os; ¥É¥­¥å¥á¥ó¥È¥»¥Ã¥È¤ÎºÇ¿·¥Ð¡¼¥¸¥ç¥ó¤Ï¡¢&os; ¥¦¥§¥Ö¥µ¥¤¥È + &os; ¥É¥­¥å¥á¥ó¥È¥»¥Ã¥È¤ÎºÇ¿·¥Ð¡¼¥¸¥ç¥ó¤Ï¡¢ + &os; ¥¦¥§¥Ö¥µ¥¤¥È ¤«¤éÆþ¼ê¤Ç¤­¤Þ¤¹¤¬¡¢ ¥Í¥Ã¥È¥ï¡¼¥¯Àܳ¤¬ÃÙ¤¤¡¢¤â¤·¤¯¤Ï¤Þ¤Ã¤¿¤¯Àܳ¤Ç¤­¤Ê¤¤¥æ¡¼¥¶¤â¤¤¤Þ¤¹¡£ ¥í¡¼¥«¥ë¤Î¥É¥­¥å¥á¥ó¥È¤òºÇ¿·¤Î &os; @@ -844,7 +912,8 @@ Fetching 133 new ports or files... done. &prompt.root; svn checkout https://svn0.us-west.FreeBSD.org/doc/head /usr/doc - ÍøÍѲÄǽ¤Ê Subversion ¥ß¥é¡¼¥µ¥¤¥È + ÍøÍѲÄǽ¤Ê + Subversion ¥ß¥é¡¼¥µ¥¤¥È ¤ÎÃ椫¤é¤â¤Ã¤È¤â¶á¤¤¥ß¥é¡¼¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤¡£ ºÇ½é¤Ë¥É¥­¥å¥á¥ó¥È¤Î¥½¡¼¥¹¤ò¥À¥¦¥ó¥í¡¼¥É¤¹¤ë¤Ë¤Ï¾¯¤·»þ´Ö¤¬¤«¤«¤ê¤Þ¤¹¡£ @@ -950,15 +1019,23 @@ Fetching 133 new ports or files... done. - ¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó ports + + ¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó ports + - MarcFonvieille¥Ù¡¼¥¹¤È¤Ê¤Ã¤¿ºî¶È: + + + Marc + Fonvieille + + ¥Ù¡¼¥¹¤È¤Ê¤Ã¤¿ºî¶È: + - - - Updating and Upgrading + + Updating and Upgrading + documentation package @@ -1000,7 +1077,8 @@ Fetching 133 new ports or files... done. &a.doceng; ¤¬Ëè·î¥¢¥Ã¥×¥Ç¡¼¥È¤·¤Æ¤¤¤ë ¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó ports ¤Ë¤è¤ê¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤¹¡£ - ¤³¤ì¤é¤Î ports ¤Ï¡¢&os; Ports Collection ¤Î docs + ¤³¤ì¤é¤Î ports ¤Ï¡¢&os; Ports Collection ¤Î docs ¥«¥Æ¥´¥ê¤Ë¤Þ¤È¤á¤é¤ì¤Æ¤¤¤Þ¤¹¡£ @@ -1026,23 +1104,28 @@ Fetching 133 new ports or files... done. - ¥Þ¥¹¥¿ port, misc/freebsd-doc-en¡£ + ¥Þ¥¹¥¿ port, + misc/freebsd-doc-en¡£ ¤¹¤Ù¤Æ¤Î±Ñ¸ìʸ½ñ¤Î ports ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹¡£ - ¤¹¤Ù¤Æ¤Î¥É¥­¥å¥á¥ó¥È¤Î port, misc/freebsd-doc-all¡£ - ¤³¤ì¤Ï¡¢¤¹¤Ù¤Æ¤ÎÍøÍѲÄǽ¤Ê¸À¸ì¤Î¤¹¤Ù¤Æ¤Î¥É¥­¥å¥á¥ó¥È¤ò¹½ÃÛ¤·¤Þ¤¹¡£ + ¤¹¤Ù¤Æ¤Î¥É¥­¥å¥á¥ó¥È¤Î port, + misc/freebsd-doc-all¡£¤³¤ì¤Ï¡¢ + ¤¹¤Ù¤Æ¤ÎÍøÍѲÄǽ¤Ê¸À¸ì¤Î¤¹¤Ù¤Æ¤Î¥É¥­¥å¥á¥ó¥È¤ò¹½ÃÛ¤·¤Þ¤¹¡£ ³Æ¸À¸ì¤Î¤¿¤á¤Ë ¥¹¥ì¡¼¥Ö port - ¤¬ÍÑ°Õ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢misc/freebsd-doc-hu + ¤¬ÍÑ°Õ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢ + misc/freebsd-doc-hu ¤Ï¥Ï¥ó¥¬¥ê¡¼¸ì¤Î¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó port ¤Ç¤¹¡£ - ¤¿¤È¤¨¤Ð¡¢http://www.FreeBSD.org ¤ÈƱ¤¸·Á¼°¤Ç¤¢¤ë¡¢ + ¤¿¤È¤¨¤Ð¡¢http://www.FreeBSD.org + ¤ÈƱ¤¸·Á¼°¤Ç¤¢¤ë¡¢ ±Ñ¸ìÈǤÎʬ³ä¤µ¤ì¤¿ HTML ·Á¼°¤ò¹½ÃÛ¤·¡¢ /usr/local/share/doc/freebsd ¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï°Ê²¼¤Î port ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤¯¤À¤µ¤¤¡£ @@ -1089,7 +1172,8 @@ Fetching 133 new ports or files... done. ¥É¥­¥å¥á¥ó¥È¤Î¥¤¥ó¥¹¥È¡¼¥ëÀè¤òÀßÄꤷ¤Þ¤¹¡£ - ¥Ç¥Õ¥©¥ë¥È¤Î¥¤¥ó¥¹¥È¡¼¥ëÀè¤Ï /usr/local/share/doc/freebsd + ¥Ç¥Õ¥©¥ë¥È¤Î¥¤¥ó¥¹¥È¡¼¥ëÀè¤Ï + /usr/local/share/doc/freebsd ¤Ç¤¹¡£ @@ -1292,8 +1376,9 @@ Fetching 133 new ports or files... done. - svn - Subversion + svn + + Subversion -CURRENT @@ -1313,12 +1398,15 @@ Fetching 133 new ports or files... done. - CTM + + CTM + -CURRENT CTM ¤ò»È¤Ã¤¿Æ±´ü ¤òÍѤ¤¤ë¡£ ÀܳÎÁ¤¬¹â³Û¤À¤Ã¤¿¤ê¡¢email ¤Ç¤Î¥¢¥¯¥»¥¹¤·¤«¤Ç¤­¤Ê¤¤¤è¤¦¤Ê¡¢ - ¤¢¤Þ¤êÎɼÁ¤Ç¤Ê¤¤ TCP/IP Àܳ¤Î¾ì¹ç¤Ë¤Ï¡¢CTM + ¤¢¤Þ¤êÎɼÁ¤Ç¤Ê¤¤ TCP/IP Àܳ¤Î¾ì¹ç¤Ë¤Ï¡¢ + CTM ¤òÍøÍѤ¹¤ë¤ÈÎɤ¤¤Ç¤·¤ç¤¦¡£¤¿¤À¤·¡¢ Subversion ¤Û¤É¤Ë¤Ï¿®Íê¤Ï¤Ç¤­¤Þ¤»¤ó¡£ @@ -1338,7 +1426,10 @@ Fetching 133 new ports or files... done. °ìÉô¤Î¤ß¤ò¥³¥ó¥Ñ¥¤¥ë¤·¤è¤¦¤È¤¹¤ë¤È¡¢ ¤Û¤Ü´Ö°ã¤¤¤Ê¤¯ÌäÂ꤬µ¯¤­¤Þ¤¹¡£ - &os.current; ¤ò¥³¥ó¥Ñ¥¤¥ë + + &os.current; + ¤ò¥³¥ó¥Ñ¥¤¥ë + -CURRENT ¥³¥ó¥Ñ¥¤¥ë ¤¹¤ëÁ°¤Ë @@ -1397,7 +1488,8 @@ Fetching 133 new ports or files... done. ¸½»þÅÀ¤Ç¤Î¸Å¤¤¥ê¥ê¡¼¥¹¤Î FreeBSD - ¤Î¥»¥­¥å¥ê¥Æ¥£¥Ý¥ê¥·¡¼¤ÎÁ´ÀâÌÀ¤òÃΤë¤Ë¤Ï¡¢http://www.FreeBSD.org/ja/security/ + ¤Î¥»¥­¥å¥ê¥Æ¥£¥Ý¥ê¥·¡¼¤ÎÁ´ÀâÌÀ¤òÃΤë¤Ë¤Ï¡¢http://www.FreeBSD.org/ja/security/ ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£ ¡£ @@ -1457,8 +1549,8 @@ Fetching 133 new ports or files... done. Ëè·î¸ø³«¤µ¤ì¤Æ¤¤¤ë &os.stable; ¤«¤é¥Ó¥ë¥É¤µ¤ì¤¿¥¹¥Ê¥Ã¥×¥·¥ç¥Ã¥È¤Î¿·¤·¤¤¥·¥¹¥Æ¥à¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï¡¢ - ¾ÜºÙ¤Ë¤Ä¤¤¤Æ¡¢ - ¥¹¥Ê¥Ã¥×¥·¥ç¥Ã¥È + ¾ÜºÙ¤Ë¤Ä¤¤¤Æ¡¢¥¹¥Ê¥Ã¥×¥·¥ç¥Ã¥È ¤ò¤´Í÷¤¯¤À¤µ¤¤¡£ ¤â¤·¤¯¤Ï¡¢¥ß¥é¡¼¥µ¥¤¥È¤«¤éºÇ¶á¤Î &os.stable; ¥ê¥ê¡¼¥¹¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¡¢²¼µ­¤ÎÀâÌÀ¤Ë½¾¤Ã¤ÆºÇ¿·¤Î @@ -1471,7 +1563,8 @@ Fetching 133 new ports or files... done. - svn + svn + Subversion ¤ò»È¤Ã¤Æ¡¢ ´õ˾¤¹¤ë³«È¯¥Ö¥é¥ó¥Á¡¢ @@ -1481,7 +1574,8 @@ Fetching 133 new ports or files... done. ¥Ö¥é¥ó¥Á̾¤Ë¤Ä¤¤¤Æ¤Ï¡¢¸½ºß¤Î³«È¯¤Î¥Ø¥Ã¥É¥Ö¥é¥ó¥Á¤Ï head¡¢¤ª¤è¤Ó ¥ê¥ê¡¼¥¹¥¨¥ó¥¸¥Ë¥¢¥ê¥ó¥°¤Î¥Ú¡¼¥¸ ¤ÎÆÃÄê¤Î¥Ö¥é¥ó¥Á¤Ç¤Ï - stable/9 + stable/9 + -STABLE Subversion ¤ò»È¤Ã¤¿Æ±´ü @@ -1489,7 +1583,8 @@ Fetching 133 new ports or files... done. releng/9.2 ¤È¤Ê¤ê¤Þ¤¹¡£ Subversion ¤ò»È¤Ã¤Æ¥Ù¡¼¥¹¥·¥¹¥Æ¥à¤ò¥Á¥§¥Ã¥¯¥¢¥¦¥È¤¹¤ëºÝ¤Î - URL ¤Î¥×¥ì¥Õ¥£¥Ã¥¯¥¹¤Ï¡¢Subversion ¥ß¥é¡¼¥µ¥¤¥È + URL ¤Î¥×¥ì¥Õ¥£¥Ã¥¯¥¹¤Ï¡¢Subversion ¥ß¥é¡¼¥µ¥¤¥È ¤ÇÀâÌÀ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£ ¥ê¥Ý¥¸¥È¥ê¥µ¥¤¥º¤Î´ÑÅÀ¤«¤é¡¢ ´õ˾¤¹¤ë¥µ¥Ö¥Ä¥ê¡¼¤Î¤ß¤ò¥Á¥§¥Ã¥¯¥¢¥¦¥È¤¹¤ë¤³¤È¤¬¿ä¾©¤µ¤ì¤Þ¤¹¡£ @@ -1497,7 +1592,8 @@ Fetching 133 new ports or files... done. ¥¤¥ó¥¿¡¼¥Í¥Ã¥È¤Ø¤ÎÀܳ¤Ë¹â®¤Ê²óÀþ¤òÍøÍѤǤ­¤Ê¤¤¤Î¤Ç¤¢¤ì¤Ð¡¢ - CTM + CTM + -STABLE CTM ¤ò»È¤Ã¤ÆƱ´ü¤¹¤ë @@ -1531,8 +1627,9 @@ Fetching 133 new ports or files... done. ¥¤¥ó¥¿¡¼¥Í¥Ã¥ÈÀܳ¤Þ¤¿¤ÏÅŻҥ᡼¥ë¤ò»ÈÍѤ·¤Æ¡¢&os; ¥×¥í¥¸¥§¥¯¥È¤Î¥½¡¼¥¹¤Î¤¢¤ë°ìÉôʬ¤Þ¤¿¤ÏÁ´ÂΤκǿ·¤òÄɤ¤¤«¤±¤ëÊýË¡¤Ï¿§¡¹¤¢¤ê¤Þ¤¹¡£ - ´ðËÜŪ¤Ê¥µ¡¼¥Ó¥¹¤Ï Subversion - ¤È CTM ¤Ç¤¹¡£ + ´ðËÜŪ¤Ê¥µ¡¼¥Ó¥¹¤Ï + Subversion ¤È + CTM ¤Ç¤¹¡£ ¥½¡¼¥¹¥Ä¥ê¡¼¤Î°ìÉô¤òºÇ¿·¤Î¤â¤Î¤Ë¹¹¿·¤¹¤ë¤³¤È¤Ï²Äǽ¤Ç¤¹¡£ @@ -1917,7 +2014,7 @@ Fetching 133 new ports or files... done. ¤½¤Î¸å¡¢°Ê²¼¤ò¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£: - &prompt.root; adjkerntz -i + &prompt.root; adjkerntz -i &prompt.root; mergemaster -p &prompt.root; cd /usr/src &prompt.root; make installworld @@ -2135,7 +2232,8 @@ Script done, … ¤Ë½ÐÎϤòÊݸ¤·¤Æ¤Ï¤¤¤±¤Þ¤»¤ó¡£ ¤³¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ï¡¢¼¡¤ÎºÆµ¯Æ°¤Çºï½ü¤µ¤ì¤Æ¤·¤Þ¤¦²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹¡£ ½ÐÎϤÎÊݸ¤Ë¤Ï¡¢/var/tmp ¤ä - root ¤Î¥Û¡¼¥à¥Ç¥£¥ì¥¯¥È¥ê¤¬Å¬¤·¤Æ¤¤¤Þ¤¹¡£ + root + ¤Î¥Û¡¼¥à¥Ç¥£¥ì¥¯¥È¥ê¤¬Å¬¤·¤Æ¤¤¤Þ¤¹¡£ @@ -2146,7 +2244,9 @@ Script done, … &prompt.root; cd /usr/src - make + + make + world ¤òºÆ¹½ÃÛ¤¹¤ë¤Ë¤Ï¡¢&man.make.1; ¤ò»ÈÍѤ·¤Æ¤¯¤À¤µ¤¤¡£ ¤³¤Î¥³¥Þ¥ó¥É¤Ï¡¢Makefile ¤«¤é¡¢ @@ -2222,11 +2322,13 @@ Script done, … ÂèÆó¤Ë¡¢NFS ¥Þ¥¦¥ó¥È¤òÍøÍѤ¹¤ë¤³¤È¤Ç¡¢ ¥Í¥Ã¥È¥ï¡¼¥¯¾å¤ÎÊ£¿ô¤Î¥Þ¥·¥ó¤ò¥¢¥Ã¥×¥°¥ì¡¼¥É¤¹¤ë¤³¤È¤¬²Äǽ¤ÊÅÀ¤¬¤¢¤²¤é¤ì¤Þ¤¹¡£ ¤¿¤È¤¨¤Ð»°Âæ¤Î¥Þ¥·¥ó¡¢ - A, B, C + A, + B, C ¤ò¥¢¥Ã¥×¥°¥ì¡¼¥É¤·¤¿¤¤¾ì¹ç¤Ë¤Ï¡¢¤Þ¤º¥Þ¥·¥ó A ¤Ç make buildworld ¤È make installworld ¤ò¼Â¹Ô¤·¤Þ¤¹¡£ - ¤½¤ì¤«¤é¡¢¥Þ¥·¥ó B ¤È¥Þ¥·¥ó C + ¤½¤ì¤«¤é¡¢¥Þ¥·¥ó B + ¤È¥Þ¥·¥ó C ¤Ç¥Þ¥·¥ó A ¤Î /usr/src ¤È /usr/obj ¤ò NFS ¥Þ¥¦¥ó¥È¤·¡¢make installworld @@ -2383,20 +2485,32 @@ Script done, … ¤Î¥Ð¥Ã¥¯¥¢¥Ã¥×¤ò¼è¤Ã¤ÆÉÔ¬¤Î»öÂÖ¤ËÈ÷¤¨¤Æ¤¯¤À¤µ¤¤¡£ - <command>mergemaster</command> + + <command>mergemaster</command> + - TomRhodes´ó¹Æ: + + + Tom + Rhodes + + ´ó¹Æ: + - mergemaster + + + mergemaster + + &man.mergemaster.8; ¤Ï Bourne ¥·¥§¥ë¥¹¥¯¥ê¥×¥È¤Ç¡¢ - /etc - ¤Ë¤¢¤ëÀßÄê¥Õ¥¡¥¤¥ë¤È¥½¡¼¥¹¥Ä¥ê¡¼¤Î + /etc ¤Ë¤¢¤ëÀßÄê¥Õ¥¡¥¤¥ë¤È¥½¡¼¥¹¥Ä¥ê¡¼¤Î /usr/src/etc ¤Ë¤¢¤ëÀßÄê¥Õ¥¡¥¤¥ë¤Î°ã¤¤¤ò³Îǧ¤¹¤ë¤Î¤ò¼êÅÁ¤Ã¤Æ¤¯¤ì¤Þ¤¹¡£ - ¤³¤ì¤ò»È¤¦¤Î¤¬¡¢¥½¡¼¥¹¥Ä¥ê¡¼¤Ë¤¢¤ëÀßÄê¥Õ¥¡¥¤¥ë¤Ë¥·¥¹¥Æ¥à¤ÎÀßÄê¥Õ¥¡¥¤¥ë¤ò + ¤³¤ì¤ò»È¤¦¤Î¤¬¡¢ + ¥½¡¼¥¹¥Ä¥ê¡¼¤Ë¤¢¤ëÀßÄê¥Õ¥¡¥¤¥ë¤Ë¥·¥¹¥Æ¥à¤ÎÀßÄê¥Õ¥¡¥¤¥ë¤ò ¹¹¿·¤¹¤ë¤¿¤á¤Ë¿ä¾©¤µ¤ì¤ëÊýË¡¤Ç¤¹¡£ »Ï¤á¤ë¤Ë¤Ï¡¢¥×¥í¥ó¥×¥È¤«¤é @@ -2590,8 +2704,8 @@ Script done, … &prompt.root; cd /var/tmp &prompt.root; diff -r root-20130214 root-20130221 - ¤³¤ì¤Ë¤è¤Ã¤ÆÊó¹ð¤µ¤ì¤ëÁê°ãÅÀ¤Ï¡¢ÂçÄñ¤Î¾ì¹ç¡¢/var/tmp/root-20130221/etc - ¤È + ¤³¤ì¤Ë¤è¤Ã¤ÆÊó¹ð¤µ¤ì¤ëÁê°ãÅÀ¤Ï¡¢ÂçÄñ¤Î¾ì¹ç¡¢ + /var/tmp/root-20130221/etc ¤È /etc ¤È¤ÎÁê°ãÅÀ¤ËÈæ¤Ù¤ÆÈó¾ï¤Ë¾¯¤Ê¤¤¤â¤Î¤Ë¤Ê¤ê¤Þ¤¹¡£ Áê°ãÅÀ¤¬¾¯¤Ê¤¤¤¿¤á¡¢Êѹ¹ÅÀ¤ò´û¸¤Î @@ -2624,12 +2738,19 @@ Script done, … - »È¤ï¤ì¤Ê¤¯¤Ê¤Ã¤¿¥Õ¥¡¥¤¥ë¡¢¥Ç¥£¥ì¥¯¥È¥ê¤Îºï½ü + + »È¤ï¤ì¤Ê¤¯¤Ê¤Ã¤¿¥Õ¥¡¥¤¥ë¡¢¥Ç¥£¥ì¥¯¥È¥ê¤Îºï½ü + - AntonShterenlikht¥Ù¡¼¥¹¤È¤Ê¤Ã¤¿¥Î¡¼¥È¤ÎÄó¶¡: + + + Anton + Shterenlikht + + ¥Ù¡¼¥¹¤È¤Ê¤Ã¤¿¥Î¡¼¥È¤ÎÄó¶¡: + - Deleting obsolete files and directories @@ -3026,9 +3147,17 @@ Building everything.. - Ê£¿ô¤Î¥Þ¥·¥ó¤ÇÄɤ¤¤«¤±¤ë + + Ê£¿ô¤Î¥Þ¥·¥ó¤ÇÄɤ¤¤«¤±¤ë + - MikeMeyer´ó¹Æ: + + + Mike + Meyer + + ´ó¹Æ: + From owner-svn-doc-head@FreeBSD.ORG Thu Feb 13 14:53:16 2014 Return-Path: Delivered-To: svn-doc-head@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 ESMTPS id 509FEB3D; Thu, 13 Feb 2014 14:53:16 +0000 (UTC) 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 2D5E61BC5; Thu, 13 Feb 2014 14:53:16 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1DErGm0012542; Thu, 13 Feb 2014 14:53:16 GMT (envelope-from dru@svn.freebsd.org) Received: (from dru@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1DErFaR012541; Thu, 13 Feb 2014 14:53:15 GMT (envelope-from dru@svn.freebsd.org) Message-Id: <201402131453.s1DErFaR012541@svn.freebsd.org> From: Dru Lavigne Date: Thu, 13 Feb 2014 14:53:15 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r43895 - head/en_US.ISO8859-1/books/handbook/mirrors X-SVN-Group: doc-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the doc tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Feb 2014 14:53:16 -0000 Author: dru Date: Thu Feb 13 14:53:15 2014 New Revision: 43895 URL: http://svnweb.freebsd.org/changeset/doc/43895 Log: Improve readability. Submitted by: bjk Sponsored by: iXsystems Modified: head/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml Modified: head/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml ============================================================================== --- head/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml Thu Feb 13 11:39:16 2014 (r43894) +++ head/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml Thu Feb 13 14:53:15 2014 (r43895) @@ -133,10 +133,10 @@ remote directory tree in sync with a central one. It is built into &os; and can be used to synchronize a system with &os;'s source repositories. It supports synchronization of an entire - repository or just the specified branches. + repository or just a specified set of branches. CTM is specifically designed for - use on lousy or non-existent TCP/IP connections. It provides + use on lousy or non-existent TCP/IP connections and provides the ability for changes to be automatically sent by email. It requires the user to obtain up to three deltas per day for the most active branches. Update sizes are always kept as small as @@ -153,7 +153,7 @@ Little documentation exists on the process of creating deltas or using CTM for other purposes. Contact the &a.ctm-users.name; mailing list for - questions on using CTM. + answers to questions on using CTM. Getting Deltas @@ -165,8 +165,8 @@ FTP deltas can be obtained from the following mirror sites. When using anonymous FTP to obtain - CTM deltas, select a geographically - close mirror. In case of problems, contact the + CTM deltas, select a mirror that is + geographically nearby. In case of problems, contact the &a.ctm-users.name; mailing list. @@ -228,7 +228,7 @@ of the ctm-src distribution lists available from http://lists.freebsd.org/mailman/listinfo. - For example, &a.ctm-src-cur.name; supports the HEAD of the + For example, &a.ctm-src-cur.name; supports the head development branch and &a.ctm-src-9.name; supports the 9.X release branch. @@ -242,8 +242,8 @@ Regardless of the method which is used to get deltas, CTM users should subscribe to the &a.ctm-announce.name; mailing list as this is the - only place where announcements concerning the operation of - the CTM system are posted. + only mechanism by which CTM + announcements are posted. @@ -275,18 +275,18 @@ &prompt.root; cd /directory/to/store/the/stuff &prompt.root; ctm -v -v /directory/which/stores/the/deltas/src-xxx.* - Multiple deltas can be applied at one time as they will + Multiple deltas can be applied with a single command as they will be processed one at a time and any deltas that are already applied will be ignored. CTM - understands deltas which have been put through - gzip, which saves disk space. + understands + gzip compressed deltas, which saves disk space. To verify a delta without applying it, include - . CTM will not - actually touch the local tree but will instead verify the + in the command line. CTM will not + actually modify the local tree but will instead verify the integrity of the delta to see if it would apply cleanly. Refer to &man.ctm.1; for more information about available - switches and an overview of the process + options and an overview of the process CTM uses when applying deltas. @@ -295,8 +295,9 @@ CTM. Once applied, it is recommended to not delete the deltas - if it is a burden to download them again. This way, a loca - copy is available in case something bad happens. + if it is a burden to download them again. This way, a local + copy is available in case it is needed for future disaster + recovery. @@ -343,7 +344,7 @@ To backup all of the files that would be changed by a CTM update, specify - . This option tells + . This option tells CTM to backup all files touched by the applied CTM delta to backup-file. From owner-svn-doc-head@FreeBSD.ORG Thu Feb 13 14:58:04 2014 Return-Path: Delivered-To: svn-doc-head@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 ESMTPS id 0668FDFF; Thu, 13 Feb 2014 14:58:04 +0000 (UTC) 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 E4FAC1C16; Thu, 13 Feb 2014 14:58:03 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1DEw3v5013257; Thu, 13 Feb 2014 14:58:03 GMT (envelope-from dru@svn.freebsd.org) Received: (from dru@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1DEw3TP013256; Thu, 13 Feb 2014 14:58:03 GMT (envelope-from dru@svn.freebsd.org) Message-Id: <201402131458.s1DEw3TP013256@svn.freebsd.org> From: Dru Lavigne Date: Thu, 13 Feb 2014 14:58:03 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r43896 - head/en_US.ISO8859-1/books/handbook/mirrors X-SVN-Group: doc-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the doc tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Feb 2014 14:58:04 -0000 Author: dru Date: Thu Feb 13 14:58:03 2014 New Revision: 43896 URL: http://svnweb.freebsd.org/changeset/doc/43896 Log: White space fix only. Translators can ignore. Sponsored by: iXsystems Modified: head/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml Modified: head/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml ============================================================================== --- head/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml Thu Feb 13 14:53:15 2014 (r43895) +++ head/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml Thu Feb 13 14:58:03 2014 (r43896) @@ -153,7 +153,8 @@ Little documentation exists on the process of creating deltas or using CTM for other purposes. Contact the &a.ctm-users.name; mailing list for - answers to questions on using CTM. + answers to questions on using + CTM. Getting Deltas @@ -275,19 +276,20 @@ &prompt.root; cd /directory/to/store/the/stuff &prompt.root; ctm -v -v /directory/which/stores/the/deltas/src-xxx.* - Multiple deltas can be applied with a single command as they will - be processed one at a time and any deltas that are already - applied will be ignored. CTM - understands - gzip compressed deltas, which saves disk space. + Multiple deltas can be applied with a single command as + they will be processed one at a time and any deltas that are + already applied will be ignored. + CTM understands + gzip compressed deltas, which saves disk + space. To verify a delta without applying it, include - in the command line. CTM will not - actually modify the local tree but will instead verify the - integrity of the delta to see if it would apply cleanly. - Refer to &man.ctm.1; for more information about available - options and an overview of the process - CTM uses when applying + in the command line. + CTM will not actually modify the + local tree but will instead verify the integrity of the delta + to see if it would apply cleanly. Refer to &man.ctm.1; for + more information about available options and an overview of + the process CTM uses when applying deltas. To keep the local source tree up-to-date, every time a @@ -344,10 +346,12 @@ To backup all of the files that would be changed by a CTM update, specify - . This option tells - CTM to backup all files - touched by the applied CTM - delta to backup-file. + . This + option tells CTM to backup + all files touched by the applied + CTM delta to + backup-file. @@ -737,11 +741,10 @@ Certificate information: Introduction - CVS and cvsup have been deprecated by the - &os; Project. - Subversion should be used - instead. + CVS and cvsup have been deprecated by + the &os; Project. Subversion + should be used instead. CVSup is a software package for From owner-svn-doc-head@FreeBSD.ORG Thu Feb 13 15:47:28 2014 Return-Path: Delivered-To: svn-doc-head@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 ESMTPS id C2649CB7; Thu, 13 Feb 2014 15:47:28 +0000 (UTC) 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 ACBB1120C; Thu, 13 Feb 2014 15:47:28 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1DFlSr0032532; Thu, 13 Feb 2014 15:47:28 GMT (envelope-from brueffer@svn.freebsd.org) Received: (from brueffer@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1DFlSbI032531; Thu, 13 Feb 2014 15:47:28 GMT (envelope-from brueffer@svn.freebsd.org) Message-Id: <201402131547.s1DFlSbI032531@svn.freebsd.org> From: Christian Brueffer Date: Thu, 13 Feb 2014 15:47:28 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r43897 - head/en_US.ISO8859-1/htdocs/docs X-SVN-Group: doc-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the doc tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Feb 2014 15:47:28 -0000 Author: brueffer Date: Thu Feb 13 15:47:28 2014 New Revision: 43897 URL: http://svnweb.freebsd.org/changeset/doc/43897 Log: Remove stale links to the info pages, we haven't served those in a long time. Discussed with: gjb Modified: head/en_US.ISO8859-1/htdocs/docs/webresources.xml Modified: head/en_US.ISO8859-1/htdocs/docs/webresources.xml ============================================================================== --- head/en_US.ISO8859-1/htdocs/docs/webresources.xml Thu Feb 13 14:58:03 2014 (r43896) +++ head/en_US.ISO8859-1/htdocs/docs/webresources.xml Thu Feb 13 15:47:28 2014 (r43897) @@ -73,20 +73,5 @@

    BSDGuides.org hosts many BSD-related tutorials.

    -

    Other documentation

    - -

    4.4BSD Documents: This is a - hypertext version of the 4.4BSD documents from - /usr/share/doc, where you will find the - documents on a FreeBSD machine (if you install the doc - distribution).

    - -

    Info Documents: This is a - hypertext version of the Info documents from - /usr/share/info, where you will find - the Info documents on a FreeBSD machine (if you install the info - distribution).

    - - From owner-svn-doc-head@FreeBSD.ORG Thu Feb 13 16:17:17 2014 Return-Path: Delivered-To: svn-doc-head@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 ESMTPS id 3D4966FF; Thu, 13 Feb 2014 16:17:17 +0000 (UTC) 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 27F1215B6; Thu, 13 Feb 2014 16:17:17 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1DGHHFM043571; Thu, 13 Feb 2014 16:17:17 GMT (envelope-from dru@svn.freebsd.org) Received: (from dru@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1DGHHfm043570; Thu, 13 Feb 2014 16:17:17 GMT (envelope-from dru@svn.freebsd.org) Message-Id: <201402131617.s1DGHHfm043570@svn.freebsd.org> From: Dru Lavigne Date: Thu, 13 Feb 2014 16:17:16 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r43898 - head/en_US.ISO8859-1/books/handbook/eresources X-SVN-Group: doc-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the doc tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Feb 2014 16:17:17 -0000 Author: dru Date: Thu Feb 13 16:17:16 2014 New Revision: 43898 URL: http://svnweb.freebsd.org/changeset/doc/43898 Log: Comment out C.4. Email Addresses for now as only one address. Sponsored by: iXsystems Modified: head/en_US.ISO8859-1/books/handbook/eresources/chapter.xml Modified: head/en_US.ISO8859-1/books/handbook/eresources/chapter.xml ============================================================================== --- head/en_US.ISO8859-1/books/handbook/eresources/chapter.xml Thu Feb 13 15:47:28 2014 (r43897) +++ head/en_US.ISO8859-1/books/handbook/eresources/chapter.xml Thu Feb 13 16:17:16 2014 (r43898) @@ -2277,7 +2277,8 @@ &chap.eresources.www.inc;     - + From owner-svn-doc-head@FreeBSD.ORG Thu Feb 13 19:04:34 2014 Return-Path: Delivered-To: svn-doc-head@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 ESMTPS id 6C60899D; Thu, 13 Feb 2014 19:04:34 +0000 (UTC) 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 563B516A0; Thu, 13 Feb 2014 19:04:34 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1DJ4YeI011480; Thu, 13 Feb 2014 19:04:34 GMT (envelope-from dru@svn.freebsd.org) Received: (from dru@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1DJ4YFS011479; Thu, 13 Feb 2014 19:04:34 GMT (envelope-from dru@svn.freebsd.org) Message-Id: <201402131904.s1DJ4YFS011479@svn.freebsd.org> From: Dru Lavigne Date: Thu, 13 Feb 2014 19:04:34 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r43901 - head/en_US.ISO8859-1/books/handbook/advanced-networking X-SVN-Group: doc-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the doc tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Feb 2014 19:04:34 -0000 Author: dru Date: Thu Feb 13 19:04:33 2014 New Revision: 43901 URL: http://svnweb.freebsd.org/changeset/doc/43901 Log: First pass at link aggregation chapter. Another nit-pickier commit to follow. Sponsored by: iXsystems Modified: head/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml Modified: head/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml ============================================================================== --- head/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml Thu Feb 13 16:41:18 2014 (r43900) +++ head/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml Thu Feb 13 19:04:33 2014 (r43901) @@ -3397,68 +3397,60 @@ BEGEMOT-BRIDGE-MIB::begemotBridgeDefault loadbalance roundrobin - - Introduction - - The &man.lagg.4; interface allows aggregation of multiple - network interfaces as one virtual interface for the purpose of - providing fault-tolerance and high-speed links. - - - - Operating Modes - - The following operating modes are supported by + &os; provides the &man.lagg.4; interface which can be used + to aggregate multiple + network interfaces into one virtual interface for the purpose of + providing fault tolerance and link aggregation. Link + aggregation works best on switches which support + LACP, as this protocol distributes traffic + bi-directionally while responding to the failure of individual + links. + + The operating modes supported by the lagg interface + determine which ports are used for outgoing traffic and + whether or not a specific port accepts incoming + traffic. The following operating modes are supported by &man.lagg.4;: - Failover + failover - Sends and receives traffic only through the master + This mode sends and receives traffic only through the master port. If the master port becomes unavailable, the next - active port is used. The first interface added is the - master port and any interfaces added after that are used + active port is used. The first interface added to the virtual interface is the + master port and all subsequently added interfaces are used as failover devices. If failover to a non-master port - occurs, the original port will become master when it + occurs, the original port becomes master once it becomes available again. - &cisco; Fast ðerchannel; + fec / loadbalance &cisco; Fast ðerchannel; (FEC) - is a static setup and does not negotiate aggregation + is found on older &cisco; switches. It provides a + static setup and does not negotiate aggregation with the peer or exchange frames to monitor the link. If the switch supports LACP, that should be used instead. - - FEC balances outgoing traffic - across the active ports based on hashed protocol header - information and accepts incoming traffic from any active - port. The hash includes the Ethernet source and - destination address and, if available, the - VLAN tag, and the - IPv4 or IPv6 - source and destination address. - LACP + lacp The &ieee; 802.3ad Link Aggregation Control Protocol - (LACP) and the Marker Protocol. - LACP will negotiate a set of + (LACP) negotiates a set of aggregable links with the peer in to one or more Link Aggregated Groups (LAGs). Each LAG is composed of ports of the - same speed, set to full-duplex operation. The traffic - will be balanced across the ports in the + same speed, set to full-duplex operation, and traffic + is balanced across the ports in the LAG with the greatest total speed. - In most cases, there will only be one - LAG which contains all ports. In + Typically, there is only one + LAG which contains all the ports. In the event of changes in physical connectivity, LACP will quickly converge to a new configuration. @@ -3468,24 +3460,16 @@ BEGEMOT-BRIDGE-MIB::begemotBridgeDefault information and accepts incoming traffic from any active port. The hash includes the Ethernet source and destination address and, if available, the - VLAN tag, and the IPv4 or + VLAN tag, and the IPv4 or IPv6 source and destination address. - Loadbalance + roundrobin - This is an alias of FEC - mode. - - - - - Round-robin - - Distributes outgoing traffic using a round-robin + This mode distributes outgoing traffic using a round-robin scheduler through all active ports and accepts incoming traffic from any active port. This mode violates Ethernet frame ordering and should be used with @@ -3493,10 +3477,16 @@ BEGEMOT-BRIDGE-MIB::begemotBridgeDefault - - Examples + Configuration Examples + + This section demonstrates how to configure a &cisco; + switch and a &os; system for LACP load + balancing. It then shows how to configure two Ethernet + interfaces in failover mode as well as how to configure + failover mode between an Ethernet and a wireless + interface. <acronym>LACP</acronym> Aggregation with a &cisco; @@ -3526,10 +3516,10 @@ BEGEMOT-BRIDGE-MIB::begemotBridgeDefault channel-group 1 mode active channel-protocol lacp</userinput></screen> - <para>Create the &man.lagg.4; interface using - <replaceable>fxp0</replaceable> and + <para>On the &os; system, create the &man.lagg.4; interface using + the physical interfaces <replaceable>fxp0</replaceable> and <replaceable>fxp1</replaceable>, and bring the interfaces up - with the <acronym>IP</acronym> address of + with an <acronym>IP</acronym> address of <replaceable>10.0.0.3/24</replaceable>:</para> <screen>&prompt.root; <userinput>ifconfig fxp0 up</userinput> @@ -3537,18 +3527,16 @@ BEGEMOT-BRIDGE-MIB::begemotBridgeDefault &prompt.root; <userinput>ifconfig lagg0 create </userinput> &prompt.root; <userinput>ifconfig lagg0 up laggproto lacp laggport fxp0 laggport fxp1 10.0.0.3/24</userinput></screen> - <para>View the interface status by running:</para> - - <screen>&prompt.root; <userinput>ifconfig lagg0</userinput></screen> - - <para>Ports marked as <emphasis>ACTIVE</emphasis> are part of + <para>Next, verify the status of the virtual interface. Ports + marked as <literal>ACTIVE</literal> are part of the active aggregation group that has been negotiated with the remote switch. Traffic will be transmitted and received through active ports. Use the verbose output of &man.ifconfig.8; to view the <acronym>LAG</acronym> identifiers.</para> - <screen>lagg0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> metric 0 mtu 1500 + <screen>&prompt.root; <userinput>ifconfig lagg0</userinput> +lagg0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> metric 0 mtu 1500 options=8<VLAN_MTU> ether 00:05:5d:71:8d:b8 media: Ethernet autoselect @@ -3557,10 +3545,9 @@ BEGEMOT-BRIDGE-MIB::begemotBridgeDefault laggport: fxp1 flags=1c<ACTIVE,COLLECTING,DISTRIBUTING> laggport: fxp0 flags=1c<ACTIVE,COLLECTING,DISTRIBUTING></screen> - <para>To see the port status on the &cisco; switch, use - <userinput>show lacp neighbor</userinput>:</para> + <para>To see the port status on the &cisco; switch:</para> - <screen>switch# show lacp neighbor + <screen>switch# <userinput>show lacp neighbor</userinput> Flags: S - Device is requesting Slow LACPDUs F - Device is requesting Fast LACPDUs A - Device is in Active mode P - Device is in Passive mode @@ -3577,9 +3564,9 @@ Fa0/2 SA 32768 0005.5d71.8d <para>For more detail, type <userinput>show lacp neighbor detail</userinput>.</para> - <para>To retain this configuration across reboots, the - following entries can be added to - <filename>/etc/rc.conf</filename>:</para> + <para>To retain this configuration across reboots, add the + following entries to + <filename>/etc/rc.conf</filename> on the &os; system:</para> <programlisting>ifconfig_<replaceable>fxp0</replaceable>="up" ifconfig_<replaceable>fxp1</replaceable>="up" @@ -3592,11 +3579,11 @@ ifconfig_<literal>lagg0</literal>="laggp <para>Failover mode can be used to switch over to a secondary interface if the link is lost on the master interface. - To configure failover mode, first bring the underlying - physical interfaces up. Then, create the &man.lagg.4; - interface, using <replaceable>fxp0</replaceable> as the - master interface and <replaceable>fxp1</replaceable> as - the secondary interface, and assign an <acronym>IP</acronym> + To configure failover mode, make sure that the underlying + physical interfaces are up, then create the &man.lagg.4; + interface. In this example, <replaceable>fxp0</replaceable> is the + master interface, <replaceable>fxp1</replaceable> is + the secondary interface, and the virtual interface is assigned an <acronym>IP</acronym> address of <replaceable>10.0.0.15/24</replaceable>:</para> @@ -3605,7 +3592,7 @@ ifconfig_<literal>lagg0</literal>="laggp &prompt.root; <userinput>ifconfig lagg0 create</userinput> &prompt.root; <userinput>ifconfig lagg0 up laggproto failover laggport fxp0 laggport fxp1 10.0.0.15/24</userinput></screen> - <para>The interface should now look something like + <para>The virtual interface should look something like this:</para> <screen>&prompt.root; <userinput>ifconfig lagg0</userinput> @@ -3626,8 +3613,8 @@ lagg0: flags=8843<UP,BROADCAST,RUNNIN If the link is restored on the master interface, it will once again become the active link.</para> - <para>To retain this configuration across reboots, the - following entries can be added to + <para>To retain this configuration across reboots, add the + following entries to <filename>/etc/rc.conf</filename>:</para> <programlisting>ifconfig_<replaceable>fxp0</replaceable>="up" @@ -3641,30 +3628,30 @@ ifconfig_<literal>lagg0</literal>="laggp Interfaces For laptop users, it is usually desirable to configure - the wireless device as a secondary interface, which is used - when the wired connection is not available. With - &man.lagg.4;, it is possible to use one - IP address, prefer the wired connection + the wireless device as a secondary which is only used + when the Ethernet connection is not available. With + &man.lagg.4;, it is possible to configure a failover which + prefers the Ethernet connection for both performance and security reasons, while maintaining the ability to transfer data over the wireless connection. - In this setup, override the underlying wireless - interface's MAC address to match that - of the &man.lagg.4;, which is inherited from the wired + This is achieved by overriding the underlying wireless + interface's MAC address with that + of the Ethernet interface. - In this example, the wired interface, - bge0, is the master, and the + In this example, the Ethernet interface, + bge0, is the master and the wireless interface, wlan0, is - the failover interface. The + the failover. The wlan0 device was created from - iwn0, which will be configured - with the wired connection's MAC address. - The first step is to determine the MAC - address of the wired interface: + iwn0 wireless interface, which will be configured + with the MAC address of the Ethernet interface. + First, determine the MAC + address of the Ethernet interface: - &prompt.root; ifconfig bge0 + &prompt.root; ifconfig bge0 bge0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> metric 0 mtu 1500 options=19b<RXCSUM,TXCSUM,VLAN_MTU,VLAN_HWTAGGING,VLAN_HWCSUM,TSO4> ether 00:21:70:da:ae:37 @@ -3674,9 +3661,9 @@ bge0: flags=8843<UP,BROADCAST,RUNNING status: active Replace bge0 to match the - system's interface name. The ether + system's Ethernet interface name. The ether line will contain the MAC address of - the wired interface. Now, change the + the specified interface. Now, change the MAC address of the underlying wireless interface: @@ -3687,16 +3674,16 @@ bge0: flags=8843<UP,BROADCAST,RUNNING &prompt.root; ifconfig wlan0 create wlandev iwn0 ssid my_router up - Bring the bge0 interface up. - Create the &man.lagg.4; interface with - bge0 as master, and failover to + Make sure the bge0 interface is up, then + create the &man.lagg.4; interface with + bge0 as master with failover to wlan0: &prompt.root; ifconfig bge0 up &prompt.root; ifconfig lagg0 create &prompt.root; ifconfig lagg0 up laggproto failover laggport bge0 laggport wlan0 - The interface will now look something like this: + The virtual interface should look something like this: &prompt.root; ifconfig lagg0 lagg0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> metric 0 mtu 1500 @@ -3713,8 +3700,8 @@ lagg0: flags=8843<UP,BROADCAST,RUNNIN &prompt.root; dhclient lagg0 - To retain this configuration across reboots, the - following entries can be added to + To retain this configuration across reboots, add the + following entries to /etc/rc.conf: ifconfig_bge0="up" From owner-svn-doc-head@FreeBSD.ORG Thu Feb 13 20:01:03 2014 Return-Path: Delivered-To: svn-doc-head@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 ESMTPS id EBB4842D; Thu, 13 Feb 2014 20:01:03 +0000 (UTC) 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 D67701C10; Thu, 13 Feb 2014 20:01:03 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1DK13mr034284; Thu, 13 Feb 2014 20:01:03 GMT (envelope-from pluknet@svn.freebsd.org) Received: (from pluknet@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1DK13Se034283; Thu, 13 Feb 2014 20:01:03 GMT (envelope-from pluknet@svn.freebsd.org) Message-Id: <201402132001.s1DK13Se034283@svn.freebsd.org> From: Sergey Kandaurov Date: Thu, 13 Feb 2014 20:01:03 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r43902 - head/en_US.ISO8859-1/books/porters-handbook X-SVN-Group: doc-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the doc tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Feb 2014 20:01:04 -0000 Author: pluknet Date: Thu Feb 13 20:01:03 2014 New Revision: 43902 URL: http://svnweb.freebsd.org/changeset/doc/43902 Log: Fix typo. Modified: head/en_US.ISO8859-1/books/porters-handbook/uses.xml Modified: head/en_US.ISO8859-1/books/porters-handbook/uses.xml ============================================================================== --- head/en_US.ISO8859-1/books/porters-handbook/uses.xml Thu Feb 13 19:04:33 2014 (r43901) +++ head/en_US.ISO8859-1/books/porters-handbook/uses.xml Thu Feb 13 20:01:03 2014 (r43902) @@ -77,7 +77,7 @@ nestedfct, features    Determines which compiler to use based on any given wishes. - Use c++11-lang if the port needs a C+11-capable + Use c++11-lang if the port needs a C++11-capable compiler, and c++11-lib if the port also needs a C++11-ready standard library. If the port needs a compiler understanding C++0X, C11, OpenMP, or nested functions, the From owner-svn-doc-head@FreeBSD.ORG Thu Feb 13 20:49:59 2014 Return-Path: Delivered-To: svn-doc-head@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 ESMTPS id 9C905A5C; Thu, 13 Feb 2014 20:49:59 +0000 (UTC) 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 7A69F122A; Thu, 13 Feb 2014 20:49:59 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1DKnxAd051342; Thu, 13 Feb 2014 20:49:59 GMT (envelope-from dru@svn.freebsd.org) Received: (from dru@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1DKnxgF051341; Thu, 13 Feb 2014 20:49:59 GMT (envelope-from dru@svn.freebsd.org) Message-Id: <201402132049.s1DKnxgF051341@svn.freebsd.org> From: Dru Lavigne Date: Thu, 13 Feb 2014 20:49:59 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r43904 - head/en_US.ISO8859-1/books/handbook/advanced-networking X-SVN-Group: doc-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the doc tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Feb 2014 20:49:59 -0000 Author: dru Date: Thu Feb 13 20:49:58 2014 New Revision: 43904 URL: http://svnweb.freebsd.org/changeset/doc/43904 Log: Finish editorial review of this chapter. Sponsored by: iXsystems Modified: head/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml Modified: head/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml ============================================================================== --- head/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml Thu Feb 13 20:09:42 2014 (r43903) +++ head/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml Thu Feb 13 20:49:58 2014 (r43904) @@ -3399,17 +3399,18 @@ BEGEMOT-BRIDGE-MIB::begemotBridgeDefault &os; provides the &man.lagg.4; interface which can be used to aggregate multiple - network interfaces into one virtual interface for the purpose of - providing fault tolerance and link aggregation. Link + network interfaces into one virtual interface in order to + provide failover and link aggregation. Failover allows traffic + to continue to flow even if an interface becomes available. Link aggregation works best on switches which support LACP, as this protocol distributes traffic bi-directionally while responding to the failure of individual links. - The operating modes supported by the lagg interface + The aggregation protocols supported by the lagg interface determine which ports are used for outgoing traffic and whether or not a specific port accepts incoming - traffic. The following operating modes are supported by + traffic. The following protocols are supported by &man.lagg.4;: @@ -3443,7 +3444,7 @@ BEGEMOT-BRIDGE-MIB::begemotBridgeDefault The &ieee; 802.3ad Link Aggregation Control Protocol (LACP) negotiates a set of - aggregable links with the peer in to one or more Link + aggregable links with the peer into one or more Link Aggregated Groups (LAGs). Each LAG is composed of ports of the same speed, set to full-duplex operation, and traffic @@ -3471,8 +3472,8 @@ BEGEMOT-BRIDGE-MIB::begemotBridgeDefault This mode distributes outgoing traffic using a round-robin scheduler through all active ports and accepts incoming - traffic from any active port. This mode violates - Ethernet frame ordering and should be used with + traffic from any active port. Since this mode violates + Ethernet frame ordering, it should be used with caution. @@ -3492,15 +3493,21 @@ BEGEMOT-BRIDGE-MIB::begemotBridgeDefault <acronym>LACP</acronym> Aggregation with a &cisco; Switch - This example connects two interfaces on a &os; machine - to the switch as a single load balanced and fault tolerant + This example connects two &man.fxp.4; Ethernet interfaces on a &os; machine + to the first two + Ethernet ports on a &cisco; switch as a single load balanced and fault tolerant link. More interfaces can be added to increase throughput - and fault tolerance. Frame ordering is mandatory on + and fault tolerance. Replace the names of the &cisco; ports, + Ethernet devices, channel group number, and + IP address shown in + the example to match the local configuration. + + Frame ordering is mandatory on Ethernet links and any traffic between two stations always flows over the same physical link, limiting the maximum speed to that of one interface. The transmit algorithm attempts to use as much information as it can to - distinguish different traffic flows and balance across the + distinguish different traffic flows and balance the flows across the available interfaces. On the &cisco; switch, add the @@ -3508,32 +3515,26 @@ BEGEMOT-BRIDGE-MIB::begemotBridgeDefault FastEthernet0/2 interfaces to channel group 1: - interface FastEthernet0/1 - channel-group 1 mode active + interface FastEthernet0/1 + channel-group 1 mode active channel-protocol lacp ! -interface FastEthernet0/2 - channel-group 1 mode active +interface FastEthernet0/2 + channel-group 1 mode active channel-protocol lacp On the &os; system, create the &man.lagg.4; interface using the physical interfaces fxp0 and - fxp1, and bring the interfaces up + fxp1 and bring the interfaces up with an IP address of 10.0.0.3/24: - &prompt.root; ifconfig fxp0 up -&prompt.root; ifconfig fxp1 up + &prompt.root; ifconfig fxp0 up +&prompt.root; ifconfig fxp1 up &prompt.root; ifconfig lagg0 create -&prompt.root; ifconfig lagg0 up laggproto lacp laggport fxp0 laggport fxp1 10.0.0.3/24 +&prompt.root; ifconfig lagg0 up laggproto lacp laggport fxp0 laggport fxp1 10.0.0.3/24 - Next, verify the status of the virtual interface. Ports - marked as ACTIVE are part of - the active aggregation group that has been negotiated with - the remote switch. Traffic will be transmitted and - received through active ports. Use the verbose output of - &man.ifconfig.8; to view the LAG - identifiers. + Next, verify the status of the virtual interface: &prompt.root; ifconfig lagg0 lagg0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> metric 0 mtu 1500 @@ -3545,6 +3546,14 @@ lagg0: flags=8843<UP,BROADCAST,RUNNIN laggport: fxp1 flags=1c<ACTIVE,COLLECTING,DISTRIBUTING> laggport: fxp0 flags=1c<ACTIVE,COLLECTING,DISTRIBUTING> + Ports + marked as ACTIVE are part of + the LAG that has been negotiated with + the remote switch. Traffic will be transmitted and + received through these active ports. Add + to the above command to view the LAG + identifiers. + To see the port status on the &cisco; switch: switch# show lacp neighbor @@ -3579,7 +3588,7 @@ ifconfig_lagg0="laggp Failover mode can be used to switch over to a secondary interface if the link is lost on the master interface. - To configure failover mode, make sure that the underlying + To configure failover, make sure that the underlying physical interfaces are up, then create the &man.lagg.4; interface. In this example, fxp0 is the master interface, fxp1 is @@ -3587,10 +3596,10 @@ ifconfig_lagg0="laggp address of 10.0.0.15/24: - &prompt.root; ifconfig fxp0 up -&prompt.root; ifconfig fxp1 up + &prompt.root; ifconfig fxp0 up +&prompt.root; ifconfig fxp1 up &prompt.root; ifconfig lagg0 create -&prompt.root; ifconfig lagg0 up laggproto failover laggport fxp0 laggport fxp1 10.0.0.15/24 +&prompt.root; ifconfig lagg0 up laggproto failover laggport fxp0 laggport fxp1 10.0.0.15/24 The virtual interface should look something like this: @@ -3624,7 +3633,7 @@ ifconfig_lagg0="laggp - Failover Mode Between Wired and Wireless + <title>Failover Mode Between Ethernet and Wireless Interfaces For laptop users, it is usually desirable to configure @@ -3636,7 +3645,7 @@ ifconfig_lagg0="laggp maintaining the ability to transfer data over the wireless connection. - This is achieved by overriding the underlying wireless + This is achieved by overriding the physical wireless interface's MAC address with that of the Ethernet interface. @@ -3667,21 +3676,21 @@ bge0: flags=8843<UP,BROADCAST,RUNNING MAC address of the underlying wireless interface: - &prompt.root; ifconfig iwn0 ether 00:21:70:da:ae:37 + &prompt.root; ifconfig iwn0 ether 00:21:70:da:ae:37 Bring the wireless interface up, but do not set an IP address: - &prompt.root; ifconfig wlan0 create wlandev iwn0 ssid my_router up + &prompt.root; ifconfig wlan0 create wlandev iwn0 ssid my_router up Make sure the bge0 interface is up, then create the &man.lagg.4; interface with bge0 as master with failover to wlan0: - &prompt.root; ifconfig bge0 up + &prompt.root; ifconfig bge0 up &prompt.root; ifconfig lagg0 create -&prompt.root; ifconfig lagg0 up laggproto failover laggport bge0 laggport wlan0 +&prompt.root; ifconfig lagg0 up laggproto failover laggport bge0 laggport wlan0 The virtual interface should look something like this: @@ -3704,12 +3713,12 @@ lagg0: flags=8843<UP,BROADCAST,RUNNIN following entries to /etc/rc.conf: - ifconfig_bge0="up" -ifconfig_iwn0="ether 00:21:70:da:ae:37" -wlans_iwn0="wlan0" + ifconfig_bge0="up" +ifconfig_iwn0="ether 00:21:70:da:ae:37" +wlans_iwn0="wlan0" ifconfig_wlan0="WPA" cloned_interfaces="lagg0" -ifconfig_lagg0="laggproto failover laggport bge0 laggport wlan0 DHCP" +ifconfig_lagg0="laggproto failover laggport bge0 laggport wlan0 DHCP" From owner-svn-doc-head@FreeBSD.ORG Thu Feb 13 21:03:02 2014 Return-Path: Delivered-To: svn-doc-head@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 ESMTPS id C641D5E6; Thu, 13 Feb 2014 21:03:02 +0000 (UTC) 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 B14BE13C1; Thu, 13 Feb 2014 21:03:02 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1DL32Ae058487; Thu, 13 Feb 2014 21:03:02 GMT (envelope-from dru@svn.freebsd.org) Received: (from dru@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1DL32Vp058486; Thu, 13 Feb 2014 21:03:02 GMT (envelope-from dru@svn.freebsd.org) Message-Id: <201402132103.s1DL32Vp058486@svn.freebsd.org> From: Dru Lavigne Date: Thu, 13 Feb 2014 21:03:02 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r43905 - head/en_US.ISO8859-1/books/handbook/advanced-networking X-SVN-Group: doc-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the doc tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Feb 2014 21:03:02 -0000 Author: dru Date: Thu Feb 13 21:03:02 2014 New Revision: 43905 URL: http://svnweb.freebsd.org/changeset/doc/43905 Log: White space fix only. Translators can ignore. Sponsored by: iXsystems Modified: head/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml Modified: head/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml ============================================================================== --- head/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml Thu Feb 13 20:49:58 2014 (r43904) +++ head/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml Thu Feb 13 21:03:02 2014 (r43905) @@ -3398,30 +3398,29 @@ BEGEMOT-BRIDGE-MIB::begemotBridgeDefault roundrobin &os; provides the &man.lagg.4; interface which can be used - to aggregate multiple - network interfaces into one virtual interface in order to - provide failover and link aggregation. Failover allows traffic - to continue to flow even if an interface becomes available. Link - aggregation works best on switches which support - LACP, as this protocol distributes traffic - bi-directionally while responding to the failure of individual - links. + to aggregate multiple network interfaces into one virtual + interface in order to provide failover and link aggregation. + Failover allows traffic to continue to flow even if an + interface becomes available. Link aggregation works best on + switches which support LACP, as this + protocol distributes traffic bi-directionally while responding + to the failure of individual links. The aggregation protocols supported by the lagg interface determine which ports are used for outgoing traffic and - whether or not a specific port accepts incoming - traffic. The following protocols are supported by - &man.lagg.4;: + whether or not a specific port accepts incoming traffic. The + following protocols are supported by &man.lagg.4;: failover - This mode sends and receives traffic only through the master - port. If the master port becomes unavailable, the next - active port is used. The first interface added to the virtual interface is the - master port and all subsequently added interfaces are used - as failover devices. If failover to a non-master port + This mode sends and receives traffic only through + the master port. If the master port becomes + unavailable, the next active port is used. The first + interface added to the virtual interface is the master + port and all subsequently added interfaces are used as + failover devices. If failover to a non-master port occurs, the original port becomes master once it becomes available again. @@ -3432,10 +3431,10 @@ BEGEMOT-BRIDGE-MIB::begemotBridgeDefault &cisco; Fast ðerchannel; (FEC) is found on older &cisco; switches. It provides a - static setup and does not negotiate aggregation - with the peer or exchange frames to monitor the link. - If the switch supports LACP, that - should be used instead. + static setup and does not negotiate aggregation with the + peer or exchange frames to monitor the link. If the + switch supports LACP, that should be + used instead. @@ -3446,13 +3445,13 @@ BEGEMOT-BRIDGE-MIB::begemotBridgeDefault (LACP) negotiates a set of aggregable links with the peer into one or more Link Aggregated Groups (LAGs). Each - LAG is composed of ports of the - same speed, set to full-duplex operation, and traffic - is balanced across the ports in the + LAG is composed of ports of the same + speed, set to full-duplex operation, and traffic is + balanced across the ports in the LAG with the greatest total speed. - Typically, there is only one - LAG which contains all the ports. In - the event of changes in physical connectivity, + Typically, there is only one LAG + which contains all the ports. In the event of changes + in physical connectivity, LACP will quickly converge to a new configuration. @@ -3461,27 +3460,27 @@ BEGEMOT-BRIDGE-MIB::begemotBridgeDefault information and accepts incoming traffic from any active port. The hash includes the Ethernet source and destination address and, if available, the - VLAN tag, and the IPv4 or - IPv6 source and destination - address. + VLAN tag, and the + IPv4 or IPv6 + source and destination address. roundrobin - This mode distributes outgoing traffic using a round-robin - scheduler through all active ports and accepts incoming - traffic from any active port. Since this mode violates - Ethernet frame ordering, it should be used with - caution. + This mode distributes outgoing traffic using a + round-robin scheduler through all active ports and + accepts incoming traffic from any active port. Since + this mode violates Ethernet frame ordering, it should be + used with caution. Configuration Examples - + This section demonstrates how to configure a &cisco; switch and a &os; system for LACP load balancing. It then shows how to configure two Ethernet @@ -3493,22 +3492,22 @@ BEGEMOT-BRIDGE-MIB::begemotBridgeDefault <acronym>LACP</acronym> Aggregation with a &cisco; Switch - This example connects two &man.fxp.4; Ethernet interfaces on a &os; machine - to the first two - Ethernet ports on a &cisco; switch as a single load balanced and fault tolerant - link. More interfaces can be added to increase throughput - and fault tolerance. Replace the names of the &cisco; ports, - Ethernet devices, channel group number, and - IP address shown in - the example to match the local configuration. - - Frame ordering is mandatory on - Ethernet links and any traffic between two stations always - flows over the same physical link, limiting the maximum - speed to that of one interface. The transmit algorithm - attempts to use as much information as it can to - distinguish different traffic flows and balance the flows across the - available interfaces. + This example connects two &man.fxp.4; Ethernet + interfaces on a &os; machine to the first two Ethernet ports + on a &cisco; switch as a single load balanced and fault + tolerant link. More interfaces can be added to increase + throughput and fault tolerance. Replace the names of the + &cisco; ports, Ethernet devices, channel group number, and + IP address shown in the example to match + the local configuration. + + Frame ordering is mandatory on Ethernet links and any + traffic between two stations always flows over the same + physical link, limiting the maximum speed to that of one + interface. The transmit algorithm attempts to use as much + information as it can to distinguish different traffic flows + and balance the flows across the available + interfaces. On the &cisco; switch, add the FastEthernet0/1 and @@ -3523,8 +3522,9 @@ BEGEMOT-BRIDGE-MIB::begemotBridgeDefault channel-group 1 mode active channel-protocol lacp - On the &os; system, create the &man.lagg.4; interface using - the physical interfaces fxp0 and + On the &os; system, create the &man.lagg.4; interface + using the physical interfaces + fxp0 and fxp1 and bring the interfaces up with an IP address of 10.0.0.3/24: @@ -3534,7 +3534,7 @@ BEGEMOT-BRIDGE-MIB::begemotBridgeDefault &prompt.root; ifconfig lagg0 create &prompt.root; ifconfig lagg0 up laggproto lacp laggport fxp0 laggport fxp1 10.0.0.3/24 - Next, verify the status of the virtual interface: + Next, verify the status of the virtual interface: &prompt.root; ifconfig lagg0 lagg0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> metric 0 mtu 1500 @@ -3547,11 +3547,11 @@ lagg0: flags=8843<UP,BROADCAST,RUNNIN laggport: fxp0 flags=1c<ACTIVE,COLLECTING,DISTRIBUTING> Ports - marked as ACTIVE are part of - the LAG that has been negotiated with - the remote switch. Traffic will be transmitted and - received through these active ports. Add - to the above command to view the LAG + marked as ACTIVE are part of the + LAG that has been negotiated with the + remote switch. Traffic will be transmitted and received + through these active ports. Add to the + above command to view the LAG identifiers. To see the port status on the &cisco; switch: @@ -3587,13 +3587,13 @@ ifconfig_lagg0="laggp Failover Mode Failover mode can be used to switch over to a secondary - interface if the link is lost on the master interface. - To configure failover, make sure that the underlying - physical interfaces are up, then create the &man.lagg.4; - interface. In this example, fxp0 is the - master interface, fxp1 is - the secondary interface, and the virtual interface is assigned an IP - address of + interface if the link is lost on the master interface. To + configure failover, make sure that the underlying physical + interfaces are up, then create the &man.lagg.4; interface. + In this example, fxp0 is the + master interface, fxp1 is the + secondary interface, and the virtual interface is assigned + an IP address of 10.0.0.15/24: &prompt.root; ifconfig fxp0 up @@ -3637,28 +3637,26 @@ ifconfig_lagg0="laggp Interfaces For laptop users, it is usually desirable to configure - the wireless device as a secondary which is only used - when the Ethernet connection is not available. With + the wireless device as a secondary which is only used when + the Ethernet connection is not available. With &man.lagg.4;, it is possible to configure a failover which - prefers the Ethernet connection - for both performance and security reasons, while - maintaining the ability to transfer data over the wireless - connection. + prefers the Ethernet connection for both performance and + security reasons, while maintaining the ability to transfer + data over the wireless connection. This is achieved by overriding the physical wireless - interface's MAC address with that - of the Ethernet - interface. + interface's MAC address with that of the + Ethernet interface. In this example, the Ethernet interface, bge0, is the master and the wireless interface, wlan0, is - the failover. The - wlan0 device was created from - iwn0 wireless interface, which will be configured - with the MAC address of the Ethernet interface. - First, determine the MAC - address of the Ethernet interface: + the failover. The wlan0 device + was created from iwn0 wireless + interface, which will be configured with the + MAC address of the Ethernet interface. + First, determine the MAC address of the + Ethernet interface: &prompt.root; ifconfig bge0 bge0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> metric 0 mtu 1500 @@ -3670,11 +3668,11 @@ bge0: flags=8843<UP,BROADCAST,RUNNING status: active Replace bge0 to match the - system's Ethernet interface name. The ether - line will contain the MAC address of - the specified interface. Now, change the - MAC address of the underlying wireless - interface: + system's Ethernet interface name. The + ether line will contain the + MAC address of the specified interface. + Now, change the MAC address of the + underlying wireless interface: &prompt.root; ifconfig iwn0 ether 00:21:70:da:ae:37 @@ -3683,8 +3681,8 @@ bge0: flags=8843<UP,BROADCAST,RUNNING &prompt.root; ifconfig wlan0 create wlandev iwn0 ssid my_router up - Make sure the bge0 interface is up, then - create the &man.lagg.4; interface with + Make sure the bge0 interface + is up, then create the &man.lagg.4; interface with bge0 as master with failover to wlan0: @@ -3692,7 +3690,8 @@ bge0: flags=8843<UP,BROADCAST,RUNNING &prompt.root; ifconfig lagg0 create &prompt.root; ifconfig lagg0 up laggproto failover laggport bge0 laggport wlan0 - The virtual interface should look something like this: + The virtual interface should look something like + this: &prompt.root; ifconfig lagg0 lagg0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> metric 0 mtu 1500 From owner-svn-doc-head@FreeBSD.ORG Thu Feb 13 22:11:28 2014 Return-Path: Delivered-To: svn-doc-head@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 ESMTPS id 278F8F26; Thu, 13 Feb 2014 22:11:28 +0000 (UTC) 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 1158619E9; Thu, 13 Feb 2014 22:11:28 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1DMBRJL085757; Thu, 13 Feb 2014 22:11:27 GMT (envelope-from wblock@svn.freebsd.org) Received: (from wblock@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1DMBR1p085755; Thu, 13 Feb 2014 22:11:27 GMT (envelope-from wblock@svn.freebsd.org) Message-Id: <201402132211.s1DMBR1p085755@svn.freebsd.org> From: Warren Block Date: Thu, 13 Feb 2014 22:11:27 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r43908 - head/share/xml X-SVN-Group: doc-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the doc tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Feb 2014 22:11:28 -0000 Author: wblock Date: Thu Feb 13 22:11:27 2014 New Revision: 43908 URL: http://svnweb.freebsd.org/changeset/doc/43908 Log: Add a manual page entity for poudriere. Fun fact: "poudriere" is French for "powder keg". Modified: head/share/xml/man-refs.ent Modified: head/share/xml/man-refs.ent ============================================================================== --- head/share/xml/man-refs.ent Thu Feb 13 22:01:54 2014 (r43907) +++ head/share/xml/man-refs.ent Thu Feb 13 22:11:27 2014 (r43908) @@ -4656,6 +4656,7 @@ portmap8"> portmaster8"> portsnap8"> +poudriere8"> powerd8"> poweroff8"> ppp8"> From owner-svn-doc-head@FreeBSD.ORG Thu Feb 13 22:45:32 2014 Return-Path: Delivered-To: svn-doc-head@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 ESMTPS id 27493CE5; Thu, 13 Feb 2014 22:45:32 +0000 (UTC) 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 0F9241C87; Thu, 13 Feb 2014 22:45:32 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1DMjWCX098383; Thu, 13 Feb 2014 22:45:32 GMT (envelope-from dru@svn.freebsd.org) Received: (from dru@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1DMjW1V098382; Thu, 13 Feb 2014 22:45:32 GMT (envelope-from dru@svn.freebsd.org) Message-Id: <201402132245.s1DMjW1V098382@svn.freebsd.org> From: Dru Lavigne Date: Thu, 13 Feb 2014 22:45:32 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r43909 - head/en_US.ISO8859-1/books/handbook/firewalls X-SVN-Group: doc-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the doc tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Feb 2014 22:45:32 -0000 Author: dru Date: Thu Feb 13 22:45:31 2014 New Revision: 43909 URL: http://svnweb.freebsd.org/changeset/doc/43909 Log: Start review of firewall chapter. Many more commits to follow. Sponsored by: iXsystems Modified: head/en_US.ISO8859-1/books/handbook/firewalls/chapter.xml Modified: head/en_US.ISO8859-1/books/handbook/firewalls/chapter.xml ============================================================================== --- head/en_US.ISO8859-1/books/handbook/firewalls/chapter.xml Thu Feb 13 22:11:27 2014 (r43908) +++ head/en_US.ISO8859-1/books/handbook/firewalls/chapter.xml Thu Feb 13 22:45:31 2014 (r43909) @@ -41,7 +41,7 @@ - Introduction + Synopsis Firewalls make it possible to filter the incoming and outgoing traffic that flows through a system. A firewall can @@ -77,6 +77,25 @@ + &os; has three firewalls built into the base system: + PF, IPFILTER, also known as + IPF, and + IPFW. + &os; also provides two traffic shapers for controlling bandwidth + usage: &man.altq.4; and &man.dummynet.4;. + ALTQ has + traditionally been closely tied with PF and + dummynet with IPFW. + Each + firewall uses rules to control the access of packets to and from + a &os; system, although they go about it in different ways and + each has a different rule syntax. + + &os; provides multiple firewalls in order to meet the + different requirements and preferences for a wide variety of + users. Each user should evaluate which firewall best meets + their needs. + After reading this chapter, you will know: @@ -112,6 +131,18 @@ Understand basic &os; and Internet concepts. + + + Since all firewalls are based on inspecting the values of + selected packet control fields, the creator of the firewall + ruleset must have an understanding of how + TCP/IP works, what the different values in + the packet control fields are, and how these values are used in + a normal session conversation. For a good introduction, refer + to + Daryl's + TCP/IP Primer. + @@ -156,37 +187,6 @@ combination of stateful and non-stateful behavior. - - Firewall Packages - - &os; has three firewalls built into the base system: - IPFILTER, also known as - IPF, IPFIREWALL, also - known as IPFW, and PF). - &os; also provides two traffic shapers for controlling bandwidth - usage: &man.altq.4; and &man.dummynet.4;. Dummynet has - traditionally been closely tied with IPFW, - and ALTQ with PF. Each - firewall uses rules to control the access of packets to and from - a &os; system, although they go about it in different ways and - each has a different rule syntax. - - &os; provides multiple firewalls in order to meet the - different requirements and preferences for a wide variety of - users. Each user should evaluate which firewall best meets - their needs. - - Since all firewalls are based on inspecting the values of - selected packet control fields, the creator of the firewall - ruleset must have an understanding of how - TCP/IP works, what the different values in - the packet control fields are, and how these values are used in - a normal session conversation. For a good introduction, refer - to - Daryl's - TCP/IP Primer. - - PF and <acronym>ALTQ</acronym> @@ -209,20 +209,20 @@ Since &os; 5.3, a ported version of OpenBSD's - PF firewall has been included as an - integrated part of the base system. PF is a + PF firewall has been included as an + integrated part of the base system. PF is a complete, full-featured firewall that has optional support for ALTQ (Alternate Queuing), which provides Quality of Service (QoS). Since the OpenBSD Project maintains the definitive - reference for PF in the + reference for PF in the PF FAQ, - this section of the Handbook focuses on PF as + this section of the Handbook focuses on PF as it pertains to &os;, while providing some general usage information. - More information about porting PF to &os; + More information about porting PF to &os; can be found at http://pf4freebsd.love2party.net/. @@ -252,7 +252,7 @@ can be found in /usr/share/examples/pf/. - The PF module can also be loaded + The PF module can also be loaded manually from the command line: &prompt.root; kldload pf.ko @@ -286,17 +286,17 @@ device pfsync - While it is not necessary to compile PF + While it is not necessary to compile PF support into the &os; kernel, some of PF's advanced features are not included in the loadable module, namely &man.pfsync.4;, which is a pseudo-device that exposes certain - changes to the state table used by PF. It + changes to the state table used by PF. It can be paired with &man.carp.4; to create failover firewalls - using PF. More information on + using PF. More information on CARP can be found in of the Handbook. - The following PF kernel options can be + The following PF kernel options can be found in /usr/src/sys/conf/NOTES: device pf @@ -320,7 +320,7 @@ device pfsync Available <filename>rc.conf</filename> Options The following &man.rc.conf.5; statements can be used to - configure PF and &man.pflog.4; at + configure PF and &man.pflog.4; at boot: pf_enable="YES" # Enable PF (load module if required) @@ -340,14 +340,14 @@ pflog_flags="" # additi Creating Filtering Rules - By default, PF reads its configuration + By default, PF reads its configuration rules from /etc/pf.conf and modifies, drops, or passes packets according to the rules or definitions specified in this file. The &os; installation includes several sample files located in /usr/share/examples/pf/. Refer to the PF - FAQ for complete coverage of PF + FAQ for complete coverage of PF rulesets. @@ -356,18 +356,18 @@ pflog_flags="" # additi keep in mind that different versions of &os; contain different versions of PF. Currently, &os; 8.X is using the same - version of PF as OpenBSD 4.1. + version of PF as OpenBSD 4.1. &os; 9.X and later is using - the same version of PF as + the same version of PF as OpenBSD 4.5. The &a.pf; is a good place to ask questions about - configuring and running the PF firewall. + configuring and running the PF firewall. Do not forget to check the mailing list archives before asking questions. - To control PF, use &man.pfctl.8;. + To control PF, use &man.pfctl.8;. Below are some useful options to this command. Review &man.pfctl.8; for a description of all available options: @@ -482,7 +482,7 @@ options ALTQ_NOPCC # Requir - <acronym>PF</acronym> Rule Sets and Tools + <application>PF</application> Rule Sets and Tools @@ -497,7 +497,7 @@ options ALTQ_NOPCC # Requir This section demonstrates some useful - PF features and PF + PF features and PF related tools in a series of examples. A more thorough tutorial is available at http://home.nuug.no/~peter/pf/. @@ -546,7 +546,7 @@ pass out all keep state Six Dumbest Ideas in Computer Security, and it is well written too.. This gives us the opportunity to introduce two of the features which - make PF such a wonderful tool: + make PF such a wonderful tool: lists and macros. @@ -563,7 +563,7 @@ udp_services = "{ domain }"Now we have demonstrated several things at once - what macros look like, that macros may be lists, and that - PF understands rules using port names + PF understands rules using port names equally well as it does port numbers. The names are the ones listed in /etc/services. This gives us something to put in our rules, which we edit @@ -574,7 +574,7 @@ pass out proto tcp to any port $tcp_serv pass proto udp to any port $udp_services keep state At this point some of us will point out that UDP is - stateless, but PF actually manages to + stateless, but PF actually manages to maintain state information despite this. Keeping state for a UDP connection means that for example when you ask a name server about a domain name, you will be able to receive its @@ -602,7 +602,7 @@ pass proto udp to any port $udp_services only, but does not load them. This provides an opportunity to correct any errors. Under any circumstances, the last valid rule set loaded will be in force until - PF is disabled or a new rule set is + PF is disabled or a new rule set is loaded. @@ -623,7 +623,7 @@ pass proto udp to any port $udp_services To most users, a single machine setup will be of limited interest, and at this point we move on to more realistic or at least more common setups, concentrating on a machine - which is running PF and also acts as a + which is running PF and also acts as a gateway for at least one other machine. @@ -851,7 +851,7 @@ pass from { lo0, $localnet } to any keep relationships between the rules in a rule set. The rules are evaluated from top to bottom, in the sequence they are written in the configuration file. For each packet or - connection evaluated by PF, + connection evaluated by PF, the last matching rule in the rule set is the one which is applied. The quick keyword offers an escape from the @@ -928,7 +928,7 @@ pass from { lo0, $localnet } to any keep gateway is amazingly simple, thanks to the FTP proxy program (called &man.ftp-proxy.8;) included in the base system on &os; and - other systems which offer PF. + other systems which offer PF. The FTP protocol being what it is, the proxy needs to dynamically insert rules in your rule @@ -944,7 +944,7 @@ pass from { lo0, $localnet } to any keep Starting the proxy manually by running /usr/sbin/ftp-proxy allows testing of - the PF configuration changes we are + the PF configuration changes we are about to make. For a basic configuration, only three elements need to @@ -1006,7 +1006,7 @@ rdr-anchor "ftp-proxy/*" For ways to run an FTP server - protected by PF and &man.ftp-proxy.8;, + protected by PF and &man.ftp-proxy.8;, look into running a separate ftp-proxy in reverse mode (using ), on a separate port with its own redirecting pass rule. @@ -1099,7 +1099,7 @@ pass inet proto icmp from any to $ext_if Stopping probes at the gateway might be an attractive option anyway, but let us have a look at a few other - options which will show some of PF's + options which will show some of PF's flexibility. @@ -1166,7 +1166,7 @@ pass out on $ext_if inet proto udp from places from http://marc.theaimsgroup.com/), to be a very valuable resource whenever you need OpenBSD - or PF related information. + or PF related information. @@ -1207,7 +1207,7 @@ pass out on $ext_if inet proto udp from pass inet proto icmp all icmp-type $icmp_types keep state - PF allows filtering on all + PF allows filtering on all variations of ICMP types and codes. For those who want to delve into what to pass (or not) of ICMP traffic, the list of possible @@ -1235,7 +1235,7 @@ pass out on $ext_if inet proto udp from and rigid. There will after all be some kinds of data which are relevant to filtering and redirection at a given time, but do not deserve to be put into a configuration file! - Quite right, and PF offers mechanisms for + Quite right, and PF offers mechanisms for handling these situations as well. Tables are one such feature, mainly useful as lists which can be manipulated without needing to reload the entire rule set, and where @@ -1323,7 +1323,7 @@ Sep 26 03:12:44 skapet sshd[24703]: Fail 22222 for a repeat performance. Since OpenBSD 3.7, and soon after in &os; version 6.0, - PF has offered a slightly more elegant + PF has offered a slightly more elegant solution. Pass rules can be written so they maintain certain limits on what connecting hosts can do. For good measure, violators can be banished to a table of addresses @@ -1488,10 +1488,10 @@ Sep 26 03:12:44 skapet sshd[24703]: Fail - Other <acronym>PF</acronym> Tools + Other <application>PF</application> Tools Over time, a number of tools have been developed which - interact with PF in various ways. + interact with PF in various ways. The <application>pftop</application> Traffic @@ -1514,11 +1514,11 @@ Sep 26 03:12:44 skapet sshd[24703]: Fail <para>Not to be confused with the <application>spamd</application> daemon which comes bundled with <application>spamassassin</application>, the - <acronym>PF</acronym> companion + <application>PF</application> companion <application>spamd</application> was designed to run on a PF gateway to form part of the outer defense against spam. <application>spamd</application> hooks into the - <acronym>PF</acronym> configuration via a set of + <application>PF</application> configuration via a set of redirections.</para> <para>The main point underlying the @@ -1819,7 +1819,7 @@ rdr pass on $ext_if inet proto tcp from can be set in the <literal>options</literal> part of the ruleset, which precedes the redirection and filtering rules. This option determines which feedback, if any, - <acronym>PF</acronym> will give to hosts which try to + <application>PF</application> will give to hosts which try to create connections which are subsequently blocked. The option has two possible values, <literal>drop</literal>, which drops blocked packets with no feedback, and @@ -1838,7 +1838,7 @@ rdr pass on $ext_if inet proto tcp from <sect5 xml:id="pftut-scrub"> <title><literal>scrub</literal> - In PF versions up to OpenBSD 4.5 + In PF versions up to OpenBSD 4.5 inclusive, scrub is a keyword which enables network packet normalization, causing fragmented packets to be assembled and removing ambiguity. @@ -1853,7 +1853,7 @@ rdr pass on $ext_if inet proto tcp from Some services, such as NFS, require some specific fragment handling options. This is extensively - documented in the PF user guide and + documented in the PF user guide and man pages provide all the information you could need. From owner-svn-doc-head@FreeBSD.ORG Thu Feb 13 23:01:33 2014 Return-Path: Delivered-To: svn-doc-head@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 ESMTPS id 0D6DB313; Thu, 13 Feb 2014 23:01:33 +0000 (UTC) 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 E983B1DEA; Thu, 13 Feb 2014 23:01:32 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1DN1WwN006098; Thu, 13 Feb 2014 23:01:32 GMT (envelope-from dru@svn.freebsd.org) Received: (from dru@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1DN1WUr006097; Thu, 13 Feb 2014 23:01:32 GMT (envelope-from dru@svn.freebsd.org) Message-Id: <201402132301.s1DN1WUr006097@svn.freebsd.org> From: Dru Lavigne Date: Thu, 13 Feb 2014 23:01:32 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r43912 - head/en_US.ISO8859-1/books/handbook/firewalls X-SVN-Group: doc-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the doc tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Feb 2014 23:01:33 -0000 Author: dru Date: Thu Feb 13 23:01:32 2014 New Revision: 43912 URL: http://svnweb.freebsd.org/changeset/doc/43912 Log: White space fix only. Translators can ignore. Sponsored by: iXsystems Modified: head/en_US.ISO8859-1/books/handbook/firewalls/chapter.xml Modified: head/en_US.ISO8859-1/books/handbook/firewalls/chapter.xml ============================================================================== --- head/en_US.ISO8859-1/books/handbook/firewalls/chapter.xml Thu Feb 13 22:58:18 2014 (r43911) +++ head/en_US.ISO8859-1/books/handbook/firewalls/chapter.xml Thu Feb 13 23:01:32 2014 (r43912) @@ -78,24 +78,26 @@ &os; has three firewalls built into the base system: - PF, IPFILTER, also known as + PF, + IPFILTER, also known as IPF, and IPFW. &os; also provides two traffic shapers for controlling bandwidth usage: &man.altq.4; and &man.dummynet.4;. ALTQ has - traditionally been closely tied with PF and - dummynet with IPFW. - Each - firewall uses rules to control the access of packets to and from - a &os; system, although they go about it in different ways and - each has a different rule syntax. + traditionally been closely tied with + PF and + dummynet with + IPFW. Each firewall uses rules to + control the access of packets to and from a &os; system, + although they go about it in different ways and each has a + different rule syntax. &os; provides multiple firewalls in order to meet the different requirements and preferences for a wide variety of users. Each user should evaluate which firewall best meets their needs. - + After reading this chapter, you will know: @@ -133,15 +135,15 @@ - Since all firewalls are based on inspecting the values of - selected packet control fields, the creator of the firewall - ruleset must have an understanding of how - TCP/IP works, what the different values in - the packet control fields are, and how these values are used in - a normal session conversation. For a good introduction, refer - to - Daryl's - TCP/IP Primer. + Since all firewalls are based on inspecting the values of + selected packet control fields, the creator of the firewall + ruleset must have an understanding of how + TCP/IP works, what the different values in + the packet control fields are, and how these values are used + in a normal session conversation. For a good introduction, + refer to Daryl's + TCP/IP Primer. @@ -210,20 +212,21 @@ Since &os; 5.3, a ported version of OpenBSD's PF firewall has been included as an - integrated part of the base system. PF is a - complete, full-featured firewall that has optional support for + integrated part of the base system. + PF is a complete, full-featured + firewall that has optional support for ALTQ (Alternate Queuing), which provides Quality of Service (QoS). Since the OpenBSD Project maintains the definitive - reference for PF in the - PF FAQ, - this section of the Handbook focuses on PF as - it pertains to &os;, while providing some general usage - information. + reference for PF in the PF FAQ, + this section of the Handbook focuses on + PF as it pertains to &os;, while + providing some general usage information. - More information about porting PF to &os; - can be found at More information about porting PF + to &os; can be found at http://pf4freebsd.love2party.net/. @@ -252,8 +255,8 @@ can be found in /usr/share/examples/pf/. - The PF module can also be loaded - manually from the command line: + The PF module can also be + loaded manually from the command line: &prompt.root; kldload pf.ko @@ -286,18 +289,20 @@ device pfsync - While it is not necessary to compile PF - support into the &os; kernel, some of PF's advanced features - are not included in the loadable module, namely - &man.pfsync.4;, which is a pseudo-device that exposes certain - changes to the state table used by PF. It - can be paired with &man.carp.4; to create failover firewalls - using PF. More information on - CARP can be found in - of the Handbook. + While it is not necessary to compile + PF support into the &os; kernel, + some of PF's advanced features are not included in the + loadable module, namely &man.pfsync.4;, which is a + pseudo-device that exposes certain changes to the state table + used by PF. It can be paired with + &man.carp.4; to create failover firewalls using + PF. More information on + CARP can be found in of the Handbook. - The following PF kernel options can be - found in /usr/src/sys/conf/NOTES: + The following PF kernel options + can be found in + /usr/src/sys/conf/NOTES: device pf device pflog @@ -340,15 +345,15 @@ pflog_flags="" # additi Creating Filtering Rules - By default, PF reads its configuration - rules from /etc/pf.conf and modifies, - drops, or passes packets according to the rules or definitions - specified in this file. The &os; installation includes - several sample files located in + By default, PF reads its + configuration rules from /etc/pf.conf and + modifies, drops, or passes packets according to the rules or + definitions specified in this file. The &os; installation + includes several sample files located in /usr/share/examples/pf/. Refer to the PF - FAQ for complete coverage of PF - rulesets. + FAQ for complete coverage of + PF rulesets. When reading the X is using the same - version of PF as OpenBSD 4.1. - &os; 9.X and later is using - the same version of PF as - OpenBSD 4.5. + version of PF + OpenBSD 4.1. &os; 9.X + and later is using the same version of + PF as OpenBSD 4.5. The &a.pf; is a good place to ask questions about - configuring and running the PF firewall. - Do not forget to check the mailing list archives before asking - questions. - - To control PF, use &man.pfctl.8;. - Below are some useful options to this command. Review - &man.pfctl.8; for a description of all available + configuring and running the PF + firewall. Do not forget to check the mailing list archives + before asking questions. + + To control PF, use + &man.pfctl.8;. Below are some useful options to this command. + Review &man.pfctl.8; for a description of all available options: @@ -482,7 +487,8 @@ options ALTQ_NOPCC # Requir - <application>PF</application> Rule Sets and Tools + <application>PF</application> Rule Sets and + Tools @@ -497,9 +503,9 @@ options ALTQ_NOPCC # Requir This section demonstrates some useful - PF features and PF - related tools in a series of examples. A more thorough - tutorial is available at PF features and + PF related tools in a series of + examples. A more thorough tutorial is available at http://home.nuug.no/~peter/pf/. @@ -563,9 +569,9 @@ udp_services = "{ domain }"Now we have demonstrated several things at once - what macros look like, that macros may be lists, and that - PF understands rules using port names - equally well as it does port numbers. The names are the - ones listed in /etc/services. This + PF understands rules using port + names equally well as it does port numbers. The names are + the ones listed in /etc/services. This gives us something to put in our rules, which we edit slightly to look like this: @@ -574,11 +580,11 @@ pass out proto tcp to any port $tcp_serv pass proto udp to any port $udp_services keep state At this point some of us will point out that UDP is - stateless, but PF actually manages to - maintain state information despite this. Keeping state for - a UDP connection means that for example when you ask a name - server about a domain name, you will be able to receive its - answer. + stateless, but PF actually + manages to maintain state information despite this. Keeping + state for a UDP connection means that for example when you + ask a name server about a domain name, you will be able to + receive its answer. Since we have made changes to our pf.conf, we load the new @@ -602,8 +608,8 @@ pass proto udp to any port $udp_services only, but does not load them. This provides an opportunity to correct any errors. Under any circumstances, the last valid rule set loaded will be in force until - PF is disabled or a new rule set is - loaded. + PF is disabled or a new rule set + is loaded. Use <command>pfctl -v</command> to Show the Parsed @@ -623,8 +629,8 @@ pass proto udp to any port $udp_services <para>To most users, a single machine setup will be of limited interest, and at this point we move on to more realistic or at least more common setups, concentrating on a machine - which is running <application>PF</application> and also acts as a - gateway for at least one other machine.</para> + which is running <application>PF</application> and also acts + as a gateway for at least one other machine.</para> <sect4 xml:id="pftut-gwpitfalls"> <title>Gateways and the Pitfalls of <literal>in</literal>, @@ -928,7 +934,8 @@ pass from { lo0, $localnet } to any keep gateway is amazingly simple, thanks to the <acronym>FTP</acronym> proxy program (called &man.ftp-proxy.8;) included in the base system on &os; and - other systems which offer <application>PF</application>.</para> + other systems which offer + <application>PF</application>.</para> <para>The <acronym>FTP</acronym> protocol being what it is, the proxy needs to dynamically insert rules in your rule @@ -944,8 +951,8 @@ pass from { lo0, $localnet } to any keep <para>Starting the proxy manually by running <command>/usr/sbin/ftp-proxy</command> allows testing of - the <application>PF</application> configuration changes we are - about to make.</para> + the <application>PF</application> configuration changes we + are about to make.</para> <para>For a basic configuration, only three elements need to be added to <filename>/etc/pf.conf</filename>. First, the @@ -1006,10 +1013,11 @@ rdr-anchor "ftp-proxy/*"</programlisting page.</para> <para>For ways to run an <acronym>FTP</acronym> server - protected by <application>PF</application> and &man.ftp-proxy.8;, - look into running a separate <command>ftp-proxy</command> - in reverse mode (using <option>-R</option>), on a separate - port with its own redirecting pass rule.</para> + protected by <application>PF</application> and + &man.ftp-proxy.8;, look into running a separate + <command>ftp-proxy</command> in reverse mode (using + <option>-R</option>), on a separate port with its own + redirecting pass rule.</para> </sect4> </sect3> @@ -1099,8 +1107,8 @@ pass inet proto icmp from any to $ext_if <para>Stopping probes at the gateway might be an attractive option anyway, but let us have a look at a few other - options which will show some of <application>PF</application>'s - flexibility.</para> + options which will show some of + <application>PF</application>'s flexibility.</para> </sect4> <sect4 xml:id="pftut-letpingthru"> @@ -1166,7 +1174,8 @@ pass out on $ext_if inet proto udp from places from <link xlink:href="http://marc.theaimsgroup.com/">http://marc.theaimsgroup.com/</link>), to be a very valuable resource whenever you need OpenBSD - or <application>PF</application> related information.</para> + or <application>PF</application> related + information.</para> </sect4> <sect4 xml:id="pftut-pathmtudisc"> @@ -1235,12 +1244,13 @@ pass out on $ext_if inet proto udp from and rigid. There will after all be some kinds of data which are relevant to filtering and redirection at a given time, but do not deserve to be put into a configuration file! - Quite right, and <application>PF</application> offers mechanisms for - handling these situations as well. Tables are one such - feature, mainly useful as lists which can be manipulated - without needing to reload the entire rule set, and where - fast lookups are desirable. Table names are always enclosed - in <literal>< ></literal>, like this:</para> + Quite right, and <application>PF</application> offers + mechanisms for handling these situations as well. Tables + are one such feature, mainly useful as lists which can be + manipulated without needing to reload the entire rule set, + and where fast lookups are desirable. Table names are + always enclosed in <literal>< ></literal>, like + this:</para> <programlisting>table <clients> { 192.168.2.0/24, !192.168.2.5 }</programlisting> @@ -1323,13 +1333,14 @@ Sep 26 03:12:44 skapet sshd[24703]: Fail 22222 for a repeat performance.</para> <para>Since OpenBSD 3.7, and soon after in &os; version 6.0, - <application>PF</application> has offered a slightly more elegant - solution. Pass rules can be written so they maintain - certain limits on what connecting hosts can do. For good - measure, violators can be banished to a table of addresses - which are denied some or all access. If desired, it is even - possible to drop all existing connections from machines - which overreach the limits. Here is how it is done:</para> + <application>PF</application> has offered a slightly more + elegant solution. Pass rules can be written so they + maintain certain limits on what connecting hosts can do. + For good measure, violators can be banished to a table of + addresses which are denied some or all access. If desired, + it is even possible to drop all existing connections from + machines which overreach the limits. Here is how it is + done:</para> <para>First, set up the table. In the tables section, add</para> @@ -1491,7 +1502,8 @@ Sep 26 03:12:44 skapet sshd[24703]: Fail <title>Other <application>PF</application> Tools Over time, a number of tools have been developed which - interact with PF in various ways. + interact with PF in various + ways. The <application>pftop</application> Traffic @@ -1819,13 +1831,14 @@ rdr pass on $ext_if inet proto tcp from can be set in the <literal>options</literal> part of the ruleset, which precedes the redirection and filtering rules. This option determines which feedback, if any, - <application>PF</application> will give to hosts which try to - create connections which are subsequently blocked. The - option has two possible values, <literal>drop</literal>, - which drops blocked packets with no feedback, and - <literal>return</literal>, which returns with status - codes such as <computeroutput>Connection - refused</computeroutput> or similar.</para> + <application>PF</application> will give to hosts which + try to create connections which are subsequently + blocked. The option has two possible values, + <literal>drop</literal>, which drops blocked packets + with no feedback, and <literal>return</literal>, which + returns with status codes such as + <computeroutput>Connection refused</computeroutput> or + similar.</para> <para>The correct strategy for block policies has been the subject of rather a lot of discussion. We choose to @@ -1838,24 +1851,24 @@ rdr pass on $ext_if inet proto tcp from <sect5 xml:id="pftut-scrub"> <title><literal>scrub</literal> - In PF versions up to OpenBSD 4.5 - inclusive, scrub is a keyword which - enables network packet normalization, causing fragmented - packets to be assembled and removing ambiguity. - Enabling scrub provides a measure of - protection against certain kinds of attacks based on - incorrect handling of packet fragments. A number of - supplementing options are available, but we choose the - simplest form which is suitable for most + In PF versions up to + OpenBSD 4.5 inclusive, scrub is a + keyword which enables network packet normalization, + causing fragmented packets to be assembled and removing + ambiguity. Enabling scrub provides a + measure of protection against certain kinds of attacks + based on incorrect handling of packet fragments. A + number of supplementing options are available, but we + choose the simplest form which is suitable for most configurations. scrub in all Some services, such as NFS, require some specific fragment handling options. This is extensively - documented in the PF user guide and - man pages provide all the information you could - need. + documented in the PF user + guide and man pages provide all the information you + could need. One fairly common example is this, From owner-svn-doc-head@FreeBSD.ORG Thu Feb 13 23:55:25 2014 Return-Path: Delivered-To: svn-doc-head@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 ESMTPS id 971162C3; Thu, 13 Feb 2014 23:55:25 +0000 (UTC) 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 7E7A11343; Thu, 13 Feb 2014 23:55:25 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1DNtPjE025679; Thu, 13 Feb 2014 23:55:25 GMT (envelope-from dru@svn.freebsd.org) Received: (from dru@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1DNtPjt025678; Thu, 13 Feb 2014 23:55:25 GMT (envelope-from dru@svn.freebsd.org) Message-Id: <201402132355.s1DNtPjt025678@svn.freebsd.org> From: Dru Lavigne Date: Thu, 13 Feb 2014 23:55:25 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r43914 - head/en_US.ISO8859-1/books/handbook/firewalls X-SVN-Group: doc-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the doc tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Feb 2014 23:55:25 -0000 Author: dru Date: Thu Feb 13 23:55:24 2014 New Revision: 43914 URL: http://svnweb.freebsd.org/changeset/doc/43914 Log: Shuffle the first part of this chapter to improve its readability. Many more commits to come. Sponsored by: iXsystems Modified: head/en_US.ISO8859-1/books/handbook/firewalls/chapter.xml Modified: head/en_US.ISO8859-1/books/handbook/firewalls/chapter.xml ============================================================================== --- head/en_US.ISO8859-1/books/handbook/firewalls/chapter.xml Thu Feb 13 23:21:17 2014 (r43913) +++ head/en_US.ISO8859-1/books/handbook/firewalls/chapter.xml Thu Feb 13 23:55:24 2014 (r43914) @@ -215,7 +215,7 @@ integrated part of the base system. PF is a complete, full-featured firewall that has optional support for - ALTQ (Alternate Queuing), which provides + ALTQ (Alternate Queuing), which provides Quality of Service (QoS). Since the OpenBSD Project maintains the definitive @@ -230,21 +230,25 @@ xlink:href="http://pf4freebsd.love2party.net/">http://pf4freebsd.love2party.net/. - Using the PF Loadable Kernel Modules + Enabling <application>PF</application> - In order to use PF, the PF kernel module must be first + In order to use PF, its module must be first loaded. Add the following line to /etc/rc.conf: pf_enable="YES" - Then, run the startup script to load the module: - - &prompt.root; service pf start - - The PF module will not load if it cannot find the - ruleset configuration file. The default location is - /etc/pf.conf. If the PF ruleset is + Additional options can be passed to + PF when it is started. Refer to + &man.pfctl.8; for the available options and specify any + required flags by + adding another entry to /etc/rc.conf: + + pf_flags="" # additional flags for pfctl startup + + The module will not load if it cannot find the + ruleset configuration file. A default ruleset is located + /etc/pf.conf. If a custom ruleset is located somewhere else, add a line to /etc/rc.conf which specifies the full path to the file: @@ -253,26 +257,34 @@ The sample pf.conf can be found in - /usr/share/examples/pf/. - - The PF module can also be - loaded manually from the command line: - - &prompt.root; kldload pf.ko + /usr/share/examples/pf/. The rest of + this chapter demonstrates how to create a custom ruleset. + + Then, run the startup script to load the module: - Logging support for PF is provided by - pflog.ko which can be loaded by adding the + &prompt.root; service pf start + Logging support for PF is provided by + &man.pflog.4; which can be loaded by adding the following line to /etc/rc.conf: pflog_enable="YES" - Then, run the startup script to load the module: + The following &man.rc.conf.5; statements can also be used to + change the default location of the log file or to specify any + additional flags: + + pflog_logfile="/var/log/pflog" # where pflogd should store the logfile +pflog_flags="" # additional flags for pflogd startup + + Save the edits, then run the startup script to load the logging module: &prompt.root; service pflog start - - - PF Kernel Options + If there is a LAN behind the firewall and packets need to + be forwarded for the computers on the LAN, or NAT is required, + add the following option: + + gateway_enable="YES" # Enable as LAN gateway kernel options @@ -289,6 +301,7 @@ device pfsync + While it is not necessary to compile PF support into the &os; kernel, some of PF's advanced features are not included in the @@ -297,12 +310,10 @@ used by PF. It can be paired with &man.carp.4; to create failover firewalls using PF. More information on - CARP can be found in of the Handbook. + CARP can be found in . The following PF kernel options - can be found in - /usr/src/sys/conf/NOTES: + are available: device pf device pflog @@ -319,27 +330,7 @@ device pfsync device pfsync enables the optional &man.pfsync.4; pseudo-network device that is used to monitor state changes. - - - - Available <filename>rc.conf</filename> Options - - The following &man.rc.conf.5; statements can be used to - configure PF and &man.pflog.4; at - boot: - - pf_enable="YES" # Enable PF (load module if required) -pf_rules="/etc/pf.conf" # rules definition file for pf -pf_flags="" # additional flags for pfctl startup -pflog_enable="YES" # start pflogd(8) -pflog_logfile="/var/log/pflog" # where pflogd should store the logfile -pflog_flags="" # additional flags for pflogd startup - - If there is a LAN behind the firewall and packets need to - be forwarded for the computers on the LAN, or NAT is required, - add the following option: - - gateway_enable="YES" # Enable as LAN gateway + From owner-svn-doc-head@FreeBSD.ORG Fri Feb 14 00:15:36 2014 Return-Path: Delivered-To: svn-doc-head@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 ESMTPS id D42979DB; Fri, 14 Feb 2014 00:15:36 +0000 (UTC) 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 BE4D61542; Fri, 14 Feb 2014 00:15:36 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1E0FaJK034767; Fri, 14 Feb 2014 00:15:36 GMT (envelope-from lioux@svn.freebsd.org) Received: (from lioux@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1E0Fa2A034766; Fri, 14 Feb 2014 00:15:36 GMT (envelope-from lioux@svn.freebsd.org) Message-Id: <201402140015.s1E0Fa2A034766@svn.freebsd.org> From: Mario Sergio Fujikawa Ferreira Date: Fri, 14 Feb 2014 00:15:36 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r43915 - head/share/pgpkeys X-SVN-Group: doc-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the doc tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Feb 2014 00:15:37 -0000 Author: lioux (ports committer) Date: Fri Feb 14 00:15:36 2014 New Revision: 43915 URL: http://svnweb.freebsd.org/changeset/doc/43915 Log: Update with new key. Modified: head/share/pgpkeys/lioux.key Modified: head/share/pgpkeys/lioux.key ============================================================================== --- head/share/pgpkeys/lioux.key Thu Feb 13 23:55:24 2014 (r43914) +++ head/share/pgpkeys/lioux.key Fri Feb 14 00:15:36 2014 (r43915) @@ -1,56 +1,140 @@ -uid Mario Sergio Fujikawa Ferreira -sub 4096g/BB7D80F2 2006-02-23 [expires: 2007-02-23] +pub 4096R/B43B673FDAE448D1 2014-02-13 [expires: 2019-02-12] + Key fingerprint = 0617 5DB3 8B1A C326 A542 3B3C B43B 673F DAE4 48D1 +uid Mario Sergio Fujikawa Ferreira (lioux) +sub 4096R/D780173751E6FF87 2014-02-13 [expires: 2019-02-12] +sub 3072D/BB0B0361BC87D308 2014-02-13 [expires: 2015-02-13] +sub 4096g/C90A229CFE1F29B0 2014-02-13 [expires: 2015-02-13] + ]]> From owner-svn-doc-head@FreeBSD.ORG Fri Feb 14 01:30:44 2014 Return-Path: Delivered-To: svn-doc-head@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 ESMTPS id 36F55996; Fri, 14 Feb 2014 01:30:44 +0000 (UTC) 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 14A1E1A32; Fri, 14 Feb 2014 01:30:44 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1E1Uh5u062469; Fri, 14 Feb 2014 01:30:43 GMT (envelope-from dru@svn.freebsd.org) Received: (from dru@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1E1UhWt062468; Fri, 14 Feb 2014 01:30:43 GMT (envelope-from dru@svn.freebsd.org) Message-Id: <201402140130.s1E1UhWt062468@svn.freebsd.org> From: Dru Lavigne Date: Fri, 14 Feb 2014 01:30:43 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r43916 - head/en_US.ISO8859-1/books/handbook/firewalls X-SVN-Group: doc-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the doc tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Feb 2014 01:30:44 -0000 Author: dru Date: Fri Feb 14 01:30:43 2014 New Revision: 43916 URL: http://svnweb.freebsd.org/changeset/doc/43916 Log: Finish subsection on enabling PF. Comment out pfsync section for now as it is no longer true. At some point a section should be adding demonstrating how to use it. Sponsored by: iXsystems Modified: head/en_US.ISO8859-1/books/handbook/firewalls/chapter.xml Modified: head/en_US.ISO8859-1/books/handbook/firewalls/chapter.xml ============================================================================== --- head/en_US.ISO8859-1/books/handbook/firewalls/chapter.xml Fri Feb 14 00:15:36 2014 (r43915) +++ head/en_US.ISO8859-1/books/handbook/firewalls/chapter.xml Fri Feb 14 01:30:43 2014 (r43916) @@ -232,24 +232,27 @@ Enabling <application>PF</application> - In order to use PF, its module must be first - loaded. Add the following line to + In order to use PF, its kernel module must be first + loaded. This section describes the entries that can be added + to /etc/rc.conf in order to enable + PF. + + Start by adding the following line to /etc/rc.conf: pf_enable="YES" - Additional options can be passed to - PF when it is started. Refer to - &man.pfctl.8; for the available options and specify any - required flags by - adding another entry to /etc/rc.conf: + Additional options, described in &man.pfctl.8;, can be passed to + PF when it is started. Add this entry to + /etc/rc.conf and specify any + required flags between the two quotes (""): pf_flags="" # additional flags for pfctl startup - The module will not load if it cannot find the - ruleset configuration file. A default ruleset is located - /etc/pf.conf. If a custom ruleset is - located somewhere else, add a line to + PF will not start if it cannot find its + ruleset configuration file. The default ruleset is already created and is named + /etc/pf.conf. If a custom ruleset has + been saved somewhere else, add a line to /etc/rc.conf which specifies the full path to the file: @@ -260,33 +263,35 @@ /usr/share/examples/pf/. The rest of this chapter demonstrates how to create a custom ruleset. - Then, run the startup script to load the module: - - &prompt.root; service pf start Logging support for PF is provided by - &man.pflog.4; which can be loaded by adding the - following line to /etc/rc.conf: + &man.pflog.4;. To enable logging support, add this + line to /etc/rc.conf: pflog_enable="YES" - The following &man.rc.conf.5; statements can also be used to + The following lines can also be added in order to change the default location of the log file or to specify any - additional flags: + additional flags to pass to &man.pflog.4; when it is started: pflog_logfile="/var/log/pflog" # where pflogd should store the logfile pflog_flags="" # additional flags for pflogd startup - Save the edits, then run the startup script to load the logging module: - - &prompt.root; service pflog start - - If there is a LAN behind the firewall and packets need to + Finally, if there is a LAN behind the firewall and packets need to be forwarded for the computers on the LAN, or NAT is required, add the following option: gateway_enable="YES" # Enable as LAN gateway - + After saving the needed edits, + PF can be started with logging support by typing: + + &prompt.root; service pf start +&prompt.root; service pflog start + + From owner-svn-doc-head@FreeBSD.ORG Fri Feb 14 01:35:03 2014 Return-Path: Delivered-To: svn-doc-head@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 ESMTPS id 8673DA96; Fri, 14 Feb 2014 01:35:03 +0000 (UTC) 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 64EC11AB7; Fri, 14 Feb 2014 01:35:03 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1E1Z3cI065314; Fri, 14 Feb 2014 01:35:03 GMT (envelope-from dru@svn.freebsd.org) Received: (from dru@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1E1Z33n065313; Fri, 14 Feb 2014 01:35:03 GMT (envelope-from dru@svn.freebsd.org) Message-Id: <201402140135.s1E1Z33n065313@svn.freebsd.org> From: Dru Lavigne Date: Fri, 14 Feb 2014 01:35:03 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r43917 - head/en_US.ISO8859-1/books/handbook/firewalls X-SVN-Group: doc-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the doc tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Feb 2014 01:35:03 -0000 Author: dru Date: Fri Feb 14 01:35:02 2014 New Revision: 43917 URL: http://svnweb.freebsd.org/changeset/doc/43917 Log: White space fix only. Translators can ignore. Sponsored by: iXsystems Modified: head/en_US.ISO8859-1/books/handbook/firewalls/chapter.xml Modified: head/en_US.ISO8859-1/books/handbook/firewalls/chapter.xml ============================================================================== --- head/en_US.ISO8859-1/books/handbook/firewalls/chapter.xml Fri Feb 14 01:30:43 2014 (r43916) +++ head/en_US.ISO8859-1/books/handbook/firewalls/chapter.xml Fri Feb 14 01:35:02 2014 (r43917) @@ -215,8 +215,8 @@ integrated part of the base system. PF is a complete, full-featured firewall that has optional support for - ALTQ (Alternate Queuing), which provides - Quality of Service (QoS). + ALTQ (Alternate Queuing), which + provides Quality of Service (QoS). Since the OpenBSD Project maintains the definitive reference for PF in the Enabling <application>PF</application> - In order to use PF, its kernel module must be first - loaded. This section describes the entries that can be added - to /etc/rc.conf in order to enable - PF. + In order to use PF, its kernel + module must be first loaded. This section describes the + entries that can be added to /etc/rc.conf + in order to enable PF. Start by adding the following line to /etc/rc.conf: pf_enable="YES" - Additional options, described in &man.pfctl.8;, can be passed to - PF when it is started. Add this entry to - /etc/rc.conf and specify any - required flags between the two quotes (""): - + Additional options, described in &man.pfctl.8;, can be + passed to PF when it is started. + Add this entry to /etc/rc.conf and + specify any required flags between the two quotes + (""): + pf_flags="" # additional flags for pfctl startup - PF will not start if it cannot find its - ruleset configuration file. The default ruleset is already created and is named + PF will not start if it cannot + find its ruleset configuration file. The default ruleset is + already created and is named /etc/pf.conf. If a custom ruleset has been saved somewhere else, add a line to /etc/rc.conf which specifies the full @@ -261,29 +263,33 @@ The sample pf.conf can be found in /usr/share/examples/pf/. The rest of - this chapter demonstrates how to create a custom ruleset. - - Logging support for PF is provided by - &man.pflog.4;. To enable logging support, add this - line to /etc/rc.conf: + this chapter demonstrates how to create a custom + ruleset. + + Logging support for PF is + provided by &man.pflog.4;. To enable logging support, add + this line to /etc/rc.conf: pflog_enable="YES" The following lines can also be added in order to change the default location of the log file or to specify any - additional flags to pass to &man.pflog.4; when it is started: + additional flags to pass to &man.pflog.4; when it is + started: pflog_logfile="/var/log/pflog" # where pflogd should store the logfile pflog_flags="" # additional flags for pflogd startup - Finally, if there is a LAN behind the firewall and packets need to - be forwarded for the computers on the LAN, or NAT is required, - add the following option: + Finally, if there is a LAN behind the + firewall and packets need to be forwarded for the computers on + the LAN, or NAT is + required, add the following option: gateway_enable="YES" # Enable as LAN gateway After saving the needed edits, - PF can be started with logging support by typing: + PF can be started with logging + support by typing: &prompt.root; service pf start &prompt.root; service pflog start From owner-svn-doc-head@FreeBSD.ORG Fri Feb 14 02:26:26 2014 Return-Path: Delivered-To: svn-doc-head@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 ESMTPS id A7CB58A2; Fri, 14 Feb 2014 02:26:26 +0000 (UTC) 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 919141E36; Fri, 14 Feb 2014 02:26:26 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1E2QQiY085361; Fri, 14 Feb 2014 02:26:26 GMT (envelope-from wblock@svn.freebsd.org) Received: (from wblock@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1E2QQJn085360; Fri, 14 Feb 2014 02:26:26 GMT (envelope-from wblock@svn.freebsd.org) Message-Id: <201402140226.s1E2QQJn085360@svn.freebsd.org> From: Warren Block Date: Fri, 14 Feb 2014 02:26:26 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r43918 - head/en_US.ISO8859-1/books/handbook/advanced-networking X-SVN-Group: doc-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the doc tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Feb 2014 02:26:26 -0000 Author: wblock Date: Fri Feb 14 02:26:26 2014 New Revision: 43918 URL: http://svnweb.freebsd.org/changeset/doc/43918 Log: Update the carp(4) section for 10.x and later. Allan Jude supplied a great patch to fix this, and then spent a lot of time changing it to meet my numerous too-strict standards. PR: docs/186464 Submitted by: Rainer Duffner Reviewed by: glebius (earlier version) Modified: head/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml Modified: head/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml ============================================================================== --- head/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml Fri Feb 14 01:35:02 2014 (r43917) +++ head/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml Fri Feb 14 02:26:26 2014 (r43918) @@ -5686,6 +5686,8 @@ route_hostD="192.168.173.4 hatm0 0 102 l TomRhodesContributed by + AllanJudeUpdated + by @@ -5698,182 +5700,235 @@ route_hostD="192.168.173.4 hatm0 0 102 l The Common Address Redundancy Protocol (CARP) allows multiple hosts to share the - same IP address. In some configurations, - this may be used for availability or load balancing. Hosts - may use separate IP addresses, as in the - example provided here. - - To enable support for CARP, the &os; - kernel can be rebuilt as described in with the following option: - - device carp - - Alternatively, the if_carp.ko module - can be loaded at boot time. Add the following line to - /boot/loader.conf: - - if_carp_load="YES" - - CARP functionality should now be - available and may be tuned via several &man.sysctl.8; - variables: - - - - - - OID - Description - - - - - - net.inet.carp.allow - Accept incoming CARP packets. - Enabled by default. - - - - net.inet.carp.preempt - This option downs all of the - CARP interfaces on the host when one - goes down. Disabled by default. - - - - net.inet.carp.log - A value of 0 disables any - logging. A value of 1 enables - logging of bad CARP packets. Values - greater than 1 enable logging of - state changes for the CARP - interfaces. The default value is - 1. - - - - net.inet.carp.arpbalance - Balance local network traffic using - ARP. Disabled by default. - - - - net.inet.carp.suppress_preempt - A read-only variable showing the status of - preemption suppression. Preemption can be suppressed - if the link on an interface is down. A value of - 0 means that preemption is not - suppressed. Every problem increments this - variable. - - - - - - The CARP devices themselves may be - created using &man.ifconfig.8;: - - &prompt.root; ifconfig carp0 create - - In a real environment, each interface has a unique - identification number known as a Virtual Host IDentification - (VHID) which is used to distinguish the - host on the network. + same IP address and provide high availability. One or more hosts can fail, and the others will + take over for the failed system transparently. In addition to the shared IP address, hosts also have a + unique IP address for management and + configuration, as in the example provided here. - - Using <acronym>CARP</acronym> for Server + <sect2 xml:id="carp-ha"> + <title>Using <acronym>CARP</acronym> for High Availability - One use of CARP is to provide server - availability. This example configures failover support for - three hosts, all with unique IP - addresses and providing the same web content. These machines - act in conjunction with a Round Robin - DNS configuration. The failover machine - has two additional CARP interfaces, one - for each of the content server's - IP addresses. When a - failure occurs, the failover server will pick up the failed - machine's IP address. - This means that the failure should go completely unnoticed - by the user. The failover server requires identical content - and services as the other content servers it is expected to - pick up load for. - - The two machines should be configured identically other - than their hostnames and VHIDs. This - example calls these machines + CARP is often used to provide + high availability for one or more services. This example + configures failover support with three hosts, all with + unique IP addresses, but providing the same + web content. These machines are load balanced with a Round + Robin DNS configuration. The master and + backup machines are configured identically + except for their hostnames and management + IP addresses. These servers must have the same configuration and run + the same services. + When the failover occurs, requests to the + service on the shared IP address can only + be answered correctly if the backup server has access to the + same content. The backup machine has two additional + CARP interfaces, one for each of the + master content server's IP addresses. When + a failure occurs, the backup server will pick up the failed + master machine's IP address. Users will + not see a service failure at all. + + This + example has two different masters named hosta.example.org and - hostb.example.org respectively. - First, the required lines for a CARP - configuration have to be added to - /etc/rc.conf. Here are the lines for + hostb.example.org, with + a shared backup named + hostc.example.org. + + Each virtual IP address has a unique + identification number known as a Virtual Host Identification + (VHID). All of the machines that share an IP address have the same VHID. + The VHID for each virtual + IP address must be unique across the + broadcast domain of the network interface. + + + + Using <acronym>CARP</acronym> on &os; 10 and + Later + + Enable support for CARP by loading the + carp.ko kernel module in + /boot/loader.conf: + + carp_load="YES" + + The CARP module can also be built into the + &os; kernel as described in : + + device carp + + The hostname, management + IP address, + CARP configuration, and the IP address + to be shared are all set by adding entries to + /etc/rc.conf. This example is for + hosta.example.org: + + hostname="hosta.example.org" +ifconfig_em0="inet 192.168.1.3 netmask 255.255.255.0" +ifconfig_em0_alias0="vhid 1 pass testpass alias 192.168.1.50/32" + + On hostb.example.org: + + hostname="hostb.example.org" +ifconfig_em0="inet 192.168.1.4 netmask 255.255.255.0" +ifconfig_em0_alias0="vhid 2 pass testpass alias 192.168.1.51/32" + + + The passwords specified with &man.ifconfig.8; + must be identical. + CARP will only listen to and accept + advertisements from machines with the correct password. + + + The third machine, + hostc.example.org, + is prepared to handle failover from + either of the previous hosts. This machine is configured + with two CARP VHIDs, one + to handle the virtual IP address of each + of the master hosts. , the + CARP advertising skew, is set to + ensure that the backup host advertises later than the + master. controls the order of precedence when there + are multiple backup servers. Set the configuration in + /etc/rc.conf: + + hostname="hostc.example.org" +ifconfig_em0="inet 192.168.1.5 netmask 255.255.255.0" +ifconfig_em0_alias0="vhid 1 advskew 100 pass testpass alias 192.168.1.50/32" +ifconfig_em0_alias1="vhid 2 advskew 100 pass testpass alias 192.168.1.51/32" + + Having two CARP + VHIDs configured means that + hostc.example.org will notice if + either of the master servers becomes unavailable. If a master + fails to advertise before the backup server, the backup server + will pick up the shared IP address until + the master becomes available again. + + + Preemption is disabled by default. If preemption has + been enabled, hostc.example.org + might not release the virtual IP address + back to the original master server. The administrator + can force the backup server to return the + IP address to the master with the + command: + + &prompt.root; ifconfig em0 vhid 1 state backup + + + At this point, either networking must be restarted or the + machine rebooted, then CARP is + enabled. + + CARP functionality can be controlled + via several &man.sysctl.8; variables documented in the + &man.carp.4; manual pages. Other actions can be triggered + from CARP events by using + &man.devd.8;. + + + + Using <acronym>CARP</acronym> on &os; 9 and + Earlier + + Enable support for CARP by loading the + if_carp.ko kernel module in + /boot/loader.conf: + + if_carp_load="YES" + + CARP can also be built into the + &os; kernel as described in : + + device carp + + The CARP devices themselves may be + created using &man.ifconfig.8;: + + &prompt.root; ifconfig carp0 create + + Set the hostname, configure the management + IP address, then configure + CARP and the IP address + to be shared by adding the required lines to + /etc/rc.conf. Here are example lines for hosta.example.org: hostname="hosta.example.org" -ifconfig_fxp0="inet 192.168.1.3 netmask 255.255.255.0" +ifconfig_fxp0="inet 192.168.1.3 netmask 255.255.255.0" cloned_interfaces="carp0" -ifconfig_carp0="vhid 1 pass testpass 192.168.1.50/24" +ifconfig_carp0="vhid 1 pass testpass 192.168.1.50/24" - On hostb.example.org, use the - following lines: + On hostb.example.org: hostname="hostb.example.org" -ifconfig_fxp0="inet 192.168.1.4 netmask 255.255.255.0" +ifconfig_fxp0="inet 192.168.1.4 netmask 255.255.255.0" cloned_interfaces="carp0" -ifconfig_carp0="vhid 2 pass testpass 192.168.1.51/24" +ifconfig_carp0="vhid 2 pass testpass 192.168.1.51/24" - It is very important that the passwords, specified by - the option to &man.ifconfig.8;, are - identical. The carp devices will - only listen to and accept advertisements from machines - with the correct password. The VHID - must also be unique for each machine. + The passwords specified with &man.ifconfig.8; + must be identical. + CARP will only listen to and accept + advertisements from machines with the correct password. The + VHID must also be unique for each virtual + IP address. The third machine, - provider.example.org, should be - prepared so that it may handle failover from either host. - This machine will require two - carp devices, one to handle each host. - The appropriate /etc/rc.conf - configuration lines will be similar to the following: + hostc.example.org, is + prepared to handle failover from either of the previous hosts. + This machine is configured with two + CARP devices, one to handle each of the virtual IP address of each of the master hosts. + Setting the + controls the CARP advertising skew. The + skew ensuring that the backup hosts advertises later than the + master, and controls the order of precedence when there + are multiple backup servers. Set the configuration in + /etc/rc.conf: - hostname="provider.example.org" -ifconfig_fxp0="inet 192.168.1.5 netmask 255.255.255.0" + hostname="hostc.example.org" +ifconfig_fxp0="inet 192.168.1.5 netmask 255.255.255.0" cloned_interfaces="carp0 carp1" -ifconfig_carp0="vhid 1 advskew 100 pass testpass 192.168.1.50/24" -ifconfig_carp1="vhid 2 advskew 100 pass testpass 192.168.1.51/24" +ifconfig_carp0="vhid 1 advskew 100 pass testpass 192.168.1.50/24" +ifconfig_carp1="vhid 2 advskew 100 pass testpass 192.168.1.51/24" - Having the two carp devices will - allow provider.example.org to notice - and pick up the IP address of either - machine, should it stop responding. + Having two CARP devices configured + means that hostc.example.org will + notice if either of the master servers becomes unavailable. + If a master fails to advertise before the backup server, the + backup server will pick up the shared IP + address until the master becomes available again. - The default &os; kernel may have - preemption enabled. If so, - provider.example.org may not - relinquish the IP address back to the - original content server. In this case, an administrator may - have to manually force the IP back to the - master. The following command should be issued on - provider.example.org: + Preemption is disabled in the GENERIC &os; kernel. + If Preemption has been enabled with a custom kernel, + hostc.example.org may not + release the IP address back to the + original content server. The administrator can force the backup + server to return the IP address to the + master with the command: - &prompt.root; ifconfig carp0 down && ifconfig carp0 up + &prompt.root; ifconfig carp0 down && ifconfig carp0 up This should be done on the carp interface which corresponds to the correct host. - At this point, CARP should be enabled - and available for testing. For testing, either networking - has to be restarted or the machines rebooted. - - More information is available in &man.carp.4;. + At this point, either networking must be restarted or the + machine rebooted, then CARP is + enabled. + + CARP functionality can be controlled + via several &man.sysctl.8; variables documented in the + &man.carp.4; manual pages. Other actions can be triggered + from CARP events by using + &man.devd.8;. From owner-svn-doc-head@FreeBSD.ORG Fri Feb 14 03:48:49 2014 Return-Path: Delivered-To: svn-doc-head@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 ESMTPS id A38C3181; Fri, 14 Feb 2014 03:48:49 +0000 (UTC) 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 8E5DB18D7; Fri, 14 Feb 2014 03:48:49 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1E3mnVM017834; Fri, 14 Feb 2014 03:48:49 GMT (envelope-from wblock@svn.freebsd.org) Received: (from wblock@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1E3mntF017833; Fri, 14 Feb 2014 03:48:49 GMT (envelope-from wblock@svn.freebsd.org) Message-Id: <201402140348.s1E3mntF017833@svn.freebsd.org> From: Warren Block Date: Fri, 14 Feb 2014 03:48:49 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r43920 - head/en_US.ISO8859-1/books/handbook/advanced-networking X-SVN-Group: doc-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the doc tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Feb 2014 03:48:49 -0000 Author: wblock Date: Fri Feb 14 03:48:49 2014 New Revision: 43920 URL: http://svnweb.freebsd.org/changeset/doc/43920 Log: Whitespace-only fixes, translators please ignore. Slightly modified patch supplied by Allan Jude. Modified: head/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml Modified: head/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml ============================================================================== --- head/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml Fri Feb 14 02:33:56 2014 (r43919) +++ head/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml Fri Feb 14 03:48:49 2014 (r43920) @@ -4,7 +4,10 @@ $FreeBSD$ --> - + + Advanced Networking @@ -89,9 +92,14 @@ Gateways and Routes - - CoranthGryphonContributed - by + + + + Coranth + Gryphon + + Contributed by + @@ -2264,10 +2272,18 @@ freebsdap 00:11:95:c3:0d:ac 1 Bluetooth - PavLucistnikWritten - by -
    pav@FreeBSD.org
    -     + + + Pav + Lucistnik + + Written by + +
    + pav@FreeBSD.org +
    +     +     @@ -2404,8 +2420,8 @@ Name: Pav's T39 If an inquiry is performed on a remote Bluetooth device, it will find the computer as - your.host.name (ubt0). The name assigned to the - local device can be changed at any time. + your.host.name (ubt0). The name assigned to + the local device can be changed at any time. The Bluetooth system provides a point-to-point connection between two Bluetooth units, or a point-to-multipoint @@ -3397,86 +3413,86 @@ BEGEMOT-BRIDGE-MIB::begemotBridgeDefault loadbalance roundrobin - &os; provides the &man.lagg.4; interface which can be used - to aggregate multiple network interfaces into one virtual - interface in order to provide failover and link aggregation. - Failover allows traffic to continue to flow even if an - interface becomes available. Link aggregation works best on - switches which support LACP, as this - protocol distributes traffic bi-directionally while responding - to the failure of individual links. - - The aggregation protocols supported by the lagg interface - determine which ports are used for outgoing traffic and - whether or not a specific port accepts incoming traffic. The - following protocols are supported by &man.lagg.4;: - - - - failover - - This mode sends and receives traffic only through - the master port. If the master port becomes - unavailable, the next active port is used. The first - interface added to the virtual interface is the master - port and all subsequently added interfaces are used as - failover devices. If failover to a non-master port - occurs, the original port becomes master once it - becomes available again. - - + &os; provides the &man.lagg.4; interface which can be used + to aggregate multiple network interfaces into one virtual + interface in order to provide failover and link aggregation. + Failover allows traffic to continue to flow even if an + interface becomes available. Link aggregation works best on + switches which support LACP, as this + protocol distributes traffic bi-directionally while responding + to the failure of individual links. + + The aggregation protocols supported by the lagg interface + determine which ports are used for outgoing traffic and + whether or not a specific port accepts incoming traffic. The + following protocols are supported by &man.lagg.4;: + + + + failover + + This mode sends and receives traffic only through + the master port. If the master port becomes + unavailable, the next active port is used. The first + interface added to the virtual interface is the master + port and all subsequently added interfaces are used as + failover devices. If failover to a non-master port + occurs, the original port becomes master once it + becomes available again. + + - - fec / loadbalance - - &cisco; Fast ðerchannel; (FEC) - is found on older &cisco; switches. It provides a - static setup and does not negotiate aggregation with the - peer or exchange frames to monitor the link. If the - switch supports LACP, that should be - used instead. - - + + fec / loadbalance + + &cisco; Fast ðerchannel; (FEC) + is found on older &cisco; switches. It provides a + static setup and does not negotiate aggregation with the + peer or exchange frames to monitor the link. If the + switch supports LACP, that should be + used instead. + + - - lacp - - The &ieee; 802.3ad Link Aggregation Control Protocol - (LACP) negotiates a set of - aggregable links with the peer into one or more Link - Aggregated Groups (LAGs). Each - LAG is composed of ports of the same - speed, set to full-duplex operation, and traffic is - balanced across the ports in the - LAG with the greatest total speed. - Typically, there is only one LAG - which contains all the ports. In the event of changes - in physical connectivity, - LACP will quickly converge to a new - configuration. - - LACP balances outgoing traffic - across the active ports based on hashed protocol header - information and accepts incoming traffic from any active - port. The hash includes the Ethernet source and - destination address and, if available, the - VLAN tag, and the - IPv4 or IPv6 - source and destination address. - - + + lacp + + The &ieee; 802.3ad Link Aggregation Control Protocol + (LACP) negotiates a set of + aggregable links with the peer into one or more Link + Aggregated Groups (LAGs). Each + LAG is composed of ports of the same + speed, set to full-duplex operation, and traffic is + balanced across the ports in the + LAG with the greatest total speed. + Typically, there is only one LAG + which contains all the ports. In the event of changes + in physical connectivity, + LACP will quickly converge to a new + configuration. + + LACP balances outgoing traffic + across the active ports based on hashed protocol header + information and accepts incoming traffic from any active + port. The hash includes the Ethernet source and + destination address and, if available, the + VLAN tag, and the + IPv4 or IPv6 + source and destination address. + + - - roundrobin - - This mode distributes outgoing traffic using a - round-robin scheduler through all active ports and - accepts incoming traffic from any active port. Since - this mode violates Ethernet frame ordering, it should be - used with caution. - - - + + roundrobin + + This mode distributes outgoing traffic using a + round-robin scheduler through all active ports and + accepts incoming traffic from any active port. Since + this mode violates Ethernet frame ordering, it should be + used with caution. + + + Configuration Examples @@ -4234,12 +4250,19 @@ cd /usr/src/etc; make distribution PXE Booting with an <acronym>NFS</acronym> Root File - System + System - CraigRodrigues + + + Craig + Rodrigues + +
    rodrigc@FreeBSD.org
    -     Written by     +     + Written by +     @@ -4325,7 +4348,7 @@ cd /usr/src/etc; make distribution Rebuild the &os; kernel and userland (): + linkend="makeworld"/>):     &prompt.root; cd /usr/src &prompt.root; make buildworld @@ -4980,16 +5003,31 @@ redirect_port tcp 192.168.0.3:80 80IPv6 - AaronKaplanOriginally - Written by + + + Aaron + Kaplan + + Originally Written by + - TomRhodesRestructured - and Added by + + + Tom + Rhodes + + Restructured and Added by + - BradDavisExtended - by + + + Brad + Davis + + Extended by + @@ -5011,26 +5049,26 @@ redirect_port tcp 192.168.0.3:80 80 - Running out of addresses. For years the use of - RFC1918 private address space (10.0.0.0/8, 172.16.0.0/12, and - 192.168.0.0/16) and NAT - has slowed down the exhaustion. Even though, there are - very few remaining IPv4 addresses. The Internet - Assigned Numbers Authority (IANA) has - issued the last of the available major blocks to the - Regional Registries. Once each Regional Registry runs - out, there will be no more available and switching to - IPv6 will be critical. + Running out of addresses. For years the use of + RFC1918 private address space (10.0.0.0/8, 172.16.0.0/12, and + 192.168.0.0/16) and NAT + has slowed down the exhaustion. Even though, there are + very few remaining IPv4 addresses. The Internet + Assigned Numbers Authority (IANA) has + issued the last of the available major blocks to the + Regional Registries. Once each Regional Registry runs + out, there will be no more available and switching to + IPv6 will be critical. - Every block of IPv4 addresses allocated required - routing information to be exchanged between many routers - on the Internet, and these routing tables were getting - too large to allow efficient routing. + Every block of IPv4 addresses allocated required + routing information to be exchanged between many routers + on the Internet, and these routing tables were getting + too large to allow efficient routing. @@ -5059,7 +5097,7 @@ redirect_port tcp 192.168.0.3:80 80 Address autoconfiguration (RFC2462). + xlink:href="http://www.ietf.org/rfc/rfc2462.txt">RFC2462). @@ -5096,7 +5134,7 @@ redirect_port tcp 192.168.0.3:80 80 KAME.net + xlink:href="http://www.kame.net">KAME.net @@ -5146,7 +5184,7 @@ redirect_port tcp 192.168.0.3:80 80128 bits unspecified Equivalent to 0.0.0.0 in + class="ipaddress">0.0.0.0 in IPv4. @@ -5155,7 +5193,7 @@ redirect_port tcp 192.168.0.3:80 80128 bits loopback address Equivalent to 127.0.0.1 in + class="ipaddress">127.0.0.1 in IPv4. @@ -5324,10 +5362,11 @@ redirect_port tcp 192.168.0.3:80 80 ipv6_enable="YES" - - - <acronym>IPv6</acronym> Client Static - Configuration + + + + <acronym>IPv6</acronym> Client Static + Configuration To statically assign the IPv6 address, @@ -5471,22 +5510,22 @@ redirect_port tcp 192.168.0.3:80 80 - - Application Use of <acronym>IPv6</acronym> + + Application Use of <acronym>IPv6</acronym> - Currently IPv6 support for many - applications and services is very good, though for some - software it still needs work. For authoritative - information about the support of - IPv6, please consult the Official - Documentation for the software in question. - - Web, DNS and Mail applications - and servers have the best support for - IPv6 because they are the most common - use case. Other applications may have varying degrees - of IPv6 support. - + Currently IPv6 support for many + applications and services is very good, though for some + software it still needs work. For authoritative information + about the support of IPv6, please consult + the Official Documentation for the software in + question. + + Web, DNS and Mail applications and + servers have the best support for IPv6 + because they are the most common use case. Other applications + may have varying degrees of IPv6 + support. +     @@ -24,13 +24,95 @@ ¤µ¤é¤Ê¤ë¾ðÊ󸻤ΰìÍ÷¤Ï¡¢ ¤ò¤´Í÷¤¯¤À¤µ¤¤¡£ - Âè 1 ÈǤ«¤é¤ÎÊѹ¹ + Âè 2 ÈǤ«¤é¤ÎÊѹ¹ - Âè 2 ÈǤϡ¢FreeBSD + Âè 3 ÈǤϡ¢FreeBSD ¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¥×¥í¥¸¥§¥¯¥È¤Î¸¥¿ÈŪ¤Ê¥á¥ó¥Ð¡¼¤Ë¤è¤ë 2 ǯ°Ê¾å¤ËÅϤëºî¶È¤ÎĺÅÀ¤ËΩ¤Ä¤â¤Î¤Ç¤¹¡£ ¤³¤Î¿·¤¿¤ÊÈǤˤª¤±¤ë¼ç¤ÊÊѹ¹¤Ï¡¢¼¡¤Î¤è¤¦¤Ê¤â¤Î¤Ç¤¹¡£ + + + + ¤Ë¡¢ACPI ÅŸ»´ÉÍý¡¢¥¯¡¼¥í¥ó¥·¥¹¥Æ¥à¥æ¡¼¥Æ¥£¥ê¥Æ¥£¡¢ + ¤ª¤è¤Ó¥«¡¼¥Í¥ë¥Á¥å¡¼¥Ë¥ó¥°¥ª¥×¥·¥ç¥ó¤Ë´Ø¤¹¤ë¤è¤ê¿¤¯¤Î¾ðÊó¤¬Äɲ䵤ì¤Þ¤·¤¿¡£ + + + + ¤Ë¡¢ + Virtual Private Network (VPN)¡¢ + ¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¥¢¥¯¥»¥¹¥³¥ó¥È¥í¡¼¥ë¥ê¥¹¥È (ACL)¡¢ + ¤ª¤è¤Ó¥»¥­¥å¥ê¥Æ¥£´«¹ð¤Ë´Ø¤¹¤ë¾ðÊó¤¬Äɲ䵤ì¤Þ¤·¤¿¡£ + + + + Mandatory Access Control (MAC) + ¤Î¾Ï¤¬¤³¤ÎÈǤÇÄɲ䵤ì¤Þ¤·¤¿¡£ + MAC ¤¬¤É¤Î¤è¤¦¤Ê¤â¤Î¤Ç¡¢ + ¤³¤Î¥á¥«¥Ë¥º¥à¤¬¤É¤Î¤è¤¦¤Ë FreeBSD + ¥·¥¹¥Æ¥à¤ò°ÂÁ´¤Ë¤¹¤ë¤«¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Æ¤¤¤Þ¤¹¡£ + + + + ¤Ë¡¢ + USB ¥¹¥È¥ì¡¼¥¸¥Ç¥Ð¥¤¥¹¡¢¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¥¹¥Ê¥Ã¥×¥·¥ç¥Ã¥È¡¢ + ¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¥¯¥©¡¼¥¿¡¢¥Õ¥¡¥¤¥ë¤ª¤è¤Ó¥Í¥Ã¥È¥ï¡¼¥¯¥Ù¡¼¥¹¤Î¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¡¢ + °Å¹æ²½¤µ¤ì¤¿¥Ç¥£¥¹¥¯¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤Ë´Ø¤¹¤ë¾ðÊó¤¬Äɲ䵤ì¤Þ¤·¤¿¡£ + + + + + + ¤Ë¡¢ + ¥È¥é¥Ö¥ë¥·¥å¡¼¥Æ¥£¥ó¥°¤ÎÀ᤬Äɲ䵤ì¤Þ¤·¤¿¡£ + + + + , ¤Ë¡¢ + ¾¤Î¥á¡¼¥ëžÁ÷¥¨¡¼¥¸¥§¥ó¥È¡¢SMTP ¤Îǧ¾Ú¡¢UUCP, fetchmail, + procmail ¤ä¾¤Î¹âÅÙ¤ÊÏÃÂê¤Ë¤Ä¤¤¤Æ¤Î¾ðÊó¤¬Äɲ䵤ì¤Þ¤·¤¿¡£ + + + + + ¥Í¥Ã¥È¥ï¡¼¥¯¥µ¡¼¥Ó¥¹¤Î¾Ï¤¬¡¢¤³¤ÎÈǤǿ·¤·¤¯Äɲ䵤ì¤Þ¤·¤¿¡£ + ¤³¤Î¾Ï¤Ç¤Ï¡¢Apache HTTP ¥µ¡¼¥Ð¡¢FTPd ¤ª¤è¤Ó Samba ¤òÍѤ¤¤Æ + Microsoft Windows + ¥¯¥é¥¤¥¢¥ó¥ÈÍѤ˥µ¡¼¥Ð¤òÀßÄꤹ¤ëÊýË¡¤Ê¤É¤ò¼è¤ê¾å¤²¤Æ¤¤¤Þ¤¹¡£ + ºÆ¹½À®¤Ë¤è¤ê¤¤¤¯¤Ä¤«¤ÎÀ᤬¡¢ + ¤«¤é°ÜÆ°¤·¤Æ¤­¤Þ¤·¤¿¡£ + + + + ¤Ë¡¢ + FreeBSD ¤Ç¤Î Bluetooth ¥Ç¥Ð¥¤¥¹¤Î»ÈÍÑ¡¢¥ï¥¤¥ä¥ì¥¹¥Í¥Ã¥È¥ï¡¼¥¯¤ÎÀßÄê¡¢ + Asynchronous Transfer Mode (ATM) + ¥Í¥Ã¥È¥ï¡¼¥¯¤Ë´Ø¤¹¤ë¾ðÊó¤¬Äɲ䵤ì¤Þ¤·¤¿¡£ + + + + Ëܽñ¤Ç»È¤ï¤ì¤Æ¤¤¤ëÀìÌçÍѸì¤ÎÄêµÁ¤ò¤Þ¤È¤á¤¿ÍѸ콸¤¬Äɲ䵤ì¤Þ¤·¤¿¡£ + + + + Ëܽñ¤òÄ̤¸¤Æɽ¤ª¤è¤Ó¿Þ¤Îɽ¸½¤Ë¤ª¤¤¤Æ¿ô¿¤¯¤Î²þÎɤ¬¤ª¤³¤Ê¤ï¤ì¤Þ¤·¤¿¡£ + + + + Âè 1 ÈǤ«¤é¤ÎÊѹ¹ + + Âè 2 ÈǤϡ¢FreeBSD + ¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¥×¥í¥¸¥§¥¯¥È¤Î¸¥¿ÈŪ¤Ê¥á¥ó¥Ð¡¼¤Ë¤è¤ë + 2 ǯ°Ê¾å¤ËÅϤëºî¶È¤ÎĺÅÀ¤ËΩ¤Ä¤â¤Î¤Ç¤·¤¿¡£ + ¤³¤Î¿·¤¿¤ÊÈǤˤª¤±¤ë¼ç¤ÊÊѹ¹¤Ï¡¢¼¡¤Î¤è¤¦¤Ê¤â¤Î¤Ç¤·¤¿¡£ + @@ -54,7 +136,7 @@ ¤Ï¿·µ¬¥æ¡¼¥¶¡¼¤¬Ê¸¾Ï¤ÎÆâÍƤòÍý²ò¤·¤ä¤¹¤¤¤è¤¦¤Ë¿¤¯¤Î¥¹¥¯¥ê¡¼¥ó¥·¥ç¥Ã¥È¤òÆþ¤ì¤Æ´°Á´¤Ë½ñ¤­Ä¾¤µ¤ì¤Þ¤·¤¿¡£ - (&unix; ¤Î´ðÁÃÃμ± ) ¤Ë¤Ï¡¢ + (&unix; ¤Î´ðÁÃÃμ±) ¤Ë¤Ï¡¢ ¥×¥í¥»¥¹¡¢¥Ç¡¼¥â¥ó¡¢¥·¥°¥Ê¥ë¤Ë´Ø¤¹¤ë¾ðÊó¤¬Äɲ䵤ì¤Þ¤·¤¿¡£ @@ -98,7 +180,7 @@ ¤ÎÀßÄê¤Ë¤Ä¤¤¤Æ¤è¤ê¿¤¯¤Î¾ðÊ󤬲䨤é¤ì¤Þ¤·¤¿¡£ - (Linux ¥Ð¥¤¥Ê¥ê¸ß´¹µ¡Ç½) + (&linux; ¥Ð¥¤¥Ê¥ê¸ß´¹µ¡Ç½) ¤Ë¤Ï¡¢&oracle; ¤ä &sap.r3; ¤Î¥¤¥ó¥¹¥È¡¼¥ë¾ðÊ󤬲䨤é¤ì¤Þ¤·¤¿ (ÌõÃí: ÆüËܸìÈǤϺî¶ÈÃæ¤Ç¤¹)¡£ @@ -157,8 +239,8 @@ FreeBSD ¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à¤Î´ðËÜŪ¤Ê¥³¥Þ¥ó¥É¤äµ¡Ç½¤ò°·¤Ã¤Æ¤¤¤Þ¤¹¡£ - Linux ¤ä¤½¤Î¾¤Î &unix; É÷¤Î¤â¤Î¤ËÆëÀ÷¤ó¤Ç¤¤¤¿¤é¡¢ - ¤³¤Î¾Ï¤òÈô¤Ð¤·¤Æ¤â¹½¤ï¤Ê¤¤¤Ç¤·¤ç¤¦¡£ + &linux; ¤ä¤½¤Î¾¤Î &unix; É÷¤Î¤â¤Î¤ËÆëÀ÷¤ó¤Ç¤¤¤¿¤é¡¢ + ¤³¤Î¾Ï¤òÈô¤Ð¤·¤Æ¤â¹½¤ï¤Ê¤¤¤Ç¤·¤ç¤¦¡£ @@ -212,13 +294,13 @@ - , Linux ¥Ð¥¤¥Ê¥ê¸ß´¹µ¡Ç½ + , &linux; ¥Ð¥¤¥Ê¥ê¸ß´¹µ¡Ç½ - FreeBSD ¤Î Linux ¥Ð¥¤¥Ê¥ê¸ß´¹µ¡Ç½¤òÀâÌÀ¤·¤Æ¤¤¤Þ¤¹¡£¤Þ¤¿¡¢ + FreeBSD ¤Î &linux; ¥Ð¥¤¥Ê¥ê¸ß´¹µ¡Ç½¤òÀâÌÀ¤·¤Æ¤¤¤Þ¤¹¡£¤Þ¤¿¡¢ &oracle;, &sap.r3;, &mathematica; ¤È¤¤¤Ã¤¿¿Íµ¤¤Î¹â¤¤ - Linux ¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Î¥¤¥ó¥¹¥È¡¼¥ë¤ò¾Ü¤·¤¯ÀâÌÀ¤·¤Æ¤¤¤Þ¤¹¡£ + &linux; ¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Î¥¤¥ó¥¹¥È¡¼¥ë¤ò¾Ü¤·¤¯ÀâÌÀ¤·¤Æ¤¤¤Þ¤¹¡£ @@ -259,8 +341,8 @@ , Mandatory Access Control Mandatory Access Control (MAC) ¤¬¤É¤Î¤è¤¦¤Ê¤â¤Î¤Ç¡¢ - ¤³¤Î¥á¥«¥Ë¥º¥à¤¬¤É¤Î¤è¤¦¤Ë - FreeBSD ¥·¥¹¥Æ¥à¤ò°ÂÁ´¤Ë¤¹¤ë¤«¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Æ¤¤¤Þ¤¹¡£ + ¤³¤Î¥á¥«¥Ë¥º¥à¤¬¤É¤Î¤è¤¦¤Ë FreeBSD + ¥·¥¹¥Æ¥à¤ò°ÂÁ´¤Ë¤¹¤ë¤«¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Æ¤¤¤Þ¤¹¡£ --> @@ -478,6 +560,9 @@ 2000 ǯ 3 ·î¤ÎºÇ½é¤Î½ÐÈÇ (ISBN 1-57176-241-8) ¤Ë¤Ä¤Ê¤¬¤ê¤Þ¤·¤¿¡£ ¤½¤Î¸å¡¢Wind River Systems ¤Ï¡¢°õºþ½ÐÎϤλÅÁȤߤòÀ°È÷¤·¡¢ ¾Ï¤òÄɲ乤뤿¤á¤ËÃø¼Ô¤ò²¿Ì¾¤«ÄɲäǸÛÍѤ·¤Æ¤¯¤ì¤Þ¤·¤¿¡£¤³¤Îºî¶È¤Ï¡¢ - 2001 ǯ 11 ·î¤ÎÂè 2 ÈǤνÐÈÇ (ISBN 1-57176-303-1) ¤Ë·ë¼Â¤·¤Þ¤·¤¿¡£ + 2001 ǯ 11 ·î¤ÎÂè 2 ÈǤνÐÈÇ (ISBN 1-57176-303-1) ¤Ë·ë¼Â¤·¤Þ¤·¤¿¡£ + 2003-2004 ǯ¤Ë¤Ï¡¢¥Ï¥ó¥É¥Ö¥Ã¥¯Âè 3 ÈǤνÐÈǽàÈ÷¤Î¤¿¤á¤Ë FreeBSD Mall, Inc + ¤¬¹×¸¥¼Ô¤ò¸ÛÍѤ·¤Æ¤¯¤ì¤Þ¤·¤¿¡£ From owner-svn-doc-head@FreeBSD.ORG Fri Feb 14 17:19:01 2014 Return-Path: Delivered-To: svn-doc-head@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 ESMTPS id DCE53235; Fri, 14 Feb 2014 17:19:01 +0000 (UTC) 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 C5860106A; Fri, 14 Feb 2014 17:19:01 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1EHJ1LG043346; Fri, 14 Feb 2014 17:19:01 GMT (envelope-from dru@svn.freebsd.org) Received: (from dru@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1EHJ1mr043345; Fri, 14 Feb 2014 17:19:01 GMT (envelope-from dru@svn.freebsd.org) Message-Id: <201402141719.s1EHJ1mr043345@svn.freebsd.org> From: Dru Lavigne Date: Fri, 14 Feb 2014 17:19:01 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r43924 - head/en_US.ISO8859-1/books/handbook/firewalls X-SVN-Group: doc-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the doc tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Feb 2014 17:19:01 -0000 Author: dru Date: Fri Feb 14 17:19:01 2014 New Revision: 43924 URL: http://svnweb.freebsd.org/changeset/doc/43924 Log: Cleanup the ALTQ section. At some point, a FreeBSD specific example should be added. Sponsored by: iXsystems Modified: head/en_US.ISO8859-1/books/handbook/firewalls/chapter.xml Modified: head/en_US.ISO8859-1/books/handbook/firewalls/chapter.xml ============================================================================== --- head/en_US.ISO8859-1/books/handbook/firewalls/chapter.xml Fri Feb 14 09:18:38 2014 (r43923) +++ head/en_US.ISO8859-1/books/handbook/firewalls/chapter.xml Fri Feb 14 17:19:01 2014 (r43924) @@ -191,7 +191,7 @@ - PF and <acronym>ALTQ</acronym> + PF @@ -347,6 +347,97 @@ device pfsync + Enabling <application>ALTQ</application> + + On &os;, ALTQ can be used with + PF to provide Quality of Service + (QOS). Once ALTQ is + enabled, queues can be defined in the ruleset which + determine the processing priority of outbound packets. + + + Before enabling ALTQ, refer to + &man.altq.4; + to determine if the drivers for the network cards installed on the system support + it. + + ALTQ is not available as a + loadable kernel module. If the system's interfaces support ALTQ, + create a custom kernel using the instructions in . + The following kernel options are available. The first is + needed to enable + ALTQ. At least one of the other options + is necessary to specify the queueing scheduler algorithm: + + options ALTQ +options ALTQ_CBQ # Class Based Queuing (CBQ) +options ALTQ_RED # Random Early Detection (RED) +options ALTQ_RIO # RED In/Out +options ALTQ_HFSC # Hierarchical Packet Scheduler (HFSC) +options ALTQ_PRIQ # Priority Queuing (PRIQ) + + The following scheduler algorithms are available: + + + + CBQ + + Class Based Queuing + (CBQ) + is used to divide a connection's bandwidth into different + classes or queues to prioritize traffic based on filter + rules. + + + + + RED + + Random Early Detection + (RED) is + used to avoid network congestion by measuring the length of + the queue and comparing it to the minimum and maximum + thresholds for the queue. When the queue is over the maximum, + all new packets are randomly dropped. + + + + + RIO + + In Random Early Detection In and Out (RIO) mode, + RED maintains multiple average queue + lengths and multiple threshold values, one for each + QOS level. + + + + + HFSC + + Hierarchical Fair Service Curve Packet + Scheduler (HFSC) is described in + http://www-2.cs.cmu.edu/~hzhang/HFSC/main.html. + + + + + PRIQ + + Priority Queuing + (PRIQ) + always passes traffic that is in a higher queue first. + + + + + More information about the scheduling + algorithms and example rulesets are available at http://www.openbsd.org/faq/pf/queueing.html. + + + Creating Filtering Rules By default, PF reads its @@ -429,66 +520,6 @@ device pfsync - - Enabling <acronym>ALTQ</acronym> - - ALTQ is only available by compiling its - support into the &os; kernel. ALTQ is not - supported by all network card drivers. Refer to &man.altq.4; - for a list of drivers that are supported by the release of - &os;. - - The following kernel options will enable - ALTQ and add additional - functionality: - - options ALTQ -options ALTQ_CBQ # Class Based Queuing (CBQ) -options ALTQ_RED # Random Early Detection (RED) -options ALTQ_RIO # RED In/Out -options ALTQ_HFSC # Hierarchical Packet Scheduler (HFSC) -options ALTQ_PRIQ # Priority Queuing (PRIQ) -options ALTQ_NOPCC # Required for SMP build - - options ALTQ enables the - ALTQ framework. - - options ALTQ_CBQ enables - Class Based Queuing - (CBQ). CBQ - can be used to divide a connection's bandwidth into different - classes or queues to prioritize traffic based on filter - rules. - - options ALTQ_RED enables - Random Early Detection - (RED). RED is - used to avoid network congestion by measuring the length of - the queue and comparing it to the minimum and maximum - thresholds for the queue. If the queue is over the maximum, - all new packets will be dropped. RED drops - packets from different connections randomly. - - options ALTQ_RIO enables - Random Early Detection In and Out. - - options ALTQ_HFSC enables the - Hierarchical Fair Service Curve Packet - Scheduler HFSC. For more - information, refer to http://www-2.cs.cmu.edu/~hzhang/HFSC/main.html. - - options ALTQ_PRIQ enables - Priority Queuing - (PRIQ). PRIQ will - always pass traffic that is in a higher queue first. - - options ALTQ_NOPCC enables - SMP support for ALTQ. - This option is required on SMP - systems. - - <application>PF</application> Rule Sets and From owner-svn-doc-head@FreeBSD.ORG Fri Feb 14 17:29:45 2014 Return-Path: <owner-svn-doc-head@FreeBSD.ORG> Delivered-To: svn-doc-head@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 ESMTPS id DD3EC408; Fri, 14 Feb 2014 17:29:44 +0000 (UTC) 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 BBF4D114C; Fri, 14 Feb 2014 17:29:44 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1EHTitd047115; Fri, 14 Feb 2014 17:29:44 GMT (envelope-from dru@svn.freebsd.org) Received: (from dru@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1EHTi2L047114; Fri, 14 Feb 2014 17:29:44 GMT (envelope-from dru@svn.freebsd.org) Message-Id: <201402141729.s1EHTi2L047114@svn.freebsd.org> From: Dru Lavigne <dru@FreeBSD.org> Date: Fri, 14 Feb 2014 17:29:44 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r43925 - head/en_US.ISO8859-1/books/handbook/firewalls X-SVN-Group: doc-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the doc tree for head <svn-doc-head.freebsd.org> List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>, <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head/> List-Post: <mailto:svn-doc-head@freebsd.org> List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help> List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>, <mailto:svn-doc-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Fri, 14 Feb 2014 17:29:45 -0000 Author: dru Date: Fri Feb 14 17:29:44 2014 New Revision: 43925 URL: http://svnweb.freebsd.org/changeset/doc/43925 Log: White space fix only. Translators can ignore. Sponsored by: iXsystems Modified: head/en_US.ISO8859-1/books/handbook/firewalls/chapter.xml Modified: head/en_US.ISO8859-1/books/handbook/firewalls/chapter.xml ============================================================================== --- head/en_US.ISO8859-1/books/handbook/firewalls/chapter.xml Fri Feb 14 17:19:01 2014 (r43924) +++ head/en_US.ISO8859-1/books/handbook/firewalls/chapter.xml Fri Feb 14 17:29:44 2014 (r43925) @@ -277,7 +277,7 @@ additional flags to pass to &man.pflog.4; when it is started:</para> - <programlisting>pflog_logfile="/var/log/pflog" # where pflogd should store the logfile + <programlisting>pflog_logfile="/var/log/pflog" # where pflogd should store the logfile pflog_flags="" # additional flags for pflogd startup</programlisting> <para>Finally, if there is a <acronym>LAN</acronym> behind the @@ -351,23 +351,23 @@ device pfsync</programlisting> <para>On &os;, <application>ALTQ</application> can be used with <application>PF</application> to provide Quality of Service - (<acronym>QOS</acronym>). Once <application>ALTQ</application> is - enabled, queues can be defined in the ruleset which - determine the processing priority of outbound packets. - </para> + (<acronym>QOS</acronym>). Once + <application>ALTQ</application> is enabled, queues can be + defined in the ruleset which determine the processing priority + of outbound packets.</para> <para>Before enabling <application>ALTQ</application>, refer to - &man.altq.4; - to determine if the drivers for the network cards installed on the system support - it.</para> + &man.altq.4; to determine if the drivers for the network cards + installed on the system support it.</para> <para><application>ALTQ</application> is not available as a - loadable kernel module. If the system's interfaces support <application>ALTQ</application>, - create a custom kernel using the instructions in <xref linkend="kernelconfig"/>. - The following kernel options are available. The first is - needed to enable - <application>ALTQ</application>. At least one of the other options - is necessary to specify the queueing scheduler algorithm:</para> + loadable kernel module. If the system's interfaces support + <application>ALTQ</application>, create a custom kernel using + the instructions in <xref linkend="kernelconfig"/>. The + following kernel options are available. The first is needed + to enable <application>ALTQ</application>. At least one of + the other options is necessary to specify the queueing + scheduler algorithm:</para> <programlisting>options ALTQ options ALTQ_CBQ # Class Based Queuing (CBQ) @@ -382,56 +382,53 @@ options ALTQ_PRIQ # Priori <varlistentry> <term>CBQ</term> <listitem> - <para>Class Based Queuing - (<acronym>CBQ</acronym>) - is used to divide a connection's bandwidth into different - classes or queues to prioritize traffic based on filter - rules.</para> + <para>Class Based Queuing (<acronym>CBQ</acronym>) is + used to divide a connection's bandwidth into different + classes or queues to prioritize traffic based on filter + rules.</para> </listitem> </varlistentry> <varlistentry> <term>RED</term> <listitem> - <para>Random Early Detection - (<acronym>RED</acronym>) is - used to avoid network congestion by measuring the length of - the queue and comparing it to the minimum and maximum - thresholds for the queue. When the queue is over the maximum, - all new packets are randomly dropped.</para> + <para>Random Early Detection (<acronym>RED</acronym>) is + used to avoid network congestion by measuring the length + of the queue and comparing it to the minimum and maximum + thresholds for the queue. When the queue is over the + maximum, all new packets are randomly dropped.</para> </listitem> </varlistentry> <varlistentry> <term>RIO</term> <listitem> - <para>In Random Early Detection In and Out (<acronym>RIO</acronym>) mode, - <acronym>RED</acronym> maintains multiple average queue - lengths and multiple threshold values, one for each - <acronym>QOS</acronym> level.</para> + <para>In Random Early Detection In and Out + (<acronym>RIO</acronym>) mode, <acronym>RED</acronym> + maintains multiple average queue lengths and multiple + threshold values, one for each + <acronym>QOS</acronym> level.</para> </listitem> </varlistentry> <varlistentry> <term>HFSC</term> <listitem> - <para>Hierarchical Fair Service Curve Packet - Scheduler (<acronym>HFSC</acronym>) is described in - <uri - xlink:href="http://www-2.cs.cmu.edu/~hzhang/HFSC/main.html">http://www-2.cs.cmu.edu/~hzhang/HFSC/main.html</uri>.</para> + <para>Hierarchical Fair Service Curve Packet Scheduler + (<acronym>HFSC</acronym>) is described in <uri + xlink:href="http://www-2.cs.cmu.edu/~hzhang/HFSC/main.html">http://www-2.cs.cmu.edu/~hzhang/HFSC/main.html</uri>.</para> </listitem> </varlistentry> <varlistentry> <term>PRIQ</term> <listitem> - <para>Priority Queuing - (<acronym>PRIQ</acronym>) - always passes traffic that is in a higher queue first.</para> + <para>Priority Queuing (<acronym>PRIQ</acronym>) always + passes traffic that is in a higher queue first.</para> </listitem> </varlistentry> </variablelist> - + <para>More information about the scheduling algorithms and example rulesets are available at <uri xlink:href="http://www.openbsd.org/faq/pf/queueing.html">http://www.openbsd.org/faq/pf/queueing.html</uri>.</para> From owner-svn-doc-head@FreeBSD.ORG Fri Feb 14 18:45:04 2014 Return-Path: <owner-svn-doc-head@FreeBSD.ORG> Delivered-To: svn-doc-head@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 ESMTPS id 310DEAE0; Fri, 14 Feb 2014 18:45:04 +0000 (UTC) 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 1068B195A; Fri, 14 Feb 2014 18:45:04 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1EIj3K8077897; Fri, 14 Feb 2014 18:45:03 GMT (envelope-from dru@svn.freebsd.org) Received: (from dru@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1EIj3ZZ077896; Fri, 14 Feb 2014 18:45:03 GMT (envelope-from dru@svn.freebsd.org) Message-Id: <201402141845.s1EIj3ZZ077896@svn.freebsd.org> From: Dru Lavigne <dru@FreeBSD.org> Date: Fri, 14 Feb 2014 18:45:03 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r43926 - head/en_US.ISO8859-1/books/handbook/firewalls X-SVN-Group: doc-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the doc tree for head <svn-doc-head.freebsd.org> List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>, <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head/> List-Post: <mailto:svn-doc-head@freebsd.org> List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help> List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>, <mailto:svn-doc-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Fri, 14 Feb 2014 18:45:04 -0000 Author: dru Date: Fri Feb 14 18:45:03 2014 New Revision: 43926 URL: http://svnweb.freebsd.org/changeset/doc/43926 Log: Continue to shuffle and improve flow of this chapter. Many more commits to come. Sponsored by: iXsystems Modified: head/en_US.ISO8859-1/books/handbook/firewalls/chapter.xml Modified: head/en_US.ISO8859-1/books/handbook/firewalls/chapter.xml ============================================================================== --- head/en_US.ISO8859-1/books/handbook/firewalls/chapter.xml Fri Feb 14 17:29:44 2014 (r43925) +++ head/en_US.ISO8859-1/books/handbook/firewalls/chapter.xml Fri Feb 14 18:45:03 2014 (r43926) @@ -218,17 +218,39 @@ <application>ALTQ</application> (Alternate Queuing), which provides Quality of Service (<acronym>QoS</acronym>).</para> - <para>Since the OpenBSD Project maintains the definitive + <para>The OpenBSD Project maintains the definitive reference for <application>PF</application> in the <link - xlink:href="http://www.openbsd.org/faq/pf/">PF FAQ</link>, - this section of the Handbook focuses on - <application>PF</application> as it pertains to &os;, while - providing some general usage information.</para> + xlink:href="http://www.openbsd.org/faq/pf/">PF FAQ</link>. + Peter Hansteen maintains a thorough <application>PF</application> tutorial at <link + xlink:href="http://home.nuug.no/~peter/pf/">http://home.nuug.no/~peter/pf/</link>.</para> + + <warning> + <para>When reading the <link + xlink:href="http://www.openbsd.org/faq/pf/">PF FAQ</link>, + keep in mind that different versions of &os; contain + different versions of <application>PF</application>. + &os; 8.<replaceable>X</replaceable> uses the same + version of <application>PF</application> as + OpenBSD 4.1 and &os; 9.<replaceable>X</replaceable> + and later uses the same version of + <application>PF</application> as OpenBSD 4.5.</para> + </warning> + + <para>The &a.pf; is a good place to ask questions about + configuring and running the <application>PF</application> + firewall. Check the mailing list archives + before asking a question as it may have already been answered.</para> <para>More information about porting <application>PF</application> to &os; can be found at <uri xlink:href="http://pf4freebsd.love2party.net/">http://pf4freebsd.love2party.net/</uri>.</para> + <para>This section of the Handbook focuses on + <application>PF</application> as it pertains to &os;. It + demonstrates how to enable <application>PF</application> and + <application>ALTQ</application>. It then provides several + examples for creating rulesets on a &os; system.</para> + <sect2> <title>Enabling <application>PF</application> @@ -260,12 +282,6 @@ pf_rules="/path/to/pf.conf" - The sample pf.conf - can be found in - /usr/share/examples/pf/. The rest of - this chapter demonstrates how to create a custom - ruleset. - Logging support for PF is provided by &man.pflog.4;. To enable logging support, add this line to /etc/rc.conf: @@ -344,6 +360,78 @@ device pfsync state changes. --> + + By default, PF reads its + configuration rules from /etc/pf.conf and + modifies, drops, or passes packets according to the rules or + definitions specified in this file. The &os; installation + includes several sample files located in + /usr/share/examples/pf/. Refer to the + PF + FAQ for complete coverage of + PF rulesets. + + To control PF, use + pfctl. summarizes some useful options to this command. + Refer to &man.pfctl.8; for a description of all available + options: + +
    + Useful <command>pfctl</command> Options + + + + + Command + Purpose + + + + + + pfctl + -e + Enable PF. + + + + pfctl + -d + Disable PF. + + + + pfctl -F all + -f /etc/pf.conf + Flush all NAT, filter, state, and table + rules and reload + /etc/pf.conf. + + + + pfctl -s [ rules | nat + state ] + Report on the filter rules, NAT rules, or state + table. + + + + pfctl -vnf + /etc/pf.conf + Check /etc/pf.conf for + errors, but do not load ruleset. + + + +
    + + + security/sudo is useful for running + commands like pfctl that require elevated + privileges. It can be installed from the Ports + Collection. +     @@ -434,93 +522,9 @@ options ALTQ_PRIQ # Priori xlink:href="http://www.openbsd.org/faq/pf/queueing.html">http://www.openbsd.org/faq/pf/queueing.html. - - Creating Filtering Rules - - By default, PF reads its - configuration rules from /etc/pf.conf and - modifies, drops, or passes packets according to the rules or - definitions specified in this file. The &os; installation - includes several sample files located in - /usr/share/examples/pf/. Refer to the - PF - FAQ for complete coverage of - PF rulesets. - - - When reading the PF FAQ, - keep in mind that different versions of &os; contain - different versions of PF. Currently, - &os; 8.X is using the same - version of PF - OpenBSD 4.1. &os; 9.X - and later is using the same version of - PF as OpenBSD 4.5. - - - The &a.pf; is a good place to ask questions about - configuring and running the PF - firewall. Do not forget to check the mailing list archives - before asking questions. - - To control PF, use - &man.pfctl.8;. Below are some useful options to this command. - Review &man.pfctl.8; for a description of all available - options: - - - - - - Command - Purpose - - - - - - pfctl - -e - Enable PF. - - - - pfctl - -d - Disable PF. - - - - pfctl -F all - -f /etc/pf.conf - Flush all NAT, filter, state, and table - rules and reload - /etc/pf.conf. - - - - pfctl -s [ rules | nat - state ] - Report on the filter rules, NAT rules, or state - table. - - - - pfctl -vnf - /etc/pf.conf - Check /etc/pf.conf for - errors, but do not load ruleset. - - - - - - - <application>PF</application> Rule Sets and - Tools + <application>PF</application> Rulesets @@ -534,21 +538,8 @@ options ALTQ_PRIQ # Priori - This section demonstrates some useful - PF features and - PF related tools in a series of - examples. A more thorough tutorial is available at http://home.nuug.no/~peter/pf/. - - - security/sudo is useful for running - commands like pfctl that require elevated - privileges. It can be installed from the Ports - Collection. - - - - The Simplest Rule Set Ever + This section demonstrates how to create a customized + ruleset, using several examples. The simplest possible setup is for a single machine which will not run any services, and which will talk to one @@ -566,10 +557,6 @@ pass out all keep state trusted. The rule set can be loaded with &prompt.root; pfctl -e ; pfctl -f /etc/pf.conf - - - - Tighter and More Elegant For a slightly more structured and complete setup, we start by denying everything and then allowing only those @@ -653,7 +640,6 @@ pass proto udp to any port $udp_services exactly the way they will be loaded. This is extremely useful when debugging rules. - A Simple Gateway with NAT @@ -664,10 +650,6 @@ pass proto udp to any port $udp_services which is running PF and also acts as a gateway for at least one other machine. - - Gateways and the Pitfalls of <literal>in</literal>, - <literal>out</literal> and <literal>on</literal> - In the single machine setup, life is relatively simple. Traffic created on it should either pass out to the rest of the world or not, and the administrator @@ -724,7 +706,6 @@ pass proto udp to any port $udp_services For the remainder of this section, with some exceptions, we will keep the rules as simple as possible for readability. - What is the Local Network, Anyway? From owner-svn-doc-head@FreeBSD.ORG Fri Feb 14 18:53:20 2014 Return-Path: Delivered-To: svn-doc-head@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 ESMTPS id AC761CDB; Fri, 14 Feb 2014 18:53:20 +0000 (UTC) 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 8CC041A17; Fri, 14 Feb 2014 18:53:20 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1EIrKTU081419; Fri, 14 Feb 2014 18:53:20 GMT (envelope-from dru@svn.freebsd.org) Received: (from dru@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1EIrKgt081418; Fri, 14 Feb 2014 18:53:20 GMT (envelope-from dru@svn.freebsd.org) Message-Id: <201402141853.s1EIrKgt081418@svn.freebsd.org> From: Dru Lavigne Date: Fri, 14 Feb 2014 18:53:20 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r43927 - head/en_US.ISO8859-1/books/handbook/firewalls X-SVN-Group: doc-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the doc tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Feb 2014 18:53:20 -0000 Author: dru Date: Fri Feb 14 18:53:20 2014 New Revision: 43927 URL: http://svnweb.freebsd.org/changeset/doc/43927 Log: White space fix only. Translators can ignore. Sponsored by: iXsystems Modified: head/en_US.ISO8859-1/books/handbook/firewalls/chapter.xml Modified: head/en_US.ISO8859-1/books/handbook/firewalls/chapter.xml ============================================================================== --- head/en_US.ISO8859-1/books/handbook/firewalls/chapter.xml Fri Feb 14 18:45:03 2014 (r43926) +++ head/en_US.ISO8859-1/books/handbook/firewalls/chapter.xml Fri Feb 14 18:53:20 2014 (r43927) @@ -218,28 +218,29 @@ ALTQ (Alternate Queuing), which provides Quality of Service (QoS). - The OpenBSD Project maintains the definitive - reference for PF in the The OpenBSD Project maintains the definitive reference for + PF in the PF FAQ. - Peter Hansteen maintains a thorough PF tutorial at http://home.nuug.no/~peter/pf/. - - - When reading the PF FAQ, - keep in mind that different versions of &os; contain - different versions of PF. - &os; 8.X uses the same - version of PF as - OpenBSD 4.1 and &os; 9.X - and later uses the same version of - PF as OpenBSD 4.5. - + Peter Hansteen maintains a thorough + PF tutorial at http://home.nuug.no/~peter/pf/. + + + When reading the PF FAQ, + keep in mind that different versions of &os; contain + different versions of PF. + &os; 8.X uses the same + version of PF as + OpenBSD 4.1 and &os; 9.X + and later uses the same version of + PF as OpenBSD 4.5. + The &a.pf; is a good place to ask questions about - configuring and running the PF - firewall. Check the mailing list archives - before asking a question as it may have already been answered. + configuring and running the PF + firewall. Check the mailing list archives before asking a + question as it may have already been answered. More information about porting PF to &os; can be found at --> - By default, PF reads its + By default, PF reads its configuration rules from /etc/pf.conf and modifies, drops, or passes packets according to the rules or definitions specified in this file. The &os; installation includes several sample files located in /usr/share/examples/pf/. Refer to the PF - FAQ for complete coverage of - PF rulesets. + FAQ for complete coverage + of PF rulesets. To control PF, use - pfctl. summarizes some useful options to this command. - Refer to &man.pfctl.8; for a description of all available - options: + pfctl. summarizes + some useful options to this command. Refer to &man.pfctl.8; + for a description of all available options: Useful <command>pfctl</command> Options @@ -404,15 +404,16 @@ device pfsync pfctl -F all -f /etc/pf.conf - Flush all NAT, filter, state, and table - rules and reload + Flush all NAT, filter, state, + and table rules and reload /etc/pf.conf. pfctl -s [ rules | nat state ] - Report on the filter rules, NAT rules, or state + Report on the filter rules, + NAT rules, or state table. From owner-svn-doc-head@FreeBSD.ORG Fri Feb 14 20:37:26 2014 Return-Path: Delivered-To: svn-doc-head@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 ESMTPS id 750E3F46; Fri, 14 Feb 2014 20:37:26 +0000 (UTC) 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 433651450; Fri, 14 Feb 2014 20:37:26 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1EKbQVm022789; Fri, 14 Feb 2014 20:37:26 GMT (envelope-from dru@svn.freebsd.org) Received: (from dru@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1EKbQ44022788; Fri, 14 Feb 2014 20:37:26 GMT (envelope-from dru@svn.freebsd.org) Message-Id: <201402142037.s1EKbQ44022788@svn.freebsd.org> From: Dru Lavigne Date: Fri, 14 Feb 2014 20:37:26 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r43928 - head/en_US.ISO8859-1/books/handbook/firewalls X-SVN-Group: doc-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the doc tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Feb 2014 20:37:26 -0000 Author: dru Date: Fri Feb 14 20:37:25 2014 New Revision: 43928 URL: http://svnweb.freebsd.org/changeset/doc/43928 Log: Tighten up this subsection. Sponsored by: iXsystems Modified: head/en_US.ISO8859-1/books/handbook/firewalls/chapter.xml Modified: head/en_US.ISO8859-1/books/handbook/firewalls/chapter.xml ============================================================================== --- head/en_US.ISO8859-1/books/handbook/firewalls/chapter.xml Fri Feb 14 18:53:20 2014 (r43927) +++ head/en_US.ISO8859-1/books/handbook/firewalls/chapter.xml Fri Feb 14 20:37:25 2014 (r43928) @@ -540,104 +540,87 @@ options ALTQ_PRIQ # Priori This section demonstrates how to create a customized - ruleset, using several examples. - - The simplest possible setup is for a single machine - which will not run any services, and which will talk to one - network which may be the Internet. A minimal - /etc/pf.conf looks like this: + ruleset. It starts with the simplest of rulesets and builds + upon its concepts using several examples to demonstrate + real-world usage of PF's many + features. + + The simplest possible ruleset is for a single machine + that does not run any services and which needs access to one + network, which may be the Internet. To create this minimal + ruleset, edit + /etc/pf.conf so it looks like this: block in all pass out all keep state - Here we deny any incoming traffic, allow traffic we make - ourselves to pass, and retain state information on our - connections. Keeping state information allows return - traffic for all connections we have initiated to pass back - to us. This rule set is used on machines that can be - trusted. The rule set can be loaded with + The first rule denies all incoming traffic by default. + The second rule allows + connections created by this system + to pass out, while retaining state information on those + connections. This state information allows return + traffic for those connections to pass back and + should only be used on machines that can be + trusted. The ruleset can be loaded with: &prompt.root; pfctl -e ; pfctl -f /etc/pf.conf - For a slightly more structured and complete setup, we - start by denying everything and then allowing only those - things we know that we need - Why write the rule set to default deny? The - short answer is, it gives better control at the expense - of some thinking. The point of packet filtering is to - take control, not to run catch-up with what the bad guys - do. Marcus Ranum has written a very entertaining and - informative article about this, The - Six Dumbest Ideas in Computer Security, and - it is well written too.. This gives - us the opportunity to introduce two of the features which - make PF such a wonderful tool: + In addition to keeping state, + PF provides lists and - macros. - - We will make some changes to - /etc/pf.conf, starting with - - block all - - Then we back up a little. Macros need to be defined - before use, so at the very top of the file, we add: + macros which can be defined for use + when creating rules. Macros can include lists and need to be defined + before use. As an example, insert these lines at the + very top of the ruleset: tcp_services = "{ ssh, smtp, domain, www, pop3, auth, pop3s }" udp_services = "{ domain }" - Now we have demonstrated several things at once - what - macros look like, that macros may be lists, and that - PF understands rules using port - names equally well as it does port numbers. The names are - the ones listed in /etc/services. This - gives us something to put in our rules, which we edit - slightly to look like this: + PF understands port + names as well as port numbers, as long as the names are listed + in /etc/services. This example + creates two macros. The first is a list of seven + TCP port names and the second is one + UDP port name. Once defined, macros can + be used in rules. In this example, all traffic is blocked + except for the connections initiated by this system for the + seven specified TCP services and the one + specified UDP service: - block all + tcp_services = "{ ssh, smtp, domain, www, pop3, auth, pop3s }" +udp_services = "{ domain }" +block all pass out proto tcp to any port $tcp_services keep state pass proto udp to any port $udp_services keep state - At this point some of us will point out that UDP is - stateless, but PF actually - manages to maintain state information despite this. Keeping - state for a UDP connection means that for example when you - ask a name server about a domain name, you will be able to - receive its answer. - - Since we have made changes to our - pf.conf, we load the new - rules: + Even though UDP is considered to be + a stateless protocol, PF + is able to track some state information. For example, when a + UDP request is passed which + asks a name server about a domain name, PF + will watch for the response in order to pass it back. + + Whenever an edit is made to a ruleset, the new rules + must be loaded so they can be used: &prompt.root; pfctl -f /etc/pf.conf - and the new rules are applied. If there are no syntax + If there are no syntax errors, pfctl will not output any - messages during the rule load. The flag - will produce more verbose pfctl - output. - - If there have been extensive changes to the rule set, - the rules can be tested before attempting to load them. The - command to do this is + messages during the rule load. Rules can also be tested before attempting to load them: &prompt.root; pfctl -nf /etc/pf.conf - causes the rules to be interpreted - only, but does not load them. This provides an opportunity - to correct any errors. Under any circumstances, the last - valid rule set loaded will be in force until - PF is disabled or a new rule set + Including causes the rules to be interpreted + only, but not loaded. This provides an opportunity + to correct any errors. At all times, the last + valid ruleset loaded will be enforced until either + PF is disabled or a new ruleset is loaded. - Use <command>pfctl -v</command> to Show the Parsed - Rule Set - - Adding the to a - pfctl ruleset load (even a dry run with - ) will display the fully parsed rules + Adding to a + pfctl ruleset verify or load will display the fully parsed rules exactly the way they will be loaded. This is extremely useful when debugging rules. @@ -699,10 +682,10 @@ pass proto udp to any port $udp_services good these days, and we will get back to them later. For now we just accept the fact that for simple setups, interface-bound rules with in/out rules tend to add more - clutter than they are worth to rule sets. + clutter than they are worth to rulesets. - For a busy network admin, a readable rule set is a - safer rule set. + For a busy network admin, a readable ruleset is a + safer ruleset. For the remainder of this section, with some exceptions, we will keep the rules as simple as possible @@ -713,7 +696,7 @@ pass proto udp to any port $udp_services Above, we introduced the interface:network notation. That is a - nice piece of shorthand, but the rule set can be made even + nice piece of shorthand, but the ruleset can be made even more readable and maintainable by taking the macro use a tiny bit further. @@ -809,7 +792,7 @@ pass from { lo0, $localnet } to any keep the last time during this tutorial we will find this of any interest whatsoever. In truly simple setups like this one, we may not gain very much by using macros like these, - but once the rule sets grow somewhat larger, you will + but once the rulesets grow somewhat larger, you will learn to appreciate the readability this provides. Also note the nat rule. This is @@ -825,7 +808,7 @@ pass from { lo0, $localnet } to any keep interruptions even if the external IP address changes. - On the other hand, this rule set probably allows more + On the other hand, this ruleset probably allows more traffic to pass out of the network than actually desired. One reasonable setup could contain the macro @@ -866,9 +849,9 @@ pass from { lo0, $localnet } to any keep pass quick inet proto { tcp, udp } to any port $udp_services keep state Note the quick keyword in this - rule. We have started writing rule sets which consist of + rule. We have started writing rulesets which consist of several rules, and it is time to take a look at the - relationships between the rules in a rule set. The rules + relationships between the rules in a ruleset. The rules are evaluated from top to bottom, in the sequence they are written in the configuration file. For each packet or connection evaluated by PF, @@ -1083,7 +1066,7 @@ rdr-anchor "ftp-proxy/*"One of the early workarounds was to simply block either all ICMP traffic or at least ICMP ECHO, which is what ping uses. Now - these rule sets have been around for roughly fifteen years, + these rulesets have been around for roughly fifteen years, and the people who put them there are still scared. @@ -1128,7 +1111,7 @@ pass inet proto icmp from any to $ext_if Letting <command>ping</command> Through - The rule set we have developed so far has one clear + The ruleset we have developed so far has one clear disadvantage: common troubleshooting commands such as &man.ping.8; and &man.traceroute.8; will not work. That may not matter too much to end users, and since it was @@ -1138,9 +1121,9 @@ pass inet proto icmp from any to $ext_if we are better off without it. If you are in my perceived target audience, you will be rather fond of having those troubleshooting tools avalable. With a couple of small - additions to the rule set, they will be. &man.ping.8; + additions to the ruleset, they will be. &man.ping.8; uses ICMP, and in order to keep our - rule set tidy, we start by defining another macro: + ruleset tidy, we start by defining another macro: icmp_types = "echoreq" @@ -1261,7 +1244,7 @@ pass out on $ext_if inet proto udp from Quite right, and PF offers mechanisms for handling these situations as well. Tables are one such feature, mainly useful as lists which can be - manipulated without needing to reload the entire rule set, + manipulated without needing to reload the entire ruleset, and where fast lookups are desirable. Table names are always enclosed in < >, like this: @@ -1361,7 +1344,7 @@ Sep 26 03:12:44 skapet sshd[24703]: Fail table <bruteforce> persist - Then somewhere fairly early in the rule set, add a rule + Then somewhere fairly early in the ruleset, add a rule to block the bruteforcers: block quick from <bruteforce> @@ -1598,7 +1581,7 @@ Sep 26 03:12:44 skapet sshd[24703]: Fail - Next, edit the rule set to include + Next, edit the ruleset to include table <spamd> persist table <spamd-white> persist @@ -1698,7 +1681,7 @@ rdr pass on $ext_if inet proto tcp from spamd_flags="-v" # for normal use: "" and see spamd-setup(8) When done with editing the setup, - reload the rule set, start + reload the ruleset, start spamd with the options desired using the /usr/local/etc/rc.d/obspamd From owner-svn-doc-head@FreeBSD.ORG Fri Feb 14 21:04:16 2014 Return-Path: Delivered-To: svn-doc-head@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 ESMTPS id 7CB1AC47; Fri, 14 Feb 2014 21:04:16 +0000 (UTC) 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 668A11717; Fri, 14 Feb 2014 21:04:16 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1EL4G6k034349; Fri, 14 Feb 2014 21:04:16 GMT (envelope-from dru@svn.freebsd.org) Received: (from dru@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1EL4GL6034348; Fri, 14 Feb 2014 21:04:16 GMT (envelope-from dru@svn.freebsd.org) Message-Id: <201402142104.s1EL4GL6034348@svn.freebsd.org> From: Dru Lavigne Date: Fri, 14 Feb 2014 21:04:16 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r43929 - head/en_US.ISO8859-1/books/handbook/firewalls X-SVN-Group: doc-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the doc tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Feb 2014 21:04:16 -0000 Author: dru Date: Fri Feb 14 21:04:15 2014 New Revision: 43929 URL: http://svnweb.freebsd.org/changeset/doc/43929 Log: Initial prep work on NAT gateway section. Still a WIP. Sponsored by: iXsystems Modified: head/en_US.ISO8859-1/books/handbook/firewalls/chapter.xml Modified: head/en_US.ISO8859-1/books/handbook/firewalls/chapter.xml ============================================================================== --- head/en_US.ISO8859-1/books/handbook/firewalls/chapter.xml Fri Feb 14 20:37:25 2014 (r43928) +++ head/en_US.ISO8859-1/books/handbook/firewalls/chapter.xml Fri Feb 14 21:04:15 2014 (r43929) @@ -628,25 +628,14 @@ pass proto udp to any port $udp_services A Simple Gateway with NAT - To most users, a single machine setup will be of limited - interest, and at this point we move on to more realistic or - at least more common setups, concentrating on a machine + This section demonstrates how to configure a &os; system which is running PF and also acts - as a gateway for at least one other machine. + as a gateway for at least one other machine. The gateway + has at least two network interfaces, each connected to a + separate network. For example, one connection is to the + Internet and the other is to the internal network. - In the single machine setup, life is relatively - simple. Traffic created on it should either pass out to - the rest of the world or not, and the administrator - decides what to let in from elsewhere. - - On a gateway, the perspective changes from - me versus the network out there to - I am the one who decides what to pass to or from - all the networks I am connected to. The machine - has at least two network interfaces, each connected to a - separate net. - - It is very reasonable to think that for traffic to + It is reasonable to think that for stateful traffic to pass from the network connected to xl1 to hosts on the network connected to xl0, a rule like @@ -654,46 +643,32 @@ pass proto udp to any port $udp_services pass in on xl1 from xl1:network to xl0:network port $ports keep state - This rule keeps track of states as well. - - However, one of the most common and most - complained-about mistakes in firewall configuration is not - realizing that the to keyword does not in - itself guarantee passage all the way there. The rule we - just wrote only lets the traffic pass in to the gateway on - the internal interface. To let the packets get a bit - further, a matching rule is needed which says + However, the to keyword does + guarantee passage all the way from source to destination. This rule + only lets the traffic pass in to the gateway on + the internal interface. To let the packets go + further, a matching rule is needed: pass out on xl0 from xl1:network to xl0:network port $ports keep state These rules will work, but they will not necessarily achieve the desired effect. - Rules this specific are rarely needed. For the basic - gateway configurations we will be dealing with here, a - better rule says + Rules this specific are rarely needed. A + better rule says: pass from xl1:network to any port $ports keep state - This provides local net access to the Internet and + This provides local network access to the Internet and leaves the detective work to the antispoof and - scrub code. They are both pretty - good these days, and we will get back to them later. For - now we just accept the fact that for simple setups, - interface-bound rules with in/out rules tend to add more - clutter than they are worth to rulesets. + scrub code. For a busy network admin, a readable ruleset is a - safer ruleset. - - For the remainder of this section, with some + safer ruleset. For the remainder of this section, with some exceptions, we will keep the rules as simple as possible for readability. - - What is the Local Network, Anyway? - Above, we introduced the interface:network notation. That is a nice piece of shorthand, but the ruleset can be made even @@ -720,21 +695,6 @@ pass proto udp to any port $udp_services could end up saving you a few headaches. We will stick to that convention from here on. - - - - Setting Up - - We assume that the machine has acquired another - network card or at any rate there is a network - connection from the local network, via PPP or other - means. We will not consider the specific interface - configurations. - - For the discussion and examples below, only the - interface names will differ between a PPP setup and an - Ethernet one, and we will do our best to get rid of the - actual interface names as quickly as possible. First, we need to turn on gatewaying in order to let the machine forward the network traffic it receives on one @@ -820,25 +780,13 @@ pass from { lo0, $localnet } to any keep pass inet proto tcp from $localnet to any port $client_out \ flags S/SA keep state - This may be a somewhat peculiar selection of ports, - but it is based on a real life example. Individual needs - probably differ at least in some specifics, but this - should cover at least some of the more useful - services. - - In addition, we have a few other pass rules. We will - be returning to some of the more interesting ones rather - soon. One pass rule which is useful to those of us who - want the ability to administer our machines from elsewhere - is - - pass in inet proto tcp to port ssh - - or for that matter + In addition, we have a few other pass rules. One pass rule which is useful for + administering machines remotely + is: pass in inet proto tcp to $ext_if port ssh - whichever is preferred. Lastly we need to make the + Lastly we need to make the name service work for our clients: udp_services = "{ domain, ntp }" @@ -870,11 +818,10 @@ pass from { lo0, $localnet } to any keep to both protocols is that they may under certain circumstances communicate alternately over TCP and UDP. - - That Sad Old <acronym>FTP</acronym> Thing + Creating an <acronym>FTP</acronym> Proxy The short list of real life TCP ports above contained, among other things, FTP. @@ -923,10 +870,6 @@ pass from { lo0, $localnet } to any keep program which is written specifically for this purpose. - - <acronym>FTP</acronym> Via Redirect: - <application>ftp-proxy</application> - Enabling FTP transfers through your gateway is amazingly simple, thanks to the FTP proxy program (called @@ -1015,11 +958,10 @@ rdr-anchor "ftp-proxy/*"ftp-proxy in reverse mode (using ), on a separate port with its own redirecting pass rule. - - Easing Troubleshooting + Managing <acronym>ICMP</acronym> Making network troubleshooting friendly is a potentially large subject. At most times, the debugging or @@ -1069,9 +1011,6 @@ rdr-anchor "ftp-proxy/*" - - Then, Do We Let it All Through? - The obvious question then becomes, if ICMP is such a good and useful thing, should we not let it all through, all the time? The @@ -1090,10 +1029,6 @@ rdr-anchor "ftp-proxy/*"ICMP traffic might be found quite harmlessly riding piggyback on keep state rules. - - - - The Easy Way Out: the Buck Stops Here The easiest solution could very well be to let all ICMP traffic from the local net through @@ -1106,7 +1041,6 @@ pass inet proto icmp from any to $ext_if option anyway, but let us have a look at a few other options which will show some of PF's flexibility. - Letting <command>ping</command> Through From owner-svn-doc-head@FreeBSD.ORG Fri Feb 14 21:22:51 2014 Return-Path: Delivered-To: svn-doc-head@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 ESMTPS id 92364236; Fri, 14 Feb 2014 21:22:51 +0000 (UTC) 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 7A775187B; Fri, 14 Feb 2014 21:22:51 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1ELMp8Q042237; Fri, 14 Feb 2014 21:22:51 GMT (envelope-from dru@svn.freebsd.org) Received: (from dru@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1ELMpNH042236; Fri, 14 Feb 2014 21:22:51 GMT (envelope-from dru@svn.freebsd.org) Message-Id: <201402142122.s1ELMpNH042236@svn.freebsd.org> From: Dru Lavigne Date: Fri, 14 Feb 2014 21:22:51 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r43930 - head/en_US.ISO8859-1/books/handbook/firewalls X-SVN-Group: doc-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the doc tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Feb 2014 21:22:51 -0000 Author: dru Date: Fri Feb 14 21:22:51 2014 New Revision: 43930 URL: http://svnweb.freebsd.org/changeset/doc/43930 Log: White space fix only. Translators can ignore. Sponsored by: iXsystems Modified: head/en_US.ISO8859-1/books/handbook/firewalls/chapter.xml Modified: head/en_US.ISO8859-1/books/handbook/firewalls/chapter.xml ============================================================================== --- head/en_US.ISO8859-1/books/handbook/firewalls/chapter.xml Fri Feb 14 21:04:15 2014 (r43929) +++ head/en_US.ISO8859-1/books/handbook/firewalls/chapter.xml Fri Feb 14 21:22:51 2014 (r43930) @@ -545,85 +545,84 @@ options ALTQ_PRIQ # Priori real-world usage of PF's many features. - The simplest possible ruleset is for a single machine - that does not run any services and which needs access to one - network, which may be the Internet. To create this minimal - ruleset, edit - /etc/pf.conf so it looks like this: + The simplest possible ruleset is for a single machine + that does not run any services and which needs access to one + network, which may be the Internet. To create this minimal + ruleset, edit /etc/pf.conf so it looks + like this: - block in all + block in all pass out all keep state - The first rule denies all incoming traffic by default. - The second rule allows - connections created by this system - to pass out, while retaining state information on those - connections. This state information allows return - traffic for those connections to pass back and - should only be used on machines that can be - trusted. The ruleset can be loaded with: - - &prompt.root; pfctl -e ; pfctl -f /etc/pf.conf - - In addition to keeping state, - PF provides - lists and - macros which can be defined for use - when creating rules. Macros can include lists and need to be defined - before use. As an example, insert these lines at the - very top of the ruleset: + The first rule denies all incoming traffic by default. + The second rule allows connections created by this system to + pass out, while retaining state information on those + connections. This state information allows return traffic for + those connections to pass back and should only be used on + machines that can be trusted. The ruleset can be loaded + with: + + &prompt.root; pfctl -e ; pfctl -f /etc/pf.conf + + In addition to keeping state, + PF provides + lists and + macros which can be defined for use + when creating rules. Macros can include lists and need to be + defined before use. As an example, insert these lines at the + very top of the ruleset: - tcp_services = "{ ssh, smtp, domain, www, pop3, auth, pop3s }" + tcp_services = "{ ssh, smtp, domain, www, pop3, auth, pop3s }" udp_services = "{ domain }" - PF understands port - names as well as port numbers, as long as the names are listed - in /etc/services. This example - creates two macros. The first is a list of seven - TCP port names and the second is one - UDP port name. Once defined, macros can - be used in rules. In this example, all traffic is blocked - except for the connections initiated by this system for the - seven specified TCP services and the one - specified UDP service: + PF understands port names as + well as port numbers, as long as the names are listed in + /etc/services. This example creates two + macros. The first is a list of seven + TCP port names and the second is one + UDP port name. Once defined, macros can be + used in rules. In this example, all traffic is blocked except + for the connections initiated by this system for the seven + specified TCP services and the one + specified UDP service: - tcp_services = "{ ssh, smtp, domain, www, pop3, auth, pop3s }" + tcp_services = "{ ssh, smtp, domain, www, pop3, auth, pop3s }" udp_services = "{ domain }" block all pass out proto tcp to any port $tcp_services keep state pass proto udp to any port $udp_services keep state - Even though UDP is considered to be - a stateless protocol, PF - is able to track some state information. For example, when a - UDP request is passed which - asks a name server about a domain name, PF - will watch for the response in order to pass it back. - - Whenever an edit is made to a ruleset, the new rules - must be loaded so they can be used: - - &prompt.root; pfctl -f /etc/pf.conf + Even though UDP is considered to be a + stateless protocol, PF is able to + track some state information. For example, when a + UDP request is passed which asks a name + server about a domain name, PF will + watch for the response in order to pass it back. + + Whenever an edit is made to a ruleset, the new rules must + be loaded so they can be used: + + &prompt.root; pfctl -f /etc/pf.conf + + If there are no syntax errors, pfctl + will not output any messages during the rule load. Rules can + also be tested before attempting to load them: + + &prompt.root; pfctl -nf /etc/pf.conf + + Including causes the rules to be + interpreted only, but not loaded. This provides an + opportunity to correct any errors. At all times, the last + valid ruleset loaded will be enforced until either + PF is disabled or a new ruleset is + loaded. - If there are no syntax - errors, pfctl will not output any - messages during the rule load. Rules can also be tested before attempting to load them: - - &prompt.root; pfctl -nf /etc/pf.conf - - Including causes the rules to be interpreted - only, but not loaded. This provides an opportunity - to correct any errors. At all times, the last - valid ruleset loaded will be enforced until either - PF is disabled or a new ruleset - is loaded. - - - Adding to a - pfctl ruleset verify or load will display the fully parsed rules - exactly the way they will be loaded. This is extremely - useful when debugging rules. - + + Adding to a pfctl + ruleset verify or load will display the fully parsed rules + exactly the way they will be loaded. This is extremely + useful when debugging rules. + A Simple Gateway with NAT @@ -635,111 +634,109 @@ pass proto udp to any port $udp_services separate network. For example, one connection is to the Internet and the other is to the internal network. - It is reasonable to think that for stateful traffic to - pass from the network connected to - xl1 to hosts on the network - connected to xl0, a rule like - this is needed: - - pass in on xl1 from xl1:network to xl0:network port $ports keep state - - However, the to keyword does - guarantee passage all the way from source to destination. This rule - only lets the traffic pass in to the gateway on - the internal interface. To let the packets go - further, a matching rule is needed: - - pass out on xl0 from xl1:network to xl0:network port $ports keep state - - These rules will work, but they will not necessarily - achieve the desired effect. - - Rules this specific are rarely needed. A - better rule says: - - pass from xl1:network to any port $ports keep state - - This provides local network access to the Internet and - leaves the detective work to the - antispoof and - scrub code. - - For a busy network admin, a readable ruleset is a - safer ruleset. For the remainder of this section, with some - exceptions, we will keep the rules as simple as possible - for readability. - - Above, we introduced the - interface:network notation. That is a - nice piece of shorthand, but the ruleset can be made even - more readable and maintainable by taking the macro use a - tiny bit further. - - For example, a $localnet macro - could be defined as the network directly attached to your - internal interface ($xl1:network in the - examples above). - - Alternatively, the definition of - $localnet could be changed to an - IP address/netmask notation to denote - a network, such as 192.168.100.1/24 for - a subnet of private addresses. - - If required, $localnet could even - be defined as a list of networks. Whatever the specific - needs, a sensible $localnet definition - and a typical pass rule of the type - - pass from $localnet to any port $ports keep state - - could end up saving you a few headaches. We will - stick to that convention from here on. - - First, we need to turn on gatewaying in order to let - the machine forward the network traffic it receives on one - interface to other networks via a separate interface. - Initially we will do this on the command line with - &man.sysctl.8;, for traditional - IP version four. - - &prompt.root; sysctl net.inet.ip.forwarding=1 - - If we need to forward IP version - six traffic, the command is - - &prompt.root; sysctl net.inet6.ip6.forwarding=1 - - In order for this to continue working after the - computer has been restarted at some time in the future, - enter these settings into - /etc/rc.conf: + It is reasonable to think that for stateful traffic to + pass from the network connected to xl1 + to hosts on the network connected to + xl0, a rule like this is needed: + + pass in on xl1 from xl1:network to xl0:network port $ports keep state + + However, the to keyword does + guarantee passage all the way from source to destination. + This rule only lets the traffic pass in to the gateway on + the internal interface. To let the packets go further, a + matching rule is needed: + + pass out on xl0 from xl1:network to xl0:network port $ports keep state + + These rules will work, but they will not necessarily + achieve the desired effect. + + Rules this specific are rarely needed. A better rule + says: + + pass from xl1:network to any port $ports keep state + + This provides local network access to the Internet and + leaves the detective work to the + antispoof and + scrub code. + + For a busy network admin, a readable ruleset is a safer + ruleset. For the remainder of this section, with some + exceptions, we will keep the rules as simple as possible + for readability. + + Above, we introduced the + interface:network notation. That is a + nice piece of shorthand, but the ruleset can be made even + more readable and maintainable by taking the macro use a + tiny bit further. + + For example, a $localnet macro could + be defined as the network directly attached to your + internal interface ($xl1:network in the + examples above). + + Alternatively, the definition of + $localnet could be changed to an + IP address/netmask notation to denote + a network, such as 192.168.100.1/24 for + a subnet of private addresses. + + If required, $localnet could even be + defined as a list of networks. Whatever the specific needs, + a sensible $localnet definition and a + typical pass rule of the type + + pass from $localnet to any port $ports keep state + + could end up saving you a few headaches. We will stick + to that convention from here on. + + First, we need to turn on gatewaying in order to let the + machine forward the network traffic it receives on one + interface to other networks via a separate interface. + Initially we will do this on the command line with + &man.sysctl.8;, for traditional IP version + four. + + &prompt.root; sysctl net.inet.ip.forwarding=1 + + If we need to forward IP version + six traffic, the command is + + &prompt.root; sysctl net.inet6.ip6.forwarding=1 + + In order for this to continue working after the + computer has been restarted at some time in the future, + enter these settings into + /etc/rc.conf: - gateway_enable="YES" #for ipv4 + gateway_enable="YES" #for ipv4 ipv6_gateway_enable="YES" #for ipv6 - Use ifconfig -a, or - ifconfig - interface_name to - find out if both of the interfaces to be used are up and - running. - - If all traffic initiated by machines on the inside is - to be allowed, /etc/pf.conf could - look roughly like this - - For dialup users, the external interface is the - tun0 pseudo-device. Broadband - users such as ADSL subscribers tend to have an - Ethernet interface to play with, however for a - significant subset of ADSL users, specifically those - using PPP over Ethernet (PPPoE), the correct external - interface will be the tun0 - pseudo-device, not the physical Ethernet - interface. - : + Use ifconfig -a, or + ifconfig interface_name to find out if + both of the interfaces to be used are up and + running. + + If all traffic initiated by machines on the inside is to + be allowed, /etc/pf.conf could look + roughly like this + + For dialup users, the external interface is the + tun0 pseudo-device. Broadband + users such as ADSL subscribers tend to have an + Ethernet interface to play with, however for a + significant subset of ADSL users, specifically those + using PPP over Ethernet (PPPoE), the correct external + interface will be the tun0 + pseudo-device, not the physical Ethernet + interface. + : - ext_if = "xl0" # macro for external interface - use tun0 for PPPoE + ext_if = "xl0" # macro for external interface - use tun0 for PPPoE int_if = "xl1" # macro for internal interface localnet = $int_if:network # ext_if IP address could be dynamic, hence ($ext_if) @@ -747,77 +744,77 @@ nat on $ext_if from $localnet to any -&g block all pass from { lo0, $localnet } to any keep state - Note the use of macros to assign logical names to the - network interfaces. Here 3Com cards are used, but this is - the last time during this tutorial we will find this of - any interest whatsoever. In truly simple setups like this - one, we may not gain very much by using macros like these, - but once the rulesets grow somewhat larger, you will - learn to appreciate the readability this provides. - - Also note the nat rule. This is - where we handle the network address translation from the - non-routable address inside the local net to the sole - official address we assume has been assigned. - - The parentheses surrounding the last part of the nat - rule ($ext_if) are there to compensate - for the possibility that the IP address of the external - interface may be dynamically assigned. This detail will - ensure that network traffic runs without serious - interruptions even if the external IP address - changes. - - On the other hand, this ruleset probably allows more - traffic to pass out of the network than actually desired. - One reasonable setup could contain the macro + Note the use of macros to assign logical names to the + network interfaces. Here 3Com cards are used, but this is + the last time during this tutorial we will find this of + any interest whatsoever. In truly simple setups like this + one, we may not gain very much by using macros like these, + but once the rulesets grow somewhat larger, you will + learn to appreciate the readability this provides. + + Also note the nat rule. This is + where we handle the network address translation from the + non-routable address inside the local net to the sole + official address we assume has been assigned. + + The parentheses surrounding the last part of the nat + rule ($ext_if) are there to compensate + for the possibility that the IP address of the external + interface may be dynamically assigned. This detail will + ensure that network traffic runs without serious + interruptions even if the external IP address + changes. + + On the other hand, this ruleset probably allows more + traffic to pass out of the network than actually desired. + One reasonable setup could contain the macro - client_out = "{ ftp-data, ftp, ssh, domain, pop3, auth, nntp, http, \ + client_out = "{ ftp-data, ftp, ssh, domain, pop3, auth, nntp, http, \ https, cvspserver, 2628, 5999, 8000, 8080 }" - and the main pass rule + and the main pass rule - pass inet proto tcp from $localnet to any port $client_out \ + pass inet proto tcp from $localnet to any port $client_out \ flags S/SA keep state - In addition, we have a few other pass rules. One pass rule which is useful for - administering machines remotely - is: - - pass in inet proto tcp to $ext_if port ssh - - Lastly we need to make the - name service work for our clients: - - udp_services = "{ domain, ntp }" - - This is supplemented with a rule which passes the - traffic we want through our firewall: - - pass quick inet proto { tcp, udp } to any port $udp_services keep state - - Note the quick keyword in this - rule. We have started writing rulesets which consist of - several rules, and it is time to take a look at the - relationships between the rules in a ruleset. The rules - are evaluated from top to bottom, in the sequence they are - written in the configuration file. For each packet or - connection evaluated by PF, - the last matching rule in the rule - set is the one which is applied. The - quick keyword offers an escape from the - ordinary sequence. When a packet matches a quick rule, - the packet is treated according to the present rule. The - rule processing stops without considering any further - rules which might have matched the packet. This is very - useful when a few isolated exceptions to the general rules - are needed. - - This rule also takes care of NTP, - which is used for time synchronization. One thing common - to both protocols is that they may under certain - circumstances communicate alternately over TCP and - UDP. + In addition, we have a few other pass rules. One pass + rule which is useful for administering machines remotely + is: + + pass in inet proto tcp to $ext_if port ssh + + Lastly we need to make the name service work for our + clients: + + udp_services = "{ domain, ntp }" + + This is supplemented with a rule which passes the + traffic we want through our firewall: + + pass quick inet proto { tcp, udp } to any port $udp_services keep state + + Note the quick keyword in this + rule. We have started writing rulesets which consist of + several rules, and it is time to take a look at the + relationships between the rules in a ruleset. The rules + are evaluated from top to bottom, in the sequence they are + written in the configuration file. For each packet or + connection evaluated by PF, + the last matching rule in the rule + set is the one which is applied. The + quick keyword offers an escape from the + ordinary sequence. When a packet matches a quick rule, + the packet is treated according to the present rule. The + rule processing stops without considering any further + rules which might have matched the packet. This is very + useful when a few isolated exceptions to the general rules + are needed. + + This rule also takes care of NTP, + which is used for time synchronization. One thing common + to both protocols is that they may under certain + circumstances communicate alternately over TCP and + UDP. @@ -870,94 +867,94 @@ pass from { lo0, $localnet } to any keep program which is written specifically for this purpose. - Enabling FTP transfers through your - gateway is amazingly simple, thanks to the - FTP proxy program (called - &man.ftp-proxy.8;) included in the base system on &os; and - other systems which offer - PF. - - The FTP protocol being what it is, - the proxy needs to dynamically insert rules in your rule - set. &man.ftp-proxy.8; interacts with your configuration - via a set of anchors where the proxy inserts and deletes - the rules it constructs to handle your - FTP traffic. + Enabling FTP transfers through your + gateway is amazingly simple, thanks to the + FTP proxy program (called + &man.ftp-proxy.8;) included in the base system on &os; and + other systems which offer + PF. + + The FTP protocol being what it is, + the proxy needs to dynamically insert rules in your rule + set. &man.ftp-proxy.8; interacts with your configuration + via a set of anchors where the proxy inserts and deletes + the rules it constructs to handle your + FTP traffic. - To enable &man.ftp-proxy.8;, add this line to + To enable &man.ftp-proxy.8;, add this line to /etc/rc.conf: - ftpproxy_enable="YES" + ftpproxy_enable="YES" - Starting the proxy manually by running - /usr/sbin/ftp-proxy allows testing of - the PF configuration changes we - are about to make. - - For a basic configuration, only three elements need to - be added to /etc/pf.conf. First, the - anchors: + Starting the proxy manually by running + /usr/sbin/ftp-proxy allows testing of + the PF configuration changes we + are about to make. + + For a basic configuration, only three elements need to + be added to /etc/pf.conf. First, the + anchors: - nat-anchor "ftp-proxy/*" + nat-anchor "ftp-proxy/*" rdr-anchor "ftp-proxy/*" - The proxy will insert the rules it generates for the - FTP sessions here. A pass rule is - needed to let FTP traffic in to the - proxy. - - Now for the actual redirection. Redirection rules and - NAT rules fall into the same rule - class. These rules may be referenced directly by other - rules, and filtering rules may depend on these rules. - Logically, rdr and - nat rules need to be defined before the - filtering rules. - - We insert our rdr rule immediately - after the nat rule in - /etc/pf.conf - - rdr pass on $int_if proto tcp from any to any port ftp -> 127.0.0.1 port 8021 - - In addition, the redirected traffic must be allowed to - pass. We achieve this with - - pass out proto tcp from $proxy to any port ftp - - where $proxy expands to the address - the proxy daemon is bound to. - - Save pf.conf, then load the new - rules with - - &prompt.root; pfctl -f /etc/pf.conf - - At this point, users will probably begin noticing - that FTP works before they have been - told. - - This example covers a basic setup where the clients in - the local net need to contact FTP - servers elsewhere. The basic configuration here should - work well with most combinations of FTP - clients and servers. As shown in the man page, the - proxy's behavior can be changed in various ways by adding - options to the ftpproxy_flags= line. - Some clients or servers may have specific quirks that must - be compensated for in the configuration, or there may be a - need to integrate the proxy in specific ways such as - assigning FTP traffic to a specific - queue. For these and other finer points of - &man.ftp-proxy.8; configuration, start by studying the man - page. - - For ways to run an FTP server - protected by PF and - &man.ftp-proxy.8;, look into running a separate - ftp-proxy in reverse mode (using - ), on a separate port with its own - redirecting pass rule. + The proxy will insert the rules it generates for the + FTP sessions here. A pass rule is + needed to let FTP traffic in to the + proxy. + + Now for the actual redirection. Redirection rules and + NAT rules fall into the same rule + class. These rules may be referenced directly by other + rules, and filtering rules may depend on these rules. + Logically, rdr and + nat rules need to be defined before the + filtering rules. + + We insert our rdr rule immediately + after the nat rule in + /etc/pf.conf + + rdr pass on $int_if proto tcp from any to any port ftp -> 127.0.0.1 port 8021 + + In addition, the redirected traffic must be allowed to + pass. We achieve this with + + pass out proto tcp from $proxy to any port ftp + + where $proxy expands to the address + the proxy daemon is bound to. + + Save pf.conf, then load the new + rules with + + &prompt.root; pfctl -f /etc/pf.conf + + At this point, users will probably begin noticing + that FTP works before they have been + told. + + This example covers a basic setup where the clients in + the local net need to contact FTP + servers elsewhere. The basic configuration here should + work well with most combinations of FTP + clients and servers. As shown in the man page, the + proxy's behavior can be changed in various ways by adding + options to the ftpproxy_flags= line. + Some clients or servers may have specific quirks that must + be compensated for in the configuration, or there may be a + need to integrate the proxy in specific ways such as + assigning FTP traffic to a specific + queue. For these and other finer points of + &man.ftp-proxy.8; configuration, start by studying the man + page. + + For ways to run an FTP server + protected by PF and + &man.ftp-proxy.8;, look into running a separate + ftp-proxy in reverse mode (using + ), on a separate port with its own + redirecting pass rule. @@ -1011,36 +1008,36 @@ rdr-anchor "ftp-proxy/*" - The obvious question then becomes, if - ICMP is such a good and useful thing, - should we not let it all through, all the time? The - answer is It depends. - - Letting diagnostic traffic pass unconditionally of - course makes debugging easier, but also makes it - relatively easy for others to extract information about - your network. That means that a rule like - - pass inet proto icmp from any to any - - might not be optimal if the internal workings of the - local network should be cloaked in a bit of mystery. In - all fairness it should also be said that some - ICMP traffic might be found quite - harmlessly riding piggyback on - keep state rules. - - The easiest solution could very well be to let all - ICMP traffic from the local net through - and stop probes from elsewhere at the gateway: + The obvious question then becomes, if + ICMP is such a good and useful thing, + should we not let it all through, all the time? The + answer is It depends. + + Letting diagnostic traffic pass unconditionally of + course makes debugging easier, but also makes it + relatively easy for others to extract information about + your network. That means that a rule like + + pass inet proto icmp from any to any + + might not be optimal if the internal workings of the + local network should be cloaked in a bit of mystery. In + all fairness it should also be said that some + ICMP traffic might be found quite + harmlessly riding piggyback on + keep state rules. + + The easiest solution could very well be to let all + ICMP traffic from the local net through + and stop probes from elsewhere at the gateway: - pass inet proto icmp from $localnet to any keep state + pass inet proto icmp from $localnet to any keep state pass inet proto icmp from any to $ext_if keep state - Stopping probes at the gateway might be an attractive - option anyway, but let us have a look at a few other - options which will show some of - PF's flexibility. + Stopping probes at the gateway might be an attractive + option anyway, but let us have a look at a few other + options which will show some of + PF's flexibility. Letting <command>ping</command> Through From owner-svn-doc-head@FreeBSD.ORG Fri Feb 14 21:23:43 2014 Return-Path: Delivered-To: svn-doc-head@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 ESMTPS id 828112B5; Fri, 14 Feb 2014 21:23:43 +0000 (UTC) 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 6DA211886; Fri, 14 Feb 2014 21:23:43 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1ELNhwX042364; Fri, 14 Feb 2014 21:23:43 GMT (envelope-from dru@svn.freebsd.org) Received: (from dru@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1ELNhTP042363; Fri, 14 Feb 2014 21:23:43 GMT (envelope-from dru@svn.freebsd.org) Message-Id: <201402142123.s1ELNhTP042363@svn.freebsd.org> From: Dru Lavigne Date: Fri, 14 Feb 2014 21:23:43 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r43931 - head/en_US.ISO8859-1/books/handbook/firewalls X-SVN-Group: doc-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the doc tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Feb 2014 21:23:43 -0000 Author: dru Date: Fri Feb 14 21:23:42 2014 New Revision: 43931 URL: http://svnweb.freebsd.org/changeset/doc/43931 Log: Fix grammo. Sponsored by: iXsystems Modified: head/en_US.ISO8859-1/books/handbook/firewalls/chapter.xml Modified: head/en_US.ISO8859-1/books/handbook/firewalls/chapter.xml ============================================================================== --- head/en_US.ISO8859-1/books/handbook/firewalls/chapter.xml Fri Feb 14 21:22:51 2014 (r43930) +++ head/en_US.ISO8859-1/books/handbook/firewalls/chapter.xml Fri Feb 14 21:23:42 2014 (r43931) @@ -641,7 +641,7 @@ pass proto udp to any port $udp_services pass in on xl1 from xl1:network to xl0:network port $ports keep state - However, the to keyword does + However, the to keyword does not guarantee passage all the way from source to destination. This rule only lets the traffic pass in to the gateway on the internal interface. To let the packets go further, a From owner-svn-doc-head@FreeBSD.ORG Sat Feb 15 12:59:01 2014 Return-Path: Delivered-To: svn-doc-head@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 ESMTPS id 9B4B5E02; Sat, 15 Feb 2014 12:59:01 +0000 (UTC) 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 6BBB01501; Sat, 15 Feb 2014 12:59:01 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1FCx1cx008865; Sat, 15 Feb 2014 12:59:01 GMT (envelope-from ryusuke@svn.freebsd.org) Received: (from ryusuke@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1FCx1oc008864; Sat, 15 Feb 2014 12:59:01 GMT (envelope-from ryusuke@svn.freebsd.org) Message-Id: <201402151259.s1FCx1oc008864@svn.freebsd.org> From: Ryusuke SUZUKI Date: Sat, 15 Feb 2014 12:59:01 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r43948 - head/ja_JP.eucJP/books/handbook/preface X-SVN-Group: doc-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the doc tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Feb 2014 12:59:01 -0000 Author: ryusuke Date: Sat Feb 15 12:59:00 2014 New Revision: 43948 URL: http://svnweb.freebsd.org/changeset/doc/43948 Log: - Merge the following from the English version: r22118 -> r23288 head/ja_JP.eucJP/books/handbook/preface/preface.xml Modified: head/ja_JP.eucJP/books/handbook/preface/preface.xml Modified: head/ja_JP.eucJP/books/handbook/preface/preface.xml ============================================================================== --- head/ja_JP.eucJP/books/handbook/preface/preface.xml Fri Feb 14 22:31:25 2014 (r43947) +++ head/ja_JP.eucJP/books/handbook/preface/preface.xml Sat Feb 15 12:59:00 2014 (r43948) @@ -3,7 +3,7 @@ The FreeBSD Documentation Project The FreeBSD Japanese Documentation Project - Original revision: r22118 + Original revision: r23288 $FreeBSD$ --> @@ -333,8 +333,8 @@ , ¥»¥­¥å¥ê¥Æ¥£ - FreeBSD ¥·¥¹¥Æ¥à¤ò°ÂÁ´¤ËÊݤĤ¿¤á¤ËÌòΩ¤Ä Kerberos, IPsec, OpenSSH, - ¥Í¥Ã¥È¥ï¡¼¥¯¥Õ¥¡¥¤¥¢¥¦¥©¡¼¥ë¤È¤¤¤Ã¤¿ÍøÍѲÄǽ¤ÊÍÍ¡¹¤Ê¥Ä¡¼¥ë¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Æ¤¤¤Þ¤¹¡£ + FreeBSD ¥·¥¹¥Æ¥à¤ò°ÂÁ´¤ËÊݤĤ¿¤á¤ËÌòΩ¤Ä Kerberos, IPsec ¤ª¤è¤Ó + OpenSSH ¤È¤¤¤Ã¤¿ÍøÍѲÄǽ¤Ê¤µ¤Þ¤¶¤Þ¤Ê¥Ä¡¼¥ë¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Æ¤¤¤Þ¤¹¡£ , ¹âÅ٤ʥͥåȥ¥¯ From owner-svn-doc-head@FreeBSD.ORG Sat Feb 15 13:22:09 2014 Return-Path: Delivered-To: svn-doc-head@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 ESMTPS id A3DABBAF; Sat, 15 Feb 2014 13:22:09 +0000 (UTC) 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 8FF0416CD; Sat, 15 Feb 2014 13:22:09 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1FDM9IQ020827; Sat, 15 Feb 2014 13:22:09 GMT (envelope-from ryusuke@svn.freebsd.org) Received: (from ryusuke@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1FDM9Tu020826; Sat, 15 Feb 2014 13:22:09 GMT (envelope-from ryusuke@svn.freebsd.org) Message-Id: <201402151322.s1FDM9Tu020826@svn.freebsd.org> From: Ryusuke SUZUKI Date: Sat, 15 Feb 2014 13:22:09 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r43949 - head/ja_JP.eucJP/books/handbook/preface X-SVN-Group: doc-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the doc tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Feb 2014 13:22:09 -0000 Author: ryusuke Date: Sat Feb 15 13:22:09 2014 New Revision: 43949 URL: http://svnweb.freebsd.org/changeset/doc/43949 Log: - Merge the following from the English version: r23288 -> r24930 head/ja_JP.eucJP/books/handbook/preface/preface.xml Modified: head/ja_JP.eucJP/books/handbook/preface/preface.xml Modified: head/ja_JP.eucJP/books/handbook/preface/preface.xml ============================================================================== --- head/ja_JP.eucJP/books/handbook/preface/preface.xml Sat Feb 15 12:59:00 2014 (r43948) +++ head/ja_JP.eucJP/books/handbook/preface/preface.xml Sat Feb 15 13:22:09 2014 (r43949) @@ -3,7 +3,7 @@ The FreeBSD Documentation Project The FreeBSD Japanese Documentation Project - Original revision: r23288 + Original revision: r24930 $FreeBSD$ --> @@ -254,7 +254,7 @@ , X Window System X Window System Á´È̤ȡ¢ÆÃ¤Ë FreeBSD ¾å¤Ç¤Î - &xfree86; ¤ÎÍøÍѤˤĤ¤¤Æ½Ò¤Ù¤Æ¤¤¤Þ¤¹¡£ + X11 ¤ÎÍøÍѤˤĤ¤¤Æ½Ò¤Ù¤Æ¤¤¤Þ¤¹¡£ ¤Þ¤¿¡¢KDE ¤ä GNOME ¤Î¤è¤¦¤Ê°ìÈÌŪ¤Ê¥Ç¥¹¥¯¥È¥Ã¥×´Ä¶­¤Ë¤â¿¨¤ì¤Æ¤¤¤Þ¤¹¡£ @@ -469,9 +469,9 @@ - ÅùÉý + ÅùÉý - ÅùÉý¥Õ¥©¥ó¥È¤Ï¡¢¥¨¥é¡¼¥á¥Ã¥»¡¼¥¸¡¢ + ÅùÉý¥Õ¥©¥ó¥È¤Ï¡¢¥¨¥é¡¼¥á¥Ã¥»¡¼¥¸¡¢ ¥³¥Þ¥ó¥É¡¢´Ä¶­ÊÑ¿ô¡¢ports ¤Î̾¾Î¡¢¥Û¥¹¥È̾¡¢¥æ¡¼¥¶Ì¾¡¢ ¥°¥ë¡¼¥×̾¡¢¥Ç¥Ð¥¤¥¹¤Î̾¾Î¡¢ÊÑ¿ô¡¢ ¥³¡¼¥É¤ÎÃÇÊÒ¤òɽ¤¹¤Î¤Ë»È¤ï¤ì¤Æ¤¤¤Þ¤¹¡£