From owner-p4-projects@FreeBSD.ORG Mon May 10 03:10:15 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9921A10656AE; Mon, 10 May 2010 03:10:15 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 58CCC1065698 for ; Mon, 10 May 2010 03:10:15 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 45DE38FC17 for ; Mon, 10 May 2010 03:10:15 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o4A3AFuV011780 for ; Mon, 10 May 2010 03:10:15 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4A3AFGd011778 for perforce@freebsd.org; Mon, 10 May 2010 03:10:15 GMT (envelope-from rene@FreeBSD.org) Date: Mon, 10 May 2010 03:10:15 GMT Message-Id: <201005100310.o4A3AFGd011778@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 178021 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: Mon, 10 May 2010 03:10:15 -0000 http://p4web.freebsd.org/@@178021?ac=10 Change 178021 by rene@rene_eee on 2010/05/10 03:09:53 IFC (at BSDCan 2010) Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/developers-handbook/policies/chapter.sgml#5 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/authors.ent#36 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml#6 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#45 integrate .. //depot/projects/docproj_nl/share/pgpkeys/decke.key#1 branch .. //depot/projects/docproj_nl/share/pgpkeys/dougb.key#3 integrate .. //depot/projects/docproj_nl/share/pgpkeys/pgpkeys-developers.sgml#37 integrate .. //depot/projects/docproj_nl/share/pgpkeys/pgpkeys.ent#34 integrate .. //depot/projects/docproj_nl/share/sgml/mirrors.xml#17 integrate .. //depot/projects/docproj_nl/www/en/copyright/freebsd-doc-license.sgml#3 integrate .. //depot/projects/docproj_nl/www/en/copyright/freebsd-license.sgml#3 integrate .. //depot/projects/docproj_nl/www/en/projects/projects.sgml#3 integrate Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/developers-handbook/policies/chapter.sgml#5 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -131,7 +131,7 @@ key issue in the decisions. - Because of some unfortunate design limitations with the RCS file + Because of some unfortunate design limitations with the RCS file format and the use of vendor branches, minor, trivial and/or cosmetic changes are strongly discouraged on files that are still tracking the vendor branch. Spelling @@ -167,7 +167,7 @@ The important thing here is that the src/contrib/file directory is created according to the rules: it is supposed to contain the sources as distributed (on a - proper vendor-branch and without RCS keyword expansion) with as few + proper vendor-branch and without RCS keyword expansion) with as few FreeBSD-specific changes as possible. If there are any doubts on how to go about it, it is imperative that you ask first and not blunder ahead and hope it works out. ==== //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/authors.ent#36 (text+ko) ==== @@ -13,7 +13,7 @@ builds for the other languages, and we will poke fun of you in public. - $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.505 2010/04/21 07:19:51 randi Exp $ + $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.506 2010/05/09 23:19:56 dougb Exp $ --> aaron@FreeBSD.org"> @@ -300,7 +300,7 @@ dmlb@FreeBSD.org"> -DougB@FreeBSD.org"> +dougb@FreeBSD.org"> dryice@FreeBSD.org"> ==== //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml#6 (text+ko) ==== @@ -1,5 +1,5 @@ + @@ -13,7 +13,7 @@ ]]> ==== //depot/projects/docproj_nl/share/pgpkeys/pgpkeys-developers.sgml#37 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -406,6 +406,11 @@ &pgpkey.petef; + + &a.decke; + &pgpkey.decke; + + &a.billf; &pgpkey.billf; ==== //depot/projects/docproj_nl/share/pgpkeys/pgpkeys.ent#34 (text+ko) ==== @@ -1,5 +1,5 @@ - + @@ -76,6 +76,7 @@ + ==== //depot/projects/docproj_nl/share/sgml/mirrors.xml#17 (text+ko) ==== @@ -2,7 +2,7 @@ - $FreeBSD: doc/share/sgml/mirrors.xml,v 1.108 2010/04/11 18:23:02 jkois Exp $ + $FreeBSD: doc/share/sgml/mirrors.xml,v 1.109 2010/05/06 14:12:54 ru Exp $ @@ -2102,10 +2102,6 @@ - cvsup4.ua.FreeBSD.org - - - cvsup5.ua.FreeBSD.org ==== //depot/projects/docproj_nl/www/en/copyright/freebsd-doc-license.sgml#3 (text+ko) ==== @@ -1,6 +1,6 @@ - + ]> @@ -8,7 +8,7 @@ &header; -

Copyright 1994-2009 +

Copyright 1994-2010 The FreeBSD Project. All rights reserved.

==== //depot/projects/docproj_nl/www/en/copyright/freebsd-license.sgml#3 (text+ko) ==== @@ -1,6 +1,6 @@ - + ]> @@ -8,7 +8,7 @@ &header; -

Copyright 1994-2009 +

Copyright 1992-2010 The FreeBSD Project. All rights reserved.

==== //depot/projects/docproj_nl/www/en/projects/projects.sgml#3 (text+ko) ==== @@ -1,6 +1,6 @@ - + @@ -36,10 +36,7 @@
  • Device drivers
  • Architecture
  • Misc
    • -
  • Google Summer of Code 2008
    • -
  • Google Summer of Code 2007
    • -
  • Google Summer of Code 2006
    • -
  • Google Summer of Code 2005
    • +
  • Google Summer of Code