Date: Thu, 12 Jan 2012 11:38:48 GMT From: Rene Ladan <rene@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 204453 for review Message-ID: <201201121138.q0CBcmrq042741@skunkworks.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://p4web.freebsd.org/@@204453?ac=10 Change 204453 by rene@rene_acer on 2012/01/12 11:38:35 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#34 integrate .. //depot/projects/docproj_nl/share/sgml/man-refs.ent#38 integrate .. //depot/projects/docproj_nl/share/sgml/mirrors.xml#31 integrate .. //depot/projects/docproj_nl/www/en/cgi/man.cgi#26 integrate .. //depot/projects/docproj_nl/www/en/releases/9.0R/Makefile#4 integrate .. //depot/projects/docproj_nl/www/en/releases/9.0R/errata.html#1 branch .. //depot/projects/docproj_nl/www/en/releases/9.0R/installation.html#2 integrate .. //depot/projects/docproj_nl/www/en/releases/9.0R/relnotes-detailed.html#1 branch .. //depot/projects/docproj_nl/www/en/releases/9.0R/relnotes.sgml#1 branch Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#34 (text+ko) ==== @@ -1,7 +1,7 @@ <!-- The FreeBSD Documentation Project - $FreeBSD: doc/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml,v 1.442 2011/12/04 20:54:59 wblock Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml,v 1.443 2012/01/11 22:27:44 bcr Exp $ --> <chapter id="advanced-networking"> @@ -4444,7 +4444,7 @@ filename "FreeBSD/install/boot/pxeboot" ; # pxeboot boot loader will try to NFS mount this directory for root FS - option root-path "192.168.0.1:/b/tftpboot/FreeBSD/intall/" ; + option root-path "192.168.0.1:/b/tftpboot/FreeBSD/install/" ; } </programlisting> ==== //depot/projects/docproj_nl/share/sgml/man-refs.ent#38 (text+ko) ==== @@ -20,7 +20,7 @@ lexicographical order by the entity (i.e., the dots used in place of special characters should not be expanded when comparing). - $FreeBSD: doc/share/sgml/man-refs.ent,v 1.529 2012/01/11 18:37:40 brueffer Exp $ + $FreeBSD: doc/share/sgml/man-refs.ent,v 1.530 2012/01/11 23:45:35 hrs Exp $ --> <!ENTITY man...1 "<citerefentry/<refentrytitle/[/<manvolnum/1//"> @@ -894,6 +894,7 @@ <!ENTITY man.pathconf.2 "<citerefentry/<refentrytitle/pathconf/<manvolnum/2//"> <!ENTITY man.pipe.2 "<citerefentry/<refentrytitle/pipe/<manvolnum/2//"> <!ENTITY man.poll.2 "<citerefentry/<refentrytitle/poll/<manvolnum/2//"> +<!ENTITY man.posix.fallocate.2 "<citerefentry/<refentrytitle/posix_fallocate/<manvolnum/2//"> <!ENTITY man.pread.2 "<citerefentry/<refentrytitle/pread/<manvolnum/2//"> <!ENTITY man.profil.2 "<citerefentry/<refentrytitle/profil/<manvolnum/2//"> <!ENTITY man.pselect.2 "<citerefentry/<refentrytitle/pselect/<manvolnum/2//"> @@ -3448,6 +3449,7 @@ <!ENTITY man.gsc.4 "<citerefentry/<refentrytitle/gsc/<manvolnum/4//"> <!ENTITY man.gusc.4 "<citerefentry/<refentrytitle/gusc/<manvolnum/4//"> <!ENTITY man.gx.4 "<citerefentry/<refentrytitle/gx/<manvolnum/4//"> +<!ENTITY man.h.ertt.4 "<citerefentry/<refentrytitle/h_ertt/<manvolnum/4//"> <!ENTITY man.harp.4 "<citerefentry/<refentrytitle/harp/<manvolnum/4//"> <!ENTITY man.hatm.4 "<citerefentry/<refentrytitle/hatm/<manvolnum/4//"> <!ENTITY man.hifn.4 "<citerefentry/<refentrytitle/hifn/<manvolnum/4//"> @@ -3827,6 +3829,7 @@ <!ENTITY man.tw.4 "<citerefentry/<refentrytitle/tw/<manvolnum/4//"> <!ENTITY man.twa.4 "<citerefentry/<refentrytitle/twa/<manvolnum/4//"> <!ENTITY man.twe.4 "<citerefentry/<refentrytitle/twe/<manvolnum/4//"> +<!ENTITY man.tws.4 "<citerefentry/<refentrytitle/tws/<manvolnum/4//"> <!ENTITY man.tx.4 "<citerefentry/<refentrytitle/tx/<manvolnum/4//"> <!ENTITY man.txp.4 "<citerefentry/<refentrytitle/txp/<manvolnum/4//"> <!ENTITY man.u3g.4 "<citerefentry/<refentrytitle/u3g/<manvolnum/4//"> @@ -4634,6 +4637,7 @@ <!ENTITY man.rrenumd.8 "<citerefentry/<refentrytitle/rrenumd/<manvolnum/8//"> <!ENTITY man.rrestore.8 "<citerefentry/<refentrytitle/rrestore/<manvolnum/8//"> <!ENTITY man.rshd.8 "<citerefentry/<refentrytitle/rshd/<manvolnum/8//"> +<!ENTITY man.rtadvctl.8 "<citerefentry/<refentrytitle/rtadvctl/<manvolnum/8//"> <!ENTITY man.rtadvd.8 "<citerefentry/<refentrytitle/rtadvd/<manvolnum/8//"> <!ENTITY man.rtquery.8 "<citerefentry/<refentrytitle/rtquery/<manvolnum/8//"> <!ENTITY man.rtsol.8 "<citerefentry/<refentrytitle/rtsol/<manvolnum/8//"> @@ -5040,6 +5044,7 @@ <!ENTITY man.groupmember.9 "<citerefentry/<refentrytitle/groupmember/<manvolnum/9//"> <!ENTITY man.gsignal.9 "<citerefentry/<refentrytitle/gsignal/<manvolnum/9//"> <!ENTITY man.hashinit.9 "<citerefentry/<refentrytitle/hashinit/<manvolnum/9//"> +<!ENTITY man.hhook.9 "<citerefentry/<refentrytitle/hhook/<manvolnum/9//"> <!ENTITY man.htobe16.9 "<citerefentry/<refentrytitle/htobe16/<manvolnum/9//"> <!ENTITY man.htobe32.9 "<citerefentry/<refentrytitle/htobe32/<manvolnum/9//"> <!ENTITY man.htobe64.9 "<citerefentry/<refentrytitle/htobe64/<manvolnum/9//"> @@ -5062,6 +5067,7 @@ <!ENTITY man.ithread.schedule.9 "<citerefentry/<refentrytitle/ithread_schedule/<manvolnum/9//"> <!ENTITY man.jumbo.9 "<citerefentry/<refentrytitle/jumbo/<manvolnum/9//"> <!ENTITY man.kernacc.9 "<citerefentry/<refentrytitle/kernacc/<manvolnum/9//"> +<!ENTITY man.khelp.9 "<citerefentry/<refentrytitle/khelp/<manvolnum/9//"> <!ENTITY man.killproc.9 "<citerefentry/<refentrytitle/killproc/<manvolnum/9//"> <!ENTITY man.kobj.9 "<citerefentry/<refentrytitle/kobj/<manvolnum/9//"> <!ENTITY man.kobj.class.compile.9 "<citerefentry/<refentrytitle/kobj_class_compile/<manvolnum/9//"> ==== //depot/projects/docproj_nl/share/sgml/mirrors.xml#31 (text+ko) ==== @@ -2,7 +2,7 @@ <mirrors> <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0"> <cvs:keyword name="freebsd"> - $FreeBSD: doc/share/sgml/mirrors.xml,v 1.129 2011/11/18 15:07:02 jkois Exp $ + $FreeBSD: doc/share/sgml/mirrors.xml,v 1.130 2012/01/11 20:54:37 thompsa Exp $ </cvs:keyword> </cvs:keywords> @@ -1187,6 +1187,11 @@ <name>cvsup.nz.FreeBSD.org</name> </host> + <host type="ftp"> + <name>ftp.nz.FreeBSD.org</name> + <url proto="ftp">ftp://ftp.nz.FreeBSD.org/pub/FreeBSD/</url>; + </host> + </entry> <entry id="mirrors-no"> ==== //depot/projects/docproj_nl/www/en/cgi/man.cgi#26 (text+ko) ==== @@ -33,7 +33,7 @@ # BSDI Id: bsdi-man,v 1.2 1995/01/11 02:30:01 polk Exp # Dual CGI/Plexus mode and new interface by sanders@bsdi.com 9/22/1995 # -# $FreeBSD: www/en/cgi/man.cgi,v 1.267 2011/11/06 16:45:23 wosch Exp $ +# $FreeBSD: www/en/cgi/man.cgi,v 1.268 2012/01/11 21:02:55 wosch Exp $ ############################################################################ # !!! man.cgi is stale perl4 code !!! @@ -200,9 +200,11 @@ ); $manLocalDir = '/usr/local/www/bsddoc/man'; -$manPathDefault = 'FreeBSD 8.2-RELEASE'; +$manPathDefault = 'FreeBSD 9.0-RELEASE'; %manPath = ( + 'FreeBSD 9.0-RELEASE and Ports', +"$manLocalDir/FreeBSD-9.0-RELEASE/man:$manLocalDir/FreeBSD-9.0-RELEASE/openssl/man:$manLocalDir/FreeBSD-ports-8.2-RELEASE", 'FreeBSD 8.2-RELEASE and Ports', "$manLocalDir/FreeBSD-8.2-RELEASE/man:$manLocalDir/FreeBSD-8.2-RELEASE/openssl/man:$manLocalDir/FreeBSD-ports-8.2-RELEASE", 'FreeBSD 8.1-RELEASE and Ports', @@ -220,6 +222,8 @@ 'FreeBSD 9-current', "$manLocalDir/FreeBSD-9-current/man:$manLocalDir/FreeBSD-9-current/openssl/man", + 'FreeBSD 9.0-RELEASE', +"$manLocalDir/FreeBSD-9.0-RELEASE/man:$manLocalDir/FreeBSD-9.0-RELEASE/openssl/man", 'FreeBSD 8.2-stable', "$manLocalDir/FreeBSD-8.2-stable/man:$manLocalDir/FreeBSD-8.2-stable/openssl/man", 'FreeBSD 8.2-RELEASE', @@ -578,8 +582,8 @@ # keywords must be in lower cases. %manPathAliases = ( - 'freebsd', 'FreeBSD 8.2-RELEASE', - 'freebsd-release', 'FreeBSD 8.2-RELEASE', + 'freebsd', 'FreeBSD 9.0-RELEASE', + 'freebsd-release', 'FreeBSD 9.0-RELEASE', 'freebsd-stable', 'FreeBSD 8.2-stable', 'freebsd-stable8', 'FreeBSD 8.2-stable', @@ -587,7 +591,7 @@ 'freebsd-stable6', 'FreeBSD 6.4-stable', 'freebsd-current', 'FreeBSD 9-current', - 'freebsd-release-ports', 'FreeBSD 8.2-RELEASE and Ports', + 'freebsd-release-ports', 'FreeBSD 9.0-RELEASE and Ports', 'slackware', 'Linux Slackware 3.1', 'redhat', 'Red Hat Linux/i386 9', @@ -1578,7 +1582,7 @@ } local $id = - '$FreeBSD: www/en/cgi/man.cgi,v 1.267 2011/11/06 16:45:23 wosch Exp $'; + '$FreeBSD: www/en/cgi/man.cgi,v 1.268 2012/01/11 21:02:55 wosch Exp $'; return qq{\ <pre> Copyright (c) 1996-2011 <a href="$mailtoURL">Wolfram Schneider</a> ==== //depot/projects/docproj_nl/www/en/releases/9.0R/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: www/en/releases/9.0R/Makefile,v 1.3 2012/01/11 20:06:45 hrs Exp $ +# $FreeBSD: www/en/releases/9.0R/Makefile,v 1.5 2012/01/12 05:14:26 hrs Exp $ .if exists(../Makefile.conf) .include "../Makefile.conf" @@ -7,11 +7,14 @@ .include "../Makefile.inc" .endif -DOCS= schedule.sgml +DOCS= schedule.sgml \ + relnotes.sgml DATA= docbook.css \ hardware.html \ readme.html \ - installation.html + installation.html \ + errata.html \ + relnotes-detailed.html .include "${WEB_PREFIX}/share/mk/web.site.mk" ==== //depot/projects/docproj_nl/www/en/releases/9.0R/installation.html#2 (text+ko) ==== @@ -22,8 +22,8 @@ <p class="COPYRIGHT">Copyright © 2012 The FreeBSD Documentation Project</p> <p class="PUBDATE">$FreeBSD: -stable/9/release/doc/en_US.ISO8859-1/installation/article.sgml 229979 2012-01-11 -20:04:52Z hrs $<br /> +stable/9/release/doc/en_US.ISO8859-1/installation/article.sgml 230001 2012-01-12 +03:52:53Z hrs $<br /> </p> <div class="LEGALNOTICE"><a id="TRADEMARKS" name="TRADEMARKS"></a> @@ -71,7 +71,7 @@ <h2 class="SECT1"><a id="UPGRADE" name="UPGRADE">2 Upgrading FreeBSD</a></h2> <p>If you are upgrading from a previous release of FreeBSD, please read <a -href="http://www.FreeBSD.org/releases/9.0R/relnotes-detailed.html#upgrade" +href="http://www.FreeBSD.org/releases/9.0R/relnotes-detailed.html#UPGRADE" target="_top">upgrading section in the Release Notes</a> for notable incompatibilities carefully.</p>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201201121138.q0CBcmrq042741>