From owner-p4-projects@FreeBSD.ORG Sat Aug 14 16:14:14 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 59FCE10656A3; Sat, 14 Aug 2010 16:14:14 +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 1AAA41065697 for ; Sat, 14 Aug 2010 16:14:14 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 066158FC17 for ; Sat, 14 Aug 2010 16:14:14 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o7EGEDab032982 for ; Sat, 14 Aug 2010 16:14:13 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o7EGED70032979 for perforce@freebsd.org; Sat, 14 Aug 2010 16:14:13 GMT (envelope-from rene@FreeBSD.org) Date: Sat, 14 Aug 2010 16:14:13 GMT Message-Id: <201008141614.o7EGED70032979@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 182399 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Aug 2010 16:14:14 -0000 http://p4web.freebsd.org/@@182399?ac=10 Change 182399 by rene@rene_acer on 2010/08/14 16:13:33 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#67 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/corp-net-guide/book.sgml#2 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/dev-model/book.sgml#3 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/developers-handbook/l10n/chapter.sgml#5 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/developers-handbook/x86/chapter.sgml#5 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/faq/book.sgml#29 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml#6 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/fdp-primer/sgml-primer/chapter.sgml#4 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/disks/chapter.sgml#10 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/firewalls/chapter.sgml#12 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/geom/chapter.sgml#8 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#85 integrate .. //depot/projects/docproj_nl/share/sgml/freebsd.ent#18 integrate .. //depot/projects/docproj_nl/www/en/cgi/man.cgi#17 integrate .. //depot/projects/docproj_nl/www/en/donations/wantlist.sgml#20 integrate .. //depot/projects/docproj_nl/www/en/search/opensearch/Makefile#4 integrate .. //depot/projects/docproj_nl/www/en/search/opensearch/man-freebsd-release-ports.xml#1 branch .. //depot/projects/docproj_nl/www/en/search/opensearch/opensearch.sgml#4 integrate .. //depot/projects/docproj_nl/www/share/sgml/commercial.consult.xml#25 integrate .. //depot/projects/docproj_nl/www/share/sgml/commercial.software.xml#6 integrate .. //depot/projects/docproj_nl/www/share/sgml/events.xml#30 integrate .. //depot/projects/docproj_nl/www/share/sgml/news.xml#87 integrate Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#67 (text+ko) ==== @@ -1,4 +1,4 @@ - + + - ACITS LPR and Win95 have a few printing idosyncracies. Most + ACITS LPR and Win95 have a few printing idiosyncrasies. Most Win95 programs, such as Microsoft Word, expect print output to be spooled on the local hard drive and then metered out to a printer that is plugged into the parallel port. Network printing, on the @@ -1846,7 +1846,7 @@ nec in both the name of the printer and the name of the Spool directory. With the print spooler LPD, the Spool directories must be different from each other, - or the spooler gets confused and doesen't print. + or the spooler gets confused and doesn't print. After the /etc/printcap is modified, the root user must create the /var/spool/output/NEC ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/dev-model/book.sgml#3 (text+ko) ==== @@ -23,7 +23,7 @@ - OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - SUCH DAMAGE. - - - $FreeBSD: doc/en_US.ISO8859-1/books/dev-model/book.sgml,v 1.17 2009/06/03 22:31:36 linimon Exp $ + - $FreeBSD: doc/en_US.ISO8859-1/books/dev-model/book.sgml,v 1.18 2010/08/08 13:54:36 jkois Exp $ --> . It shows the number of ports available to FreeBSD in the period 1995 to 2005. It looks like the curve has first grown exponentionally, and then - since the middle of 2001 grown linerly. + since the middle of 2001 grown linearly. ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/developers-handbook/l10n/chapter.sgml#5 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -315,7 +315,7 @@ catalogs with the NLSSRCDIR &man.make.1; variable. The default name of the precompiled catalog files also follow the naming convention mentioned before. It can be - overriden by setting the NLSNAME variable. + overridden by setting the NLSNAME variable. There are other options to fine tune the processing of the catalog files but usually it is not needed, thus they are not described here. For further information on bsd.nls.mk, ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/developers-handbook/x86/chapter.sgml#5 (text+ko) ==== @@ -15,7 +15,7 @@ author to assign us the copyright. For now, it is valuable content so it should stay. - $FreeBSD: doc/en_US.ISO8859-1/books/developers-handbook/x86/chapter.sgml,v 1.18 2010/02/17 18:20:32 jhb Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/developers-handbook/x86/chapter.sgml,v 1.19 2010/08/10 20:40:36 jkois Exp $ --> @@ -3152,7 +3152,7 @@ -Do not use this program on files stored on a disk formated +Do not use this program on files stored on a disk formatted by &ms-dos; or &windows;. There seems to be a subtle bug in the FreeBSD code when using mmap on these drives mounted under FreeBSD: If the file is over ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/faq/book.sgml#29 (text+ko) ==== @@ -12,7 +12,7 @@ The &os; Documentation Project - $FreeBSD: doc/en_US.ISO8859-1/books/faq/book.sgml,v 1.1124 2010/07/30 21:34:30 pgj Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/faq/book.sgml,v 1.1126 2010/08/10 10:11:15 pgj Exp $ 1995 @@ -7035,7 +7035,7 @@ use your mouse on one or more virtual consoles, and use X, see and set up - moused. + &man.moused.8;. Then edit /etc/X11/xorg.conf and make sure you have the following lines: @@ -7045,6 +7045,15 @@ Option "Device" "/dev/sysmouse" ..... + Starting with &xorg; version 7.4, the + InputDevice sections in + xorg.conf are ignored in favor of + autodetected devices. To restore the old behavior, add the + following line to the ServerLayout or + ServerFlags section: + + Option "AutoAddDevices" "false" + Some people prefer to use /dev/mouse under X. To make this work, /dev/mouse should be linked ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml#6 (text+ko) ==== @@ -27,7 +27,7 @@ ANY WAY OUT OF THE USE OF THIS DOCUMENTATION, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml,v 1.79 2010/03/14 22:26:02 pgj Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml,v 1.80 2010/08/08 13:54:36 jkois Exp $ --> @@ -1708,7 +1708,7 @@ You will frequently want to refer to both applications and commands when writing documentation. The distinction between them is simple: an application is the name for a suite (or possibly - just 1) of programs that fulfil a particular task. A command is the + just 1) of programs that fulfill a particular task. A command is the name of a program that the user can run. In addition, you will occasionally need to list one or more of ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/fdp-primer/sgml-primer/chapter.sgml#4 (text+ko) ==== @@ -27,7 +27,7 @@ ANY WAY OUT OF THE USE OF THIS DOCUMENTATION, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/sgml-primer/chapter.sgml,v 1.49 2008/12/07 22:03:48 pgj Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/sgml-primer/chapter.sgml,v 1.50 2010/08/10 11:48:17 pgj Exp $ --> @@ -412,23 +412,23 @@ Try to validate this file using an SGML parser. Part of textproc/docproj is the - nsgmls validating - parser. Normally, nsgmls reads in a document + onsgmls validating + parser. Normally, onsgmls reads in a document marked up according to an SGML DTD and returns a copy of the document's Element Structure Information Set (ESIS, but that is not important right now). - However, when nsgmls is given the - parameter, nsgmls will suppress its normal output, and + However, when onsgmls is given the + parameter, onsgmls will suppress its normal output, and just print error messages. This makes it a useful way to check to see if your document is valid or not. - Use nsgmls to check that your document is + Use onsgmls to check that your document is valid: - &prompt.user; nsgmls -s example.sgml + &prompt.user; onsgmls -s example.sgml - As you will see, nsgmls returns without displaying any + As you will see, onsgmls returns without displaying any output. This means that your document validated successfully. @@ -438,11 +438,11 @@ removing the title and /title tags, and re-run the validation. - &prompt.user; nsgmls -s example.sgml -nsgmls:example.sgml:5:4:E: character data is not allowed here -nsgmls:example.sgml:6:8:E: end tag for "HEAD" which is not finished + &prompt.user; onsgmls -s example.sgml +onsgmls:example.sgml:5:4:E: character data is not allowed here +onsgmls:example.sgml:6:8:E: end tag for "HEAD" which is not finished - The error output from nsgmls is organized into + The error output from onsgmls is organized into colon-separated groups, or columns. @@ -458,7 +458,7 @@ 1 The name of the program generating the error. This - will always be nsgmls. + will always be onsgmls. @@ -483,8 +483,8 @@ message, W is for warnings, and E is for errors It is not always the fifth column either. - nsgmls -sv displays - nsgmls:I: SP version "1.3" + onsgmls -sv displays + onsgmls:I: "OpenSP" version "1.5.2" (depending on the installed version). As you can see, this is an informational message. , and X is for @@ -512,7 +512,7 @@ The second error is because head elements must contain a title - element. Because it does not nsgmls considers that the + element. Because it does not onsgmls considers that the element has not been properly finished. However, the closing tag indicates that the element has been closed before it has been finished. @@ -894,13 +894,13 @@ Add some comments to example.sgml, and - check that the file still validates using nsgmls. + check that the file still validates using onsgmls. Add some invalid comments to example.sgml, and see the error messages that - nsgmls gives when it encounters an invalid comment. + onsgmls gives when it encounters an invalid comment. @@ -1049,7 +1049,7 @@ - Validate the document using nsgmls. + Validate the document using onsgmls. @@ -1075,9 +1075,9 @@ SGML is to expand all the entity references in the document, replacing the entities with the text that they represent. - You can use sgmlnorm to do this. + You can use osgmlnorm to do this. - &prompt.user; sgmlnorm example.sgml > example.html + &prompt.user; osgmlnorm example.sgml > example.html You should find a normalized (i.e., entity references expanded) copy of your document in @@ -1086,12 +1086,12 @@ - If you look at the output from sgmlnorm + If you look at the output from osgmlnorm you will see that it does not include a DOCTYPE declaration at the start. To include this you need to use the option: - &prompt.user; sgmlnorm -d example.sgml > example.html + &prompt.user; osgmlnorm -d example.sgml > example.html @@ -1249,7 +1249,7 @@ Produce example.html by normalizing example.sgml. - &prompt.user; sgmlnorm -d example.sgml > example.html + &prompt.user; osgmlnorm -d example.sgml > example.html @@ -1306,7 +1306,7 @@ Produce example.html by normalizing example.sgml. - &prompt.user; sgmlnorm -d example.sgml > example.html + &prompt.user; osgmlnorm -d example.sgml > example.html @@ -1553,7 +1553,7 @@ - Normalize this file using &man.sgmlnorm.1; and examine the + Normalize this file using osgmlnorm and examine the output. Notice which paragraphs have appeared, which have disappeared, and what has happened to the content of the CDATA marked section. ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/disks/chapter.sgml#10 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -1176,6 +1176,15 @@ ATAPI Drives + + With the help of the ATAPI/CAM module, + cdda2wav can also be used on ATAPI + drives. This tool is usually a better choice for most of + users (jitter correction, endianness issues, etc.) than + the method proposed below. + + The ATAPI CD driver makes each track available as /dev/acddtnn, ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/firewalls/chapter.sgml#12 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -932,7 +932,7 @@ If the packet is a TCP packet, there will be an additional field starting with a hyphen followed by letters corresponding to any flags that were set. See the - &man.ipmon.8; manual page for a list of letters and their + &man.ipf.5; manual page for a list of letters and their flags. If the packet is an ICMP packet, there will be two fields ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/geom/chapter.sgml#8 (text+ko) ==== @@ -1,6 +1,6 @@ @@ -755,8 +755,8 @@ da4 is a new SCSI disk: - &prompt.root; gjournal label /dev/da4 -&prompt.root; gjournal load + &prompt.root; gjournal load + &prompt.root; gjournal label /dev/da4 At this point, there should be a /dev/da4 device node and a ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#85 (text+ko) ==== @@ -1,7 +1,7 @@ It is expected that PORTEPOCH will not be used for the majority of ports, and that sensible - use of PORTVERSION can often pre-empt + use of PORTVERSION can often preempt it becoming necessary if a future release of the software should change the version structure. However, care is needed by FreeBSD porters when a vendor release is made @@ -1162,7 +1162,7 @@ part of the directory name in a family of ports), the -compiled.specifics part should state the compiled-in defaults (the hyphen is optional). Examples are - papersize and font units. + paper size and font units. The -compiled.specifics part should be set in the PKGNAMESUFFIX @@ -1315,7 +1315,7 @@ psutils -letter 1.13 - Papersize hardcoded at package build time + Paper size hardcoded at package build time @@ -3108,7 +3108,7 @@ make sure you also add them to distinfo. Also, the additional files will normally be extracted into WRKDIR as well, which for some ports may - lead to undesirable sideeffects and require special handling. + lead to undesirable side effects and require special handling. @@ -3283,33 +3283,28 @@ part can be omitted if it is the same as DEPENDS_TARGET. - Quite common situation is when + A quite common situation is when RUN_DEPENDS is literally the same as BUILD_DEPENDS, especially if ported software is written in a scripted language or if it requires - the same run-time environment used to build it. In this - case, it is very tempting, and indeed natural to directly - assign one to another: + the same build and run-time environment. In this + case, it is both tempting and intuitive to directly + assign one to the other: RUN_DEPENDS= ${BUILD_DEPENDS} - However, doing so can and often will result in - run-time dependencies be polluted by superfluous entries, not - present in original port's BUILD_DEPENDS. - It happens due to the fact that &man.make.1 is being lazy - when it evaluates assignments like these. Most probably - additional dependencies will be pulled by - ports/Mk/bsd.*.mk when processing - USE_* - variables, which most ports contain. For example, such - direct assignment along with - USE_GMAKE=yes will bring - gmake into - RUN_DEPENDS, despite that it was not - included explicitly in BUILD_DEPENDS. To - prevent this from happening, immediate expansion assignment - should be used, i.e. expand the value before assigning it - to the variable: + However, such assignment can pollute run-time dependencies + with entries not defined in the port's original BUILD_DEPENDS. + This happens because of &man.make.1;'s lazy evaluation of variable + assignment. Consider a Makefile with + USE_* variables, which + are processed by ports/Mk/bsd.*.mk to augment + initial build dependencies. For example, USE_GMAKE=yes + adds devel/gmake to + BUILD_DEPENDS. To prevent such additional dependencies + from polluting RUN_DEPENDS, take care to assign + with expansion, i.e. expand the value before assigning it to the + variable: RUN_DEPENDS:= ${BUILD_DEPENDS} @@ -3885,7 +3880,7 @@ check for /var/db/ports/portname/options. If that file does not exist, it will use the values of - OPTIONS to create a dialogbox where the options + OPTIONS to create a dialog box where the options can be enabled or disabled. Then the options file is saved and the selected variables will be used when building the port. @@ -5795,7 +5790,7 @@ neglect to look for includes and/or libraries in the X11 directories. You can tell qmake to add directories to the include and library searchpaths - via the commandline, for example: + via the command line, for example: ${QMAKE} -unix PREFIX=${PREFIX} INCLUDEPATH+=${LOCALBASE}/include \ LIBS+=-L${LOCALBASE}/lib sillyapp.pro @@ -7978,7 +7973,7 @@ tolua - Library for accesing C/C++ code + Library for accessing C/C++ code 4.0-5.0 @@ -12462,7 +12457,7 @@ 700044 June 7, 2007 7.0-CURRENT after changing the argument for - vn_open()/VOP_OPEN() from filedescriptor index to the + vn_open()/VOP_OPEN() from file descriptor index to the struct file *. @@ -14161,7 +14156,7 @@ If a port would conflict with a currently installed port (for example, if they install a file in the same - place that perfoms a different function), + place that performs a different function), use CONFLICTS instead. CONFLICTS will set @@ -14259,7 +14254,7 @@ 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 nonblank value to + 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. ==== //depot/projects/docproj_nl/share/sgml/freebsd.ent#18 (text+ko) ==== @@ -1,7 +1,7 @@ - + ==== //depot/projects/docproj_nl/www/en/cgi/man.cgi#17 (text+ko) ==== @@ -34,7 +34,7 @@ # Dual CGI/Plexus mode and new interface by sanders@bsdi.com 9/22/1995 # # $Id: man.cgi,v 1.172 2007/11/28 18:51:29 hrs Exp $ -# $FreeBSD: www/en/cgi/man.cgi,v 1.253 2010/08/04 17:17:58 wosch Exp $ +# $FreeBSD: www/en/cgi/man.cgi,v 1.254 2010/08/09 19:37:14 wosch Exp $ ############################################################################ # !!! man.cgi is stale perl4 code !!! @@ -630,6 +630,7 @@ +