From owner-p4-projects@FreeBSD.ORG Sun Jun 1 23:49:33 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D270E106567A; Sun, 1 Jun 2008 23:49:32 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9390D1065676 for ; Sun, 1 Jun 2008 23:49:32 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 70E218FC16 for ; Sun, 1 Jun 2008 23:49:32 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m51NnWMC026066 for ; Sun, 1 Jun 2008 23:49:32 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m51NnWNI026064 for perforce@freebsd.org; Sun, 1 Jun 2008 23:49:32 GMT (envelope-from jb@freebsd.org) Date: Sun, 1 Jun 2008 23:49:32 GMT Message-Id: <200806012349.m51NnWNI026064@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 142724 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 Jun 2008 23:49:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=142724 Change 142724 by jb@freebsd3 on 2008/06/01 23:49:00 IFC Affected files ... .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/Makefile#10 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#80 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#45 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.develalumni.sgml#20 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/cups/Makefile#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/cups/article.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/ldap-auth/Makefile#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/ldap-auth/article.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/faq/book.sgml#20 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#15 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/config/chapter.sgml#12 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/firewalls/chapter.sgml#16 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/install/chapter.sgml#18 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#13 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/mail/chapter.sgml#6 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#8 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/serialcomms/chapter.sgml#10 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/vinum/chapter.sgml#6 integrate .. //depot/projects/dtrace/doc/share/sgml/man-refs.ent#33 integrate .. //depot/projects/dtrace/ports/MOVED#94 integrate .. //depot/projects/dtrace/ports/Tools/scripts/tindex#6 integrate .. //depot/projects/dtrace/ports/UPDATING#76 integrate .. //depot/projects/dtrace/src/MAINTAINERS#16 integrate .. //depot/projects/dtrace/src/games/fortune/datfiles/freebsd-tips#7 integrate .. //depot/projects/dtrace/src/release/doc/en_US.ISO8859-1/readme/article.sgml#6 integrate .. //depot/projects/dtrace/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#23 integrate .. //depot/projects/dtrace/src/release/doc/share/sgml/release.ent#9 integrate .. //depot/projects/dtrace/src/share/sendmail/Makefile#4 integrate .. //depot/projects/dtrace/src/sys/amd64/amd64/pmap.c#45 integrate .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#9 integrate .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace_impl.h#6 integrate .. //depot/projects/dtrace/src/sys/dev/ath/ah_osdep.h#5 integrate .. //depot/projects/dtrace/src/sys/dev/atkbdc/psm.c#10 integrate .. //depot/projects/dtrace/src/sys/dev/nve/if_nve.c#8 integrate .. //depot/projects/dtrace/src/sys/dev/nve/if_nvereg.h#5 integrate .. //depot/projects/dtrace/src/sys/dev/pccard/pccard_cis.c#6 integrate .. //depot/projects/dtrace/src/sys/fs/devfs/devfs_vnops.c#21 integrate .. //depot/projects/dtrace/src/sys/modules/dtrace/Makefile#32 integrate .. //depot/projects/dtrace/src/sys/netgraph/ng_nat.c#10 integrate .. //depot/projects/dtrace/src/sys/netinet/ip_fw_nat.c#2 integrate .. //depot/projects/dtrace/src/sys/netinet/libalias/alias.c#10 integrate .. //depot/projects/dtrace/src/sys/netinet/libalias/alias_db.c#8 integrate .. //depot/projects/dtrace/src/sys/netinet/libalias/alias_local.h#7 integrate .. //depot/projects/dtrace/src/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c#5 integrate .. //depot/projects/dtrace/src/usr.sbin/sicontrol/sicontrol.c#4 integrate .. //depot/projects/dtrace/www/en/docs/books.sgml#18 integrate .. //depot/projects/dtrace/www/en/news/news.sgml#8 integrate .. //depot/projects/dtrace/www/en/platforms/arm.sgml#6 integrate .. //depot/projects/dtrace/www/en/platforms/mips.sgml#4 integrate .. //depot/projects/dtrace/www/en/security/security.sgml#14 integrate Differences ... ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/Makefile#10 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: doc/en_US.ISO8859-1/articles/Makefile,v 1.58 2008/04/28 15:44:35 gabor Exp $ +# $FreeBSD: doc/en_US.ISO8859-1/articles/Makefile,v 1.60 2008/05/31 13:32:19 remko Exp $ SUBDIR = SUBDIR+= 5-roadmap @@ -12,6 +12,7 @@ SUBDIR+= contributing SUBDIR+= contributing-ports SUBDIR+= contributors +SUBDIR+= cups SUBDIR+= cvs-freebsd SUBDIR+= cvsup-advanced SUBDIR+= dialup-firewall @@ -29,6 +30,7 @@ SUBDIR+= hubs SUBDIR+= ipsec-must SUBDIR+= laptop +SUBDIR+= ldap-auth SUBDIR+= linux-comparison SUBDIR+= linux-emulation SUBDIR+= linux-users ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#80 (text+ko) ==== @@ -1,4 +1,4 @@ - + + + @@ -324,7 +324,7 @@ 2003) - + &a.amurai; (1995 - 2003) @@ -705,8 +705,8 @@ Andrew L. Moore (1993 - 1995) - - @@ -2165,11 +2165,6 @@ ubt0: Interface 1 (alt.config 5) endpoints: isoc-in=0x83, isoc-out=0x3, wMaxPacketSize=49, nframes=6, buffer size=294 - - The Bluetooth stack has to be started manually on &os; 6.0, and - on &os; 5.X before 5.5. It is done automatically from &man.devd.8; - on &os; 5.5, 6.1 and newer. - Copy /usr/share/examples/netgraph/bluetooth/rc.bluetooth into some convenient place, like /etc/rc.bluetooth. @@ -2190,7 +2185,6 @@ Number of ACL packets: 8 Max. SCO packet size: 64 bytes Number of SCO packets: 8 - @@ -2509,12 +2503,6 @@ &prompt.root; /etc/rc.d/sdpd start - On &os; 6.0, and on &os; 5.X before 5.5, - sdpd is not integrated into the system - startup scripts. It has to be started manually with: - - &prompt.root; sdpd - The local server application that wants to provide Bluetooth service to the remote clients will register service with the local SDP daemon. The example of such application is &man.rfcomm.pppd.8;. ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/config/chapter.sgml#12 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -367,13 +367,11 @@ While every script must meet some minimal requirements, most of the time these requirements are &os; version - agnostic. Each script must have a .sh - extension appended to the end and every script must be - executable by the system. The latter may be achieved by using - the chmod command and setting the unique permissions - of 755. There should also be, at minimal, - an option to start the application and an - option to stop the application. + agnostic. Each script must be executable by the system; this is + typically achieved by using the chmod command and + setting the unique permissions of 555. There should + also be, at minimal, options to start and stop + the application. The simplest start up script would probably look a little bit like this one: @@ -2171,7 +2169,7 @@ connected at once, the resources needed may be similar to a high-scale web server. - As of FreeBSD 4.5, kern.maxusers is + The variable kern.maxusers is automatically sized at boot based on the amount of memory available in the system, and may be determined at run-time by inspecting the value of the read-only kern.maxusers sysctl. @@ -2184,9 +2182,7 @@ boot-time or run-time in /boot/loader.conf (see the &man.loader.conf.5; man page or the /boot/defaults/loader.conf file for some hints) - or as described elsewhere in this document. Systems older than - FreeBSD 4.4 must set this value via the kernel &man.config.8; - option instead. + or as described elsewhere in this document. In older releases, the system will auto-tune maxusers for you if you explicitly set it to @@ -2218,14 +2214,7 @@ limit the number of users which can log into your machine. It simply sets various table sizes to reasonable values considering the maximum number of users you will likely have on your system - and how many processes each of them will be running. One keyword - which does limit the number of simultaneous - remote logins and X terminal windows is pseudo-device pty - 16. With &os; 5.X, you do not have to - worry about this number since the &man.pty.4; driver is - auto-cloning; you simply use the line - device pty in your configuration file. + and how many processes each of them will be running. ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/firewalls/chapter.sgml#16 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -393,9 +393,8 @@ When browsing the pf user's guide, please keep in mind that different versions of &os; contain different versions of pf. The - pf firewall in &os; 5.X is at the level - of OpenBSD version 3.5 and in &os; 6.X is at the level of OpenBSD - version 3.7. + pf firewall in &os; 6.X is at the level + of OpenBSD version 3.7. The &a.pf; is a good place to ask questions about ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/install/chapter.sgml#18 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -2030,15 +2030,6 @@ G for gigabytes, or C for cylinders. - Beginning with FreeBSD 5.X, users can: select - UFS2 (which is default on &os; 5.1 and - above) using the Custom Newfs - (Z) option, create labels with - Auto Defaults and modify them with the Custom Newfs option or - add during the regular creation period. - Do not forget to add for SoftUpdates if you use the Custom Newfs - option! -
Free Space for Root Partition @@ -2428,8 +2419,8 @@ installation. An option can be configured by re-entering the configuration options before booting the new FreeBSD system or after installation using - sysinstall (/stand/sysinstall - in &os; versions older than 5.2) and selecting + sysinstall + and selecting Configure. @@ -3472,8 +3463,8 @@ Groups can also be added at this time if specific needs are known. Otherwise, this may be accessed through using - sysinstall (/stand/sysinstall - in &os; versions older than 5.2) after installation is + sysinstall + after installation is completed. When you are finished adding users, select @@ -3512,9 +3503,7 @@ If you need to configure additional network services or any other configuration, you can do it at this point or - after installation with sysinstall - (/stand/sysinstall in &os; versions older - than 5.2). + after installation with sysinstall. User Confirmation Requested Visit the general configuration menu for a chance to set any last @@ -4147,7 +4136,7 @@ drive is not probed. - &os; 5.0 and above makes extensive use of the system + &os; makes extensive use of the system ACPI service on the i386, amd64 and ia64 platforms to aid in system configuration if it is detected during boot. Unfortunately, some bugs still exist in both the @@ -4417,9 +4406,6 @@ &prompt.root; cu -l /dev/cuad0 - On &os; 5.X, use - /dev/cuaa0 instead of - /dev/cuad0. @@ -4497,7 +4483,7 @@ That directory will normally contain the following images: - FreeBSD 5.<replaceable>X</replaceable> and 6.<replaceable>X</replaceable> + <title>FreeBSD 6.<replaceable>X</replaceable> and 7.<replaceable>X</replaceable> ISO Image Names and Meanings @@ -4531,14 +4517,14 @@ version-RELEASE-arch-disc2.iso - &os; documentation (prior to &os; 6.2) and as many + As many third-party packages as would fit on the disc. version-RELEASE-arch-docs.iso - &os; documentation (for &os; 6.2 and later). + &os; documentation. ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#13 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -975,7 +975,7 @@ #device apm Advanced Power Management support. Useful for laptops, - although in &os; 5.X and above this is disabled in + although this is disabled in GENERIC by default. # Add suspend/resume support for the i8254. ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/mail/chapter.sgml#6 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -702,12 +702,6 @@ Disable <application>sendmail</application> - The procedure used to start - sendmail changed significantly - between 4.5-RELEASE, 4.6-RELEASE, and later releases. - Therefore, the procedure used to disable it is subtly - different. - If you disable sendmail's outgoing mail service, it is important that you replace it @@ -724,53 +718,10 @@ never be delivered. - - FreeBSD 4.5-STABLE before 2002/4/4 and Earlier - (Including 4.5-RELEASE and Earlier) - - Enter: - - sendmail_enable="NO" - - into /etc/rc.conf. This will disable - sendmail's incoming mail service, - but if /etc/mail/mailer.conf (see below) - is not changed, sendmail will - still be used to send e-mail. - - - - FreeBSD 4.5-STABLE after 2002/4/4 - (Including 4.6-RELEASE and Later) - In order to completely disable sendmail, including the outgoing mail service, you must use - sendmail_enable="NONE" - - in /etc/rc.conf. - - If you only want to disable - sendmail's incoming mail service, - you should set - - sendmail_enable="NO" - - in /etc/rc.conf. However, if - incoming mail is disabled, local delivery will still - function. More information on - sendmail's startup options is - available from the &man.rc.sendmail.8; manual page. >>> TRUNCATED FOR MAIL (1000 lines) <<<