doc-el commit 869:54d23ce4e243 - Merge from ncvs
freebsd-doc-el at lists.hellug.gr
freebsd-doc-el at lists.hellug.gr
Tue Oct 7 03:19:07 EEST 2008
changeset: 869:54d23ce4e243
user: keramida
date: 2008-10-07 02:49 +0300
details: http://hg.hellug.gr/freebsd/doc-el/?cmd=changeset;node=54d23ce4e243
description:
Merge from ncvs
diffs (227 lines):
diff -r ca0c273a5e59 -r 54d23ce4e243 el_GR.ISO8859-7/books/handbook/basics/chapter.sgml
--- a/el_GR.ISO8859-7/books/handbook/basics/chapter.sgml Mon Oct 06 17:04:51 2008 +0300
+++ b/el_GR.ISO8859-7/books/handbook/basics/chapter.sgml Tue Oct 07 02:49:38 2008 +0300
@@ -4,7 +4,7 @@
The FreeBSD Greek Documentation Project
- $FreeBSD: doc/el_GR.ISO8859-7/books/handbook/basics/chapter.sgml,v 1.3 2008/09/09 12:23:21 manolis Exp $
+ $FreeBSD: doc/el_GR.ISO8859-7/books/handbook/basics/chapter.sgml,v 1.4 2008/10/04 14:23:30 manolis Exp $
%SOURCE% en_US.ISO8859-1/books/handbook/basics/chapter.sgml
%SRCID% 1.154
diff -r ca0c273a5e59 -r 54d23ce4e243 el_GR.ISO8859-7/books/handbook/pgpkeys/chapter.sgml
--- a/el_GR.ISO8859-7/books/handbook/pgpkeys/chapter.sgml Mon Oct 06 17:04:51 2008 +0300
+++ b/el_GR.ISO8859-7/books/handbook/pgpkeys/chapter.sgml Tue Oct 07 02:49:38 2008 +0300
@@ -4,7 +4,7 @@
The FreeBSD Greek Documentation Project
- $FreeBSD: doc/el_GR.ISO8859-7/books/handbook/pgpkeys/chapter.sgml,v 1.2 2008/01/14 14:19:46 keramida Exp $
+ $FreeBSD: doc/el_GR.ISO8859-7/books/handbook/pgpkeys/chapter.sgml,v 1.3 2008/10/05 11:20:30 manolis Exp $
%SOURCE% en_US.ISO8859-1/books/handbook/pgpkeys/chapter.sgml
%SRCID% 1.286
diff -r ca0c273a5e59 -r 54d23ce4e243 en_US.ISO8859-1/articles/contributors/contrib.additional.sgml
--- a/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml Mon Oct 06 17:04:51 2008 +0300
+++ b/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml Tue Oct 07 02:49:38 2008 +0300
@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.824 2008/10/03 20:19:12 garga Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.825 2008/10/06 15:02:21 roam Exp $ -->
<!--
NOTE TO COMMITTERS: Contributors lists are sorted in alphabetical
order by first name.
@@ -5699,6 +5699,11 @@
<listitem>
<para>Marcus vA
<email>mva121 at gmx.net</email></para>
+ </listitem>
+
+ <listitem>
+ <para>Marin Atanasov
+ <email>dnaeon at gmail.com</email></para>
</listitem>
<listitem>
diff -r ca0c273a5e59 -r 54d23ce4e243 en_US.ISO8859-1/articles/contributors/contrib.committers.sgml
--- a/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml Mon Oct 06 17:04:51 2008 +0300
+++ b/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml Tue Oct 07 02:49:38 2008 +0300
@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml,v 1.244 2008/09/18 14:31:21 zec Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml,v 1.245 2008/10/06 13:59:02 lstewart Exp $ -->
<!--
NOTE TO NEW COMMITTERS: Core and committers lists are sorted in
alphabetical order by last name. Please keep in mind that fact while
@@ -1311,6 +1311,10 @@
</listitem>
<listitem>
+ <para>&a.lstewart;</para>
+ </listitem>
+
+ <listitem>
<para>&a.rrs;</para>
</listitem>
diff -r ca0c273a5e59 -r 54d23ce4e243 en_US.ISO8859-1/articles/releng/Makefile
--- a/en_US.ISO8859-1/articles/releng/Makefile Mon Oct 06 17:04:51 2008 +0300
+++ b/en_US.ISO8859-1/articles/releng/Makefile Tue Oct 07 02:49:38 2008 +0300
@@ -1,5 +1,5 @@
#
-# $FreeBSD: doc/en_US.ISO8859-1/articles/releng/Makefile,v 1.18 2005/11/04 15:54:49 hrs Exp $
+# $FreeBSD: doc/en_US.ISO8859-1/articles/releng/Makefile,v 1.19 2008/10/05 12:41:45 hrs Exp $
#
# Article: FreeBSD Release Engineering
@@ -17,6 +17,7 @@
IMAGES_EN+= branches-releng4.pic
IMAGES_EN+= branches-releng5.pic
IMAGES_EN+= branches-releng6.pic
+IMAGES_EN+= branches-releng7.pic
CSS_SHEET_ADDITIONS= extra.css
diff -r ca0c273a5e59 -r 54d23ce4e243 en_US.ISO8859-1/articles/releng/article.sgml
--- a/en_US.ISO8859-1/articles/releng/article.sgml Mon Oct 06 17:04:51 2008 +0300
+++ b/en_US.ISO8859-1/articles/releng/article.sgml Tue Oct 07 02:49:38 2008 +0300
@@ -37,7 +37,7 @@
</author>
</authorgroup>
- <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/releng/article.sgml,v 1.80 2008/08/16 21:42:36 pgj Exp $</pubdate>
+ <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/releng/article.sgml,v 1.81 2008/10/05 12:41:45 hrs Exp $</pubdate>
<legalnotice id="trademarks" role="trademarks">
&tm-attrib.freebsd;
@@ -341,6 +341,16 @@
<textobject>
<phrase>FreeBSD 6.x STABLE Branch</phrase>
+ </textobject>
+ </mediaobject>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="branches-releng7" align="center">
+ </imageobject>
+
+ <textobject>
+ <phrase>FreeBSD 7.x STABLE Branch</phrase>
</textobject>
</mediaobject>
</sect3>
diff -r ca0c273a5e59 -r 54d23ce4e243 en_US.ISO8859-1/share/sgml/authors.ent
--- a/en_US.ISO8859-1/share/sgml/authors.ent Mon Oct 06 17:04:51 2008 +0300
+++ b/en_US.ISO8859-1/share/sgml/authors.ent Tue Oct 07 02:49:38 2008 +0300
@@ -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.462 2008/09/18 14:20:54 zec Exp $
+ $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.463 2008/10/06 08:36:30 lstewart Exp $
-->
<!ENTITY a.aaron "Aaron Dalton <email>aaron at FreeBSD.org</email>">
@@ -624,6 +624,8 @@
<!ENTITY a.logo "Valentino Vaschetto <email>logo at FreeBSD.org</email>">
+<!ENTITY a.lstewart "Lawrence Stewart <email>lstewart at FreeBSD.org</email>">
+
<!ENTITY a.lth "Lars Thegler <email>lth at FreeBSD.org</email>">
<!ENTITY a.luigi "Luigi Rizzo <email>luigi at FreeBSD.org</email>">
diff -r ca0c273a5e59 -r 54d23ce4e243 share/images/articles/releng/branches-releng6.pic
--- a/share/images/articles/releng/branches-releng6.pic Mon Oct 06 17:04:51 2008 +0300
+++ b/share/images/articles/releng/branches-releng6.pic Tue Oct 07 02:49:38 2008 +0300
@@ -1,5 +1,5 @@
.\" -*- nroff -*-
-.\" $FreeBSD: doc/share/images/articles/releng/branches-releng6.pic,v 1.4 2007/01/17 07:22:16 murray Exp $
+.\" $FreeBSD: doc/share/images/articles/releng/branches-releng6.pic,v 1.5 2008/10/05 12:41:45 hrs Exp $
.PS 6
@@ -30,6 +30,22 @@
box width .9 "\s-3RELENG_6_2\s+3" dashed
line -> right from RELENG_6_2_0_RELEASE.e
+RELENG_6_3_0_RELEASE:
+ ellipse width .9 "\s-26.3-RELEASE\s+2"
+
+ line -> down from RELENG_6_3_0_RELEASE.s
+RELENG_6_3:
+ box width .9 "\s-3RELENG_6_3\s+3" dashed
+
+ line -> right from RELENG_6_3_0_RELEASE.e
+RELENG_6_4_0_RELEASE:
+ ellipse width .9 "\s-26.4-RELEASE\s+2"
+
+ line -> down from RELENG_6_4_0_RELEASE.s
+RELENG_6_4:
+ box width .9 "\s-3RELENG_6_4\s+3" dashed
+
+ line -> right from RELENG_6_4_0_RELEASE.e
RELENG_6:box "\s-26-STABLE\s+2"
.PE
diff -r ca0c273a5e59 -r 54d23ce4e243 share/images/articles/releng/branches-releng7.pic
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/share/images/articles/releng/branches-releng7.pic Tue Oct 07 02:49:38 2008 +0300
@@ -0,0 +1,27 @@
+.\" -*- nroff -*-
+.\" $FreeBSD: doc/share/images/articles/releng/branches-releng7.pic,v 1.1 2008/10/05 12:41:45 hrs Exp $
+
+.PS 6
+
+RELENG_7_0_0_RELEASE:
+ ellipse width .9 "\s-27.0-RELEASE\s+2"
+ move right 4
+ move up .5
+ "\s-1RELENG_7 (7.x STABLE Branch)\s+1"
+
+ line -> down from RELENG_7_0_0_RELEASE.s
+RELENG_7_0:
+ box width .9 "\s-3RELENG_7_0\s+3" dashed
+
+ line -> right from RELENG_7_0_0_RELEASE.e
+RELENG_7_1_0_RELEASE:
+ ellipse width .9 "\s-27.1-RELEASE\s+2"
+
+ line -> down from RELENG_7_1_0_RELEASE.s
+RELENG_7_1:
+ box width .9 "\s-3RELENG_7_1\s+3" dashed
+
+ line -> right from RELENG_7_1_0_RELEASE.e
+RELENG_7:box "\s-27-STABLE\s+2"
+
+.PE
diff -r ca0c273a5e59 -r 54d23ce4e243 share/sgml/man-refs.ent
--- a/share/sgml/man-refs.ent Mon Oct 06 17:04:51 2008 +0300
+++ b/share/sgml/man-refs.ent Tue Oct 07 02:49:38 2008 +0300
@@ -20,7 +20,7 @@
lexicographical order by the entity (i.e., the dots used in place of
special characters should not be expanded when comparing).
- $FreeBSD: doc/share/sgml/man-refs.ent,v 1.469 2008/09/28 19:09:35 danger Exp $
+ $FreeBSD: doc/share/sgml/man-refs.ent,v 1.472 2008/10/06 21:49:01 simon Exp $
-->
<!ENTITY man...1 "<citerefentry/<refentrytitle/[/<manvolnum/1//">
@@ -3247,7 +3247,9 @@
<!ENTITY man.ad.4 "<citerefentry/<refentrytitle/ad/<manvolnum/4//">
<!ENTITY man.adv.4 "<citerefentry/<refentrytitle/adv/<manvolnum/4//">
<!ENTITY man.adw.4 "<citerefentry/<refentrytitle/adw/<manvolnum/4//">
+<!ENTITY man.ae.4 "<citerefentry/<refentrytitle/ae/<manvolnum/4//">
<!ENTITY man.afd.4 "<citerefentry/<refentrytitle/afd/<manvolnum/4//">
+<!ENTITY man.age.4 "<citerefentry/<refentrytitle/age/<manvolnum/4//">
<!ENTITY man.agp.4 "<citerefentry/<refentrytitle/agp/<manvolnum/4//">
<!ENTITY man.aha.4 "<citerefentry/<refentrytitle/aha/<manvolnum/4//">
<!ENTITY man.ahb.4 "<citerefentry/<refentrytitle/ahb/<manvolnum/4//">
@@ -3409,6 +3411,7 @@
<!ENTITY man.ifpi.4 "<citerefentry/<refentrytitle/ifpi/<manvolnum/4//">
<!ENTITY man.ifpi2.4 "<citerefentry/<refentrytitle/ifpi2/<manvolnum/4//">
<!ENTITY man.ifpnp.4 "<citerefentry/<refentrytitle/ifpnp/<manvolnum/4//">
+<!ENTITY man.igb.4 "<citerefentry/<refentrytitle/igb/<manvolnum/4//">
<!ENTITY man.ihfc.4 "<citerefentry/<refentrytitle/ihfc/<manvolnum/4//">
<!ENTITY man.iic.4 "<citerefentry/<refentrytitle/iic/<manvolnum/4//">
<!ENTITY man.iicbb.4 "<citerefentry/<refentrytitle/iicbb/<manvolnum/4//">
More information about the Freebsd-doc-el
mailing list