Date: Tue, 29 Apr 2008 09:17:24 GMT From: Gabor Kovesdan <gabor@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 140846 for review Message-ID: <200804290917.m3T9HOCl040661@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 @@ -<!-- $FreeBSD: doc/share/pgpkeys/novel.key,v 1.3 2007/09/01 14:22:05 novel Exp $ --> +<!-- $FreeBSD: doc/share/pgpkeys/novel.key,v 1.4 2008/04/26 07:05:25 novel Exp $ --> <!-- sh addkey.sh novel 1DAACA46; --> <programlisting role="pgpfingerprint"><![CDATA[ -pub 1024R/1DAACA46 2004-05-25 [expires: 2008-01-10] +pub 1024R/1DAACA46 2004-05-25 [expires: 2009-04-26] Key fingerprint = AC27 CF29 5E51 E53F 8C8D DB90 8074 5B38 1DAA CA46 uid Roman Bogorodskiy <novel@FreeBSD.org> uid Roman Bogorodskiy <bogorodskiy@gmail.com> @@ -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----- ]]></programlisting> ==== //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{\ <pre> Copyright (c) 1996-2008 <a href="$mailtoURL">Wolfram Schneider</a> @@ -1280,7 +1282,6 @@ <li>Get the <a href="$BASE/source">source</a> of the man.cgi script</li> <li>Troff macros works only if defined in FreeBSD/groff. OS specific macros like `appeared in NetBSD version 1.2' are not supported.</li> -<li>Netscape is buggy, you may press twice the link 'Index Page and Help'</li> <li>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.</li> @@ -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 ) . "<h1>", $www{'head'}, "</h1>\n" . &faq . qq{\ ==== //depot/projects/docproj_es/www/en/docproj/translations.sgml#2 (text+ko) ==== @@ -1,6 +1,6 @@ <!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [ <!ENTITY base CDATA ".."> -<!ENTITY date "$FreeBSD: www/en/docproj/translations.sgml,v 1.99 2008/02/10 09:42:38 keramida Exp $"> +<!ENTITY date "$FreeBSD: www/en/docproj/translations.sgml,v 1.100 2008/04/28 11:30:14 chinsan Exp $"> <!ENTITY title "FreeBSD Documentation Project: Translations"> <!ENTITY % navinclude.docs "INCLUDE"> ]> @@ -137,16 +137,15 @@ <a name="chinese-tw"></a> <h2>The FreeBSD Traditional Chinese Documentation Project</h2> -<b>Web</b>: <a href="http://www.FreeBSD.org.tw">www.FreeBSD.org.tw</a><br> +<b>Web</b>: <a href="https://opensvn.csie.org/traccgi/freebsddoc/">https://opensvn.csie.org/traccgi/freebsddoc/</a><br> <b>E-Mail</b>: <a href="mailto:chinsan@FreeBSD.org">chinsan@FreeBSD.org</a><br> <dl> <dt><i>USENET Newsgroup available</i></dt> <dd>We usually use <b>tw.bbs.comp.386bsd</b> to discuss these issue.<br> It can be access by the following URL:<br> - <a href="http://www.csie.nctu.edu.tw/news/group//tw.bbs.comp.386bsd">NCTU CSIE Web News</a><br> + <a href="http://www.cs.nctu.edu.tw/usenet/group//tw.bbs.comp.386bsd">NCTU CSIE Web News</a><br> <a href="http://www.ptt.cc/bbs/FreeBSD/index.html">PTT WebBBS</a><br> - <a href="http://news.ee.nthu.edu.tw/brd?bsd">NTHU EE WebBBS</a><br> <a href="http://groups.google.com.tw/group/tw.bbs.comp.386bsd?lnk=sg">Google Group</a><br> and anything else which newsreader can read <b>tw.bbs.comp.386bsd</b>. </dd> @@ -159,6 +158,7 @@ <dd><a href="../doc/zh_TW/books/handbook/">Handbook</a></dd> <dd><a href="../doc/zh_TW/books/developers-handbook">Developers' Handbook</a></dd> <dd><a href="../doc/zh_TW/books/porters-handbook">Porters' Handbook</a></dd> + <dd><a href="../doc/zh_TW/booksfdp-prime">FreeBSD Document Project Primer for New Contributors</a></dd> </dl> <a name="dutch"></a> ==== //depot/projects/docproj_es/www/en/docs/books.sgml#2 (text+ko) ==== @@ -1,6 +1,6 @@ <!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [ <!ENTITY base CDATA ".."> -<!ENTITY date "$FreeBSD: www/en/docs/books.sgml,v 1.34 2008/04/14 17:33:15 jkois Exp $"> +<!ENTITY date "$FreeBSD: www/en/docs/books.sgml,v 1.35 2008/04/28 15:47:21 gabor Exp $"> <!ENTITY title "Books and Articles Online"> <!ENTITY % navinclude.docs "INCLUDE"> @@ -199,6 +199,11 @@ a GEOM Class</a>(geom-class)<br> A guide to GEOM internals, and writing your own class.</p> + <p><a href="&url.articles;/gjournal-desktop/index.html">Implementing + UFS journaling on a desktop PC</a>(gjournal-desktop)<br> + A guide to create UFS partitions configured with journaling + for desktop use.</p> + <p><a href="&url.articles;/hats/index.html">Working with Hats</a> (hats)<br> 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 @@ <usergroups> <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0"> <cvs:keyword name="freebsd"> - $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 $ </cvs:keyword> </cvs:keywords> @@ -220,10 +220,13 @@ <description>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. <a - href="http://www.uugrn.org/kalender.php">Meetings</a> 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</a> + are held on the second Thursday of each month at the + "Vereinsgaststatte ESC-Blauweiss Mannheim" in Mannheim. The + <a href="http://wiki.uugrn.org/wiki/UUGRN:FIXME_Treffen">FIXME + meeting</a> happens every fourth Friday of each month in + "Forum41" in Schwetzingen. Located in Germany, + Rhine-Neckar-Region. </description> </entry> @@ -982,6 +985,15 @@ other BSD variations. Join us! </description> </entry> + + <entry id="beersd-argentina"> + <name>bug.dc.uba.ar</name> + <url>http://bug.dc.uba.ar</url> + + <description>Buenos Aires based group with monthly meetings. + Comprised of many students at the University of Buenos Aires + Computer Science department.</description> + </entry> </country> <country code="PE" name="Peru">
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200804290917.m3T9HOCl040661>