From owner-p4-projects@FreeBSD.ORG Thu May 5 22:44:47 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5260D1065674; Thu, 5 May 2011 22:44:47 +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 13BB4106566B for ; Thu, 5 May 2011 22:44:47 +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 000598FC16 for ; Thu, 5 May 2011 22:44:46 +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 p45MikqR000345 for ; Thu, 5 May 2011 22:44:46 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p45MikcJ000335 for perforce@freebsd.org; Thu, 5 May 2011 22:44:46 GMT (envelope-from rene@FreeBSD.org) Date: Thu, 5 May 2011 22:44:46 GMT Message-Id: <201105052244.p45MikcJ000335@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 192672 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: Thu, 05 May 2011 22:44:47 -0000 http://p4web.freebsd.org/@@192672?ac=10 Change 192672 by rene@rene_acer on 2011/05/05 22:44:28 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#92 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#12 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#105 integrate .. //depot/projects/docproj_nl/share/pgpkeys/brooks.key#2 integrate .. //depot/projects/docproj_nl/www/en/copyright/daemon.sgml#3 integrate .. //depot/projects/docproj_nl/www/en/news/status/report-2011-01-2011-03.xml#2 integrate .. //depot/projects/docproj_nl/www/en/portmgr/Makefile#3 integrate .. //depot/projects/docproj_nl/www/en/portmgr/index.sgml#4 integrate .. //depot/projects/docproj_nl/www/en/portmgr/policies.sgml#3 integrate .. //depot/projects/docproj_nl/www/en/portmgr/policies_eol.sgml#1 branch .. //depot/projects/docproj_nl/www/en/portmgr/policies_releng_6.sgml#2 delete .. //depot/projects/docproj_nl/www/en/relnotes.sgml#3 integrate .. //depot/projects/docproj_nl/www/en/relnotes/Makefile#3 integrate .. //depot/projects/docproj_nl/www/nl/share/sgml/header.l10n.ent#20 integrate .. //depot/projects/docproj_nl/www/nl/share/sgml/navibar.l10n.ent#19 integrate Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#92 (text+ko) ==== @@ -1,4 +1,4 @@ - + @@ -591,7 +591,7 @@ PPP and Static IP Addresses, with the following change: - 17 set ifaddr 10.0.0.1/0 10.0.0.2/0 255.255.255.255 + 17 set ifaddr 10.0.0.1/0 10.0.0.2/0 255.255.255.255 0.0.0.0 Again, do not include the line number, it is just for reference. Indentation of at least one space is ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#105 (text+ko) ==== @@ -1,7 +1,7 @@ 800038 May 26, 2008 8.0-CURRENT after removal of netatm and - ISDN4BSD. + ISDN4BSD. Also, the addition of the + Compact C Type (CTF) tools. 800039 ==== //depot/projects/docproj_nl/share/pgpkeys/brooks.key#2 (text+ko) ==== @@ -1,15 +1,16 @@ - + - Key fingerprint = 655D 519C 26A7 82E7 2529 9BF0 5D8E 8BE9 F238 1AD4 -uid Brooks Davis -uid Brooks Davis -uid Brooks Davis -sub 2048g/CFDACA7A 2003-01-25 [expires: 2008-01-24] -sub 1024g/42921194 2001-02-10 [expires: 2009-02-08] +pub 1024D/F2381AD4 2001-02-10 + Key fingerprint = 655D 519C 26A7 82E7 2529 9BF0 5D8E 8BE9 F238 1AD4 +uid Brooks Davis (The Aerospace Corporation) +uid Brooks Davis +uid Brooks Davis +uid Brooks Davis +sub 2048g/CFDACA7A 2003-01-25 [expires: 2016-04-30] +sub 1024g/42921194 2001-02-10 [expires: 2016-04-30] ]]> ==== //depot/projects/docproj_nl/www/en/copyright/daemon.sgml#3 (text+ko) ==== @@ -1,6 +1,6 @@ - + ]> @@ -45,10 +45,10 @@

Various size stuffed and beanie daemons are available from the FreeBSD Mall - . + .

ScotGold - produce 1" case badges featuring BSD Daemon. + produce 1" case badges featuring BSD Daemon.

==== //depot/projects/docproj_nl/www/en/news/status/report-2011-01-2011-03.xml#2 (text+ko) ==== @@ -2,7 +2,7 @@ - + January-March @@ -924,7 +924,7 @@ - pfSense home page + pfSense home page ==== //depot/projects/docproj_nl/www/en/portmgr/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: www/en/portmgr/Makefile,v 1.4 2010/09/17 13:29:46 tabthorpe Exp $ +# $FreeBSD: www/en/portmgr/Makefile,v 1.5 2011/05/02 12:59:28 erwin Exp $ .if exists(../Makefile.conf) .include "../Makefile.conf" @@ -13,7 +13,7 @@ DOCS+= policies.sgml DOCS+= policies_committing.sgml DOCS+= policies_contributors.sgml -DOCS+= policies_releng_6.sgml +DOCS+= policies_eol.sgml DOCS+= qa.sgml .include "${WEB_PREFIX}/share/mk/web.site.mk" ==== //depot/projects/docproj_nl/www/en/portmgr/index.sgml#4 (text+ko) ==== @@ -1,6 +1,6 @@ - + @@ -15,7 +15,7 @@

The FreeBSD Ports Management Team (also known as portmgr due to its email alias) is responsible for issues relating to the - FreeBSD Ports Collection.

+ FreeBSD Ports Collection.

Charter

@@ -29,8 +29,8 @@ its goals, such as timeouts for inactivity and when commits are allowed. -Also contains the end of support policy -on FreeBSD 6.X.

+Also contains the policy for supported +releases and branches.

Implementation Issues

==== //depot/projects/docproj_nl/www/en/portmgr/policies.sgml#3 (text+ko) ==== @@ -1,6 +1,6 @@ - + ]> @@ -12,8 +12,8 @@ Ports Management Team has adopted certain policies to try to meet each of its goals.

EOS/EOL Policies of Ports and Ports - Intrastructure on RELENG_6

EOL Policies of Ports and Ports + Intrastructure

Assure The Integrity Of The Ports Collection

==== //depot/projects/docproj_nl/www/en/relnotes.sgml#3 (text+ko) ==== @@ -1,5 +1,5 @@ + ]> @@ -70,6 +70,18 @@

Errata

FreeBSD 8-STABLE Release Documentation

+ +

FreeBSD 7-STABLE Release Documentation

==== //depot/projects/docproj_nl/www/en/relnotes/Makefile#3 (text+ko) ==== @@ -7,10 +7,11 @@ # of relnotes should appear on the web site. The second word is the # path to that relnotes set. # -# $FreeBSD: www/en/relnotes/Makefile,v 1.8 2008/10/05 10:17:00 simon Exp $ +# $FreeBSD: www/en/relnotes/Makefile,v 1.9 2011/05/02 20:54:26 blackend Exp $ # RELNOTES?= CURRENT ${.CURDIR}/../../../relnotes/doc \ + 8-STABLE ${.CURDIR}/../../../relnotes8/doc \ 7-STABLE ${.CURDIR}/../../../relnotes7/doc \ 6-STABLE ${.CURDIR}/../../../relnotes6/doc ==== //depot/projects/docproj_nl/www/nl/share/sgml/header.l10n.ent#20 (text+ko) ==== @@ -1,4 +1,4 @@ - ==== //depot/projects/docproj_nl/www/nl/share/sgml/navibar.l10n.ent#19 (text+ko) ==== @@ -1,4 +1,4 @@ -