From owner-p4-projects@FreeBSD.ORG Tue Apr 29 09:17:24 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AD3CD1065673; Tue, 29 Apr 2008 09:17:24 +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 5518B1065670 for ; Tue, 29 Apr 2008 09:17:24 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3DCA88FC15 for ; Tue, 29 Apr 2008 09:17:24 +0000 (UTC) (envelope-from gabor@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 m3T9HOXW040663 for ; Tue, 29 Apr 2008 09:17:24 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3T9HOCl040661 for perforce@freebsd.org; Tue, 29 Apr 2008 09:17:24 GMT (envelope-from gabor@freebsd.org) Date: Tue, 29 Apr 2008 09:17:24 GMT Message-Id: <200804290917.m3T9HOCl040661@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 140846 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: Tue, 29 Apr 2008 09:17:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=140846 Change 140846 by gabor@gabor_server on 2008/04/29 09:17:18 IFC Affected files ... .. //depot/projects/docproj_es/doc/share/images/articles/gjournal-desktop/disklabel1.png#1 branch .. //depot/projects/docproj_es/doc/share/images/articles/gjournal-desktop/disklabel2.png#1 branch .. //depot/projects/docproj_es/doc/share/pgpkeys/novel.key#2 integrate .. //depot/projects/docproj_es/www/en/cgi/man.cgi#2 integrate .. //depot/projects/docproj_es/www/en/docproj/translations.sgml#2 integrate .. //depot/projects/docproj_es/www/en/docs/books.sgml#2 integrate .. //depot/projects/docproj_es/www/share/sgml/usergroups.xml#2 integrate Differences ... ==== //depot/projects/docproj_es/doc/share/pgpkeys/novel.key#2 (text+ko) ==== @@ -1,9 +1,9 @@ - + uid Roman Bogorodskiy @@ -17,28 +17,28 @@ boNl3sK/+KsJxwt6frqOBnnvtQYQEYzIQNJ4pMKC2Mz15jMYndwsuxg6L09e6+R1 7RfIEFEXU7p6YWQFLoBFUW16XF7ye8YrjFJxAEfTa4jnXF27ERopVpUFAAYptCVS b21hbiBCb2dvcm9kc2tpeSA8bm92ZWxARnJlZUJTRC5vcmc+iL0EEwECACcCGwMG -CwkIBwMCAxUCAwMWAgECHgECF4ACGQEFAkWk7H0FCQbS+2IACgkQgHRbOB2qykaY -TgP/aTl0A12yrwFi6sQE/2hzrK6qQ1HL4qmz3UETXZSHcKbZwXYLbGO2Qvs5dMZv -FCw50QbLh+3I2fn3kFU/IaupD3wwIoTdRJiLM+vl+EU/H3ClZ0fgC7iEnroHCbL4 -OZW+L6SEx+eT508pQm36SOJKGkS/++wrbUGuG50JiKOKihG0KVJvbWFuIEJvZ29y +CwkIBwMCAxUCAwMWAgECHgECF4ACGQEFAkgS0BsFCQlA3vgACgkQgHRbOB2qykZG +oAP8D28j3pBxbOch9/mlDL048M1lWMnJhAJ1wYpcAbmKseBrEWCz9czxPj/UgUNl +6EfRLT71W0HOH/eN74zJqwWb80wviX9nOKApsmqtv528fujoMYF+XeweBX4a+Cta +D+krJUxM0rA8kETvLcHCehl9EDJdNHHM5piSCTrnj8XBNJS0KVJvbWFuIEJvZ29y b2Rza2l5IDxib2dvcm9kc2tpeUBnbWFpbC5jb20+iLoEEwECACQCGwMGCwkIBwMC -AxUCAwMWAgECHgECF4AFAkWk7IEFCQbS+2IACgkQgHRbOB2qykZlpgP/Vr9cnLEF -iijzgyHXBhfo3Y8dmO7+8r1LDd7zEBfFIVQWmmquOZBcHOdJ7kOWe+X7e56yBCpb -DboNUiXgYJ728UfDvk3ida5Mj4OiQjOKlW1pyiwNhNE8/X1ngoVIdZ/mafv8141Q -nkIINIC7dcB27+QKDuzQJ2FMI+4azR1a3Ee0KFJvbWFuIEJvZ29yb2Rza2l5IDxi +AxUCAwMWAgECHgECF4AFAkgS0B4FCQlA3vgACgkQgHRbOB2qykZ1+AP/ajL5tZdQ +hoM075iBc+q34czeeLccV6nXGDkQSyJ2gp654+oOiDKIU+HeaaNVpgvvtzZqoFQZ +GH38DWM0G/WLuaEJDsCPSVHdKMgAe98FaLWe/oekTS0KF/epuK73GHRBNZaCPrcn +tVWALyo/O6V65023Lor4DcU6pjhDbwk6Yrq0KFJvbWFuIEJvZ29yb2Rza2l5IDxi b2dvcm9kc2tpeUBpbmJveC5ydT6IugQTAQIAJAIbAwYLCQgHAwIDFQIDAxYCAQIe -AQIXgAUCRaTsgQUJBtL7YgAKCRCAdFs4HarKRvzvBADDlwy0yK1iSQNKx1z7kkoL -+JVzXfzDmJ4uOw3T6XwUNuXzNENslgNd2UQJgEm8ag5Bxsx9sXY2xbq7OwIoeULl -gc6Dde8MgLUZdlFLfUIzRz8Bw6Mw2cxTp5IM2EL1Q7Khj55toRplzkM3rzIU8YEf -lT21C1tFsk6SZHVLROG3n4i0BBMBAgAeBQJAsySbAhsDBgsJCAcDAgMVAgMDFgIB +AQIXgAUCSBLQHgUJCUDe+AAKCRCAdFs4HarKRnIcA/4iBqhJ7zdEx1j1qQ0rj9hO +R/OQISesx17fRMwd/u3tmDjAyX22Pgqhhj56f2eJ2SQUr0PJXin6UwaYEQ4ifbz0 +z6zVZlmiLVEwJk6O43dhHc6k9RxM/eDltzbCa4aBQwuQg3Seyg4Z2HCvRrKv9ESZ +9NZVI+hqVyQl9hyJ95b8CIi0BBMBAgAeBQJAsySbAhsDBgsJCAcDAgMVAgMDFgIB Ah4BAheAAAoJEIB0WzgdqspG/3kD/0isk4pKJTMKCcoaGcZsGW6C3e5CZw8Mr+OW AsxHGh/Iv3iGB7gGoO07R/I+uAMNR2VbPQAvYPlMwrIhubNzUZRzkdlBu7QQyT7C lyEIAn/ikUzfmxvD2U0D0SrHguz7YcSH1Vjb9R7J8dc+qlPJBRXIX6saNG6+FbSk KN+J8hOBtCVSb21hbiBCb2dvcm9kc2tpeSA8bm92ZWxAY2x1YmxpZmUucnU+iLwE -EwECACYCGwMGCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAUCRaTsgQUJBtL7YgAKCRCA -dFs4HarKRuscA/972/PGOvl0zijaqyAQ8p4vIQU9/0MTOvjSJ7h1F2R77B4SI7lK -afbO87vBPo1QugRmJ/j3bD4pOg9G2CNXOFyUENrV47E0BVGCQURph9/CPGw0wdUm -s/AcBfDoCsqIA71O+p/5d7STbtIatKdoUePi89QIjI0HQjpXV/l5Py1SEw== -=0bTH +EwECACYCGwMGCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAUCSBLQHgUJCUDe+AAKCRCA +dFs4HarKRpUEBACyMr1jFO6G1HTwixax4+jMmto+9Mdp3uifEr/Rwa6mFyIGQx1G +3N/bHWgWNIUkD8ZAKoD4jaijPNpE9yEUsXSkZD7TOkvRfsFbGDb0PissDnraRr0o +hNH2K/edi23vXQH/rHj7N/B4fjF+3x0jocg3+Dnh1ADEJcPBN2HQGVAkkA== +=ilKf -----END PGP PUBLIC KEY BLOCK----- ]]> ==== //depot/projects/docproj_es/www/en/cgi/man.cgi#2 (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.198 2008/04/15 09:57:12 wosch Exp $ +# $FreeBSD: www/en/cgi/man.cgi,v 1.202 2008/04/27 10:53:18 wosch Exp $ ############################################################################ # !!! man.cgi is stale perl4 code !!! @@ -47,7 +47,7 @@ package main; -$www{'title'} = 'FreeBSD Hypertext Man Pages'; +$www{'title'} = 'FreeBSD Man Pages'; $www{'home'} = 'http://www.FreeBSD.org'; $www{'head'} = $www{'title'}; @@ -169,7 +169,6 @@ 'FreeBSD 6.3-RELEASE', "$manLocalDir/FreeBSD-6.3-RELEASE/man:$manLocalDir/FreeBSD-6.3-RELEASE/openssl/man", 'FreeBSD Ports 6.3-RELEASE', "$manLocalDir/FreeBSD-ports-6.3-RELEASE", - 'FreeBSD 6.2-stable', "$manLocalDir/FreeBSD-6.2-stable/man:$manLocalDir/FreeBSD-6.2-stable/openssl/man", 'FreeBSD 6.2-RELEASE', "$manLocalDir/FreeBSD-6.2-RELEASE/man:$manLocalDir/FreeBSD-6.2-RELEASE/openssl/man", 'FreeBSD Ports 6.2-RELEASE', "$manLocalDir/FreeBSD-ports-6.2-RELEASE", @@ -382,15 +381,18 @@ # keywords must be in lower cases. %manPathAliases = ( - 'freebsd', 'FreeBSD 6.2-RELEASE', - 'freebsd-release', 'FreeBSD 6.2-RELEASE', - 'freebsd-stable', 'FreeBSD 6.2-stable', + 'freebsd', 'FreeBSD 7.0-RELEASE', + 'freebsd-release', 'FreeBSD 7.0-RELEASE', + + 'freebsd-stable', 'FreeBSD 7.0-stable', + 'freebsd-stable7', 'FreeBSD 7.0-stable', + 'freebsd-stable6', 'FreeBSD 6.3-stable', + 'freebsd-stable5', 'FreeBSD 5.5-stable', 'freebsd-stable4', 'FreeBSD 4.11-stable', - 'freebsd-stable5', 'FreeBSD 5.5-stable', - 'freebsd-stable6', 'FreeBSD 6.2-stable', - 'freebsd-stable7', 'FreeBSD 7.0-stable', + 'freebsd-current', 'FreeBSD 8-current', - 'freebsd-release-ports', 'FreeBSD 6.2-RELEASE and Ports', + 'freebsd-release-ports', 'FreeBSD 7.0-RELEASE and Ports', + 'slackware', 'Linux Slackware 3.1', 'linux-de', 'deutsch - Linux/GNU', 'redhat', 'Red Hat Linux/i386 9', @@ -412,8 +414,8 @@ 'sunos5', 'SunOS 5.10', 'sunos4', 'SunOS 4.1.3', 'sunos', 'SunOS 4.1.3', - 'freebsd ports', 'FreeBSD Ports 6.2-RELEASE', - 'ports', 'FreeBSD Ports 6.2-RELEASE', + 'freebsd ports', 'FreeBSD Ports 7.0-RELEASE', + 'ports', 'FreeBSD Ports 7.0-RELEASE', 'plan9', 'Plan 9', 'osf1', 'OSF1 V5.1/alpha', 'true64', 'OSF1 V5.1/alpha', @@ -1243,7 +1245,7 @@ if $manPathAliases{$_}; } - local $id = '$FreeBSD: www/en/cgi/man.cgi,v 1.198 2008/04/15 09:57:12 wosch Exp $'; + local $id = '$FreeBSD: www/en/cgi/man.cgi,v 1.202 2008/04/27 10:53:18 wosch Exp $'; return qq{\ 
 Copyright (c) 1996-2008 Wolfram Schneider
@@ -1280,7 +1282,6 @@
 
  • Get the source of the man.cgi script
    • 
 
  • Troff macros works only if defined in FreeBSD/groff. OS specific
 macros like `appeared in NetBSD version 1.2' are not supported.
    • 
-
  • Netscape is buggy, you may press twice the link 'Index Page and Help'
    • 
 
  • Some OSs provide only formated manual pages (catpages), e.g. NetBSD
 and OpenBSD. In this case it is not possible to create Postscript
 and troff output.
    • 
@@ -1334,7 +1335,7 @@
     $base = 'http://www.freebsd.org/cgi/';    # XXX
 
     &http_header("text/html");
-    print &html_header( "HTML hypertext FreeBSD man page interface", $base )
+    print &html_header( "FreeBSD manual page help", $base )
       . "
    ", $www{'head'},
       "
    \n" 
       . &faq . qq{\

==== //depot/projects/docproj_es/www/en/docproj/translations.sgml#2 (text+ko) ====

@@ -1,6 +1,6 @@
 
-
+
 
 
 ]>
@@ -137,16 +137,15 @@
 
 
 
    The FreeBSD Traditional Chinese Documentation Project
    
-Web: www.FreeBSD.org.tw
    
+Web: https://opensvn.csie.org/traccgi/freebsddoc/
    
 E-Mail: chinsan@FreeBSD.org
    
 
 
    
   
    USENET Newsgroup available
    
   
    We usually use tw.bbs.comp.386bsd to discuss these issue.
    
     It can be access by the following URL:
    
-    NCTU CSIE Web News
    
+    NCTU CSIE Web News
    
     PTT WebBBS
    
-    NTHU EE WebBBS
    
     Google Group
    
     and anything else which newsreader can read tw.bbs.comp.386bsd.
   
    
@@ -159,6 +158,7 @@
   
    Handbook
    
   
    Developers' Handbook
    
   
    Porters' Handbook
    
+  
    FreeBSD Document Project Primer for New Contributors
    
 
    
 
 

==== //depot/projects/docproj_es/www/en/docs/books.sgml#2 (text+ko) ====

@@ -1,6 +1,6 @@
 
-
+
 
 
 
@@ -199,6 +199,11 @@
 	        a GEOM Class(geom-class)
    
 	      A guide to GEOM internals, and writing your own class.
    
 
+	    
    Implementing
+	        UFS journaling on a desktop PC(gjournal-desktop)
    
+	      A guide to create UFS partitions configured with journaling
+		for desktop use.
    
+
 	    
    Working with Hats
 	        (hats)
    
 	      A committer's guide to working with ``hats'' (other

==== //depot/projects/docproj_es/www/share/sgml/usergroups.xml#2 (text+ko) ====

@@ -5,7 +5,7 @@
 
   
     
-      $FreeBSD: www/share/sgml/usergroups.xml,v 1.68 2008/04/20 22:49:26 murray Exp $
+      $FreeBSD: www/share/sgml/usergroups.xml,v 1.69 2008/04/25 20:32:52 murray Exp $
     
   
 
@@ -220,10 +220,13 @@
       The Unix Users Group Rhein-Neckar eV (UUGRN eV)
         provides a regional forum for users of all Unix flavors, with
         a stress on Linux and BSD. Meetings are held
-        on the second Thursday of each month at the "hafenschenke" in
-        Mannheim and the fourth Wednesday of each month at the "Vater
-        Rhein" in Heidelberg.  Located in Germany, Mannheim.
+        href="http://wiki.uugrn.org/wiki/UUGRN:Stammtisch">Meetings
+        are held on the second Thursday of each month at the
+        "Vereinsgaststatte ESC-Blauweiss Mannheim" in Mannheim.  The
+        FIXME
+        meeting happens every fourth Friday of each month in
+        "Forum41" in Schwetzingen. Located in Germany,
+        Rhine-Neckar-Region.
       
     
 
@@ -982,6 +985,15 @@
       other BSD variations.  Join us!
     
   
+
+  
+    bug.dc.uba.ar
+    http://bug.dc.uba.ar
+
+    Buenos Aires based group with monthly meetings.
+      Comprised of many students at the University of Buenos Aires
+      Computer Science department.
+