PERFORCE change 187832 for review
Rene Ladan
rene at FreeBSD.org
Sat Jan 15 09:53:21 UTC 2011
http://p4web.freebsd.org/@@187832?ac=10
Change 187832 by rene at rene_acer on 2011/01/15 09:53:19
IFC
Affected files ...
.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#83 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/book.sgml#6 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/install/chapter.sgml#14 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml#36 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#98 integrate
.. //depot/projects/docproj_nl/share/sgml/freebsd.ent#19 integrate
.. //depot/projects/docproj_nl/www/en/administration.sgml#17 integrate
.. //depot/projects/docproj_nl/www/en/cgi/cgi-style.pl#7 integrate
.. //depot/projects/docproj_nl/www/en/cgi/mailindex.cgi#2 integrate
.. //depot/projects/docproj_nl/www/en/cgi/man.cgi#21 integrate
.. //depot/projects/docproj_nl/www/en/cgi/mid.cgi#4 integrate
.. //depot/projects/docproj_nl/www/en/cgi/mirror.cgi#3 integrate
.. //depot/projects/docproj_nl/www/en/cgi/missing_handler.cgi#3 integrate
.. //depot/projects/docproj_nl/www/en/cgi/pds.cgi#3 integrate
.. //depot/projects/docproj_nl/www/en/cgi/ports.cgi#6 integrate
.. //depot/projects/docproj_nl/www/en/cgi/url.cgi#3 integrate
.. //depot/projects/docproj_nl/www/en/donations/donors.sgml#38 integrate
.. //depot/projects/docproj_nl/www/en/gnome/docs/gnome1_porting.sgml#2 integrate
.. //depot/projects/docproj_nl/www/en/index.xsl#7 integrate
.. //depot/projects/docproj_nl/www/en/releases/index.sgml#12 integrate
.. //depot/projects/docproj_nl/www/en/security/Makefile#2 integrate
.. //depot/projects/docproj_nl/www/en/security/mkindex.xsl#2 integrate
.. //depot/projects/docproj_nl/www/en/security/notices.sgml#1 branch
.. //depot/projects/docproj_nl/www/en/security/security.sgml#16 integrate
.. //depot/projects/docproj_nl/www/nl/where.sgml#25 integrate
.. //depot/projects/docproj_nl/www/share/sgml/commercial.isp.xml#21 integrate
.. //depot/projects/docproj_nl/www/share/sgml/libcommon.xsl#9 integrate
.. //depot/projects/docproj_nl/www/share/sgml/navibar.ent#9 integrate
Differences ...
==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#83 (text+ko) ====
@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.981 2010/12/29 20:44:12 decke Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.982 2011/01/04 01:14:27 tota Exp $ -->
<!--
NOTE TO COMMITTERS: Contributors lists are sorted in alphabetical
order by first name.
@@ -3385,6 +3385,11 @@
</listitem>
<listitem>
+ <para>Gleb Sushko
+ <email>neuroworker at gmail.com</email></para>
+ </listitem>
+
+ <listitem>
<para>Glen Foster
<email>gfoster at gfoster.com</email></para>
</listitem>
==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/book.sgml#6 (text+ko) ====
@@ -1,7 +1,7 @@
<!--
The FreeBSD Documentation Project
- $FreeBSD: doc/en_US.ISO8859-1/books/handbook/book.sgml,v 1.176 2010/01/18 19:35:05 blackend Exp $
+ $FreeBSD: doc/en_US.ISO8859-1/books/handbook/book.sgml,v 1.177 2011/01/10 19:02:37 blackend Exp $
-->
<!DOCTYPE BOOK PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
@@ -79,6 +79,7 @@
<year>2008</year>
<year>2009</year>
<year>2010</year>
+ <year>2011</year>
<holder>The FreeBSD Documentation Project</holder>
</copyright>
==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/install/chapter.sgml#14 (text+ko) ====
@@ -1,7 +1,7 @@
<!--
The FreeBSD Documentation Project
- $FreeBSD: doc/en_US.ISO8859-1/books/handbook/install/chapter.sgml,v 1.414 2010/12/01 20:37:04 rene Exp $
+ $FreeBSD: doc/en_US.ISO8859-1/books/handbook/install/chapter.sgml,v 1.415 2011/01/10 13:27:34 ryusuke Exp $
-->
<chapter id="install">
@@ -93,11 +93,7 @@
<para>The minimal configuration to install &os; varies with the
&os; version and the hardware architecture.</para>
- <para>Information about the minimal configuration is
- available in the Installation Notes on the <ulink
- url="http://www.FreeBSD.org/releases/index.html">Release
- Information</ulink> page of the &os; web site. A summary of
- this information is given in the following sections.
+ <para>A summary of this information is given in the following sections.
Depending on the method you choose to install &os;, you may
also need a floppy drive, a supported CDROM drive, and in some
case a network adapter. This will be covered by the <xref
==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml#36 (text+ko) ====
@@ -1,7 +1,7 @@
<!--
The FreeBSD Documentation Project
- $FreeBSD: doc/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml,v 1.490 2010/12/01 20:37:04 rene Exp $
+ $FreeBSD: doc/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml,v 1.493 2011/01/10 19:29:32 blackend Exp $
-->
<appendix id="mirrors">
@@ -2426,6 +2426,15 @@
</varlistentry>
<varlistentry>
+ <term>RELENG_8_2</term>
+
+ <listitem>
+ <para>The release branch for &os;-8.2, used only for
+ security advisories and other critical fixes.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
<term>RELENG_8_1</term>
<listitem>
@@ -2453,6 +2462,15 @@
</varlistentry>
<varlistentry>
+ <term>RELENG_7_4</term>
+
+ <listitem>
+ <para>The release branch for &os;-7.4, used only for
+ security advisories and other critical fixes.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
<term>RELENG_7_3</term>
<listitem>
==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#98 (text+ko) ====
@@ -1,7 +1,7 @@
<!--
The FreeBSD Documentation Project
- $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.1092 2010/12/30 06:24:10 miwi Exp $
+ $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.1093 2011/01/15 08:39:27 jkois Exp $
-->
<!DOCTYPE BOOK PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
@@ -4171,7 +4171,7 @@
<sect1 id="conflicts">
<title>Conflict handling</title>
- <para>There are tree different variables to register a conflict
+ <para>There are three different variables to register a conflict
between packages and ports: <makevar>CONFLICTS</makevar>,
<makevar>CONFLICTS_INSTALL</makevar> and
<makevar>CONFLICTS_BUILD</makevar>.</para>
==== //depot/projects/docproj_nl/share/sgml/freebsd.ent#19 (text+ko) ====
@@ -1,7 +1,7 @@
<!-- -*- sgml -*-
DocBook Miscellaneous FreeBSD Entities.
- $FreeBSD: doc/share/sgml/freebsd.ent,v 1.127 2010/08/10 10:28:44 pgj Exp $
+ $FreeBSD: doc/share/sgml/freebsd.ent,v 1.129 2011/01/10 19:29:32 blackend Exp $
This file is now valid XML as well as SGML. Please do not add CDATA
attributes or anything else that will prevent this file from being
==== //depot/projects/docproj_nl/www/en/administration.sgml#17 (text+ko) ====
@@ -1,5 +1,5 @@
<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
-<!ENTITY date "$FreeBSD: www/en/administration.sgml,v 1.38 2010/11/17 15:17:46 tabthorpe Exp $">
+<!ENTITY date "$FreeBSD: www/en/administration.sgml,v 1.39 2011/01/06 21:15:59 simon Exp $">
<!ENTITY title "FreeBSD Project Administration and Management">
<!ENTITY % navinclude.about "INCLUDE">
<!ENTITY % developers SYSTEM "developers.sgml"> %developers;
@@ -74,7 +74,6 @@
<li><a href="#t-perforce-admin">Perforce Repository
Administrators</a></li>
<li><a href="#t-postmaster">Postmaster Team</a></li>
- <li><a href="#t-refadm">Ref Administrators</a></li>
<li><a href="#t-webmaster">Webmaster Team</a></li>
</ul>
</li>
@@ -570,26 +569,6 @@
<li>&a.dhw; <<a href="mailto:dhw at FreeBSD.org">dhw at FreeBSD.org</a>></li>
</ul>
- <h3><a name="t-refadm">Reference Systems Administrators</a>
- <!-- admins mail aliases intentionally left incomplete -->
- <refadm@></h3>
-
- <p>The Reference Systems Administrators are responsible for administrating,
- upgrading and maintaining the reference systems in the FreeBSD cluster.
- These systems are available to all FreeBSD committers.</p>
-
- <ul>
- <li>&a.jake; <<a href="mailto:jake at FreeBSD.org">jake at FreeBSD.org</a>></li>
- <li>&a.billf; <<a href="mailto:billf at FreeBSD.org">billf at FreeBSD.org</a>></li>
- <li>&a.markm; <<a href="mailto:markm at FreeBSD.org">markm at FreeBSD.org</a>></li>
- <li>&a.simon; <<a href="mailto:simon at FreeBSD.org">simon at FreeBSD.org</a>></li>
- <li>&a.obrien; <<a href="mailto:obrien at FreeBSD.org">obrien at FreeBSD.org</a>></li>
- <li>&a.ps; <<a href="mailto:ps at FreeBSD.org">ps at FreeBSD.org</a>></li>
- <li>&a.kensmith; <<a href="mailto:kensmith at FreeBSD.org">kensmith at FreeBSD.org</a>></li>
- <li>&a.peter; <<a href="mailto:peter at FreeBSD.org">peter at FreeBSD.org</a>></li>
- <li>&a.dhw; <<a href="mailto:dhw at FreeBSD.org">dhw at FreeBSD.org</a>></li>
- </ul>
-
<h3><a name="t-webmaster">Webmaster Team</a>
<<a href="mailto:webmaster at FreeBSD.org">webmaster at FreeBSD.org</a>></h3>
==== //depot/projects/docproj_nl/www/en/cgi/cgi-style.pl#7 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: www/en/cgi/cgi-style.pl,v 1.41 2010/12/29 13:08:41 wosch Exp $
+# $FreeBSD: www/en/cgi/cgi-style.pl,v 1.42 2011/01/08 14:58:27 wosch Exp $
#
# Perl routines to encapsulate various elements of HTML page style.
@@ -236,7 +236,7 @@
return qq`
</div>
<div id="footer">
- <a href="$hsty_base/copyright/">Legal Notices</a> | © 1995-2010
+ <a href="$hsty_base/copyright/">Legal Notices</a> | © 1995-2011
The FreeBSD Project. All rights reserved.<br />
<address>$hsty_author<br />$hsty_date</address>
</div>
==== //depot/projects/docproj_nl/www/en/cgi/mailindex.cgi#2 (text+ko) ====
@@ -1,6 +1,6 @@
#!/usr/bin/perl -T
#
-# Copyright (c) Jan 1999 Wolfram Schneider <wosch at FreeBSD.org>
+# Copyright (c) Jan 1999-2011 Wolfram Schneider <wosch at FreeBSD.org>
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -24,7 +24,7 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD: www/en/cgi/mailindex.cgi,v 1.10 2006/12/01 21:58:22 wosch Exp $
+# $FreeBSD: www/en/cgi/mailindex.cgi,v 1.11 2011/01/08 14:58:27 wosch Exp $
use CGI;
==== //depot/projects/docproj_nl/www/en/cgi/man.cgi#21 (text+ko) ====
@@ -1,6 +1,6 @@
#!/usr/bin/perl -T
#
-# Copyright (c) 1996-2010 Wolfram Schneider <wosch at FreeBSD.org>
+# Copyright (c) 1996-2011 Wolfram Schneider <wosch at FreeBSD.org>
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -34,7 +34,7 @@
# Dual CGI/Plexus mode and new interface by sanders at 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.258 2010/12/29 15:20:51 wosch Exp $
+# $FreeBSD: www/en/cgi/man.cgi,v 1.259 2011/01/08 14:58:27 wosch Exp $
############################################################################
# !!! man.cgi is stale perl4 code !!!
@@ -1491,10 +1491,10 @@
}
local $id =
- '$FreeBSD: www/en/cgi/man.cgi,v 1.258 2010/12/29 15:20:51 wosch Exp $';
+ '$FreeBSD: www/en/cgi/man.cgi,v 1.259 2011/01/08 14:58:27 wosch Exp $';
return qq{\
<pre>
-Copyright (c) 1996-2010 <a href="$mailtoURL">Wolfram Schneider</a>
+Copyright (c) 1996-2011 <a href="$mailtoURL">Wolfram Schneider</a>
Copyright (c) 1993-1995 Berkeley Software Design, Inc.
This data is part of a licensed program from BERKELEY SOFTWARE
==== //depot/projects/docproj_nl/www/en/cgi/mid.cgi#4 (text+ko) ====
@@ -1,6 +1,6 @@
#!/usr/bin/perl -T
#
-# Copyright (c) March 1998-2010 Wolfram Schneider <wosch at FreeBSD.org>. Berlin.
+# Copyright (c) March 1998-2011 Wolfram Schneider <wosch at FreeBSD.org>. Berlin.
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -26,7 +26,7 @@
#
# Search a mail by Message-ID, References or In-Reply-To field
#
-# $FreeBSD: www/en/cgi/mid.cgi,v 1.18 2009/12/31 16:37:18 wosch Exp $
+# $FreeBSD: www/en/cgi/mid.cgi,v 1.19 2011/01/08 14:58:27 wosch Exp $
require "./cgi-lib.pl";
require "./cgi-style.pl";
==== //depot/projects/docproj_nl/www/en/cgi/mirror.cgi#3 (text+ko) ====
@@ -1,5 +1,5 @@
#!/usr/bin/perl -T
-# (c) 1996-2010 Wolfram Schneider. Public domain.
+# (c) 1996-2011 Wolfram Schneider. Public domain.
#
# FreeBSD WWW mirror redirect
#
==== //depot/projects/docproj_nl/www/en/cgi/missing_handler.cgi#3 (text+ko) ====
@@ -1,5 +1,5 @@
#!/usr/bin/perl -T
-# Copyright (c) July 1997-2010. Wolfram Schneider <wosch at FreeBSD.org>
+# Copyright (c) July 1997-2011. Wolfram Schneider <wosch at FreeBSD.org>
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -52,7 +52,7 @@
#
# _________________________________________________________________
#
-# $FreeBSD: www/en/cgi/missing_handler.cgi,v 1.20 2009/12/31 16:37:18 wosch Exp $
+# $FreeBSD: www/en/cgi/missing_handler.cgi,v 1.21 2011/01/08 14:58:27 wosch Exp $
# ----------------------------------------------------------------------
sub escape($) { $_ = $_[0]; s/&/&/g; s/</</g; s/>/>/g; $_; }
==== //depot/projects/docproj_nl/www/en/cgi/pds.cgi#3 (text+ko) ====
@@ -1,5 +1,5 @@
#!/usr/bin/perl -T
-# Copyright (c) 1997-2010 Wolfram Schneider <wosch at FreeBSD.ORG>, Berlin.
+# Copyright (c) 1997-2011 Wolfram Schneider <wosch at FreeBSD.ORG>, Berlin.
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -26,7 +26,7 @@
# pds.cgi - FreeBSD Ports download sources cgi script
# print a list of source files for a port
#
-# $FreeBSD: www/en/cgi/pds.cgi,v 1.13 2009/12/31 16:37:18 wosch Exp $
+# $FreeBSD: www/en/cgi/pds.cgi,v 1.14 2011/01/08 14:58:27 wosch Exp $
sub escape($) { $_ = $_[0]; s/&/&/g; s/</</g; s/>/>/g; $_; }
==== //depot/projects/docproj_nl/www/en/cgi/ports.cgi#6 (text+ko) ====
@@ -1,6 +1,6 @@
#!/usr/bin/perl -T
#
-# Copyright (c) 1996-2010 Wolfram Schneider <wosch at FreeBSD.ORG>
+# Copyright (c) 1996-2011 Wolfram Schneider <wosch at FreeBSD.ORG>
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -24,7 +24,7 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD: www/en/cgi/ports.cgi,v 1.100 2010/12/29 12:48:29 wosch Exp $
+# $FreeBSD: www/en/cgi/ports.cgi,v 1.101 2011/01/08 14:58:27 wosch Exp $
#
# ports.cgi - search engine for FreeBSD ports
# o search for a port by name or description
@@ -515,10 +515,10 @@
print qq{
<img align="right" src="$hsty_base/gifs/powerlogo.gif" alt="Powered by FreeBSD" />
-© 1996-2010 by Wolfram Schneider. All rights reserved.<br />
+© 1996-2011 by Wolfram Schneider. All rights reserved.<br />
};
-#print q{$FreeBSD: www/en/cgi/ports.cgi,v 1.100 2010/12/29 12:48:29 wosch Exp $} . "<br />\n";
+#print q{$FreeBSD: www/en/cgi/ports.cgi,v 1.101 2011/01/08 14:58:27 wosch Exp $} . "<br />\n";
print qq{Please direct questions about this service to
<i><a href="$mailtoURL">$mailto</a></i><br />\n};
print qq{General questions about FreeBSD ports should be sent to }
==== //depot/projects/docproj_nl/www/en/cgi/url.cgi#3 (text+ko) ====
@@ -1,6 +1,6 @@
#!/usr/bin/perl -T
#
-# Copyright (c) Oct 1997-1999 Wolfram Schneider <wosch at FreeBSD.org>. Berlin.
+# Copyright (c) Oct 1997-2011 Wolfram Schneider <wosch at FreeBSD.org>. Berlin.
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -26,7 +26,7 @@
#
# url.cgi - make plain text URLs clickable
#
-# $FreeBSD: www/en/cgi/url.cgi,v 1.37 2010/08/28 19:15:22 wosch Exp $
+# $FreeBSD: www/en/cgi/url.cgi,v 1.38 2011/01/08 14:58:27 wosch Exp $
use strict;
==== //depot/projects/docproj_nl/www/en/donations/donors.sgml#38 (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/donations/donors.sgml,v 1.421 2010/10/26 03:28:39 tabthorpe Exp $">
+<!ENTITY date "$FreeBSD: www/en/donations/donors.sgml,v 1.422 2011/01/10 08:35:05 gahr Exp $">
<!ENTITY title "Hardware Donors Page">
<!ENTITY % navinclude.about "INCLUDE">
<!ENTITY % developers SYSTEM "../developers.sgml"> %developers;
@@ -2823,6 +2823,18 @@
<td> fjoe </td>
<td> received </td>
</tr>
+
+ <tr>
+ <td> Anton Shterenlikht </td>
+ <td> 1x Asus WL-107g (Ralink RT2560 + RT2525, ral(4))<br>
+ 1x MSI CB54G2 (Ralink RT2560 + RT2525, ral(4))<br>
+ 1x Sitecom WL-112 (Ralink RT2560 + RT2525, ral(4))<br>
+ 1x Zonet ZEW1500 (PRISM GT/ISL3890, no driver)<br>
+ 1x Linksys WPC11v4 (Realtek RTL8180L, no driver)</td>
+ <td> bschmidt </td>
+ <td> received </td>
+ </tr>
+
</table>
&footer;
==== //depot/projects/docproj_nl/www/en/gnome/docs/gnome1_porting.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/gnome/docs/gnome1_porting.sgml,v 1.9 2007/06/21 06:55:20 marcus Exp $">
+<!ENTITY date "$FreeBSD: www/en/gnome/docs/gnome1_porting.sgml,v 1.11 2011/01/04 12:24:06 mezz Exp $">
<!ENTITY title "FreeBSD GNOME Project: GNOME 1 Components">
<!ENTITY email "freebsd-gnome">
<!ENTITY % navinclude.gnome "INCLUDE">
@@ -52,12 +52,6 @@
</tr>
<tr>
- <td><tt>glibwww</tt></td>
- <td><tt>www/glibwww</tt></td>
- <td><tt>gnomelibs</tt></td>
- </tr>
-
- <tr>
<td><tt>gnomecanvas</tt></td>
<td><tt>graphics/gnomecanvas</tt></td>
<td><tt>gnomelibs gdkpixbuf</tt></td>
@@ -94,24 +88,12 @@
</tr>
<tr>
- <td><tt>gtkhtml</tt></td>
- <td><tt>www/gtkhtml</tt></td>
- <td><tt>glibwww gal libghttp libcapplet</tt></td>
- </tr>
-
- <tr>
<td><tt>imlib</tt></td>
<td><tt>graphics/imlib</tt></td>
<td><tt>gtk12</tt></td>
</tr>
<tr>
- <td><tt>libcapplet</tt></td>
- <td><tt>x11/libcapplet</tt></td>
- <td><tt>gnomelibs</tt></td>
- </tr>
-
- <tr>
<td><tt>libgda</tt></td>
<td><tt>databases/libgda</tt></td>
<td><tt>gconf bonobo</tt></td>
@@ -148,12 +130,6 @@
</tr>
<tr>
- <td><tt>pygnome</tt></td>
- <td><tt>x11-toolkits/py-gnome</tt></td>
- <td><tt>gtkhtml pygtk</tt></td>
- </tr>
-
- <tr>
<td><tt>pygtk</tt></td>
<td><tt>x11-toolkits/py-gtk</tt></td>
<td><tt>gnomelibs gdkpixbuf libglade</tt></td>
==== //depot/projects/docproj_nl/www/en/index.xsl#7 (text+ko) ====
@@ -4,7 +4,7 @@
<!ENTITY title "The FreeBSD Project">
]>
-<!-- $FreeBSD: www/en/index.xsl,v 1.169 2009/06/02 21:11:59 gabor Exp $ -->
+<!-- $FreeBSD: www/en/index.xsl,v 1.170 2011/01/04 20:14:36 jkois Exp $ -->
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
<xsl:import href="http://www.FreeBSD.org/XML/www/lang/share/sgml/libcommon.xsl"/>
@@ -334,7 +334,7 @@
<div>
<ul class="newseventslist">
<li class="first-child">
- <a href="&base;/security/" title="More Errata Notices">More</a>
+ <a href="&base;/security/notices.html" title="More Errata Notices">More</a>
</li>
<li class="last-child">
<a href="&base;/security/errata.xml" title="Errata Notices RSS Feed"><img class="rssimage" src="&base;/layout/images/ico_rss.png" width="27" height="12" alt="Errata Notices RSS Feed" /></a>
==== //depot/projects/docproj_nl/www/en/releases/index.sgml#12 (text+ko) ====
@@ -1,10 +1,10 @@
<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
<!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/en/releases/index.sgml,v 1.127 2010/11/18 09:14:16 jkois Exp $">
+<!ENTITY date "$FreeBSD: www/en/releases/index.sgml,v 1.128 2011/01/15 01:09:44 ryusuke Exp $">
<!ENTITY title "Release Information">
<!ENTITY % navinclude.download "INCLUDE">
]>
-<!-- $FreeBSD: www/en/releases/index.sgml,v 1.127 2010/11/18 09:14:16 jkois Exp $ -->
+<!-- $FreeBSD: www/en/releases/index.sgml,v 1.128 2011/01/15 01:09:44 ryusuke Exp $ -->
<html>
&header;
@@ -250,7 +250,7 @@
</em>
</li>
- <li><b>4.11</b> (Jan, 2005)
+ <li><b>4.11</b> (January, 2005)
<em>
<a href="./4.11R/announce.html">Announcement</a>:
<a href="./4.11R/relnotes.html">Release Notes</a>:
==== //depot/projects/docproj_nl/www/en/security/Makefile#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: www/en/security/Makefile,v 1.17 2008/06/20 20:03:28 danger Exp $
+# $FreeBSD: www/en/security/Makefile,v 1.18 2011/01/04 20:14:36 jkois Exp $
.if exists(../Makefile.conf)
.include "../Makefile.conf"
@@ -11,21 +11,30 @@
DOCS= charter.sgml
DOCS+= security.sgml
DOCS+= advisories.sgml
+DOCS+= notices.sgml
advisories.sgml: advisories.html.inc
+notices.sgml: notices.html.inc
+
INDEXLINK= security.html
-security.html: advisories.html.inc advisories.rdf
-
DEPENDSET.DEFAULT= advisories
DEPENDSET.errata-rss= notices
+DEPENDSET.notices= notices
XML.DEFAULT= ${XML_ADVISORIES}
XMLDOCS= advisories:mkindex.xsl::advisories.html.inc
+PARAMS.advisories= --param type "'advisory'"
NO_DATA.advisories= yes
NO_TIDY.advisories= yes
+XMLDOCS+= notices:mkindex.xsl::notices.html.inc
+PARAMS.notices= --param advisories.xml "'${XML_NOTICES}'"
+PARAMS.notices+= --param type "'notice'"
+NO_DATA.notices= yes
+NO_TIDY.notices= yes
+
XMLDOCS+= advisories-rdf:security-rdf.xsl::advisories.rdf
XMLDOCS+= advisories-rss:security-rss.xsl::rss.xml
XMLDOCS+= errata-rss:errata-rss.xsl::errata.xml
==== //depot/projects/docproj_nl/www/en/security/mkindex.xsl#2 (text+ko) ====
@@ -5,7 +5,7 @@
<!ENTITY title "">
]>
-<!-- $FreeBSD: www/en/security/mkindex.xsl,v 1.6 2008/03/01 01:55:27 simon Exp $ -->
+<!-- $FreeBSD: www/en/security/mkindex.xsl,v 1.7 2011/01/04 20:14:36 jkois Exp $ -->
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
<xsl:import href="http://www.FreeBSD.org/XML/www/lang/share/sgml/libcommon.xsl"/>
@@ -16,6 +16,7 @@
<xsl:template match="/">
<xsl:call-template name="html-list-advisories">
<xsl:with-param name="advisories.xml" select="$advisories.xml" />
+ <xsl:with-param name="type" select="$type" />
</xsl:call-template>
</xsl:template>
</xsl:stylesheet>
==== //depot/projects/docproj_nl/www/en/security/security.sgml#16 (text+ko) ====
@@ -1,12 +1,11 @@
<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
<!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/en/security/security.sgml,v 1.216 2010/12/01 00:00:14 cperciva Exp $">
+<!ENTITY date "$FreeBSD: www/en/security/security.sgml,v 1.218 2011/01/13 18:54:57 cperciva Exp $">
<!ENTITY title "FreeBSD Security Information">
<!ENTITY % navinclude.support "INCLUDE">
<!ENTITY % developers SYSTEM "../developers.sgml"> %developers;
-<!ENTITY advisories.html.inc SYSTEM "advisories.html.inc">
]>
-<!-- $FreeBSD: www/en/security/security.sgml,v 1.216 2010/12/01 00:00:14 cperciva Exp $ -->
+<!-- $FreeBSD: www/en/security/security.sgml,v 1.218 2011/01/13 18:54:57 cperciva Exp $ -->
<html>
&header;
@@ -32,6 +31,7 @@
<ul>
<li><a href="charter.html">Charter for the Security Officer and Team</a></li>
<li><a href="advisories.html">List of FreeBSD Security Advisories</a></li>
+ <li><a href="notices.html">List of FreeBSD Errata Notices</a></li>
<li><a href="&base;/doc/en_US.ISO8859-1/books/handbook/security-advisories.html">
Reading FreeBSD Security Advisories</a></li>
</ul>
@@ -318,6 +318,126 @@
href="http://security.FreeBSD.org/patches/">patches</a>
subdirectories.</p>
+ <a name="unsup"></a>
+ <h2>Unsupported FreeBSD Releases</h2>
+
+ <p>The following releases are no longer supported but are listed
+ here for reference purposes.</p>
+ <table class="tblbasic">
+ <tr>
+ <th>Branch</th>
+ <th>Release</th>
+ <th>Type</th>
+ <th>Release Date</th>
+ <th>EoL</th>
+ </tr>
+ <tr>
+ <td>RELENG_4</td>
+ <td>n/a</td>
+ <td>n/a</td>
+ <td>n/a</td>
+ <td>January 31, 2007</td>
+ </tr>
+ <tr>
+ <td>RELENG_4_11</td>
+ <td>4.11-RELEASE</td>
+ <td>Extended</td>
+ <td>January 25, 2005</td>
+ <td>January 31, 2007</td>
+ </tr>
+ <tr>
+ <td>RELENG_5</td>
+ <td>n/a</td>
+ <td>n/a</td>
+ <td>n/a</td>
+ <td>May 31, 2008</td>
+ </tr>
+ <tr>
+ <td>RELENG_5_3</td>
+ <td>5.3-RELEASE</td>
+ <td>Extended</td>
+ <td>November 6, 2004</td>
+ <td>October 31, 2006</td>
+ </tr>
+ <tr>
+ <td>RELENG_5_4</td>
+ <td>5.4-RELEASE</td>
+ <td>Normal</td>
+ <td>May 9, 2005</td>
+ <td>October 31, 2006</td>
+ </tr>
+ <tr>
+ <td>RELENG_5_5</td>
+ <td>5.5-RELEASE</td>
+ <td>Extended</td>
+ <td>May 25, 2006</td>
+ <td>May 31, 2008</td>
+ </tr>
+ <tr>
+ <td>RELENG_6</td>
+ <td>n/a</td>
+ <td>n/a</td>
+ <td>n/a</td>
+ <td>November 30, 2010</td>
+ </tr>
+ <tr>
+ <td>RELENG_6_0</td>
+ <td>6.0-RELEASE</td>
+ <td>Normal</td>
+ <td>November 4, 2005</td>
+ <td>January 31, 2007</td>
+ </tr>
+ <tr>
+ <td>RELENG_6_1</td>
+ <td>6.1-RELEASE</td>
+ <td>Extended</td>
+ <td>May 9, 2006</td>
+ <td>May 31, 2008</td>
+ </tr>
+ <tr>
+ <td>RELENG_6_2</td>
+ <td>6.2-RELEASE</td>
+ <td>Normal</td>
+ <td>January 15, 2007</td>
+ <td>May 31, 2008</td>
+ </tr>
+ <tr>
+ <td>RELENG_6_3</td>
+ <td>6.3-RELEASE</td>
+ <td>Extended</td>
+ <td>January 18, 2008</td>
+ <td>January 31, 2010</td>
+ </tr>
+ <tr>
+ <td>RELENG_6_4</td>
+ <td>6.4-RELEASE</td>
+ <td>Extended</td>
+ <td>November 28, 2008</td>
+ <td>November 30, 2010</td>
+ </tr>
+ <tr>
+ <td>RELENG_7_0</td>
+ <td>7.0-RELEASE</td>
+ <td>Normal</td>
+ <td>February 27, 2008</td>
+ <td>April 30, 2009</td>
+ </tr>
+ <tr>
+ <td>RELENG_7_2</td>
+ <td>7.2-RELEASE</td>
+ <td>Normal</td>
+ <td>May 4, 2009</td>
+ <td>June 30, 2010</td>
+ </tr>
+ <tr>
+ <td>RELENG_8_0</td>
+ <td>8.0-RELEASE</td>
+ <td>Normal</td>
+ <td>November 25, 2009</td>
+ <td>November 30, 2010</td>
+ </tr>
+ </table>
+
&footer;
</body>
</html>
==== //depot/projects/docproj_nl/www/nl/where.sgml#25 (text+ko) ====
@@ -1,5 +1,5 @@
<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
-<!ENTITY date "$FreeBSD: www/nl/where.sgml,v 1.10 2011/01/02 20:55:44 rene Exp $">
+<!ENTITY date "$FreeBSD: www/nl/where.sgml,v 1.11 2011/01/03 20:10:47 rene Exp $">
<!ENTITY title "&os; verkrijgen">
<!ENTITY % navinclude.download "INCLUDE">
<!ENTITY url.rel "ftp://ftp.FreeBSD.org/pub/FreeBSD/releases">
==== //depot/projects/docproj_nl/www/share/sgml/commercial.isp.xml#21 (text+ko) ====
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!DOCTYPE entries PUBLIC "-//FreeBSD//DTD FreeBSD XML Database for Commercial Gallery//EN"
"http://www.FreeBSD.org/XML/www/share/sgml/gallery.dtd">
-<!-- $FreeBSD: www/share/sgml/commercial.isp.xml,v 1.61 2010/10/23 19:19:59 jkois Exp $ -->
+<!-- $FreeBSD: www/share/sgml/commercial.isp.xml,v 1.62 2011/01/04 19:05:02 jkois Exp $ -->
<entries>
<cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
<cvs:keyword name="freebsd">
- $FreeBSD: www/share/sgml/commercial.isp.xml,v 1.61 2010/10/23 19:19:59 jkois Exp $
+ $FreeBSD: www/share/sgml/commercial.isp.xml,v 1.62 2011/01/04 19:05:02 jkois Exp $
</cvs:keyword>
</cvs:keywords>
@@ -190,6 +190,17 @@
</description>
</entry>
+ <entry id="midlandcomputers">
+ <name>Midland Computers</name>
+ <url>http://www.midlandcomputers.com/</url>
+ <description>
+ Midland Computers is a UK based FreeBSD hosting provider. We
+ offer hosting solutions ranging from shared hosting to
+ dedicated servers, all running FreeBSD and we run our own secure
+ data center.
+ </description>
+ </entry>
+
<entry id="hostpoint">
<name>Hostpoint AG</name>
<url>http://www.hostpoint.ch/</url>
==== //depot/projects/docproj_nl/www/share/sgml/libcommon.xsl#9 (text+ko) ====
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
<!DOCTYPE xsl:stylesheet PUBLIC "-//FreeBSD//DTD FreeBSD XSLT 1.0 DTD//EN"
"http://www.FreeBSD.org/XML/www/share/sgml/xslt10-freebsd.dtd">
-<!-- $FreeBSD: www/share/sgml/libcommon.xsl,v 1.31 2010/04/09 10:09:05 jkois Exp $ -->
+<!-- $FreeBSD: www/share/sgml/libcommon.xsl,v 1.32 2011/01/04 20:14:37 jkois Exp $ -->
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
version="1.0"
@@ -760,32 +760,16 @@
<xsl:when test="$type = 'advisory'">
<xsl:call-template name="html-list-advisories-putitems">
<xsl:with-param name="items" select="document($advisories.xml)//advisory" />
+ <xsl:with-param name="itemtype" select="'Advisory'" />
<xsl:with-param name="prefix" select="'&ftpbase;'" />
<xsl:with-param name="prefixold" select="'&ftpbaseold;'" />
</xsl:call-template>
</xsl:when>
<xsl:when test="$type = 'notice'">
- <xsl:for-each select="document($advisories.xml)
- /descendant::release">
-
- <xsl:variable name="relname" select="string(name)" />
-
- <xsl:call-template name="html-list-advisories-putitems">
- <xsl:with-param name="items" select="document($advisories.xml)
- //notice[$relname = string(following::release/name[1])]" />
- <xsl:with-param name="prefix" select="'&ftpbaseerrata;'" />
- <xsl:with-param name="prefixold" select="'&ftpbaseerrata;'" />
- </xsl:call-template>
-
- <xsl:call-template name="html-list-advisories-release-label">
- <xsl:with-param name="relname" select="name" />
- </xsl:call-template>
- </xsl:for-each>
-
<xsl:call-template name="html-list-advisories-putitems">
- <xsl:with-param name="items" select="document($advisories.xml)
- //notice[not(following::release/name[1])]" />
+ <xsl:with-param name="items" select="document($advisories.xml)//notice" />
+ <xsl:with-param name="itemtype" select="'Errata Notice'" />
<xsl:with-param name="prefix" select="'&ftpbaseerrata;'" />
<xsl:with-param name="prefixold" select="'&ftpbaseerrata;'" />
</xsl:call-template>
@@ -798,12 +782,13 @@
<xsl:template name="html-list-advisories-putitems">
<xsl:param name="items" select="''" />
+ <xsl:param name="itemtype" select="''" />
<xsl:param name="prefix" select="''" />
<xsl:param name="prefixold" select="''" />
<xsl:if test="$items">
<table>
- <tr><th>Date</th><th>Advisory name</th></tr>
+ <tr><th>Date</th><th><xsl:value-of select='$itemtype' /> name</th></tr>
<xsl:for-each select="$items">
<xsl:variable name="year" select="../../../name" />
<xsl:variable name="month" select="../../name" />
==== //depot/projects/docproj_nl/www/share/sgml/navibar.ent#9 (text+ko) ====
@@ -1,4 +1,4 @@
-<!-- $FreeBSD: www/share/sgml/navibar.ent,v 1.31 2010/11/21 00:03:21 kwm Exp $ -->
+<!-- $FreeBSD: www/share/sgml/navibar.ent,v 1.32 2011/01/04 20:14:37 jkois Exp $ -->
<!ENTITY % navinclude.about "IGNORE">
<![ %navinclude.about; [
@@ -179,6 +179,7 @@
<li><a href="&base;/security/index.html">Security Information</a>
<ul>
<li><a href="&base;/security/advisories.html">Advisories</a></li>
+ <li><a href="&base;/security/notices.html">Errata Notices</a></li>
</ul></li>
<li><a href="&base;/support/bugreports.html">Bug Reports</a>
<ul>
More information about the p4-projects
mailing list