From 5086b7db9694496f45e72757caa027f55fdfc57b Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Sat, 13 Oct 2012 18:32:14 +0000
Subject: [PATCH 001/121] - Fix the make lint (validate) target
---
da_DK.ISO8859-1/share/xml/entities.ent | 27 ++++++---
da_DK.ISO8859-1/share/xml/mailing-lists.ent | 1 +
da_DK.ISO8859-1/share/xml/newsgroups.ent | 1 +
da_DK.ISO8859-1/share/xml/teams.ent | 1 +
da_DK.ISO8859-1/share/xml/translators.ent | 1 +
de_DE.ISO8859-1/share/xml/entities.ent | 38 ++++++++-----
de_DE.ISO8859-1/share/xml/l10n.ent | 1 +
de_DE.ISO8859-1/share/xml/mailing-lists.ent | 1 +
de_DE.ISO8859-1/share/xml/newsgroups.ent | 1 +
de_DE.ISO8859-1/share/xml/teams.ent | 1 +
de_DE.ISO8859-1/share/xml/trademarks.ent | 1 +
de_DE.ISO8859-1/share/xml/translators.ent | 1 +
el_GR.ISO8859-7/share/xml/entities.ent | 55 ++++++++++++-------
el_GR.ISO8859-7/share/xml/freebsd.ent | 1 +
el_GR.ISO8859-7/share/xml/l10n.ent | 1 +
el_GR.ISO8859-7/share/xml/mailing-lists.ent | 1 +
el_GR.ISO8859-7/share/xml/newsgroups.ent | 1 +
el_GR.ISO8859-7/share/xml/teams.ent | 1 +
el_GR.ISO8859-7/share/xml/trademarks.ent | 1 +
el_GR.ISO8859-7/share/xml/translators.ent | 1 +
el_GR.ISO8859-7/share/xml/urls.ent | 1 +
en_US.ISO8859-1/share/xml/entities.ent | 29 ++++++----
es_ES.ISO8859-1/share/xml/entities.ent | 38 ++++++++-----
.../share/xml/es-mailing-lists.ent | 1 +
es_ES.ISO8859-1/share/xml/l10n.ent | 1 +
es_ES.ISO8859-1/share/xml/mailing-lists.ent | 1 +
es_ES.ISO8859-1/share/xml/newsgroups.ent | 1 +
es_ES.ISO8859-1/share/xml/teams.ent | 1 +
es_ES.ISO8859-1/share/xml/trademarks.ent | 1 +
es_ES.ISO8859-1/share/xml/translators.ent | 1 +
fr_FR.ISO8859-1/share/xml/abstract.ent | 1 +
fr_FR.ISO8859-1/share/xml/artheader.ent | 1 +
fr_FR.ISO8859-1/share/xml/entities.ent | 47 ++++++++++------
fr_FR.ISO8859-1/share/xml/mailing-lists.ent | 1 +
fr_FR.ISO8859-1/share/xml/newsgroups.ent | 1 +
fr_FR.ISO8859-1/share/xml/teams.ent | 1 +
fr_FR.ISO8859-1/share/xml/trademarks.ent | 1 +
fr_FR.ISO8859-1/share/xml/translators.ent | 1 +
fr_FR.ISO8859-1/share/xml/urls.ent | 1 +
hu_HU.ISO8859-2/share/xml/entities.ent | 35 +++++++-----
hu_HU.ISO8859-2/share/xml/freebsd.ent | 1 +
hu_HU.ISO8859-2/share/xml/l10n.ent | 1 +
hu_HU.ISO8859-2/share/xml/mailing-lists.ent | 1 +
hu_HU.ISO8859-2/share/xml/newsgroups.ent | 1 +
hu_HU.ISO8859-2/share/xml/teams.ent | 1 +
hu_HU.ISO8859-2/share/xml/trademarks.ent | 1 +
hu_HU.ISO8859-2/share/xml/translators.ent | 1 +
it_IT.ISO8859-15/share/xml/entities.ent | 38 ++++++++-----
it_IT.ISO8859-15/share/xml/l10n.ent | 1 +
it_IT.ISO8859-15/share/xml/mailing-lists.ent | 1 +
it_IT.ISO8859-15/share/xml/trademarks.ent | 1 +
it_IT.ISO8859-15/share/xml/translators.ent | 1 +
ja_JP.eucJP/share/xml/authors.ent | 1 +
ja_JP.eucJP/share/xml/entities.ent | 47 ++++++++++------
ja_JP.eucJP/share/xml/mailing-lists.ent | 1 +
ja_JP.eucJP/share/xml/newsgroups.ent | 1 +
ja_JP.eucJP/share/xml/teams.ent | 1 +
ja_JP.eucJP/share/xml/trademarks.ent | 1 +
mn_MN.UTF-8/share/xml/entities.ent | 32 +++++++----
nl_NL.ISO8859-1/share/xml/entities.ent | 35 +++++++-----
nl_NL.ISO8859-1/share/xml/l10n.ent | 1 +
nl_NL.ISO8859-1/share/xml/mailing-lists.ent | 1 +
nl_NL.ISO8859-1/share/xml/newsgroups.ent | 1 +
nl_NL.ISO8859-1/share/xml/teams.ent | 1 +
nl_NL.ISO8859-1/share/xml/trademarks.ent | 1 +
nl_NL.ISO8859-1/share/xml/translators.ent | 4 +-
pl_PL.ISO8859-2/share/xml/entities.ent | 35 +++++++-----
pl_PL.ISO8859-2/share/xml/l10n.ent | 1 +
pl_PL.ISO8859-2/share/xml/mailing-lists.ent | 1 +
pl_PL.ISO8859-2/share/xml/newsgroups.ent | 1 +
pl_PL.ISO8859-2/share/xml/teams.ent | 1 +
pt_BR.ISO8859-1/share/xml/entities.ent | 36 ++++++++----
pt_BR.ISO8859-1/share/xml/l10n.ent | 1 +
pt_BR.ISO8859-1/share/xml/mailing-lists.ent | 1 +
pt_BR.ISO8859-1/share/xml/newsgroups.ent | 1 +
pt_BR.ISO8859-1/share/xml/teams.ent | 1 +
pt_BR.ISO8859-1/share/xml/trademarks.ent | 1 +
pt_BR.ISO8859-1/share/xml/translators.ent | 1 +
pt_BR.ISO8859-1/share/xml/words.ent | 1 +
ru_RU.KOI8-R/share/xml/entities.ent | 35 +++++++-----
ru_RU.KOI8-R/share/xml/mailing-lists.ent | 1 +
ru_RU.KOI8-R/share/xml/newsgroups.ent | 1 +
ru_RU.KOI8-R/share/xml/teams.ent | 1 +
ru_RU.KOI8-R/share/xml/trademarks.ent | 1 +
ru_RU.KOI8-R/share/xml/translators.ent | 1 +
ru_RU.KOI8-R/share/xml/urls.ent | 1 +
sr_YU.ISO8859-2/share/xml/entities.ent | 24 +++++---
tr_TR.ISO8859-9/share/xml/entities.ent | 24 +++++---
.../share/xml/authors-in-author-tag.ent | 1 +
zh_CN.GB2312/share/xml/authors.ent | 1 +
zh_CN.GB2312/share/xml/entities.ent | 38 ++++++++-----
zh_CN.GB2312/share/xml/mailing-lists.ent | 1 +
zh_CN.GB2312/share/xml/teams.ent | 1 +
zh_CN.GB2312/share/xml/trademarks.ent | 1 +
zh_TW.Big5/share/xml/authors.ent | 1 +
zh_TW.Big5/share/xml/entities.ent | 38 ++++++++-----
zh_TW.Big5/share/xml/mailing-lists.ent | 1 +
zh_TW.Big5/share/xml/trademarks.ent | 1 +
zh_TW.Big5/share/xml/urls.ent | 1 +
99 files changed, 498 insertions(+), 237 deletions(-)
diff --git a/da_DK.ISO8859-1/share/xml/entities.ent b/da_DK.ISO8859-1/share/xml/entities.ent
index 2b612813a1..c7853679a4 100644
--- a/da_DK.ISO8859-1/share/xml/entities.ent
+++ b/da_DK.ISO8859-1/share/xml/entities.ent
@@ -1,21 +1,30 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<!-- $FreeBSD$ -->
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
+<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN"
+ "nonexistent">
%authors;
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
+<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN"
+ "nonexistent">
%man;
-<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
+<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
+ "nonexistent">
%freebsd;
-<!ENTITY % translators PUBLIC "-//FreeBSD//ENTITIES DocBook Translator Entities//DK">
+<!ENTITY % translators PUBLIC "-//FreeBSD//ENTITIES DocBook Translator Entities//DK"
+ "translators.ent">
%translators;
-<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN">
+<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
+ "l10n.ent">
%l10n;
-<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//DK">
+<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//DK"
+ "mailing-lists.ent">
%mailing-lists;
-<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//DK">
+<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//DK"
+ "newsgroups.ent">
%newsgroups;
-<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//DK">
+<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//DK"
+ "teams.ent">
%teams;
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
+<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN"
+ "nonexistent">
%trademarks;
diff --git a/da_DK.ISO8859-1/share/xml/mailing-lists.ent b/da_DK.ISO8859-1/share/xml/mailing-lists.ent
index 080b91e29f..e6647db98c 100644
--- a/da_DK.ISO8859-1/share/xml/mailing-lists.ent
+++ b/da_DK.ISO8859-1/share/xml/mailing-lists.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
Navne p� FreeBSD mailing lister og relateret software.
diff --git a/da_DK.ISO8859-1/share/xml/newsgroups.ent b/da_DK.ISO8859-1/share/xml/newsgroups.ent
index fe16bf2b42..85d53e443d 100644
--- a/da_DK.ISO8859-1/share/xml/newsgroups.ent
+++ b/da_DK.ISO8859-1/share/xml/newsgroups.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
Navne p� FreeBSD nyhedsgrupper
diff --git a/da_DK.ISO8859-1/share/xml/teams.ent b/da_DK.ISO8859-1/share/xml/teams.ent
index 25a971a3b7..32179d0bbe 100644
--- a/da_DK.ISO8859-1/share/xml/teams.ent
+++ b/da_DK.ISO8859-1/share/xml/teams.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
Navne og email adresser p� de teams af folk der arbejder
p� specifikke opgaver. Normalt er de bare mail aliaser der
diff --git a/da_DK.ISO8859-1/share/xml/translators.ent b/da_DK.ISO8859-1/share/xml/translators.ent
index 58c5b91f99..df69892e8f 100644
--- a/da_DK.ISO8859-1/share/xml/translators.ent
+++ b/da_DK.ISO8859-1/share/xml/translators.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Dannish Documentation Project
diff --git a/de_DE.ISO8859-1/share/xml/entities.ent b/de_DE.ISO8859-1/share/xml/entities.ent
index 0048526ffd..5061a702fe 100644
--- a/de_DE.ISO8859-1/share/xml/entities.ent
+++ b/de_DE.ISO8859-1/share/xml/entities.ent
@@ -4,29 +4,39 @@
basiert auf: 1.1
-->
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
+<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN"
+ "nonexistent">
%man;
-<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
+<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
+ "nonexistent">
%freebsd;
-<!ENTITY % translators PUBLIC "-//FreeBSD//ENTITIES DocBook Translator Entities//DE">
+<!ENTITY % translators PUBLIC "-//FreeBSD//ENTITIES DocBook Translator Entities//DE"
+ "translators.ent">
%translators;
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
+<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN"
+ "nonexistent">
%authors;
-<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EN">
+<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EN"
+ "nonexistent">
%teams;
-<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//DE">
+<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//DE"
+ "mailing-lists.ent">
%mailing-lists;
-<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EN">
+<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EN"
+ "nonexistent">
%newsgroups;
-<!ENTITY % de-trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//DE">
+<!ENTITY % de-trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//DE"
+ "trademarks.ent">
%de-trademarks;
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
+<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN"
+ "nonexistent">
%trademarks;
-<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN">
+<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
+ "l10n.ent">
%l10n;
-<!ENTITY % l10n-common PUBLIC "-//FreeBSD//ENTITIES DocBook Language Neutral Entities//EN">
-%l10n-common;
-<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN">
+<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN"
+ "nonexistent">
%urls;
-<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//DE">
+<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//DE"
+ "glossary.ent">
%glossary;
diff --git a/de_DE.ISO8859-1/share/xml/l10n.ent b/de_DE.ISO8859-1/share/xml/l10n.ent
index 59defb096c..7e6e2c1de0 100644
--- a/de_DE.ISO8859-1/share/xml/l10n.ent
+++ b/de_DE.ISO8859-1/share/xml/l10n.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- -*- sgml -*-
DocBook Language Specific Entities for Localization (en).
diff --git a/de_DE.ISO8859-1/share/xml/mailing-lists.ent b/de_DE.ISO8859-1/share/xml/mailing-lists.ent
index ff0b7bd91a..d4011db972 100644
--- a/de_DE.ISO8859-1/share/xml/mailing-lists.ent
+++ b/de_DE.ISO8859-1/share/xml/mailing-lists.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
Namen der FreeBSD Mailinglisten und verwandter Software
diff --git a/de_DE.ISO8859-1/share/xml/newsgroups.ent b/de_DE.ISO8859-1/share/xml/newsgroups.ent
index 7b62f42be1..8c647970a5 100644
--- a/de_DE.ISO8859-1/share/xml/newsgroups.ent
+++ b/de_DE.ISO8859-1/share/xml/newsgroups.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
Namen der FreeBSD-Newsgroups
diff --git a/de_DE.ISO8859-1/share/xml/teams.ent b/de_DE.ISO8859-1/share/xml/teams.ent
index 1f67441164..f5ad53f6b3 100644
--- a/de_DE.ISO8859-1/share/xml/teams.ent
+++ b/de_DE.ISO8859-1/share/xml/teams.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
Names and email address of teams of people working on specified
tasks. Usally they're just mail aliases set up at hub.FreeBSD.org
diff --git a/de_DE.ISO8859-1/share/xml/trademarks.ent b/de_DE.ISO8859-1/share/xml/trademarks.ent
index 1c6879d352..218b70a202 100644
--- a/de_DE.ISO8859-1/share/xml/trademarks.ent
+++ b/de_DE.ISO8859-1/share/xml/trademarks.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
Trademark Legend, as required by The Open Group, Sun, etc..
diff --git a/de_DE.ISO8859-1/share/xml/translators.ent b/de_DE.ISO8859-1/share/xml/translators.ent
index 41efe4c6cc..747d5116e1 100644
--- a/de_DE.ISO8859-1/share/xml/translators.ent
+++ b/de_DE.ISO8859-1/share/xml/translators.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD German Documentation Project
diff --git a/el_GR.ISO8859-7/share/xml/entities.ent b/el_GR.ISO8859-7/share/xml/entities.ent
index ad55947dbf..f97fae18b6 100644
--- a/el_GR.ISO8859-7/share/xml/entities.ent
+++ b/el_GR.ISO8859-7/share/xml/entities.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-7"?>
<!--
������� ��� entities ��� ����� �������� �� ��� �� ������ ��� ���������
@@ -12,50 +13,66 @@
-->
-<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN">
+<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
+ "l10n.ent">
%l10n;
-<!ENTITY % l10n-common PUBLIC "-//FreeBSD//ENTITIES DocBook Language Neutral Entities//EN">
-%l10n-common;
-<!ENTITY % translators PUBLIC "-//FreeBSD//ENTITIES DocBook Translator Entities//EL">
+<!ENTITY % translators PUBLIC "-//FreeBSD//ENTITIES DocBook Translator Entities//EL"
+ "translators.ent">
%translators;
-<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EL">
+<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EL"
+ "mailing-lists.ent">
%mailing-lists;
-<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EL">
+<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EL"
+ "teams.ent">
%teams;
-<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EL">
+<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EL"
+ "newsgroups.ent">
%newsgroups;
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
+<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN"
+ "nonexistent">
%man;
-<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//EL">
+<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//EL"
+ "glossary.ent">
%glossary;
<!-- � ����� ��� %freebsd.el; ��� %freebsd; ����� ���������.
������������� ����� �� entities ��� ��������� �����. ����� ���������
��� ����� ����������� ��� ��������, �� �������� �������� ��� ���
������� ������ -->
-<!ENTITY % freebsd.el PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EL">
+<!ENTITY % freebsd.el PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EL"
+ "freebsd.ent">
%freebsd.el;
-<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
+<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EL"
+ "freebsd.ent">
%freebsd;
-
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
+<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
+ "nonexistent">
+%freebsd;
+<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN"
+ "nonexistent">
%authors;
-<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EL">
+<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EL"
+ "teams.ent">
%teams;
-<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EL">
+<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EL"
+ "mailing-lists.ent">
%mailing-lists;
-<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EL">
+<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EL"
+ "newsgroups.ent">
%newsgroups;
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EL">
+<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EL"
+ "trademarks.ent">
%trademarks;
<!-- � ����� ��� %urls.el; ��� %urls; ����� ���������.
������������� ����� �� entities ��� ��������� �����. ����� ���������
��� ����� ����������� ��� ��������, �� �������� �������� ��� ���
������� ������ -->
-<!ENTITY % urls.el PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EL">
+<!ENTITY % urls.el PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EL"
+ "urls.ent">
%urls.el;
-<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN">
+<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN"
+ "nonexistent">
%urls;
<!--
diff --git a/el_GR.ISO8859-7/share/xml/freebsd.ent b/el_GR.ISO8859-7/share/xml/freebsd.ent
index 783ac46705..4f62e17b80 100644
--- a/el_GR.ISO8859-7/share/xml/freebsd.ent
+++ b/el_GR.ISO8859-7/share/xml/freebsd.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-7"?>
<!--
������� DocBook Entities ��� �� FreeBSD Project.
diff --git a/el_GR.ISO8859-7/share/xml/l10n.ent b/el_GR.ISO8859-7/share/xml/l10n.ent
index 9fe0efeefd..12ba0ae45d 100644
--- a/el_GR.ISO8859-7/share/xml/l10n.ent
+++ b/el_GR.ISO8859-7/share/xml/l10n.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-7"?>
<!--
��������������� ��� ��������� ��������� ��� ��� HTML charset ��� �����������
diff --git a/el_GR.ISO8859-7/share/xml/mailing-lists.ent b/el_GR.ISO8859-7/share/xml/mailing-lists.ent
index b75e42da12..314654ee0d 100644
--- a/el_GR.ISO8859-7/share/xml/mailing-lists.ent
+++ b/el_GR.ISO8859-7/share/xml/mailing-lists.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-7"?>
<!--
������� ��� ��� ������ ������������ ������������ ��� FreeBSD,
diff --git a/el_GR.ISO8859-7/share/xml/newsgroups.ent b/el_GR.ISO8859-7/share/xml/newsgroups.ent
index b937d55599..b43cf09bb9 100644
--- a/el_GR.ISO8859-7/share/xml/newsgroups.ent
+++ b/el_GR.ISO8859-7/share/xml/newsgroups.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-7"?>
<!--
������� ������ ���������� Usenet ��� �� FreeBSD
diff --git a/el_GR.ISO8859-7/share/xml/teams.ent b/el_GR.ISO8859-7/share/xml/teams.ent
index 54a2782dac..4465078694 100644
--- a/el_GR.ISO8859-7/share/xml/teams.ent
+++ b/el_GR.ISO8859-7/share/xml/teams.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-7"?>
<!--
�� ������� ��� �� ���������� ��� ������ ��� ����� ������������
diff --git a/el_GR.ISO8859-7/share/xml/trademarks.ent b/el_GR.ISO8859-7/share/xml/trademarks.ent
index 520d80b930..a9aa5958de 100644
--- a/el_GR.ISO8859-7/share/xml/trademarks.ent
+++ b/el_GR.ISO8859-7/share/xml/trademarks.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-7"?>
<!--
����� ������������� �������� ��� ��������� ��������, ���� ���������
diff --git a/el_GR.ISO8859-7/share/xml/translators.ent b/el_GR.ISO8859-7/share/xml/translators.ent
index 90b9e081d8..e851501192 100644
--- a/el_GR.ISO8859-7/share/xml/translators.ent
+++ b/el_GR.ISO8859-7/share/xml/translators.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-7"?>
<!--
������� ��� ����������� ������������ ������������� ��� ����� ���
diff --git a/el_GR.ISO8859-7/share/xml/urls.ent b/el_GR.ISO8859-7/share/xml/urls.ent
index 8658f8c6de..365c42d573 100644
--- a/el_GR.ISO8859-7/share/xml/urls.ent
+++ b/el_GR.ISO8859-7/share/xml/urls.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-7"?>
<!--
URLs ��� ����� ����� ���� �� ��� �������� ���������� ��� FreeBSD.
diff --git a/en_US.ISO8859-1/share/xml/entities.ent b/en_US.ISO8859-1/share/xml/entities.ent
index fe8eb023c8..5a6913e47e 100644
--- a/en_US.ISO8859-1/share/xml/entities.ent
+++ b/en_US.ISO8859-1/share/xml/entities.ent
@@ -3,23 +3,30 @@
<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
"l10n.ent">
%l10n;
-<!ENTITY % l10n-common PUBLIC "-//FreeBSD//ENTITIES DocBook Language Neutral Entities//EN">
-%l10n-common;
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
+<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN"
+ "man.ent">
%man;
-<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
+<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
+ "freebsd.ent">
%freebsd;
-<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//EN">
+<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//EN"
+ "glossary.ent">
%glossary;
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
+<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN"
+ "authors.ent">
%authors;
-<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EN">
+<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EN"
+ "teams.ent">
%teams;
-<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN">
+<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN"
+ "mailing-lists.ent">
%mailing-lists;
-<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EN">
+<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EN"
+ "newsgroups.ent">
%newsgroups;
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
+<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN"
+ "trademarks.ent">
%trademarks;
-<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN">
+<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN"
+ "urls.ent">
%urls;
diff --git a/es_ES.ISO8859-1/share/xml/entities.ent b/es_ES.ISO8859-1/share/xml/entities.ent
index efe217eed8..11499c8a0a 100644
--- a/es_ES.ISO8859-1/share/xml/entities.ent
+++ b/es_ES.ISO8859-1/share/xml/entities.ent
@@ -2,29 +2,39 @@
$FreeBSD$
-->
-<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN">
+<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
+ "l10n.ent">
%l10n;
-<!ENTITY % l10n-common PUBLIC "-//FreeBSD//ENTITIES DocBook Language Neutral Entities//EN">
-%l10n-common;
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
+<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN"
+ "nonexistent">
%man;
-<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
+<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
+ "nonexistent">
%freebsd;
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
+<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN"
+ "nonexistent">
%authors;
-<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//ES">
+<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//ES"
+ "teams.ent">
%teams;
-<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//ES">
+<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//ES"
+ "mailing-lists.ent">
%mailing-lists;
-<!ENTITY % es-mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Spanish Mailing List Entities//ES">
+<!ENTITY % es-mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Spanish Mailing List Entities//ES"
+ "es-mailing-lists.ent">
%es-mailing-lists;
-<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//ES">
+<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//ES"
+ "newsgroups.ent">
%newsgroups;
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//ES">
+<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//ES"
+ "trademarks.ent">
%trademarks;
-<!ENTITY % translators PUBLIC "-//FreeBSD//ENTITIES DocBook Translator Entities//ES">
+<!ENTITY % translators PUBLIC "-//FreeBSD//ENTITIES DocBook Translator Entities//ES"
+ "translators.ent">
%translators;
-<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN">
+<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN"
+ "nonexistent">
%urls;
-<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//ES">
+<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//ES"
+ "glossary.ent">
%glossary;
diff --git a/es_ES.ISO8859-1/share/xml/es-mailing-lists.ent b/es_ES.ISO8859-1/share/xml/es-mailing-lists.ent
index 5183360936..17a24c6e09 100644
--- a/es_ES.ISO8859-1/share/xml/es-mailing-lists.ent
+++ b/es_ES.ISO8859-1/share/xml/es-mailing-lists.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
Listas de correo oficiales de FreeBSD en castellano.
diff --git a/es_ES.ISO8859-1/share/xml/l10n.ent b/es_ES.ISO8859-1/share/xml/l10n.ent
index 61b5e9d79c..891c4a7cee 100644
--- a/es_ES.ISO8859-1/share/xml/l10n.ent
+++ b/es_ES.ISO8859-1/share/xml/l10n.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- -*- sgml -*-
DocBook Language Specific Entities for Localization (es).
diff --git a/es_ES.ISO8859-1/share/xml/mailing-lists.ent b/es_ES.ISO8859-1/share/xml/mailing-lists.ent
index 0cce7a953a..cd219e1139 100755
--- a/es_ES.ISO8859-1/share/xml/mailing-lists.ent
+++ b/es_ES.ISO8859-1/share/xml/mailing-lists.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
Nombres de las listas de correo de FreeBSD y software relacionado.
diff --git a/es_ES.ISO8859-1/share/xml/newsgroups.ent b/es_ES.ISO8859-1/share/xml/newsgroups.ent
index add9889dfb..22c0898e7c 100644
--- a/es_ES.ISO8859-1/share/xml/newsgroups.ent
+++ b/es_ES.ISO8859-1/share/xml/newsgroups.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
Nombres de los grupos de noticias de FreeBSD
diff --git a/es_ES.ISO8859-1/share/xml/teams.ent b/es_ES.ISO8859-1/share/xml/teams.ent
index 8e43da6f0a..2228734cd5 100644
--- a/es_ES.ISO8859-1/share/xml/teams.ent
+++ b/es_ES.ISO8859-1/share/xml/teams.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
Names and email address of teams of people working on specified
tasks. Usally they're just mail aliases set up at hub.FreeBSD.org
diff --git a/es_ES.ISO8859-1/share/xml/trademarks.ent b/es_ES.ISO8859-1/share/xml/trademarks.ent
index 0417ce6cf8..3d2ed3c283 100644
--- a/es_ES.ISO8859-1/share/xml/trademarks.ent
+++ b/es_ES.ISO8859-1/share/xml/trademarks.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
Trademark Legend, as required by The Open Group, Sun, etc..
diff --git a/es_ES.ISO8859-1/share/xml/translators.ent b/es_ES.ISO8859-1/share/xml/translators.ent
index 4045e9ff6d..5d3f1384ac 100644
--- a/es_ES.ISO8859-1/share/xml/translators.ent
+++ b/es_ES.ISO8859-1/share/xml/translators.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Spanish Documentation Project
diff --git a/fr_FR.ISO8859-1/share/xml/abstract.ent b/fr_FR.ISO8859-1/share/xml/abstract.ent
index a4e8a1e907..2d75349f46 100644
--- a/fr_FR.ISO8859-1/share/xml/abstract.ent
+++ b/fr_FR.ISO8859-1/share/xml/abstract.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD French Documentation Project
diff --git a/fr_FR.ISO8859-1/share/xml/artheader.ent b/fr_FR.ISO8859-1/share/xml/artheader.ent
index 76c9b9f728..36d17523ae 100644
--- a/fr_FR.ISO8859-1/share/xml/artheader.ent
+++ b/fr_FR.ISO8859-1/share/xml/artheader.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD French Documentation Project
diff --git a/fr_FR.ISO8859-1/share/xml/entities.ent b/fr_FR.ISO8859-1/share/xml/entities.ent
index e2cc626105..30ac9f08ed 100644
--- a/fr_FR.ISO8859-1/share/xml/entities.ent
+++ b/fr_FR.ISO8859-1/share/xml/entities.ent
@@ -2,37 +2,50 @@
Original revision: 1.2
-->
-<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN">
+<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
+ "l10n.ent">
%l10n;
-<!ENTITY % l10n-common PUBLIC "-//FreeBSD//ENTITIES DocBook Language Neutral Entities//EN">
-%l10n-common;
-<!ENTITY % translators PUBLIC "-//FreeBSD//ENTITIES DocBook Translator Entities//FR">
+<!ENTITY % translators PUBLIC "-//FreeBSD//ENTITIES DocBook Translator Entities//FR"
+ "translators.ent">
%translators;
-<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//FR">
+<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//FR"
+ "mailing-lists.ent">
%mailing-lists;
-<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//FR">
+<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//FR"
+ "teams.ent">
%teams;
-<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//FR">
+<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//FR"
+ "newsgroups.ent">
%newsgroups;
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
+<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN"
+ "nonexistent">
%man;
-<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
+<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
+ "nonexistent">
%freebsd;
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
+<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN"
+ "nonexistent">
%authors;
-<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//FR">
+<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//FR"
+ "glossary.ent">
%glossary;
<!--
-<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EN">
+<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EN"
+ "nonexistent">
%teams;
-<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN">
+<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN"
+ "nonexistent">
%mailing-lists;
-<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EN">
+<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EN"
+ "nonexistent">
%newsgroups;
-->
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
+<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN"
+ "nonexistent">
%trademarks;
-<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//FR">
+<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//FR"
+ "urls.ent">
%urls;
-<!ENTITY % urls-en PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN">
+<!ENTITY % urls-en PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN"
+ "nonexistent">
%urls-en;
diff --git a/fr_FR.ISO8859-1/share/xml/mailing-lists.ent b/fr_FR.ISO8859-1/share/xml/mailing-lists.ent
index 6d1ba10546..14c5772c09 100644
--- a/fr_FR.ISO8859-1/share/xml/mailing-lists.ent
+++ b/fr_FR.ISO8859-1/share/xml/mailing-lists.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD French Documentation Project
diff --git a/fr_FR.ISO8859-1/share/xml/newsgroups.ent b/fr_FR.ISO8859-1/share/xml/newsgroups.ent
index 7cdc47e2dc..b336f9f126 100644
--- a/fr_FR.ISO8859-1/share/xml/newsgroups.ent
+++ b/fr_FR.ISO8859-1/share/xml/newsgroups.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD French Documentation Project
diff --git a/fr_FR.ISO8859-1/share/xml/teams.ent b/fr_FR.ISO8859-1/share/xml/teams.ent
index 184cb8e2fe..f4db86c00d 100644
--- a/fr_FR.ISO8859-1/share/xml/teams.ent
+++ b/fr_FR.ISO8859-1/share/xml/teams.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD French Documentation Project
diff --git a/fr_FR.ISO8859-1/share/xml/trademarks.ent b/fr_FR.ISO8859-1/share/xml/trademarks.ent
index 24f72ae816..4616c292ab 100644
--- a/fr_FR.ISO8859-1/share/xml/trademarks.ent
+++ b/fr_FR.ISO8859-1/share/xml/trademarks.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD French Documentation Project
diff --git a/fr_FR.ISO8859-1/share/xml/translators.ent b/fr_FR.ISO8859-1/share/xml/translators.ent
index 24f4a06bad..e65790ce54 100644
--- a/fr_FR.ISO8859-1/share/xml/translators.ent
+++ b/fr_FR.ISO8859-1/share/xml/translators.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD French Documentation Project
diff --git a/fr_FR.ISO8859-1/share/xml/urls.ent b/fr_FR.ISO8859-1/share/xml/urls.ent
index 6bcbdf8d31..2ebd4513b2 100644
--- a/fr_FR.ISO8859-1/share/xml/urls.ent
+++ b/fr_FR.ISO8859-1/share/xml/urls.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD French Documentation Project
diff --git a/hu_HU.ISO8859-2/share/xml/entities.ent b/hu_HU.ISO8859-2/share/xml/entities.ent
index c16d43fd24..9cd4155b4f 100644
--- a/hu_HU.ISO8859-2/share/xml/entities.ent
+++ b/hu_HU.ISO8859-2/share/xml/entities.ent
@@ -5,27 +5,36 @@
%SRCID% 1.2
-->
-<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN">
+<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
+ "l10n.ent">
%l10n;
-<!ENTITY % l10n-common PUBLIC "-//FreeBSD//ENTITIES DocBook Language Neutral Entities//EN">
-%l10n-common;
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
+<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN"
+ "nonexistent">
%man;
-<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//HU">
+<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//HU"
+ "freebsd.ent">
%freebsd;
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
+<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN"
+ "nonexistent">
%authors;
-<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//HU">
+<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//HU"
+ "teams.ent">
%teams;
-<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//HU">
+<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//HU"
+ "mailing-lists.ent">
%mailing-lists;
-<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//HU">
+<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//HU"
+ "newsgroups.ent">
%newsgroups;
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//HU">
+<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//HU"
+ "trademarks.ent">
%trademarks;
-<!ENTITY % translators PUBLIC "-//FreeBSD//ENTITIES DocBook Translator Entities//HU">
+<!ENTITY % translators PUBLIC "-//FreeBSD//ENTITIES DocBook Translator Entities//HU"
+ "translators.ent">
%translators;
-<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN">
+<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN"
+ "nonexistent">
%urls;
-<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//HU">
+<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//HU"
+ "glossary.ent">
%glossary;
diff --git a/hu_HU.ISO8859-2/share/xml/freebsd.ent b/hu_HU.ISO8859-2/share/xml/freebsd.ent
index be9b49e4e5..0f05aae175 100644
--- a/hu_HU.ISO8859-2/share/xml/freebsd.ent
+++ b/hu_HU.ISO8859-2/share/xml/freebsd.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-2"?>
<!-- -*- sgml -*-
DocBook Miscellaneous FreeBSD Entities.
diff --git a/hu_HU.ISO8859-2/share/xml/l10n.ent b/hu_HU.ISO8859-2/share/xml/l10n.ent
index fcf514af55..5412f263c2 100644
--- a/hu_HU.ISO8859-2/share/xml/l10n.ent
+++ b/hu_HU.ISO8859-2/share/xml/l10n.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-2"?>
<!-- -*- sgml -*-
DocBook Language Specific Entities for Localization (hu).
diff --git a/hu_HU.ISO8859-2/share/xml/mailing-lists.ent b/hu_HU.ISO8859-2/share/xml/mailing-lists.ent
index f6d57d919b..61952e93c8 100644
--- a/hu_HU.ISO8859-2/share/xml/mailing-lists.ent
+++ b/hu_HU.ISO8859-2/share/xml/mailing-lists.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
Names of FreeBSD mailing lists and related software.
diff --git a/hu_HU.ISO8859-2/share/xml/newsgroups.ent b/hu_HU.ISO8859-2/share/xml/newsgroups.ent
index b828bf5d85..7df30d0c4f 100644
--- a/hu_HU.ISO8859-2/share/xml/newsgroups.ent
+++ b/hu_HU.ISO8859-2/share/xml/newsgroups.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
Names of FreeBSD newsgroups
diff --git a/hu_HU.ISO8859-2/share/xml/teams.ent b/hu_HU.ISO8859-2/share/xml/teams.ent
index cb1aa614f6..9c3d708ea4 100644
--- a/hu_HU.ISO8859-2/share/xml/teams.ent
+++ b/hu_HU.ISO8859-2/share/xml/teams.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
Names and email address of teams of people working on specified
tasks. Usally they're just mail aliases set up at hub.FreeBSD.org
diff --git a/hu_HU.ISO8859-2/share/xml/trademarks.ent b/hu_HU.ISO8859-2/share/xml/trademarks.ent
index c39ebc2e4f..0047602504 100644
--- a/hu_HU.ISO8859-2/share/xml/trademarks.ent
+++ b/hu_HU.ISO8859-2/share/xml/trademarks.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
Trademark Legend, as required by The Open Group, Sun, etc..
diff --git a/hu_HU.ISO8859-2/share/xml/translators.ent b/hu_HU.ISO8859-2/share/xml/translators.ent
index ebecb0c89f..e4fee6f43b 100644
--- a/hu_HU.ISO8859-2/share/xml/translators.ent
+++ b/hu_HU.ISO8859-2/share/xml/translators.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Hungarian Documentation Project
diff --git a/it_IT.ISO8859-15/share/xml/entities.ent b/it_IT.ISO8859-15/share/xml/entities.ent
index dde7e8ad76..c4b4a9e7e5 100644
--- a/it_IT.ISO8859-15/share/xml/entities.ent
+++ b/it_IT.ISO8859-15/share/xml/entities.ent
@@ -4,29 +4,39 @@
$FreeBSD$
-->
-<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN">
+<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
+ "l10n.ent">
%l10n;
-<!ENTITY % l10n-common PUBLIC "-//FreeBSD//ENTITIES DocBook Language Neutral Entities//EN">
-%l10n-common;
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
+<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN"
+ "nonexistent">
%man;
-<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
+<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
+ "nonexistent">
%freebsd;
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
+<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN"
+ "nonexistent">
%authors;
-<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EN">
+<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EN"
+ "nonexistent">
%teams;
-<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//IT">
+<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//IT"
+ "mailing-lists.ent">
%mailing-lists;
-<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EN">
+<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EN"
+ "nonexistent">
%newsgroups;
-<!ENTITY % it-trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//IT">
+<!ENTITY % it-trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//IT"
+ "trademarks.ent">
%it-trademarks;
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
+<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN"
+ "nonexistent">
%trademarks;
-<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN">
+<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN"
+ "nonexistent">
%urls;
-<!ENTITY % translators PUBLIC "-//FreeBSD//ENTITIES DocBook Translator Entities//IT">
+<!ENTITY % translators PUBLIC "-//FreeBSD//ENTITIES DocBook Translator Entities//IT"
+ "translators.ent">
%translators;
-<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//IT">
+<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//IT"
+ "glossary.ent">
%glossary;
diff --git a/it_IT.ISO8859-15/share/xml/l10n.ent b/it_IT.ISO8859-15/share/xml/l10n.ent
index aaffe110e5..d04a282367 100644
--- a/it_IT.ISO8859-15/share/xml/l10n.ent
+++ b/it_IT.ISO8859-15/share/xml/l10n.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-15"?>
<!--
The FreeBSD Italian Documentation Project
diff --git a/it_IT.ISO8859-15/share/xml/mailing-lists.ent b/it_IT.ISO8859-15/share/xml/mailing-lists.ent
index 71f549f748..f38a62b089 100644
--- a/it_IT.ISO8859-15/share/xml/mailing-lists.ent
+++ b/it_IT.ISO8859-15/share/xml/mailing-lists.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-15"?>
<!--
The FreeBSD Italian Documentation Project
diff --git a/it_IT.ISO8859-15/share/xml/trademarks.ent b/it_IT.ISO8859-15/share/xml/trademarks.ent
index 7b4b57d673..db963c92ba 100644
--- a/it_IT.ISO8859-15/share/xml/trademarks.ent
+++ b/it_IT.ISO8859-15/share/xml/trademarks.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-15"?>
<!--
The FreeBSD Italian Documentation Project
diff --git a/it_IT.ISO8859-15/share/xml/translators.ent b/it_IT.ISO8859-15/share/xml/translators.ent
index bc6fdc7abd..11ec3f45bb 100644
--- a/it_IT.ISO8859-15/share/xml/translators.ent
+++ b/it_IT.ISO8859-15/share/xml/translators.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-15"?>
<!--
The FreeBSD Italian Documentation Project
diff --git a/ja_JP.eucJP/share/xml/authors.ent b/ja_JP.eucJP/share/xml/authors.ent
index 3aa7fc4d0c..5e1b8be541 100644
--- a/ja_JP.eucJP/share/xml/authors.ent
+++ b/ja_JP.eucJP/share/xml/authors.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="euc-jp"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Japanese Documentation Project
diff --git a/ja_JP.eucJP/share/xml/entities.ent b/ja_JP.eucJP/share/xml/entities.ent
index 679ba28ec6..ef5b26f204 100644
--- a/ja_JP.eucJP/share/xml/entities.ent
+++ b/ja_JP.eucJP/share/xml/entities.ent
@@ -1,38 +1,51 @@
<!-- $FreeBSD$ -->
-<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN">
+<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
+ "l10n.ent">
%l10n;
-<!ENTITY % l10n-common PUBLIC "-//FreeBSD//ENTITIES DocBook Language Neutral Entities//EN">
-%l10n-common;
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
+<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN"
+ "nonexistent">
%man;
-<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
+<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
+ "nonexistent">
%freebsd;
-<!ENTITY % authors-ja PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//JA">
+<!ENTITY % authors-ja PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//JA"
+ "authors.ent">
%authors-ja;
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
+<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN"
+ "nonexistent">
%authors;
-<!ENTITY % teams-ja PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//JA">
+<!ENTITY % teams-ja PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//JA"
+ "teams.ent">
%teams-ja;
-<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EN">
+<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EN"
+ "nonexistent">
%teams;
-<!ENTITY % mailing-lists-ja PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//JA">
+<!ENTITY % mailing-lists-ja PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//JA"
+ "mailing-lists.ent">
%mailing-lists-ja;
<!--
-<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN">
+<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN"
+ "nonexistent">
%mailing-lists;
-->
-<!ENTITY % newsgroups-ja PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//JA">
+<!ENTITY % newsgroups-ja PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//JA"
+ "newsgroups.ent">
%newsgroups-ja;
<!--
-<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EN">
+<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EN"
+ "nonexistent">
%newsgroups;
-->
-<!ENTITY % trademarks-ja PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//JA">
+<!ENTITY % trademarks-ja PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//JA"
+ "trademarks.ent">
%trademarks-ja;
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
+<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN"
+ "nonexistent">
%trademarks;
-<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN">
+<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN"
+ "nonexistent">
%urls;
-<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//EN">
+<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//EN"
+ "nonexistent">
%glossary;
diff --git a/ja_JP.eucJP/share/xml/mailing-lists.ent b/ja_JP.eucJP/share/xml/mailing-lists.ent
index 01db7a8bbb..238d00fc7d 100644
--- a/ja_JP.eucJP/share/xml/mailing-lists.ent
+++ b/ja_JP.eucJP/share/xml/mailing-lists.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="euc-jp"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Japanese Documentation Project
diff --git a/ja_JP.eucJP/share/xml/newsgroups.ent b/ja_JP.eucJP/share/xml/newsgroups.ent
index c61635ad19..577e49f89a 100644
--- a/ja_JP.eucJP/share/xml/newsgroups.ent
+++ b/ja_JP.eucJP/share/xml/newsgroups.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="euc-jp"?>
<!--
Names of FreeBSD newsgroups
diff --git a/ja_JP.eucJP/share/xml/teams.ent b/ja_JP.eucJP/share/xml/teams.ent
index 341e8610c8..d70b8b0043 100644
--- a/ja_JP.eucJP/share/xml/teams.ent
+++ b/ja_JP.eucJP/share/xml/teams.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="euc-jp"?>
<!--
Names and email address of teams of people working on specified
tasks. Usally they're just mail aliases set up at hub.FreeBSD.org
diff --git a/ja_JP.eucJP/share/xml/trademarks.ent b/ja_JP.eucJP/share/xml/trademarks.ent
index 55b954d3b1..61a66d06af 100644
--- a/ja_JP.eucJP/share/xml/trademarks.ent
+++ b/ja_JP.eucJP/share/xml/trademarks.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="euc-jp"?>
<!--
Trademark Legend, as required by The Open Group, Sun, etc..
diff --git a/mn_MN.UTF-8/share/xml/entities.ent b/mn_MN.UTF-8/share/xml/entities.ent
index 3be4888484..ca664ee908 100644
--- a/mn_MN.UTF-8/share/xml/entities.ent
+++ b/mn_MN.UTF-8/share/xml/entities.ent
@@ -6,25 +6,33 @@
$FreeBSD$
-->
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
+<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN"
+ "nonexistent">
%man;
-<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
+<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
+ "nonexistent">
%freebsd;
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
+<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN"
+ "nonexistent">
%authors;
-<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//MN">
+<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//MN"
+ "teams.ent">
%teams;
-<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//MN">
+<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//MN"
+ "mailing-lists.ent">
%mailing-lists;
-<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//MN">
+<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//MN"
+ "newsgroups.ent">
%newsgroups;
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//MN">
+<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//MN"
+ "trademarks.ent">
%trademarks;
-<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN">
+<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
+ "l10n.ent">
%l10n;
-<!ENTITY % l10n-common PUBLIC "-//FreeBSD//ENTITIES DocBook Language Neutral Entities//EN">
-%l10n-common;
-<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN">
+<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN"
+ "nonexistent">
%urls;
-<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//MN">
+<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//MN"
+ "glossary.ent">
%glossary;
diff --git a/nl_NL.ISO8859-1/share/xml/entities.ent b/nl_NL.ISO8859-1/share/xml/entities.ent
index c71505e04a..bd9c5e799f 100644
--- a/nl_NL.ISO8859-1/share/xml/entities.ent
+++ b/nl_NL.ISO8859-1/share/xml/entities.ent
@@ -6,27 +6,36 @@
%SRCID% 39534
-->
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
+<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN"
+ "nonexistent">
%man;
-<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
+<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
+ "nonexistent">
%freebsd;
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
+<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN"
+ "nonexistent">
%authors;
-<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//NL">
+<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//NL"
+ "teams.ent">
%teams;
-<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//NL">
+<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//NL"
+ "mailing-lists.ent">
%mailing-lists;
-<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//NL">
+<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//NL"
+ "newsgroups.ent">
%newsgroups;
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//NL">
+<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//NL"
+ "trademarks.ent">
%trademarks;
-<!ENTITY % trademarks-en PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
+<!ENTITY % trademarks-en PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN"
+ "nonexistent">
%trademarks-en;
-<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN">
+<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN"
+ "nonexistent">
%urls;
-<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN">
+<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
+ "l10n.ent">
%l10n;
-<!ENTITY % l10n-common PUBLIC "-//FreeBSD//ENTITIES DocBook Language Neutral Entities//EN">
-%l10n-common;
-<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//NL">
+<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//NL"
+ "glossary.ent">
%glossary;
diff --git a/nl_NL.ISO8859-1/share/xml/l10n.ent b/nl_NL.ISO8859-1/share/xml/l10n.ent
index 6db02c97cd..961f04f440 100644
--- a/nl_NL.ISO8859-1/share/xml/l10n.ent
+++ b/nl_NL.ISO8859-1/share/xml/l10n.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- -*- sgml -*-
DocBook Language Specific Entities for Localization (nl).
diff --git a/nl_NL.ISO8859-1/share/xml/mailing-lists.ent b/nl_NL.ISO8859-1/share/xml/mailing-lists.ent
index a0749a0266..b7cd210445 100644
--- a/nl_NL.ISO8859-1/share/xml/mailing-lists.ent
+++ b/nl_NL.ISO8859-1/share/xml/mailing-lists.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
Namen van FreeBSD mailinglijsten en gerelateerde software.
diff --git a/nl_NL.ISO8859-1/share/xml/newsgroups.ent b/nl_NL.ISO8859-1/share/xml/newsgroups.ent
index e18e8d626c..a7006af3ea 100644
--- a/nl_NL.ISO8859-1/share/xml/newsgroups.ent
+++ b/nl_NL.ISO8859-1/share/xml/newsgroups.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Dutch Documentation Project
Namen van FreeBSD newsgroepen
diff --git a/nl_NL.ISO8859-1/share/xml/teams.ent b/nl_NL.ISO8859-1/share/xml/teams.ent
index a221f2af03..9bffb92d66 100644
--- a/nl_NL.ISO8859-1/share/xml/teams.ent
+++ b/nl_NL.ISO8859-1/share/xml/teams.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Dutch Documentation Project
diff --git a/nl_NL.ISO8859-1/share/xml/trademarks.ent b/nl_NL.ISO8859-1/share/xml/trademarks.ent
index 0a6aa354a7..2d3d32eacb 100644
--- a/nl_NL.ISO8859-1/share/xml/trademarks.ent
+++ b/nl_NL.ISO8859-1/share/xml/trademarks.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
Legenda van handelsmerken, zoals vereist door The Open Group, Sun,
enzovoorts.
diff --git a/nl_NL.ISO8859-1/share/xml/translators.ent b/nl_NL.ISO8859-1/share/xml/translators.ent
index 99c1c391e0..b250b910c6 100644
--- a/nl_NL.ISO8859-1/share/xml/translators.ent
+++ b/nl_NL.ISO8859-1/share/xml/translators.ent
@@ -1,5 +1,5 @@
-<!--
- The FreeBSD Documentation Project
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- The FreeBSD Documentation Project
Nederlandse vertalers
$FreeBSD$
diff --git a/pl_PL.ISO8859-2/share/xml/entities.ent b/pl_PL.ISO8859-2/share/xml/entities.ent
index 06a3061827..7ec7b52fc2 100644
--- a/pl_PL.ISO8859-2/share/xml/entities.ent
+++ b/pl_PL.ISO8859-2/share/xml/entities.ent
@@ -5,27 +5,36 @@
Original revision: 1.2
-->
-<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN">
+<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
+ "l10n.ent">
%l10n;
-<!ENTITY % l10n-common PUBLIC "-//FreeBSD//ENTITIES DocBook Language Neutral Entities//EN">
-%l10n-common;
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
+<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN"
+ "nonexistent">
%man;
-<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
+<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
+ "nonexistent">
%freebsd;
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
+<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN"
+ "nonexistent">
%authors;
-<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//PL">
+<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//PL"
+ "teams.ent">
%teams;
-<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//PL">
+<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//PL"
+ "mailing-lists.ent">
%mailing-lists;
-<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//PL">
+<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//PL"
+ "newsgroups.ent">
%newsgroups;
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//PL">
+<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//PL"
+ "trademarks.ent">
%trademarks;
-<!ENTITY % trademarks-en PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
+<!ENTITY % trademarks-en PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN"
+ "nonexistent">
%trademarks-en;
-<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN">
+<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN"
+ "nonexistent">
%urls;
-<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//EN">
+<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//EN"
+ "nonexistent">
%glossary;
diff --git a/pl_PL.ISO8859-2/share/xml/l10n.ent b/pl_PL.ISO8859-2/share/xml/l10n.ent
index 7747ee9a49..de4a4227a7 100644
--- a/pl_PL.ISO8859-2/share/xml/l10n.ent
+++ b/pl_PL.ISO8859-2/share/xml/l10n.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-2"?>
<!-- -*- sgml -*-
DocBook Language Specific Entities for Localization (pl).
diff --git a/pl_PL.ISO8859-2/share/xml/mailing-lists.ent b/pl_PL.ISO8859-2/share/xml/mailing-lists.ent
index 5225fccdda..fb51733752 100644
--- a/pl_PL.ISO8859-2/share/xml/mailing-lists.ent
+++ b/pl_PL.ISO8859-2/share/xml/mailing-lists.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
Names of FreeBSD mailing lists and related software.
diff --git a/pl_PL.ISO8859-2/share/xml/newsgroups.ent b/pl_PL.ISO8859-2/share/xml/newsgroups.ent
index e47d2189a1..97f1cc297b 100644
--- a/pl_PL.ISO8859-2/share/xml/newsgroups.ent
+++ b/pl_PL.ISO8859-2/share/xml/newsgroups.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Polish Documentation Project
diff --git a/pl_PL.ISO8859-2/share/xml/teams.ent b/pl_PL.ISO8859-2/share/xml/teams.ent
index a02f7d3e24..22a7b92716 100644
--- a/pl_PL.ISO8859-2/share/xml/teams.ent
+++ b/pl_PL.ISO8859-2/share/xml/teams.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Polish Documentation Project
diff --git a/pt_BR.ISO8859-1/share/xml/entities.ent b/pt_BR.ISO8859-1/share/xml/entities.ent
index 87648dace0..6460afbca2 100644
--- a/pt_BR.ISO8859-1/share/xml/entities.ent
+++ b/pt_BR.ISO8859-1/share/xml/entities.ent
@@ -1,27 +1,39 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<!-- $FreeBSD$ -->
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
+<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN"
+ "nonexistent">
%authors;
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
+<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN"
+ "nonexistent">
%man;
-<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
+<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
+ "nonexistent">
%freebsd;
-<!ENTITY % translators PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//PT">
+<!ENTITY % translators PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//PT"
+ "translators.ent">
%translators;
-<!ENTITY % words PUBLIC "-//FreeBSD//ENTITIES DocBook Specific Word Translations Entities//PT">
+<!ENTITY % words PUBLIC "-//FreeBSD//ENTITIES DocBook Specific Word Translations Entities//PT"
+ "words.ent">
%words;
-<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//PT">
+<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//PT"
+ "l10n.ent">
%l10n;
-<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//PT">
+<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//PT"
+ "mailing-lists.ent">
%mailing-lists;
-<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//PT">
+<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//PT"
+ "newsgroups.ent">
%newsgroups;
-<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//PT">
+<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//PT"
+ "teams.ent">
%teams;
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//PT">
+<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//PT"
+ "trademarks.ent">
%trademarks;
-<!ENTITY % trademarks-en PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
+<!ENTITY % trademarks-en PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN"
+ "nonexistent">
%trademarks-en;
-<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN">
+<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN"
+ "nonexistent">
%urls;
diff --git a/pt_BR.ISO8859-1/share/xml/l10n.ent b/pt_BR.ISO8859-1/share/xml/l10n.ent
index d82aec6554..6d7f8aa948 100644
--- a/pt_BR.ISO8859-1/share/xml/l10n.ent
+++ b/pt_BR.ISO8859-1/share/xml/l10n.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- -*- sgml -*-
DocBook Language Specific Entities for Localization (pt_BR).
diff --git a/pt_BR.ISO8859-1/share/xml/mailing-lists.ent b/pt_BR.ISO8859-1/share/xml/mailing-lists.ent
index 321eb0194b..77039cc53b 100644
--- a/pt_BR.ISO8859-1/share/xml/mailing-lists.ent
+++ b/pt_BR.ISO8859-1/share/xml/mailing-lists.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
Nomes das listas de discuss�o do FreeBSD e dos softwares
relacionados
diff --git a/pt_BR.ISO8859-1/share/xml/newsgroups.ent b/pt_BR.ISO8859-1/share/xml/newsgroups.ent
index 2c06789b80..e55b43329b 100644
--- a/pt_BR.ISO8859-1/share/xml/newsgroups.ent
+++ b/pt_BR.ISO8859-1/share/xml/newsgroups.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
Names of FreeBSD newsgroups
diff --git a/pt_BR.ISO8859-1/share/xml/teams.ent b/pt_BR.ISO8859-1/share/xml/teams.ent
index 7476584e03..e1a4644091 100644
--- a/pt_BR.ISO8859-1/share/xml/teams.ent
+++ b/pt_BR.ISO8859-1/share/xml/teams.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
Names and email address of teams of people working on specified
tasks. Usually they're just mail aliases set up at hub.FreeBSD.org
diff --git a/pt_BR.ISO8859-1/share/xml/trademarks.ent b/pt_BR.ISO8859-1/share/xml/trademarks.ent
index 66359ab3b6..ff0b2a03cf 100644
--- a/pt_BR.ISO8859-1/share/xml/trademarks.ent
+++ b/pt_BR.ISO8859-1/share/xml/trademarks.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- $FreeBSD -->
<!ENTITY legalnotice '
diff --git a/pt_BR.ISO8859-1/share/xml/translators.ent b/pt_BR.ISO8859-1/share/xml/translators.ent
index 99a9f543e7..d6ff0d4fb8 100644
--- a/pt_BR.ISO8859-1/share/xml/translators.ent
+++ b/pt_BR.ISO8859-1/share/xml/translators.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Brazilian Portuguese Documentation Project
diff --git a/pt_BR.ISO8859-1/share/xml/words.ent b/pt_BR.ISO8859-1/share/xml/words.ent
index 659d4513cb..e77f89d3f8 100644
--- a/pt_BR.ISO8859-1/share/xml/words.ent
+++ b/pt_BR.ISO8859-1/share/xml/words.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
Words that were deemed too controversial. Which, therefore,
would require several futher revisions. Moreover, the use of
diff --git a/ru_RU.KOI8-R/share/xml/entities.ent b/ru_RU.KOI8-R/share/xml/entities.ent
index f52abd7694..40caa1f4c0 100644
--- a/ru_RU.KOI8-R/share/xml/entities.ent
+++ b/ru_RU.KOI8-R/share/xml/entities.ent
@@ -7,27 +7,36 @@
Original revision: 1.1 (doc/share/xml)
-->
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
+<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN"
+ "nonexistent">
%man;
-<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
+<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
+ "nonexistent">
%freebsd;
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
+<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN"
+ "nonexistent">
%authors;
-<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//RU">
+<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//RU"
+ "teams.ent">
%teams;
-<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//RU">
+<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//RU"
+ "mailing-lists.ent">
%mailing-lists;
-<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//RU">
+<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//RU"
+ "newsgroups.ent">
%newsgroups;
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//RU">
+<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//RU"
+ "trademarks.ent">
%trademarks;
-<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN">
+<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
+ "l10n.ent">
%l10n;
-<!ENTITY % l10n-common PUBLIC "-//FreeBSD//ENTITIES DocBook Language Neutral Entities//EN">
-%l10n-common;
-<!ENTITY % urls-ru PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//RU">
+<!ENTITY % urls-ru PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//RU"
+ "urls.ent">
%urls-ru;
-<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN">
+<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN"
+ "nonexistent">
%urls;
-<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//RU">
+<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//RU"
+ "glossary.ent">
%glossary;
diff --git a/ru_RU.KOI8-R/share/xml/mailing-lists.ent b/ru_RU.KOI8-R/share/xml/mailing-lists.ent
index d70d70647b..0876938c78 100644
--- a/ru_RU.KOI8-R/share/xml/mailing-lists.ent
+++ b/ru_RU.KOI8-R/share/xml/mailing-lists.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="koi8-r"?>
<!--
The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/share/xml/newsgroups.ent b/ru_RU.KOI8-R/share/xml/newsgroups.ent
index 5bd404da20..20ab5d4032 100644
--- a/ru_RU.KOI8-R/share/xml/newsgroups.ent
+++ b/ru_RU.KOI8-R/share/xml/newsgroups.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="koi8-r"?>
<!--
The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/share/xml/teams.ent b/ru_RU.KOI8-R/share/xml/teams.ent
index 9347d7aaa8..c5ad0159dc 100644
--- a/ru_RU.KOI8-R/share/xml/teams.ent
+++ b/ru_RU.KOI8-R/share/xml/teams.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="koi8-r"?>
<!--
The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/share/xml/trademarks.ent b/ru_RU.KOI8-R/share/xml/trademarks.ent
index 83bbfc794e..c9dae8b297 100644
--- a/ru_RU.KOI8-R/share/xml/trademarks.ent
+++ b/ru_RU.KOI8-R/share/xml/trademarks.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="koi8-r"?>
<!--
The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/share/xml/translators.ent b/ru_RU.KOI8-R/share/xml/translators.ent
index a20272f125..718b2f7e58 100644
--- a/ru_RU.KOI8-R/share/xml/translators.ent
+++ b/ru_RU.KOI8-R/share/xml/translators.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="koi8-r"?>
<!--
The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/share/xml/urls.ent b/ru_RU.KOI8-R/share/xml/urls.ent
index 644605a719..d7112a8543 100644
--- a/ru_RU.KOI8-R/share/xml/urls.ent
+++ b/ru_RU.KOI8-R/share/xml/urls.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="koi8-r"?>
<!--
The FreeBSD Russian Documentation Project
diff --git a/sr_YU.ISO8859-2/share/xml/entities.ent b/sr_YU.ISO8859-2/share/xml/entities.ent
index 1e953d7362..a92856522b 100644
--- a/sr_YU.ISO8859-2/share/xml/entities.ent
+++ b/sr_YU.ISO8859-2/share/xml/entities.ent
@@ -1,19 +1,27 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<!-- $FreeBSD$ -->
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
+<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN"
+ "nonexistent">
%authors;
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
+<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN"
+ "nonexistent">
%man;
-<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
+<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
+ "nonexistent">
%freebsd;
-<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN">
+<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
+ "l10n.ent">
%l10n;
-<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN">
+<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN"
+ "nonexistent">
%mailing-lists;
-<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EN">
+<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EN"
+ "nonexistent">
%newsgroups;
-<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EN">
+<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EN"
+ "nonexistent">
%teams;
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
+<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN"
+ "nonexistent">
%trademarks;
diff --git a/tr_TR.ISO8859-9/share/xml/entities.ent b/tr_TR.ISO8859-9/share/xml/entities.ent
index 1e953d7362..a92856522b 100644
--- a/tr_TR.ISO8859-9/share/xml/entities.ent
+++ b/tr_TR.ISO8859-9/share/xml/entities.ent
@@ -1,19 +1,27 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<!-- $FreeBSD$ -->
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
+<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN"
+ "nonexistent">
%authors;
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
+<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN"
+ "nonexistent">
%man;
-<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
+<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
+ "nonexistent">
%freebsd;
-<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN">
+<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
+ "l10n.ent">
%l10n;
-<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN">
+<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN"
+ "nonexistent">
%mailing-lists;
-<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EN">
+<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EN"
+ "nonexistent">
%newsgroups;
-<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EN">
+<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EN"
+ "nonexistent">
%teams;
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
+<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN"
+ "nonexistent">
%trademarks;
diff --git a/zh_CN.GB2312/share/xml/authors-in-author-tag.ent b/zh_CN.GB2312/share/xml/authors-in-author-tag.ent
index 793b9a0bdf..ddd53cb661 100644
--- a/zh_CN.GB2312/share/xml/authors-in-author-tag.ent
+++ b/zh_CN.GB2312/share/xml/authors-in-author-tag.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="gb2312"?>
<!--
The FreeBSD Simplified Chinese Documentation Project
diff --git a/zh_CN.GB2312/share/xml/authors.ent b/zh_CN.GB2312/share/xml/authors.ent
index cdfd441f37..efd44a5ebf 100644
--- a/zh_CN.GB2312/share/xml/authors.ent
+++ b/zh_CN.GB2312/share/xml/authors.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="gb2312"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Simplified Chinese Documentation Project
diff --git a/zh_CN.GB2312/share/xml/entities.ent b/zh_CN.GB2312/share/xml/entities.ent
index b025010020..cd2064caef 100644
--- a/zh_CN.GB2312/share/xml/entities.ent
+++ b/zh_CN.GB2312/share/xml/entities.ent
@@ -1,28 +1,38 @@
<!-- $FreeBSD$ -->
-<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN">
+<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
+ "l10n.ent">
%l10n;
-<!ENTITY % l10n-common PUBLIC "-//FreeBSD//ENTITIES DocBook Language Neutral Entities//EN">
-%l10n-common;
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
+<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN"
+ "nonexistent">
%man;
-<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
+<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
+ "nonexistent">
%freebsd;
-<!ENTITY % authors.cn PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//ZH">
+<!ENTITY % authors.cn PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//ZH"
+ "authors.ent">
%authors.cn;
-<!ENTITY % authors.in.author.tag.cn PUBLIC "-//FreeBSD//ENTITIES DocBook Author In Author Tag Entities//ZH">
+<!ENTITY % authors.in.author.tag.cn PUBLIC "-//FreeBSD//ENTITIES DocBook Author In Author Tag Entities//ZH"
+ "authors-in-author-tag.ent">
%authors.in.author.tag.cn;
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
+<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN"
+ "nonexistent">
%authors;
-<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//ZH">
+<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//ZH"
+ "teams.ent">
%teams;
-<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//ZH">
+<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//ZH"
+ "mailing-lists.ent">
%mailing-lists;
-<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EN">
+<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EN"
+ "nonexistent">
%newsgroups;
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//ZH">
+<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//ZH"
+ "trademarks.ent">
%trademarks;
-<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN">
+<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN"
+ "nonexistent">
%urls;
-<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//ZH">
+<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//ZH"
+ "glossary.ent">
%glossary;
diff --git a/zh_CN.GB2312/share/xml/mailing-lists.ent b/zh_CN.GB2312/share/xml/mailing-lists.ent
index fd8b8b177c..b19148ecd8 100644
--- a/zh_CN.GB2312/share/xml/mailing-lists.ent
+++ b/zh_CN.GB2312/share/xml/mailing-lists.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="gb2312"?>
<!--
Names of FreeBSD mailing lists and related software.
The FreeBSD Chinese Documentation Project
diff --git a/zh_CN.GB2312/share/xml/teams.ent b/zh_CN.GB2312/share/xml/teams.ent
index 0b4ef1c3d8..3fd0be0c2a 100644
--- a/zh_CN.GB2312/share/xml/teams.ent
+++ b/zh_CN.GB2312/share/xml/teams.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="gb2312"?>
<!--
Names and email address of teams of people working on specified
tasks. Usally they're just mail aliases set up at hub.FreeBSD.org
diff --git a/zh_CN.GB2312/share/xml/trademarks.ent b/zh_CN.GB2312/share/xml/trademarks.ent
index 3b43bdbacd..adec25d2ff 100644
--- a/zh_CN.GB2312/share/xml/trademarks.ent
+++ b/zh_CN.GB2312/share/xml/trademarks.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="gb2312"?>
<!--
Trademark Legend, as required by The Open Group, Sun, etc..
diff --git a/zh_TW.Big5/share/xml/authors.ent b/zh_TW.Big5/share/xml/authors.ent
index 6041504d22..8b8e7316f8 100644
--- a/zh_TW.Big5/share/xml/authors.ent
+++ b/zh_TW.Big5/share/xml/authors.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="big5"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Traditional Chinese Documentation Project
diff --git a/zh_TW.Big5/share/xml/entities.ent b/zh_TW.Big5/share/xml/entities.ent
index f457e0dd94..24ec0e64ba 100644
--- a/zh_TW.Big5/share/xml/entities.ent
+++ b/zh_TW.Big5/share/xml/entities.ent
@@ -1,28 +1,38 @@
<!-- $FreeBSD$ -->
-<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN">
+<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
+ "l10n.ent">
%l10n;
-<!ENTITY % l10n-common PUBLIC "-//FreeBSD//ENTITIES DocBook Language Neutral Entities//EN">
-%l10n-common;
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
+<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN"
+ "nonexistent">
%man;
-<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
+<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
+ "nonexistent">
%freebsd;
-<!ENTITY % authors.cn PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//ZH">
+<!ENTITY % authors.cn PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//ZH"
+ "authors.ent">
%authors.cn;
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
+<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN"
+ "nonexistent">
%authors;
-<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EN">
+<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EN"
+ "nonexistent">
%teams;
-<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//ZH">
+<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//ZH"
+ "mailing-lists.ent">
%mailing-lists;
-<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EN">
+<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EN"
+ "nonexistent">
%newsgroups;
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//ZH">
+<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//ZH"
+ "trademarks.ent">
%trademarks;
-<!ENTITY % trademarks-en PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
+<!ENTITY % trademarks-en PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN"
+ "nonexistent">
%trademarks-en;
-<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//ZH">
+<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//ZH"
+ "urls.ent">
%urls;
-<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//ZH">
+<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//ZH"
+ "glossary.ent">
%glossary;
diff --git a/zh_TW.Big5/share/xml/mailing-lists.ent b/zh_TW.Big5/share/xml/mailing-lists.ent
index ce5c33db0d..55ba56e118 100644
--- a/zh_TW.Big5/share/xml/mailing-lists.ent
+++ b/zh_TW.Big5/share/xml/mailing-lists.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="big5"?>
<!--
Names of FreeBSD �l����s and related software.
The FreeBSD Traditional-Chinese Documentation Project
diff --git a/zh_TW.Big5/share/xml/trademarks.ent b/zh_TW.Big5/share/xml/trademarks.ent
index 4c8f711c85..6adf8a275f 100644
--- a/zh_TW.Big5/share/xml/trademarks.ent
+++ b/zh_TW.Big5/share/xml/trademarks.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="big5"?>
<!--
Trademark Legend, as required by The Open Group, Sun, etc..
diff --git a/zh_TW.Big5/share/xml/urls.ent b/zh_TW.Big5/share/xml/urls.ent
index 29e8b5eff2..66a5957beb 100644
--- a/zh_TW.Big5/share/xml/urls.ent
+++ b/zh_TW.Big5/share/xml/urls.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="big5"?>
<!-- $FreeBSD$ -->
<!--
From 31698a11f58d56959131ca8511548215a49f8675 Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Sat, 20 Oct 2012 12:26:26 +0000
Subject: [PATCH 002/121] - Add a Subversion config fragment that sets the SVN
properties when adding files
---
share/misc/svn_props.txt | 72 ++++++++++++++++++++++++++++++++++++++++
1 file changed, 72 insertions(+)
create mode 100644 share/misc/svn_props.txt
diff --git a/share/misc/svn_props.txt b/share/misc/svn_props.txt
new file mode 100644
index 0000000000..a0293097ff
--- /dev/null
+++ b/share/misc/svn_props.txt
@@ -0,0 +1,72 @@
+# Make sure you have a ~/.subversion/config. Simply using it (svn --help)
+# will cause a default one to be created if you don't already have one.
+# Add the following changes to ~/.subversion/config:
+#
+#
+# Set:
+# enable-auto-props = yes
+#
+#
+# Append/edit auto-props section:
+#
+
+[auto-props]
+*.c = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
+*.h = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
+*.s = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
+*.S = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
+*.cc = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
+*.cpp = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
+*.cxx = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
+*.in = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
+*.sh = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain; svn:executable
+*.pl = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain; svn:executable
+*.pm = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
+*.py = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
+*.rb = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
+*.awk = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
+*.sed = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
+*.txt = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
+*.log = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
+*.conf = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
+Makefile* = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
+*.1 = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
+*.2 = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
+*.3 = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
+*.4 = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
+*.5 = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
+*.6 = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
+*.7 = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
+*.8 = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
+*.9 = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
+
+*.css = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/css
+*.docbook = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/sgml
+*.dtd = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=application/xml-dtd
+*.ent = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=application/xml-dtd
+*.html = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/html
+*.mml = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=application/mathml+xml
+*.js = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=application/javascript
+*.rss = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=application/rss+xml
+*.sgml = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/sgml
+*.xhtml = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/html+xml
+*.xml = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/xml
+*.xsd = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/xml
+*.xsl = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=application/xslt+xml
+*.xslt = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=application/xslt+xml
+*.xul = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/xul
+
+*.bin = svn:mime-type=application/octet-stream
+*.eps = svn:mime-type=application/postscript
+*.exe = svn:mime-type=application/octet-stream
+*.gz = svn:mime-type=application/gzip
+*.pdf = svn:mime-type=application/pdf
+*.ps = svn:mime-type=application/postscript
+
+*.gif = svn:mime-type=image/gif
+*.ico = svn:mime-type=image/vnd.microsoft.icon
+*.jpeg = svn:mime-type=image/jpeg
+*.jpg = svn:mime-type=image/jpeg
+*.png = svn:mime-type=image/png
+*.svg = svn:mime-type=image/svg+xml
+*.tiff = svn:mime-type=image/tiff
From 54c0bf5890b1017a48ab04caa951f530f189de58 Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Sat, 20 Oct 2012 19:14:42 +0000
Subject: [PATCH 003/121] - Add dtd to validate the mirrors database
---
share/xml/mirrors.dtd | 26 ++++++++++++++++++++++++++
share/xml/mirrors.xml | 2 ++
2 files changed, 28 insertions(+)
create mode 100644 share/xml/mirrors.dtd
diff --git a/share/xml/mirrors.dtd b/share/xml/mirrors.dtd
new file mode 100644
index 0000000000..e40058511b
--- /dev/null
+++ b/share/xml/mirrors.dtd
@@ -0,0 +1,26 @@
+<!-- $FreeBSD$ -->
+
+<!ENTITY % cvs PUBLIC "-//FreeBSD//DTD FreeBSD CVS Keywords//EN"
+"http://www.FreeBSD.org/XML/doc/share/xml/cvs.dtd">
+%cvs;
+
+<!ELEMENT mirrors (cvs:keyword, entry+)>
+
+<!ELEMENT entry (country, host+, email?)>
+<!ELEMENT country (#PCDATA)>
+<!ELEMENT host (name, url*)>
+<!ELEMENT name (#PCDATA)>
+<!ELEMENT url (#PCDATA)>
+<!ELEMENT email (#PCDATA)>
+
+<!ATTLIST entry id ID #REQUIRED>
+<!ATTLIST host type (cvsup|ftp|rsync|www) #REQUIRED>
+<!ATTLIST url proto (ftp|ftpv6|http|httpv6|rsync|rsyncv6) #REQUIRED>
+<!ATTLIST country
+ sortkey CDATA #REQUIRED
+ role CDATA #IMPLIED>
+
+<!ENTITY % iso8879.ent
+ PUBLIC "-//FreeBSD//ENTITIES ISO 8879:1986 Entity Set//EN//XML"
+ "http://www.FreeBSD.org/XML/www/share/xml/iso8879.ent">
+%iso8879.ent;
diff --git a/share/xml/mirrors.xml b/share/xml/mirrors.xml
index bcf2c76f61..2ad6264b24 100644
--- a/share/xml/mirrors.xml
+++ b/share/xml/mirrors.xml
@@ -1,4 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE mirrors PUBLIC "-//FreeBSD//DTD FreeBSD XML Database for Mirrors//EN"
+ "http://www.FreeBSD.org/XML/www/share/xml/mirrors.dtd">
<mirrors>
<cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
$FreeBSD$
From a1c12382a015771863ade0b79a28b99372a6f724 Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Mon, 21 Jan 2013 17:31:17 +0000
Subject: [PATCH 004/121] - Restore support for make lint - Validation is now
actually XML validation
---
share/mk/doc.docbook.mk | 2 +-
share/mk/doc.html.mk | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/share/mk/doc.docbook.mk b/share/mk/doc.docbook.mk
index 4669dff66e..b2a058e99f 100644
--- a/share/mk/doc.docbook.mk
+++ b/share/mk/doc.docbook.mk
@@ -723,7 +723,7 @@ ${DOC}.${_curformat}:
#
lint validate:
- @${XMLLINT} --nonet --noout --noent --valid ${MASTERDOC}
+ ${XMLLINT} --catalogs --nonet --noout --noent --valid ${MASTERDOC}
# ------------------------------------------------------------------------
#
diff --git a/share/mk/doc.html.mk b/share/mk/doc.html.mk
index d7559fd1f7..85fb4ef7e4 100644
--- a/share/mk/doc.html.mk
+++ b/share/mk/doc.html.mk
@@ -180,8 +180,7 @@ ${DOC}.${_curformat}:
#
lint validate:
- ${NSGMLS} -s -c ${HTMLCATALOG} ${MASTERDOC}
-
+ ${XMLLINT} --catalogs --nonet --noout --noent --valid ${MASTERDOC}
# ------------------------------------------------------------------------
#
From cacfbb9e6b499aa4882c41afb8938dd6978f8d77 Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Mon, 21 Jan 2013 17:33:49 +0000
Subject: [PATCH 005/121] - Drop some old artifacts and go towards XML validity
---
share/xml/bibliography.xml | 2 +-
share/xml/catalog.xml | 33 ++++++++++++++++++++++++++++++++-
share/xml/mirrors-local.xsl | 1 -
share/xml/mirrors-master.xsl | 23 +++++++++++++----------
share/xml/urls.ent | 33 +--------------------------------
5 files changed, 47 insertions(+), 45 deletions(-)
diff --git a/share/xml/bibliography.xml b/share/xml/bibliography.xml
index 71900a016b..ef4cc44947 100644
--- a/share/xml/bibliography.xml
+++ b/share/xml/bibliography.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
$FreeBSD$
-->
diff --git a/share/xml/catalog.xml b/share/xml/catalog.xml
index 7dd342c033..dfbd757cdd 100644
--- a/share/xml/catalog.xml
+++ b/share/xml/catalog.xml
@@ -37,7 +37,7 @@
uri="common.ent" />
<public
publicId="-//FreeBSD//ENTITIES FreeBSD L10N Common Entities//EN"
- uri="l10n.ent" />
+ uri="l10n-common.ent" />
<public
publicId="-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
uri="l10n.ent" />
@@ -65,6 +65,9 @@
<public
publicId="-//FreeBSD//DTD FreeBSD XML Database for Multimedia//EN"
uri="multimedia.dtd"/>
+ <public
+ publicId="-//FreeBSD//DTD FreeBSD XML Database for Mirrors//EN"
+ uri="mirrors.dtd" />
<public
publicId="-//FreeBSD//DTD FreeBSD XML Database for Events//EN"
uri="events.dtd" />
@@ -77,4 +80,32 @@
<public
publicId="-//FreeBSD//DTD XHTML 1.0 Transitional-Based Extension//EN"
uri="xhtml10-freebsd.dtd" />
+ <public
+ publicId="-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN"
+ uri="man-refs.ent" />
+ <public
+ publicId="-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
+ uri="freebsd.ent" />
+ <public
+ publicId="-//FreeBSD//ENTITIES DocBook Trademark Entities//EN"
+ uri="trademarks.ent" />
+ <public
+ publicId="-//FreeBSD//ENTITIES DocBook URL Entities//EN"
+ uri="urls.ent" />
+ <public
+ publicId="-//FreeBSD//ENTITIES DocBook Author Entities//EN"
+ uri="authors.ent"/>
+ <public
+ publicId="-//FreeBSD//ENTITIES DocBook Team Entities//EN"
+ uri="../../en_US.ISO8859-1/share/xml/teams.ent"/>
+
+ <public
+ publicId="-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EN"
+ uri="../../en_US.ISO8859-1/share/xml/newsgroups.ent"/>
+ <public
+ publicId="-//FreeBSD//ENTITIES DocBook Glossary Entities//EN"
+ uri="../../en_US.ISO8859-1/share/xml/glossary.ent"/>
+ <public
+ publicId="-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN"
+ uri="../../en_US.ISO8859-1/share/xml/mailing-lists.ent"/>
</catalog>
diff --git a/share/xml/mirrors-local.xsl b/share/xml/mirrors-local.xsl
index bc2b37d047..f21a45de01 100644
--- a/share/xml/mirrors-local.xsl
+++ b/share/xml/mirrors-local.xsl
@@ -7,7 +7,6 @@
<xsl:import href="./mirrors-master.xsl" />
<xsl:output type="xml" encoding="iso-8859-1"
- omit-xml-declaration="yes"
indent="yes"/>
</xsl:stylesheet>
diff --git a/share/xml/mirrors-master.xsl b/share/xml/mirrors-master.xsl
index 4eed64c5a1..ec2c73b6a2 100644
--- a/share/xml/mirrors-master.xsl
+++ b/share/xml/mirrors-master.xsl
@@ -4,7 +4,6 @@
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
<xsl:output type="xml" encoding="iso-8859-1"
- omit-xml-declaration="yes"
indent="yes"/>
<!-- these params should be externally bound. The values
@@ -13,8 +12,6 @@
<xsl:param name="proto" select="''" />
<xsl:param name="target" select="''" />
- <xsl:param name="mirrors-docbook-country-anchor-id" select="translate($target, '/.', '--')" />
-
<xsl:variable name="date">
<xsl:value-of xmlns:cvs="http://www.FreeBSD.org/XML/CVS"
select="normalize-space(//cvs:keyword[@name='freebsd'])"/>
@@ -32,16 +29,22 @@
<xsl:template match="/">
<xsl:choose>
- <xsl:when test="$target = 'handbook/mirrors/chapter.xml'">
- <xsl:call-template name="mirrors-docbook-country-index-all" />
+ <xsl:when test="$target = 'lastmod'">
<para>(<xsl:call-template name="mirrors-lastmodified" />)</para>
+ </xsl:when>
+
+ <xsl:when test="$target = 'index'">
+ <xsl:call-template name="mirrors-docbook-country-index-all" />
+ </xsl:when>
+
+ <xsl:when test="$target = 'handbook/mirrors/chapter.xml'">
<xsl:call-template name="mirrors-docbook-variablelist" />
</xsl:when>
+
<xsl:when test="$target = 'handbook/eresources/chapter.xml'">
- <xsl:call-template name="mirrors-docbook-country-index-all" />
- <para>(<xsl:call-template name="mirrors-lastmodified" />)</para>
<xsl:call-template name="mirrors-docbook-itemizedlist" />
</xsl:when>
+
<xsl:otherwise>
<xsl:value-of select="'*** processing error ***'" />
</xsl:otherwise>
@@ -91,7 +94,7 @@
<xsl:param name="mirrors-docbook-country-index-without-period" />
<link>
<xsl:attribute name="linkend">
- <xsl:value-of select="concat($mirrors-docbook-country-anchor-id, '-', @id, '-', $type)" />
+ <xsl:value-of select="concat(@id, '-', $type)" />
</xsl:attribute>
<xsl:value-of select="country" />
</link>
@@ -126,7 +129,7 @@
<term>
<anchor>
<xsl:attribute name="id">
- <xsl:value-of select="concat($mirrors-docbook-country-anchor-id, '-', @id, '-', $type)" />
+ <xsl:value-of select="concat(@id, '-', $type)" />
</xsl:attribute>
</anchor>
<xsl:value-of select="country" />
@@ -211,7 +214,7 @@
<listitem>
<anchor>
<xsl:attribute name="id">
- <xsl:value-of select="concat($mirrors-docbook-country-anchor-id, '-', @id, '-', $type)" />
+ <xsl:value-of select="concat(@id, '-', $type)" />
</xsl:attribute>
</anchor>
diff --git a/share/xml/urls.ent b/share/xml/urls.ent
index 0e309e2890..c92568bde9 100644
--- a/share/xml/urls.ent
+++ b/share/xml/urls.ent
@@ -1,41 +1,10 @@
<!-- $FreeBSD$ -->
<!ENTITY % freebsd.urls.absolute "IGNORE">
-<!ENTITY % freebsd.urls.relprefix.1 "IGNORE">
-<!ENTITY % freebsd.urls.relprefix.2 "IGNORE">
-<!ENTITY % freebsd.urls.relprefix.3 "IGNORE">
-<!ENTITY % freebsd.urls.relprefix.4 "IGNORE">
-<!ENTITY % freebsd.urls.relprefix.5 "IGNORE">
-<!ENTITY % freebsd.urls.relprefix.6 "IGNORE">
-<!ENTITY % freebsd.urls.relprefix.7 "IGNORE">
-<!ENTITY % freebsd.urls.relprefix.8 "IGNORE">
<!-- Do not edit: start here -->
-<![%freebsd.urls.relprefix.1;[
- <!ENTITY url.relprefix "..">
-]]>
-<![%freebsd.urls.relprefix.2;[
- <!ENTITY url.relprefix "../..">
-]]>
-<![%freebsd.urls.relprefix.3;[
- <!ENTITY url.relprefix "../../..">
-]]>
-<![%freebsd.urls.relprefix.4;[
- <!ENTITY url.relprefix "../../../..">
-]]>
-<![%freebsd.urls.relprefix.5;[
- <!ENTITY url.relprefix "../../../../..">
-]]>
-<![%freebsd.urls.relprefix.6;[
- <!ENTITY url.relprefix "../../../../../..">
-]]>
-<![%freebsd.urls.relprefix.7;[
- <!ENTITY url.relprefix "../../../../../../..">
-]]>
-<![%freebsd.urls.relprefix.8;[
- <!ENTITY url.relprefix "../../../../../../../..">
-]]>
+<!ENTITY url.relprefix "../../../..">
<![ %freebsd.urls.absolute; [
<!ENTITY url.base "http://www.FreeBSD.org">
From 1a95b79f46a1535bac2b319821aa0a38b07da0df Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Mon, 21 Jan 2013 17:35:04 +0000
Subject: [PATCH 006/121] - Add XML declaration to non-ASCII key files
---
share/pgpkeys/decke.key | 1 +
share/pgpkeys/pgj.key | 1 +
share/pgpkeys/scop.key | 1 +
share/pgpkeys/thomas.key | 1 +
4 files changed, 4 insertions(+)
diff --git a/share/pgpkeys/decke.key b/share/pgpkeys/decke.key
index 298ce6adb8..d47cdde113 100644
--- a/share/pgpkeys/decke.key
+++ b/share/pgpkeys/decke.key
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- $FreeBSD$ -->
<!--
sh addkey.sh decke CF5840D4;
diff --git a/share/pgpkeys/pgj.key b/share/pgpkeys/pgj.key
index 02f88b19b7..bdda6e7006 100644
--- a/share/pgpkeys/pgj.key
+++ b/share/pgpkeys/pgj.key
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- $FreeBSD$ -->
<!--
sh ./addkey.sh pgj 9E3F9BE6;
diff --git a/share/pgpkeys/scop.key b/share/pgpkeys/scop.key
index d50d58850a..11d170aa5f 100644
--- a/share/pgpkeys/scop.key
+++ b/share/pgpkeys/scop.key
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- $FreeBSD$ -->
<!--
sh addkey.sh scop BCD241CB;
diff --git a/share/pgpkeys/thomas.key b/share/pgpkeys/thomas.key
index 80b9aa9ebb..ca80563a51 100644
--- a/share/pgpkeys/thomas.key
+++ b/share/pgpkeys/thomas.key
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- $FreeBSD$ -->
<!--
sh addkey.sh thomas 393D2469;
From 40a53fec894442c0069b05524890f8f669d70fd3 Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Mon, 21 Jan 2013 17:35:44 +0000
Subject: [PATCH 007/121] - Make the German documentation valid XML
---
.../introduction/chapter.xml | 4 +-
.../developers-handbook/ipv6/chapter.xml | 2 +-
.../kernelbuild/chapter.xml | 2 +-
.../kerneldebug/chapter.xml | 2 +-
.../developers-handbook/l10n/chapter.xml | 2 +-
.../developers-handbook/policies/chapter.xml | 2 +-
.../developers-handbook/secure/chapter.xml | 2 +-
.../developers-handbook/sockets/chapter.xml | 2 +-
.../developers-handbook/testing/chapter.xml | 2 +-
.../developers-handbook/tools/chapter.xml | 2 +-
.../books/developers-handbook/x86/chapter.xml | 2 +-
de_DE.ISO8859-1/books/faq/book.xml | 6 +-
.../books/fdp-primer/doc-build/chapter.xml | 2 +-
.../books/fdp-primer/examples/appendix.xml | 2 +-
.../books/fdp-primer/overview/chapter.xml | 2 +-
.../books/fdp-primer/psgml-mode/chapter.xml | 2 +-
.../books/fdp-primer/see-also/chapter.xml | 2 +-
.../books/fdp-primer/sgml-markup/chapter.xml | 2 +-
.../books/fdp-primer/sgml-primer/chapter.xml | 24 +--
.../books/fdp-primer/structure/chapter.xml | 4 +-
.../books/fdp-primer/stylesheets/chapter.xml | 2 +-
.../books/fdp-primer/the-website/chapter.xml | 2 +-
.../books/fdp-primer/tools/chapter.xml | 2 +-
.../books/fdp-primer/translations/chapter.xml | 2 +-
.../fdp-primer/writing-style/chapter.xml | 2 +-
de_DE.ISO8859-1/books/handbook/Makefile | 36 +++-
.../handbook/advanced-networking/chapter.xml | 4 +-
.../books/handbook/audit/chapter.xml | 2 +-
.../books/handbook/basics/chapter.xml | 2 +-
.../books/handbook/bibliography/chapter.xml | 2 +-
.../books/handbook/boot/chapter.xml | 2 +-
.../books/handbook/bsdinstall/chapter.xml | 2 +-
de_DE.ISO8859-1/books/handbook/chapters.ent | 183 +-----------------
de_DE.ISO8859-1/books/handbook/colophon.xml | 2 +-
.../books/handbook/config/chapter.xml | 4 +-
.../books/handbook/cutting-edge/chapter.xml | 14 +-
.../books/handbook/desktop/chapter.xml | 2 +-
.../books/handbook/disks/chapter.xml | 20 +-
.../books/handbook/dtrace/chapter.xml | 2 +-
.../books/handbook/eresources/chapter.xml | 7 +-
.../books/handbook/filesystems/chapter.xml | 4 +-
.../books/handbook/firewalls/chapter.xml | 2 +-
.../books/handbook/geom/chapter.xml | 2 +-
.../books/handbook/install/chapter.xml | 2 +-
.../books/handbook/introduction/chapter.xml | 2 +-
.../books/handbook/jails/chapter.xml | 2 +-
.../books/handbook/kernelconfig/chapter.xml | 2 +-
.../books/handbook/l10n/chapter.xml | 2 +-
.../books/handbook/linuxemu/chapter.xml | 10 +-
.../books/handbook/mac/chapter.xml | 72 ++++---
.../books/handbook/mail/chapter.xml | 8 +-
.../books/handbook/mirrors/chapter.xml | 10 +-
.../books/handbook/multimedia/chapter.xml | 4 +-
.../handbook/network-servers/chapter.xml | 2 +-
.../books/handbook/pgpkeys/chapter.xml | 2 +-
.../books/handbook/ports/chapter.xml | 2 +-
.../books/handbook/ppp-and-slip/chapter.xml | 2 +-
.../books/handbook/preface/preface.xml | 2 +-
.../books/handbook/printing/chapter.xml | 2 +-
.../books/handbook/security/chapter.xml | 4 +-
.../books/handbook/serialcomms/chapter.xml | 2 +-
.../books/handbook/users/chapter.xml | 2 +-
.../books/handbook/vinum/chapter.xml | 2 +-
.../books/handbook/virtualization/chapter.xml | 2 +-
.../books/handbook/x11/chapter.xml | 4 +-
.../books/porters-handbook/book.xml | 6 +-
de_DE.ISO8859-1/share/xml/mirrors-local.xsl | 1 -
67 files changed, 174 insertions(+), 347 deletions(-)
diff --git a/de_DE.ISO8859-1/books/developers-handbook/introduction/chapter.xml b/de_DE.ISO8859-1/books/developers-handbook/introduction/chapter.xml
index dd7ef91614..44ccf7d1c4 100644
--- a/de_DE.ISO8859-1/books/developers-handbook/introduction/chapter.xml
+++ b/de_DE.ISO8859-1/books/developers-handbook/introduction/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD German Documentation Project
@@ -116,7 +116,7 @@
</listitem>
</itemizedlist>
- <para>Aus Scheifler & Gettys: "X Window System"</para>
+ <para>Aus Scheifler & Gettys: "X Window System"</para>
</sect1>
<sect1 id="introduction-layout">
diff --git a/de_DE.ISO8859-1/books/developers-handbook/ipv6/chapter.xml b/de_DE.ISO8859-1/books/developers-handbook/ipv6/chapter.xml
index d6fc6e55a1..b24a67e27a 100644
--- a/de_DE.ISO8859-1/books/developers-handbook/ipv6/chapter.xml
+++ b/de_DE.ISO8859-1/books/developers-handbook/ipv6/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD German Documentation Project
diff --git a/de_DE.ISO8859-1/books/developers-handbook/kernelbuild/chapter.xml b/de_DE.ISO8859-1/books/developers-handbook/kernelbuild/chapter.xml
index 1aef995166..a6af8072e1 100644
--- a/de_DE.ISO8859-1/books/developers-handbook/kernelbuild/chapter.xml
+++ b/de_DE.ISO8859-1/books/developers-handbook/kernelbuild/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD German Documentation Project
diff --git a/de_DE.ISO8859-1/books/developers-handbook/kerneldebug/chapter.xml b/de_DE.ISO8859-1/books/developers-handbook/kerneldebug/chapter.xml
index 4202d00db7..d74d1b70aa 100644
--- a/de_DE.ISO8859-1/books/developers-handbook/kerneldebug/chapter.xml
+++ b/de_DE.ISO8859-1/books/developers-handbook/kerneldebug/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD German Documentation Project
diff --git a/de_DE.ISO8859-1/books/developers-handbook/l10n/chapter.xml b/de_DE.ISO8859-1/books/developers-handbook/l10n/chapter.xml
index 4974cee9ff..4cbb98738f 100644
--- a/de_DE.ISO8859-1/books/developers-handbook/l10n/chapter.xml
+++ b/de_DE.ISO8859-1/books/developers-handbook/l10n/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD German Documentation Project
diff --git a/de_DE.ISO8859-1/books/developers-handbook/policies/chapter.xml b/de_DE.ISO8859-1/books/developers-handbook/policies/chapter.xml
index 07abb8ee37..cb736efd1d 100644
--- a/de_DE.ISO8859-1/books/developers-handbook/policies/chapter.xml
+++ b/de_DE.ISO8859-1/books/developers-handbook/policies/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD German Documentation Project
diff --git a/de_DE.ISO8859-1/books/developers-handbook/secure/chapter.xml b/de_DE.ISO8859-1/books/developers-handbook/secure/chapter.xml
index 1d2db0a404..b136a71534 100644
--- a/de_DE.ISO8859-1/books/developers-handbook/secure/chapter.xml
+++ b/de_DE.ISO8859-1/books/developers-handbook/secure/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD German Documentation Project
diff --git a/de_DE.ISO8859-1/books/developers-handbook/sockets/chapter.xml b/de_DE.ISO8859-1/books/developers-handbook/sockets/chapter.xml
index 86f9d1e35d..689f3477bf 100644
--- a/de_DE.ISO8859-1/books/developers-handbook/sockets/chapter.xml
+++ b/de_DE.ISO8859-1/books/developers-handbook/sockets/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD German Documentation Project
diff --git a/de_DE.ISO8859-1/books/developers-handbook/testing/chapter.xml b/de_DE.ISO8859-1/books/developers-handbook/testing/chapter.xml
index 22984d8345..30fde27ed4 100644
--- a/de_DE.ISO8859-1/books/developers-handbook/testing/chapter.xml
+++ b/de_DE.ISO8859-1/books/developers-handbook/testing/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD German Documentation Project
diff --git a/de_DE.ISO8859-1/books/developers-handbook/tools/chapter.xml b/de_DE.ISO8859-1/books/developers-handbook/tools/chapter.xml
index f70bf8d3c0..cf76487e17 100644
--- a/de_DE.ISO8859-1/books/developers-handbook/tools/chapter.xml
+++ b/de_DE.ISO8859-1/books/developers-handbook/tools/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD German Documentation Project
diff --git a/de_DE.ISO8859-1/books/developers-handbook/x86/chapter.xml b/de_DE.ISO8859-1/books/developers-handbook/x86/chapter.xml
index ec6f4b3391..f9c2256efd 100644
--- a/de_DE.ISO8859-1/books/developers-handbook/x86/chapter.xml
+++ b/de_DE.ISO8859-1/books/developers-handbook/x86/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD German Documentation Project
diff --git a/de_DE.ISO8859-1/books/faq/book.xml b/de_DE.ISO8859-1/books/faq/book.xml
index e5fa268010..0e02a8f59b 100644
--- a/de_DE.ISO8859-1/books/faq/book.xml
+++ b/de_DE.ISO8859-1/books/faq/book.xml
@@ -6520,7 +6520,7 @@ perm /dev/acd0 0660</programlisting>
die Zeile dort.</para>
<para>Wenn Sie zum Beispiel den mitgelieferten DNS-Server
- &man.named.8 aktivieren wollen, m�ssen Sie lediglich
+ &man.named.8; aktivieren wollen, m�ssen Sie lediglich
das folgende Kommando eingeben:</para>
<screen>&prompt.root; <userinput>echo 'named_enable="YES"' >> /etc/rc.conf</userinput></screen>
@@ -10551,9 +10551,9 @@ ATDT1234567
genannten Befehl:</para>
<programlisting>
-sio0: <16550A-compatible COM port> port 0x3f8-0x3ff irq 4 flags 0x10 on acpi0
+sio0: <16550A-compatible COM port> port 0x3f8-0x3ff irq 4 flags 0x10 on acpi0
sio0: type 16550A
-sio1: <16550A-compatible COM port> port 0x2f8-0x2ff irq 3 on acpi0
+sio1: <16550A-compatible COM port> port 0x2f8-0x2ff irq 3 on acpi0
sio1: type 16550A</programlisting>
<para>Es zeigt zwei serielle Schnittstellen. Die erste
diff --git a/de_DE.ISO8859-1/books/fdp-primer/doc-build/chapter.xml b/de_DE.ISO8859-1/books/fdp-primer/doc-build/chapter.xml
index b2beceeb2d..0f59db4f4f 100644
--- a/de_DE.ISO8859-1/books/fdp-primer/doc-build/chapter.xml
+++ b/de_DE.ISO8859-1/books/fdp-primer/doc-build/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Copyright (c) 1999 Neil Blakey-Milner, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/de_DE.ISO8859-1/books/fdp-primer/examples/appendix.xml b/de_DE.ISO8859-1/books/fdp-primer/examples/appendix.xml
index fe1ed0d5a9..958bdb08f5 100644
--- a/de_DE.ISO8859-1/books/fdp-primer/examples/appendix.xml
+++ b/de_DE.ISO8859-1/books/fdp-primer/examples/appendix.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Copyright (c) 2000 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/de_DE.ISO8859-1/books/fdp-primer/overview/chapter.xml b/de_DE.ISO8859-1/books/fdp-primer/overview/chapter.xml
index c15db733fb..f19ff6aa9f 100644
--- a/de_DE.ISO8859-1/books/fdp-primer/overview/chapter.xml
+++ b/de_DE.ISO8859-1/books/fdp-primer/overview/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/de_DE.ISO8859-1/books/fdp-primer/psgml-mode/chapter.xml b/de_DE.ISO8859-1/books/fdp-primer/psgml-mode/chapter.xml
index 8a23ee71c3..8170263207 100644
--- a/de_DE.ISO8859-1/books/fdp-primer/psgml-mode/chapter.xml
+++ b/de_DE.ISO8859-1/books/fdp-primer/psgml-mode/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/de_DE.ISO8859-1/books/fdp-primer/see-also/chapter.xml b/de_DE.ISO8859-1/books/fdp-primer/see-also/chapter.xml
index 0102cc2b88..cf7bd22aa9 100644
--- a/de_DE.ISO8859-1/books/fdp-primer/see-also/chapter.xml
+++ b/de_DE.ISO8859-1/books/fdp-primer/see-also/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/de_DE.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml b/de_DE.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml
index b0d679b62f..b5237ecd27 100644
--- a/de_DE.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml
+++ b/de_DE.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/de_DE.ISO8859-1/books/fdp-primer/sgml-primer/chapter.xml b/de_DE.ISO8859-1/books/fdp-primer/sgml-primer/chapter.xml
index eb55ee8886..b46813fd41 100644
--- a/de_DE.ISO8859-1/books/fdp-primer/sgml-primer/chapter.xml
+++ b/de_DE.ISO8859-1/books/fdp-primer/sgml-primer/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
@@ -1070,28 +1070,6 @@ onsgmls:beispiel.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
-- mehrzeilige Kommentare. -->]]></programlisting>
</example>
- <!--? Noch zu uebersetzen. Oliver Fischer -->
- <![%output.print;[
- <important>
- <title>Es sind zwei Bindestriche</title>
-
- <para>Es gibt ein Problem mit den PostScript- oder
- PDF-Versionen dieses Dokuments. Das obige Beispiel
- zeigt vielleicht nur einen Bindestrich (<literal>-</literal>)
- hinter <literal><!</literal> und vor
- <literal>></literal>.</para>
-
- <para>Es <emphasis>m�ssen</emphasis> zwei Bindestriche
- und <emphasis>nicht</emphasis> nur einer benutzt werden.
- Die PostScript- und PDF-Versionen haben vielleicht
- beide Bindestriche zu einem l�ngeren Strich, dem
- <emphasis>em-dash</emphasis>, zusammengefasst.</para>
-
- <para>Die HTML-, nur-Text und RTF-Versionen dieses Dokuments
- sind nicht von diesem Problem betroffen.</para>
- </important>
- ]]>
-
<para>Hat man fr�her schon Erfahrungen mit HTML gesammelt,
wird man vielleicht andere Regeln f�r den Gebrauch von
Kommentaren kennengelernt haben. Beispielsweise wird oft
diff --git a/de_DE.ISO8859-1/books/fdp-primer/structure/chapter.xml b/de_DE.ISO8859-1/books/fdp-primer/structure/chapter.xml
index 0883d4184a..39c7607cf4 100644
--- a/de_DE.ISO8859-1/books/fdp-primer/structure/chapter.xml
+++ b/de_DE.ISO8859-1/books/fdp-primer/structure/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
@@ -255,7 +255,7 @@
<para>Enth�lt eine Kapiteldatei beispielsweise die
Eintr�ge</para>
- <programlisting><![ CDATA [
+ <programlisting><![CDATA[
<chapter id="kernelconfig">
...
</chapter>]]></programlisting>
diff --git a/de_DE.ISO8859-1/books/fdp-primer/stylesheets/chapter.xml b/de_DE.ISO8859-1/books/fdp-primer/stylesheets/chapter.xml
index 7ca7f746db..c578236df5 100644
--- a/de_DE.ISO8859-1/books/fdp-primer/stylesheets/chapter.xml
+++ b/de_DE.ISO8859-1/books/fdp-primer/stylesheets/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/de_DE.ISO8859-1/books/fdp-primer/the-website/chapter.xml b/de_DE.ISO8859-1/books/fdp-primer/the-website/chapter.xml
index ee9914899f..76f757a07f 100644
--- a/de_DE.ISO8859-1/books/fdp-primer/the-website/chapter.xml
+++ b/de_DE.ISO8859-1/books/fdp-primer/the-website/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/de_DE.ISO8859-1/books/fdp-primer/tools/chapter.xml b/de_DE.ISO8859-1/books/fdp-primer/tools/chapter.xml
index de12b43396..bcdcbd7d7e 100644
--- a/de_DE.ISO8859-1/books/fdp-primer/tools/chapter.xml
+++ b/de_DE.ISO8859-1/books/fdp-primer/tools/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/de_DE.ISO8859-1/books/fdp-primer/translations/chapter.xml b/de_DE.ISO8859-1/books/fdp-primer/translations/chapter.xml
index 17124f9772..ed36ca7129 100644
--- a/de_DE.ISO8859-1/books/fdp-primer/translations/chapter.xml
+++ b/de_DE.ISO8859-1/books/fdp-primer/translations/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Copyright (c) 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/de_DE.ISO8859-1/books/fdp-primer/writing-style/chapter.xml b/de_DE.ISO8859-1/books/fdp-primer/writing-style/chapter.xml
index 0ce0f90354..7739ae90bd 100644
--- a/de_DE.ISO8859-1/books/fdp-primer/writing-style/chapter.xml
+++ b/de_DE.ISO8859-1/books/fdp-primer/writing-style/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Copyright (c) 1998 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/de_DE.ISO8859-1/books/handbook/Makefile b/de_DE.ISO8859-1/books/handbook/Makefile
index da7fdbe8f5..1f459ed8e2 100644
--- a/de_DE.ISO8859-1/books/handbook/Makefile
+++ b/de_DE.ISO8859-1/books/handbook/Makefile
@@ -287,29 +287,55 @@ DOC_PREFIX?= ${.CURDIR}/../../..
#
# rules generating lists of mirror site from XML database.
#
-XMLDOCS= mirrors-ftp:::mirrors.xml.ftp.inc \
+XMLDOCS= lastmod:::mirrors.lastmod.inc \
+ mirrors-ftp-index:::mirrors.xml.ftp.index.inc \
+ mirrors-ftp:::mirrors.xml.ftp.inc \
+ mirrors-cvsup-index:::mirrors.xml.cvsup.index.inc \
mirrors-cvsup:::mirrors.xml.cvsup.inc \
+ eresources-index:::eresources.xml.www.index.inc \
eresources:::eresources.xml.www.inc
DEPENDSET.DEFAULT= transtable mirror
XSLT.DEFAULT= ${XSL_MIRRORS}
XML.DEFAULT= ${XML_MIRRORS}
NO_TIDY.DEFAULT= yes
+PARAMS.lastmod+= --param 'target' "'lastmod'"
+PARAMS.mirrors-ftp-index+= --param 'type' "'ftp'" \
+ --param 'proto' "'ftp'" \
+ --param 'target' "'index'"
PARAMS.mirrors-ftp+= --param 'type' "'ftp'" \
--param 'proto' "'ftp'" \
--param 'target' "'handbook/mirrors/chapter.xml'"
+PARAMS.mirrors-cvsup-index+= --param 'type' "'cvsup'" \
+ --param 'proto' "'cvsup'" \
+ --param 'target' "'index'"
PARAMS.mirrors-cvsup+= --param 'type' "'cvsup'" \
--param 'proto' "'cvsup'" \
--param 'target' "'handbook/mirrors/chapter.xml'"
+PARAMS.eresources-index+= --param 'type' "'www'" \
+ --param 'proto' "'http'" \
+ --param 'target' "'index'"
PARAMS.eresources+= --param 'type' "'www'" \
--param 'proto' "'http'" \
--param 'target' "'handbook/eresources/chapter.xml'"
-SRCS+= mirrors.xml.ftp.inc \
+SRCS+= mirrors.lastmod.inc \
+ mirrors.xml.ftp.inc \
+ mirrors.xml.ftp.index.inc \
mirrors.xml.cvsup.inc \
- eresources.xml.www.inc
-CLEANFILES+= mirrors.xml.ftp.inc \
+ mirrors.xml.cvsup.index.inc \
+ eresources.xml.www.inc \
+ eresources.xml.www.index.inc
+CLEANFILES+= mirrors.lastmod.inc \
+ mirrors.xml.ftp.inc \
+ mirrors.xml.ftp.index.inc \
mirrors.xml.cvsup.inc \
- eresources.xml.www.inc
+ mirrors.xml.cvsup.index.inc \
+ eresources.xml.www.inc \
+ eresources.xml.www.index.inc
+
+lint: mirrors.lastmod.inc mirrors.xml.ftp.inc mirrors.xml.ftp.index.inc \
+ mirrors.xml.cvsup.inc mirrors.xml.cvsup.index.inc \
+ eresources.xml.www.inc eresources.xml.www.index.inc
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/de_DE.ISO8859-1/books/handbook/advanced-networking/chapter.xml b/de_DE.ISO8859-1/books/handbook/advanced-networking/chapter.xml
index a673e9f97b..95c92266d1 100644
--- a/de_DE.ISO8859-1/books/handbook/advanced-networking/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/advanced-networking/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD German Documentation Project
@@ -6636,7 +6636,7 @@ ifconfig_carp1="vhid 2 advskew 100 pass testpass 192.168.1.51/24"</programlistin
<hostid>provider.example.org</hostid> den folgenden
Befehl ein:</para>
- <screen>&prompt.root; <userinput>ifconfig carp0 down && ifconfig carp0 up</userinput></screen>
+ <screen>&prompt.root; <userinput>ifconfig carp0 down && ifconfig carp0 up</userinput></screen>
<para>Dieser Befehl muss auf das
<devicename>carp</devicename>-Ger�t ausgef�hrt
diff --git a/de_DE.ISO8859-1/books/handbook/audit/chapter.xml b/de_DE.ISO8859-1/books/handbook/audit/chapter.xml
index b5aac5a9e5..e0512ed6da 100644
--- a/de_DE.ISO8859-1/books/handbook/audit/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/audit/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD German Documentation Project
diff --git a/de_DE.ISO8859-1/books/handbook/basics/chapter.xml b/de_DE.ISO8859-1/books/handbook/basics/chapter.xml
index afde1bfbd5..5bca0654f8 100644
--- a/de_DE.ISO8859-1/books/handbook/basics/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/basics/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD German Documentation Project
diff --git a/de_DE.ISO8859-1/books/handbook/bibliography/chapter.xml b/de_DE.ISO8859-1/books/handbook/bibliography/chapter.xml
index aadbd720d3..bfa1d01f8c 100644
--- a/de_DE.ISO8859-1/books/handbook/bibliography/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/bibliography/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD German Documentation Project
diff --git a/de_DE.ISO8859-1/books/handbook/boot/chapter.xml b/de_DE.ISO8859-1/books/handbook/boot/chapter.xml
index a6bb602c7b..91931165cd 100644
--- a/de_DE.ISO8859-1/books/handbook/boot/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/boot/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD German Documentation Project
diff --git a/de_DE.ISO8859-1/books/handbook/bsdinstall/chapter.xml b/de_DE.ISO8859-1/books/handbook/bsdinstall/chapter.xml
index 652296a845..b6f0d268bc 100644
--- a/de_DE.ISO8859-1/books/handbook/bsdinstall/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/bsdinstall/chapter.xml
@@ -154,7 +154,7 @@
<para>Es gibt zwei Klassen von Prozessoren, die in der Lage sind,
auf &os;/&arch.amd64; zu laufen. Die erste Klasse sind
AMD64-Prozessoren, was sowohl &amd.athlon;64,
- &amd.athlon;64-FX, &amd.opteron oder bessere Prozessoren
+ &amd.athlon;64-FX, &amd.opteron; oder bessere Prozessoren
beinhaltet.</para>
<para>Die zweite Klasse von Prozessoren, die &os;/&arch.amd64;
diff --git a/de_DE.ISO8859-1/books/handbook/chapters.ent b/de_DE.ISO8859-1/books/handbook/chapters.ent
index b9a3d52402..f8bb7e300f 100644
--- a/de_DE.ISO8859-1/books/handbook/chapters.ent
+++ b/de_DE.ISO8859-1/books/handbook/chapters.ent
@@ -15,234 +15,63 @@
<!ENTITY % not.published "INCLUDE">
-<!ENTITY % chap.introduction "IGNORE">
-<!ENTITY % chap.install "IGNORE">
-<!ENTITY % chap.bsdinstall "IGNORE">
-<!ENTITY % chap.basics "IGNORE">
-<!ENTITY % chap.ports "IGNORE">
-<!ENTITY % chap.config "IGNORE">
-<!ENTITY % chap.boot "IGNORE">
-<!ENTITY % chap.users "IGNORE">
-<!ENTITY % chap.kernelconfig "IGNORE">
-<!ENTITY % chap.security "IGNORE">
-<!ENTITY % chap.jails "IGNORE">
-<!ENTITY % chap.mac "IGNORE">
-<!ENTITY % chap.audit "IGNORE">
-<!ENTITY % chap.printing "IGNORE">
-<!ENTITY % chap.disks "IGNORE">
-<!ENTITY % chap.geom "IGNORE">
-<!ENTITY % chap.vinum "IGNORE">
-<!ENTITY % chap.x11 "IGNORE">
-<!ENTITY % chap.l10n "IGNORE">
-<!ENTITY % chap.multimedia "IGNORE">
-<!ENTITY % chap.desktop "IGNORE">
-<!ENTITY % chap.serialcomms "IGNORE">
-<!ENTITY % chap.ppp-and-slip "IGNORE">
-<!ENTITY % chap.network-servers "IGNORE">
-<!ENTITY % chap.firewalls "IGNORE">
-<!ENTITY % chap.advanced-networking "IGNORE">
-<!ENTITY % chap.mail "IGNORE">
-<!ENTITY % chap.cutting-edge "IGNORE">
-<!ENTITY % chap.linuxemu "IGNORE">
-<!ENTITY % chap.mirrors "IGNORE">
-<!ENTITY % chap.mirrors.ftp.inc "INCLUDE">
-<!ENTITY % chap.mirrors.cvsup.inc "INCLUDE">
-<!ENTITY % chap.bibliography "IGNORE">
-<!ENTITY % chap.eresources "IGNORE">
-<!ENTITY % chap.eresources.www.inc "INCLUDE">
-<!ENTITY % chap.pgpkeys "IGNORE">
-<!ENTITY % chap.index "IGNORE">
-<!ENTITY % chap.freebsd-glossary "IGNORE">
-<!ENTITY % chap.filesystems "IGNORE">
-<!ENTITY % chap.dtrace "IGNORE">
-<!ENTITY % chap.colophon "IGNORE">
-
<!ENTITY chap.preface SYSTEM "preface/preface.xml">
<!ENTITY % pgpkeys SYSTEM "../../../share/pgpkeys/pgpkeys.ent"> %pgpkeys;
<!-- Teil Eins -->
-<![%chap.introduction;[
<!ENTITY chap.introduction SYSTEM "introduction/chapter.xml">
-]]>
-<![%chap.install;[
<!ENTITY chap.install SYSTEM "install/chapter.xml">
-]]>
-<![%chap.bsdinstall;[
<!ENTITY chap.bsdinstall SYSTEM "bsdinstall/chapter.xml">
-]]>
-<![%chap.basics;[
<!ENTITY chap.basics SYSTEM "basics/chapter.xml">
-]]>
-<![%chap.ports;[
<!ENTITY chap.ports SYSTEM "ports/chapter.xml">
-]]>
-<![%chap.x11;[
<!ENTITY chap.x11 SYSTEM "x11/chapter.xml">
-]]>
<!-- Teil Zwei -->
-<![%chap.desktop;[
<!ENTITY chap.desktop SYSTEM "desktop/chapter.xml">
-]]>
-<![%chap.multimedia;[
<!ENTITY chap.multimedia SYSTEM "multimedia/chapter.xml">
-]]>
-<![%chap.kernelconfig;[
<!ENTITY chap.kernelconfig SYSTEM "kernelconfig/chapter.xml">
-]]>
-<![%chap.printing;[
<!ENTITY chap.printing SYSTEM "printing/chapter.xml">
-]]>
-<![%chap.linuxemu;[
<!ENTITY chap.linuxemu SYSTEM "linuxemu/chapter.xml">
-]]>
<!-- Teil Drei -->
-<![%chap.config;[
<!ENTITY chap.config SYSTEM "config/chapter.xml">
-]]>
-<![%chap.boot;[
<!ENTITY chap.boot SYSTEM "boot/chapter.xml">
-]]>
-<![%chap.users;[
<!ENTITY chap.users SYSTEM "users/chapter.xml">
-]]>
-<![%chap.security;[
<!ENTITY chap.security SYSTEM "security/chapter.xml">
-]]>
-<![%chap.jails;[
<!ENTITY chap.jails SYSTEM "jails/chapter.xml">
-]]>
-<![%chap.mac;[
<!ENTITY chap.mac SYSTEM "mac/chapter.xml">
-]]>
-<![%chap.audit;[
<!ENTITY chap.audit SYSTEM "audit/chapter.xml">
-]]>
-<![%chap.disks;[
<!ENTITY chap.disks SYSTEM "disks/chapter.xml">
-]]>
-<![%chap.geom;[
<!ENTITY chap.geom SYSTEM "geom/chapter.xml">
-]]>
-<![%chap.filesystems;[
<!ENTITY chap.filesystems SYSTEM "filesystems/chapter.xml">
-]]>
-<![%chap.vinum;[
<!ENTITY chap.vinum SYSTEM "vinum/chapter.xml">
-]]>
-<![%chap.virtualization;[
<!ENTITY chap.virtualization SYSTEM "virtualization/chapter.xml">
-]]>
-<![%chap.l10n;[
<!ENTITY chap.l10n SYSTEM "l10n/chapter.xml">
-]]>
-<![%chap.cutting-edge;[
<!ENTITY chap.cutting-edge SYSTEM "cutting-edge/chapter.xml">
-]]>
-<![%chap.dtrace;[
<!ENTITY chap.dtrace SYSTEM "dtrace/chapter.xml">
-]]>
<!-- Teil Vier -->
-<![%chap.serialcomms;[
<!ENTITY chap.serialcomms SYSTEM "serialcomms/chapter.xml">
-]]>
-<![%chap.ppp-and-slip;[
<!ENTITY chap.ppp-and-slip SYSTEM "ppp-and-slip/chapter.xml">
-]]>
-<![%chap.mail;[
<!ENTITY chap.mail SYSTEM "mail/chapter.xml">
-]]>
-<![%chap.network-servers;[
<!ENTITY chap.network-servers SYSTEM "network-servers/chapter.xml">
-]]>
-<![%chap.firewalls;[
<!ENTITY chap.firewalls SYSTEM "firewalls/chapter.xml">
-]]>
-<![%chap.advanced-networking;[
<!ENTITY chap.advanced-networking SYSTEM "advanced-networking/chapter.xml">
-]]>
<!-- Teil Fuenf (Anhang) -->
-<![%chap.mirrors;[
<!ENTITY chap.mirrors SYSTEM "mirrors/chapter.xml">
-]]>
-<![%chap.mirrors.ftp.inc;[
<!ENTITY chap.mirrors.ftp.inc SYSTEM "mirrors.xml.ftp.inc">
-]]>
-<![%chap.mirrors.cvsup.inc;[
<!ENTITY chap.mirrors.cvsup.inc SYSTEM "mirrors.xml.cvsup.inc">
-]]>
-<![%chap.bibliography;[
<!ENTITY chap.bibliography SYSTEM "bibliography/chapter.xml">
-]]>
-<![%chap.eresources;[
<!ENTITY chap.eresources SYSTEM "eresources/chapter.xml">
-]]>
-<![%chap.eresources.www.inc;[
<!ENTITY chap.eresources.www.inc SYSTEM "eresources.xml.www.inc">
-]]>
-<![%chap.pgpkeys;[
<!ENTITY chap.pgpkeys SYSTEM "pgpkeys/chapter.xml">
-]]>
-<![%chap.freebsd-glossary;[
<!ENTITY chap.freebsd-glossary "&freebsd-glossary;">
-]]>
-<![%chap.index;[
- <!ENTITY chap.index SYSTEM "index.xml">
-]]>
+ <!ENTITY chap.index "">
+
+<!ENTITY chap.mirrors.lastmod.inc SYSTEM "mirrors.lastmod.inc">
+<!ENTITY chap.mirrors.ftp.index.inc SYSTEM "mirrors.xml.ftp.index.inc">
+<!ENTITY chap.mirrors.cvsup.index.inc SYSTEM "mirrors.xml.cvsup.index.inc">
+<!ENTITY chap.eresources.www.index.inc SYSTEM "eresources.xml.www.index.inc">
<!ENTITY chap.colophon SYSTEM "colophon.xml">
-
-<!-- IGNORE cases -->
-
-<!-- Teil Eins -->
-<!ENTITY chap.introduction "">
-<!ENTITY chap.install "">
-<!ENTITY chap.basics "">
-<!ENTITY chap.ports "">
-<!ENTITY chap.x11 "">
-
-<!-- Teil Zwei -->
-<!ENTITY chap.desktop "">
-<!ENTITY chap.multimedia "">
-<!ENTITY chap.kernelconfig "">
-<!ENTITY chap.printing "">
-<!ENTITY chap.linuxemu "">
-
-<!-- Teil Drei -->
-<!ENTITY chap.config "">
-<!ENTITY chap.boot "">
-<!ENTITY chap.users "">
-<!ENTITY chap.security "">
-<!ENTITY chap.jails "">
-<!ENTITY chap.mac "">
-<!ENTITY chap.audit "">
-<!ENTITY chap.disks "">
-<!ENTITY chap.geom "">
-<!ENTITY chap.filesystems "">
-<!ENTITY chap.vinum "">
-<!ENTITY chap.virtualization "">
-<!ENTITY chap.l10n "">
-<!ENTITY chap.cutting-edge "">
-<!ENTITY chap.dtrace "">
-
-<!-- Teil Vier -->
-<!ENTITY chap.serialcomms "">
-<!ENTITY chap.ppp-and-slip "">
-<!ENTITY chap.mail "">
-<!ENTITY chap.network-servers "">
-<!ENTITY chap.firewalls "">
-<!ENTITY chap.advanced-networking "">
-
-<!-- Teil Fuenf (Anhang) -->
-<!ENTITY chap.mirrors "">
-<!ENTITY chap.mirrors.ftp.inc "">
-<!ENTITY chap.mirrors.cvsup.inc "">
-<!ENTITY chap.bibliography "">
-<!ENTITY chap.eresources "">
-<!ENTITY chap.eresources.www.inc "">
-<!ENTITY chap.pgpkeys "">
-<!ENTITY chap.freebsd-glossary "">
-<!ENTITY chap.index "">
diff --git a/de_DE.ISO8859-1/books/handbook/colophon.xml b/de_DE.ISO8859-1/books/handbook/colophon.xml
index be6a7ac978..9f3a254fdd 100644
--- a/de_DE.ISO8859-1/books/handbook/colophon.xml
+++ b/de_DE.ISO8859-1/books/handbook/colophon.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/de_DE.ISO8859-1/books/handbook/config/chapter.xml b/de_DE.ISO8859-1/books/handbook/config/chapter.xml
index 8d32c66931..db5f293476 100644
--- a/de_DE.ISO8859-1/books/handbook/config/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/config/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD German Documentation Project
@@ -829,7 +829,7 @@ sshd is running as pid 433.</screen>
Manualpages zu &man.rc.8; sowie &man.rc.subr.8;. Wenn Sie
Ihre eigenen <filename>rc.d</filename>-Skripte schreiben
wollen, sollten Sie den Artikel
- <ulink url="&url.articles.rc-scripting.en">Practical rc.d
+ <ulink url="&url.articles.rc-scripting.en;">Practical rc.d
scripting in BSD</ulink> lesen.</para>
</sect1>
diff --git a/de_DE.ISO8859-1/books/handbook/cutting-edge/chapter.xml b/de_DE.ISO8859-1/books/handbook/cutting-edge/chapter.xml
index d94d98139f..bbf3918646 100644
--- a/de_DE.ISO8859-1/books/handbook/cutting-edge/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/cutting-edge/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD German Documentation Project
@@ -1158,7 +1158,7 @@ DOCSUPFILE?= /usr/share/examples/cvsup/doc-supfile</programlisting>
<listitem>
<para>Schliesslich gibt es noch einen sogenannten <quote>slave
- port</quote> f&¨r jede �bersetzung, z.B.: <filename
+ port</quote> f�r jede �bersetzung, z.B.: <filename
role="package">misc/freebsd-doc-hu</filename> f�r
Dokumentation in ungarischer Sprache. All diese ben�tigen
den Master-Port und installieren die �bersetzte
@@ -1300,8 +1300,8 @@ DOCSUPFILE?= /usr/share/examples/cvsup/doc-supfile</programlisting>
</sect3>
</sect2>
-<!-- FIXME: Waiting for a working docsnap server... -->
-<![ IGNORE [
+<!-- FIXME: Waiting for a working docsnap server...
+
<sect2 id="docsnap">
<sect2info>
<authorgroup>
@@ -1358,14 +1358,14 @@ DOCSUPFILE?= /usr/share/examples/cvsup/doc-supfile</programlisting>
above.</para>
</note>
- <para>Do not use the <option>--delete</option> flag here as there
+ <para>Do not use the <option>‐‐delete</option> flag here as there
are some items installed
into <filename class="directory">/usr/share/doc</filename>
during <command>make installworld</command>, which would
accidentally be removed. To clean up, use this command
instead:</para>
- <screen>&prompt.root; <userinput>rsync -rltvz --delete <replaceable>docsnap.sk.FreeBSD.org</replaceable>::docsnap/??_??\.\* <replaceable>/usr/share/doc</replaceable></userinput></screen>
+ <screen>&prompt.root; <userinput>rsync -rltvz ‐‐delete <replaceable>docsnap.sk.FreeBSD.org</replaceable>::docsnap/??_??\.\* <replaceable>/usr/share/doc</replaceable></userinput></screen>
<para>If a subset of documentation needs to be updated, for
example, the English documentation only, the following command
@@ -1373,7 +1373,7 @@ DOCSUPFILE?= /usr/share/examples/cvsup/doc-supfile</programlisting>
<screen>&prompt.root; <userinput>rsync -rltvz <replaceable>docsnap.sk.FreeBSD.org</replaceable>::docsnap/en_US.ISO8859-1 <replaceable>/usr/share/doc</replaceable></userinput></screen>
</sect2>
-]]>
+-->
</sect1>
<sect1 id="current-stable">
diff --git a/de_DE.ISO8859-1/books/handbook/desktop/chapter.xml b/de_DE.ISO8859-1/books/handbook/desktop/chapter.xml
index 8d09183488..96015c2912 100644
--- a/de_DE.ISO8859-1/books/handbook/desktop/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/desktop/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD German Documentation Project
diff --git a/de_DE.ISO8859-1/books/handbook/disks/chapter.xml b/de_DE.ISO8859-1/books/handbook/disks/chapter.xml
index af06f36a2d..eadbfe69ee 100644
--- a/de_DE.ISO8859-1/books/handbook/disks/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/disks/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD German Documentation Project
@@ -3112,18 +3112,6 @@ cd0: Attempt to query device size failed: NOT READY, Medium not present - tray c
dranh�ngen, kann Ihnen sp�ter ein weiteres Missgeschick
ersparen.</para>
</sect3>
-
-<![%not.published;[
-
- <sect3>
- <title>* Ich habe mich nicht auf Missgeschicke vorbereitet - was
- nun?</title>
-
- <para></para>
- </sect3>
-
-]]>
-
</sect2>
</sect1>
@@ -5014,7 +5002,7 @@ case "$1" in
# Wait for any "hastd secondary" processes to stop
for disk in ${resources}; do
- while $( pgrep -lf "hastd: ${disk} \(secondary\)" > /dev/null 2>&1 ); do
+ while $( pgrep -lf "hastd: ${disk} \(secondary\)" > /dev/null 2>&1 ); do
sleep 1
done
@@ -5029,7 +5017,7 @@ case "$1" in
# Wait for the /dev/hast/* devices to appear
for disk in ${resources}; do
for I in $( jot 60 ); do
- [ -c "/dev/hast/${disk}" ] && break
+ [ -c "/dev/hast/${disk}" ] && break
sleep 0.5
done
@@ -5062,7 +5050,7 @@ case "$1" in
umount -f /hast/${disk}
fi
sleep $delay
- hastctl role secondary ${disk} 2>&1
+ hastctl role secondary ${disk} 2>&1
if [ $? -ne 0 ]; then
logger -p $log -t $name "Unable to switch role to secondary for resource ${disk}."
exit 1
diff --git a/de_DE.ISO8859-1/books/handbook/dtrace/chapter.xml b/de_DE.ISO8859-1/books/handbook/dtrace/chapter.xml
index e7f3807937..23d06a80a2 100644
--- a/de_DE.ISO8859-1/books/handbook/dtrace/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/dtrace/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
Recently I suggested to myself that this should become a profiling
and debugging chapter, which covers things like ktrace(1) and
diff --git a/de_DE.ISO8859-1/books/handbook/eresources/chapter.xml b/de_DE.ISO8859-1/books/handbook/eresources/chapter.xml
index 4e8b4fc0be..189e45e3e9 100644
--- a/de_DE.ISO8859-1/books/handbook/eresources/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/eresources/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD German Documentation Project
@@ -2151,6 +2151,11 @@
<sect2 id="eresources-web-mirrors">
<title>Official Mirrors</title>
+
+ &chap.eresources.www.index.inc;
+
+ &chap.mirrors.lastmod.inc;
+
&chap.eresources.www.inc;
</sect2>
</sect1>
diff --git a/de_DE.ISO8859-1/books/handbook/filesystems/chapter.xml b/de_DE.ISO8859-1/books/handbook/filesystems/chapter.xml
index 5dba58b61e..7f8d0156c1 100644
--- a/de_DE.ISO8859-1/books/handbook/filesystems/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/filesystems/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD German Documentation Project
@@ -244,7 +244,7 @@ example 17547136 0 17547136 0% /example</screen>
von den Benutzern aufgelistet werden, wie im folgenden Beispiel
gezeigt wird:</para>
- <screen>&prompt.root <userinput>cd /example</userinput>
+ <screen>&prompt.root; <userinput>cd /example</userinput>
&prompt.root; <userinput>ls</userinput>
&prompt.root; <userinput>touch testfile</userinput>
&prompt.root; <userinput>ls -al</userinput>
diff --git a/de_DE.ISO8859-1/books/handbook/firewalls/chapter.xml b/de_DE.ISO8859-1/books/handbook/firewalls/chapter.xml
index f77ee1b386..5a679c9224 100644
--- a/de_DE.ISO8859-1/books/handbook/firewalls/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/firewalls/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD German Documentation Project
diff --git a/de_DE.ISO8859-1/books/handbook/geom/chapter.xml b/de_DE.ISO8859-1/books/handbook/geom/chapter.xml
index ad61804881..6b80fc3b3f 100644
--- a/de_DE.ISO8859-1/books/handbook/geom/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/geom/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD German Documentation Project
diff --git a/de_DE.ISO8859-1/books/handbook/install/chapter.xml b/de_DE.ISO8859-1/books/handbook/install/chapter.xml
index 996c9b6359..d855dcfbee 100644
--- a/de_DE.ISO8859-1/books/handbook/install/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/install/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/de_DE.ISO8859-1/books/handbook/introduction/chapter.xml b/de_DE.ISO8859-1/books/handbook/introduction/chapter.xml
index 917deaae84..9c004f9636 100644
--- a/de_DE.ISO8859-1/books/handbook/introduction/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/introduction/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD German Documentation Project
diff --git a/de_DE.ISO8859-1/books/handbook/jails/chapter.xml b/de_DE.ISO8859-1/books/handbook/jails/chapter.xml
index e3790afe6d..d5c7b6b274 100644
--- a/de_DE.ISO8859-1/books/handbook/jails/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/jails/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD German Documentation Project
diff --git a/de_DE.ISO8859-1/books/handbook/kernelconfig/chapter.xml b/de_DE.ISO8859-1/books/handbook/kernelconfig/chapter.xml
index 91a804a89c..a4aaa32765 100644
--- a/de_DE.ISO8859-1/books/handbook/kernelconfig/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/kernelconfig/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD German Documentation Project
diff --git a/de_DE.ISO8859-1/books/handbook/l10n/chapter.xml b/de_DE.ISO8859-1/books/handbook/l10n/chapter.xml
index 2f786cb223..5c28fb6a3d 100644
--- a/de_DE.ISO8859-1/books/handbook/l10n/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/l10n/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD German Documentation Project
diff --git a/de_DE.ISO8859-1/books/handbook/linuxemu/chapter.xml b/de_DE.ISO8859-1/books/handbook/linuxemu/chapter.xml
index 6faf4ab1d7..a63bb0ef13 100644
--- a/de_DE.ISO8859-1/books/handbook/linuxemu/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/linuxemu/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD German Documentation Project
@@ -715,14 +715,14 @@ LOG=/var/log/lmgrd.log
case "$1" in
start)
- lmgrd -c ${LICENSE_FILE} 2>> ${LOG} 1>&2
+ lmgrd -c ${LICENSE_FILE} 2>> ${LOG} 1>&2
echo -n " lmgrd"
;;
stop)
- lmgrd -c ${LICENSE_FILE} -x lmdown 2>> ${LOG} 1>&2
+ lmgrd -c ${LICENSE_FILE} -x lmdown 2>> ${LOG} 1>&2
;;
*)
- echo "Usage: `basename $0` {start|stop}" 1>&2
+ echo "Usage: `basename $0` {start|stop}" 1>&2
exit 64
;;
esac
@@ -1025,7 +1025,7 @@ exit 0</programlisting>
nachstehendem Inhalt:</para>
<programlisting>#!/compat/linux/bin/sh
-(sleep 5; killall -1 matlab_helper) &
+(sleep 5; killall -1 matlab_helper) &
exit 0</programlisting>
</step>
diff --git a/de_DE.ISO8859-1/books/handbook/mac/chapter.xml b/de_DE.ISO8859-1/books/handbook/mac/chapter.xml
index 6fb2a6b88d..289f99fffd 100644
--- a/de_DE.ISO8859-1/books/handbook/mac/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/mac/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD German Documentation Project
@@ -758,49 +758,43 @@ test: biba/high</screen>
Biba, Lomac, <acronym>MLS</acronym> und
<acronym>SEBSD</acronym>.</para>
-<!-- ================================================================================== --
- -- ================================================================================== --
- -- ================================================================================== --
- -- Das folgende Beispiel weigere ich mich zu uebersetzen. Der Autor selbst schreibt --
- -- schreibt ja, dass es only a quick example ist. --
+<!-- Das folgende Beispiel weigere ich mich zu uebersetzen. Der Autor selbst schreibt
+ schreibt ja, dass es only a quick example ist.
- -- <para>In many cases, the <option>multilabel</ option> may not need --
- -- to be set at all. Consider the following situation and --
- -- security model:</para> --
- -- <itemizedlist> --
- -- <listitem> --
- -- <para>&os; web-server using the <acronym>MAC</acronym> --
- -- framework and a mix of the various policies.</para> --
- -- </listitem> --
+ <para>In many cases, the <option>multilabel</ option> may not need
+ to be set at all. Consider the following situation and
+ security model:</para>
+ <itemizedlist>
+ <listitem>
+ <para>&os; web-server using the <acronym>MAC</acronym>
+ framework and a mix of the various policies.</para>
+ </listitem>
- -- <listitem> --
- -- <para>This machine only requires one label, --
- -- <literal>biba/high</literal>, for everything in the system. --
- -- Here the file system would not require the --
- -- <option>multilabel</ option> option as a single label --
- -- will always be in effect.</para> --
- -- </listitem> --
+ <listitem>
+ <para>This machine only requires one label,
+ <literal>biba/high</literal>, for everything in the system.
+ Here the file system would not require the
+ <option>multilabel</ option> option as a single label
+ will always be in effect.</para>
+ </listitem>
- -- <listitem> --
- -- <para>But, this machine will be a web server and should have --
- -- the web server run at <literal>biba/low</literal> to prevent --
- -- write up capabilities. The Biba policy and how it works --
- -- will be discussed later, so if the previous comment was --
- -- difficult to interpret just continue reading and return. --
- -- The server could use a separate partition set at --
- -- <literal>biba/low</literal> for most if not all of its --
- -- runtime state. Much is lacking from this example, for --
- -- instance the restrictions on data, configuration and user --
- -- settings; however, this is just a quick example to prove the --
- -- aforementioned point.</para> --
- -- </listitem> --
- -- </itemizedlist> --
+ <listitem>
+ <para>But, this machine will be a web server and should have
+ the web server run at <literal>biba/low</literal> to prevent
+ write up capabilities. The Biba policy and how it works
+ will be discussed later, so if the previous comment was
+ difficult to interpret just continue reading and return.
+ The server could use a separate partition set at
+ <literal>biba/low</literal> for most if not all of its
+ runtime state. Much is lacking from this example, for
+ instance the restrictions on data, configuration and user
+ settings; however, this is just a quick example to prove the
+ aforementioned point.</para>
+ </listitem>
+ </itemizedlist>
- -- end of quick example --
- -- ================================================================================== --
- -- ================================================================================== --
- -- ================================================================================== -->
+ -->
<para>Wenn Richtlinien benutzt werden sollen, die ohne Labels auskommen,
wird die Option <option>multilabel</option> nicht ben�tigt. Dies
diff --git a/de_DE.ISO8859-1/books/handbook/mail/chapter.xml b/de_DE.ISO8859-1/books/handbook/mail/chapter.xml
index 5d74286666..d0f9654228 100644
--- a/de_DE.ISO8859-1/books/handbook/mail/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/mail/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD German Documentation Project
@@ -1804,11 +1804,11 @@ SENDMAIL_LDADD=-lsasl2</programlisting>
den nachstehenden Kommandos:</para>
<screen>&prompt.root; <userinput>cd /usr/src/lib/libsmutil</userinput>
-&prompt.root; <userinput>make cleandir && make obj && make</userinput>
+&prompt.root; <userinput>make cleandir && make obj && make</userinput>
&prompt.root; <userinput>cd /usr/src/lib/libsm</userinput>
-&prompt.root; <userinput>make cleandir && make obj && make</userinput>
+&prompt.root; <userinput>make cleandir && make obj && make</userinput>
&prompt.root; <userinput>cd /usr/src/usr.sbin/sendmail</userinput>
-&prompt.root; <userinput>make cleandir && make obj && make && make install</userinput></screen>
+&prompt.root; <userinput>make cleandir && make obj && make && make install</userinput></screen>
<para><application>sendmail</application> sollte sich ohne Probleme
�bersetzen lassen, wenn die Dateien in
diff --git a/de_DE.ISO8859-1/books/handbook/mirrors/chapter.xml b/de_DE.ISO8859-1/books/handbook/mirrors/chapter.xml
index 9bd6352d33..373bc85959 100644
--- a/de_DE.ISO8859-1/books/handbook/mirrors/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/mirrors/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD German Documentation Project
@@ -253,6 +253,10 @@
stehenden Zugriffsmethoden sind bei jedem Server in Klammern
angegeben.</para>
+ &chap.mirrors.ftp.index.inc;
+
+ &chap.mirrors.lastmod.inc;
+
&chap.mirrors.ftp.inc;
</sect1>
@@ -2402,6 +2406,10 @@ doc/zh_*</screen>
<para>Die folgende Aufz�hlung enth�lt
<link linkend="cvsup">CVSup</link> Server f�r &os;:</para>
+ &chap.mirrors.cvsup.index.inc;
+
+ &chap.mirrors.lastmod.inc;
+
&chap.mirrors.cvsup.inc;
</sect2>
</sect1>
diff --git a/de_DE.ISO8859-1/books/handbook/multimedia/chapter.xml b/de_DE.ISO8859-1/books/handbook/multimedia/chapter.xml
index ea7f6ef88e..49dfc1d5ca 100644
--- a/de_DE.ISO8859-1/books/handbook/multimedia/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/multimedia/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD German Documentation Project
@@ -1731,7 +1731,7 @@ bktr0: Pinnacle/Miro TV, Philips SECAM tuner.</programlisting>
<para>Richten Sie anschliessend die MythTV-Datenbank ein:</para>
- <screen>&prompt.root; <userinput>mysql -uroot -p < /usr/local/share/mythtv/database/mc.sql</userinput></screen>
+ <screen>&prompt.root; <userinput>mysql -uroot -p < /usr/local/share/mythtv/database/mc.sql</userinput></screen>
<para>Konfigurieren Sie dann das Backend:</para>
diff --git a/de_DE.ISO8859-1/books/handbook/network-servers/chapter.xml b/de_DE.ISO8859-1/books/handbook/network-servers/chapter.xml
index 27724ca3d8..720d0c939a 100644
--- a/de_DE.ISO8859-1/books/handbook/network-servers/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/network-servers/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD German Documentation Project
diff --git a/de_DE.ISO8859-1/books/handbook/pgpkeys/chapter.xml b/de_DE.ISO8859-1/books/handbook/pgpkeys/chapter.xml
index d18e5f1b30..b855de0ba0 100644
--- a/de_DE.ISO8859-1/books/handbook/pgpkeys/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/pgpkeys/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD German Documentation Project
diff --git a/de_DE.ISO8859-1/books/handbook/ports/chapter.xml b/de_DE.ISO8859-1/books/handbook/ports/chapter.xml
index 48fb4648be..25948e7238 100644
--- a/de_DE.ISO8859-1/books/handbook/ports/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/ports/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD German Documentation Project
diff --git a/de_DE.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml b/de_DE.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml
index f8683e8a70..e7fe8e8ffd 100644
--- a/de_DE.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD German Documentation Project
diff --git a/de_DE.ISO8859-1/books/handbook/preface/preface.xml b/de_DE.ISO8859-1/books/handbook/preface/preface.xml
index 55949300e9..751e9cac4a 100644
--- a/de_DE.ISO8859-1/books/handbook/preface/preface.xml
+++ b/de_DE.ISO8859-1/books/handbook/preface/preface.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD German Documentation Project
diff --git a/de_DE.ISO8859-1/books/handbook/printing/chapter.xml b/de_DE.ISO8859-1/books/handbook/printing/chapter.xml
index c4ec2b2043..bf1e7185e1 100644
--- a/de_DE.ISO8859-1/books/handbook/printing/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/printing/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD German Documentation Project
diff --git a/de_DE.ISO8859-1/books/handbook/security/chapter.xml b/de_DE.ISO8859-1/books/handbook/security/chapter.xml
index da19ec5b67..71869bb038 100644
--- a/de_DE.ISO8859-1/books/handbook/security/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/security/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD German Documentation Project
@@ -708,7 +708,7 @@
<literal>schg</literal> Flag auf kritische Startdateien,
Verzeichnisse und Scripte (z.B. alles was l�uft bis zu
dem Punkt auf dem das Securelevel gesetzt ist) zu setzen. Dies
- k�nnte etwas ü,bertrieben sein, und auch das Upgrade
+ k�nnte etwas übertrieben sein, und auch das Upgrade
des Systems ist sehr viel schwerer, wenn es auf einem hohen
Securelevel l�uft. Ein strengerer Kompromiss ist es, das
System auf einem h�heren Securelevel laufen zu lassen, aber
diff --git a/de_DE.ISO8859-1/books/handbook/serialcomms/chapter.xml b/de_DE.ISO8859-1/books/handbook/serialcomms/chapter.xml
index c78f38d11b..8c85b9a3b0 100644
--- a/de_DE.ISO8859-1/books/handbook/serialcomms/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/serialcomms/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD German Documentation Project
diff --git a/de_DE.ISO8859-1/books/handbook/users/chapter.xml b/de_DE.ISO8859-1/books/handbook/users/chapter.xml
index eda4969f05..d6f34352ed 100644
--- a/de_DE.ISO8859-1/books/handbook/users/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/users/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD German Documentation Project
diff --git a/de_DE.ISO8859-1/books/handbook/vinum/chapter.xml b/de_DE.ISO8859-1/books/handbook/vinum/chapter.xml
index 4784c0247d..3a4089f3e7 100644
--- a/de_DE.ISO8859-1/books/handbook/vinum/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/vinum/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The Vinum Volume Manager
By Greg Lehey (grog at lemis dot com)
diff --git a/de_DE.ISO8859-1/books/handbook/virtualization/chapter.xml b/de_DE.ISO8859-1/books/handbook/virtualization/chapter.xml
index 95c771c026..433fc3898c 100644
--- a/de_DE.ISO8859-1/books/handbook/virtualization/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/virtualization/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD German Documentation Project
diff --git a/de_DE.ISO8859-1/books/handbook/x11/chapter.xml b/de_DE.ISO8859-1/books/handbook/x11/chapter.xml
index 2bc9464905..60558f71df 100644
--- a/de_DE.ISO8859-1/books/handbook/x11/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/x11/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
@@ -320,7 +320,7 @@
<application>&xorg;</application> ist der von der
X.Org Foundation herausgegebene X-Server des Open-Source
X Window Systems. <application>&xorg;</application>
- beruht auf <application>&xfree86 4.4RC2</application> und
+ beruht auf <application>&xfree86; 4.4RC2</application> und
X11R6.6. Derzeit ist die Version &xorg.version; von
<application>&xorg;</application> in der Ports-Sammlung
vorhanden.</para>
diff --git a/de_DE.ISO8859-1/books/porters-handbook/book.xml b/de_DE.ISO8859-1/books/porters-handbook/book.xml
index 9976d29893..73ac41b041 100644
--- a/de_DE.ISO8859-1/books/porters-handbook/book.xml
+++ b/de_DE.ISO8859-1/books/porters-handbook/book.xml
@@ -10044,7 +10044,7 @@ etc/orbit.conf.sample
<para>Speichern Sie die Verzeichnisstruktur in einer neuen
Datei.</para>
- <screen>&prompt.root; <userinput>(cd /var/tmp/`make -V PORTNAME` && find -d * -type d) | sort > OLD-DIRS</userinput></screen>
+ <screen>&prompt.root; <userinput>(cd /var/tmp/`make -V PORTNAME` && find -d * -type d) | sort > OLD-DIRS</userinput></screen>
<para>Erstellen Sie eine leere
<filename>pkg-plist</filename>-Datei:</para>
@@ -10056,12 +10056,12 @@ etc/orbit.conf.sample
Paketliste erstellt werden.</para>
<screen>&prompt.root; <userinput>make install PREFIX=/var/tmp/`make -V PORTNAME`</userinput>
-&prompt.root; <userinput>(cd /var/tmp/`make -V PORTNAME` && find -d * \! -type d) | sort > pkg-plist</userinput></screen>
+&prompt.root; <userinput>(cd /var/tmp/`make -V PORTNAME` && find -d * \! -type d) | sort > pkg-plist</userinput></screen>
<para>Sie m�ssen auch alle neu erstellten Verzeichnisse in
die Paketliste aufnehmen.</para>
- <screen>&prompt.root; <userinput>(cd /var/tmp/`make -V PORTNAME` && find -d * -type d) | sort | comm -13 OLD-DIRS - | sort -r | sed -e 's#^#@dirrm #' >> pkg-plist</userinput></screen>
+ <screen>&prompt.root; <userinput>(cd /var/tmp/`make -V PORTNAME` && find -d * -type d) | sort | comm -13 OLD-DIRS - | sort -r | sed -e 's#^#@dirrm #' >> pkg-plist</userinput></screen>
<para>Zu guter Letzt muss die Paketliste noch manuell
aufger�umt werden - es funktioniert eben nicht
diff --git a/de_DE.ISO8859-1/share/xml/mirrors-local.xsl b/de_DE.ISO8859-1/share/xml/mirrors-local.xsl
index efb34f7a79..b7abdc1fdf 100644
--- a/de_DE.ISO8859-1/share/xml/mirrors-local.xsl
+++ b/de_DE.ISO8859-1/share/xml/mirrors-local.xsl
@@ -11,7 +11,6 @@
<xsl:import href="../../../share/xml/mirrors-master.xsl" />
<xsl:output type="xml" encoding="iso-8859-1"
- omit-xml-declaration="yes"
indent="yes"/>
<!-- these params should be externally bound. The values
From ef2fe332c012d9f568a8c8052911cfc812d1edc7 Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Mon, 21 Jan 2013 17:36:29 +0000
Subject: [PATCH 008/121] - Make the Greek documentation valid XML
---
.../articles/contributing/article.xml | 2 +-
el_GR.ISO8859-7/books/handbook/Makefile | 38 +++-
.../handbook/advanced-networking/chapter.xml | 4 +-
.../books/handbook/audit/chapter.xml | 2 +-
.../books/handbook/basics/chapter.xml | 2 +-
.../books/handbook/bibliography/chapter.xml | 2 +-
.../books/handbook/boot/chapter.xml | 2 +-
el_GR.ISO8859-7/books/handbook/chapters.ent | 199 ++----------------
el_GR.ISO8859-7/books/handbook/colophon.xml | 2 +-
.../books/handbook/config/chapter.xml | 6 +-
.../books/handbook/cutting-edge/chapter.xml | 10 +-
.../books/handbook/desktop/chapter.xml | 2 +-
.../books/handbook/disks/chapter.xml | 26 +--
.../books/handbook/dtrace/chapter.xml | 2 +-
.../books/handbook/eresources/chapter.xml | 6 +-
.../books/handbook/filesystems/chapter.xml | 4 +-
.../books/handbook/firewalls/chapter.xml | 2 +-
.../books/handbook/geom/chapter.xml | 2 +-
.../books/handbook/install/chapter.xml | 4 +-
.../books/handbook/introduction/chapter.xml | 2 +-
.../books/handbook/jails/chapter.xml | 2 +-
.../books/handbook/kernelconfig/chapter.xml | 2 +-
.../books/handbook/l10n/chapter.xml | 2 +-
.../books/handbook/linuxemu/chapter.xml | 10 +-
.../books/handbook/mac/chapter.xml | 2 +-
.../books/handbook/mail/chapter.xml | 8 +-
.../books/handbook/mirrors/chapter.xml | 10 +-
.../books/handbook/multimedia/chapter.xml | 4 +-
.../handbook/network-servers/chapter.xml | 2 +-
.../books/handbook/pgpkeys/chapter.xml | 2 +-
.../books/handbook/ports/chapter.xml | 2 +-
.../books/handbook/ppp-and-slip/chapter.xml | 2 +-
.../books/handbook/preface/preface.xml | 2 +-
.../books/handbook/printing/chapter.xml | 2 +-
.../books/handbook/security/chapter.xml | 2 +-
.../books/handbook/serialcomms/chapter.xml | 2 +-
.../books/handbook/users/chapter.xml | 2 +-
.../books/handbook/vinum/chapter.xml | 2 +-
.../books/handbook/virtualization/chapter.xml | 4 +-
.../books/handbook/x11/chapter.xml | 4 +-
el_GR.ISO8859-7/share/xml/entities.ent | 5 +-
41 files changed, 122 insertions(+), 270 deletions(-)
diff --git a/el_GR.ISO8859-7/articles/contributing/article.xml b/el_GR.ISO8859-7/articles/contributing/article.xml
index 312c69fff9..1292390c2c 100644
--- a/el_GR.ISO8859-7/articles/contributing/article.xml
+++ b/el_GR.ISO8859-7/articles/contributing/article.xml
@@ -216,7 +216,7 @@
<para>������������ �� ������ ��������� ��� ������� ������� ���� �� &posix;. ��������
�� ������ ���������� ������� �� ���� �� ������� ����
���������� <ulink url="&url.base;/projects/c99/index.html">&os;
- C99 & POSIX Standards Conformance Project</ulink>. ���������� ���
+ C99 & POSIX Standards Conformance Project</ulink>. ���������� ���
����������� ��� &os; �� ��� ����������� ��� �� �������. �� �
����������� ��������, ��������� �� ����� � ����������� ������ ���
������������, ������� ��� ������� ����������� ������� �� ����. �� ����� �������
diff --git a/el_GR.ISO8859-7/books/handbook/Makefile b/el_GR.ISO8859-7/books/handbook/Makefile
index 0372086e1d..803649118d 100644
--- a/el_GR.ISO8859-7/books/handbook/Makefile
+++ b/el_GR.ISO8859-7/books/handbook/Makefile
@@ -318,30 +318,56 @@ DOC_PREFIX?= ${.CURDIR}/../../..
#
# rules generating lists of mirror site from XML database.
#
-XMLDOCS= mirrors-ftp:::mirrors.xml.ftp.inc \
+XMLDOCS= lastmod:::mirrors.lastmod.inc \
+ mirrors-ftp:::mirrors.xml.ftp.inc \
+ mirrors-ftp-index:::mirrors.xml.ftp.index.inc \
mirrors-cvsup:::mirrors.xml.cvsup.inc \
- eresources:::eresources.xml.www.inc
+ mirrors-cvsup-index:::mirrors.xml.cvsup.index.inc \
+ eresources:::eresources.xml.www.inc \
+ eresources-index:::eresources.xml.www.index.inc
DEPENDSET.DEFAULT= transtable mirror
XSLT.DEFAULT= ${XSL_MIRRORS}
XML.DEFAULT= ${XML_MIRRORS}
NO_TIDY.DEFAULT= yes
+PARAMS.lastmod+= --param 'target' "'lastmod'"
+PARAMS.mirrors-ftp-index+= --param 'type' "'ftp'" \
+ --param 'proto' "'ftp'" \
+ --param 'target' "'index'"
PARAMS.mirrors-ftp+= --param 'type' "'ftp'" \
--param 'proto' "'ftp'" \
--param 'target' "'handbook/mirrors/chapter.xml'"
+PARAMS.mirrors-cvsup-index+= --param 'type' "'cvsup'" \
+ --param 'proto' "'cvsup'" \
+ --param 'target' "'index'"
PARAMS.mirrors-cvsup+= --param 'type' "'cvsup'" \
--param 'proto' "'cvsup'" \
--param 'target' "'handbook/mirrors/chapter.xml'"
+PARAMS.eresources-index+= --param 'type' "'www'" \
+ --param 'proto' "'http'" \
+ --param 'target' "'index'"
PARAMS.eresources+= --param 'type' "'www'" \
--param 'proto' "'http'" \
--param 'target' "'handbook/eresources/chapter.xml'"
-SRCS+= mirrors.xml.ftp.inc \
+SRCS+= mirrors.lastmod.inc \
+ mirrors.xml.ftp.inc \
+ mirrors.xml.ftp.index.inc \
mirrors.xml.cvsup.inc \
- eresources.xml.www.inc
+ mirrors.xml.cvsup.index.inc \
+ eresources.xml.www.inc \
+ eresources.xml.www.index.inc
-CLEANFILES+= mirrors.xml.ftp.inc \
+CLEANFILES+= mirrors.lastmod.inc \
+ mirrors.xml.ftp.inc \
+ mirrors.xml.ftp.index.inc \
mirrors.xml.cvsup.inc \
- eresources.xml.www.inc
+ mirrors.xml.cvsup.index.inc \
+ eresources.xml.www.inc \
+ eresources.xml.www.index.inc
+
+lint: mirrors.lastmod.inc mirrors.xml.ftp.inc mirrors.xml.ftp.index.inc \
+ mirrors.xml.cvsup.inc mirrors.xml.cvsup.index.inc \
+ eresources.xml.www.inc eresources.xml.www.index.inc
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/el_GR.ISO8859-7/books/handbook/advanced-networking/chapter.xml b/el_GR.ISO8859-7/books/handbook/advanced-networking/chapter.xml
index 7f143e23b0..81538410ca 100644
--- a/el_GR.ISO8859-7/books/handbook/advanced-networking/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/advanced-networking/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
<!--
�� ���������� ��� FreeBSD: ����������� ������ ���������
@@ -4794,7 +4794,7 @@ ifconfig_carp1="vhid 2 advskew 100 pass testpass 192.168.1.51/24"</programlistin
should be issued on
<hostid>provider.example.org</hostid>:</para>
- <screen>&prompt.root; <userinput>ifconfig carp0 down && ifconfig carp0 up</userinput></screen>
+ <screen>&prompt.root; <userinput>ifconfig carp0 down && ifconfig carp0 up</userinput></screen>
<para>This should be done on the <devicename>carp</devicename>
interface which corresponds to the correct host.</para>
diff --git a/el_GR.ISO8859-7/books/handbook/audit/chapter.xml b/el_GR.ISO8859-7/books/handbook/audit/chapter.xml
index d4e062a558..8fc903b178 100644
--- a/el_GR.ISO8859-7/books/handbook/audit/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/audit/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
<!--
�� ���������� ��� FreeBSD: ������� ��������� ���������
diff --git a/el_GR.ISO8859-7/books/handbook/basics/chapter.xml b/el_GR.ISO8859-7/books/handbook/basics/chapter.xml
index 9b19881c83..bbb16b7598 100644
--- a/el_GR.ISO8859-7/books/handbook/basics/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/basics/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
<!--
�� ���������� ��� FreeBSD: ������� ������� ��� Unix
diff --git a/el_GR.ISO8859-7/books/handbook/bibliography/chapter.xml b/el_GR.ISO8859-7/books/handbook/bibliography/chapter.xml
index d7426c1885..8eb5287d48 100644
--- a/el_GR.ISO8859-7/books/handbook/bibliography/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/bibliography/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
<!--
�� ���������� ��� FreeBSD: ������������
diff --git a/el_GR.ISO8859-7/books/handbook/boot/chapter.xml b/el_GR.ISO8859-7/books/handbook/boot/chapter.xml
index 78fd02bb2e..1eb393009f 100644
--- a/el_GR.ISO8859-7/books/handbook/boot/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/boot/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
<!--
�� ���������� ��� FreeBSD: � ���������� ��������� ��� FreeBSD
diff --git a/el_GR.ISO8859-7/books/handbook/chapters.ent b/el_GR.ISO8859-7/books/handbook/chapters.ent
index daa4314a4b..eefe8973a2 100644
--- a/el_GR.ISO8859-7/books/handbook/chapters.ent
+++ b/el_GR.ISO8859-7/books/handbook/chapters.ent
@@ -17,235 +17,62 @@
-->
-<!ENTITY % not.published "INCLUDE">
-
-<!ENTITY % chap.introduction "IGNORE">
-<!ENTITY % chap.install "IGNORE">
-<!ENTITY % chap.bsdinstall "IGNORE">
-<!ENTITY % chap.basics "IGNORE">
-<!ENTITY % chap.ports "IGNORE">
-<!ENTITY % chap.config "IGNORE">
-<!ENTITY % chap.boot "IGNORE">
-<!ENTITY % chap.users "IGNORE">
-<!ENTITY % chap.kernelconfig "IGNORE">
-<!ENTITY % chap.security "IGNORE">
-<!ENTITY % chap.jails "IGNORE">
-<!ENTITY % chap.printing "IGNORE">
-<!ENTITY % chap.disks "IGNORE">
-<!ENTITY % chap.geom "IGNORE">
-<!ENTITY % chap.vinum "IGNORE">
-<!ENTITY % chap.x11 "IGNORE">
-<!ENTITY % chap.l10n "IGNORE">
-<!ENTITY % chap.multimedia "IGNORE">
-<!ENTITY % chap.desktop "IGNORE">
-<!ENTITY % chap.serialcomms "IGNORE">
-<!ENTITY % chap.ppp-and-slip "IGNORE">
-<!ENTITY % chap.advanced-networking "IGNORE">
-<!ENTITY % chap.firewalls "IGNORE">
-<!ENTITY % chap.network-servers "IGNORE">
-<!ENTITY % chap.mail "IGNORE">
-<!ENTITY % chap.cutting-edge "IGNORE">
-<!ENTITY % chap.linuxemu "IGNORE">
-<!ENTITY % chap.mirrors "IGNORE">
-<!ENTITY % chap.mirrors.ftp.inc "INCLUDE">
-<!ENTITY % chap.mirrors.cvsup.inc "INCLUDE">
-<!ENTITY % chap.bibliography "IGNORE">
-<!ENTITY % chap.eresources "IGNORE">
-<!ENTITY % chap.eresources.www.inc "INCLUDE">
-<!ENTITY % chap.pgpkeys "IGNORE">
-<!ENTITY % chap.index "IGNORE">
-<!ENTITY % chap.freebsd-glossary "IGNORE">
-<!ENTITY % chap.mac "IGNORE">
-<!ENTITY % chap.audit "IGNORE">
-<!ENTITY % chap.filesystems "IGNORE">
-<!ENTITY % chap.dtrace "IGNORE">
-
<!ENTITY chap.preface SYSTEM "preface/preface.xml">
<!ENTITY % pgpkeys SYSTEM "../../../share/pgpkeys/pgpkeys.ent"> %pgpkeys;
<!-- Part One -->
-<![%chap.introduction;[
<!ENTITY chap.introduction SYSTEM "introduction/chapter.xml">
-]]>
-<![%chap.install;[
<!ENTITY chap.install SYSTEM "install/chapter.xml">
-]]>
-<![%chap.bsdinstall;[
<!ENTITY chap.bsdinstall SYSTEM "bsdinstall/chapter.xml">
-]]>
-<![%chap.basics;[
<!ENTITY chap.basics SYSTEM "basics/chapter.xml">
-]]>
-<![%chap.ports;[
<!ENTITY chap.ports SYSTEM "ports/chapter.xml">
-]]>
-<![%chap.x11;[
<!ENTITY chap.x11 SYSTEM "x11/chapter.xml">
-]]>
<!-- Part Two -->
-<![%chap.desktop;[
<!ENTITY chap.desktop SYSTEM "desktop/chapter.xml">
-]]>
-<![%chap.multimedia;[
<!ENTITY chap.multimedia SYSTEM "multimedia/chapter.xml">
-]]>
-<![%chap.kernelconfig;[
<!ENTITY chap.kernelconfig SYSTEM "kernelconfig/chapter.xml">
-]]>
-<![%chap.printing;[
<!ENTITY chap.printing SYSTEM "printing/chapter.xml">
-]]>
-<![%chap.linuxemu;[
<!ENTITY chap.linuxemu SYSTEM "linuxemu/chapter.xml">
-]]>
<!-- Part Three -->
-<![%chap.config;[
<!ENTITY chap.config SYSTEM "config/chapter.xml">
-]]>
-<![%chap.boot;[
<!ENTITY chap.boot SYSTEM "boot/chapter.xml">
-]]>
-<![%chap.users;[
<!ENTITY chap.users SYSTEM "users/chapter.xml">
-]]>
-<![%chap.security;[
<!ENTITY chap.security SYSTEM "security/chapter.xml">
-]]>
-<![%chap.jails;[
<!ENTITY chap.jails SYSTEM "jails/chapter.xml">
-]]>
-<![%chap.mac;[
<!ENTITY chap.mac SYSTEM "mac/chapter.xml">
-]]>
-<![%chap.audit;[
<!ENTITY chap.audit SYSTEM "audit/chapter.xml">
-]]>
-<![%chap.disks;[
<!ENTITY chap.disks SYSTEM "disks/chapter.xml">
-]]>
-<![%chap.geom;[
<!ENTITY chap.geom SYSTEM "geom/chapter.xml">
-]]>
-<![%chap.filesystems;[
<!ENTITY chap.filesystems SYSTEM "filesystems/chapter.xml">
-]]>
-<![%chap.vinum;[
<!ENTITY chap.vinum SYSTEM "vinum/chapter.xml">
-]]>
-<![%chap.virtualization;[
<!ENTITY chap.virtualization SYSTEM "virtualization/chapter.xml">
-]]>
-<![%chap.l10n;[
<!ENTITY chap.l10n SYSTEM "l10n/chapter.xml">
-]]>
-<![%chap.cutting-edge;[
<!ENTITY chap.cutting-edge SYSTEM "cutting-edge/chapter.xml">
-]]>
-<![%chap.dtrace;[
<!ENTITY chap.dtrace SYSTEM "dtrace/chapter.xml">
-]]>
<!-- Part Four -->
-<![%chap.serialcomms;[
<!ENTITY chap.serialcomms SYSTEM "serialcomms/chapter.xml">
-]]>
-<![%chap.ppp-and-slip;[
<!ENTITY chap.ppp-and-slip SYSTEM "ppp-and-slip/chapter.xml">
-]]>
-<![%chap.mail;[
<!ENTITY chap.mail SYSTEM "mail/chapter.xml">
-]]>
-<![%chap.network-servers;[
<!ENTITY chap.network-servers SYSTEM "network-servers/chapter.xml">
-]]>
-<![%chap.firewalls;[
<!ENTITY chap.firewalls SYSTEM "firewalls/chapter.xml">
-]]>
-<![%chap.advanced-networking;[
<!ENTITY chap.advanced-networking SYSTEM "advanced-networking/chapter.xml">
-]]>
<!-- Part Five (appendices) -->
-<![%chap.mirrors;[
- <!ENTITY chap.mirrors SYSTEM "mirrors/chapter.xml">
-]]>
-<![%chap.mirrors.ftp.inc;[
- <!ENTITY chap.mirrors.ftp.inc SYSTEM "mirrors.xml.ftp.inc">
-]]>
-<![%chap.mirrors.cvsup.inc;[
- <!ENTITY chap.mirrors.cvsup.inc SYSTEM "mirrors.xml.cvsup.inc">
-]]>
-<![%chap.bibliography;[
- <!ENTITY chap.bibliography SYSTEM "bibliography/chapter.xml">
-]]>
-<![%chap.eresources;[
- <!ENTITY chap.eresources SYSTEM "eresources/chapter.xml">
-]]>
-<![%chap.eresources.www.inc;[
- <!ENTITY chap.eresources.www.inc SYSTEM "eresources.xml.www.inc">
-]]>
-<![%chap.pgpkeys;[
- <!ENTITY chap.pgpkeys SYSTEM "pgpkeys/chapter.xml">
-]]>
-<![%chap.freebsd-glossary;[
- <!ENTITY chap.freebsd-glossary "&freebsd-glossary;">
-]]>
-<![%chap.index;[
- <!ENTITY chap.index SYSTEM "index.xml">
-]]>
+ <!ENTITY chap.mirrors SYSTEM "mirrors/chapter.xml">
+ <!ENTITY chap.mirrors.lastmod.inc SYSTEM "mirrors.lastmod.inc">
+ <!ENTITY chap.mirrors.ftp.index.inc SYSTEM "mirrors.xml.ftp.index.inc">
+ <!ENTITY chap.mirrors.ftp.inc SYSTEM "mirrors.xml.ftp.inc">
+ <!ENTITY chap.mirrors.cvsup.index.inc SYSTEM "mirrors.xml.cvsup.index.inc">
+ <!ENTITY chap.mirrors.cvsup.inc SYSTEM "mirrors.xml.cvsup.inc">
+ <!ENTITY chap.bibliography SYSTEM "bibliography/chapter.xml">
+ <!ENTITY chap.eresources SYSTEM "eresources/chapter.xml">
+ <!ENTITY chap.eresources.www.index.inc SYSTEM "eresources.xml.www.index.inc">
+ <!ENTITY chap.eresources.www.inc SYSTEM "eresources.xml.www.inc">
+ <!ENTITY chap.pgpkeys SYSTEM "pgpkeys/chapter.xml">
+ <!ENTITY chap.freebsd-glossary "&freebsd-glossary;">
+ <!ENTITY chap.index "">
<!ENTITY chap.colophon SYSTEM "colophon.xml">
-
-<!-- IGNORE cases -->
-
-<!-- Part One -->
-<!ENTITY chap.introduction "">
-<!ENTITY chap.install "">
-<!ENTITY chap.basics "">
-<!ENTITY chap.ports "">
-<!ENTITY chap.x11 "">
-
-<!-- Part Two -->
-<!ENTITY chap.desktop "">
-<!ENTITY chap.multimedia "">
-<!ENTITY chap.kernelconfig "">
-<!ENTITY chap.printing "">
-<!ENTITY chap.linuxemu "">
-
-<!-- Part Three -->
-<!ENTITY chap.config "">
-<!ENTITY chap.boot "">
-<!ENTITY chap.users "">
-<!ENTITY chap.security "">
-<!ENTITY chap.jails "">
-<!ENTITY chap.mac "">
-<!ENTITY chap.audit "">
-<!ENTITY chap.disks "">
-<!ENTITY chap.geom "">
-<!ENTITY chap.filesystems "">
-<!ENTITY chap.vinum "">
-<!ENTITY chap.virtualization "">
-<!ENTITY chap.l10n "">
-<!ENTITY chap.cutting-edge "">
-<!ENTITY chap.dtrace "">
-
-<!-- Part Four -->
-<!ENTITY chap.serialcomms "">
-<!ENTITY chap.ppp-and-slip "">
-<!ENTITY chap.mail "">
-<!ENTITY chap.network-servers "">
-<!ENTITY chap.firewalls "">
-<!ENTITY chap.advanced-networking "">
-
-<!-- Part Five (appendices) -->
-<!ENTITY chap.mirrors "">
-<!ENTITY chap.mirrors.ftp.inc "">
-<!ENTITY chap.mirrors.cvsup.inc "">
-<!ENTITY chap.bibliography "">
-<!ENTITY chap.eresources "">
-<!ENTITY chap.eresources.www.inc "">
-<!ENTITY chap.pgpkeys "">
-<!ENTITY chap.freebsd-glossary "">
-<!ENTITY chap.index "">
diff --git a/el_GR.ISO8859-7/books/handbook/colophon.xml b/el_GR.ISO8859-7/books/handbook/colophon.xml
index 98df77588e..2db2cb7527 100644
--- a/el_GR.ISO8859-7/books/handbook/colophon.xml
+++ b/el_GR.ISO8859-7/books/handbook/colophon.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
<!--
�� ���������� ��� FreeBSD: �������� �������
diff --git a/el_GR.ISO8859-7/books/handbook/config/chapter.xml b/el_GR.ISO8859-7/books/handbook/config/chapter.xml
index d9c096ae43..7a748980e8 100644
--- a/el_GR.ISO8859-7/books/handbook/config/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/config/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
<!--
�� ���������� ��� FreeBSD: ������� ��� ��������������
@@ -403,7 +403,7 @@ stop)
kill -9 `cat /var/run/utility.pid`
;;
*)
- echo "Usage: `basename $0` {start|stop}" >&2
+ echo "Usage: `basename $0` {start|stop}" >&2
exit 64
;;
esac
@@ -854,7 +854,7 @@ $sshd_enable=YES</screen>
������� �� ������� ���� ������� �������� &man.rc.8; ��� &man.rc.subr.8;.
�� ������������ ��� ��� ������� ����� ���
�������� <filename>rc.d</filename> � ��� ��� �������� ��� ���
- ����������, �� ������ <ulink url="&url.articles.rc-scripting">���
+ ����������, �� ������ <ulink url="&url.articles.rc-scripting;">���
�������� �����</ulink> ������ �������.</para>
</sect1>
diff --git a/el_GR.ISO8859-7/books/handbook/cutting-edge/chapter.xml b/el_GR.ISO8859-7/books/handbook/cutting-edge/chapter.xml
index 0620644521..2989c85826 100644
--- a/el_GR.ISO8859-7/books/handbook/cutting-edge/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/cutting-edge/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
<!--
�� ���������� ��� FreeBSD: ��������� ��� ���������� ��� FreeBSD
@@ -1272,7 +1272,7 @@ DOCSUPFILE?= /usr/share/examples/cvsup/doc-supfile</programlisting>
</sect3>
</sect2>
-<![ IGNORE [
+<!-- XXX
<sect2 id="docsnap">
<sect2info>
<authorgroup>
@@ -1332,13 +1332,13 @@ DOCSUPFILE?= /usr/share/examples/cvsup/doc-supfile</programlisting>
��������.</para>
</note>
- <para>��� ��������������� ��� ������� <option>--delete</option>, �����
+ <para>��� ��������������� ��� ������� <option>‐‐delete</option>, �����
� <command>make installworld</command> ��������� ������ �������� ����
�������� <filename class="directory">/usr/share/doc</filename> ��
����� �� ��������. ��� �� ���������� �� ����� ������, ��������������
��� �������� ������:</para>
- <screen>&prompt.root; <userinput>rsync -rltvz --delete <replaceable>docsnap.sk.FreeBSD.org</replaceable>::docsnap/??_??\.\* <replaceable>/usr/share/doc</replaceable></userinput></screen>
+ <screen>&prompt.root; <userinput>rsync -rltvz ‐‐delete <replaceable>docsnap.sk.FreeBSD.org</replaceable>::docsnap/??_??\.\* <replaceable>/usr/share/doc</replaceable></userinput></screen>
<para>�� ���������� �� ����������� ��� ��������� ��� �����������, ���
���������� ���� ��� ������� ����������, �������� �� ���������������
@@ -1346,7 +1346,7 @@ DOCSUPFILE?= /usr/share/examples/cvsup/doc-supfile</programlisting>
<screen>&prompt.root; <userinput>rsync -rltvz <replaceable>docsnap.sk.FreeBSD.org</replaceable>::docsnap/en_US.ISO8859-1 <replaceable>/usr/share/doc</replaceable></userinput></screen>
</sect2>
-]]>
+-->
</sect1>
<sect1 id="current-stable">
diff --git a/el_GR.ISO8859-7/books/handbook/desktop/chapter.xml b/el_GR.ISO8859-7/books/handbook/desktop/chapter.xml
index 77b5691edd..6c69393afa 100644
--- a/el_GR.ISO8859-7/books/handbook/desktop/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/desktop/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
<!--
�� ���������� ��� FreeBSD: Desktop ���������
diff --git a/el_GR.ISO8859-7/books/handbook/disks/chapter.xml b/el_GR.ISO8859-7/books/handbook/disks/chapter.xml
index e865836ba7..59427fc440 100644
--- a/el_GR.ISO8859-7/books/handbook/disks/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/disks/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
<!--
�� ���������� ��� FreeBSD: ������������ ����
@@ -2694,7 +2694,7 @@ sa0(ncr1:4:0): Logical unit is in process of becoming ready</screen>
<example>
<title>A Script for Creating a Bootable Floppy</title>
- <programlisting><![ CDATA [#!/bin/sh
+ <programlisting><![CDATA[#!/bin/sh
#
# create a restore floppy
#
@@ -2740,7 +2740,7 @@ mkdir /mnt/var
#
if [ ! -x /sys/compile/MINI/kernel ]
then
- cat << EOM
+ cat << EOM
The MINI kernel does not exist, please create one.
Here is an example config file:
#
@@ -2822,19 +2822,19 @@ cd /
#
# create minimum file system table
#
-cat > /mnt/etc/fstab <<EOM
+cat > /mnt/etc/fstab <<EOM
/dev/fd0a / ufs rw 1 1
EOM
#
# create minimum passwd file
#
-cat > /mnt/etc/passwd <<EOM
-root:*:0:0:Charlie &:/root:/bin/sh
+cat > /mnt/etc/passwd <<EOM
+root:*:0:0:Charlie &:/root:/bin/sh
EOM
-cat > /mnt/etc/master.passwd <<EOM
-root::0:0::0:0:Charlie &:/root:/bin/sh
+cat > /mnt/etc/master.passwd <<EOM
+root::0:0::0:0:Charlie &:/root:/bin/sh
EOM
chmod 600 /mnt/etc/master.passwd
@@ -2906,16 +2906,6 @@ echo "The floppy has been unmounted and is now ready."]]></programlisting>
Whatever caused the crash or data loss may strike again. Another
hour spent now may save you from further distress later.</para>
</sect3>
-
-<![ %not.published; [
-
- <sect3>
- <title>* I Did Not Prepare for the Disaster, What Now?</title>
-
- <para></para>
- </sect3>
-]]>
-
</sect2>
</sect1>
diff --git a/el_GR.ISO8859-7/books/handbook/dtrace/chapter.xml b/el_GR.ISO8859-7/books/handbook/dtrace/chapter.xml
index ba77da0fa4..3d0a0545b0 100644
--- a/el_GR.ISO8859-7/books/handbook/dtrace/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/dtrace/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
<!--
�� ���������� ��� FreeBSD: DTrace
diff --git a/el_GR.ISO8859-7/books/handbook/eresources/chapter.xml b/el_GR.ISO8859-7/books/handbook/eresources/chapter.xml
index dbd61564f6..3146e779cd 100644
--- a/el_GR.ISO8859-7/books/handbook/eresources/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/eresources/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
<!--
�� ���������� ��� FreeBSD: ����� ������������ ��� ���������
@@ -2196,6 +2196,10 @@
<sect2 id="eresources-web-mirrors">
<title>������� Mirrors</title>
+ &chap.eresources.www.index.inc;
+
+ &chap.mirrors.lastmod.inc;
+
&chap.eresources.www.inc;
</sect2>
</sect1>
diff --git a/el_GR.ISO8859-7/books/handbook/filesystems/chapter.xml b/el_GR.ISO8859-7/books/handbook/filesystems/chapter.xml
index b9dd86fd33..520d07ee65 100644
--- a/el_GR.ISO8859-7/books/handbook/filesystems/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/filesystems/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
<!--
�� ���������� ��� FreeBSD: ��������� �������
@@ -241,7 +241,7 @@ example 17547136 0 17547136 0% /example</screen>
��� ����� ������� ������� ������ �� �� ����, ���� �������� ���
�������� ����������:</para>
- <screen>&prompt.root <userinput>cd /example</userinput>
+ <screen>&prompt.root; <userinput>cd /example</userinput>
&prompt.root; <userinput>ls</userinput>
&prompt.root; <userinput>touch testfile</userinput>
&prompt.root; <userinput>ls -al</userinput>
diff --git a/el_GR.ISO8859-7/books/handbook/firewalls/chapter.xml b/el_GR.ISO8859-7/books/handbook/firewalls/chapter.xml
index b02e5148e6..c58f023aaf 100644
--- a/el_GR.ISO8859-7/books/handbook/firewalls/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/firewalls/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
<!--
�� ���������� ��� FreeBSD: Firewalls
diff --git a/el_GR.ISO8859-7/books/handbook/geom/chapter.xml b/el_GR.ISO8859-7/books/handbook/geom/chapter.xml
index 298c4e9e17..661117e46c 100644
--- a/el_GR.ISO8859-7/books/handbook/geom/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/geom/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
<!--
�� ���������� ��� FreeBSD: GEOM: ���������� ���������� ������
diff --git a/el_GR.ISO8859-7/books/handbook/install/chapter.xml b/el_GR.ISO8859-7/books/handbook/install/chapter.xml
index cb7d31d596..66347a8c87 100644
--- a/el_GR.ISO8859-7/books/handbook/install/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/install/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
<!--
�� ���������� ��� FreeBSD: ������������� �� FreeBSD
@@ -328,7 +328,7 @@
��������� ��� �����, ��� ��� ���������� ��� ������ ����������.</para>
<sect3 id="install-where-i386">
- <title>����������� ������ ��� ������������� &os/&arch.i386;</title>
+ <title>����������� ������ ��� ������������� &os;/&arch.i386;</title>
<para>���� ������� ������ PC ������ �� �������� �� �������� �������.
�� ������� ���� ���������
diff --git a/el_GR.ISO8859-7/books/handbook/introduction/chapter.xml b/el_GR.ISO8859-7/books/handbook/introduction/chapter.xml
index 6df27ecefc..42a539d791 100644
--- a/el_GR.ISO8859-7/books/handbook/introduction/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/introduction/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
<!--
�� ���������� ��� FreeBSD: ��������
diff --git a/el_GR.ISO8859-7/books/handbook/jails/chapter.xml b/el_GR.ISO8859-7/books/handbook/jails/chapter.xml
index 0149ef15ad..e6e7c88d59 100644
--- a/el_GR.ISO8859-7/books/handbook/jails/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/jails/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
<!--
�� ���������� ��� FreeBSD: Jails
diff --git a/el_GR.ISO8859-7/books/handbook/kernelconfig/chapter.xml b/el_GR.ISO8859-7/books/handbook/kernelconfig/chapter.xml
index 4aa66c2439..e42bb7b4cc 100644
--- a/el_GR.ISO8859-7/books/handbook/kernelconfig/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/kernelconfig/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
<!--
�� ���������� ��� FreeBSD: ����������� ��� ������ ��� FreeBSD
diff --git a/el_GR.ISO8859-7/books/handbook/l10n/chapter.xml b/el_GR.ISO8859-7/books/handbook/l10n/chapter.xml
index faa054cd4a..3a0c9e58b9 100644
--- a/el_GR.ISO8859-7/books/handbook/l10n/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/l10n/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
<!--
�� ���������� ��� FreeBSD: ������� ��������� - ����� ��� ������� I18N/L10N
diff --git a/el_GR.ISO8859-7/books/handbook/linuxemu/chapter.xml b/el_GR.ISO8859-7/books/handbook/linuxemu/chapter.xml
index 6b0bc9d9b9..498c48d5ec 100644
--- a/el_GR.ISO8859-7/books/handbook/linuxemu/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/linuxemu/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
<!--
�� ���������� ��� FreeBSD: ����������� �� ���������� ��� Linux
@@ -698,14 +698,14 @@ LOG=/var/log/lmgrd.log
case "$1" in
start)
- lmgrd -c ${LICENSE_FILE} 2>> ${LOG} 1>&2
+ lmgrd -c ${LICENSE_FILE} 2>> ${LOG} 1>&2
echo -n " lmgrd"
;;
stop)
- lmgrd -c ${LICENSE_FILE} -x lmdown 2>> ${LOG} 1>&2
+ lmgrd -c ${LICENSE_FILE} -x lmdown 2>> ${LOG} 1>&2
;;
*)
- echo "Usage: `basename $0` {start|stop}" 1>&2
+ echo "Usage: `basename $0` {start|stop}" 1>&2
exit 64
;;
esac
@@ -1002,7 +1002,7 @@ exit 0</programlisting>
�������� �� ��������:</para>
<programlisting>#!/compat/linux/bin/sh
-(sleep 5; killall -1 matlab_helper) &
+(sleep 5; killall -1 matlab_helper) &
exit 0</programlisting>
</step>
diff --git a/el_GR.ISO8859-7/books/handbook/mac/chapter.xml b/el_GR.ISO8859-7/books/handbook/mac/chapter.xml
index ccdc74afc0..a674a3147e 100644
--- a/el_GR.ISO8859-7/books/handbook/mac/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/mac/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
<!--
�� ���������� ��� FreeBSD: ������������ ������� ���������
diff --git a/el_GR.ISO8859-7/books/handbook/mail/chapter.xml b/el_GR.ISO8859-7/books/handbook/mail/chapter.xml
index f056b75c19..94d5860884 100644
--- a/el_GR.ISO8859-7/books/handbook/mail/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/mail/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
<!--
�� ���������� ��� FreeBSD: ����������� �����������
@@ -1761,11 +1761,11 @@ SENDMAIL_LDADD=-lsasl2</programlisting>
���������� ��� �������� �������:</para>
<screen>&prompt.root; <userinput>cd /usr/src/lib/libsmutil</userinput>
-&prompt.root; <userinput>make cleandir && make obj && make</userinput>
+&prompt.root; <userinput>make cleandir && make obj && make</userinput>
&prompt.root; <userinput>cd /usr/src/lib/libsm</userinput>
-&prompt.root; <userinput>make cleandir && make obj && make</userinput>
+&prompt.root; <userinput>make cleandir && make obj && make</userinput>
&prompt.root; <userinput>cd /usr/src/usr.sbin/sendmail</userinput>
-&prompt.root; <userinput>make cleandir && make obj && make && make install</userinput></screen>
+&prompt.root; <userinput>make cleandir && make obj && make && make install</userinput></screen>
<para>� ������������ ��� <application>sendmail</application> ���
������ �� ����������� ����������, �� ��
diff --git a/el_GR.ISO8859-7/books/handbook/mirrors/chapter.xml b/el_GR.ISO8859-7/books/handbook/mirrors/chapter.xml
index e8e879bbc4..4f54ea2d93 100644
--- a/el_GR.ISO8859-7/books/handbook/mirrors/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/mirrors/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
<!--
�� ���������� ��� FreeBSD: ��� �� ������ �� FreeBSD
@@ -212,6 +212,10 @@
������������ ������ �������� ����������� ��������� ��� ���� site
��������:</para>
+ &chap.mirrors.ftp.index.inc;
+
+ &chap.mirrors.lastmod.inc;
+
&chap.mirrors.ftp.inc;
</sect1>
@@ -2376,6 +2380,10 @@ doc/zh_*</screen>
<para>�������� �� ������ ������������ <link linkend="cvsup">CVSup</link>
��� �� &os; ���� ��������� ����������:</para>
+ &chap.mirrors.cvsup.index.inc;
+
+ &chap.mirrors.lastmod.inc;
+
&chap.mirrors.cvsup.inc;
</sect2>
</sect1>
diff --git a/el_GR.ISO8859-7/books/handbook/multimedia/chapter.xml b/el_GR.ISO8859-7/books/handbook/multimedia/chapter.xml
index d6f26eedf2..f8368676da 100644
--- a/el_GR.ISO8859-7/books/handbook/multimedia/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/multimedia/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
<!--
�� ���������� ��� FreeBSD: ��������
@@ -1667,7 +1667,7 @@ bktr0: Pinnacle/Miro TV, Philips SECAM tuner.</programlisting>
<para>������������ �� ���� ��������� ��� MythTV:</para>
- <screen>&prompt.root; <userinput>mysql -uroot -p < /usr/local/share/mythtv/database/mc.sql</userinput></screen>
+ <screen>&prompt.root; <userinput>mysql -uroot -p < /usr/local/share/mythtv/database/mc.sql</userinput></screen>
<para>�������� �� backend:</para>
diff --git a/el_GR.ISO8859-7/books/handbook/network-servers/chapter.xml b/el_GR.ISO8859-7/books/handbook/network-servers/chapter.xml
index cf3eaab2a0..824db9b047 100644
--- a/el_GR.ISO8859-7/books/handbook/network-servers/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/network-servers/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
<!--
�� ���������� ��� FreeBSD: ������������ �������
diff --git a/el_GR.ISO8859-7/books/handbook/pgpkeys/chapter.xml b/el_GR.ISO8859-7/books/handbook/pgpkeys/chapter.xml
index 4bfb7574f2..f3876f083a 100644
--- a/el_GR.ISO8859-7/books/handbook/pgpkeys/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/pgpkeys/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
<!--
�� ���������� ��� FreeBSD: ������� PGP
diff --git a/el_GR.ISO8859-7/books/handbook/ports/chapter.xml b/el_GR.ISO8859-7/books/handbook/ports/chapter.xml
index 8f9f091262..c63420e884 100644
--- a/el_GR.ISO8859-7/books/handbook/ports/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/ports/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
<!--
�� ���������� ��� FreeBSD: ����������� ���������: Packages ��� Ports
diff --git a/el_GR.ISO8859-7/books/handbook/ppp-and-slip/chapter.xml b/el_GR.ISO8859-7/books/handbook/ppp-and-slip/chapter.xml
index ef5b3378ea..61f24b024f 100644
--- a/el_GR.ISO8859-7/books/handbook/ppp-and-slip/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/ppp-and-slip/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
<!--
�� ���������� ��� FreeBSD: PPP ��� SLIP
diff --git a/el_GR.ISO8859-7/books/handbook/preface/preface.xml b/el_GR.ISO8859-7/books/handbook/preface/preface.xml
index 6d945c2eff..3008e81f47 100644
--- a/el_GR.ISO8859-7/books/handbook/preface/preface.xml
+++ b/el_GR.ISO8859-7/books/handbook/preface/preface.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
<!--
�� ���������� ��� FreeBSD: ��������
diff --git a/el_GR.ISO8859-7/books/handbook/printing/chapter.xml b/el_GR.ISO8859-7/books/handbook/printing/chapter.xml
index c5c5eb6f86..d39064cba6 100644
--- a/el_GR.ISO8859-7/books/handbook/printing/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/printing/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
<!--
�� ���������� ��� FreeBSD: ����������
diff --git a/el_GR.ISO8859-7/books/handbook/security/chapter.xml b/el_GR.ISO8859-7/books/handbook/security/chapter.xml
index ce0a37b849..4a0eaae769 100644
--- a/el_GR.ISO8859-7/books/handbook/security/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/security/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
<!--
�� ���������� ��� FreeBSD: ��������
diff --git a/el_GR.ISO8859-7/books/handbook/serialcomms/chapter.xml b/el_GR.ISO8859-7/books/handbook/serialcomms/chapter.xml
index 1e1d557673..b309e8b819 100644
--- a/el_GR.ISO8859-7/books/handbook/serialcomms/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/serialcomms/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
<!--
�� ���������� ��� FreeBSD: ��������� ������������
diff --git a/el_GR.ISO8859-7/books/handbook/users/chapter.xml b/el_GR.ISO8859-7/books/handbook/users/chapter.xml
index 9b49303608..3377c0f694 100644
--- a/el_GR.ISO8859-7/books/handbook/users/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/users/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
<!--
�� ���������� ��� FreeBSD: ������� ��� ������ ���������� �����������
diff --git a/el_GR.ISO8859-7/books/handbook/vinum/chapter.xml b/el_GR.ISO8859-7/books/handbook/vinum/chapter.xml
index 8ff93bc5df..4d6b51e7bf 100644
--- a/el_GR.ISO8859-7/books/handbook/vinum/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/vinum/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
<!--
�� ���������� ��� FreeBSD: � ������������ ����� Vinum
diff --git a/el_GR.ISO8859-7/books/handbook/virtualization/chapter.xml b/el_GR.ISO8859-7/books/handbook/virtualization/chapter.xml
index b55c5811fb..dd2f79e415 100644
--- a/el_GR.ISO8859-7/books/handbook/virtualization/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/virtualization/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
<!--
�� ���������� ��� FreeBSD: ��������������
@@ -1026,7 +1026,7 @@ xenbr1 8000.feffffffffff no vif0.1
role="package">emulators/virtualbox-ose-additions</filename>
��� ������������� &os; �����������.</para>
- <screen>&prompt.root; <userinput>cd /usr/ports/emulators/virtualbox-ose-additions && make install clean</userinput></screen>
+ <screen>&prompt.root; <userinput>cd /usr/ports/emulators/virtualbox-ose-additions && make install clean</userinput></screen>
<para>��������� ��� �������� ������� ���
<filename>/etc/rc.conf</filename>:</para>
diff --git a/el_GR.ISO8859-7/books/handbook/x11/chapter.xml b/el_GR.ISO8859-7/books/handbook/x11/chapter.xml
index d709336dd8..30231906f0 100644
--- a/el_GR.ISO8859-7/books/handbook/x11/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/x11/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
<!--
�� ���������� ��� FreeBSD: �� ������� X Window
@@ -336,7 +336,7 @@
� ����������� � ��� ���������� X Window System ��� X.Org Foundation,
��� ����� �������� ������. � <application>&xorg;</application> �����
���������� ���� ������ ���
- <application>&xfree86 4.4RC2</application> ��� ��� X11R6.6.
+ <application>&xfree86; 4.4RC2</application> ��� ��� X11R6.6.
� ������ ��� <application>&xorg;</application> ��� ����������
��� ��� ������� ��� Ports ��� &os; ����� � &xorg.version;.</para>
diff --git a/el_GR.ISO8859-7/share/xml/entities.ent b/el_GR.ISO8859-7/share/xml/entities.ent
index f97fae18b6..46e60f1b7d 100644
--- a/el_GR.ISO8859-7/share/xml/entities.ent
+++ b/el_GR.ISO8859-7/share/xml/entities.ent
@@ -42,11 +42,8 @@
<!ENTITY % freebsd.el PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EL"
"freebsd.ent">
%freebsd.el;
-<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EL"
- "freebsd.ent">
-%freebsd;
<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
- "nonexistent">
+ "nonexistent">
%freebsd;
<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN"
"nonexistent">
From d95165dc167eac255ea3d47a00131628cec1e8d1 Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Mon, 21 Jan 2013 17:37:33 +0000
Subject: [PATCH 009/121] - Make the English documentation valid XML
---
.../articles/committers-guide/article.xml | 2 +-
.../articles/contributors/contrib.386bsd.xml | 2 +-
.../contributors/contrib.additional.xml | 2 +-
.../contributors/contrib.committers.xml | 2 +-
.../contributors/contrib.corealumni.xml | 2 +-
.../contributors/contrib.develalumni.xml | 2 +-
.../contributors/contrib.develinmemoriam.xml | 4 +-
.../articles/custom-gcc/article.xml | 12 +-
.../freebsd-update-server/article.xml | 10 +-
.../port-mentor-guidelines/article.xml | 4 +-
.../articles/portbuild/article.xml | 4 +-
.../books/arch-handbook/boot/chapter.xml | 2 +-
.../books/arch-handbook/chapters.ent | 2 +-
.../arch-handbook/driverbasics/chapter.xml | 2 +-
.../books/arch-handbook/isa/chapter.xml | 2 +-
.../books/arch-handbook/jail/chapter.xml | 2 +-
.../books/arch-handbook/kobj/chapter.xml | 2 +-
.../books/arch-handbook/locking/chapter.xml | 2 +-
.../books/arch-handbook/mac/chapter.xml | 2 +-
.../books/arch-handbook/newbus/chapter.xml | 2 +-
.../books/arch-handbook/pccard/chapter.xml | 2 +-
.../books/arch-handbook/pci/chapter.xml | 2 +-
.../books/arch-handbook/scsi/chapter.xml | 2 +-
.../books/arch-handbook/smp/chapter.xml | 2 +-
.../books/arch-handbook/sound/chapter.xml | 2 +-
.../books/arch-handbook/sysinit/chapter.xml | 2 +-
.../books/arch-handbook/usb/chapter.xml | 2 +-
.../books/arch-handbook/vm/chapter.xml | 2 +-
.../introduction/chapter.xml | 2 +-
.../developers-handbook/ipv6/chapter.xml | 2 +-
.../kernelbuild/chapter.xml | 2 +-
.../kerneldebug/chapter.xml | 2 +-
.../developers-handbook/l10n/chapter.xml | 2 +-
.../developers-handbook/policies/chapter.xml | 2 +-
.../developers-handbook/secure/chapter.xml | 2 +-
.../developers-handbook/sockets/chapter.xml | 2 +-
.../developers-handbook/testing/chapter.xml | 2 +-
.../developers-handbook/tools/chapter.xml | 2 +-
.../books/developers-handbook/x86/chapter.xml | 2 +-
.../books/fdp-primer/doc-build/chapter.xml | 2 +-
.../books/fdp-primer/examples/appendix.xml | 2 +-
.../books/fdp-primer/overview/chapter.xml | 2 +-
.../books/fdp-primer/psgml-mode/chapter.xml | 2 +-
.../books/fdp-primer/see-also/chapter.xml | 2 +-
.../books/fdp-primer/sgml-markup/chapter.xml | 2 +-
.../books/fdp-primer/sgml-primer/chapter.xml | 26 +--
.../books/fdp-primer/structure/chapter.xml | 2 +-
.../books/fdp-primer/stylesheets/chapter.xml | 2 +-
.../books/fdp-primer/the-website/chapter.xml | 2 +-
.../books/fdp-primer/tools/chapter.xml | 2 +-
.../books/fdp-primer/translations/chapter.xml | 2 +-
.../fdp-primer/writing-style/chapter.xml | 4 +-
en_US.ISO8859-1/books/handbook/Makefile | 36 +++-
.../handbook/advanced-networking/chapter.xml | 2 +-
.../books/handbook/audit/chapter.xml | 2 +-
.../books/handbook/basics/chapter.xml | 2 +-
.../books/handbook/bibliography/chapter.xml | 2 +-
.../books/handbook/boot/chapter.xml | 2 +-
.../books/handbook/bsdinstall/chapter.xml | 2 +-
en_US.ISO8859-1/books/handbook/chapters.ent | 184 +-----------------
en_US.ISO8859-1/books/handbook/colophon.xml | 2 +-
.../books/handbook/config/chapter.xml | 4 +-
.../books/handbook/cutting-edge/chapter.xml | 10 +-
.../books/handbook/desktop/chapter.xml | 2 +-
.../books/handbook/disks/chapter.xml | 17 +-
.../books/handbook/dtrace/chapter.xml | 2 +-
.../books/handbook/eresources/chapter.xml | 7 +-
.../books/handbook/filesystems/chapter.xml | 2 +-
.../books/handbook/firewalls/chapter.xml | 2 +-
.../books/handbook/geom/chapter.xml | 2 +-
.../books/handbook/install/chapter.xml | 2 +-
.../books/handbook/introduction/chapter.xml | 2 +-
.../books/handbook/jails/chapter.xml | 2 +-
.../books/handbook/kernelconfig/chapter.xml | 2 +-
.../books/handbook/l10n/chapter.xml | 2 +-
.../books/handbook/linuxemu/chapter.xml | 4 +-
.../books/handbook/mac/chapter.xml | 2 +-
.../books/handbook/mail/chapter.xml | 2 +-
.../books/handbook/mirrors/chapter.xml | 10 +-
.../books/handbook/multimedia/chapter.xml | 4 +-
.../handbook/network-servers/chapter.xml | 2 +-
.../books/handbook/pgpkeys/chapter.xml | 2 +-
.../books/handbook/ports/chapter.xml | 2 +-
.../books/handbook/ppp-and-slip/chapter.xml | 2 +-
.../books/handbook/preface/preface.xml | 2 +-
.../books/handbook/printing/chapter.xml | 2 +-
.../books/handbook/security/chapter.xml | 2 +-
.../books/handbook/serialcomms/chapter.xml | 2 +-
.../books/handbook/users/chapter.xml | 2 +-
.../books/handbook/vinum/chapter.xml | 2 +-
.../books/handbook/virtualization/chapter.xml | 4 +-
.../books/handbook/x11/chapter.xml | 2 +-
.../books/pmake/answers/chapter.xml | 2 +-
.../books/pmake/basics/chapter.xml | 2 +-
.../books/pmake/glossary/glossary.xml | 2 +-
en_US.ISO8859-1/books/pmake/gods/chapter.xml | 2 +-
en_US.ISO8859-1/books/pmake/intro/chapter.xml | 2 +-
.../books/pmake/shortcuts/chapter.xml | 2 +-
.../books/porters-handbook/book.xml | 16 +-
99 files changed, 179 insertions(+), 343 deletions(-)
diff --git a/en_US.ISO8859-1/articles/committers-guide/article.xml b/en_US.ISO8859-1/articles/committers-guide/article.xml
index 1bbae473b3..4ebe7151c0 100644
--- a/en_US.ISO8859-1/articles/committers-guide/article.xml
+++ b/en_US.ISO8859-1/articles/committers-guide/article.xml
@@ -3843,7 +3843,7 @@ U stable/9/share/man/man4/netmap.4
specifically permitted by portmgr. Complete details
about what qualifies as a sweeping change can be found
on the <ulink
- url="&url.base/portmgr/implementation.html">Portmgr
+ url="&url.base;/portmgr/implementation.html">Portmgr
Implementation page</ulink>.</para>
<para>The benefit of a slush as opposed to a complete
diff --git a/en_US.ISO8859-1/articles/contributors/contrib.386bsd.xml b/en_US.ISO8859-1/articles/contributors/contrib.386bsd.xml
index 1d9100b739..398ff330aa 100644
--- a/en_US.ISO8859-1/articles/contributors/contrib.386bsd.xml
+++ b/en_US.ISO8859-1/articles/contributors/contrib.386bsd.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- $FreeBSD$ -->
<itemizedlist>
diff --git a/en_US.ISO8859-1/articles/contributors/contrib.additional.xml b/en_US.ISO8859-1/articles/contributors/contrib.additional.xml
index 78b401a1a1..02ba44b40c 100644
--- a/en_US.ISO8859-1/articles/contributors/contrib.additional.xml
+++ b/en_US.ISO8859-1/articles/contributors/contrib.additional.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- $FreeBSD$ -->
<!--
NOTE TO COMMITTERS: Contributors lists are sorted in alphabetical
diff --git a/en_US.ISO8859-1/articles/contributors/contrib.committers.xml b/en_US.ISO8859-1/articles/contributors/contrib.committers.xml
index 2adb6cb171..ba64dac81c 100644
--- a/en_US.ISO8859-1/articles/contributors/contrib.committers.xml
+++ b/en_US.ISO8859-1/articles/contributors/contrib.committers.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- $FreeBSD$ -->
<!--
NOTE TO NEW COMMITTERS: Core and committers lists are sorted in
diff --git a/en_US.ISO8859-1/articles/contributors/contrib.corealumni.xml b/en_US.ISO8859-1/articles/contributors/contrib.corealumni.xml
index d971803318..0f42288312 100644
--- a/en_US.ISO8859-1/articles/contributors/contrib.corealumni.xml
+++ b/en_US.ISO8859-1/articles/contributors/contrib.corealumni.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- $FreeBSD$ -->
<itemizedlist>
diff --git a/en_US.ISO8859-1/articles/contributors/contrib.develalumni.xml b/en_US.ISO8859-1/articles/contributors/contrib.develalumni.xml
index 02b6c2ced3..7ab3b549b0 100644
--- a/en_US.ISO8859-1/articles/contributors/contrib.develalumni.xml
+++ b/en_US.ISO8859-1/articles/contributors/contrib.develalumni.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- $FreeBSD$ -->
<itemizedlist>
diff --git a/en_US.ISO8859-1/articles/contributors/contrib.develinmemoriam.xml b/en_US.ISO8859-1/articles/contributors/contrib.develinmemoriam.xml
index 12fa30b4cf..4c7d03fe7c 100644
--- a/en_US.ISO8859-1/articles/contributors/contrib.develinmemoriam.xml
+++ b/en_US.ISO8859-1/articles/contributors/contrib.develinmemoriam.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- $FreeBSD$ -->
<itemizedlist>
@@ -7,7 +7,7 @@
<para>
<ulink url="http://hub.opensolaris.org/bin/view/Community+Group+ogb/In+Memoriam">John</ulink>
made major contributions to FreeBSD, the best known of which
- is the import of the &man.dtrace.1 code. John's unique sense
+ is the import of the &man.dtrace.1; code. John's unique sense
of humor and plain-spokenness either ruffled feathers or
made him quick friends. At the end of his life, he had
moved to a rural area and was attempting to live with
diff --git a/en_US.ISO8859-1/articles/custom-gcc/article.xml b/en_US.ISO8859-1/articles/custom-gcc/article.xml
index 95c88263d6..8d2bf73b6d 100644
--- a/en_US.ISO8859-1/articles/custom-gcc/article.xml
+++ b/en_US.ISO8859-1/articles/custom-gcc/article.xml
@@ -77,7 +77,7 @@
<application>binutils</application> using the &os; ports tree,
issue the following command:</para>
- <screen>&prompt.root; <userinput>cd /usr/ports/devel/binutils && make install</userinput></screen>
+ <screen>&prompt.root; <userinput>cd /usr/ports/devel/binutils && make install</userinput></screen>
</sect2>
<sect2 id="installing-gcc">
@@ -94,7 +94,7 @@
<application>GCC</application> ports, run the following
command:</para>
- <screen>&prompt.root; <userinput>cd /usr/ports/lang/<replaceable>gcc44</replaceable> && make install</userinput></screen>
+ <screen>&prompt.root; <userinput>cd /usr/ports/lang/<replaceable>gcc44</replaceable> && make install</userinput></screen>
</sect2>
</sect1>
@@ -113,7 +113,7 @@
<filename>/etc/make.conf</filename> file (or modify
appropriately):</para>
- <programlisting>.if !empty(.CURDIR:M/usr/ports/*) && exists(/usr/local/bin/gcc44)
+ <programlisting>.if !empty(.CURDIR:M/usr/ports/*) && exists(/usr/local/bin/gcc44)
CC=gcc44
CXX=g++44
CPP=cpp44
@@ -172,7 +172,7 @@ libstdc++.so.6 gcc44/libstdc++.so.6</programlisting>
<filename>/etc/make.conf</filename> according to the following
example:</para>
- <programlisting>.if !empty(.CURDIR:M/usr/ports/*) && exists(/usr/local/bin/gcc44)
+ <programlisting>.if !empty(.CURDIR:M/usr/ports/*) && exists(/usr/local/bin/gcc44)
CC=gcc44
CXX=g++44
CPP=cpp44
@@ -195,7 +195,7 @@ CFLAGS+=-mssse3
<filename>/etc/make.conf</filename> according to the following
example:</para>
- <programlisting>.if !empty(.CURDIR:M/usr/ports/*) && exists(/usr/local/bin/gcc44)
+ <programlisting>.if !empty(.CURDIR:M/usr/ports/*) && exists(/usr/local/bin/gcc44)
.if empty(.CURDIR:M/usr/ports/net/openldap*)
CC=gcc44
CXX=g++44
@@ -208,7 +208,7 @@ CPP=cpp44
<filename role="package">net/openldap</filename>* ports. It is
also possible to specify more ports on a single line:</para>
- <programlisting>.if empty(.CURDIR:M/usr/ports/net/openldap*) && empty(.CURDIR:M/usr/ports/xxx/yyy) && ...</programlisting>
+ <programlisting>.if empty(.CURDIR:M/usr/ports/net/openldap*) && empty(.CURDIR:M/usr/ports/xxx/yyy) && ...</programlisting>
</sect2>
</sect1>
diff --git a/en_US.ISO8859-1/articles/freebsd-update-server/article.xml b/en_US.ISO8859-1/articles/freebsd-update-server/article.xml
index d5ed5655ea..ca0400d20a 100644
--- a/en_US.ISO8859-1/articles/freebsd-update-server/article.xml
+++ b/en_US.ISO8859-1/articles/freebsd-update-server/article.xml
@@ -792,14 +792,14 @@ the new builds.</screen>
<screen> # Build the world
log "Building world"
- cd /usr/src &&
- make -j 2 ${COMPATFLAGS} buildworld 2>&1
+ cd /usr/src &&
+ make -j 2 ${COMPATFLAGS} buildworld 2>&1
# Distribute the world
log "Distributing world"
- cd /usr/src/release &&
- make -j 2 obj &&
- make ${COMPATFLAGS} release.1 release.2 2>&1</screen>
+ cd /usr/src/release &&
+ make -j 2 obj &&
+ make ${COMPATFLAGS} release.1 release.2 2>&1</screen>
</listitem>
<listitem>
diff --git a/en_US.ISO8859-1/articles/port-mentor-guidelines/article.xml b/en_US.ISO8859-1/articles/port-mentor-guidelines/article.xml
index 35c9897cf5..949f37fe59 100644
--- a/en_US.ISO8859-1/articles/port-mentor-guidelines/article.xml
+++ b/en_US.ISO8859-1/articles/port-mentor-guidelines/article.xml
@@ -127,8 +127,8 @@
<para>We expect mentors to make sure their mentees read the
<ulink url="&url.books.porters-handbook;">Porter's
Handbook</ulink>, the <ulink
- url="&url.articles.pr-guidelines">PR handling guide</ulink>, and
- the <ulink url="&url.articles.committers-guide">Committer's
+ url="&url.articles.pr-guidelines;">PR handling guide</ulink>, and
+ the <ulink url="&url.articles.committers-guide;">Committer's
Guide</ulink>. While it's not necessary to memorize all the
details, every committer needs to have an overview of these
things to be an effective part of the community (and avoid as
diff --git a/en_US.ISO8859-1/articles/portbuild/article.xml b/en_US.ISO8859-1/articles/portbuild/article.xml
index 1fee3cae2b..b1cbd0bf61 100644
--- a/en_US.ISO8859-1/articles/portbuild/article.xml
+++ b/en_US.ISO8859-1/articles/portbuild/article.xml
@@ -54,7 +54,7 @@
<note>
<para>Many of the details in this article will be of interest only to
- those on the <ulink url="&url.base/portmgr">Ports Management</ulink>
+ those on the <ulink url="&url.base;/portmgr">Ports Management</ulink>
team.</para>
</note>
@@ -2566,7 +2566,7 @@ cd /var/portbuild/<replaceable>arch</replaceable></screen>
</listitem>
<listitem>
- <para><screen>cd .ssh && ssh-keygen</screen></para>
+ <para><screen>cd .ssh && ssh-keygen</screen></para>
</listitem>
<listitem>
diff --git a/en_US.ISO8859-1/books/arch-handbook/boot/chapter.xml b/en_US.ISO8859-1/books/arch-handbook/boot/chapter.xml
index 08776a032e..014d603427 100644
--- a/en_US.ISO8859-1/books/arch-handbook/boot/chapter.xml
+++ b/en_US.ISO8859-1/books/arch-handbook/boot/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/arch-handbook/chapters.ent b/en_US.ISO8859-1/books/arch-handbook/chapters.ent
index d36157997c..7fdd3df4ad 100644
--- a/en_US.ISO8859-1/books/arch-handbook/chapters.ent
+++ b/en_US.ISO8859-1/books/arch-handbook/chapters.ent
@@ -33,7 +33,7 @@
<!ENTITY chap.pccard SYSTEM "pccard/chapter.xml">
<!-- Part three - Appendices -->
-<![%chap.index[
+<![%chap.index;[
<!ENTITY chap.index SYSTEM "index.xml">
]]>
<!ENTITY chap.index "">
diff --git a/en_US.ISO8859-1/books/arch-handbook/driverbasics/chapter.xml b/en_US.ISO8859-1/books/arch-handbook/driverbasics/chapter.xml
index 9b653e41ca..f70027a2e9 100644
--- a/en_US.ISO8859-1/books/arch-handbook/driverbasics/chapter.xml
+++ b/en_US.ISO8859-1/books/arch-handbook/driverbasics/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/arch-handbook/isa/chapter.xml b/en_US.ISO8859-1/books/arch-handbook/isa/chapter.xml
index d046c2aa88..20a2996f02 100644
--- a/en_US.ISO8859-1/books/arch-handbook/isa/chapter.xml
+++ b/en_US.ISO8859-1/books/arch-handbook/isa/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/arch-handbook/jail/chapter.xml b/en_US.ISO8859-1/books/arch-handbook/jail/chapter.xml
index 0cd77ee50e..b89c74b760 100644
--- a/en_US.ISO8859-1/books/arch-handbook/jail/chapter.xml
+++ b/en_US.ISO8859-1/books/arch-handbook/jail/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/arch-handbook/kobj/chapter.xml b/en_US.ISO8859-1/books/arch-handbook/kobj/chapter.xml
index ee0c27679b..ef59555739 100644
--- a/en_US.ISO8859-1/books/arch-handbook/kobj/chapter.xml
+++ b/en_US.ISO8859-1/books/arch-handbook/kobj/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/arch-handbook/locking/chapter.xml b/en_US.ISO8859-1/books/arch-handbook/locking/chapter.xml
index 0818c0fbdd..4486cfb648 100644
--- a/en_US.ISO8859-1/books/arch-handbook/locking/chapter.xml
+++ b/en_US.ISO8859-1/books/arch-handbook/locking/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD SMP Next Generation Project
diff --git a/en_US.ISO8859-1/books/arch-handbook/mac/chapter.xml b/en_US.ISO8859-1/books/arch-handbook/mac/chapter.xml
index 483889c9dc..0fbd8d6440 100644
--- a/en_US.ISO8859-1/books/arch-handbook/mac/chapter.xml
+++ b/en_US.ISO8859-1/books/arch-handbook/mac/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
Copyright (c) 2002-2005 Networks Associates Technology, Inc.
All rights reserved.
diff --git a/en_US.ISO8859-1/books/arch-handbook/newbus/chapter.xml b/en_US.ISO8859-1/books/arch-handbook/newbus/chapter.xml
index 7fd0152d02..3f62902a88 100644
--- a/en_US.ISO8859-1/books/arch-handbook/newbus/chapter.xml
+++ b/en_US.ISO8859-1/books/arch-handbook/newbus/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
$FreeBSD$
diff --git a/en_US.ISO8859-1/books/arch-handbook/pccard/chapter.xml b/en_US.ISO8859-1/books/arch-handbook/pccard/chapter.xml
index 301de79aee..14e9e36995 100644
--- a/en_US.ISO8859-1/books/arch-handbook/pccard/chapter.xml
+++ b/en_US.ISO8859-1/books/arch-handbook/pccard/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/arch-handbook/pci/chapter.xml b/en_US.ISO8859-1/books/arch-handbook/pci/chapter.xml
index 272b6aab3e..b6f5aff26d 100644
--- a/en_US.ISO8859-1/books/arch-handbook/pci/chapter.xml
+++ b/en_US.ISO8859-1/books/arch-handbook/pci/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/arch-handbook/scsi/chapter.xml b/en_US.ISO8859-1/books/arch-handbook/scsi/chapter.xml
index bdd4fd3928..9d0c293e2b 100644
--- a/en_US.ISO8859-1/books/arch-handbook/scsi/chapter.xml
+++ b/en_US.ISO8859-1/books/arch-handbook/scsi/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/arch-handbook/smp/chapter.xml b/en_US.ISO8859-1/books/arch-handbook/smp/chapter.xml
index 0d0f001e6c..69acb41e19 100644
--- a/en_US.ISO8859-1/books/arch-handbook/smp/chapter.xml
+++ b/en_US.ISO8859-1/books/arch-handbook/smp/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD SMP Next Generation Project
diff --git a/en_US.ISO8859-1/books/arch-handbook/sound/chapter.xml b/en_US.ISO8859-1/books/arch-handbook/sound/chapter.xml
index b21a45a2bd..4ce5564a02 100644
--- a/en_US.ISO8859-1/books/arch-handbook/sound/chapter.xml
+++ b/en_US.ISO8859-1/books/arch-handbook/sound/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/arch-handbook/sysinit/chapter.xml b/en_US.ISO8859-1/books/arch-handbook/sysinit/chapter.xml
index 01b91357c1..7898ee7e2e 100644
--- a/en_US.ISO8859-1/books/arch-handbook/sysinit/chapter.xml
+++ b/en_US.ISO8859-1/books/arch-handbook/sysinit/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/arch-handbook/usb/chapter.xml b/en_US.ISO8859-1/books/arch-handbook/usb/chapter.xml
index 95f0a6e5c5..938519b241 100644
--- a/en_US.ISO8859-1/books/arch-handbook/usb/chapter.xml
+++ b/en_US.ISO8859-1/books/arch-handbook/usb/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/arch-handbook/vm/chapter.xml b/en_US.ISO8859-1/books/arch-handbook/vm/chapter.xml
index af2d1d5f50..47726b04c3 100644
--- a/en_US.ISO8859-1/books/arch-handbook/vm/chapter.xml
+++ b/en_US.ISO8859-1/books/arch-handbook/vm/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/developers-handbook/introduction/chapter.xml b/en_US.ISO8859-1/books/developers-handbook/introduction/chapter.xml
index 6c53a7d0ee..0f7e8270b7 100644
--- a/en_US.ISO8859-1/books/developers-handbook/introduction/chapter.xml
+++ b/en_US.ISO8859-1/books/developers-handbook/introduction/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/developers-handbook/ipv6/chapter.xml b/en_US.ISO8859-1/books/developers-handbook/ipv6/chapter.xml
index 15cfb17c23..66c0ff75b9 100644
--- a/en_US.ISO8859-1/books/developers-handbook/ipv6/chapter.xml
+++ b/en_US.ISO8859-1/books/developers-handbook/ipv6/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/developers-handbook/kernelbuild/chapter.xml b/en_US.ISO8859-1/books/developers-handbook/kernelbuild/chapter.xml
index 0857fc51d4..0c147b8eb6 100644
--- a/en_US.ISO8859-1/books/developers-handbook/kernelbuild/chapter.xml
+++ b/en_US.ISO8859-1/books/developers-handbook/kernelbuild/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/developers-handbook/kerneldebug/chapter.xml b/en_US.ISO8859-1/books/developers-handbook/kerneldebug/chapter.xml
index 1f78263b6e..3f90f40252 100644
--- a/en_US.ISO8859-1/books/developers-handbook/kerneldebug/chapter.xml
+++ b/en_US.ISO8859-1/books/developers-handbook/kerneldebug/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/developers-handbook/l10n/chapter.xml b/en_US.ISO8859-1/books/developers-handbook/l10n/chapter.xml
index dd13a7a2fc..cced92ce05 100644
--- a/en_US.ISO8859-1/books/developers-handbook/l10n/chapter.xml
+++ b/en_US.ISO8859-1/books/developers-handbook/l10n/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/developers-handbook/policies/chapter.xml b/en_US.ISO8859-1/books/developers-handbook/policies/chapter.xml
index 01cb12ae08..2451e051e2 100644
--- a/en_US.ISO8859-1/books/developers-handbook/policies/chapter.xml
+++ b/en_US.ISO8859-1/books/developers-handbook/policies/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/developers-handbook/secure/chapter.xml b/en_US.ISO8859-1/books/developers-handbook/secure/chapter.xml
index e35fe1afdd..4a655c189c 100644
--- a/en_US.ISO8859-1/books/developers-handbook/secure/chapter.xml
+++ b/en_US.ISO8859-1/books/developers-handbook/secure/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/developers-handbook/sockets/chapter.xml b/en_US.ISO8859-1/books/developers-handbook/sockets/chapter.xml
index 89b29f957a..7cb263be69 100644
--- a/en_US.ISO8859-1/books/developers-handbook/sockets/chapter.xml
+++ b/en_US.ISO8859-1/books/developers-handbook/sockets/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/developers-handbook/testing/chapter.xml b/en_US.ISO8859-1/books/developers-handbook/testing/chapter.xml
index 9470863c45..0ac3cbdd6a 100644
--- a/en_US.ISO8859-1/books/developers-handbook/testing/chapter.xml
+++ b/en_US.ISO8859-1/books/developers-handbook/testing/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/developers-handbook/tools/chapter.xml b/en_US.ISO8859-1/books/developers-handbook/tools/chapter.xml
index d1df3354ae..bba1da5520 100644
--- a/en_US.ISO8859-1/books/developers-handbook/tools/chapter.xml
+++ b/en_US.ISO8859-1/books/developers-handbook/tools/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/developers-handbook/x86/chapter.xml b/en_US.ISO8859-1/books/developers-handbook/x86/chapter.xml
index 65e17b742b..dafbb31103 100644
--- a/en_US.ISO8859-1/books/developers-handbook/x86/chapter.xml
+++ b/en_US.ISO8859-1/books/developers-handbook/x86/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/fdp-primer/doc-build/chapter.xml b/en_US.ISO8859-1/books/fdp-primer/doc-build/chapter.xml
index 7b969da21a..05d5abbea4 100644
--- a/en_US.ISO8859-1/books/fdp-primer/doc-build/chapter.xml
+++ b/en_US.ISO8859-1/books/fdp-primer/doc-build/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Copyright (c) 1999 Neil Blakey-Milner, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/en_US.ISO8859-1/books/fdp-primer/examples/appendix.xml b/en_US.ISO8859-1/books/fdp-primer/examples/appendix.xml
index 95bd162179..ee6b7e139e 100644
--- a/en_US.ISO8859-1/books/fdp-primer/examples/appendix.xml
+++ b/en_US.ISO8859-1/books/fdp-primer/examples/appendix.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Copyright (c) 2000 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/en_US.ISO8859-1/books/fdp-primer/overview/chapter.xml b/en_US.ISO8859-1/books/fdp-primer/overview/chapter.xml
index 2930c47f9f..c62fbc470e 100644
--- a/en_US.ISO8859-1/books/fdp-primer/overview/chapter.xml
+++ b/en_US.ISO8859-1/books/fdp-primer/overview/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/en_US.ISO8859-1/books/fdp-primer/psgml-mode/chapter.xml b/en_US.ISO8859-1/books/fdp-primer/psgml-mode/chapter.xml
index 9901723f10..6e8dd4ef35 100644
--- a/en_US.ISO8859-1/books/fdp-primer/psgml-mode/chapter.xml
+++ b/en_US.ISO8859-1/books/fdp-primer/psgml-mode/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/en_US.ISO8859-1/books/fdp-primer/see-also/chapter.xml b/en_US.ISO8859-1/books/fdp-primer/see-also/chapter.xml
index 64da1923c8..65f4df3962 100644
--- a/en_US.ISO8859-1/books/fdp-primer/see-also/chapter.xml
+++ b/en_US.ISO8859-1/books/fdp-primer/see-also/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml b/en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml
index 1a1e9d9372..9ada557496 100644
--- a/en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml
+++ b/en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/en_US.ISO8859-1/books/fdp-primer/sgml-primer/chapter.xml b/en_US.ISO8859-1/books/fdp-primer/sgml-primer/chapter.xml
index 7a9929df52..f24a2b0848 100644
--- a/en_US.ISO8859-1/books/fdp-primer/sgml-primer/chapter.xml
+++ b/en_US.ISO8859-1/books/fdp-primer/sgml-primer/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
@@ -828,28 +828,6 @@ example.xml:5: element head: validity error : Element head content does not foll
-- doing multiline comments -->]]></programlisting>
</example>
- <![%output.print;[
- <important>
- <title>Use 2 Dashes</title>
-
- <para>There is a problem with producing the Postscript and PDF
- versions of this document. The above example probably shows
- just one hyphen symbol, <literal>-</literal> after the
- <literal><!</literal> and before the
- <literal>></literal>.</para>
-
- <para>You <emphasis>must</emphasis> use two
- <literal>-</literal>, <emphasis>not</emphasis> one. The
- Postscript and PDF versions have translated the two
- <literal>-</literal> in the original to a longer, more
- professional <emphasis>em-dash</emphasis>, and broken this
- example in the process.</para>
-
- <para>The XHTML, plain text, and RTF versions of this document
- are not affected.</para>
- </important>
- ]]>
-
<para>If you have used XHTML before you may have been shown
different rules for comments. In particular, you may think that
the string <literal><!--</literal> opens a comment, and it is
@@ -1357,7 +1335,7 @@ example.xml:5: element head: validity error : Element head content does not foll
</example>
<para>As you would expect, being an XML construct, a marked
- section starts with <literal><!</literal>.</para>
+ section starts with <literal><!</literal>.</para>
<para>The first square bracket begins to delimit the marked
section.</para>
diff --git a/en_US.ISO8859-1/books/fdp-primer/structure/chapter.xml b/en_US.ISO8859-1/books/fdp-primer/structure/chapter.xml
index 0111965b9e..7a688264b4 100644
--- a/en_US.ISO8859-1/books/fdp-primer/structure/chapter.xml
+++ b/en_US.ISO8859-1/books/fdp-primer/structure/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/en_US.ISO8859-1/books/fdp-primer/stylesheets/chapter.xml b/en_US.ISO8859-1/books/fdp-primer/stylesheets/chapter.xml
index 23126ed4b8..bfdbca8f4e 100644
--- a/en_US.ISO8859-1/books/fdp-primer/stylesheets/chapter.xml
+++ b/en_US.ISO8859-1/books/fdp-primer/stylesheets/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/en_US.ISO8859-1/books/fdp-primer/the-website/chapter.xml b/en_US.ISO8859-1/books/fdp-primer/the-website/chapter.xml
index 4a621e79b5..c72ecfa11a 100644
--- a/en_US.ISO8859-1/books/fdp-primer/the-website/chapter.xml
+++ b/en_US.ISO8859-1/books/fdp-primer/the-website/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/en_US.ISO8859-1/books/fdp-primer/tools/chapter.xml b/en_US.ISO8859-1/books/fdp-primer/tools/chapter.xml
index 979b907ffd..f915276fb0 100644
--- a/en_US.ISO8859-1/books/fdp-primer/tools/chapter.xml
+++ b/en_US.ISO8859-1/books/fdp-primer/tools/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/en_US.ISO8859-1/books/fdp-primer/translations/chapter.xml b/en_US.ISO8859-1/books/fdp-primer/translations/chapter.xml
index 296142dbb9..2219e73282 100644
--- a/en_US.ISO8859-1/books/fdp-primer/translations/chapter.xml
+++ b/en_US.ISO8859-1/books/fdp-primer/translations/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Copyright (c) 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.xml b/en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.xml
index 3c4f95790d..b272a6f880 100644
--- a/en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.xml
+++ b/en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Copyright (c) 1998 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
@@ -185,7 +185,7 @@
<emphasis>not</emphasis> <sgmltag>PARA</sgmltag>.</para>
<para>Text that appears in SGML contexts is generally written in
- upper case, <literal><!ENTITY…></literal>, and
+ upper case, <literal><!ENTITY…></literal>, and
<literal><!DOCTYPE…></literal>,
<emphasis>not</emphasis>
<literal><!entity…></literal> and
diff --git a/en_US.ISO8859-1/books/handbook/Makefile b/en_US.ISO8859-1/books/handbook/Makefile
index c95d4c46b8..8f09bff7a2 100644
--- a/en_US.ISO8859-1/books/handbook/Makefile
+++ b/en_US.ISO8859-1/books/handbook/Makefile
@@ -315,30 +315,56 @@ DOC_PREFIX?= ${.CURDIR}/../../..
#
# rules generating lists of mirror site from XML database.
#
-XMLDOCS= mirrors-ftp:::mirrors.xml.ftp.inc \
+XMLDOCS= lastmod:::mirrors.lastmod.inc \
+ mirrors-ftp-index:::mirrors.xml.ftp.index.inc \
+ mirrors-ftp:::mirrors.xml.ftp.inc \
+ mirrors-cvsup-index:::mirrors.xml.cvsup.index.inc \
mirrors-cvsup:::mirrors.xml.cvsup.inc \
+ eresources-index:::eresources.xml.www.index.inc \
eresources:::eresources.xml.www.inc
DEPENDSET.DEFAULT= transtable mirror
XSLT.DEFAULT= ${XSL_MIRRORS}
XML.DEFAULT= ${XML_MIRRORS}
NO_TIDY.DEFAULT= yes
+PARAMS.lastmod+= --param 'target' "'lastmod'"
+PARAMS.mirrors-ftp-index+= --param 'type' "'ftp'" \
+ --param 'proto' "'ftp'" \
+ --param 'target' "'index'"
PARAMS.mirrors-ftp+= --param 'type' "'ftp'" \
--param 'proto' "'ftp'" \
--param 'target' "'handbook/mirrors/chapter.xml'"
+PARAMS.mirrors-cvsup-index+= --param 'type' "'cvsup'" \
+ --param 'proto' "'cvsup'" \
+ --param 'target' "'index'"
PARAMS.mirrors-cvsup+= --param 'type' "'cvsup'" \
--param 'proto' "'cvsup'" \
--param 'target' "'handbook/mirrors/chapter.xml'"
+PARAMS.eresources-index+= --param 'type' "'www'" \
+ --param 'proto' "'http'" \
+ --param 'target' "'index'"
PARAMS.eresources+= --param 'type' "'www'" \
--param 'proto' "'http'" \
--param 'target' "'handbook/eresources/chapter.xml'"
-SRCS+= mirrors.xml.ftp.inc \
+SRCS+= mirrors.lastmod.inc \
+ mirrors.xml.ftp.inc \
+ mirrors.xml.ftp.index.inc \
mirrors.xml.cvsup.inc \
- eresources.xml.www.inc
+ mirrors.xml.cvsup.index.inc \
+ eresources.xml.www.inc \
+ eresources.xml.www.index.inc
-CLEANFILES+= mirrors.xml.ftp.inc \
+SRCS+= mirrors.lastmod.inc \
+ mirrors.xml.ftp.inc \
+ mirrors.xml.ftp.index.inc \
mirrors.xml.cvsup.inc \
- eresources.xml.www.inc
+ mirrors.xml.cvsup.index.inc \
+ eresources.xml.www.inc \
+ eresources.xml.www.index.inc
+
+lint: mirrors.lastmod.inc mirrors.xml.ftp.inc mirrors.xml.ftp.index.inc \
+ mirrors.xml.cvsup.inc mirrors.xml.cvsup.index.inc \
+ eresources.xml.www.inc eresources.xml.www.index.inc
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml b/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml
index de262b5ddf..57bf23600b 100644
--- a/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/handbook/audit/chapter.xml b/en_US.ISO8859-1/books/handbook/audit/chapter.xml
index be5714458e..f8ed65c041 100644
--- a/en_US.ISO8859-1/books/handbook/audit/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/audit/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
$FreeBSD$
diff --git a/en_US.ISO8859-1/books/handbook/basics/chapter.xml b/en_US.ISO8859-1/books/handbook/basics/chapter.xml
index 587749831b..2b45e4a68d 100644
--- a/en_US.ISO8859-1/books/handbook/basics/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/basics/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/handbook/bibliography/chapter.xml b/en_US.ISO8859-1/books/handbook/bibliography/chapter.xml
index 03d8a27211..2b7bdece60 100644
--- a/en_US.ISO8859-1/books/handbook/bibliography/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/bibliography/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/handbook/boot/chapter.xml b/en_US.ISO8859-1/books/handbook/boot/chapter.xml
index ab2478c416..2e865047b1 100644
--- a/en_US.ISO8859-1/books/handbook/boot/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/boot/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/handbook/bsdinstall/chapter.xml b/en_US.ISO8859-1/books/handbook/bsdinstall/chapter.xml
index 5cfcc52f2c..0be0d592eb 100644
--- a/en_US.ISO8859-1/books/handbook/bsdinstall/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/bsdinstall/chapter.xml
@@ -162,7 +162,7 @@
multiple CPUs.</para>
<para>A 32-bit kernel can only use the first 2 GB of RAM.
- &firewire; is not supported on the Blue & White PowerMac
+ &firewire; is not supported on the Blue & White PowerMac
G3.</para>
</sect3>
diff --git a/en_US.ISO8859-1/books/handbook/chapters.ent b/en_US.ISO8859-1/books/handbook/chapters.ent
index a2a9455f59..6ac388f3c9 100644
--- a/en_US.ISO8859-1/books/handbook/chapters.ent
+++ b/en_US.ISO8859-1/books/handbook/chapters.ent
@@ -10,235 +10,63 @@
$FreeBSD$
-->
-<!ENTITY % not.published "INCLUDE">
-
-<!ENTITY % chap.introduction "IGNORE">
-<!ENTITY % chap.install "IGNORE">
-<!ENTITY % chap.bsdinstall "IGNORE">
-<!ENTITY % chap.basics "IGNORE">
-<!ENTITY % chap.ports "IGNORE">
-<!ENTITY % chap.config "IGNORE">
-<!ENTITY % chap.boot "IGNORE">
-<!ENTITY % chap.users "IGNORE">
-<!ENTITY % chap.kernelconfig "IGNORE">
-<!ENTITY % chap.security "IGNORE">
-<!ENTITY % chap.jails "IGNORE">
-<!ENTITY % chap.printing "IGNORE">
-<!ENTITY % chap.disks "IGNORE">
-<!ENTITY % chap.geom "IGNORE">
-<!ENTITY % chap.vinum "IGNORE">
-<!ENTITY % chap.x11 "IGNORE">
-<!ENTITY % chap.l10n "IGNORE">
-<!ENTITY % chap.multimedia "IGNORE">
-<!ENTITY % chap.desktop "IGNORE">
-<!ENTITY % chap.serialcomms "IGNORE">
-<!ENTITY % chap.ppp-and-slip "IGNORE">
-<!ENTITY % chap.advanced-networking "IGNORE">
-<!ENTITY % chap.firewalls "IGNORE">
-<!ENTITY % chap.network-servers "IGNORE">
-<!ENTITY % chap.mail "IGNORE">
-<!ENTITY % chap.cutting-edge "IGNORE">
-<!ENTITY % chap.linuxemu "IGNORE">
-<!ENTITY % chap.mirrors "IGNORE">
-<!ENTITY % chap.mirrors.ftp.inc "INCLUDE">
-<!ENTITY % chap.mirrors.cvsup.inc "INCLUDE">
-<!ENTITY % chap.bibliography "IGNORE">
-<!ENTITY % chap.eresources "IGNORE">
-<!ENTITY % chap.eresources.www.inc "INCLUDE">
-<!ENTITY % chap.pgpkeys "IGNORE">
-<!ENTITY % chap.index "IGNORE">
-<!ENTITY % chap.freebsd-glossary "IGNORE">
-<!ENTITY % chap.mac "IGNORE">
-<!ENTITY % chap.audit "IGNORE">
-<!ENTITY % chap.filesystems "IGNORE">
-<!ENTITY % chap.dtrace "IGNORE">
-
<!ENTITY chap.preface SYSTEM "preface/preface.xml">
<!ENTITY % pgpkeys SYSTEM "../../../share/pgpkeys/pgpkeys.ent"> %pgpkeys;
<!-- Part One -->
-<![%chap.introduction;[
<!ENTITY chap.introduction SYSTEM "introduction/chapter.xml">
-]]>
-<![%chap.install;[
<!ENTITY chap.install SYSTEM "install/chapter.xml">
-]]>
-<![%chap.bsdinstall;[
<!ENTITY chap.bsdinstall SYSTEM "bsdinstall/chapter.xml">
-]]>
-<![%chap.basics;[
<!ENTITY chap.basics SYSTEM "basics/chapter.xml">
-]]>
-<![%chap.ports;[
<!ENTITY chap.ports SYSTEM "ports/chapter.xml">
-]]>
-<![%chap.x11;[
<!ENTITY chap.x11 SYSTEM "x11/chapter.xml">
-]]>
<!-- Part Two -->
-<![%chap.desktop;[
<!ENTITY chap.desktop SYSTEM "desktop/chapter.xml">
-]]>
-<![%chap.multimedia;[
<!ENTITY chap.multimedia SYSTEM "multimedia/chapter.xml">
-]]>
-<![%chap.kernelconfig;[
<!ENTITY chap.kernelconfig SYSTEM "kernelconfig/chapter.xml">
-]]>
-<![%chap.printing;[
<!ENTITY chap.printing SYSTEM "printing/chapter.xml">
-]]>
-<![%chap.linuxemu;[
<!ENTITY chap.linuxemu SYSTEM "linuxemu/chapter.xml">
-]]>
<!-- Part Three -->
-<![%chap.config;[
<!ENTITY chap.config SYSTEM "config/chapter.xml">
-]]>
-<![%chap.boot;[
<!ENTITY chap.boot SYSTEM "boot/chapter.xml">
-]]>
-<![%chap.users;[
<!ENTITY chap.users SYSTEM "users/chapter.xml">
-]]>
-<![%chap.security;[
<!ENTITY chap.security SYSTEM "security/chapter.xml">
-]]>
-<![%chap.jails;[
<!ENTITY chap.jails SYSTEM "jails/chapter.xml">
-]]>
-<![%chap.mac;[
<!ENTITY chap.mac SYSTEM "mac/chapter.xml">
-]]>
-<![%chap.audit;[
<!ENTITY chap.audit SYSTEM "audit/chapter.xml">
-]]>
-<![%chap.disks;[
<!ENTITY chap.disks SYSTEM "disks/chapter.xml">
-]]>
-<![%chap.geom;[
<!ENTITY chap.geom SYSTEM "geom/chapter.xml">
-]]>
-<![%chap.filesystems;[
<!ENTITY chap.filesystems SYSTEM "filesystems/chapter.xml">
-]]>
-<![%chap.vinum;[
<!ENTITY chap.vinum SYSTEM "vinum/chapter.xml">
-]]>
-<![%chap.virtualization;[
<!ENTITY chap.virtualization SYSTEM "virtualization/chapter.xml">
-]]>
-<![%chap.l10n;[
<!ENTITY chap.l10n SYSTEM "l10n/chapter.xml">
-]]>
-<![%chap.cutting-edge;[
<!ENTITY chap.cutting-edge SYSTEM "cutting-edge/chapter.xml">
-]]>
-<![%chap.dtrace;[
<!ENTITY chap.dtrace SYSTEM "dtrace/chapter.xml">
-]]>
<!-- Part Four -->
-<![%chap.serialcomms;[
<!ENTITY chap.serialcomms SYSTEM "serialcomms/chapter.xml">
-]]>
-<![%chap.ppp-and-slip;[
<!ENTITY chap.ppp-and-slip SYSTEM "ppp-and-slip/chapter.xml">
-]]>
-<![%chap.mail;[
<!ENTITY chap.mail SYSTEM "mail/chapter.xml">
-]]>
-<![%chap.network-servers;[
<!ENTITY chap.network-servers SYSTEM "network-servers/chapter.xml">
-]]>
-<![%chap.firewalls;[
<!ENTITY chap.firewalls SYSTEM "firewalls/chapter.xml">
-]]>
-<![%chap.advanced-networking;[
<!ENTITY chap.advanced-networking SYSTEM "advanced-networking/chapter.xml">
-]]>
<!-- Part Five (appendices) -->
-<![%chap.mirrors;[
<!ENTITY chap.mirrors SYSTEM "mirrors/chapter.xml">
-]]>
-<![%chap.mirrors.ftp.inc;[
+ <!ENTITY chap.mirrors.lastmod.inc SYSTEM "mirrors.lastmod.inc">
+ <!ENTITY chap.mirrors.ftp.index.inc SYSTEM "mirrors.xml.ftp.index.inc">
<!ENTITY chap.mirrors.ftp.inc SYSTEM "mirrors.xml.ftp.inc">
-]]>
-<![%chap.mirrors.cvsup.inc;[
+ <!ENTITY chap.mirrors.cvsup.index.inc SYSTEM "mirrors.xml.cvsup.index.inc">
<!ENTITY chap.mirrors.cvsup.inc SYSTEM "mirrors.xml.cvsup.inc">
-]]>
-<![%chap.bibliography;[
<!ENTITY chap.bibliography SYSTEM "bibliography/chapter.xml">
-]]>
-<![%chap.eresources;[
<!ENTITY chap.eresources SYSTEM "eresources/chapter.xml">
-]]>
-<![%chap.eresources.www.inc;[
+ <!ENTITY chap.eresources.www.index.inc SYSTEM "eresources.xml.www.index.inc">
<!ENTITY chap.eresources.www.inc SYSTEM "eresources.xml.www.inc">
-]]>
-<![%chap.pgpkeys;[
<!ENTITY chap.pgpkeys SYSTEM "pgpkeys/chapter.xml">
-]]>
-<![%chap.freebsd-glossary;[
<!ENTITY chap.freebsd-glossary "&freebsd-glossary;">
-]]>
-<![%chap.index;[
- <!ENTITY chap.index SYSTEM "index.xml">
-]]>
+<!-- XXX -->
+ <!ENTITY chap.index "">
<!ENTITY chap.colophon SYSTEM "colophon.xml">
-
-<!-- IGNORE cases -->
-
-<!-- Part One -->
-<!ENTITY chap.introduction "">
-<!ENTITY chap.install "">
-<!ENTITY chap.basics "">
-<!ENTITY chap.ports "">
-<!ENTITY chap.x11 "">
-
-<!-- Part Two -->
-<!ENTITY chap.desktop "">
-<!ENTITY chap.multimedia "">
-<!ENTITY chap.kernelconfig "">
-<!ENTITY chap.printing "">
-<!ENTITY chap.linuxemu "">
-
-<!-- Part Three -->
-<!ENTITY chap.config "">
-<!ENTITY chap.boot "">
-<!ENTITY chap.users "">
-<!ENTITY chap.security "">
-<!ENTITY chap.jails "">
-<!ENTITY chap.mac "">
-<!ENTITY chap.audit "">
-<!ENTITY chap.disks "">
-<!ENTITY chap.geom "">
-<!ENTITY chap.filesystems "">
-<!ENTITY chap.vinum "">
-<!ENTITY chap.virtualization "">
-<!ENTITY chap.l10n "">
-<!ENTITY chap.cutting-edge "">
-<!ENTITY chap.dtrace "">
-
-<!-- Part Four -->
-<!ENTITY chap.serialcomms "">
-<!ENTITY chap.ppp-and-slip "">
-<!ENTITY chap.mail "">
-<!ENTITY chap.network-servers "">
-<!ENTITY chap.firewalls "">
-<!ENTITY chap.advanced-networking "">
-
-<!-- Part Five (appendices) -->
-<!ENTITY chap.mirrors "">
-<!ENTITY chap.mirrors.ftp.inc "">
-<!ENTITY chap.mirrors.cvsup.inc "">
-<!ENTITY chap.bibliography "">
-<!ENTITY chap.eresources "">
-<!ENTITY chap.eresources.www.inc "">
-<!ENTITY chap.pgpkeys "">
-<!ENTITY chap.freebsd-glossary "">
-<!ENTITY chap.index "">
diff --git a/en_US.ISO8859-1/books/handbook/colophon.xml b/en_US.ISO8859-1/books/handbook/colophon.xml
index 18d093364b..b639a4f7dc 100644
--- a/en_US.ISO8859-1/books/handbook/colophon.xml
+++ b/en_US.ISO8859-1/books/handbook/colophon.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/handbook/config/chapter.xml b/en_US.ISO8859-1/books/handbook/config/chapter.xml
index 43f5b1ebab..ff90d311f0 100644
--- a/en_US.ISO8859-1/books/handbook/config/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/config/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
@@ -807,7 +807,7 @@ sshd is running as pid 433.</screen>
system can be found in the &man.rc.8; and &man.rc.subr.8; manual
pages. If you are interested in writing your own
<filename>rc.d</filename> scripts or improving the existing
- ones, you may find <ulink url="&url.articles.rc-scripting">this
+ ones, you may find <ulink url="&url.articles.rc-scripting;">this
article</ulink> also useful.</para>
</sect1>
diff --git a/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml b/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml
index f32ff4680d..f1c6f3a5c9 100644
--- a/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
@@ -1149,7 +1149,7 @@ Fetching 133 new ports or files... done.</screen>
</sect2>
<!-- FIXME: Waiting for a working docsnap server... -->
-<![ IGNORE [
+<!--
<sect2 id="docsnap">
<sect2info>
<authorgroup>
@@ -1206,14 +1206,14 @@ Fetching 133 new ports or files... done.</screen>
above.</para>
</note>
- <para>Do not use the <option>--delete</option> flag here as there
+ <para>Do not use the <option>‐‐delete</option> flag here as there
are some items installed
into <filename class="directory">/usr/share/doc</filename>
during <command>make installworld</command>, which would
accidentally be removed. To clean up, use this command
instead:</para>
- <screen>&prompt.root; <userinput>rsync -rltvz --delete <replaceable>docsnap.sk.FreeBSD.org</replaceable>::docsnap/??_??\.\* <replaceable>/usr/share/doc</replaceable></userinput></screen>
+ <screen>&prompt.root; <userinput>rsync -rltvz ‐‐delete <replaceable>docsnap.sk.FreeBSD.org</replaceable>::docsnap/??_??\.\* <replaceable>/usr/share/doc</replaceable></userinput></screen>
<para>If a subset of documentation needs to be updated, for
example, the English documentation only, the following command
@@ -1221,7 +1221,7 @@ Fetching 133 new ports or files... done.</screen>
<screen>&prompt.root; <userinput>rsync -rltvz <replaceable>docsnap.sk.FreeBSD.org</replaceable>::docsnap/en_US.ISO8859-1 <replaceable>/usr/share/doc</replaceable></userinput></screen>
</sect2>
-]]>
+-->
</sect1>
<sect1 id="current-stable">
diff --git a/en_US.ISO8859-1/books/handbook/desktop/chapter.xml b/en_US.ISO8859-1/books/handbook/desktop/chapter.xml
index c7b5e1ca4e..b20e512869 100644
--- a/en_US.ISO8859-1/books/handbook/desktop/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/desktop/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
$FreeBSD$
diff --git a/en_US.ISO8859-1/books/handbook/disks/chapter.xml b/en_US.ISO8859-1/books/handbook/disks/chapter.xml
index 99156deaa8..55c4031eea 100644
--- a/en_US.ISO8859-1/books/handbook/disks/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/disks/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
@@ -2902,15 +2902,6 @@ sa0(ncr1:4:0): Logical unit is in process of becoming ready</screen>
again. Another hour spent now may save you from further
distress later.</para>
</sect3>
-
-<![%not.published;[
-
- <sect3>
- <title>* I Did Not Prepare for the Disaster, What Now?</title>
-
- <para></para>
- </sect3>
-]]>
</sect2>
</sect1>
@@ -4707,7 +4698,7 @@ case "$1" in
# Wait for any "hastd secondary" processes to stop
for disk in ${resources}; do
- while $( pgrep -lf "hastd: ${disk} \(secondary\)" > /dev/null 2>&1 ); do
+ while $( pgrep -lf "hastd: ${disk} \(secondary\)" > /dev/null 2>&1 ); do
sleep 1
done
@@ -4722,7 +4713,7 @@ case "$1" in
# Wait for the /dev/hast/* devices to appear
for disk in ${resources}; do
for I in $( jot 60 ); do
- [ -c "/dev/hast/${disk}" ] && break
+ [ -c "/dev/hast/${disk}" ] && break
sleep 0.5
done
@@ -4755,7 +4746,7 @@ case "$1" in
umount -f /hast/${disk}
fi
sleep $delay
- hastctl role secondary ${disk} 2>&1
+ hastctl role secondary ${disk} 2>&1
if [ $? -ne 0 ]; then
logger -p $log -t $name "Unable to switch role to secondary for resource ${disk}."
exit 1
diff --git a/en_US.ISO8859-1/books/handbook/dtrace/chapter.xml b/en_US.ISO8859-1/books/handbook/dtrace/chapter.xml
index 5bbc4a08de..1e7bad38b2 100644
--- a/en_US.ISO8859-1/books/handbook/dtrace/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/dtrace/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
Recently I suggested to myself that this should become a profiling
and debugging chapter, which covers things like ktrace(1) and
diff --git a/en_US.ISO8859-1/books/handbook/eresources/chapter.xml b/en_US.ISO8859-1/books/handbook/eresources/chapter.xml
index a9744a272c..b7091fe6ae 100644
--- a/en_US.ISO8859-1/books/handbook/eresources/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/eresources/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
@@ -2105,6 +2105,11 @@
<sect2 id="eresources-web-mirrors">
<title>Official Mirrors</title>
+
+ &chap.eresources.www.index.inc;
+
+ &chap.mirrors.lastmod.inc;
+
&chap.eresources.www.inc;
</sect2>
</sect1>
diff --git a/en_US.ISO8859-1/books/handbook/filesystems/chapter.xml b/en_US.ISO8859-1/books/handbook/filesystems/chapter.xml
index cf3ad85d5d..96018296fb 100644
--- a/en_US.ISO8859-1/books/handbook/filesystems/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/filesystems/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
$FreeBSD$
diff --git a/en_US.ISO8859-1/books/handbook/firewalls/chapter.xml b/en_US.ISO8859-1/books/handbook/firewalls/chapter.xml
index f84d9aaddf..a01704080a 100644
--- a/en_US.ISO8859-1/books/handbook/firewalls/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/firewalls/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/handbook/geom/chapter.xml b/en_US.ISO8859-1/books/handbook/geom/chapter.xml
index ff7ec9a29e..f201885f67 100644
--- a/en_US.ISO8859-1/books/handbook/geom/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/geom/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
$FreeBSD$
diff --git a/en_US.ISO8859-1/books/handbook/install/chapter.xml b/en_US.ISO8859-1/books/handbook/install/chapter.xml
index 6e43a0518a..1ca328c639 100644
--- a/en_US.ISO8859-1/books/handbook/install/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/install/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/handbook/introduction/chapter.xml b/en_US.ISO8859-1/books/handbook/introduction/chapter.xml
index c36ee52aa7..d5ae98c174 100644
--- a/en_US.ISO8859-1/books/handbook/introduction/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/introduction/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/handbook/jails/chapter.xml b/en_US.ISO8859-1/books/handbook/jails/chapter.xml
index 71cf55c7f3..90507c7984 100644
--- a/en_US.ISO8859-1/books/handbook/jails/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/jails/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.xml b/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.xml
index 095e1a69dd..83e72a8b50 100644
--- a/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/handbook/l10n/chapter.xml b/en_US.ISO8859-1/books/handbook/l10n/chapter.xml
index 8fe790686f..36fb3dba9b 100644
--- a/en_US.ISO8859-1/books/handbook/l10n/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/l10n/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/handbook/linuxemu/chapter.xml b/en_US.ISO8859-1/books/handbook/linuxemu/chapter.xml
index b9c42c0b42..34a8b41443 100644
--- a/en_US.ISO8859-1/books/handbook/linuxemu/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/linuxemu/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
@@ -923,7 +923,7 @@ exit 0</programlisting>
contain the following:</para>
<programlisting>#!/compat/linux/bin/sh
-(sleep 5; killall -1 matlab_helper) &
+(sleep 5; killall -1 matlab_helper) &
exit 0</programlisting>
</step>
diff --git a/en_US.ISO8859-1/books/handbook/mac/chapter.xml b/en_US.ISO8859-1/books/handbook/mac/chapter.xml
index f94e9d5aa1..9daede6b5e 100644
--- a/en_US.ISO8859-1/books/handbook/mac/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/mac/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
$FreeBSD$
diff --git a/en_US.ISO8859-1/books/handbook/mail/chapter.xml b/en_US.ISO8859-1/books/handbook/mail/chapter.xml
index 5a5c57de21..2f5cc6578d 100644
--- a/en_US.ISO8859-1/books/handbook/mail/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/mail/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml b/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml
index f7421e5581..4113f96b2e 100644
--- a/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
@@ -204,6 +204,10 @@
methods available for each site are provided in parentheses
after the hostname.</para>
+ &chap.mirrors.ftp.index.inc;
+
+ &chap.mirrors.lastmod.inc;
+
&chap.mirrors.ftp.inc;
</sect1>
@@ -2403,6 +2407,10 @@ doc/zh_*</screen>
<para><link linkend="cvsup">CVSup</link> servers for &os; are running
at the following sites:</para>
+ &chap.mirrors.cvsup.index.inc;
+
+ &chap.mirrors.lastmod.inc;
+
&chap.mirrors.cvsup.inc;
</sect2>
</sect1>
diff --git a/en_US.ISO8859-1/books/handbook/multimedia/chapter.xml b/en_US.ISO8859-1/books/handbook/multimedia/chapter.xml
index 6856ac9abe..db06863523 100644
--- a/en_US.ISO8859-1/books/handbook/multimedia/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/multimedia/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
@@ -1569,7 +1569,7 @@ bktr0: Pinnacle/Miro TV, Philips SECAM tuner.</programlisting>
<para>Set up the MythTV database:</para>
- <screen>&prompt.root; <userinput>mysql -uroot -p < /usr/local/share/mythtv/database/mc.sql</userinput></screen>
+ <screen>&prompt.root; <userinput>mysql -uroot -p < /usr/local/share/mythtv/database/mc.sql</userinput></screen>
<para>Configure the backend:</para>
diff --git a/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml b/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml
index 44c3233cf4..3ff29e58f8 100644
--- a/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/handbook/pgpkeys/chapter.xml b/en_US.ISO8859-1/books/handbook/pgpkeys/chapter.xml
index ecd7b81155..3fef27e198 100644
--- a/en_US.ISO8859-1/books/handbook/pgpkeys/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/pgpkeys/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/handbook/ports/chapter.xml b/en_US.ISO8859-1/books/handbook/ports/chapter.xml
index 05fe018a4b..263dbc5be3 100644
--- a/en_US.ISO8859-1/books/handbook/ports/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/ports/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml b/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml
index 24ea0b2498..659e374ad3 100644
--- a/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/handbook/preface/preface.xml b/en_US.ISO8859-1/books/handbook/preface/preface.xml
index 1f9ecf4534..bc726c4789 100644
--- a/en_US.ISO8859-1/books/handbook/preface/preface.xml
+++ b/en_US.ISO8859-1/books/handbook/preface/preface.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
$FreeBSD$
-->
diff --git a/en_US.ISO8859-1/books/handbook/printing/chapter.xml b/en_US.ISO8859-1/books/handbook/printing/chapter.xml
index 540f91c64d..7d0cdb3bee 100644
--- a/en_US.ISO8859-1/books/handbook/printing/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/printing/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/handbook/security/chapter.xml b/en_US.ISO8859-1/books/handbook/security/chapter.xml
index 7f6ff6cab4..bea005d836 100644
--- a/en_US.ISO8859-1/books/handbook/security/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/security/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/handbook/serialcomms/chapter.xml b/en_US.ISO8859-1/books/handbook/serialcomms/chapter.xml
index 5dc07269b4..1c6fe1d5e1 100644
--- a/en_US.ISO8859-1/books/handbook/serialcomms/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/serialcomms/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/handbook/users/chapter.xml b/en_US.ISO8859-1/books/handbook/users/chapter.xml
index bad97251c8..af618fda07 100644
--- a/en_US.ISO8859-1/books/handbook/users/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/users/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/handbook/vinum/chapter.xml b/en_US.ISO8859-1/books/handbook/vinum/chapter.xml
index a631b66326..90aed1c718 100644
--- a/en_US.ISO8859-1/books/handbook/vinum/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/vinum/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The Vinum Volume Manager
By Greg Lehey (grog at lemis dot com)
diff --git a/en_US.ISO8859-1/books/handbook/virtualization/chapter.xml b/en_US.ISO8859-1/books/handbook/virtualization/chapter.xml
index 3960c880d8..3f48a37d20 100644
--- a/en_US.ISO8859-1/books/handbook/virtualization/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/virtualization/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
@@ -1028,7 +1028,7 @@ xenbr1 8000.feffffffffff no vif0.1
role="package">emulators/virtualbox-ose-additions</filename>
package in the &os; guest.</para>
- <screen>&prompt.root; <userinput>cd /usr/ports/emulators/virtualbox-ose-additions && make install clean</userinput></screen>
+ <screen>&prompt.root; <userinput>cd /usr/ports/emulators/virtualbox-ose-additions && make install clean</userinput></screen>
<para>Add these lines to
<filename>/etc/rc.conf</filename>:</para>
diff --git a/en_US.ISO8859-1/books/handbook/x11/chapter.xml b/en_US.ISO8859-1/books/handbook/x11/chapter.xml
index 188155f246..795cf3063b 100644
--- a/en_US.ISO8859-1/books/handbook/x11/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/x11/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/pmake/answers/chapter.xml b/en_US.ISO8859-1/books/pmake/answers/chapter.xml
index e3f96181fa..68d86a9db3 100644
--- a/en_US.ISO8859-1/books/pmake/answers/chapter.xml
+++ b/en_US.ISO8859-1/books/pmake/answers/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
$FreeBSD$
-->
diff --git a/en_US.ISO8859-1/books/pmake/basics/chapter.xml b/en_US.ISO8859-1/books/pmake/basics/chapter.xml
index 12df062549..4ae0a8b799 100644
--- a/en_US.ISO8859-1/books/pmake/basics/chapter.xml
+++ b/en_US.ISO8859-1/books/pmake/basics/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
$FreeBSD$
-->
diff --git a/en_US.ISO8859-1/books/pmake/glossary/glossary.xml b/en_US.ISO8859-1/books/pmake/glossary/glossary.xml
index 9b59545ea8..d983027d75 100644
--- a/en_US.ISO8859-1/books/pmake/glossary/glossary.xml
+++ b/en_US.ISO8859-1/books/pmake/glossary/glossary.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
$FreeBSD$
-->
diff --git a/en_US.ISO8859-1/books/pmake/gods/chapter.xml b/en_US.ISO8859-1/books/pmake/gods/chapter.xml
index bc57aba8c9..6bca57995b 100644
--- a/en_US.ISO8859-1/books/pmake/gods/chapter.xml
+++ b/en_US.ISO8859-1/books/pmake/gods/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
$FreeBSD$
-->
diff --git a/en_US.ISO8859-1/books/pmake/intro/chapter.xml b/en_US.ISO8859-1/books/pmake/intro/chapter.xml
index 39597afc0b..b1cfcec310 100644
--- a/en_US.ISO8859-1/books/pmake/intro/chapter.xml
+++ b/en_US.ISO8859-1/books/pmake/intro/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
PMake - A Tutorial
diff --git a/en_US.ISO8859-1/books/pmake/shortcuts/chapter.xml b/en_US.ISO8859-1/books/pmake/shortcuts/chapter.xml
index 417e3b65a5..9c7a90cac9 100644
--- a/en_US.ISO8859-1/books/pmake/shortcuts/chapter.xml
+++ b/en_US.ISO8859-1/books/pmake/shortcuts/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
$FreeBSD$
-->
diff --git a/en_US.ISO8859-1/books/porters-handbook/book.xml b/en_US.ISO8859-1/books/porters-handbook/book.xml
index 4397956653..06d45e78ea 100644
--- a/en_US.ISO8859-1/books/porters-handbook/book.xml
+++ b/en_US.ISO8859-1/books/porters-handbook/book.xml
@@ -4053,8 +4053,8 @@ PKGNAMESUFFIX= ${RESOLUTION}
:
# default
RESOLUTION?= 300
-.if ${RESOLUTION} != 118 && ${RESOLUTION} != 240 && \
- ${RESOLUTION} != 300 && ${RESOLUTION} != 400
+.if ${RESOLUTION} != 118 && ${RESOLUTION} != 240 && \
+ ${RESOLUTION} != 300 && ${RESOLUTION} != 400
@${ECHO_MSG} "Error: invalid value for RESOLUTION: \"${RESOLUTION}\""
@${ECHO_MSG} "Possible values are: 118, 240, 300 (default) and 400."
@${FALSE}
@@ -6564,7 +6564,7 @@ PLIST_SUB+= QT_INCDIR_REL=${QT_INCDIR_REL} \
<programlisting>HAS_CONFIGURE= yes
do-configure:
- @cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
+ @cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
${QMAKE} ${QMAKEFLAGS} PREFIX=${PREFIX} texmaker.pro</programlisting>
<para>Note the similarity to the <command>qmake</command> line
@@ -9339,7 +9339,7 @@ CFLAGS+= -DLUA_VERSION_STRING="${VER_STR}"
url="&url.books.handbook;/configtuning-rcd.html">the rc.d
Handbook chapter</ulink>. Detailed explanation of available
commands is provided in &man.rc.8; and &man.rc.subr.8;.
- Finally, there is <ulink url="&url.articles.rc-scripting">an
+ Finally, there is <ulink url="&url.articles.rc-scripting;">an
article</ulink> on practical aspects of
<filename>rc.d</filename> scripting.</para>
@@ -9932,7 +9932,7 @@ etc/orbit.conf.sample
<para>Store the directory structure in a new file.</para>
- <screen>&prompt.root; <userinput>(cd /var/tmp/`make -V PORTNAME` && find -d * -type d) | sort > OLD-DIRS</userinput></screen>
+ <screen>&prompt.root; <userinput>(cd /var/tmp/`make -V PORTNAME` && find -d * -type d) | sort > OLD-DIRS</userinput></screen>
<para>Create an empty <filename>pkg-plist</filename>
file:</para>
@@ -9944,12 +9944,12 @@ etc/orbit.conf.sample
list.</para>
<screen>&prompt.root; <userinput>make install PREFIX=/var/tmp/`make -V PORTNAME`</userinput>
-&prompt.root; <userinput>(cd /var/tmp/`make -V PORTNAME` && find -d * \! -type d) | sort > pkg-plist</userinput></screen>
+&prompt.root; <userinput>(cd /var/tmp/`make -V PORTNAME` && find -d * \! -type d) | sort > pkg-plist</userinput></screen>
<para>You must also add any newly created directories to the
packing list.</para>
- <screen>&prompt.root; <userinput>(cd /var/tmp/`make -V PORTNAME` && find -d * -type d) | sort | comm -13 OLD-DIRS - | sort -r | sed -e 's#^#@dirrm #' >> pkg-plist</userinput></screen>
+ <screen>&prompt.root; <userinput>(cd /var/tmp/`make -V PORTNAME` && find -d * -type d) | sort | comm -13 OLD-DIRS - | sort -r | sed -e 's#^#@dirrm #' >> pkg-plist</userinput></screen>
<para>Finally, you need to tidy up the packing list by hand; it
is not <emphasis>all</emphasis> automated. Manual pages
@@ -10533,7 +10533,7 @@ as .putsy.conf and edit it.</programlisting>
<sect1 id="svn-diff">
<title>Using <literal>SVN</literal> to Make Patches</title>
- <para>If you can, please submit a &man.svn.1 diff; they are
+ <para>If you can, please submit a &man.svn.1; diff; they are
easier to handle than diffs between <quote>new and old</quote>
directories. Plus it is easier for you to see what you have
changed and to update your diff if something is modified in
From 4a970c291f6e353e52c3982fe9551282b5eab2b0 Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Mon, 21 Jan 2013 17:38:17 +0000
Subject: [PATCH 010/121] - Make the Spanish documentation valid XML
---
.../articles/explaining-bsd/article.xml | 2 +-
.../handbook/advanced-networking/chapter.xml | 26 +--
.../books/handbook/audit/chapter.xml | 2 +-
.../books/handbook/basics/chapter.xml | 4 +-
.../books/handbook/bibliography/chapter.xml | 2 +-
.../books/handbook/boot/chapter.xml | 2 +-
es_ES.ISO8859-1/books/handbook/chapters.ent | 196 ++----------------
es_ES.ISO8859-1/books/handbook/colophon.xml | 2 +-
.../books/handbook/config/chapter.xml | 2 +-
.../books/handbook/cutting-edge/chapter.xml | 2 +-
.../books/handbook/desktop/chapter.xml | 4 +-
.../books/handbook/disks/chapter.xml | 33 +--
.../books/handbook/eresources/chapter.xml | 4 +-
.../books/handbook/firewalls/chapter.xml | 2 +-
.../books/handbook/geom/chapter.xml | 4 +-
.../books/handbook/install/chapter.xml | 8 +-
.../books/handbook/introduction/chapter.xml | 2 +-
.../books/handbook/jails/chapter.xml | 2 +-
.../books/handbook/kernelconfig/chapter.xml | 4 +-
.../books/handbook/l10n/chapter.xml | 2 +-
.../books/handbook/linuxemu/chapter.xml | 12 +-
.../books/handbook/mac/chapter.xml | 2 +-
.../books/handbook/mail/chapter.xml | 10 +-
.../books/handbook/mirrors/chapter.xml | 2 +-
.../books/handbook/multimedia/chapter.xml | 2 +-
.../handbook/network-servers/chapter.xml | 2 +-
.../books/handbook/pgpkeys/chapter.xml | 2 +-
.../books/handbook/ports/chapter.xml | 4 +-
.../books/handbook/ppp-and-slip/chapter.xml | 6 +-
.../books/handbook/preface/preface.xml | 2 +-
.../books/handbook/printing/chapter.xml | 2 +-
.../books/handbook/security/chapter.xml | 6 +-
.../books/handbook/serialcomms/chapter.xml | 2 +-
.../books/handbook/users/chapter.xml | 2 +-
.../books/handbook/vinum/chapter.xml | 2 +-
.../books/handbook/virtualization/chapter.xml | 2 +-
.../books/handbook/x11/chapter.xml | 4 +-
37 files changed, 94 insertions(+), 275 deletions(-)
diff --git a/es_ES.ISO8859-1/articles/explaining-bsd/article.xml b/es_ES.ISO8859-1/articles/explaining-bsd/article.xml
index 26a31cad7e..14f6c5d2c1 100644
--- a/es_ES.ISO8859-1/articles/explaining-bsd/article.xml
+++ b/es_ES.ISO8859-1/articles/explaining-bsd/article.xml
@@ -254,7 +254,7 @@
<listitem>
<para>Existe la creencia de que los proyectos BSD est�n
fragmentados y enfrentados entre s�. El <ulink
- url="http://interactive.wsj.com/bin/login?Tag=/&URI=/archive/retrieve.cgi%253Fid%253DSB952470579348918651.djm&">Wall Street
+ url="http://interactive.wsj.com/bin/login?Tag=/&URI=/archive/retrieve.cgi%253Fid%253DSB952470579348918651.djm&">Wall Street
Journal</ulink> habl� de la <quote>balcanizaci�n
</quote> de los proyectos BSD. Como en el caso del pleito, esa
creencia se fundamenta en historia antigua.</para>
diff --git a/es_ES.ISO8859-1/books/handbook/advanced-networking/chapter.xml b/es_ES.ISO8859-1/books/handbook/advanced-networking/chapter.xml
index a8e054b92f..6dacb31790 100755
--- a/es_ES.ISO8859-1/books/handbook/advanced-networking/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/advanced-networking/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
@@ -2696,7 +2696,7 @@ Exports list on foobar:
trabajo de alto rendimiento, como por ejemplo estaciones de Silicon
Graphics y de Sun Microsystems. El montaje del sistema de ficheros
remoto suele funcionar perfectamente y algunas operaciones sobre el
- el sistema de ficheros pueden tener é,xito pero de repente el
+ el sistema de ficheros pueden tener �xito pero de repente el
el servidor que no responde a las peticiones del cliente, aunque
peticiones y respuestas de otros clientes funcionan con normalidad y
se contin�an procesando. Esto sucede en los sistemas clientes,
@@ -3543,7 +3543,7 @@ options BOOTP_NFSROOT # NFS mount root filesystem using BOOTP info
<programlisting>#!/bin/sh
export DESTDIR=/data/misc/diskless
mkdir -p ${DESTDIR}
-cd /usr/src; make world && make kernel
+cd /usr/src; make world && make kernel
cd /usr/src/etc; make distribution</programlisting>
<para>Una vez ejecutado puede ser necesario ajustar los ficheros
@@ -3637,7 +3637,7 @@ host margaux {
</sect4>
<sect4>
- <title><acronym>NFS</acronym> swap en &os 5.X</title>
+ <title><acronym>NFS</acronym> swap en &os; 5.X</title>
<para>El n�cleo no soporta la activaci�n del
intercambio a trav�s de <acronym>NFS</acronym> en tiempo de
@@ -6888,10 +6888,10 @@ www IN CNAME @</programlisting>
<para>Reorganizar y crear los archivos de configuraci�n de
zona b�sicos:</para>
<screen>&prompt.root; <userinput>cp /etc/localtime etc</userinput><co id="localtime"/>
-&prompt.root; <userinput>mv named.conf etc && ln -sf etc/named.conf</userinput>
+&prompt.root; <userinput>mv named.conf etc && ln -sf etc/named.conf</userinput>
&prompt.root; <userinput>mv named.root master</userinput>
<!-- I don't like this next bit -->
-&prompt.root; <userinput>sh make-localhost && mv localhost.rev localhost-v6.rev master</userinput>
+&prompt.root; <userinput>sh make-localhost && mv localhost.rev localhost-v6.rev master</userinput>
&prompt.root; <userinput>cat > master/named.localhost
$ORIGIN localhost.
$TTL 6h
@@ -6921,12 +6921,12 @@ $TTL 6h
del directorio del <quote>sandbox</quote>:</para>
<screen>&prompt.root; <userinput>cd /usr/src/lib/libisc</userinput>
-&prompt.root; <userinput>make cleandir && make cleandir && make depend && make all</userinput>
+&prompt.root; <userinput>make cleandir && make cleandir && make depend && make all</userinput>
&prompt.root; <userinput>cd /usr/src/lib/libbind</userinput>
-&prompt.root; <userinput>make cleandir && make cleandir && make depend && make all</userinput>
+&prompt.root; <userinput>make cleandir && make cleandir && make depend && make all</userinput>
&prompt.root; <userinput>cd /usr/src/libexec/named-xfer</userinput>
-&prompt.root; <userinput>make cleandir && make cleandir && make depend && make NOSHARED=yes all</userinput>
-&prompt.root; <userinput>cp named-xfer /etc/namedb/bin && chmod 555 /etc/namedb/bin/named-xfer</userinput><co id="clean-cruft"/></screen>
+&prompt.root; <userinput>make cleandir && make cleandir && make depend && make NOSHARED=yes all</userinput>
+&prompt.root; <userinput>cp named-xfer /etc/namedb/bin && chmod 555 /etc/namedb/bin/named-xfer</userinput><co id="clean-cruft"/></screen>
<para>Despue�s de instalar la versi�n est�tica
de <command>named-xfer</command> se deben realizar algunas tareas
@@ -6945,11 +6945,11 @@ $TTL 6h
<para>En algunas ocasiones este paso puede fallar. Si es su caso
ejecute lo siguiente:</para>
- <screen>&prompt.root; <userinput>cd /usr/src && make cleandir && make cleandir</userinput></screen>
+ <screen>&prompt.root; <userinput>cd /usr/src && make cleandir && make cleandir</userinput></screen>
<para>y borre su directorio <filename>/usr/obj</filename>:</para>
- <screen>&prompt.root; <userinput>rm -fr /usr/obj && mkdir /usr/obj</userinput></screen>
+ <screen>&prompt.root; <userinput>rm -fr /usr/obj && mkdir /usr/obj</userinput></screen>
<para>Esto limpia cualquier <quote>impureza</quote> del
�rbol de fuentes y si se repiten los pasos anteriores
@@ -6969,7 +6969,7 @@ $TTL 6h
que <application>named</application> pueda verlo y pueda escribir
sobre �l:</para>
- <screen>&prompt.root; <userinput>cd /etc/namedb/dev && mknod null c 2 2</userinput>
+ <screen>&prompt.root; <userinput>cd /etc/namedb/dev && mknod null c 2 2</userinput>
&prompt.root; <userinput>chmod 666 null</userinput></screen>
</listitem>
diff --git a/es_ES.ISO8859-1/books/handbook/audit/chapter.xml b/es_ES.ISO8859-1/books/handbook/audit/chapter.xml
index 40721a2b72..becd1a38a3 100644
--- a/es_ES.ISO8859-1/books/handbook/audit/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/audit/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/es_ES.ISO8859-1/books/handbook/basics/chapter.xml b/es_ES.ISO8859-1/books/handbook/basics/chapter.xml
index cc0e7bf93c..307ff0a43f 100755
--- a/es_ES.ISO8859-1/books/handbook/basics/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/basics/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
@@ -1534,7 +1534,7 @@ root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01 passwd</screen>
que se preve que ocupen una slice.</para>
<para>Tanto las �slice� y las unidades f�sicas
- �peligrosamente dedicadas», como otras unidades
+ �peligrosamente dedicadas�, como otras unidades
contienen <firstterm>particiones</firstterm>, que se designan
mediante letras desde la <literal>a</literal>
hasta <literal>h</literal>. Esta letra se a�ade al nombre
diff --git a/es_ES.ISO8859-1/books/handbook/bibliography/chapter.xml b/es_ES.ISO8859-1/books/handbook/bibliography/chapter.xml
index adcaf1ef07..cdcb9e9203 100755
--- a/es_ES.ISO8859-1/books/handbook/bibliography/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/bibliography/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/es_ES.ISO8859-1/books/handbook/boot/chapter.xml b/es_ES.ISO8859-1/books/handbook/boot/chapter.xml
index c30266dbcb..3a2fa91d94 100644
--- a/es_ES.ISO8859-1/books/handbook/boot/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/boot/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/es_ES.ISO8859-1/books/handbook/chapters.ent b/es_ES.ISO8859-1/books/handbook/chapters.ent
index fab3b141f3..2de5ecc113 100755
--- a/es_ES.ISO8859-1/books/handbook/chapters.ent
+++ b/es_ES.ISO8859-1/books/handbook/chapters.ent
@@ -19,231 +19,61 @@
$FreeBSDes: doc/es_ES.ISO8859-1/books/handbook/chapters.ent,v 1.2 2004/10/08 22:36:51 jesusr Exp $
-->
-<!ENTITY % not.published "INCLUDE">
-
-<!ENTITY % chap.introduction "IGNORE">
-<!ENTITY % chap.install "IGNORE">
-<!ENTITY % chap.basics "IGNORE">
-<!ENTITY % chap.ports "IGNORE">
-<!ENTITY % chap.config "IGNORE">
-<!ENTITY % chap.boot "IGNORE">
-<!ENTITY % chap.users "IGNORE">
-<!ENTITY % chap.kernelconfig "IGNORE">
-<!ENTITY % chap.security "IGNORE">
-<!ENTITY % chap.jails "IGNORE">
-<!ENTITY % chap.printing "IGNORE">
-<!ENTITY % chap.disks "IGNORE">
-<!ENTITY % chap.geom "IGNORE">
-<!ENTITY % chap.vinum "IGNORE">
-<!ENTITY % chap.x11 "IGNORE">
-<!ENTITY % chap.l10n "IGNORE">
-<!ENTITY % chap.multimedia "IGNORE">
-<!ENTITY % chap.desktop "IGNORE">
-<!ENTITY % chap.serialcomms "IGNORE">
-<!ENTITY % chap.ppp-and-slip "IGNORE">
-<!ENTITY % chap.advanced-networking "IGNORE">
-<!ENTITY % chap.firewalls "IGNORE">
-<!ENTITY % chap.network-servers "IGNORE">
-<!ENTITY % chap.mail "IGNORE">
-<!ENTITY % chap.cutting-edge "IGNORE">
-<!ENTITY % chap.linuxemu "IGNORE">
-<!ENTITY % chap.mirrors "IGNORE">
-<!ENTITY % chap.mirrors.ftp.inc "INCLUDE">
-<!ENTITY % chap.mirrors.cvsup.inc "INCLUDE">
-<!ENTITY % chap.bibliography "IGNORE">
-<!ENTITY % chap.eresources "IGNORE">
-<!ENTITY % chap.eresources.www.inc "INCLUDE">
-<!ENTITY % chap.pgpkeys "IGNORE">
-<!ENTITY % chap.index "IGNORE">
-<!ENTITY % chap.freebsd-glossary "IGNORE">
-<!ENTITY % chap.mac "IGNORE">
-<!ENTITY % chap.audit "IGNORE">
-<!ENTITY % chap.filesystems "IGNORE">
-<!ENTITY % chap.dtrace "IGNORE">
-
<!ENTITY chap.preface SYSTEM "preface/preface.xml">
<!ENTITY % pgpkeys SYSTEM "../../../share/pgpkeys/pgpkeys.ent"> %pgpkeys;
<!-- Part One -->
-<![%chap.introduction;[
<!ENTITY chap.introduction SYSTEM "introduction/chapter.xml">
-]]>
-<![%chap.install;[
<!ENTITY chap.install SYSTEM "install/chapter.xml">
-]]>
-<![%chap.basics;[
<!ENTITY chap.basics SYSTEM "basics/chapter.xml">
-]]>
-<![%chap.ports;[
<!ENTITY chap.ports SYSTEM "ports/chapter.xml">
-]]>
-<![%chap.x11;[
<!ENTITY chap.x11 SYSTEM "x11/chapter.xml">
-]]>
<!-- Part Two -->
-<![%chap.desktop;[
<!ENTITY chap.desktop SYSTEM "desktop/chapter.xml">
-]]>
-<![%chap.multimedia;[
<!ENTITY chap.multimedia SYSTEM "multimedia/chapter.xml">
-]]>
-<![%chap.kernelconfig;[
<!ENTITY chap.kernelconfig SYSTEM "kernelconfig/chapter.xml">
-]]>
-<![%chap.printing;[
<!ENTITY chap.printing SYSTEM "printing/chapter.xml">
-]]>
-<![%chap.linuxemu;[
<!ENTITY chap.linuxemu SYSTEM "linuxemu/chapter.xml">
-]]>
<!-- Part Three -->
-<![%chap.config;[
<!ENTITY chap.config SYSTEM "config/chapter.xml">
-]]>
-<![%chap.boot;[
<!ENTITY chap.boot SYSTEM "boot/chapter.xml">
-]]>
-<![%chap.users;[
<!ENTITY chap.users SYSTEM "users/chapter.xml">
-]]>
-<![%chap.security;[
<!ENTITY chap.security SYSTEM "security/chapter.xml">
-]]>
-<![%chap.jails;[
<!ENTITY chap.jails SYSTEM "jails/chapter.xml">
-]]>
-<![%chap.mac;[
<!ENTITY chap.mac SYSTEM "mac/chapter.xml">
-]]>
-<![%chap.audit;[
<!ENTITY chap.audit SYSTEM "audit/chapter.xml">
-]]>
-<![%chap.disks;[
<!ENTITY chap.disks SYSTEM "disks/chapter.xml">
-]]>
-<![%chap.geom;[
<!ENTITY chap.geom SYSTEM "geom/chapter.xml">
-]]>
-<![%chap.filesystems;[
<!ENTITY chap.filesystems SYSTEM "filesystems/chapter.xml">
-]]>
-<![%chap.vinum;[
<!ENTITY chap.vinum SYSTEM "vinum/chapter.xml">
-]]>
-<![%chap.virtualization;[
<!ENTITY chap.virtualization SYSTEM "virtualization/chapter.xml">
-]]>
-<![%chap.l10n;[
<!ENTITY chap.l10n SYSTEM "l10n/chapter.xml">
-]]>
-<![%chap.cutting-edge;[
<!ENTITY chap.cutting-edge SYSTEM "cutting-edge/chapter.xml">
-]]>
-<![%chap.dtrace;[
<!ENTITY chap.dtrace SYSTEM "dtrace/chapter.xml">
-]]>
<!-- Part Four -->
-<![%chap.serialcomms;[
<!ENTITY chap.serialcomms SYSTEM "serialcomms/chapter.xml">
-]]>
-<![%chap.ppp-and-slip;[
<!ENTITY chap.ppp-and-slip SYSTEM "ppp-and-slip/chapter.xml">
-]]>
-<![%chap.mail;[
<!ENTITY chap.mail SYSTEM "mail/chapter.xml">
-]]>
-<![%chap.network-servers;[
<!ENTITY chap.network-servers SYSTEM "network-servers/chapter.xml">
-]]>
-<![%chap.firewalls;[
<!ENTITY chap.firewalls SYSTEM "firewalls/chapter.xml">
-]]>
-<![%chap.advanced-networking;[
<!ENTITY chap.advanced-networking SYSTEM "advanced-networking/chapter.xml">
-]]>
<!-- Part Five (appendices) -->
-<![%chap.mirrors;[
- <!ENTITY chap.mirrors SYSTEM "mirrors/chapter.xml">
-]]>
-<![%chap.mirrors.ftp.inc;[
- <!ENTITY chap.mirrors.ftp.inc SYSTEM "mirrors.xml.ftp.inc">
-]]>
-<![%chap.mirrors.cvsup.inc;[
- <!ENTITY chap.mirrors.cvsup.inc SYSTEM "mirrors.xml.cvsup.inc">
-]]>
-<![%chap.bibliography;[
- <!ENTITY chap.bibliography SYSTEM "bibliography/chapter.xml">
-]]>
-<![%chap.eresources;[
- <!ENTITY chap.eresources SYSTEM "eresources/chapter.xml">
-]]>
-<![%chap.eresources.www.inc;[
- <!ENTITY chap.eresources.www.inc SYSTEM "eresources.xml.www.inc">
-]]>
-<![%chap.pgpkeys;[
- <!ENTITY chap.pgpkeys SYSTEM "pgpkeys/chapter.xml">
-]]>
-<![%chap.freebsd-glossary;[
- <!ENTITY chap.freebsd-glossary "&freebsd-glossary;">
-]]>
-<![%chap.index;[
- <!ENTITY chap.index SYSTEM "index.xml">
-]]>
+ <!ENTITY chap.mirrors SYSTEM "mirrors/chapter.xml">
+ <!ENTITY chap.mirrors.lastmod.inc SYSTEM "mirrors.lastmod.inc">
+ <!ENTITY chap.mirrors.ftp.index.inc SYSTEM "mirrors.xml.ftp.index.inc">
+ <!ENTITY chap.mirrors.ftp.inc SYSTEM "mirrors.xml.ftp.inc">
+ <!ENTITY chap.mirrors.cvsup.index.inc SYSTEM "mirrors.xml.cvsup.index.inc">
+ <!ENTITY chap.mirrors.cvsup.inc SYSTEM "mirrors.xml.cvsup.inc">
+ <!ENTITY chap.bibliography SYSTEM "bibliography/chapter.xml">
+ <!ENTITY chap.eresources SYSTEM "eresources/chapter.xml">
+ <!ENTITY chap.eresources.www.index.inc SYSTEM "eresources.xml.www.index.inc">
+ <!ENTITY chap.eresources.www.inc SYSTEM "eresources.xml.www.inc">
+ <!ENTITY chap.pgpkeys SYSTEM "pgpkeys/chapter.xml">
+ <!ENTITY chap.freebsd-glossary "&freebsd-glossary;">
+ <!ENTITY chap.index "">
<!ENTITY chap.colophon SYSTEM "colophon.xml">
-
-<!-- IGNORE cases -->
-
-<!-- Part One -->
-<!ENTITY chap.introduction "">
-<!ENTITY chap.install "">
-<!ENTITY chap.basics "">
-<!ENTITY chap.ports "">
-<!ENTITY chap.x11 "">
-
-<!-- Part Two -->
-<!ENTITY chap.desktop "">
-<!ENTITY chap.multimedia "">
-<!ENTITY chap.kernelconfig "">
-<!ENTITY chap.printing "">
-<!ENTITY chap.linuxemu "">
-
-<!-- Part Three -->
-<!ENTITY chap.config "">
-<!ENTITY chap.boot "">
-<!ENTITY chap.users "">
-<!ENTITY chap.security "">
-<!ENTITY chap.jails "">
-<!ENTITY chap.mac "">
-<!ENTITY chap.audit "">
-<!ENTITY chap.disks "">
-<!ENTITY chap.geom "">
-<!ENTITY chap.filesystems "">
-<!ENTITY chap.vinum "">
-<!ENTITY chap.virtualization "">
-<!ENTITY chap.l10n "">
-<!ENTITY chap.cutting-edge "">
-<!ENTITY chap.dtrace "">
-
-<!-- Part Four -->
-<!ENTITY chap.serialcomms "">
-<!ENTITY chap.ppp-and-slip "">
-<!ENTITY chap.mail "">
-<!ENTITY chap.network-servers "">
-<!ENTITY chap.firewalls "">
-<!ENTITY chap.advanced-networking "">
-
-<!-- Part Five (appendices) -->
-<!ENTITY chap.mirrors "">
-<!ENTITY chap.mirrors.ftp.inc "">
-<!ENTITY chap.mirrors.cvsup.inc "">
-<!ENTITY chap.bibliography "">
-<!ENTITY chap.eresources "">
-<!ENTITY chap.eresources.www.inc "">
-<!ENTITY chap.pgpkeys "">
-<!ENTITY chap.freebsd-glossary "">
-<!ENTITY chap.index "">
diff --git a/es_ES.ISO8859-1/books/handbook/colophon.xml b/es_ES.ISO8859-1/books/handbook/colophon.xml
index 757be7a2dd..36cba45a64 100644
--- a/es_ES.ISO8859-1/books/handbook/colophon.xml
+++ b/es_ES.ISO8859-1/books/handbook/colophon.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/es_ES.ISO8859-1/books/handbook/config/chapter.xml b/es_ES.ISO8859-1/books/handbook/config/chapter.xml
index bdf9fce3a7..b97e06f27d 100644
--- a/es_ES.ISO8859-1/books/handbook/config/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/config/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/es_ES.ISO8859-1/books/handbook/cutting-edge/chapter.xml b/es_ES.ISO8859-1/books/handbook/cutting-edge/chapter.xml
index f4f13fc3a0..9656d5dd78 100755
--- a/es_ES.ISO8859-1/books/handbook/cutting-edge/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/cutting-edge/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/es_ES.ISO8859-1/books/handbook/desktop/chapter.xml b/es_ES.ISO8859-1/books/handbook/desktop/chapter.xml
index da24efcfd7..e4316d8b02 100644
--- a/es_ES.ISO8859-1/books/handbook/desktop/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/desktop/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Version en ingles traducida: 1.45
@@ -199,7 +199,7 @@
electr�nico, lector de noticias e incluso ofrece un
editor de p�ginas HTML por si quiere crear
p�ginas web. Los usuarios de
- <application>&netscape</application> encontrar�n semejanzas
+ <application>&netscape;</application> encontrar�n semejanzas
con la suite <application>Communicator</application>, dado que
ambos navegadores comparten parte de la base de desarrollo.</para>
diff --git a/es_ES.ISO8859-1/books/handbook/disks/chapter.xml b/es_ES.ISO8859-1/books/handbook/disks/chapter.xml
index 797e418fdb..20f4c7839c 100644
--- a/es_ES.ISO8859-1/books/handbook/disks/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/disks/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
@@ -2026,7 +2026,7 @@ cd0: Attempt to query device size failed: NOT READY, Medium not present - tray c
<para>Algunas veces las entradas bajo <filename>/dev</filename>
tendr�n que ser (re)creadas. Para ello, ejecute:</para>
- <screen>&prompt.root; <userinput>cd /dev && ./MAKEDEV "fd*"</userinput></screen>
+ <screen>&prompt.root; <userinput>cd /dev && ./MAKEDEV "fd*"</userinput></screen>
</sect4>
<sect4>
@@ -2680,9 +2680,9 @@ sa0(ncr1:4:0): Logical unit is in process of becoming ready</screen>
para mandar los datos a una unidad de cinta remota.</para>
<screen>&prompt.root; <userinput>for f in <replaceable>lista_directorios; do</replaceable></userinput>
-<userinput>find $f >> backup.list</userinput>
+<userinput>find $f << backup.list</userinput>
<userinput>done</userinput>
-&prompt.root; <userinput>cpio -v -o --format=newc < backup.list | ssh <replaceable>usuario</replaceable>@<replaceable>m�quina</replaceable> "cat > <replaceable>dispositivo_de_respaldo</replaceable>"</userinput></screen>
+&prompt.root; <userinput>cpio -v -o --format=newc < backup.list | ssh <replaceable>usuario</replaceable>@<replaceable>m�quina</replaceable> "cat > <replaceable>dispositivo_de_respaldo</replaceable>"</userinput></screen>
<para>Donde <replaceable>lista_directorios</replaceable> es la lista de
directorios que desea respaldar,
@@ -2890,7 +2890,7 @@ sa0(ncr1:4:0): Logical unit is in process of becoming ready</screen>
<title>Un <quote>script</quote> para la creaci�n de discos
flexibles de arranque</title>
- <programlisting><![ CDATA [#!/bin/sh
+ <programlisting><![CDATA[#!/bin/sh
#
# create a restore floppy
#
@@ -2936,7 +2936,7 @@ mkdir /mnt/var
#
if [ ! -x /sys/compile/MINI/kernel ]
then
- cat << EOM
+ cat << EOM
The MINI kernel does not exist, please create one.
Here is an example config file:
#
@@ -3018,19 +3018,19 @@ cd /
#
# create minimum file system table
#
-cat > /mnt/etc/fstab <<EOM
+cat > /mnt/etc/fstab <<EOM
/dev/fd0a / ufs rw 1 1
EOM
#
# create minimum passwd file
#
-cat > /mnt/etc/passwd <<EOM
-root:*:0:0:Charlie &:/root:/bin/sh
+cat > /mnt/etc/passwd <<EOM
+root:*:0:0:Charlie &:/root:/bin/sh
EOM
-cat > /mnt/etc/master.passwd <<EOM
-root::0:0::0:0:Charlie &:/root:/bin/sh
+cat > /mnt/etc/master.passwd <<EOM
+root::0:0::0:0:Charlie &:/root:/bin/sh
EOM
chmod 600 /mnt/etc/master.passwd
@@ -3111,17 +3111,6 @@ echo "The floppy has been unmounted and is now ready."]]></programlisting>
Una hora m�s que gaste ahora puede ahorrarle mucho
sufrimiento m�s adelante.</para>
</sect3>
-
-<![ %not.published; [
-
- <sect3>
- <title>* No tom� medidas antes del desastre
- ?Y ahora qu�?</title>
-
- <para></para>
- </sect3>
-]]>
-
</sect2>
</sect1>
diff --git a/es_ES.ISO8859-1/books/handbook/eresources/chapter.xml b/es_ES.ISO8859-1/books/handbook/eresources/chapter.xml
index ed00cd1f37..048d4fc722 100755
--- a/es_ES.ISO8859-1/books/handbook/eresources/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/eresources/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
@@ -1770,7 +1770,7 @@ help
<entry>SSH only</entry>
<entry>CVS de s�lo lectura, espacio web personal,
correo electr�nico</entry>
- <entry>&a.brian</entry>
+ <entry>&a.brian;</entry>
</row>
<row>
diff --git a/es_ES.ISO8859-1/books/handbook/firewalls/chapter.xml b/es_ES.ISO8859-1/books/handbook/firewalls/chapter.xml
index 27b273129a..daef773e24 100644
--- a/es_ES.ISO8859-1/books/handbook/firewalls/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/firewalls/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/es_ES.ISO8859-1/books/handbook/geom/chapter.xml b/es_ES.ISO8859-1/books/handbook/geom/chapter.xml
index 3a3a17c509..fa47c57455 100644
--- a/es_ES.ISO8859-1/books/handbook/geom/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/geom/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Spanish Documentation Project
@@ -343,7 +343,7 @@ Done.</screen>
copiar� el c�digo de arranque. De ese modo, el fallo
estar�a garantizado.</para>
- <screen>&prompt.root; <userinput>dump -L -0 -f- / |(cd /mnt && restore -r -v -f-)</userinput></screen>
+ <screen>&prompt.root; <userinput>dump -L -0 -f- / |(cd /mnt && restore -r -v -f-)</userinput></screen>
<para>Se debe hacer esto para cada sistema de ficheros. Simplemente
ponga el sistema de ficheros adecuado en la ubicaci�n correcta
diff --git a/es_ES.ISO8859-1/books/handbook/install/chapter.xml b/es_ES.ISO8859-1/books/handbook/install/chapter.xml
index 9561c329e2..1a690d30b6 100755
--- a/es_ES.ISO8859-1/books/handbook/install/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/install/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
@@ -1943,7 +1943,7 @@ Mounting root from ufs:/dev/md0c
</figure>
<para>El <keycap>tabulador</keycap> se usa para hacer pasar el
- cursor entre &gui.ok, &gui.cancel;.</para>
+ cursor entre &gui.ok;, &gui.cancel;.</para>
<para>Pulse <keycap>tabulador</keycap> para pasar el cursor a
&gui.ok; y pulse
@@ -3505,7 +3505,7 @@ Pulse [Intro] para abrir /etc/exports en un editor
<para>Esta opci�n le permitir� cortar y pegar texto en
consola y en otros programas mediante un rat�n de tres
- botones. Consulte &man.moused.8 si usa uno de 2 botones, es posible
+ botones. Consulte &man.moused.8; si usa uno de 2 botones, es posible
emular ese tercer bot�n. En el siguiente ejemplo veremos la
configuraci�n de un rat�n �no USB� (es
decir, PS/2 o de puerto COM):</para>
@@ -4714,7 +4714,7 @@ Please press any key to reboot.</screen>
<para>Cuando el disco de arranque no sea el primer disco
del sistema &os; necesitar� un poco de ayuda para
poderlo encontrar. Puede haber dos escenarios donde
- suceda esto y en ambos hay que decirle a &os, d�nde
+ suceda esto y en ambos hay que decirle a &os;, d�nde
encontrar el sistema de ficheros ra�z. Esto se
hace especificando el n�mero de disco seg�n
la BIOS, el tipo de disco y el n�mero de disco
diff --git a/es_ES.ISO8859-1/books/handbook/introduction/chapter.xml b/es_ES.ISO8859-1/books/handbook/introduction/chapter.xml
index f7c37db1e5..1e54c65d94 100755
--- a/es_ES.ISO8859-1/books/handbook/introduction/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/introduction/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/es_ES.ISO8859-1/books/handbook/jails/chapter.xml b/es_ES.ISO8859-1/books/handbook/jails/chapter.xml
index 3ca141ef23..f5ec23d124 100644
--- a/es_ES.ISO8859-1/books/handbook/jails/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/jails/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/es_ES.ISO8859-1/books/handbook/kernelconfig/chapter.xml b/es_ES.ISO8859-1/books/handbook/kernelconfig/chapter.xml
index e6c565ac1f..da31429a20 100755
--- a/es_ES.ISO8859-1/books/handbook/kernelconfig/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/kernelconfig/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
@@ -367,7 +367,7 @@ ath_hal(4) - Atheros Hardware Access Layer (HAL)</programlisting>
&prompt.root; <userinput>cp GENERIC MIKERNEL</userinput></screen>
<para>Por tradici�n el nombre se escribe con may�suculas y
- si tiene varias maquinas &os, con diferente hardware es recomendable
+ si tiene varias maquinas &os;, con diferente hardware es recomendable
darle a cada kernel el mismo nombre que la m�quina en la que va
a ejecutarse. En este ejemplo usaremos el nombre de
<filename>MIKERNEL</filename> .</para>
diff --git a/es_ES.ISO8859-1/books/handbook/l10n/chapter.xml b/es_ES.ISO8859-1/books/handbook/l10n/chapter.xml
index 8eb69d1a3d..ef9caf7f8b 100755
--- a/es_ES.ISO8859-1/books/handbook/l10n/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/l10n/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Spanish Documentation Project
diff --git a/es_ES.ISO8859-1/books/handbook/linuxemu/chapter.xml b/es_ES.ISO8859-1/books/handbook/linuxemu/chapter.xml
index 29f119cd53..1c75327839 100755
--- a/es_ES.ISO8859-1/books/handbook/linuxemu/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/linuxemu/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
@@ -60,7 +60,7 @@
su producto si existieran esas versiones para &os;, y
la mayor�a contin�a desarrollando �nicamente
para Linux.
- Vista la situaci�n ?que puede hacer un usuario de &os?
+ Vista la situaci�n ?que puede hacer un usuario de &os;?
Aqu� es donde entra en juego la compatibilidad binaria con
Linux.</para>
@@ -686,14 +686,14 @@ LOG=/var/log/lmgrd.log
case "$1" in
start)
- lmgrd -c ${LICENSE_FILE} 2>> ${LOG} 1>&2
+ lmgrd -c ${LICENSE_FILE} 2<< ${LOG} 1<&2
echo -n " lmgrd"
;;
stop)
- lmgrd -c ${LICENSE_FILE} -x lmdown 2>> ${LOG} 1>&2
+ lmgrd -c ${LICENSE_FILE} -x lmdown 2<< ${LOG} 1<&2
;;
*)
- echo "Usage: `basename $0` {start|stop}" 1>&2
+ echo "Usage: `basename $0` {start|stop}" 1<&2
exit 64
;;
esac
@@ -992,7 +992,7 @@ exit 0</programlisting>
contenido:</para>
<programlisting>#!/usr/compat/linux/bin/sh
-(sleep 5; killall -1 matlab_helper) &
+(sleep 5; killall -1 matlab_helper) &
exit 0</programlisting>
</step>
diff --git a/es_ES.ISO8859-1/books/handbook/mac/chapter.xml b/es_ES.ISO8859-1/books/handbook/mac/chapter.xml
index bf520959eb..a91a700e55 100644
--- a/es_ES.ISO8859-1/books/handbook/mac/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/mac/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/es_ES.ISO8859-1/books/handbook/mail/chapter.xml b/es_ES.ISO8859-1/books/handbook/mail/chapter.xml
index 972aca5bcf..e386dd54fb 100755
--- a/es_ES.ISO8859-1/books/handbook/mail/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/mail/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
@@ -2053,7 +2053,7 @@ sasl_pwcheck_program="/usr/local/sbin/pwcheck"</programlisting>
el n�mero del mensaje que queremos leer.
En este ejemplo vamos a leer el primer correo:</para>
- <screen>& <userinput>t 1</userinput>
+ <screen>&prompt.user; <userinput>t 1</userinput>
Message 1:
From root@localhost Mon Mar 8 14:05:52 2004
X-Original-To: marcs@localhost
@@ -2086,7 +2086,7 @@ This is a test message, please reply if you receive it.</screen>
(<keycap>.</keycap>) a continuaci�n de un salto de
l�nea. Veamos un ejemplo:</para>
- <screen>& <userinput>R 1</userinput>
+ <screen>&prompt.user; <userinput>R 1</userinput>
To: root@localhost
Subject: Re: test
@@ -2105,7 +2105,7 @@ EOT</screen>
<keycap>.</keycap> tras un saldo de l�nea y pulsando la
tecla <quote>enter</quote>.</para>
- <screen>& <userinput>mail root@localhost</userinput>
+ <screen>&prompt.user; <userinput>mail root@localhost</userinput>
Subject: <userinput>I mastered mail
Now I can send and receive email using mail ... :)
@@ -2537,7 +2537,7 @@ user "john", with password "XXXXX", is "myth" here;</programlisting>
a la direcci�n <literal>corredefiar@ejemplo2.com</literal>:</para>
<programlisting>:0
-* < 1000
+* < 1000
! correodefiar@ejemplo2.com</programlisting>
<para>Env�o de todos los correos dirigidos a
diff --git a/es_ES.ISO8859-1/books/handbook/mirrors/chapter.xml b/es_ES.ISO8859-1/books/handbook/mirrors/chapter.xml
index 95d76fe814..2ad2162903 100755
--- a/es_ES.ISO8859-1/books/handbook/mirrors/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/mirrors/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/es_ES.ISO8859-1/books/handbook/multimedia/chapter.xml b/es_ES.ISO8859-1/books/handbook/multimedia/chapter.xml
index 36d7389b18..28684c2af3 100644
--- a/es_ES.ISO8859-1/books/handbook/multimedia/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/multimedia/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/es_ES.ISO8859-1/books/handbook/network-servers/chapter.xml b/es_ES.ISO8859-1/books/handbook/network-servers/chapter.xml
index a1f505b2c2..fa6bfd3767 100644
--- a/es_ES.ISO8859-1/books/handbook/network-servers/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/network-servers/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/es_ES.ISO8859-1/books/handbook/pgpkeys/chapter.xml b/es_ES.ISO8859-1/books/handbook/pgpkeys/chapter.xml
index a67436d033..8408f8d52e 100755
--- a/es_ES.ISO8859-1/books/handbook/pgpkeys/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/pgpkeys/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/es_ES.ISO8859-1/books/handbook/ports/chapter.xml b/es_ES.ISO8859-1/books/handbook/ports/chapter.xml
index bb5822a5d4..c70dad0efb 100755
--- a/es_ES.ISO8859-1/books/handbook/ports/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/ports/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
@@ -1165,7 +1165,7 @@ ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/distfiles/ fetch</userinput></screen>
<screen>&prompt.root; <userinput>portupgrade -ai</userinput></screen>
<para>Si solamente quiere actualizar una sola aplicaci�n (y no
- absolutamente todos los ports) utilice la orden <<command>portupgrade
+ absolutamente todos los ports) utilice la orden <command>portupgrade
<replaceable>nombre-de-aplicaci�n</replaceable></command>.
A�ada el modificador <option>-R</option> si quiere que
<application>portupgrade</application> actualice antes todos los
diff --git a/es_ES.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml b/es_ES.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml
index f382b7cf30..35d8e0d4df 100755
--- a/es_ES.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
@@ -1895,7 +1895,7 @@ reinput 1 {\255}
if success goto slhup
reinput 1 {\127}
if success goto slhup
-if < \%x 60 goto look
+if < \%x 60 goto look
else goto slhup
:sllogin ; login
@@ -1916,7 +1916,7 @@ reinput 1 {\255}
if success goto slhup
reinput 1 {\127}
if success goto slhup
-if < \%x 10 goto slloop ; intentar 10 veces para obtener un login
+if < \%x 10 goto slloop ; intentar 10 veces para obtener un login
else goto slhup ; colgar y empezar de nuevo si a la decima falla
:sluid
diff --git a/es_ES.ISO8859-1/books/handbook/preface/preface.xml b/es_ES.ISO8859-1/books/handbook/preface/preface.xml
index 19ecae79f7..5c719c142f 100644
--- a/es_ES.ISO8859-1/books/handbook/preface/preface.xml
+++ b/es_ES.ISO8859-1/books/handbook/preface/preface.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
$FreeBSD$
diff --git a/es_ES.ISO8859-1/books/handbook/printing/chapter.xml b/es_ES.ISO8859-1/books/handbook/printing/chapter.xml
index c1c19adca6..4362195974 100755
--- a/es_ES.ISO8859-1/books/handbook/printing/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/printing/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/es_ES.ISO8859-1/books/handbook/security/chapter.xml b/es_ES.ISO8859-1/books/handbook/security/chapter.xml
index d70d2a0398..6de38d9e3d 100755
--- a/es_ES.ISO8859-1/books/handbook/security/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/security/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
@@ -4817,7 +4817,7 @@ COPYRIGHT 100% |*****************************| 4735
<title>ssh-keygen</title>
<para>&man.ssh-keygen.1; le permite validar a un usuario sin
- pedirle la contrase�a:<</para>
+ pedirle la contrase�a:</para>
<screen>&prompt.user; <userinput>ssh-keygen -t <replaceable>dsa</replaceable></userinput>
Generating public/private dsa key pair.
@@ -5320,7 +5320,7 @@ drwxr-xr-x 2 robert robert 512 Nov 10 11:54 public_html</programlisting>
<para>Si quiere usar <application>Portaudit</application>
inst�lelo desde la colecci�n de ports:</para>
- <screen>&prompt.root; <userinput>cd /usr/ports/security/portaudit && make install clean</userinput></screen>
+ <screen>&prompt.root; <userinput>cd /usr/ports/security/portaudit && make install clean</userinput></screen>
<para>Durante el proceso de instalaci�n los ficheros
de configuraci�n de &man.periodic.8; se actualizan
diff --git a/es_ES.ISO8859-1/books/handbook/serialcomms/chapter.xml b/es_ES.ISO8859-1/books/handbook/serialcomms/chapter.xml
index e4ede53d79..c8af2d1fe4 100755
--- a/es_ES.ISO8859-1/books/handbook/serialcomms/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/serialcomms/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/es_ES.ISO8859-1/books/handbook/users/chapter.xml b/es_ES.ISO8859-1/books/handbook/users/chapter.xml
index 7f231264e3..8dbf408674 100644
--- a/es_ES.ISO8859-1/books/handbook/users/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/users/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/es_ES.ISO8859-1/books/handbook/vinum/chapter.xml b/es_ES.ISO8859-1/books/handbook/vinum/chapter.xml
index 5873bc6cf0..4d44745af3 100644
--- a/es_ES.ISO8859-1/books/handbook/vinum/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/vinum/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Spanish Documentation Project
diff --git a/es_ES.ISO8859-1/books/handbook/virtualization/chapter.xml b/es_ES.ISO8859-1/books/handbook/virtualization/chapter.xml
index 5c4ba92666..c51654db4d 100644
--- a/es_ES.ISO8859-1/books/handbook/virtualization/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/virtualization/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/es_ES.ISO8859-1/books/handbook/x11/chapter.xml b/es_ES.ISO8859-1/books/handbook/x11/chapter.xml
index 8d881d66d2..81a8b50fb9 100755
--- a/es_ES.ISO8859-1/books/handbook/x11/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/x11/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
@@ -356,7 +356,7 @@
<para><application>&xorg;</application> es la implementaci�n
de X11 por omisi�n en &os;. <application>&xorg;</application>
est� basado en c�digo de
- <application>&xfree86 4.4RC2</application> y X11R6.6.
+ <application>&xfree86; 4.4RC2</application> y X11R6.6.
La versi�n de <application>&xorg;</application> que se
distribuye actualmente en la Colecci�n de Ports de &os; es
la &xorg.version;.</para>
From b7fac262077d66b08e849cb15cbeb72f03fcce06 Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Mon, 21 Jan 2013 17:38:45 +0000
Subject: [PATCH 011/121] - Make the French documentation valid XML
---
.../articles/building-products/article.xml | 12 +-
.../articles/explaining-bsd/article.xml | 2 +-
.../articles/linux-users/article.xml | 2 +-
.../books/developers-handbook/book.xml | 2 +-
.../driverbasics/chapter.xml | 16 +-
.../developers-handbook/locking/chapter.xml | 2 +-
.../books/developers-handbook/pci/chapter.xml | 6 +-
.../developers-handbook/scsi/chapter.xml | 2 +-
.../developers-handbook/secure/chapter.xml | 4 +-
.../developers-handbook/tools/chapter.xml | 16 +-
.../books/developers-handbook/usb/chapter.xml | 2 +-
fr_FR.ISO8859-1/books/faq/book.xml | 20 +-
fr_FR.ISO8859-1/books/fdp-primer/book.xml | 2 +-
.../books/fdp-primer/in-progress.xml | 2 +-
.../books/fdp-primer/overview/chapter.xml | 4 +-
.../books/fdp-primer/psgml-mode/chapter.xml | 2 +-
.../books/fdp-primer/see-also/chapter.xml | 2 +-
.../books/fdp-primer/sgml-markup/chapter.xml | 92 ++++-----
.../books/fdp-primer/sgml-primer/chapter.xml | 70 ++++---
.../books/fdp-primer/stylesheets/chapter.xml | 2 +-
.../books/fdp-primer/the-faq/chapter.xml | 2 +-
.../books/fdp-primer/the-handbook/chapter.xml | 8 +-
.../books/fdp-primer/the-website/chapter.xml | 2 +-
fr_FR.ISO8859-1/books/fdp-primer/todo.xml | 2 +-
.../books/fdp-primer/tools/chapter.xml | 2 +-
.../books/fdp-primer/translations/chapter.xml | 8 +-
.../fdp-primer/writing-style/chapter.xml | 2 +-
fr_FR.ISO8859-1/books/handbook/Makefile | 36 +++-
.../handbook/advanced-networking/chapter.xml | 6 +-
.../books/handbook/audit/chapter.xml | 2 +-
.../books/handbook/basics/chapter.xml | 2 +-
.../books/handbook/bibliography/chapter.xml | 2 +-
fr_FR.ISO8859-1/books/handbook/book.xml | 2 +-
.../books/handbook/boot/chapter.xml | 2 +-
fr_FR.ISO8859-1/books/handbook/chapters.ent | 195 ++----------------
fr_FR.ISO8859-1/books/handbook/colophon.xml | 2 +-
.../books/handbook/config/chapter.xml | 10 +-
.../books/handbook/cutting-edge/chapter.xml | 2 +-
.../books/handbook/desktop/chapter.xml | 2 +-
.../books/handbook/disks/chapter.xml | 27 +--
.../books/handbook/eresources/chapter.xml | 4 +-
.../books/handbook/firewalls/chapter.xml | 2 +-
.../books/handbook/geom/chapter.xml | 2 +-
.../books/handbook/install/chapter.xml | 4 +-
.../books/handbook/introduction/chapter.xml | 2 +-
.../books/handbook/jails/chapter.xml | 2 +-
.../books/handbook/kernelconfig/chapter.xml | 4 +-
.../books/handbook/l10n/chapter.xml | 2 +-
.../books/handbook/linuxemu/chapter.xml | 10 +-
.../books/handbook/mac/chapter.xml | 2 +-
.../books/handbook/mail/chapter.xml | 10 +-
.../books/handbook/mirrors/chapter.xml | 2 +-
.../books/handbook/multimedia/chapter.xml | 2 +-
.../handbook/network-servers/chapter.xml | 2 +-
.../books/handbook/pgpkeys/chapter.xml | 2 +-
.../books/handbook/ports/chapter.xml | 2 +-
.../books/handbook/ppp-and-slip/chapter.xml | 6 +-
.../books/handbook/preface/preface.xml | 2 +-
.../books/handbook/printing/chapter.xml | 2 +-
.../books/handbook/security/chapter.xml | 14 +-
.../books/handbook/serialcomms/chapter.xml | 2 +-
.../books/handbook/users/chapter.xml | 2 +-
.../books/handbook/vinum/chapter.xml | 2 +-
.../books/handbook/virtualization/chapter.xml | 2 +-
.../books/handbook/x11/chapter.xml | 6 +-
.../books/porters-handbook/book.xml | 2 +-
fr_FR.ISO8859-1/share/xml/mirrors-local.xsl | 1 -
67 files changed, 260 insertions(+), 413 deletions(-)
diff --git a/fr_FR.ISO8859-1/articles/building-products/article.xml b/fr_FR.ISO8859-1/articles/building-products/article.xml
index bc645c8020..069452b076 100644
--- a/fr_FR.ISO8859-1/articles/building-products/article.xml
+++ b/fr_FR.ISO8859-1/articles/building-products/article.xml
@@ -871,12 +871,12 @@ bde 2005-10-29 16:34:50 UTC
66 1.14 (bde 29-Oct-05): int32_t e0,i,nx,n,ix,hx;
67 1.1 (jkh 19-Aug-94):
68 1.1 (jkh 19-Aug-94): GET_FLOAT_WORD(hx,x);
-69 1.1 (jkh 19-Aug-94): ix = hx&0x7fffffff;
-70 1.1 (jkh 19-Aug-94): if(ix<=0x3f490fd8) /* |x| ~<= pi/4 , no need for reduction */
+69 1.1 (jkh 19-Aug-94): ix = hx&0x7fffffff;
+70 1.1 (jkh 19-Aug-94): if(ix<=0x3f490fd8) /* |x| ~<= pi/4 , no need for reduction */
71 1.1 (jkh 19-Aug-94): {y[0] = x; y[1] = 0; return 0;}
72 1.14 (bde 29-Oct-05): /* 33+53 bit pi is good enough for special and medium size cases */
-73 1.2 (bde 07-Apr-95): if(ix<0x4016cbe4) { /* |x| < 3pi/4, special case with n=+-1 */
-74 1.14 (bde 29-Oct-05): if(hx>0) {
+73 1.2 (bde 07-Apr-95): if(ix<0x4016cbe4) { /* |x| < 3pi/4, special case with n=+-1 */
+74 1.14 (bde 29-Oct-05): if(hx>0) {
75 1.15 (bde 06-Nov-05): z = x - pio2;
76 1.15 (bde 06-Nov-05): n = 1;
77 1.15 (bde 06-Nov-05): } else {
@@ -887,7 +887,7 @@ bde 2005-10-29 16:34:50 UTC
82 1.15 (bde 06-Nov-05): y[1] = z - y[0];
83 1.15 (bde 06-Nov-05): return n;
84 1.15 (bde 06-Nov-05): }
-85 1.15 (bde 06-Nov-05): if(ix<0x407b53d1) { /* |x| < 5*pi/4, special case with n=+-2 */
+85 1.15 (bde 06-Nov-05): if(ix<0x407b53d1) { /* |x| < 5*pi/4, special case with n=+-2 */
</programlisting>
</figure>
@@ -956,7 +956,7 @@ bde 2005-10-29 16:34:50 UTC
rapproch�es, il est recommand� d'embaucher
ou de s'attacher les services d'un d�veloppeur ou
d'une firme qui a de l'exp�rience avec &os;. La
- &a.jobs est un canal de communication utile si vous
+ &a.jobs; est un canal de communication utile si vous
�tes à la recherche de talents dans le
domaine. Le projet &os; maintient une <ulink
url="&url.base;/commercial/consult_bycat.html"> liste
diff --git a/fr_FR.ISO8859-1/articles/explaining-bsd/article.xml b/fr_FR.ISO8859-1/articles/explaining-bsd/article.xml
index 189a052967..c0793356af 100644
--- a/fr_FR.ISO8859-1/articles/explaining-bsd/article.xml
+++ b/fr_FR.ISO8859-1/articles/explaining-bsd/article.xml
@@ -304,7 +304,7 @@
<listitem>
<para>Il existe une id�e selon laquelle les projets BSD
seraient fragment�s et concurrents. Le <ulink
- url="http://interactive.wsj.com/bin/login?Tag=/&URI=/archive/retrieve.cgi%253Fid%253DSB952470579348918651.djm&">Wall
+ url="http://interactive.wsj.com/bin/login?Tag=/&URI=/archive/retrieve.cgi%253Fid%253DSB952470579348918651.djm&">Wall
Street Journal</ulink> a m�me parl� d'une
<quote>balkanisation</quote> des projets BSD. Tout comme
les poursuites judiciaires, cette perception se base sur de
diff --git a/fr_FR.ISO8859-1/articles/linux-users/article.xml b/fr_FR.ISO8859-1/articles/linux-users/article.xml
index 30bf94cf7c..19fb056b76 100644
--- a/fr_FR.ISO8859-1/articles/linux-users/article.xml
+++ b/fr_FR.ISO8859-1/articles/linux-users/article.xml
@@ -414,7 +414,7 @@ apache22_flags="-DSSL"</programlisting>
une interface r�seau, &os; utilise le nom du pilote
suivi d'un nombre en tant qu'identifiant. La sortie suivante
de &man.ifconfig.8; montre deux interfaces r�seau
- &intel Pro 1000 (<devicename>em0</devicename> et
+ &intel; Pro 1000 (<devicename>em0</devicename> et
<devicename>em1</devicename>):</para>
<screen>&prompt.user; <userinput>ifconfig</userinput>
diff --git a/fr_FR.ISO8859-1/books/developers-handbook/book.xml b/fr_FR.ISO8859-1/books/developers-handbook/book.xml
index 44f6ae4f0e..32532e7075 100644
--- a/fr_FR.ISO8859-1/books/developers-handbook/book.xml
+++ b/fr_FR.ISO8859-1/books/developers-handbook/book.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
"../../../share/xml/freebsd42.dtd" [
<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//FR" "../../share/xml/entities.ent">
diff --git a/fr_FR.ISO8859-1/books/developers-handbook/driverbasics/chapter.xml b/fr_FR.ISO8859-1/books/developers-handbook/driverbasics/chapter.xml
index 398cec854c..87e701e170 100644
--- a/fr_FR.ISO8859-1/books/developers-handbook/driverbasics/chapter.xml
+++ b/fr_FR.ISO8859-1/books/developers-handbook/driverbasics/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD French Documentation Project
@@ -122,7 +122,7 @@ KMOD=skeleton
<para>Lancer simplement la commande <command>make</command> avec ce fichier Makefile
cr�era un fichier <filename>skeleton.ko</filename> qui peut
�tre charg� dans votre syst�me en tapant :
-<screen> &prompt.root
+<screen> &prompt.root;
kldload -v ./skeleton.ko
</screen>
</para>
@@ -179,7 +179,7 @@ KMOD=skeleton
* Murray Stokely
*/
-#define MIN(a,b) (((a) < (b)) ? (a) : (b))
+#define MIN(a,b) (((a) < (b)) ? (a) : (b))
#include <sys/types.h>
#include <sys/module.h>
@@ -244,7 +244,7 @@ echo_loader(struct module *m, int what, void *arg)
switch (what) {
case MOD_LOAD: /* kldload */
- sdev = make_dev(<literal>&</literal>echo_cdevsw,
+ sdev = make_dev(<literal>&</literal>echo_cdevsw,
0,
UID_ROOT,
GID_WHEEL,
@@ -298,7 +298,7 @@ echo_read(dev_t dev, struct uio *uio, int ioflag)
/* De quelle taille est cette operation read ? Aussi grande que l'utilisateur le veut,
ou aussi grande que les donnees restantes */
- amt = MIN(uio->uio_resid, (echomsg->len - uio->uio_offset > 0) ? echomsg->len - uio->uio_offset : 0);
+ amt = MIN(uio->uio_resid, (echomsg->len - uio->uio_offset > 0) ? echomsg->len - uio->uio_offset : 0);
if ((err = uiomove(echomsg->msg + uio->uio_offset,amt,uio)) != 0) {
uprintf("uiomove echoue!\n");
}
@@ -338,15 +338,15 @@ DEV_MODULE(echo,echo_loader,NULL);</programlisting>
votre syst�me de fichiers avec une commande comme : </para>
<screen>
- &prompt.root mknod /dev/echo c 33 0
+ &prompt.root; mknod /dev/echo c 33 0
</screen>
<para>Avec ce pilote charg�, vous devriez maintenant �tr capable de taper
quelque chose comme :</para>
<screen>
- &prompt.root echo -n "Test Donnees" > /dev/echo
- &prompt.root cat /dev/echo
+ &prompt.root; echo -n "Test Donnees" > /dev/echo
+ &prompt.root; cat /dev/echo
Test Donnees
</screen>
diff --git a/fr_FR.ISO8859-1/books/developers-handbook/locking/chapter.xml b/fr_FR.ISO8859-1/books/developers-handbook/locking/chapter.xml
index c3a703c746..ca308534df 100644
--- a/fr_FR.ISO8859-1/books/developers-handbook/locking/chapter.xml
+++ b/fr_FR.ISO8859-1/books/developers-handbook/locking/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD French Documentation Project
diff --git a/fr_FR.ISO8859-1/books/developers-handbook/pci/chapter.xml b/fr_FR.ISO8859-1/books/developers-handbook/pci/chapter.xml
index 129ef1be60..22b31e9a33 100644
--- a/fr_FR.ISO8859-1/books/developers-handbook/pci/chapter.xml
+++ b/fr_FR.ISO8859-1/books/developers-handbook/pci/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD French Documentation Project
@@ -29,7 +29,7 @@
* Murray Stokely
*/
-#define MIN(a,b) (((a) < (b)) ? (a) : (b))
+#define MIN(a,b) (((a) < (b)) ? (a) : (b))
#include <sys/types.h>
#include <sys/module.h>
@@ -138,7 +138,7 @@ static int
mypci_attach(device_t dev)
{
uprintf("Rattachement de MonPCI pour: ID Peripherique: 0x%x\n",pci_get_vendor(dev));
- sdev = make_dev(<literal>&</literal>mypci_cdevsw,
+ sdev = make_dev(<literal>&</literal>mypci_cdevsw,
0,
UID_ROOT,
GID_WHEEL,
diff --git a/fr_FR.ISO8859-1/books/developers-handbook/scsi/chapter.xml b/fr_FR.ISO8859-1/books/developers-handbook/scsi/chapter.xml
index 9692f16ecb..f56c6a51f9 100644
--- a/fr_FR.ISO8859-1/books/developers-handbook/scsi/chapter.xml
+++ b/fr_FR.ISO8859-1/books/developers-handbook/scsi/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD French Documentation Project
diff --git a/fr_FR.ISO8859-1/books/developers-handbook/secure/chapter.xml b/fr_FR.ISO8859-1/books/developers-handbook/secure/chapter.xml
index 19f5de9645..473dbc6f90 100644
--- a/fr_FR.ISO8859-1/books/developers-handbook/secure/chapter.xml
+++ b/fr_FR.ISO8859-1/books/developers-handbook/secure/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD French Documentation Project
@@ -343,7 +343,7 @@ int main() {
les permissions d'un fichier, le propri�taire, le groupe, la taille,
la date d'acc�s, et la date de modification.</simpara></listitem>
<listitem><simpara>Se lier à des ports privil�gi�s sur Internet
- (ports < 1024)</simpara></listitem>
+ (ports < 1024)</simpara></listitem>
</itemizedlist>
<para><function>Jail</function> est un outil tr�s utile pour ex�cuter
diff --git a/fr_FR.ISO8859-1/books/developers-handbook/tools/chapter.xml b/fr_FR.ISO8859-1/books/developers-handbook/tools/chapter.xml
index 6bf317ae99..6a7400b235 100644
--- a/fr_FR.ISO8859-1/books/developers-handbook/tools/chapter.xml
+++ b/fr_FR.ISO8859-1/books/developers-handbook/tools/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD French Documentation Project
@@ -974,7 +974,7 @@ free(foo);
<para>Si vous voulez cr�er un fichier <filename>core</filename> depuis
l'ext�rieur de votre programme, mais ne voulez pas que le processus
s'arr�t,vous pouvez utiliser le programme <command>gcore</command>.
- Voir la page de manuel en ligne de &man.gcore.1 pour plus d'informations.
+ Voir la page de manuel en ligne de &man.gcore.1; pour plus d'informations.
</para>
</answer>
@@ -1005,7 +1005,7 @@ free(foo);
Aussi, nous pourrions avoir quelque chose comme �a:
</para>
- <screen>&prompt.user; <userinput>cc fichier1.o fichier2.o</userinput> … <userinput>fichier37.c</userinput> &hellip
+ <screen>&prompt.user; <userinput>cc fichier1.o fichier2.o</userinput> … <userinput>fichier37.c</userinput> …
</screen>
<para>si nous avions chang� le fichier <filename>fichier37.c</filename> mais aucun
@@ -1472,7 +1472,7 @@ main() {
i = 5;
printf("C'est mon programme\n");
-<lineannotation>&hellip</lineannotation></programlisting>
+<lineannotation>…</lineannotation></programlisting>
<para>mais nous n'avions pas mis la ligne <literal>i=5;</literal>. Comme
nous n'avons pas initialis� <symbol>i</symbol>, il a pris le nombre se trouvant
@@ -1591,17 +1591,17 @@ Cannot access memory at address 0x7020796d.
de <command>gdb</command>):
</para>
- <screen><lineannotation>&hellip</lineannotation>
-if ((pid = fork()) < 0) /* _Toujours_ verifier cela */
+ <screen><lineannotation>…</lineannotation>
+if ((pid = fork()) < 0) /* _Toujours_ verifier cela */
error();
else if (pid == 0) { /* le fils */
int PauseMode = 1;
while (PauseMode)
sleep(10); /* Attendre jusqu'a ce que quelqu'un se brache sur nous */
- <lineannotation>&hellip</lineannotation>
+ <lineannotation>…</lineannotation>
} else { /* le pere */
- <lineannotation>&hellip</lineannotation>
+ <lineannotation>…</lineannotation>
</screen>
<para>Maintenant tout ce que nous avons à faire est de nous brancher sur le processus fils,
diff --git a/fr_FR.ISO8859-1/books/developers-handbook/usb/chapter.xml b/fr_FR.ISO8859-1/books/developers-handbook/usb/chapter.xml
index 66a7dbcfc7..201363d704 100644
--- a/fr_FR.ISO8859-1/books/developers-handbook/usb/chapter.xml
+++ b/fr_FR.ISO8859-1/books/developers-handbook/usb/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD French Documentation Project
diff --git a/fr_FR.ISO8859-1/books/faq/book.xml b/fr_FR.ISO8859-1/books/faq/book.xml
index b09cb9bc01..dc18acdd6f 100644
--- a/fr_FR.ISO8859-1/books/faq/book.xml
+++ b/fr_FR.ISO8859-1/books/faq/book.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
"../../../share/xml/freebsd42.dtd" [
<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//FR" "../../share/xml/entities.ent">
@@ -62,7 +62,7 @@
<para>N.d.T.: Contactez la &a.fr-doc; si vous voulez
collaborer à ce projet.</para>
&trans.a.gioria;
- <para><emphasis>Premi�re version de &a.fr.gioria et
+ <para><emphasis>Premi�re version de &a.fr.gioria; et
&a.fr.dntt;</emphasis></para>
</abstract>
@@ -739,7 +739,7 @@ besoin de reformater ces fichiers sous une forme plus lisible, lancez
la commande col sur le fichier :
<programlisting>
-$ col -b < fichierOrigine > fichierSortie
+$ col -b < fichierOrigine > fichierSortie
</programlisting>
</para>
</sect1>
@@ -1181,7 +1181,7 @@ lp0 des deux c
<para>Par exemple, si vous voulez connecter l'ordinateur max avec moritz :</para>
<programlisting>
- max <-----> moritz
+ max <-----> moritz
IP Address 10.0.0.1 10.0.0.2
</programlisting>
@@ -1199,7 +1199,7 @@ IP Address 10.0.0.1 10.0.0.2
# ifconfig lp0 10.0.0.2 10.0.0.1
</programlisting>
-<para>C'est tout ! Lisez aussi les manpages
+<para>C'est tout ! Lisez aussi les manpages
<citerefentry><refentrytitle>lp</refentrytitle><manvolnum>4</manvolnum></citerefentry> and
<citerefentry><refentrytitle>lpt</refentrytitle><manvolnum>4</manvolnum></citerefentry>.</para>
@@ -1361,7 +1361,7 @@ dans les 504 premiers Mo.</para>
<sect1>
- <title>A propos des gestionnaires de disque ? Ou bien, j'ai un disque de grande capacit� !</title>
+ <title>A propos des gestionnaires de disque ? Ou bien, j'ai un disque de grande capacit� !</title>
<para>FreeBSD reconnait le gestionnaire "Ontrack Disk Manager" et le tol�re.
Les autres gestionnaires de disque ne sont pas support�s.</para>
@@ -2045,7 +2045,7 @@ moused_flags=""
</sect1>
<sect1>
- <title>Je n'ai pas de coprocesseur arithm�tique. Est-ce un probl�me ?</title>
+ <title>Je n'ai pas de coprocesseur arithm�tique. Est-ce un probl�me ?</title>
<note>
<para>Cela ne touche que ceux qui ont un 386/486SX/486SLC -
@@ -4077,12 +4077,12 @@ quitter ce mode tapez Control-D.</para>
j@uriah 191% sendmail -bt
ADDRESS TEST MODE (ruleset 3 NOT automatically invoked)
Enter <ruleset> <address>
-> 0 foo@interface-business.de
+> 0 foo@interface-business.de
rewrite: ruleset 0 input: foo @ interface-business . de
...
rewrite: ruleset 0 returns: $# uucp-dom $@ if-bus $: foo \
-< @ interface-business . de >
-> ^D
+< @ interface-business . de >
+> ^D
j@uriah 192%
</programlisting></para>
</sect1>
diff --git a/fr_FR.ISO8859-1/books/fdp-primer/book.xml b/fr_FR.ISO8859-1/books/fdp-primer/book.xml
index bc654bf9a2..16d63bee43 100644
--- a/fr_FR.ISO8859-1/books/fdp-primer/book.xml
+++ b/fr_FR.ISO8859-1/books/fdp-primer/book.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
"../../../share/xml/freebsd42.dtd" [
<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//FR" "../../share/xml/entities.ent">
diff --git a/fr_FR.ISO8859-1/books/fdp-primer/in-progress.xml b/fr_FR.ISO8859-1/books/fdp-primer/in-progress.xml
index 046d7c6684..032513ab6f 100644
--- a/fr_FR.ISO8859-1/books/fdp-primer/in-progress.xml
+++ b/fr_FR.ISO8859-1/books/fdp-primer/in-progress.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD French Documentation Project
diff --git a/fr_FR.ISO8859-1/books/fdp-primer/overview/chapter.xml b/fr_FR.ISO8859-1/books/fdp-primer/overview/chapter.xml
index bf4faee0c1..c4499afa41 100644
--- a/fr_FR.ISO8859-1/books/fdp-primer/overview/chapter.xml
+++ b/fr_FR.ISO8859-1/books/fdp-primer/overview/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
@@ -163,7 +163,7 @@
<application>CVSup</application> ou <application>CTM</application>),
ou en vous servant de <application>CVSup</application> pour ne
t�l�charger que la version
- extraite - <emphasis>courante</emphasis>.</para>
+ extraite - <emphasis>courante</emphasis>.</para>
</listitem>
<listitem>
diff --git a/fr_FR.ISO8859-1/books/fdp-primer/psgml-mode/chapter.xml b/fr_FR.ISO8859-1/books/fdp-primer/psgml-mode/chapter.xml
index 4090ac8e5f..aadb3dc30a 100644
--- a/fr_FR.ISO8859-1/books/fdp-primer/psgml-mode/chapter.xml
+++ b/fr_FR.ISO8859-1/books/fdp-primer/psgml-mode/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/fr_FR.ISO8859-1/books/fdp-primer/see-also/chapter.xml b/fr_FR.ISO8859-1/books/fdp-primer/see-also/chapter.xml
index 5c79b71093..6213db8893 100644
--- a/fr_FR.ISO8859-1/books/fdp-primer/see-also/chapter.xml
+++ b/fr_FR.ISO8859-1/books/fdp-primer/see-also/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/fr_FR.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml b/fr_FR.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml
index 2d4f339466..f26e549753 100644
--- a/fr_FR.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml
+++ b/fr_FR.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
@@ -159,7 +159,7 @@ PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"</programlisting>
<para>Utilisez :</para>
<programlisting>
-<![ CDATA [<h1>Premi�re section</h1>
+<![CDATA[<h1>Premi�re section</h1>
<!-- Introduction du document -->
@@ -191,7 +191,7 @@ PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"</programlisting>
<para>Use:</para>
<programlisting>
-<![ CDATA [<h1>Premi�re section</h1>
+<![CDATA[<h1>Premi�re section</h1>
<!-- Introduction du document -->
@@ -213,7 +213,7 @@ PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"</programlisting>
<para>Utilisez :</para>
<programlisting>
-<![ CDATA [<p>C'est un paragraphe. Il peut contenir pratiquement
+<![CDATA[<p>C'est un paragraphe. Il peut contenir pratiquement
n'importe quel �l�ment.</p>]]></programlisting>
</example>
</sect3>
@@ -231,7 +231,7 @@ PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"</programlisting>
<para>Utilisez :</para>
<programlisting>
-<![ CDATA [<p>Un court extrait de la Constitution des Etats-Unis :</p>
+<![CDATA[<p>Un court extrait de la Constitution des Etats-Unis :</p>
<blockquote>Nous le Peuple des Etats-Unis, dans le But de former
une Union plus parfaite, d'�tablir la Justice, d'assurer
@@ -276,7 +276,7 @@ PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"</programlisting>
<para>Utilisez :</para>
<programlisting>
-<![ CDATA [<p>Une liste non ordonn�e. Les �l�ments de la liste seront
+<![CDATA[<p>Une liste non ordonn�e. Les �l�ments de la liste seront
probablement pr�c�d�s par des puces.</p>
<ul>
@@ -307,7 +307,7 @@ PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"</programlisting>
<para>Utilisez :</para>
<programlisting>
-<![ CDATA [<dl>
+<![CDATA[<dl>
<dt>Terme 1</dt>
<dd><p>Paragraphe 1 de la d�finition 1.</p></dd>
@@ -345,7 +345,7 @@ PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"</programlisting>
texte d'un courrier �lectronique :</para>
<programlisting>
-<![ CDATA [<pre>
+<![CDATA[<pre>
From: nik@freebsd.org
To: freebsd-doc@freebsd.org
Subject: Nouvelle documentation disponible
@@ -389,7 +389,7 @@ PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"</programlisting>
<para>Utilisez :</para>
<programlisting>
-<![ CDATA [<p>C'est une table 2x2 simple.</p>
+<![CDATA[<p>C'est une table 2x2 simple.</p>
<table>
<tr>
@@ -416,7 +416,7 @@ PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"</programlisting>
<para>Utilisez :</para>
<programlisting>
-<![ CDATA [<p>Une grande cellule à gauche, deux petites cellule à droite.</p>
+<![CDATA[<p>Une grande cellule à gauche, deux petites cellule à droite.</p>
<table>
<tr>
@@ -437,7 +437,7 @@ PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"</programlisting>
<para>Utilisez :</para>
<programlisting>
-<![ CDATA [<p>Une grande cellule en haut, deux petites cellules en dessous.</p>
+<![CDATA[<p>Une grande cellule en haut, deux petites cellules en dessous.</p>
<table>
<tr>
@@ -459,7 +459,7 @@ PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"</programlisting>
<para>Use:</para>
<programlisting>
-<![ CDATA [<p>Sur une grille 3x3, la cellule en haut à gauche s'�tend sur deux
+<![CDATA[<p>Sur une grille 3x3, la cellule en haut à gauche s'�tend sur deux
lignes et deux colonnes. Les autres cellules sont normales.</p>
<table>
@@ -510,7 +510,7 @@ PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"</programlisting>
<para>Utilisez :</para>
<programlisting>
-<![ CDATA [<p><em>Ceci</em> est accentu�, et
+<![CDATA[<p><em>Ceci</em> est accentu�, et
<strong>cela</strong> l'est encore plus.</p>]]></programlisting>
</example>
</sect3>
@@ -527,7 +527,7 @@ PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"</programlisting>
<title><sgmltag>b</sgmltag> et <sgmltag>i</sgmltag></title>
<programlisting>
-<![ CDATA [<p><b>Ceci</b> est en gras, tandis que <i>cela</i> est
+<![CDATA[<p><b>Ceci</b> est en gras, tandis que <i>cela</i> est
en italiques.</p>]]></programlisting>
</example>
</sect3>
@@ -545,7 +545,7 @@ PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"</programlisting>
<para>Utilisez :</para>
<programlisting>
-<![ CDATA [<p>L'auteur original de ce document est
+<![CDATA[<p>L'auteur original de ce document est
Nik Clayton, qui peut �tre contact� par courrier
�lectronique à l'adresse : <tt>nik@freebsd.org</tt>.</p>]]></programlisting>
</example>
@@ -590,7 +590,7 @@ PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"</programlisting>
<para>Les trois extraits suivants ont le m�me r�sultat :</para>
<programlisting>
-<![ CDATA [<p>Ce texte est <small>un peu plus petit</small>.
+<![CDATA[<p>Ce texte est <small>un peu plus petit</small>.
Mais celui-là <big>est un peu plus gros</big>.</p>
<p>Ce texte est <font size="-1">un peu plus petit</font>.
@@ -628,7 +628,7 @@ PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"</programlisting>
<para>Utilisez :</para>
<programlisting>
-<![ CDATA [<p>Vous trouverez plus d'informations sur le
+<![CDATA[<p>Vous trouverez plus d'informations sur le
<a href="http://www.freebsd.org/">site Web de FreeBSD</a>.</p>]]></programlisting>
</example>
@@ -653,7 +653,7 @@ PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"</programlisting>
<para>Utilisez :</para>
<programlisting>
-<![ CDATA [<p><a name="para1">Ce</a> paragraphe peut �tre r�f�renc�
+<![CDATA[<p><a name="para1">Ce</a> paragraphe peut �tre r�f�renc�
par d'autres liens via le nom <tt>para1</tt>.</p>]]></programlisting>
</example>
@@ -668,7 +668,7 @@ PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"</programlisting>
dans un document appel� <filename>foo.html</filename>.</para>
<programlisting>
-<![ CDATA [<p>Vous trouverez plus d'informations au
+<![CDATA[<p>Vous trouverez plus d'informations au
<a href="foo.html#para1">premier paragraphe</a> de
<tt>foo.html</tt>.</p>]]></programlisting>
</example>
@@ -684,7 +684,7 @@ PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"</programlisting>
de ce document.</para>
<programlisting>
-<![ CDATA [<p>Vous trouverez plus d'informations au
+<![CDATA[<p>Vous trouverez plus d'informations au
<a href="#para1">premier paragraphe</a> de
ce document.</p>]]></programlisting>
</example>
@@ -913,7 +913,7 @@ PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"</programlisting>
<example>
<title>Un chapitre</title>
- <programlisting><![ CDATA [<chapter>
+ <programlisting><![CDATA[<chapter>
<title>Le titre du chapitre</title>
...
@@ -927,7 +927,7 @@ PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"</programlisting>
<example>
<title>Chapitres vides</title>
- <programlisting><![ CDATA [<chapter>
+ <programlisting><![CDATA[<chapter>
<title>C'est un chapitre vide</title>
<para></para>
@@ -956,7 +956,7 @@ PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"</programlisting>
<example>
<title>Sections dans les chapitres</title>
- <programlisting><![ RCDATA [<chapter>
+ <programlisting><![CDATA[<chapter>
<title>Exemple de chapitre</title>
<para>Du texte dans le chapitre.</para>
@@ -1005,7 +1005,7 @@ PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"</programlisting>
d�finissant une ou plusieurs <sgmltag>part</sgmltag>s. Ce n'est pas
possible dans un <sgmltag>article</sgmltag>.</para>
- <programlisting><![ CDATA [<part>
+ <programlisting><![CDATA[<part>
<title>Introduction</title>
<chapter>
@@ -1050,7 +1050,7 @@ PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"</programlisting>
<para>Utilisez :</para>
- <programlisting><![ CDATA [<para>C'est un paragraphe. Il peut contenir
+ <programlisting><![CDATA[<para>C'est un paragraphe. Il peut contenir
presque n'importe quel autre �l�ment.</para> ]]></programlisting>
<para>Apparence :</para>
@@ -1075,7 +1075,7 @@ PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"</programlisting>
<para>Utilisez :</para>
- <programlisting><![ CDATA [<para>Un court extrait de la constitution des Etats-Unis :</para>
+ <programlisting><![CDATA[<para>Un court extrait de la constitution des Etats-Unis :</para>
<blockquote>
<title>Pr�ambule à la Constitution des Etats-Unis</title>
@@ -1159,7 +1159,7 @@ PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"</programlisting>
<para>Utilisez :</para>
- <programlisting><![ CDATA [<warning>
+ <programlisting><![CDATA[<warning>
<para>Installer FreeBSD peut vous donner envie de supprimer
Windows de votre disque dur.</para>
</warning>]]></programlisting>
@@ -1209,7 +1209,7 @@ PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"</programlisting>
<para>Utilisez :</para>
- <programlisting><![ CDATA [<itemizedlist>
+ <programlisting><![CDATA[<itemizedlist>
<listitem>
<para>C'est le premier �l�ment de la liste.</para>
</listitem>
@@ -1304,7 +1304,7 @@ PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"</programlisting>
<para>Utilisez :</para>
- <programlisting><![ CDATA[<para>Quand vous aurez fini, votre programme
+ <programlisting><![CDATA[<para>Quand vous aurez fini, votre programme
ressemblera à cela :</para>
<programlisting>#include <stdio.h>
@@ -1375,7 +1375,7 @@ main(void)
<para>Utilisez :</para>
- <programlisting><![ CDATA [<informaltable>
+ <programlisting><![CDATA[<informaltable>
<tgroup cols="2">
<thead>
<row>
@@ -1532,7 +1532,7 @@ main(void)
<para>Utilisez :</para>
- <programlisting><![ CDATA [<screen>&prompt.user; <userinput>ls -1</userinput>
+ <programlisting><![CDATA[<screen>&prompt.user; <userinput>ls -1</userinput>
foo1
foo2
foo3
@@ -1591,7 +1591,7 @@ C'est le fichier 'foo2'</screen>
<para>Utilisez :</para>
- <programlisting><![ CDATA [<para>FreeBSD est sans aucun doute
+ <programlisting><![CDATA[<para>FreeBSD est sans aucun doute
<emphasis>le</emphasis> premier syst�me
d'exploitation de type Unix pour
architecture Intel.</para>]]></programlisting>
@@ -1678,7 +1678,7 @@ C'est le fichier 'foo2'</screen>
<para>Utilisez :</para>
- <programlisting><![ CDATA [<para><application>Sendmail</application> est le logiciel de
+ <programlisting><![CDATA[<para><application>Sendmail</application> est le logiciel de
courrier �lectronique le plus employ� sous Unix.</para>
<para><application>Sendmail</application> comporte les
@@ -1730,7 +1730,7 @@ C'est le fichier 'foo2'</screen>
<para>Utilisez :</para>
- <programlisting><![ CDATA [<para>Vous trouverez le source SGML du Manuel
+ <programlisting><![CDATA[<para>Vous trouverez le source SGML du Manuel
de R�f�rence en Anglais dans
<filename>/usr/doc/en/handbook/</filename>. Le
fichier principal, dans ce r�pertoire, s'appelle
@@ -1776,7 +1776,7 @@ C'est le fichier 'foo2'</screen>
<para>Utilisez :</para>
- <programlisting><![ CDATA [<para><devicename>sio</devicename> sert
+ <programlisting><![CDATA[<para><devicename>sio</devicename> sert
sous FreeBSD aux communications s�ries.
<devicename>sio</devicename> correspond
à un certain nombre d'entr�es dans
@@ -1899,7 +1899,7 @@ C'est le fichier 'foo2'</screen>
<para>Utilisez :</para>
- <programlisting><![ CDATA [<para>La machine locale peut toujours
+ <programlisting><![CDATA[<para>La machine locale peut toujours
�tre d�sign�e par <hostid>localhost</hostid>,
et aura l'adresse IP
<hostid role="ipaddr">127.0.0.1</hostid>.</para>
@@ -1965,7 +1965,7 @@ C'est le fichier 'foo2'</screen>
<para>Utilisez :</para>
- <programlisting><![ CDATA [<para>Pour effectuer la plupart des
+ <programlisting><![CDATA[<para>Pour effectuer la plupart des
t�ches d'administration syst�me,
vous aurez besoin d'�tre
<username>root</username>.</para>]]></programlisting>
@@ -2004,7 +2004,7 @@ C'est le fichier 'foo2'</screen>
<para>Utilisez :</para>
- <programlisting><![ CDATA [<para>Il y a deux cibles courantes dans les
+ <programlisting><![CDATA[<para>Il y a deux cibles courantes dans les
<filename>Makefile</filename> :
<maketarget>all</maketarget> et
<maketarget>clean</maketarget>.</para>
@@ -2058,7 +2058,7 @@ C'est le fichier 'foo2'</screen>
<para>Utilisez :</para>
- <programlisting><![ CDATA [<para>La ligne <literal>maxusers 10</literal> du fichier
+ <programlisting><![CDATA[<para>La ligne <literal>maxusers 10</literal> du fichier
de configuration du noyau d�termine la table de nombreuses
tables syst�me et d�finit approximativement le nombre de
connexions simultan�es qu'acceptera le syst�me.</para>]]></programlisting>
@@ -2091,7 +2091,7 @@ C'est le fichier 'foo2'</screen>
<para>Utilisez :</para>
- <programlisting><![ CDATA [<informalexample>
+ <programlisting><![CDATA[<informalexample>
<screen>&prompt.user; <userinput>man
<replaceable>command</replaceable></userinput></screen>
</informalexample>]]></programlisting>
@@ -2110,7 +2110,7 @@ C'est le fichier 'foo2'</screen>
<para>Utilisez :</para>
- <programlisting><![ CDATA [<para>La ligne <literal>maxusers 10</literal> du fichier
+ <programlisting><![CDATA[<para>La ligne <literal>maxusers 10</literal> du fichier
de configuration du noyau d�termine la table de nombreuses
tables syst�me et d�finit approximativement le nombre
de connexions simultan�es qu'acceptera le syst�me.</para>
@@ -2160,7 +2160,7 @@ C'est le fichier 'foo2'</screen>
<example>
<title><literal>id</literal> de chapitres et de section</title>
- <programlisting><![ CDATA [<chapter id="chapitre1">
+ <programlisting><![CDATA[<chapter id="chapitre1">
<title>Introduction</title>
<para>C'est l'introduction. Elle comporte une sous-section,
@@ -2190,7 +2190,7 @@ C'est le fichier 'foo2'</screen>
<example>
<title><sgmltag>anchor</sgmltag></title>
- <programlisting><![ CDATA [<para>Ce paragraphe inclut un
+ <programlisting><![CDATA[<para>Ce paragraphe inclut un
<anchor id="para1">lien interne. Il n'appara�t
pas dans le document.</para>]]></programlisting>
</example>
@@ -2217,7 +2217,7 @@ C'est le fichier 'foo2'</screen>
document qui contienne l'exemple que nous avons donn� pour
<literal>id</literal> :</para>
- <programlisting><![ CDATA [<para>Vous trouverez plus d'information
+ <programlisting><![CDATA[<para>Vous trouverez plus d'information
au <xref linkend="chapter1">.</para>
<para>Vous trouverez des informations plus d�taill�es dans
@@ -2259,7 +2259,7 @@ C'est le fichier 'foo2'</screen>
document qui contienne l'exemple que nous avons donn� pour
<literal>id</literal> :</para>
- <programlisting><![ CDATA [<para>Vous trouverez plus d'information
+ <programlisting><![CDATA[<para>Vous trouverez plus d'information
au <link linkend="chapter1">premier chapitre</link>.</para>
<para>Vous trouverez des informations plus d�taill�es dans
@@ -2310,7 +2310,7 @@ C'est le fichier 'foo2'</screen>
<para>Utilisez :</para>
- <programlisting><![ CDATA [<para>Vous pouvez bien s�r cessez de lire
+ <programlisting><![CDATA[<para>Vous pouvez bien s�r cessez de lire
ce document, et aller au lieu de cela sur la <ulink
url="http://www.FreeBSD.org/"> page Web de FreeBSD</ulink>.</para>]]></programlisting>
diff --git a/fr_FR.ISO8859-1/books/fdp-primer/sgml-primer/chapter.xml b/fr_FR.ISO8859-1/books/fdp-primer/sgml-primer/chapter.xml
index 0af6c8fe1d..6dd690c5fd 100644
--- a/fr_FR.ISO8859-1/books/fdp-primer/sgml-primer/chapter.xml
+++ b/fr_FR.ISO8859-1/books/fdp-primer/sgml-primer/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
@@ -107,7 +107,7 @@
<para>L'exemple pr�c�dent est cod� comme suit dans le pr�sent
document :</para>
- <programlisting><![ CDATA [
+ <programlisting><![CDATA[
<para>Pour effacer <filename>/tmp/foo</filename>, utilisez
&man.rm.1;.</para>
@@ -232,7 +232,7 @@
de d�but et une de fin.</para>
<programlisting>
-<![ CDATA [<p>C'est un paragraphe. Il commence avec la marque de d�but pour
+<![CDATA[<p>C'est un paragraphe. Il commence avec la marque de d�but pour
l'�l�ment 'p', et se terminera avec la marque de fin pour
l'�l�ment 'p'</p>
@@ -254,7 +254,7 @@
donc qu'une marque de d�but.</para>
<programlisting>
-<![ CDATA [<p>C'est un paragraphe.</p>
+<![CDATA[<p>C'est un paragraphe.</p>
<hr>
@@ -271,7 +271,7 @@
<title>El�ments dans des �l�ments ; <sgmltag>em</sgmltag></title>
<programlisting>
-<![ CDATA [<p>C'est un <em>paragraphe</em> simple o� certains
+<![CDATA[<p>C'est un <em>paragraphe</em> simple o� certains
<em>mots</em> ont �t� <em>mis en valeur</em>.</p>]]></programlisting>
</example>
@@ -322,7 +322,7 @@
<title>Utiliser un �l�ment avec un attribut</title>
<programlisting>
-<![ CDATA [<p align="left">L'attribut align est superflus pour ce paragraphe,
+<![CDATA[<p align="left">L'attribut align est superflus pour ce paragraphe,
puisque 'left' est la valeur par d�faut.</p>
<p align="center">Ce paragraphe sera peut-�tre centr�.</p>]]></programlisting>
@@ -338,7 +338,7 @@
<title>Simples quotes dans un attribut</title>
<programlisting>
-<![ CDATA [<p align='right'>Je suis à droite !</p>]]></programlisting>
+<![CDATA[<p align='right'>Je suis à droite !</p>]]></programlisting>
</example>
<para>Vous n'avez pas toujours besoin de mettre la valeur de l'attribut
@@ -401,7 +401,7 @@ setenv SGML_CATALOG_FILES ${SGML_ROOT}/docbook/catalog:$SGML_CATALOG_FILES</prog
mettrez :</para>
<programlisting>
-<![ CDATA [<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0
+<![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0
Transitional//EN">
<html>
@@ -563,7 +563,7 @@ nsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
4.0 de la DTD HTML :</para>
<programlisting>
-<![ CDATA [<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN">]]></programlisting>
+<![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN">]]></programlisting>
<para>Cette ligne a plusieurs composants distincts :</para>
@@ -797,7 +797,7 @@ PUBLIC "-//W3C//DTD HTML 4.0//EN" "4.0/strict.dtd"</programlisting>
<para>La syntaxe pour le faire est l�g�rement diff�rente :</para>
<programlisting>
-<![ CDATA [<!DOCTYPE html SYSTEM "/path/to/file.dtd">]]></programlisting>
+<![CDATA[<!DOCTYPE html SYSTEM "/path/to/file.dtd">]]></programlisting>
<para>Le mot-cl� <literal>SYSTEM</literal> indique que le processeur
SGML doit localiser le fichier d'une fa�on qui d�pend du syst�me. Cela
@@ -856,7 +856,7 @@ PUBLIC "-//W3C//DTD HTML 4.0//EN" "4.0/strict.dtd"</programlisting>
<programlisting>
<!-- commentaire de test --></programlisting>
- <programlisting><![ CDATA [
+ <programlisting><![CDATA[
<!-- C'est le texte du commentaire -->
<!-- C'est un autre commentaire -->
@@ -868,7 +868,8 @@ PUBLIC "-//W3C//DTD HTML 4.0//EN" "4.0/strict.dtd"</programlisting>
-- de le faire -->]]></programlisting>
</example>
- <![ %output.print; [
+<!--
+ <![%output.print;[
<important>
<title>Utilisez 2 tirets</title>
@@ -887,6 +888,7 @@ PUBLIC "-//W3C//DTD HTML 4.0//EN" "4.0/strict.dtd"</programlisting>
sujettes à ce probl�me.</para>
</important>
]]>
+-->
<para>Si vous avez d�jà utilis� HTML auparavant, on vous a peut-�tre
donn� des r�gles diff�rentes pour les commentaires. En particulier, vous
@@ -901,7 +903,7 @@ PUBLIC "-//W3C//DTD HTML 4.0//EN" "4.0/strict.dtd"</programlisting>
<example>
<title>Commentaires SGML erronn�s</title>
- <programlisting><![ CDATA [
+ <programlisting><![CDATA[
<!-- C'est en commentaire --
CE N'EST PAS EN COMMENTAIRE!
@@ -917,13 +919,13 @@ PUBLIC "-//W3C//DTD HTML 4.0//EN" "4.0/strict.dtd"</programlisting>
source de confusion.</para>
<programlisting>
-<![ CDATA [<!--------------- C'est un tr�s mauvaise id�e --------------->]]></programlisting>
+<![CDATA[<!--------------- C'est un tr�s mauvaise id�e --------------->]]></programlisting>
<para>Comme l'exemple le sugg�re, ne mettez <emphasis>pas</emphasis> de
commentaires de ce type.</para>
<programlisting>
-<![ CDATA [<!--===================================================-->]]></programlisting>
+<![CDATA[<!--===================================================-->]]></programlisting>
<para>C'est une (l�g�rement) meilleure id�e, mais c'est toute de m�me
une source de confusion potentielle pour les d�butants en SGML.</para>
@@ -980,7 +982,7 @@ PUBLIC "-//W3C//DTD HTML 4.0//EN" "4.0/strict.dtd"</programlisting>
courante de votre produit. Vous pourriez �crire :</para>
<programlisting>
-<![ CDATA [<para>La version courante de notre produit est la
+<![CDATA[<para>La version courante de notre produit est la
&version.courante;.</para>]]></programlisting>
<para>Quand le num�ro de version change, il vous suffit de modifier la
@@ -1007,7 +1009,7 @@ PUBLIC "-//W3C//DTD HTML 4.0//EN" "4.0/strict.dtd"</programlisting>
<title>D�finition d'entit�s g�n�rales</title>
<programlisting>
-<![ CDATA [<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
+<![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
<!ENTITY version.courante "3.0-RELEASE">
<!ENTITY derniere.version "2.2.7-RELEASE">
]>]]></programlisting>
@@ -1047,7 +1049,7 @@ PUBLIC "-//W3C//DTD HTML 4.0//EN" "4.0/strict.dtd"</programlisting>
<title>D�finition d'entit�s param�tres</title>
<programlisting>
-<![ CDATA [<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
+<![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
<!ENTITY % param.du "du">
<!ENTITY % param.texte "text">
<!ENTITY % param.encore "encore %param.du more %param.texte">
@@ -1069,7 +1071,7 @@ PUBLIC "-//W3C//DTD HTML 4.0//EN" "4.0/strict.dtd"</programlisting>
<filename>exemple.xml</filename>.</para>
<programlisting>
-<![ CDATA [<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
<!ENTITY version "1.1">
]>
@@ -1169,7 +1171,7 @@ PUBLIC "-//W3C//DTD HTML 4.0//EN" "4.0/strict.dtd"</programlisting>
fichiers</title>
<programlisting>
-<![ CDATA [<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
+<![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
<!ENTITY chapitre.1 SYSTEM "chapitre1.xml">
<!ENTITY chapitre.2 SYSTEM "chapitre2.xml">
<!ENTITY chapitre.3 SYSTEM "chapitre3.xml">
@@ -1225,7 +1227,7 @@ PUBLIC "-//W3C//DTD HTML 4.0//EN" "4.0/strict.dtd"</programlisting>
contiendra :</para>
<programlisting>
-<![ CDATA [<!ENTITY chapitre.1 SYSTEM "chapitre1.xml">
+<![CDATA[<!ENTITY chapitre.1 SYSTEM "chapitre1.xml">
<!ENTITY chapitre.2 SYSTEM "chapitre2.xml">
<!ENTITY chapitre.3 SYSTEM "chapitre3.xml">]]></programlisting>
@@ -1236,7 +1238,7 @@ PUBLIC "-//W3C//DTD HTML 4.0//EN" "4.0/strict.dtd"</programlisting>
pr�c�demment :</para>
<programlisting>
-<![ CDATA [<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
+<![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
<!--
D�finissez une entit� param�tre pour inclure le fichier
des entit�s g�n�rales pour les chapitres
@@ -1270,7 +1272,7 @@ PUBLIC "-//W3C//DTD HTML 4.0//EN" "4.0/strict.dtd"</programlisting>
<para>Mettez-y quelque chose qui ressemble à ceci :</para>
<programlisting>
-<![ CDATA [<p>C'est le premier paragraphe.</p>]]></programlisting>
+<![CDATA[<p>C'est le premier paragraphe.</p>]]></programlisting>
</step>
<step>
@@ -1278,7 +1280,7 @@ PUBLIC "-//W3C//DTD HTML 4.0//EN" "4.0/strict.dtd"</programlisting>
suivante :</para>
<programlisting>
-<![ CDATA [<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
+<![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
<!ENTITY version "1.1">
<!ENTITY para1 SYSTEM "para1.xml">
<!ENTITY para2 SYSTEM "para2.xml">
@@ -1331,7 +1333,7 @@ PUBLIC "-//W3C//DTD HTML 4.0//EN" "4.0/strict.dtd"</programlisting>
<filename>exemple.xml</filename> :</para>
<programlisting>
-<![ CDATA [<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
+<![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
<!ENTITY % entites SYSTEM "entites.xml"> %entites;
]>
@@ -1355,7 +1357,7 @@ PUBLIC "-//W3C//DTD HTML 4.0//EN" "4.0/strict.dtd"</programlisting>
qui contienne :</para>
<programlisting>
-<![ CDATA [<!ENTITY version "1.1">
+<![CDATA[<!ENTITY version "1.1">
<!ENTITY para1 SYSTEM "para1.xml">
<!ENTITY para2 SYSTEM "para2.xml">
<!ENTITY para3 SYSTEM "para3.xml">]]></programlisting>
@@ -1396,7 +1398,7 @@ PUBLIC "-//W3C//DTD HTML 4.0//EN" "4.0/strict.dtd"</programlisting>
</example>
<para>Comme vous pouviez vous y attendre, une section marqu�e est une
- fonctionnalit� SGML et commence donc par <literal><!</literal>.</para>
+ fonctionnalit� SGML et commence donc par <literal><!</literal>.</para>
<para>Le premier crochet ouvrant d�limite la section marqu�e.</para>
@@ -1467,7 +1469,7 @@ PUBLIC "-//W3C//DTD HTML 4.0//EN" "4.0/strict.dtd"</programlisting>
<programlisting>) est du DocBook.</para>
<programlisting>
- <![ CDATA [ <![ CDATA [
+ <![CDATA[<![CDATA[
<p>Cet exemple vous montre quelques �l�ments de HTML. Comme les
caract�res < et > y sont si fr�quemment utilis�s, il est plus
facile de marquer tout l'exemple comme CDATA plut�t que de se
@@ -1482,7 +1484,7 @@ PUBLIC "-//W3C//DTD HTML 4.0//EN" "4.0/strict.dtd"</programlisting>
<p>C'est la fin de l'exemple.</p>]]>
]]>
-</programlisting></programlisting>
+</programlisting></programlisting>
<para>Si vous consultez le source de ce document, vous verrez qu'il
utilise constamment cette technique.</para>
@@ -1557,7 +1559,7 @@ PUBLIC "-//W3C//DTD HTML 4.0//EN" "4.0/strict.dtd"</programlisting>
l'entit� en :</para>
<programlisting>
-<!ENTiTY % version.electronique "IGNORE"></programlisting>
+<!ENTiTY % version.electronique "IGNORE"></programlisting>
<para>A la seconde passe sur le document, les sections marqu�es qui
utilisent <literal>%version.electronique</literal> comme mot-cl�
@@ -1585,17 +1587,17 @@ PUBLIC "-//W3C//DTD HTML 4.0//EN" "4.0/strict.dtd"</programlisting>
</head>
<body>
- <p>Ce paragraphe <![ CDATA [contient de nombreux
+ <p>Ce paragraphe <![CDATA[contient de nombreux
caract�res < (< < < < <) il est donc
plus facile de l'inclure dans une section marqu�e
- CDATA ]]></p>
+ CDATA ]]></p>
- <![ IGNORE [
+ <![IGNORE[
<p>Ce paragraphe n'appara�tra jamais dans les
sorties.</p>
]]>
- <![ <![ CDATA [%sortie.texte]]> [
+ <![ <![CDATA[%sortie.texte]]> [
<p>Ce paragraphe appara�tra peut-�tre dans les
sorties.</p>
diff --git a/fr_FR.ISO8859-1/books/fdp-primer/stylesheets/chapter.xml b/fr_FR.ISO8859-1/books/fdp-primer/stylesheets/chapter.xml
index 4255e6939e..e7f63861fd 100644
--- a/fr_FR.ISO8859-1/books/fdp-primer/stylesheets/chapter.xml
+++ b/fr_FR.ISO8859-1/books/fdp-primer/stylesheets/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/fr_FR.ISO8859-1/books/fdp-primer/the-faq/chapter.xml b/fr_FR.ISO8859-1/books/fdp-primer/the-faq/chapter.xml
index cf5a56b93f..100df04e41 100644
--- a/fr_FR.ISO8859-1/books/fdp-primer/the-faq/chapter.xml
+++ b/fr_FR.ISO8859-1/books/fdp-primer/the-faq/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/fr_FR.ISO8859-1/books/fdp-primer/the-handbook/chapter.xml b/fr_FR.ISO8859-1/books/fdp-primer/the-handbook/chapter.xml
index b9b6035187..048a36aebc 100644
--- a/fr_FR.ISO8859-1/books/fdp-primer/the-handbook/chapter.xml
+++ b/fr_FR.ISO8859-1/books/fdp-primer/the-handbook/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
@@ -107,7 +107,7 @@
<para>Si par exemple, un des chapitres contient :</para>
- <programlisting><![ CDATA [
+ <programlisting><![CDATA[
<chapter id="kernelconfiguration">
...
</chapter>]]></programlisting>
@@ -190,7 +190,7 @@
<literal><PARA></literal>.</para>
<para>Le texte dans les contextes SGML est normalement en majuscules,
- <literal><!ENTITY…></literal> ou
+ <literal><!ENTITY…></literal> ou
<literal><!DOCTYPE…></literal> et
<emphasis>non</emphasis> <literal><!entity…></literal>
ou <literal><!doctype…></literal>.</para>
@@ -211,7 +211,7 @@
section :</para>
<programlisting>
-<![ CDATA [+--- C'est la colonne 0
+<![CDATA[+--- C'est la colonne 0
<chapter>
<title>...</title>
diff --git a/fr_FR.ISO8859-1/books/fdp-primer/the-website/chapter.xml b/fr_FR.ISO8859-1/books/fdp-primer/the-website/chapter.xml
index 832c07f2d5..5c72c201ec 100644
--- a/fr_FR.ISO8859-1/books/fdp-primer/the-website/chapter.xml
+++ b/fr_FR.ISO8859-1/books/fdp-primer/the-website/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/fr_FR.ISO8859-1/books/fdp-primer/todo.xml b/fr_FR.ISO8859-1/books/fdp-primer/todo.xml
index 15867fb5c2..68c1adc5c0 100644
--- a/fr_FR.ISO8859-1/books/fdp-primer/todo.xml
+++ b/fr_FR.ISO8859-1/books/fdp-primer/todo.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD French Documentation Project
diff --git a/fr_FR.ISO8859-1/books/fdp-primer/tools/chapter.xml b/fr_FR.ISO8859-1/books/fdp-primer/tools/chapter.xml
index a2d21f8326..ff6b93e468 100644
--- a/fr_FR.ISO8859-1/books/fdp-primer/tools/chapter.xml
+++ b/fr_FR.ISO8859-1/books/fdp-primer/tools/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/fr_FR.ISO8859-1/books/fdp-primer/translations/chapter.xml b/fr_FR.ISO8859-1/books/fdp-primer/translations/chapter.xml
index 3bae95c1d3..d4649355dd 100644
--- a/fr_FR.ISO8859-1/books/fdp-primer/translations/chapter.xml
+++ b/fr_FR.ISO8859-1/books/fdp-primer/translations/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Copyright (c) 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
@@ -82,7 +82,7 @@
<qandaentry>
<question>
<para>Y-a-t-il une liste de diffusion pour les
- traducteurs ?</para>
+ traducteurs ?</para>
</question>
<answer>
@@ -458,7 +458,7 @@
<para>Les en-t�tes de la version anglaise du document ressembleront à
ceci :</para>
- <programlisting><![ CDATA [<!--
+ <programlisting><![CDATA[<!--
The FreeBSD Documentation Project
$Id: chapter.xml,v 1.11 1999/06/20 21:18:57 billf Exp $
@@ -481,7 +481,7 @@
<para>Donc, la version espagnole du pr�sent fichier commencerait
par :</para>
- <programlisting><![ CDATA [<!--
+ <programlisting><![CDATA[<!--
The FreeBSD Spanish Documentation Project
$Id: chapter.xml,v 1.3 1999/06/24 19:12:32 jesusr Exp $
diff --git a/fr_FR.ISO8859-1/books/fdp-primer/writing-style/chapter.xml b/fr_FR.ISO8859-1/books/fdp-primer/writing-style/chapter.xml
index 69636eb910..9fa77093d2 100644
--- a/fr_FR.ISO8859-1/books/fdp-primer/writing-style/chapter.xml
+++ b/fr_FR.ISO8859-1/books/fdp-primer/writing-style/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Copyright (c) 1998 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/fr_FR.ISO8859-1/books/handbook/Makefile b/fr_FR.ISO8859-1/books/handbook/Makefile
index ed494b737b..e301569eff 100644
--- a/fr_FR.ISO8859-1/books/handbook/Makefile
+++ b/fr_FR.ISO8859-1/books/handbook/Makefile
@@ -247,30 +247,56 @@ DOC_PREFIX?= ${.CURDIR}/../../..
#
# rules generating lists of mirror site from XML database.
#
-XMLDOCS= mirrors-ftp:::mirrors.xml.ftp.inc \
+XMLDOCS= lastmod:::mirrors.lastmod.inc \
+ mirrors-ftp-index:::mirrors.xml.ftp.index.inc \
+ mirrors-ftp:::mirrors.xml.ftp.inc \
+ mirrors-cvsup-index:::mirrors.xml.cvsup.index.inc \
mirrors-cvsup:::mirrors.xml.cvsup.inc \
+ eresources-index:::eresources.xml.www.index.inc \
eresources:::eresources.xml.www.inc
DEPENDSET.DEFAULT= transtable mirror
XSLT.DEFAULT= ${XSL_MIRRORS}
XML.DEFAULT= ${XML_MIRRORS}
NO_TIDY.DEFAULT= yes
+PARAMS.lastmod+= --param 'target' "'lastmod'"
+PARAMS.mirrors-ftp-index+= --param 'type' "'ftp'" \
+ --param 'proto' "'ftp'" \
+ --param 'target' "'index'"
PARAMS.mirrors-ftp+= --param 'type' "'ftp'" \
--param 'proto' "'ftp'" \
--param 'target' "'handbook/mirrors/chapter.xml'"
+PARAMS.mirrors-cvsup-index+= --param 'type' "'cvsup'" \
+ --param 'proto' "'cvsup'" \
+ --param 'target' "'index'"
PARAMS.mirrors-cvsup+= --param 'type' "'cvsup'" \
--param 'proto' "'cvsup'" \
--param 'target' "'handbook/mirrors/chapter.xml'"
+PARAMS.eresources-index+= --param 'type' "'www'" \
+ --param 'proto' "'http'" \
+ --param 'target' "'index'"
PARAMS.eresources+= --param 'type' "'www'" \
--param 'proto' "'http'" \
--param 'target' "'handbook/eresources/chapter.xml'"
-SRCS+= mirrors.xml.ftp.inc \
+SRCS+= mirrors.lastmod.inc \
+ mirrors.xml.ftp.inc \
+ mirrors.xml.ftp.index.inc \
mirrors.xml.cvsup.inc \
- eresources.xml.www.inc
+ mirrors.xml.cvsup.index.inc \
+ eresources.xml.www.inc \
+ eresources.xml.www.index.inc
-CLEANFILES+= mirrors.xml.ftp.inc \
+CLEANFILES+= mirrors.lastmod.inc \
+ mirrors.xml.ftp.inc \
+ mirrors.xml.ftp.index.inc \
mirrors.xml.cvsup.inc \
- eresources.xml.www.inc
+ mirrors.xml.cvsup.index.inc \
+ eresources.xml.www.inc \
+ eresources.xml.www.index.inc
+
+lint: mirrors.lastmod.inc mirrors.xml.ftp.inc mirrors.xml.ftp.index.inc \
+ mirrors.xml.cvsup.inc mirrors.xml.cvsup.index.inc \
+ eresources.xml.www.inc eresources.xml.www.index.inc
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/fr_FR.ISO8859-1/books/handbook/advanced-networking/chapter.xml b/fr_FR.ISO8859-1/books/handbook/advanced-networking/chapter.xml
index 8ef8052277..271dcc3991 100644
--- a/fr_FR.ISO8859-1/books/handbook/advanced-networking/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/advanced-networking/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD French Documentation Project
@@ -1410,7 +1410,7 @@ linuxemu/chapter.xml -->
<para>Nous pouvons enfin compiler et installer le module du
pilote:</para>
- <screen>&prompt.root; <userinput>make && make install</userinput></screen>
+ <screen>&prompt.root; <userinput>make && make install</userinput></screen>
<para>Pour utiliser le pilote, vous devez charger les
modules appropri�s:</para>
@@ -3299,7 +3299,7 @@ host margaux {
<sect4>
<title>Pagination via <acronym>NFS</acronym> sous
- &os 5.X</title>
+ &os; 5.X</title>
<para>Le noyau ne supporte pas l'activation de la pagination
par <acronym>NFS</acronym> au d�marrage. L'espace
diff --git a/fr_FR.ISO8859-1/books/handbook/audit/chapter.xml b/fr_FR.ISO8859-1/books/handbook/audit/chapter.xml
index a2c6f06d53..ffb73ffcee 100644
--- a/fr_FR.ISO8859-1/books/handbook/audit/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/audit/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD French Documentation Project
diff --git a/fr_FR.ISO8859-1/books/handbook/basics/chapter.xml b/fr_FR.ISO8859-1/books/handbook/basics/chapter.xml
index f148ff7c60..b4c8e3a726 100644
--- a/fr_FR.ISO8859-1/books/handbook/basics/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/basics/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD French Documentation Project
diff --git a/fr_FR.ISO8859-1/books/handbook/bibliography/chapter.xml b/fr_FR.ISO8859-1/books/handbook/bibliography/chapter.xml
index d01562747c..f1f741e208 100644
--- a/fr_FR.ISO8859-1/books/handbook/bibliography/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/bibliography/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD French Documentation Project
diff --git a/fr_FR.ISO8859-1/books/handbook/book.xml b/fr_FR.ISO8859-1/books/handbook/book.xml
index 9455ef0d16..e28afa364d 100644
--- a/fr_FR.ISO8859-1/books/handbook/book.xml
+++ b/fr_FR.ISO8859-1/books/handbook/book.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
"../../../share/xml/freebsd42.dtd" [
<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//FR" "../../share/xml/entities.ent">
diff --git a/fr_FR.ISO8859-1/books/handbook/boot/chapter.xml b/fr_FR.ISO8859-1/books/handbook/boot/chapter.xml
index a669a14f65..68cd24ce49 100644
--- a/fr_FR.ISO8859-1/books/handbook/boot/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/boot/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD French Documentation Project
diff --git a/fr_FR.ISO8859-1/books/handbook/chapters.ent b/fr_FR.ISO8859-1/books/handbook/chapters.ent
index d7a930da14..b6aac4feae 100644
--- a/fr_FR.ISO8859-1/books/handbook/chapters.ent
+++ b/fr_FR.ISO8859-1/books/handbook/chapters.ent
@@ -14,229 +14,60 @@
Original revision: 1.37
-->
-<!ENTITY % not.published "INCLUDE">
-
-<!ENTITY % chap.introduction "IGNORE">
-<!ENTITY % chap.install "IGNORE">
-<!ENTITY % chap.bsdinstall "IGNORE">
-<!ENTITY % chap.basics "IGNORE">
-<!ENTITY % chap.ports "IGNORE">
-<!ENTITY % chap.config "IGNORE">
-<!ENTITY % chap.boot "IGNORE">
-<!ENTITY % chap.users "IGNORE">
-<!ENTITY % chap.kernelconfig "IGNORE">
-<!ENTITY % chap.security "IGNORE">
-<!ENTITY % chap.jails "IGNORE">
-<!ENTITY % chap.printing "IGNORE">
-<!ENTITY % chap.disks "IGNORE">
-<!ENTITY % chap.geom "IGNORE">
-<!ENTITY % chap.vinum "IGNORE">
-<!ENTITY % chap.x11 "IGNORE">
-<!ENTITY % chap.l10n "IGNORE">
-<!ENTITY % chap.multimedia "IGNORE">
-<!ENTITY % chap.desktop "IGNORE">
-<!ENTITY % chap.serialcomms "IGNORE">
-<!ENTITY % chap.ppp-and-slip "IGNORE">
-<!ENTITY % chap.advanced-networking "IGNORE">
-<!ENTITY % chap.firewalls "IGNORE">
-<!ENTITY % chap.network-servers "IGNORE">
-<!ENTITY % chap.mail "IGNORE">
-<!ENTITY % chap.cutting-edge "IGNORE">
-<!ENTITY % chap.linuxemu "IGNORE">
-<!ENTITY % chap.mirrors "IGNORE">
-<!ENTITY % chap.mirrors.ftp.inc "INCLUDE">
-<!ENTITY % chap.mirrors.cvsup.inc "INCLUDE">
-<!ENTITY % chap.bibliography "IGNORE">
-<!ENTITY % chap.eresources "IGNORE">
-<!ENTITY % chap.eresources.www.inc "INCLUDE">
-<!ENTITY % chap.pgpkeys "IGNORE">
-<!ENTITY % chap.index "IGNORE">
-<!ENTITY % chap.freebsd-glossary "IGNORE">
-<!ENTITY % chap.mac "IGNORE">
-<!ENTITY % chap.audit "IGNORE">
-<!ENTITY % chap.filesystems "IGNORE">
-<!ENTITY % chap.dtrace "IGNORE">
-
<!ENTITY chap.preface SYSTEM "preface/preface.xml">
<!ENTITY % pgpkeys SYSTEM "../../../share/pgpkeys/pgpkeys.ent"> %pgpkeys;
<!-- Part One -->
-<![%chap.introduction;[
<!ENTITY chap.introduction SYSTEM "introduction/chapter.xml">
-]]>
-<![%chap.install;[
<!ENTITY chap.install SYSTEM "install/chapter.xml">
-]]>
-<![%chap.basics;[
<!ENTITY chap.basics SYSTEM "basics/chapter.xml">
-]]>
-<![%chap.ports;[
<!ENTITY chap.ports SYSTEM "ports/chapter.xml">
-]]>
-<![%chap.x11;[
<!ENTITY chap.x11 SYSTEM "x11/chapter.xml">
-]]>
<!-- Part Two -->
-<![%chap.desktop;[
<!ENTITY chap.desktop SYSTEM "desktop/chapter.xml">
-]]>
-<![%chap.multimedia;[
<!ENTITY chap.multimedia SYSTEM "multimedia/chapter.xml">
-]]>
-<![%chap.kernelconfig;[
<!ENTITY chap.kernelconfig SYSTEM "kernelconfig/chapter.xml">
-]]>
-<![%chap.printing;[
<!ENTITY chap.printing SYSTEM "printing/chapter.xml">
-]]>
-<![%chap.linuxemu;[
<!ENTITY chap.linuxemu SYSTEM "linuxemu/chapter.xml">
-]]>
<!-- Part Three -->
-<![%chap.config;[
<!ENTITY chap.config SYSTEM "config/chapter.xml">
-]]>
-<![%chap.boot;[
<!ENTITY chap.boot SYSTEM "boot/chapter.xml">
-]]>
-<![%chap.users;[
<!ENTITY chap.users SYSTEM "users/chapter.xml">
-]]>
-<![%chap.security;[
<!ENTITY chap.security SYSTEM "security/chapter.xml">
-]]>
-<![%chap.jails;[
<!ENTITY chap.jails SYSTEM "jails/chapter.xml">
-]]>
-<![%chap.mac;[
<!ENTITY chap.mac SYSTEM "mac/chapter.xml">
-]]>
-<![%chap.audit;[
<!ENTITY chap.audit SYSTEM "audit/chapter.xml">
-]]>
-<![%chap.disks;[
<!ENTITY chap.disks SYSTEM "disks/chapter.xml">
-]]>
-<![%chap.geom;[
<!ENTITY chap.geom SYSTEM "geom/chapter.xml">
-]]>
-<![%chap.vinum;[
<!ENTITY chap.vinum SYSTEM "vinum/chapter.xml">
-]]>
-<![%chap.virtualization;[
<!ENTITY chap.virtualization SYSTEM "virtualization/chapter.xml">
-]]>
-<![%chap.l10n;[
<!ENTITY chap.l10n SYSTEM "l10n/chapter.xml">
-]]>
-<![%chap.cutting-edge;[
<!ENTITY chap.cutting-edge SYSTEM "cutting-edge/chapter.xml">
-]]>
-<![%chap.dtrace;[
<!ENTITY chap.dtrace SYSTEM "dtrace/chapter.xml">
-]]>
<!-- Part Four -->
-<![%chap.serialcomms;[
<!ENTITY chap.serialcomms SYSTEM "serialcomms/chapter.xml">
-]]>
-<![%chap.ppp-and-slip;[
<!ENTITY chap.ppp-and-slip SYSTEM "ppp-and-slip/chapter.xml">
-]]>
-<![%chap.mail;[
<!ENTITY chap.mail SYSTEM "mail/chapter.xml">
-]]>
-<![%chap.network-servers;[
<!ENTITY chap.network-servers SYSTEM "network-servers/chapter.xml">
-]]>
-<![%chap.firewalls;[
<!ENTITY chap.firewalls SYSTEM "firewalls/chapter.xml">
-]]>
-<![%chap.advanced-networking;[
<!ENTITY chap.advanced-networking SYSTEM "advanced-networking/chapter.xml">
-]]>
<!-- Part Five (appendices) -->
-<![%chap.mirrors;[
- <!ENTITY chap.mirrors SYSTEM "mirrors/chapter.xml">
-]]>
-<![%chap.mirrors.ftp.inc;[
- <!ENTITY chap.mirrors.ftp.inc SYSTEM "mirrors.xml.ftp.inc">
-]]>
-<![%chap.mirrors.cvsup.inc;[
- <!ENTITY chap.mirrors.cvsup.inc SYSTEM "mirrors.xml.cvsup.inc">
-]]>
-<![%chap.bibliography;[
- <!ENTITY chap.bibliography SYSTEM "bibliography/chapter.xml">
-]]>
-<![%chap.eresources;[
- <!ENTITY chap.eresources SYSTEM "eresources/chapter.xml">
-]]>
-<![%chap.eresources.www.inc;[
- <!ENTITY chap.eresources.www.inc SYSTEM "eresources.xml.www.inc">
-]]>
-<![%chap.pgpkeys;[
- <!ENTITY chap.pgpkeys SYSTEM "pgpkeys/chapter.xml">
-]]>
-<![%chap.freebsd-glossary;[
- <!ENTITY chap.freebsd-glossary "&freebsd-glossary;">
-]]>
-<![%chap.index;[
- <!ENTITY chap.index SYSTEM "index.xml">
-]]>
+ <!ENTITY chap.mirrors SYSTEM "mirrors/chapter.xml">
+ <!ENTITY chap.mirrors.lastmod.inc SYSTEM "mirrors.lastmod.inc">
+ <!ENTITY chap.mirrors.ftp.index.inc SYSTEM "mirrors.xml.ftp.index.inc">
+ <!ENTITY chap.mirrors.ftp.inc SYSTEM "mirrors.xml.ftp.inc">
+ <!ENTITY chap.mirrors.cvsup.index.inc SYSTEM "mirrors.xml.cvsup.index.inc">
+ <!ENTITY chap.mirrors.cvsup.inc SYSTEM "mirrors.xml.cvsup.inc">
+ <!ENTITY chap.bibliography SYSTEM "bibliography/chapter.xml">
+ <!ENTITY chap.eresources SYSTEM "eresources/chapter.xml">
+ <!ENTITY chap.eresources.www.index.inc SYSTEM "eresources.xml.www.index.inc">
+ <!ENTITY chap.eresources.www.inc SYSTEM "eresources.xml.www.inc">
+ <!ENTITY chap.pgpkeys SYSTEM "pgpkeys/chapter.xml">
+ <!ENTITY chap.freebsd-glossary "&freebsd-glossary;">
+ <!ENTITY chap.index "">
<!ENTITY chap.colophon SYSTEM "colophon.xml">
-
-<!-- IGNORE cases -->
-
-<!-- Part One -->
-<!ENTITY chap.introduction "">
-<!ENTITY chap.install "">
-<!ENTITY chap.basics "">
-<!ENTITY chap.ports "">
-<!ENTITY chap.x11 "">
-
-<!-- Part Two -->
-<!ENTITY chap.desktop "">
-<!ENTITY chap.multimedia "">
-<!ENTITY chap.kernelconfig "">
-<!ENTITY chap.printing "">
-<!ENTITY chap.linuxemu "">
-
-<!-- Part Three -->
-<!ENTITY chap.config "">
-<!ENTITY chap.boot "">
-<!ENTITY chap.users "">
-<!ENTITY chap.security "">
-<!ENTITY chap.jails "">
-<!ENTITY chap.mac "">
-<!ENTITY chap.audit "">
-<!ENTITY chap.disks "">
-<!ENTITY chap.geom "">
-<!ENTITY chap.filesystems "">
-<!ENTITY chap.vinum "">
-<!ENTITY chap.virtualization "">
-<!ENTITY chap.l10n "">
-<!ENTITY chap.cutting-edge "">
-<!ENTITY chap.dtrace "">
-
-<!-- Part Four -->
-<!ENTITY chap.serialcomms "">
-<!ENTITY chap.ppp-and-slip "">
-<!ENTITY chap.mail "">
-<!ENTITY chap.network-servers "">
-<!ENTITY chap.firewalls "">
-<!ENTITY chap.advanced-networking "">
-
-<!-- Part Five (appendices) -->
-<!ENTITY chap.mirrors "">
-<!ENTITY chap.mirrors.ftp.inc "">
-<!ENTITY chap.mirrors.cvsup.inc "">
-<!ENTITY chap.bibliography "">
-<!ENTITY chap.eresources "">
-<!ENTITY chap.eresources.www.inc "">
-<!ENTITY chap.pgpkeys "">
-<!ENTITY chap.freebsd-glossary "">
-<!ENTITY chap.index "">
diff --git a/fr_FR.ISO8859-1/books/handbook/colophon.xml b/fr_FR.ISO8859-1/books/handbook/colophon.xml
index b4788e5303..c622d39f1b 100644
--- a/fr_FR.ISO8859-1/books/handbook/colophon.xml
+++ b/fr_FR.ISO8859-1/books/handbook/colophon.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD French Documentation Project
diff --git a/fr_FR.ISO8859-1/books/handbook/config/chapter.xml b/fr_FR.ISO8859-1/books/handbook/config/chapter.xml
index bc6153e124..f8b243bb47 100644
--- a/fr_FR.ISO8859-1/books/handbook/config/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/config/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD French Documentation Project
@@ -416,7 +416,7 @@
&man.cron.8;, sont lanc�s par l'interm�diaire des
proc�dures de d�marrage du syst�me. Ces
proc�dures peuvent varier en fonction de la version de
- &os,; ou du fournisseur; cependant, l'aspect le plus important
+ &os;, ou du fournisseur; cependant, l'aspect le plus important
à consid�rer est que leur configuration de
d�marrage peut �tre g�r�e à
l'aide de proc�dures de d�marrage simples.</para>
@@ -468,7 +468,7 @@ stop)
kill -9 `cat /var/run/utility.pid`
;;
*)
- echo "Usage: `basename $0` {start|stop}" >&2
+ echo "Usage: `basename $0` {start|stop}" >&2
exit 64
;;
esac
@@ -839,7 +839,7 @@ HOME=/var/log
</authorgroup>
</sect1info>
- <title>Utilisation du syst�me rc sous &os</title>
+ <title>Utilisation du syst�me rc sous &os;</title>
<para>En 2002, le syst�me <filename>rc.d</filename> de NetBSD pour
l'initialisation du syst�me a
@@ -993,7 +993,7 @@ sshd is running as pid 433.</screen>
int�ress� par l'�criture de vos propres
proc�dures <filename>rc.d</filename> ou pour
l'am�lioration des proc�dures existantes, vous
- trouverez <ulink url="&url.articles.rc-scripting">cette
+ trouverez <ulink url="&url.articles.rc-scripting;">cette
article</ulink> utile.</para>
</sect1>
diff --git a/fr_FR.ISO8859-1/books/handbook/cutting-edge/chapter.xml b/fr_FR.ISO8859-1/books/handbook/cutting-edge/chapter.xml
index 727e99804e..b3b2c95f49 100644
--- a/fr_FR.ISO8859-1/books/handbook/cutting-edge/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/cutting-edge/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD French Documentation Project
diff --git a/fr_FR.ISO8859-1/books/handbook/desktop/chapter.xml b/fr_FR.ISO8859-1/books/handbook/desktop/chapter.xml
index 95f8d89ecb..e9c353f69d 100644
--- a/fr_FR.ISO8859-1/books/handbook/desktop/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/desktop/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD French Documentation Project
diff --git a/fr_FR.ISO8859-1/books/handbook/disks/chapter.xml b/fr_FR.ISO8859-1/books/handbook/disks/chapter.xml
index 5eb97a5822..f50d7ee16a 100755
--- a/fr_FR.ISO8859-1/books/handbook/disks/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/disks/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD French Documentation Project
@@ -3151,7 +3151,7 @@ sa0(ncr1:4:0): Logical unit is in process of becoming ready</screen>
<title>Proc�dure de cr�ation d'une disquette
de d�marrage</title>
- <programlisting><![ CDATA [#!/bin/sh
+ <programlisting><![CDATA[#!/bin/sh
#
# create a restore floppy
#
@@ -3197,7 +3197,7 @@ mkdir /mnt/var
#
if [ ! -x /sys/compile/MINI/kernel ]
then
- cat << EOM
+ cat << EOM
The MINI kernel does not exist, please create one.
Here is an example config file:
#
@@ -3279,19 +3279,19 @@ cd /
#
# create minimum file system table
#
-cat > /mnt/etc/fstab <<EOM
+cat < /mnt/etc/fstab <<EOM
/dev/fd0a / ufs rw 1 1
EOM
#
# create minimum passwd file
#
-cat > /mnt/etc/passwd <<EOM
-root:*:0:0:Charlie &:/root:/bin/sh
+cat < /mnt/etc/passwd <<EOM
+root:*:0:0:Charlie &:/root:/bin/sh
EOM
-cat > /mnt/etc/master.passwd <<EOM
-root::0:0::0:0:Charlie &:/root:/bin/sh
+cat < /mnt/etc/master.passwd <<EOM
+root::0:0::0:0:Charlie &:/root:/bin/sh
EOM
chmod 600 /mnt/etc/master.passwd
@@ -3376,17 +3376,6 @@ echo "The floppy has been unmounted and is now ready."]]></programlisting>
reproduire. Une heure de perdue maintenant peut vous
�pargner d'autres ennuis plus tard.</para>
</sect3>
-
-<![ %not.published; [
-
- <sect3>
- <title>* Je ne me suis pas pr�par� au d�sastre,
- que faire?</title>
-
- <para></para>
- </sect3>
-]]>
-
</sect2>
</sect1>
diff --git a/fr_FR.ISO8859-1/books/handbook/eresources/chapter.xml b/fr_FR.ISO8859-1/books/handbook/eresources/chapter.xml
index a5bde54d41..cee2b1844c 100644
--- a/fr_FR.ISO8859-1/books/handbook/eresources/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/eresources/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD French Documentation Project
@@ -787,7 +787,7 @@
Pour la plupart des listes, il y a d�jà beaucoup de
souscripteurs communs, et mis à part les cas les plus
�sot�riques (par exemple
- “-stable & -scsi”), il n'y a pas vraiment de
+ “-stable & -scsi”), il n'y a pas vraiment de
raison de poster sur plus d'une liste à la fois.
Si vous recevez un message o� apparaissent sur la
ligne <literal>Cc</literal> plusieurs listes de diffusion,
diff --git a/fr_FR.ISO8859-1/books/handbook/firewalls/chapter.xml b/fr_FR.ISO8859-1/books/handbook/firewalls/chapter.xml
index cc942dde79..c98fc76040 100644
--- a/fr_FR.ISO8859-1/books/handbook/firewalls/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/firewalls/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD French Documentation Project
diff --git a/fr_FR.ISO8859-1/books/handbook/geom/chapter.xml b/fr_FR.ISO8859-1/books/handbook/geom/chapter.xml
index a82fe8ce2a..a322c2a23a 100644
--- a/fr_FR.ISO8859-1/books/handbook/geom/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/geom/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD French Documentation Project
diff --git a/fr_FR.ISO8859-1/books/handbook/install/chapter.xml b/fr_FR.ISO8859-1/books/handbook/install/chapter.xml
index 657ea32ddc..aa29c95f44 100644
--- a/fr_FR.ISO8859-1/books/handbook/install/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/install/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD French Documentation Project
@@ -2562,7 +2562,7 @@ Mounting root from ufs:/dev/md0c
The ports collection is a very valuable resource and well worth having
on your /usr partition, so it is advisable to say Yes to this option.
- For more information on the ports collection & the latest ports,
+ For more information on the ports collection & the latest ports,
visit:
http://www.FreeBSD.org/ports
diff --git a/fr_FR.ISO8859-1/books/handbook/introduction/chapter.xml b/fr_FR.ISO8859-1/books/handbook/introduction/chapter.xml
index c088d921a4..731a4740c8 100644
--- a/fr_FR.ISO8859-1/books/handbook/introduction/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/introduction/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD French Documentation Project
diff --git a/fr_FR.ISO8859-1/books/handbook/jails/chapter.xml b/fr_FR.ISO8859-1/books/handbook/jails/chapter.xml
index 435cdfacbb..bb2af7c138 100644
--- a/fr_FR.ISO8859-1/books/handbook/jails/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/jails/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD French Documentation Project
diff --git a/fr_FR.ISO8859-1/books/handbook/kernelconfig/chapter.xml b/fr_FR.ISO8859-1/books/handbook/kernelconfig/chapter.xml
index f5b6ce611f..d1ce15fee1 100755
--- a/fr_FR.ISO8859-1/books/handbook/kernelconfig/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/kernelconfig/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD French Documentation Project
@@ -1371,7 +1371,7 @@ device fwe # Ethernet over FireWire (non-standard!)</programl
familles de microprocesseurs &pentium; Pro et
suivantes.</para>
- <para>L'extension de l'adressage physique&mdash,“Physical
+ <para>L'extension de l'adressage physique—,“Physical
Address Extension” (<acronym>PAE</acronym>) est une
caract�ristique des microprocesseurs &intel; &pentium;
Pro et suivants autorisant les configurations m�moires
diff --git a/fr_FR.ISO8859-1/books/handbook/l10n/chapter.xml b/fr_FR.ISO8859-1/books/handbook/l10n/chapter.xml
index 6d14310f94..075a004055 100644
--- a/fr_FR.ISO8859-1/books/handbook/l10n/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/l10n/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD French Documentation Project
diff --git a/fr_FR.ISO8859-1/books/handbook/linuxemu/chapter.xml b/fr_FR.ISO8859-1/books/handbook/linuxemu/chapter.xml
index e57131cdde..d69586216a 100644
--- a/fr_FR.ISO8859-1/books/handbook/linuxemu/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/linuxemu/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD French Documentation Project
@@ -736,14 +736,14 @@ LOG=/var/log/lmgrd.log
case "$1" in
start)
- lmgrd -c ${LICENSE_FILE} 2>> ${LOG} 1>&2
+ lmgrd -c ${LICENSE_FILE} 2>> ${LOG} 1>&2
echo -n " lmgrd"
;;
stop)
- lmgrd -c ${LICENSE_FILE} -x lmdown 2>> ${LOG} 1>&2
+ lmgrd -c ${LICENSE_FILE} -x lmdown 2>> ${LOG} 1>&2
;;
*)
- echo "Usage: `basename $0` {start|stop}" 1>&2
+ echo "Usage: `basename $0` {start|stop}" 1>&2
exit 64
;;
esac
@@ -1061,7 +1061,7 @@ exit 0</programlisting>
ce qui suit:</para>
<programlisting>#!/usr/compat/linux/bin/sh
-(sleep 5; killall -1 matlab_helper) &
+(sleep 5; killall -1 matlab_helper) &
exit 0</programlisting>
</step>
diff --git a/fr_FR.ISO8859-1/books/handbook/mac/chapter.xml b/fr_FR.ISO8859-1/books/handbook/mac/chapter.xml
index 95cc5ee3d7..fbe8daea67 100644
--- a/fr_FR.ISO8859-1/books/handbook/mac/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/mac/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
$FreeBSD$
diff --git a/fr_FR.ISO8859-1/books/handbook/mail/chapter.xml b/fr_FR.ISO8859-1/books/handbook/mail/chapter.xml
index 99feb4e4d0..1bba5dd2c0 100644
--- a/fr_FR.ISO8859-1/books/handbook/mail/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/mail/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD French Documentation Project
@@ -2107,7 +2107,7 @@ sasl_pwcheck_program="/usr/local/sbin/pwcheck"</programlisting>
qui devra �tre affich�. Dans cet exemple, nous
lirons le premier courrier �lectronique:</para>
- <screen>& <userinput>t 1</userinput>
+ <screen>&prompt.user; <userinput>t 1</userinput>
Message 1:
From root@localhost Mon Mar 8 14:05:52 2004
X-Original-To: marcs@localhost
@@ -2141,7 +2141,7 @@ This is a test message, please reply if you receive it.</screen>
<keycap>.</keycap> sur une nouvelle ligne. Ci-dessous est
pr�sent� un exemple:</para>
- <screen>& <userinput>R 1</userinput>
+ <screen>&prompt.user; <userinput>R 1</userinput>
To: root@localhost
Subject: Re: test
@@ -2159,7 +2159,7 @@ EOT</screen>
d'un message doit �tre indiqu�e en mettant un
<keycap>.</keycap> seul sur une nouvelle ligne.</para>
- <screen>& <userinput>mail root@localhost</userinput>
+ <screen>&prompt.user; <userinput>mail root@localhost</userinput>
Subject: <userinput>I mastered mail
Now I can send and receive email using mail ... :)
@@ -2628,7 +2628,7 @@ user "john", with password "XXXXX", is "myth" here;</programlisting>
<literal>goodmail@example2.com</literal>:</para>
<programlisting>:0
-* < 1000
+* < 1000
! goodmail@example2.com</programlisting>
<para>Mettre tout le courrier à destination de
diff --git a/fr_FR.ISO8859-1/books/handbook/mirrors/chapter.xml b/fr_FR.ISO8859-1/books/handbook/mirrors/chapter.xml
index 2bcec5bbd0..e179c71c3b 100644
--- a/fr_FR.ISO8859-1/books/handbook/mirrors/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/mirrors/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD French Documentation Project
diff --git a/fr_FR.ISO8859-1/books/handbook/multimedia/chapter.xml b/fr_FR.ISO8859-1/books/handbook/multimedia/chapter.xml
index 4155773d9e..9beeb7bdef 100644
--- a/fr_FR.ISO8859-1/books/handbook/multimedia/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/multimedia/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD French Documentation Project
diff --git a/fr_FR.ISO8859-1/books/handbook/network-servers/chapter.xml b/fr_FR.ISO8859-1/books/handbook/network-servers/chapter.xml
index 1459610b9c..815669e5dd 100644
--- a/fr_FR.ISO8859-1/books/handbook/network-servers/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/network-servers/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD French Documentation Project
diff --git a/fr_FR.ISO8859-1/books/handbook/pgpkeys/chapter.xml b/fr_FR.ISO8859-1/books/handbook/pgpkeys/chapter.xml
index f4f623adcf..29d9f64b50 100644
--- a/fr_FR.ISO8859-1/books/handbook/pgpkeys/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/pgpkeys/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD French Documentation Project
diff --git a/fr_FR.ISO8859-1/books/handbook/ports/chapter.xml b/fr_FR.ISO8859-1/books/handbook/ports/chapter.xml
index 3626333f8c..8ede17b082 100644
--- a/fr_FR.ISO8859-1/books/handbook/ports/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/ports/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD French Documentation Project
diff --git a/fr_FR.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml b/fr_FR.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml
index d8ef215988..a5f3ddaa3c 100644
--- a/fr_FR.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD French Documentation Project
@@ -566,7 +566,7 @@ reinput 1 {\255}
if success goto slhup
reinput 1 {\127}
if success goto slhup
-if < \%x 60 goto look
+if < \%x 60 goto look
else goto slhup
:sllogin ; ouverture de session
@@ -587,7 +587,7 @@ reinput 1 {\255}
if success goto slhup
reinput 1 {\127}
if success goto slhup
-if < \%x 10 goto slloop ; essayer 10 fois d'obtenir une invite de session
+if < \%x 10 goto slloop ; essayer 10 fois d'obtenir une invite de session
else goto slhup ; raccrocher et recommencer apr�s 10 �checs
:sluid
diff --git a/fr_FR.ISO8859-1/books/handbook/preface/preface.xml b/fr_FR.ISO8859-1/books/handbook/preface/preface.xml
index ea04cf7aa8..707d2a2cf6 100644
--- a/fr_FR.ISO8859-1/books/handbook/preface/preface.xml
+++ b/fr_FR.ISO8859-1/books/handbook/preface/preface.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD French Documentation Project
diff --git a/fr_FR.ISO8859-1/books/handbook/printing/chapter.xml b/fr_FR.ISO8859-1/books/handbook/printing/chapter.xml
index 5e08df4535..1cb089d513 100755
--- a/fr_FR.ISO8859-1/books/handbook/printing/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/printing/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD French Documentation Project
diff --git a/fr_FR.ISO8859-1/books/handbook/security/chapter.xml b/fr_FR.ISO8859-1/books/handbook/security/chapter.xml
index 784ac56c29..55e0abff1b 100755
--- a/fr_FR.ISO8859-1/books/handbook/security/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/security/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD French Documentation Project
@@ -2162,7 +2162,7 @@ options IPSEC_ESP #IP security (crypto; define w/IPSEC)</progr
<screen>
(1)
- Machine A ------> Machine B
+ Machine A ------> Machine B
(1)PROTO=AH
ALG=MD5(RFC1826)
@@ -2170,8 +2170,8 @@ options IPSEC_ESP #IP security (crypto; define w/IPSEC)</progr
SPI=1000
(2.1)
- Machine A <------ Machine B
- <------
+ Machine A <------ Machine B
+ <------
(2.2)
(2.1)
@@ -2224,10 +2224,10 @@ C
Machine A --------------------------> Machine E
10.2.3.4 10.6.7.8
| |
- ========= ancien AH keyed-md5 ========>
+ ========= ancien AH keyed-md5 ========>
- <======== nouveau AH hmac-sha1 ========
- <======== nouveau ESP des-cbc =========
+ <======== nouveau AH hmac-sha1 ========
+ <======== nouveau ESP des-cbc =========
</screen>
</sect2>
diff --git a/fr_FR.ISO8859-1/books/handbook/serialcomms/chapter.xml b/fr_FR.ISO8859-1/books/handbook/serialcomms/chapter.xml
index d4e4fd8974..0a659096ed 100644
--- a/fr_FR.ISO8859-1/books/handbook/serialcomms/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/serialcomms/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD French Documentation Project
diff --git a/fr_FR.ISO8859-1/books/handbook/users/chapter.xml b/fr_FR.ISO8859-1/books/handbook/users/chapter.xml
index 413638d912..83bc588601 100644
--- a/fr_FR.ISO8859-1/books/handbook/users/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/users/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD French Documentation Project
diff --git a/fr_FR.ISO8859-1/books/handbook/vinum/chapter.xml b/fr_FR.ISO8859-1/books/handbook/vinum/chapter.xml
index 06df24be69..d3e6bc9bdf 100644
--- a/fr_FR.ISO8859-1/books/handbook/vinum/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/vinum/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The Vinum Volume Manager
Par Greg Lehey (grog at lemis dot com)
diff --git a/fr_FR.ISO8859-1/books/handbook/virtualization/chapter.xml b/fr_FR.ISO8859-1/books/handbook/virtualization/chapter.xml
index e5682a6873..bf11412fcb 100644
--- a/fr_FR.ISO8859-1/books/handbook/virtualization/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/virtualization/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD French Documentation Project
diff --git a/fr_FR.ISO8859-1/books/handbook/x11/chapter.xml b/fr_FR.ISO8859-1/books/handbook/x11/chapter.xml
index 710c3e7781..c504fae19b 100644
--- a/fr_FR.ISO8859-1/books/handbook/x11/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/x11/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD French Documentation Project
@@ -112,7 +112,7 @@
juste la lettre suivante dans l'alphabet romain.</para>
<para>X peut �tre appel� “X”,
- “Syst�me X Window”, <quote>X11&</quote>, et sous d'autres
+ “Syst�me X Window”, <quote>X11</quote>, et sous d'autres
noms. Il se peut que vous puissiez trouver que nommer
X11 <quote>X Windows</quote> peut �tre offensant pour
certaines personnes; consultez &man.X.7; pour un peu plus
@@ -364,7 +364,7 @@
l'impl�mentation open source du syst�me X Window
publi�e par la fondation X.Org.
<application>&xorg;</application> est bas�e sur le code
- de <application>&xfree86 4.4RC2</application> et d'X11R6.6.
+ de <application>&xfree86; 4.4RC2</application> et d'X11R6.6.
la version d'<application>&xorg;</application> actuellement disponible dans le catalogue des logiciels
port�s de &os; est la &xorg.version;.</para>
diff --git a/fr_FR.ISO8859-1/books/porters-handbook/book.xml b/fr_FR.ISO8859-1/books/porters-handbook/book.xml
index 577af96668..6986365929 100644
--- a/fr_FR.ISO8859-1/books/porters-handbook/book.xml
+++ b/fr_FR.ISO8859-1/books/porters-handbook/book.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
"../../../share/xml/freebsd42.dtd" [
<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//FR" "../../share/xml/entities.ent">
diff --git a/fr_FR.ISO8859-1/share/xml/mirrors-local.xsl b/fr_FR.ISO8859-1/share/xml/mirrors-local.xsl
index d95a126a65..afcc035684 100644
--- a/fr_FR.ISO8859-1/share/xml/mirrors-local.xsl
+++ b/fr_FR.ISO8859-1/share/xml/mirrors-local.xsl
@@ -14,7 +14,6 @@
<xsl:import href="../../../share/xml/mirrors-master.xsl" />
<xsl:output type="xml" encoding="iso-8859-1"
- omit-xml-declaration="yes"
indent="yes"/>
<!-- template: "mirrors-docbook-contact" -->
From 8851951886e8ebf2130bc85949c8c8cb8de00920 Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Mon, 21 Jan 2013 17:39:10 +0000
Subject: [PATCH 012/121] - Make the Hungarian documentation valid XML
---
.../books/fdp-primer/sgml-primer/chapter.xml | 27 +--
hu_HU.ISO8859-2/books/handbook/Makefile | 36 ++-
.../handbook/advanced-networking/chapter.xml | 6 +-
.../books/handbook/audit/chapter.xml | 2 +-
.../books/handbook/basics/chapter.xml | 2 +-
.../books/handbook/bibliography/chapter.xml | 2 +-
.../books/handbook/boot/chapter.xml | 2 +-
hu_HU.ISO8859-2/books/handbook/chapters.ent | 196 +--------------
hu_HU.ISO8859-2/books/handbook/colophon.xml | 2 +-
.../books/handbook/config/chapter.xml | 2 +-
.../books/handbook/cutting-edge/chapter.xml | 96 +-------
.../books/handbook/desktop/chapter.xml | 2 +-
.../books/handbook/disks/chapter.xml | 13 +-
.../books/handbook/dtrace/chapter.xml | 2 +-
.../books/handbook/eresources/chapter.xml | 6 +-
.../books/handbook/filesystems/chapter.xml | 4 +-
.../books/handbook/firewalls/chapter.xml | 2 +-
.../books/handbook/geom/chapter.xml | 2 +-
.../books/handbook/install/chapter.xml | 2 +-
.../books/handbook/introduction/chapter.xml | 2 +-
.../books/handbook/jails/chapter.xml | 2 +-
.../books/handbook/kernelconfig/chapter.xml | 2 +-
.../books/handbook/l10n/chapter.xml | 2 +-
.../books/handbook/linuxemu/chapter.xml | 10 +-
.../books/handbook/mac/chapter.xml | 2 +-
.../books/handbook/mail/chapter.xml | 8 +-
.../books/handbook/mirrors/chapter.xml | 10 +-
.../books/handbook/multimedia/chapter.xml | 2 +-
.../handbook/network-servers/chapter.xml | 2 +-
.../books/handbook/pgpkeys/chapter.xml | 2 +-
.../books/handbook/ports/chapter.xml | 2 +-
.../books/handbook/ppp-and-slip/chapter.xml | 2 +-
.../books/handbook/preface/preface.xml | 2 +-
.../books/handbook/printing/chapter.xml | 2 +-
.../books/handbook/security/chapter.xml | 2 +-
.../books/handbook/serialcomms/chapter.xml | 2 +-
.../books/handbook/users/chapter.xml | 2 +-
.../books/handbook/vinum/chapter.xml | 2 +-
.../books/handbook/virtualization/chapter.xml | 2 +-
.../books/handbook/x11/chapter.xml | 2 +-
hu_HU.ISO8859-2/share/xml/bibliography.xml | 2 +-
hu_HU.ISO8859-2/share/xml/mirrors-local.xsl | 226 +-----------------
42 files changed, 109 insertions(+), 589 deletions(-)
diff --git a/hu_HU.ISO8859-2/books/fdp-primer/sgml-primer/chapter.xml b/hu_HU.ISO8859-2/books/fdp-primer/sgml-primer/chapter.xml
index 4e29f4e028..763f5100b4 100644
--- a/hu_HU.ISO8859-2/books/fdp-primer/sgml-primer/chapter.xml
+++ b/hu_HU.ISO8859-2/books/fdp-primer/sgml-primer/chapter.xml
@@ -1166,31 +1166,6 @@ onsgmls:pr
--]]> t�bbsoros megjegyz�sek �r�s�nak <![CDATA[-->]]></programlisting>
</example>
- <![%output.print;[
- <important>
- <title>A k�t k�t�jel haszn�lata</title>
-
- <para>A Postscript �s PDF v�ltozatok eset�n
- kisebb probl�m�k jelentkeznek enn�l a
- p�ld�n�l, ugyanis benn�k csak egyetlen
- k�t�jel fog l�tszani a <literal><!</literal>
- �s <literal>></literal> szimb�lumok
- mellett.</para>
-
- <para>A forr�sk�dban azonban k�t
- <literal>-</literal> (k�t�jel) szimb�lumot
- <emphasis>kell</emphasis> haszn�lnunk,
- <emphasis>nem</emphasis> pedig egyet. A Postscript �s
- PDF v�ltozatokban az eredetileg k�t
- k�t�jelet �sszevonj�k egyetlen hosszabb
- k�t�jell�, ez�ltal elrontj�k az
- im�nti p�ld�t.</para>
-
- <para>A dokumentum HTML, sz�veges �s RTF
- v�ltozatait ez nem �rinti.</para>
- </important>
- ]]>
-
<para>Ha dolgoztunk m�r kor�bban HTML k�ddal,
akkor el�fordulhat, hogy m�s meghat�roz�st
l�ttunk a megjegyz�sekre. Ez�rt
@@ -1814,7 +1789,7 @@ onsgmls:pr
<para>A kor�bbiakban tapasztaltak szerint
term�szetesen a jel�lt szakaszokat az SGML
- r�szek�nt a <literal><!</literal>
+ r�szek�nt a <literal><!</literal>
szimb�lummal vezetj�k be.</para>
<para>Ezt k�vet�en az els� sz�gletes
diff --git a/hu_HU.ISO8859-2/books/handbook/Makefile b/hu_HU.ISO8859-2/books/handbook/Makefile
index 2ac5df9bd8..dae85bf965 100644
--- a/hu_HU.ISO8859-2/books/handbook/Makefile
+++ b/hu_HU.ISO8859-2/books/handbook/Makefile
@@ -280,30 +280,56 @@ DOC_PREFIX?= ${.CURDIR}/../../..
#
# rules generating lists of mirror site from XML database.
#
-XMLDOCS= mirrors-ftp:::mirrors.xml.ftp.inc \
+XMLDOCS= lastmod:::mirrors.lastmod.inc \
+ mirrors-ftp-index:::mirrors.xml.ftp.index.inc \
+ mirrors-ftp:::mirrors.xml.ftp.inc \
+ mirrors-cvsup-index:::mirrors.xml.cvsup.index.inc \
mirrors-cvsup:::mirrors.xml.cvsup.inc \
+ eresources-index:::eresources.xml.www.index.inc \
eresources:::eresources.xml.www.inc
DEPENDSET.DEFAULT= transtable mirror
XSLT.DEFAULT= ${XSL_MIRRORS}
XML.DEFAULT= ${XML_MIRRORS}
NO_TIDY.DEFAULT= yes
+PARAMS.lastmod+= --param 'target' "'lastmod'"
+PARAMS.mirrors-ftp-index+= --param 'type' "'ftp'" \
+ --param 'proto' "'ftp'" \
+ --param 'target' "'index'"
PARAMS.mirrors-ftp+= --param 'type' "'ftp'" \
--param 'proto' "'ftp'" \
--param 'target' "'handbook/mirrors/chapter.xml'"
+PARAMS.mirrors-cvsup-index+= --param 'type' "'cvsup'" \
+ --param 'proto' "'cvsup'" \
+ --param 'target' "'index'"
PARAMS.mirrors-cvsup+= --param 'type' "'cvsup'" \
--param 'proto' "'cvsup'" \
--param 'target' "'handbook/mirrors/chapter.xml'"
+PARAMS.eresources-index+= --param 'type' "'www'" \
+ --param 'proto' "'http'" \
+ --param 'target' "'index'"
PARAMS.eresources+= --param 'type' "'www'" \
--param 'proto' "'http'" \
--param 'target' "'handbook/eresources/chapter.xml'"
-SRCS+= mirrors.xml.ftp.inc \
+SRCS+= mirrors.lastmod.inc \
+ mirrors.xml.ftp.inc \
+ mirrors.xml.ftp.index.inc \
mirrors.xml.cvsup.inc \
- eresources.xml.www.inc
+ mirrors.xml.cvsup.index.inc \
+ eresources.xml.www.inc \
+ eresources.xml.www.index.inc
-CLEANFILES+= mirrors.xml.ftp.inc \
+CLEANFILES+= mirrors.lastmod.inc \
+ mirrors.xml.ftp.inc \
+ mirrors.xml.ftp.index.inc \
mirrors.xml.cvsup.inc \
- eresources.xml.www.inc
+ mirrors.xml.cvsup.index.inc \
+ eresources.xml.www.inc \
+ eresources.xml.www.index.inc
+
+lint: mirrors.lastmod.inc mirrors.xml.ftp.inc mirrors.xml.ftp.index.inc \
+ mirrors.xml.cvsup.inc mirrors.xml.cvsup.index.inc \
+ eresources.xml.www.inc eresources.xml.www.index.inc
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/hu_HU.ISO8859-2/books/handbook/advanced-networking/chapter.xml b/hu_HU.ISO8859-2/books/handbook/advanced-networking/chapter.xml
index 7d236f68a6..c4beaade54 100644
--- a/hu_HU.ISO8859-2/books/handbook/advanced-networking/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/advanced-networking/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Documentation Project
@@ -2823,7 +2823,7 @@ wpa_pairwise=CCMP TKIP <co id="co-ap-wpapsk-pwise"/></programlisting>
<application>hostapd</application>
elind�t�sa:</para>
- <screen>&prompt.root <userinput>/etc/rc.d/hostapd forcestart</userinput></screen>
+ <screen>&prompt.root; <userinput>/etc/rc.d/hostapd forcestart</userinput></screen>
<screen>&prompt.root; <userinput>ifconfig <replaceable>wlan0</replaceable></userinput>
wlan0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> mtu 2290
@@ -8102,7 +8102,7 @@ ifconfig_carp1="vhid 2 advskew 100 pass testpass 192.168.1.51/24"</programlistin
k�vetkez� parancsot kell kiadnia a
<hostid>szolgaltato.minta.org</hostid> g�pen:</para>
- <screen>&prompt.root; <userinput>ifconfig carp0 down && ifconfig carp0 up</userinput></screen>
+ <screen>&prompt.root; <userinput>ifconfig carp0 down && ifconfig carp0 up</userinput></screen>
<para>Ezt az adott g�phez tartoz�
<devicename>carp</devicename> fel�lettel kell
diff --git a/hu_HU.ISO8859-2/books/handbook/audit/chapter.xml b/hu_HU.ISO8859-2/books/handbook/audit/chapter.xml
index a6ee4e1726..144e36ad2b 100644
--- a/hu_HU.ISO8859-2/books/handbook/audit/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/audit/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Documentation Project
$FreeBSD$
diff --git a/hu_HU.ISO8859-2/books/handbook/basics/chapter.xml b/hu_HU.ISO8859-2/books/handbook/basics/chapter.xml
index cae9986ffd..2d0498e19c 100644
--- a/hu_HU.ISO8859-2/books/handbook/basics/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/basics/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Documentation Project
diff --git a/hu_HU.ISO8859-2/books/handbook/bibliography/chapter.xml b/hu_HU.ISO8859-2/books/handbook/bibliography/chapter.xml
index 95c00eb831..2fb59e89c3 100644
--- a/hu_HU.ISO8859-2/books/handbook/bibliography/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/bibliography/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Documentation Project
$FreeBSD$
diff --git a/hu_HU.ISO8859-2/books/handbook/boot/chapter.xml b/hu_HU.ISO8859-2/books/handbook/boot/chapter.xml
index 8abc84d77d..4641eb9718 100644
--- a/hu_HU.ISO8859-2/books/handbook/boot/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/boot/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Documentation Project
diff --git a/hu_HU.ISO8859-2/books/handbook/chapters.ent b/hu_HU.ISO8859-2/books/handbook/chapters.ent
index 8eaef370e2..fb50794c97 100644
--- a/hu_HU.ISO8859-2/books/handbook/chapters.ent
+++ b/hu_HU.ISO8859-2/books/handbook/chapters.ent
@@ -15,231 +15,61 @@
%SRCID% 1.39
-->
-<!ENTITY % not.published "INCLUDE">
-
-<!ENTITY % chap.introduction "IGNORE">
-<!ENTITY % chap.install "IGNORE">
-<!ENTITY % chap.basics "IGNORE">
-<!ENTITY % chap.ports "IGNORE">
-<!ENTITY % chap.config "IGNORE">
-<!ENTITY % chap.boot "IGNORE">
-<!ENTITY % chap.users "IGNORE">
-<!ENTITY % chap.kernelconfig "IGNORE">
-<!ENTITY % chap.security "IGNORE">
-<!ENTITY % chap.jails "IGNORE">
-<!ENTITY % chap.printing "IGNORE">
-<!ENTITY % chap.disks "IGNORE">
-<!ENTITY % chap.geom "IGNORE">
-<!ENTITY % chap.vinum "IGNORE">
-<!ENTITY % chap.x11 "IGNORE">
-<!ENTITY % chap.l10n "IGNORE">
-<!ENTITY % chap.multimedia "IGNORE">
-<!ENTITY % chap.desktop "IGNORE">
-<!ENTITY % chap.serialcomms "IGNORE">
-<!ENTITY % chap.ppp-and-slip "IGNORE">
-<!ENTITY % chap.advanced-networking "IGNORE">
-<!ENTITY % chap.firewalls "IGNORE">
-<!ENTITY % chap.network-servers "IGNORE">
-<!ENTITY % chap.mail "IGNORE">
-<!ENTITY % chap.cutting-edge "IGNORE">
-<!ENTITY % chap.linuxemu "IGNORE">
-<!ENTITY % chap.mirrors "IGNORE">
-<!ENTITY % chap.mirrors.ftp.inc "INCLUDE">
-<!ENTITY % chap.mirrors.cvsup.inc "INCLUDE">
-<!ENTITY % chap.bibliography "IGNORE">
-<!ENTITY % chap.eresources "IGNORE">
-<!ENTITY % chap.eresources.www.inc "INCLUDE">
-<!ENTITY % chap.pgpkeys "IGNORE">
-<!ENTITY % chap.index "IGNORE">
-<!ENTITY % chap.freebsd-glossary "IGNORE">
-<!ENTITY % chap.mac "IGNORE">
-<!ENTITY % chap.audit "IGNORE">
-<!ENTITY % chap.filesystems "IGNORE">
-<!ENTITY % chap.dtrace "IGNORE">
-
<!ENTITY chap.preface SYSTEM "preface/preface.xml">
<!ENTITY % pgpkeys SYSTEM "../../../share/pgpkeys/pgpkeys.ent"> %pgpkeys;
<!-- Part One -->
-<![%chap.introduction;[
<!ENTITY chap.introduction SYSTEM "introduction/chapter.xml">
-]]>
-<![%chap.install;[
<!ENTITY chap.install SYSTEM "install/chapter.xml">
-]]>
-<![%chap.basics;[
<!ENTITY chap.basics SYSTEM "basics/chapter.xml">
-]]>
-<![%chap.ports;[
<!ENTITY chap.ports SYSTEM "ports/chapter.xml">
-]]>
-<![%chap.x11;[
<!ENTITY chap.x11 SYSTEM "x11/chapter.xml">
-]]>
<!-- Part Two -->
-<![%chap.desktop;[
<!ENTITY chap.desktop SYSTEM "desktop/chapter.xml">
-]]>
-<![%chap.multimedia;[
<!ENTITY chap.multimedia SYSTEM "multimedia/chapter.xml">
-]]>
-<![%chap.kernelconfig;[
<!ENTITY chap.kernelconfig SYSTEM "kernelconfig/chapter.xml">
-]]>
-<![%chap.printing;[
<!ENTITY chap.printing SYSTEM "printing/chapter.xml">
-]]>
-<![%chap.linuxemu;[
<!ENTITY chap.linuxemu SYSTEM "linuxemu/chapter.xml">
-]]>
<!-- Part Three -->
-<![%chap.config;[
<!ENTITY chap.config SYSTEM "config/chapter.xml">
-]]>
-<![%chap.boot;[
<!ENTITY chap.boot SYSTEM "boot/chapter.xml">
-]]>
-<![%chap.users;[
<!ENTITY chap.users SYSTEM "users/chapter.xml">
-]]>
-<![%chap.security;[
<!ENTITY chap.security SYSTEM "security/chapter.xml">
-]]>
-<![%chap.jails;[
<!ENTITY chap.jails SYSTEM "jails/chapter.xml">
-]]>
-<![%chap.mac;[
<!ENTITY chap.mac SYSTEM "mac/chapter.xml">
-]]>
-<![%chap.audit;[
<!ENTITY chap.audit SYSTEM "audit/chapter.xml">
-]]>
-<![%chap.disks;[
<!ENTITY chap.disks SYSTEM "disks/chapter.xml">
-]]>
-<![%chap.geom;[
<!ENTITY chap.geom SYSTEM "geom/chapter.xml">
-]]>
-<![%chap.filesystems;[
<!ENTITY chap.filesystems SYSTEM "filesystems/chapter.xml">
-]]>
-<![%chap.vinum;[
<!ENTITY chap.vinum SYSTEM "vinum/chapter.xml">
-]]>
-<![%chap.virtualization;[
<!ENTITY chap.virtualization SYSTEM "virtualization/chapter.xml">
-]]>
-<![%chap.l10n;[
<!ENTITY chap.l10n SYSTEM "l10n/chapter.xml">
-]]>
-<![%chap.cutting-edge;[
<!ENTITY chap.cutting-edge SYSTEM "cutting-edge/chapter.xml">
-]]>
-<![%chap.dtrace;[
<!ENTITY chap.dtrace SYSTEM "dtrace/chapter.xml">
-]]>
<!-- Part Four -->
-<![%chap.serialcomms;[
<!ENTITY chap.serialcomms SYSTEM "serialcomms/chapter.xml">
-]]>
-<![%chap.ppp-and-slip;[
<!ENTITY chap.ppp-and-slip SYSTEM "ppp-and-slip/chapter.xml">
-]]>
-<![%chap.mail;[
<!ENTITY chap.mail SYSTEM "mail/chapter.xml">
-]]>
-<![%chap.network-servers;[
<!ENTITY chap.network-servers SYSTEM "network-servers/chapter.xml">
-]]>
-<![%chap.firewalls;[
<!ENTITY chap.firewalls SYSTEM "firewalls/chapter.xml">
-]]>
-<![%chap.advanced-networking;[
<!ENTITY chap.advanced-networking SYSTEM "advanced-networking/chapter.xml">
-]]>
<!-- Part Five (appendices) -->
-<![%chap.mirrors;[
- <!ENTITY chap.mirrors SYSTEM "mirrors/chapter.xml">
-]]>
-<![%chap.mirrors.ftp.inc;[
- <!ENTITY chap.mirrors.ftp.inc SYSTEM "mirrors.xml.ftp.inc">
-]]>
-<![%chap.mirrors.cvsup.inc;[
- <!ENTITY chap.mirrors.cvsup.inc SYSTEM "mirrors.xml.cvsup.inc">
-]]>
-<![%chap.bibliography;[
- <!ENTITY chap.bibliography SYSTEM "bibliography/chapter.xml">
-]]>
-<![%chap.eresources;[
- <!ENTITY chap.eresources SYSTEM "eresources/chapter.xml">
-]]>
-<![%chap.eresources.www.inc;[
- <!ENTITY chap.eresources.www.inc SYSTEM "eresources.xml.www.inc">
-]]>
-<![%chap.pgpkeys;[
- <!ENTITY chap.pgpkeys SYSTEM "pgpkeys/chapter.xml">
-]]>
-<![%chap.freebsd-glossary;[
- <!ENTITY chap.freebsd-glossary "&freebsd-glossary;">
-]]>
-<![%chap.index;[
- <!ENTITY chap.index SYSTEM "index.xml">
-]]>
+ <!ENTITY chap.mirrors SYSTEM "mirrors/chapter.xml">
+ <!ENTITY chap.mirrors.lastmod.inc SYSTEM "mirrors.lastmod.inc">
+ <!ENTITY chap.mirrors.ftp.index.inc SYSTEM "mirrors.xml.ftp.index.inc">
+ <!ENTITY chap.mirrors.ftp.inc SYSTEM "mirrors.xml.ftp.inc">
+ <!ENTITY chap.mirrors.cvsup.index.inc SYSTEM "mirrors.xml.cvsup.index.inc">
+ <!ENTITY chap.mirrors.cvsup.inc SYSTEM "mirrors.xml.cvsup.inc">
+ <!ENTITY chap.bibliography SYSTEM "bibliography/chapter.xml">
+ <!ENTITY chap.eresources SYSTEM "eresources/chapter.xml">
+ <!ENTITY chap.eresources.www.index.inc SYSTEM "eresources.xml.www.index.inc">
+ <!ENTITY chap.eresources.www.inc SYSTEM "eresources.xml.www.inc">
+ <!ENTITY chap.pgpkeys SYSTEM "pgpkeys/chapter.xml">
+ <!ENTITY chap.freebsd-glossary "&freebsd-glossary;">
+ <!ENTITY chap.index "">
<!ENTITY chap.colophon SYSTEM "colophon.xml">
-
-<!-- IGNORE cases -->
-
-<!-- Part One -->
-<!ENTITY chap.introduction "">
-<!ENTITY chap.install "">
-<!ENTITY chap.basics "">
-<!ENTITY chap.ports "">
-<!ENTITY chap.x11 "">
-
-<!-- Part Two -->
-<!ENTITY chap.desktop "">
-<!ENTITY chap.multimedia "">
-<!ENTITY chap.kernelconfig "">
-<!ENTITY chap.printing "">
-<!ENTITY chap.linuxemu "">
-
-<!-- Part Three -->
-<!ENTITY chap.config "">
-<!ENTITY chap.boot "">
-<!ENTITY chap.users "">
-<!ENTITY chap.security "">
-<!ENTITY chap.jails "">
-<!ENTITY chap.mac "">
-<!ENTITY chap.audit "">
-<!ENTITY chap.disks "">
-<!ENTITY chap.geom "">
-<!ENTITY chap.filesystems "">
-<!ENTITY chap.vinum "">
-<!ENTITY chap.virtualization "">
-<!ENTITY chap.l10n "">
-<!ENTITY chap.cutting-edge "">
-<!ENTITY chap.dtrace "">
-
-<!-- Part Four -->
-<!ENTITY chap.serialcomms "">
-<!ENTITY chap.ppp-and-slip "">
-<!ENTITY chap.mail "">
-<!ENTITY chap.network-servers "">
-<!ENTITY chap.firewalls "">
-<!ENTITY chap.advanced-networking "">
-
-<!-- Part Five (appendices) -->
-<!ENTITY chap.mirrors "">
-<!ENTITY chap.mirrors.ftp.inc "">
-<!ENTITY chap.mirrors.cvsup.inc "">
-<!ENTITY chap.bibliography "">
-<!ENTITY chap.eresources "">
-<!ENTITY chap.eresources.www.inc "">
-<!ENTITY chap.pgpkeys "">
-<!ENTITY chap.freebsd-glossary "">
-<!ENTITY chap.index "">
diff --git a/hu_HU.ISO8859-2/books/handbook/colophon.xml b/hu_HU.ISO8859-2/books/handbook/colophon.xml
index 63b68017ec..8c1e46030c 100644
--- a/hu_HU.ISO8859-2/books/handbook/colophon.xml
+++ b/hu_HU.ISO8859-2/books/handbook/colophon.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Documentation Project
diff --git a/hu_HU.ISO8859-2/books/handbook/config/chapter.xml b/hu_HU.ISO8859-2/books/handbook/config/chapter.xml
index e661ddaa21..f489ff510d 100644
--- a/hu_HU.ISO8859-2/books/handbook/config/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/config/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Documentation Project
diff --git a/hu_HU.ISO8859-2/books/handbook/cutting-edge/chapter.xml b/hu_HU.ISO8859-2/books/handbook/cutting-edge/chapter.xml
index 93566945fe..15b45b2f54 100644
--- a/hu_HU.ISO8859-2/books/handbook/cutting-edge/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/cutting-edge/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Documentation Project
@@ -1000,7 +1000,7 @@ Fetching 133 new ports or files... done.</screen>
<screen>&prompt.root; <userinput>portsnap fetch update</userinput></screen>
- <para>Ez a parancs let�lti a Portgy&251;jtem�ny
+ <para>Ez a parancs let�lti a Portgy�jtem�ny
legfrissebb v�ltozat�t, majd
kit�m�r�ti azt a helyi <filename
class="directory">/usr/ports</filename>
@@ -1663,98 +1663,6 @@ DOCSUPFILE?= /usr/share/examples/cvsup/doc-supfile</programlisting>
<screen>&prompt.root; <userinput>portupgrade -PP hu-freebsd-doc</userinput></screen>
</sect3>
</sect2>
-
-<![ IGNORE [
- <sect2 id="docsnap">
- <sect2info>
- <authorgroup>
- <author>
- <firstname>Pav</firstname>
- <surname>Lucistnik</surname>
- <contrib>A sz�ks�ges inform�ci�kat
- szolg�ltatta: </contrib>
- </author>
- </authorgroup>
- </sect2info>
-
- <title>A Docsnap haszn�lata</title>
-
- <indexterm><primary>friss�t�s �s frissen
- tart�s</primary></indexterm>
-
- <indexterm>
- <primary>Docsnap</primary>
- <see>friss�t�s �s frissen tart�s</see>
- </indexterm>
-
- <para>A <application>Docsnap</application> a &os;
- dokument�ci�j�nak egy viszonylag gyors
- �s k�nny� friss�t�s�re
- alkalmas &man.rsync.1; repository. Az �n.
- <quote><application>Docsnap</application> szerver</quote>
- folyamatosan k�veti a dokument�ci�
- forr�sainak v�ltoz�sait, majd minden
- �r�ban el��ll�tja a HTML
- v�ltozatukat. A <application>Docsnap</application>
- haszn�latakor nincs sz�ks�g�nk a
- <filename role="package">textproc/docproj</filename> port
- telep�t�s�re, mivel mindig csak a
- m�r el��ll�tott
- dokument�ci�t friss�tj�k.</para>
-
- <para>A m�dszer haszn�lat�hoz mind�ssze
- a <filename role="package">net/rsync</filename> port vagy csomag
- telep�t�se sz�ks�geltetik. Ezt a
- k�vetkez� paranccsal tudjuk elv�gezni:</para>
-
- <screen>&prompt.root; <userinput>pkg_add -r rsync</userinput></screen>
-
- <note>
- <para>A <application>Docsnap</application>
- m�dszer�t eredetileg a <filename
- class="directory">/usr/share/doc</filename>
- k�nyvt�rban t�rolt
- dokument�ci� friss�t�s�re
- fejlesztett�k ki, de a bemutatott p�ld�k
- tetsz�leges k�nyvt�rra alkalmazhat�ak.
- Felhaszn�l�i k�nyvt�rak
- eset�n m�g rendszergazdai jogosults�gokra
- sincs sz�ks�g�nk a feladat
- elv�gz�s�hez.</para>
- </note>
-
- <para>A dokument�ci� �gy az al�bbi
- paranccsal friss�thet�:</para>
-
- <screen>&prompt.root; <userinput>rsync -rltvz <replaceable>docsnap.sk.FreeBSD.org</replaceable>::docsnap <replaceable>/usr/share/doc</replaceable></userinput></screen>
-
- <note>
- <para>Jelenleg csak egyetlen <application>Docsnap</application>
- szerver �rhet� el, ez a fentebb is
- l�that�
- <hostid>docsnap.sk.FreeBSD.org</hostid>.</para>
- </note>
-
- <para>K�zvetlen�l ne haszn�ljuk a
- <option>--delete</option> param�tert, mert a <command>make
- installworld</command> parancs fut�sa k�zben olyan
- elemeket is telep�thetett a <filename
- class="directory">/usr/share/doc</filename>
- k�nyvt�rba, amelyek �gy
- t�rl�dn�nek. Helyette ink�bb �gy
- haszn�ljuk a parancsot:</para>
-
- <screen>&prompt.root; <userinput>rsync -rltvz --delete <replaceable>docsnap.sk.FreeBSD.org</replaceable>::docsnap/??_??\.\* <replaceable>/usr/share/doc</replaceable></userinput></screen>
-
- <para>Ha csak a dokument�ci� egy
- r�sz�t akarjuk friss�teni,
- p�ld�ul csak az angol nyelv�
- v�ltozat�t, akkor pedig ezt a parancsot
- haszn�ljuk:</para>
-
- <screen>&prompt.root; <userinput>rsync -rltvz <replaceable>docsnap.sk.FreeBSD.org</replaceable>::docsnap/en_US.ISO8859-1 <replaceable>/usr/share/doc</replaceable></userinput></screen>
- </sect2>
-]]>
</sect1>
<sect1 id="current-stable">
diff --git a/hu_HU.ISO8859-2/books/handbook/desktop/chapter.xml b/hu_HU.ISO8859-2/books/handbook/desktop/chapter.xml
index 08fcf9a485..504547e8b7 100644
--- a/hu_HU.ISO8859-2/books/handbook/desktop/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/desktop/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Documentation Project
$FreeBSD$
diff --git a/hu_HU.ISO8859-2/books/handbook/disks/chapter.xml b/hu_HU.ISO8859-2/books/handbook/disks/chapter.xml
index 931ca60809..fd4c0ef218 100644
--- a/hu_HU.ISO8859-2/books/handbook/disks/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/disks/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Documentation Project
@@ -3936,17 +3936,6 @@ return billenty
magunkat.</para>
</sect3>
-
-<![ %not.published; [
-
- <sect3>
- <title>* Mit tegyek, ha nem k�sz�ltem fel a
- katasztr�f�ra?</title>
-
- <para></para>
- </sect3>
-]]>
-
</sect2>
</sect1>
diff --git a/hu_HU.ISO8859-2/books/handbook/dtrace/chapter.xml b/hu_HU.ISO8859-2/books/handbook/dtrace/chapter.xml
index 2007d0b765..efffd80788 100644
--- a/hu_HU.ISO8859-2/books/handbook/dtrace/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/dtrace/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Documentation Project
$FreeBSD$
diff --git a/hu_HU.ISO8859-2/books/handbook/eresources/chapter.xml b/hu_HU.ISO8859-2/books/handbook/eresources/chapter.xml
index 01b979b6de..b90c0555e6 100644
--- a/hu_HU.ISO8859-2/books/handbook/eresources/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/eresources/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Documentation Project
@@ -2610,6 +2610,10 @@
<sect2 id="eresources-web-mirrors">
<title>Hivatalos t�kr�z�sek</title>
+ &chap.eresources.www.index.inc;
+
+ &chap.mirrors.lastmod.inc;
+
&chap.eresources.www.inc;
</sect2>
</sect1>
diff --git a/hu_HU.ISO8859-2/books/handbook/filesystems/chapter.xml b/hu_HU.ISO8859-2/books/handbook/filesystems/chapter.xml
index 7cdb7529f6..ea3716707a 100644
--- a/hu_HU.ISO8859-2/books/handbook/filesystems/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/filesystems/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Documentation Project
$FreeBSD$
@@ -314,7 +314,7 @@ minta 17547136 0 17547136 0% /minta</screen>
�llom�nyok hozhat�ak rajta l�tre
vagy list�zhat� a tartalma:</para>
- <screen>&prompt.root <userinput>cd /minta</userinput>
+ <screen>&prompt.root; <userinput>cd /minta</userinput>
&prompt.root; <userinput>ls</userinput>
&prompt.root; <userinput>touch proba</userinput>
&prompt.root; <userinput>ls -al</userinput>
diff --git a/hu_HU.ISO8859-2/books/handbook/firewalls/chapter.xml b/hu_HU.ISO8859-2/books/handbook/firewalls/chapter.xml
index e1b72c2819..b1929ab607 100644
--- a/hu_HU.ISO8859-2/books/handbook/firewalls/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/firewalls/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Documentation Project
diff --git a/hu_HU.ISO8859-2/books/handbook/geom/chapter.xml b/hu_HU.ISO8859-2/books/handbook/geom/chapter.xml
index ad674c1e9a..fdca1d5761 100644
--- a/hu_HU.ISO8859-2/books/handbook/geom/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/geom/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Documentation Project
$FreeBSD$
diff --git a/hu_HU.ISO8859-2/books/handbook/install/chapter.xml b/hu_HU.ISO8859-2/books/handbook/install/chapter.xml
index ea9be46471..3eb62e7aa5 100644
--- a/hu_HU.ISO8859-2/books/handbook/install/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/install/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Documentation Project
diff --git a/hu_HU.ISO8859-2/books/handbook/introduction/chapter.xml b/hu_HU.ISO8859-2/books/handbook/introduction/chapter.xml
index afcd4fc3e6..be14b8e209 100644
--- a/hu_HU.ISO8859-2/books/handbook/introduction/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/introduction/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Documentation Project
diff --git a/hu_HU.ISO8859-2/books/handbook/jails/chapter.xml b/hu_HU.ISO8859-2/books/handbook/jails/chapter.xml
index 9391061d45..faddb51710 100644
--- a/hu_HU.ISO8859-2/books/handbook/jails/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/jails/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Documentation Project
diff --git a/hu_HU.ISO8859-2/books/handbook/kernelconfig/chapter.xml b/hu_HU.ISO8859-2/books/handbook/kernelconfig/chapter.xml
index 2b66058407..65684cb9b7 100644
--- a/hu_HU.ISO8859-2/books/handbook/kernelconfig/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/kernelconfig/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Documentation Project
diff --git a/hu_HU.ISO8859-2/books/handbook/l10n/chapter.xml b/hu_HU.ISO8859-2/books/handbook/l10n/chapter.xml
index 3e78307827..0772ecf635 100644
--- a/hu_HU.ISO8859-2/books/handbook/l10n/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/l10n/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Documentation Project
diff --git a/hu_HU.ISO8859-2/books/handbook/linuxemu/chapter.xml b/hu_HU.ISO8859-2/books/handbook/linuxemu/chapter.xml
index fa8a3fbfca..5599112f6b 100644
--- a/hu_HU.ISO8859-2/books/handbook/linuxemu/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/linuxemu/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Documentation Project
@@ -880,14 +880,14 @@ LOG=/var/log/lmgrd.log
case "$1" in
start)
- lmgrd -c ${LICENSE_FILE} 2>> ${LOG} 1>&2
+ lmgrd -c ${LICENSE_FILE} 2>> ${LOG} 1>&2
echo -n " lmgrd"
;;
stop)
- lmgrd -c ${LICENSE_FILE} -x lmdown 2>> ${LOG} 1>&2
+ lmgrd -c ${LICENSE_FILE} -x lmdown 2>> ${LOG} 1>&2
;;
*)
- echo "Usage: `basename $0` {start|stop}" 1>&2
+ echo "Usage: `basename $0` {start|stop}" 1>&2
exit 64
;;
esac
@@ -1241,7 +1241,7 @@ exit 0</programlisting>
k�vetkez�:</para>
<programlisting>#!/usr/compat/linux/bin/sh
-(sleep 5; killall -1 matlab_helper) &
+(sleep 5; killall -1 matlab_helper) &
exit 0</programlisting>
</step>
diff --git a/hu_HU.ISO8859-2/books/handbook/mac/chapter.xml b/hu_HU.ISO8859-2/books/handbook/mac/chapter.xml
index 971f865e29..d8b479e2bf 100644
--- a/hu_HU.ISO8859-2/books/handbook/mac/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/mac/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Documentation Project
$FreeBSD$
diff --git a/hu_HU.ISO8859-2/books/handbook/mail/chapter.xml b/hu_HU.ISO8859-2/books/handbook/mail/chapter.xml
index 1ac404ad39..538a5aaa68 100644
--- a/hu_HU.ISO8859-2/books/handbook/mail/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/mail/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Documentation Project
@@ -2241,11 +2241,11 @@ SENDMAIL_LDADD=-lsasl2</programlisting>
el:</para>
<screen>&prompt.root; <userinput>cd /usr/src/lib/libsmutil</userinput>
-&prompt.root; <userinput>make cleandir && make obj && make</userinput>
+&prompt.root; <userinput>make cleandir && make obj && make</userinput>
&prompt.root; <userinput>cd /usr/src/lib/libsm</userinput>
-&prompt.root; <userinput>make cleandir && make obj && make</userinput>
+&prompt.root; <userinput>make cleandir && make obj && make</userinput>
&prompt.root; <userinput>cd /usr/src/usr.sbin/sendmail</userinput>
-&prompt.root; <userinput>make cleandir && make obj && make && make install</userinput></screen>
+&prompt.root; <userinput>make cleandir && make obj && make && make install</userinput></screen>
<para>A <application>sendmail</application>
ford�t�sa eset�n semmilyen
diff --git a/hu_HU.ISO8859-2/books/handbook/mirrors/chapter.xml b/hu_HU.ISO8859-2/books/handbook/mirrors/chapter.xml
index 99cdd2a284..a21d3085ab 100644
--- a/hu_HU.ISO8859-2/books/handbook/mirrors/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/mirrors/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Documentation Project
@@ -282,6 +282,10 @@
m�dszereket a nev�k ut�n
z�r�jelben k�z�lj�k.</para>
+ &chap.mirrors.ftp.index.inc;
+
+ &chap.mirrors.lastmod.inc;
+
&chap.mirrors.ftp.inc;
</sect1>
@@ -2999,6 +3003,10 @@ doc/zh_*</screen>
<para>A &os; <link linkend="cvsup">CVSup</link> szerverei az
al�bbi oldalakon �rhet�ek el:</para>
+ &chap.mirrors.cvsup.index.inc;
+
+ &chap.mirrors.lastmod.inc;
+
&chap.mirrors.cvsup.inc;
</sect2>
diff --git a/hu_HU.ISO8859-2/books/handbook/multimedia/chapter.xml b/hu_HU.ISO8859-2/books/handbook/multimedia/chapter.xml
index 19603a94df..afb85355f7 100644
--- a/hu_HU.ISO8859-2/books/handbook/multimedia/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/multimedia/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Documentation Project
diff --git a/hu_HU.ISO8859-2/books/handbook/network-servers/chapter.xml b/hu_HU.ISO8859-2/books/handbook/network-servers/chapter.xml
index 9dfe80d894..f09b877955 100644
--- a/hu_HU.ISO8859-2/books/handbook/network-servers/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/network-servers/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Documentation Project
diff --git a/hu_HU.ISO8859-2/books/handbook/pgpkeys/chapter.xml b/hu_HU.ISO8859-2/books/handbook/pgpkeys/chapter.xml
index aaf079153b..e9cc9cab89 100644
--- a/hu_HU.ISO8859-2/books/handbook/pgpkeys/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/pgpkeys/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Documentation Project
$FreeBSD$
diff --git a/hu_HU.ISO8859-2/books/handbook/ports/chapter.xml b/hu_HU.ISO8859-2/books/handbook/ports/chapter.xml
index 86df55f0db..688945f54c 100644
--- a/hu_HU.ISO8859-2/books/handbook/ports/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/ports/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Documentation Project
diff --git a/hu_HU.ISO8859-2/books/handbook/ppp-and-slip/chapter.xml b/hu_HU.ISO8859-2/books/handbook/ppp-and-slip/chapter.xml
index a8d8ad1e16..2d684502b3 100644
--- a/hu_HU.ISO8859-2/books/handbook/ppp-and-slip/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/ppp-and-slip/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Documentation Project
diff --git a/hu_HU.ISO8859-2/books/handbook/preface/preface.xml b/hu_HU.ISO8859-2/books/handbook/preface/preface.xml
index 96a205cf0c..9b9f015c0f 100644
--- a/hu_HU.ISO8859-2/books/handbook/preface/preface.xml
+++ b/hu_HU.ISO8859-2/books/handbook/preface/preface.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
$FreeBSD$
-->
diff --git a/hu_HU.ISO8859-2/books/handbook/printing/chapter.xml b/hu_HU.ISO8859-2/books/handbook/printing/chapter.xml
index 059b6d216f..548546f0ea 100644
--- a/hu_HU.ISO8859-2/books/handbook/printing/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/printing/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Documentation Project
diff --git a/hu_HU.ISO8859-2/books/handbook/security/chapter.xml b/hu_HU.ISO8859-2/books/handbook/security/chapter.xml
index 8e0e5e2f98..1b536465be 100644
--- a/hu_HU.ISO8859-2/books/handbook/security/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/security/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Documentation Project
diff --git a/hu_HU.ISO8859-2/books/handbook/serialcomms/chapter.xml b/hu_HU.ISO8859-2/books/handbook/serialcomms/chapter.xml
index e92c197311..e1371dfc67 100644
--- a/hu_HU.ISO8859-2/books/handbook/serialcomms/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/serialcomms/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Documentation Project
diff --git a/hu_HU.ISO8859-2/books/handbook/users/chapter.xml b/hu_HU.ISO8859-2/books/handbook/users/chapter.xml
index 1e046a17b7..6e540f5e58 100644
--- a/hu_HU.ISO8859-2/books/handbook/users/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/users/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Documentation Project
diff --git a/hu_HU.ISO8859-2/books/handbook/vinum/chapter.xml b/hu_HU.ISO8859-2/books/handbook/vinum/chapter.xml
index e03ef42112..032905b69e 100644
--- a/hu_HU.ISO8859-2/books/handbook/vinum/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/vinum/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The Vinum Volume Manager
By Greg Lehey (grog at lemis dot com)
diff --git a/hu_HU.ISO8859-2/books/handbook/virtualization/chapter.xml b/hu_HU.ISO8859-2/books/handbook/virtualization/chapter.xml
index fce0116b0a..c299662d14 100644
--- a/hu_HU.ISO8859-2/books/handbook/virtualization/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/virtualization/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Documentation Project
diff --git a/hu_HU.ISO8859-2/books/handbook/x11/chapter.xml b/hu_HU.ISO8859-2/books/handbook/x11/chapter.xml
index 9b2dcc7874..1c1af26583 100644
--- a/hu_HU.ISO8859-2/books/handbook/x11/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/x11/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Documentation Project
diff --git a/hu_HU.ISO8859-2/share/xml/bibliography.xml b/hu_HU.ISO8859-2/share/xml/bibliography.xml
index 2a73c12864..47ed73976a 100644
--- a/hu_HU.ISO8859-2/share/xml/bibliography.xml
+++ b/hu_HU.ISO8859-2/share/xml/bibliography.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
$FreeBSD$
-->
diff --git a/hu_HU.ISO8859-2/share/xml/mirrors-local.xsl b/hu_HU.ISO8859-2/share/xml/mirrors-local.xsl
index 67da8c7b18..51ce50a143 100644
--- a/hu_HU.ISO8859-2/share/xml/mirrors-local.xsl
+++ b/hu_HU.ISO8859-2/share/xml/mirrors-local.xsl
@@ -14,6 +14,9 @@
exclude-result-prefixes="cvs"
extension-element-prefixes="str">
+ <!-- must point to master copy, doc/share/xml/mirrors-master.xsl -->
+ <xsl:import href="../../../share/xml/mirrors-master.xsl" />
+
<xsl:variable name="svnKeyword">
<xsl:value-of select="normalize-space(//cvs:keyword[1])"/>
</xsl:variable>
@@ -23,15 +26,8 @@
</xsl:variable>
<xsl:output type="xml" encoding="iso-8859-2"
- omit-xml-declaration="yes"
indent="yes"/>
- <!-- these params should be externally bound. The values
- here are not used actually -->
- <xsl:param name="type" select="''" />
- <xsl:param name="proto" select="''" />
- <xsl:param name="target" select="''" />
-
<xsl:param name="mirrors-docbook-country-anchor-id" select="translate($target, '/.', '--')" />
<!--
@@ -39,29 +35,8 @@
* "mirrors-lastmodified"
* "mirrors-docbook-contact"
- * "mirrors-docbook-country-index-all"
- * "mirrors-docbook-variablelist"
- * "mirrors-docbook-itemizedlist"
-->
- <xsl:template match="/">
- <xsl:choose>
- <xsl:when test="$target = 'handbook/mirrors/chapter.xml'">
- <xsl:call-template name="mirrors-docbook-country-index-all" />
- <para>(<xsl:call-template name="mirrors-lastmodified" />)</para>
- <xsl:call-template name="mirrors-docbook-variablelist" />
- </xsl:when>
- <xsl:when test="$target = 'handbook/eresources/chapter.xml'">
- <xsl:call-template name="mirrors-docbook-country-index-all" />
- <para>(<xsl:call-template name="mirrors-lastmodified" />)</para>
- <xsl:call-template name="mirrors-docbook-itemizedlist" />
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="'*** processing error ***'" />
- </xsl:otherwise>
- </xsl:choose>
- </xsl:template>
-
<!-- template: "mirrors-docbook-contact" -->
<xsl:template name="mirrors-docbook-contact">
@@ -77,199 +52,4 @@
<xsl:text>D�tum: </xsl:text>
<xsl:call-template name="mirrors-lastmodified-utc" />
</xsl:template>
-
- <!-- template: "mirrors-docbook-country-index-all" -->
-
- <xsl:template name="mirrors-docbook-country-index-all">
- <para>
- <xsl:for-each select="mirrors/entry[country/@role = 'primary'
- and host[@type = $type]]">
- <xsl:call-template name="mirrors-docbook-country-index">
- <xsl:with-param name="mirrors-docbook-country-index-without-period" select="'true'" />
- </xsl:call-template>
- </xsl:for-each>
-
- <xsl:for-each select="mirrors/entry[(not(country/@role) or country/@role != 'primary') and
- host[@type = $type]]">
- <xsl:sort select="country/@sortkey" data-type="number"/>
- <xsl:sort select="country" />
-
- <xsl:call-template name="mirrors-docbook-country-index">
- <xsl:with-param name="mirrors-docbook-country-index-without-period" select="'false'" />
- </xsl:call-template>
- </xsl:for-each>
- </para>
- </xsl:template>
-
- <xsl:template name="mirrors-docbook-country-index">
- <xsl:param name="mirrors-docbook-country-index-without-period" />
- <link>
- <xsl:attribute name="linkend">
- <xsl:value-of select="concat($mirrors-docbook-country-anchor-id, '-', @id, '-', $type)" />
- </xsl:attribute>
- <xsl:value-of select="country" />
- </link>
- <xsl:choose>
- <xsl:when test='$mirrors-docbook-country-index-without-period != "true" and
- position() = last()'><xsl:text>.</xsl:text></xsl:when>
- <xsl:otherwise><xsl:text>, </xsl:text></xsl:otherwise>
- </xsl:choose>
- </xsl:template>
-
- <!-- template: "mirrors-docbook-variablelist" -->
-
- <xsl:template name="mirrors-docbook-variablelist">
- <variablelist>
- <xsl:for-each select="mirrors/entry[country/@role = 'primary' and
- host[@type = $type]]">
- <xsl:call-template name="mirrors-docbook-variablelist-entry" />
- </xsl:for-each>
-
- <xsl:for-each select="mirrors/entry[(not(country/@role) or country/@role != 'primary') and
- host[@type = $type]]">
- <xsl:sort select="country/@sortkey" data-type="number"/>
- <xsl:sort select="country" />
-
- <xsl:call-template name="mirrors-docbook-variablelist-entry" />
- </xsl:for-each>
- </variablelist>
- </xsl:template>
-
- <xsl:template name="mirrors-docbook-variablelist-entry">
- <varlistentry>
- <term>
- <anchor>
- <xsl:attribute name="id">
- <xsl:value-of select="concat($mirrors-docbook-country-anchor-id, '-', @id, '-', $type)" />
- </xsl:attribute>
- </anchor>
- <xsl:value-of select="country" />
- </term>
-
- <listitem>
- <xsl:if test="$type = 'ftp' and email">
- <xsl:call-template name="mirrors-docbook-contact">
- <xsl:with-param name="email" select="email" />
- </xsl:call-template>
- </xsl:if>
-
- <itemizedlist>
- <xsl:for-each select="host[@type = $type]">
- <listitem>
- <para>
- <xsl:choose>
- <xsl:when test="url[@proto = $proto]">
- <xsl:for-each select="url[@proto = $proto]">
- <ulink>
- <xsl:attribute name="url"><xsl:value-of select="." /></xsl:attribute>
- <xsl:value-of select="name" />
- </ulink>
- </xsl:for-each>
-
- <xsl:value-of select="' (ftp'" />
-
- <xsl:choose>
- <xsl:when test="url[@proto != $proto]">
- <xsl:for-each select="url[@proto != $proto]">
- <xsl:value-of select="' / '" />
- <xsl:choose>
- <xsl:when test=". != ''">
- <ulink>
- <xsl:attribute name="url"><xsl:value-of select="." /></xsl:attribute>
- <xsl:value-of select="@proto" />
- </ulink>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="@proto" />
- </xsl:otherwise>
- </xsl:choose>
- </xsl:for-each>
- </xsl:when>
- </xsl:choose>
-
- <xsl:value-of select="') '" />
- </xsl:when>
-
- <xsl:otherwise>
- <xsl:value-of select="name" />
- </xsl:otherwise>
- </xsl:choose>
- </para>
- </listitem>
- </xsl:for-each>
- </itemizedlist>
- </listitem>
- </varlistentry>
- </xsl:template>
-
- <!-- template: "mirrors-docbook-itemizedlist" -->
-
- <xsl:template name="mirrors-docbook-itemizedlist">
- <itemizedlist>
- <xsl:for-each select="mirrors/entry[country/@role = 'primary' and
- host[@type = $type]]">
- <xsl:call-template name="mirrors-docbook-itemizedlist-listitem" />
- </xsl:for-each>
-
- <xsl:for-each select="mirrors/entry[(not(country/@role) or country/@role != 'primary') and
- host[@type = $type]]">
- <xsl:sort select="country/@sortkey" data-type="number"/>
- <xsl:sort select="country" />
-
- <xsl:call-template name="mirrors-docbook-itemizedlist-listitem" />
- </xsl:for-each>
- </itemizedlist>
- </xsl:template>
-
- <xsl:template name="mirrors-docbook-itemizedlist-listitem">
- <listitem>
- <anchor>
- <xsl:attribute name="id">
- <xsl:value-of select="concat($mirrors-docbook-country-anchor-id, '-', @id, '-', $type)" />
- </xsl:attribute>
- </anchor>
-
- <para><xsl:value-of select="country" /></para>
-
- <itemizedlist>
- <xsl:for-each select="host[@type = $type]">
- <listitem>
- <para>
- <xsl:choose>
- <xsl:when test="url[@proto = $proto]">
- <xsl:for-each select="url[@proto = $proto]">
- <ulink>
- <xsl:attribute name="url"><xsl:value-of select="." /></xsl:attribute>
- <xsl:value-of select="name" />
- </ulink>
- </xsl:for-each>
-
- <xsl:if test="url[
- contains(@proto, 'ftpv6')
- or contains(@proto, 'httpv6')
- or contains(@proto, 'rsyncv6')]">
- <xsl:text> (IPv6)</xsl:text>
- </xsl:if>
- </xsl:when>
-
- <xsl:otherwise>
- <xsl:value-of select="name" />
- </xsl:otherwise>
- </xsl:choose>
- </para>
- </listitem>
- </xsl:for-each>
- </itemizedlist>
- </listitem>
- </xsl:template>
-
- <!-- template: "mirrors-lastmodified-utc" -->
-
- <xsl:template name="mirrors-lastmodified-utc">
- <xsl:param name="basestr" select="substring-after(substring-after($date, ',v '), ' ')" />
- <xsl:param name="datestr" select="substring-before($basestr, ' ')" />
- <xsl:param name="timestr" select="substring-before(substring-after($basestr, ' '), ' ')" />
-
- <xsl:value-of select="concat($datestr, ' ', $timestr, ' UTC')" />
- </xsl:template>
</xsl:stylesheet>
From 1e99c6f9de69873ad7f303b97b81dac6c6a01a00 Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Mon, 21 Jan 2013 17:39:52 +0000
Subject: [PATCH 013/121] - Make the Italian documentation valid XML
---
it_IT.ISO8859-15/books/handbook/Makefile | 36 +++-
.../handbook/advanced-networking/chapter.xml | 2 +-
.../books/handbook/audit/chapter.xml | 2 +-
.../books/handbook/basics/chapter.xml | 4 +-
.../books/handbook/bibliography/chapter.xml | 2 +-
it_IT.ISO8859-15/books/handbook/book.xml | 2 +-
.../books/handbook/boot/chapter.xml | 2 +-
it_IT.ISO8859-15/books/handbook/chapters.ent | 190 +-----------------
it_IT.ISO8859-15/books/handbook/colophon.xml | 2 +-
.../books/handbook/config/chapter.xml | 6 +-
.../books/handbook/cutting-edge/chapter.xml | 2 +-
.../books/handbook/desktop/chapter.xml | 2 +-
.../books/handbook/disks/chapter.xml | 2 +-
.../books/handbook/eresources/chapter.xml | 6 +-
.../books/handbook/firewalls/chapter.xml | 2 +-
.../books/handbook/geom/chapter.xml | 4 +-
.../books/handbook/install/chapter.xml | 8 +-
.../books/handbook/introduction/chapter.xml | 6 +-
.../books/handbook/jails/chapter.xml | 2 +-
.../books/handbook/kernelconfig/chapter.xml | 4 +-
.../books/handbook/l10n/chapter.xml | 2 +-
.../books/handbook/linuxemu/chapter.xml | 12 +-
.../books/handbook/mac/chapter.xml | 2 +-
.../books/handbook/mail/chapter.xml | 10 +-
.../books/handbook/mirrors/chapter.xml | 14 +-
.../books/handbook/multimedia/chapter.xml | 2 +-
.../handbook/network-servers/chapter.xml | 6 +-
.../books/handbook/pgpkeys/chapter.xml | 4 +-
.../books/handbook/ports/chapter.xml | 4 +-
.../books/handbook/ppp-and-slip/chapter.xml | 2 +-
.../books/handbook/preface/preface.xml | 2 +-
.../books/handbook/printing/chapter.xml | 2 +-
.../books/handbook/security/chapter.xml | 2 +-
.../books/handbook/serialcomms/chapter.xml | 2 +-
.../books/handbook/users/chapter.xml | 2 +-
.../books/handbook/vinum/chapter.xml | 2 +-
.../books/handbook/virtualization/chapter.xml | 2 +-
.../books/handbook/x11/chapter.xml | 4 +-
.../bibliography/chapter.xml | 2 +-
.../books/unix-introduction/book.xml | 2 +-
.../command-summary/chapter.xml | 2 +-
.../unix-introduction/commands/chapter.xml | 30 +--
.../unix-introduction/editors/chapter.xml | 2 +-
.../getting-started/chapter.xml | 2 +-
.../unix-introduction/glossary/chapter.xml | 2 +-
.../unix-introduction/history/chapter.xml | 2 +-
.../unix-introduction/preface/chapter.xml | 2 +-
.../shell-programming/chapter.xml | 22 +-
.../unix-introduction/shells/chapter.xml | 2 +-
.../special-features/chapter.xml | 10 +-
.../unix-introduction/structure/chapter.xml | 4 +-
.../system-resource/chapter.xml | 6 +-
.../text-processing/chapter.xml | 2 +-
53 files changed, 161 insertions(+), 293 deletions(-)
diff --git a/it_IT.ISO8859-15/books/handbook/Makefile b/it_IT.ISO8859-15/books/handbook/Makefile
index 3f44821085..1d0287b18e 100644
--- a/it_IT.ISO8859-15/books/handbook/Makefile
+++ b/it_IT.ISO8859-15/books/handbook/Makefile
@@ -248,30 +248,56 @@ DOC_PREFIX?= ${.CURDIR}/../../..
#
# rules generating lists of mirror site from XML database.
#
-XMLDOCS= mirrors-ftp:::mirrors.xml.ftp.inc \
+XMLDOCS= lastmod:::mirrors.lastmod.inc \
+ mirrors-ftp-index:::mirrors.xml.ftp.index.inc \
+ mirrors-ftp:::mirrors.xml.ftp.inc \
+ mirrors-cvsup-index:::mirrors.xml.cvsup.index.inc \
mirrors-cvsup:::mirrors.xml.cvsup.inc \
+ eresources-index:::eresources.xml.www.index.inc \
eresources:::eresources.xml.www.inc
DEPENDSET.DEFAULT= transtable mirror
XSLT.DEFAULT= ${XSL_MIRRORS}
XML.DEFAULT= ${XML_MIRRORS}
NO_TIDY.DEFAULT= yes
+PARAMS.lastmod+= --param 'target' "'lastmod'"
+PARAMS.mirrors-ftp-index+= --param 'type' "'ftp'" \
+ --param 'proto' "'ftp'" \
+ --param 'target' "'index'"
PARAMS.mirrors-ftp+= --param 'type' "'ftp'" \
--param 'proto' "'ftp'" \
--param 'target' "'handbook/mirrors/chapter.xml'"
+PARAMS.mirrors-cvsup-index+= --param 'type' "'cvsup'" \
+ --param 'proto' "'cvsup'" \
+ --param 'target' "'index'"
PARAMS.mirrors-cvsup+= --param 'type' "'cvsup'" \
--param 'proto' "'cvsup'" \
--param 'target' "'handbook/mirrors/chapter.xml'"
+PARAMS.eresources-index+= --param 'type' "'www'" \
+ --param 'proto' "'http'" \
+ --param 'target' "'index'"
PARAMS.eresources+= --param 'type' "'www'" \
--param 'proto' "'http'" \
--param 'target' "'handbook/eresources/chapter.xml'"
-SRCS+= mirrors.xml.ftp.inc \
+SRCS+= mirrors.lastmod.inc \
+ mirrors.xml.ftp.inc \
+ mirrors.xml.ftp.index.inc \
mirrors.xml.cvsup.inc \
- eresources.xml.www.inc
+ mirrors.xml.cvsup.index.inc \
+ eresources.xml.www.inc \
+ eresources.xml.www.index.inc
-CLEANFILES+= mirrors.xml.ftp.inc \
+CLEANFILES+= mirrors.lastmod.inc \
+ mirrors.xml.ftp.inc \
+ mirrors.xml.ftp.index.inc \
mirrors.xml.cvsup.inc \
- eresources.xml.www.inc
+ mirrors.xml.cvsup.index.inc \
+ eresources.xml.www.inc \
+ eresources.xml.www.index.inc
+
+lint: mirrors.lastmod.inc mirrors.xml.ftp.inc mirrors.xml.ftp.index.inc \
+ mirrors.xml.cvsup.inc mirrors.xml.cvsup.index.inc \
+ eresources.xml.www.inc eresources.xml.www.index.inc
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/it_IT.ISO8859-15/books/handbook/advanced-networking/chapter.xml b/it_IT.ISO8859-15/books/handbook/advanced-networking/chapter.xml
index ed63027375..292ce6984b 100644
--- a/it_IT.ISO8859-15/books/handbook/advanced-networking/chapter.xml
+++ b/it_IT.ISO8859-15/books/handbook/advanced-networking/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
<!--
The FreeBSD Italian Documentation Project
diff --git a/it_IT.ISO8859-15/books/handbook/audit/chapter.xml b/it_IT.ISO8859-15/books/handbook/audit/chapter.xml
index 134f42f4ec..2621b4d925 100644
--- a/it_IT.ISO8859-15/books/handbook/audit/chapter.xml
+++ b/it_IT.ISO8859-15/books/handbook/audit/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
<!--
The FreeBSD Italian Documentation Project
diff --git a/it_IT.ISO8859-15/books/handbook/basics/chapter.xml b/it_IT.ISO8859-15/books/handbook/basics/chapter.xml
index dda1e24083..b8a5bcabba 100644
--- a/it_IT.ISO8859-15/books/handbook/basics/chapter.xml
+++ b/it_IT.ISO8859-15/books/handbook/basics/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
<!--
The FreeBSD Italian Documentation Project
@@ -1028,7 +1028,7 @@ total 530
memoria � montato in
<filename class="directory">/var</filename>.
Questo pu� essere automatizzato usando le variabili
- relative a varmfs di &man.rc.conf.5 (o con un entry in
+ relative a varmfs di &man.rc.conf.5; (o con un entry in
<filename>/etc/fstab</filename>; consultare
&man.mdmfs.8;).</entry>
</row>
diff --git a/it_IT.ISO8859-15/books/handbook/bibliography/chapter.xml b/it_IT.ISO8859-15/books/handbook/bibliography/chapter.xml
index 567fe467c7..2a0ee13a6b 100644
--- a/it_IT.ISO8859-15/books/handbook/bibliography/chapter.xml
+++ b/it_IT.ISO8859-15/books/handbook/bibliography/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
<!--
The FreeBSD Italian Documentation Project
diff --git a/it_IT.ISO8859-15/books/handbook/book.xml b/it_IT.ISO8859-15/books/handbook/book.xml
index 5ac5e126b2..72efcac5f3 100644
--- a/it_IT.ISO8859-15/books/handbook/book.xml
+++ b/it_IT.ISO8859-15/books/handbook/book.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
"../../../share/xml/freebsd42.dtd" [
<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//IT" "../../share/xml/entities.ent">
diff --git a/it_IT.ISO8859-15/books/handbook/boot/chapter.xml b/it_IT.ISO8859-15/books/handbook/boot/chapter.xml
index 3da9ea9e16..4e0ad5bb75 100644
--- a/it_IT.ISO8859-15/books/handbook/boot/chapter.xml
+++ b/it_IT.ISO8859-15/books/handbook/boot/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
<!--
The FreeBSD Italian Documentation Project
diff --git a/it_IT.ISO8859-15/books/handbook/chapters.ent b/it_IT.ISO8859-15/books/handbook/chapters.ent
index 0267af8510..9ceb77664e 100644
--- a/it_IT.ISO8859-15/books/handbook/chapters.ent
+++ b/it_IT.ISO8859-15/books/handbook/chapters.ent
@@ -13,231 +13,61 @@
Original revision: 1.37
-->
-<!ENTITY % not.published "INCLUDE">
-
-<!ENTITY % chap.introduction "IGNORE">
-<!ENTITY % chap.install "IGNORE">
-<!ENTITY % chap.basics "IGNORE">
-<!ENTITY % chap.ports "IGNORE">
-<!ENTITY % chap.config "IGNORE">
-<!ENTITY % chap.boot "IGNORE">
-<!ENTITY % chap.users "IGNORE">
-<!ENTITY % chap.kernelconfig "IGNORE">
-<!ENTITY % chap.security "IGNORE">
-<!ENTITY % chap.jails "IGNORE">
-<!ENTITY % chap.printing "IGNORE">
-<!ENTITY % chap.disks "IGNORE">
-<!ENTITY % chap.geom "IGNORE">
-<!ENTITY % chap.vinum "IGNORE">
-<!ENTITY % chap.x11 "IGNORE">
-<!ENTITY % chap.l10n "IGNORE">
-<!ENTITY % chap.multimedia "IGNORE">
-<!ENTITY % chap.desktop "IGNORE">
-<!ENTITY % chap.serialcomms "IGNORE">
-<!ENTITY % chap.ppp-and-slip "IGNORE">
-<!ENTITY % chap.advanced-networking "IGNORE">
-<!ENTITY % chap.firewalls "IGNORE">
-<!ENTITY % chap.network-servers "IGNORE">
-<!ENTITY % chap.mail "IGNORE">
-<!ENTITY % chap.cutting-edge "IGNORE">
-<!ENTITY % chap.linuxemu "IGNORE">
-<!ENTITY % chap.mirrors "IGNORE">
-<!ENTITY % chap.mirrors.ftp.inc "INCLUDE">
-<!ENTITY % chap.mirrors.cvsup.inc "INCLUDE">
-<!ENTITY % chap.bibliography "IGNORE">
-<!ENTITY % chap.eresources "IGNORE">
-<!ENTITY % chap.eresources.www.inc "INCLUDE">
-<!ENTITY % chap.pgpkeys "IGNORE">
-<!ENTITY % chap.index "IGNORE">
-<!ENTITY % chap.freebsd-glossary "IGNORE">
-<!ENTITY % chap.mac "IGNORE">
-<!ENTITY % chap.audit "IGNORE">
-<!ENTITY % chap.filesystems "IGNORE">
-<!ENTITY % chap.dtrace "IGNORE">
-
<!ENTITY chap.preface SYSTEM "preface/preface.xml">
<!ENTITY % pgpkeys SYSTEM "../../../share/pgpkeys/pgpkeys.ent"> %pgpkeys;
<!-- Part One -->
-<![%chap.introduction;[
<!ENTITY chap.introduction SYSTEM "introduction/chapter.xml">
-]]>
-<![%chap.install;[
<!ENTITY chap.install SYSTEM "install/chapter.xml">
-]]>
-<![%chap.basics;[
<!ENTITY chap.basics SYSTEM "basics/chapter.xml">
-]]>
-<![%chap.ports;[
<!ENTITY chap.ports SYSTEM "ports/chapter.xml">
-]]>
-<![%chap.x11;[
<!ENTITY chap.x11 SYSTEM "x11/chapter.xml">
-]]>
<!-- Part Two -->
-<![%chap.desktop;[
<!ENTITY chap.desktop SYSTEM "desktop/chapter.xml">
-]]>
-<![%chap.multimedia;[
<!ENTITY chap.multimedia SYSTEM "multimedia/chapter.xml">
-]]>
-<![%chap.kernelconfig;[
<!ENTITY chap.kernelconfig SYSTEM "kernelconfig/chapter.xml">
-]]>
-<![%chap.printing;[
<!ENTITY chap.printing SYSTEM "printing/chapter.xml">
-]]>
-<![%chap.linuxemu;[
<!ENTITY chap.linuxemu SYSTEM "linuxemu/chapter.xml">
-]]>
<!-- Part Three -->
-<![%chap.config;[
<!ENTITY chap.config SYSTEM "config/chapter.xml">
-]]>
-<![%chap.boot;[
<!ENTITY chap.boot SYSTEM "boot/chapter.xml">
-]]>
-<![%chap.users;[
<!ENTITY chap.users SYSTEM "users/chapter.xml">
-]]>
-<![%chap.security;[
<!ENTITY chap.security SYSTEM "security/chapter.xml">
-]]>
-<![%chap.jails;[
<!ENTITY chap.jails SYSTEM "jails/chapter.xml">
-]]>
-<![%chap.mac;[
<!ENTITY chap.mac SYSTEM "mac/chapter.xml">
-]]>
-<![%chap.audit;[
<!ENTITY chap.audit SYSTEM "audit/chapter.xml">
-]]>
-<![%chap.disks;[
<!ENTITY chap.disks SYSTEM "disks/chapter.xml">
-]]>
-<![%chap.geom;[
<!ENTITY chap.geom SYSTEM "geom/chapter.xml">
-]]>
-<![%chap.filesystems;[
<!ENTITY chap.filesystems SYSTEM "filesystems/chapter.xml">
-]]>
-<![%chap.vinum;[
<!ENTITY chap.vinum SYSTEM "vinum/chapter.xml">
-]]>
-<![%chap.virtualization;[
<!ENTITY chap.virtualization SYSTEM "virtualization/chapter.xml">
-]]>
-<![%chap.l10n;[
<!ENTITY chap.l10n SYSTEM "l10n/chapter.xml">
-]]>
-<![%chap.cutting-edge;[
<!ENTITY chap.cutting-edge SYSTEM "cutting-edge/chapter.xml">
-]]>
-<![%chap.dtrace;[
<!ENTITY chap.dtrace SYSTEM "dtrace/chapter.xml">
-]]>
<!-- Part Four -->
-<![%chap.serialcomms;[
<!ENTITY chap.serialcomms SYSTEM "serialcomms/chapter.xml">
-]]>
-<![%chap.ppp-and-slip;[
<!ENTITY chap.ppp-and-slip SYSTEM "ppp-and-slip/chapter.xml">
-]]>
-<![%chap.mail;[
<!ENTITY chap.mail SYSTEM "mail/chapter.xml">
-]]>
-<![%chap.network-servers;[
<!ENTITY chap.network-servers SYSTEM "network-servers/chapter.xml">
-]]>
-<![%chap.firewalls;[
<!ENTITY chap.firewalls SYSTEM "firewalls/chapter.xml">
-]]>
-<![%chap.advanced-networking;[
<!ENTITY chap.advanced-networking SYSTEM "advanced-networking/chapter.xml">
-]]>
<!-- Part Five (appendices) -->
-<![%chap.mirrors;[
- <!ENTITY chap.mirrors SYSTEM "mirrors/chapter.xml">
-]]>
-<![%chap.mirrors.ftp.inc;[
- <!ENTITY chap.mirrors.ftp.inc SYSTEM "mirrors.xml.ftp.inc">
-]]>
-<![%chap.mirrors.cvsup.inc;[
- <!ENTITY chap.mirrors.cvsup.inc SYSTEM "mirrors.xml.cvsup.inc">
-]]>
-<![%chap.bibliography;[
+ <!ENTITY chap.mirrors SYSTEM "mirrors/chapter.xml">
+ <!ENTITY chap.mirrors.lastmod.inc SYSTEM "mirrors.lastmod.inc">
+ <!ENTITY chap.mirrors.ftp.index.inc SYSTEM "mirrors.xml.ftp.index.inc">
+ <!ENTITY chap.mirrors.ftp.inc SYSTEM "mirrors.xml.ftp.inc">
+ <!ENTITY chap.mirrors.cvsup.index.inc SYSTEM "mirrors.xml.cvsup.index.inc">
+ <!ENTITY chap.mirrors.cvsup.inc SYSTEM "mirrors.xml.cvsup.inc">
<!ENTITY chap.bibliography SYSTEM "bibliography/chapter.xml">
-]]>
-<![%chap.eresources;[
- <!ENTITY chap.eresources SYSTEM "eresources/chapter.xml">
-]]>
-<![%chap.eresources.www.inc;[
- <!ENTITY chap.eresources.www.inc SYSTEM "eresources.xml.www.inc">
-]]>
-<![%chap.pgpkeys;[
+ <!ENTITY chap.eresources SYSTEM "eresources/chapter.xml">
+ <!ENTITY chap.eresources.www.index.inc SYSTEM "eresources.xml.www.index.inc">
+ <!ENTITY chap.eresources.www.inc SYSTEM "eresources.xml.www.inc">
<!ENTITY chap.pgpkeys SYSTEM "pgpkeys/chapter.xml">
-]]>
-<![%chap.freebsd-glossary;[
<!ENTITY chap.freebsd-glossary "&freebsd-glossary;">
-]]>
-<![%chap.index;[
- <!ENTITY chap.index SYSTEM "index.xml">
-]]>
+ <!ENTITY chap.index "">
<!ENTITY chap.colophon SYSTEM "colophon.xml">
-
-<!-- IGNORE cases -->
-
-<!-- Part One -->
-<!ENTITY chap.introduction "">
-<!ENTITY chap.install "">
-<!ENTITY chap.basics "">
-<!ENTITY chap.ports "">
-<!ENTITY chap.x11 "">
-
-<!-- Part Two -->
-<!ENTITY chap.desktop "">
-<!ENTITY chap.multimedia "">
-<!ENTITY chap.kernelconfig "">
-<!ENTITY chap.printing "">
-<!ENTITY chap.linuxemu "">
-
-<!-- Part Three -->
-<!ENTITY chap.config "">
-<!ENTITY chap.boot "">
-<!ENTITY chap.users "">
-<!ENTITY chap.security "">
-<!ENTITY chap.jails "">
-<!ENTITY chap.mac "">
-<!ENTITY chap.audit "">
-<!ENTITY chap.disks "">
-<!ENTITY chap.geom "">
-<!ENTITY chap.filesystems "">
-<!ENTITY chap.vinum "">
-<!ENTITY chap.virtualization "">
-<!ENTITY chap.l10n "">
-<!ENTITY chap.cutting-edge "">
-<!ENTITY chap.dtrace "">
-
-<!-- Part Four -->
-<!ENTITY chap.serialcomms "">
-<!ENTITY chap.ppp-and-slip "">
-<!ENTITY chap.mail "">
-<!ENTITY chap.network-servers "">
-<!ENTITY chap.firewalls "">
-<!ENTITY chap.advanced-networking "">
-
-<!-- Part Five (appendices) -->
-<!ENTITY chap.mirrors "">
-<!ENTITY chap.mirrors.ftp.inc "">
-<!ENTITY chap.mirrors.cvsup.inc "">
-<!ENTITY chap.bibliography "">
-<!ENTITY chap.eresources "">
-<!ENTITY chap.eresources.www.inc "">
-<!ENTITY chap.pgpkeys "">
-<!ENTITY chap.freebsd-glossary "">
-<!ENTITY chap.index "">
diff --git a/it_IT.ISO8859-15/books/handbook/colophon.xml b/it_IT.ISO8859-15/books/handbook/colophon.xml
index 12584e1292..f2164d55cc 100644
--- a/it_IT.ISO8859-15/books/handbook/colophon.xml
+++ b/it_IT.ISO8859-15/books/handbook/colophon.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
<!--
The FreeBSD Italian Documentation Project
diff --git a/it_IT.ISO8859-15/books/handbook/config/chapter.xml b/it_IT.ISO8859-15/books/handbook/config/chapter.xml
index 301ee5cbf4..ed4c936181 100644
--- a/it_IT.ISO8859-15/books/handbook/config/chapter.xml
+++ b/it_IT.ISO8859-15/books/handbook/config/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
<!--
The FreeBSD Italian Documentation Project
@@ -412,7 +412,7 @@ stop)
kill -9 `cat /var/run/utility.pid`
;;
*)
- echo "Usage: `basename $0` {start|stop}" >&2
+ echo "Usage: `basename $0` {start|stop}" >&2
exit 64
;;
esac
@@ -876,7 +876,7 @@ sshd is running as pid 433.</screen>
&man.rc.8; e &man.rc.subr.8;. Se sei interessato
a scrivere un tuo script <filename>rc.d</filename> o
a migliorarne uno esisente, ti pu� essere utile
- <ulink url="&url.articles.rc-scripting">questo
+ <ulink url="&url.articles.rc-scripting;">questo
articolo</ulink>.</para>
</sect1>
diff --git a/it_IT.ISO8859-15/books/handbook/cutting-edge/chapter.xml b/it_IT.ISO8859-15/books/handbook/cutting-edge/chapter.xml
index cf65803818..1f4591d92d 100644
--- a/it_IT.ISO8859-15/books/handbook/cutting-edge/chapter.xml
+++ b/it_IT.ISO8859-15/books/handbook/cutting-edge/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
<!--
The FreeBSD Italian Documentation Project
diff --git a/it_IT.ISO8859-15/books/handbook/desktop/chapter.xml b/it_IT.ISO8859-15/books/handbook/desktop/chapter.xml
index 527a64779f..2ea19b4d15 100644
--- a/it_IT.ISO8859-15/books/handbook/desktop/chapter.xml
+++ b/it_IT.ISO8859-15/books/handbook/desktop/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
<!--
The FreeBSD Italian Documentation Project
diff --git a/it_IT.ISO8859-15/books/handbook/disks/chapter.xml b/it_IT.ISO8859-15/books/handbook/disks/chapter.xml
index d1ca1c8bfd..8ddc5083f2 100644
--- a/it_IT.ISO8859-15/books/handbook/disks/chapter.xml
+++ b/it_IT.ISO8859-15/books/handbook/disks/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
<!--
The FreeBSD Italian Documentation Project
diff --git a/it_IT.ISO8859-15/books/handbook/eresources/chapter.xml b/it_IT.ISO8859-15/books/handbook/eresources/chapter.xml
index 32bcf454c5..bc25ce5876 100644
--- a/it_IT.ISO8859-15/books/handbook/eresources/chapter.xml
+++ b/it_IT.ISO8859-15/books/handbook/eresources/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
<!--
The FreeBSD Italian Documentation Project
@@ -1900,6 +1900,10 @@
<sect1 id="eresources-web">
<title>Server World Wide Web</title>
+ &chap.eresources.www.index.inc;
+
+ &chap.mirrors.lastmod.inc;
+
&chap.eresources.www.inc;
</sect1>
diff --git a/it_IT.ISO8859-15/books/handbook/firewalls/chapter.xml b/it_IT.ISO8859-15/books/handbook/firewalls/chapter.xml
index 9a1175e512..22a53ccfbd 100644
--- a/it_IT.ISO8859-15/books/handbook/firewalls/chapter.xml
+++ b/it_IT.ISO8859-15/books/handbook/firewalls/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
<!--
The FreeBSD Italian Documentation Project
diff --git a/it_IT.ISO8859-15/books/handbook/geom/chapter.xml b/it_IT.ISO8859-15/books/handbook/geom/chapter.xml
index db18e85c1d..c01e0fb637 100644
--- a/it_IT.ISO8859-15/books/handbook/geom/chapter.xml
+++ b/it_IT.ISO8859-15/books/handbook/geom/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
<!--
The FreeBSD Documentation Project
$FreeBSD$
@@ -330,7 +330,7 @@ Done.</screen>
codice di boot. In caso contrario il fallimento �
garantito.</para>
- <screen>&prompt.root; <userinput>dump -L -0 -f- / |(cd /mnt && restore -r -v -f-)</userinput></screen>
+ <screen>&prompt.root; <userinput>dump -L -0 -f- / |(cd /mnt && restore -r -v -f-)</userinput></screen>
<para>Questo deve essere fatto per ciascun filesystem. Disponi
semplicemente il filesystem appropriato nella posizione corretta quando
diff --git a/it_IT.ISO8859-15/books/handbook/install/chapter.xml b/it_IT.ISO8859-15/books/handbook/install/chapter.xml
index 1b14263f69..fb6bddbab6 100644
--- a/it_IT.ISO8859-15/books/handbook/install/chapter.xml
+++ b/it_IT.ISO8859-15/books/handbook/install/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
<!--
The FreeBSD Italian Documentation Project
@@ -105,7 +105,7 @@
processo venga completato con successo, quindi potrai avere bisogno
di modificare la tua configurazione.</para>
- <para>Se hai già un altro sistema operativo installato, ad
+ <para>Se hai gi� un altro sistema operativo installato, ad
esempio &windows; o Linux, potrebbe essere una buona idea vedere come
� configurato l'hardware su quei sistemi operativi. Se non sei
sicuro della configurazione usata da una certa scheda di espansione,
@@ -683,7 +683,7 @@ pqb0.0.1.4.0 PQB0 PCI EIDE</screen>
<para>Su FreeBSD, <filename>/dev/fd0</filename> �
riferito al primo floppy disk (il dispositivo
<devicename>A:</devicename>). <filename>/dev/fd1</filename> sarebbe
- il dispositivo <devicename>B:</devicename>, e cosí via. Altre
+ il dispositivo <devicename>B:</devicename>, e cosi via. Altre
varianti &unix; potrebbero avere nomi differenti per i dispositivi
floppy disk, e se necessario consulta la documentazione del sistema
che stai usando.</para>
@@ -5159,7 +5159,7 @@ Please press any key to reboot.</screen>
necessario.</para>
<para>Usa l'immagine del disco uno se vuoi installare una release
- di &os e se vuoi anche un
+ di &os; e se vuoi anche un
modesto assortimento di package di terze parti.</para>
<para>Le altre immagini sono utili, ma non essenziali,
diff --git a/it_IT.ISO8859-15/books/handbook/introduction/chapter.xml b/it_IT.ISO8859-15/books/handbook/introduction/chapter.xml
index 14df612ca5..ec4ce89f21 100644
--- a/it_IT.ISO8859-15/books/handbook/introduction/chapter.xml
+++ b/it_IT.ISO8859-15/books/handbook/introduction/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
<!--
The FreeBSD Italian Documentation Project
@@ -732,7 +732,7 @@
<para>Quel codice nel nostro albero dei sorgenti che cade sotto
la GNU General Public Licence (GPL) o la GNU Lesser General Public
- License (LGPL) ha un po' più di vincoli, sebbene
+ License (LGPL) ha un po' pi� di vincoli, sebbene
almeno dal lato di rafforzare l'accesso piuttosto che l'opposto.
Date le complessit� aggiuntive che possono
risultare dall'uso commerciale di software GPL noi preferiamo,
@@ -932,7 +932,7 @@
&i486;, &pentium;, &pentium; Pro, &celeron;, &pentium; II,
&pentium; III, &pentium; 4 (o compatibili), &xeon;, DEC
<trademark>Alpha</trademark> e Sun &ultrasparc;.
- È basato principalmente su software del gruppo CSRG della
+ � basato principalmente su software del gruppo CSRG della
U.C. Berkeley, con alcuni miglioramenti presi da NetBSD, OpenBSD,
386BSD, e dalla Free Software Foundation.</para>
diff --git a/it_IT.ISO8859-15/books/handbook/jails/chapter.xml b/it_IT.ISO8859-15/books/handbook/jails/chapter.xml
index caca9ab330..4b3bb7fd23 100644
--- a/it_IT.ISO8859-15/books/handbook/jails/chapter.xml
+++ b/it_IT.ISO8859-15/books/handbook/jails/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
<!--
The FreeBSD Italian Documentation Project
diff --git a/it_IT.ISO8859-15/books/handbook/kernelconfig/chapter.xml b/it_IT.ISO8859-15/books/handbook/kernelconfig/chapter.xml
index ed2eb3a398..71d5a0e450 100644
--- a/it_IT.ISO8859-15/books/handbook/kernelconfig/chapter.xml
+++ b/it_IT.ISO8859-15/books/handbook/kernelconfig/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
<!--
The FreeBSD Documentation Project
@@ -434,7 +434,7 @@
<programlisting>machine i386</programlisting>
- <para>Questa è la architettura della macchina. Deve essere
+ <para>Questa � la architettura della macchina. Deve essere
una fra <literal>alpha</literal>, <literal>amd64</literal>,
<literal>i386</literal>, <literal>ia64</literal>,
<literal>pc98</literal>, <literal>powerpc</literal>, o
diff --git a/it_IT.ISO8859-15/books/handbook/l10n/chapter.xml b/it_IT.ISO8859-15/books/handbook/l10n/chapter.xml
index b425244c63..145fc004e4 100644
--- a/it_IT.ISO8859-15/books/handbook/l10n/chapter.xml
+++ b/it_IT.ISO8859-15/books/handbook/l10n/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
<!--
The FreeBSD Italian Documentation Project
diff --git a/it_IT.ISO8859-15/books/handbook/linuxemu/chapter.xml b/it_IT.ISO8859-15/books/handbook/linuxemu/chapter.xml
index b89fed7182..b7066c731a 100644
--- a/it_IT.ISO8859-15/books/handbook/linuxemu/chapter.xml
+++ b/it_IT.ISO8859-15/books/handbook/linuxemu/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
<!--
The FreeBSD Italian Documentation Project
@@ -662,14 +662,14 @@ LOG=/var/log/lmgrd.log
case "$1" in
start)
- lmgrd -c ${LICENSE_FILE} 2>> ${LOG} 1>&2
+ lmgrd -c ${LICENSE_FILE} 2>> ${LOG} 1>&2
echo -n " lmgrd"
;;
stop)
- llmgrd -c ${LICENSE_FILE} -x lmdown 2>> ${LOG} 1>&2
+ llmgrd -c ${LICENSE_FILE} -x lmdown 2>> ${LOG} 1>&2
;;
*)
- echo "Usage: `basename $0` {start|stop}" 1>&2
+ echo "Usage: `basename $0` {start|stop}" 1>&2
exit 64
;;
esac
@@ -964,7 +964,7 @@ exit 0</programlisting>
che segue:</para>
<programlisting>#!/usr/compat/linux/bin/sh
-(sleep 5; killall -1 matlab_helper) &
+(sleep 5; killall -1 matlab_helper) &
exit 0</programlisting>
</step>
@@ -3739,7 +3739,7 @@ options SHMMAXPGS=393216
<para>Se sei curioso di come funziona la compatibilit� con i binari
di Linux, questa � la sezione da leggere. Molto di ci�
- che segue � basato pesantemente su una email scritta a &a.chat
+ che segue � basato pesantemente su una email scritta a &a.chat;
da Terry Lambert <email>tlambert@primenet.com</email> (ID del messaggio:
<literal><199906020108.SAA07001@usr09.primenet.com></literal>).</para>
diff --git a/it_IT.ISO8859-15/books/handbook/mac/chapter.xml b/it_IT.ISO8859-15/books/handbook/mac/chapter.xml
index 6cb97ff857..1e0bc0d344 100644
--- a/it_IT.ISO8859-15/books/handbook/mac/chapter.xml
+++ b/it_IT.ISO8859-15/books/handbook/mac/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
<!--
The FreeBSD Italian Documentation Project
diff --git a/it_IT.ISO8859-15/books/handbook/mail/chapter.xml b/it_IT.ISO8859-15/books/handbook/mail/chapter.xml
index 795d4fc7dc..413aa662fd 100644
--- a/it_IT.ISO8859-15/books/handbook/mail/chapter.xml
+++ b/it_IT.ISO8859-15/books/handbook/mail/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
<!--
The FreeBSD Italian Documentation Project
@@ -1040,7 +1040,7 @@ in /etc/mail/sendmail.cf.</programlisting>
<para>L'altro � trovare un server Internet a tempo pieno
che fornisca un servizio MX secondario per il tuo dominio.
- Per esempio, se il dominio della tua societ� è
+ Per esempio, se il dominio della tua societ� �
<hostid role="domainname">example.com</hostid> e il tuo fornitore
di servizi Internet ha attivato <hostid
role="domainname">example.net</hostid> per fornire il servizio
@@ -1756,11 +1756,11 @@ SENDMAIL_LDADD=-lsasl2</programlisting>
seguenti comandi:</para>
<screen>&prompt.root; <userinput>cd /usr/src/lib/libsmutil</userinput>
-&prompt.root; <userinput>make cleandir && make obj && make</userinput>
+&prompt.root; <userinput>make cleandir && make obj && make</userinput>
&prompt.root; <userinput>cd /usr/src/lib/libsm</userinput>
-&prompt.root; <userinput>make cleandir && make obj && make</userinput>
+&prompt.root; <userinput>make cleandir && make obj && make</userinput>
&prompt.root; <userinput>cd /usr/src/usr.sbin/sendmail</userinput>
-&prompt.root; <userinput>make cleandir && make obj && make && make install</userinput></screen>
+&prompt.root; <userinput>make cleandir && make obj && make && make install</userinput></screen>
<para>Se <filename>/usr/src</filename> non ha subito enormi cambiamenti
e se le librerie condivise di cui si ha bisogno sono disponibili, la
diff --git a/it_IT.ISO8859-15/books/handbook/mirrors/chapter.xml b/it_IT.ISO8859-15/books/handbook/mirrors/chapter.xml
index 68d8fd6d78..4ce9c0f6bf 100644
--- a/it_IT.ISO8859-15/books/handbook/mirrors/chapter.xml
+++ b/it_IT.ISO8859-15/books/handbook/mirrors/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
<!--
The FreeBSD Italian Documentation Project
@@ -289,6 +289,10 @@
I metodi di accesso disponibili per ogni sito sono elencati fra parentesi
dopo il nome dell'host.</para>
+ &chap.mirrors.ftp.index.inc;
+
+ &chap.mirrors.lastmod.inc;
+
&chap.mirrors.ftp.inc;
</sect1>
@@ -312,7 +316,7 @@
progetto FreeBSD. Per utilizzarlo � sufficiente impostare la
variabile di ambiente <envar>CVSROOT</envar> facendola puntare al server
anoncvs appropriato, immettere la password <quote>anoncvs</quote> con il
- comando <command>cvs login</command>, e poi usare il comando &man.cvs.1
+ comando <command>cvs login</command>, e poi usare il comando &man.cvs.1;
per accederci come se fosse un deposito locale.</para>
<note>
@@ -676,7 +680,7 @@ Warning: Permanently added 'anoncvs.freebsd.org' (DSA) to the list of known host
toccher� il tuo albero. Per verificare una delta puoi usare
l'opzione <option>-c</option> e di fatto <application>CTM</application>
non toccher� il tuo albero; verificher� soltanto
- l'integrità della delta e se questa pu� essere applicata
+ l'integrit� della delta e se questa pu� essere applicata
in modo pulito al tuo albero attuale.</para>
<para>Ci sono altre opzioni di <application>CTM</application>, guarda
@@ -2281,6 +2285,10 @@ doc/zh_*</screen>
<para>I server <link linkend="cvsup">CVSup</link> per FreeBSD si trovano
ai seguenti siti:</para>
+ &chap.mirrors.cvsup.index.inc;
+
+ &chap.mirrors.lastmod.inc;
+
&chap.mirrors.cvsup.inc;
</sect2>
</sect1>
diff --git a/it_IT.ISO8859-15/books/handbook/multimedia/chapter.xml b/it_IT.ISO8859-15/books/handbook/multimedia/chapter.xml
index c000807d38..30c439f4d0 100644
--- a/it_IT.ISO8859-15/books/handbook/multimedia/chapter.xml
+++ b/it_IT.ISO8859-15/books/handbook/multimedia/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
<!--
The FreeBSD Italian Documentation Project
diff --git a/it_IT.ISO8859-15/books/handbook/network-servers/chapter.xml b/it_IT.ISO8859-15/books/handbook/network-servers/chapter.xml
index 9853790ca7..6086fb74c9 100644
--- a/it_IT.ISO8859-15/books/handbook/network-servers/chapter.xml
+++ b/it_IT.ISO8859-15/books/handbook/network-servers/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
<!--
The FreeBSD Italian Documentation Project
@@ -2949,7 +2949,7 @@ domain</replaceable>,<replaceable>server</replaceable>"</programlisting>
disponibile nel port <filename
role="package">net/isc-dhcp3-server</filename>. Le
pagine di manuale &man.dhclient.8;, &man.dhcp-options.5;, e
- &man.dhclient.conf.5, oltre ai riferimenti
+ &man.dhclient.conf.5;, oltre ai riferimenti
elencati oltre, sono risorse utili.</para>
</sect2>
@@ -4054,7 +4054,7 @@ www IN CNAME @</programlisting>
<literal>www</literal> si trasformerebbe in
<hostid>www.example.org</hostid>.</para>
- <para>Il formato di un file di zona è
+ <para>Il formato di un file di zona �
il seguente:</para>
<programlisting>recordname IN recordtype
diff --git a/it_IT.ISO8859-15/books/handbook/pgpkeys/chapter.xml b/it_IT.ISO8859-15/books/handbook/pgpkeys/chapter.xml
index 892d47e998..019a186673 100644
--- a/it_IT.ISO8859-15/books/handbook/pgpkeys/chapter.xml
+++ b/it_IT.ISO8859-15/books/handbook/pgpkeys/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
<!--
The FreeBSD Italian Documentation Project
@@ -20,7 +20,7 @@
<sect1 id="pgpkeys-officers">
<title>Cariche Ufficiali</title>
- §ion.pgpkeys-officers
+ §ion.pgpkeys-officers;
</sect1>
<sect1 id="pgpkeys-core">
diff --git a/it_IT.ISO8859-15/books/handbook/ports/chapter.xml b/it_IT.ISO8859-15/books/handbook/ports/chapter.xml
index d27179da5e..3380d29503 100644
--- a/it_IT.ISO8859-15/books/handbook/ports/chapter.xml
+++ b/it_IT.ISO8859-15/books/handbook/ports/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
<!--
The FreeBSD Italian Documentation Project
@@ -1250,7 +1250,7 @@ ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/distfiles/ fetch</userinput></screen>
<para>Di solito dopo aver installato una nuova applicazione dovresti
leggere la documentazione che potrebbe essere stata inclusa, modificare
qualche file di configurazione, assicurarti che l'applicazione parta nella
- fase di avvio (se � un demone), e così via;.</para>
+ fase di avvio (se � un demone), e cos� via;.</para>
<para>I passi precisi che devi seguire per configurare un'applicazione
sono ovviamente diversi da applicazione a applicazione. Comunque, se hai
diff --git a/it_IT.ISO8859-15/books/handbook/ppp-and-slip/chapter.xml b/it_IT.ISO8859-15/books/handbook/ppp-and-slip/chapter.xml
index 3aa926563a..a1c5b38e0c 100644
--- a/it_IT.ISO8859-15/books/handbook/ppp-and-slip/chapter.xml
+++ b/it_IT.ISO8859-15/books/handbook/ppp-and-slip/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
<!--
The FreeBSD Italian Documentation Project
diff --git a/it_IT.ISO8859-15/books/handbook/preface/preface.xml b/it_IT.ISO8859-15/books/handbook/preface/preface.xml
index 75f61ad0d2..a23929126e 100644
--- a/it_IT.ISO8859-15/books/handbook/preface/preface.xml
+++ b/it_IT.ISO8859-15/books/handbook/preface/preface.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
<!--
The FreeBSD Italian Documentation Project
diff --git a/it_IT.ISO8859-15/books/handbook/printing/chapter.xml b/it_IT.ISO8859-15/books/handbook/printing/chapter.xml
index bcb9a63616..b892a989c2 100644
--- a/it_IT.ISO8859-15/books/handbook/printing/chapter.xml
+++ b/it_IT.ISO8859-15/books/handbook/printing/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
<!--
The FreeBSD Italian Documentation Project
diff --git a/it_IT.ISO8859-15/books/handbook/security/chapter.xml b/it_IT.ISO8859-15/books/handbook/security/chapter.xml
index 6d983c6e33..379ee0644e 100644
--- a/it_IT.ISO8859-15/books/handbook/security/chapter.xml
+++ b/it_IT.ISO8859-15/books/handbook/security/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
<!--
The FreeBSD Italian Documentation Project
diff --git a/it_IT.ISO8859-15/books/handbook/serialcomms/chapter.xml b/it_IT.ISO8859-15/books/handbook/serialcomms/chapter.xml
index d879ce1aae..c26f7aeddc 100644
--- a/it_IT.ISO8859-15/books/handbook/serialcomms/chapter.xml
+++ b/it_IT.ISO8859-15/books/handbook/serialcomms/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
<!--
The FreeBSD Italian Documentation Project
diff --git a/it_IT.ISO8859-15/books/handbook/users/chapter.xml b/it_IT.ISO8859-15/books/handbook/users/chapter.xml
index 2885dfab92..5f6d67652a 100644
--- a/it_IT.ISO8859-15/books/handbook/users/chapter.xml
+++ b/it_IT.ISO8859-15/books/handbook/users/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
<!--
The FreeBSD Italian Documentation Project
diff --git a/it_IT.ISO8859-15/books/handbook/vinum/chapter.xml b/it_IT.ISO8859-15/books/handbook/vinum/chapter.xml
index 426a61e26a..333e299d01 100644
--- a/it_IT.ISO8859-15/books/handbook/vinum/chapter.xml
+++ b/it_IT.ISO8859-15/books/handbook/vinum/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
<!--
The FreeBSD Italian Documentation Project
diff --git a/it_IT.ISO8859-15/books/handbook/virtualization/chapter.xml b/it_IT.ISO8859-15/books/handbook/virtualization/chapter.xml
index b584655cdb..c42e8fef36 100644
--- a/it_IT.ISO8859-15/books/handbook/virtualization/chapter.xml
+++ b/it_IT.ISO8859-15/books/handbook/virtualization/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
<!--
The FreeBSD Italian Documentation Project
diff --git a/it_IT.ISO8859-15/books/handbook/x11/chapter.xml b/it_IT.ISO8859-15/books/handbook/x11/chapter.xml
index 6f8fee3c4d..e65ad7dab0 100644
--- a/it_IT.ISO8859-15/books/handbook/x11/chapter.xml
+++ b/it_IT.ISO8859-15/books/handbook/x11/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
<!--
The FreeBSD Italian Documentation Project
@@ -337,7 +337,7 @@
l'implementazione
dell'X server dell'X Window System rilasciato dalla Fondazione X.Org.
<application>&xorg;</application> � basato sul codice di
- <application>&xfree86 4.4RC2</application> e X11R6.6.
+ <application>&xfree86; 4.4RC2</application> e X11R6.6.
La versione di <application>&xorg;</application> disponibile al momento
nella Collezione dei Ports � &xorg.version;.</para>
diff --git a/it_IT.ISO8859-15/books/unix-introduction/bibliography/chapter.xml b/it_IT.ISO8859-15/books/unix-introduction/bibliography/chapter.xml
index 4cd3a6bee9..53c457123d 100644
--- a/it_IT.ISO8859-15/books/unix-introduction/bibliography/chapter.xml
+++ b/it_IT.ISO8859-15/books/unix-introduction/bibliography/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
<!--
The FreeBSD Italian Documentation Project
diff --git a/it_IT.ISO8859-15/books/unix-introduction/book.xml b/it_IT.ISO8859-15/books/unix-introduction/book.xml
index 644f307a4c..a863e2b6ec 100644
--- a/it_IT.ISO8859-15/books/unix-introduction/book.xml
+++ b/it_IT.ISO8859-15/books/unix-introduction/book.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
"../../../share/xml/freebsd42.dtd" [
<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//IT" "../../share/xml/entities.ent">
diff --git a/it_IT.ISO8859-15/books/unix-introduction/command-summary/chapter.xml b/it_IT.ISO8859-15/books/unix-introduction/command-summary/chapter.xml
index cb86713741..bfa23cb4d5 100644
--- a/it_IT.ISO8859-15/books/unix-introduction/command-summary/chapter.xml
+++ b/it_IT.ISO8859-15/books/unix-introduction/command-summary/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
<!--
The FreeBSD Italian Documentation Project
diff --git a/it_IT.ISO8859-15/books/unix-introduction/commands/chapter.xml b/it_IT.ISO8859-15/books/unix-introduction/commands/chapter.xml
index 198dd8f603..c0e86cc887 100644
--- a/it_IT.ISO8859-15/books/unix-introduction/commands/chapter.xml
+++ b/it_IT.ISO8859-15/books/unix-introduction/commands/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
<!--
The FreeBSD Italian Documentation Project
@@ -278,13 +278,13 @@ mon.logins tues.logins differ: char 9, line 2</screen>
<screen>&prompt.user; <userinput>diff mon.logins tues.logins</userinput>
2d1
-< bsmith
+< bsmith
4a4
-> jdoe
+> jdoe
7c7
-< mschmidt
+< mschmidt
---
-> proy</screen>
+> proy</screen>
<para>Notare che l'output mostra sia l'elenco delle differenze sia in
quale file queste esistono. Le linee del primo file sono precedute da
@@ -1542,7 +1542,7 @@ source.tar.Z: Blocchi di dati compressi 16 bit</screen>
<para><emphasis>Esempi:</emphasis></para>
<para>L'esempio seguente usa come file di input una lista di libri di
- P. G. Wodehouse Jeeves & Wooster.</para>
+ P. G. Wodehouse Jeeves & Wooster.</para>
<programlisting>The Inimitable Jeeves [1923] The Mating Season [1949]
Carry On, Jeeves [1925] Ring for Jeeves [1953]
@@ -2207,22 +2207,22 @@ beauty:01/31/94:#total logins,2175:#different UIDs,1194</screen>
<programlisting>begin 555 binary_filename
-M?T5,1@$" 0 " ( ! %"W #0 5"< T "
+M?T5,1@$" 0 " ( ! %"W #0 5"< T "
M!0 H !4 % 8 T $ - "@ H 4 P
M -0 !$ ! ! ! %"
-M%P !0A< % $ $ 4(8 -"& W& W% < 0
+M%P !0A< % $ $ 4(8 -"& W& W% < 0
M @ !0B T(@ )@ !P O=7-R+VQI8B]L9"YS
-M;RXQ ?< 'Y VP "O !VP )8 &6 !G0
-M %[ U0 %G !3 ;< #Q %Q !
+M;RXQ ?< 'Y VP "O !VP )8 &6 !G0
+M %[ U0 %G !3 ;< #Q %Q !
MEP :P !_ '@ !PP (P
-M N0 =H _0 $D Y < #F /L
-M01 $' $ & ! P #0A@ 4(8
+M N0 =H _0 $D Y < #F /L
+M01 $' $ & ! P #0A@ 4(8
M" ! 0 !E !@ , T(@ %"( )@ $
M 0 ( ;@ $ ' -"N !0K@ /H
M $ # ', ! P #1J 4:@ #8 !
M !Y 0 , TH %* !=X 0
M@ @ # -/X !3^ "E, $ (4 !
-M 4_> )0 0 ". P
+M 4_> )0 0 ". P
; %0 P )@ $
end</programlisting>
@@ -2885,7 +2885,7 @@ DeBula, e Linda Condron, mentre insegnavano ad usare una nuova versione
di Unix workshop sviluppata per l'UTS.
Sperando di aver insegnato qualcosa.
-Frank, Linda, & Linda</screen>
+Frank, Linda, & Linda</screen>
<screen>brigadier: condron [77]> <userinput>finger</userinput>
Login Name TTY Idle When Where
@@ -2956,7 +2956,7 @@ frank Frank G. Fiamingo p1 Mon 16:19 nyssa</screen>
<replaceable>username</replaceable></option></entry>
<entry>si connette all' host remoto con il nome utente specificato
- (&man.rlogin.1; & &man.rsh.1;)</entry>
+ (&man.rlogin.1; & &man.rsh.1;)</entry>
</row>
</tbody>
</tgroup>
diff --git a/it_IT.ISO8859-15/books/unix-introduction/editors/chapter.xml b/it_IT.ISO8859-15/books/unix-introduction/editors/chapter.xml
index e33d4eb84c..ed00d8df12 100644
--- a/it_IT.ISO8859-15/books/unix-introduction/editors/chapter.xml
+++ b/it_IT.ISO8859-15/books/unix-introduction/editors/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
<!--
The FreeBSD Italian Documentation Project
diff --git a/it_IT.ISO8859-15/books/unix-introduction/getting-started/chapter.xml b/it_IT.ISO8859-15/books/unix-introduction/getting-started/chapter.xml
index b5c3a6f7c1..a39c012fc3 100644
--- a/it_IT.ISO8859-15/books/unix-introduction/getting-started/chapter.xml
+++ b/it_IT.ISO8859-15/books/unix-introduction/getting-started/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
<!--
The FreeBSD Italian Documentation Project
diff --git a/it_IT.ISO8859-15/books/unix-introduction/glossary/chapter.xml b/it_IT.ISO8859-15/books/unix-introduction/glossary/chapter.xml
index 62002d43f9..9e2df2e6d4 100644
--- a/it_IT.ISO8859-15/books/unix-introduction/glossary/chapter.xml
+++ b/it_IT.ISO8859-15/books/unix-introduction/glossary/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
<!--
The FreeBSD Italian Documentation Project
diff --git a/it_IT.ISO8859-15/books/unix-introduction/history/chapter.xml b/it_IT.ISO8859-15/books/unix-introduction/history/chapter.xml
index b618f2410c..935ad0f810 100644
--- a/it_IT.ISO8859-15/books/unix-introduction/history/chapter.xml
+++ b/it_IT.ISO8859-15/books/unix-introduction/history/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
<!--
The FreeBSD Italian Documentation Project
diff --git a/it_IT.ISO8859-15/books/unix-introduction/preface/chapter.xml b/it_IT.ISO8859-15/books/unix-introduction/preface/chapter.xml
index af7f8cdf9e..bec6644d87 100644
--- a/it_IT.ISO8859-15/books/unix-introduction/preface/chapter.xml
+++ b/it_IT.ISO8859-15/books/unix-introduction/preface/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
<!--
The FreeBSD Italian Documentation Project
diff --git a/it_IT.ISO8859-15/books/unix-introduction/shell-programming/chapter.xml b/it_IT.ISO8859-15/books/unix-introduction/shell-programming/chapter.xml
index bcfa02ae7e..b00d3a97df 100644
--- a/it_IT.ISO8859-15/books/unix-introduction/shell-programming/chapter.xml
+++ b/it_IT.ISO8859-15/books/unix-introduction/shell-programming/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
<!--
The FreeBSD Italian Documentation Project
@@ -550,9 +550,9 @@ $#argv: 5</screen>
<programlisting>#!/bin/sh
param0=$0
-test -n "$1" && param1=$1
-test -n "$2" && param2=$2
-test -n "$3" && param3=$3
+test -n "$1" && param1=$1
+test -n "$2" && param2=$2
+test -n "$3" && param3=$3
echo 0: $param0
echo "1: ${param1-1}: \c" ;echo $param1
echo "2: ${param2=2}: \c" ;echo $param2
@@ -680,7 +680,7 @@ param=hello frank</screen>
<para>&man.csh.1; usa il simbolo <literal>$<</literal> per leggere una
linea da &man.stdin.4;, esempio:</para>
- <para><command>set param = $<</command></para>
+ <para><command>set param = $<</command></para>
<para>Gli spazi bianchi intorno al segno di uguale sono importanti.
Il seguente script illustra come usarlo:</para>
@@ -744,7 +744,7 @@ Rewind="$Mt -f $device rewind"
Offline="$Mt -f $device rewoffl"
# Failure - exit
failure () {
- $Mail -s "Backup fallito - $HOST" $admin << EOF_failure
+ $Mail -s "Backup fallito - $HOST" $admin << EOF_failure
$HOST
Script cron backup fallito. A quanto pare non c'� il nastro nel dispositivo.
EOF_failure
@@ -752,7 +752,7 @@ failure () {
}
# Dump failure - exit
dumpfail () {
- $Mail -s "Backup fallito - $HOST" $admin << EOF_dumpfail
+ $Mail -s "Backup fallito - $HOST" $admin << EOF_dumpfail
$HOST
Script cron backup fallito. A quanto pare non c'� il nastro nel dispositivo.
EOF_dumpfail
@@ -760,7 +760,7 @@ dumpfail () {
}
# Success
success () {
- $Mail -s "Backup completato con successo - $HOST" $admin << EOF_success
+ $Mail -s "Backup completato con successo - $HOST" $admin << EOF_success
$HOST
Script cron backup apparentemente riuscito. Il file /etc/dumpdates �:
`/bin/cat /etc/dumpdates`
@@ -772,7 +772,7 @@ $Dump 0uf $device / || dumpfail
$Dump 0uf $device /usr || dumpfail
$Dump 0uf $device /home || dumpfail
$Dump 0uf $device /var || dumpfail
-($Dump 0uf $device /var/spool/mail || dumpfail) && success
+($Dump 0uf $device /var/spool/mail || dumpfail) && success
$Offline</programlisting>
<para>Questo script illustra alcuni argomenti che sono stati trattati in
@@ -790,7 +790,7 @@ $Offline</programlisting>
la forma <emphasis>here document</emphasis> per realizzare il contenuto
della funzione stessa. Si introducono ora gli operatori logici
<emphasis>OR</emphasis> (<emphasis>||</emphasis>) e
- <emphasis>AND</emphasis> (<emphasis>&&</emphasis>); ciascuno �
+ <emphasis>AND</emphasis> (<emphasis>&&</emphasis>); ciascuno �
posizionato tra una coppia di comandi. Per l'operatore
<emphasis>OR</emphasis>, il secondo comando viene eseguito solamente se
il primo comando non � stato completato con successo. Per
@@ -808,7 +808,7 @@ $Offline</programlisting>
(<literal>|| dumpfail</literal>). Se questa operazione non viene eseguita
completamente con successo si esegue la procedura
<command>dumpfail</command> e si esce. Se l'ultimo backup ha successo si
- procede con la funzione <command>success</command> (<literal>(...) &&
+ procede con la funzione <command>success</command> (<literal>(...) &&
success</literal>). In fine si riavvolge il nastro e lo si manda fuori
linea affinch� altri utenti non possano accidentalmente scriverci
sopra.</para>
diff --git a/it_IT.ISO8859-15/books/unix-introduction/shells/chapter.xml b/it_IT.ISO8859-15/books/unix-introduction/shells/chapter.xml
index 2c24348841..8ed4cca78f 100644
--- a/it_IT.ISO8859-15/books/unix-introduction/shells/chapter.xml
+++ b/it_IT.ISO8859-15/books/unix-introduction/shells/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
<!--
The FreeBSD Italian Documentation Project
diff --git a/it_IT.ISO8859-15/books/unix-introduction/special-features/chapter.xml b/it_IT.ISO8859-15/books/unix-introduction/special-features/chapter.xml
index d5f6144716..674a3649c4 100644
--- a/it_IT.ISO8859-15/books/unix-introduction/special-features/chapter.xml
+++ b/it_IT.ISO8859-15/books/unix-introduction/special-features/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
<!--
The FreeBSD Italian Documentation Project
@@ -247,7 +247,7 @@
si deve prima redirigere &man.stdout.4; in una sotto-shell,
cos�:</para>
- <screen>&prompt.user; <userinput>(<replaceable>comando</replaceable> > <replaceable>out_file</replaceable>) >& <replaceable>err_file</replaceable></userinput></screen>
+ <screen>&prompt.user; <userinput>(<replaceable>comando</replaceable> > <replaceable>out_file</replaceable>) >& <replaceable>err_file</replaceable></userinput></screen>
</sect2>
<sect2 id="special-features-file-redir-sh">
@@ -330,14 +330,14 @@
supporto, 3. Si redirige prima 3 su 2, quindi 2 su 1 e in fine si
redirige 1 su 3.</para>
- <screen>$ <userinput>(<replaceable>comando</replaceable> 3>&2 2>&1 1>&3) > <replaceable>file</replaceable></userinput></screen>
+ <screen>$ <userinput>(<replaceable>comando</replaceable> 3>&2 2>&1 1>&3) > <replaceable>file</replaceable></userinput></screen>
<para>Questo manda &man.stderr.4; in 1 e &man.stdout.4; in 3 che �
rediretto su 2. In questo modo, in effetti, si ribaltano i normali
significati dei descrittori di file 1 e 2. Si pu� sperimentare
tutto questo con l'esempio seguente:</para>
- <screen>$ <userinput>(cat <replaceable>file</replaceable> 3>&2 2>&1 1>&3) > <replaceable>errfile</replaceable></userinput></screen>
+ <screen>$ <userinput>(cat <replaceable>file</replaceable> 3>&2 2>&1 1>&3) > <replaceable>errfile</replaceable></userinput></screen>
<para>Quindi se <filename><replaceable>file</replaceable></filename>
� letto, l'informazione � scartata dall'output del
@@ -413,7 +413,7 @@
<entry>esegue il comando seguente (a questo simbolo) solamente se il
comando precedente (a questo simbolo) � stato completato
con successo, esempio:
- <command>grep <replaceable>stringa file</replaceable> && cat
+ <command>grep <replaceable>stringa file</replaceable> && cat
<replaceable>file</replaceable></command></entry>
</row>
diff --git a/it_IT.ISO8859-15/books/unix-introduction/structure/chapter.xml b/it_IT.ISO8859-15/books/unix-introduction/structure/chapter.xml
index 69db41145d..9815125d3d 100644
--- a/it_IT.ISO8859-15/books/unix-introduction/structure/chapter.xml
+++ b/it_IT.ISO8859-15/books/unix-introduction/structure/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
<!--
The FreeBSD Italian Documentation Project
@@ -17,7 +17,7 @@
interagisce direttamente con l'hardware e fornisce i servizi ai programmi
utente. I programmi utente non necessitano di conoscere informazioni
sull'hardware. Devono solo sapere come interagire con il kernel ed
- � quest'ultimo a fornire i servizi richiesti. Uno dei più
+ � quest'ultimo a fornire i servizi richiesti. Uno dei pi�
grandi fattori che ha contribuito alla richiesta di Unix da parte dei
programmatori � stato che molti programmi utente corretti
sono indipendenti dall'hardware sottostante, e ci� li rende
diff --git a/it_IT.ISO8859-15/books/unix-introduction/system-resource/chapter.xml b/it_IT.ISO8859-15/books/unix-introduction/system-resource/chapter.xml
index eb837ed39a..9613715563 100644
--- a/it_IT.ISO8859-15/books/unix-introduction/system-resource/chapter.xml
+++ b/it_IT.ISO8859-15/books/unix-introduction/system-resource/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
<!--
The FreeBSD Italian Documentation Project
@@ -353,7 +353,7 @@ peri:/acs/peri/2
</informaltable>
<note>
- <para>Poich� il comando &man.ps.1 � molto dipendente dal
+ <para>Poich� il comando &man.ps.1; � molto dipendente dal
sistema, si raccomanda di consultare le <emphasis>pagine
man</emphasis> del proprio sistema per i dettagli delle opzioni e per
l'interpretazione dell'output di &man.ps.1;.</para>
@@ -784,7 +784,7 @@ Mon 06/10/96</screen>
</table>
<para>I comandi di stampa permettono di stampare file sullo standard output
- (&man.pr.1;) o attraverso una stampante (&man.lp.1; e &man.lpr.1) fino a
+ (&man.pr.1;) o attraverso una stampante (&man.lp.1; e &man.lpr.1;) fino a
filtrare l'output. I comandi di stampa di <emphasis>BSD</emphasis> e
<emphasis>SysV</emphasis> usano diversi nomi e diverse opzioni per
produrre lo stesso risultato: &man.lpr.1;, &man.lprm.1; e &man.lpq.1;
diff --git a/it_IT.ISO8859-15/books/unix-introduction/text-processing/chapter.xml b/it_IT.ISO8859-15/books/unix-introduction/text-processing/chapter.xml
index e1dc50360a..477714c80c 100644
--- a/it_IT.ISO8859-15/books/unix-introduction/text-processing/chapter.xml
+++ b/it_IT.ISO8859-15/books/unix-introduction/text-processing/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
<!--
The FreeBSD Italian Documentation Project
From 19323c585bec02a1a73590828e8016b6f2d4b3a4 Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Mon, 21 Jan 2013 17:40:23 +0000
Subject: [PATCH 014/121] - Make the Japanese documentation valid XML
---
ja_JP.eucJP/books/design-44bsd/book.xml | 6 +-
ja_JP.eucJP/books/faq/book.xml | 14 +-
.../books/fdp-primer/overview/chapter.xml | 2 +-
.../books/fdp-primer/psgml-mode/chapter.xml | 2 +-
.../books/fdp-primer/see-also/chapter.xml | 2 +-
.../books/fdp-primer/structure/chapter.xml | 2 +-
.../books/fdp-primer/stylesheets/chapter.xml | 2 +-
.../books/fdp-primer/the-website/chapter.xml | 2 +-
.../books/fdp-primer/tools/chapter.xml | 2 +-
.../books/fdp-primer/translations/chapter.xml | 2 +-
.../fdp-primer/writing-style/chapter.xml | 2 +-
ja_JP.eucJP/books/handbook/Makefile | 54 +++--
.../handbook/advanced-networking/chapter.xml | 2 +-
ja_JP.eucJP/books/handbook/basics/chapter.xml | 2 +-
.../books/handbook/bibliography/chapter.xml | 2 +-
ja_JP.eucJP/books/handbook/book.xml | 5 +-
ja_JP.eucJP/books/handbook/boot/chapter.xml | 2 +-
.../books/handbook/bsdinstall/chapter.xml | 6 +-
ja_JP.eucJP/books/handbook/chapters.ent | 195 +-----------------
ja_JP.eucJP/books/handbook/colophon.xml | 2 +-
ja_JP.eucJP/books/handbook/config/chapter.xml | 4 +-
.../books/handbook/cutting-edge/chapter.xml | 77 +------
.../books/handbook/desktop/chapter.xml | 4 +-
ja_JP.eucJP/books/handbook/disks/chapter.xml | 19 +-
.../books/handbook/eresources/chapter.xml | 6 +-
.../books/handbook/install/chapter.xml | 10 +-
.../books/handbook/introduction/chapter.xml | 2 +-
.../books/handbook/jcontrib/chapter.xml | 2 +-
.../books/handbook/kernelconfig/chapter.xml | 6 +-
ja_JP.eucJP/books/handbook/l10n/chapter.xml | 2 +-
.../books/handbook/linuxemu/chapter.xml | 4 +-
ja_JP.eucJP/books/handbook/mail/chapter.xml | 4 +-
.../books/handbook/mirrors/chapter.xml | 10 +-
.../books/handbook/multimedia/chapter.xml | 6 +-
.../books/handbook/pgpkeys/chapter.xml | 2 +-
ja_JP.eucJP/books/handbook/ports/chapter.xml | 6 +-
.../books/handbook/ppp-and-slip/chapter.xml | 8 +-
.../books/handbook/preface/preface.xml | 2 +-
.../books/handbook/printing/chapter.xml | 2 +-
.../books/handbook/security/chapter.xml | 14 +-
.../books/handbook/serialcomms/chapter.xml | 2 +-
ja_JP.eucJP/books/handbook/users/chapter.xml | 2 +-
ja_JP.eucJP/books/handbook/x11/chapter.xml | 6 +-
ja_JP.eucJP/books/porters-handbook/book.xml | 12 +-
ja_JP.eucJP/share/xml/mirrors-local.xsl | 1 -
45 files changed, 144 insertions(+), 377 deletions(-)
diff --git a/ja_JP.eucJP/books/design-44bsd/book.xml b/ja_JP.eucJP/books/design-44bsd/book.xml
index f8036854de..61045b3035 100644
--- a/ja_JP.eucJP/books/design-44bsd/book.xml
+++ b/ja_JP.eucJP/books/design-44bsd/book.xml
@@ -2242,7 +2242,7 @@
</biblioentry>
<biblioentry id="biblio-kernighan">
- <abbrev>Kernighan & Pike, 1984</abbrev>
+ <abbrev>Kernighan & Pike, 1984</abbrev>
<title>The UNIX Programming Environment</title>
@@ -2299,7 +2299,7 @@
</biblioentry>
<biblioentry id="biblio-mckusick-2">
- <abbrev>McKusick & Karels, 1988</abbrev>
+ <abbrev>McKusick & Karels, 1988</abbrev>
<biblioset relation="article">
<title>Design of a General Purpose Memory Allocator for the 4.3BSD
@@ -2393,7 +2393,7 @@
</biblioentry>
<biblioentry id="biblio-rosenblum">
- <abbrev>Rosenblum & Ousterhout, 1992</abbrev>
+ <abbrev>Rosenblum & Ousterhout, 1992</abbrev>
<biblioset relation="article">
<title>The Design and Implementation of a Log-Structured File
diff --git a/ja_JP.eucJP/books/faq/book.xml b/ja_JP.eucJP/books/faq/book.xml
index 142989c7a2..b913f435ab 100644
--- a/ja_JP.eucJP/books/faq/book.xml
+++ b/ja_JP.eucJP/books/faq/book.xml
@@ -3596,11 +3596,11 @@ diff -u -r1.60.2.1 -r1.60.2.2
if (verbose >= 2)
printf("psm%d: SET_DEFAULTS return code:%04x\n", unit, i);
+#endif
- if (sc->config & PSM_CONFIG_RESOLUTION) {
+ if (sc->config & PSM_CONFIG_RESOLUTION) {
sc->mode.resolution
= set_mouse_resolution(sc->kbdc,
-- (sc->config & PSM_CONFIG_RESOLUTION) - 1);
-+ (sc->config & PSM_CONFIG_RESOLUTION) - 1);
+- (sc->config & PSM_CONFIG_RESOLUTION) - 1);
++ (sc->config & PSM_CONFIG_RESOLUTION) - 1);
+ } else if (sc->mode.resolution >= 0) {
+ sc->mode.resolution
+ = set_mouse_resolution(sc->kbdc, sc->dflt_mode.resolution);
@@ -3611,7 +3611,7 @@ diff -u -r1.60.2.1 -r1.60.2.2
+ set_mouse_scaling(sc->kbdc, 1);
/* request a data packet and extract sync. bits */
- if (get_mouse_status(sc->kbdc, stat, 1, 3) < 3) {</programlisting>
+ if (get_mouse_status(sc->kbdc, stat, 1, 3) < 3) {</programlisting>
<para>FreeBSD 3.2
��꿷���������ǤϤ������ư���Ϥ��Ǥ���
@@ -4980,7 +4980,7 @@ Checking for Plug-n-Play devices...
Card assigned CSN #1
Vendor ID PMC2430 (0x3024a341), Serial Number 0xffffffff
PnP Version 1.0, Vendor Version 0
-Device Description: Pace 56 Voice Internal Plug & Play Modem
+Device Description: Pace 56 Voice Internal Plug & Play Modem
Logical Device ID: PMC2430 0x3024a341 #0
Device supports I/O Range Check
@@ -5998,7 +5998,7 @@ crw-rw-rw- 1 root wheel 41, 1 Oct 15 22:14 spx</screen>
<para>�����ƥब�����ư���Ƥ���ʤ�С�
<filename>/etc/periodic.conf</filename> ��
<literal>weekly_status_pkg_enable="YES"</literal> ��
- ���ꤷ�ơ�&man.periodic.8 �����ƥ�ˤ�ä��轵������ɬ�פ� ports
+ ���ꤷ�ơ�&man.periodic.8; �����ƥ�ˤ�ä��轵������ɬ�פ� ports
�ΰ����������Ǥ��ޤ���</para>
</answer>
</qandaentry>
@@ -12096,7 +12096,7 @@ nat port udp <replaceable>internal</replaceable>:5009 5009</programlisting>
Base</ulink> �ˤ��롢
�ֹ� <quote>Q158474 - Windows TCPIP Registry Entries</quote>��
������ֹ�
- <quote>Q120642 - TCPIP & NBT Configuration Parameters for Windows NT</quote>
+ <quote>Q120642 - TCPIP & NBT Configuration Parameters for Windows NT</quote>
�Ȥ��Ƥ���������
</para>
diff --git a/ja_JP.eucJP/books/fdp-primer/overview/chapter.xml b/ja_JP.eucJP/books/fdp-primer/overview/chapter.xml
index a445bd6814..3682257ca5 100644
--- a/ja_JP.eucJP/books/fdp-primer/overview/chapter.xml
+++ b/ja_JP.eucJP/books/fdp-primer/overview/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
+<?xml version="1.0" encoding="euc-jp"?>
<!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/ja_JP.eucJP/books/fdp-primer/psgml-mode/chapter.xml b/ja_JP.eucJP/books/fdp-primer/psgml-mode/chapter.xml
index ebfcd50583..f4c9d5de15 100644
--- a/ja_JP.eucJP/books/fdp-primer/psgml-mode/chapter.xml
+++ b/ja_JP.eucJP/books/fdp-primer/psgml-mode/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
+<?xml version="1.0" encoding="euc-jp"?>
<!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/ja_JP.eucJP/books/fdp-primer/see-also/chapter.xml b/ja_JP.eucJP/books/fdp-primer/see-also/chapter.xml
index 8bab5e67ef..c556097fe0 100644
--- a/ja_JP.eucJP/books/fdp-primer/see-also/chapter.xml
+++ b/ja_JP.eucJP/books/fdp-primer/see-also/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
+<?xml version="1.0" encoding="euc-jp"?>
<!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/ja_JP.eucJP/books/fdp-primer/structure/chapter.xml b/ja_JP.eucJP/books/fdp-primer/structure/chapter.xml
index b01b5c2894..f2aeaae77b 100644
--- a/ja_JP.eucJP/books/fdp-primer/structure/chapter.xml
+++ b/ja_JP.eucJP/books/fdp-primer/structure/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
+<?xml version="1.0" encoding="euc-jp"?>
<!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/ja_JP.eucJP/books/fdp-primer/stylesheets/chapter.xml b/ja_JP.eucJP/books/fdp-primer/stylesheets/chapter.xml
index 6d98f02ddc..a58ad4a427 100644
--- a/ja_JP.eucJP/books/fdp-primer/stylesheets/chapter.xml
+++ b/ja_JP.eucJP/books/fdp-primer/stylesheets/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
+<?xml version="1.0" encoding="euc-jp"?>
<!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/ja_JP.eucJP/books/fdp-primer/the-website/chapter.xml b/ja_JP.eucJP/books/fdp-primer/the-website/chapter.xml
index c5073db9e4..dbb34be62c 100644
--- a/ja_JP.eucJP/books/fdp-primer/the-website/chapter.xml
+++ b/ja_JP.eucJP/books/fdp-primer/the-website/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
+<?xml version="1.0" encoding="euc-jp"?>
<!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/ja_JP.eucJP/books/fdp-primer/tools/chapter.xml b/ja_JP.eucJP/books/fdp-primer/tools/chapter.xml
index b1a42a17cf..374e691101 100644
--- a/ja_JP.eucJP/books/fdp-primer/tools/chapter.xml
+++ b/ja_JP.eucJP/books/fdp-primer/tools/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
+<?xml version="1.0" encoding="euc-jp"?>
<!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/ja_JP.eucJP/books/fdp-primer/translations/chapter.xml b/ja_JP.eucJP/books/fdp-primer/translations/chapter.xml
index 07a8f09690..9aef3181e4 100644
--- a/ja_JP.eucJP/books/fdp-primer/translations/chapter.xml
+++ b/ja_JP.eucJP/books/fdp-primer/translations/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
+<?xml version="1.0" encoding="euc-jp"?>
<!-- Copyright (c) 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/ja_JP.eucJP/books/fdp-primer/writing-style/chapter.xml b/ja_JP.eucJP/books/fdp-primer/writing-style/chapter.xml
index 6b3deda627..2bf75efc2d 100644
--- a/ja_JP.eucJP/books/fdp-primer/writing-style/chapter.xml
+++ b/ja_JP.eucJP/books/fdp-primer/writing-style/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
+<?xml version="1.0" encoding="euc-jp"?>
<!-- Copyright (c) 1998 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/ja_JP.eucJP/books/handbook/Makefile b/ja_JP.eucJP/books/handbook/Makefile
index 3e390930ea..25b9a8b818 100644
--- a/ja_JP.eucJP/books/handbook/Makefile
+++ b/ja_JP.eucJP/books/handbook/Makefile
@@ -320,42 +320,56 @@ DOC_PREFIX?= ${.CURDIR}/../../..
#
# rules generating lists of mirror site from XML database.
#
-XMLDOCS= mirrors-ftp:::mirrors.xml.ftp.inc.tmp \
- mirrors-cvsup:::mirrors.xml.cvsup.inc.tmp \
- eresources:::eresources.xml.www.inc.tmp
+XMLDOCS= lastmod:::mirrors.lastmod.inc \
+ mirrors-ftp-index:::mirrors.xml.ftp.index.inc \
+ mirrors-ftp:::mirrors.xml.ftp.inc \
+ mirrors-cvsup-index:::mirrors.xml.cvsup.index.inc \
+ mirrors-cvsup:::mirrors.xml.cvsup.inc \
+ eresources-index:::eresources.xml.www.index.inc \
+ eresources:::eresources.xml.www.inc
DEPENDSET.DEFAULT= transtable mirror
XSLT.DEFAULT= ${XSL_MIRRORS}
XML.DEFAULT= ${XML_MIRRORS}
NO_TIDY.DEFAULT= yes
+
+PARAMS.lastmod+= --param 'target' "'lastmod'"
+PARAMS.mirrors-ftp-index+= --param 'type' "'ftp'" \
+ --param 'proto' "'ftp'" \
+ --param 'target' "'index'"
PARAMS.mirrors-ftp+= --param 'type' "'ftp'" \
--param 'proto' "'ftp'" \
--param 'target' "'handbook/mirrors/chapter.xml'"
+PARAMS.mirrors-cvsup-index+= --param 'type' "'cvsup'" \
+ --param 'proto' "'cvsup'" \
+ --param 'target' "'index'"
PARAMS.mirrors-cvsup+= --param 'type' "'cvsup'" \
--param 'proto' "'cvsup'" \
--param 'target' "'handbook/mirrors/chapter.xml'"
+PARAMS.eresources-index+= --param 'type' "'www'" \
+ --param 'proto' "'http'" \
+ --param 'target' "'index'"
PARAMS.eresources+= --param 'type' "'www'" \
--param 'proto' "'http'" \
--param 'target' "'handbook/eresources/chapter.xml'"
-SRCS+= mirrors.xml.ftp.inc \
+SRCS+= mirrors.lastmod.inc \
+ mirrors.xml.ftp.inc \
+ mirrors.xml.ftp.index.inc \
mirrors.xml.cvsup.inc \
- eresources.xml.www.inc
+ mirrors.xml.cvsup.index.inc \
+ eresources.xml.www.inc \
+ eresources.xml.www.index.inc
-CLEANFILES+= mirrors.xml.ftp.inc mirrors.xml.ftp.inc.tmp \
- mirrors.xml.cvsup.inc mirrors.xml.cvsup.inc.tmp \
- eresources.xml.www.inc eresources.xml.www.inc.tmp
+CLEANFILES+= mirrors.lastmod.inc \
+ mirrors.xml.ftp.inc \
+ mirrors.xml.ftp.index.inc \
+ mirrors.xml.cvsup.inc \
+ mirrors.xml.cvsup.index.inc \
+ eresources.xml.www.inc \
+ eresources.xml.www.index.inc
+lint: mirrors.lastmod.inc mirrors.xml.ftp.inc mirrors.xml.ftp.index.inc \
+ mirrors.xml.cvsup.inc mirrors.xml.cvsup.index.inc \
+ eresources.xml.www.inc eresources.xml.www.index.inc
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
-
-.for p in ftp cvsup
-mirrors.xml.${p}.inc: mirrors.xml.${p}.inc.tmp
- ${CP} ${.ALLSRC} ${.TARGET}
-# ${SED} -e 's,<\([^ >]*\)\([^>]*\)/>,<\1\2></\1>,;s,</anchor>,,'\
-# < $@.tmp > $@ || (${RM} -f $@ && false)
-.endfor
-
-eresources.xml.www.inc: eresources.xml.www.inc.tmp
- ${CP} ${.ALLSRC} ${.TARGET}
-# ${SED} -e 's,<\([^ >]*\)\([^>]*\)/>,<\1\2></\1>,;s,</anchor>,,'\
-# < $@.tmp > $@ || (${RM} -f $@ && false)
diff --git a/ja_JP.eucJP/books/handbook/advanced-networking/chapter.xml b/ja_JP.eucJP/books/handbook/advanced-networking/chapter.xml
index c723da61ec..f009855aa3 100644
--- a/ja_JP.eucJP/books/handbook/advanced-networking/chapter.xml
+++ b/ja_JP.eucJP/books/handbook/advanced-networking/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
+<?xml version="1.0" encoding="euc-jp"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Japanese Documentation Project
diff --git a/ja_JP.eucJP/books/handbook/basics/chapter.xml b/ja_JP.eucJP/books/handbook/basics/chapter.xml
index b5c9630b9a..fedbda78c2 100644
--- a/ja_JP.eucJP/books/handbook/basics/chapter.xml
+++ b/ja_JP.eucJP/books/handbook/basics/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
+<?xml version="1.0" encoding="euc-jp"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Japanese Documentation Project
diff --git a/ja_JP.eucJP/books/handbook/bibliography/chapter.xml b/ja_JP.eucJP/books/handbook/bibliography/chapter.xml
index dcecb9cff9..ae2c0a083f 100644
--- a/ja_JP.eucJP/books/handbook/bibliography/chapter.xml
+++ b/ja_JP.eucJP/books/handbook/bibliography/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
+<?xml version="1.0" encoding="euc-jp"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Japanese Documentation Project
diff --git a/ja_JP.eucJP/books/handbook/book.xml b/ja_JP.eucJP/books/handbook/book.xml
index 6301d20b27..df7ea5494b 100644
--- a/ja_JP.eucJP/books/handbook/book.xml
+++ b/ja_JP.eucJP/books/handbook/book.xml
@@ -247,13 +247,10 @@
&chap.security;
<!--
&chap.jails;
--->
&chap.mac;
-<!--
&chap.audit;
-->
&chap.disks;
- &chap.geom;
<!--
&chap.filesystems;
&chap.vinum;
@@ -307,8 +304,10 @@
&chap.serialcomms;
&chap.ppp-and-slip;
&chap.mail;
+<!--
&chap.network-servers;
&chap.firewalls;
+-->
&chap.advanced-networking;
</part>
diff --git a/ja_JP.eucJP/books/handbook/boot/chapter.xml b/ja_JP.eucJP/books/handbook/boot/chapter.xml
index 821d8083c0..5c39217ace 100644
--- a/ja_JP.eucJP/books/handbook/boot/chapter.xml
+++ b/ja_JP.eucJP/books/handbook/boot/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
+<?xml version="1.0" encoding="euc-jp"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Japanese Documentation Project
diff --git a/ja_JP.eucJP/books/handbook/bsdinstall/chapter.xml b/ja_JP.eucJP/books/handbook/bsdinstall/chapter.xml
index 7b6b3903ad..84ce97db68 100644
--- a/ja_JP.eucJP/books/handbook/bsdinstall/chapter.xml
+++ b/ja_JP.eucJP/books/handbook/bsdinstall/chapter.xml
@@ -117,7 +117,7 @@
<sect3>
<title>&os;/&arch.i386;</title>
- <para>&os;/&arch.i386 �������ƥ�����ϡ�
+ <para>&os;/&arch.i386; �������ƥ�����ϡ�
486 �ʾ�Υץ����å��ȡ�
���ʤ��Ȥ� 64 MB �� RAM ��ɬ�פǤ���
�Ǿ��Υ��ȡ���Ǥϡ�
@@ -161,7 +161,7 @@
ʣ���� CPU ����ĥ���ԥ塼���� SMP ���б����Ƥ��ޤ���</para>
<para>32-bit �����ͥ�ϡ�RAM �κǽ�� 2 GB ���������ѤǤ��ޤ���
- Blue & White PowerMac G3 �Ǥϡ�&firewire; ���б����Ƥ��ޤ���</para>
+ Blue & White PowerMac G3 �Ǥϡ�&firewire; ���б����Ƥ��ޤ���</para>
</sect3>
<sect3>
@@ -2592,7 +2592,7 @@ login:</screen>
</sect2>
<sect2>
- <title>�ȥ�֥륷�塼�ƥ��˴ؤ��� Q & A</title>
+ <title>�ȥ�֥륷�塼�ƥ��˴ؤ��� Q & A</title>
<qandaset>
<qandaentry>
diff --git a/ja_JP.eucJP/books/handbook/chapters.ent b/ja_JP.eucJP/books/handbook/chapters.ent
index 1505851dc2..a8690771db 100644
--- a/ja_JP.eucJP/books/handbook/chapters.ent
+++ b/ja_JP.eucJP/books/handbook/chapters.ent
@@ -14,232 +14,57 @@
Chapters should be listed in the order in which they are referenced.
-->
-<!ENTITY % not.published "INCLUDE">
-
-<!ENTITY % chap.introduction "IGNORE">
-<!ENTITY % chap.install "IGNORE">
-<!ENTITY % chap.bsdinstall "IGNORE">
-<!ENTITY % chap.basics "IGNORE">
-<!ENTITY % chap.ports "IGNORE">
-<!ENTITY % chap.config "IGNORE">
-<!ENTITY % chap.boot "IGNORE">
-<!ENTITY % chap.users "IGNORE">
-<!ENTITY % chap.kernelconfig "IGNORE">
-<!ENTITY % chap.security "IGNORE">
-<!ENTITY % chap.jails "IGNORE">
-<!ENTITY % chap.printing "IGNORE">
-<!ENTITY % chap.disks "IGNORE">
-<!ENTITY % chap.geom "IGNORE">
-<!ENTITY % chap.vinum "IGNORE">
-<!ENTITY % chap.x11 "IGNORE">
-<!ENTITY % chap.l10n "IGNORE">
-<!ENTITY % chap.multimedia "IGNORE">
-<!ENTITY % chap.desktop "IGNORE">
-<!ENTITY % chap.serialcomms "IGNORE">
-<!ENTITY % chap.ppp-and-slip "IGNORE">
-<!ENTITY % chap.advanced-networking "IGNORE">
-<!ENTITY % chap.firewalls "IGNORE">
-<!ENTITY % chap.network-servers "IGNORE">
-<!ENTITY % chap.mail "IGNORE">
-<!ENTITY % chap.cutting-edge "IGNORE">
-<!ENTITY % chap.linuxemu "IGNORE">
-<!ENTITY % chap.mirrors "IGNORE">
-<!ENTITY % chap.mirrors.ftp.inc "INCLUDE">
-<!ENTITY % chap.mirrors.cvsup.inc "INCLUDE">
-<!ENTITY % chap.bibliography "IGNORE">
-<!ENTITY % chap.eresources "IGNORE">
-<!ENTITY % chap.eresources.www.inc "INCLUDE">
-<!ENTITY % chap.pgpkeys "IGNORE">
-<!ENTITY % chap.index "IGNORE">
-<!ENTITY % chap.freebsd-glossary "IGNORE">
-<!ENTITY % chap.mac "IGNORE">
-<!ENTITY % chap.audit "IGNORE">
-<!ENTITY % chap.filesystems "IGNORE">
-<!ENTITY % chap.dtrace "IGNORE">
-
<!ENTITY chap.preface SYSTEM "preface/preface.xml">
<!ENTITY % pgpkeys SYSTEM "../../../share/pgpkeys/pgpkeys.ent"> %pgpkeys;
<!-- Part One -->
-<![%chap.introduction;[
<!ENTITY chap.introduction SYSTEM "introduction/chapter.xml">
-]]>
-<![%chap.install;[
<!ENTITY chap.install SYSTEM "install/chapter.xml">
-]]>
-<![%chap.bsdinstall;[
<!ENTITY chap.bsdinstall SYSTEM "bsdinstall/chapter.xml">
-]]>
-<![%chap.basics;[
<!ENTITY chap.basics SYSTEM "basics/chapter.xml">
-]]>
-<![%chap.ports;[
<!ENTITY chap.ports SYSTEM "ports/chapter.xml">
-]]>
-<![%chap.x11;[
<!ENTITY chap.x11 SYSTEM "x11/chapter.xml">
-]]>
<!-- Part Two -->
-<![%chap.desktop;[
<!ENTITY chap.desktop SYSTEM "desktop/chapter.xml">
-]]>
-<![%chap.multimedia;[
<!ENTITY chap.multimedia SYSTEM "multimedia/chapter.xml">
-]]>
-<![%chap.kernelconfig;[
<!ENTITY chap.kernelconfig SYSTEM "kernelconfig/chapter.xml">
-]]>
-<![%chap.printing;[
<!ENTITY chap.printing SYSTEM "printing/chapter.xml">
-]]>
-<![%chap.linuxemu;[
<!ENTITY chap.linuxemu SYSTEM "linuxemu/chapter.xml">
-]]>
<!-- Part Three -->
-<![%chap.config;[
<!ENTITY chap.config SYSTEM "config/chapter.xml">
-]]>
-<![%chap.boot;[
<!ENTITY chap.boot SYSTEM "boot/chapter.xml">
-]]>
-<![%chap.users;[
<!ENTITY chap.users SYSTEM "users/chapter.xml">
-]]>
-<![%chap.security;[
<!ENTITY chap.security SYSTEM "security/chapter.xml">
-]]>
-<![%chap.jails;[
<!ENTITY chap.jails SYSTEM "jails/chapter.xml">
-]]>
-<![%chap.mac;[
- <!ENTITY chap.mac SYSTEM "mac/chapter.xml">
-]]>
-<![%chap.audit;[
<!ENTITY chap.audit SYSTEM "audit/chapter.xml">
-]]>
-<![%chap.disks;[
<!ENTITY chap.disks SYSTEM "disks/chapter.xml">
-]]>
-<![%chap.geom;[
- <!ENTITY chap.geom SYSTEM "geom/chapter.xml">
-]]>
-<![%chap.filesystems;[
<!ENTITY chap.filesystems SYSTEM "filesystems/chapter.xml">
-]]>
-<![%chap.vinum;[
<!ENTITY chap.vinum SYSTEM "vinum/chapter.xml">
-]]>
-<![%chap.l10n;[
<!ENTITY chap.l10n SYSTEM "l10n/chapter.xml">
-]]>
-<![%chap.cutting-edge;[
<!ENTITY chap.cutting-edge SYSTEM "cutting-edge/chapter.xml">
-]]>
-<![%chap.dtrace;[
<!ENTITY chap.dtrace SYSTEM "dtrace/chapter.xml">
-]]>
<!-- Part Four -->
-<![%chap.serialcomms;[
<!ENTITY chap.serialcomms SYSTEM "serialcomms/chapter.xml">
-]]>
-<![%chap.ppp-and-slip;[
<!ENTITY chap.ppp-and-slip SYSTEM "ppp-and-slip/chapter.xml">
-]]>
-<![%chap.mail;[
<!ENTITY chap.mail SYSTEM "mail/chapter.xml">
-]]>
-<![%chap.network-servers;[
- <!ENTITY chap.network-servers SYSTEM "network-servers/chapter.xml">
-]]>
-<![%chap.firewalls;[
- <!ENTITY chap.firewalls SYSTEM "firewalls/chapter.xml">
-]]>
-<![%chap.advanced-networking;[
<!ENTITY chap.advanced-networking SYSTEM "advanced-networking/chapter.xml">
-]]>
<!-- Part Five (appendices) -->
-<![%chap.mirrors;[
- <!ENTITY chap.mirrors SYSTEM "mirrors/chapter.xml">
-]]>
-<![%chap.mirrors.ftp.inc;[
- <!ENTITY chap.mirrors.ftp.inc SYSTEM "mirrors.xml.ftp.inc">
-]]>
-<![%chap.mirrors.cvsup.inc;[
- <!ENTITY chap.mirrors.cvsup.inc SYSTEM "mirrors.xml.cvsup.inc">
-]]>
-<![%chap.bibliography;[
+ <!ENTITY chap.mirrors SYSTEM "mirrors/chapter.xml">
+ <!ENTITY chap.mirrors.lastmod.inc SYSTEM "mirrors.lastmod.inc">
+ <!ENTITY chap.mirrors.ftp.index.inc SYSTEM "mirrors.xml.ftp.index.inc">
+ <!ENTITY chap.mirrors.ftp.inc SYSTEM "mirrors.xml.ftp.inc">
+ <!ENTITY chap.mirrors.cvsup.index.inc SYSTEM "mirrors.xml.cvsup.index.inc">
+ <!ENTITY chap.mirrors.cvsup.inc SYSTEM "mirrors.xml.cvsup.inc">
<!ENTITY chap.bibliography SYSTEM "bibliography/chapter.xml">
-]]>
-<![%chap.eresources;[
- <!ENTITY chap.eresources SYSTEM "eresources/chapter.xml">
-]]>
-<![%chap.eresources.www.inc;[
- <!ENTITY chap.eresources.www.inc SYSTEM "eresources.xml.www.inc">
-]]>
-<![%chap.pgpkeys;[
+ <!ENTITY chap.eresources SYSTEM "eresources/chapter.xml">
+ <!ENTITY chap.eresources.www.index.inc SYSTEM "eresources.xml.www.index.inc">
+ <!ENTITY chap.eresources.www.inc SYSTEM "eresources.xml.www.inc">
<!ENTITY chap.pgpkeys SYSTEM "pgpkeys/chapter.xml">
-]]>
-<![%chap.freebsd-glossary;[
<!ENTITY chap.freebsd-glossary "&freebsd-glossary;">
-]]>
-<![%chap.index;[
- <!ENTITY chap.index SYSTEM "index.xml">
-]]>
+ <!ENTITY chap.index "">
<!ENTITY chap.colophon SYSTEM "colophon.xml">
-
-<!-- IGNORE cases -->
-
-<!-- Part One -->
-<!ENTITY chap.introduction "">
-<!ENTITY chap.install "">
-<!ENTITY chap.basics "">
-<!ENTITY chap.ports "">
-<!ENTITY chap.x11 "">
-
-<!-- Part Two -->
-<!ENTITY chap.desktop "">
-<!ENTITY chap.multimedia "">
-<!ENTITY chap.kernelconfig "">
-<!ENTITY chap.printing "">
-<!ENTITY chap.linuxemu "">
-
-<!-- Part Three -->
-<!ENTITY chap.config "">
-<!ENTITY chap.boot "">
-<!ENTITY chap.users "">
-<!ENTITY chap.security "">
-<!ENTITY chap.jails "">
-<!ENTITY chap.mac "">
-<!ENTITY chap.audit "">
-<!ENTITY chap.disks "">
-<!ENTITY chap.geom "">
-<!ENTITY chap.filesystems "">
-<!ENTITY chap.vinum "">
-<!ENTITY chap.virtualization "">
-<!ENTITY chap.l10n "">
-<!ENTITY chap.cutting-edge "">
-<!ENTITY chap.dtrace "">
-
-<!-- Part Four -->
-<!ENTITY chap.serialcomms "">
-<!ENTITY chap.ppp-and-slip "">
-<!ENTITY chap.mail "">
-<!ENTITY chap.network-servers "">
-<!ENTITY chap.firewalls "">
-<!ENTITY chap.advanced-networking "">
-
-<!-- Part Five (appendices) -->
-<!ENTITY chap.mirrors "">
-<!ENTITY chap.mirrors.ftp.inc "">
-<!ENTITY chap.mirrors.cvsup.inc "">
-<!ENTITY chap.bibliography "">
-<!ENTITY chap.eresources "">
-<!ENTITY chap.eresources.www.inc "">
-<!ENTITY chap.pgpkeys "">
-<!ENTITY chap.freebsd-glossary "">
-<!ENTITY chap.index "">
diff --git a/ja_JP.eucJP/books/handbook/colophon.xml b/ja_JP.eucJP/books/handbook/colophon.xml
index f0bd815755..c39677f324 100644
--- a/ja_JP.eucJP/books/handbook/colophon.xml
+++ b/ja_JP.eucJP/books/handbook/colophon.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
+<?xml version="1.0" encoding="euc-jp"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Japanese Documentation Project
diff --git a/ja_JP.eucJP/books/handbook/config/chapter.xml b/ja_JP.eucJP/books/handbook/config/chapter.xml
index fbbb32a03c..9b9f81fe1e 100644
--- a/ja_JP.eucJP/books/handbook/config/chapter.xml
+++ b/ja_JP.eucJP/books/handbook/config/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
+<?xml version="1.0" encoding="euc-jp"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Japanese Documentation Project
@@ -372,7 +372,7 @@ stop)
kill -9 `cat /var/run/foobar.pid`
;;
*)
- echo "Usage: `basename $0` {start|stop}" >&2
+ echo "Usage: `basename $0` {start|stop}" >&2
exit 64
;;
esac
diff --git a/ja_JP.eucJP/books/handbook/cutting-edge/chapter.xml b/ja_JP.eucJP/books/handbook/cutting-edge/chapter.xml
index 3d68eef8b4..0620296357 100644
--- a/ja_JP.eucJP/books/handbook/cutting-edge/chapter.xml
+++ b/ja_JP.eucJP/books/handbook/cutting-edge/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
+<?xml version="1.0" encoding="euc-jp"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Japanese Documentation Project
@@ -1174,81 +1174,6 @@ Fetching 133 new ports or files... done.</screen>
<screen>&prompt.root; <userinput>portupgrade -PP hu-freebsd-doc</userinput></screen>
</sect3>
</sect2>
-
-<!-- FIXME: Waiting for a working docsnap server... -->
-<![ IGNORE [
- <sect2 id="docsnap">
- <sect2info>
- <authorgroup>
- <author>
- <firstname>Pav</firstname>
- <surname>Lucistnik</surname>
- <contrib>Based on information provided by </contrib>
- </author>
- </authorgroup>
- </sect2info>
-
- <title>Using Docsnap</title>
-
- <indexterm><primary>Updating and Upgrading</primary></indexterm>
-
- <indexterm>
- <primary>Docsnap</primary>
- <see>Updating and Upgrading</see>
- </indexterm>
-
- <para><application>Docsnap</application> is an &man.rsync.1;
- repository for updating installed &os; Documentation in a
- relatively easy and fast way. A
- <quote><application>Docsnap</application> server</quote> tracks
- the documentation sources, and builds them in HTML format every
- hour. The <filename role="package">textproc/docproj</filename>
- is unneeded with <application>Docsnap</application> as only
- patches to the built documentation exist.</para>
-
- <para>The only requirement for using this technique is
- the <filename role="package">net/rsync</filename> port or
- package. To add it, use the following command:</para>
-
- <screen>&prompt.root; <userinput>pkg_add -r rsync</userinput></screen>
-
- <note>
- <para><application>Docsnap</application> has been originally
- developed for updating documentation installed
- to <filename class="directory">/usr/share/doc</filename>, but
- the following examples could be adapted for other directories
- as well. For user directories, it does not require
- <username>root</username> privileges.</para>
- </note>
-
- <para>To update the documentation set, issue the following
- command:</para>
-
- <screen>&prompt.root; <userinput>rsync -rltvz <replaceable>docsnap.sk.FreeBSD.org</replaceable>::docsnap <replaceable>/usr/share/doc</replaceable></userinput></screen>
-
- <note>
- <para>There is only one <application>Docsnap</application>
- server at the moment;
- the <hostid>docsnap.sk.FreeBSD.org</hostid> shown
- above.</para>
- </note>
-
- <para>Do not use the <option>--delete</option> flag here as there
- are some items installed
- into <filename class="directory">/usr/share/doc</filename>
- during <command>make installworld</command>, which would
- accidentally be removed. To clean up, use this command
- instead:</para>
-
- <screen>&prompt.root; <userinput>rsync -rltvz --delete <replaceable>docsnap.sk.FreeBSD.org</replaceable>::docsnap/??_??\.\* <replaceable>/usr/share/doc</replaceable></userinput></screen>
-
- <para>If a subset of documentation needs to be updated, for
- example, the English documentation only, the following command
- should be used:</para>
-
- <screen>&prompt.root; <userinput>rsync -rltvz <replaceable>docsnap.sk.FreeBSD.org</replaceable>::docsnap/en_US.ISO8859-1 <replaceable>/usr/share/doc</replaceable></userinput></screen>
- </sect2>
-]]>
</sect1>
<sect1 id="current-stable">
diff --git a/ja_JP.eucJP/books/handbook/desktop/chapter.xml b/ja_JP.eucJP/books/handbook/desktop/chapter.xml
index b86d00f0ee..fe8a1314cf 100644
--- a/ja_JP.eucJP/books/handbook/desktop/chapter.xml
+++ b/ja_JP.eucJP/books/handbook/desktop/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
+<?xml version="1.0" encoding="euc-jp"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Japanese Documentation Project
@@ -270,7 +270,7 @@
<para>&os; �Ѥ� &adobe; &flash; �ץ饰���������Ƥ��ޤ���
�������ʤ��顢Linux �С������Υץ饰�����¹Ԥ��뤿��Υ��եȥ������쥤�� (wrapper) ��¸�ߤ��ޤ���
���� wrapper �ϡ�&adobe; &acrobat; �ץ饰�����
- &realplayer �ץ饰����ʤɤˤ��б����Ƥ��ޤ���</para>
+ &realplayer; �ץ饰����ʤɤˤ��б����Ƥ��ޤ���</para>
<para>���Ѥ��Ƥ��� &os; �ΥС������ˤ�ä�ɬ�פʺ�Ȥϰۤʤ�ޤ���</para>
diff --git a/ja_JP.eucJP/books/handbook/disks/chapter.xml b/ja_JP.eucJP/books/handbook/disks/chapter.xml
index 0f688934d3..5668a1f3f3 100644
--- a/ja_JP.eucJP/books/handbook/disks/chapter.xml
+++ b/ja_JP.eucJP/books/handbook/disks/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
+<?xml version="1.0" encoding="euc-jp"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Japanese Documentation Project
@@ -1319,7 +1319,7 @@ cd0: Attempt to query device size failed: NOT READY, Medium not present - tray c
<para>���� <filename>/dev</filename> ���Υ���ȥ�� (��)
��������ʤ���Фʤ�ޤ����Υ��ޥ�ɤǤ����Ԥ��ޤ���</para>
- <screen>&prompt.root; <userinput>cd /dev && ./MAKEDEV "fd*"</userinput></screen>
+ <screen>&prompt.root; <userinput>cd /dev && ./MAKEDEV "fd*"</userinput></screen>
</sect4>
<sect4>
@@ -1935,9 +1935,9 @@ sa0(ncr1:4:0): Logical unit is in process of becoming ready</screen>
���Ѥ��ƥ�⡼�ȥơ��ץɥ饤�֤˥ǡ��������뤳�Ȥ��Ǥ��ޤ���</para>
<screen>&prompt.root; <userinput>for f in <replaceable>directory_list; do</replaceable></userinput>
-<userinput>find $f >> backup.list</userinput>
+<userinput>find $f >> backup.list</userinput>
<userinput>done</userinput>
-&prompt.root; <userinput>cpio -v -o --format=newc < backup.list | ssh <replaceable>user</replaceable>@<replaceable>host</replaceable> "cat > <replaceable>backup_device</replaceable>"</userinput></screen>
+&prompt.root; <userinput>cpio -v -o --format=newc < backup.list | ssh <replaceable>user</replaceable>@<replaceable>host</replaceable> "cat > <replaceable>backup_device</replaceable>"</userinput></screen>
<para><replaceable>directory_list</replaceable>
�ϥХå����åפ������ǥ��쥯�ȥ�Υꥹ�Ȥǡ�
@@ -2147,7 +2147,7 @@ sa0(ncr1:4:0): Logical unit is in process of becoming ready</screen>
<example>
<title>�֡��ȥե��åԡ���������륹����ץ�</title>
- <programlisting><![ CDATA [#!/bin/sh
+ <programlisting><![CDATA[#!/bin/sh
#
# create a restore floppy
#
@@ -2275,7 +2275,7 @@ cd /
#
# create minimum file system table
#
-cat > /mnt/etc/fstab <<EOM
+cat > /mnt/etc/fstab <<EOM
/dev/fd0a / ufs rw 1 1
EOM
@@ -2361,13 +2361,6 @@ echo "The floppy has been unmounted and is now ready."]]></programlisting>
�ɤΤ褦����ͳ�ǺƤӻ��Τ��������ꡢ�ǡ����������뤫�狼��ޤ���
����˿����֤����Ȥǡ��塹�κ���ߤ��ޤ���</para>
</sect3>
-
-<![ %not.published; [
- <sect3>
- <title>* �����к��Ƥ��ޤ���Ǥ�����
- �ɤ������餤���Ǥ��礦��?</title>
- </sect3>
-]]>
</sect2>
</sect1>
diff --git a/ja_JP.eucJP/books/handbook/eresources/chapter.xml b/ja_JP.eucJP/books/handbook/eresources/chapter.xml
index 7dd701845b..05b9248a7b 100644
--- a/ja_JP.eucJP/books/handbook/eresources/chapter.xml
+++ b/ja_JP.eucJP/books/handbook/eresources/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
+<?xml version="1.0" encoding="euc-jp"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Japanese Documentation Project
@@ -1519,6 +1519,10 @@
<sect1 id="eresources-web">
<title>World Wide Web ������</title>
+ &chap.eresources.www.index.inc;
+
+ &chap.mirrors.lastmod.inc;
+
&chap.eresources.www.inc;
</sect1>
diff --git a/ja_JP.eucJP/books/handbook/install/chapter.xml b/ja_JP.eucJP/books/handbook/install/chapter.xml
index eb08fabebe..dab56b7d19 100644
--- a/ja_JP.eucJP/books/handbook/install/chapter.xml
+++ b/ja_JP.eucJP/books/handbook/install/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
+<?xml version="1.0" encoding="euc-jp"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Japanese Documentation Project
@@ -111,7 +111,7 @@
<sect3>
<title>&os;/&arch.i386; ����� &os;/&arch.pc98;</title>
- <para>&os;/&arch.i386 �� &os;/&arch.pc98 ��ξ���Υ������ƥ�����ϡ�
+ <para>&os;/&arch.i386; �� &os;/&arch.pc98; ��ξ���Υ������ƥ�����ϡ�
486 �ʾ�Υץ����å��ȡ�
���ʤ��Ȥ� 24 MB �� RAM ��ɬ�פǤ���
�Ǿ��Υ��ȡ���Ǥϡ�
@@ -3059,7 +3059,7 @@ Press [Enter] now to invoke an editor on /etc/exports
</mediaobject>
</figure>
- <para>�ͤ��ѹ������� &gui.ok ������
+ <para>�ͤ��ѹ������� &gui.ok; ������
<keycap>Enter</keycap> ���ơ�
�����ƥॳ����������˥塼����äƤ���������</para>
@@ -4228,7 +4228,7 @@ Please press any key to reboot.</screen>
</sect2>
<sect2>
- <title>�ȥ�֥륷�塼�ƥ��˴ؤ��� Q & A</title>
+ <title>�ȥ�֥륷�塼�ƥ��˴ؤ��� Q & A</title>
<qandaset>
<qandaentry>
@@ -4368,7 +4368,7 @@ Please press any key to reboot.</screen>
<para>���Ѥ��Ƥ��륫���ɤ� IRQ ����
<filename>/boot/device.hints</filename>
�ե�����ǻ��ꤵ�줿 IRQ �Ȱۤʤ��ǽ��������ޤ���
- &man.ed.4 �ɥ饤�Фϡ��ǥե���ȤǤ� <quote>���եȥ�����</quote> ����ե����졼�����
+ &man.ed.4; �ɥ饤�Фϡ��ǥե���ȤǤ� <quote>���եȥ�����</quote> ����ե����졼�����
(&ms-dos; �� EZSETUP �����Ϥ��줿��) ���Ѥ��ޤ���
�����ե������Υҥ�Ⱦ���� <literal>-1</literal> ����ꤷ�����ˤϡ�
���եȥ���������ե����졼������Ѥ����ޤ���</para>
diff --git a/ja_JP.eucJP/books/handbook/introduction/chapter.xml b/ja_JP.eucJP/books/handbook/introduction/chapter.xml
index 9d8c3eaa6f..9e4771cae0 100644
--- a/ja_JP.eucJP/books/handbook/introduction/chapter.xml
+++ b/ja_JP.eucJP/books/handbook/introduction/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
+<?xml version="1.0" encoding="euc-jp"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Japanese Documentation Project
diff --git a/ja_JP.eucJP/books/handbook/jcontrib/chapter.xml b/ja_JP.eucJP/books/handbook/jcontrib/chapter.xml
index dcb68446f7..45ad47378b 100644
--- a/ja_JP.eucJP/books/handbook/jcontrib/chapter.xml
+++ b/ja_JP.eucJP/books/handbook/jcontrib/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
+<?xml version="1.0" encoding="euc-jp"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Japanese Documentation Project
diff --git a/ja_JP.eucJP/books/handbook/kernelconfig/chapter.xml b/ja_JP.eucJP/books/handbook/kernelconfig/chapter.xml
index 61da1b21e6..12c9a10630 100644
--- a/ja_JP.eucJP/books/handbook/kernelconfig/chapter.xml
+++ b/ja_JP.eucJP/books/handbook/kernelconfig/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
+<?xml version="1.0" encoding="euc-jp"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Japanese Documentation Project
@@ -831,7 +831,7 @@ options NFS_ROOT # NFS usable as /, requires NFSCLIENT</progra
<para>�ꥢ�륿�����ĥ�� 1993 &posix; ���ɲä���ޤ�����
Ports Collection ����Τ����Ĥ��Υ��ץꥱ�������
- (���Ȥ��� <application>&staroffice</application>)
+ (���Ȥ��� <application>&staroffice;</application>)
�Ϥ����ȤäƤ��ޤ���</para>
<programlisting>options KBD_INSTALL_CDEV # install a CDEV entry in /dev</programlisting>
@@ -1175,7 +1175,7 @@ device ppc</programlisting>
<programlisting>#device puc</programlisting>
- <para>&man.puc.4 glue �ɥ饤�Ф����ݡ��Ȥ��Ƥ���
+ <para>&man.puc.4; glue �ɥ饤�Ф����ݡ��Ȥ��Ƥ���
<quote>dumb</quote> ���ꥢ�롢
�ޤ��ϥѥ��� PCI �����ɤ���äƤ���ΤǤ���С�
���ΥǥХ�����ͭ���ˤ��Ƥ���������</para>
diff --git a/ja_JP.eucJP/books/handbook/l10n/chapter.xml b/ja_JP.eucJP/books/handbook/l10n/chapter.xml
index b4352e3ec7..902cf258f4 100644
--- a/ja_JP.eucJP/books/handbook/l10n/chapter.xml
+++ b/ja_JP.eucJP/books/handbook/l10n/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
+<?xml version="1.0" encoding="euc-jp"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Japanese Documentation Project
diff --git a/ja_JP.eucJP/books/handbook/linuxemu/chapter.xml b/ja_JP.eucJP/books/handbook/linuxemu/chapter.xml
index c1221a72ea..afed0f6046 100644
--- a/ja_JP.eucJP/books/handbook/linuxemu/chapter.xml
+++ b/ja_JP.eucJP/books/handbook/linuxemu/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
+<?xml version="1.0" encoding="euc-jp"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Japanese Documentation Project
@@ -2258,7 +2258,7 @@ drwxrwxr-x 11 idsadm sapsys 512 May 4 14:20 trans </screen>
<indexterm><primary>execution class loader</primary></indexterm>
<para>FreeBSD �ϡ�“�¹ԥ��饹������ (execution class loader) ”
- �ȸƤФ�����Ū�ʵ�������äƤ��ޤ�������� &man.execve.2
+ �ȸƤФ�����Ū�ʵ�������äƤ��ޤ�������� &man.execve.2;
�����ƥॳ����ؤ�ܸ�Ȥ������Ǽ�������Ƥ��ޤ���
</para>
diff --git a/ja_JP.eucJP/books/handbook/mail/chapter.xml b/ja_JP.eucJP/books/handbook/mail/chapter.xml
index e8b1d2bba9..1ed5b554a8 100644
--- a/ja_JP.eucJP/books/handbook/mail/chapter.xml
+++ b/ja_JP.eucJP/books/handbook/mail/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
+<?xml version="1.0" encoding="euc-jp"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Japanese Documentation Project
@@ -452,7 +452,7 @@ mail.example.com</programlisting>
<para><application>sendmail</application> �μ�����ե������
<application>sendmail</application> �ε�ǽ��ư�����ꤹ��
- &man.m4.1 �ޥ������鹽�ۤǤ��ޤ���
+ &man.m4.1; �ޥ������鹽�ۤǤ��ޤ���
�ܺ٤ˤĤ��Ƥ�
<filename>/usr/src/contrib/sendmail/cf/README</filename>
�Ȥ��Ƥ���������</para>
diff --git a/ja_JP.eucJP/books/handbook/mirrors/chapter.xml b/ja_JP.eucJP/books/handbook/mirrors/chapter.xml
index 8892d3580d..a997332056 100644
--- a/ja_JP.eucJP/books/handbook/mirrors/chapter.xml
+++ b/ja_JP.eucJP/books/handbook/mirrors/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
+<?xml version="1.0" encoding="euc-jp"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Japanese Documentation Project
@@ -207,6 +207,10 @@
�ƥ����Ȥ����Ƥ��륢��������ˡ�ϡ�
�ۥ���̾��³����̤���˵��ܤ���Ƥ��ޤ���</para>
+ &chap.mirrors.ftp.index.inc;
+
+ &chap.mirrors.lastmod.inc;
+
&chap.mirrors.ftp.inc;
</sect1>
@@ -2423,6 +2427,10 @@ doc/zh_*</screen>
<para>&os; �� <link linkend="cvsup">CVSup</link>
�����Фϰʲ��Υ����ȤDz�Ư���Ƥ��ޤ���</para>
+ &chap.mirrors.cvsup.index.inc;
+
+ &chap.mirrors.lastmod.inc;
+
&chap.mirrors.cvsup.inc;
</sect2>
</sect1>
diff --git a/ja_JP.eucJP/books/handbook/multimedia/chapter.xml b/ja_JP.eucJP/books/handbook/multimedia/chapter.xml
index b3a84a2373..3a18879904 100644
--- a/ja_JP.eucJP/books/handbook/multimedia/chapter.xml
+++ b/ja_JP.eucJP/books/handbook/multimedia/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
+<?xml version="1.0" encoding="euc-jp"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Japanese Documentation Project
@@ -1656,7 +1656,7 @@ bktr0: Pinnacle/Miro TV, Philips SECAM tuner.</programlisting>
<para>MythTV �ǡ����١��������ꤷ�Ƥ���������</para>
- <screen>&prompt.root; <userinput>mysql -uroot -p < /usr/local/share/mythtv/database/mc.sql</userinput></screen>
+ <screen>&prompt.root; <userinput>mysql -uroot -p < /usr/local/share/mythtv/database/mc.sql</userinput></screen>
<para>�Хå�����ɤ����ꤷ�Ƥ���������</para>
@@ -1714,7 +1714,7 @@ bktr0: Pinnacle/Miro TV, Philips SECAM tuner.</programlisting>
<sect2>
<title>�����ͥ�Υ���ե����졼�����</title>
- <para>���ҤΤ褦�ˡ�&os �ϥ�����ʤΥ��ե������Ȥ���
+ <para>���ҤΤ褦�ˡ�&os; �ϥ�����ʤΥ��ե������Ȥ���
SCSI �� USB ��ξ�����б����Ƥ��ޤ���
������ʤΥ��ե������ˤ�äơ�ɬ�פȤʤ�ɥ饤�Ф��ۤʤ�ޤ���</para>
diff --git a/ja_JP.eucJP/books/handbook/pgpkeys/chapter.xml b/ja_JP.eucJP/books/handbook/pgpkeys/chapter.xml
index 3270bcba7a..33e9250c26 100644
--- a/ja_JP.eucJP/books/handbook/pgpkeys/chapter.xml
+++ b/ja_JP.eucJP/books/handbook/pgpkeys/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
+<?xml version="1.0" encoding="euc-jp"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Japanese Documentation Project
diff --git a/ja_JP.eucJP/books/handbook/ports/chapter.xml b/ja_JP.eucJP/books/handbook/ports/chapter.xml
index 7f118e0edb..8ffda81c91 100644
--- a/ja_JP.eucJP/books/handbook/ports/chapter.xml
+++ b/ja_JP.eucJP/books/handbook/ports/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
+<?xml version="1.0" encoding="euc-jp"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Japanese Documentation Project
@@ -880,7 +880,7 @@ docbook =
���Τ褦�ʥե�������Ѥ����ü�ʾ����ˤ��б����Ƥ��ޤ���
�����Υե�����ˤĤ��Ƥξܺ٤����
ports �ΰ���Ū�������ˤĤ��Ƥϡ�<ulink
- url="&url.books.porters-handbook/index.html">port
+ url="&url.books.porters-handbook;/index.html">port
�����ԤΤ���Υϥ�ɥ֥å�</ulink> ������������</para>
<para>port �ϥ����������ɤ��饢�ץꥱ���������ۤ�����ˡ�����ޤ�����
@@ -1624,7 +1624,7 @@ ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/distfiles/ fetch</userinput></screen>
<listitem>
<para>��ʬ��ľ���ޤ��礦!
<quote>Ports</quote> �����ƥ�˴ؤ���ܺ٤ʾ���� <ulink
- url="&url.books.porters-handbook/index.html">
+ url="&url.books.porters-handbook;/index.html">
port �����ԤΤ���Υϥ�ɥ֥å�</ulink> �ˤ���ޤ���
���Υ����������ɤ�ȡ�����Ƥ��ޤä� port ��ľ�����ꡢ
��ʬ�Ǻ�ä� port ����Ф�����Ǥ���褦�ˤʤ�ޤ�!</para>
diff --git a/ja_JP.eucJP/books/handbook/ppp-and-slip/chapter.xml b/ja_JP.eucJP/books/handbook/ppp-and-slip/chapter.xml
index d6611c60ae..859d7ecf73 100644
--- a/ja_JP.eucJP/books/handbook/ppp-and-slip/chapter.xml
+++ b/ja_JP.eucJP/books/handbook/ppp-and-slip/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
+<?xml version="1.0" encoding="euc-jp"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Japanese Documentation Project
@@ -454,7 +454,7 @@ nameserver <replaceable>y.y.y.y</replaceable></programlisting>
<para>���Υץ��Х����������ֹ����ꤷ�ޤ�.
ʣ���������ֹ�� <literal>:</literal> ��
<literal>|</literal> �Ƕ��ڤäƻ��ꤹ�뤳�Ȥ��Ǥ��ޤ�.
- �������ڤ�ʸ���ΰ㤤�ˤĤ��Ƥ�, &man.ppp.8
+ �������ڤ�ʸ���ΰ㤤�ˤĤ��Ƥ�, &man.ppp.8;
�� �ܤ�����Ƥ��ޤ�.
�����, ���㤦�ֹ�� ���������ΤǤ����
<literal>:</literal> ��Ȥ��ޤ�. ���
@@ -1718,7 +1718,7 @@ reinput 1 {\255}
if success goto slhup
reinput 1 {\127}
if success goto slhup
-if < \%x 60 goto look
+if < \%x 60 goto look
else goto slhup
:sllogin ; login
@@ -1739,7 +1739,7 @@ reinput 1 {\255}
if success goto slhup
reinput 1 {\127}
if success goto slhup
-if < \%x 10 goto slloop ; try 10 times to get a login prompt
+if < \%x 10 goto slloop ; try 10 times to get a login prompt
else goto slhup ; hang up and start again if 10 failures
:sluid
diff --git a/ja_JP.eucJP/books/handbook/preface/preface.xml b/ja_JP.eucJP/books/handbook/preface/preface.xml
index 541ce41af6..44078b6854 100644
--- a/ja_JP.eucJP/books/handbook/preface/preface.xml
+++ b/ja_JP.eucJP/books/handbook/preface/preface.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
+<?xml version="1.0" encoding="euc-jp"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Japanese Documentation Project
diff --git a/ja_JP.eucJP/books/handbook/printing/chapter.xml b/ja_JP.eucJP/books/handbook/printing/chapter.xml
index 33deeea85e..39554c77fb 100644
--- a/ja_JP.eucJP/books/handbook/printing/chapter.xml
+++ b/ja_JP.eucJP/books/handbook/printing/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
+<?xml version="1.0" encoding="euc-jp"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Japanese Documentation Project
diff --git a/ja_JP.eucJP/books/handbook/security/chapter.xml b/ja_JP.eucJP/books/handbook/security/chapter.xml
index 941450d408..e8ccf73288 100644
--- a/ja_JP.eucJP/books/handbook/security/chapter.xml
+++ b/ja_JP.eucJP/books/handbook/security/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
+<?xml version="1.0" encoding="euc-jp"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Japanese Documentation Project
@@ -3171,7 +3171,7 @@ options IPSEC_ESP #IP security (crypto; define w/IPSEC)</progr
<screen>
(1)
- �ۥ��� A ------> �ۥ��� B
+ �ۥ��� A ------> �ۥ��� B
(1)PROTO=AH
ALG=MD5(RFC1826)
@@ -3179,8 +3179,8 @@ options IPSEC_ESP #IP security (crypto; define w/IPSEC)</progr
SPI=1000
(2.1)
- �ۥ��� A <------ �ۥ��� B
- <------
+ �ۥ��� A <------ �ۥ��� B
+ <------
(2.2)
(2.1)
@@ -3231,10 +3231,10 @@ B
�ۥ��� A -------------------------------------> �ۥ��� B
10.2.3.4 10.6.7.8
| |
- ========== old AH keyed-md5 ==========>
+ ========== old AH keyed-md5 ==========>
- <========= new AH hmac-sha1 ===========
- <========= new ESP des-cbc ============
+ <========= new AH hmac-sha1 ===========
+ <========= new ESP des-cbc ============
</screen>
</sect2>
diff --git a/ja_JP.eucJP/books/handbook/serialcomms/chapter.xml b/ja_JP.eucJP/books/handbook/serialcomms/chapter.xml
index 58f9bc6b68..6dd0b42bf3 100644
--- a/ja_JP.eucJP/books/handbook/serialcomms/chapter.xml
+++ b/ja_JP.eucJP/books/handbook/serialcomms/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
+<?xml version="1.0" encoding="euc-jp"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Japanese Documentation Project
diff --git a/ja_JP.eucJP/books/handbook/users/chapter.xml b/ja_JP.eucJP/books/handbook/users/chapter.xml
index c9b658f9bb..5cb6f46c0e 100644
--- a/ja_JP.eucJP/books/handbook/users/chapter.xml
+++ b/ja_JP.eucJP/books/handbook/users/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
+<?xml version="1.0" encoding="euc-jp"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Japanese Documentation Project
diff --git a/ja_JP.eucJP/books/handbook/x11/chapter.xml b/ja_JP.eucJP/books/handbook/x11/chapter.xml
index 80df9f8c88..16a25ba7af 100644
--- a/ja_JP.eucJP/books/handbook/x11/chapter.xml
+++ b/ja_JP.eucJP/books/handbook/x11/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
+<?xml version="1.0" encoding="euc-jp"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Japanese Documentation Project
@@ -322,12 +322,12 @@
<sect1 id="x-install">
<title>X11 �Υ��ȡ���</title>
- <para>&os �Υǥե���Ȥ� X11 �ϡ�<application>&xorg;</application>
+ <para>&os; �Υǥե���Ȥ� X11 �ϡ�<application>&xorg;</application>
�Ǥ���
<application>&xorg;</application> �� X.Org Foundation
���������Ƥ��� X Window System �Υ����ץ����ʼ����Ǥ���
<application>&xorg;</application> ��
- <application>&xfree86 4.4RC2</application>
+ <application>&xfree86; 4.4RC2</application>
�� X11R6.6 �Υ����ɤˤ��Ƥ��ޤ���
���� &os; Ports Collection �����Ѳ�ǽ��
<application>&xorg;</application> �ΥС�������
diff --git a/ja_JP.eucJP/books/porters-handbook/book.xml b/ja_JP.eucJP/books/porters-handbook/book.xml
index c94418b23f..c2fa6558d9 100644
--- a/ja_JP.eucJP/books/porters-handbook/book.xml
+++ b/ja_JP.eucJP/books/porters-handbook/book.xml
@@ -3917,7 +3917,7 @@ LDCONFIG_DIRS= %%PREFIX%%/lib/foo %%PREFIX%%/lib/bar</programlisting>
<para>�����ѿ��ϡ��ʲ��Τ褦�ˤ���
<filename>bsd.port.mk</filename> ������ꤵ��ޤ���</para>
- <programlisting>PORTOBJFORMAT!= test -x /usr/bin/objformat && /usr/bin/objformat || echo aout</programlisting>
+ <programlisting>PORTOBJFORMAT!= test -x /usr/bin/objformat && /usr/bin/objformat || echo aout</programlisting>
<para>�����ѿ���Ȥäơ�port �� make
�β����Dz��٤�������ꤹ�٤��Ǥ�����
@@ -4070,8 +4070,8 @@ PKGNAMESUFFIX= ${RESOLUTION}
:
# default
RESOLUTION?= 300
-.if ${RESOLUTION} != 118 && ${RESOLUTION} != 240 && \
- ${RESOLUTION} != 300 && ${RESOLUTION} != 400
+.if ${RESOLUTION} != 118 && ${RESOLUTION} != 240 && \
+ ${RESOLUTION} != 300 && ${RESOLUTION} != 400
@${ECHO} "Error: invalid value for RESOLUTION: \"${RESOLUTION}\""
@${ECHO} "Possible values are: 118, 240, 300 (default) and 400."
@${FALSE}
@@ -6797,17 +6797,17 @@ pre-install:
<para>���Υǥ��쥯�ȥ깽¤�����ե��������¸���Ƥ���������</para>
- <screen>&prompt.root; <userinput>(cd /var/tmp/<replaceable>port-name</replaceable> && find -d * -type d) | sort -r > OLD-DIRS</userinput></screen>
+ <screen>&prompt.root; <userinput>(cd /var/tmp/<replaceable>port-name</replaceable> && find -d * -type d) | sort -r > OLD-DIRS</userinput></screen>
<para>�⤷���ʤ��� port �� <makevar>PREFIX</makevar> �ˤ����Ƚ����ʤ顢
������ port �ȡ��뤷�ƥѥå��ꥹ�Ȥ��뤳�Ȥ��Ǥ��ޤ���</para>
<screen>&prompt.root; <userinput>make install PREFIX=/var/tmp</userinput>
-&prompt.root; <userinput>(cd /var/tmp/<replaceable>port-name</replaceable> && find -d * \! -type d) | sort > pkg-plist</userinput></screen>
+&prompt.root; <userinput>(cd /var/tmp/<replaceable>port-name</replaceable> && find -d * \! -type d) | sort > pkg-plist</userinput></screen>
<para>�������������줿�ǥ��쥯�ȥ�Ϥ��٤ƥѥå��ꥹ�Ȥ��ɲä���ɬ�פ�����ޤ���</para>
- <screen>&prompt.root; <userinput>(cd /var/tmp/<replaceable>port-name</replaceable> && find -d * -type d) | sort -r | comm -13 OLD-DIRS - | sed -e 's#^#@dirrm #' >> pkg-plist</userinput></screen>
+ <screen>&prompt.root; <userinput>(cd /var/tmp/<replaceable>port-name</replaceable> && find -d * -type d) | sort -r | comm -13 OLD-DIRS - | sed -e 's#^#@dirrm #' >> pkg-plist</userinput></screen>
<para>�Ǹ�˥ѥå��ꥹ�Ȥ���������ɬ�פ�����ޤ�;
<emphasis>���٤�</emphasis>����ư������Ƥ���櫓�ǤϤ���ޤ���
diff --git a/ja_JP.eucJP/share/xml/mirrors-local.xsl b/ja_JP.eucJP/share/xml/mirrors-local.xsl
index 849d4cda79..dfeea04e7a 100644
--- a/ja_JP.eucJP/share/xml/mirrors-local.xsl
+++ b/ja_JP.eucJP/share/xml/mirrors-local.xsl
@@ -7,7 +7,6 @@
<xsl:import href="../../../share/xml/mirrors-master.xsl" />
<xsl:output type="xml" encoding="euc-jp"
- omit-xml-declaration="yes"
indent="yes"/>
<!-- template: "mirrors-docbook-contact" -->
From 414e905e1c367614516c06ec07b325c921467289 Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Mon, 21 Jan 2013 17:40:54 +0000
Subject: [PATCH 015/121] - Make the Mongolian documentation valid XML
---
mn_MN.UTF-8/books/handbook/Makefile | 36 +++-
.../handbook/advanced-networking/chapter.xml | 6 +-
mn_MN.UTF-8/books/handbook/audit/chapter.xml | 2 +-
mn_MN.UTF-8/books/handbook/basics/chapter.xml | 2 +-
.../books/handbook/bibliography/chapter.xml | 2 +-
mn_MN.UTF-8/books/handbook/book.xml | 2 +-
mn_MN.UTF-8/books/handbook/boot/chapter.xml | 2 +-
.../books/handbook/bsdinstall/chapter.xml | 4 +-
mn_MN.UTF-8/books/handbook/chapters.ent | 185 +-----------------
mn_MN.UTF-8/books/handbook/colophon.xml | 2 +-
mn_MN.UTF-8/books/handbook/config/chapter.xml | 4 +-
.../books/handbook/cutting-edge/chapter.xml | 73 +------
.../books/handbook/desktop/chapter.xml | 2 +-
mn_MN.UTF-8/books/handbook/disks/chapter.xml | 18 +-
mn_MN.UTF-8/books/handbook/dtrace/chapter.xml | 2 +-
.../books/handbook/eresources/chapter.xml | 9 +-
.../books/handbook/filesystems/chapter.xml | 4 +-
.../books/handbook/firewalls/chapter.xml | 2 +-
mn_MN.UTF-8/books/handbook/geom/chapter.xml | 2 +-
.../books/handbook/install/chapter.xml | 2 +-
.../books/handbook/introduction/chapter.xml | 2 +-
mn_MN.UTF-8/books/handbook/jails/chapter.xml | 2 +-
.../books/handbook/kernelconfig/chapter.xml | 2 +-
mn_MN.UTF-8/books/handbook/l10n/chapter.xml | 2 +-
.../books/handbook/linuxemu/chapter.xml | 10 +-
mn_MN.UTF-8/books/handbook/mac/chapter.xml | 2 +-
mn_MN.UTF-8/books/handbook/mail/chapter.xml | 8 +-
.../books/handbook/mirrors/chapter.xml | 10 +-
.../books/handbook/multimedia/chapter.xml | 4 +-
.../handbook/network-servers/chapter.xml | 2 +-
.../books/handbook/pgpkeys/chapter.xml | 2 +-
mn_MN.UTF-8/books/handbook/ports/chapter.xml | 2 +-
.../books/handbook/ppp-and-slip/chapter.xml | 2 +-
.../books/handbook/preface/preface.xml | 2 +-
.../books/handbook/printing/chapter.xml | 2 +-
.../books/handbook/security/chapter.xml | 2 +-
.../books/handbook/serialcomms/chapter.xml | 2 +-
mn_MN.UTF-8/books/handbook/txtfiles.ent | 2 +-
mn_MN.UTF-8/books/handbook/users/chapter.xml | 2 +-
mn_MN.UTF-8/books/handbook/vinum/chapter.xml | 2 +-
.../books/handbook/virtualization/chapter.xml | 4 +-
mn_MN.UTF-8/books/handbook/x11/chapter.xml | 4 +-
mn_MN.UTF-8/share/xml/glossary.ent | 2 +-
mn_MN.UTF-8/share/xml/mirrors-local.xsl | 1 -
mn_MN.UTF-8/share/xml/trademarks.ent | 2 +-
45 files changed, 111 insertions(+), 327 deletions(-)
diff --git a/mn_MN.UTF-8/books/handbook/Makefile b/mn_MN.UTF-8/books/handbook/Makefile
index a231aeb032..2676cbbd6d 100644
--- a/mn_MN.UTF-8/books/handbook/Makefile
+++ b/mn_MN.UTF-8/books/handbook/Makefile
@@ -318,30 +318,56 @@ DOC_PREFIX?= ${.CURDIR}/../../..
#
# rules generating lists of mirror site from XML database.
#
-XMLDOCS= mirrors-ftp:::mirrors.xml.ftp.inc \
+XMLDOCS= lastmod:::mirrors.lastmod.inc \
+ mirrors-ftp-index:::mirrors.xml.ftp.index.inc \
+ mirrors-ftp:::mirrors.xml.ftp.inc \
+ mirrors-cvsup-index:::mirrors.xml.cvsup.index.inc \
mirrors-cvsup:::mirrors.xml.cvsup.inc \
+ eresources-index:::eresources.xml.www.index.inc \
eresources:::eresources.xml.www.inc
DEPENDSET.DEFAULT= transtable mirror
XSLT.DEFAULT= ${XSL_MIRRORS}
XML.DEFAULT= ${XML_MIRRORS}
NO_TIDY.DEFAULT= yes
+PARAMS.lastmod+= --param 'target' "'lastmod'"
+PARAMS.mirrors-ftp-index+= --param 'type' "'ftp'" \
+ --param 'proto' "'ftp'" \
+ --param 'target' "'index'"
PARAMS.mirrors-ftp+= --param 'type' "'ftp'" \
--param 'proto' "'ftp'" \
--param 'target' "'handbook/mirrors/chapter.xml'"
+PARAMS.mirrors-cvsup-index+= --param 'type' "'cvsup'" \
+ --param 'proto' "'cvsup'" \
+ --param 'target' "'index'"
PARAMS.mirrors-cvsup+= --param 'type' "'cvsup'" \
--param 'proto' "'cvsup'" \
--param 'target' "'handbook/mirrors/chapter.xml'"
+PARAMS.eresources-index+= --param 'type' "'www'" \
+ --param 'proto' "'http'" \
+ --param 'target' "'index'"
PARAMS.eresources+= --param 'type' "'www'" \
--param 'proto' "'http'" \
--param 'target' "'handbook/eresources/chapter.xml'"
-SRCS+= mirrors.xml.ftp.inc \
+SRCS+= mirrors.lastmod.inc \
+ mirrors.xml.ftp.inc \
+ mirrors.xml.ftp.index.inc \
mirrors.xml.cvsup.inc \
- eresources.xml.www.inc
+ mirrors.xml.cvsup.index.inc \
+ eresources.xml.www.inc \
+ eresources.xml.www.index.inc
-CLEANFILES+= mirrors.xml.ftp.inc \
+CLEANFILES+= mirrors.lastmod.inc \
+ mirrors.xml.ftp.inc \
+ mirrors.xml.ftp.index.inc \
mirrors.xml.cvsup.inc \
- eresources.xml.www.inc
+ mirrors.xml.cvsup.index.inc \
+ eresources.xml.www.inc \
+ eresources.xml.www.index.inc
+
+lint: mirrors.lastmod.inc mirrors.xml.ftp.inc mirrors.xml.ftp.index.inc \
+ mirrors.xml.cvsup.inc mirrors.xml.cvsup.index.inc \
+ eresources.xml.www.inc eresources.xml.www.index.inc
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/mn_MN.UTF-8/books/handbook/advanced-networking/chapter.xml b/mn_MN.UTF-8/books/handbook/advanced-networking/chapter.xml
index 3749a328a4..3c64023043 100644
--- a/mn_MN.UTF-8/books/handbook/advanced-networking/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/advanced-networking/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
<!--
The FreeBSD Mongolian Documentation Project
@@ -1911,7 +1911,7 @@ wpa_pairwise=CCMP TKIP <co id="co-ap-wpapsk-pwise"/></programlisting>
<para>Дараагийн алхам нь <application>hostapd</application>-г эхлүүлэх:</para>
- <screen>&prompt.root <userinput>/etc/rc.d/hostapd forcestart</userinput></screen>
+ <screen>&prompt.root; <userinput>/etc/rc.d/hostapd forcestart</userinput></screen>
<screen>&prompt.root; <userinput>ifconfig <replaceable>wlan0</replaceable></userinput>
wlan0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> mtu 2290
@@ -5990,7 +5990,7 @@ ifconfig_carp1="vhid 2 advskew 100 pass testpass 192.168.1.51/24"</programlistin
IP-г хүчилж болох юм. Дараах тушаалыг <hostid>provider.example.org</hostid>
дээр ажиллуулах шаардлагатай:</para>
- <screen>&prompt.root; <userinput>ifconfig carp0 down && ifconfig carp0 up</userinput></screen>
+ <screen>&prompt.root; <userinput>ifconfig carp0 down && ifconfig carp0 up</userinput></screen>
<para>Хостод тохирох <devicename>carp</devicename> интерфэйс дээр
үүнийг хийх ёстой.</para>
diff --git a/mn_MN.UTF-8/books/handbook/audit/chapter.xml b/mn_MN.UTF-8/books/handbook/audit/chapter.xml
index 6cf5537cce..7dabc7b1db 100644
--- a/mn_MN.UTF-8/books/handbook/audit/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/audit/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
<!--
The FreeBSD Mongolian Documentation Project
diff --git a/mn_MN.UTF-8/books/handbook/basics/chapter.xml b/mn_MN.UTF-8/books/handbook/basics/chapter.xml
index 2d571821b6..4bf0b27e55 100644
--- a/mn_MN.UTF-8/books/handbook/basics/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/basics/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
<!--
The FreeBSD Mongolian Documentation Project
diff --git a/mn_MN.UTF-8/books/handbook/bibliography/chapter.xml b/mn_MN.UTF-8/books/handbook/bibliography/chapter.xml
index 029293b543..037fba34b3 100644
--- a/mn_MN.UTF-8/books/handbook/bibliography/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/bibliography/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
<!--
The FreeBSD Mongolian Documentation Project
diff --git a/mn_MN.UTF-8/books/handbook/book.xml b/mn_MN.UTF-8/books/handbook/book.xml
index 742a89cc42..1328ce29dd 100644
--- a/mn_MN.UTF-8/books/handbook/book.xml
+++ b/mn_MN.UTF-8/books/handbook/book.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
"../../../share/xml/freebsd42.dtd" [
<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//MN" "../../share/xml/entities.ent">
diff --git a/mn_MN.UTF-8/books/handbook/boot/chapter.xml b/mn_MN.UTF-8/books/handbook/boot/chapter.xml
index 490cbb6ea6..b7b8ddb19c 100644
--- a/mn_MN.UTF-8/books/handbook/boot/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/boot/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
<!--
The FreeBSD Mongolian Documentation Project
diff --git a/mn_MN.UTF-8/books/handbook/bsdinstall/chapter.xml b/mn_MN.UTF-8/books/handbook/bsdinstall/chapter.xml
index 51069006d0..3fe3e6f5c9 100644
--- a/mn_MN.UTF-8/books/handbook/bsdinstall/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/bsdinstall/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
<!--
The FreeBSD Mongolian Documentation Project
@@ -670,7 +670,7 @@ Loading /boot/defaults/loader.conf
<keycap>Alt</keycap>
<keycap>O</keycap>
<keycap>F</keycap>
- </keycombo> товчлууруудыг &apple биш гар дээр дарж хийнэ.
+ </keycombo> товчлууруудыг &apple; биш гар дээр дарж хийнэ.
<prompt>0 ></prompt> гарч ирэхэд доорхийг бичнэ.</para>
<screen><userinput>boot cd:,\ppc\loader cd:0</userinput></screen>
diff --git a/mn_MN.UTF-8/books/handbook/chapters.ent b/mn_MN.UTF-8/books/handbook/chapters.ent
index 0956278d0e..af58bdce2a 100644
--- a/mn_MN.UTF-8/books/handbook/chapters.ent
+++ b/mn_MN.UTF-8/books/handbook/chapters.ent
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
<!--
The FreeBSD Mongolian Documentation Project
@@ -16,235 +16,62 @@
-->
-<!ENTITY % not.published "INCLUDE">
-
-<!ENTITY % chap.introduction "IGNORE">
-<!ENTITY % chap.install "IGNORE">
-<!ENTITY % chap.bsdinstall "IGNORE">
-<!ENTITY % chap.basics "IGNORE">
-<!ENTITY % chap.ports "IGNORE">
-<!ENTITY % chap.config "IGNORE">
-<!ENTITY % chap.boot "IGNORE">
-<!ENTITY % chap.users "IGNORE">
-<!ENTITY % chap.kernelconfig "IGNORE">
-<!ENTITY % chap.security "IGNORE">
-<!ENTITY % chap.jails "IGNORE">
-<!ENTITY % chap.printing "IGNORE">
-<!ENTITY % chap.disks "IGNORE">
-<!ENTITY % chap.geom "IGNORE">
-<!ENTITY % chap.vinum "IGNORE">
-<!ENTITY % chap.x11 "IGNORE">
-<!ENTITY % chap.l10n "IGNORE">
-<!ENTITY % chap.multimedia "IGNORE">
-<!ENTITY % chap.desktop "IGNORE">
-<!ENTITY % chap.serialcomms "IGNORE">
-<!ENTITY % chap.ppp-and-slip "IGNORE">
-<!ENTITY % chap.advanced-networking "IGNORE">
-<!ENTITY % chap.firewalls "IGNORE">
-<!ENTITY % chap.network-servers "IGNORE">
-<!ENTITY % chap.mail "IGNORE">
-<!ENTITY % chap.cutting-edge "IGNORE">
-<!ENTITY % chap.linuxemu "IGNORE">
-<!ENTITY % chap.mirrors "IGNORE">
-<!ENTITY % chap.mirrors.ftp.inc "INCLUDE">
-<!ENTITY % chap.mirrors.cvsup.inc "INCLUDE">
-<!ENTITY % chap.bibliography "IGNORE">
-<!ENTITY % chap.eresources "IGNORE">
-<!ENTITY % chap.eresources.www.inc "INCLUDE">
-<!ENTITY % chap.pgpkeys "IGNORE">
-<!ENTITY % chap.index "IGNORE">
-<!ENTITY % chap.freebsd-glossary "IGNORE">
-<!ENTITY % chap.mac "IGNORE">
-<!ENTITY % chap.audit "IGNORE">
-<!ENTITY % chap.filesystems "IGNORE">
-<!ENTITY % chap.dtrace "IGNORE">
-
<!ENTITY chap.preface SYSTEM "preface/preface.xml">
<!ENTITY % pgpkeys SYSTEM "../../../share/pgpkeys/pgpkeys.ent"> %pgpkeys;
<!-- Part One -->
-<![%chap.introduction;[
<!ENTITY chap.introduction SYSTEM "introduction/chapter.xml">
-]]>
-<![%chap.install;[
<!ENTITY chap.install SYSTEM "install/chapter.xml">
-]]>
-<![%chap.bsdinstall;[
<!ENTITY chap.bsdinstall SYSTEM "bsdinstall/chapter.xml">
-]]>
-<![%chap.basics;[
<!ENTITY chap.basics SYSTEM "basics/chapter.xml">
-]]>
-<![%chap.ports;[
<!ENTITY chap.ports SYSTEM "ports/chapter.xml">
-]]>
-<![%chap.x11;[
<!ENTITY chap.x11 SYSTEM "x11/chapter.xml">
-]]>
<!-- Part Two -->
-<![%chap.desktop;[
<!ENTITY chap.desktop SYSTEM "desktop/chapter.xml">
-]]>
-<![%chap.multimedia;[
<!ENTITY chap.multimedia SYSTEM "multimedia/chapter.xml">
-]]>
-<![%chap.kernelconfig;[
<!ENTITY chap.kernelconfig SYSTEM "kernelconfig/chapter.xml">
-]]>
-<![%chap.printing;[
<!ENTITY chap.printing SYSTEM "printing/chapter.xml">
-]]>
-<![%chap.linuxemu;[
<!ENTITY chap.linuxemu SYSTEM "linuxemu/chapter.xml">
-]]>
<!-- Part Three -->
-<![%chap.config;[
<!ENTITY chap.config SYSTEM "config/chapter.xml">
-]]>
-<![%chap.boot;[
<!ENTITY chap.boot SYSTEM "boot/chapter.xml">
-]]>
-<![%chap.users;[
<!ENTITY chap.users SYSTEM "users/chapter.xml">
-]]>
-<![%chap.security;[
<!ENTITY chap.security SYSTEM "security/chapter.xml">
-]]>
-<![%chap.jails;[
<!ENTITY chap.jails SYSTEM "jails/chapter.xml">
-]]>
-<![%chap.mac;[
<!ENTITY chap.mac SYSTEM "mac/chapter.xml">
-]]>
-<![%chap.audit;[
<!ENTITY chap.audit SYSTEM "audit/chapter.xml">
-]]>
-<![%chap.disks;[
<!ENTITY chap.disks SYSTEM "disks/chapter.xml">
-]]>
-<![%chap.geom;[
<!ENTITY chap.geom SYSTEM "geom/chapter.xml">
-]]>
-<![%chap.filesystems;[
<!ENTITY chap.filesystems SYSTEM "filesystems/chapter.xml">
-]]>
-<![%chap.vinum;[
<!ENTITY chap.vinum SYSTEM "vinum/chapter.xml">
-]]>
-<![%chap.virtualization;[
<!ENTITY chap.virtualization SYSTEM "virtualization/chapter.xml">
-]]>
-<![%chap.l10n;[
<!ENTITY chap.l10n SYSTEM "l10n/chapter.xml">
-]]>
-<![%chap.cutting-edge;[
<!ENTITY chap.cutting-edge SYSTEM "cutting-edge/chapter.xml">
-]]>
-<![%chap.dtrace;[
<!ENTITY chap.dtrace SYSTEM "dtrace/chapter.xml">
-]]>
<!-- Part Four -->
-<![%chap.serialcomms;[
<!ENTITY chap.serialcomms SYSTEM "serialcomms/chapter.xml">
-]]>
-<![%chap.ppp-and-slip;[
<!ENTITY chap.ppp-and-slip SYSTEM "ppp-and-slip/chapter.xml">
-]]>
-<![%chap.mail;[
<!ENTITY chap.mail SYSTEM "mail/chapter.xml">
-]]>
-<![%chap.network-servers;[
<!ENTITY chap.network-servers SYSTEM "network-servers/chapter.xml">
-]]>
-<![%chap.firewalls;[
<!ENTITY chap.firewalls SYSTEM "firewalls/chapter.xml">
-]]>
-<![%chap.advanced-networking;[
<!ENTITY chap.advanced-networking SYSTEM "advanced-networking/chapter.xml">
-]]>
<!-- Part Five (appendices) -->
-<![%chap.mirrors;[
<!ENTITY chap.mirrors SYSTEM "mirrors/chapter.xml">
-]]>
-<![%chap.mirrors.ftp.inc;[
+ <!ENTITY chap.mirrors.lastmod.inc SYSTEM "mirrors.lastmod.inc">
+ <!ENTITY chap.mirrors.ftp.index.inc SYSTEM "mirrors.xml.ftp.index.inc">
<!ENTITY chap.mirrors.ftp.inc SYSTEM "mirrors.xml.ftp.inc">
-]]>
-<![%chap.mirrors.cvsup.inc;[
+ <!ENTITY chap.mirrors.cvsup.index.inc SYSTEM "mirrors.xml.cvsup.index.inc">
<!ENTITY chap.mirrors.cvsup.inc SYSTEM "mirrors.xml.cvsup.inc">
-]]>
-<![%chap.bibliography;[
<!ENTITY chap.bibliography SYSTEM "bibliography/chapter.xml">
-]]>
-<![%chap.eresources;[
<!ENTITY chap.eresources SYSTEM "eresources/chapter.xml">
-]]>
-<![%chap.eresources.www.inc;[
+ <!ENTITY chap.eresources.www.index.inc SYSTEM "eresources.xml.www.index.inc">
<!ENTITY chap.eresources.www.inc SYSTEM "eresources.xml.www.inc">
-]]>
-<![%chap.pgpkeys;[
<!ENTITY chap.pgpkeys SYSTEM "pgpkeys/chapter.xml">
-]]>
-<![%chap.freebsd-glossary;[
<!ENTITY chap.freebsd-glossary "&freebsd-glossary;">
-]]>
-<![%chap.index;[
- <!ENTITY chap.index SYSTEM "index.xml">
-]]>
+ <!ENTITY chap.index "">
<!ENTITY chap.colophon SYSTEM "colophon.xml">
-
-<!-- IGNORE cases -->
-
-<!-- Part One -->
-<!ENTITY chap.introduction "">
-<!ENTITY chap.install "">
-<!ENTITY chap.basics "">
-<!ENTITY chap.ports "">
-<!ENTITY chap.x11 "">
-
-<!-- Part Two -->
-<!ENTITY chap.desktop "">
-<!ENTITY chap.multimedia "">
-<!ENTITY chap.kernelconfig "">
-<!ENTITY chap.printing "">
-<!ENTITY chap.linuxemu "">
-
-<!-- Part Three -->
-<!ENTITY chap.config "">
-<!ENTITY chap.boot "">
-<!ENTITY chap.users "">
-<!ENTITY chap.security "">
-<!ENTITY chap.jails "">
-<!ENTITY chap.mac "">
-<!ENTITY chap.audit "">
-<!ENTITY chap.disks "">
-<!ENTITY chap.geom "">
-<!ENTITY chap.filesystems "">
-<!ENTITY chap.vinum "">
-<!ENTITY chap.virtualization "">
-<!ENTITY chap.l10n "">
-<!ENTITY chap.cutting-edge "">
-<!ENTITY chap.dtrace "">
-
-<!-- Part Four -->
-<!ENTITY chap.serialcomms "">
-<!ENTITY chap.ppp-and-slip "">
-<!ENTITY chap.mail "">
-<!ENTITY chap.network-servers "">
-<!ENTITY chap.firewalls "">
-<!ENTITY chap.advanced-networking "">
-
-<!-- Part Five (appendices) -->
-<!ENTITY chap.mirrors "">
-<!ENTITY chap.mirrors.ftp.inc "">
-<!ENTITY chap.mirrors.cvsup.inc "">
-<!ENTITY chap.bibliography "">
-<!ENTITY chap.eresources "">
-<!ENTITY chap.eresources.www.inc "">
-<!ENTITY chap.pgpkeys "">
-<!ENTITY chap.freebsd-glossary "">
-<!ENTITY chap.index "">
diff --git a/mn_MN.UTF-8/books/handbook/colophon.xml b/mn_MN.UTF-8/books/handbook/colophon.xml
index ec30c3caff..e51f300a01 100644
--- a/mn_MN.UTF-8/books/handbook/colophon.xml
+++ b/mn_MN.UTF-8/books/handbook/colophon.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
<!--
The FreeBSD Mongolian Documentation Project
diff --git a/mn_MN.UTF-8/books/handbook/config/chapter.xml b/mn_MN.UTF-8/books/handbook/config/chapter.xml
index 90f93e66cd..9d26c1d8a4 100644
--- a/mn_MN.UTF-8/books/handbook/config/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/config/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
<!--
The FreeBSD Mongolian Documentation Project
@@ -756,7 +756,7 @@ sshd is running as pid 433.</screen>
<para><filename>rc.d</filename> системийн талаар нэмэлт мэдээллийг &man.rc.8;
болон &man.rc.subr.8; гарын авлагын хуудаснуудаас олж болно. Хэрэв та өөрийн
rc.d скриптүүд бичих эсвэл байгаагаа сайжруулахыг сонирхож байгаа бол танд бас
- <ulink url="&url.articles.rc-scripting">энэ нийтлэл</ulink> хэрэгтэй байж
+ <ulink url="&url.articles.rc-scripting;">энэ нийтлэл</ulink> хэрэгтэй байж
болох юм.</para>
</sect1>
diff --git a/mn_MN.UTF-8/books/handbook/cutting-edge/chapter.xml b/mn_MN.UTF-8/books/handbook/cutting-edge/chapter.xml
index 2542bdf069..34a31cddeb 100644
--- a/mn_MN.UTF-8/books/handbook/cutting-edge/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/cutting-edge/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
<!--
The FreeBSD Mongolian Documentation Project
@@ -1123,77 +1123,6 @@ Fetching 133 new ports or files... done.</screen>
<screen>&prompt.root; <userinput>portupgrade -PP hu-freebsd-doc</userinput></screen>
</sect3>
</sect2>
-
-<!-- FIXME: Waiting for a working docsnap server... -->
-<![ IGNORE [
- <sect2 id="docsnap">
- <sect2info>
- <authorgroup>
- <author>
- <firstname>Пав</firstname>
- <surname>Лукистник</surname>
- <contrib>Мэдээллээр хангасан </contrib>
- </author>
- </authorgroup>
- </sect2info>
-
- <title>Docsnap-ийг ашиглах нь</title>
-
- <indexterm><primary>Updating and Upgrading</primary></indexterm>
-
- <indexterm>
- <primary>Docsnap</primary>
- <see>Updating and Upgrading</see>
- </indexterm>
-
- <para><application>Docsnap</application> нь &os;-ийн баримтуудыг
- хялбар, хурдан аргаар шинэчлэхэд зориулагдсан &man.rsync.1;
- репозитор юм. <quote><application>Docsnap</application> сервер</quote>
- нь баримтын эхүүдийг дагаж тэдгээрийг цаг бүр HTML хэлбэрт бүтээж
- байдаг. <filename role="package">textproc/docproj</filename> нь
- <application>Docsnap</application>-д хэрэггүй байдаг. Учир нь
- зөвхөн бүтээсэн баримтад зориулсан нөхөөсүүд байдаг болохоор тэр юм.</para>
-
- <para>Энэ техникийг ашиглахад шаардлагатай цорын ганц зүйл нь
- <filename role="package">net/rsync</filename> порт юм уу эсвэл багц
- байдаг. Үүнийг нэмэхийн тулд дараах тушаалыг ашиглана:</para>
-
- <screen>&prompt.root; <userinput>pkg_add -r rsync</userinput></screen>
-
- <note>
- <para><application>Docsnap</application> нь
- <filename class="directory">/usr/share/doc</filename>-д суулгагдсан
- баримтыг шинэчлэхэд зориулж анхлан хөгжүүлэгдсэн боловч дараах жишээнүүдийг
- бусад сангуудын хувьд тохируулан ашиглаж болно. Хэрэглэгчийн сангуудын
- хувьд энэ нь <username>root</username> эрхийг шаарддаггүй.</para>
- </note>
-
- <para>Баримтын цуглуулгыг шинэчлэхийн тулд дараах тушаалыг
- ажиллуулна:</para>
-
- <screen>&prompt.root; <userinput>rsync -rltvz <replaceable>docsnap.sk.FreeBSD.org</replaceable>::docsnap <replaceable>/usr/share/doc</replaceable></userinput></screen>
-
- <note>
- <para>Одоогоор зөвхөн нэг <application>Docsnap</application>
- сервер байгаа, <hostid>docsnap.sk.FreeBSD.org</hostid> дээр
- харуулагдсан байгаа.</para>
- </note>
-
- <para>Энд <option>--delete</option> тохируулыг ашиглах хэрэггүй,
- учир нь <command>make installworld</command> тушаалын үеэр
- <filename class="directory">/usr/share/doc</filename>
- санд суулгагдсан зарим зүйлсийг санамсаргүйгээр устгаж болох юм.
- Цэвэрлэхийн тулд энэ тушаалыг ашиглана:</para>
-
- <screen>&prompt.root; <userinput>rsync -rltvz --delete <replaceable>docsnap.sk.FreeBSD.org</replaceable>::docsnap/??_??\.\* <replaceable>/usr/share/doc</replaceable></userinput></screen>
-
- <para>Хэрэв баримтын хэсгийг шинэчлэх шаардлагатай бол жишээ нь
- Англи баримтыг зөвхөн шинэчлэх бол дараах тушаалыг ашиглах
- шаардлагатай:</para>
-
- <screen>&prompt.root; <userinput>rsync -rltvz <replaceable>docsnap.sk.FreeBSD.org</replaceable>::docsnap/en_US.ISO8859-1 <replaceable>/usr/share/doc</replaceable></userinput></screen>
- </sect2>
-]]>
</sect1>
<sect1 id="current-stable">
diff --git a/mn_MN.UTF-8/books/handbook/desktop/chapter.xml b/mn_MN.UTF-8/books/handbook/desktop/chapter.xml
index 7eba781704..3ef3939800 100644
--- a/mn_MN.UTF-8/books/handbook/desktop/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/desktop/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
<!--
The FreeBSD Mongolian Documentation Project
diff --git a/mn_MN.UTF-8/books/handbook/disks/chapter.xml b/mn_MN.UTF-8/books/handbook/disks/chapter.xml
index 75d9606ec7..d6b143e816 100644
--- a/mn_MN.UTF-8/books/handbook/disks/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/disks/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
<!--
The FreeBSD Mongolian Documentation Project
@@ -2698,16 +2698,6 @@ sa0(ncr1:4:0): Logical unit is in process of becoming ready</screen>
Сүйрэл эсвэл өгөгдлийн алдагдалд хүргэсэн тэр явдал дахин болж болох юм. Одоо зарцуулсан
нэг цаг таныг зовлонд учрахаас хожим аварч болох юм.</para>
</sect3>
-
-<![ %not.published; [
-
- <sect3>
- <title>* I Did Not Prepare for the Disaster, What Now?</title>
-
- <para></para>
- </sect3>
-]]>
-
</sect2>
</sect1>
@@ -4401,7 +4391,7 @@ case "$1" in
# Wait for any "hastd secondary" processes to stop
for disk in ${resources}; do
- while $( pgrep -lf "hastd: ${disk} \(secondary\)" > /dev/null 2>&1 ); do
+ while $( pgrep -lf "hastd: ${disk} \(secondary\)" > /dev/null 2>&1 ); do
sleep 1
done
@@ -4416,7 +4406,7 @@ case "$1" in
# Wait for the /dev/hast/* devices to appear
for disk in ${resources}; do
for I in $( jot 60 ); do
- [ -c "/dev/hast/${disk}" ] && break
+ [ -c "/dev/hast/${disk}" ] && break
sleep 0.5
done
@@ -4449,7 +4439,7 @@ case "$1" in
umount -f /hast/${disk}
fi
sleep $delay
- hastctl role secondary ${disk} 2>&1
+ hastctl role secondary ${disk} 2>&1
if [ $? -ne 0 ]; then
logger -p $log -t $name "Unable to switch role to secondary for resource ${disk}."
exit 1
diff --git a/mn_MN.UTF-8/books/handbook/dtrace/chapter.xml b/mn_MN.UTF-8/books/handbook/dtrace/chapter.xml
index b0bef58d6a..0a2ab0ae5d 100644
--- a/mn_MN.UTF-8/books/handbook/dtrace/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/dtrace/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
<!--
The FreeBSD Mongolian Documentation Project
diff --git a/mn_MN.UTF-8/books/handbook/eresources/chapter.xml b/mn_MN.UTF-8/books/handbook/eresources/chapter.xml
index 3aae5c4e5a..9d6235dc61 100644
--- a/mn_MN.UTF-8/books/handbook/eresources/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/eresources/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
<!--
The FreeBSD Mongolian Documentation Project
@@ -356,7 +356,7 @@
<row>
<entry>&a.mips.name;</entry>
- <entry>FreeBSD-г &mips рүү порт хийх;</entry>
+ <entry>FreeBSD-г &mips; рүү порт хийх;</entry>
</row>
<row>
@@ -2064,6 +2064,11 @@
<sect2 id="eresources-web-mirrors">
<title>Албан ёсны толин хуудаснууд</title>
+
+ &chap.eresources.www.index.inc;
+
+ &chap.mirrors.lastmod.inc;
+
&chap.eresources.www.inc;
</sect2>
</sect1>
diff --git a/mn_MN.UTF-8/books/handbook/filesystems/chapter.xml b/mn_MN.UTF-8/books/handbook/filesystems/chapter.xml
index 110e8fb810..ab2e4c956d 100644
--- a/mn_MN.UTF-8/books/handbook/filesystems/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/filesystems/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
<!--
The FreeBSD Mongolian Documentation Project
@@ -220,7 +220,7 @@ example 17547136 0 17547136 0% /example</screen>
шиг хандах боломжтой, үүн дээр файлууд үүсгэж хэрэглэгчид
дараах жишээн дээрх шиг үзэх боломжтой байна:</para>
- <screen>&prompt.root <userinput>cd /example</userinput>
+ <screen>&prompt.root; <userinput>cd /example</userinput>
&prompt.root; <userinput>ls</userinput>
&prompt.root; <userinput>touch testfile</userinput>
&prompt.root; <userinput>ls -al</userinput>
diff --git a/mn_MN.UTF-8/books/handbook/firewalls/chapter.xml b/mn_MN.UTF-8/books/handbook/firewalls/chapter.xml
index d522a19d7a..5994738ef3 100644
--- a/mn_MN.UTF-8/books/handbook/firewalls/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/firewalls/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
<!--
The FreeBSD Mongolian Documentation Project
diff --git a/mn_MN.UTF-8/books/handbook/geom/chapter.xml b/mn_MN.UTF-8/books/handbook/geom/chapter.xml
index 06580a67ef..720d070a4f 100644
--- a/mn_MN.UTF-8/books/handbook/geom/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/geom/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
<!--
The FreeBSD Mongolian Documentation Project
diff --git a/mn_MN.UTF-8/books/handbook/install/chapter.xml b/mn_MN.UTF-8/books/handbook/install/chapter.xml
index fb22b3a2de..319ae3d3c0 100644
--- a/mn_MN.UTF-8/books/handbook/install/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/install/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
<!--
The FreeBSD Mongolian Documentation Project
diff --git a/mn_MN.UTF-8/books/handbook/introduction/chapter.xml b/mn_MN.UTF-8/books/handbook/introduction/chapter.xml
index 42bc34fd0e..35ea406b22 100644
--- a/mn_MN.UTF-8/books/handbook/introduction/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/introduction/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
<!--
The FreeBSD Mongolian Documentation Project
diff --git a/mn_MN.UTF-8/books/handbook/jails/chapter.xml b/mn_MN.UTF-8/books/handbook/jails/chapter.xml
index 3b8eebd155..768f3b8e75 100644
--- a/mn_MN.UTF-8/books/handbook/jails/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/jails/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
<!--
The FreeBSD Mongolian Documentation Project
diff --git a/mn_MN.UTF-8/books/handbook/kernelconfig/chapter.xml b/mn_MN.UTF-8/books/handbook/kernelconfig/chapter.xml
index a5fa3ac99e..d862fdb8f2 100644
--- a/mn_MN.UTF-8/books/handbook/kernelconfig/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/kernelconfig/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
<!--
The FreeBSD Mongolian Documentation Project
diff --git a/mn_MN.UTF-8/books/handbook/l10n/chapter.xml b/mn_MN.UTF-8/books/handbook/l10n/chapter.xml
index f7139a13d6..7dc835771d 100644
--- a/mn_MN.UTF-8/books/handbook/l10n/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/l10n/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
<!--
The FreeBSD Mongolian Documentation Project
diff --git a/mn_MN.UTF-8/books/handbook/linuxemu/chapter.xml b/mn_MN.UTF-8/books/handbook/linuxemu/chapter.xml
index 8b18ee7446..c3a36e1b3b 100644
--- a/mn_MN.UTF-8/books/handbook/linuxemu/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/linuxemu/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
<!--
The FreeBSD Mongolian Documentation Project
@@ -627,14 +627,14 @@ LOG=/var/log/lmgrd.log
case "$1" in
start)
- lmgrd -c ${LICENSE_FILE} 2>> ${LOG} 1>&2
+ lmgrd -c ${LICENSE_FILE} 2>> ${LOG} 1>&2
echo -n " lmgrd"
;;
stop)
- lmgrd -c ${LICENSE_FILE} -x lmdown 2>> ${LOG} 1>&2
+ lmgrd -c ${LICENSE_FILE} -x lmdown 2>> ${LOG} 1>&2
;;
*)
- echo "Usage: `basename $0` {start|stop}" 1>&2
+ echo "Usage: `basename $0` {start|stop}" 1>&2
exit 64
;;
esac
@@ -905,7 +905,7 @@ exit 0</programlisting>
үүсгэнэ:</para>
<programlisting>#!/compat/linux/bin/sh
-(sleep 5; killall -1 matlab_helper) &
+(sleep 5; killall -1 matlab_helper) &
exit 0</programlisting>
</step>
diff --git a/mn_MN.UTF-8/books/handbook/mac/chapter.xml b/mn_MN.UTF-8/books/handbook/mac/chapter.xml
index a85e268883..b7b9dd4e80 100644
--- a/mn_MN.UTF-8/books/handbook/mac/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/mac/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
<!--
The FreeBSD Mongolian Documentation Project
diff --git a/mn_MN.UTF-8/books/handbook/mail/chapter.xml b/mn_MN.UTF-8/books/handbook/mail/chapter.xml
index cf17f1724e..bec5b653f6 100644
--- a/mn_MN.UTF-8/books/handbook/mail/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/mail/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
<!--
The FreeBSD Mongolian Documentation Project
@@ -1604,11 +1604,11 @@ SENDMAIL_LDADD=-lsasl2</programlisting>
<para>Дараах тушаалуудыг ажиллуулж <application>sendmail</application>-г дахин эмхэтгэнэ:</para>
<screen>&prompt.root; <userinput>cd /usr/src/lib/libsmutil</userinput>
-&prompt.root; <userinput>make cleandir && make obj && make</userinput>
+&prompt.root; <userinput>make cleandir && make obj && make</userinput>
&prompt.root; <userinput>cd /usr/src/lib/libsm</userinput>
-&prompt.root; <userinput>make cleandir && make obj && make</userinput>
+&prompt.root; <userinput>make cleandir && make obj && make</userinput>
&prompt.root; <userinput>cd /usr/src/usr.sbin/sendmail</userinput>
-&prompt.root; <userinput>make cleandir && make obj && make && make install</userinput></screen>
+&prompt.root; <userinput>make cleandir && make obj && make && make install</userinput></screen>
<para><filename>/usr/src</filename> тийм ч ихээр өөрчлөгдөөгүй бөгөөд
хэрэгцээтэй хуваалцдаг сангууд байгаа тохиолдолд <application>sendmail</application>-ийн эмхэтгэлт
diff --git a/mn_MN.UTF-8/books/handbook/mirrors/chapter.xml b/mn_MN.UTF-8/books/handbook/mirrors/chapter.xml
index 41b9c0da99..e673bc1c99 100644
--- a/mn_MN.UTF-8/books/handbook/mirrors/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/mirrors/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
<!--
The FreeBSD Mongolian Documentation Project
@@ -204,6 +204,10 @@
Сайт болгоны хувьд хандах аргууд нь хостын нэрийн дараа хаалтанд өгөгдсөн
байгаа болно.</para>
+ &chap.mirrors.ftp.index.inc;
+
+ &chap.mirrors.lastmod.inc;
+
&chap.mirrors.ftp.inc;
</sect1>
@@ -2340,6 +2344,10 @@ doc/zh_*</screen>
<para>&os;-д зориулсан <link linkend="cvsup">CVSup</link> серверүүд дараах хаягууд дээр
ажиллаж байгаа:</para>
+ &chap.mirrors.cvsup.index.inc;
+
+ &chap.mirrors.lastmod.inc;
+
&chap.mirrors.cvsup.inc;
</sect2>
</sect1>
diff --git a/mn_MN.UTF-8/books/handbook/multimedia/chapter.xml b/mn_MN.UTF-8/books/handbook/multimedia/chapter.xml
index 83b3e4498b..19d0f02939 100644
--- a/mn_MN.UTF-8/books/handbook/multimedia/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/multimedia/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
<!--
The FreeBSD Mongolian Documentation Project
@@ -1556,7 +1556,7 @@ bktr0: Pinnacle/Miro TV, Philips SECAM tuner.</programlisting>
<para>MythTV өгөгдлийн санг суулгана:</para>
- <screen>&prompt.root; <userinput>mysql -uroot -p < /usr/local/share/mythtv/database/mc.sql</userinput></screen>
+ <screen>&prompt.root; <userinput>mysql -uroot -p < /usr/local/share/mythtv/database/mc.sql</userinput></screen>
<para>Арын тохиргоог хийнэ:</para>
diff --git a/mn_MN.UTF-8/books/handbook/network-servers/chapter.xml b/mn_MN.UTF-8/books/handbook/network-servers/chapter.xml
index 278d3b5c3c..d1f805c885 100644
--- a/mn_MN.UTF-8/books/handbook/network-servers/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/network-servers/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
<!--
The FreeBSD Mongolian Documentation Project
diff --git a/mn_MN.UTF-8/books/handbook/pgpkeys/chapter.xml b/mn_MN.UTF-8/books/handbook/pgpkeys/chapter.xml
index 9fce65a91b..f0e6482cb1 100644
--- a/mn_MN.UTF-8/books/handbook/pgpkeys/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/pgpkeys/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
<!--
The FreeBSD Mongolian Documentation Project
diff --git a/mn_MN.UTF-8/books/handbook/ports/chapter.xml b/mn_MN.UTF-8/books/handbook/ports/chapter.xml
index 2511ce566f..139258a782 100644
--- a/mn_MN.UTF-8/books/handbook/ports/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/ports/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
<!--
The FreeBSD Mongolian Documentation Project
diff --git a/mn_MN.UTF-8/books/handbook/ppp-and-slip/chapter.xml b/mn_MN.UTF-8/books/handbook/ppp-and-slip/chapter.xml
index fee27be3f4..a591304be5 100644
--- a/mn_MN.UTF-8/books/handbook/ppp-and-slip/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/ppp-and-slip/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
<!--
The FreeBSD Mongolian Documentation Project
diff --git a/mn_MN.UTF-8/books/handbook/preface/preface.xml b/mn_MN.UTF-8/books/handbook/preface/preface.xml
index 57bcb3ddf3..48ae9c1b4f 100644
--- a/mn_MN.UTF-8/books/handbook/preface/preface.xml
+++ b/mn_MN.UTF-8/books/handbook/preface/preface.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
<!--
The FreeBSD Mongolian Documentation Project
diff --git a/mn_MN.UTF-8/books/handbook/printing/chapter.xml b/mn_MN.UTF-8/books/handbook/printing/chapter.xml
index 766d3d6c5b..bbbb1a5882 100644
--- a/mn_MN.UTF-8/books/handbook/printing/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/printing/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
<!--
The FreeBSD Mongolian Documentation Project
diff --git a/mn_MN.UTF-8/books/handbook/security/chapter.xml b/mn_MN.UTF-8/books/handbook/security/chapter.xml
index 02cc2bd71f..9fb3448efc 100644
--- a/mn_MN.UTF-8/books/handbook/security/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/security/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
<!--
The FreeBSD Mongolian Documentation Project
diff --git a/mn_MN.UTF-8/books/handbook/serialcomms/chapter.xml b/mn_MN.UTF-8/books/handbook/serialcomms/chapter.xml
index 75994bac34..a2b3349d27 100644
--- a/mn_MN.UTF-8/books/handbook/serialcomms/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/serialcomms/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
<!--
The FreeBSD Mongolian Documentation Project
diff --git a/mn_MN.UTF-8/books/handbook/txtfiles.ent b/mn_MN.UTF-8/books/handbook/txtfiles.ent
index f37cdbb854..0cf7bab3e2 100644
--- a/mn_MN.UTF-8/books/handbook/txtfiles.ent
+++ b/mn_MN.UTF-8/books/handbook/txtfiles.ent
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
<!--
The FreeBSD Mongolian Documentation Project
diff --git a/mn_MN.UTF-8/books/handbook/users/chapter.xml b/mn_MN.UTF-8/books/handbook/users/chapter.xml
index cf3d49bbd8..a21494175d 100644
--- a/mn_MN.UTF-8/books/handbook/users/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/users/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
<!--
The FreeBSD Mongolian Documentation Project
diff --git a/mn_MN.UTF-8/books/handbook/vinum/chapter.xml b/mn_MN.UTF-8/books/handbook/vinum/chapter.xml
index d1375c54cb..535dd94e9b 100644
--- a/mn_MN.UTF-8/books/handbook/vinum/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/vinum/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
<!--
The FreeBSD Mongolian Documentation Project
diff --git a/mn_MN.UTF-8/books/handbook/virtualization/chapter.xml b/mn_MN.UTF-8/books/handbook/virtualization/chapter.xml
index 7d2cf465fd..0297d5045b 100644
--- a/mn_MN.UTF-8/books/handbook/virtualization/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/virtualization/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
<!--
The FreeBSD Mongolian Documentation Project
@@ -1009,7 +1009,7 @@ xenbr1 8000.feffffffffff no vif0.1
role="package">emulators/virtualbox-ose-additions</filename> багцыг
&os; зочин дээр суулгана.</para>
- <screen>&prompt.root; <userinput>cd /usr/ports/emulators/virtualbox-ose-additions && make install clean</userinput></screen>
+ <screen>&prompt.root; <userinput>cd /usr/ports/emulators/virtualbox-ose-additions && make install clean</userinput></screen>
<para>Дараах мөрүүдийг <filename>/etc/rc.conf</filename>-д нэмнэ:</para>
diff --git a/mn_MN.UTF-8/books/handbook/x11/chapter.xml b/mn_MN.UTF-8/books/handbook/x11/chapter.xml
index febf06d616..79744f99ee 100644
--- a/mn_MN.UTF-8/books/handbook/x11/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/x11/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
<!--
The FreeBSD Mongolian Documentation Project
@@ -315,7 +315,7 @@
гүйцэтгэл юм. <application>&xorg;</application> нь X.Org сангаас
гаргасан Х цонхот системийн Х сервер.
<application>&xorg;</application> нь
- <application>&xfree86 4.4RC2</application> болон X11R6.6
+ <application>&xfree86; 4.4RC2</application> болон X11R6.6
хоёрын эх бичлэг дээр үндэслэгдсэн билээ.
&os;-н портын цуглуулга дотор байгаа
<application>&xorg;</application>-н хувилбар нь &xorg.version; гэж буй.</para>
diff --git a/mn_MN.UTF-8/share/xml/glossary.ent b/mn_MN.UTF-8/share/xml/glossary.ent
index 4f47b61551..4e17355b36 100644
--- a/mn_MN.UTF-8/share/xml/glossary.ent
+++ b/mn_MN.UTF-8/share/xml/glossary.ent
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
<!--
The FreeBSD Mongolian Documentation Project
diff --git a/mn_MN.UTF-8/share/xml/mirrors-local.xsl b/mn_MN.UTF-8/share/xml/mirrors-local.xsl
index c924a48cb8..e6340a1dd8 100644
--- a/mn_MN.UTF-8/share/xml/mirrors-local.xsl
+++ b/mn_MN.UTF-8/share/xml/mirrors-local.xsl
@@ -13,7 +13,6 @@
<xsl:import href="../../../share/xml/mirrors-master.xsl" />
<xsl:output type="xml" encoding="utf-8"
- omit-xml-declaration="yes"
indent="yes"/>
<!-- template: "mirrors-docbook-contact" -->
diff --git a/mn_MN.UTF-8/share/xml/trademarks.ent b/mn_MN.UTF-8/share/xml/trademarks.ent
index 6d5f388174..173624eaee 100644
--- a/mn_MN.UTF-8/share/xml/trademarks.ent
+++ b/mn_MN.UTF-8/share/xml/trademarks.ent
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
<!--
The FreeBSD Mongolian Documentation Project
From c0abcd6579652f7f0c48fbfd59c3b03bd60ff09b Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Mon, 21 Jan 2013 17:41:24 +0000
Subject: [PATCH 016/121] - Make the Dutch documentation valid XML
---
.../articles/contributing/article.xml | 2 +-
.../articles/explaining-bsd/article.xml | 2 +-
nl_NL.ISO8859-1/books/handbook/Makefile | 35 +++-
.../handbook/advanced-networking/chapter.xml | 6 +-
.../books/handbook/audit/chapter.xml | 2 +-
.../books/handbook/basics/chapter.xml | 2 +-
.../books/handbook/bibliography/chapter.xml | 2 +-
nl_NL.ISO8859-1/books/handbook/book.xml | 55 +-----
.../books/handbook/boot/chapter.xml | 2 +-
nl_NL.ISO8859-1/books/handbook/chapters.ent | 183 +-----------------
nl_NL.ISO8859-1/books/handbook/colophon.xml | 2 +-
.../books/handbook/config/chapter.xml | 4 +-
.../books/handbook/cutting-edge/chapter.xml | 79 +-------
.../books/handbook/desktop/chapter.xml | 2 +-
.../books/handbook/disks/chapter.xml | 22 +--
.../books/handbook/dtrace/chapter.xml | 2 +-
.../books/handbook/eresources/chapter.xml | 6 +-
.../books/handbook/filesystems/chapter.xml | 4 +-
.../books/handbook/firewalls/chapter.xml | 4 +-
.../books/handbook/geom/chapter.xml | 2 +-
.../books/handbook/install/chapter.xml | 4 +-
.../books/handbook/introduction/chapter.xml | 2 +-
.../books/handbook/jails/chapter.xml | 2 +-
.../books/handbook/kernelconfig/chapter.xml | 2 +-
.../books/handbook/l10n/chapter.xml | 2 +-
.../books/handbook/linuxemu/chapter.xml | 14 +-
.../books/handbook/mac/chapter.xml | 2 +-
.../books/handbook/mail/chapter.xml | 8 +-
.../books/handbook/mirrors/chapter.xml | 10 +-
.../books/handbook/multimedia/chapter.xml | 2 +-
.../handbook/network-servers/chapter.xml | 2 +-
.../books/handbook/pgpkeys/chapter.xml | 2 +-
.../books/handbook/ports/chapter.xml | 2 +-
.../books/handbook/ppp-and-slip/chapter.xml | 2 +-
.../books/handbook/preface/preface.xml | 2 +-
.../books/handbook/printing/chapter.xml | 2 +-
.../books/handbook/security/chapter.xml | 2 +-
.../books/handbook/serialcomms/chapter.xml | 2 +-
.../books/handbook/users/chapter.xml | 2 +-
.../books/handbook/vinum/chapter.xml | 2 +-
.../books/handbook/virtualization/chapter.xml | 4 +-
.../books/handbook/x11/chapter.xml | 4 +-
nl_NL.ISO8859-1/share/xml/glossary.ent | 2 +-
nl_NL.ISO8859-1/share/xml/mirrors-local.xsl | 1 -
44 files changed, 116 insertions(+), 381 deletions(-)
diff --git a/nl_NL.ISO8859-1/articles/contributing/article.xml b/nl_NL.ISO8859-1/articles/contributing/article.xml
index c1311bcb65..67249ff3be 100644
--- a/nl_NL.ISO8859-1/articles/contributing/article.xml
+++ b/nl_NL.ISO8859-1/articles/contributing/article.xml
@@ -198,7 +198,7 @@
<para>Verkrijg kopie�n van formele standaarden zoals
&posix;. Enkele links over deze standaarden staan op de
website van het <ulink
- url="&url.base;/projects/c99/index.html">&os; C99 & POSIX
+ url="&url.base;/projects/c99/index.html">&os; C99 & POSIX
Standards Conformance Project</ulink>. Vergelijk het
gedrag van &os; met dat wat de standaard voorschrijft. Als
het gedrag verschilt, met name in subtiele of obscure
diff --git a/nl_NL.ISO8859-1/articles/explaining-bsd/article.xml b/nl_NL.ISO8859-1/articles/explaining-bsd/article.xml
index 93d31c36fa..fbc5a1eb12 100644
--- a/nl_NL.ISO8859-1/articles/explaining-bsd/article.xml
+++ b/nl_NL.ISO8859-1/articles/explaining-bsd/article.xml
@@ -256,7 +256,7 @@
<listitem>
<para>De indruk heerst dat de BSD-projecten gefragmenteerd en
oorlogvoerend zijn. De <ulink
- url="http://interactive.wsj.com/bin/login?Tag=/&URI=/archive/retrieve.cgi%253Fid%253DSB952470579348918651.djm&">Wall
+ url="http://interactive.wsj.com/bin/login?Tag=/&URI=/archive/retrieve.cgi%253Fid%253DSB952470579348918651.djm&">Wall
Street Journal</ulink> sprak van <quote>balkanizatie</quote> van de
BSD-projecten. Net als de rechtszaak is dit beeld
voornamelijk op een oude geschiedenis gebaseerd.</para>
diff --git a/nl_NL.ISO8859-1/books/handbook/Makefile b/nl_NL.ISO8859-1/books/handbook/Makefile
index c83efce5cb..46a034c392 100644
--- a/nl_NL.ISO8859-1/books/handbook/Makefile
+++ b/nl_NL.ISO8859-1/books/handbook/Makefile
@@ -318,30 +318,55 @@ DOC_PREFIX?= ${.CURDIR}/../../..
#
# regels die lijsten met mirrors vanuit de XML-database genereren.
#
-XMLDOCS= mirrors-ftp:::mirrors.xml.ftp.inc \
+XMLDOCS= lastmod:::mirrors.lastmod.inc \
+ mirrors-ftp-index:::mirrors.xml.ftp.index.inc \
+ mirrors-ftp:::mirrors.xml.ftp.inc \
+ mirrors-cvsup-index:::mirrors.xml.cvsup.index.inc \
mirrors-cvsup:::mirrors.xml.cvsup.inc \
+ eresources-index:::eresources.xml.www.index.inc \
eresources:::eresources.xml.www.inc
DEPENDSET.DEFAULT= transtable mirror
XSLT.DEFAULT= ${XSL_MIRRORS}
XML.DEFAULT= ${XML_MIRRORS}
NO_TIDY.DEFAULT= yes
+PARAMS.lastmod+= --param 'target' "'lastmod'"
+PARAMS.mirrors-ftp-index+= --param 'type' "'ftp'" \
+ --param 'proto' "'ftp'" \
+ --param 'target' "'index'"
PARAMS.mirrors-ftp+= --param 'type' "'ftp'" \
--param 'proto' "'ftp'" \
--param 'target' "'handbook/mirrors/chapter.xml'"
+PARAMS.mirrors-cvsup-index+= --param 'type' "'cvsup'" \
+ --param 'proto' "'cvsup'" \
+ --param 'target' "'index'"
PARAMS.mirrors-cvsup+= --param 'type' "'cvsup'" \
--param 'proto' "'cvsup'" \
--param 'target' "'handbook/mirrors/chapter.xml'"
+PARAMS.eresources-index+= --param 'type' "'www'" \
+ --param 'proto' "'http'" \
+ --param 'target' "'index'"
PARAMS.eresources+= --param 'type' "'www'" \
--param 'proto' "'http'" \
--param 'target' "'handbook/eresources/chapter.xml'"
-SRCS+= mirrors.xml.ftp.inc \
+SRCS+= mirrors.lastmod.inc \
+ mirrors.xml.ftp.inc \
+ mirrors.xml.ftp.index.inc \
mirrors.xml.cvsup.inc \
- eresources.xml.www.inc
+ mirrors.xml.cvsup.index.inc \
+ eresources.xml.www.inc \
+ eresources.xml.www.index.inc
-CLEANFILES+= mirrors.xml.ftp.inc \
+CLEANFILES+= mirrors.lastmod.inc \
+ mirrors.xml.ftp.inc \
+ mirrors.xml.ftp.index.inc \
mirrors.xml.cvsup.inc \
- eresources.xml.www.inc
+ mirrors.xml.cvsup.index.inc \
+ eresources.xml.www.inc \
+ eresources.xml.www.index.inc
+lint: mirrors.lastmod.inc mirrors.xml.ftp.inc mirrors.xml.ftp.index.inc \
+ mirrors.xml.cvsup.inc mirrors.xml.cvsup.index.inc \
+ eresources.xml.www.inc eresources.xml.www.index.inc
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.xml b/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.xml
index 34cb309bfc..3a66e06ba9 100644
--- a/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Dutch Documentation Project
@@ -2177,7 +2177,7 @@ wpa_pairwise=CCMP TKIP <co id="co-ap-wpapsk-pwise"/></programlisting>
<para>De volgende stap is het starten van
<application>hostapd</application>:</para>
- <screen>&prompt.root <userinput>/etc/rc.d/hostapd forcestart</userinput></screen>
+ <screen>&prompt.root; <userinput>/etc/rc.d/hostapd forcestart</userinput></screen>
<screen>&prompt.root; <userinput>ifconfig <replaceable>wlan0</replaceable></userinput>
wlan0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> mtu 2290
@@ -6756,7 +6756,7 @@ ifconfig_carp1="vhid 2 advskew 100 pass testpass 192.168.1.51/24"</programlistin
Het volgende commando dient op
<hostid>provider.example.org</hostid> gegeven te worden:</para>
- <screen>&prompt.root; <userinput>ifconfig carp0 down && ifconfig carp0 up</userinput></screen>
+ <screen>&prompt.root; <userinput>ifconfig carp0 down && ifconfig carp0 up</userinput></screen>
<para>Dit dient gedaan te worden op de
<devicename>carp</devicename> interface die met de juiste
diff --git a/nl_NL.ISO8859-1/books/handbook/audit/chapter.xml b/nl_NL.ISO8859-1/books/handbook/audit/chapter.xml
index b552284318..551bb2c8f2 100644
--- a/nl_NL.ISO8859-1/books/handbook/audit/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/audit/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Dutch Documentation Project
$FreeBSD$
diff --git a/nl_NL.ISO8859-1/books/handbook/basics/chapter.xml b/nl_NL.ISO8859-1/books/handbook/basics/chapter.xml
index 40a654abbc..cff04da79b 100644
--- a/nl_NL.ISO8859-1/books/handbook/basics/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/basics/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Dutch Documentation Project
diff --git a/nl_NL.ISO8859-1/books/handbook/bibliography/chapter.xml b/nl_NL.ISO8859-1/books/handbook/bibliography/chapter.xml
index 116ab24601..aead981d69 100644
--- a/nl_NL.ISO8859-1/books/handbook/bibliography/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/bibliography/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Dutch Documentation Project
diff --git a/nl_NL.ISO8859-1/books/handbook/book.xml b/nl_NL.ISO8859-1/books/handbook/book.xml
index a39e87ae53..cd956f553e 100644
--- a/nl_NL.ISO8859-1/books/handbook/book.xml
+++ b/nl_NL.ISO8859-1/books/handbook/book.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
"../../../share/xml/freebsd42.dtd" [
<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//NL" "../../share/xml/entities.ent">
@@ -17,47 +17,6 @@
<!ENTITY % txtfiles SYSTEM "txtfiles.ent">
%txtfiles;
-<!ENTITY % not.published "INCLUDE">
-
-<!ENTITY % chap.introduction "IGNORE">
-<!ENTITY % chap.install "IGNORE">
-<!ENTITY % chap.bsdinstall "IGNORE">
-<!ENTITY % chap.basics "IGNORE">
-<!ENTITY % chap.ports "IGNORE">
-<!ENTITY % chap.config "IGNORE">
-<!ENTITY % chap.boot "IGNORE">
-<!ENTITY % chap.users "IGNORE">
-<!ENTITY % chap.kernelconfig "IGNORE">
-<!ENTITY % chap.security "IGNORE">
-<!ENTITY % chap.jails "IGNORE">
-<!ENTITY % chap.printing "IGNORE">
-<!ENTITY % chap.disks "IGNORE">
-<!ENTITY % chap.geom "IGNORE">
-<!ENTITY % chap.vinum "IGNORE">
-<!ENTITY % chap.x11 "IGNORE">
-<!ENTITY % chap.l10n "IGNORE">
-<!ENTITY % chap.multimedia "IGNORE">
-<!ENTITY % chap.desktop "IGNORE">
-<!ENTITY % chap.serialcomms "IGNORE">
-<!ENTITY % chap.ppp-and-slip "IGNORE">
-<!ENTITY % chap.advanced-networking "IGNORE">
-<!ENTITY % chap.firewalls "IGNORE">
-<!ENTITY % chap.network-servers "IGNORE">
-<!ENTITY % chap.mail "IGNORE">
-<!ENTITY % chap.cutting-edge "IGNORE">
-<!ENTITY % chap.linuxemu "IGNORE">
-<!ENTITY % chap.mirrors "IGNORE">
-<!ENTITY % chap.bibliography "IGNORE">
-<!ENTITY % chap.eresources "IGNORE">
-<!ENTITY % chap.pgpkeys "IGNORE">
-<!ENTITY % chap.index "IGNORE">
-<!ENTITY % chap.freebsd-glossary "IGNORE">
-<!ENTITY % chap.mac "IGNORE">
-<!ENTITY % chap.audit "IGNORE">
-<!ENTITY % chap.virtualization "IGNORE">
-<!ENTITY % chap.filesystems "IGNORE">
-<!ENTITY % chap.dtrace "IGNORE">
-
<!ENTITY % pgpkeys SYSTEM "../../../share/pgpkeys/pgpkeys.ent"> %pgpkeys;
]>
@@ -204,12 +163,12 @@
gelezen kan worden zonder bladeren.</para>
</partintro>
- <![ %chap.introduction; [ &chap.introduction; ]]>
- <![ %chap.install; [ &chap.install; ]]>
- <![ %chap.bsdinstall; [ &chap.bsdinstall; ]]>
- <![ %chap.basics; [ &chap.basics; ]]>
- <![ %chap.ports; [ &chap.ports; ]]>
- <![ %chap.x11; [ &chap.x11; ]]>
+ &chap.introduction;
+ &chap.install;
+ &chap.bsdinstall;
+ &chap.basics;
+ &chap.ports;
+ &chap.x11;
</part>
<part id="common-tasks">
diff --git a/nl_NL.ISO8859-1/books/handbook/boot/chapter.xml b/nl_NL.ISO8859-1/books/handbook/boot/chapter.xml
index d7e19cdba4..674328c37c 100644
--- a/nl_NL.ISO8859-1/books/handbook/boot/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/boot/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Dutch Documentation Project
diff --git a/nl_NL.ISO8859-1/books/handbook/chapters.ent b/nl_NL.ISO8859-1/books/handbook/chapters.ent
index 3706897718..132f7a6e6c 100644
--- a/nl_NL.ISO8859-1/books/handbook/chapters.ent
+++ b/nl_NL.ISO8859-1/books/handbook/chapters.ent
@@ -14,235 +14,62 @@
%SRCID% 39534
-->
-<!ENTITY % not.published "INCLUDE">
-
-<!ENTITY % chap.introduction "IGNORE">
-<!ENTITY % chap.install "IGNORE">
-<!ENTITY % chap.bsdinstall "IGNORE">
-<!ENTITY % chap.basics "IGNORE">
-<!ENTITY % chap.ports "IGNORE">
-<!ENTITY % chap.config "IGNORE">
-<!ENTITY % chap.boot "IGNORE">
-<!ENTITY % chap.users "IGNORE">
-<!ENTITY % chap.kernelconfig "IGNORE">
-<!ENTITY % chap.security "IGNORE">
-<!ENTITY % chap.jails "IGNORE">
-<!ENTITY % chap.printing "IGNORE">
-<!ENTITY % chap.disks "IGNORE">
-<!ENTITY % chap.geom "IGNORE">
-<!ENTITY % chap.vinum "IGNORE">
-<!ENTITY % chap.x11 "IGNORE">
-<!ENTITY % chap.l10n "IGNORE">
-<!ENTITY % chap.multimedia "IGNORE">
-<!ENTITY % chap.desktop "IGNORE">
-<!ENTITY % chap.serialcomms "IGNORE">
-<!ENTITY % chap.ppp-and-slip "IGNORE">
-<!ENTITY % chap.advanced-networking "IGNORE">
-<!ENTITY % chap.firewalls "IGNORE">
-<!ENTITY % chap.network-servers "IGNORE">
-<!ENTITY % chap.mail "IGNORE">
-<!ENTITY % chap.cutting-edge "IGNORE">
-<!ENTITY % chap.linuxemu "IGNORE">
-<!ENTITY % chap.mirrors "IGNORE">
-<!ENTITY % chap.mirrors.ftp.inc "INCLUDE">
-<!ENTITY % chap.mirrors.cvsup.inc "INCLUDE">
-<!ENTITY % chap.bibliography "IGNORE">
-<!ENTITY % chap.eresources "IGNORE">
-<!ENTITY % chap.eresources.www.inc "INCLUDE">
-<!ENTITY % chap.pgpkeys "IGNORE">
-<!ENTITY % chap.index "IGNORE">
-<!ENTITY % chap.freebsd-glossary "IGNORE">
-<!ENTITY % chap.mac "IGNORE">
-<!ENTITY % chap.audit "IGNORE">
-<!ENTITY % chap.filesystems "IGNORE">
-<!ENTITY % chap.dtrace "IGNORE">
-
<!ENTITY chap.preface SYSTEM "preface/preface.xml">
<!ENTITY % pgpkeys SYSTEM "../../../share/pgpkeys/pgpkeys.ent"> %pgpkeys;
<!-- Deel een -->
-<![%chap.introduction;[
<!ENTITY chap.introduction SYSTEM "introduction/chapter.xml">
-]]>
-<![%chap.install;[
<!ENTITY chap.install SYSTEM "install/chapter.xml">
-]]>
-<![%chap.bsdinstall;[
<!ENTITY chap.bsdinstall SYSTEM "bsdinstall/chapter.xml">
-]]>
-<![%chap.basics;[
<!ENTITY chap.basics SYSTEM "basics/chapter.xml">
-]]>
-<![%chap.ports;[
<!ENTITY chap.ports SYSTEM "ports/chapter.xml">
-]]>
-<![%chap.x11;[
<!ENTITY chap.x11 SYSTEM "x11/chapter.xml">
-]]>
<!-- Deel twee -->
-<![%chap.desktop;[
<!ENTITY chap.desktop SYSTEM "desktop/chapter.xml">
-]]>
-<![%chap.multimedia;[
<!ENTITY chap.multimedia SYSTEM "multimedia/chapter.xml">
-]]>
-<![%chap.kernelconfig;[
<!ENTITY chap.kernelconfig SYSTEM "kernelconfig/chapter.xml">
-]]>
-<![%chap.printing;[
<!ENTITY chap.printing SYSTEM "printing/chapter.xml">
-]]>
-<![%chap.linuxemu;[
<!ENTITY chap.linuxemu SYSTEM "linuxemu/chapter.xml">
-]]>
<!-- Deel drie -->
-<![%chap.config;[
<!ENTITY chap.config SYSTEM "config/chapter.xml">
-]]>
-<![%chap.boot;[
<!ENTITY chap.boot SYSTEM "boot/chapter.xml">
-]]>
-<![%chap.users;[
<!ENTITY chap.users SYSTEM "users/chapter.xml">
-]]>
-<![%chap.security;[
<!ENTITY chap.security SYSTEM "security/chapter.xml">
-]]>
-<![%chap.jails;[
<!ENTITY chap.jails SYSTEM "jails/chapter.xml">
-]]>
-<![%chap.mac;[
<!ENTITY chap.mac SYSTEM "mac/chapter.xml">
-]]>
-<![%chap.audit;[
<!ENTITY chap.audit SYSTEM "audit/chapter.xml">
-]]>
-<![%chap.disks;[
<!ENTITY chap.disks SYSTEM "disks/chapter.xml">
-]]>
-<![%chap.geom;[
<!ENTITY chap.geom SYSTEM "geom/chapter.xml">
-]]>
-<![%chap.filesystems;[
<!ENTITY chap.filesystems SYSTEM "filesystems/chapter.xml">
-]]>
-<![%chap.vinum;[
<!ENTITY chap.vinum SYSTEM "vinum/chapter.xml">
-]]>
-<![%chap.virtualization;[
<!ENTITY chap.virtualization SYSTEM "virtualization/chapter.xml">
-]]>
-<![%chap.l10n;[
<!ENTITY chap.l10n SYSTEM "l10n/chapter.xml">
-]]>
-<![%chap.cutting-edge;[
<!ENTITY chap.cutting-edge SYSTEM "cutting-edge/chapter.xml">
-]]>
-<![%chap.dtrace;[
<!ENTITY chap.dtrace SYSTEM "dtrace/chapter.xml">
-]]>
<!-- Deel vier -->
-<![%chap.serialcomms;[
<!ENTITY chap.serialcomms SYSTEM "serialcomms/chapter.xml">
-]]>
-<![%chap.ppp-and-slip;[
<!ENTITY chap.ppp-and-slip SYSTEM "ppp-and-slip/chapter.xml">
-]]>
-<![%chap.mail;[
<!ENTITY chap.mail SYSTEM "mail/chapter.xml">
-]]>
-<![%chap.network-servers;[
<!ENTITY chap.network-servers SYSTEM "network-servers/chapter.xml">
-]]>
-<![%chap.firewalls;[
<!ENTITY chap.firewalls SYSTEM "firewalls/chapter.xml">
-]]>
-<![%chap.advanced-networking;[
<!ENTITY chap.advanced-networking SYSTEM "advanced-networking/chapter.xml">
-]]>
<!-- Deel vijf (appendices) -->
-<![%chap.mirrors;[
<!ENTITY chap.mirrors SYSTEM "mirrors/chapter.xml">
-]]>
-<![%chap.mirrors.ftp.inc;[
+ <!ENTITY chap.mirrors.lastmod.inc SYSTEM "mirrors.lastmod.inc">
+ <!ENTITY chap.mirrors.ftp.index.inc SYSTEM "mirrors.xml.ftp.index.inc">
<!ENTITY chap.mirrors.ftp.inc SYSTEM "mirrors.xml.ftp.inc">
-]]>
-<![%chap.mirrors.cvsup.inc;[
+ <!ENTITY chap.mirrors.cvsup.index.inc SYSTEM "mirrors.xml.cvsup.index.inc">
<!ENTITY chap.mirrors.cvsup.inc SYSTEM "mirrors.xml.cvsup.inc">
-]]>
-<![%chap.bibliography;[
<!ENTITY chap.bibliography SYSTEM "bibliography/chapter.xml">
-]]>
-<![%chap.eresources;[
<!ENTITY chap.eresources SYSTEM "eresources/chapter.xml">
-]]>
-<![%chap.eresources.www.inc;[
+ <!ENTITY chap.eresources.www.index.inc SYSTEM "eresources.xml.www.index.inc">
<!ENTITY chap.eresources.www.inc SYSTEM "eresources.xml.www.inc">
-]]>
-<![%chap.pgpkeys;[
<!ENTITY chap.pgpkeys SYSTEM "pgpkeys/chapter.xml">
-]]>
-<![%chap.freebsd-glossary;[
<!ENTITY chap.freebsd-glossary "&freebsd-glossary;">
-]]>
-<![%chap.index;[
- <!ENTITY chap.index SYSTEM "index.xml">
-]]>
+ <!ENTITY chap.index "">
<!ENTITY chap.colophon SYSTEM "colophon.xml">
-
-<!-- IGNORE cases -->
-
-<!-- Deel een-->
-<!ENTITY chap.introduction "">
-<!ENTITY chap.install "">
-<!ENTITY chap.basics "">
-<!ENTITY chap.ports "">
-<!ENTITY chap.x11 "">
-
-<!-- Deel twee -->
-<!ENTITY chap.desktop "">
-<!ENTITY chap.multimedia "">
-<!ENTITY chap.kernelconfig "">
-<!ENTITY chap.printing "">
-<!ENTITY chap.linuxemu "">
-
-<!-- Deel drie -->
-<!ENTITY chap.config "">
-<!ENTITY chap.boot "">
-<!ENTITY chap.users "">
-<!ENTITY chap.security "">
-<!ENTITY chap.jails "">
-<!ENTITY chap.mac "">
-<!ENTITY chap.audit "">
-<!ENTITY chap.disks "">
-<!ENTITY chap.geom "">
-<!ENTITY chap.filesystems "">
-<!ENTITY chap.vinum "">
-<!ENTITY chap.virtualization "">
-<!ENTITY chap.l10n "">
-<!ENTITY chap.cutting-edge "">
-<!ENTITY chap.dtrace "">
-
-<!-- Deel vier -->
-<!ENTITY chap.serialcomms "">
-<!ENTITY chap.ppp-and-slip "">
-<!ENTITY chap.mail "">
-<!ENTITY chap.network-servers "">
-<!ENTITY chap.firewalls "">
-<!ENTITY chap.advanced-networking "">
-
-<!-- Deel vijf (appendices) -->
-<!ENTITY chap.mirrors "">
-<!ENTITY chap.mirrors.ftp.inc "">
-<!ENTITY chap.mirrors.cvsup.inc "">
-<!ENTITY chap.bibliography "">
-<!ENTITY chap.eresources "">
-<!ENTITY chap.eresources.www.inc "">
-<!ENTITY chap.pgpkeys "">
-<!ENTITY chap.freebsd-glossary "">
-<!ENTITY chap.index "">
diff --git a/nl_NL.ISO8859-1/books/handbook/colophon.xml b/nl_NL.ISO8859-1/books/handbook/colophon.xml
index ad2c56c77e..395fd9d9cc 100644
--- a/nl_NL.ISO8859-1/books/handbook/colophon.xml
+++ b/nl_NL.ISO8859-1/books/handbook/colophon.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Dutch Documentation Project
diff --git a/nl_NL.ISO8859-1/books/handbook/config/chapter.xml b/nl_NL.ISO8859-1/books/handbook/config/chapter.xml
index 0177adbc88..72117e4818 100644
--- a/nl_NL.ISO8859-1/books/handbook/config/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/config/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Dutch Documentation Project
@@ -826,7 +826,7 @@ sshd is running as pid 433.</screen>
staat in &man.rc.8; en &man.rc.subr.8;. Als u ge�nteresseerd
bent in het schrijven van uw eigen
<filename>rc.d</filename>-script of om de huidige scripts te
- verbeteren is wellicht <ulink url="&url.articles.rc-scripting">dit
+ verbeteren is wellicht <ulink url="&url.articles.rc-scripting;">dit
artikel</ulink> interessant.</para>
</sect1>
diff --git a/nl_NL.ISO8859-1/books/handbook/cutting-edge/chapter.xml b/nl_NL.ISO8859-1/books/handbook/cutting-edge/chapter.xml
index abd785431c..019780833e 100644
--- a/nl_NL.ISO8859-1/books/handbook/cutting-edge/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/cutting-edge/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Dutch Documentation Project
@@ -1233,83 +1233,6 @@ Fetching 133 new ports or files... done.</screen>
<screen>&prompt.root; <userinput>portupgrade -PP hu-freebsd-doc</userinput></screen>
</sect3>
</sect2>
-
-<!--FIXME: Waiting for a working docsnap server...-->
-<![ IGNORE [
- <sect2 id="docsnap">
- <sect2info>
- <authorgroup>
- <author>
- <firstname>Pav</firstname>
- <surname>Lucistnik</surname>
- <contrib>Gebaseerd op informatie geleverd door </contrib>
- </author>
- </authorgroup>
- </sect2info>
-
- <title>Docsnap gebruiken</title>
-
- <indexterm><primary>updaten en upgraden</primary></indexterm>
-
- <indexterm>
- <primary>Docsnap</primary>
-
- <see>updaten en upgraden</see>
- </indexterm>
-
- <para><application>Docscnap</application> is een
- &man.rsync.1;-reservoir voor het bijwerken van
- ge�nstalleerde &os;-documentatie op een relatief
- gemakkelijke en snelle manier. Een
- <quote><application>Docsnap</application> server</quote> volgt
- de documentatiebroncode en bouwt ze elk uur in HTML-formaat. De
- port <filename role="package">textproc/docproj</filename> is
- niet nodig met <application>Docsnap</application> aangezien er
- alleen patches voor de gebouwde documentatie bestaan.</para>
-
- <para>De enige benodigdheid om deze techniek te gebruiken is de
- port of het pakket <filename
- role="package">net/rsync</filename>. Gebruik het volgende
- commando om het toe te voegen:</para>
-
- <screen>&prompt.root; <userinput>pkg_add -r rsync</userinput></screen>
-
- <note>
- <para><application>Docsnap</application> is eigenlijk ontwikkeld
- om de documentatie die in <filename
- class="directory">/usr/share/doc</filename> is
- ge�nstalleerd bij te werken, maar de volgende voorbeelden
- kunnen ook voor andere mappen worden gebruikt. Voor
- gebruikersmappen heeft het geen
- <username>root</username>-rechten nodig.</para>
- </note>
-
- <para>Geef het volgende commando om de documentatie bij te werken:</para>
-
- <screen>&prompt.root; <userinput>rsync -rltvz <replaceable>docsnap.sk.FreeBSD.org</replaceable>::docsnap <replaceable>/usr/share/doc</replaceable></userinput></screen>
-
- <note>
- <para>Er is momenteel slechts ��n
- <application>Docsnap</application>-server; de bovengenoemde
- host <hostid>docsnap.sk.FreeBSD.org</hostid>.</para>
- </note>
-
- <para>Gebruik hier niet de vlag <option>--delete</option> omdat er
- tijdens <command>make installworld</command> wat dingen in
- <filename class="directory">/usr/share/doc</filename> worden
- ge�nstalleerd, die dan per ongeluk verwijderd zouden
- worden. Gebruik in plaats daarvan dit commando om op te
- ruimen:</para>
-
- <screen>&prompt.root; <userinput>rsync -rltvz --delete <replaceable>docsnap.sk.FreeBSD.org</replaceable>::docsnap/??_??\.\* <replaceable>/usr/share/doc</replaceable></userinput></screen>
-
- <para>Het volgende commando dient gebruikt te worden als er een
- deelverzameling van de documentatie, bijvoorbeeld
- alleen de Engelse documentatie, bijgewerkt moet worden:</para>
-
- <screen>&prompt.root; <userinput>rsync -rltvz <replaceable>docsnap.sk.FreeBSD.org</replaceable>::docsnap/en_US.ISO8859-1 <replaceable>/usr/share/doc</replaceable></userinput></screen>
- </sect2>
-]]>
</sect1>
<sect1 id="current-stable">
diff --git a/nl_NL.ISO8859-1/books/handbook/desktop/chapter.xml b/nl_NL.ISO8859-1/books/handbook/desktop/chapter.xml
index 869509374e..bd36fe3614 100644
--- a/nl_NL.ISO8859-1/books/handbook/desktop/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/desktop/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Dutch Documentation Project
diff --git a/nl_NL.ISO8859-1/books/handbook/disks/chapter.xml b/nl_NL.ISO8859-1/books/handbook/disks/chapter.xml
index a73bbee255..a8230ddc4b 100644
--- a/nl_NL.ISO8859-1/books/handbook/disks/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/disks/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Dutch Documentation Project
@@ -3132,16 +3132,6 @@ sa0(ncr1:4:0): Logical unit is in process of becoming ready</screen>
Nu een extra uur investeren, kan later grote zorgen
besparen.</para>
</sect3>
-
- <![ %not.published; [
-
- <sect3>
- <title>* Er zijn geen voorbereidingen voor de ramp getroffen,
- wat nu?</title>
-
- <para></para>
- </sect3>
-]]>
</sect2>
</sect1>
@@ -3980,7 +3970,7 @@ sector_size = 2048
<step>
<title>Koppel de versleutelde partitie aan de kernel</title>
- <screen>&prompt.root <userinput>gbde attach /dev/ad4s1c -l /etc/gbde/ad4s1c.lock</userinput></screen>
+ <screen>&prompt.root; <userinput>gbde attach /dev/ad4s1c -l /etc/gbde/ad4s1c.lock</userinput></screen>
<para>Er wordt om de wachtwoordzin gevraagd die gekozen is
tijdens de initialisatie van de versleutelde partitie. Het
@@ -4064,7 +4054,7 @@ Filesystem Size Used Avail Capacity Mounted on
<step>
<title>Koppel de gbde-partitie aan de kernel</title>
- <screen>&prompt.root <userinput>gbde attach /dev/ad4s1c -l /etc/gbde/ad4s1c.lock</userinput></screen>
+ <screen>&prompt.root; <userinput>gbde attach /dev/ad4s1c -l /etc/gbde/ad4s1c.lock</userinput></screen>
<para>Er wordt om de wachtwoordzin gevraagd die gekozen is
tijdens de initialisatie van de versleutelde
@@ -5025,7 +5015,7 @@ case "$1" in
# Wacht totdat de "hastd secondary" processen zijn gestopt
for disk in ${resources}; do
- while $( pgrep -lf "hastd: ${disk} \(secondary\)" > /dev/null 2>&1 ); do
+ while $( pgrep -lf "hastd: ${disk} \(secondary\)" > /dev/null 2>&1 ); do
sleep 1
done
@@ -5040,7 +5030,7 @@ case "$1" in
# Wacht totdat de apparaten /dev/hast/* verschijnen
for disk in ${resources}; do
for I in $( jot 60 ); do
- [ -c "/dev/hast/${disk}" ] && break
+ [ -c "/dev/hast/${disk}" ] && break
sleep 0.5
done
@@ -5073,7 +5063,7 @@ case "$1" in
umount -f /hast/${disk}
fi
sleep $delay
- hastctl role secondary ${disk} 2>&1
+ hastctl role secondary ${disk} 2>&1
if [ $? -ne 0 ]; then
logger -p $log -t $name "Omschakelen van rol naar secundair voor hulpbron ${disk} mislukt."
exit 1
diff --git a/nl_NL.ISO8859-1/books/handbook/dtrace/chapter.xml b/nl_NL.ISO8859-1/books/handbook/dtrace/chapter.xml
index d58e653ec9..5bcbe50ee5 100644
--- a/nl_NL.ISO8859-1/books/handbook/dtrace/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/dtrace/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
Recently I suggested to myself that this should become a profiling
and debugging chapter, which covers things like ktrace(1) and
diff --git a/nl_NL.ISO8859-1/books/handbook/eresources/chapter.xml b/nl_NL.ISO8859-1/books/handbook/eresources/chapter.xml
index aec381d30a..0baf0aea7e 100644
--- a/nl_NL.ISO8859-1/books/handbook/eresources/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/eresources/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Dutch Documentation Project
@@ -2349,6 +2349,10 @@
<sect2 id="eresources-web-mirrors">
<title>Offici�le spiegels</title>
+ &chap.eresources.www.index.inc;
+
+ &chap.mirrors.lastmod.inc;
+
&chap.eresources.www.inc;
</sect2>
</sect1>
diff --git a/nl_NL.ISO8859-1/books/handbook/filesystems/chapter.xml b/nl_NL.ISO8859-1/books/handbook/filesystems/chapter.xml
index 5b24117afa..344bcdca99 100644
--- a/nl_NL.ISO8859-1/books/handbook/filesystems/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/filesystems/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Dutch Documentation Project
$FreeBSD$
@@ -257,7 +257,7 @@ example 17547136 0 17547136 0% /example</screen>
bestanden op worden aangemaakt en gebruikers kunnen er op
rondkijken zoals in het volgende voorbeeld:</para>
- <screen>&prompt.root <userinput>cd /example</userinput>
+ <screen>&prompt.root; <userinput>cd /example</userinput>
&prompt.root; <userinput>ls</userinput>
&prompt.root; <userinput>touch testfile</userinput>
&prompt.root; <userinput>ls -al</userinput>
diff --git a/nl_NL.ISO8859-1/books/handbook/firewalls/chapter.xml b/nl_NL.ISO8859-1/books/handbook/firewalls/chapter.xml
index a0993cb833..c6f148ec60 100644
--- a/nl_NL.ISO8859-1/books/handbook/firewalls/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/firewalls/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Dutch Documentation Project
@@ -1177,7 +1177,7 @@ sh /etc/ipf.rules.script</programlisting>
<para>De regelsyntaxis die hier wordt besproken is versimpeld
door alleen de moderne stateful regels en de <quote>eerste
van toepassing zijnde regel wint</quote> te belichten. De
- complete regelsyntaxis is na te lezen in &man.ipf.8</para>
+ complete regelsyntaxis is na te lezen in &man.ipf.8;.</para>
<para>Het karakter <literal>#</literal> wordt gebruikt om het
begin van een opmerking te markeren en zowel op een eigen
diff --git a/nl_NL.ISO8859-1/books/handbook/geom/chapter.xml b/nl_NL.ISO8859-1/books/handbook/geom/chapter.xml
index 398d4a9670..8ecc5808b1 100644
--- a/nl_NL.ISO8859-1/books/handbook/geom/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/geom/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Dutch Documentation Project
diff --git a/nl_NL.ISO8859-1/books/handbook/install/chapter.xml b/nl_NL.ISO8859-1/books/handbook/install/chapter.xml
index 4c7ac5695b..0245e883ff 100644
--- a/nl_NL.ISO8859-1/books/handbook/install/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/install/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Dutch Documentation Project
@@ -3993,7 +3993,7 @@ Retype new password :</screen>
<title>&os; opstarten</title>
<sect3 id="freebsdboot-i386">
- <title>&os/&arch.i386; opstarten</title>
+ <title>&os;/&arch.i386; opstarten</title>
<para>Als alles goed is gegaan komen er berichten over het scherm
rollen en komt dit uit bij de aanmeldprompt. De inhoud van de
diff --git a/nl_NL.ISO8859-1/books/handbook/introduction/chapter.xml b/nl_NL.ISO8859-1/books/handbook/introduction/chapter.xml
index 032ad96b46..c3f25ecb05 100644
--- a/nl_NL.ISO8859-1/books/handbook/introduction/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/introduction/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/nl_NL.ISO8859-1/books/handbook/jails/chapter.xml b/nl_NL.ISO8859-1/books/handbook/jails/chapter.xml
index 0602cc10fb..036e7b139b 100644
--- a/nl_NL.ISO8859-1/books/handbook/jails/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/jails/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Dutch Documentation Project
diff --git a/nl_NL.ISO8859-1/books/handbook/kernelconfig/chapter.xml b/nl_NL.ISO8859-1/books/handbook/kernelconfig/chapter.xml
index 5a3d00628e..8476ce3158 100644
--- a/nl_NL.ISO8859-1/books/handbook/kernelconfig/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/kernelconfig/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Dutch Documentation Project
diff --git a/nl_NL.ISO8859-1/books/handbook/l10n/chapter.xml b/nl_NL.ISO8859-1/books/handbook/l10n/chapter.xml
index bad63caf67..db2096e084 100644
--- a/nl_NL.ISO8859-1/books/handbook/l10n/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/l10n/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Dutch Documentation Project
diff --git a/nl_NL.ISO8859-1/books/handbook/linuxemu/chapter.xml b/nl_NL.ISO8859-1/books/handbook/linuxemu/chapter.xml
index 90279d9afd..fb954276c1 100644
--- a/nl_NL.ISO8859-1/books/handbook/linuxemu/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/linuxemu/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Dutch Documentation Project
@@ -251,7 +251,7 @@ Id Refs Address Size Name
<para>Als er toegang is tot een &linux; systeem kan gekeken
worden welke gedeelde bibliotheken de applicatie nodig heeft
- en kunnen ze gekopieerd worden naar het &os systeem. Dit
+ en kunnen ze gekopieerd worden naar het &os; systeem. Dit
wordt toegelicht in het volgende voorbeeld:</para>
<informalexample>
@@ -506,7 +506,7 @@ done</programlisting>
programma <command>mathinfo</command> in de installatiemap om uw
<quote>machine-ID</quote> te verkrijgen. Dit machine-ID is
alleen op het MAC-adres van uw eerste Ethernetkaart gebaseerd,
- zodat u uw kopie van <application>&mathematica</application>
+ zodat u uw kopie van <application>&mathematica;</application>
niet op andere machines kunt draaien.</para>
<para>Bij een registratie bij Wolfram, per email, telefoon of
@@ -699,14 +699,14 @@ LOG=/var/log/lmgrd.log
case "$1" in
start)
- lmgrd -c ${LICENSE_FILE} 2>> ${LOG} 1>&2
+ lmgrd -c ${LICENSE_FILE} 2>> ${LOG} 1>&2
echo -n " lmgrd"
;;
stop)
- lmgrd -c ${LICENSE_FILE} -x lmdown 2>> ${LOG} 1>&2
+ lmgrd -c ${LICENSE_FILE} -x lmdown 2>> ${LOG} 1>&2
;;
*)
- echo "Usage: `basename $0` {start|stop}" 1>&2
+ echo "Usage: `basename $0` {start|stop}" 1>&2
exit 64
;;
esac
@@ -1005,7 +1005,7 @@ exit 0</programlisting>
volgende bevat:</para>
<programlisting>#!/compat/linux/bin/sh
-(sleep 5; killall -1 matlab_helper) &
+(sleep 5; killall -1 matlab_helper) &
exit 0</programlisting>
</step>
diff --git a/nl_NL.ISO8859-1/books/handbook/mac/chapter.xml b/nl_NL.ISO8859-1/books/handbook/mac/chapter.xml
index ae173b6dbf..17cf99a947 100644
--- a/nl_NL.ISO8859-1/books/handbook/mac/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/mac/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Dutch Documentation Project
diff --git a/nl_NL.ISO8859-1/books/handbook/mail/chapter.xml b/nl_NL.ISO8859-1/books/handbook/mail/chapter.xml
index 2be2854576..8b4d629b9c 100644
--- a/nl_NL.ISO8859-1/books/handbook/mail/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/mail/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Dutch Documentation Project
@@ -1684,11 +1684,11 @@ SENDMAIL_LDADD=-lsasl2</programlisting>
volgende opdrachten uit te voeren:</para>
<screen>&prompt.root; <userinput>cd /usr/src/lib/libsmutil</userinput>
-&prompt.root; <userinput>make cleandir && make obj && make</userinput>
+&prompt.root; <userinput>make cleandir && make obj && make</userinput>
&prompt.root; <userinput>cd /usr/src/lib/libsm</userinput>
-&prompt.root; <userinput>make cleandir && make obj && make</userinput>
+&prompt.root; <userinput>make cleandir && make obj && make</userinput>
&prompt.root; <userinput>cd /usr/src/usr.sbin/sendmail</userinput>
-&prompt.root; <userinput>make cleandir && make obj && make && make install</userinput></screen>
+&prompt.root; <userinput>make cleandir && make obj && make && make install</userinput></screen>
<para>Het compileren van <application>sendmail</application> zou
geen problemen moeten geven indien <filename>/usr/src
diff --git a/nl_NL.ISO8859-1/books/handbook/mirrors/chapter.xml b/nl_NL.ISO8859-1/books/handbook/mirrors/chapter.xml
index e2949b81f2..4f3b010c2b 100644
--- a/nl_NL.ISO8859-1/books/handbook/mirrors/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/mirrors/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Dutch Documentation Project
@@ -219,6 +219,10 @@
toegangsmogelijkheden. De toegangsmogelijkheden voor iedere site
staan tussen haakjes achter de hostnaam.</para>
+ &chap.mirrors.ftp.index.inc;
+
+ &chap.mirrors.lastmod.inc;
+
&chap.mirrors.ftp.inc;
</sect1>
@@ -2501,6 +2505,10 @@ doc/zh_*</screen>
<para><link linkend="cvsup">CVSup</link> servers voor &os; draaien
op de onderstaande sites.</para>
+ &chap.mirrors.cvsup.index.inc;
+
+ &chap.mirrors.lastmod.inc;
+
&chap.mirrors.cvsup.inc;
</sect2>
</sect1>
diff --git a/nl_NL.ISO8859-1/books/handbook/multimedia/chapter.xml b/nl_NL.ISO8859-1/books/handbook/multimedia/chapter.xml
index 42271e29be..6b6d43b841 100644
--- a/nl_NL.ISO8859-1/books/handbook/multimedia/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/multimedia/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Dutch Documentation Project
diff --git a/nl_NL.ISO8859-1/books/handbook/network-servers/chapter.xml b/nl_NL.ISO8859-1/books/handbook/network-servers/chapter.xml
index 8fc23de52a..813980e116 100644
--- a/nl_NL.ISO8859-1/books/handbook/network-servers/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/network-servers/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Dutch Documentation Project
diff --git a/nl_NL.ISO8859-1/books/handbook/pgpkeys/chapter.xml b/nl_NL.ISO8859-1/books/handbook/pgpkeys/chapter.xml
index 4089704424..b9c3fbc542 100644
--- a/nl_NL.ISO8859-1/books/handbook/pgpkeys/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/pgpkeys/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Dutch Documentation Project
diff --git a/nl_NL.ISO8859-1/books/handbook/ports/chapter.xml b/nl_NL.ISO8859-1/books/handbook/ports/chapter.xml
index 0a7f7834e4..637d00f247 100644
--- a/nl_NL.ISO8859-1/books/handbook/ports/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/ports/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The Dutch FreeBSD Documentation Project
diff --git a/nl_NL.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml b/nl_NL.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml
index bde823b062..8025a2e1e4 100644
--- a/nl_NL.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Dutch Documentation Project
diff --git a/nl_NL.ISO8859-1/books/handbook/preface/preface.xml b/nl_NL.ISO8859-1/books/handbook/preface/preface.xml
index 96bf9b14e1..20ab1ca505 100644
--- a/nl_NL.ISO8859-1/books/handbook/preface/preface.xml
+++ b/nl_NL.ISO8859-1/books/handbook/preface/preface.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Dutch Documentation Project
diff --git a/nl_NL.ISO8859-1/books/handbook/printing/chapter.xml b/nl_NL.ISO8859-1/books/handbook/printing/chapter.xml
index ea4917dd08..564c21327e 100644
--- a/nl_NL.ISO8859-1/books/handbook/printing/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/printing/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/nl_NL.ISO8859-1/books/handbook/security/chapter.xml b/nl_NL.ISO8859-1/books/handbook/security/chapter.xml
index 65f96a7f5b..8a23f2e3c6 100644
--- a/nl_NL.ISO8859-1/books/handbook/security/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/security/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Dutch Documentation Project
diff --git a/nl_NL.ISO8859-1/books/handbook/serialcomms/chapter.xml b/nl_NL.ISO8859-1/books/handbook/serialcomms/chapter.xml
index 8cff3d1bf8..4b6752613e 100644
--- a/nl_NL.ISO8859-1/books/handbook/serialcomms/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/serialcomms/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Dutch Documentation Project
diff --git a/nl_NL.ISO8859-1/books/handbook/users/chapter.xml b/nl_NL.ISO8859-1/books/handbook/users/chapter.xml
index 2951fe678f..a2a668a16f 100644
--- a/nl_NL.ISO8859-1/books/handbook/users/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/users/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Dutch Documentation Project
diff --git a/nl_NL.ISO8859-1/books/handbook/vinum/chapter.xml b/nl_NL.ISO8859-1/books/handbook/vinum/chapter.xml
index c9dca54014..07497fe4fa 100644
--- a/nl_NL.ISO8859-1/books/handbook/vinum/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/vinum/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
De Vinum Volume Manager
Door Greg Lehey (grog at lemis dot com)
diff --git a/nl_NL.ISO8859-1/books/handbook/virtualization/chapter.xml b/nl_NL.ISO8859-1/books/handbook/virtualization/chapter.xml
index bc692030c5..3c7c40faf7 100644
--- a/nl_NL.ISO8859-1/books/handbook/virtualization/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/virtualization/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
@@ -1033,7 +1033,7 @@ xenbr1 8000.feffffffffff no vif0.1
role="package">emulators/virtualbox-ose-additions</filename> in de
&os;-gast.</para>
- <screen>&prompt.root; <userinput>cd /usr/ports/emulators/virtualbox-ose-additions && make install clean</userinput></screen>
+ <screen>&prompt.root; <userinput>cd /usr/ports/emulators/virtualbox-ose-additions && make install clean</userinput></screen>
<para>Voeg deze regels toe aan <filename>/etc/rc.conf</filename>:</para>
diff --git a/nl_NL.ISO8859-1/books/handbook/x11/chapter.xml b/nl_NL.ISO8859-1/books/handbook/x11/chapter.xml
index 86c3844861..42cb69029f 100644
--- a/nl_NL.ISO8859-1/books/handbook/x11/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/x11/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Dutch Documentation Project
@@ -334,7 +334,7 @@
de X11 server van de open source implementatie die is uitgebracht
door de X.Org Foundation. <application>&xorg;</application> is
gebaseerd op de code van
- <application>&xfree86 4.4RC2</application> en X11R6.6.
+ <application>&xfree86; 4.4RC2</application> en X11R6.6.
De versie van <application>&xorg;</application> die momenteel
beschikbaar is in de &os; Portscollectie is &xorg.version;.</para>
diff --git a/nl_NL.ISO8859-1/share/xml/glossary.ent b/nl_NL.ISO8859-1/share/xml/glossary.ent
index 7f0b1edfc9..ba94e26b02 100644
--- a/nl_NL.ISO8859-1/share/xml/glossary.ent
+++ b/nl_NL.ISO8859-1/share/xml/glossary.ent
@@ -1111,7 +1111,7 @@
</glossterm>
<acronym>MFS</acronym>
<glossdef subject="FreeBSD">
- <para>In het &os ontwikkelproces wordt een wijziging gecommit
+ <para>In het &os; ontwikkelproces wordt een wijziging gecommit
in de -CURRENT tak om deze te testen voordat deze wordt
samengevoegd naar -STABLE. In bijzondere gevallen gaat een
wijziging eerst naar -STABLE en wordt dan pas samengevoegd
diff --git a/nl_NL.ISO8859-1/share/xml/mirrors-local.xsl b/nl_NL.ISO8859-1/share/xml/mirrors-local.xsl
index c9fbae756b..0a03ee6f4a 100644
--- a/nl_NL.ISO8859-1/share/xml/mirrors-local.xsl
+++ b/nl_NL.ISO8859-1/share/xml/mirrors-local.xsl
@@ -11,7 +11,6 @@
<xsl:import href="../../../share/xml/mirrors-master.xsl" />
<xsl:output type="xml" encoding="iso-8859-1"
- omit-xml-declaration="yes"
indent="yes"/>
<!-- these params should be externally bound. The values
From 22e0a4a3313b4f2570846770d9a6c4d4fcc13235 Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Mon, 21 Jan 2013 17:42:03 +0000
Subject: [PATCH 017/121] - Make the Polish documentation valid XML
---
pl_PL.ISO8859-2/books/handbook/Makefile | 35 +++-
.../handbook/advanced-networking/chapter.xml | 2 +-
.../books/handbook/audit/chapter.xml | 2 +-
.../books/handbook/basics/chapter.xml | 2 +-
.../books/handbook/bibliography/chapter.xml | 2 +-
pl_PL.ISO8859-2/books/handbook/book.xml | 2 +-
.../books/handbook/boot/chapter.xml | 2 +-
pl_PL.ISO8859-2/books/handbook/chapters.ent | 178 +-----------------
pl_PL.ISO8859-2/books/handbook/colophon.xml | 2 +-
.../books/handbook/config/chapter.xml | 4 +-
.../books/handbook/cutting-edge/chapter.xml | 2 +-
.../books/handbook/desktop/chapter.xml | 6 +-
.../books/handbook/disks/chapter.xml | 14 +-
.../books/handbook/eresources/chapter.xml | 6 +-
.../books/handbook/firewalls/chapter.xml | 2 +-
.../books/handbook/geom/chapter.xml | 2 +-
.../books/handbook/install/chapter.xml | 2 +-
.../books/handbook/introduction/chapter.xml | 2 +-
.../books/handbook/kernelconfig/chapter.xml | 2 +-
.../books/handbook/l10n/chapter.xml | 2 +-
.../books/handbook/linuxemu/chapter.xml | 10 +-
.../books/handbook/mac/chapter.xml | 2 +-
.../books/handbook/mail/chapter.xml | 2 +-
.../books/handbook/mirrors/chapter.xml | 10 +-
.../books/handbook/multimedia/chapter.xml | 2 +-
.../handbook/network-servers/chapter.xml | 2 +-
.../books/handbook/pgpkeys/chapter.xml | 2 +-
.../books/handbook/ports/chapter.xml | 2 +-
.../books/handbook/ppp-and-slip/chapter.xml | 2 +-
.../books/handbook/preface/preface.xml | 2 +-
.../books/handbook/printing/chapter.xml | 2 +-
.../books/handbook/security/chapter.xml | 2 +-
.../books/handbook/serialcomms/chapter.xml | 2 +-
.../books/handbook/users/chapter.xml | 2 +-
.../books/handbook/vinum/chapter.xml | 2 +-
.../books/handbook/x11/chapter.xml | 2 +-
36 files changed, 89 insertions(+), 230 deletions(-)
diff --git a/pl_PL.ISO8859-2/books/handbook/Makefile b/pl_PL.ISO8859-2/books/handbook/Makefile
index 4a3ad49426..f71bce96a9 100644
--- a/pl_PL.ISO8859-2/books/handbook/Makefile
+++ b/pl_PL.ISO8859-2/books/handbook/Makefile
@@ -216,30 +216,55 @@ DOC_PREFIX?= ${.CURDIR}/../../..
#
# rules generating lists of mirror site from XML database.
#
-XMLDOCS= mirrors-ftp:::mirrors.xml.ftp.inc \
+XMLDOCS= lastmod:::mirrors.lastmod.inc \
+ mirrors-ftp-index:::mirrors.xml.ftp.index.inc \
+ mirrors-ftp:::mirrors.xml.ftp.inc \
+ mirrors-cvsup-index:::mirrors.xml.cvsup.index.inc \
mirrors-cvsup:::mirrors.xml.cvsup.inc \
+ eresources-index:::eresources.xml.www.index.inc \
eresources:::eresources.xml.www.inc
DEPENDSET.DEFAULT= transtable mirror
XSLT.DEFAULT= ${XSL_MIRRORS}
XML.DEFAULT= ${XML_MIRRORS}
NO_TIDY.DEFAULT= yes
+PARAMS.lastmod+= --param 'target' "'lastmod'"
+PARAMS.mirrors-ftp-index+= --param 'type' "'ftp'" \
+ --param 'proto' "'ftp'" \
+ --param 'target' "'index'"
PARAMS.mirrors-ftp+= --param 'type' "'ftp'" \
--param 'proto' "'ftp'" \
--param 'target' "'handbook/mirrors/chapter.xml'"
+PARAMS.mirrors-cvsup-index+= --param 'type' "'cvsup'" \
+ --param 'proto' "'cvsup'" \
+ --param 'target' "'index'"
PARAMS.mirrors-cvsup+= --param 'type' "'cvsup'" \
--param 'proto' "'cvsup'" \
--param 'target' "'handbook/mirrors/chapter.xml'"
+PARAMS.eresources-index+= --param 'type' "'www'" \
+ --param 'proto' "'http'" \
+ --param 'target' "'index'"
PARAMS.eresources+= --param 'type' "'www'" \
--param 'proto' "'http'" \
--param 'target' "'handbook/eresources/chapter.xml'"
-SRCS+= mirrors.xml.ftp.inc \
+SRCS+= mirrors.lastmod.inc \
+ mirrors.xml.ftp.inc \
+ mirrors.xml.ftp.index.inc \
mirrors.xml.cvsup.inc \
- eresources.xml.www.inc
+ mirrors.xml.cvsup.index.inc \
+ eresources.xml.www.inc \
+ eresources.xml.www.index.inc
-CLEANFILES+= mirrors.xml.ftp.inc \
+CLEANFILES+= mirrors.lastmod.inc \
+ mirrors.xml.ftp.inc \
+ mirrors.xml.ftp.index.inc \
mirrors.xml.cvsup.inc \
- eresources.xml.www.inc
+ mirrors.xml.cvsup.index.inc \
+ eresources.xml.www.inc \
+ eresources.xml.www.index.inc
+lint: mirrors.lastmod.inc mirrors.xml.ftp.inc mirrors.xml.ftp.index.inc \
+ mirrors.xml.cvsup.inc mirrors.xml.cvsup.index.inc \
+ eresources.xml.www.inc eresources.xml.www.index.inc
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/pl_PL.ISO8859-2/books/handbook/advanced-networking/chapter.xml b/pl_PL.ISO8859-2/books/handbook/advanced-networking/chapter.xml
index bbced0dcd9..c23d4afc19 100644
--- a/pl_PL.ISO8859-2/books/handbook/advanced-networking/chapter.xml
+++ b/pl_PL.ISO8859-2/books/handbook/advanced-networking/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Documentation Project
diff --git a/pl_PL.ISO8859-2/books/handbook/audit/chapter.xml b/pl_PL.ISO8859-2/books/handbook/audit/chapter.xml
index 8cfdba4c90..13aa55147a 100644
--- a/pl_PL.ISO8859-2/books/handbook/audit/chapter.xml
+++ b/pl_PL.ISO8859-2/books/handbook/audit/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Documentation Project
$FreeBSD$
diff --git a/pl_PL.ISO8859-2/books/handbook/basics/chapter.xml b/pl_PL.ISO8859-2/books/handbook/basics/chapter.xml
index 8176f59732..e78b35b459 100644
--- a/pl_PL.ISO8859-2/books/handbook/basics/chapter.xml
+++ b/pl_PL.ISO8859-2/books/handbook/basics/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Polish Documentation Project
diff --git a/pl_PL.ISO8859-2/books/handbook/bibliography/chapter.xml b/pl_PL.ISO8859-2/books/handbook/bibliography/chapter.xml
index dbb1322f7b..bc55531844 100644
--- a/pl_PL.ISO8859-2/books/handbook/bibliography/chapter.xml
+++ b/pl_PL.ISO8859-2/books/handbook/bibliography/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Polish Documentation Project
diff --git a/pl_PL.ISO8859-2/books/handbook/book.xml b/pl_PL.ISO8859-2/books/handbook/book.xml
index ca90ff2ae6..e3b5797ad7 100644
--- a/pl_PL.ISO8859-2/books/handbook/book.xml
+++ b/pl_PL.ISO8859-2/books/handbook/book.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
"../../../share/xml/freebsd42.dtd" [
<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//PL" "../../share/xml/entities.ent">
diff --git a/pl_PL.ISO8859-2/books/handbook/boot/chapter.xml b/pl_PL.ISO8859-2/books/handbook/boot/chapter.xml
index 039c55b245..96f10dce02 100644
--- a/pl_PL.ISO8859-2/books/handbook/boot/chapter.xml
+++ b/pl_PL.ISO8859-2/books/handbook/boot/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Documentation Project
diff --git a/pl_PL.ISO8859-2/books/handbook/chapters.ent b/pl_PL.ISO8859-2/books/handbook/chapters.ent
index 9740b42942..ce6215bb29 100644
--- a/pl_PL.ISO8859-2/books/handbook/chapters.ent
+++ b/pl_PL.ISO8859-2/books/handbook/chapters.ent
@@ -11,228 +11,60 @@
Original revision: 1.35
-->
-<!ENTITY % not.published "INCLUDE">
-
-<!ENTITY % chap.introduction "IGNORE">
-<!ENTITY % chap.install "IGNORE">
-<!ENTITY % chap.basics "IGNORE">
-<!ENTITY % chap.ports "IGNORE">
-<!ENTITY % chap.config "IGNORE">
-<!ENTITY % chap.boot "IGNORE">
-<!ENTITY % chap.users "IGNORE">
-<!ENTITY % chap.kernelconfig "IGNORE">
-<!ENTITY % chap.security "IGNORE">
-<!ENTITY % chap.jails "IGNORE">
-<!ENTITY % chap.printing "IGNORE">
-<!ENTITY % chap.disks "IGNORE">
-<!ENTITY % chap.geom "IGNORE">
-<!ENTITY % chap.vinum "IGNORE">
-<!ENTITY % chap.x11 "IGNORE">
-<!ENTITY % chap.l10n "IGNORE">
-<!ENTITY % chap.multimedia "IGNORE">
-<!ENTITY % chap.desktop "IGNORE">
-<!ENTITY % chap.serialcomms "IGNORE">
-<!ENTITY % chap.ppp-and-slip "IGNORE">
-<!ENTITY % chap.advanced-networking "IGNORE">
-<!ENTITY % chap.firewalls "IGNORE">
-<!ENTITY % chap.network-servers "IGNORE">
-<!ENTITY % chap.mail "IGNORE">
-<!ENTITY % chap.cutting-edge "IGNORE">
-<!ENTITY % chap.linuxemu "IGNORE">
-<!ENTITY % chap.mirrors "IGNORE">
-<!ENTITY % chap.mirrors.ftp.inc "INCLUDE">
-<!ENTITY % chap.mirrors.cvsup.inc "INCLUDE">
-<!ENTITY % chap.bibliography "IGNORE">
-<!ENTITY % chap.eresources "IGNORE">
-<!ENTITY % chap.eresources.www.inc "INCLUDE">
-<!ENTITY % chap.pgpkeys "IGNORE">
-<!ENTITY % chap.index "IGNORE">
-<!ENTITY % chap.freebsd-glossary "IGNORE">
-<!ENTITY % chap.mac "IGNORE">
-<!ENTITY % chap.audit "IGNORE">
-<!ENTITY % chap.filesystems "IGNORE">
-<!ENTITY % chap.dtrace "IGNORE">
-
<!ENTITY chap.preface SYSTEM "preface/preface.xml">
<!ENTITY % pgpkeys SYSTEM "../../../share/pgpkeys/pgpkeys.ent"> %pgpkeys;
<!-- Part One -->
-<![%chap.introduction;[
<!ENTITY chap.introduction SYSTEM "introduction/chapter.xml">
-]]>
-<![%chap.install;[
<!ENTITY chap.install SYSTEM "install/chapter.xml">
-]]>
-<![%chap.basics;[
<!ENTITY chap.basics SYSTEM "basics/chapter.xml">
-]]>
-<![%chap.ports;[
<!ENTITY chap.ports SYSTEM "ports/chapter.xml">
-]]>
-<![%chap.x11;[
<!ENTITY chap.x11 SYSTEM "x11/chapter.xml">
-]]>
<!-- Part Two -->
-<![%chap.desktop;[
<!ENTITY chap.desktop SYSTEM "desktop/chapter.xml">
-]]>
-<![%chap.multimedia;[
<!ENTITY chap.multimedia SYSTEM "multimedia/chapter.xml">
-]]>
-<![%chap.kernelconfig;[
<!ENTITY chap.kernelconfig SYSTEM "kernelconfig/chapter.xml">
-]]>
-<![%chap.printing;[
<!ENTITY chap.printing SYSTEM "printing/chapter.xml">
-]]>
-<![%chap.linuxemu;[
<!ENTITY chap.linuxemu SYSTEM "linuxemu/chapter.xml">
-]]>
<!-- Part Three -->
-<![%chap.config;[
<!ENTITY chap.config SYSTEM "config/chapter.xml">
-]]>
-<![%chap.boot;[
<!ENTITY chap.boot SYSTEM "boot/chapter.xml">
-]]>
-<![%chap.users;[
<!ENTITY chap.users SYSTEM "users/chapter.xml">
-]]>
-<![%chap.security;[
<!ENTITY chap.security SYSTEM "security/chapter.xml">
-]]>
-<![%chap.jails;[
<!ENTITY chap.jails SYSTEM "jails/chapter.xml">
-]]>
-<![%chap.mac;[
<!ENTITY chap.mac SYSTEM "mac/chapter.xml">
-]]>
-<![%chap.audit;[
<!ENTITY chap.audit SYSTEM "audit/chapter.xml">
-]]>
-<![%chap.disks;[
<!ENTITY chap.disks SYSTEM "disks/chapter.xml">
-]]>
-<![%chap.geom;[
<!ENTITY chap.geom SYSTEM "geom/chapter.xml">
-]]>
-<![%chap.filesystems;[
<!ENTITY chap.filesystems SYSTEM "filesystems/chapter.xml">
-]]>
-<![%chap.vinum;[
<!ENTITY chap.vinum SYSTEM "vinum/chapter.xml">
-]]>
-<![%chap.l10n;[
<!ENTITY chap.l10n SYSTEM "l10n/chapter.xml">
-]]>
-<![%chap.cutting-edge;[
<!ENTITY chap.cutting-edge SYSTEM "cutting-edge/chapter.xml">
-]]>
-<![%chap.dtrace;[
<!ENTITY chap.dtrace SYSTEM "dtrace/chapter.xml">
-]]>
<!-- Part Four -->
-<![%chap.serialcomms;[
<!ENTITY chap.serialcomms SYSTEM "serialcomms/chapter.xml">
-]]>
-<![%chap.ppp-and-slip;[
<!ENTITY chap.ppp-and-slip SYSTEM "ppp-and-slip/chapter.xml">
-]]>
-<![%chap.mail;[
<!ENTITY chap.mail SYSTEM "mail/chapter.xml">
-]]>
-<![%chap.network-servers;[
<!ENTITY chap.network-servers SYSTEM "network-servers/chapter.xml">
-]]>
-<![%chap.firewalls;[
<!ENTITY chap.firewalls SYSTEM "firewalls/chapter.xml">
-]]>
-<![%chap.advanced-networking;[
<!ENTITY chap.advanced-networking SYSTEM "advanced-networking/chapter.xml">
-]]>
<!-- Part Five (appendices) -->
-<![%chap.mirrors;[
<!ENTITY chap.mirrors SYSTEM "mirrors/chapter.xml">
-]]>
-<![%chap.mirrors.ftp.inc;[
+ <!ENTITY chap.mirrors.lastmod.inc SYSTEM "mirrors.lastmod.inc">
+ <!ENTITY chap.mirrors.ftp.index.inc SYSTEM "mirrors.xml.ftp.index.inc">
<!ENTITY chap.mirrors.ftp.inc SYSTEM "mirrors.xml.ftp.inc">
-]]>
-<![%chap.mirrors.cvsup.inc;[
+ <!ENTITY chap.mirrors.cvsup.index.inc SYSTEM "mirrors.xml.cvsup.index.inc">
<!ENTITY chap.mirrors.cvsup.inc SYSTEM "mirrors.xml.cvsup.inc">
-]]>
-<![%chap.bibliography;[
<!ENTITY chap.bibliography SYSTEM "bibliography/chapter.xml">
-]]>
-<![%chap.eresources;[
<!ENTITY chap.eresources SYSTEM "eresources/chapter.xml">
-]]>
-<![%chap.eresources.www.inc;[
+ <!ENTITY chap.eresources.www.index.inc SYSTEM "eresources.xml.www.index.inc">
<!ENTITY chap.eresources.www.inc SYSTEM "eresources.xml.www.inc">
-]]>
-<![%chap.pgpkeys;[
<!ENTITY chap.pgpkeys SYSTEM "pgpkeys/chapter.xml">
-]]>
-<![%chap.freebsd-glossary;[
<!ENTITY chap.freebsd-glossary "&freebsd-glossary;">
-]]>
-<![%chap.index;[
- <!ENTITY chap.index SYSTEM "index.xml">
-]]>
+ <!ENTITY chap.index "">
<!ENTITY chap.colophon SYSTEM "colophon.xml">
-
-<!-- IGNORE cases -->
-
-<!-- Part One -->
-<!ENTITY chap.introduction "">
-<!ENTITY chap.install "">
-<!ENTITY chap.basics "">
-<!ENTITY chap.ports "">
-<!ENTITY chap.x11 "">
-
-<!-- Part Two -->
-<!ENTITY chap.desktop "">
-<!ENTITY chap.multimedia "">
-<!ENTITY chap.kernelconfig "">
-<!ENTITY chap.printing "">
-<!ENTITY chap.linuxemu "">
-
-<!-- Part Three -->
-<!ENTITY chap.config "">
-<!ENTITY chap.boot "">
-<!ENTITY chap.users "">
-<!ENTITY chap.security "">
-<!ENTITY chap.jails "">
-<!ENTITY chap.mac "">
-<!ENTITY chap.audit "">
-<!ENTITY chap.disks "">
-<!ENTITY chap.geom "">
-<!ENTITY chap.filesystems "">
-<!ENTITY chap.vinum "">
-<!ENTITY chap.virtualization "">
-<!ENTITY chap.l10n "">
-<!ENTITY chap.cutting-edge "">
-<!ENTITY chap.dtrace "">
-
-<!-- Part Four -->
-<!ENTITY chap.serialcomms "">
-<!ENTITY chap.ppp-and-slip "">
-<!ENTITY chap.mail "">
-<!ENTITY chap.network-servers "">
-<!ENTITY chap.firewalls "">
-<!ENTITY chap.advanced-networking "">
-
-<!-- Part Five (appendices) -->
-<!ENTITY chap.mirrors "">
-<!ENTITY chap.mirrors.ftp.inc "">
-<!ENTITY chap.mirrors.cvsup.inc "">
-<!ENTITY chap.bibliography "">
-<!ENTITY chap.eresources "">
-<!ENTITY chap.eresources.www.inc "">
-<!ENTITY chap.pgpkeys "">
-<!ENTITY chap.freebsd-glossary "">
-<!ENTITY chap.index "">
diff --git a/pl_PL.ISO8859-2/books/handbook/colophon.xml b/pl_PL.ISO8859-2/books/handbook/colophon.xml
index 23748e9c2c..b929981a7f 100644
--- a/pl_PL.ISO8859-2/books/handbook/colophon.xml
+++ b/pl_PL.ISO8859-2/books/handbook/colophon.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Polish Documentation Project
diff --git a/pl_PL.ISO8859-2/books/handbook/config/chapter.xml b/pl_PL.ISO8859-2/books/handbook/config/chapter.xml
index 282b0899c3..4825f473e0 100644
--- a/pl_PL.ISO8859-2/books/handbook/config/chapter.xml
+++ b/pl_PL.ISO8859-2/books/handbook/config/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Documentation Project
@@ -390,7 +390,7 @@ stop)
kill -9 `cat /var/run/utility.pid`
;;
*)
- echo "Usage: `basename $0` {start|stop}" >&2
+ echo "Usage: `basename $0` {start|stop}" >&2
exit 64
;;
esac
diff --git a/pl_PL.ISO8859-2/books/handbook/cutting-edge/chapter.xml b/pl_PL.ISO8859-2/books/handbook/cutting-edge/chapter.xml
index ae57257815..4e6c02ba0f 100644
--- a/pl_PL.ISO8859-2/books/handbook/cutting-edge/chapter.xml
+++ b/pl_PL.ISO8859-2/books/handbook/cutting-edge/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Documentation Project
diff --git a/pl_PL.ISO8859-2/books/handbook/desktop/chapter.xml b/pl_PL.ISO8859-2/books/handbook/desktop/chapter.xml
index 800bb11499..a46516e736 100644
--- a/pl_PL.ISO8859-2/books/handbook/desktop/chapter.xml
+++ b/pl_PL.ISO8859-2/books/handbook/desktop/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Polish Documentation Project
@@ -327,12 +327,12 @@
<screen>&prompt.root; <userinput>cd /usr/src</userinput>
&prompt.root; <userinput>fetch http://people.FreeBSD.org/~nork/rtld_dlsym_hack.diff</userinput>
-&prompt.root; <userinput>patch < rtld_dlsym_hack.diff</userinput>
+&prompt.root; <userinput>patch < rtld_dlsym_hack.diff</userinput>
&prompt.root; <userinput>cd libexec/rtld-elf/</userinput>
&prompt.root; <userinput>make clean</userinput>
&prompt.root; <userinput>make obj</userinput>
&prompt.root; <userinput>make depend</userinput>
-&prompt.root; <userinput>make && make install</userinput></screen>
+&prompt.root; <userinput>make && make install</userinput></screen>
<para>Po czym musimy ponownie uruchomi� komputer.</para>
diff --git a/pl_PL.ISO8859-2/books/handbook/disks/chapter.xml b/pl_PL.ISO8859-2/books/handbook/disks/chapter.xml
index 5726735f6a..041ae3ebb2 100644
--- a/pl_PL.ISO8859-2/books/handbook/disks/chapter.xml
+++ b/pl_PL.ISO8859-2/books/handbook/disks/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Documentation Project
@@ -2601,7 +2601,7 @@ sa0(ncr1:4:0): Logical unit is in process of becoming ready</screen>
<example>
<title>A Script for Creating a Bootable Floppy</title>
- <programlisting><![ CDATA [#!/bin/sh
+ <programlisting><![CDATA[#!/bin/sh
#
# create a restore floppy
#
@@ -2813,16 +2813,6 @@ echo "The floppy has been unmounted and is now ready."]]></programlisting>
Whatever caused the crash or data loss may strike again. Another
hour spent now may save you from further distress later.</para>
</sect3>
-
-<![ %not.published; [
-
- <sect3>
- <title>* I Did Not Prepare for the Disaster, What Now?</title>
-
- <para></para>
- </sect3>
-]]>
-
</sect2>
</sect1>
diff --git a/pl_PL.ISO8859-2/books/handbook/eresources/chapter.xml b/pl_PL.ISO8859-2/books/handbook/eresources/chapter.xml
index 0133045012..2997cbc32f 100644
--- a/pl_PL.ISO8859-2/books/handbook/eresources/chapter.xml
+++ b/pl_PL.ISO8859-2/books/handbook/eresources/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Documentation Project
@@ -1703,6 +1703,10 @@
<sect1 id="eresources-web">
<title>World Wide Web Servers</title>
+ &chap.eresources.www.index.inc;
+
+ &chap.mirrors.lastmod.inc;
+
&chap.eresources.www.inc;
</sect1>
diff --git a/pl_PL.ISO8859-2/books/handbook/firewalls/chapter.xml b/pl_PL.ISO8859-2/books/handbook/firewalls/chapter.xml
index ee46955977..29bf44fccc 100644
--- a/pl_PL.ISO8859-2/books/handbook/firewalls/chapter.xml
+++ b/pl_PL.ISO8859-2/books/handbook/firewalls/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Documentation Project
diff --git a/pl_PL.ISO8859-2/books/handbook/geom/chapter.xml b/pl_PL.ISO8859-2/books/handbook/geom/chapter.xml
index 6d4721e2e4..2026d043cc 100644
--- a/pl_PL.ISO8859-2/books/handbook/geom/chapter.xml
+++ b/pl_PL.ISO8859-2/books/handbook/geom/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Documentation Project
$FreeBSD$
diff --git a/pl_PL.ISO8859-2/books/handbook/install/chapter.xml b/pl_PL.ISO8859-2/books/handbook/install/chapter.xml
index 3dada36626..c1d716fc30 100644
--- a/pl_PL.ISO8859-2/books/handbook/install/chapter.xml
+++ b/pl_PL.ISO8859-2/books/handbook/install/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Polish Documentation Project
diff --git a/pl_PL.ISO8859-2/books/handbook/introduction/chapter.xml b/pl_PL.ISO8859-2/books/handbook/introduction/chapter.xml
index 69aa7e1cb6..d9be249892 100644
--- a/pl_PL.ISO8859-2/books/handbook/introduction/chapter.xml
+++ b/pl_PL.ISO8859-2/books/handbook/introduction/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Polish Documentation Project
diff --git a/pl_PL.ISO8859-2/books/handbook/kernelconfig/chapter.xml b/pl_PL.ISO8859-2/books/handbook/kernelconfig/chapter.xml
index 6c768df12f..913853c9d6 100644
--- a/pl_PL.ISO8859-2/books/handbook/kernelconfig/chapter.xml
+++ b/pl_PL.ISO8859-2/books/handbook/kernelconfig/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Polish Documentation Project
diff --git a/pl_PL.ISO8859-2/books/handbook/l10n/chapter.xml b/pl_PL.ISO8859-2/books/handbook/l10n/chapter.xml
index ff6c476814..6236701373 100644
--- a/pl_PL.ISO8859-2/books/handbook/l10n/chapter.xml
+++ b/pl_PL.ISO8859-2/books/handbook/l10n/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Documentation Project
diff --git a/pl_PL.ISO8859-2/books/handbook/linuxemu/chapter.xml b/pl_PL.ISO8859-2/books/handbook/linuxemu/chapter.xml
index ca61fabcea..9dd6a53a67 100644
--- a/pl_PL.ISO8859-2/books/handbook/linuxemu/chapter.xml
+++ b/pl_PL.ISO8859-2/books/handbook/linuxemu/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Documentation Project
@@ -615,14 +615,14 @@ LOG=/var/log/lmgrd.log
case "$1" in
start)
- lmgrd -c ${LICENSE_FILE} 2>> ${LOG} 1>&2
+ lmgrd -c ${LICENSE_FILE} 2>> ${LOG} 1>&2
echo -n " lmgrd"
;;
stop)
- lmgrd -c ${LICENSE_FILE} -x lmdown 2>> ${LOG} 1>&2
+ lmgrd -c ${LICENSE_FILE} -x lmdown 2>> ${LOG} 1>&2
;;
*)
- echo "Usage: `basename $0` {start|stop}" 1>&2
+ echo "Usage: `basename $0` {start|stop}" 1>&2
exit 64
;;
esac
@@ -901,7 +901,7 @@ exit 0</programlisting>
contain the following:</para>
<programlisting>#!/usr/compat/linux/bin/sh
-(sleep 5; killall -1 matlab_helper) &
+(sleep 5; killall -1 matlab_helper) &
exit 0</programlisting>
</step>
diff --git a/pl_PL.ISO8859-2/books/handbook/mac/chapter.xml b/pl_PL.ISO8859-2/books/handbook/mac/chapter.xml
index bdda4845cb..d3f4e3c17c 100644
--- a/pl_PL.ISO8859-2/books/handbook/mac/chapter.xml
+++ b/pl_PL.ISO8859-2/books/handbook/mac/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Documentation Project
$FreeBSD$
diff --git a/pl_PL.ISO8859-2/books/handbook/mail/chapter.xml b/pl_PL.ISO8859-2/books/handbook/mail/chapter.xml
index 9822ff76a6..e051dc67aa 100644
--- a/pl_PL.ISO8859-2/books/handbook/mail/chapter.xml
+++ b/pl_PL.ISO8859-2/books/handbook/mail/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Documentation Project
diff --git a/pl_PL.ISO8859-2/books/handbook/mirrors/chapter.xml b/pl_PL.ISO8859-2/books/handbook/mirrors/chapter.xml
index 91da938cf3..6bdc9ae856 100644
--- a/pl_PL.ISO8859-2/books/handbook/mirrors/chapter.xml
+++ b/pl_PL.ISO8859-2/books/handbook/mirrors/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Documentation Project
@@ -273,6 +273,10 @@
methods available for each site are provided in parentheses
after the hostname.</para>
+ &chap.mirrors.ftp.index.inc;
+
+ &chap.mirrors.lastmod.inc;
+
&chap.mirrors.ftp.inc;
</sect1>
@@ -2326,6 +2330,10 @@ doc/zh_*</screen>
<para><link linkend="cvsup">CVSup</link> servers for FreeBSD are running
at the following sites:</para>
+ &chap.mirrors.cvsup.index.inc;
+
+ &chap.mirrors.lastmod.inc;
+
&chap.mirrors.cvsup.inc;
</sect2>
</sect1>
diff --git a/pl_PL.ISO8859-2/books/handbook/multimedia/chapter.xml b/pl_PL.ISO8859-2/books/handbook/multimedia/chapter.xml
index 93d2cb6ee2..de21e19deb 100644
--- a/pl_PL.ISO8859-2/books/handbook/multimedia/chapter.xml
+++ b/pl_PL.ISO8859-2/books/handbook/multimedia/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Documentation Project
diff --git a/pl_PL.ISO8859-2/books/handbook/network-servers/chapter.xml b/pl_PL.ISO8859-2/books/handbook/network-servers/chapter.xml
index 89e7013096..c73e199a9b 100644
--- a/pl_PL.ISO8859-2/books/handbook/network-servers/chapter.xml
+++ b/pl_PL.ISO8859-2/books/handbook/network-servers/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Documentation Project
diff --git a/pl_PL.ISO8859-2/books/handbook/pgpkeys/chapter.xml b/pl_PL.ISO8859-2/books/handbook/pgpkeys/chapter.xml
index 35b33145a9..56fa76c07f 100644
--- a/pl_PL.ISO8859-2/books/handbook/pgpkeys/chapter.xml
+++ b/pl_PL.ISO8859-2/books/handbook/pgpkeys/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Documentation Project
diff --git a/pl_PL.ISO8859-2/books/handbook/ports/chapter.xml b/pl_PL.ISO8859-2/books/handbook/ports/chapter.xml
index a541195139..89624bf757 100644
--- a/pl_PL.ISO8859-2/books/handbook/ports/chapter.xml
+++ b/pl_PL.ISO8859-2/books/handbook/ports/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Polish Documentation Project
diff --git a/pl_PL.ISO8859-2/books/handbook/ppp-and-slip/chapter.xml b/pl_PL.ISO8859-2/books/handbook/ppp-and-slip/chapter.xml
index 39d4f88bf2..fe62c1eda2 100644
--- a/pl_PL.ISO8859-2/books/handbook/ppp-and-slip/chapter.xml
+++ b/pl_PL.ISO8859-2/books/handbook/ppp-and-slip/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Documentation Project
diff --git a/pl_PL.ISO8859-2/books/handbook/preface/preface.xml b/pl_PL.ISO8859-2/books/handbook/preface/preface.xml
index a565e7fd2f..20ef5fd36f 100644
--- a/pl_PL.ISO8859-2/books/handbook/preface/preface.xml
+++ b/pl_PL.ISO8859-2/books/handbook/preface/preface.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Polish Documentation Project
diff --git a/pl_PL.ISO8859-2/books/handbook/printing/chapter.xml b/pl_PL.ISO8859-2/books/handbook/printing/chapter.xml
index 6c50560d6c..5e1736a3ac 100644
--- a/pl_PL.ISO8859-2/books/handbook/printing/chapter.xml
+++ b/pl_PL.ISO8859-2/books/handbook/printing/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Documentation Project
diff --git a/pl_PL.ISO8859-2/books/handbook/security/chapter.xml b/pl_PL.ISO8859-2/books/handbook/security/chapter.xml
index 34d9592e35..3da3d06fc4 100644
--- a/pl_PL.ISO8859-2/books/handbook/security/chapter.xml
+++ b/pl_PL.ISO8859-2/books/handbook/security/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Documentation Project
diff --git a/pl_PL.ISO8859-2/books/handbook/serialcomms/chapter.xml b/pl_PL.ISO8859-2/books/handbook/serialcomms/chapter.xml
index ff89ce1eb0..b2337fbcf7 100644
--- a/pl_PL.ISO8859-2/books/handbook/serialcomms/chapter.xml
+++ b/pl_PL.ISO8859-2/books/handbook/serialcomms/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Documentation Project
diff --git a/pl_PL.ISO8859-2/books/handbook/users/chapter.xml b/pl_PL.ISO8859-2/books/handbook/users/chapter.xml
index 2820678aa1..fdca469842 100644
--- a/pl_PL.ISO8859-2/books/handbook/users/chapter.xml
+++ b/pl_PL.ISO8859-2/books/handbook/users/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Polish Documentation Project
diff --git a/pl_PL.ISO8859-2/books/handbook/vinum/chapter.xml b/pl_PL.ISO8859-2/books/handbook/vinum/chapter.xml
index 3b3ade50a2..f25d496c46 100644
--- a/pl_PL.ISO8859-2/books/handbook/vinum/chapter.xml
+++ b/pl_PL.ISO8859-2/books/handbook/vinum/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The Vinum Volume Manager
By Greg Lehey (grog at lemis dot com)
diff --git a/pl_PL.ISO8859-2/books/handbook/x11/chapter.xml b/pl_PL.ISO8859-2/books/handbook/x11/chapter.xml
index f65bf0ca0c..37c3ddb00e 100644
--- a/pl_PL.ISO8859-2/books/handbook/x11/chapter.xml
+++ b/pl_PL.ISO8859-2/books/handbook/x11/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Polish Documentation Project
From 141ff167310f2c7731d306c70a09ee9b67c61d25 Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Mon, 21 Jan 2013 17:42:38 +0000
Subject: [PATCH 018/121] - Make the Brazilian Portuguese documentation valid
XML
---
.../articles/contributing-ports/article.xml | 2 +-
.../freebsd-update-server/article.xml | 10 +-
.../articles/problem-reports/article.xml | 8 +-
pt_BR.ISO8859-1/books/faq/book.xml | 34 ++--
.../books/fdp-primer/doc-build/chapter.xml | 1 +
.../books/fdp-primer/examples/appendix.xml | 5 +-
.../books/fdp-primer/overview/chapter.xml | 1 +
.../books/fdp-primer/psgml-mode/chapter.xml | 1 +
.../books/fdp-primer/see-also/chapter.xml | 1 +
.../books/fdp-primer/sgml-markup/chapter.xml | 105 +++++------
.../books/fdp-primer/sgml-primer/chapter.xml | 110 +++++------
.../books/fdp-primer/structure/chapter.xml | 3 +-
.../books/fdp-primer/stylesheets/chapter.xml | 1 +
.../books/fdp-primer/the-website/chapter.xml | 1 +
.../books/fdp-primer/tools/chapter.xml | 1 +
.../books/fdp-primer/translations/chapter.xml | 1 +
.../fdp-primer/writing-style/chapter.xml | 13 +-
.../handbook/advanced-networking/chapter.xml | 2 +-
.../books/handbook/basics/chapter.xml | 2 +-
.../books/handbook/bibliography/chapter.xml | 2 +-
pt_BR.ISO8859-1/books/handbook/book.xml | 2 +-
.../books/handbook/boot/chapter.xml | 2 +-
pt_BR.ISO8859-1/books/handbook/chapters.ent | 173 +-----------------
pt_BR.ISO8859-1/books/handbook/colophon.xml | 2 +-
.../books/handbook/config/chapter.xml | 2 +-
.../books/handbook/cutting-edge/chapter.xml | 2 +-
.../books/handbook/disks/chapter.xml | 2 +-
.../books/handbook/eresources/chapter.xml | 2 +-
.../books/handbook/install/chapter.xml | 2 +-
.../books/handbook/introduction/chapter.xml | 2 +-
.../books/handbook/kernelconfig/chapter.xml | 2 +-
.../books/handbook/l10n/chapter.xml | 2 +-
.../books/handbook/linuxemu/chapter.xml | 2 +-
.../books/handbook/mail/chapter.xml | 2 +-
.../books/handbook/mirrors/chapter.xml | 20 +-
.../books/handbook/pgpkeys/chapter.xml | 2 +-
.../books/handbook/ports/chapter.xml | 2 +-
.../books/handbook/ppp-and-slip/chapter.xml | 2 +-
.../books/handbook/preface/preface.xml | 2 +-
.../books/handbook/printing/chapter.xml | 2 +-
.../books/handbook/security/chapter.xml | 2 +-
.../books/handbook/serialcomms/chapter.xml | 2 +-
.../books/handbook/users/chapter.xml | 2 +-
.../books/handbook/x11/chapter.xml | 2 +-
44 files changed, 180 insertions(+), 361 deletions(-)
diff --git a/pt_BR.ISO8859-1/articles/contributing-ports/article.xml b/pt_BR.ISO8859-1/articles/contributing-ports/article.xml
index 4326701a7b..edcab8972f 100644
--- a/pt_BR.ISO8859-1/articles/contributing-ports/article.xml
+++ b/pt_BR.ISO8859-1/articles/contributing-ports/article.xml
@@ -1011,7 +1011,7 @@
Banco de Dados de Relat�rios de Problemas</ulink>.</para>
<para>O <ulink url="http://pointyhat.FreeBSD.org/">Pointyhat</ulink>
- é o cluster de compila��o do sistema de
+ � o cluster de compila��o do sistema de
<literal>ports</literal>. Voc� pode utilizar o Pointyhat
para verificar os logs de compila��o de um
<literal>port</literal> em todas as arquiteturas e releases
diff --git a/pt_BR.ISO8859-1/articles/freebsd-update-server/article.xml b/pt_BR.ISO8859-1/articles/freebsd-update-server/article.xml
index 1f87a326fb..ac456abd1d 100644
--- a/pt_BR.ISO8859-1/articles/freebsd-update-server/article.xml
+++ b/pt_BR.ISO8859-1/articles/freebsd-update-server/article.xml
@@ -788,14 +788,14 @@ addextradocs () {
<screen>#Build the world
log "Building world"
-cd /usr/src &&
-make -j 2 ${COMPATFLAGS} buildworld 2>&1
+cd /usr/src &&
+make -j 2 ${COMPATFLAGS} buildworld 2>&1
# Distribute the world
log "Distributing world"
-cd /usr/src/release &&
-make -j 2 obj &&
- make ${COMPATFLAGS} release.1 release.2 2>&1</screen>
+cd /usr/src/release &&
+make -j 2 obj &&
+ make ${COMPATFLAGS} release.1 release.2 2>&1</screen>
</listitem>
<listitem>
diff --git a/pt_BR.ISO8859-1/articles/problem-reports/article.xml b/pt_BR.ISO8859-1/articles/problem-reports/article.xml
index 89fa4e748d..80eb7a1bb4 100644
--- a/pt_BR.ISO8859-1/articles/problem-reports/article.xml
+++ b/pt_BR.ISO8859-1/articles/problem-reports/article.xml
@@ -561,7 +561,7 @@
<para>O fato de que voc� leu o
<filename>src/UPDATING</filename> e que o seu
problema n�o est� listado ali
- (é certeza que algu�m vai
+ (� certeza que algu�m vai
perguntar)</para>
</listitem>
<listitem>
@@ -599,7 +599,7 @@
<para>O fato de que voc� leu o
<filename>ports/UPDATING</filename> e que o seu
problema n�o est� listado ali
- (é certeza que algu�m vai
+ (� certeza que algu�m vai
perguntar)</para>
</listitem>
</itemizedlist>
@@ -661,7 +661,7 @@
voc� deve estar preparado para n�o somente
disponibilizar um <literal>patch</literal>, como
tamb�m para defender porque o seu
- <literal>patch</literal> é <quote>a coisa certa a
+ <literal>patch</literal> � <quote>a coisa certa a
se fazer</quote>. Como mencionado acima, realizar uma
busca cuidadosa no hist�rico das <ulink
url="http://www.FreeBSD.org/search/search.html#mailinglists">listas
@@ -1453,7 +1453,7 @@
<para>Antes de pressionar o bot�o
<literal>submit</literal> para enviar o seu relat�rio,
- voc� terá que preencher um campo com o texto
+ voc� ter� que preencher um campo com o texto
exibido na imagem de captcha exibida no final do
formul�rio. Infelizmente esta medida teve de ser
adotada devido ao mau uso do mesmo por sistemas automatizados
diff --git a/pt_BR.ISO8859-1/books/faq/book.xml b/pt_BR.ISO8859-1/books/faq/book.xml
index 7c194ccd9f..c452ef68e0 100644
--- a/pt_BR.ISO8859-1/books/faq/book.xml
+++ b/pt_BR.ISO8859-1/books/faq/book.xml
@@ -2381,7 +2381,7 @@ sectors/track: 63</screen>
voc� ter� que instalar a
distribui��o <quote>crypto</quote> via
sysinstall ou apartir do c�digo fonte). Instalando
- as bibliotecas crypto será possivel utilizar outros
+ as bibliotecas crypto ser� possivel utilizar outros
tipos de criptografia, como o formato Blowfish, que
� ainda mais seguro do que o MD5. A
defini��o de qual codifica��o
@@ -2957,7 +2957,7 @@ disk wd2 at wdc1 drive 1 # change from wd3 to wd2</programlisting
<para>O FreeBSD suporta ZIP Drives do tipo SCSI, �
claro. Essa unidade deve ser configurada apenas nos SCSI
ID n�meros 5 ou 6, mas se a sua BIOS tem suporte
- à inicializ��o(boot) pela unidade
+ � inicializ��o(boot) pela unidade
SCSI, essa caracter�stica pode ser usada sem
problemas. N�o est� claro exatamente quais
adaptadores SCSI suportam a caracter�stica de
@@ -3505,11 +3505,11 @@ diff -u -r1.60.2.1 -r1.60.2.2
if (verbose >= 2)
printf("psm%d: SET_DEFAULTS return code:%04x\n", unit, i);
+#endif
- if (sc->config & PSM_CONFIG_RESOLUTION) {
+ if (sc->config & PSM_CONFIG_RESOLUTION) {
sc->mode.resolution
= set_mouse_resolution(sc->kbdc,
-- (sc->config & PSM_CONFIG_RESOLUTION) - 1);
-+ (sc->config & PSM_CONFIG_RESOLUTION) - 1);
+- (sc->config & PSM_CONFIG_RESOLUTION) - 1);
++ (sc->config & PSM_CONFIG_RESOLUTION) - 1);
+ } else if (sc->mode.resolution >= 0) {
+ sc->mode.resolution
+ = set_mouse_resolution(sc->kbdc, sc->dflt_mode.resolution);
@@ -3520,7 +3520,7 @@ diff -u -r1.60.2.1 -r1.60.2.2
+ set_mouse_scaling(sc->kbdc, 1);
/* request a data packet and extract sync. bits */
- if (get_mouse_status(sc->kbdc, stat, 1, 3) < 3) {</programlisting>
+ if (get_mouse_status(sc->kbdc, stat, 1, 3) < 3) {</programlisting>
<para>Em vers�es posteriores � 3.2, o suporte
deve funcionar.</para>
@@ -5026,7 +5026,7 @@ Checking for Plug-n-Play devices...
Card assigned CSN #1
Vendor ID PMC2430 (0x3024a341), Serial Number 0xffffffff
PnP Version 1.0, Vendor Version 0
-Device Description: Pace 56 Voice Internal Plug & Play Modem
+Device Description: Pace 56 Voice Internal Plug & Play Modem
Logical Device ID: PMC2430 0x3024a341 #0
Device supports I/O Range Check
@@ -6052,7 +6052,7 @@ kern.timecounter.hardware: TSC -> i8254</screen>
<programlisting>options GPL_MATH_EMULATE</programlisting>
<note>
- <para>Quando você fizer isto, ser�
+ <para>Quando voc� fizer isto, ser�
necess�rio remover a op��o
<literal>MATH_EMULATE</literal></para>
</note>
@@ -6120,7 +6120,7 @@ crw-rw-rw- 1 root wheel 41, 1 Oct 15 22:14 spx</screen>
� <ulink
url="http://www.cis.ohio-state.edu/~barr/INN.html">Dave
Barr's INN Page</ulink> onde vo�e
- encontrará o <literal>FAQ</literal> do INN.
+ encontrar� o <literal>FAQ</literal> do INN.
</para>
</answer>
</qandaentry>
@@ -6643,7 +6643,7 @@ device sio5 at isa? port 0x2b8 tty flags 0x501 vector siointr</programlisting>
<procedure>
<step>
<para>Crie um novo sistema de arquivos com o
- &man.newfs.8 na nova parti��o.</para>
+ &man.newfs.8; na nova parti��o.</para>
</step>
<step>
@@ -6676,7 +6676,7 @@ device sio5 at isa? port 0x2b8 tty flags 0x501 vector siointr</programlisting>
&prompt.root; <userinput>dump 0af - / | restore xf -</userinput></screen>
<para>Redefinir a estrutura das parti��es com
- o &man.dump.8 � um processo um pouco mais
+ o &man.dump.8; � um processo um pouco mais
trabalhoso. Caso voc� queira, por exemplo, unir o
conte�do da parti��o
<filename>/var</filename> com as parti��es
@@ -7044,7 +7044,7 @@ use "disklabel -r" to install initial label</screen>
<screen>&prompt.root; <userinput>disklabel ccd0 > /tmp/disklabel.tmp</userinput>
&prompt.root; <userinput>disklabel -Rr ccd0 /tmp/disklabel.tmp</userinput>
&prompt.root; <userinput>disklabel -e ccd0</userinput>
-(agora irá funcionar)</screen>
+(agora ir� funcionar)</screen>
</answer>
</qandaentry>
@@ -11526,7 +11526,7 @@ default 10.0.0.2 UGSc 0 0 tun0
<para>Assume-se o uso do endere�o recomendado pelo
&a.ptbr.p.handbook;, p�ginas de manual ou no
arquivo ppp.conf.sample. Se a rota padr�o
- n�o foi definida, é poss�vel que a
+ n�o foi definida, � poss�vel que a
vers�o do &man.ppp.8; seja antiga, uma vez que
n�o entendem a palavra <literal>HISADDR</literal>
no arquivo ppp.conf. Se a vers�o do seu FreeBSD
@@ -11768,7 +11768,7 @@ deny pred1 deflate deflate24 protocomp acfcomp shortseq vj</programlisting>
ent�o quando a proxima queda de link ocorrer, eles
podem ser capazes de dizer porque o seu lado esta tendo
problemas. Sinta-se livre para enviar os detalhes para
- &a.brian ou pe�a para seu provedor
+ &a.brian; ou pe�a para seu provedor
contact�-lo diretamente.</para>
</answer>
</qandaentry>
@@ -11920,7 +11920,7 @@ deny pred1 deflate deflate24 protocomp acfcomp shortseq vj</programlisting>
, CCP & IPCP com suas requisi��es
originais. Como consequ�ncia, se uma
implementa��o ppp � 6 segundos mais
- lenta do que o outro lado, esse lado emitirá duas
+ lenta do que o outro lado, esse lado emitir� duas
requis�es adicionais de configura��o
LCP. Isto � fatal.</para>
@@ -13289,7 +13289,7 @@ device sio7 at isa? port 0x2b8 tty flags 0x781 irq 7 vector siointr</programlist
tip57600|Disque para qualquer n�mero em 57600 bps:\
:dv=/dev/cuaa0:br#57600:at=hayes:pa=none:du:</programlisting>
- <para>Depois você pode fazer algo como <command>tip
+ <para>Depois voc� pode fazer algo como <command>tip
-115200 5551234</command>. Se preferir o &man.cu.1; ao
inv�s do &man.tip.1;, utilize uma entrada
gen�rica:</para>
@@ -13675,7 +13675,7 @@ raisechar=^^</programlisting>
<para>O FreeBSD vem de tradi��o
<quote>cl�ssica</quote> e por isso sempre usou o
- formado &man.a.out.5 que � uma tecnologia que foi
+ formado &man.a.out.5; que � uma tecnologia que foi
experimentada e aprovada por v�rias
gera��es de sistemas BSD. Apesar de,
h� algum tempo tamb�m ser poss�vel
diff --git a/pt_BR.ISO8859-1/books/fdp-primer/doc-build/chapter.xml b/pt_BR.ISO8859-1/books/fdp-primer/doc-build/chapter.xml
index cd66467abc..5218a3581b 100644
--- a/pt_BR.ISO8859-1/books/fdp-primer/doc-build/chapter.xml
+++ b/pt_BR.ISO8859-1/books/fdp-primer/doc-build/chapter.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Copyright (c) 1999 Neil Blakey-Milner, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/pt_BR.ISO8859-1/books/fdp-primer/examples/appendix.xml b/pt_BR.ISO8859-1/books/fdp-primer/examples/appendix.xml
index 2e5d6fa786..2b534cba53 100644
--- a/pt_BR.ISO8859-1/books/fdp-primer/examples/appendix.xml
+++ b/pt_BR.ISO8859-1/books/fdp-primer/examples/appendix.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Copyright (c) 2000 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
@@ -74,7 +75,7 @@
<example>
<title>DocBook <sgmltag>book</sgmltag></title>
- <programlisting><![ RCDATA [<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.1//EN">
+ <programlisting><![CDATA[<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.1//EN">
<book>
<bookinfo>
@@ -126,7 +127,7 @@
<example>
<title>DocBook <sgmltag>article</sgmltag></title>
- <programlisting><![ RCDATA [<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook V4.1//EN">
+ <programlisting><![CDATA[<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook V4.1//EN">
<article>
<articleinfo>
diff --git a/pt_BR.ISO8859-1/books/fdp-primer/overview/chapter.xml b/pt_BR.ISO8859-1/books/fdp-primer/overview/chapter.xml
index b97ed64711..d907e68ba0 100644
--- a/pt_BR.ISO8859-1/books/fdp-primer/overview/chapter.xml
+++ b/pt_BR.ISO8859-1/books/fdp-primer/overview/chapter.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/pt_BR.ISO8859-1/books/fdp-primer/psgml-mode/chapter.xml b/pt_BR.ISO8859-1/books/fdp-primer/psgml-mode/chapter.xml
index 1e830891ba..624ec3e8ff 100644
--- a/pt_BR.ISO8859-1/books/fdp-primer/psgml-mode/chapter.xml
+++ b/pt_BR.ISO8859-1/books/fdp-primer/psgml-mode/chapter.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/pt_BR.ISO8859-1/books/fdp-primer/see-also/chapter.xml b/pt_BR.ISO8859-1/books/fdp-primer/see-also/chapter.xml
index c681654aa5..d79f096954 100644
--- a/pt_BR.ISO8859-1/books/fdp-primer/see-also/chapter.xml
+++ b/pt_BR.ISO8859-1/books/fdp-primer/see-also/chapter.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/pt_BR.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml b/pt_BR.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml
index ec8bb39d10..2cc9f6046c 100644
--- a/pt_BR.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml
+++ b/pt_BR.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
@@ -176,7 +177,7 @@
<para>Uso:</para>
- <programlisting><![ RCDATA [<h1>Primeira se��o</h1>
+ <programlisting><![CDATA[<h1>Primeira se��o</h1>
<!-- a introdu��o do documento entra aqui -->
@@ -210,7 +211,7 @@
<para>Uso:</para>
- <programlisting><![ RCDATA [<h1>Primeira se��o</h1>
+ <programlisting><![CDATA[<h1>Primeira se��o</h1>
<!-- Introdu��o do documento -->
@@ -231,7 +232,7 @@
<para>Uso:</para>
- <programlisting><![ RCDATA [<p>Isto � um par�grafo. Pode conter qualquer outro elemento</p>]]></programlisting>
+ <programlisting><![CDATA[<p>Isto � um par�grafo. Pode conter qualquer outro elemento</p>]]></programlisting>
</example>
</sect3>
@@ -248,7 +249,7 @@
<para>Uso:</para>
- <programlisting><![ RCDATA [<p>Um pequeno trecho da constitui��o dos Estados Unidos:</p>
+ <programlisting><![CDATA[<p>Um pequeno trecho da constitui��o dos Estados Unidos:</p>
<blockquote>
N�s, povo dos Estados Unidos, com o objetivo de fazer uma
@@ -300,7 +301,7 @@ essa constitui
<para>Uso:</para>
- <programlisting><![ RCDATA [<p>Uma lista n�o ordenada. Os itens ser�o provavelmente
+ <programlisting><![CDATA[<p>Uma lista n�o ordenada. Os itens ser�o provavelmente
precedidos por uma esfera s�lida.</p>
<ul>
@@ -332,7 +333,7 @@ ser
<para>Uso:</para>
- <programlisting><![ RCDATA [<dl>
+ <programlisting><![CDATA[<dl>
<dt>Termo 1</dt>
<dd><p>Par�grafo 1 da defini��o 1.</p>
@@ -369,7 +370,7 @@ ser
<para>Voc� pode usar <sgmltag>pre</sgmltag> para
marcar uma mensagem de email;</para>
- <programlisting><![ RCDATA [<pre>
+ <programlisting><![CDATA[<pre>
From: nik@FreeBSD.org
To: freebsd-doc@FreeBSD.org
Subject: New documentation available
@@ -387,7 +388,7 @@ ser
<para>Tenha em mente que o <literal><</literal> e o
<literal>&</literal> continuam sendo reconhecidos como
caracteres especiais em um texto pr�-formatado.
- É por isto que nos exemplos tivemos que utilizar
+ � por isto que nos exemplos tivemos que utilizar
<literal>&lt;</literal> ao inv�s de
<literal><</literal>. Para manter a consist�ncia,
o <literal>&gt;</literal> tamb�m foi utilizado
@@ -428,7 +429,7 @@ ser
<para>Uso:</para>
- <programlisting><![ RCDATA [<p>Esta � uma simples tabela 2x2.</p>
+ <programlisting><![CDATA[<p>Esta � uma simples tabela 2x2.</p>
<table>
<tr>
@@ -455,7 +456,7 @@ ser
<para>Uso:</para>
- <programlisting><![ RCDATA [<p>Uma c�lula comprida e estreita na esquerda e duas
+ <programlisting><![CDATA[<p>Uma c�lula comprida e estreita na esquerda e duas
c�lulas pequenas � direita.</p>
<table>
@@ -476,7 +477,7 @@ c
<para>Uso:</para>
- <programlisting><![ RCDATA [<p>Uma c�lula longa em cima, duas c�lulas abaixo.</p>
+ <programlisting><![CDATA[<p>Uma c�lula longa em cima, duas c�lulas abaixo.</p>
<table>
<tr>
@@ -497,7 +498,7 @@ c
<para>Uso:</para>
- <programlisting><![ RCDATA [<p>Numa tabela 3x3, o bloco superior esquerdo � um conjunto
+ <programlisting><![CDATA[<p>Numa tabela 3x3, o bloco superior esquerdo � um conjunto
2x2 fundidos em um. As outras c�lulas s�o normais.</p>
<table>
@@ -548,7 +549,7 @@ c
<para>Uso:</para>
- <programlisting><![ RCDATA [<p><em>Este</em> foi enfatizado
+ <programlisting><![CDATA[<p><em>Este</em> foi enfatizado
enquanto <strong>este</strong> foi fortemente enfatizado.</p>]]>
</programlisting>
</example>
@@ -567,7 +568,7 @@ enquanto <strong>este</strong> foi fortemente enfatizado.</p>]]>
<example>
<title><sgmltag>b</sgmltag> e <sgmltag>i</sgmltag></title>
- <programlisting><![ RCDATA [<p><b>Este</b> esta em negrito,
+ <programlisting><![CDATA[<p><b>Este</b> esta em negrito,
enquanto <i>este</i> est� em it�lico.</p>]]>
</programlisting>
</example>
@@ -585,7 +586,7 @@ enquanto <i>este</i> est
<para>Uso:</para>
- <programlisting><![ RCDATA [<p> Este documento foi originalmente por
+ <programlisting><![CDATA[<p> Este documento foi originalmente por
Nik Clayton, que pode ser encontrado por email em
<tt>nik@FreeBSD.org</tt>.</p>]]></programlisting>
</example>
@@ -634,7 +635,7 @@ Nik Clayton, que pode ser encontrado por email em
<para>Todos os fragmentos fazem a mesma coisa.</para>
- <programlisting><![ RCDATA [<p>Este texto � <small>ligeiramente menor</small>.
+ <programlisting><![CDATA[<p>Este texto � <small>ligeiramente menor</small>.
Mas este texto � <big>ligeiramente maior</big>.</p>
<p>Este texto � <font size="-1">ligeiramente menor</font>.
@@ -674,7 +675,7 @@ Mas este texto
<para>Uso:</para>
- <programlisting><![ RCDATA [<p>Maiores informa��es est�o dispon�veis no
+ <programlisting><![CDATA[<p>Maiores informa��es est�o dispon�veis no
<a href="http://www.FreeBSD.org/">web site do FreeBSD</a>.</p>]]></programlisting>
</example>
@@ -700,7 +701,7 @@ Mas este texto
<para>Uso:</para>
- <programlisting><![ RCDATA [<p><a name="para1">Este</a> par�grafo pode ser referenciado
+ <programlisting><![CDATA[<p><a name="para1">Este</a> par�grafo pode ser referenciado
em outros links com o nome<tt>para1</tt>.</p>]]></programlisting>
</example>
@@ -717,7 +718,7 @@ em outros links com o nome<tt>para1</tt>.</p>]]></programlisting>
em um documento chamado <filename>foo.html</filename>.
</para>
- <programlisting><![ RCDATA [<p>Mais informa��o no <a href="foo.html#para1">primeiro
+ <programlisting><![CDATA[<p>Mais informa��o no <a href="foo.html#para1">primeiro
par�grafo</a> de <tt>foo.html</tt>.</p>]]>
</programlisting>
</example>
@@ -733,7 +734,7 @@ par
<para>Suponha que o exemplo <literal>para1</literal> esteja neste documento</para>
- <programlisting><![ RCDATA [<p>Mais informa��o no <a href="#para1">primeiro
+ <programlisting><![CDATA[<p>Mais informa��o no <a href="#para1">primeiro
par�grafo</a> deste documento.</p>]]></programlisting>
</example>
</sect3>
@@ -744,7 +745,7 @@ par
<title>DocBook</title>
<para>O DocBook foi originalmente desenvolvido por HaL Computer
- Systems e O'Reilly & Associates como um DTD para escrever
+ Systems e O'Reilly & Associates como um DTD para escrever
documenta��o t�cnica
<footnote><para>Uma pequena hist�ria sobre este assunto
pode ser encontrada em
@@ -992,7 +993,7 @@ par
<example>
<title>Um cap�tulo simples</title>
- <programlisting><![ RCDATA [<chapter>
+ <programlisting><![CDATA[<chapter>
<title>T�tulo do cap�tulo</title>
...
@@ -1008,7 +1009,7 @@ par
<example>
<title>Cap�tulos Vazios</title>
- <programlisting><![ RCDATA [<chapter>
+ <programlisting><![CDATA[<chapter>
<title>Isto � um cap�tulo vazio</title>
<para></para>
@@ -1040,7 +1041,7 @@ par
<example>
<title>Se��es em Cap�tulos</title>
- <programlisting><![ RCDATA [<chapter>
+ <programlisting><![CDATA[<chapter>
<title>Um exemplo de cap�tulo</title>
<para>Algum texto dentro do cap�tulo</para>
@@ -1095,7 +1096,7 @@ par
<sgmltag>part</sgmltag>s. Isto n�o pode ser
feito em um <sgmltag>article</sgmltag>.</para>
- <programlisting><![ RCDATA [<part>
+ <programlisting><![CDATA[<part>
<title>Introdu��o</title>
<chapter>
@@ -1142,7 +1143,7 @@ par
<para>Uso:</para>
- <programlisting><![ RCDATA [<para>Isso � um par�grafo. E pode conter quase
+ <programlisting><![CDATA[<para>Isso � um par�grafo. E pode conter quase
qualquer outro elemento.</para> ]]></programlisting>
<para>Apar�ncia:</para>
@@ -1171,7 +1172,7 @@ par
<para>Uso:</para>
- <programlisting><![ RCDATA [<para>Um pequeno peda�o da Constitui��o dos Estados Unidos:</para>
+ <programlisting><![CDATA[<para>Um pequeno peda�o da Constitui��o dos Estados Unidos:</para>
<blockquote>
<title>Pre�mbulo da constitui��o dos Estados Unidos.</title>
@@ -1263,7 +1264,7 @@ par
<para>Uso:</para>
- <programlisting><![ RCDATA [<warning>
+ <programlisting><![CDATA[<warning>
<para>Instalar o FreeBSD talvez fa�a com que voc� queira
desinstalar o Windows do seu Hard disk.</para>
</warning>]]></programlisting>
@@ -1321,7 +1322,7 @@ desinstalar o Windows do seu Hard disk.</para>
<para>Uso:</para>
- <programlisting><![ RCDATA [<itemizedlist>
+ <programlisting><![CDATA[<itemizedlist>
<listitem>
<para>Esse � o primeiro item enumerado.</para>
</listitem>
@@ -1416,7 +1417,7 @@ desinstalar o Windows do seu Hard disk.</para>
<para>Uso:</para>
- <programlisting><![ RCDATA[<para>Quando voc� tiver terminado, seu programa deve estar assim:</para>
+ <programlisting><![CDATA[<para>Quando voc� tiver terminado, seu programa deve estar assim:</para>
<programlisting>#include <stdio.h>
@@ -1467,7 +1468,7 @@ main(void)
<title><sgmltag>co</sgmltag> e
<sgmltag>calloutlist</sgmltag></title>
- <programlisting><![ RCDATA[<para>Quando voc� tivert terminado, seu prograva deve estar assim;</para>
+ <programlisting><![CDATA[<para>Quando voc� tivert terminado, seu prograva deve estar assim;</para>
<programlisting>#include <stdio.h> <co id="co-ex-include"/>
@@ -1556,7 +1557,7 @@ main(void)
<para>Uso:</para>
- <programlisting><![ RCDATA [<informaltable pgwide="1">
+ <programlisting><![CDATA[<informaltable pgwide="1">
<tgroup cols="2">
<thead>
<row>
@@ -1736,7 +1737,7 @@ main(void)
<para>Uso:</para>
- <programlisting><![ RCDATA [<screen>&prompt.user; <userinput>ls -1</userinput>
+ <programlisting><![CDATA[<screen>&prompt.user; <userinput>ls -1</userinput>
foo1
foo2
foo3
@@ -1798,7 +1799,7 @@ This is the file called 'foo2'</screen>
<para>Uso:</para>
- <programlisting><![ RCDATA [<para>O FreeBSD � sem d�vida <emphasis>o</emphasis> melhor sistema operacional tipo Unix
+ <programlisting><![CDATA[<para>O FreeBSD � sem d�vida <emphasis>o</emphasis> melhor sistema operacional tipo Unix
para a arquitetura Intel.</para>]]></programlisting>
<para>Apar�ncia:</para>
@@ -1823,7 +1824,7 @@ para a arquitetura Intel.</para>]]></programlisting>
<para>Uso:</para>
- <programlisting><![ RCDATA [<para>Entretanto, certifique-se que a busca n�o v� al�m do <quote>limite entre
+ <programlisting><![CDATA[<para>Entretanto, certifique-se que a busca n�o v� al�m do <quote>limite entre
a administra��o local e p�blica</quote> como diz o RFC 1535.</para>]]></programlisting>
<para>Apar�ncia:</para>
@@ -1865,7 +1866,7 @@ para a arquitetura Intel.</para>]]></programlisting>
<para>Uso:</para>
- <programlisting><![ RCDATA [<para>Para mudar para o segundo terminal virtual, digite
+ <programlisting><![CDATA[<para>Para mudar para o segundo terminal virtual, digite
<keycombo action="simul"><keycap>Alt</keycap>
<keycap>F1</keycap></keycombo>.</para>
@@ -1991,7 +1992,7 @@ para a arquitetura Intel.</para>]]></programlisting>
<para>Uso:</para>
- <programlisting><![ CDATA [<para>O <application>Sendmail</application> � a aplica��o
+ <programlisting><![CDATA[<para>O <application>Sendmail</application> � a aplica��o
de email mais utilizada em Unix.</para>
<para>O <application>Sendmail</application> inclui os programas
@@ -2046,7 +2047,7 @@ para a arquitetura Intel.</para>]]></programlisting>
<para>Uso:</para>
- <programlisting><![ RCDATA [<para>O fonte SGML do Handbook em Ingl�s pode ser encotrado em
+ <programlisting><![CDATA[<para>O fonte SGML do Handbook em Ingl�s pode ser encotrado em
<filename class="directory">/usr/doc/en_US.ISO8859-1/books/handbook/</filename>.
O primeiro arquivo neste diret�rio � chamado <filename>book.xml</filename>.
Voc� tamb�m deve ver o <filename>Makefile</filename>
@@ -2092,7 +2093,7 @@ para a arquitetura Intel.</para>]]></programlisting>
<para>Use:</para>
- <programlisting><![ RCDATA [<para>Instale o port <filename role="package">net/ethereal</filename>
+ <programlisting><![CDATA[<para>Instale o port <filename role="package">net/ethereal</filename>
para ver o tr�fego na rede.</para>]]></programlisting>
<para>Apar�ncia:</para>
@@ -2131,7 +2132,7 @@ para ver o tr
<para>Uso:</para>
- <programlisting><![ RCDATA [
+ <programlisting><![CDATA[
<para><devicename>sio</devicename> � usado para comunica��o
serial no FreeBSD. <devicename>sio</devicename> se manifesta
atrav�s de entradas em <filename>/dev</filename>, incluindo
@@ -2269,7 +2270,7 @@ para ver o tr
<para>Use:</para>
- <programlisting><![ RCDATA [
+ <programlisting><![CDATA[
<para>A m�quina local sempre pode ser referida pelo nome
<hostid>localhost</hostid>, que ter� o endere�o IP
<hostid role="ipaddr">127.0.0.1</hostid>.</para>
@@ -2339,7 +2340,7 @@ role="mac">08:00:20:87:ef:d0</hostid>).</para>
<para>Uso:</para>
- <programlisting><![ RCDATA [<para>Para executar a maioria das fun��es administrativas voc� precisar�
+ <programlisting><![CDATA[<para>Para executar a maioria das fun��es administrativas voc� precisar�
ser <username>root</username>.</para>]]></programlisting>
<para>Apar�ncia:</para>
@@ -2382,7 +2383,7 @@ role="mac">08:00:20:87:ef:d0</hostid>).</para>
<para>Uso:</para>
- <programlisting><![ RCDATA [
+ <programlisting><![CDATA[
<para>Dois alvos comuns em um <filename>Makefile</filename> s�o
<maketarget>all</maketarget> e <maketarget>clean</maketarget>.</para>
@@ -2441,7 +2442,7 @@ muitas vari
<para>Uso:</para>
- <programlisting><![ RCDATA [ <para>A linha <literal>maxusers 10</literal> no arquivo de
+ <programlisting><![CDATA[ <para>A linha <literal>maxusers 10</literal> no arquivo de
configura��o do kernel determina o tamanho de muitas tabelas
do sistema, e diz aproximadamente quantos logins simult�neos
o sistema ir� suportar.</para>
@@ -2479,7 +2480,7 @@ o sistema ir
<para>Uso:</para>
- <programlisting><![ CDATA [<screen>&prompt.user; <userinput>man <replaceable>command</replaceable></userinput></screen>]]></programlisting>
+ <programlisting><![CDATA[<screen>&prompt.user; <userinput>man <replaceable>command</replaceable></userinput></screen>]]></programlisting>
<para>Apar�ncia:</para>
@@ -2497,7 +2498,7 @@ o sistema ir
<para>Uso:</para>
- <programlisting><![ RCDATA [
+ <programlisting><![CDATA[
<para>A linha <literal>maxusers <replaceable>n</replaceable></literal>
no arquivo de configura��o do kernel determina o tamanho de muitas
tabelas do sistema, e diz aproximadamente quantos logins simult�neos
@@ -2533,7 +2534,7 @@ bom valor para <replaceable>n</replaceable>.</para>
<para>Uso:</para>
- <programlisting><![ RCDATA [
+ <programlisting><![CDATA[
<screen><errorname>Panic: cannot mount root</errorname></screen> ]]>
</programlisting>
@@ -2849,7 +2850,7 @@ IMAGES= chapter1/fig1.png
<title>O atributo <literal>id</literal> em cap�tulos
ou se��es</title>
- <programlisting><![ RCDATA [<chapter id="chapter1">
+ <programlisting><![CDATA[<chapter id="chapter1">
<title>Introdu��o</title>
<para>Esta � a introdu��o. Cont�m uma
@@ -2881,7 +2882,7 @@ IMAGES= chapter1/fig1.png
<example>
<title><sgmltag>anchor</sgmltag></title>
- <programlisting><![ RCDATA [<para>
+ <programlisting><![CDATA[<para>
Este par�grafo tem um <anchor id="para1">alvo dentro dele.
O qual n�o ir� aparecer no documento
</para>]]></programlisting>
@@ -2912,7 +2913,7 @@ O qual n
lugar de um documento que inclua o <literal>id</literal>
do exemplo.</para>
- <programlisting><![ RCDATA [
+ <programlisting><![CDATA[
<para>Maiores informa��es podem ser encontradas
em <xref linkend="chapter1"/></para>
@@ -2961,7 +2962,7 @@ O qual n
um documento que inclui o <literal>id</literal> do
exemplo.</para>
- <programlisting><![ RCDATA [
+ <programlisting><![CDATA[
<para>Maiores informa��es podem ser encontradas
<link linkend="chapter1">no primeiro cap�tulo</link>.
</para>
@@ -3021,7 +3022,7 @@ O qual n
<para>Uso:</para>
- <programlisting><![ RCDATA [
+ <programlisting><![CDATA[
<para>� claro que voc� pode parar de ler este documento e ir para a
<ulink url="&url.base;/index.html">P�gina principal do FreeBSD</ulink>
</para>
diff --git a/pt_BR.ISO8859-1/books/fdp-primer/sgml-primer/chapter.xml b/pt_BR.ISO8859-1/books/fdp-primer/sgml-primer/chapter.xml
index 0e47df9f10..8d056ae206 100644
--- a/pt_BR.ISO8859-1/books/fdp-primer/sgml-primer/chapter.xml
+++ b/pt_BR.ISO8859-1/books/fdp-primer/sgml-primer/chapter.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
@@ -128,7 +129,7 @@
<para>O exemplo acima foi na verdade escrito neste documento
como se segue:</para>
- <programlisting><![ CDATA [
+ <programlisting><![CDATA[
<para>Para remover <filename>/tmp/foo</filename> utilize &man.rm.1;.</para>
<screen>&prompt.user; <userinput>rm /tmp/foo</userinput></screen>]]></programlisting>
@@ -291,7 +292,7 @@
elemento possui ambas as tags de in�cio e de fim.
</para>
- <programlisting><![ RCDATA [<p>Este � um par�grafo. Ele inicia com a tag de inicio do
+ <programlisting><![CDATA[<p>Este � um par�grafo. Ele inicia com a tag de inicio do
elemento 'p', e ir� terminar com a tag de fim para o
elemento 'p'.</p>
@@ -315,7 +316,7 @@
n�o cont�m nenhum conte�do, assim ele
possui apenas uma tag de inicio.</para>
- <programlisting><![ RCDATA [<p>Este � um par�grafo.</p>
+ <programlisting><![CDATA[<p>Este � um par�grafo.</p>
<hr>
@@ -333,7 +334,7 @@
<title>Elementos contendo elementos; <sgmltag>em</sgmltag>
</title>
- <programlisting><![ RCDATA [<p>Este � um <em>par�grafo</em> simples no qual
+ <programlisting><![CDATA[<p>Este � um <em>par�grafo</em> simples no qual
algumas das <em>palavras</em> foram <em>enfatizadas</em>.</p>]]></programlisting>
</example>
@@ -395,7 +396,7 @@
<example>
<title>Utilizando um elemento com um atributo</title>
- <programlisting><![ RCDATA [<p align="left">A inclus�o de um atributo de alinhamento neste
+ <programlisting><![CDATA[<p align="left">A inclus�o de um atributo de alinhamento neste
par�grafo foi sup�rfluo, uma vez que o alinhamento
padr�o � left (esquerda).</p>
@@ -413,7 +414,7 @@
<example>
<title>Aspas simples envolta de atributos</title>
- <programlisting><![ RCDATA [<p align='right'>Eu estou a direita!</p>]]></programlisting>
+ <programlisting><![CDATA[<p align='right'>Eu estou a direita!</p>]]></programlisting>
</example>
<para>Algumas vezes voc� n�o precisa utilizar aspas
@@ -504,7 +505,7 @@ setenv SGML_CATALOG_FILES /usr/doc/en_US.ISO8859-1/share/xml/catalog:$SGML_CATAL
<para>Crie o arquivo <filename>example.xml</filename>, e
entre com o seguinte texto:</para>
- <programlisting><![ RCDATA [<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+ <programlisting><![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<html>
<head>
@@ -677,7 +678,7 @@ onsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
documento escrito para conformar-se com a vers�o 4.0
do DTD HTML se parece com esta:</para>
- <programlisting><![ RCDATA [<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN">]]></programlisting>
+ <programlisting><![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN">]]></programlisting>
<para>Esta linha cont�m diferentes componentes.</para>
@@ -941,7 +942,7 @@ onsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
<para>A sintaxe para isto � ligeiramente diferente:
</para>
- <programlisting><![ RCDATA [<!DOCTYPE html SYSTEM "/path/to/file.dtd">]]></programlisting>
+ <programlisting><![CDATA[<!DOCTYPE html SYSTEM "/path/to/file.dtd">]]></programlisting>
<para>A palavra chave <literal>SYSTEM</literal> indica que o
processador SGML deve encontrar o DTD em um local
@@ -1007,7 +1008,7 @@ onsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
<programlisting><!-- Teste de coment�rio --></programlisting>
- <programlisting><![ RCDATA [
+ <programlisting><![CDATA[
<!-- Este � o interior do coment�rio -->
<!-- Este � outro coment�rio -->
@@ -1019,29 +1020,6 @@ onsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
-- de fazer coment�rios de v�rias linhas -->]]></programlisting>
</example>
- <![ %output.print; [
- <important>
- <title>Utilize 2 tra�os</title>
-
- <para>Existe um problema com a produ��o de
- vers�es Postscript e PDF deste documento. O exemplo
- acima provavelmente mostra apenas um s�mbolo de
- h�fen, <literal>-</literal> depois do
- <literal><!</literal> e antes do <literal>></literal>.
- </para>
-
- <para>Voc� <emphasis>deve</emphasis> utilizar dois
- <literal>-</literal> e <emphasis>n�o</emphasis> um.
- As vers�es Postscript e PDF traduzem os dois
- <literal>-</literal> do original para um mais longo, e mais
- profissional <emphasis>em-dash</emphasis>, e quebra este
- exemplo no processo.</para>
-
- <para>As vers�es HTML, texto plano, e RTF deste
- documento n�o s�o afetadas.</para>
- </important>
- ]]>
-
<para>Se voc� j� utilizou HTML antes, voc� pode ter
sido exposto a regras diferentes para coment�rios. Em
particular, voc� pode pensar que o conjunto de caracteres
@@ -1059,7 +1037,7 @@ onsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
<example>
<title>Coment�rios SGML errados</title>
- <programlisting><![ RCDATA [
+ <programlisting><![CDATA[
<!-- Este � o coment�rio --
Isto est� fora do coment�rio!
@@ -1074,12 +1052,12 @@ onsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
<para>Isto n�o � um SGML v�lido, e pode
dar mensagens de erro confusas.</para>
- <programlisting><![ RCDATA [<!--------------- Isto � uma id�ia muito ruim --------------->]]></programlisting>
+ <programlisting><![CDATA[<!--------------- Isto � uma id�ia muito ruim --------------->]]></programlisting>
<para>E como o exemplo sugere, <emphasis>n�o escreva
</emphasis> coment�rios como esse.</para>
- <programlisting><![ RCDATA [<!--===================================================-->]]></programlisting>
+ <programlisting><![CDATA[<!--===================================================-->]]></programlisting>
<para>Esta � uma abordagem (ligeiramente) melhor, mas
ele ainda � potencialmente confuso para as pessoas
@@ -1147,7 +1125,7 @@ onsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
expande para a vers�o atual do seu produto.
Voc� pode escrever:</para>
- <programlisting><![ RCDATA [<para>A vers�o atual do nosso produto � &current.version;.</para>]]></programlisting>
+ <programlisting><![CDATA[<para>A vers�o atual do nosso produto � &current.version;.</para>]]></programlisting>
<para>Quando o n�mero de vers�o mudar,
voc� pode simplesmente alterar a defini��o
@@ -1180,7 +1158,7 @@ onsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
<example>
<title>Definindo uma entidade geral</title>
- <programlisting><![ RCDATA [<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
+ <programlisting><![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
<!ENTITY current.version "3.0-RELEASE">
<!ENTITY last.version "2.2.7-RELEASE">
]>]]></programlisting>
@@ -1227,7 +1205,7 @@ onsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
<example>
<title>Definindo entidades de par�metros</title>
- <programlisting><![ RCDATA [<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
+ <programlisting><![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
<!ENTITY % param.some "some">
<!ENTITY % param.text "text">
<!ENTITY % param.new "%param.some more %param.text">
@@ -1249,7 +1227,7 @@ onsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
<para>Adicione uma entidade geral ao
<filename>example.xml</filename>.</para>
- <programlisting><![ RCDATA [<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+ <programlisting><![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
<!ENTITY version "1.1">
]>
@@ -1362,7 +1340,7 @@ onsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
<title>Utilizando entidades gerais para incluir
arquivos</title>
- <programlisting><![ CDATA [<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
+ <programlisting><![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
<!ENTITY chapter.1 SYSTEM "chapter1.xml">
<!ENTITY chapter.2 SYSTEM "chapter2.xml">
<!ENTITY chapter.3 SYSTEM "chapter3.xml">
@@ -1424,7 +1402,7 @@ onsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
<filename>chapters.ent</filename>. Este arquivo
cont�m o seguinte:</para>
- <programlisting><![ RCDATA [<!ENTITY chapter.1 SYSTEM "chapter1.xml">
+ <programlisting><![CDATA[<!ENTITY chapter.1 SYSTEM "chapter1.xml">
<!ENTITY chapter.2 SYSTEM "chapter2.xml">
<!ENTITY chapter.3 SYSTEM "chapter3.xml">]]></programlisting>
@@ -1435,7 +1413,7 @@ onsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
dispon�veis para uso. Feito isso, utilize as
entidades gerais como antes;</para>
- <programlisting><![ RCDATA [<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
+ <programlisting><![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
<!-- Define uma entidade de par�metro para carregar as entidades gerais de capitulo -->
<!ENTITY % chapters SYSTEM "chapters.ent">
@@ -1468,14 +1446,14 @@ onsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
<para>Coloque um conte�do similar ao seguinte em
cada arquivo:</para>
- <programlisting><![ RCDATA [<p>Este � o primeiro par�grafo.</p>]]></programlisting>
+ <programlisting><![CDATA[<p>Este � o primeiro par�grafo.</p>]]></programlisting>
</step>
<step>
<para>Edite o arquivo <filename>example.xml</filename>
para que ele se pare�a com este:</para>
- <programlisting><![ RCDATA [<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
+ <programlisting><![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
<!ENTITY version "1.1">
<!ENTITY para1 SYSTEM "para1.xml">
<!ENTITY para2 SYSTEM "para2.xml">
@@ -1532,7 +1510,7 @@ onsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
<filename>example.xml</filename> para que ele se
pare�a com este:</para>
- <programlisting><![ RCDATA [<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
+ <programlisting><![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
<!ENTITY % entities SYSTEM "entities.xml"> %entities;
]>
@@ -1556,7 +1534,7 @@ onsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
<filename>entities.xml</filename>, com este
conte�do:</para>
- <programlisting><![ RCDATA [<!ENTITY version "1.1">
+ <programlisting><![CDATA[<!ENTITY version "1.1">
<!ENTITY para1 SYSTEM "para1.xml">
<!ENTITY para2 SYSTEM "para2.xml">
<!ENTITY para3 SYSTEM "para3.xml">]]></programlisting>
@@ -1601,7 +1579,7 @@ onsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
<para>Como voc� esperaria, sendo uma
constru��o SGML, uma sess�o
- marcada inicia com um <literal><!</literal>.</para>
+ marcada inicia com um <literal><!</literal>.</para>
<para>O primeiro colchete come�a a limitar a sess�o
marcada.</para>
@@ -1697,29 +1675,29 @@ onsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
<title>Utilizando uma sess�o marcada como
CDATA</title>
- <programlisting><para>Aqui est� um exemplo de como voc� incluiria algum texto que contenha muitos
- s�mbolos <literal>&lt;</literal> e <literal>&amp;</literal>.
+ <programlisting><para>Aqui est� um exemplo de como voc� incluiria algum texto que contenha muitos
+ s�mbolos <literal><</literal> e <literal>></literal>.
O texto de exemplo � um fragmento de HTML.
- O texto circunvizinho (<para> e <programlisting>) � do
- DocBook.</para>
+ O texto circunvizinho (<para> e <programlisting>) � do
+ DocBook.</para>
-<programlisting>
- <![ CDATA [ <![ RCDATA [
- <p>Esta � uma amostra que apresenta alguns elementos de HTML.
- Uma vez que os s�mbolos de < e > s�o utilizados muitas vezes, �
+<programlisting>
+ <![CDATA[>![RCDATA[
+ <p>Esta � uma amostra que apresenta alguns elementos de HTML.
+ Uma vez que os s�mbolos de < e > s�o utilizados muitas vezes, �
mais f�cil dizer que o exemplo todo � uma sess�o marcada do
tipo CDATA, do que utilizar nomes de entidades para representar
- estes s�mbolos ao longo de todo o texto.</p>
+ estes s�mbolos ao longo de todo o texto.</p>
- <ul>
- <li>Este � um item de lista</li>
- <li>Este � um segundo item de lista</li>
- <li>Este � um terceiro item de lista</li>
- </ul>
+ <ul>
+ <li>Este � um item de lista</li>
+ <li>Este � um segundo item de lista</li>
+ <li>Este � um terceiro item de lista</li>
+ </ul>
- <p>Este � o final do exemplo.</p>]]>
+ <p>Este � o final do exemplo.</p>]]>
]]>
-</programlisting></programlisting>
+</programlisting></programlisting>
<para>Se voc� examinar o fonte deste documento
voc� ir� ver que esta t�cnica foi
@@ -1833,7 +1811,7 @@ onsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
</head>
<body>
- <p>Este par�grafo <![ CDATA [cont�m muitos caracteres <
+ <p>Este par�grafo <![CDATA[cont�m muitos caracteres <
(< < < < <) de forma que � mais simples utilizar
uma sess�o marcada do tipo CDATA.]]></p>
@@ -1842,7 +1820,7 @@ onsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
no output.</p>
]]>
- <![ <![ CDATA [%text.output]]> [
+ <![ <![CDATA[%text.output]]> [
<p>Este par�grafo pode ou n�o aparecer no output.</p>
<p>A sua ocorr�ncia � controlada pela entidade de par�metro <![CDATA[%text.output]]>
diff --git a/pt_BR.ISO8859-1/books/fdp-primer/structure/chapter.xml b/pt_BR.ISO8859-1/books/fdp-primer/structure/chapter.xml
index 8ea88855db..3fa3afbfc5 100644
--- a/pt_BR.ISO8859-1/books/fdp-primer/structure/chapter.xml
+++ b/pt_BR.ISO8859-1/books/fdp-primer/structure/chapter.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
@@ -273,7 +274,7 @@
<para>Por exemplo, se um dos arquivos de cap�tulos
contiver:</para>
- <programlisting><![ CDATA [
+ <programlisting><![CDATA[
<chapter id="kernelconfig">
...
</chapter>]]></programlisting>
diff --git a/pt_BR.ISO8859-1/books/fdp-primer/stylesheets/chapter.xml b/pt_BR.ISO8859-1/books/fdp-primer/stylesheets/chapter.xml
index d95a8c4e5a..b7c995dcbb 100644
--- a/pt_BR.ISO8859-1/books/fdp-primer/stylesheets/chapter.xml
+++ b/pt_BR.ISO8859-1/books/fdp-primer/stylesheets/chapter.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/pt_BR.ISO8859-1/books/fdp-primer/the-website/chapter.xml b/pt_BR.ISO8859-1/books/fdp-primer/the-website/chapter.xml
index a394aca615..bb06f9f16e 100755
--- a/pt_BR.ISO8859-1/books/fdp-primer/the-website/chapter.xml
+++ b/pt_BR.ISO8859-1/books/fdp-primer/the-website/chapter.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/pt_BR.ISO8859-1/books/fdp-primer/tools/chapter.xml b/pt_BR.ISO8859-1/books/fdp-primer/tools/chapter.xml
index 6443e1f55a..b52d29dfcd 100644
--- a/pt_BR.ISO8859-1/books/fdp-primer/tools/chapter.xml
+++ b/pt_BR.ISO8859-1/books/fdp-primer/tools/chapter.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/pt_BR.ISO8859-1/books/fdp-primer/translations/chapter.xml b/pt_BR.ISO8859-1/books/fdp-primer/translations/chapter.xml
index 37a505063e..43ab1fe556 100644
--- a/pt_BR.ISO8859-1/books/fdp-primer/translations/chapter.xml
+++ b/pt_BR.ISO8859-1/books/fdp-primer/translations/chapter.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Copyright (c) 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/pt_BR.ISO8859-1/books/fdp-primer/writing-style/chapter.xml b/pt_BR.ISO8859-1/books/fdp-primer/writing-style/chapter.xml
index b921a9c2b4..824e5e6284 100755
--- a/pt_BR.ISO8859-1/books/fdp-primer/writing-style/chapter.xml
+++ b/pt_BR.ISO8859-1/books/fdp-primer/writing-style/chapter.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Copyright (c) 1998 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
@@ -212,7 +213,7 @@
<para>O texto que aparece em contextos do SGML �
escrito geralmente em caixa alta,
- <literal><!ENTITY…></literal>, e
+ <literal><!ENTITY…></literal>, e
<literal><!DOCTYPE…></literal>,
<emphasis>n�o</emphasis>
<literal><!entity…></literal> e
@@ -266,7 +267,7 @@
<para>Por exemplo, o c�digo para esta
se��o seria algo como:</para>
- <programlisting><![ CDATA [+--- This is column 0
+ <programlisting><![CDATA[+--- This is column 0
V
<chapter>
<title>...</title>
@@ -319,7 +320,7 @@ augroup END</programlisting>
que um Tag precedente n�o, observe:</para>
<informalexample>
- <programlisting><![ CDATA [<article>
+ <programlisting><![CDATA[<article>
<articleinfo>
<title>NIS</title>
@@ -431,13 +432,13 @@ augroup END</programlisting>
<listitem>
<para>Entre n�meros e suas unidades:</para>
- <programlisting><![ CDATA [57600 bps]]></programlisting>
+ <programlisting><![CDATA[57600 bps]]></programlisting>
</listitem>
<listitem>
<para>Entre os nomes dos programas e os seus
n�meros de vers�o:</para>
- <programlisting><![ CDATA [FreeBSD 4.7]]></programlisting>
+ <programlisting><![CDATA[FreeBSD 4.7]]></programlisting>
</listitem>
<listitem>
@@ -445,7 +446,7 @@ augroup END</programlisting>
estiver lidando com nomes com mais de 3 ou 4 palavras,
como por exemplo, <quote>The FreeBSD Brazilian
Portuguese Documentation Project</quote>):</para>
- <programlisting><![ CDATA [Sun Microsystems]]></programlisting>
+ <programlisting><![CDATA[Sun Microsystems]]></programlisting>
</listitem>
</itemizedlist>
</sect2>
diff --git a/pt_BR.ISO8859-1/books/handbook/advanced-networking/chapter.xml b/pt_BR.ISO8859-1/books/handbook/advanced-networking/chapter.xml
index e2a07b58fe..c27c77d75a 100644
--- a/pt_BR.ISO8859-1/books/handbook/advanced-networking/chapter.xml
+++ b/pt_BR.ISO8859-1/books/handbook/advanced-networking/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Brazilian Portuguese Documentation Project
diff --git a/pt_BR.ISO8859-1/books/handbook/basics/chapter.xml b/pt_BR.ISO8859-1/books/handbook/basics/chapter.xml
index c502727cf0..f20e86067b 100644
--- a/pt_BR.ISO8859-1/books/handbook/basics/chapter.xml
+++ b/pt_BR.ISO8859-1/books/handbook/basics/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Brazilian Portuguese Documentation Project
diff --git a/pt_BR.ISO8859-1/books/handbook/bibliography/chapter.xml b/pt_BR.ISO8859-1/books/handbook/bibliography/chapter.xml
index b6b7c23f60..2d69c1fca6 100644
--- a/pt_BR.ISO8859-1/books/handbook/bibliography/chapter.xml
+++ b/pt_BR.ISO8859-1/books/handbook/bibliography/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Brazilian Portuguese Documentation Project
diff --git a/pt_BR.ISO8859-1/books/handbook/book.xml b/pt_BR.ISO8859-1/books/handbook/book.xml
index 5aac2b2eed..19e3e4feb5 100644
--- a/pt_BR.ISO8859-1/books/handbook/book.xml
+++ b/pt_BR.ISO8859-1/books/handbook/book.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
"../../../share/xml/freebsd42.dtd" [
<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//PT" "../../share/xml/entities.ent">
diff --git a/pt_BR.ISO8859-1/books/handbook/boot/chapter.xml b/pt_BR.ISO8859-1/books/handbook/boot/chapter.xml
index 5d4e863cda..51a9654664 100644
--- a/pt_BR.ISO8859-1/books/handbook/boot/chapter.xml
+++ b/pt_BR.ISO8859-1/books/handbook/boot/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Brazilian Portuguese Documentation Project
diff --git a/pt_BR.ISO8859-1/books/handbook/chapters.ent b/pt_BR.ISO8859-1/books/handbook/chapters.ent
index 75fef0877f..e493b62744 100644
--- a/pt_BR.ISO8859-1/books/handbook/chapters.ent
+++ b/pt_BR.ISO8859-1/books/handbook/chapters.ent
@@ -13,228 +13,57 @@
Chapters should be listed in the order in which they are referenced.
-->
-<!ENTITY % not.published "INCLUDE">
-
-<!ENTITY % chap.introduction "IGNORE">
-<!ENTITY % chap.install "IGNORE">
-<!ENTITY % chap.basics "IGNORE">
-<!ENTITY % chap.ports "IGNORE">
-<!ENTITY % chap.config "IGNORE">
-<!ENTITY % chap.boot "IGNORE">
-<!ENTITY % chap.users "IGNORE">
-<!ENTITY % chap.kernelconfig "IGNORE">
-<!ENTITY % chap.security "IGNORE">
-<!ENTITY % chap.jails "IGNORE">
-<!ENTITY % chap.printing "IGNORE">
-<!ENTITY % chap.disks "IGNORE">
-<!ENTITY % chap.geom "IGNORE">
-<!ENTITY % chap.vinum "IGNORE">
-<!ENTITY % chap.x11 "IGNORE">
-<!ENTITY % chap.l10n "IGNORE">
-<!ENTITY % chap.multimedia "IGNORE">
-<!ENTITY % chap.desktop "IGNORE">
-<!ENTITY % chap.serialcomms "IGNORE">
-<!ENTITY % chap.ppp-and-slip "IGNORE">
-<!ENTITY % chap.advanced-networking "IGNORE">
-<!ENTITY % chap.firewalls "IGNORE">
-<!ENTITY % chap.network-servers "IGNORE">
-<!ENTITY % chap.mail "IGNORE">
-<!ENTITY % chap.cutting-edge "IGNORE">
-<!ENTITY % chap.linuxemu "IGNORE">
-<!ENTITY % chap.mirrors "IGNORE">
-<!ENTITY % chap.mirrors.ftp.inc "INCLUDE">
-<!ENTITY % chap.mirrors.cvsup.inc "INCLUDE">
-<!ENTITY % chap.bibliography "IGNORE">
-<!ENTITY % chap.eresources "IGNORE">
-<!ENTITY % chap.eresources.www.inc "INCLUDE">
-<!ENTITY % chap.pgpkeys "IGNORE">
-<!ENTITY % chap.index "IGNORE">
-<!ENTITY % chap.freebsd-glossary "IGNORE">
-<!ENTITY % chap.mac "IGNORE">
-<!ENTITY % chap.audit "IGNORE">
-<!ENTITY % chap.filesystems "IGNORE">
-<!ENTITY % chap.dtrace "IGNORE">
<!ENTITY chap.preface SYSTEM "preface/preface.xml">
<!ENTITY % pgpkeys SYSTEM "../../../share/pgpkeys/pgpkeys.ent"> %pgpkeys;
<!-- Part One -->
-<![%chap.introduction;[
<!ENTITY chap.introduction SYSTEM "introduction/chapter.xml">
-]]>
-<![%chap.install;[
<!ENTITY chap.install SYSTEM "install/chapter.xml">
-]]>
-<![%chap.basics;[
<!ENTITY chap.basics SYSTEM "basics/chapter.xml">
-]]>
-<![%chap.ports;[
<!ENTITY chap.ports SYSTEM "ports/chapter.xml">
-]]>
-<![%chap.x11;[
<!ENTITY chap.x11 SYSTEM "x11/chapter.xml">
-]]>
<!-- Part Two -->
-<![%chap.desktop;[
<!ENTITY chap.desktop SYSTEM "desktop/chapter.xml">
-]]>
-<![%chap.multimedia;[
<!ENTITY chap.multimedia SYSTEM "multimedia/chapter.xml">
-]]>
-<![%chap.kernelconfig;[
<!ENTITY chap.kernelconfig SYSTEM "kernelconfig/chapter.xml">
-]]>
-<![%chap.printing;[
<!ENTITY chap.printing SYSTEM "printing/chapter.xml">
-]]>
-<![%chap.linuxemu;[
<!ENTITY chap.linuxemu SYSTEM "linuxemu/chapter.xml">
-]]>
<!-- Part Three -->
-<![%chap.config;[
<!ENTITY chap.config SYSTEM "config/chapter.xml">
-]]>
-<![%chap.boot;[
<!ENTITY chap.boot SYSTEM "boot/chapter.xml">
-]]>
-<![%chap.users;[
<!ENTITY chap.users SYSTEM "users/chapter.xml">
-]]>
-<![%chap.security;[
<!ENTITY chap.security SYSTEM "security/chapter.xml">
-]]>
-<![%chap.jails;[
<!ENTITY chap.jails SYSTEM "jails/chapter.xml">
-]]>
-<![%chap.mac;[
<!ENTITY chap.mac SYSTEM "mac/chapter.xml">
-]]>
-<![%chap.audit;[
<!ENTITY chap.audit SYSTEM "audit/chapter.xml">
-]]>
-<![%chap.disks;[
<!ENTITY chap.disks SYSTEM "disks/chapter.xml">
-]]>
-<![%chap.geom;[
<!ENTITY chap.geom SYSTEM "geom/chapter.xml">
-]]>
-<![%chap.filesystems;[
<!ENTITY chap.filesystems SYSTEM "filesystems/chapter.xml">
-]]>
-<![%chap.vinum;[
<!ENTITY chap.vinum SYSTEM "vinum/chapter.xml">
-]]>
-<![%chap.l10n;[
<!ENTITY chap.l10n SYSTEM "l10n/chapter.xml">
-]]>
-<![%chap.cutting-edge;[
<!ENTITY chap.cutting-edge SYSTEM "cutting-edge/chapter.xml">
-]]>
-<![%chap.dtrace;[
<!ENTITY chap.dtrace SYSTEM "dtrace/chapter.xml">
-]]>
<!-- Part Four -->
-<![%chap.serialcomms;[
<!ENTITY chap.serialcomms SYSTEM "serialcomms/chapter.xml">
-]]>
-<![%chap.ppp-and-slip;[
<!ENTITY chap.ppp-and-slip SYSTEM "ppp-and-slip/chapter.xml">
-]]>
-<![%chap.mail;[
<!ENTITY chap.mail SYSTEM "mail/chapter.xml">
-]]>
-<![%chap.network-servers;[
<!ENTITY chap.network-servers SYSTEM "network-servers/chapter.xml">
-]]>
-<![%chap.firewalls;[
<!ENTITY chap.firewalls SYSTEM "firewalls/chapter.xml">
-]]>
-<![%chap.advanced-networking;[
<!ENTITY chap.advanced-networking SYSTEM "advanced-networking/chapter.xml">
-]]>
<!-- Part Five (appendices) -->
-<![%chap.mirrors;[
<!ENTITY chap.mirrors SYSTEM "mirrors/chapter.xml">
-]]>
-<![%chap.mirrors.ftp.inc;[
<!ENTITY chap.mirrors.ftp.inc SYSTEM "mirrors.xml.ftp.inc">
-]]>
-<![%chap.mirrors.cvsup.inc;[
<!ENTITY chap.mirrors.cvsup.inc SYSTEM "mirrors.xml.cvsup.inc">
-]]>
-<![%chap.bibliography;[
<!ENTITY chap.bibliography SYSTEM "bibliography/chapter.xml">
-]]>
-<![%chap.eresources;[
<!ENTITY chap.eresources SYSTEM "eresources/chapter.xml">
-]]>
-<![%chap.eresources.www.inc;[
<!ENTITY chap.eresources.www.inc SYSTEM "eresources.xml.www.inc">
-]]>
-<![%chap.pgpkeys;[
<!ENTITY chap.pgpkeys SYSTEM "pgpkeys/chapter.xml">
-]]>
-<![%chap.freebsd-glossary;[
<!ENTITY chap.freebsd-glossary "&freebsd-glossary;">
-]]>
-<![%chap.index;[
- <!ENTITY chap.index SYSTEM "index.xml">
-]]>
+ <!ENTITY chap.index "">
<!ENTITY chap.colophon SYSTEM "colophon.xml">
-
-<!-- IGNORE cases -->
-
-<!-- Part One -->
-<!ENTITY chap.introduction "">
-<!ENTITY chap.install "">
-<!ENTITY chap.basics "">
-<!ENTITY chap.ports "">
-<!ENTITY chap.x11 "">
-
-<!-- Part Two -->
-<!ENTITY chap.desktop "">
-<!ENTITY chap.multimedia "">
-<!ENTITY chap.kernelconfig "">
-<!ENTITY chap.printing "">
-<!ENTITY chap.linuxemu "">
-
-<!-- Part Three -->
-<!ENTITY chap.config "">
-<!ENTITY chap.boot "">
-<!ENTITY chap.users "">
-<!ENTITY chap.security "">
-<!ENTITY chap.jails "">
-<!ENTITY chap.mac "">
-<!ENTITY chap.audit "">
-<!ENTITY chap.disks "">
-<!ENTITY chap.geom "">
-<!ENTITY chap.filesystems "">
-<!ENTITY chap.vinum "">
-<!ENTITY chap.virtualization "">
-<!ENTITY chap.l10n "">
-<!ENTITY chap.cutting-edge "">
-<!ENTITY chap.dtrace "">
-
-<!-- Part Four -->
-<!ENTITY chap.serialcomms "">
-<!ENTITY chap.ppp-and-slip "">
-<!ENTITY chap.mail "">
-<!ENTITY chap.network-servers "">
-<!ENTITY chap.firewalls "">
-<!ENTITY chap.advanced-networking "">
-
-<!-- Part Five (appendices) -->
-<!ENTITY chap.mirrors "">
-<!ENTITY chap.mirrors.ftp.inc "">
-<!ENTITY chap.mirrors.cvsup.inc "">
-<!ENTITY chap.bibliography "">
-<!ENTITY chap.eresources "">
-<!ENTITY chap.eresources.www.inc "">
-<!ENTITY chap.pgpkeys "">
-<!ENTITY chap.freebsd-glossary "">
-<!ENTITY chap.index "">
diff --git a/pt_BR.ISO8859-1/books/handbook/colophon.xml b/pt_BR.ISO8859-1/books/handbook/colophon.xml
index 237398942b..5848f8b4dc 100644
--- a/pt_BR.ISO8859-1/books/handbook/colophon.xml
+++ b/pt_BR.ISO8859-1/books/handbook/colophon.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Brazilian Portuguese Documentation Project
diff --git a/pt_BR.ISO8859-1/books/handbook/config/chapter.xml b/pt_BR.ISO8859-1/books/handbook/config/chapter.xml
index 466ea783af..a8bf46fe2e 100644
--- a/pt_BR.ISO8859-1/books/handbook/config/chapter.xml
+++ b/pt_BR.ISO8859-1/books/handbook/config/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Brazilian Portuguese Documentation Project
diff --git a/pt_BR.ISO8859-1/books/handbook/cutting-edge/chapter.xml b/pt_BR.ISO8859-1/books/handbook/cutting-edge/chapter.xml
index 2bbff9c222..355f38dee3 100644
--- a/pt_BR.ISO8859-1/books/handbook/cutting-edge/chapter.xml
+++ b/pt_BR.ISO8859-1/books/handbook/cutting-edge/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Brazilian Portuguese Documentation Project
diff --git a/pt_BR.ISO8859-1/books/handbook/disks/chapter.xml b/pt_BR.ISO8859-1/books/handbook/disks/chapter.xml
index 7f1c552a56..47695efceb 100644
--- a/pt_BR.ISO8859-1/books/handbook/disks/chapter.xml
+++ b/pt_BR.ISO8859-1/books/handbook/disks/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Brazilian Portuguese Documentation Project
diff --git a/pt_BR.ISO8859-1/books/handbook/eresources/chapter.xml b/pt_BR.ISO8859-1/books/handbook/eresources/chapter.xml
index f9a62d0d66..6621d83deb 100644
--- a/pt_BR.ISO8859-1/books/handbook/eresources/chapter.xml
+++ b/pt_BR.ISO8859-1/books/handbook/eresources/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Brazilian Portuguese Documentation Project
diff --git a/pt_BR.ISO8859-1/books/handbook/install/chapter.xml b/pt_BR.ISO8859-1/books/handbook/install/chapter.xml
index aead82cce5..ded98913c9 100644
--- a/pt_BR.ISO8859-1/books/handbook/install/chapter.xml
+++ b/pt_BR.ISO8859-1/books/handbook/install/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Brazilian Portuguese Documentation Project
diff --git a/pt_BR.ISO8859-1/books/handbook/introduction/chapter.xml b/pt_BR.ISO8859-1/books/handbook/introduction/chapter.xml
index a693f70137..5b9f6d6b8c 100644
--- a/pt_BR.ISO8859-1/books/handbook/introduction/chapter.xml
+++ b/pt_BR.ISO8859-1/books/handbook/introduction/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Brazilian Portuguese Documentation Project
diff --git a/pt_BR.ISO8859-1/books/handbook/kernelconfig/chapter.xml b/pt_BR.ISO8859-1/books/handbook/kernelconfig/chapter.xml
index bd2170fc06..9f8e3046b0 100644
--- a/pt_BR.ISO8859-1/books/handbook/kernelconfig/chapter.xml
+++ b/pt_BR.ISO8859-1/books/handbook/kernelconfig/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Brazilian Portuguese Documentation Project
diff --git a/pt_BR.ISO8859-1/books/handbook/l10n/chapter.xml b/pt_BR.ISO8859-1/books/handbook/l10n/chapter.xml
index 91aabd9820..fde853e358 100644
--- a/pt_BR.ISO8859-1/books/handbook/l10n/chapter.xml
+++ b/pt_BR.ISO8859-1/books/handbook/l10n/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Brazilian Portuguese Documentation Project
diff --git a/pt_BR.ISO8859-1/books/handbook/linuxemu/chapter.xml b/pt_BR.ISO8859-1/books/handbook/linuxemu/chapter.xml
index a5f6a17610..938b7d83cd 100644
--- a/pt_BR.ISO8859-1/books/handbook/linuxemu/chapter.xml
+++ b/pt_BR.ISO8859-1/books/handbook/linuxemu/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Brazilian Portuguese Documentation Project
diff --git a/pt_BR.ISO8859-1/books/handbook/mail/chapter.xml b/pt_BR.ISO8859-1/books/handbook/mail/chapter.xml
index 4c43d1d5bf..f03ad119ad 100644
--- a/pt_BR.ISO8859-1/books/handbook/mail/chapter.xml
+++ b/pt_BR.ISO8859-1/books/handbook/mail/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Brazilian Portuguese Documentation Project
diff --git a/pt_BR.ISO8859-1/books/handbook/mirrors/chapter.xml b/pt_BR.ISO8859-1/books/handbook/mirrors/chapter.xml
index 2b6e83cddc..158fb5953c 100644
--- a/pt_BR.ISO8859-1/books/handbook/mirrors/chapter.xml
+++ b/pt_BR.ISO8859-1/books/handbook/mirrors/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Brazilian Portuguese Documentation Project
@@ -1168,7 +1168,7 @@
<para>Configurar o &man.cvs.1; para utilizar um
reposit�rio CVS an�nimo requer, simplesmente,
uma atribui��o � vari�vel de ambiente
- <envar>CVSROOT</envar> da localizaç�o de um dos
+ <envar>CVSROOT</envar> da localiza��o de um dos
servidores <emphasis>anoncvs</emphasis> do projeto FreeBSD.
No momento da prepara��o deste documento, os
seguintes servidores est�o dispon�veis:</para>
@@ -1590,7 +1590,7 @@
<para>Voc� ir� precisar de duas coisas: O programa
<application>CTM</application>, e os deltas iniciais para
aliment�-lo (para alcan�ar os n�veis
- “correntes&rdquo).</para>
+ “correntes”).</para>
<para>O programa <application>CTM</application> faz parte do
FreeBSD desde a vers�o 2.0 <literal>release</literal>,
@@ -1632,11 +1632,11 @@
saiba como se inscrever usando
<application>majordomo</application>, envie uma mensagem
primeiro contendo a palavra <literal>help</literal> —
- ele enviar-lhe-� de volta instruç�es
+ ele enviar-lhe-� de volta instru��es
sobre o uso.)</para>
<para>Quando come�ar a receber suas
- atualizaç�es <application>CTM</application>
+ atualiza��es <application>CTM</application>
por e-mail, voc� pode utilizar o programa
<command>ctm_rmail</command> para desempacot�-las e
aplic�-las. Na verdade, voc� pode usar o
@@ -1724,7 +1724,7 @@
<para>A menos que <application>CTM</application> sinta-se
muito seguro a respeito de todo o processo, ele n�o
tocar� sua �rvore. Pode-se usar a
- opç�o <option>-c</option> e
+ op��o <option>-c</option> e
<application>CTM</application> n�o tocar� sua
�rvore; meramente verificar� a integridade
do delta e verificar� se ele aplicar-se-ia sem erros
@@ -1752,7 +1752,7 @@
<para>Um desenvolvedor gostaria de experimentar e mudar arquivos
na �rvore de c�digo fonte.
<application>CTM</application> suporta
- modificaç�es locais de maneira limitada: antes de
+ modifica��es locais de maneira limitada: antes de
checar a exist�ncia de um arquivo
<filename>foo</filename>, ele primeiro procura por
<filename>foo.ctm</filename>. Se este arquivo existir, CTM
@@ -1984,7 +1984,7 @@
puxar, cada cliente requisita atualiza��es ao
servidor, se e quando desejam. Ou seja, todas as
atualiza��es s�o iniciadas pelo cliente.
- O servidor jamais envia atualizaç�es n�o
+ O servidor jamais envia atualiza��es n�o
solicitadas. Usu�rios devem ou executar o cliente
<application>CVSup</application> manualmente para obter uma
atualiza��o, ou criar um <literal>job</literal>
@@ -1999,7 +1999,7 @@
e o servidor <command>cvsupd</command> o qual executa em
cada s�tio espelho FreeBSD.</para>
- <para>Ao ler a documentaç�o do FreeBSD e listas
+ <para>Ao ler a documenta��o do FreeBSD e listas
de discuss�o, voc� pode ver refer�ncias
a <application>sup</application>. <application>Sup</application>
foi o predecessor de <application>CVSup</application>, e
@@ -2718,7 +2718,7 @@ src-all</programlisting>
<para>onde
<filename><replaceable>supfile</replaceable></filename>
- é, na verdade, o nome do supfile que voc� acaba
+ �, na verdade, o nome do supfile que voc� acaba
de criar. Assumindo que voc� est� executando
sob o X11, <command>cvsup</command> ir� exibir uma
janela GUI com bot�es para fazer as coisas usuais.
diff --git a/pt_BR.ISO8859-1/books/handbook/pgpkeys/chapter.xml b/pt_BR.ISO8859-1/books/handbook/pgpkeys/chapter.xml
index 5d121705c0..92badc49fb 100644
--- a/pt_BR.ISO8859-1/books/handbook/pgpkeys/chapter.xml
+++ b/pt_BR.ISO8859-1/books/handbook/pgpkeys/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Brazilian Portuguese Documentation Project
diff --git a/pt_BR.ISO8859-1/books/handbook/ports/chapter.xml b/pt_BR.ISO8859-1/books/handbook/ports/chapter.xml
index ee95e01f76..304c387f23 100644
--- a/pt_BR.ISO8859-1/books/handbook/ports/chapter.xml
+++ b/pt_BR.ISO8859-1/books/handbook/ports/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Brazilian Portuguese Documentation Project
diff --git a/pt_BR.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml b/pt_BR.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml
index 2e227fe9bd..591bbc08d1 100644
--- a/pt_BR.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml
+++ b/pt_BR.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Brazilian Portuguese Documentation Project
diff --git a/pt_BR.ISO8859-1/books/handbook/preface/preface.xml b/pt_BR.ISO8859-1/books/handbook/preface/preface.xml
index 28cee8a263..6c3454eea8 100644
--- a/pt_BR.ISO8859-1/books/handbook/preface/preface.xml
+++ b/pt_BR.ISO8859-1/books/handbook/preface/preface.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Brazilian Portuguese Documentation Project
diff --git a/pt_BR.ISO8859-1/books/handbook/printing/chapter.xml b/pt_BR.ISO8859-1/books/handbook/printing/chapter.xml
index 74ff5d5a35..4e4d9137d0 100644
--- a/pt_BR.ISO8859-1/books/handbook/printing/chapter.xml
+++ b/pt_BR.ISO8859-1/books/handbook/printing/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Brazilian Portuguese Documentation Project
diff --git a/pt_BR.ISO8859-1/books/handbook/security/chapter.xml b/pt_BR.ISO8859-1/books/handbook/security/chapter.xml
index a958066dea..e2f55bbaf9 100644
--- a/pt_BR.ISO8859-1/books/handbook/security/chapter.xml
+++ b/pt_BR.ISO8859-1/books/handbook/security/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Brazilian Portuguese Documentation Project
diff --git a/pt_BR.ISO8859-1/books/handbook/serialcomms/chapter.xml b/pt_BR.ISO8859-1/books/handbook/serialcomms/chapter.xml
index 4d1574a6c1..14728dc6ad 100644
--- a/pt_BR.ISO8859-1/books/handbook/serialcomms/chapter.xml
+++ b/pt_BR.ISO8859-1/books/handbook/serialcomms/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Brazilian Portuguese Documentation Project
diff --git a/pt_BR.ISO8859-1/books/handbook/users/chapter.xml b/pt_BR.ISO8859-1/books/handbook/users/chapter.xml
index f99f50ea59..21e6e0e0a5 100644
--- a/pt_BR.ISO8859-1/books/handbook/users/chapter.xml
+++ b/pt_BR.ISO8859-1/books/handbook/users/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Brazilian Portuguese Documentation Project
diff --git a/pt_BR.ISO8859-1/books/handbook/x11/chapter.xml b/pt_BR.ISO8859-1/books/handbook/x11/chapter.xml
index 100769dd2a..2e9df7af9d 100644
--- a/pt_BR.ISO8859-1/books/handbook/x11/chapter.xml
+++ b/pt_BR.ISO8859-1/books/handbook/x11/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Brazilian Portuguese Documentation Project
From b139b56e0f29e2c5d1003b02584699a192999629 Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Mon, 21 Jan 2013 17:43:10 +0000
Subject: [PATCH 019/121] - Make the Russian documentation valid XML
---
.../articles/contributing/article.xml | 2 +-
ru_RU.KOI8-R/articles/cups/article.xml | 2 +-
ru_RU.KOI8-R/articles/custom-gcc/article.xml | 14 +-
.../articles/fbsd-from-scratch/article.xml | 4 +-
.../arch-handbook/driverbasics/chapter.xml | 2 +-
.../books/arch-handbook/locking/chapter.xml | 2 +-
.../books/arch-handbook/sound/chapter.xml | 2 +-
.../introduction/chapter.xml | 2 +-
.../kerneldebug/chapter.xml | 2 +-
.../developers-handbook/policies/chapter.xml | 2 +-
.../developers-handbook/secure/chapter.xml | 2 +-
ru_RU.KOI8-R/books/faq/book.xml | 14 +-
.../books/fdp-primer/doc-build/chapter.xml | 2 +-
.../books/fdp-primer/overview/chapter.xml | 2 +-
.../books/fdp-primer/see-also/chapter.xml | 2 +-
.../books/fdp-primer/sgml-markup/chapter.xml | 2 +-
.../books/fdp-primer/the-website/chapter.xml | 2 +-
.../books/fdp-primer/tools/chapter.xml | 2 +-
.../fdp-primer/writing-style/chapter.xml | 2 +-
ru_RU.KOI8-R/books/handbook/Makefile | 36 +++-
.../handbook/advanced-networking/chapter.xml | 4 +-
ru_RU.KOI8-R/books/handbook/audit/chapter.xml | 2 +-
.../books/handbook/basics/chapter.xml | 2 +-
.../books/handbook/bibliography/chapter.xml | 2 +-
ru_RU.KOI8-R/books/handbook/boot/chapter.xml | 2 +-
ru_RU.KOI8-R/books/handbook/chapters.ent | 178 +-----------------
ru_RU.KOI8-R/books/handbook/colophon.xml | 2 +-
.../books/handbook/config/chapter.xml | 4 +-
.../books/handbook/cutting-edge/chapter.xml | 2 +-
.../books/handbook/desktop/chapter.xml | 2 +-
ru_RU.KOI8-R/books/handbook/disks/chapter.xml | 12 +-
.../books/handbook/eresources/chapter.xml | 2 +-
.../books/handbook/filesystems/chapter.xml | 4 +-
.../books/handbook/firewalls/chapter.xml | 2 +-
ru_RU.KOI8-R/books/handbook/geom/chapter.xml | 2 +-
.../books/handbook/install/chapter.xml | 2 +-
.../books/handbook/introduction/chapter.xml | 2 +-
.../books/handbook/kernelconfig/chapter.xml | 2 +-
ru_RU.KOI8-R/books/handbook/l10n/chapter.xml | 2 +-
.../books/handbook/linuxemu/chapter.xml | 10 +-
ru_RU.KOI8-R/books/handbook/mac/chapter.xml | 8 +-
ru_RU.KOI8-R/books/handbook/mail/chapter.xml | 8 +-
.../books/handbook/mirrors/chapter.xml | 4 +-
.../books/handbook/multimedia/chapter.xml | 2 +-
.../handbook/network-servers/chapter.xml | 2 +-
.../books/handbook/pgpkeys/chapter.xml | 2 +-
ru_RU.KOI8-R/books/handbook/ports/chapter.xml | 2 +-
.../books/handbook/ppp-and-slip/chapter.xml | 6 +-
.../books/handbook/preface/preface.xml | 2 +-
.../books/handbook/printing/chapter.xml | 2 +-
.../books/handbook/security/chapter.xml | 2 +-
.../books/handbook/serialcomms/chapter.xml | 2 +-
ru_RU.KOI8-R/books/handbook/users/chapter.xml | 2 +-
ru_RU.KOI8-R/books/handbook/vinum/chapter.xml | 2 +-
ru_RU.KOI8-R/books/handbook/x11/chapter.xml | 4 +-
ru_RU.KOI8-R/books/porters-handbook/book.xml | 26 +--
ru_RU.KOI8-R/share/xml/mirrors-local.xsl | 1 -
57 files changed, 132 insertions(+), 285 deletions(-)
diff --git a/ru_RU.KOI8-R/articles/contributing/article.xml b/ru_RU.KOI8-R/articles/contributing/article.xml
index b841938c79..a671f2f02b 100644
--- a/ru_RU.KOI8-R/articles/contributing/article.xml
+++ b/ru_RU.KOI8-R/articles/contributing/article.xml
@@ -192,7 +192,7 @@
<para>������� ����� ����������� ����������, ��������, &posix;. ��
������ ����� ��������� ������ �� ��� �� �������� Web-����� <ulink
url="&url.base;/projects/c99/index.html">������� ������������
- FreeBSD ���������� C99 & POSIX</ulink>. �������� ��������� FreeBSD
+ FreeBSD ���������� C99 & POSIX</ulink>. �������� ��������� FreeBSD
� ���, ��� ���������� ����������. ���� ������� ����������,
�������� � �������������� ��� ���������� �������� ������������,
��������� �� ���� PR. ���� ������, �������, ��� ��������� ��� �
diff --git a/ru_RU.KOI8-R/articles/cups/article.xml b/ru_RU.KOI8-R/articles/cups/article.xml
index 01d402aff1..236c642437 100644
--- a/ru_RU.KOI8-R/articles/cups/article.xml
+++ b/ru_RU.KOI8-R/articles/cups/article.xml
@@ -85,7 +85,7 @@ Translation: Taras Korenko,
� ������������ ������������ <username>root</username> ���������
�������:</para>
- <screen>&prompt.root; <userinput>cd /usr/ports/print/cups && make install clean</userinput></screen>
+ <screen>&prompt.root; <userinput>cd /usr/ports/print/cups && make install clean</userinput></screen>
<para>��� ��������� <application>CUPS</application> ��������� �����,
��������� �� ���������� ����� �������:</para>
diff --git a/ru_RU.KOI8-R/articles/custom-gcc/article.xml b/ru_RU.KOI8-R/articles/custom-gcc/article.xml
index ee6969823d..e67896530a 100644
--- a/ru_RU.KOI8-R/articles/custom-gcc/article.xml
+++ b/ru_RU.KOI8-R/articles/custom-gcc/article.xml
@@ -83,7 +83,7 @@
<application>binutils</application> ��������� ��������� ������
&os;, ��������� ��������� �������:</para>
- <screen>&prompt.root; <userinput>cd /usr/ports/devel/binutils && make install</userinput></screen>
+ <screen>&prompt.root; <userinput>cd /usr/ports/devel/binutils && make install</userinput></screen>
</sect2>
<sect2 id="installing-gcc">
@@ -100,7 +100,7 @@
<para>��� ��������� ������ �� �������������� ������
<application>GCC</application>, �������� ��������� �������:</para>
- <screen>&prompt.root; <userinput>cd /usr/ports/lang/<replaceable>gcc44</replaceable> && make install</userinput></screen>
+ <screen>&prompt.root; <userinput>cd /usr/ports/lang/<replaceable>gcc44</replaceable> && make install</userinput></screen>
</sect2>
</sect1>
@@ -109,7 +109,7 @@
������ <application>GCC</application></title>
<para>��� ������������� ��������� ������ <application>GCC</application>,
- ������������� �� ��������� ������ &os, ��������� ��������������
+ ������������� �� ��������� ������ &os;, ��������� ��������������
������������ �������.</para>
<sect2 id="adjusting-make.conf">
@@ -118,7 +118,7 @@
<para>�������� ��������� ������ � <filename>/etc/make.conf</filename>
(��� ��������� ������������):</para>
- <programlisting>.if !empty(.CURDIR:M/usr/ports/*) && exists(/usr/local/bin/gcc44)
+ <programlisting>.if !empty(.CURDIR:M/usr/ports/*) && exists(/usr/local/bin/gcc44)
CC=gcc44
CXX=g++44
CPP=cpp44
@@ -179,7 +179,7 @@ libstdc++.so.6 gcc44/libstdc++.so.6</programlisting>
<literal>CFLAGS</literal>, ���������
<filename>/etc/make.conf</filename> �������� ���������� �������:</para>
- <programlisting>.if !empty(.CURDIR:M/usr/ports/*) && exists(/usr/local/bin/gcc44)
+ <programlisting>.if !empty(.CURDIR:M/usr/ports/*) && exists(/usr/local/bin/gcc44)
CC=gcc44
CXX=g++44
CPP=cpp44
@@ -201,7 +201,7 @@ CFLAGS+=-mssse3
<filename>/etc/make.conf</filename> �������� ����������
�������:</para>
- <programlisting>.if !empty(.CURDIR:M/usr/ports/*) && exists(/usr/local/bin/gcc44)
+ <programlisting>.if !empty(.CURDIR:M/usr/ports/*) && exists(/usr/local/bin/gcc44)
.if empty(.CURDIR:M/usr/ports/net/openldap*)
CC=gcc44
CXX=g++44
@@ -214,7 +214,7 @@ CPP=cpp44
<filename role="package">net/openldap</filename>*. �����
�������� ������� ������ ������ � ����� ������:</para>
- <programlisting>.if empty(.CURDIR:M/usr/ports/net/openldap*) && empty(.CURDIR:M/usr/ports/xxx/yyy) && ...</programlisting>
+ <programlisting>.if empty(.CURDIR:M/usr/ports/net/openldap*) && empty(.CURDIR:M/usr/ports/xxx/yyy) && ...</programlisting>
</sect2>
</sect1>
diff --git a/ru_RU.KOI8-R/articles/fbsd-from-scratch/article.xml b/ru_RU.KOI8-R/articles/fbsd-from-scratch/article.xml
index f7f032d681..0e1bf03761 100644
--- a/ru_RU.KOI8-R/articles/fbsd-from-scratch/article.xml
+++ b/ru_RU.KOI8-R/articles/fbsd-from-scratch/article.xml
@@ -485,9 +485,9 @@ Do you wish to delete what is left of /var/tmp/temproot.stage1? [no] <userinput>
<para>�� ����� ���� �� ������ ������� ��������� ������� �������� � �� ����
������������� �������� �������� <command>make</command>:</para>
- <programlisting>java jdk16 echo true > files/license.sh; make install BATCH=yes < /dev/null
+ <programlisting>java jdk16 echo true > files/license.sh; make install BATCH=yes < /dev/null
print acroread8 yes accept | make install PAGER=ls
-x11-fonts gnu-unifont make install && mkfontdir /usr/local/lib/X11/fonts/local
+x11-fonts gnu-unifont make install && mkfontdir /usr/local/lib/X11/fonts/local
news inn-stable CONFIGURE_ARGS="--enable-uucp-rnews --enable-setgid-inews" make install</programlisting>
<para>� ������ ���� �������� �����������������, ��� �������� � �������,
diff --git a/ru_RU.KOI8-R/books/arch-handbook/driverbasics/chapter.xml b/ru_RU.KOI8-R/books/arch-handbook/driverbasics/chapter.xml
index 531ac00b72..5d67f59bca 100644
--- a/ru_RU.KOI8-R/books/arch-handbook/driverbasics/chapter.xml
+++ b/ru_RU.KOI8-R/books/arch-handbook/driverbasics/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!--
The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/books/arch-handbook/locking/chapter.xml b/ru_RU.KOI8-R/books/arch-handbook/locking/chapter.xml
index 2cd5a80a7b..74aebf6f30 100644
--- a/ru_RU.KOI8-R/books/arch-handbook/locking/chapter.xml
+++ b/ru_RU.KOI8-R/books/arch-handbook/locking/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!--
The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/books/arch-handbook/sound/chapter.xml b/ru_RU.KOI8-R/books/arch-handbook/sound/chapter.xml
index 0343bbcef3..5df63748fd 100644
--- a/ru_RU.KOI8-R/books/arch-handbook/sound/chapter.xml
+++ b/ru_RU.KOI8-R/books/arch-handbook/sound/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!--
The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/books/developers-handbook/introduction/chapter.xml b/ru_RU.KOI8-R/books/developers-handbook/introduction/chapter.xml
index a0859acebb..bdbf249a60 100644
--- a/ru_RU.KOI8-R/books/developers-handbook/introduction/chapter.xml
+++ b/ru_RU.KOI8-R/books/developers-handbook/introduction/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!--
The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/books/developers-handbook/kerneldebug/chapter.xml b/ru_RU.KOI8-R/books/developers-handbook/kerneldebug/chapter.xml
index 643c2ac33a..ac5541c3e7 100644
--- a/ru_RU.KOI8-R/books/developers-handbook/kerneldebug/chapter.xml
+++ b/ru_RU.KOI8-R/books/developers-handbook/kerneldebug/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!--
The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/books/developers-handbook/policies/chapter.xml b/ru_RU.KOI8-R/books/developers-handbook/policies/chapter.xml
index 8637dc82a1..3f4eee098b 100644
--- a/ru_RU.KOI8-R/books/developers-handbook/policies/chapter.xml
+++ b/ru_RU.KOI8-R/books/developers-handbook/policies/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!--
The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/books/developers-handbook/secure/chapter.xml b/ru_RU.KOI8-R/books/developers-handbook/secure/chapter.xml
index 26a1714ec0..1d5f380228 100644
--- a/ru_RU.KOI8-R/books/developers-handbook/secure/chapter.xml
+++ b/ru_RU.KOI8-R/books/developers-handbook/secure/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!--
The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/books/faq/book.xml b/ru_RU.KOI8-R/books/faq/book.xml
index e3028b6acc..e738c0ad85 100644
--- a/ru_RU.KOI8-R/books/faq/book.xml
+++ b/ru_RU.KOI8-R/books/faq/book.xml
@@ -2839,7 +2839,7 @@ bindkey ^[[3~ delete-char #
<qandaentry>
<question id="pae">
<para>������ &os; ���������� ������������ ���������� ������
- �� ���������� &i386?</para>
+ �� ���������� &i386;?</para>
</question>
<answer>
@@ -3524,7 +3524,7 @@ Checking for Plug-n-Play devices...
Card assigned CSN #1
Vendor ID PMC2430 (0x3024a341), Serial Number 0xffffffff
PnP Version 1.0, Vendor Version 0
-Device Description: Pace 56 Voice Internal Plug & Play Modem
+Device Description: Pace 56 Voice Internal Plug & Play Modem
Logical Device ID: PMC2430 0x3024a341 #0
Device supports I/O Range Check
@@ -8689,7 +8689,7 @@ add 0 0 HISADDR</programlisting>
<para>� ����������� ������� ���� ��������, ������������
���������������� � ��������� ������ �������. ��������, �
- ������ &usrobotics; &sportster ��� ������������ ���������
+ ������ &usrobotics; &sportster; ��� ������������ ���������
�������� <literal>S10</literal> � ������� ����� �������.
����� ������� ����� ����� ����������, �������� ���������
������������������ �������-�������� � ������ ������:</para>
@@ -9588,7 +9588,7 @@ ATDT1234567</programlisting>
url="http://support.microsoft.com/support/kb/articles/Q158/4/74.asp">
Q158474 - Windows TCPIP Registry Entries</ulink> � <ulink
url="http://support.microsoft.com/support/kb/articles/Q120/6/42.asp">
- Q120642 - TCPIP & NBT Configuration Parameters for
+ Q120642 - TCPIP & NBT Configuration Parameters for
&windowsnt;</ulink> ��� ��������� ����� ������ ���������� ��
��������� MTU � &windows; ��� ������ � NAT-���������������.</para>
@@ -9658,9 +9658,9 @@ ATDT1234567</programlisting>
<para>��� ������ ������ ������������� �������:</para>
- <programlisting>sio0: <16550A-compatible COM port> port 0x3f8-0x3ff irq 4 flags 0x10 on acpi0
+ <programlisting>sio0: <16550A-compatible COM port> port 0x3f8-0x3ff irq 4 flags 0x10 on acpi0
sio0: type 16550A
-sio1: <16550A-compatible COM port> port 0x2f8-0x2ff irq 3 on acpi0
+sio1: <16550A-compatible COM port> port 0x2f8-0x2ff irq 3 on acpi0
sio1: type 16550A</programlisting>
<para>����� ������������ ��� ���������������� �����. ������
@@ -9793,7 +9793,7 @@ hint.sio.7.irq="12"</programlisting>
</question>
<answer>
- <para>�������� ������ ����������� &os, �����ݣ���� <ulink
+ <para>�������� ������ ����������� &os;, �����ݣ���� <ulink
url="&url.books.handbook;/serial.html#SERIAL-HW-CONFIG">����������������
�����������</ulink>.</para>
</answer>
diff --git a/ru_RU.KOI8-R/books/fdp-primer/doc-build/chapter.xml b/ru_RU.KOI8-R/books/fdp-primer/doc-build/chapter.xml
index 4e2f5cb036..b8d5ba90a0 100644
--- a/ru_RU.KOI8-R/books/fdp-primer/doc-build/chapter.xml
+++ b/ru_RU.KOI8-R/books/fdp-primer/doc-build/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!--
The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/books/fdp-primer/overview/chapter.xml b/ru_RU.KOI8-R/books/fdp-primer/overview/chapter.xml
index e760bbbf19..4569e530ab 100644
--- a/ru_RU.KOI8-R/books/fdp-primer/overview/chapter.xml
+++ b/ru_RU.KOI8-R/books/fdp-primer/overview/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!--
The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/books/fdp-primer/see-also/chapter.xml b/ru_RU.KOI8-R/books/fdp-primer/see-also/chapter.xml
index a4fbceb0ff..3237b4cf79 100644
--- a/ru_RU.KOI8-R/books/fdp-primer/see-also/chapter.xml
+++ b/ru_RU.KOI8-R/books/fdp-primer/see-also/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!--
The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/books/fdp-primer/sgml-markup/chapter.xml b/ru_RU.KOI8-R/books/fdp-primer/sgml-markup/chapter.xml
index 1b0b87dcae..d98faffea9 100644
--- a/ru_RU.KOI8-R/books/fdp-primer/sgml-markup/chapter.xml
+++ b/ru_RU.KOI8-R/books/fdp-primer/sgml-markup/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!--
The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/books/fdp-primer/the-website/chapter.xml b/ru_RU.KOI8-R/books/fdp-primer/the-website/chapter.xml
index d7a4302d4d..683549158b 100644
--- a/ru_RU.KOI8-R/books/fdp-primer/the-website/chapter.xml
+++ b/ru_RU.KOI8-R/books/fdp-primer/the-website/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!--
The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/books/fdp-primer/tools/chapter.xml b/ru_RU.KOI8-R/books/fdp-primer/tools/chapter.xml
index 4780afe4e3..b54aa51456 100644
--- a/ru_RU.KOI8-R/books/fdp-primer/tools/chapter.xml
+++ b/ru_RU.KOI8-R/books/fdp-primer/tools/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!--
The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/books/fdp-primer/writing-style/chapter.xml b/ru_RU.KOI8-R/books/fdp-primer/writing-style/chapter.xml
index dbc3071da2..691bc1d834 100644
--- a/ru_RU.KOI8-R/books/fdp-primer/writing-style/chapter.xml
+++ b/ru_RU.KOI8-R/books/fdp-primer/writing-style/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!--
The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/books/handbook/Makefile b/ru_RU.KOI8-R/books/handbook/Makefile
index 52bdb32c5c..6ab253ac4d 100644
--- a/ru_RU.KOI8-R/books/handbook/Makefile
+++ b/ru_RU.KOI8-R/books/handbook/Makefile
@@ -224,30 +224,56 @@ DOC_PREFIX?= ${.CURDIR}/../../..
#
# rules generating lists of mirror site from XML database.
#
-XMLDOCS= mirrors-ftp:::mirrors.xml.ftp.inc \
+XMLDOCS= lastmod:::mirrors.lastmod.inc \
+ mirrors-ftp-index:::mirrors.xml.ftp.index.inc \
+ mirrors-ftp:::mirrors.xml.ftp.inc \
+ mirrors-cvsup-index:::mirrors.xml.cvsup.index.inc \
mirrors-cvsup:::mirrors.xml.cvsup.inc \
+ eresources-index:::eresources.xml.www.index.inc \
eresources:::eresources.xml.www.inc
DEPENDSET.DEFAULT= transtable mirror
XSLT.DEFAULT= ${XSL_MIRRORS}
XML.DEFAULT= ${XML_MIRRORS}
NO_TIDY.DEFAULT= yes
+PARAMS.lastmod+= --param 'target' "'lastmod'"
+PARAMS.mirrors-ftp-index+= --param 'type' "'ftp'" \
+ --param 'proto' "'ftp'" \
+ --param 'target' "'index'"
PARAMS.mirrors-ftp+= --param 'type' "'ftp'" \
--param 'proto' "'ftp'" \
--param 'target' "'handbook/mirrors/chapter.xml'"
+PARAMS.mirrors-cvsup-index+= --param 'type' "'cvsup'" \
+ --param 'proto' "'cvsup'" \
+ --param 'target' "'index'"
PARAMS.mirrors-cvsup+= --param 'type' "'cvsup'" \
--param 'proto' "'cvsup'" \
--param 'target' "'handbook/mirrors/chapter.xml'"
+PARAMS.eresources-index+= --param 'type' "'www'" \
+ --param 'proto' "'http'" \
+ --param 'target' "'index'"
PARAMS.eresources+= --param 'type' "'www'" \
--param 'proto' "'http'" \
--param 'target' "'handbook/eresources/chapter.xml'"
-SRCS+= mirrors.xml.ftp.inc \
+SRCS+= mirrors.lastmod.inc \
+ mirrors.xml.ftp.inc \
+ mirrors.xml.ftp.index.inc \
mirrors.xml.cvsup.inc \
- eresources.xml.www.inc
+ mirrors.xml.cvsup.index.inc \
+ eresources.xml.www.inc \
+ eresources.xml.www.index.inc
-CLEANFILES+= mirrors.xml.ftp.inc \
+CLEANFILES+= mirrors.lastmod.inc \
+ mirrors.xml.ftp.inc \
+ mirrors.xml.ftp.index.inc \
mirrors.xml.cvsup.inc \
- eresources.xml.www.inc
+ mirrors.xml.cvsup.index.inc \
+ eresources.xml.www.inc \
+ eresources.xml.www.index.inc
+
+lint: mirrors.lastmod.inc mirrors.xml.ftp.inc mirrors.xml.ftp.index.inc \
+ mirrors.xml.cvsup.inc mirrors.xml.cvsup.index.inc \
+ eresources.xml.www.inc eresources.xml.www.index.inc
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/ru_RU.KOI8-R/books/handbook/advanced-networking/chapter.xml b/ru_RU.KOI8-R/books/handbook/advanced-networking/chapter.xml
index 53f638d982..06cb24fbdb 100644
--- a/ru_RU.KOI8-R/books/handbook/advanced-networking/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/advanced-networking/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!--
The FreeBSD Russian Documentation Project
@@ -1268,7 +1268,7 @@ wi0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> mtu 1500
<para>�������, �������� � ���������� ������ ��������:</para>
- <screen>&prompt.root; <userinput>make && make install</userinput></screen>
+ <screen>&prompt.root; <userinput>make && make install</userinput></screen>
<para>��� ������������� �������� ���������� ��������� ���������������
������:</para>
diff --git a/ru_RU.KOI8-R/books/handbook/audit/chapter.xml b/ru_RU.KOI8-R/books/handbook/audit/chapter.xml
index 59a33b64d5..96a138068f 100644
--- a/ru_RU.KOI8-R/books/handbook/audit/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/audit/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!--
The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/books/handbook/basics/chapter.xml b/ru_RU.KOI8-R/books/handbook/basics/chapter.xml
index 9662774759..4a1c1c9b6b 100644
--- a/ru_RU.KOI8-R/books/handbook/basics/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/basics/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!--
The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/books/handbook/bibliography/chapter.xml b/ru_RU.KOI8-R/books/handbook/bibliography/chapter.xml
index e8d1353b98..d234a87de2 100644
--- a/ru_RU.KOI8-R/books/handbook/bibliography/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/bibliography/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!--
The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/books/handbook/boot/chapter.xml b/ru_RU.KOI8-R/books/handbook/boot/chapter.xml
index 2f0d46912b..8346cc6885 100644
--- a/ru_RU.KOI8-R/books/handbook/boot/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/boot/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!--
The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/books/handbook/chapters.ent b/ru_RU.KOI8-R/books/handbook/chapters.ent
index 101b55ba55..3b49199428 100644
--- a/ru_RU.KOI8-R/books/handbook/chapters.ent
+++ b/ru_RU.KOI8-R/books/handbook/chapters.ent
@@ -16,228 +16,60 @@
������� ������ ���� ������������� � ������� � ������� ��� ������������.
-->
-<!ENTITY % not.published "INCLUDE">
-
-<!ENTITY % chap.introduction "IGNORE">
-<!ENTITY % chap.install "IGNORE">
-<!ENTITY % chap.basics "IGNORE">
-<!ENTITY % chap.ports "IGNORE">
-<!ENTITY % chap.config "IGNORE">
-<!ENTITY % chap.boot "IGNORE">
-<!ENTITY % chap.users "IGNORE">
-<!ENTITY % chap.kernelconfig "IGNORE">
-<!ENTITY % chap.security "IGNORE">
-<!ENTITY % chap.jails "IGNORE">
-<!ENTITY % chap.printing "IGNORE">
-<!ENTITY % chap.disks "IGNORE">
-<!ENTITY % chap.geom "IGNORE">
-<!ENTITY % chap.vinum "IGNORE">
-<!ENTITY % chap.x11 "IGNORE">
-<!ENTITY % chap.l10n "IGNORE">
-<!ENTITY % chap.multimedia "IGNORE">
-<!ENTITY % chap.desktop "IGNORE">
-<!ENTITY % chap.serialcomms "IGNORE">
-<!ENTITY % chap.ppp-and-slip "IGNORE">
-<!ENTITY % chap.advanced-networking "IGNORE">
-<!ENTITY % chap.firewalls "IGNORE">
-<!ENTITY % chap.network-servers "IGNORE">
-<!ENTITY % chap.mail "IGNORE">
-<!ENTITY % chap.cutting-edge "IGNORE">
-<!ENTITY % chap.linuxemu "IGNORE">
-<!ENTITY % chap.mirrors "IGNORE">
-<!ENTITY % chap.mirrors.ftp.inc "INCLUDE">
-<!ENTITY % chap.mirrors.cvsup.inc "INCLUDE">
-<!ENTITY % chap.bibliography "IGNORE">
-<!ENTITY % chap.eresources "IGNORE">
-<!ENTITY % chap.eresources.www.inc "INCLUDE">
-<!ENTITY % chap.pgpkeys "IGNORE">
-<!ENTITY % chap.index "IGNORE">
-<!ENTITY % chap.freebsd-glossary "IGNORE">
-<!ENTITY % chap.mac "IGNORE">
-<!ENTITY % chap.audit "IGNORE">
-<!ENTITY % chap.filesystems "IGNORE">
-<!ENTITY % chap.dtrace "IGNORE">
-
<!ENTITY chap.preface SYSTEM "preface/preface.xml">
<!ENTITY % pgpkeys SYSTEM "../../../share/pgpkeys/pgpkeys.ent"> %pgpkeys;
<!-- Part One -->
-<![%chap.introduction;[
<!ENTITY chap.introduction SYSTEM "introduction/chapter.xml">
-]]>
-<![%chap.install;[
<!ENTITY chap.install SYSTEM "install/chapter.xml">
-]]>
-<![%chap.basics;[
<!ENTITY chap.basics SYSTEM "basics/chapter.xml">
-]]>
-<![%chap.ports;[
<!ENTITY chap.ports SYSTEM "ports/chapter.xml">
-]]>
-<![%chap.x11;[
<!ENTITY chap.x11 SYSTEM "x11/chapter.xml">
-]]>
<!-- Part Two -->
-<![%chap.desktop;[
<!ENTITY chap.desktop SYSTEM "desktop/chapter.xml">
-]]>
-<![%chap.multimedia;[
<!ENTITY chap.multimedia SYSTEM "multimedia/chapter.xml">
-]]>
-<![%chap.kernelconfig;[
<!ENTITY chap.kernelconfig SYSTEM "kernelconfig/chapter.xml">
-]]>
-<![%chap.printing;[
<!ENTITY chap.printing SYSTEM "printing/chapter.xml">
-]]>
-<![%chap.linuxemu;[
<!ENTITY chap.linuxemu SYSTEM "linuxemu/chapter.xml">
-]]>
<!-- Part Three -->
-<![%chap.config;[
<!ENTITY chap.config SYSTEM "config/chapter.xml">
-]]>
-<![%chap.boot;[
<!ENTITY chap.boot SYSTEM "boot/chapter.xml">
-]]>
-<![%chap.users;[
<!ENTITY chap.users SYSTEM "users/chapter.xml">
-]]>
-<![%chap.security;[
<!ENTITY chap.security SYSTEM "security/chapter.xml">
-]]>
-<![%chap.jails;[
<!ENTITY chap.jails SYSTEM "jails/chapter.xml">
-]]>
-<![%chap.mac;[
<!ENTITY chap.mac SYSTEM "mac/chapter.xml">
-]]>
-<![%chap.audit;[
<!ENTITY chap.audit SYSTEM "audit/chapter.xml">
-]]>
-<![%chap.disks;[
<!ENTITY chap.disks SYSTEM "disks/chapter.xml">
-]]>
-<![%chap.geom;[
<!ENTITY chap.geom SYSTEM "geom/chapter.xml">
-]]>
-<![%chap.filesystems;[
<!ENTITY chap.filesystems SYSTEM "filesystems/chapter.xml">
-]]>
-<![%chap.vinum;[
<!ENTITY chap.vinum SYSTEM "vinum/chapter.xml">
-]]>
-<![%chap.l10n;[
<!ENTITY chap.l10n SYSTEM "l10n/chapter.xml">
-]]>
-<![%chap.cutting-edge;[
<!ENTITY chap.cutting-edge SYSTEM "cutting-edge/chapter.xml">
-]]>
-<![%chap.dtrace;[
<!ENTITY chap.dtrace SYSTEM "dtrace/chapter.xml">
-]]>
<!-- Part Four -->
-<![%chap.serialcomms;[
<!ENTITY chap.serialcomms SYSTEM "serialcomms/chapter.xml">
-]]>
-<![%chap.ppp-and-slip;[
<!ENTITY chap.ppp-and-slip SYSTEM "ppp-and-slip/chapter.xml">
-]]>
-<![%chap.mail;[
<!ENTITY chap.mail SYSTEM "mail/chapter.xml">
-]]>
-<![%chap.network-servers;[
<!ENTITY chap.network-servers SYSTEM "network-servers/chapter.xml">
-]]>
-<![%chap.firewalls;[
<!ENTITY chap.firewalls SYSTEM "firewalls/chapter.xml">
-]]>
-<![%chap.advanced-networking;[
<!ENTITY chap.advanced-networking SYSTEM "advanced-networking/chapter.xml">
-]]>
<!-- Part Five (appendices) -->
-<![%chap.mirrors;[
<!ENTITY chap.mirrors SYSTEM "mirrors/chapter.xml">
-]]>
-<![%chap.mirrors.ftp.inc;[
+ <!ENTITY chap.mirrors.lastmod.inc SYSTEM "mirrors.lastmod.inc">
+ <!ENTITY chap.mirrors.ftp.index.inc SYSTEM "mirrors.xml.ftp.index.inc">
<!ENTITY chap.mirrors.ftp.inc SYSTEM "mirrors.xml.ftp.inc">
-]]>
-<![%chap.mirrors.cvsup.inc;[
+ <!ENTITY chap.mirrors.cvsup.index.inc SYSTEM "mirrors.xml.cvsup.index.inc">
<!ENTITY chap.mirrors.cvsup.inc SYSTEM "mirrors.xml.cvsup.inc">
-]]>
-<![%chap.bibliography;[
<!ENTITY chap.bibliography SYSTEM "bibliography/chapter.xml">
-]]>
-<![%chap.eresources;[
<!ENTITY chap.eresources SYSTEM "eresources/chapter.xml">
-]]>
-<![%chap.eresources.www.inc;[
+ <!ENTITY chap.eresources.www.index.inc SYSTEM "eresources.xml.www.index.inc">
<!ENTITY chap.eresources.www.inc SYSTEM "eresources.xml.www.inc">
-]]>
-<![%chap.pgpkeys;[
<!ENTITY chap.pgpkeys SYSTEM "pgpkeys/chapter.xml">
-]]>
-<![%chap.freebsd-glossary;[
<!ENTITY chap.freebsd-glossary "&freebsd-glossary;">
-]]>
-<![%chap.index;[
- <!ENTITY chap.index SYSTEM "index.xml">
-]]>
+ <!ENTITY chap.index "">
<!ENTITY chap.colophon SYSTEM "colophon.xml">
-
-<!-- IGNORE cases -->
-
-<!-- Part One -->
-<!ENTITY chap.introduction "">
-<!ENTITY chap.install "">
-<!ENTITY chap.basics "">
-<!ENTITY chap.ports "">
-<!ENTITY chap.x11 "">
-
-<!-- Part Two -->
-<!ENTITY chap.desktop "">
-<!ENTITY chap.multimedia "">
-<!ENTITY chap.kernelconfig "">
-<!ENTITY chap.printing "">
-<!ENTITY chap.linuxemu "">
-
-<!-- Part Three -->
-<!ENTITY chap.config "">
-<!ENTITY chap.boot "">
-<!ENTITY chap.users "">
-<!ENTITY chap.security "">
-<!ENTITY chap.jails "">
-<!ENTITY chap.mac "">
-<!ENTITY chap.audit "">
-<!ENTITY chap.disks "">
-<!ENTITY chap.geom "">
-<!ENTITY chap.filesystems "">
-<!ENTITY chap.vinum "">
-<!ENTITY chap.virtualization "">
-<!ENTITY chap.l10n "">
-<!ENTITY chap.cutting-edge "">
-<!ENTITY chap.dtrace "">
-
-<!-- Part Four -->
-<!ENTITY chap.serialcomms "">
-<!ENTITY chap.ppp-and-slip "">
-<!ENTITY chap.mail "">
-<!ENTITY chap.network-servers "">
-<!ENTITY chap.firewalls "">
-<!ENTITY chap.advanced-networking "">
-
-<!-- Part Five (appendices) -->
-<!ENTITY chap.mirrors "">
-<!ENTITY chap.mirrors.ftp.inc "">
-<!ENTITY chap.mirrors.cvsup.inc "">
-<!ENTITY chap.bibliography "">
-<!ENTITY chap.eresources "">
-<!ENTITY chap.eresources.www.inc "">
-<!ENTITY chap.pgpkeys "">
-<!ENTITY chap.freebsd-glossary "">
-<!ENTITY chap.index "">
diff --git a/ru_RU.KOI8-R/books/handbook/colophon.xml b/ru_RU.KOI8-R/books/handbook/colophon.xml
index fddc7f54dc..228c443b2f 100644
--- a/ru_RU.KOI8-R/books/handbook/colophon.xml
+++ b/ru_RU.KOI8-R/books/handbook/colophon.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!--
The Russian FreeBSD Documentation Project
diff --git a/ru_RU.KOI8-R/books/handbook/config/chapter.xml b/ru_RU.KOI8-R/books/handbook/config/chapter.xml
index a99290ba37..0853766366 100644
--- a/ru_RU.KOI8-R/books/handbook/config/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/config/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!--
The FreeBSD Documentation Project
@@ -397,7 +397,7 @@ stop)
kill -9 `cat /var/run/utility.pid`
;;
*)
- echo "Usage: `basename $0` {start|stop}" >&2
+ echo "Usage: `basename $0` {start|stop}" >&2
exit 64
;;
esac
diff --git a/ru_RU.KOI8-R/books/handbook/cutting-edge/chapter.xml b/ru_RU.KOI8-R/books/handbook/cutting-edge/chapter.xml
index c33b28c768..d9685fd4fb 100644
--- a/ru_RU.KOI8-R/books/handbook/cutting-edge/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/cutting-edge/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!--
The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/books/handbook/desktop/chapter.xml b/ru_RU.KOI8-R/books/handbook/desktop/chapter.xml
index cd457312d8..443e5b9f3d 100644
--- a/ru_RU.KOI8-R/books/handbook/desktop/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/desktop/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!--
The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/books/handbook/disks/chapter.xml b/ru_RU.KOI8-R/books/handbook/disks/chapter.xml
index 21b0bd72c5..5e2ef323cd 100644
--- a/ru_RU.KOI8-R/books/handbook/disks/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/disks/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!--
The FreeBSD Russian Documentation Project
@@ -2949,16 +2949,6 @@ targetuser@targetmachine.example.com dd of=/mybigfiles/dump-usr-l0.gz</userinput
��������� �����. �ݣ ���� ���, ����������� � ���� ������, �����
������ ��� �� ������������� � �������.</para>
</sect3>
-
-<![ %not.published; [
-
- <sect3>
- <title>* � �� ��� ����� � ����������, � ��� ������?</title>
-
- <para></para>
- </sect3>
-]]>
-
</sect2>
</sect1>
diff --git a/ru_RU.KOI8-R/books/handbook/eresources/chapter.xml b/ru_RU.KOI8-R/books/handbook/eresources/chapter.xml
index 2b8cc70f0a..ab75145080 100644
--- a/ru_RU.KOI8-R/books/handbook/eresources/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/eresources/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!--
The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/books/handbook/filesystems/chapter.xml b/ru_RU.KOI8-R/books/handbook/filesystems/chapter.xml
index 4b6d2ec664..a44606af50 100644
--- a/ru_RU.KOI8-R/books/handbook/filesystems/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/filesystems/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!--
The FreeBSD Russian Documentation Project
$FreeBSD$
@@ -227,7 +227,7 @@ example 17547136 0 17547136 0% /example</screen>
��������� �����, � ������������ ����� ������������� ��� ����������,
��������:</para>
- <screen>&prompt.root <userinput>cd /example</userinput>
+ <screen>&prompt.root; <userinput>cd /example</userinput>
&prompt.root; <userinput>ls</userinput>
&prompt.root; <userinput>touch testfile</userinput>
&prompt.root; <userinput>ls -al</userinput>
diff --git a/ru_RU.KOI8-R/books/handbook/firewalls/chapter.xml b/ru_RU.KOI8-R/books/handbook/firewalls/chapter.xml
index 1b3e8556b1..82b504bfb4 100644
--- a/ru_RU.KOI8-R/books/handbook/firewalls/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/firewalls/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!--
The FreeBSD Documentation Project
diff --git a/ru_RU.KOI8-R/books/handbook/geom/chapter.xml b/ru_RU.KOI8-R/books/handbook/geom/chapter.xml
index d804ad63f0..7e6939a30b 100644
--- a/ru_RU.KOI8-R/books/handbook/geom/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/geom/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!--
The FreeBSD Russian Documentation Project
$FreeBSD$
diff --git a/ru_RU.KOI8-R/books/handbook/install/chapter.xml b/ru_RU.KOI8-R/books/handbook/install/chapter.xml
index b224fca5e5..5baa7a2e06 100644
--- a/ru_RU.KOI8-R/books/handbook/install/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/install/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!--
The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/books/handbook/introduction/chapter.xml b/ru_RU.KOI8-R/books/handbook/introduction/chapter.xml
index 4949c64566..148f51a85d 100644
--- a/ru_RU.KOI8-R/books/handbook/introduction/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/introduction/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!--
The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/books/handbook/kernelconfig/chapter.xml b/ru_RU.KOI8-R/books/handbook/kernelconfig/chapter.xml
index b0c2cf58cf..1c0b30b4e3 100644
--- a/ru_RU.KOI8-R/books/handbook/kernelconfig/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/kernelconfig/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!--
The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/books/handbook/l10n/chapter.xml b/ru_RU.KOI8-R/books/handbook/l10n/chapter.xml
index 287c0bc9d4..5a7963065d 100644
--- a/ru_RU.KOI8-R/books/handbook/l10n/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/l10n/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!--
The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/books/handbook/linuxemu/chapter.xml b/ru_RU.KOI8-R/books/handbook/linuxemu/chapter.xml
index 2746707174..f7aab0ecb2 100644
--- a/ru_RU.KOI8-R/books/handbook/linuxemu/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/linuxemu/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!--
The FreeBSD Russian Documentation Project
@@ -648,14 +648,14 @@ LOG=/var/log/lmgrd.log
case "$1" in
start)
- lmgrd -c ${LICENSE_FILE} 2>> ${LOG} 1>&2
+ lmgrd -c ${LICENSE_FILE} 2>> ${LOG} 1>&2
echo -n " lmgrd"
;;
stop)
- lmgrd -c ${LICENSE_FILE} -x lmdown 2>> ${LOG} 1>&2
+ lmgrd -c ${LICENSE_FILE} -x lmdown 2>> ${LOG} 1>&2
;;
*)
- echo "Usage: `basename $0` {start|stop}" 1>&2
+ echo "Usage: `basename $0` {start|stop}" 1>&2
exit 64
;;
esac
@@ -922,7 +922,7 @@ exit 0</programlisting>
��������� ��������� ������:</para>
<programlisting>#!/usr/compat/linux/bin/sh
-(sleep 5; killall -1 matlab_helper) &
+(sleep 5; killall -1 matlab_helper) &
exit 0</programlisting>
</step>
diff --git a/ru_RU.KOI8-R/books/handbook/mac/chapter.xml b/ru_RU.KOI8-R/books/handbook/mac/chapter.xml
index eeb197962e..5b034e17b1 100644
--- a/ru_RU.KOI8-R/books/handbook/mac/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/mac/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!--
The FreeBSD Russian Documentation Project
@@ -1681,7 +1681,7 @@ mac_partition_load="YES"</programlisting>
&man.vi.1;. ��������� ������ <command>sh</command>
������� ��� �����������:</para>
- <screen>&prompt.root; <userinput>for x in `awk -F: '($3 >= 1001) && ($3 != 65534) { print $1 }' \</userinput>
+ <screen>&prompt.root; <userinput>for x in `awk -F: '($3 >= 1001) && ($3 != 65534) { print $1 }' \</userinput>
<userinput>/etc/passwd`; do pw usermod $x -L insecure; done;</userinput></screen>
<para>����� ����� ��������� ���������� ��������� �������
@@ -1863,7 +1863,7 @@ round-trip min/avg/max/stddev = 204.455/204.455/204.455/0.000 ms</screen>
test1: biba/equal,mls/equal
&prompt.root; <userinput>setfmac biba/low test1 test2; setfmac biba/high test4 test5; \
setfmac mls/low test1 test3; setfmac mls/high test2 test4</userinput>
-&prompt.root; <userinput>setfmac mls/equal,biba/equal test3 && getfmac test?</userinput>
+&prompt.root; <userinput>setfmac mls/equal,biba/equal test3 && getfmac test?</userinput>
test1: biba/low,mls/low
test2: biba/low,mls/high
test3: biba/equal,mls/equal
@@ -1948,7 +1948,7 @@ cat: test4: Permission denied</screen>
<para>������� ������������ ���������� ��������� � ����� ��
���������; ����� �������:</para>
- <screen>&prompt.root; <userinput>for x in `awk -F: '($3 >= 1001) && ($3 != 65534) { print $1 }' \</userinput>
+ <screen>&prompt.root; <userinput>for x in `awk -F: '($3 >= 1001) && ($3 != 65534) { print $1 }' \</userinput>
<userinput>/etc/passwd`; do pw usermod $x -L default; done;</userinput></screen>
<para>������ ����� ��� ������.</para>
diff --git a/ru_RU.KOI8-R/books/handbook/mail/chapter.xml b/ru_RU.KOI8-R/books/handbook/mail/chapter.xml
index a1e3ce457a..3137daa086 100644
--- a/ru_RU.KOI8-R/books/handbook/mail/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/mail/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!--
The FreeBSD Documentation Project
@@ -1683,11 +1683,11 @@ SENDMAIL_LDADD=-lsasl2</programlisting>
��������� �������:</para>
<screen>&prompt.root; <userinput>cd /usr/src/lib/libsmutil</userinput>
-&prompt.root; <userinput>make cleandir && make obj && make</userinput>
+&prompt.root; <userinput>make cleandir && make obj && make</userinput>
&prompt.root; <userinput>cd /usr/src/lib/libsm</userinput>
-&prompt.root; <userinput>make cleandir && make obj && make</userinput>
+&prompt.root; <userinput>make cleandir && make obj && make</userinput>
&prompt.root; <userinput>cd /usr/src/usr.sbin/sendmail</userinput>
-&prompt.root; <userinput>make cleandir && make obj && make && make install</userinput></screen>
+&prompt.root; <userinput>make cleandir && make obj && make && make install</userinput></screen>
<para>���������� <application>sendmail</application> ������ ������
��� �������, ���� <filename>/usr/src</filename> �� ��� ������
diff --git a/ru_RU.KOI8-R/books/handbook/mirrors/chapter.xml b/ru_RU.KOI8-R/books/handbook/mirrors/chapter.xml
index 8473d65ce3..dba5c4a9fe 100644
--- a/ru_RU.KOI8-R/books/handbook/mirrors/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/mirrors/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!--
The FreeBSD Russian Documentation Project
@@ -2473,7 +2473,7 @@ doc/zh_*</screen>
������ ������ �� ���������� ������������� ������� ��������
� ��� ���� <filename>/etc/crontab</filename> ������</para>
- <programlisting>0 3 * * * root portsnap -I cron update && pkg_version -vIL=</programlisting>
+ <programlisting>0 3 * * * root portsnap -I cron update && pkg_version -vIL=</programlisting>
<note>
<para>���� ��������� ���� �� ����������� � ��������� �����,
diff --git a/ru_RU.KOI8-R/books/handbook/multimedia/chapter.xml b/ru_RU.KOI8-R/books/handbook/multimedia/chapter.xml
index d2d867a31c..573cff7252 100644
--- a/ru_RU.KOI8-R/books/handbook/multimedia/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/multimedia/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!--
The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/books/handbook/network-servers/chapter.xml b/ru_RU.KOI8-R/books/handbook/network-servers/chapter.xml
index 84ec47cf31..21375238ea 100644
--- a/ru_RU.KOI8-R/books/handbook/network-servers/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/network-servers/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!--
The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/books/handbook/pgpkeys/chapter.xml b/ru_RU.KOI8-R/books/handbook/pgpkeys/chapter.xml
index 3a3dbacd6f..ddd532f271 100644
--- a/ru_RU.KOI8-R/books/handbook/pgpkeys/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/pgpkeys/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!--
The FreeBSD Documentation Project
diff --git a/ru_RU.KOI8-R/books/handbook/ports/chapter.xml b/ru_RU.KOI8-R/books/handbook/ports/chapter.xml
index eb51231a68..89edadd440 100644
--- a/ru_RU.KOI8-R/books/handbook/ports/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/ports/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!--
The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/books/handbook/ppp-and-slip/chapter.xml b/ru_RU.KOI8-R/books/handbook/ppp-and-slip/chapter.xml
index e4ee10c1d2..c9df9b7196 100644
--- a/ru_RU.KOI8-R/books/handbook/ppp-and-slip/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/ppp-and-slip/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!--
The FreeBSD Russian Documentation Project
@@ -1724,7 +1724,7 @@ reinput 1 {\255}
if success goto slhup
reinput 1 {\127}
if success goto slhup
-if < \%x 60 goto look
+if < \%x 60 goto look
else goto slhup
:sllogin ; login
@@ -1745,7 +1745,7 @@ reinput 1 {\255}
if success goto slhup
reinput 1 {\127}
if success goto slhup
-if < \%x 10 goto slloop ; try 10 times to get a login prompt
+if < \%x 10 goto slloop ; try 10 times to get a login prompt
else goto slhup ; hang up and start again if 10 failures
:sluid
diff --git a/ru_RU.KOI8-R/books/handbook/preface/preface.xml b/ru_RU.KOI8-R/books/handbook/preface/preface.xml
index 37ceffff66..c2b8daf49f 100644
--- a/ru_RU.KOI8-R/books/handbook/preface/preface.xml
+++ b/ru_RU.KOI8-R/books/handbook/preface/preface.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!--
The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/books/handbook/printing/chapter.xml b/ru_RU.KOI8-R/books/handbook/printing/chapter.xml
index eb0e773b6f..00317e157c 100644
--- a/ru_RU.KOI8-R/books/handbook/printing/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/printing/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!--
The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/books/handbook/security/chapter.xml b/ru_RU.KOI8-R/books/handbook/security/chapter.xml
index 8168ae79f6..59d47db0f4 100644
--- a/ru_RU.KOI8-R/books/handbook/security/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/security/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!--
The FreeBSD Documentation Project
diff --git a/ru_RU.KOI8-R/books/handbook/serialcomms/chapter.xml b/ru_RU.KOI8-R/books/handbook/serialcomms/chapter.xml
index 31aca55c47..b5d3db88fd 100644
--- a/ru_RU.KOI8-R/books/handbook/serialcomms/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/serialcomms/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!--
The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/books/handbook/users/chapter.xml b/ru_RU.KOI8-R/books/handbook/users/chapter.xml
index f0762b869b..bdf5fb318c 100644
--- a/ru_RU.KOI8-R/books/handbook/users/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/users/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!--
The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/books/handbook/vinum/chapter.xml b/ru_RU.KOI8-R/books/handbook/vinum/chapter.xml
index d942e95974..a15938582d 100644
--- a/ru_RU.KOI8-R/books/handbook/vinum/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/vinum/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!--
The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/books/handbook/x11/chapter.xml b/ru_RU.KOI8-R/books/handbook/x11/chapter.xml
index 8e742aa887..d3c91f2730 100644
--- a/ru_RU.KOI8-R/books/handbook/x11/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/x11/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!--
The FreeBSD Russian Documentation Project
@@ -331,7 +331,7 @@
<application>&xorg;</application>. <application>&xorg;</application>
��� ������ X ������������ �������� ���������� X Window System,
���������� X.Org Foundation. <application>&xorg;</application> ������� �� ����
- <application>&xfree86 4.4RC2</application> � X11R6.6.
+ <application>&xfree86; 4.4RC2</application> � X11R6.6.
������ <application>&xorg;</application>, ��������� �� ������ ������
�� ��������� ������ &os;: &xorg.version;.</para>
diff --git a/ru_RU.KOI8-R/books/porters-handbook/book.xml b/ru_RU.KOI8-R/books/porters-handbook/book.xml
index 0b6aa7bc4c..3200f37334 100644
--- a/ru_RU.KOI8-R/books/porters-handbook/book.xml
+++ b/ru_RU.KOI8-R/books/porters-handbook/book.xml
@@ -3484,7 +3484,7 @@ ALWAYS_KEEP_DISTFILES= yes
<para>��� �� �����, �������� ���������� ����� ���������� �����������
������� ���������� ����������, �� �������� �
<makevar>BUILD_DEPENDS</makevar> ��������� �����.
- ����� ��������� ��-�� �������� ���������� � &man.make.1
+ ����� ��������� ��-�� �������� ���������� � &man.make.1;
������������� ����������. ����������� <filename>Makefile</filename>
� ����������� <makevar>USE_<replaceable>*</replaceable></makevar>,
������� �������������� � <filename>ports/Mk/bsd.*.mk</filename>
@@ -3899,8 +3899,8 @@ PKGNAMESUFFIX= ${RESOLUTION}
:
# default
RESOLUTION?= 300
-.if ${RESOLUTION} != 118 && ${RESOLUTION} != 240 && \
- ${RESOLUTION} != 300 && ${RESOLUTION} != 400
+.if ${RESOLUTION} != 118 && ${RESOLUTION} != 240 && \
+ ${RESOLUTION} != 300 && ${RESOLUTION} != 400
@${ECHO_MSG} "Error: invalid value for RESOLUTION: \"${RESOLUTION}\""
@${ECHO_MSG} "Possible values are: 118, 240, 300 (default) and 400."
@${FALSE}
@@ -4645,7 +4645,7 @@ PORTVERSION= 1.0</programlisting>
<programlisting>post-install:
${MKDIR} ${EXAMPLESDIR}
- (cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} \* ${EXAMPLESDIR})</programlisting>
+ (cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} \* ${EXAMPLESDIR})</programlisting>
<para>� ���� ������� ��������������� ���������� ��������
<filename>examples</filename> �� ������������ ������ �������������
@@ -4653,7 +4653,7 @@ PORTVERSION= 1.0</programlisting>
<programlisting>post-install:
${MKDIR} ${DATADIR}/summer
- (cd ${WRKSRC}/temperatures/ && ${COPYTREE_SHARE} "June July August" ${DATADIR}/summer/)</programlisting>
+ (cd ${WRKSRC}/temperatures/ && ${COPYTREE_SHARE} "June July August" ${DATADIR}/summer/)</programlisting>
<para>� � ���� ������� ����� ����������� ������ ������ ������� �
���������� <filename>summer</filename> ��������
@@ -4667,7 +4667,7 @@ PORTVERSION= 1.0</programlisting>
<programlisting>post-install:
${MKDIR} ${EXAMPLESDIR}
- (cd ${WRKSRC}/examples/ && \
+ (cd ${WRKSRC}/examples/ && \
${COPYTREE_SHARE} \* ${EXAMPLESDIR} "! -name Makefile")</programlisting>
<para>�������� ��������, ��� ��� ������� �� ���������� ����������
@@ -6355,7 +6355,7 @@ QT_COMPONENTS= gui moc_build qmake_build rcc_build uic_build</programlisting>
<programlisting>HAS_CONFIGURE= yes
do-configure:
- @cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
+ @cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
${QMAKE} PREFIX=${PREFIX} texmaker.pro</programlisting>
<para>�������� �������� �� �������� �� ������� <command>qmake</command>
@@ -9152,7 +9152,7 @@ CFLAGS+= -DLUA_VERSION_STRING="${VER_STR}"
url="&url.books.handbook;/configtuning-rcd.html">����� rc.d
�����������</ulink>. ��������� ���������� ��������� ������
��������� � &man.rc.8; � &man.rc.subr.8;. �������, ���� <ulink
- url="&url.articles.rc-scripting">������</ulink>� ������������
+ url="&url.articles.rc-scripting;">������</ulink>� ������������
�������� ��������� ��������� <filename>rc.d</filename>.</para>
<para>���������� ����� ���� ��� ����� ���������
@@ -9736,7 +9736,7 @@ etc/orbit.conf.sample
<para>��������� ��������� ��������� � ����� �����.</para>
- <screen>&prompt.root; <userinput>(cd /var/tmp/`make -V PORTNAME` && find -d * -type d) | sort > OLD-DIRS</userinput></screen>
+ <screen>&prompt.root; <userinput>(cd /var/tmp/`make -V PORTNAME` && find -d * -type d) | sort > OLD-DIRS</userinput></screen>
<para>�������� ������ ���� <filename>pkg-plist</filename>:</para>
@@ -9747,12 +9747,12 @@ etc/orbit.conf.sample
��������.</para>
<screen>&prompt.root; <userinput>make install PREFIX=/var/tmp/`make -V PORTNAME`</userinput>
-&prompt.root; <userinput>(cd /var/tmp/`make -V PORTNAME` && find -d * \! -type d) | sort > pkg-plist</userinput></screen>
+&prompt.root; <userinput>(cd /var/tmp/`make -V PORTNAME` && find -d * \! -type d) | sort > pkg-plist</userinput></screen>
<para>����� ����, � ������ �������� �� ������ �������� ��� �����
��������� ��������.</para>
- <screen>&prompt.root; <userinput>(cd /var/tmp/`make -V PORTNAME` && find -d * -type d) | sort | comm -13 OLD-DIRS - | sort -r | sed -e 's#^#@dirrm #' >> pkg-plist</userinput></screen>
+ <screen>&prompt.root; <userinput>(cd /var/tmp/`make -V PORTNAME` && find -d * -type d) | sort | comm -13 OLD-DIRS - | sort -r | sed -e 's#^#@dirrm #' >> pkg-plist</userinput></screen>
<para>� �������, ��� ����� ������� ����������� ������ ��������; ���
�������� ���������������� <emphasis>�� ���������</emphasis>. ��������
@@ -13373,7 +13373,7 @@ Reference: <http://www.freebsd.org/ports/portaudit/74a9541d-5d6c-11d8-80e3-00
<row>
<entry>700016</entry>
<entry>22 ������ 2006</entry>
- <entry>7.0-CURRENT ����� ���������� &man.fcloseall.3
+ <entry>7.0-CURRENT ����� ���������� &man.fcloseall.3;
� libc.</entry>
</row>
@@ -15483,7 +15483,7 @@ CFLAGS= -Wall -Werror
<sect1 id="dads-pthread">
<title>���������� �������</title>
- <para>�� &os ���������� ������� ������� ���� ������������ �
+ <para>�� &os; ���������� ������� ������� ���� ������������ �
������������ ������� � �������������� ������������ �����
������������ <literal>-pthread</literal>. ���� ���� ����������
�� ������ ���������� � <literal>-lpthread</literal> ���
diff --git a/ru_RU.KOI8-R/share/xml/mirrors-local.xsl b/ru_RU.KOI8-R/share/xml/mirrors-local.xsl
index 2ce9eb4828..862d15076d 100644
--- a/ru_RU.KOI8-R/share/xml/mirrors-local.xsl
+++ b/ru_RU.KOI8-R/share/xml/mirrors-local.xsl
@@ -14,7 +14,6 @@
<xsl:import href="../../../share/xml/mirrors-master.xsl" />
<xsl:output type="xml" encoding="koi8-r"
- omit-xml-declaration="yes"
indent="yes"/>
<!-- template: "mirrors-docbook-contact" -->
From 757d04e9ef12f091ae34952877435ae8e3ac20e2 Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Mon, 21 Jan 2013 17:44:29 +0000
Subject: [PATCH 020/121] - Make the Simplified Chinese documentation valid XML
---
zh_CN.GB2312/articles/linux-users/article.xml | 2 +-
.../articles/rc-scripting/article.xml | 4 +-
.../books/arch-handbook/boot/chapter.xml | 2 +-
zh_CN.GB2312/books/arch-handbook/chapters.ent | 2 +-
.../arch-handbook/driverbasics/chapter.xml | 2 +-
.../books/arch-handbook/isa/chapter.xml | 2 +-
.../books/arch-handbook/jail/chapter.xml | 2 +-
.../books/arch-handbook/kobj/chapter.xml | 2 +-
.../books/arch-handbook/locking/chapter.xml | 2 +-
.../books/arch-handbook/mac/chapter.xml | 6 +-
.../books/arch-handbook/newbus/chapter.xml | 2 +-
.../books/arch-handbook/pccard/chapter.xml | 2 +-
.../books/arch-handbook/pci/chapter.xml | 2 +-
.../books/arch-handbook/scsi/chapter.xml | 2 +-
.../books/arch-handbook/smp/chapter.xml | 2 +-
.../books/arch-handbook/sound/chapter.xml | 2 +-
.../books/arch-handbook/sysinit/chapter.xml | 2 +-
.../books/arch-handbook/usb/chapter.xml | 2 +-
.../books/arch-handbook/vm/chapter.xml | 2 +-
zh_CN.GB2312/books/handbook/Makefile | 36 +++-
.../handbook/advanced-networking/chapter.xml | 8 +-
zh_CN.GB2312/books/handbook/audit/chapter.xml | 4 +-
.../books/handbook/basics/chapter.xml | 2 +-
.../books/handbook/bibliography/chapter.xml | 4 +-
zh_CN.GB2312/books/handbook/book.xml | 2 +-
zh_CN.GB2312/books/handbook/boot/chapter.xml | 2 +-
zh_CN.GB2312/books/handbook/chapters.ent | 180 +-----------------
zh_CN.GB2312/books/handbook/colophon.xml | 2 +-
.../books/handbook/config/chapter.xml | 4 +-
.../books/handbook/cutting-edge/chapter.xml | 70 +------
.../books/handbook/desktop/chapter.xml | 2 +-
zh_CN.GB2312/books/handbook/disks/chapter.xml | 20 +-
.../books/handbook/dtrace/chapter.xml | 2 +-
.../books/handbook/eresources/chapter.xml | 7 +-
.../books/handbook/filesystems/chapter.xml | 4 +-
.../books/handbook/firewalls/chapter.xml | 2 +-
zh_CN.GB2312/books/handbook/geom/chapter.xml | 2 +-
.../books/handbook/install/chapter.xml | 2 +-
.../books/handbook/introduction/chapter.xml | 2 +-
zh_CN.GB2312/books/handbook/jails/chapter.xml | 2 +-
.../books/handbook/kernelconfig/chapter.xml | 2 +-
zh_CN.GB2312/books/handbook/l10n/chapter.xml | 2 +-
.../books/handbook/linuxemu/chapter.xml | 10 +-
zh_CN.GB2312/books/handbook/mac/chapter.xml | 6 +-
zh_CN.GB2312/books/handbook/mail/chapter.xml | 8 +-
.../books/handbook/mirrors/chapter.xml | 11 +-
.../books/handbook/multimedia/chapter.xml | 2 +-
.../handbook/network-servers/chapter.xml | 2 +-
.../books/handbook/pgpkeys/chapter.xml | 2 +-
zh_CN.GB2312/books/handbook/ports/chapter.xml | 2 +-
.../books/handbook/ppp-and-slip/chapter.xml | 2 +-
.../books/handbook/preface/preface.xml | 2 +-
.../books/handbook/printing/chapter.xml | 2 +-
.../books/handbook/security/chapter.xml | 2 +-
.../books/handbook/serialcomms/chapter.xml | 2 +-
zh_CN.GB2312/books/handbook/users/chapter.xml | 2 +-
zh_CN.GB2312/books/handbook/vinum/chapter.xml | 2 +-
.../books/handbook/virtualization/chapter.xml | 8 +-
zh_CN.GB2312/books/handbook/x11/chapter.xml | 8 +-
zh_CN.GB2312/books/porters-handbook/book.xml | 24 +--
zh_CN.GB2312/share/xml/mirrors-local.xsl | 1 -
zh_CN.GB2312/share/xml/trademarks.ent | 5 -
62 files changed, 149 insertions(+), 361 deletions(-)
diff --git a/zh_CN.GB2312/articles/linux-users/article.xml b/zh_CN.GB2312/articles/linux-users/article.xml
index 8bbaa904cb..3a2a157ed0 100644
--- a/zh_CN.GB2312/articles/linux-users/article.xml
+++ b/zh_CN.GB2312/articles/linux-users/article.xml
@@ -149,7 +149,7 @@ in your /etc/rc.conf. Extra options can be found in startup script.</screen>
<title>Ports</title>
<para>&os; �ĵڶ��ְ�װӦ�ó���ķ�������ʹ�� Ports ���ˡ�
- Ports ���� &os �ϵ�һ������ <filename>Makefile</filename>
+ Ports ���� &os; �ϵ�һ������ <filename>Makefile</filename>
��һЩ�����ļ����ض���Դ�붨�ư�װ������������Ŀ�ܡ�
����װһ�� port ʱϵͳ���ȡ����Դ�룬
Ӧ���κ�����Ҫ�IJ���������Դ�룬
diff --git a/zh_CN.GB2312/articles/rc-scripting/article.xml b/zh_CN.GB2312/articles/rc-scripting/article.xml
index b5c73861b9..2b1c46ac6f 100644
--- a/zh_CN.GB2312/articles/rc-scripting/article.xml
+++ b/zh_CN.GB2312/articles/rc-scripting/article.xml
@@ -911,8 +911,8 @@ start_precmd="${name}_prestart"
mumbled_prestart()
{
- if ! checkyesno frotz_enable && \
- ! /etc/rc.d/frotz forcestatus 1>/dev/null 2>&1; then
+ if ! checkyesno frotz_enable && \
+ ! /etc/rc.d/frotz forcestatus 1>/dev/null 2>&1; then
force_depend frotz || return 1<co id="rcng-hookup-force"/>
fi
return 0
diff --git a/zh_CN.GB2312/books/arch-handbook/boot/chapter.xml b/zh_CN.GB2312/books/arch-handbook/boot/chapter.xml
index 99d683bef0..162da2b684 100644
--- a/zh_CN.GB2312/books/arch-handbook/boot/chapter.xml
+++ b/zh_CN.GB2312/books/arch-handbook/boot/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Simplified Chinese Project
diff --git a/zh_CN.GB2312/books/arch-handbook/chapters.ent b/zh_CN.GB2312/books/arch-handbook/chapters.ent
index 03de4f95ce..2a1dc3bdeb 100644
--- a/zh_CN.GB2312/books/arch-handbook/chapters.ent
+++ b/zh_CN.GB2312/books/arch-handbook/chapters.ent
@@ -34,7 +34,7 @@
<!ENTITY chap.pccard SYSTEM "pccard/chapter.xml">
<!-- Part three - Appendices -->
-<![%chap.index[
+<![%chap.index;[
<!ENTITY chap.index SYSTEM "index.xml">
]]>
<!ENTITY chap.index "">
diff --git a/zh_CN.GB2312/books/arch-handbook/driverbasics/chapter.xml b/zh_CN.GB2312/books/arch-handbook/driverbasics/chapter.xml
index c7e1491049..5b5e8a7817 100644
--- a/zh_CN.GB2312/books/arch-handbook/driverbasics/chapter.xml
+++ b/zh_CN.GB2312/books/arch-handbook/driverbasics/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Simplified Chinese Project
diff --git a/zh_CN.GB2312/books/arch-handbook/isa/chapter.xml b/zh_CN.GB2312/books/arch-handbook/isa/chapter.xml
index 70c31231cc..b24b960685 100644
--- a/zh_CN.GB2312/books/arch-handbook/isa/chapter.xml
+++ b/zh_CN.GB2312/books/arch-handbook/isa/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
<!--
The FreeBSD Documentation Project
diff --git a/zh_CN.GB2312/books/arch-handbook/jail/chapter.xml b/zh_CN.GB2312/books/arch-handbook/jail/chapter.xml
index a6a5fc85f4..c06f9badd2 100644
--- a/zh_CN.GB2312/books/arch-handbook/jail/chapter.xml
+++ b/zh_CN.GB2312/books/arch-handbook/jail/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Simplified Chinese Project
diff --git a/zh_CN.GB2312/books/arch-handbook/kobj/chapter.xml b/zh_CN.GB2312/books/arch-handbook/kobj/chapter.xml
index 5416e829d1..50484936bf 100644
--- a/zh_CN.GB2312/books/arch-handbook/kobj/chapter.xml
+++ b/zh_CN.GB2312/books/arch-handbook/kobj/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Simplified Chinese Project
diff --git a/zh_CN.GB2312/books/arch-handbook/locking/chapter.xml b/zh_CN.GB2312/books/arch-handbook/locking/chapter.xml
index 4103839c43..4bd187862e 100644
--- a/zh_CN.GB2312/books/arch-handbook/locking/chapter.xml
+++ b/zh_CN.GB2312/books/arch-handbook/locking/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
<!--
The FreeBSD Documentation Project
The FreeBSD SMP Next Generation Project
diff --git a/zh_CN.GB2312/books/arch-handbook/mac/chapter.xml b/zh_CN.GB2312/books/arch-handbook/mac/chapter.xml
index 9202891559..e9ec8cf8e2 100644
--- a/zh_CN.GB2312/books/arch-handbook/mac/chapter.xml
+++ b/zh_CN.GB2312/books/arch-handbook/mac/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
<!--
Copyright (c) 2002-2005 Networks Associates Technology, Inc.
All rights reserved.
@@ -2770,8 +2770,8 @@
</tgroup>
</informaltable>
- <para>���� &man.listen.2 ���� <parameter>oldsocket</parameter>��
- Ϊ�½� &man.accept.2 ������ <parameter>newsocket</parameter>�����ñ�ǡ�</para>
+ <para>���� &man.listen.2; ���� <parameter>oldsocket</parameter>��
+ Ϊ�½� &man.accept.2; ������ <parameter>newsocket</parameter>�����ñ�ǡ�</para>
</sect4>
<sect4 id="mac-mpo-relabel-pipe">
diff --git a/zh_CN.GB2312/books/arch-handbook/newbus/chapter.xml b/zh_CN.GB2312/books/arch-handbook/newbus/chapter.xml
index 7a0e466ead..f25293bf72 100644
--- a/zh_CN.GB2312/books/arch-handbook/newbus/chapter.xml
+++ b/zh_CN.GB2312/books/arch-handbook/newbus/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Simplified Chinese Project
diff --git a/zh_CN.GB2312/books/arch-handbook/pccard/chapter.xml b/zh_CN.GB2312/books/arch-handbook/pccard/chapter.xml
index 5df8822a87..c27a32e244 100644
--- a/zh_CN.GB2312/books/arch-handbook/pccard/chapter.xml
+++ b/zh_CN.GB2312/books/arch-handbook/pccard/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Simplified Chinese Project
diff --git a/zh_CN.GB2312/books/arch-handbook/pci/chapter.xml b/zh_CN.GB2312/books/arch-handbook/pci/chapter.xml
index 750529c06e..c3aa94e1c3 100644
--- a/zh_CN.GB2312/books/arch-handbook/pci/chapter.xml
+++ b/zh_CN.GB2312/books/arch-handbook/pci/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Simplified Chinese Project
diff --git a/zh_CN.GB2312/books/arch-handbook/scsi/chapter.xml b/zh_CN.GB2312/books/arch-handbook/scsi/chapter.xml
index f5d43263b2..be793ee339 100644
--- a/zh_CN.GB2312/books/arch-handbook/scsi/chapter.xml
+++ b/zh_CN.GB2312/books/arch-handbook/scsi/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Simplified Chinese Project
diff --git a/zh_CN.GB2312/books/arch-handbook/smp/chapter.xml b/zh_CN.GB2312/books/arch-handbook/smp/chapter.xml
index 373e8b166f..c2369c60a9 100644
--- a/zh_CN.GB2312/books/arch-handbook/smp/chapter.xml
+++ b/zh_CN.GB2312/books/arch-handbook/smp/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
<!--
The FreeBSD Documentation Project
The FreeBSD SMP Next Generation Project
diff --git a/zh_CN.GB2312/books/arch-handbook/sound/chapter.xml b/zh_CN.GB2312/books/arch-handbook/sound/chapter.xml
index 2390a70454..c2c97f1803 100644
--- a/zh_CN.GB2312/books/arch-handbook/sound/chapter.xml
+++ b/zh_CN.GB2312/books/arch-handbook/sound/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Simplified Chinese Project
diff --git a/zh_CN.GB2312/books/arch-handbook/sysinit/chapter.xml b/zh_CN.GB2312/books/arch-handbook/sysinit/chapter.xml
index e38fe038ed..f62316c6e4 100644
--- a/zh_CN.GB2312/books/arch-handbook/sysinit/chapter.xml
+++ b/zh_CN.GB2312/books/arch-handbook/sysinit/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Simplified Chinese Project
diff --git a/zh_CN.GB2312/books/arch-handbook/usb/chapter.xml b/zh_CN.GB2312/books/arch-handbook/usb/chapter.xml
index 93653e6404..eaa9e5a813 100644
--- a/zh_CN.GB2312/books/arch-handbook/usb/chapter.xml
+++ b/zh_CN.GB2312/books/arch-handbook/usb/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Simplified Chinese Project
diff --git a/zh_CN.GB2312/books/arch-handbook/vm/chapter.xml b/zh_CN.GB2312/books/arch-handbook/vm/chapter.xml
index 7a0d44d10f..89ce63e11b 100644
--- a/zh_CN.GB2312/books/arch-handbook/vm/chapter.xml
+++ b/zh_CN.GB2312/books/arch-handbook/vm/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Simplified Chinese Project
diff --git a/zh_CN.GB2312/books/handbook/Makefile b/zh_CN.GB2312/books/handbook/Makefile
index f2eaba6091..9029f3c43d 100644
--- a/zh_CN.GB2312/books/handbook/Makefile
+++ b/zh_CN.GB2312/books/handbook/Makefile
@@ -272,30 +272,56 @@ DOC_PREFIX?= ${.CURDIR}/../../..
#
# rules generating lists of mirror site from XML database.
#
-XMLDOCS= mirrors-ftp:::mirrors.xml.ftp.inc \
+XMLDOCS= lastmod:::mirrors.lastmod.inc \
+ mirrors-ftp-index:::mirrors.xml.ftp.index.inc \
+ mirrors-ftp:::mirrors.xml.ftp.inc \
+ mirrors-cvsup-index:::mirrors.xml.cvsup.index.inc \
mirrors-cvsup:::mirrors.xml.cvsup.inc \
+ eresources-index:::eresources.xml.www.index.inc \
eresources:::eresources.xml.www.inc
DEPENDSET.DEFAULT= transtable mirror
XSLT.DEFAULT= ${XSL_MIRRORS}
XML.DEFAULT= ${XML_MIRRORS}
NO_TIDY.DEFAULT= yes
+PARAMS.lastmod+= --param 'target' "'lastmod'"
+PARAMS.mirrors-ftp-index+= --param 'type' "'ftp'" \
+ --param 'proto' "'ftp'" \
+ --param 'target' "'index'"
PARAMS.mirrors-ftp+= --param 'type' "'ftp'" \
--param 'proto' "'ftp'" \
--param 'target' "'handbook/mirrors/chapter.xml'"
+PARAMS.mirrors-cvsup-index+= --param 'type' "'cvsup'" \
+ --param 'proto' "'cvsup'" \
+ --param 'target' "'index'"
PARAMS.mirrors-cvsup+= --param 'type' "'cvsup'" \
--param 'proto' "'cvsup'" \
--param 'target' "'handbook/mirrors/chapter.xml'"
+PARAMS.eresources-index+= --param 'type' "'www'" \
+ --param 'proto' "'http'" \
+ --param 'target' "'index'"
PARAMS.eresources+= --param 'type' "'www'" \
--param 'proto' "'http'" \
--param 'target' "'handbook/eresources/chapter.xml'"
-SRCS+= mirrors.xml.ftp.inc \
+SRCS+= mirrors.lastmod.inc \
+ mirrors.xml.ftp.inc \
+ mirrors.xml.ftp.index.inc \
mirrors.xml.cvsup.inc \
- eresources.xml.www.inc
+ mirrors.xml.cvsup.index.inc \
+ eresources.xml.www.inc \
+ eresources.xml.www.index.inc
-CLEANFILES+= mirrors.xml.ftp.inc \
+CLEANFILES+= mirrors.lastmod.inc \
+ mirrors.xml.ftp.inc \
+ mirrors.xml.ftp.index.inc \
mirrors.xml.cvsup.inc \
- eresources.xml.www.inc
+ mirrors.xml.cvsup.index.inc \
+ eresources.xml.www.inc \
+ eresources.xml.www.index.inc
+
+lint: mirrors.lastmod.inc mirrors.xml.ftp.inc mirrors.xml.ftp.index.inc \
+ mirrors.xml.cvsup.inc mirrors.xml.cvsup.index.inc \
+ eresources.xml.www.inc eresources.xml.www.index.inc
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/zh_CN.GB2312/books/handbook/advanced-networking/chapter.xml b/zh_CN.GB2312/books/handbook/advanced-networking/chapter.xml
index c228ec0036..c4b8385eb2 100644
--- a/zh_CN.GB2312/books/handbook/advanced-networking/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/advanced-networking/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Chinese Documentation Project
@@ -640,7 +640,7 @@ route_net2="-net 192.168.1.0/24 192.168.1.1"</programlisting>
<acronym>DVMRP</acronym> �ಥ·��Э�飬
��������öಥ�ij��ϣ�
���ѱ� &man.pim.4; ȡ���� &man.mrouted.8; �Լ���ص�
- &man.map-mbone.8; �� &man.mrinfo.8 ���߿����� &os; �� Ports Collection
+ &man.map-mbone.8; �� &man.mrinfo.8; ���߿����� &os; �� Ports Collection
<filename role="package">net/mrouted</filename> ���ҵ���</para>
</note>
</sect2>
@@ -1874,7 +1874,7 @@ wpa_pairwise=CCMP TKIP <co id="co-ap-wpapsk-pwise"/></programlisting>
<para>��������һ����������
<application>hostapd</application>��</para>
- <screen>&prompt.root <userinput>/etc/rc.d/hostapd forcestart</userinput></screen>
+ <screen>&prompt.root; <userinput>/etc/rc.d/hostapd forcestart</userinput></screen>
<screen>&prompt.root; <userinput>ifconfig <replaceable>wlan0</replaceable></userinput>
wlan0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> mtu 2290
@@ -5670,7 +5670,7 @@ ifconfig_carp1="vhid 2 advskew 100 pass testpass 192.168.1.51/24"</programlistin
�ص�ԭ�����ݷ������� ������������
<hostid>provider.example.org</hostid> ��ʹ����������</para>
- <screen>&prompt.root; <userinput>ifconfig carp0 down && ifconfig carp0 up</userinput></screen>
+ <screen>&prompt.root; <userinput>ifconfig carp0 down && ifconfig carp0 up</userinput></screen>
<para>���������Ҫ������������������Ӧ���Ǹ� <devicename>carp</devicename>
�ӿ��Ͻ��С�</para>
diff --git a/zh_CN.GB2312/books/handbook/audit/chapter.xml b/zh_CN.GB2312/books/handbook/audit/chapter.xml
index d2aaa1dd05..d8a117ea20 100644
--- a/zh_CN.GB2312/books/handbook/audit/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/audit/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Simplified Chinese Project
@@ -463,7 +463,7 @@ www:fc,+ex:no</programlisting>
<para>��Ƽ������� BSM �����Ƹ�ʽ����ģ� ��˱���ʹ�ù�������������ģ�
����ת��Ϊ�ı��� &man.praudit.1;
�����ܹ��������ļ�ת��Ϊ���ı���ʽ�� ��
- &man.auditreduce.1 ���������Ϊ������ �浵���ӡĿ����Ũ�������־�ļ���
+ &man.auditreduce.1; ���������Ϊ������ �浵���ӡĿ����Ũ�������־�ļ���
<command>auditreduce</command> ֧��һϵ��ɸѡ������ �����¼����͡� �¼��ࡢ
�û��� �¼������ں�ʱ�䣬 �Լ��ļ�·�����������</para>
diff --git a/zh_CN.GB2312/books/handbook/basics/chapter.xml b/zh_CN.GB2312/books/handbook/basics/chapter.xml
index 94df37e03e..b4a05a7a16 100644
--- a/zh_CN.GB2312/books/handbook/basics/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/basics/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Simplified Chinese Project
diff --git a/zh_CN.GB2312/books/handbook/bibliography/chapter.xml b/zh_CN.GB2312/books/handbook/bibliography/chapter.xml
index 91058cbe84..6042b31da5 100644
--- a/zh_CN.GB2312/books/handbook/bibliography/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/bibliography/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
<!--
The FreeBSD Chinese Documentation Project
@@ -55,7 +55,7 @@
</listitem>
<listitem>
- <para>FreeBSD & Windows ��������ʵ�� ���������ģ���
+ <para>FreeBSD & Windows ��������ʵ�� ���������ģ���
<ulink url="http://www.tdpress.com/">�����������</ulink>��
ISBN 7-113-03845-X��</para>
</listitem>
diff --git a/zh_CN.GB2312/books/handbook/book.xml b/zh_CN.GB2312/books/handbook/book.xml
index 24ad5a21da..f451bea069 100644
--- a/zh_CN.GB2312/books/handbook/book.xml
+++ b/zh_CN.GB2312/books/handbook/book.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
"../../../share/xml/freebsd42.dtd" [
<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//ZH" "../../share/xml/entities.ent">
diff --git a/zh_CN.GB2312/books/handbook/boot/chapter.xml b/zh_CN.GB2312/books/handbook/boot/chapter.xml
index 241ce004b1..8ae7206d63 100644
--- a/zh_CN.GB2312/books/handbook/boot/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/boot/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Chinese (Simplified) Project
diff --git a/zh_CN.GB2312/books/handbook/chapters.ent b/zh_CN.GB2312/books/handbook/chapters.ent
index d0c9d534ed..6e28d6e125 100644
--- a/zh_CN.GB2312/books/handbook/chapters.ent
+++ b/zh_CN.GB2312/books/handbook/chapters.ent
@@ -11,231 +11,61 @@
$FreeBSD$
-->
-<!ENTITY % not.published "INCLUDE">
-
-<!ENTITY % chap.introduction "IGNORE">
-<!ENTITY % chap.install "IGNORE">
-<!ENTITY % chap.basics "IGNORE">
-<!ENTITY % chap.ports "IGNORE">
-<!ENTITY % chap.config "IGNORE">
-<!ENTITY % chap.boot "IGNORE">
-<!ENTITY % chap.users "IGNORE">
-<!ENTITY % chap.kernelconfig "IGNORE">
-<!ENTITY % chap.security "IGNORE">
-<!ENTITY % chap.jails "IGNORE">
-<!ENTITY % chap.printing "IGNORE">
-<!ENTITY % chap.disks "IGNORE">
-<!ENTITY % chap.geom "IGNORE">
-<!ENTITY % chap.vinum "IGNORE">
-<!ENTITY % chap.x11 "IGNORE">
-<!ENTITY % chap.l10n "IGNORE">
-<!ENTITY % chap.multimedia "IGNORE">
-<!ENTITY % chap.desktop "IGNORE">
-<!ENTITY % chap.serialcomms "IGNORE">
-<!ENTITY % chap.ppp-and-slip "IGNORE">
-<!ENTITY % chap.advanced-networking "IGNORE">
-<!ENTITY % chap.firewalls "IGNORE">
-<!ENTITY % chap.network-servers "IGNORE">
-<!ENTITY % chap.mail "IGNORE">
-<!ENTITY % chap.cutting-edge "IGNORE">
-<!ENTITY % chap.linuxemu "IGNORE">
-<!ENTITY % chap.mirrors "IGNORE">
-<!ENTITY % chap.mirrors.ftp.inc "INCLUDE">
-<!ENTITY % chap.mirrors.cvsup.inc "INCLUDE">
-<!ENTITY % chap.bibliography "IGNORE">
-<!ENTITY % chap.eresources "IGNORE">
-<!ENTITY % chap.eresources.www.inc "INCLUDE">
-<!ENTITY % chap.pgpkeys "IGNORE">
-<!ENTITY % chap.index "IGNORE">
-<!ENTITY % chap.freebsd-glossary "IGNORE">
-<!ENTITY % chap.mac "IGNORE">
-<!ENTITY % chap.audit "IGNORE">
-<!ENTITY % chap.filesystems "IGNORE">
-<!ENTITY % chap.dtrace "IGNORE">
-
<!ENTITY chap.preface SYSTEM "preface/preface.xml">
<!ENTITY % pgpkeys SYSTEM "../../../share/pgpkeys/pgpkeys.ent"> %pgpkeys;
<!-- Part One -->
-<![%chap.introduction;[
<!ENTITY chap.introduction SYSTEM "introduction/chapter.xml">
-]]>
-<![%chap.install;[
<!ENTITY chap.install SYSTEM "install/chapter.xml">
-]]>
-<![%chap.basics;[
<!ENTITY chap.basics SYSTEM "basics/chapter.xml">
-]]>
-<![%chap.ports;[
<!ENTITY chap.ports SYSTEM "ports/chapter.xml">
-]]>
-<![%chap.x11;[
<!ENTITY chap.x11 SYSTEM "x11/chapter.xml">
-]]>
<!-- Part Two -->
-<![%chap.desktop;[
<!ENTITY chap.desktop SYSTEM "desktop/chapter.xml">
-]]>
-<![%chap.multimedia;[
<!ENTITY chap.multimedia SYSTEM "multimedia/chapter.xml">
-]]>
-<![%chap.kernelconfig;[
<!ENTITY chap.kernelconfig SYSTEM "kernelconfig/chapter.xml">
-]]>
-<![%chap.printing;[
<!ENTITY chap.printing SYSTEM "printing/chapter.xml">
-]]>
-<![%chap.linuxemu;[
<!ENTITY chap.linuxemu SYSTEM "linuxemu/chapter.xml">
-]]>
<!-- Part Three -->
-<![%chap.config;[
<!ENTITY chap.config SYSTEM "config/chapter.xml">
-]]>
-<![%chap.boot;[
<!ENTITY chap.boot SYSTEM "boot/chapter.xml">
-]]>
-<![%chap.users;[
<!ENTITY chap.users SYSTEM "users/chapter.xml">
-]]>
-<![%chap.security;[
<!ENTITY chap.security SYSTEM "security/chapter.xml">
-]]>
-<![%chap.jails;[
<!ENTITY chap.jails SYSTEM "jails/chapter.xml">
-]]>
-<![%chap.mac;[
<!ENTITY chap.mac SYSTEM "mac/chapter.xml">
-]]>
-<![%chap.audit;[
<!ENTITY chap.audit SYSTEM "audit/chapter.xml">
-]]>
-<![%chap.disks;[
<!ENTITY chap.disks SYSTEM "disks/chapter.xml">
-]]>
-<![%chap.geom;[
<!ENTITY chap.geom SYSTEM "geom/chapter.xml">
-]]>
-<![%chap.filesystems;[
<!ENTITY chap.filesystems SYSTEM "filesystems/chapter.xml">
-]]>
-<![%chap.vinum;[
<!ENTITY chap.vinum SYSTEM "vinum/chapter.xml">
-]]>
-<![%chap.virtualization;[
<!ENTITY chap.virtualization SYSTEM "virtualization/chapter.xml">
-]]>
-<![%chap.l10n;[
<!ENTITY chap.l10n SYSTEM "l10n/chapter.xml">
-]]>
-<![%chap.cutting-edge;[
<!ENTITY chap.cutting-edge SYSTEM "cutting-edge/chapter.xml">
-]]>
-<![%chap.dtrace;[
<!ENTITY chap.dtrace SYSTEM "dtrace/chapter.xml">
-]]>
<!-- Part Four -->
-<![%chap.serialcomms;[
<!ENTITY chap.serialcomms SYSTEM "serialcomms/chapter.xml">
-]]>
-<![%chap.ppp-and-slip;[
<!ENTITY chap.ppp-and-slip SYSTEM "ppp-and-slip/chapter.xml">
-]]>
-<![%chap.mail;[
<!ENTITY chap.mail SYSTEM "mail/chapter.xml">
-]]>
-<![%chap.network-servers;[
<!ENTITY chap.network-servers SYSTEM "network-servers/chapter.xml">
-]]>
-<![%chap.firewalls;[
<!ENTITY chap.firewalls SYSTEM "firewalls/chapter.xml">
-]]>
-<![%chap.advanced-networking;[
<!ENTITY chap.advanced-networking SYSTEM "advanced-networking/chapter.xml">
-]]>
<!-- Part Five (appendices) -->
-<![%chap.mirrors;[
<!ENTITY chap.mirrors SYSTEM "mirrors/chapter.xml">
-]]>
-<![%chap.mirrors.ftp.inc;[
+ <!ENTITY chap.mirrors.lastmod.inc SYSTEM "mirrors.lastmod.inc">
+ <!ENTITY chap.mirrors.ftp.index.inc SYSTEM "mirrors.xml.ftp.index.inc">
<!ENTITY chap.mirrors.ftp.inc SYSTEM "mirrors.xml.ftp.inc">
-]]>
-<![%chap.mirrors.cvsup.inc;[
+ <!ENTITY chap.mirrors.cvsup.index.inc SYSTEM "mirrors.xml.cvsup.index.inc">
<!ENTITY chap.mirrors.cvsup.inc SYSTEM "mirrors.xml.cvsup.inc">
-]]>
-<![%chap.bibliography;[
<!ENTITY chap.bibliography SYSTEM "bibliography/chapter.xml">
-]]>
-<![%chap.eresources;[
<!ENTITY chap.eresources SYSTEM "eresources/chapter.xml">
-]]>
-<![%chap.eresources.www.inc;[
+ <!ENTITY chap.eresources.www.index.inc SYSTEM "eresources.xml.www.index.inc">
<!ENTITY chap.eresources.www.inc SYSTEM "eresources.xml.www.inc">
-]]>
-<![%chap.pgpkeys;[
<!ENTITY chap.pgpkeys SYSTEM "pgpkeys/chapter.xml">
-]]>
-<![%chap.freebsd-glossary;[
<!ENTITY chap.freebsd-glossary "&freebsd-glossary;">
-]]>
-<![%chap.index;[
- <!ENTITY chap.index SYSTEM "index.xml">
-]]>
+ <!ENTITY chap.index "">
<!ENTITY chap.colophon SYSTEM "colophon.xml">
-
-<!-- IGNORE cases -->
-
-<!-- Part One -->
-<!ENTITY chap.introduction "">
-<!ENTITY chap.install "">
-<!ENTITY chap.basics "">
-<!ENTITY chap.ports "">
-<!ENTITY chap.x11 "">
-
-<!-- Part Two -->
-<!ENTITY chap.desktop "">
-<!ENTITY chap.multimedia "">
-<!ENTITY chap.kernelconfig "">
-<!ENTITY chap.printing "">
-<!ENTITY chap.linuxemu "">
-
-<!-- Part Three -->
-<!ENTITY chap.config "">
-<!ENTITY chap.boot "">
-<!ENTITY chap.users "">
-<!ENTITY chap.security "">
-<!ENTITY chap.jails "">
-<!ENTITY chap.mac "">
-<!ENTITY chap.audit "">
-<!ENTITY chap.disks "">
-<!ENTITY chap.geom "">
-<!ENTITY chap.filesystems "">
-<!ENTITY chap.vinum "">
-<!ENTITY chap.virtualization "">
-<!ENTITY chap.l10n "">
-<!ENTITY chap.cutting-edge "">
-<!ENTITY chap.dtrace "">
-
-<!-- Part Four -->
-<!ENTITY chap.serialcomms "">
-<!ENTITY chap.ppp-and-slip "">
-<!ENTITY chap.mail "">
-<!ENTITY chap.network-servers "">
-<!ENTITY chap.firewalls "">
-<!ENTITY chap.advanced-networking "">
-
-<!-- Part Five (appendices) -->
-<!ENTITY chap.mirrors "">
-<!ENTITY chap.mirrors.ftp.inc "">
-<!ENTITY chap.mirrors.cvsup.inc "">
-<!ENTITY chap.bibliography "">
-<!ENTITY chap.eresources "">
-<!ENTITY chap.eresources.www.inc "">
-<!ENTITY chap.pgpkeys "">
-<!ENTITY chap.freebsd-glossary "">
-<!ENTITY chap.index "">
diff --git a/zh_CN.GB2312/books/handbook/colophon.xml b/zh_CN.GB2312/books/handbook/colophon.xml
index 6dbf3c543c..913048bb21 100644
--- a/zh_CN.GB2312/books/handbook/colophon.xml
+++ b/zh_CN.GB2312/books/handbook/colophon.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Simplified Chinese Project
diff --git a/zh_CN.GB2312/books/handbook/config/chapter.xml b/zh_CN.GB2312/books/handbook/config/chapter.xml
index 0e9f07d5c2..dcb84dd2bd 100644
--- a/zh_CN.GB2312/books/handbook/config/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/config/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Chinese Documentation Project
@@ -674,7 +674,7 @@ sshd is running as pid 433.</screen>
&man.rc.8; �� &man.rc.subr.8; �����ֲ����ҵ���
���������д�Լ��� <filename>rc.d</filename> �ű���
������еĽű�����һЩ�Ľ��� Ҳ���Բο�
- <ulink url="&url.articles.rc-scripting">��ƪ����</ulink>��</para>
+ <ulink url="&url.articles.rc-scripting;">��ƪ����</ulink>��</para>
</sect1>
<sect1 id="config-network-setup">
diff --git a/zh_CN.GB2312/books/handbook/cutting-edge/chapter.xml b/zh_CN.GB2312/books/handbook/cutting-edge/chapter.xml
index f055a6f82a..111054dd17 100644
--- a/zh_CN.GB2312/books/handbook/cutting-edge/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/cutting-edge/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Simplified Chinese Project
@@ -1064,72 +1064,6 @@ DOCSUPFILE?= /usr/share/examples/cvsup/doc-supfile</programlisting>
<screen>&prompt.root; <userinput>portupgrade -PP hu-freebsd-doc</userinput></screen>
</sect3>
</sect2>
-
-<!-- FIXME: Waiting for a working docsnap server... -->
-<![ IGNORE [
- <sect2 id="docsnap">
- <sect2info>
- <authorgroup>
- <author>
- <firstname>Pav</firstname>
- <surname>Lucistnik</surname>
- <contrib>ԭ���� </contrib>
- </author>
- </authorgroup>
- </sect2info>
-
- <title>Using Docsnap</title>
-
- <indexterm><primary>Updating and Upgrading</primary></indexterm>
-
- <indexterm>
- <primary>Docsnap</primary>
- <see>Updating and Upgrading</see>
- </indexterm>
-
- <para><application>Docsnap</application> ��һ��ͨ�� &man.rsync.1;
- �ֿ�����Ѱ�װ�� &os; �ĵ����ٵķ�����
- һ̨ <quote><application>Docsnap</application> ������</quote>
- �����ĵ�ԭ���룬 ��ÿ��Сʱ�����Զ��� HTML ��ʽ�� ʹ��
- <application>Docsnap</application> ������Ҫ
- <filename role="package">textproc/docproj</filename>��
- �е�ֻ�Ƕ��ѱ����ĵ����ɵIJ�����</para>
-
- <para>ʹ�������Ψһ��Ҫ�ľ���
- <filename role="package">net/rsync</filename> port
- ���߶�Ӧ�Ķ����ư��� ��ʹ�����µ����װ��</para>
-
- <screen>&prompt.root; <userinput>pkg_add -r rsync</userinput></screen>
-
- <note>
- <para><application>Docsnap</application> ԭ���DZ��������°�װ��
- <filename class="directory">/usr/share/doc</filename>
- ���ĵ��� �������µ�����ͬ��������������Ŀ¼�� �����û���Ŀ¼��
- �����Ͳ���Ҫ <username>root</username> Ȩ���ˡ�</para>
- </note>
-
- <para>�����ĵ��� �������µ����</para>
-
- <screen>&prompt.root; <userinput>rsync -rltvz <replaceable>docsnap.sk.FreeBSD.org</replaceable>::docsnap <replaceable>/usr/share/doc</replaceable></userinput></screen>
-
- <note>
- <para>Ŀǰ��ֻ����������ʾ�� <hostid>docsnap.sk.FreeBSD.org</hostid>
- ��һ̨ <application>Docsnap</application> ��������</para>
- </note>
-
- <para>�˴���Ҫʹ�� <option>--delete</option> ��־��
- ��Ϊ����Щ <command>make installworld</command> ʱ��װ��
- <filename class="directory">/usr/share/doc</filename>
- �µ��ļ����ܻᱻ������Ƴ��� ��ʹ�����µ�����������õ��ļ���</para>
-
- <screen>&prompt.root; <userinput>rsync -rltvz --delete <replaceable>docsnap.sk.FreeBSD.org</replaceable>::docsnap/??_??\.\* <replaceable>/usr/share/doc</replaceable></userinput></screen>
-
- <para>���ֻ�������ĵ���ijһ�Ӽ��� ���磬
- ����ʹ�����µ����������ĵ���Ӣ�IJ��֣�</para>
-
- <screen>&prompt.root; <userinput>rsync -rltvz <replaceable>docsnap.sk.FreeBSD.org</replaceable>::docsnap/en_US.ISO8859-1 <replaceable>/usr/share/doc</replaceable></userinput></screen>
- </sect2>
-]]>
</sect1>
<sect1 id="current-stable">
@@ -1201,7 +1135,7 @@ DOCSUPFILE?= /usr/share/examples/cvsup/doc-supfile</programlisting>
</listitem>
<listitem>
- <para>����©�Ŀ�ݷ�ʽ���κ� &os.current
+ <para>����©�Ŀ�ݷ�ʽ���κ� &os.current;
�ļȶ��汾������֪��©��ͬʱ�ֿ��ܻ�����µĴ�©��</para>
</listitem>
diff --git a/zh_CN.GB2312/books/handbook/desktop/chapter.xml b/zh_CN.GB2312/books/handbook/desktop/chapter.xml
index ba0f4f8f52..b06e480b45 100644
--- a/zh_CN.GB2312/books/handbook/desktop/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/desktop/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Simplified Chinese Project
diff --git a/zh_CN.GB2312/books/handbook/disks/chapter.xml b/zh_CN.GB2312/books/handbook/disks/chapter.xml
index 4184075bc5..2038e9b711 100644
--- a/zh_CN.GB2312/books/handbook/disks/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/disks/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Simplified Chinese Project
@@ -293,7 +293,7 @@
<para>�������û�а�װ�����IJ���ϵͳ������ʹ�� <literal>dedicated</literal>
ģʽ����ס����ģʽ���ܻ�Ū�� Microsoft �IJ���ϵͳ����������������ƻ���
- ����ʶ���ҵ��� IBM &os2 �� <quote>appropriate</quote> ������</para>
+ ����ʶ���ҵ��� IBM &os2; �� <quote>appropriate</quote> ������</para>
<screen>&prompt.root; <userinput>dd if=/dev/zero of=/dev/da1 bs=1k count=1</userinput>
&prompt.root; <userinput>bsdlabel -Bw da1 auto</userinput>
@@ -2431,16 +2431,6 @@ sa0(ncr1:4:0): Logical unit is in process of becoming ready</screen>
�κ�������ݶ�ʧ�ĵ����Ѷ������ٴη����� ���ڻ�һЩʱ�䣬
Ҳ���������´η�������ʱ����һ�ѡ�</para>
</sect3>
-
-<![ %not.published; [
-
- <sect3>
- <title>* I Did Not Prepare for the Disaster, What Now?</title>
-
- <para></para>
- </sect3>
-]]>
-
</sect2>
</sect1>
@@ -3993,7 +3983,7 @@ case "$1" in
# Wait for any "hastd secondary" processes to stop
for disk in ${resources}; do
- while $( pgrep -lf "hastd: ${disk} \(secondary\)" > /dev/null 2>&1 ); do
+ while $( pgrep -lf "hastd: ${disk} \(secondary\)" > /dev/null 2>&1 ); do
sleep 1
done
@@ -4008,7 +3998,7 @@ case "$1" in
# Wait for the /dev/hast/* devices to appear
for disk in ${resources}; do
for I in $( jot 60 ); do
- [ -c "/dev/hast/${disk}" ] && break
+ [ -c "/dev/hast/${disk}" ] && break
sleep 0.5
done
@@ -4041,7 +4031,7 @@ case "$1" in
umount -f /hast/${disk}
fi
sleep $delay
- hastctl role secondary ${disk} 2>&1
+ hastctl role secondary ${disk} 2>&1
if [ $? -ne 0 ]; then
logger -p $log -t $name "Unable to switch role to secondary for resource ${disk}."
exit 1
diff --git a/zh_CN.GB2312/books/handbook/dtrace/chapter.xml b/zh_CN.GB2312/books/handbook/dtrace/chapter.xml
index feb7b222ae..d240e98bf5 100644
--- a/zh_CN.GB2312/books/handbook/dtrace/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/dtrace/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
<!--
Recently I suggested to myself that this should become a profiling
and debugging chapter, which covers things like ktrace(1) and
diff --git a/zh_CN.GB2312/books/handbook/eresources/chapter.xml b/zh_CN.GB2312/books/handbook/eresources/chapter.xml
index e96e47e3c3..dad45a4574 100644
--- a/zh_CN.GB2312/books/handbook/eresources/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/eresources/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Simplified Chinese Project
@@ -1831,6 +1831,11 @@
<sect2 id="eresources-web-mirrors">
<title>Official Mirrors</title>
+
+ &chap.eresources.www.index.inc;
+
+ &chap.mirrors.lastmod.inc;
+
&chap.eresources.www.inc;
</sect2>
</sect1>
diff --git a/zh_CN.GB2312/books/handbook/filesystems/chapter.xml b/zh_CN.GB2312/books/handbook/filesystems/chapter.xml
index d9c4d8d7bc..d33b6c1c6f 100644
--- a/zh_CN.GB2312/books/handbook/filesystems/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/filesystems/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
<!--
The FreeBSD Documentation Project
Original Revision: r37255
@@ -200,7 +200,7 @@ example 17547136 0 17547136 0% /example</screen>
�������������ͨ���ļ�ϵͳ������������
����������������ʾ���������û��ܹ������洴���ļ��������</para>
- <screen>&prompt.root <userinput>cd /example</userinput>
+ <screen>&prompt.root; <userinput>cd /example</userinput>
&prompt.root; <userinput>ls</userinput>
&prompt.root; <userinput>touch testfile</userinput>
&prompt.root; <userinput>ls -al</userinput>
diff --git a/zh_CN.GB2312/books/handbook/firewalls/chapter.xml b/zh_CN.GB2312/books/handbook/firewalls/chapter.xml
index 6fa8b5e64e..2e0c3be2be 100644
--- a/zh_CN.GB2312/books/handbook/firewalls/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/firewalls/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Simplified Chinese Project
diff --git a/zh_CN.GB2312/books/handbook/geom/chapter.xml b/zh_CN.GB2312/books/handbook/geom/chapter.xml
index 0f97ecf17d..cbf6ca6033 100644
--- a/zh_CN.GB2312/books/handbook/geom/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/geom/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Simplified Chinese Project
diff --git a/zh_CN.GB2312/books/handbook/install/chapter.xml b/zh_CN.GB2312/books/handbook/install/chapter.xml
index 063d6e65d2..c4c71e7c34 100644
--- a/zh_CN.GB2312/books/handbook/install/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/install/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Simplified Chinese Project
diff --git a/zh_CN.GB2312/books/handbook/introduction/chapter.xml b/zh_CN.GB2312/books/handbook/introduction/chapter.xml
index 81d81c0351..6e9731cac5 100644
--- a/zh_CN.GB2312/books/handbook/introduction/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/introduction/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Simplified Chinese Project
diff --git a/zh_CN.GB2312/books/handbook/jails/chapter.xml b/zh_CN.GB2312/books/handbook/jails/chapter.xml
index 4294b556be..3ad9849513 100644
--- a/zh_CN.GB2312/books/handbook/jails/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/jails/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Simplified Chinese Project
diff --git a/zh_CN.GB2312/books/handbook/kernelconfig/chapter.xml b/zh_CN.GB2312/books/handbook/kernelconfig/chapter.xml
index 93a2be60e3..6d0832e9df 100644
--- a/zh_CN.GB2312/books/handbook/kernelconfig/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/kernelconfig/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Chinese Documentation Project
diff --git a/zh_CN.GB2312/books/handbook/l10n/chapter.xml b/zh_CN.GB2312/books/handbook/l10n/chapter.xml
index ef80573db9..2975100ce9 100644
--- a/zh_CN.GB2312/books/handbook/l10n/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/l10n/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Chinese Documentation Project
diff --git a/zh_CN.GB2312/books/handbook/linuxemu/chapter.xml b/zh_CN.GB2312/books/handbook/linuxemu/chapter.xml
index b6635ede8e..01e9ee260f 100644
--- a/zh_CN.GB2312/books/handbook/linuxemu/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/linuxemu/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
<!--
The FreeBSD Documentation Project
@@ -542,14 +542,14 @@ LOG=/var/log/lmgrd.log
case "$1" in
start)
- lmgrd -c ${LICENSE_FILE} 2>> ${LOG} 1>&2
+ lmgrd -c ${LICENSE_FILE} 2>> ${LOG} 1>&2
echo -n " lmgrd"
;;
stop)
- lmgrd -c ${LICENSE_FILE} -x lmdown 2>> ${LOG} 1>&2
+ lmgrd -c ${LICENSE_FILE} -x lmdown 2>> ${LOG} 1>&2
;;
*)
- echo "Usage: `basename $0` {start|stop}" 1>&2
+ echo "Usage: `basename $0` {start|stop}" 1>&2
exit 64
;;
esac
@@ -797,7 +797,7 @@ exit 0</programlisting>
contain the following:</para>
<programlisting>#!/usr/compat/linux/bin/sh
-(sleep 5; killall -1 matlab_helper) &
+(sleep 5; killall -1 matlab_helper) &
exit 0</programlisting>
</step>
diff --git a/zh_CN.GB2312/books/handbook/mac/chapter.xml b/zh_CN.GB2312/books/handbook/mac/chapter.xml
index e66c3e3408..e1ee68c5b7 100644
--- a/zh_CN.GB2312/books/handbook/mac/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/mac/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Simplified Chinese Project
@@ -505,7 +505,7 @@ test: biba/high</screen>
ע�����Ǵ�������ġ� ������˵������Ҫ�������üƻ���
��Ϊ������������ʮ�����ѡ�</para>
- <para>�� &os �Ժ�İ汾�У� ������һ�ֽ��û�ӳ�䵽��ǩ���·�ʽ��
+ <para>�� &os; �Ժ�İ汾�У� ������һ�ֽ��û�ӳ�䵽��ǩ���·�ʽ��
������ˣ� ��ҲҪ�� &os; 5.3 ֮���ij��ʱ�����ʵ�֡�</para>
</sect3>
@@ -1610,7 +1610,7 @@ setpmac biba/10\(10-10\) /usr/local/etc/rc.d/nagios.sh forcestart</userinput></s
�������Ѿ������ض��� <command>sysctl</command> ����ֹ�����û��ķ��ʡ�</para>
<note>
- <para>���������û�ʱ�� ���ǵ� &man.mac.bsdextended.4
+ <para>���������û�ʱ�� ���ǵ� &man.mac.bsdextended.4;
�����Զ������ڹ����С� ҪѸ�ٸ��¹���
ֻ���ʹ�� &man.kldunload.8; �� &man.kldload.8;
������ж�ز����¼��ذ�ȫ����ģ�顣</para>
diff --git a/zh_CN.GB2312/books/handbook/mail/chapter.xml b/zh_CN.GB2312/books/handbook/mail/chapter.xml
index ad6ab161de..4916e361fd 100644
--- a/zh_CN.GB2312/books/handbook/mail/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/mail/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Chinese Documentation Project
@@ -1470,11 +1470,11 @@ SENDMAIL_LDADD=-lsasl2</programlisting>
<para>���±��� <application>sendmail</application> �����������</para>
<screen>&prompt.root; <userinput>cd /usr/src/lib/libsmutil</userinput>
-&prompt.root; <userinput>make cleandir && make obj && make</userinput>
+&prompt.root; <userinput>make cleandir && make obj && make</userinput>
&prompt.root; <userinput>cd /usr/src/lib/libsm</userinput>
-&prompt.root; <userinput>make cleandir && make obj && make</userinput>
+&prompt.root; <userinput>make cleandir && make obj && make</userinput>
&prompt.root; <userinput>cd /usr/src/usr.sbin/sendmail</userinput>
-&prompt.root; <userinput>make cleandir && make obj && make && make install</userinput></screen>
+&prompt.root; <userinput>make cleandir && make obj && make && make install</userinput></screen>
<para>��� <filename>/usr/src</filename>
������û�д�ı仯�������Ƕ�������ã�<application>sendmail</application>
diff --git a/zh_CN.GB2312/books/handbook/mirrors/chapter.xml b/zh_CN.GB2312/books/handbook/mirrors/chapter.xml
index 364a4f6046..a018bdcba5 100644
--- a/zh_CN.GB2312/books/handbook/mirrors/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/mirrors/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Chinese Documentation Project
@@ -243,6 +243,10 @@
���ʶ���Щվ��Ҳ�ṩ�����ķ��ʷ�ʽ����ÿ��վ����õķ��ʷ�ʽ
����������������˵����</para>
+ &chap.mirrors.ftp.index.inc;
+
+ &chap.mirrors.lastmod.inc;
+
&chap.mirrors.ftp.inc;
</sect1>
@@ -2233,6 +2237,11 @@ doc/zh_*</screen>
<para>&os; �� <link linkend="cvsup">CVSup</link> ������������
����վ�㣺</para>
+
+ &chap.mirrors.cvsup.index.inc;
+
+ &chap.mirrors.lastmod.inc;
+
&chap.mirrors.cvsup.inc;
</sect2>
</sect1>
diff --git a/zh_CN.GB2312/books/handbook/multimedia/chapter.xml b/zh_CN.GB2312/books/handbook/multimedia/chapter.xml
index fab90aaa9e..2d8f3a1340 100644
--- a/zh_CN.GB2312/books/handbook/multimedia/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/multimedia/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Simplified Chinese Documentation Project
diff --git a/zh_CN.GB2312/books/handbook/network-servers/chapter.xml b/zh_CN.GB2312/books/handbook/network-servers/chapter.xml
index 8f479e4d00..ab71f2b27e 100644
--- a/zh_CN.GB2312/books/handbook/network-servers/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/network-servers/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Simplified Chinese Project
diff --git a/zh_CN.GB2312/books/handbook/pgpkeys/chapter.xml b/zh_CN.GB2312/books/handbook/pgpkeys/chapter.xml
index 6035219136..2bd9483642 100644
--- a/zh_CN.GB2312/books/handbook/pgpkeys/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/pgpkeys/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Simplified Chinese Project
diff --git a/zh_CN.GB2312/books/handbook/ports/chapter.xml b/zh_CN.GB2312/books/handbook/ports/chapter.xml
index 004c3e6aca..47d72ede5b 100644
--- a/zh_CN.GB2312/books/handbook/ports/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/ports/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Simplified Chinese Documentation Project
diff --git a/zh_CN.GB2312/books/handbook/ppp-and-slip/chapter.xml b/zh_CN.GB2312/books/handbook/ppp-and-slip/chapter.xml
index 9e779afdf7..55bf7c23b6 100644
--- a/zh_CN.GB2312/books/handbook/ppp-and-slip/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/ppp-and-slip/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Simplified Chinese Project
diff --git a/zh_CN.GB2312/books/handbook/preface/preface.xml b/zh_CN.GB2312/books/handbook/preface/preface.xml
index b0750be60a..ccb1345260 100644
--- a/zh_CN.GB2312/books/handbook/preface/preface.xml
+++ b/zh_CN.GB2312/books/handbook/preface/preface.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
<!--
The FreeBSD Chinese Documentation Project
diff --git a/zh_CN.GB2312/books/handbook/printing/chapter.xml b/zh_CN.GB2312/books/handbook/printing/chapter.xml
index e1823646a7..d4688e72fc 100644
--- a/zh_CN.GB2312/books/handbook/printing/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/printing/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Simplified Chinese Project
diff --git a/zh_CN.GB2312/books/handbook/security/chapter.xml b/zh_CN.GB2312/books/handbook/security/chapter.xml
index 15cbc64a70..2775406861 100644
--- a/zh_CN.GB2312/books/handbook/security/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/security/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Simplified Chinese Project
diff --git a/zh_CN.GB2312/books/handbook/serialcomms/chapter.xml b/zh_CN.GB2312/books/handbook/serialcomms/chapter.xml
index fec296d2a7..ba51638920 100644
--- a/zh_CN.GB2312/books/handbook/serialcomms/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/serialcomms/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Simplified Chinese Project
diff --git a/zh_CN.GB2312/books/handbook/users/chapter.xml b/zh_CN.GB2312/books/handbook/users/chapter.xml
index 9225139d4e..efc457cf32 100644
--- a/zh_CN.GB2312/books/handbook/users/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/users/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
<!--
The FreeBSD Chinese Documentation Project
diff --git a/zh_CN.GB2312/books/handbook/vinum/chapter.xml b/zh_CN.GB2312/books/handbook/vinum/chapter.xml
index 958ca661aa..9accce3d03 100644
--- a/zh_CN.GB2312/books/handbook/vinum/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/vinum/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
<!--
The Vinum Volume Manager
By Greg Lehey (grog at lemis dot com)
diff --git a/zh_CN.GB2312/books/handbook/virtualization/chapter.xml b/zh_CN.GB2312/books/handbook/virtualization/chapter.xml
index ebff811ba3..8565f6db12 100644
--- a/zh_CN.GB2312/books/handbook/virtualization/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/virtualization/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Simplified Chinese Project
@@ -732,8 +732,8 @@ xenbr1 8000.feffffffffff no vif0.1
<sect2 id="virtualization-guest-vmware">
<title>������ MacOS �� VMware</title>
- <para>&mac �汾�� <application>VMware Fusion</application>
- ��һ����ҵ�����������ڻ��� &intel �� &apple; &mac �������
+ <para>&mac; �汾�� <application>VMware Fusion</application>
+ ��һ����ҵ�����������ڻ��� &intel; �� &apple; &mac; �������
&macos; 10.4.9 ����汾�IJ���ϵͳ�ϡ� &os;
��һ����ȫ��֧�ֵĿͻ�����ϵͳ�� �� &macos; X �ϰ�װ��
<application>VMware Fusion</application> ֮��
@@ -909,7 +909,7 @@ xenbr1 8000.feffffffffff no vif0.1
<title>������ OS �� &os;</title>
<para>�ڹ�ȥ�ļ����� &os; ��û���κο��õIJ����ٷ�֧�ֵ����⻯���������
- һЩ�û���ʱʹ�ù����� &linux �����Ƽ��ݲ����е�
+ һЩ�û���ʱʹ�ù����� &linux; �����Ƽ��ݲ����е�
<application>VMware</application> �¾ɲ�����ѹ�ʱ�İ汾 (����
<filename role="package">emulators/vmware3</filename>)��
�� &os; 7.2 �������ã� Sun ��Դ�汾 (Open Source Edition
diff --git a/zh_CN.GB2312/books/handbook/x11/chapter.xml b/zh_CN.GB2312/books/handbook/x11/chapter.xml
index 0b4c08bfea..3fbf2e3b72 100644
--- a/zh_CN.GB2312/books/handbook/x11/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/x11/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Simplified Chinese Project
@@ -268,7 +268,7 @@
�ϵ�Ĭ�� X11 ʵ�֡� <application>&xorg;</application>
���� X.Org ����ᷢ�еĿ���Դ���� X Window ϵͳʵ���е� X ����
<application>&xorg;</application> ����
- <application>&xfree86 4.4RC2</application> �� X11R6.6 �Ĵ��롣
+ <application>&xfree86; 4.4RC2</application> �� X11R6.6 �Ĵ��롣
�� &os; Ports ������װ <application>&xorg;</application>
�� &xorg.version; �汾��</para>
@@ -1002,7 +1002,7 @@ EndSection</programlisting>
ֻҪ�������¼�û�����������������֤��Ϣ��</para>
<para>��Ҳ���� <application>XDM</application> �������
- &man.getty.8 ����һ��(see <xref linkend="term-config"/> for
+ &man.getty.8; ����һ��(see <xref linkend="term-config"/> for
details)��Ϊ�û��ṩ��ͬ�����ܡ����������ϵͳ�ĵ�¼����
Ȼ��Ϊ�û�����һ���Ự������
(ͨ����һ�� X �Ӵ�������)�������� <application>XDM</application>
@@ -1272,7 +1272,7 @@ DisplayManager.requestPort: 0</screen>
<programlisting>proc /proc procfs rw 0 0</programlisting>
<para>�� <filename>/etc/fstab</filename> �Ա���ϵͳ����ʱ�Զ�����
- &man.procfs.5��</para>
+ &man.procfs.5;��</para>
<para>һ��װ���� <application>GNOME</application>��
�ͱ������ X server ����
diff --git a/zh_CN.GB2312/books/porters-handbook/book.xml b/zh_CN.GB2312/books/porters-handbook/book.xml
index 7c2f4d8026..59c0296457 100644
--- a/zh_CN.GB2312/books/porters-handbook/book.xml
+++ b/zh_CN.GB2312/books/porters-handbook/book.xml
@@ -105,7 +105,7 @@
ע����Щ�ļ�ʹ���˷DZ����Ʊ�����
<application>Emacs</application> ��
<application>Vim</application> Ӧ�����ڴ��ļ���ʱ���Զ�ʶ������
- �� &man.vi.1; �� &man.ex.1 ����Ҫ�ڴ��ļ���ʱ��ͨ��
+ �� &man.vi.1; �� &man.ex.1; ����Ҫ�ڴ��ļ���ʱ��ͨ��
<command>:set tabstop=4</command> ������Ĭ�ϵ����á�</para>
</note>
@@ -3567,8 +3567,8 @@ PKGNAMESUFFIX= ${RESOLUTION}
:
# default
RESOLUTION?= 300
-.if ${RESOLUTION} != 118 && ${RESOLUTION} != 240 && \
- ${RESOLUTION} != 300 && ${RESOLUTION} != 400
+.if ${RESOLUTION} != 118 && ${RESOLUTION} != 240 && \
+ ${RESOLUTION} != 300 && ${RESOLUTION} != 400
@${ECHO_MSG} "Error: invalid value for RESOLUTION: \"${RESOLUTION}\""
@${ECHO_MSG} "Possible values are: 118, 240, 300 (default) and 400."
@${FALSE}
@@ -4120,14 +4120,14 @@ PORTVERSION= 1.0</programlisting>
<programlisting>post-install:
${MKDIR} ${EXAMPLESDIR}
- (cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} \* ${EXAMPLESDIR})</programlisting>
+ (cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} \* ${EXAMPLESDIR})</programlisting>
<para>������ӽ�ԭ�����ṩ������
<filename>examples</filename> Ŀ¼���Ƶ��� port ָ���İ�װʾ���ļ���λ�á�</para>
<programlisting>post-install:
${MKDIR} ${DATADIR}/summer
- (cd ${WRKSRC}/temperatures/ && ${COPYTREE_SHARE} "June July August" ${DATADIR}/summer/)</programlisting>
+ (cd ${WRKSRC}/temperatures/ && ${COPYTREE_SHARE} "June July August" ${DATADIR}/summer/)</programlisting>
<para>������ӽ����ļ��������µ����ݣ� ���Ƶ�
<filename><makevar>DATADIR</makevar></filename> �е�
@@ -4140,7 +4140,7 @@ PORTVERSION= 1.0</programlisting>
<programlisting>post-install:
${MKDIR} ${EXAMPLESDIR}
- (cd ${WRKSRC}/examples/ && \
+ (cd ${WRKSRC}/examples/ && \
${COPYTREE_SHARE} \* ${EXAMPLESDIR} "! -name Makefile")</programlisting>
<para>��Ҫע����ǣ� ��Щ�겢�����Զ�������װ���ļ��ӵ�
@@ -5659,7 +5659,7 @@ QT_COMPONENTS= gui moc_build qmake_build rcc_build uic_build</programlisting>
<programlisting>HAS_CONFIGURE= yes
do-configure:
- @cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
+ @cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
${QMAKE} -unix PREFIX=${PREFIX} texmaker.pro</programlisting>
<para>��ע�⣬ ����ϵͳ�ṩ�� <filename>BUILD.sh</filename>
@@ -8288,7 +8288,7 @@ CFLAGS+= -DLUA_VERSION_STRING="${VER_STR}"
<ulink url="&url.books.handbook;/configtuning-rcd.html">ʹ���ֲ�� rc.d
�½�</ulink> �ҵ��� ���ڿ����������ϸ���ͣ� �������
&man.rc.8; �� &man.rc.subr.8; �ҵ��� ��� �����Բ���
- <ulink url="&url.articles.rc-scripting">��ƪ����</ulink>
+ <ulink url="&url.articles.rc-scripting;">��ƪ����</ulink>
�˽�д <filename>rc.d</filename> �ű������ʵ����</para>
<para>����װһ���� <filename>rc.d</filename> �ű���</para>
@@ -8645,7 +8645,7 @@ etc/orbit.conf.sample
<para>��Ŀ¼�ṹ���浽һ���ļ��С�</para>
- <screen>&prompt.root; <userinput>(cd /var/tmp/`make -V PORTNAME` && find -d * -type d) | sort > OLD-DIRS</userinput></screen>
+ <screen>&prompt.root; <userinput>(cd /var/tmp/`make -V PORTNAME` && find -d * -type d) | sort > OLD-DIRS</userinput></screen>
<para>����һ�հ� <filename>pkg-plist</filename> �ļ���</para>
@@ -8655,11 +8655,11 @@ etc/orbit.conf.sample
�������Ӧ��װ�� port ������װ�䵥��</para>
<screen>&prompt.root; <userinput>make install PREFIX=/var/tmp/`make -V PORTNAME`</userinput>
-&prompt.root; <userinput>(cd /var/tmp/`make -V PORTNAME` && find -d * \! -type d) | sort > pkg-plist</userinput></screen>
+&prompt.root; <userinput>(cd /var/tmp/`make -V PORTNAME` && find -d * \! -type d) | sort > pkg-plist</userinput></screen>
<para>���Ӧ���½�����Ŀ¼����װ�䵥��</para>
- <screen>&prompt.root; <userinput>(cd /var/tmp/`make -V PORTNAME` && find -d * -type d) | sort | comm -13 OLD-DIRS - | sort -r | sed -e 's#^#@dirrm #' >> pkg-plist</userinput></screen>
+ <screen>&prompt.root; <userinput>(cd /var/tmp/`make -V PORTNAME` && find -d * -type d) | sort | comm -13 OLD-DIRS - | sort -r | sed -e 's#^#@dirrm #' >> pkg-plist</userinput></screen>
<para>�����Ҫ�ֹ����� packing list�� ��һ���̲���
<emphasis>��ȫ</emphasis> �Զ��ġ� �����ֲ�Ӧ���� port
@@ -9702,7 +9702,7 @@ as .putsy.conf and edit it.</programlisting>
Ȼ�������¼�¼���뵽 VuXML ���ݿ��С� ��������
�������������������Ƿ�������</para>
- <screen>&prompt.user; <userinput>cd ${PORTSDIR}/security/vuxml && make validate</userinput></screen>
+ <screen>&prompt.user; <userinput>cd ${PORTSDIR}/security/vuxml && make validate</userinput></screen>
<note>
<para>����Ҫ��װ���� package �е�����һ����
diff --git a/zh_CN.GB2312/share/xml/mirrors-local.xsl b/zh_CN.GB2312/share/xml/mirrors-local.xsl
index 0da5fc058a..c6cdef50f3 100644
--- a/zh_CN.GB2312/share/xml/mirrors-local.xsl
+++ b/zh_CN.GB2312/share/xml/mirrors-local.xsl
@@ -8,7 +8,6 @@
<xsl:import href="../../../share/xml/mirrors-master.xsl" />
<xsl:output type="xml" encoding="gb2312"
- omit-xml-declaration="yes"
indent="yes"/>
<!-- template: "mirrors-docbook-contact" -->
diff --git a/zh_CN.GB2312/share/xml/trademarks.ent b/zh_CN.GB2312/share/xml/trademarks.ent
index adec25d2ff..89fa13f59c 100644
--- a/zh_CN.GB2312/share/xml/trademarks.ent
+++ b/zh_CN.GB2312/share/xml/trademarks.ent
@@ -447,13 +447,10 @@ Coverity Extend
DAMAGE.</para>
</important>
-<![%output.for.print;[
-
<important><para><emphasis>�� FreeBSD �� FreeBSD ���Ļ���Ŀ�ٷ���վ��ȡ�ı��ĵ�
PostScript® �� PDF ��ʽ�ļ�����Ƕ���������壬���Ķ��Ƽ������ɷ�����˾��
���Ķ�������Ȩ�顷��Ȩ�ṩ��</emphasis></para></important>
-<!-- Start of ARPHIC PUBLIC LICENSE -->
<para>�Ķ�������Ȩ��</para>
<para></para>
<para>��Ȩ����(C) 1999 �Ķ��Ƽ������ɷ�����˾</para>
@@ -559,8 +556,6 @@ Coverity Extend
����������ʹ�û���ʹ�ñ����ͣ������������������Ʒ�����IJɹ���
ʹ�á� ���ݻ�����֮��ʧ�� ����Ӫҵ������ �����µ��κ�ֱ�ӡ� ��ӡ� ��Ȼ��
żȻ�� �����ͷ�����ʧ���� ��ʹ��Ȩ�˻���������֪����ʧ�Ŀ�����ʱ����⡣</para>
-<!-- End of ARPHIC PUBLIC LICENSE -->
-]]>
</legalnotice>
'>
From a6016aaef97199cecbedf6e920daa59512b971e6 Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Mon, 21 Jan 2013 17:45:18 +0000
Subject: [PATCH 021/121] - Make the Traditional Chinese documentation valid
XML
---
.../introduction/chapter.xml | 4 +-
.../developers-handbook/ipv6/chapter.xml | 2 +-
.../kerneldebug/chapter.xml | 2 +-
.../developers-handbook/l10n/chapter.xml | 2 +-
.../developers-handbook/policies/chapter.xml | 2 +-
.../developers-handbook/secure/chapter.xml | 2 +-
.../developers-handbook/sockets/chapter.xml | 2 +-
.../developers-handbook/testing/chapter.xml | 2 +-
.../developers-handbook/tools/chapter.xml | 2 +-
.../books/developers-handbook/x86/chapter.xml | 2 +-
zh_TW.Big5/books/faq/book.xml | 8 +-
zh_TW.Big5/books/fdp-primer/book.xml | 2 +-
.../books/fdp-primer/doc-build/chapter.xml | 2 +-
.../books/fdp-primer/examples/appendix.xml | 6 +-
.../books/fdp-primer/overview/chapter.xml | 2 +-
.../books/fdp-primer/psgml-mode/chapter.xml | 2 +-
.../books/fdp-primer/see-also/chapter.xml | 2 +-
.../books/fdp-primer/sgml-markup/chapter.xml | 102 +++++-----
.../books/fdp-primer/sgml-primer/chapter.xml | 64 ++++---
.../books/fdp-primer/structure/chapter.xml | 4 +-
.../books/fdp-primer/stylesheets/chapter.xml | 2 +-
.../books/fdp-primer/the-website/chapter.xml | 2 +-
zh_TW.Big5/books/fdp-primer/tools/chapter.xml | 2 +-
.../books/fdp-primer/translations/chapter.xml | 2 +-
.../fdp-primer/writing-style/chapter.xml | 14 +-
zh_TW.Big5/books/handbook/Makefile | 36 +++-
.../handbook/advanced-networking/chapter.xml | 6 +-
zh_TW.Big5/books/handbook/audit/chapter.xml | 2 +-
zh_TW.Big5/books/handbook/basics/chapter.xml | 6 +-
.../books/handbook/bibliography/chapter.xml | 2 +-
zh_TW.Big5/books/handbook/book.xml | 2 +-
zh_TW.Big5/books/handbook/boot/chapter.xml | 2 +-
zh_TW.Big5/books/handbook/chapters.ent | 180 +-----------------
zh_TW.Big5/books/handbook/colophon.xml | 2 +-
zh_TW.Big5/books/handbook/config/chapter.xml | 4 +-
.../books/handbook/cutting-edge/chapter.xml | 2 +-
zh_TW.Big5/books/handbook/desktop/chapter.xml | 2 +-
zh_TW.Big5/books/handbook/disks/chapter.xml | 16 +-
.../books/handbook/eresources/chapter.xml | 6 +-
.../books/handbook/firewalls/chapter.xml | 2 +-
zh_TW.Big5/books/handbook/geom/chapter.xml | 2 +-
zh_TW.Big5/books/handbook/install/chapter.xml | 4 +-
.../books/handbook/introduction/chapter.xml | 2 +-
zh_TW.Big5/books/handbook/jails/chapter.xml | 2 +-
.../books/handbook/kernelconfig/chapter.xml | 6 +-
zh_TW.Big5/books/handbook/l10n/chapter.xml | 2 +-
.../books/handbook/linuxemu/chapter.xml | 10 +-
zh_TW.Big5/books/handbook/mac/chapter.xml | 8 +-
zh_TW.Big5/books/handbook/mail/chapter.xml | 8 +-
zh_TW.Big5/books/handbook/mirrors/chapter.xml | 10 +-
.../books/handbook/multimedia/chapter.xml | 2 +-
.../handbook/network-servers/chapter.xml | 2 +-
zh_TW.Big5/books/handbook/pgpkeys/chapter.xml | 2 +-
zh_TW.Big5/books/handbook/ports/chapter.xml | 2 +-
.../books/handbook/ppp-and-slip/chapter.xml | 10 +-
zh_TW.Big5/books/handbook/preface/preface.xml | 2 +-
.../books/handbook/printing/chapter.xml | 2 +-
.../books/handbook/security/chapter.xml | 4 +-
.../books/handbook/serialcomms/chapter.xml | 2 +-
zh_TW.Big5/books/handbook/users/chapter.xml | 2 +-
zh_TW.Big5/books/handbook/vinum/chapter.xml | 2 +-
.../books/handbook/virtualization/chapter.xml | 2 +-
zh_TW.Big5/books/handbook/x11/chapter.xml | 4 +-
zh_TW.Big5/books/porters-handbook/book.xml | 22 +--
zh_TW.Big5/share/xml/urls.ent | 36 +---
65 files changed, 244 insertions(+), 414 deletions(-)
diff --git a/zh_TW.Big5/books/developers-handbook/introduction/chapter.xml b/zh_TW.Big5/books/developers-handbook/introduction/chapter.xml
index ce285c8329..342a47c2dc 100644
--- a/zh_TW.Big5/books/developers-handbook/introduction/chapter.xml
+++ b/zh_TW.Big5/books/developers-handbook/introduction/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!--
The FreeBSD Documentation Project
@@ -67,7 +67,7 @@
</itemizedlist>
- <para>�H�W�K�� Scheifler & Gettys �� "X Window System" �פ�</para>
+ <para>�H�W�K�� Scheifler & Gettys �� "X Window System" �פ�</para>
</sect1>
diff --git a/zh_TW.Big5/books/developers-handbook/ipv6/chapter.xml b/zh_TW.Big5/books/developers-handbook/ipv6/chapter.xml
index 10baf4285a..ac166db725 100644
--- a/zh_TW.Big5/books/developers-handbook/ipv6/chapter.xml
+++ b/zh_TW.Big5/books/developers-handbook/ipv6/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!--
The FreeBSD Documentation Project
diff --git a/zh_TW.Big5/books/developers-handbook/kerneldebug/chapter.xml b/zh_TW.Big5/books/developers-handbook/kerneldebug/chapter.xml
index 6d5f27874f..2062206e1c 100644
--- a/zh_TW.Big5/books/developers-handbook/kerneldebug/chapter.xml
+++ b/zh_TW.Big5/books/developers-handbook/kerneldebug/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!--
The FreeBSD Documentation Project
diff --git a/zh_TW.Big5/books/developers-handbook/l10n/chapter.xml b/zh_TW.Big5/books/developers-handbook/l10n/chapter.xml
index 29ab547c4b..a75577a8c7 100644
--- a/zh_TW.Big5/books/developers-handbook/l10n/chapter.xml
+++ b/zh_TW.Big5/books/developers-handbook/l10n/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!--
The FreeBSD Documentation Project
diff --git a/zh_TW.Big5/books/developers-handbook/policies/chapter.xml b/zh_TW.Big5/books/developers-handbook/policies/chapter.xml
index 73582f13b1..16d63c7663 100644
--- a/zh_TW.Big5/books/developers-handbook/policies/chapter.xml
+++ b/zh_TW.Big5/books/developers-handbook/policies/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!--
The FreeBSD Documentation Project
diff --git a/zh_TW.Big5/books/developers-handbook/secure/chapter.xml b/zh_TW.Big5/books/developers-handbook/secure/chapter.xml
index ec1904c301..928f05da21 100644
--- a/zh_TW.Big5/books/developers-handbook/secure/chapter.xml
+++ b/zh_TW.Big5/books/developers-handbook/secure/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!--
The FreeBSD Documentation Project
diff --git a/zh_TW.Big5/books/developers-handbook/sockets/chapter.xml b/zh_TW.Big5/books/developers-handbook/sockets/chapter.xml
index 3b118fabe4..aa2eed2c9f 100644
--- a/zh_TW.Big5/books/developers-handbook/sockets/chapter.xml
+++ b/zh_TW.Big5/books/developers-handbook/sockets/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!--
The FreeBSD Documentation Project
diff --git a/zh_TW.Big5/books/developers-handbook/testing/chapter.xml b/zh_TW.Big5/books/developers-handbook/testing/chapter.xml
index 256702d217..e187e8d0be 100644
--- a/zh_TW.Big5/books/developers-handbook/testing/chapter.xml
+++ b/zh_TW.Big5/books/developers-handbook/testing/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!--
The FreeBSD Documentation Project
diff --git a/zh_TW.Big5/books/developers-handbook/tools/chapter.xml b/zh_TW.Big5/books/developers-handbook/tools/chapter.xml
index 48313dbfe5..486176ac32 100644
--- a/zh_TW.Big5/books/developers-handbook/tools/chapter.xml
+++ b/zh_TW.Big5/books/developers-handbook/tools/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!--
The FreeBSD Documentation Project
diff --git a/zh_TW.Big5/books/developers-handbook/x86/chapter.xml b/zh_TW.Big5/books/developers-handbook/x86/chapter.xml
index 181c94dbf0..cb8c6cbd96 100644
--- a/zh_TW.Big5/books/developers-handbook/x86/chapter.xml
+++ b/zh_TW.Big5/books/developers-handbook/x86/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!--
The FreeBSD Documentation Project
diff --git a/zh_TW.Big5/books/faq/book.xml b/zh_TW.Big5/books/faq/book.xml
index b68defa3a0..be829a904b 100644
--- a/zh_TW.Big5/books/faq/book.xml
+++ b/zh_TW.Big5/books/faq/book.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
"../../../share/xml/freebsd42.dtd" [
<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//TW" "../../share/xml/entities.ent">
@@ -1945,7 +1945,7 @@ File: +DESC (ignored)</screen>
<para>�����o�I�A�b FreeBSD �Q�װϤW�ɱ`���H�Q�סC���M�w��O���t�ܧ֡A
�i���H�ɦ��s�W��B�s���~�X�{�A�M�ӳo�dz��b�ڭ̷N�Ƥ����A
�ڭ� <emphasis>���M</emphasis> �j�P��ij�G�b�߰ݦ����̷s�W��w�骺�䴩���D���e�A
- �Х��Ѿ\ &os
+ �Х��Ѿ\ &os;
<ulink url="&rel.current.hardware;">&rel.current;</ulink>
��
<ulink url="&rel2.current.hardware;">&rel2.current;</ulink>���䴩�w��C���A
@@ -2667,11 +2667,11 @@ device card 1</programlisting>
# When a USB keyboard arrives, attach it as the console keyboard.
#attach 100 {
# device-name "ukbd0";
-# action "kbdcontrol -k /dev/ukbd0 < /dev/console && /etc/rc.d/syscons restart";
+# action "kbdcontrol -k /dev/ukbd0 < /dev/console && /etc/rc.d/syscons restart";
#};
#detach 100 {
# device-name "ukbd0";
-# action "kbdcontrol -k /dev/kbd0 < /dev/console";
+# action "kbdcontrol -k /dev/kbd0 < /dev/console";
#};
</programlisting>
</listitem>
diff --git a/zh_TW.Big5/books/fdp-primer/book.xml b/zh_TW.Big5/books/fdp-primer/book.xml
index 51d3920a02..6309b5fcce 100644
--- a/zh_TW.Big5/books/fdp-primer/book.xml
+++ b/zh_TW.Big5/books/fdp-primer/book.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
"../../../share/xml/freebsd42.dtd" [
<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//TW" "../../share/xml/entities.ent">
diff --git a/zh_TW.Big5/books/fdp-primer/doc-build/chapter.xml b/zh_TW.Big5/books/fdp-primer/doc-build/chapter.xml
index c6eac0880e..de649ee875 100644
--- a/zh_TW.Big5/books/fdp-primer/doc-build/chapter.xml
+++ b/zh_TW.Big5/books/fdp-primer/doc-build/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!-- Copyright (c) 1999 Neil Blakey-Milner, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/zh_TW.Big5/books/fdp-primer/examples/appendix.xml b/zh_TW.Big5/books/fdp-primer/examples/appendix.xml
index 729da18ccc..afdd162607 100644
--- a/zh_TW.Big5/books/fdp-primer/examples/appendix.xml
+++ b/zh_TW.Big5/books/fdp-primer/examples/appendix.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!-- Copyright (c) 2000 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
@@ -55,7 +55,7 @@
<example>
<title>DocBook <sgmltag>book</sgmltag></title>
- <programlisting><![ CDATA [<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.1//EN">
+ <programlisting><![CDATA[<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.1//EN">
<book lang='zh_tw'>
<bookinfo>
@@ -106,7 +106,7 @@
<example>
<title>DocBook <sgmltag>article</sgmltag></title>
- <programlisting><![ CDATA [<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook V4.1//EN">
+ <programlisting><![CDATA[<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook V4.1//EN">
<article lang='zh_tw'>
<articleinfo>
diff --git a/zh_TW.Big5/books/fdp-primer/overview/chapter.xml b/zh_TW.Big5/books/fdp-primer/overview/chapter.xml
index cc24a302dd..62c34a11ec 100644
--- a/zh_TW.Big5/books/fdp-primer/overview/chapter.xml
+++ b/zh_TW.Big5/books/fdp-primer/overview/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/zh_TW.Big5/books/fdp-primer/psgml-mode/chapter.xml b/zh_TW.Big5/books/fdp-primer/psgml-mode/chapter.xml
index e3de3809db..1b2f97992c 100644
--- a/zh_TW.Big5/books/fdp-primer/psgml-mode/chapter.xml
+++ b/zh_TW.Big5/books/fdp-primer/psgml-mode/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/zh_TW.Big5/books/fdp-primer/see-also/chapter.xml b/zh_TW.Big5/books/fdp-primer/see-also/chapter.xml
index 09133c3d9a..d6fc136474 100644
--- a/zh_TW.Big5/books/fdp-primer/see-also/chapter.xml
+++ b/zh_TW.Big5/books/fdp-primer/see-also/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/zh_TW.Big5/books/fdp-primer/sgml-markup/chapter.xml b/zh_TW.Big5/books/fdp-primer/sgml-markup/chapter.xml
index be49ae8445..90a6c91b93 100644
--- a/zh_TW.Big5/books/fdp-primer/sgml-markup/chapter.xml
+++ b/zh_TW.Big5/books/fdp-primer/sgml-markup/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
@@ -148,7 +148,7 @@
<para>Use:</para>
- <programlisting><![ CDATA [<h1>First section</h1>
+ <programlisting><![CDATA[<h1>First section</h1>
<!-- Document introduction goes here -->
@@ -179,7 +179,7 @@
<para>Use:</para>
- <programlisting><![ CDATA [<h1>First section</h1>
+ <programlisting><![CDATA[<h1>First section</h1>
<!-- Document introduction -->
@@ -200,7 +200,7 @@
<para>Use:</para>
- <programlisting><![ CDATA [<p>This is a paragraph. It can contain just about any
+ <programlisting><![CDATA[<p>This is a paragraph. It can contain just about any
other element.</p>]]></programlisting>
</example>
</sect3>
@@ -216,7 +216,7 @@
<para>Use:</para>
- <programlisting><![ CDATA [<p>A small excerpt from the US Constitution:</p>
+ <programlisting><![CDATA[<p>A small excerpt from the US Constitution:</p>
<blockquote>We the People of the United States, in Order to form
a more perfect Union, establish Justice, insure domestic
@@ -259,7 +259,7 @@
<para>Use:</para>
- <programlisting><![ CDATA [<p>An unordered list. Listitems will probably be
+ <programlisting><![CDATA[<p>An unordered list. Listitems will probably be
preceded by bullets.</p>
<ul>
@@ -291,7 +291,7 @@
<para>Use:</para>
- <programlisting><![ CDATA [<dl>
+ <programlisting><![CDATA[<dl>
<dt>Term 1</dt>
<dd><p>Paragraph 1 of definition 1.</p>
@@ -326,7 +326,7 @@
<para>You could use <sgmltag>pre</sgmltag> to mark up an email
message:</para>
- <programlisting><![ CDATA [<pre> From: nik@FreeBSD.org
+ <programlisting><![CDATA[<pre> From: nik@FreeBSD.org
To: freebsd-doc@FreeBSD.org
Subject: New documentation available
@@ -376,7 +376,7 @@
<para>Use:</para>
- <programlisting><![ CDATA [<p>This is a simple 2x2 table.</p>
+ <programlisting><![CDATA[<p>This is a simple 2x2 table.</p>
<table>
<tr>
@@ -402,7 +402,7 @@
<para>Use:</para>
- <programlisting><![ CDATA [<p>One tall thin cell on the left, two short cells next to
+ <programlisting><![CDATA[<p>One tall thin cell on the left, two short cells next to
it on the right.</p>
<table>
@@ -423,7 +423,7 @@
<para>Use:</para>
- <programlisting><![ CDATA [<p>One long cell on top, two short cells below it.</p>
+ <programlisting><![CDATA[<p>One long cell on top, two short cells below it.</p>
<table>
<tr>
@@ -444,7 +444,7 @@
<para>Use:</para>
- <programlisting><![ CDATA [<p>On a 3x3 grid, the top left block is a 2x2 set of
+ <programlisting><![CDATA[<p>On a 3x3 grid, the top left block is a 2x2 set of
cells merged into one. The other cells are normal.</p>
<table>
@@ -494,7 +494,7 @@
<para>Use:</para>
- <programlisting><![ CDATA [<p><em>This</em> has been emphasized, while
+ <programlisting><![CDATA[<p><em>This</em> has been emphasized, while
<strong>this</strong> has been strongly emphasized.</p>]]></programlisting>
</example>
</sect3>
@@ -510,7 +510,7 @@
<example>
<title><sgmltag>b</sgmltag> and <sgmltag>i</sgmltag></title>
- <programlisting><![ CDATA [<p><b>This</b> is in bold, while <i>this</i> is
+ <programlisting><![CDATA[<p><b>This</b> is in bold, while <i>this</i> is
in italics.</p>]]></programlisting>
</example>
</sect3>
@@ -527,7 +527,7 @@
<para>Use:</para>
- <programlisting><![ CDATA [<p>This document was originally written by
+ <programlisting><![CDATA[<p>This document was originally written by
Nik Clayton, who can be reached by email as
<tt>nik@FreeBSD.org</tt>.</p>]]></programlisting>
</example>
@@ -568,7 +568,7 @@
<para>The following fragments all do the same thing.</para>
- <programlisting><![ CDATA [<p>This text is <small>slightly smaller</small>. But
+ <programlisting><![CDATA[<p>This text is <small>slightly smaller</small>. But
this text is <big>slightly bigger</big>.</p>
<p>This text is <font size="-1">slightly smaller</font>. But
@@ -605,7 +605,7 @@
<para>Use:</para>
- <programlisting><![ CDATA [<p>More information is available at the
+ <programlisting><![CDATA[<p>More information is available at the
<a href="http://www.FreeBSD.org/">FreeBSD web site</a>.</p>]]></programlisting>
</example>
@@ -629,7 +629,7 @@
<para>Use:</para>
- <programlisting><![ CDATA [<p><a name="para1">This</a> paragraph can be referenced
+ <programlisting><![CDATA[<p><a name="para1">This</a> paragraph can be referenced
in other links with the name <tt>para1</tt>.</p>]]></programlisting>
</example>
@@ -643,7 +643,7 @@
<para>Assume that the <literal>para1</literal> example resides in a
document called <filename>foo.html</filename>.</para>
- <programlisting><![ CDATA [<p>More information can be found in the
+ <programlisting><![CDATA[<p>More information can be found in the
<a href="foo.html#para1">first paragraph</a> of
<tt>foo.html</tt>.</p>]]></programlisting>
</example>
@@ -658,7 +658,7 @@
<para>Assume that the <literal>para1</literal> example resides in
this document:</para>
- <programlisting><![ CDATA [<p>More information can be found in the
+ <programlisting><![CDATA[<p>More information can be found in the
<a href="#para1">first paragraph</a> of this
document.</p>]]></programlisting>
</example>
@@ -881,7 +881,7 @@
<example>
<title>A simple chapter</title>
- <programlisting><![ CDATA [<chapter>
+ <programlisting><![CDATA[<chapter>
<title>The chapter's title</title>
...
@@ -895,7 +895,7 @@
<example>
<title>Empty chapters</title>
- <programlisting><![ CDATA [<chapter>
+ <programlisting><![CDATA[<chapter>
<title>This is an empty chapter</title>
<para></para>
@@ -922,7 +922,7 @@
<example>
<title>Sections in chapters</title>
- <programlisting><![ RCDATA [<chapter>
+ <programlisting><![CDATA[<chapter>
<title>A sample chapter</title>
<para>Some text in the chapter.</para>
@@ -971,7 +971,7 @@
more <sgmltag>part</sgmltag>s. This cannot be done in an
<sgmltag>article</sgmltag>.</para>
- <programlisting><![ CDATA [<part>
+ <programlisting><![CDATA[<part>
<title>Introduction</title>
<chapter>
@@ -1016,7 +1016,7 @@
<para>Use:</para>
- <programlisting><![ CDATA [<para>This is a paragraph. It can contain just about any
+ <programlisting><![CDATA[<para>This is a paragraph. It can contain just about any
other element.</para> ]]></programlisting>
<para>Appearance:</para>
@@ -1041,7 +1041,7 @@
<para>Use:</para>
- <programlisting><![ CDATA [<para>A small excerpt from the US Constitution:</para>
+ <programlisting><![CDATA[<para>A small excerpt from the US Constitution:</para>
<blockquote>
<title>Preamble to the Constitution of the United States</title>
@@ -1116,7 +1116,7 @@
<para>Use:</para>
- <programlisting><![ CDATA [<warning>
+ <programlisting><![CDATA[<warning>
<para>Installing FreeBSD may make you want to delete Windows from your
hard disk.</para>
</warning>]]></programlisting>
@@ -1165,7 +1165,7 @@
<para>Use:</para>
- <programlisting><![ CDATA [<itemizedlist>
+ <programlisting><![CDATA[<itemizedlist>
<listitem>
<para>This is the first itemized item.</para>
</listitem>
@@ -1258,7 +1258,7 @@
<para>Use:</para>
- <programlisting><![ CDATA[<para>When you have finished, your program should look like
+ <programlisting><![CDATA[<para>When you have finished, your program should look like
this:</para>
<programlisting>#include <stdio.h>
@@ -1307,7 +1307,7 @@ main(void)
<title><sgmltag>co</sgmltag> and
<sgmltag>calloutlist</sgmltag></title>
- <programlisting><![ CDATA[<para>When you have finished, your program should look like
+ <programlisting><![CDATA[<para>When you have finished, your program should look like
this:</para>
<programlisting>#include <stdio.h> <co id="co-ex-include"/>
@@ -1392,7 +1392,7 @@ main(void)
<para>Use:</para>
- <programlisting><![ CDATA [<informaltable frame="none" pgwide="1">
+ <programlisting><![CDATA[<informaltable frame="none" pgwide="1">
<tgroup cols="2">
<thead>
<row>
@@ -1552,7 +1552,7 @@ main(void)
<para>Use:</para>
- <programlisting><![ CDATA [<screen>&prompt.user; <userinput>ls -1</userinput>
+ <programlisting><![CDATA[<screen>&prompt.user; <userinput>ls -1</userinput>
foo1
foo2
foo3
@@ -1610,7 +1610,7 @@ This is the file called 'foo2'</screen>
<para>Use:</para>
- <programlisting><![ CDATA [<para>FreeBSD is without doubt <emphasis>the</emphasis>
+ <programlisting><![CDATA[<para>FreeBSD is without doubt <emphasis>the</emphasis>
premiere Unix like operating system for the Intel architecture.</para>]]></programlisting>
<para>Appearance:</para>
@@ -1633,7 +1633,7 @@ This is the file called 'foo2'</screen>
<para>Use:</para>
- <programlisting><![ CDATA [<para>However, make sure that the search does not go beyond the
+ <programlisting><![CDATA[<para>However, make sure that the search does not go beyond the
<quote>boundary between local and public administration</quote>,
as RFC 1535 calls it.</para>]]></programlisting>
@@ -1671,7 +1671,7 @@ This is the file called 'foo2'</screen>
<para>Use:</para>
- <programlisting><![ CDATA [<para>To switch to the second virtual terminal, press
+ <programlisting><![CDATA[<para>To switch to the second virtual terminal, press
<keycombo action="simul"><keycap>Alt</keycap>
<keycap>F1</keycap></keycombo>.</para>
@@ -1775,7 +1775,7 @@ This is the file called 'foo2'</screen>
<para>Use:</para>
- <programlisting><![ CDATA [<para><application>Sendmail</application> is the most
+ <programlisting><![CDATA[<para><application>Sendmail</application> is the most
widely used Unix mail application.</para>
<para><application>Sendmail</application> includes the
@@ -1834,7 +1834,7 @@ This is the file called 'foo2'</screen>
<para>Use:</para>
- <programlisting><![ CDATA [<para>The SGML source for the Handbook in English can be
+ <programlisting><![CDATA[<para>The SGML source for the Handbook in English can be
found in <filename>/usr/doc/en/handbook/</filename>. The first
file is called <filename>handbook.xml</filename> in that
directory. You should also see a <filename>Makefile</filename>
@@ -1876,7 +1876,7 @@ This is the file called 'foo2'</screen>
<para>Use:</para>
- <programlisting><![ CDATA [<para>Install the <filename role="package">net/ethereal</filename> port to view network traffic.</para>]]></programlisting>
+ <programlisting><![CDATA[<para>Install the <filename role="package">net/ethereal</filename> port to view network traffic.</para>]]></programlisting>
<para>Appearance:</para>
@@ -1909,7 +1909,7 @@ This is the file called 'foo2'</screen>
<para>Use:</para>
- <programlisting><![ CDATA [<para><devicename>sio</devicename> is used for serial
+ <programlisting><![CDATA[<para><devicename>sio</devicename> is used for serial
communication in FreeBSD. <devicename>sio</devicename> manifests
through a number of entries in <filename>/dev</filename>, including
<filename>/dev/ttyd0</filename> and <filename>/dev/cuaa0</filename>.</para>
@@ -2032,7 +2032,7 @@ This is the file called 'foo2'</screen>
<para>Use:</para>
- <programlisting><![ CDATA [<para>The local machine can always be referred to by the
+ <programlisting><![CDATA[<para>The local machine can always be referred to by the
name <hostid>localhost</hostid>, which will have the IP address
<hostid role="ipaddr">127.0.0.1</hostid>.</para>
@@ -2093,7 +2093,7 @@ This is the file called 'foo2'</screen>
<para>Use:</para>
- <programlisting><![ CDATA [<para>To carry out most system administration functions you
+ <programlisting><![CDATA[<para>To carry out most system administration functions you
will need to be <username>root</username>.</para>]]></programlisting>
<para>Appearance:</para>
@@ -2130,7 +2130,7 @@ This is the file called 'foo2'</screen>
<para>Use:</para>
- <programlisting><![ CDATA [<para>Two common targets in a <filename>Makefile</filename>
+ <programlisting><![CDATA[<para>Two common targets in a <filename>Makefile</filename>
are <maketarget>all</maketarget> and <maketarget>clean</maketarget>.</para>
<para>Typically, invoking <maketarget>all</maketarget> will rebuild the
@@ -2180,7 +2180,7 @@ This is the file called 'foo2'</screen>
<para>Use:</para>
- <programlisting><![ CDATA [<para>The <literal>maxusers 10</literal> line in the kernel
+ <programlisting><![CDATA[<para>The <literal>maxusers 10</literal> line in the kernel
configuration file determines the size of many system tables, and is
a rough guide to how many simultaneous logins the system will
support.</para>]]></programlisting>
@@ -2212,7 +2212,7 @@ This is the file called 'foo2'</screen>
<para>Use:</para>
- <programlisting><![ CDATA [<informalexample>
+ <programlisting><![CDATA[<informalexample>
<screen>&prompt.user; <userinput>man <replaceable>command</replaceable></userinput></screen>
</informalexample>]]></programlisting>
@@ -2230,7 +2230,7 @@ This is the file called 'foo2'</screen>
<para>Use:</para>
- <programlisting><![ CDATA [<para>The <literal>maxusers <replaceable>n</replaceable></literal>
+ <programlisting><![CDATA[<para>The <literal>maxusers <replaceable>n</replaceable></literal>
line in the kernel configuration file determines the size of many system
tables, and is a rough guide to how many simultaneous logins the system will
support.</para>
@@ -2262,7 +2262,7 @@ This is the file called 'foo2'</screen>
<para>Use:</para>
- <programlisting><![ CDATA [
+ <programlisting><![CDATA[
<screen><errorname>Panic: cannot mount root</errorname></screen> ]]>
</programlisting>
@@ -2536,7 +2536,7 @@ IMAGES= chapter1/fig1.png
<example>
<title><literal>id on chapters and sections</literal></title>
- <programlisting><![ CDATA [<chapter id="chapter1">
+ <programlisting><![CDATA[<chapter id="chapter1">
<title>Introduction</title>
<para>This is the introduction. It contains a subsection,
@@ -2565,7 +2565,7 @@ IMAGES= chapter1/fig1.png
<example>
<title><sgmltag>anchor</sgmltag></title>
- <programlisting><![ CDATA [<para>This paragraph has an embedded
+ <programlisting><![CDATA[<para>This paragraph has an embedded
<anchor id="para1">link target in it. It will not show up in
the document.</para>]]></programlisting>
</example>
@@ -2590,7 +2590,7 @@ IMAGES= chapter1/fig1.png
<para>Assume that this fragment appears somewhere in a document that
includes the <literal>id</literal> example:</para>
- <programlisting><![ CDATA [<para>More information can be found
+ <programlisting><![CDATA[<para>More information can be found
in <xref linkend="chapter1">.</para>
<para>More specific information can be found
@@ -2631,7 +2631,7 @@ IMAGES= chapter1/fig1.png
<para>Assume that this fragment appears somewhere in a document that
includes the <literal>id</literal> example.</para>
- <programlisting><![ CDATA [<para>More information can be found in
+ <programlisting><![CDATA[<para>More information can be found in
<link linkend="chapter1">the first chapter</link>.</para>
<para>More specific information can be found in
@@ -2681,7 +2681,7 @@ IMAGES= chapter1/fig1.png
<para>Use:</para>
- <programlisting><![ CDATA [<para>Of course, you could stop reading this document and
+ <programlisting><![CDATA[<para>Of course, you could stop reading this document and
go to the <ulink url="&url.base;/index.html">FreeBSD
home page</ulink> instead.</para>]]></programlisting>
diff --git a/zh_TW.Big5/books/fdp-primer/sgml-primer/chapter.xml b/zh_TW.Big5/books/fdp-primer/sgml-primer/chapter.xml
index a6d2030e97..238c3a4d66 100644
--- a/zh_TW.Big5/books/fdp-primer/sgml-primer/chapter.xml
+++ b/zh_TW.Big5/books/fdp-primer/sgml-primer/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
@@ -98,7 +98,7 @@
<para>The previous example is actually represented in this document like
this:</para>
- <programlisting><![ CDATA [
+ <programlisting><![CDATA[
<para>To remove <filename>/tmp/foo</filename> use &man.rm.1;.</para>
<screen>&prompt.user; <userinput>rm /tmp/foo</userinput></screen>]]></programlisting>
@@ -215,7 +215,7 @@
the element is a paragraph, called <literal>p</literal>. This
element has both start and end tags.</para>
- <programlisting><![ CDATA [<p>This is a paragraph. It starts with the start tag for
+ <programlisting><![CDATA[<p>This is a paragraph. It starts with the start tag for
the 'p' element, and it will end with the end tag for the 'p'
element.</p>
@@ -234,7 +234,7 @@
<literal>hr</literal>. This element does not wrap content, so only
has a start tag.</para>
- <programlisting><![ CDATA [<p>This is a paragraph.</p>
+ <programlisting><![CDATA[<p>This is a paragraph.</p>
<hr>
@@ -250,7 +250,7 @@
<example>
<title>Elements within elements; <sgmltag>em</sgmltag></title>
- <programlisting><![ CDATA [<p>This is a simple <em>paragraph</em> where some
+ <programlisting><![CDATA[<p>This is a simple <em>paragraph</em> where some
of the <em>words</em> have been <em>emphasized</em>.</p>]]></programlisting>
</example>
@@ -300,7 +300,7 @@
<example>
<title>Using an element with an attribute</title>
- <programlisting><![ CDATA [<p align="left">The inclusion of the align attribute
+ <programlisting><![CDATA[<p align="left">The inclusion of the align attribute
on this paragraph was superfluous, since the default is left.</p>
<p align="center">This may appear in the center.</p>]]></programlisting>
@@ -315,7 +315,7 @@
<example>
<title>Single quotes around attributes</title>
- <programlisting><![ CDATA [<p align='right'>I am on the right!</p>]]></programlisting>
+ <programlisting><![CDATA[<p align='right'>I am on the right!</p>]]></programlisting>
</example>
<para>Sometimes you do not need to use quotes around attribute values at
@@ -391,7 +391,7 @@ setenv SGML_CATALOG_FILES /usr/doc/en_US.ISO8859-1/share/xml/catalog:$SGML_CATAL
<para>Create <filename>example.xml</filename>, and enter the
following text:</para>
- <programlisting><![ CDATA [<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+ <programlisting><![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<html>
<head>
@@ -539,7 +539,7 @@ nsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
<para>A typical declaration for a document written to conform with version
4.0 of the HTML DTD looks like this:</para>
- <programlisting><![ CDATA [<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN">]]></programlisting>
+ <programlisting><![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN">]]></programlisting>
<para>That line contains a number of different components.</para>
@@ -764,7 +764,7 @@ nsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
<para>The syntax for this is slightly different:</para>
- <programlisting><![ CDATA [<!DOCTYPE html SYSTEM "/path/to/file.dtd">]]></programlisting>
+ <programlisting><![CDATA[<!DOCTYPE html SYSTEM "/path/to/file.dtd">]]></programlisting>
<para>The <literal>SYSTEM</literal> keyword indicates that the SGML
processor should locate the DTD in a system specific fashion. This
@@ -818,7 +818,7 @@ nsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
<programlisting><!-- ���յ��� --></programlisting>
- <programlisting><![ CDATA [
+ <programlisting><![CDATA[
<!-- �o�O���� -->
<!-- �o�]�O���� -->
@@ -830,7 +830,8 @@ nsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
-- �]�i�H�o�ˤl�� -->]]></programlisting>
</example>
- <![ %output.print; [
+<!--
+ <![%output.print;[
<important>
<title>Use 2 dashes</title>
@@ -849,6 +850,7 @@ nsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
affected.</para>
</important>
]]>
+-->
<para>If you have used HTML before you may have been shown different rules
for comments. In particular, you may think that the string
@@ -863,7 +865,7 @@ nsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
<example>
<title>Erroneous SGML comments</title>
- <programlisting><![ CDATA [
+ <programlisting><![CDATA[
<!-- This is in the comment --
THIS IS OUTSIDE THE COMMENT!
@@ -877,12 +879,12 @@ nsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
<para>This is not valid SGML, and may give confusing error
messages.</para>
- <programlisting><![ CDATA [<!--------------- This is a very bad idea --------------->]]></programlisting>
+ <programlisting><![CDATA[<!--------------- This is a very bad idea --------------->]]></programlisting>
<para>As the example suggests, <emphasis>do not</emphasis> write
comments like that.</para>
- <programlisting><![ CDATA [<!--===================================================-->]]></programlisting>
+ <programlisting><![CDATA[<!--===================================================-->]]></programlisting>
<para>That is a (slightly) better approach, but it still potentially
confusing to people new to SGML.</para>
@@ -938,7 +940,7 @@ nsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
<literal>current.version</literal> which expanded to the current
version number of your product. You could write:</para>
- <programlisting><![ CDATA [<para>The current version of our product is
+ <programlisting><![CDATA[<para>The current version of our product is
¤t.version;.</para>]]></programlisting>
<para>When the version number changes you can simply change the
@@ -966,7 +968,7 @@ nsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
<example>
<title>Defining general entities</title>
- <programlisting><![ CDATA [<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
+ <programlisting><![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
<!ENTITY current.version "3.0-RELEASE">
<!ENTITY last.version "2.2.7-RELEASE">
]>]]></programlisting>
@@ -1005,7 +1007,7 @@ nsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
<example>
<title>Defining parameter entities</title>
- <programlisting><![ CDATA [<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
+ <programlisting><![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
<!ENTITY % param.some "some">
<!ENTITY % param.text "text">
<!ENTITY % param.new "%param.some more %param.text">
@@ -1025,7 +1027,7 @@ nsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
<para>Add a general entity to
<filename>example.xml</filename>.</para>
- <programlisting><![ CDATA [<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+ <programlisting><![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
<!ENTITY version "1.1">
]>
@@ -1123,7 +1125,7 @@ nsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
<example>
<title>Using general entities to include files</title>
- <programlisting><![ CDATA [<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
+ <programlisting><![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
<!ENTITY chapter.1 SYSTEM "chapter1.xml">
<!ENTITY chapter.2 SYSTEM "chapter2.xml">
<!ENTITY chapter.3 SYSTEM "chapter3.xml">
@@ -1177,7 +1179,7 @@ nsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
<filename>chapters.ent</filename>. This file contains the
following:</para>
- <programlisting><![ CDATA [<!ENTITY chapter.1 SYSTEM "chapter1.xml">
+ <programlisting><![CDATA[<!ENTITY chapter.1 SYSTEM "chapter1.xml">
<!ENTITY chapter.2 SYSTEM "chapter2.xml">
<!ENTITY chapter.3 SYSTEM "chapter3.xml">]]></programlisting>
@@ -1186,7 +1188,7 @@ nsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
document, which will then make all the general entities available
for use. Then use the general entities as before:</para>
- <programlisting><![ CDATA [<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
+ <programlisting><![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
<!-- Define a parameter entity to load in the chapter general entities -->
<!ENTITY % chapters SYSTEM "chapters.ent">
@@ -1216,14 +1218,14 @@ nsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
<para>Put content similar to the following in each file:</para>
- <programlisting><![ CDATA [<p>This is the first paragraph.</p>]]></programlisting>
+ <programlisting><![CDATA[<p>This is the first paragraph.</p>]]></programlisting>
</step>
<step>
<para>Edit <filename>example.xml</filename> so that it looks like
this:</para>
- <programlisting><![ CDATA [<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
+ <programlisting><![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
<!ENTITY version "1.1">
<!ENTITY para1 SYSTEM "para1.xml">
<!ENTITY para2 SYSTEM "para2.xml">
@@ -1273,7 +1275,7 @@ nsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
<para>Edit <filename>example.xml</filename> so that it looks like
this:</para>
- <programlisting><![ CDATA [<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
+ <programlisting><![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
<!ENTITY % entities SYSTEM "entities.xml"> %entities;
]>
@@ -1296,7 +1298,7 @@ nsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
<para>Create a new file, <filename>entities.xml</filename>, with
this content:</para>
- <programlisting><![ CDATA [<!ENTITY version "1.1">
+ <programlisting><![CDATA[<!ENTITY version "1.1">
<!ENTITY para1 SYSTEM "para1.xml">
<!ENTITY para2 SYSTEM "para2.xml">
<!ENTITY para3 SYSTEM "para3.xml">]]></programlisting>
@@ -1336,7 +1338,7 @@ nsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
</example>
<para>As you would expect, being an SGML construct, a marked section
- starts with <literal><!</literal>.</para>
+ starts with <literal><!</literal>.</para>
<para>The first square bracket begins to delimit the marked
section.</para>
@@ -1418,7 +1420,7 @@ nsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
<programlisting>) are from DocBook.</para>
<programlisting>
- <![ CDATA [ <![ CDATA [
+ <![CDATA[<![CDATA[
<p>This is a sample that shows you some of the elements within
HTML. Since the angle brackets are used so many times, it is
simpler to say the whole example is a CDATA marked section
@@ -1532,16 +1534,16 @@ nsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
</head>
<body>
- <p>This paragraph <![ CDATA [contains many <
+ <p>This paragraph <![CDATA[contains many <
characters (< < < < <) so it is easier
to wrap it in a CDATA marked section ]]></p>
- <![ IGNORE [
+ <![IGNORE[
<p>This paragraph will definitely not be included in the
output.</p>
]]>
- <![ <![ CDATA [%text.output]]> [
+ <![<![CDATA[%text.output]]> [
<p>This paragraph might appear in the output, or it
might not.</p>
diff --git a/zh_TW.Big5/books/fdp-primer/structure/chapter.xml b/zh_TW.Big5/books/fdp-primer/structure/chapter.xml
index 658a93ec39..8c22d28519 100644
--- a/zh_TW.Big5/books/fdp-primer/structure/chapter.xml
+++ b/zh_TW.Big5/books/fdp-primer/structure/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
@@ -222,7 +222,7 @@
<para>For example, if one of the chapter files contains:</para>
- <programlisting><![ CDATA [
+ <programlisting><![CDATA[
<chapter id="kernelconfiguration">
...
</chapter>]]></programlisting>
diff --git a/zh_TW.Big5/books/fdp-primer/stylesheets/chapter.xml b/zh_TW.Big5/books/fdp-primer/stylesheets/chapter.xml
index 2ed9a117bb..785f566f4b 100644
--- a/zh_TW.Big5/books/fdp-primer/stylesheets/chapter.xml
+++ b/zh_TW.Big5/books/fdp-primer/stylesheets/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/zh_TW.Big5/books/fdp-primer/the-website/chapter.xml b/zh_TW.Big5/books/fdp-primer/the-website/chapter.xml
index 9a55bd17d3..85801201ec 100644
--- a/zh_TW.Big5/books/fdp-primer/the-website/chapter.xml
+++ b/zh_TW.Big5/books/fdp-primer/the-website/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/zh_TW.Big5/books/fdp-primer/tools/chapter.xml b/zh_TW.Big5/books/fdp-primer/tools/chapter.xml
index a15d80b543..eb7cfe411f 100644
--- a/zh_TW.Big5/books/fdp-primer/tools/chapter.xml
+++ b/zh_TW.Big5/books/fdp-primer/tools/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/zh_TW.Big5/books/fdp-primer/translations/chapter.xml b/zh_TW.Big5/books/fdp-primer/translations/chapter.xml
index 8eab03e45c..2a19c41ee7 100644
--- a/zh_TW.Big5/books/fdp-primer/translations/chapter.xml
+++ b/zh_TW.Big5/books/fdp-primer/translations/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!-- Copyright (c) 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/zh_TW.Big5/books/fdp-primer/writing-style/chapter.xml b/zh_TW.Big5/books/fdp-primer/writing-style/chapter.xml
index a936251da5..ffb5b6a2c0 100644
--- a/zh_TW.Big5/books/fdp-primer/writing-style/chapter.xml
+++ b/zh_TW.Big5/books/fdp-primer/writing-style/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!-- Copyright (c) 1998 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
@@ -172,7 +172,7 @@
�A<emphasis>�ӫD</emphasis> <literal><PARA></literal>�C</para>
<para>�� SGML ����h�O�Τj�g�r�����ܡA���O�G
- <literal><!ENTITY…></literal> ��
+ <literal><!ENTITY…></literal> ��
<literal><!DOCTYPE…></literal>�A
<emphasis>�Ӥ��O</emphasis>
<literal><!entity…></literal> ��
@@ -209,7 +209,7 @@
<para>�|�ӨҤl�A�o�`�ҥΪ��g�k�j�P�O�U���o�ˡG</para>
- <programlisting><![ CDATA [+--- �o�O 0 �a�C
+ <programlisting><![CDATA[+--- �o�O 0 �a�C
V
<chapter>
<title>...</title>
@@ -256,7 +256,7 @@ augroup END</programlisting>
��p�G</para>
<informalexample>
- <programlisting><![ CDATA [<article lang='zh_tw'>
+ <programlisting><![CDATA[<article lang='zh_tw'>
<articleinfo>
<title>NIS</title>
@@ -340,19 +340,19 @@ GB. Hardware compression …</literallayout>
<itemizedlist>
<listitem>
<para>�b�Ʀr�P��줧���G</para>
- <programlisting><![ CDATA [57600 bps]]></programlisting>
+ <programlisting><![CDATA[57600 bps]]></programlisting>
</listitem>
<listitem>
<para>�b�{���W�ٻP���������G</para>
- <programlisting><![ CDATA [FreeBSD 4.7]]></programlisting>
+ <programlisting><![CDATA[FreeBSD 4.7]]></programlisting>
</listitem>
<listitem>
<para>multiword ���� (�ϥήɽФp�ߡA���O <quote>The FreeBSD Brazilian
Portuguese Documentation Project</quote> �o���ѤT��|�Ӧr�Ҳզ����A
�h���Υ[�C)�G</para>
- <programlisting><![ CDATA [Sun Microsystems]]></programlisting>
+ <programlisting><![CDATA[Sun Microsystems]]></programlisting>
</listitem>
</itemizedlist>
</sect2>
diff --git a/zh_TW.Big5/books/handbook/Makefile b/zh_TW.Big5/books/handbook/Makefile
index 10639b23bb..0b8bb98633 100644
--- a/zh_TW.Big5/books/handbook/Makefile
+++ b/zh_TW.Big5/books/handbook/Makefile
@@ -260,30 +260,56 @@ DOC_PREFIX?= ${.CURDIR}/../../..
#
# rules generating lists of mirror site from XML database.
#
-XMLDOCS= mirrors-ftp:::mirrors.xml.ftp.inc \
+XMLDOCS= lastmod:::mirrors.lastmod.inc \
+ mirrors-ftp-index:::mirrors.xml.ftp.index.inc \
+ mirrors-ftp:::mirrors.xml.ftp.inc \
+ mirrors-cvsup-index:::mirrors.xml.cvsup.index.inc \
mirrors-cvsup:::mirrors.xml.cvsup.inc \
+ eresources-index:::eresources.xml.www.index.inc \
eresources:::eresources.xml.www.inc
DEPENDSET.DEFAULT= transtable mirror
XSLT.DEFAULT= ${XSL_MIRRORS}
XML.DEFAULT= ${XML_MIRRORS}
NO_TIDY.DEFAULT= yes
+PARAMS.lastmod+= --param 'target' "'lastmod'"
+PARAMS.mirrors-ftp-index+= --param 'type' "'ftp'" \
+ --param 'proto' "'ftp'" \
+ --param 'target' "'index'"
PARAMS.mirrors-ftp+= --param 'type' "'ftp'" \
--param 'proto' "'ftp'" \
--param 'target' "'handbook/mirrors/chapter.xml'"
+PARAMS.mirrors-cvsup-index+= --param 'type' "'cvsup'" \
+ --param 'proto' "'cvsup'" \
+ --param 'target' "'index'"
PARAMS.mirrors-cvsup+= --param 'type' "'cvsup'" \
--param 'proto' "'cvsup'" \
--param 'target' "'handbook/mirrors/chapter.xml'"
+PARAMS.eresources-index+= --param 'type' "'www'" \
+ --param 'proto' "'http'" \
+ --param 'target' "'index'"
PARAMS.eresources+= --param 'type' "'www'" \
--param 'proto' "'http'" \
--param 'target' "'handbook/eresources/chapter.xml'"
-SRCS+= mirrors.xml.ftp.inc \
+SRCS+= mirrors.lastmod.inc \
+ mirrors.xml.ftp.inc \
+ mirrors.xml.ftp.index.inc \
mirrors.xml.cvsup.inc \
- eresources.xml.www.inc
+ mirrors.xml.cvsup.index.inc \
+ eresources.xml.www.inc \
+ eresources.xml.www.index.inc
-CLEANFILES+= mirrors.xml.ftp.inc \
+CLEANFILES+= mirrors.lastmod.inc \
+ mirrors.xml.ftp.inc \
+ mirrors.xml.ftp.index.inc \
mirrors.xml.cvsup.inc \
- eresources.xml.www.inc
+ mirrors.xml.cvsup.index.inc \
+ eresources.xml.www.inc \
+ eresources.xml.www.index.inc
+
+lint: mirrors.lastmod.inc mirrors.xml.ftp.inc mirrors.xml.ftp.index.inc \
+ mirrors.xml.cvsup.inc mirrors.xml.cvsup.index.inc \
+ eresources.xml.www.inc eresources.xml.www.index.inc
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/zh_TW.Big5/books/handbook/advanced-networking/chapter.xml b/zh_TW.Big5/books/handbook/advanced-networking/chapter.xml
index 1ad1706ea8..ad4e269ce1 100644
--- a/zh_TW.Big5/books/handbook/advanced-networking/chapter.xml
+++ b/zh_TW.Big5/books/handbook/advanced-networking/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!--
The FreeBSD Documentation Project
@@ -1954,7 +1954,7 @@ wpa_pairwise=CCMP TKIP <co id="co-ap-wpapsk-pwise"/></programlisting>
<para>The next step is to start
<application>hostapd</application>:</para>
- <screen>&prompt.root <userinput>/etc/rc.d/hostapd forcestart</userinput></screen>
+ <screen>&prompt.root; <userinput>/etc/rc.d/hostapd forcestart</userinput></screen>
<screen>&prompt.root; <userinput>ifconfig <replaceable>ath0</replaceable></userinput>
ath0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> mtu 2290
@@ -5533,7 +5533,7 @@ ifconfig_carp1="vhid 2 advskew 100 pass testpass 192.168.1.51/24"</programlistin
should be issued on
<hostid>provider.example.org</hostid>:</para>
- <screen>&prompt.root; <userinput>ifconfig carp0 down && ifconfig carp0 up</userinput></screen>
+ <screen>&prompt.root; <userinput>ifconfig carp0 down && ifconfig carp0 up</userinput></screen>
<para>This should be done on the <devicename>carp</devicename>
interface which corresponds to the correct host.</para>
diff --git a/zh_TW.Big5/books/handbook/audit/chapter.xml b/zh_TW.Big5/books/handbook/audit/chapter.xml
index 79179f96ac..3a431cfb20 100644
--- a/zh_TW.Big5/books/handbook/audit/chapter.xml
+++ b/zh_TW.Big5/books/handbook/audit/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!--
The FreeBSD Documentation Project
$FreeBSD$
diff --git a/zh_TW.Big5/books/handbook/basics/chapter.xml b/zh_TW.Big5/books/handbook/basics/chapter.xml
index 520d95adbd..e4e1e89f85 100644
--- a/zh_TW.Big5/books/handbook/basics/chapter.xml
+++ b/zh_TW.Big5/books/handbook/basics/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!--
The FreeBSD Documentation Project
@@ -808,7 +808,7 @@ total 530
<entry>�s��U�إγ~�� log �ɡB�{�ɩμȮɦs��B�C�L�ζl��
spool �ɮסC���ɭԡAmemory-based �ɮרt�Τ]�|�����b
<filename class="directory">/var</filename>�C
- �o�Ǻ��ƥi�z�L varmfs ������ &man.rc.conf.5
+ �o�Ǻ��ƥi�z�L varmfs ������ &man.rc.conf.5;
�����ܼƨӦ۰ʧ����C(�άO�b
<filename>/etc/fstab</filename> �����]�w�A�����Ӹ`�аѾ\
&man.mdmfs.8;�C)</entry>
@@ -1083,7 +1083,7 @@ total 530
</itemizedlist>
<para>�ɮרt�Υ]�t�b���ΰϸ̭��C
- �]�� &os; ��ŧ &unix �[�c�A�o���������ΰϩM�@�봣�쪺���ΰ�
+ �]�� &os; ��ŧ &unix; �[�c�A�o���������ΰϩM�@�봣�쪺���ΰ�
(�Ҧp &ms-dos; ���ΰ�) ���P�C �C�@�Ӥ��ΰϥѤ@�ӥN��(�r��)���ܡA�q
<literal>a</literal> �� <literal>h</literal>�C
�C�Ӥ��ΰϥu��]�t�@���ɮרt�ΡC
diff --git a/zh_TW.Big5/books/handbook/bibliography/chapter.xml b/zh_TW.Big5/books/handbook/bibliography/chapter.xml
index 367ed55a18..5f8fd5d824 100644
--- a/zh_TW.Big5/books/handbook/bibliography/chapter.xml
+++ b/zh_TW.Big5/books/handbook/bibliography/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!--
The FreeBSD Documentation Project
diff --git a/zh_TW.Big5/books/handbook/book.xml b/zh_TW.Big5/books/handbook/book.xml
index 272f315b40..b0df515e4e 100644
--- a/zh_TW.Big5/books/handbook/book.xml
+++ b/zh_TW.Big5/books/handbook/book.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
"../../../share/xml/freebsd42.dtd" [
<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//TW" "../../share/xml/entities.ent">
diff --git a/zh_TW.Big5/books/handbook/boot/chapter.xml b/zh_TW.Big5/books/handbook/boot/chapter.xml
index 9147e51406..5400fc8b2c 100644
--- a/zh_TW.Big5/books/handbook/boot/chapter.xml
+++ b/zh_TW.Big5/books/handbook/boot/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!--
The FreeBSD Documentation Project
diff --git a/zh_TW.Big5/books/handbook/chapters.ent b/zh_TW.Big5/books/handbook/chapters.ent
index 8868fe9a40..177bf80f5b 100644
--- a/zh_TW.Big5/books/handbook/chapters.ent
+++ b/zh_TW.Big5/books/handbook/chapters.ent
@@ -11,231 +11,61 @@
Original revision: 1.33
-->
-<!ENTITY % not.published "INCLUDE">
-
-<!ENTITY % chap.introduction "IGNORE">
-<!ENTITY % chap.install "IGNORE">
-<!ENTITY % chap.basics "IGNORE">
-<!ENTITY % chap.ports "IGNORE">
-<!ENTITY % chap.config "IGNORE">
-<!ENTITY % chap.boot "IGNORE">
-<!ENTITY % chap.users "IGNORE">
-<!ENTITY % chap.kernelconfig "IGNORE">
-<!ENTITY % chap.security "IGNORE">
-<!ENTITY % chap.jails "IGNORE">
-<!ENTITY % chap.printing "IGNORE">
-<!ENTITY % chap.disks "IGNORE">
-<!ENTITY % chap.geom "IGNORE">
-<!ENTITY % chap.vinum "IGNORE">
-<!ENTITY % chap.x11 "IGNORE">
-<!ENTITY % chap.l10n "IGNORE">
-<!ENTITY % chap.multimedia "IGNORE">
-<!ENTITY % chap.desktop "IGNORE">
-<!ENTITY % chap.serialcomms "IGNORE">
-<!ENTITY % chap.ppp-and-slip "IGNORE">
-<!ENTITY % chap.advanced-networking "IGNORE">
-<!ENTITY % chap.firewalls "IGNORE">
-<!ENTITY % chap.network-servers "IGNORE">
-<!ENTITY % chap.mail "IGNORE">
-<!ENTITY % chap.cutting-edge "IGNORE">
-<!ENTITY % chap.linuxemu "IGNORE">
-<!ENTITY % chap.mirrors "IGNORE">
-<!ENTITY % chap.mirrors.ftp.inc "INCLUDE">
-<!ENTITY % chap.mirrors.cvsup.inc "INCLUDE">
-<!ENTITY % chap.bibliography "IGNORE">
-<!ENTITY % chap.eresources "IGNORE">
-<!ENTITY % chap.eresources.www.inc "INCLUDE">
-<!ENTITY % chap.pgpkeys "IGNORE">
-<!ENTITY % chap.index "IGNORE">
-<!ENTITY % chap.freebsd-glossary "IGNORE">
-<!ENTITY % chap.mac "IGNORE">
-<!ENTITY % chap.audit "IGNORE">
-<!ENTITY % chap.filesystems "IGNORE">
-<!ENTITY % chap.dtrace "IGNORE">
-
<!ENTITY chap.preface SYSTEM "preface/preface.xml">
<!ENTITY % pgpkeys SYSTEM "../../../share/pgpkeys/pgpkeys.ent"> %pgpkeys;
<!-- Part One -->
-<![%chap.introduction;[
<!ENTITY chap.introduction SYSTEM "introduction/chapter.xml">
-]]>
-<![%chap.install;[
<!ENTITY chap.install SYSTEM "install/chapter.xml">
-]]>
-<![%chap.basics;[
<!ENTITY chap.basics SYSTEM "basics/chapter.xml">
-]]>
-<![%chap.ports;[
<!ENTITY chap.ports SYSTEM "ports/chapter.xml">
-]]>
-<![%chap.x11;[
<!ENTITY chap.x11 SYSTEM "x11/chapter.xml">
-]]>
<!-- Part Two -->
-<![%chap.desktop;[
<!ENTITY chap.desktop SYSTEM "desktop/chapter.xml">
-]]>
-<![%chap.multimedia;[
<!ENTITY chap.multimedia SYSTEM "multimedia/chapter.xml">
-]]>
-<![%chap.kernelconfig;[
<!ENTITY chap.kernelconfig SYSTEM "kernelconfig/chapter.xml">
-]]>
-<![%chap.printing;[
<!ENTITY chap.printing SYSTEM "printing/chapter.xml">
-]]>
-<![%chap.linuxemu;[
<!ENTITY chap.linuxemu SYSTEM "linuxemu/chapter.xml">
-]]>
<!-- Part Three -->
-<![%chap.config;[
<!ENTITY chap.config SYSTEM "config/chapter.xml">
-]]>
-<![%chap.boot;[
<!ENTITY chap.boot SYSTEM "boot/chapter.xml">
-]]>
-<![%chap.users;[
<!ENTITY chap.users SYSTEM "users/chapter.xml">
-]]>
-<![%chap.security;[
<!ENTITY chap.security SYSTEM "security/chapter.xml">
-]]>
-<![%chap.jails;[
<!ENTITY chap.jails SYSTEM "jails/chapter.xml">
-]]>
-<![%chap.mac;[
<!ENTITY chap.mac SYSTEM "mac/chapter.xml">
-]]>
-<![%chap.audit;[
<!ENTITY chap.audit SYSTEM "audit/chapter.xml">
-]]>
-<![%chap.disks;[
<!ENTITY chap.disks SYSTEM "disks/chapter.xml">
-]]>
-<![%chap.geom;[
<!ENTITY chap.geom SYSTEM "geom/chapter.xml">
-]]>
-<![%chap.filesystems;[
<!ENTITY chap.filesystems SYSTEM "filesystems/chapter.xml">
-]]>
-<![%chap.vinum;[
<!ENTITY chap.vinum SYSTEM "vinum/chapter.xml">
-]]>
-<![%chap.virtualization;[
<!ENTITY chap.virtualization SYSTEM "virtualization/chapter.xml">
-]]>
-<![%chap.l10n;[
<!ENTITY chap.l10n SYSTEM "l10n/chapter.xml">
-]]>
-<![%chap.cutting-edge;[
<!ENTITY chap.cutting-edge SYSTEM "cutting-edge/chapter.xml">
-]]>
-<![%chap.dtrace;[
<!ENTITY chap.dtrace SYSTEM "dtrace/chapter.xml">
-]]>
<!-- Part Four -->
-<![%chap.serialcomms;[
<!ENTITY chap.serialcomms SYSTEM "serialcomms/chapter.xml">
-]]>
-<![%chap.ppp-and-slip;[
<!ENTITY chap.ppp-and-slip SYSTEM "ppp-and-slip/chapter.xml">
-]]>
-<![%chap.mail;[
<!ENTITY chap.mail SYSTEM "mail/chapter.xml">
-]]>
-<![%chap.network-servers;[
<!ENTITY chap.network-servers SYSTEM "network-servers/chapter.xml">
-]]>
-<![%chap.firewalls;[
<!ENTITY chap.firewalls SYSTEM "firewalls/chapter.xml">
-]]>
-<![%chap.advanced-networking;[
<!ENTITY chap.advanced-networking SYSTEM "advanced-networking/chapter.xml">
-]]>
<!-- Part Five (appendices) -->
-<![%chap.mirrors;[
<!ENTITY chap.mirrors SYSTEM "mirrors/chapter.xml">
-]]>
-<![%chap.mirrors.ftp.inc;[
+ <!ENTITY chap.mirrors.lastmod.inc SYSTEM "mirrors.lastmod.inc">
+ <!ENTITY chap.mirrors.ftp.index.inc SYSTEM "mirrors.xml.ftp.index.inc">
<!ENTITY chap.mirrors.ftp.inc SYSTEM "mirrors.xml.ftp.inc">
-]]>
-<![%chap.mirrors.cvsup.inc;[
+ <!ENTITY chap.mirrors.cvsup.index.inc SYSTEM "mirrors.xml.cvsup.index.inc">
<!ENTITY chap.mirrors.cvsup.inc SYSTEM "mirrors.xml.cvsup.inc">
-]]>
-<![%chap.bibliography;[
<!ENTITY chap.bibliography SYSTEM "bibliography/chapter.xml">
-]]>
-<![%chap.eresources;[
<!ENTITY chap.eresources SYSTEM "eresources/chapter.xml">
-]]>
-<![%chap.eresources.www.inc;[
+ <!ENTITY chap.eresources.www.index.inc SYSTEM "eresources.xml.www.index.inc">
<!ENTITY chap.eresources.www.inc SYSTEM "eresources.xml.www.inc">
-]]>
-<![%chap.pgpkeys;[
<!ENTITY chap.pgpkeys SYSTEM "pgpkeys/chapter.xml">
-]]>
-<![%chap.freebsd-glossary;[
<!ENTITY chap.freebsd-glossary "&freebsd-glossary;">
-]]>
-<![%chap.index;[
- <!ENTITY chap.index SYSTEM "index.xml">
-]]>
+ <!ENTITY chap.index "">
<!ENTITY chap.colophon SYSTEM "colophon.xml">
-
-<!-- IGNORE cases -->
-
-<!-- Part One -->
-<!ENTITY chap.introduction "">
-<!ENTITY chap.install "">
-<!ENTITY chap.basics "">
-<!ENTITY chap.ports "">
-<!ENTITY chap.x11 "">
-
-<!-- Part Two -->
-<!ENTITY chap.desktop "">
-<!ENTITY chap.multimedia "">
-<!ENTITY chap.kernelconfig "">
-<!ENTITY chap.printing "">
-<!ENTITY chap.linuxemu "">
-
-<!-- Part Three -->
-<!ENTITY chap.config "">
-<!ENTITY chap.boot "">
-<!ENTITY chap.users "">
-<!ENTITY chap.security "">
-<!ENTITY chap.jails "">
-<!ENTITY chap.mac "">
-<!ENTITY chap.audit "">
-<!ENTITY chap.disks "">
-<!ENTITY chap.geom "">
-<!ENTITY chap.filesystems "">
-<!ENTITY chap.vinum "">
-<!ENTITY chap.virtualization "">
-<!ENTITY chap.l10n "">
-<!ENTITY chap.cutting-edge "">
-<!ENTITY chap.dtrace "">
-
-<!-- Part Four -->
-<!ENTITY chap.serialcomms "">
-<!ENTITY chap.ppp-and-slip "">
-<!ENTITY chap.mail "">
-<!ENTITY chap.network-servers "">
-<!ENTITY chap.firewalls "">
-<!ENTITY chap.advanced-networking "">
-
-<!-- Part Five (appendices) -->
-<!ENTITY chap.mirrors "">
-<!ENTITY chap.mirrors.ftp.inc "">
-<!ENTITY chap.mirrors.cvsup.inc "">
-<!ENTITY chap.bibliography "">
-<!ENTITY chap.eresources "">
-<!ENTITY chap.eresources.www.inc "">
-<!ENTITY chap.pgpkeys "">
-<!ENTITY chap.freebsd-glossary "">
-<!ENTITY chap.index "">
diff --git a/zh_TW.Big5/books/handbook/colophon.xml b/zh_TW.Big5/books/handbook/colophon.xml
index 3eedb9aed1..62f4bb0b8d 100644
--- a/zh_TW.Big5/books/handbook/colophon.xml
+++ b/zh_TW.Big5/books/handbook/colophon.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!--
The FreeBSD Documentation Project
diff --git a/zh_TW.Big5/books/handbook/config/chapter.xml b/zh_TW.Big5/books/handbook/config/chapter.xml
index d21c12bc31..51b9f8a55e 100644
--- a/zh_TW.Big5/books/handbook/config/chapter.xml
+++ b/zh_TW.Big5/books/handbook/config/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!--
The FreeBSD Documentation Project
@@ -352,7 +352,7 @@ stop)
kill -9 `cat /var/run/utility.pid`
;;
*)
- echo "Usage: `basename $0` {start|stop}" >&2
+ echo "Usage: `basename $0` {start|stop}" >&2
exit 64
;;
esac
diff --git a/zh_TW.Big5/books/handbook/cutting-edge/chapter.xml b/zh_TW.Big5/books/handbook/cutting-edge/chapter.xml
index 4163460677..11534ff2c8 100644
--- a/zh_TW.Big5/books/handbook/cutting-edge/chapter.xml
+++ b/zh_TW.Big5/books/handbook/cutting-edge/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!--
The FreeBSD Documentation Project
diff --git a/zh_TW.Big5/books/handbook/desktop/chapter.xml b/zh_TW.Big5/books/handbook/desktop/chapter.xml
index c6b809d735..25aa903c5f 100644
--- a/zh_TW.Big5/books/handbook/desktop/chapter.xml
+++ b/zh_TW.Big5/books/handbook/desktop/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!--
The FreeBSD Documentation Project
$FreeBSD$
diff --git a/zh_TW.Big5/books/handbook/disks/chapter.xml b/zh_TW.Big5/books/handbook/disks/chapter.xml
index 0a3fc849fa..c5708b1ab8 100644
--- a/zh_TW.Big5/books/handbook/disks/chapter.xml
+++ b/zh_TW.Big5/books/handbook/disks/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!--
The FreeBSD Documentation Project
@@ -416,7 +416,7 @@ ad3: 29333MB <WDC WD307AA> [59598/16/63] at ata1-slave UDMA33</programlist
�C</para></note>
<para>���U�ӡA�Ҽ{�p��N�����ܦ��ɮרt�Ϊ��@�����C�z�i�H�Ѧ�
- &man.vinum.8;(<xref linkend="vinum-vinum"/>) �� &man.ccd.4�C
+ &man.vinum.8;(<xref linkend="vinum-vinum"/>) �� &man.ccd.4;�C
�b���ڭ̿�� &man.ccd.4;�C</para>
</sect4>
@@ -2524,7 +2524,7 @@ sa0(ncr1:4:0): Logical unit is in process of becoming ready</screen>
<example>
<title>A Script for Creating a Bootable Floppy</title>
- <programlisting><![ CDATA [#!/bin/sh
+ <programlisting><![CDATA[#!/bin/sh
#
# create a restore floppy
#
@@ -2736,16 +2736,6 @@ echo "The floppy has been unmounted and is now ready."]]></programlisting>
Whatever caused the crash or data loss may strike again. Another
hour spent now may save you from further distress later.</para>
</sect3>
-
-<![ %not.published; [
-
- <sect3>
- <title>* I Did Not Prepare for the Disaster, What Now?</title>
-
- <para></para>
- </sect3>
-]]>
-
</sect2>
</sect1>
diff --git a/zh_TW.Big5/books/handbook/eresources/chapter.xml b/zh_TW.Big5/books/handbook/eresources/chapter.xml
index a48da1f8fb..104be5ccc5 100644
--- a/zh_TW.Big5/books/handbook/eresources/chapter.xml
+++ b/zh_TW.Big5/books/handbook/eresources/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!--
The FreeBSD Documentation Project
@@ -1633,6 +1633,10 @@
<sect1 id="eresources-web">
<title>World Wide Web Servers</title>
+ &chap.eresources.www.index.inc;
+
+ &chap.mirrors.lastmod.inc;
+
&chap.eresources.www.inc;
</sect1>
diff --git a/zh_TW.Big5/books/handbook/firewalls/chapter.xml b/zh_TW.Big5/books/handbook/firewalls/chapter.xml
index 8fa7476433..ac4dcd058f 100644
--- a/zh_TW.Big5/books/handbook/firewalls/chapter.xml
+++ b/zh_TW.Big5/books/handbook/firewalls/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!--
The FreeBSD Documentation Project
diff --git a/zh_TW.Big5/books/handbook/geom/chapter.xml b/zh_TW.Big5/books/handbook/geom/chapter.xml
index 1672ae11f8..a5dcddefe2 100644
--- a/zh_TW.Big5/books/handbook/geom/chapter.xml
+++ b/zh_TW.Big5/books/handbook/geom/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!--
The FreeBSD Documentation Project
$FreeBSD$
diff --git a/zh_TW.Big5/books/handbook/install/chapter.xml b/zh_TW.Big5/books/handbook/install/chapter.xml
index 287f376a5a..a3e7a65571 100644
--- a/zh_TW.Big5/books/handbook/install/chapter.xml
+++ b/zh_TW.Big5/books/handbook/install/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!--
The FreeBSD Documentation Project
@@ -1989,7 +1989,7 @@ Mounting root from ufs:/dev/md0c
The Ports Collection is a very valuable resource and well worth having
on your /usr partition, so it is advisable to say Yes to this option.
- For more information on the Ports Collection & the latest ports,
+ For more information on the Ports Collection & the latest ports,
visit:
http://www.FreeBSD.org/ports
diff --git a/zh_TW.Big5/books/handbook/introduction/chapter.xml b/zh_TW.Big5/books/handbook/introduction/chapter.xml
index 008865a193..4f922856af 100644
--- a/zh_TW.Big5/books/handbook/introduction/chapter.xml
+++ b/zh_TW.Big5/books/handbook/introduction/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!--
The FreeBSD Documentation Project
diff --git a/zh_TW.Big5/books/handbook/jails/chapter.xml b/zh_TW.Big5/books/handbook/jails/chapter.xml
index a82c543e54..be2d18f77f 100644
--- a/zh_TW.Big5/books/handbook/jails/chapter.xml
+++ b/zh_TW.Big5/books/handbook/jails/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!--
The FreeBSD Documentation Project
diff --git a/zh_TW.Big5/books/handbook/kernelconfig/chapter.xml b/zh_TW.Big5/books/handbook/kernelconfig/chapter.xml
index 565f01e21a..f0f37d3eec 100644
--- a/zh_TW.Big5/books/handbook/kernelconfig/chapter.xml
+++ b/zh_TW.Big5/books/handbook/kernelconfig/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!--
The FreeBSD Documentation Project
@@ -404,7 +404,7 @@ ath_hal(4) - Atheros Hardware Access Layer (HAL)</programlisting>
<para>�Y���F���աA�ӻݭn�@���t���Ҧ��i�γ]�w���]�w�ɡA����ХH
<username>root</username> �����U�G</para>
- <screen>&prompt.root; <userinput>cd /usr/src/sys/<replaceable>i386</replaceable>/conf && make LINT</userinput></screen>
+ <screen>&prompt.root; <userinput>cd /usr/src/sys/<replaceable>i386</replaceable>/conf && make LINT</userinput></screen>
</note>
<indexterm>
@@ -1036,7 +1036,7 @@ device re # RealTek 8139C+/8169/8169S/8110S
device rl # RealTek 8129/8139
device sf # Adaptec AIC-6915 (<quote>Starfire</quote>)
device sis # Silicon Integrated Systems SiS 900/SiS 7016
-device sk # SysKonnect SK-984x & SK-982x gigabit Ethernet
+device sk # SysKonnect SK-984x & SK-982x gigabit Ethernet
device ste # Sundance ST201 (D-Link DFE-550TX)
device stge # Sundance/Tamarack TC9021 gigabit Ethernet
device ti # Alteon Networks Tigon I/II gigabit Ethernet
diff --git a/zh_TW.Big5/books/handbook/l10n/chapter.xml b/zh_TW.Big5/books/handbook/l10n/chapter.xml
index f6d7e448f9..4029f6e690 100644
--- a/zh_TW.Big5/books/handbook/l10n/chapter.xml
+++ b/zh_TW.Big5/books/handbook/l10n/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!--
The FreeBSD Documentation Project
diff --git a/zh_TW.Big5/books/handbook/linuxemu/chapter.xml b/zh_TW.Big5/books/handbook/linuxemu/chapter.xml
index 8adac61fe3..57786fced7 100644
--- a/zh_TW.Big5/books/handbook/linuxemu/chapter.xml
+++ b/zh_TW.Big5/books/handbook/linuxemu/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!--
The FreeBSD Documentation Project
@@ -600,14 +600,14 @@ LOG=/var/log/lmgrd.log
case "$1" in
start)
- lmgrd -c ${LICENSE_FILE} 2>> ${LOG} 1>&2
+ lmgrd -c ${LICENSE_FILE} 2>> ${LOG} 1>&2
echo -n " lmgrd"
;;
stop)
- lmgrd -c ${LICENSE_FILE} -x lmdown 2>> ${LOG} 1>&2
+ lmgrd -c ${LICENSE_FILE} -x lmdown 2>> ${LOG} 1>&2
;;
*)
- echo "Usage: `basename $0` {start|stop}" 1>&2
+ echo "Usage: `basename $0` {start|stop}" 1>&2
exit 64
;;
esac
@@ -886,7 +886,7 @@ exit 0</programlisting>
contain the following:</para>
<programlisting>#!/usr/compat/linux/bin/sh
-(sleep 5; killall -1 matlab_helper) &
+(sleep 5; killall -1 matlab_helper) &
exit 0</programlisting>
</step>
diff --git a/zh_TW.Big5/books/handbook/mac/chapter.xml b/zh_TW.Big5/books/handbook/mac/chapter.xml
index 54fb1b8cec..cfca14a62a 100644
--- a/zh_TW.Big5/books/handbook/mac/chapter.xml
+++ b/zh_TW.Big5/books/handbook/mac/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!--
The FreeBSD Documentation Project
$FreeBSD$
@@ -1766,7 +1766,7 @@ mac_partition_load="YES"</programlisting>
The following <command>sh</command> script should do the
trick:</para>
- <screen>&prompt.root; <userinput>for x in `awk -F: '($3 >= 1001) && ($3 != 65534) { print $1 }' \</userinput>
+ <screen>&prompt.root; <userinput>for x in `awk -F: '($3 >= 1001) && ($3 != 65534) { print $1 }' \</userinput>
<userinput>/etc/passwd`; do pw usermod $x -L insecure; done;</userinput></screen>
<para>The <command>cap_mkdb</command> command will need to be
@@ -1949,7 +1949,7 @@ round-trip min/avg/max/stddev = 204.455/204.455/204.455/0.000 ms</screen>
test1: biba/equal,mls/equal
&prompt.root; <userinput>setfmac biba/low test1 test2; setfmac biba/high test4 test5; \
setfmac mls/low test1 test3; setfmac mls/high test2 test4</userinput>
-&prompt.root; <userinput>setfmac mls/equal,biba/equal test3 && getfmac test?</userinput>
+&prompt.root; <userinput>setfmac mls/equal,biba/equal test3 && getfmac test?</userinput>
test1: biba/low,mls/low
test2: biba/low,mls/high
test3: biba/equal,mls/equal
@@ -2038,7 +2038,7 @@ cat: test4: Permission denied</screen>
<para>Every user should now be placed in the default class;
a command such as:</para>
- <screen>&prompt.root; <userinput>for x in `awk -F: '($3 >= 1001) && ($3 != 65534) { print $1 }' \</userinput>
+ <screen>&prompt.root; <userinput>for x in `awk -F: '($3 >= 1001) && ($3 != 65534) { print $1 }' \</userinput>
<userinput>/etc/passwd`; do pw usermod $x -L default; done;</userinput></screen>
<para>will accomplish this task in a few moments.</para>
diff --git a/zh_TW.Big5/books/handbook/mail/chapter.xml b/zh_TW.Big5/books/handbook/mail/chapter.xml
index cdbd8183db..fe4683e079 100644
--- a/zh_TW.Big5/books/handbook/mail/chapter.xml
+++ b/zh_TW.Big5/books/handbook/mail/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!--
The FreeBSD Documentation Project
@@ -1699,11 +1699,11 @@ SENDMAIL_LDADD=-lsasl2</programlisting>
<para>Recompile <application>sendmail</application> by executing the following commands:</para>
<screen>&prompt.root; <userinput>cd /usr/src/lib/libsmutil</userinput>
-&prompt.root; <userinput>make cleandir && make obj && make</userinput>
+&prompt.root; <userinput>make cleandir && make obj && make</userinput>
&prompt.root; <userinput>cd /usr/src/lib/libsm</userinput>
-&prompt.root; <userinput>make cleandir && make obj && make</userinput>
+&prompt.root; <userinput>make cleandir && make obj && make</userinput>
&prompt.root; <userinput>cd /usr/src/usr.sbin/sendmail</userinput>
-&prompt.root; <userinput>make cleandir && make obj && make && make install</userinput></screen>
+&prompt.root; <userinput>make cleandir && make obj && make && make install</userinput></screen>
<para>The compile of <application>sendmail</application> should not have any problems
if <filename>/usr/src</filename> has not been changed extensively
diff --git a/zh_TW.Big5/books/handbook/mirrors/chapter.xml b/zh_TW.Big5/books/handbook/mirrors/chapter.xml
index 8c525d3737..355ba68d8c 100644
--- a/zh_TW.Big5/books/handbook/mirrors/chapter.xml
+++ b/zh_TW.Big5/books/handbook/mirrors/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!--
The FreeBSD Documentation Project
@@ -270,6 +270,10 @@
methods available for each site are provided in parentheses
after the hostname.</para>
+ &chap.mirrors.ftp.index.inc;
+
+ &chap.mirrors.lastmod.inc;
+
&chap.mirrors.ftp.inc;
</sect1>
@@ -2323,6 +2327,10 @@ doc/zh_*</screen>
<para><link linkend="cvsup">CVSup</link> servers for FreeBSD are running
at the following sites:</para>
+ &chap.mirrors.cvsup.index.inc;
+
+ &chap.mirrors.lastmod.inc;
+
&chap.mirrors.cvsup.inc;
</sect2>
</sect1>
diff --git a/zh_TW.Big5/books/handbook/multimedia/chapter.xml b/zh_TW.Big5/books/handbook/multimedia/chapter.xml
index 5f4e5ff04f..1d0756d4d9 100644
--- a/zh_TW.Big5/books/handbook/multimedia/chapter.xml
+++ b/zh_TW.Big5/books/handbook/multimedia/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!--
The FreeBSD Documentation Project
diff --git a/zh_TW.Big5/books/handbook/network-servers/chapter.xml b/zh_TW.Big5/books/handbook/network-servers/chapter.xml
index db5c8a9d23..92a98f24de 100644
--- a/zh_TW.Big5/books/handbook/network-servers/chapter.xml
+++ b/zh_TW.Big5/books/handbook/network-servers/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!--
The FreeBSD Documentation Project
diff --git a/zh_TW.Big5/books/handbook/pgpkeys/chapter.xml b/zh_TW.Big5/books/handbook/pgpkeys/chapter.xml
index 76a9b52ab0..048980e0fc 100644
--- a/zh_TW.Big5/books/handbook/pgpkeys/chapter.xml
+++ b/zh_TW.Big5/books/handbook/pgpkeys/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!--
The FreeBSD Documentation Project
diff --git a/zh_TW.Big5/books/handbook/ports/chapter.xml b/zh_TW.Big5/books/handbook/ports/chapter.xml
index 2f02e8dc4f..fa6bb9e6be 100644
--- a/zh_TW.Big5/books/handbook/ports/chapter.xml
+++ b/zh_TW.Big5/books/handbook/ports/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!--
The FreeBSD Documentation Project
diff --git a/zh_TW.Big5/books/handbook/ppp-and-slip/chapter.xml b/zh_TW.Big5/books/handbook/ppp-and-slip/chapter.xml
index 63f249fff9..234cd31fd2 100644
--- a/zh_TW.Big5/books/handbook/ppp-and-slip/chapter.xml
+++ b/zh_TW.Big5/books/handbook/ppp-and-slip/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!--
The FreeBSD Documentation Project
@@ -394,7 +394,7 @@
</varlistentry>
<varlistentry>
- <term>Line 6 & 7:</term>
+ <term>Line 6 & 7:</term>
<listitem>
<indexterm><primary>PPP</primary><secondary>user PPP</secondary></indexterm>
@@ -474,7 +474,7 @@
</varlistentry>
<varlistentry>
- <term>Line 13 & 14:</term>
+ <term>Line 13 & 14:</term>
<listitem>
<para>Identifies the user name and password. When
@@ -1705,7 +1705,7 @@ reinput 1 {\255}
if success goto slhup
reinput 1 {\127}
if success goto slhup
-if < \%x 60 goto look
+if < \%x 60 goto look
else goto slhup
:sllogin ; login
@@ -1726,7 +1726,7 @@ reinput 1 {\255}
if success goto slhup
reinput 1 {\127}
if success goto slhup
-if < \%x 10 goto slloop ; try 10 times to get a login prompt
+if < \%x 10 goto slloop ; try 10 times to get a login prompt
else goto slhup ; hang up and start again if 10 failures
:sluid
diff --git a/zh_TW.Big5/books/handbook/preface/preface.xml b/zh_TW.Big5/books/handbook/preface/preface.xml
index d0e0df49fb..5c0bfca6e1 100644
--- a/zh_TW.Big5/books/handbook/preface/preface.xml
+++ b/zh_TW.Big5/books/handbook/preface/preface.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!--
$FreeBSD$
Original revision: 1.30
diff --git a/zh_TW.Big5/books/handbook/printing/chapter.xml b/zh_TW.Big5/books/handbook/printing/chapter.xml
index 70a39ed58a..acec03c739 100644
--- a/zh_TW.Big5/books/handbook/printing/chapter.xml
+++ b/zh_TW.Big5/books/handbook/printing/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!--
The FreeBSD Traditional Chinese Documentation Project
diff --git a/zh_TW.Big5/books/handbook/security/chapter.xml b/zh_TW.Big5/books/handbook/security/chapter.xml
index 46de8b93d5..bc48598f6d 100644
--- a/zh_TW.Big5/books/handbook/security/chapter.xml
+++ b/zh_TW.Big5/books/handbook/security/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!--
The FreeBSD Documentation Project
@@ -4771,7 +4771,7 @@ drwxr-xr-x 2 robert robert 512 Nov 10 11:54 public_html</programlisting>
<para>To begin using <application>Portaudit</application>, one
must install it from the Ports Collection:</para>
- <screen>&prompt.root; <userinput>cd /usr/ports/security/portaudit && make install clean</userinput></screen>
+ <screen>&prompt.root; <userinput>cd /usr/ports/security/portaudit && make install clean</userinput></screen>
<para>During the install process, the configuration files for
&man.periodic.8; will be updated, permitting
diff --git a/zh_TW.Big5/books/handbook/serialcomms/chapter.xml b/zh_TW.Big5/books/handbook/serialcomms/chapter.xml
index 69baac15f3..5725f9b081 100644
--- a/zh_TW.Big5/books/handbook/serialcomms/chapter.xml
+++ b/zh_TW.Big5/books/handbook/serialcomms/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!--
The FreeBSD Documentation Project
diff --git a/zh_TW.Big5/books/handbook/users/chapter.xml b/zh_TW.Big5/books/handbook/users/chapter.xml
index 602de85923..39c1f2b237 100644
--- a/zh_TW.Big5/books/handbook/users/chapter.xml
+++ b/zh_TW.Big5/books/handbook/users/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!--
The FreeBSD Documentation Project
diff --git a/zh_TW.Big5/books/handbook/vinum/chapter.xml b/zh_TW.Big5/books/handbook/vinum/chapter.xml
index ced70471b0..1e8a1cc888 100644
--- a/zh_TW.Big5/books/handbook/vinum/chapter.xml
+++ b/zh_TW.Big5/books/handbook/vinum/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!--
The Vinum Volume Manager
By Greg Lehey (grog at lemis dot com)
diff --git a/zh_TW.Big5/books/handbook/virtualization/chapter.xml b/zh_TW.Big5/books/handbook/virtualization/chapter.xml
index 953e60f87c..5601b4b410 100644
--- a/zh_TW.Big5/books/handbook/virtualization/chapter.xml
+++ b/zh_TW.Big5/books/handbook/virtualization/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Traditional Chinese Documentation Project
diff --git a/zh_TW.Big5/books/handbook/x11/chapter.xml b/zh_TW.Big5/books/handbook/x11/chapter.xml
index dde7754e40..1e50725cc1 100644
--- a/zh_TW.Big5/books/handbook/x11/chapter.xml
+++ b/zh_TW.Big5/books/handbook/x11/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!--
The FreeBSD Documentation Project
@@ -276,7 +276,7 @@
<para><application>&xorg;</application> �O &os; �w�]�� X11 ��@�C
<application>&xorg;</application> �O�� X.Org ����|�ҵo�椧�}�X�n��
X Window �t�ι�@�� X server�C <application>&xorg;</application>
- �D�O�H <application>&xfree86 4.4RC2</application> �H�� X11R6.6
+ �D�O�H <application>&xfree86; 4.4RC2</application> �H�� X11R6.6
����¦�Ҳ��ͪ��C �ثe &os; Ports Collection ����
<application>&xorg;</application> ������ &xorg.version;�C</para>
diff --git a/zh_TW.Big5/books/porters-handbook/book.xml b/zh_TW.Big5/books/porters-handbook/book.xml
index e77cf24e87..bdd7379336 100644
--- a/zh_TW.Big5/books/porters-handbook/book.xml
+++ b/zh_TW.Big5/books/porters-handbook/book.xml
@@ -3512,8 +3512,8 @@ PKGNAMESUFFIX= ${RESOLUTION}
:
# default
RESOLUTION?= 300
-.if ${RESOLUTION} != 118 && ${RESOLUTION} != 240 && \
- ${RESOLUTION} != 300 && ${RESOLUTION} != 400
+.if ${RESOLUTION} != 118 && ${RESOLUTION} != 240 && \
+ ${RESOLUTION} != 300 && ${RESOLUTION} != 400
@${ECHO_MSG} "Error: invalid value for RESOLUTION: \"${RESOLUTION}\""
@${ECHO_MSG} "Possible values are: 118, 240, 300 (default) and 400."
@${FALSE}
@@ -4053,7 +4053,7 @@ PORTVERSION= 1.0</programlisting>
<programlisting>post-install:
${MKDIR} ${EXAMPLESDIR}
- (cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} \* ${EXAMPLESDIR})</programlisting>
+ (cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} \* ${EXAMPLESDIR})</programlisting>
<para>This example will install the contents of
<filename>examples</filename> directory in the vendor distfile to the
@@ -4061,7 +4061,7 @@ PORTVERSION= 1.0</programlisting>
<programlisting>post-install:
${MKDIR} ${DATADIR}/summer
- (cd ${WRKSRC}/temperatures/ && ${COPYTREE_SHARE} "June July August" ${DATADIR}/summer/)</programlisting>
+ (cd ${WRKSRC}/temperatures/ && ${COPYTREE_SHARE} "June July August" ${DATADIR}/summer/)</programlisting>
<para>And this example will install the data of summer months to the
<filename>summer</filename> subdirectory of a
@@ -4074,7 +4074,7 @@ PORTVERSION= 1.0</programlisting>
<programlisting>post-install:
${MKDIR} ${EXAMPLESDIR}
- (cd ${WRKSRC}/examples/ && \
+ (cd ${WRKSRC}/examples/ && \
${COPYTREE_SHARE} \* ${EXAMPLESDIR} "! -name Makefile")</programlisting>
<para>Note that these macros does not add the installed files to
@@ -5662,7 +5662,7 @@ QT_COMPONENTS= gui moc_build qmake_build rcc_build uic_build</programlisting>
<programlisting>HAS_CONFIGURE= yes
do-configure:
- @cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
+ @cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
${QMAKE} -unix PREFIX=${PREFIX} texmaker.pro</programlisting>
<para>Note the similarity to the <command>qmake</command> line
@@ -8092,7 +8092,7 @@ CFLAGS+= -DLUA_VERSION_STRING="${VER_STR}"
chapter</ulink>. Detailed explanation of available commands is
provided in
&man.rc.8; and &man.rc.subr.8;. Finally, there is
- <ulink url="&url.articles.rc-scripting.en">an article</ulink>
+ <ulink url="&url.articles.rc-scripting.en;">an article</ulink>
on practical aspects of <filename>rc.d</filename> scripting.</para>
<para>One or more rc scripts can be installed:</para>
@@ -8421,7 +8421,7 @@ etc/orbit.conf.sample
<para>��o�ؿ��[�c�s��s�ɮסC</para>
- <screen>&prompt.root; <userinput>(cd /var/tmp/$(make -V PORTNAME) && find -d * -type d) | sort > OLD-DIRS</userinput></screen>
+ <screen>&prompt.root; <userinput>(cd /var/tmp/$(make -V PORTNAME) && find -d * -type d) | sort > OLD-DIRS</userinput></screen>
<para>�s�W�Ū� <filename>pkg-plist</filename> �ɮסG</para>
@@ -8431,11 +8431,11 @@ etc/orbit.conf.sample
���۴N�i�H�w�˸� port �ò����ɮײM��C</para>
<screen>&prompt.root; <userinput>make install PREFIX=/var/tmp/$(make -V PORTNAME)</userinput>
-&prompt.root; <userinput>(cd /var/tmp/$(make -V PORTNAME) && find -d * \! -type d) | sort > pkg-plist</userinput></screen>
+&prompt.root; <userinput>(cd /var/tmp/$(make -V PORTNAME) && find -d * \! -type d) | sort > pkg-plist</userinput></screen>
<para>�o�ɭn�O�o��s�ت��ؿ��A�]�[���ɮײM�椺�C</para>
- <screen>&prompt.root; <userinput>(cd /var/tmp/$(make -V PORTNAME) && find -d * -type d) | sort | comm -13 OLD-DIRS - | sort -r | sed -e 's#^#@dirrm #' >> pkg-plist</userinput></screen>
+ <screen>&prompt.root; <userinput>(cd /var/tmp/$(make -V PORTNAME) && find -d * -type d) | sort | comm -13 OLD-DIRS - | sort -r | sed -e 's#^#@dirrm #' >> pkg-plist</userinput></screen>
<para>�̫�A�z���Ӥ�ʾ�z�ɮײM��]�o���O�����۰ʤƳB�z���^�CMan page �h���ӧQ�� <makevar>MAN<replaceable>n</replaceable></makevar> ���覡
�g�b port �� <filename>Makefile</filename> �Ӥ��O�g�b�ɮײM�椤�C
@@ -9408,7 +9408,7 @@ as .putsy.conf and edit it.</programlisting>
add your new entry to the VuXML database. Please verify
its syntax after that as follows:</para>
- <screen>&prompt.user; <userinput>cd ${PORTSDIR}/security/vuxml && make validate</userinput></screen>
+ <screen>&prompt.user; <userinput>cd ${PORTSDIR}/security/vuxml && make validate</userinput></screen>
<note>
<para>You will need at least one of the following packages
diff --git a/zh_TW.Big5/share/xml/urls.ent b/zh_TW.Big5/share/xml/urls.ent
index 66a5957beb..d712a047fa 100644
--- a/zh_TW.Big5/share/xml/urls.ent
+++ b/zh_TW.Big5/share/xml/urls.ent
@@ -5,42 +5,12 @@
The FreeBSD Traditional Chinese Project
Original revision: 1.13
-->
-<!ENTITY % freebsd.urls.absolute "IGNORE">
-<!ENTITY % freebsd.urls.relprefix.1 "IGNORE">
-<!ENTITY % freebsd.urls.relprefix.2 "IGNORE">
-<!ENTITY % freebsd.urls.relprefix.3 "IGNORE">
-<!ENTITY % freebsd.urls.relprefix.4 "IGNORE">
-<!ENTITY % freebsd.urls.relprefix.5 "IGNORE">
-<!ENTITY % freebsd.urls.relprefix.6 "IGNORE">
-<!ENTITY % freebsd.urls.relprefix.7 "IGNORE">
-<!ENTITY % freebsd.urls.relprefix.8 "IGNORE">
<!-- Do not edit: start here -->
-<![%freebsd.urls.relprefix.1;[
- <!ENTITY url.relprefix "..">
-]]>
-<![%freebsd.urls.relprefix.2;[
- <!ENTITY url.relprefix "../..">
-]]>
-<![%freebsd.urls.relprefix.3;[
- <!ENTITY url.relprefix "../../..">
-]]>
-<![%freebsd.urls.relprefix.4;[
- <!ENTITY url.relprefix "../../../..">
-]]>
-<![%freebsd.urls.relprefix.5;[
- <!ENTITY url.relprefix "../../../../..">
-]]>
-<![%freebsd.urls.relprefix.6;[
- <!ENTITY url.relprefix "../../../../../..">
-]]>
-<![%freebsd.urls.relprefix.7;[
- <!ENTITY url.relprefix "../../../../../../..">
-]]>
-<![%freebsd.urls.relprefix.8;[
- <!ENTITY url.relprefix "../../../../../../../..">
-]]>
+<!ENTITY % freebsd.urls.absolute "IGNORE">
+
+<!ENTITY url.relprefix "../../../..">
<![ %freebsd.urls.absolute; [
<!ENTITY url.base "http://www.FreeBSD.org">
From f810e926a92b99a90abbfc35151286fecc54fae5 Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Wed, 23 Jan 2013 09:11:13 +0000
Subject: [PATCH 022/121] - Upgrade DTD to DocBook 4.5, porting our custom
extensions
---
share/xml/catalog | 4 ++--
share/xml/catalog.xml | 4 ++--
share/xml/{freebsd42.dtd => freebsd45.dtd} | 6 ++++--
3 files changed, 8 insertions(+), 6 deletions(-)
rename share/xml/{freebsd42.dtd => freebsd45.dtd} (90%)
diff --git a/share/xml/catalog b/share/xml/catalog
index a88f2bd23e..524dd812dc 100644
--- a/share/xml/catalog
+++ b/share/xml/catalog
@@ -11,8 +11,8 @@
documentation, even though the listed language is "EN"
--
-PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "freebsd42.dtd"
+PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "freebsd45.dtd"
PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
"freebsd.dsl"
diff --git a/share/xml/catalog.xml b/share/xml/catalog.xml
index dfbd757cdd..7b14607ae2 100644
--- a/share/xml/catalog.xml
+++ b/share/xml/catalog.xml
@@ -15,8 +15,8 @@
rewritePrefix="../../"/>
<public
- publicId="-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- uri="freebsd42.dtd"/>
+ publicId="-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ uri="freebsd45.dtd"/>
<!--
<public
diff --git a/share/xml/freebsd42.dtd b/share/xml/freebsd45.dtd
similarity index 90%
rename from share/xml/freebsd42.dtd
rename to share/xml/freebsd45.dtd
index e86f9cc16b..055e722c83 100644
--- a/share/xml/freebsd42.dtd
+++ b/share/xml/freebsd45.dtd
@@ -7,8 +7,10 @@
<!ENTITY % filename.element "IGNORE">
-<!ENTITY % orig-docbook PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "/usr/local/share/xml/docbook/4.2/docbookx.dtd">
+<!ENTITY % ISOgrk4.module "IGNORE">
+
+<!ENTITY % orig-docbook PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+ "/usr/local/share/xml/docbook/4.5/docbookx.dtd">
%orig-docbook;
<!ELEMENT hostid (%cptr.char.mix;)*>
From 96516463e7ced793b49e3ab18ee26bf0c0edbc64 Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Wed, 23 Jan 2013 13:05:32 +0000
Subject: [PATCH 023/121] - Add some basic customization to the XSL FO
stylesheets
---
share/xsl/freebsd-fo.xsl | 58 +++++++++++++++++++++++++++++++++++++++-
1 file changed, 57 insertions(+), 1 deletion(-)
diff --git a/share/xsl/freebsd-fo.xsl b/share/xsl/freebsd-fo.xsl
index 4b3ced1abb..725ed0a268 100644
--- a/share/xsl/freebsd-fo.xsl
+++ b/share/xsl/freebsd-fo.xsl
@@ -3,8 +3,9 @@
<!-- $FreeBSD$ -->
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ xmlns:fo="http://www.w3.org/1999/XSL/Format"
+ xmlns="http://www.w3.org/TR/xhtml1/transitional"
version='1.0'
- xmlns="http://www.w3.org/TR/xhtml1/transitional"
exclude-result-prefixes="#default">
<!-- Pull in the base stylesheets -->
@@ -27,5 +28,60 @@
<!-- FO specific customisation goes here -->
+ <xsl:param name="use.extensions" select="1"/>
+ <xsl:param name="fop1.extensions" select="1"/>
+
+<!--
+ <xsl:param name="hyphenate.verbatim" select="1"/>
+-->
+ <xsl:param name="header.column.widths">1 5 1</xsl:param>
+
+
+<xsl:template match="pubdate" mode="article.titlepage.recto.auto.mode"/>
+
+<xsl:attribute-set name="abstract.title.properties">
+ <xsl:attribute name="font-size">
+ <xsl:value-of select="$body.font.master * 2.0736"></xsl:value-of>
+ <xsl:text>pt</xsl:text>
+ </xsl:attribute>
+ <xsl:attribute name="text-align">left</xsl:attribute>
+</xsl:attribute-set>
+
+<xsl:attribute-set name="abstract.properties">
+ <xsl:attribute name="margin-left">0</xsl:attribute>
+ <xsl:attribute name="margin-right">0</xsl:attribute>
+ <xsl:attribute name="padding-left">0</xsl:attribute>
+ <xsl:attribute name="padding-right">0</xsl:attribute>
+</xsl:attribute-set>
+
+<xsl:attribute-set name="toc.margin.properties">
+ <xsl:attribute name="margin-left">
+ <xsl:value-of select="'0'"/>
+ </xsl:attribute>
+ <xsl:attribute name="margin-right">
+ <xsl:value-of select="'0'"/>
+ </xsl:attribute>
+ <xsl:attribute name="padding-left">
+ <xsl:value-of select="'0'"/>
+ </xsl:attribute>
+ <xsl:attribute name="padding-right">
+ <xsl:value-of select="'0'"/>
+ </xsl:attribute>
+</xsl:attribute-set>
+
+<!--
+<xsl:template match="legalnotice" mode="article.titlepage.recto.auto.mode">
+ <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="article.titlepage.recto.style" text-align="start" font-family="{$body.fontset}">
+ <xsl:apply-templates select="." mode="article.titlepage.recto.mode"/>
+ </fo:block>
+</xsl:template>
+-->
+
+<xsl:template match="abstract" mode="article.titlepage.recto.auto.mode">
+<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="article.titlepage.recto.style" space-before="0.5em" text-align="start" margin-left="0.5in" margin-right="0.5in" font-family="{$body.fontset}">
+<xsl:apply-templates select="." mode="article.titlepage.recto.mode"/>
+</fo:block>
+</xsl:template>
+
</xsl:stylesheet>
From d85fd456260befdf76cb80bda9fc8907cf3cb69d Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Wed, 23 Jan 2013 13:05:57 +0000
Subject: [PATCH 024/121] - Cleanup
---
share/xsl/freebsd-common.xsl | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/share/xsl/freebsd-common.xsl b/share/xsl/freebsd-common.xsl
index d4f067e2ec..52f2d9c519 100644
--- a/share/xsl/freebsd-common.xsl
+++ b/share/xsl/freebsd-common.xsl
@@ -3,9 +3,7 @@
<!-- $FreeBSD$ -->
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- version='1.0'
- xmlns="http://www.w3.org/TR/xhtml1/transitional"
- exclude-result-prefixes="#default">
+ version='1.0'>
<!-- Global customisation -->
From 270c3b26d3a7f67db550e04707a5e66814a876a8 Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Wed, 23 Jan 2013 13:13:16 +0000
Subject: [PATCH 025/121] - Reorganize stylesheets for easier customization
---
share/xsl/freebsd-fo.xsl | 7 +++----
.../{default.xsl => freebsd-xhtml-chunk.xsl} | 6 +++---
...ebsd-html.xsl => freebsd-xhtml-common.xsl} | 11 +++++++++--
...eebsd-html-chunk.xsl => freebsd-xhtml.xsl} | 7 +++----
share/xsl/freebsd.xsl | 19 -------------------
5 files changed, 18 insertions(+), 32 deletions(-)
rename share/xsl/{default.xsl => freebsd-xhtml-chunk.xsl} (65%)
rename share/xsl/{freebsd-html.xsl => freebsd-xhtml-common.xsl} (78%)
rename share/xsl/{freebsd-html-chunk.xsl => freebsd-xhtml.xsl} (63%)
delete mode 100644 share/xsl/freebsd.xsl
diff --git a/share/xsl/freebsd-fo.xsl b/share/xsl/freebsd-fo.xsl
index 725ed0a268..be0987069b 100644
--- a/share/xsl/freebsd-fo.xsl
+++ b/share/xsl/freebsd-fo.xsl
@@ -11,6 +11,9 @@
<!-- Pull in the base stylesheets -->
<xsl:import href="/usr/local/share/xsl/docbook/fo/docbook.xsl"/>
+ <!-- Include the common customizations -->
+ <xsl:include href="freebsd-common.xsl"/>
+
<!-- Redefine variables, and replace templates as necessary here -->
<xsl:param name="freebsd.output.print"
@@ -22,10 +25,6 @@
<xsl:param name="freebsd.output.print.twoside"
select="'0'"/>
- <!-- Include the common stylesheets -->
-
- <xsl:include href="freebsd-common.xsl"/>
-
<!-- FO specific customisation goes here -->
<xsl:param name="use.extensions" select="1"/>
diff --git a/share/xsl/default.xsl b/share/xsl/freebsd-xhtml-chunk.xsl
similarity index 65%
rename from share/xsl/default.xsl
rename to share/xsl/freebsd-xhtml-chunk.xsl
index 29122aadc4..635c922d13 100644
--- a/share/xsl/default.xsl
+++ b/share/xsl/freebsd-xhtml-chunk.xsl
@@ -8,9 +8,9 @@
exclude-result-prefixes="#default">
<!-- Pull in the base stylesheets -->
- <xsl:import href="freebsd.xsl"/>
-
- <!-- Redefine variables, and replace templates as necessary here -->
+ <xsl:import href="/usr/local/share/xsl/docbook/xhtml/chunk.xsl"/>
+ <!-- Pull in common XHTML customizations -->
+ <xsl:include href="freebsd-xhtml-common.xsl"/>
</xsl:stylesheet>
diff --git a/share/xsl/freebsd-html.xsl b/share/xsl/freebsd-xhtml-common.xsl
similarity index 78%
rename from share/xsl/freebsd-html.xsl
rename to share/xsl/freebsd-xhtml-common.xsl
index f493e29fb4..ded9e0f2ab 100644
--- a/share/xsl/freebsd-html.xsl
+++ b/share/xsl/freebsd-xhtml-common.xsl
@@ -8,7 +8,11 @@
exclude-result-prefixes="#default">
<!-- Pull in the base stylesheets -->
- <xsl:import href="/usr/local/share/xsl/docbook/html/docbook.xsl"/>
+ <!-- XXX hardcoded path. Very bad. Should be turned in to a paramater -->
+ <xsl:import href="/usr/local/share/xml/docbook/xsl/modular/html/docbook.xsl"/>
+
+ <!-- Include the common customizations -->
+ <xsl:include href="freebsd-common.xsl"/>
<!-- Redefine variables, and replace templates as necessary here -->
<xsl:param name="freebsd.output.html" select="'0'"/>
@@ -31,5 +35,8 @@
contacting <<a href="mailto:questions@FreeBSD.org">questions@FreeBSD.org</a>>.<br/>
For questions about this documentation, e-mail <<a href="mailto:doc@FreeBSD.org">doc@FreeBSD.org</a>>.</small></p>
</xsl:template>
-</xsl:stylesheet>
+ <xsl:template match="hostid|username|groupname|devicename|maketarget|makevar">
+ <xsl:call-template name="inline.monoseq"/>
+ </xsl:template>
+</xsl:stylesheet>
diff --git a/share/xsl/freebsd-html-chunk.xsl b/share/xsl/freebsd-xhtml.xsl
similarity index 63%
rename from share/xsl/freebsd-html-chunk.xsl
rename to share/xsl/freebsd-xhtml.xsl
index b274add9d5..bcb0c26738 100644
--- a/share/xsl/freebsd-html-chunk.xsl
+++ b/share/xsl/freebsd-xhtml.xsl
@@ -8,10 +8,9 @@
exclude-result-prefixes="#default">
<!-- Pull in the base stylesheets -->
- <xsl:import href="/usr/local/share/xsl/docbook/html/chunk.xsl"/>
+ <xsl:import href="/usr/local/share/xsl/docbook/xhtml/docbook.xsl"/>
- <!-- Redefine variables, and replace templates as necessary here -->
-
- <xsl:include href="freebsd-common.xsl"/>
+ <!-- Pull in common XHTML customizations -->
+ <xsl:include href="freebsd-xhtml-common.xsl"/>
</xsl:stylesheet>
diff --git a/share/xsl/freebsd.xsl b/share/xsl/freebsd.xsl
deleted file mode 100644
index 0d0e09fa1c..0000000000
--- a/share/xsl/freebsd.xsl
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version='1.0'?>
-
-<!-- $FreeBSD$ -->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- version='1.0'
- xmlns="http://www.w3.org/TR/xhtml1/transitional"
- exclude-result-prefixes="#default">
-
- <!-- Pull in the base stylesheets -->
- <!-- XXX hardcoded path. Very bad. Should be turned in to a paramater -->
- <xsl:import href="/usr/local/share/xml/docbook/xsl/modular/html/docbook.xsl"/>
-
- <!-- Redefine variables, and replace templates as necessary here -->
- <xsl:template match="hostid|username|groupname|devicename|maketarget|makevar">
- <xsl:call-template name="inline.monoseq"/>
- </xsl:template>
-
-</xsl:stylesheet>
From 36cdb51546f0d2bcfd977ea33b449f24bf71768f Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Wed, 30 Jan 2013 14:00:53 +0000
Subject: [PATCH 026/121] - Migrate the documentation set to DocBook 4.5
---
.../articles/explaining-bsd/article.xml | 6 ++---
.../articles/new-users/article.xml | 6 ++---
.../articles/ipsec-must/article.xml | 7 ++----
da_DK.ISO8859-1/articles/pxe/article.xml | 9 +++----
da_DK.ISO8859-1/share/xml/catalog | 3 +++
da_DK.ISO8859-1/share/xml/catalog.xml | 20 +++++++++++++++
.../articles/contributing-ports/article.xml | 8 ++----
.../articles/contributing/article.xml | 8 ++----
.../articles/explaining-bsd/article.xml | 7 ++----
de_DE.ISO8859-1/articles/laptop/article.xml | 7 ++----
.../articles/linux-comparison/article.xml | 8 ++----
.../articles/new-users/article.xml | 7 ++----
.../articles/solid-state/article.xml | 7 ++----
.../books/developers-handbook/book.xml | 6 ++---
de_DE.ISO8859-1/books/faq/book.xml | 6 ++---
de_DE.ISO8859-1/books/fdp-primer/book.xml | 6 ++---
de_DE.ISO8859-1/books/handbook/book.xml | 7 ++----
.../books/porters-handbook/book.xml | 7 ++----
de_DE.ISO8859-1/share/xml/catalog | 2 +-
de_DE.ISO8859-1/share/xml/catalog.xml | 9 ++++++-
el_GR.ISO8859-7/articles/bsdl-gpl/article.xml | 7 ++----
.../articles/compiz-fusion/article.xml | 8 ++----
.../articles/contributing/article.xml | 8 ++----
.../articles/cvs-freebsd/article.xml | 8 ++----
.../articles/explaining-bsd/article.xml | 7 ++----
.../articles/freebsd-questions/article.xml | 7 ++----
.../articles/gjournal-desktop/article.xml | 7 ++----
.../greek-language-support/article.xml | 6 ++---
el_GR.ISO8859-7/articles/laptop/article.xml | 7 ++----
.../articles/linux-users/article.xml | 8 ++----
.../articles/mailing-list-faq/article.xml | 7 ++----
el_GR.ISO8859-7/articles/nanobsd/article.xml | 7 ++----
.../articles/new-users/article.xml | 7 ++----
.../articles/problem-reports/article.xml | 7 ++----
.../articles/releng-packages/article.xml | 7 ++----
el_GR.ISO8859-7/articles/releng/article.xml | 6 ++---
el_GR.ISO8859-7/books/faq/book.xml | 6 ++---
el_GR.ISO8859-7/books/handbook/book.xml | 7 ++----
el_GR.ISO8859-7/share/xml/catalog | 2 +-
el_GR.ISO8859-7/share/xml/catalog.xml | 4 +++
en_US.ISO8859-1/articles/bsdl-gpl/article.xml | 7 ++----
.../articles/building-products/article.xml | 7 ++----
.../casestudy-argentina.com/article.xml | 7 ++----
.../articles/committers-guide/article.xml | 7 ++----
.../articles/compiz-fusion/article.xml | 7 ++----
.../articles/console-server/article.xml | 7 ++----
.../articles/contributing-ports/article.xml | 7 ++----
.../articles/contributing/article.xml | 7 ++----
.../articles/contributors/article.xml | 7 ++----
en_US.ISO8859-1/articles/cups/article.xml | 7 ++----
.../articles/custom-gcc/article.xml | 7 ++----
.../articles/cvs-freebsd/article.xml | 7 ++----
.../articles/cvsup-advanced/article.xml | 7 ++----
.../articles/explaining-bsd/article.xml | 7 ++----
.../articles/fbsd-from-scratch/article.xml | 6 ++---
.../articles/filtering-bridges/article.xml | 7 ++----
en_US.ISO8859-1/articles/fonts/article.xml | 7 ++----
.../articles/freebsd-questions/article.xml | 7 ++----
.../freebsd-update-server/article.xml | 6 ++---
.../articles/geom-class/article.xml | 7 ++----
.../articles/gjournal-desktop/article.xml | 7 ++----
en_US.ISO8859-1/articles/hubs/article.xml | 7 ++----
.../articles/ipsec-must/article.xml | 7 ++----
en_US.ISO8859-1/articles/laptop/article.xml | 7 ++----
.../articles/ldap-auth/article.xml | 7 ++----
.../articles/linux-comparison/article.xml | 7 ++----
.../articles/linux-emulation/article.xml | 7 ++----
.../articles/linux-users/article.xml | 7 ++----
.../articles/mailing-list-faq/article.xml | 7 ++----
en_US.ISO8859-1/articles/mh/article.xml | 7 ++----
en_US.ISO8859-1/articles/nanobsd/article.xml | 7 ++----
.../articles/new-users/article.xml | 7 ++----
.../articles/p4-primer/article.xml | 7 ++----
en_US.ISO8859-1/articles/pam/article.xml | 7 ++----
.../port-mentor-guidelines/article.xml | 7 ++----
.../articles/portbuild/article.xml | 7 ++----
.../articles/pr-guidelines/article.xml | 6 ++---
.../articles/problem-reports/article.xml | 7 ++----
.../articles/rc-scripting/article.xml | 7 ++----
.../articles/relaydelay/article.xml | 8 ++----
.../articles/releng-packages/article.xml | 7 ++----
en_US.ISO8859-1/articles/releng/article.xml | 6 ++---
.../articles/remote-install/article.xml | 7 ++----
.../articles/serial-uart/article.xml | 7 ++----
.../articles/solid-state/article.xml | 7 ++----
.../articles/vm-design/article.xml | 7 ++----
.../articles/wp-toolbox/article.xml | 6 ++---
en_US.ISO8859-1/books/arch-handbook/book.xml | 6 ++---
en_US.ISO8859-1/books/bibliography/book.xml | 6 ++---
en_US.ISO8859-1/books/corp-net-guide/book.xml | 7 ++----
en_US.ISO8859-1/books/design-44bsd/book.xml | 7 ++----
en_US.ISO8859-1/books/dev-model/book.xml | 6 ++---
.../books/developers-handbook/book.xml | 6 ++---
en_US.ISO8859-1/books/faq/book.xml | 6 ++---
en_US.ISO8859-1/books/fdp-primer/book.xml | 6 ++---
en_US.ISO8859-1/books/handbook/book.xml | 7 ++----
en_US.ISO8859-1/books/pmake/book.xml | 6 ++---
.../books/porters-handbook/book.xml | 7 ++----
en_US.ISO8859-1/share/xml/catalog | 3 +++
en_US.ISO8859-1/share/xml/catalog.xml | 4 +++
en_US.ISO8859-1/share/xml/entities.ent | 10 ++++----
.../casestudy-argentina.com/article.xml | 7 ++----
.../articles/contributing/article.xml | 7 ++----
.../articles/cvs-freebsd/article.xml | 7 ++----
.../articles/explaining-bsd/article.xml | 7 ++----
.../articles/fbsd-from-scratch/article.xml | 6 ++---
es_ES.ISO8859-1/articles/fdp-es/article.xml | 7 ++----
es_ES.ISO8859-1/articles/laptop/article.xml | 7 ++----
.../articles/linux-comparison/article.xml | 7 ++----
.../articles/linux-users/article.xml | 7 ++----
.../articles/mailing-list-faq/article.xml | 7 ++----
es_ES.ISO8859-1/articles/nanobsd/article.xml | 7 ++----
.../articles/p4-primer/article.xml | 7 ++----
.../articles/problem-reports/article.xml | 7 ++----
es_ES.ISO8859-1/articles/releng/article.xml | 7 ++----
es_ES.ISO8859-1/books/faq/book.xml | 7 ++----
es_ES.ISO8859-1/books/handbook/book.xml | 7 ++----
es_ES.ISO8859-1/share/xml/catalog | 2 +-
es_ES.ISO8859-1/share/xml/catalog.xml | 4 +++
.../articles/building-products/article.xml | 8 ++----
.../articles/committers-guide/article.xml | 7 ++----
.../articles/contributing-ports/article.xml | 7 ++----
.../articles/contributing/article.xml | 8 ++----
.../articles/contributors/article.xml | 8 ++----
.../articles/cvsup-advanced/article.xml | 8 ++----
.../articles/explaining-bsd/article.xml | 7 ++----
.../articles/filtering-bridges/article.xml | 8 ++----
fr_FR.ISO8859-1/articles/fonts/article.xml | 8 ++----
.../articles/ipsec-must/article.xml | 8 ++----
fr_FR.ISO8859-1/articles/laptop/article.xml | 7 ++----
.../articles/linux-users/article.xml | 7 ++----
fr_FR.ISO8859-1/articles/mh/article.xml | 7 ++----
fr_FR.ISO8859-1/articles/nanobsd/article.xml | 7 ++----
.../articles/new-users/article.xml | 7 ++----
fr_FR.ISO8859-1/articles/pam/article.xml | 7 ++----
.../articles/pr-guidelines/article.xml | 7 ++----
.../articles/problem-reports/article.xml | 7 ++----
.../articles/releng-packages/article.xml | 7 ++----
.../books/developers-handbook/book.xml | 6 ++---
fr_FR.ISO8859-1/books/faq/book.xml | 6 ++---
fr_FR.ISO8859-1/books/fdp-primer/book.xml | 6 ++---
fr_FR.ISO8859-1/books/handbook/book.xml | 6 ++---
.../books/porters-handbook/book.xml | 7 ++----
fr_FR.ISO8859-1/share/xml/catalog | 2 +-
fr_FR.ISO8859-1/share/xml/catalog.xml | 3 +++
.../articles/compiz-fusion/article.xml | 7 ++----
hu_HU.ISO8859-2/articles/cups/article.xml | 7 ++----
.../articles/explaining-bsd/article.xml | 7 ++----
.../articles/gjournal-desktop/article.xml | 7 ++----
hu_HU.ISO8859-2/articles/laptop/article.xml | 7 ++----
.../articles/linux-comparison/article.xml | 7 ++----
.../articles/linux-users/article.xml | 7 ++----
hu_HU.ISO8859-2/books/faq/book.xml | 6 ++---
hu_HU.ISO8859-2/books/fdp-primer/book.xml | 6 ++---
hu_HU.ISO8859-2/books/handbook/book.xml | 7 ++----
hu_HU.ISO8859-2/share/xml/catalog | 2 +-
hu_HU.ISO8859-2/share/xml/catalog.xml | 3 +++
.../articles/committers-guide/article.xml | 7 ++----
.../articles/explaining-bsd/article.xml | 7 ++----
.../articles/filtering-bridges/article.xml | 7 ++----
.../articles/new-users/article.xml | 7 ++----
.../articles/vm-design/article.xml | 7 ++----
it_IT.ISO8859-15/books/handbook/book.xml | 6 ++---
.../books/unix-introduction/book.xml | 6 ++---
it_IT.ISO8859-15/share/xml/catalog | 2 +-
it_IT.ISO8859-15/share/xml/catalog.xml | 3 +++
ja_JP.eucJP/articles/contributing/article.xml | 8 ++----
ja_JP.eucJP/articles/contributors/article.xml | 7 ++----
.../articles/fbsd-from-scratch/article.xml | 6 ++---
ja_JP.eucJP/articles/fonts/article.xml | 7 ++----
ja_JP.eucJP/articles/ipsec-must/article.xml | 7 ++----
.../articles/problem-reports/article.xml | 7 ++----
ja_JP.eucJP/books/design-44bsd/book.xml | 7 ++----
ja_JP.eucJP/books/faq/book.xml | 7 ++----
ja_JP.eucJP/books/fdp-primer/book.xml | 6 ++---
ja_JP.eucJP/books/handbook/book.xml | 7 ++----
ja_JP.eucJP/books/porters-handbook/book.xml | 7 ++----
ja_JP.eucJP/share/xml/catalog | 2 +-
ja_JP.eucJP/share/xml/catalog.xml | 3 +++
mn_MN.UTF-8/books/handbook/book.xml | 7 ++----
mn_MN.UTF-8/share/xml/catalog | 2 +-
mn_MN.UTF-8/share/xml/catalog.xml | 25 +++++++++++++++++++
.../articles/contributing-ports/article.xml | 8 ++----
.../articles/contributing/article.xml | 8 ++----
.../articles/explaining-bsd/article.xml | 7 ++----
.../articles/problem-reports/article.xml | 7 ++----
.../articles/solid-state/article.xml | 7 ++----
nl_NL.ISO8859-1/books/handbook/book.xml | 7 ++----
nl_NL.ISO8859-1/share/xml/catalog | 2 +-
nl_NL.ISO8859-1/share/xml/catalog.xml | 3 +++
.../articles/filtering-bridges/article.xml | 7 ++----
.../articles/new-users/article.xml | 7 ++----
pl_PL.ISO8859-2/books/handbook/book.xml | 6 ++---
pl_PL.ISO8859-2/share/xml/catalog | 2 +-
pl_PL.ISO8859-2/share/xml/catalog.xml | 22 ++++++++++++++++
.../articles/building-products/article.xml | 8 ++----
.../articles/contributing-ports/article.xml | 7 ++----
.../articles/contributing/article.xml | 7 ++----
.../articles/explaining-bsd/article.xml | 7 ++----
.../articles/freebsd-questions/article.xml | 7 ++----
.../freebsd-update-server/article.xml | 6 ++---
pt_BR.ISO8859-1/articles/hubs/article.xml | 8 ++----
.../articles/linux-users/article.xml | 7 ++----
.../articles/new-users/article.xml | 7 ++----
.../articles/problem-reports/article.xml | 7 ++----
pt_BR.ISO8859-1/books/faq/book.xml | 6 ++---
pt_BR.ISO8859-1/books/fdp-primer/book.xml | 7 ++----
pt_BR.ISO8859-1/books/handbook/book.xml | 6 ++---
pt_BR.ISO8859-1/share/xml/catalog.xml | 25 +++++++++++++++++++
.../articles/committers-guide/article.xml | 7 ++----
.../articles/console-server/article.xml | 7 ++----
.../articles/contributing/article.xml | 8 ++----
ru_RU.KOI8-R/articles/cups/article.xml | 8 ++----
ru_RU.KOI8-R/articles/custom-gcc/article.xml | 7 ++----
ru_RU.KOI8-R/articles/cvs-freebsd/article.xml | 7 ++----
.../articles/cvsup-advanced/article.xml | 7 ++----
.../articles/explaining-bsd/article.xml | 7 ++----
.../articles/fbsd-from-scratch/article.xml | 6 ++---
ru_RU.KOI8-R/articles/fonts/article.xml | 7 ++----
.../articles/freebsd-questions/article.xml | 7 ++----
ru_RU.KOI8-R/articles/geom-class/article.xml | 7 ++----
.../articles/gjournal-desktop/article.xml | 7 ++----
ru_RU.KOI8-R/articles/hubs/article.xml | 7 ++----
ru_RU.KOI8-R/articles/ipsec-must/article.xml | 7 ++----
ru_RU.KOI8-R/articles/laptop/article.xml | 7 ++----
.../articles/linux-comparison/article.xml | 7 ++----
.../articles/mailing-list-faq/article.xml | 7 ++----
ru_RU.KOI8-R/articles/mh/article.xml | 7 ++----
ru_RU.KOI8-R/articles/new-users/article.xml | 7 ++----
ru_RU.KOI8-R/articles/pam/article.xml | 7 ++----
ru_RU.KOI8-R/articles/portbuild/article.xml | 7 ++----
.../articles/pr-guidelines/article.xml | 6 ++---
.../articles/problem-reports/article.xml | 7 ++----
ru_RU.KOI8-R/articles/relaydelay/article.xml | 8 ++----
.../articles/releng-packages/article.xml | 7 ++----
ru_RU.KOI8-R/articles/releng/article.xml | 6 ++---
ru_RU.KOI8-R/articles/solid-state/article.xml | 7 ++----
ru_RU.KOI8-R/articles/vm-design/article.xml | 7 ++----
ru_RU.KOI8-R/books/design-44bsd/book.xml | 7 ++----
.../books/developers-handbook/book.xml | 6 ++---
ru_RU.KOI8-R/books/faq/book.xml | 6 ++---
ru_RU.KOI8-R/books/fdp-primer/book.xml | 6 ++---
ru_RU.KOI8-R/books/handbook/book.xml | 7 ++----
ru_RU.KOI8-R/books/porters-handbook/book.xml | 7 ++----
ru_RU.KOI8-R/share/xml/catalog | 2 +-
ru_RU.KOI8-R/share/xml/catalog.xml | 3 +++
share/xml/freebsd45.dtd | 4 +++
.../articles/explaining-bsd/article.xml | 7 ++----
tr_TR.ISO8859-9/share/xml/catalog.xml | 4 +++
.../articles/contributing/article.xml | 7 ++----
zh_CN.GB2312/articles/cvs-freebsd/article.xml | 7 ++----
zh_CN.GB2312/articles/linux-users/article.xml | 7 ++----
zh_CN.GB2312/articles/nanobsd/article.xml | 7 ++----
.../articles/rc-scripting/article.xml | 7 ++----
.../articles/remote-install/article.xml | 7 ++----
zh_CN.GB2312/books/arch-handbook/book.xml | 6 ++---
zh_CN.GB2312/books/handbook/book.xml | 7 ++----
zh_CN.GB2312/books/porters-handbook/book.xml | 7 ++----
zh_CN.GB2312/share/xml/catalog | 2 +-
zh_CN.GB2312/share/xml/catalog.xml | 3 +++
zh_TW.Big5/articles/contributing/article.xml | 8 ++----
zh_TW.Big5/articles/cvs-freebsd/article.xml | 7 ++----
.../articles/freebsd-questions/article.xml | 7 ++----
zh_TW.Big5/articles/hubs/article.xml | 8 ++----
.../articles/mailing-list-faq/article.xml | 7 ++----
zh_TW.Big5/articles/nanobsd/article.xml | 7 ++----
zh_TW.Big5/articles/pr-guidelines/article.xml | 6 ++---
.../articles/problem-reports/article.xml | 7 ++----
.../articles/remote-install/article.xml | 7 ++----
zh_TW.Big5/books/developers-handbook/book.xml | 6 ++---
zh_TW.Big5/books/faq/book.xml | 6 ++---
zh_TW.Big5/books/fdp-primer/book.xml | 6 ++---
zh_TW.Big5/books/handbook/book.xml | 6 ++---
zh_TW.Big5/books/porters-handbook/book.xml | 7 ++----
zh_TW.Big5/share/xml/catalog | 2 +-
zh_TW.Big5/share/xml/catalog.xml | 3 +++
276 files changed, 653 insertions(+), 1208 deletions(-)
create mode 100644 da_DK.ISO8859-1/share/xml/catalog.xml
create mode 100644 mn_MN.UTF-8/share/xml/catalog.xml
create mode 100644 pl_PL.ISO8859-2/share/xml/catalog.xml
create mode 100644 pt_BR.ISO8859-1/share/xml/catalog.xml
diff --git a/bn_BD.ISO10646-1/articles/explaining-bsd/article.xml b/bn_BD.ISO10646-1/articles/explaining-bsd/article.xml
index e8601ada9b..8d5d96470f 100644
--- a/bn_BD.ISO10646-1/articles/explaining-bsd/article.xml
+++ b/bn_BD.ISO10646-1/articles/explaining-bsd/article.xml
@@ -1,7 +1,5 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd">
-
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Documentation Project
diff --git a/bn_BD.ISO10646-1/articles/new-users/article.xml b/bn_BD.ISO10646-1/articles/new-users/article.xml
index bae4188ed4..12bb2d7d4d 100644
--- a/bn_BD.ISO10646-1/articles/new-users/article.xml
+++ b/bn_BD.ISO10646-1/articles/new-users/article.xml
@@ -1,7 +1,5 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd">
-
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Documentation Project
diff --git a/da_DK.ISO8859-1/articles/ipsec-must/article.xml b/da_DK.ISO8859-1/articles/ipsec-must/article.xml
index f0d54f350d..fd9d466684 100644
--- a/da_DK.ISO8859-1/articles/ipsec-must/article.xml
+++ b/da_DK.ISO8859-1/articles/ipsec-must/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//DA" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Documentation Project
diff --git a/da_DK.ISO8859-1/articles/pxe/article.xml b/da_DK.ISO8859-1/articles/pxe/article.xml
index 35658564ac..69c1a571b0 100644
--- a/da_DK.ISO8859-1/articles/pxe/article.xml
+++ b/da_DK.ISO8859-1/articles/pxe/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//DA" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Documentation Project
diff --git a/da_DK.ISO8859-1/share/xml/catalog b/da_DK.ISO8859-1/share/xml/catalog
index b44849dbf5..18d67e74a7 100644
--- a/da_DK.ISO8859-1/share/xml/catalog
+++ b/da_DK.ISO8859-1/share/xml/catalog
@@ -4,6 +4,9 @@
-- $FreeBSD$
--
+PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
+ "entities.ent"
+
PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
"freebsd.dsl"
diff --git a/da_DK.ISO8859-1/share/xml/catalog.xml b/da_DK.ISO8859-1/share/xml/catalog.xml
new file mode 100644
index 0000000000..34b34af34d
--- /dev/null
+++ b/da_DK.ISO8859-1/share/xml/catalog.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN"
+ "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
+
+<!-- $FreeBSD$
+ $FreeBSDde: de-www/share/xml/catalog.xml,v 1.1 2006/10/19 19:26:11 jkois Exp $
+ basiert auf: 1.1
+-->
+
+<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
+ <rewriteSystem systemIdStartString="http://www.FreeBSD.org/XML/www/lang/"
+ rewritePrefix="../../"/>
+ <rewriteURI uriStartString="http://www.FreeBSD.org/XML/www/lang/"
+ rewritePrefix="../../"/>
+
+ <public publicId="-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
+ uri="entities.ent"/>
+ <public publicId="-//FreeBSD//ENTITIES DocBook Translator Entities//DK"
+ uri="translators.ent" />
+</catalog>
diff --git a/de_DE.ISO8859-1/articles/contributing-ports/article.xml b/de_DE.ISO8859-1/articles/contributing-ports/article.xml
index 77268b9390..2c0aa074e8 100644
--- a/de_DE.ISO8859-1/articles/contributing-ports/article.xml
+++ b/de_DE.ISO8859-1/articles/contributing-ports/article.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//DE" "../../share/xml/entities.ent">
-%entities;
-<!ENTITY % not.published "IGNORE">
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!-- The FreeBSD Documentation Project
The FreeBSD German Documentation Project
diff --git a/de_DE.ISO8859-1/articles/contributing/article.xml b/de_DE.ISO8859-1/articles/contributing/article.xml
index f96d25728c..99917e9bef 100644
--- a/de_DE.ISO8859-1/articles/contributing/article.xml
+++ b/de_DE.ISO8859-1/articles/contributing/article.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//DE" "../../share/xml/entities.ent">
-%entities;
-<!ENTITY % not.published "IGNORE">
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Documentation Project
diff --git a/de_DE.ISO8859-1/articles/explaining-bsd/article.xml b/de_DE.ISO8859-1/articles/explaining-bsd/article.xml
index 5fc21d6b7c..8d77222459 100644
--- a/de_DE.ISO8859-1/articles/explaining-bsd/article.xml
+++ b/de_DE.ISO8859-1/articles/explaining-bsd/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//DE" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!-- The FreeBSD Documentation Project
The FreeBSD German Documentation Project
diff --git a/de_DE.ISO8859-1/articles/laptop/article.xml b/de_DE.ISO8859-1/articles/laptop/article.xml
index 76c5b74390..462e54bd29 100644
--- a/de_DE.ISO8859-1/articles/laptop/article.xml
+++ b/de_DE.ISO8859-1/articles/laptop/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//DE" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!-- The FreeBSD Documentation Project
The FreeBSD German Documentation Project
diff --git a/de_DE.ISO8859-1/articles/linux-comparison/article.xml b/de_DE.ISO8859-1/articles/linux-comparison/article.xml
index cff4ab82e0..36124e24c3 100644
--- a/de_DE.ISO8859-1/articles/linux-comparison/article.xml
+++ b/de_DE.ISO8859-1/articles/linux-comparison/article.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//DE" "../../share/xml/entities.ent">
-%entities;
-<!ENTITY % not.published "IGNORE">
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
Copyright (c) 2005 Dru Lavigne
diff --git a/de_DE.ISO8859-1/articles/new-users/article.xml b/de_DE.ISO8859-1/articles/new-users/article.xml
index a835fbc7a0..9738c039da 100644
--- a/de_DE.ISO8859-1/articles/new-users/article.xml
+++ b/de_DE.ISO8859-1/articles/new-users/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//DE" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!-- The FreeBSD Documentation Project
The FreeBSD German Documentation Project
diff --git a/de_DE.ISO8859-1/articles/solid-state/article.xml b/de_DE.ISO8859-1/articles/solid-state/article.xml
index 5cd7a0a41b..62b14ee016 100644
--- a/de_DE.ISO8859-1/articles/solid-state/article.xml
+++ b/de_DE.ISO8859-1/articles/solid-state/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//DE" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!-- Copyright (c) 2001 The FreeBSD Documentation Project
diff --git a/de_DE.ISO8859-1/books/developers-handbook/book.xml b/de_DE.ISO8859-1/books/developers-handbook/book.xml
index 2cffde0118..b1dff89736 100644
--- a/de_DE.ISO8859-1/books/developers-handbook/book.xml
+++ b/de_DE.ISO8859-1/books/developers-handbook/book.xml
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//DE" "../../share/xml/entities.ent">
-%entities;
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [
<!ENTITY % chapters SYSTEM "chapters.ent"> %chapters;
]>
diff --git a/de_DE.ISO8859-1/books/faq/book.xml b/de_DE.ISO8859-1/books/faq/book.xml
index 0e02a8f59b..2d88980475 100644
--- a/de_DE.ISO8859-1/books/faq/book.xml
+++ b/de_DE.ISO8859-1/books/faq/book.xml
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//DE" "../../share/xml/entities.ent">
-%entities;
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [
<!ENTITY bibliography SYSTEM "../../share/xml/bibliography.xml">
<!ENTITY rel.head "<emphasis>10-CURRENT</emphasis>">
<!ENTITY rel.head.relx "10.<replaceable>X</replaceable>">
diff --git a/de_DE.ISO8859-1/books/fdp-primer/book.xml b/de_DE.ISO8859-1/books/fdp-primer/book.xml
index 26d5f41d5f..2aa41aacf4 100644
--- a/de_DE.ISO8859-1/books/fdp-primer/book.xml
+++ b/de_DE.ISO8859-1/books/fdp-primer/book.xml
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//DE" "../../share/xml/entities.ent">
-%entities;
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [
<!ENTITY % chapters SYSTEM "chapters.ent">
%chapters;
]>
diff --git a/de_DE.ISO8859-1/books/handbook/book.xml b/de_DE.ISO8859-1/books/handbook/book.xml
index ff0c917717..a17a451e85 100644
--- a/de_DE.ISO8859-1/books/handbook/book.xml
+++ b/de_DE.ISO8859-1/books/handbook/book.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//DE" "../../share/xml/entities.ent">
-%entities;
-
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [
<!ENTITY % chapters SYSTEM "chapters.ent"> %chapters;
<!ENTITY % txtfiles SYSTEM "txtfiles.ent"> %txtfiles;
]>
diff --git a/de_DE.ISO8859-1/books/porters-handbook/book.xml b/de_DE.ISO8859-1/books/porters-handbook/book.xml
index 73ac41b041..166346ccba 100644
--- a/de_DE.ISO8859-1/books/porters-handbook/book.xml
+++ b/de_DE.ISO8859-1/books/porters-handbook/book.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//DE" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Documentation Project
diff --git a/de_DE.ISO8859-1/share/xml/catalog b/de_DE.ISO8859-1/share/xml/catalog
index 44bca8a074..a48b846ada 100644
--- a/de_DE.ISO8859-1/share/xml/catalog
+++ b/de_DE.ISO8859-1/share/xml/catalog
@@ -8,7 +8,7 @@
-- $FreeBSDde: de-docproj/share/xml/catalog,v 1.10 2004/11/28 18:16:45 jkois Exp $ --
-- basiert auf: 1.5 --
-PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//DE"
+PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
"entities.ent"
PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
diff --git a/de_DE.ISO8859-1/share/xml/catalog.xml b/de_DE.ISO8859-1/share/xml/catalog.xml
index 20a5875de6..6e76ac8d3a 100644
--- a/de_DE.ISO8859-1/share/xml/catalog.xml
+++ b/de_DE.ISO8859-1/share/xml/catalog.xml
@@ -13,7 +13,14 @@
<rewriteURI uriStartString="http://www.FreeBSD.org/XML/www/lang/"
rewritePrefix="../../"/>
- <public publicId="-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
+ <public
+ publicId="-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
+ uri="entities.ent" />
+ <public
+ publicId="-//FreeBSD//ENTITIES DocBook Translator Entities//DE"
+ uri="translators.ent" />
+ <public
+ publicId="-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
uri="l10n.ent" />
<public
publicId="-//FreeBSD//ENTITIES FreeBSD Release L10N Entities//EN"
diff --git a/el_GR.ISO8859-7/articles/bsdl-gpl/article.xml b/el_GR.ISO8859-7/articles/bsdl-gpl/article.xml
index 846fc85192..f508edbaa6 100644
--- a/el_GR.ISO8859-7/articles/bsdl-gpl/article.xml
+++ b/el_GR.ISO8859-7/articles/bsdl-gpl/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EL" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
diff --git a/el_GR.ISO8859-7/articles/compiz-fusion/article.xml b/el_GR.ISO8859-7/articles/compiz-fusion/article.xml
index b31f18f14f..4dd03b4b3f 100644
--- a/el_GR.ISO8859-7/articles/compiz-fusion/article.xml
+++ b/el_GR.ISO8859-7/articles/compiz-fusion/article.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EL" "../../share/xml/entities.ent">
-%entities;
-<!ENTITY iso-greek "ISO/IEC 8859-7">
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
diff --git a/el_GR.ISO8859-7/articles/contributing/article.xml b/el_GR.ISO8859-7/articles/contributing/article.xml
index 1292390c2c..bd808b0ba4 100644
--- a/el_GR.ISO8859-7/articles/contributing/article.xml
+++ b/el_GR.ISO8859-7/articles/contributing/article.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EL" "../../share/xml/entities.ent">
-%entities;
-<!ENTITY % not.published "IGNORE">
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
diff --git a/el_GR.ISO8859-7/articles/cvs-freebsd/article.xml b/el_GR.ISO8859-7/articles/cvs-freebsd/article.xml
index fdbefd6ce8..8c176b16f9 100644
--- a/el_GR.ISO8859-7/articles/cvs-freebsd/article.xml
+++ b/el_GR.ISO8859-7/articles/cvs-freebsd/article.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EL" "../../share/xml/entities.ent">
-%entities;
-<!ENTITY iso-greek "ISO/IEC 8859-7">
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
diff --git a/el_GR.ISO8859-7/articles/explaining-bsd/article.xml b/el_GR.ISO8859-7/articles/explaining-bsd/article.xml
index de559a7519..dc77aa76b6 100644
--- a/el_GR.ISO8859-7/articles/explaining-bsd/article.xml
+++ b/el_GR.ISO8859-7/articles/explaining-bsd/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EL" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
diff --git a/el_GR.ISO8859-7/articles/freebsd-questions/article.xml b/el_GR.ISO8859-7/articles/freebsd-questions/article.xml
index bac63efbc8..0db17cc5c6 100644
--- a/el_GR.ISO8859-7/articles/freebsd-questions/article.xml
+++ b/el_GR.ISO8859-7/articles/freebsd-questions/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EL" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
diff --git a/el_GR.ISO8859-7/articles/gjournal-desktop/article.xml b/el_GR.ISO8859-7/articles/gjournal-desktop/article.xml
index e7119be0b1..30c6ff5411 100644
--- a/el_GR.ISO8859-7/articles/gjournal-desktop/article.xml
+++ b/el_GR.ISO8859-7/articles/gjournal-desktop/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EL" "../../share/xml/entities.ent">
-%entities;
-<!ENTITY iso-greek "ISO/IEC 8859-7">
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [<!ENTITY iso-greek "ISO/IEC 8859-7">
]>
<!--
diff --git a/el_GR.ISO8859-7/articles/greek-language-support/article.xml b/el_GR.ISO8859-7/articles/greek-language-support/article.xml
index b7523c8722..cfceec5c27 100644
--- a/el_GR.ISO8859-7/articles/greek-language-support/article.xml
+++ b/el_GR.ISO8859-7/articles/greek-language-support/article.xml
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EL" "../../share/xml/entities.ent">
-%entities;
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [
<!ENTITY iso-greek "ISO/IEC 8859-7">
<!ENTITY iso-ucs "ISO/IEC 10646">
]>
diff --git a/el_GR.ISO8859-7/articles/laptop/article.xml b/el_GR.ISO8859-7/articles/laptop/article.xml
index 3187c5524a..93814a3643 100644
--- a/el_GR.ISO8859-7/articles/laptop/article.xml
+++ b/el_GR.ISO8859-7/articles/laptop/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EL" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
diff --git a/el_GR.ISO8859-7/articles/linux-users/article.xml b/el_GR.ISO8859-7/articles/linux-users/article.xml
index 42b459dcc3..64c5f6bec6 100644
--- a/el_GR.ISO8859-7/articles/linux-users/article.xml
+++ b/el_GR.ISO8859-7/articles/linux-users/article.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EL" "../../share/xml/entities.ent">
-%entities;
-<!ENTITY iso-greek "ISO/IEC 8859-7">
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
diff --git a/el_GR.ISO8859-7/articles/mailing-list-faq/article.xml b/el_GR.ISO8859-7/articles/mailing-list-faq/article.xml
index 8153a9ba78..ac12864025 100644
--- a/el_GR.ISO8859-7/articles/mailing-list-faq/article.xml
+++ b/el_GR.ISO8859-7/articles/mailing-list-faq/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EL" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
diff --git a/el_GR.ISO8859-7/articles/nanobsd/article.xml b/el_GR.ISO8859-7/articles/nanobsd/article.xml
index 1a41f7f944..78170ec95a 100644
--- a/el_GR.ISO8859-7/articles/nanobsd/article.xml
+++ b/el_GR.ISO8859-7/articles/nanobsd/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EL" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
�������� ��������� ���: Introduction to NanoBSD
diff --git a/el_GR.ISO8859-7/articles/new-users/article.xml b/el_GR.ISO8859-7/articles/new-users/article.xml
index be31b2e062..06bd407edf 100644
--- a/el_GR.ISO8859-7/articles/new-users/article.xml
+++ b/el_GR.ISO8859-7/articles/new-users/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EL" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
diff --git a/el_GR.ISO8859-7/articles/problem-reports/article.xml b/el_GR.ISO8859-7/articles/problem-reports/article.xml
index ffc4fea0d9..46f7027e59 100644
--- a/el_GR.ISO8859-7/articles/problem-reports/article.xml
+++ b/el_GR.ISO8859-7/articles/problem-reports/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EL" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
diff --git a/el_GR.ISO8859-7/articles/releng-packages/article.xml b/el_GR.ISO8859-7/articles/releng-packages/article.xml
index 7c85947b4f..5b23a01b31 100644
--- a/el_GR.ISO8859-7/articles/releng-packages/article.xml
+++ b/el_GR.ISO8859-7/articles/releng-packages/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EL" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
� �������� ������� ��� ������� ���������� ��� ������� ��� FreeBSD
diff --git a/el_GR.ISO8859-7/articles/releng/article.xml b/el_GR.ISO8859-7/articles/releng/article.xml
index 4659d752fe..58a8794f28 100644
--- a/el_GR.ISO8859-7/articles/releng/article.xml
+++ b/el_GR.ISO8859-7/articles/releng/article.xml
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EL" "../../share/xml/entities.ent">
-%entities;
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [
<!ENTITY art.re.pkgs '<ulink url="../releng-packages/article.html">� �������� ������� ��� ������� ���������� ��� �������</ulink>'>
]>
diff --git a/el_GR.ISO8859-7/books/faq/book.xml b/el_GR.ISO8859-7/books/faq/book.xml
index ec1d38e9e8..cca540df68 100644
--- a/el_GR.ISO8859-7/books/faq/book.xml
+++ b/el_GR.ISO8859-7/books/faq/book.xml
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EL" "../../share/xml/entities.ent">
-%entities;
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [
<!ENTITY bibliography SYSTEM "../../../share/xml/bibliography.xml">
]>
diff --git a/el_GR.ISO8859-7/books/handbook/book.xml b/el_GR.ISO8859-7/books/handbook/book.xml
index ca8bac31b0..8ad7959e60 100644
--- a/el_GR.ISO8859-7/books/handbook/book.xml
+++ b/el_GR.ISO8859-7/books/handbook/book.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EL" "../../share/xml/entities.ent">
-%entities;
-
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [
<!ENTITY % chapters SYSTEM "chapters.ent">
%chapters;
<!ENTITY % txtfiles SYSTEM "txtfiles.ent">
diff --git a/el_GR.ISO8859-7/share/xml/catalog b/el_GR.ISO8859-7/share/xml/catalog
index 3effaf96b0..51a93fb332 100644
--- a/el_GR.ISO8859-7/share/xml/catalog
+++ b/el_GR.ISO8859-7/share/xml/catalog
@@ -11,7 +11,7 @@
-- their original English version. Please use your judgement wisely
-- when adding new entity translations to the Greek translations.
-PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EL"
+PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
"entities.ent"
PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
diff --git a/el_GR.ISO8859-7/share/xml/catalog.xml b/el_GR.ISO8859-7/share/xml/catalog.xml
index 12c0f02504..a3feec86ca 100644
--- a/el_GR.ISO8859-7/share/xml/catalog.xml
+++ b/el_GR.ISO8859-7/share/xml/catalog.xml
@@ -9,4 +9,8 @@
rewritePrefix="../../"/>
<rewriteURI uriStartString="http://www.FreeBSD.org/XML/www/lang/"
rewritePrefix="../../"/>
+
+ <public
+ publicId="-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
+ uri="entities.ent" />
</catalog>
diff --git a/en_US.ISO8859-1/articles/bsdl-gpl/article.xml b/en_US.ISO8859-1/articles/bsdl-gpl/article.xml
index 74ceada1fc..730169c5ed 100644
--- a/en_US.ISO8859-1/articles/bsdl-gpl/article.xml
+++ b/en_US.ISO8859-1/articles/bsdl-gpl/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<article lang='en'>
<title>Why you should use a BSD style license for your Open Source Project</title>
diff --git a/en_US.ISO8859-1/articles/building-products/article.xml b/en_US.ISO8859-1/articles/building-products/article.xml
index 16ab5ec83f..dcca43f6a8 100644
--- a/en_US.ISO8859-1/articles/building-products/article.xml
+++ b/en_US.ISO8859-1/articles/building-products/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<article lang='en'>
<articleinfo>
diff --git a/en_US.ISO8859-1/articles/casestudy-argentina.com/article.xml b/en_US.ISO8859-1/articles/casestudy-argentina.com/article.xml
index 1b8fcfe06e..0e1181a50a 100644
--- a/en_US.ISO8859-1/articles/casestudy-argentina.com/article.xml
+++ b/en_US.ISO8859-1/articles/casestudy-argentina.com/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<article lang='en'>
<title>Argentina.com : A Case Study</title>
diff --git a/en_US.ISO8859-1/articles/committers-guide/article.xml b/en_US.ISO8859-1/articles/committers-guide/article.xml
index 4ebe7151c0..5c29deda27 100644
--- a/en_US.ISO8859-1/articles/committers-guide/article.xml
+++ b/en_US.ISO8859-1/articles/committers-guide/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<article lang='en'>
<articleinfo>
diff --git a/en_US.ISO8859-1/articles/compiz-fusion/article.xml b/en_US.ISO8859-1/articles/compiz-fusion/article.xml
index 5ee28becd1..b3c1a7067f 100644
--- a/en_US.ISO8859-1/articles/compiz-fusion/article.xml
+++ b/en_US.ISO8859-1/articles/compiz-fusion/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<article lang="en">
<articleinfo>
diff --git a/en_US.ISO8859-1/articles/console-server/article.xml b/en_US.ISO8859-1/articles/console-server/article.xml
index 0207854871..43343f39a2 100644
--- a/en_US.ISO8859-1/articles/console-server/article.xml
+++ b/en_US.ISO8859-1/articles/console-server/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<article lang='en'>
<articleinfo>
diff --git a/en_US.ISO8859-1/articles/contributing-ports/article.xml b/en_US.ISO8859-1/articles/contributing-ports/article.xml
index 9005e03a03..3d3703ca5c 100644
--- a/en_US.ISO8859-1/articles/contributing-ports/article.xml
+++ b/en_US.ISO8859-1/articles/contributing-ports/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<article lang='en'>
<articleinfo>
diff --git a/en_US.ISO8859-1/articles/contributing/article.xml b/en_US.ISO8859-1/articles/contributing/article.xml
index 4581e365fa..819bf3c014 100644
--- a/en_US.ISO8859-1/articles/contributing/article.xml
+++ b/en_US.ISO8859-1/articles/contributing/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<article lang='en'>
<articleinfo>
diff --git a/en_US.ISO8859-1/articles/contributors/article.xml b/en_US.ISO8859-1/articles/contributors/article.xml
index 3f5733ecf8..4347df2f37 100644
--- a/en_US.ISO8859-1/articles/contributors/article.xml
+++ b/en_US.ISO8859-1/articles/contributors/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [
<!ENTITY % contrib.ent SYSTEM "contrib.ent">
%contrib.ent;
<!ENTITY % not.published "IGNORE">
diff --git a/en_US.ISO8859-1/articles/cups/article.xml b/en_US.ISO8859-1/articles/cups/article.xml
index 35c13dfcc9..5ced963e5d 100644
--- a/en_US.ISO8859-1/articles/cups/article.xml
+++ b/en_US.ISO8859-1/articles/cups/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<article lang='en'>
<articleinfo>
diff --git a/en_US.ISO8859-1/articles/custom-gcc/article.xml b/en_US.ISO8859-1/articles/custom-gcc/article.xml
index 8d2bf73b6d..51b38334f7 100644
--- a/en_US.ISO8859-1/articles/custom-gcc/article.xml
+++ b/en_US.ISO8859-1/articles/custom-gcc/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<article lang='en'>
<articleinfo>
diff --git a/en_US.ISO8859-1/articles/cvs-freebsd/article.xml b/en_US.ISO8859-1/articles/cvs-freebsd/article.xml
index e19b4b3dd8..f891a55d87 100644
--- a/en_US.ISO8859-1/articles/cvs-freebsd/article.xml
+++ b/en_US.ISO8859-1/articles/cvs-freebsd/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<article lang='en'>
<articleinfo>
diff --git a/en_US.ISO8859-1/articles/cvsup-advanced/article.xml b/en_US.ISO8859-1/articles/cvsup-advanced/article.xml
index e8c2be4f07..8a16f0bdbb 100644
--- a/en_US.ISO8859-1/articles/cvsup-advanced/article.xml
+++ b/en_US.ISO8859-1/articles/cvsup-advanced/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<article lang='en'>
<articleinfo>
diff --git a/en_US.ISO8859-1/articles/explaining-bsd/article.xml b/en_US.ISO8859-1/articles/explaining-bsd/article.xml
index ef3d40ccaa..5addee3b59 100644
--- a/en_US.ISO8859-1/articles/explaining-bsd/article.xml
+++ b/en_US.ISO8859-1/articles/explaining-bsd/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!-- $FreeBSD$ -->
<!-- The FreeBSD Documentation Project -->
diff --git a/en_US.ISO8859-1/articles/fbsd-from-scratch/article.xml b/en_US.ISO8859-1/articles/fbsd-from-scratch/article.xml
index 3ca6798cca..5db02aff31 100644
--- a/en_US.ISO8859-1/articles/fbsd-from-scratch/article.xml
+++ b/en_US.ISO8859-1/articles/fbsd-from-scratch/article.xml
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [
<!ENTITY scratch.ap "<application>FreeBSD From Scratch</application>">
]>
diff --git a/en_US.ISO8859-1/articles/filtering-bridges/article.xml b/en_US.ISO8859-1/articles/filtering-bridges/article.xml
index 0ff9690ad1..29ee27ba53 100644
--- a/en_US.ISO8859-1/articles/filtering-bridges/article.xml
+++ b/en_US.ISO8859-1/articles/filtering-bridges/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<article lang='en'>
<articleinfo>
diff --git a/en_US.ISO8859-1/articles/fonts/article.xml b/en_US.ISO8859-1/articles/fonts/article.xml
index da22671ed1..050b21d20d 100644
--- a/en_US.ISO8859-1/articles/fonts/article.xml
+++ b/en_US.ISO8859-1/articles/fonts/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!-- $FreeBSD$ -->
<!-- The FreeBSD Documentation Project -->
diff --git a/en_US.ISO8859-1/articles/freebsd-questions/article.xml b/en_US.ISO8859-1/articles/freebsd-questions/article.xml
index 22168dd0eb..34779524b4 100644
--- a/en_US.ISO8859-1/articles/freebsd-questions/article.xml
+++ b/en_US.ISO8859-1/articles/freebsd-questions/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<article lang='en'>
<articleinfo>
diff --git a/en_US.ISO8859-1/articles/freebsd-update-server/article.xml b/en_US.ISO8859-1/articles/freebsd-update-server/article.xml
index ca0400d20a..7b9dc15ced 100644
--- a/en_US.ISO8859-1/articles/freebsd-update-server/article.xml
+++ b/en_US.ISO8859-1/articles/freebsd-update-server/article.xml
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [
<!ENTITY fbus.ap "<application>FreeBSD Update Server</application>">
]>
diff --git a/en_US.ISO8859-1/articles/geom-class/article.xml b/en_US.ISO8859-1/articles/geom-class/article.xml
index d68af2201a..92ec3b3be0 100644
--- a/en_US.ISO8859-1/articles/geom-class/article.xml
+++ b/en_US.ISO8859-1/articles/geom-class/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<article lang='en'>
<title>Writing a GEOM Class</title>
diff --git a/en_US.ISO8859-1/articles/gjournal-desktop/article.xml b/en_US.ISO8859-1/articles/gjournal-desktop/article.xml
index cfd89a4664..37c5e8e597 100644
--- a/en_US.ISO8859-1/articles/gjournal-desktop/article.xml
+++ b/en_US.ISO8859-1/articles/gjournal-desktop/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<article lang="en">
<articleinfo>
diff --git a/en_US.ISO8859-1/articles/hubs/article.xml b/en_US.ISO8859-1/articles/hubs/article.xml
index c347e79065..d5ce8be4a4 100644
--- a/en_US.ISO8859-1/articles/hubs/article.xml
+++ b/en_US.ISO8859-1/articles/hubs/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<article lang='en'>
<articleinfo>
diff --git a/en_US.ISO8859-1/articles/ipsec-must/article.xml b/en_US.ISO8859-1/articles/ipsec-must/article.xml
index 58a5db6ccb..6882cef80c 100644
--- a/en_US.ISO8859-1/articles/ipsec-must/article.xml
+++ b/en_US.ISO8859-1/articles/ipsec-must/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/articles/laptop/article.xml b/en_US.ISO8859-1/articles/laptop/article.xml
index 524bc45724..72e46ab182 100644
--- a/en_US.ISO8859-1/articles/laptop/article.xml
+++ b/en_US.ISO8859-1/articles/laptop/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<article lang='en'>
<articleinfo>
diff --git a/en_US.ISO8859-1/articles/ldap-auth/article.xml b/en_US.ISO8859-1/articles/ldap-auth/article.xml
index 6a89f2429a..c5d3bb93ec 100644
--- a/en_US.ISO8859-1/articles/ldap-auth/article.xml
+++ b/en_US.ISO8859-1/articles/ldap-auth/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<article lang="en">
<articleinfo>
diff --git a/en_US.ISO8859-1/articles/linux-comparison/article.xml b/en_US.ISO8859-1/articles/linux-comparison/article.xml
index a2d1b85be5..ba841654b2 100644
--- a/en_US.ISO8859-1/articles/linux-comparison/article.xml
+++ b/en_US.ISO8859-1/articles/linux-comparison/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
Copyright (c) 2005 Dru Lavigne
diff --git a/en_US.ISO8859-1/articles/linux-emulation/article.xml b/en_US.ISO8859-1/articles/linux-emulation/article.xml
index 4cd9ddff17..09bb526a26 100644
--- a/en_US.ISO8859-1/articles/linux-emulation/article.xml
+++ b/en_US.ISO8859-1/articles/linux-emulation/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!-- $FreeBSD$ -->
<!-- The FreeBSD Documentation Project -->
diff --git a/en_US.ISO8859-1/articles/linux-users/article.xml b/en_US.ISO8859-1/articles/linux-users/article.xml
index 3a1bc05ee2..c5f32f8c10 100644
--- a/en_US.ISO8859-1/articles/linux-users/article.xml
+++ b/en_US.ISO8859-1/articles/linux-users/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<article lang='en'>
<articleinfo>
diff --git a/en_US.ISO8859-1/articles/mailing-list-faq/article.xml b/en_US.ISO8859-1/articles/mailing-list-faq/article.xml
index 10298fa7ae..15c64648bd 100644
--- a/en_US.ISO8859-1/articles/mailing-list-faq/article.xml
+++ b/en_US.ISO8859-1/articles/mailing-list-faq/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!-- $FreeBSD$ -->
<!-- The FreeBSD Documentation Project -->
diff --git a/en_US.ISO8859-1/articles/mh/article.xml b/en_US.ISO8859-1/articles/mh/article.xml
index 5dc3b56d0f..fc34225cb6 100644
--- a/en_US.ISO8859-1/articles/mh/article.xml
+++ b/en_US.ISO8859-1/articles/mh/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!-- $FreeBSD$ -->
<!-- FreeBSD Documentation Project -->
diff --git a/en_US.ISO8859-1/articles/nanobsd/article.xml b/en_US.ISO8859-1/articles/nanobsd/article.xml
index 4f921c9c48..6e0fa31216 100644
--- a/en_US.ISO8859-1/articles/nanobsd/article.xml
+++ b/en_US.ISO8859-1/articles/nanobsd/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<article lang='en'>
<articleinfo>
diff --git a/en_US.ISO8859-1/articles/new-users/article.xml b/en_US.ISO8859-1/articles/new-users/article.xml
index ae0fff539e..c3a68e8e91 100644
--- a/en_US.ISO8859-1/articles/new-users/article.xml
+++ b/en_US.ISO8859-1/articles/new-users/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!-- $FreeBSD$ -->
<!-- The FreeBSD Documentation Project -->
diff --git a/en_US.ISO8859-1/articles/p4-primer/article.xml b/en_US.ISO8859-1/articles/p4-primer/article.xml
index 16f8c3ca5f..d7b8eac378 100644
--- a/en_US.ISO8859-1/articles/p4-primer/article.xml
+++ b/en_US.ISO8859-1/articles/p4-primer/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<article lang='en'>
<title>Perforce in &os; Development</title>
diff --git a/en_US.ISO8859-1/articles/pam/article.xml b/en_US.ISO8859-1/articles/pam/article.xml
index 75dfb6bef9..67643e2977 100644
--- a/en_US.ISO8859-1/articles/pam/article.xml
+++ b/en_US.ISO8859-1/articles/pam/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
- Copyright (c) 2001-2003 Networks Associates Technology, Inc.
diff --git a/en_US.ISO8859-1/articles/port-mentor-guidelines/article.xml b/en_US.ISO8859-1/articles/port-mentor-guidelines/article.xml
index 949f37fe59..4e4e1cfed8 100644
--- a/en_US.ISO8859-1/articles/port-mentor-guidelines/article.xml
+++ b/en_US.ISO8859-1/articles/port-mentor-guidelines/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<article lang="en">
<articleinfo>
diff --git a/en_US.ISO8859-1/articles/portbuild/article.xml b/en_US.ISO8859-1/articles/portbuild/article.xml
index b1cbd0bf61..674417a5c0 100644
--- a/en_US.ISO8859-1/articles/portbuild/article.xml
+++ b/en_US.ISO8859-1/articles/portbuild/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<article lang='en'>
<articleinfo>
diff --git a/en_US.ISO8859-1/articles/pr-guidelines/article.xml b/en_US.ISO8859-1/articles/pr-guidelines/article.xml
index 754bb548d5..ff7f8e61fb 100644
--- a/en_US.ISO8859-1/articles/pr-guidelines/article.xml
+++ b/en_US.ISO8859-1/articles/pr-guidelines/article.xml
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [
<!ENTITY man.edit-pr.1 "<citerefentry><refentrytitle>edit-pr</refentrytitle><manvolnum>1</manvolnum></citerefentry>">
<!ENTITY man.query-pr.1 "<citerefentry><refentrytitle>query-pr</refentrytitle><manvolnum>1</manvolnum></citerefentry>">
]>
diff --git a/en_US.ISO8859-1/articles/problem-reports/article.xml b/en_US.ISO8859-1/articles/problem-reports/article.xml
index ef710e0456..b106a2dac4 100644
--- a/en_US.ISO8859-1/articles/problem-reports/article.xml
+++ b/en_US.ISO8859-1/articles/problem-reports/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<article lang='en'>
<articleinfo>
diff --git a/en_US.ISO8859-1/articles/rc-scripting/article.xml b/en_US.ISO8859-1/articles/rc-scripting/article.xml
index 0238769092..c299b5895a 100644
--- a/en_US.ISO8859-1/articles/rc-scripting/article.xml
+++ b/en_US.ISO8859-1/articles/rc-scripting/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<article lang='en'>
<articleinfo>
diff --git a/en_US.ISO8859-1/articles/relaydelay/article.xml b/en_US.ISO8859-1/articles/relaydelay/article.xml
index d332ee73e0..2d17a1bc52 100644
--- a/en_US.ISO8859-1/articles/relaydelay/article.xml
+++ b/en_US.ISO8859-1/articles/relaydelay/article.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-<!ENTITY % not.published "IGNORE">
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
$FreeBSD$
diff --git a/en_US.ISO8859-1/articles/releng-packages/article.xml b/en_US.ISO8859-1/articles/releng-packages/article.xml
index e4c9903e0d..9e1658fcab 100644
--- a/en_US.ISO8859-1/articles/releng-packages/article.xml
+++ b/en_US.ISO8859-1/articles/releng-packages/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<article lang='en'>
<title>FreeBSD Release Engineering for Third Party Software
diff --git a/en_US.ISO8859-1/articles/releng/article.xml b/en_US.ISO8859-1/articles/releng/article.xml
index 28fbda88e2..b754ec7f10 100644
--- a/en_US.ISO8859-1/articles/releng/article.xml
+++ b/en_US.ISO8859-1/articles/releng/article.xml
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [
<!ENTITY art.re.pkgs '<ulink url="&url.articles.releng-packages;/article.html">The Release Engineering of Third Party Packages</ulink>'>
]>
diff --git a/en_US.ISO8859-1/articles/remote-install/article.xml b/en_US.ISO8859-1/articles/remote-install/article.xml
index ef94bce981..95c24ea52c 100644
--- a/en_US.ISO8859-1/articles/remote-install/article.xml
+++ b/en_US.ISO8859-1/articles/remote-install/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<article lang='en'>
<articleinfo>
diff --git a/en_US.ISO8859-1/articles/serial-uart/article.xml b/en_US.ISO8859-1/articles/serial-uart/article.xml
index 04ccddabf2..fd46d4b7b8 100644
--- a/en_US.ISO8859-1/articles/serial-uart/article.xml
+++ b/en_US.ISO8859-1/articles/serial-uart/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<article lang='en'>
<articleinfo>
diff --git a/en_US.ISO8859-1/articles/solid-state/article.xml b/en_US.ISO8859-1/articles/solid-state/article.xml
index 82046ccb98..26f702b248 100644
--- a/en_US.ISO8859-1/articles/solid-state/article.xml
+++ b/en_US.ISO8859-1/articles/solid-state/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!-- Copyright (c) 2001 The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/articles/vm-design/article.xml b/en_US.ISO8859-1/articles/vm-design/article.xml
index cfc3726b42..411047b8d7 100644
--- a/en_US.ISO8859-1/articles/vm-design/article.xml
+++ b/en_US.ISO8859-1/articles/vm-design/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!-- $FreeBSD$ -->
<!-- FreeBSD Documentation Project -->
diff --git a/en_US.ISO8859-1/articles/wp-toolbox/article.xml b/en_US.ISO8859-1/articles/wp-toolbox/article.xml
index 9f36f69053..062905f5ff 100644
--- a/en_US.ISO8859-1/articles/wp-toolbox/article.xml
+++ b/en_US.ISO8859-1/articles/wp-toolbox/article.xml
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [
<!ENTITY ports "Ports Collection">
<!ENTITY os.ports "&os; &ports;">
<!ENTITY frisbee "<application>Frisbee</application>">
diff --git a/en_US.ISO8859-1/books/arch-handbook/book.xml b/en_US.ISO8859-1/books/arch-handbook/book.xml
index c78ced629a..876a72774f 100644
--- a/en_US.ISO8859-1/books/arch-handbook/book.xml
+++ b/en_US.ISO8859-1/books/arch-handbook/book.xml
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [
<!ENTITY % chapters SYSTEM "chapters.ent">
%chapters;
<!ENTITY % mac-entities SYSTEM "mac.ent">
diff --git a/en_US.ISO8859-1/books/bibliography/book.xml b/en_US.ISO8859-1/books/bibliography/book.xml
index 7fe6b60ef3..9a414be0c6 100644
--- a/en_US.ISO8859-1/books/bibliography/book.xml
+++ b/en_US.ISO8859-1/books/bibliography/book.xml
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [
<!ENTITY bibliography SYSTEM "../../../share/xml/bibliography.xml">
]>
diff --git a/en_US.ISO8859-1/books/corp-net-guide/book.xml b/en_US.ISO8859-1/books/corp-net-guide/book.xml
index 3eac694c58..0171a7044b 100644
--- a/en_US.ISO8859-1/books/corp-net-guide/book.xml
+++ b/en_US.ISO8859-1/books/corp-net-guide/book.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!-- $FreeBSD$ -->
<!-- FreeBSD Documentation Project -->
diff --git a/en_US.ISO8859-1/books/design-44bsd/book.xml b/en_US.ISO8859-1/books/design-44bsd/book.xml
index 64b66a623c..6e8301597e 100644
--- a/en_US.ISO8859-1/books/design-44bsd/book.xml
+++ b/en_US.ISO8859-1/books/design-44bsd/book.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!-- $FreeBSD$ -->
<!-- FreeBSD Documentation Project -->
diff --git a/en_US.ISO8859-1/books/dev-model/book.xml b/en_US.ISO8859-1/books/dev-model/book.xml
index 029bbc097f..f0082ba893 100644
--- a/en_US.ISO8859-1/books/dev-model/book.xml
+++ b/en_US.ISO8859-1/books/dev-model/book.xml
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [
<!ENTITY % chapters SYSTEM "chapters.ent">
%chapters;
]>
diff --git a/en_US.ISO8859-1/books/developers-handbook/book.xml b/en_US.ISO8859-1/books/developers-handbook/book.xml
index 755ee5d18c..0892e8f1f5 100644
--- a/en_US.ISO8859-1/books/developers-handbook/book.xml
+++ b/en_US.ISO8859-1/books/developers-handbook/book.xml
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [
<!ENTITY % chapters SYSTEM "chapters.ent"> %chapters;
]>
diff --git a/en_US.ISO8859-1/books/faq/book.xml b/en_US.ISO8859-1/books/faq/book.xml
index 4ed1210014..f2090e7183 100644
--- a/en_US.ISO8859-1/books/faq/book.xml
+++ b/en_US.ISO8859-1/books/faq/book.xml
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [
<!ENTITY bibliography SYSTEM "../../../share/xml/bibliography.xml">
<!ENTITY rel.head "<emphasis>10-CURRENT</emphasis>">
<!ENTITY rel.head.relx "10.<replaceable>X</replaceable>">
diff --git a/en_US.ISO8859-1/books/fdp-primer/book.xml b/en_US.ISO8859-1/books/fdp-primer/book.xml
index b86c9439da..c7c6353ad9 100644
--- a/en_US.ISO8859-1/books/fdp-primer/book.xml
+++ b/en_US.ISO8859-1/books/fdp-primer/book.xml
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [
<!ENTITY % chapters SYSTEM "chapters.ent"> %chapters;
<!-- ENTITY index SYSTEM "index.xml" -->
]>
diff --git a/en_US.ISO8859-1/books/handbook/book.xml b/en_US.ISO8859-1/books/handbook/book.xml
index 6f342ef829..4351f74d1b 100644
--- a/en_US.ISO8859-1/books/handbook/book.xml
+++ b/en_US.ISO8859-1/books/handbook/book.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/pmake/book.xml b/en_US.ISO8859-1/books/pmake/book.xml
index c7c31487e1..b344674b1c 100644
--- a/en_US.ISO8859-1/books/pmake/book.xml
+++ b/en_US.ISO8859-1/books/pmake/book.xml
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [
<!ENTITY % chapters.ent SYSTEM "chapters.ent">
%chapters.ent;
]>
diff --git a/en_US.ISO8859-1/books/porters-handbook/book.xml b/en_US.ISO8859-1/books/porters-handbook/book.xml
index 06d45e78ea..4ef462a9ac 100644
--- a/en_US.ISO8859-1/books/porters-handbook/book.xml
+++ b/en_US.ISO8859-1/books/porters-handbook/book.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/share/xml/catalog b/en_US.ISO8859-1/share/xml/catalog
index a865eaa313..0079ae91b4 100644
--- a/en_US.ISO8859-1/share/xml/catalog
+++ b/en_US.ISO8859-1/share/xml/catalog
@@ -4,6 +4,9 @@
-- $FreeBSD$
--
+PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
+ "entities.ent"
+
PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
"freebsd.dsl"
diff --git a/en_US.ISO8859-1/share/xml/catalog.xml b/en_US.ISO8859-1/share/xml/catalog.xml
index a077690b34..7f0d5f9037 100644
--- a/en_US.ISO8859-1/share/xml/catalog.xml
+++ b/en_US.ISO8859-1/share/xml/catalog.xml
@@ -13,4 +13,8 @@
rewritePrefix="../../"/>
<rewriteURI uriStartString="http://www.FreeBSD.org/XML/www/lang/"
rewritePrefix="../../"/>
+
+ <public
+ publicId="-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
+ uri="entities.ent" />
</catalog>
diff --git a/en_US.ISO8859-1/share/xml/entities.ent b/en_US.ISO8859-1/share/xml/entities.ent
index 5a6913e47e..b84c1cdbf8 100644
--- a/en_US.ISO8859-1/share/xml/entities.ent
+++ b/en_US.ISO8859-1/share/xml/entities.ent
@@ -4,16 +4,16 @@
"l10n.ent">
%l10n;
<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN"
- "man.ent">
+ "../../../share/xml/man-refs.ent">
%man;
<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
- "freebsd.ent">
+ "../../../share/xml/freebsd.ent">
%freebsd;
<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//EN"
"glossary.ent">
%glossary;
<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN"
- "authors.ent">
+ "../../../share/xml/authors.ent">
%authors;
<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EN"
"teams.ent">
@@ -25,8 +25,8 @@
"newsgroups.ent">
%newsgroups;
<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN"
- "trademarks.ent">
+ "../../../share/xml/trademarks.ent">
%trademarks;
<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN"
- "urls.ent">
+ "../../../share/xml/urls.ent">
%urls;
diff --git a/es_ES.ISO8859-1/articles/casestudy-argentina.com/article.xml b/es_ES.ISO8859-1/articles/casestudy-argentina.com/article.xml
index 598c3888dc..869cc0bdb0 100644
--- a/es_ES.ISO8859-1/articles/casestudy-argentina.com/article.xml
+++ b/es_ES.ISO8859-1/articles/casestudy-argentina.com/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//ES" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<article lang='es'>
<title>Argentina.com : Un estudio de caso</title>
diff --git a/es_ES.ISO8859-1/articles/contributing/article.xml b/es_ES.ISO8859-1/articles/contributing/article.xml
index 84d59e794b..4a6ce7ef76 100644
--- a/es_ES.ISO8859-1/articles/contributing/article.xml
+++ b/es_ES.ISO8859-1/articles/contributing/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//ES" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<article lang="es">
<articleinfo>
diff --git a/es_ES.ISO8859-1/articles/cvs-freebsd/article.xml b/es_ES.ISO8859-1/articles/cvs-freebsd/article.xml
index 0d9af8f764..c96e99769b 100644
--- a/es_ES.ISO8859-1/articles/cvs-freebsd/article.xml
+++ b/es_ES.ISO8859-1/articles/cvs-freebsd/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//ES" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Spanish Documentation Project
diff --git a/es_ES.ISO8859-1/articles/explaining-bsd/article.xml b/es_ES.ISO8859-1/articles/explaining-bsd/article.xml
index 14f6c5d2c1..7876ee6662 100644
--- a/es_ES.ISO8859-1/articles/explaining-bsd/article.xml
+++ b/es_ES.ISO8859-1/articles/explaining-bsd/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//ES" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!-- $FreeBSD$ -->
<!-- The FreeBSD Spanish Documentation Project -->
diff --git a/es_ES.ISO8859-1/articles/fbsd-from-scratch/article.xml b/es_ES.ISO8859-1/articles/fbsd-from-scratch/article.xml
index f9b491df3f..244cd4ce1f 100644
--- a/es_ES.ISO8859-1/articles/fbsd-from-scratch/article.xml
+++ b/es_ES.ISO8859-1/articles/fbsd-from-scratch/article.xml
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//ES" "../../share/xml/entities.ent">
-%entities;
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [
<!ENTITY scratch.ap "<application>FreeBSD From Scratch</application>">
]>
diff --git a/es_ES.ISO8859-1/articles/fdp-es/article.xml b/es_ES.ISO8859-1/articles/fdp-es/article.xml
index 6d796c031d..937beeb137 100644
--- a/es_ES.ISO8859-1/articles/fdp-es/article.xml
+++ b/es_ES.ISO8859-1/articles/fdp-es/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//ES" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Spanish Documentation Project
diff --git a/es_ES.ISO8859-1/articles/laptop/article.xml b/es_ES.ISO8859-1/articles/laptop/article.xml
index 7f202815f2..f7c79d6c8d 100644
--- a/es_ES.ISO8859-1/articles/laptop/article.xml
+++ b/es_ES.ISO8859-1/articles/laptop/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//ES" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<article lang="es">
<articleinfo>
diff --git a/es_ES.ISO8859-1/articles/linux-comparison/article.xml b/es_ES.ISO8859-1/articles/linux-comparison/article.xml
index 100dfba3aa..3b9c1757e9 100644
--- a/es_ES.ISO8859-1/articles/linux-comparison/article.xml
+++ b/es_ES.ISO8859-1/articles/linux-comparison/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//ES" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
Copyright (c) 2005 Dru Lavigne
diff --git a/es_ES.ISO8859-1/articles/linux-users/article.xml b/es_ES.ISO8859-1/articles/linux-users/article.xml
index 1e888ab636..c7af14a8cd 100644
--- a/es_ES.ISO8859-1/articles/linux-users/article.xml
+++ b/es_ES.ISO8859-1/articles/linux-users/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//ES" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!-- The FreeBSD Spanish Documentation Project
Original Revision: r1.1 -->
diff --git a/es_ES.ISO8859-1/articles/mailing-list-faq/article.xml b/es_ES.ISO8859-1/articles/mailing-list-faq/article.xml
index 683cab8e61..c0e814482a 100644
--- a/es_ES.ISO8859-1/articles/mailing-list-faq/article.xml
+++ b/es_ES.ISO8859-1/articles/mailing-list-faq/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//ES" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!-- $FreeBSD$
Traducido de la version 1.4
diff --git a/es_ES.ISO8859-1/articles/nanobsd/article.xml b/es_ES.ISO8859-1/articles/nanobsd/article.xml
index 4a603b736c..7429cab82c 100644
--- a/es_ES.ISO8859-1/articles/nanobsd/article.xml
+++ b/es_ES.ISO8859-1/articles/nanobsd/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//ES" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!-- The FreeBSD Spanish Documentation Project
Original Revision: r1.3 -->
diff --git a/es_ES.ISO8859-1/articles/p4-primer/article.xml b/es_ES.ISO8859-1/articles/p4-primer/article.xml
index 55023fe416..a680f490f3 100644
--- a/es_ES.ISO8859-1/articles/p4-primer/article.xml
+++ b/es_ES.ISO8859-1/articles/p4-primer/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//ES" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<article lang='es'>
<title><application>Perforce</application> en el contexto del desarrollo de &os;</title>
diff --git a/es_ES.ISO8859-1/articles/problem-reports/article.xml b/es_ES.ISO8859-1/articles/problem-reports/article.xml
index db02c89a9b..264da4cae5 100644
--- a/es_ES.ISO8859-1/articles/problem-reports/article.xml
+++ b/es_ES.ISO8859-1/articles/problem-reports/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//ES" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<article lang='es'>
<articleinfo>
diff --git a/es_ES.ISO8859-1/articles/releng/article.xml b/es_ES.ISO8859-1/articles/releng/article.xml
index c5b6cf2823..438013aac7 100644
--- a/es_ES.ISO8859-1/articles/releng/article.xml
+++ b/es_ES.ISO8859-1/articles/releng/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//ES" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Documentation Project
diff --git a/es_ES.ISO8859-1/books/faq/book.xml b/es_ES.ISO8859-1/books/faq/book.xml
index 4d8d30a2cd..e0fe8e5a1c 100644
--- a/es_ES.ISO8859-1/books/faq/book.xml
+++ b/es_ES.ISO8859-1/books/faq/book.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//ES" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<book lang="es">
<bookinfo>
diff --git a/es_ES.ISO8859-1/books/handbook/book.xml b/es_ES.ISO8859-1/books/handbook/book.xml
index 92c20ce932..b76dceb29d 100755
--- a/es_ES.ISO8859-1/books/handbook/book.xml
+++ b/es_ES.ISO8859-1/books/handbook/book.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//ES" "../../share/xml/entities.ent">
-%entities;
-
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [
<!ENTITY % chapters SYSTEM "chapters.ent">
%chapters;
<!ENTITY % txtfiles SYSTEM "txtfiles.ent">
diff --git a/es_ES.ISO8859-1/share/xml/catalog b/es_ES.ISO8859-1/share/xml/catalog
index 7a81027959..cbd8334622 100644
--- a/es_ES.ISO8859-1/share/xml/catalog
+++ b/es_ES.ISO8859-1/share/xml/catalog
@@ -7,7 +7,7 @@
-- $FreeBSD$
-- $FreeBSDes: doc/es_ES.ISO8859-1/share/xml/catalog,v 1.5 2004/08/05 17:11:47 carvay Exp $
-PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//ES"
+PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
"entities.ent"
PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
diff --git a/es_ES.ISO8859-1/share/xml/catalog.xml b/es_ES.ISO8859-1/share/xml/catalog.xml
index 3553c62fbc..72795603b7 100644
--- a/es_ES.ISO8859-1/share/xml/catalog.xml
+++ b/es_ES.ISO8859-1/share/xml/catalog.xml
@@ -10,6 +10,10 @@
<rewriteURI uriStartString="http://www.FreeBSD.org/XML/www/lang/"
rewritePrefix="../../"/>
+ <public
+ publicId="-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
+ uri="entities.ent" />
+
<public publicId="-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
uri="l10n.ent" />
<public
diff --git a/fr_FR.ISO8859-1/articles/building-products/article.xml b/fr_FR.ISO8859-1/articles/building-products/article.xml
index 069452b076..f6021ad8c9 100644
--- a/fr_FR.ISO8859-1/articles/building-products/article.xml
+++ b/fr_FR.ISO8859-1/articles/building-products/article.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//FR" "../../share/xml/entities.ent">
-%entities;
-<!ENTITY % not.published "IGNORE">
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Documentation Project
diff --git a/fr_FR.ISO8859-1/articles/committers-guide/article.xml b/fr_FR.ISO8859-1/articles/committers-guide/article.xml
index c9d09132f0..0a7dd1acc0 100644
--- a/fr_FR.ISO8859-1/articles/committers-guide/article.xml
+++ b/fr_FR.ISO8859-1/articles/committers-guide/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//FR" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Documentation Project
diff --git a/fr_FR.ISO8859-1/articles/contributing-ports/article.xml b/fr_FR.ISO8859-1/articles/contributing-ports/article.xml
index 0459343d27..2ab239b607 100644
--- a/fr_FR.ISO8859-1/articles/contributing-ports/article.xml
+++ b/fr_FR.ISO8859-1/articles/contributing-ports/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//FR" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Documentation Project
diff --git a/fr_FR.ISO8859-1/articles/contributing/article.xml b/fr_FR.ISO8859-1/articles/contributing/article.xml
index 6aebc1c185..68074a9544 100644
--- a/fr_FR.ISO8859-1/articles/contributing/article.xml
+++ b/fr_FR.ISO8859-1/articles/contributing/article.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//FR" "../../share/xml/entities.ent">
-%entities;
-<!ENTITY % not.published "IGNORE">
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Documentation Project
diff --git a/fr_FR.ISO8859-1/articles/contributors/article.xml b/fr_FR.ISO8859-1/articles/contributors/article.xml
index d8dd56d741..95faeb5aa3 100644
--- a/fr_FR.ISO8859-1/articles/contributors/article.xml
+++ b/fr_FR.ISO8859-1/articles/contributors/article.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//FR" "../../share/xml/entities.ent">
-%entities;
-<!ENTITY % not.published "IGNORE">
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Documentation Project
diff --git a/fr_FR.ISO8859-1/articles/cvsup-advanced/article.xml b/fr_FR.ISO8859-1/articles/cvsup-advanced/article.xml
index f8a6a7a520..1d16021293 100644
--- a/fr_FR.ISO8859-1/articles/cvsup-advanced/article.xml
+++ b/fr_FR.ISO8859-1/articles/cvsup-advanced/article.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//FR" "../../share/xml/entities.ent">
-%entities;
-<!ENTITY % not.published "IGNORE">
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Documentation Project
diff --git a/fr_FR.ISO8859-1/articles/explaining-bsd/article.xml b/fr_FR.ISO8859-1/articles/explaining-bsd/article.xml
index c0793356af..4d10a7d391 100644
--- a/fr_FR.ISO8859-1/articles/explaining-bsd/article.xml
+++ b/fr_FR.ISO8859-1/articles/explaining-bsd/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//FR" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Documentation Project
diff --git a/fr_FR.ISO8859-1/articles/filtering-bridges/article.xml b/fr_FR.ISO8859-1/articles/filtering-bridges/article.xml
index dd88d3a120..d70e463a93 100644
--- a/fr_FR.ISO8859-1/articles/filtering-bridges/article.xml
+++ b/fr_FR.ISO8859-1/articles/filtering-bridges/article.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//FR" "../../share/xml/entities.ent">
-%entities;
-<!ENTITY % not.published "IGNORE">
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Project - http://www.FreeBSD.org
diff --git a/fr_FR.ISO8859-1/articles/fonts/article.xml b/fr_FR.ISO8859-1/articles/fonts/article.xml
index 2620de0106..0b4c8fbc5a 100755
--- a/fr_FR.ISO8859-1/articles/fonts/article.xml
+++ b/fr_FR.ISO8859-1/articles/fonts/article.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//FR" "../../share/xml/entities.ent">
-%entities;
-<!ENTITY % not.published "IGNORE">
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Documentation Project
diff --git a/fr_FR.ISO8859-1/articles/ipsec-must/article.xml b/fr_FR.ISO8859-1/articles/ipsec-must/article.xml
index a917063e3e..34db5cae45 100644
--- a/fr_FR.ISO8859-1/articles/ipsec-must/article.xml
+++ b/fr_FR.ISO8859-1/articles/ipsec-must/article.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//FR" "../../share/xml/entities.ent">
-%entities;
-<!ENTITY % not.published "IGNORE">
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Documentation Project
diff --git a/fr_FR.ISO8859-1/articles/laptop/article.xml b/fr_FR.ISO8859-1/articles/laptop/article.xml
index 695253903e..dc009b02f9 100644
--- a/fr_FR.ISO8859-1/articles/laptop/article.xml
+++ b/fr_FR.ISO8859-1/articles/laptop/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//FR" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Documentation Project
diff --git a/fr_FR.ISO8859-1/articles/linux-users/article.xml b/fr_FR.ISO8859-1/articles/linux-users/article.xml
index 19fb056b76..c0e4e0abcc 100644
--- a/fr_FR.ISO8859-1/articles/linux-users/article.xml
+++ b/fr_FR.ISO8859-1/articles/linux-users/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//FR" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD French Documentation Project
diff --git a/fr_FR.ISO8859-1/articles/mh/article.xml b/fr_FR.ISO8859-1/articles/mh/article.xml
index 5978e969e9..9a85f04080 100644
--- a/fr_FR.ISO8859-1/articles/mh/article.xml
+++ b/fr_FR.ISO8859-1/articles/mh/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//FR" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Documentation Project
diff --git a/fr_FR.ISO8859-1/articles/nanobsd/article.xml b/fr_FR.ISO8859-1/articles/nanobsd/article.xml
index 9ea8414f13..e1ee59862d 100644
--- a/fr_FR.ISO8859-1/articles/nanobsd/article.xml
+++ b/fr_FR.ISO8859-1/articles/nanobsd/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//FR" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Documentation Project
diff --git a/fr_FR.ISO8859-1/articles/new-users/article.xml b/fr_FR.ISO8859-1/articles/new-users/article.xml
index c7bf7ab9de..3a1b587251 100755
--- a/fr_FR.ISO8859-1/articles/new-users/article.xml
+++ b/fr_FR.ISO8859-1/articles/new-users/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//FR" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Documentation Project
diff --git a/fr_FR.ISO8859-1/articles/pam/article.xml b/fr_FR.ISO8859-1/articles/pam/article.xml
index 4407f4880b..ee026243b9 100644
--- a/fr_FR.ISO8859-1/articles/pam/article.xml
+++ b/fr_FR.ISO8859-1/articles/pam/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//FR" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
- Copyright (c) 2001-2003 Networks Associates Technology, Inc.
diff --git a/fr_FR.ISO8859-1/articles/pr-guidelines/article.xml b/fr_FR.ISO8859-1/articles/pr-guidelines/article.xml
index 57da8c89ba..dfea3e6e3c 100644
--- a/fr_FR.ISO8859-1/articles/pr-guidelines/article.xml
+++ b/fr_FR.ISO8859-1/articles/pr-guidelines/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//FR" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
Problem Report Handling Guidelines
diff --git a/fr_FR.ISO8859-1/articles/problem-reports/article.xml b/fr_FR.ISO8859-1/articles/problem-reports/article.xml
index 7e624179c9..591ff049f9 100644
--- a/fr_FR.ISO8859-1/articles/problem-reports/article.xml
+++ b/fr_FR.ISO8859-1/articles/problem-reports/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//FR" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Documentation Project
diff --git a/fr_FR.ISO8859-1/articles/releng-packages/article.xml b/fr_FR.ISO8859-1/articles/releng-packages/article.xml
index 2e2cb9e43c..357ec4a716 100644
--- a/fr_FR.ISO8859-1/articles/releng-packages/article.xml
+++ b/fr_FR.ISO8859-1/articles/releng-packages/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//FR" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Documentation Project
diff --git a/fr_FR.ISO8859-1/books/developers-handbook/book.xml b/fr_FR.ISO8859-1/books/developers-handbook/book.xml
index 32532e7075..f07e83dca7 100644
--- a/fr_FR.ISO8859-1/books/developers-handbook/book.xml
+++ b/fr_FR.ISO8859-1/books/developers-handbook/book.xml
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//FR" "../../share/xml/entities.ent">
-%entities;
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [
<!ENTITY % chapters SYSTEM "chapters.ent"> %chapters;
]>
diff --git a/fr_FR.ISO8859-1/books/faq/book.xml b/fr_FR.ISO8859-1/books/faq/book.xml
index dc18acdd6f..4bb10a320a 100644
--- a/fr_FR.ISO8859-1/books/faq/book.xml
+++ b/fr_FR.ISO8859-1/books/faq/book.xml
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//FR" "../../share/xml/entities.ent">
-%entities;
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [
<!ENTITY bibliography SYSTEM "../../../share/xml/bibliography.xml">
<!ENTITY isbn.amazon 'http://www.amazon.com/exec/obidos/ASIN'>
]>
diff --git a/fr_FR.ISO8859-1/books/fdp-primer/book.xml b/fr_FR.ISO8859-1/books/fdp-primer/book.xml
index 16d63bee43..c07499df82 100644
--- a/fr_FR.ISO8859-1/books/fdp-primer/book.xml
+++ b/fr_FR.ISO8859-1/books/fdp-primer/book.xml
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//FR" "../../share/xml/entities.ent">
-%entities;
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [
<!ENTITY % chapters SYSTEM "chapters.ent">
%chapters;
<!ENTITY sgml.in-progress SYSTEM "in-progress.xml">
diff --git a/fr_FR.ISO8859-1/books/handbook/book.xml b/fr_FR.ISO8859-1/books/handbook/book.xml
index e28afa364d..a3446dc4fe 100644
--- a/fr_FR.ISO8859-1/books/handbook/book.xml
+++ b/fr_FR.ISO8859-1/books/handbook/book.xml
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//FR" "../../share/xml/entities.ent">
-%entities;
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [
<!ENTITY % chapters SYSTEM "chapters.ent"> %chapters;
<!ENTITY % txtfiles SYSTEM "../../../en_US.ISO8859-1/books/handbook/txtfiles.ent"> %txtfiles;
]>
diff --git a/fr_FR.ISO8859-1/books/porters-handbook/book.xml b/fr_FR.ISO8859-1/books/porters-handbook/book.xml
index 6986365929..d239aba36a 100644
--- a/fr_FR.ISO8859-1/books/porters-handbook/book.xml
+++ b/fr_FR.ISO8859-1/books/porters-handbook/book.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//FR" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Documentation Project
diff --git a/fr_FR.ISO8859-1/share/xml/catalog b/fr_FR.ISO8859-1/share/xml/catalog
index fb22c6654c..d729e51785 100644
--- a/fr_FR.ISO8859-1/share/xml/catalog
+++ b/fr_FR.ISO8859-1/share/xml/catalog
@@ -7,7 +7,7 @@
-- $FreeBSD$
--
-PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//FR"
+PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
"entities.ent"
PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
diff --git a/fr_FR.ISO8859-1/share/xml/catalog.xml b/fr_FR.ISO8859-1/share/xml/catalog.xml
index 3553c62fbc..0b06d43c89 100644
--- a/fr_FR.ISO8859-1/share/xml/catalog.xml
+++ b/fr_FR.ISO8859-1/share/xml/catalog.xml
@@ -10,6 +10,9 @@
<rewriteURI uriStartString="http://www.FreeBSD.org/XML/www/lang/"
rewritePrefix="../../"/>
+ <public
+ publicId="-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
+ uri="entities.ent" />
<public publicId="-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
uri="l10n.ent" />
<public
diff --git a/hu_HU.ISO8859-2/articles/compiz-fusion/article.xml b/hu_HU.ISO8859-2/articles/compiz-fusion/article.xml
index a090177e9e..b0903a784a 100644
--- a/hu_HU.ISO8859-2/articles/compiz-fusion/article.xml
+++ b/hu_HU.ISO8859-2/articles/compiz-fusion/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//HU" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!-- $FreeBSD$ -->
diff --git a/hu_HU.ISO8859-2/articles/cups/article.xml b/hu_HU.ISO8859-2/articles/cups/article.xml
index 59f349006d..9d0a7d4897 100644
--- a/hu_HU.ISO8859-2/articles/cups/article.xml
+++ b/hu_HU.ISO8859-2/articles/cups/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//HU" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!-- The FreeBSD Hungarian Documentation Project
Translated by: PALI, Gabor <pgj@FreeBSD.org>
diff --git a/hu_HU.ISO8859-2/articles/explaining-bsd/article.xml b/hu_HU.ISO8859-2/articles/explaining-bsd/article.xml
index bb27cddb99..8ffd88cf1f 100644
--- a/hu_HU.ISO8859-2/articles/explaining-bsd/article.xml
+++ b/hu_HU.ISO8859-2/articles/explaining-bsd/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//HU" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!-- $FreeBSD$ -->
diff --git a/hu_HU.ISO8859-2/articles/gjournal-desktop/article.xml b/hu_HU.ISO8859-2/articles/gjournal-desktop/article.xml
index 5407cf2524..9d3f291737 100644
--- a/hu_HU.ISO8859-2/articles/gjournal-desktop/article.xml
+++ b/hu_HU.ISO8859-2/articles/gjournal-desktop/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//HU" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!-- $FreeBSD$ -->
diff --git a/hu_HU.ISO8859-2/articles/laptop/article.xml b/hu_HU.ISO8859-2/articles/laptop/article.xml
index 5b1268299e..87cf08b87f 100644
--- a/hu_HU.ISO8859-2/articles/laptop/article.xml
+++ b/hu_HU.ISO8859-2/articles/laptop/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//HU" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!-- The FreeBSD Hungarian Documentation Project
Translated by: PALI, Gabor <pgj@FreeBSD.org>
diff --git a/hu_HU.ISO8859-2/articles/linux-comparison/article.xml b/hu_HU.ISO8859-2/articles/linux-comparison/article.xml
index 7af790b2ec..656c81fd72 100644
--- a/hu_HU.ISO8859-2/articles/linux-comparison/article.xml
+++ b/hu_HU.ISO8859-2/articles/linux-comparison/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//HU" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
Copyright (c) 2005 Dru Lavigne
diff --git a/hu_HU.ISO8859-2/articles/linux-users/article.xml b/hu_HU.ISO8859-2/articles/linux-users/article.xml
index 0e54a29591..b174865fce 100644
--- a/hu_HU.ISO8859-2/articles/linux-users/article.xml
+++ b/hu_HU.ISO8859-2/articles/linux-users/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//HU" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!-- $FreeBSD$ -->
diff --git a/hu_HU.ISO8859-2/books/faq/book.xml b/hu_HU.ISO8859-2/books/faq/book.xml
index 5d8fb7e0cf..7d71c9967f 100644
--- a/hu_HU.ISO8859-2/books/faq/book.xml
+++ b/hu_HU.ISO8859-2/books/faq/book.xml
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//HU" "../../share/xml/entities.ent">
-%entities;
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [
<!ENTITY enbase "http://www.FreeBSD.org">
<!ENTITY bibliography SYSTEM "../../share/xml/bibliography.xml">
<!ENTITY url.base.hu "&enbase;/hu">
diff --git a/hu_HU.ISO8859-2/books/fdp-primer/book.xml b/hu_HU.ISO8859-2/books/fdp-primer/book.xml
index 8ee2b33599..1fc09b2c15 100644
--- a/hu_HU.ISO8859-2/books/fdp-primer/book.xml
+++ b/hu_HU.ISO8859-2/books/fdp-primer/book.xml
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//HU" "../../share/xml/entities.ent">
-%entities;
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [
<!ENTITY % chapters SYSTEM "chapters.ent"> %chapters;
]>
diff --git a/hu_HU.ISO8859-2/books/handbook/book.xml b/hu_HU.ISO8859-2/books/handbook/book.xml
index 6528435392..ceaacae891 100644
--- a/hu_HU.ISO8859-2/books/handbook/book.xml
+++ b/hu_HU.ISO8859-2/books/handbook/book.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//HU" "../../share/xml/entities.ent">
-%entities;
-
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [
<!ENTITY % chapters SYSTEM "chapters.ent">
%chapters;
<!ENTITY % txtfiles SYSTEM "txtfiles.ent">
diff --git a/hu_HU.ISO8859-2/share/xml/catalog b/hu_HU.ISO8859-2/share/xml/catalog
index b7bb103082..17b8de072b 100644
--- a/hu_HU.ISO8859-2/share/xml/catalog
+++ b/hu_HU.ISO8859-2/share/xml/catalog
@@ -9,7 +9,7 @@
-- %SOURCE% share/xml/catalog
-- %SRCID% 1.32
-PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//HU"
+PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
"entities.ent"
PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
diff --git a/hu_HU.ISO8859-2/share/xml/catalog.xml b/hu_HU.ISO8859-2/share/xml/catalog.xml
index 3553c62fbc..0b06d43c89 100644
--- a/hu_HU.ISO8859-2/share/xml/catalog.xml
+++ b/hu_HU.ISO8859-2/share/xml/catalog.xml
@@ -10,6 +10,9 @@
<rewriteURI uriStartString="http://www.FreeBSD.org/XML/www/lang/"
rewritePrefix="../../"/>
+ <public
+ publicId="-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
+ uri="entities.ent" />
<public publicId="-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
uri="l10n.ent" />
<public
diff --git a/it_IT.ISO8859-15/articles/committers-guide/article.xml b/it_IT.ISO8859-15/articles/committers-guide/article.xml
index 192c27e6f3..daa3e3d763 100644
--- a/it_IT.ISO8859-15/articles/committers-guide/article.xml
+++ b/it_IT.ISO8859-15/articles/committers-guide/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//IT" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Italian Documentation Project
diff --git a/it_IT.ISO8859-15/articles/explaining-bsd/article.xml b/it_IT.ISO8859-15/articles/explaining-bsd/article.xml
index 47260430b8..d429c1d376 100644
--- a/it_IT.ISO8859-15/articles/explaining-bsd/article.xml
+++ b/it_IT.ISO8859-15/articles/explaining-bsd/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//IT" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Italian Documentation Project
diff --git a/it_IT.ISO8859-15/articles/filtering-bridges/article.xml b/it_IT.ISO8859-15/articles/filtering-bridges/article.xml
index 85e05a8669..f9b2c88528 100644
--- a/it_IT.ISO8859-15/articles/filtering-bridges/article.xml
+++ b/it_IT.ISO8859-15/articles/filtering-bridges/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//IT" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Italian Documentation Project
diff --git a/it_IT.ISO8859-15/articles/new-users/article.xml b/it_IT.ISO8859-15/articles/new-users/article.xml
index d21aa73adb..16e9efdd8b 100644
--- a/it_IT.ISO8859-15/articles/new-users/article.xml
+++ b/it_IT.ISO8859-15/articles/new-users/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//IT" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Italian Documentation Project
diff --git a/it_IT.ISO8859-15/articles/vm-design/article.xml b/it_IT.ISO8859-15/articles/vm-design/article.xml
index 481ba23bbc..182046d44c 100644
--- a/it_IT.ISO8859-15/articles/vm-design/article.xml
+++ b/it_IT.ISO8859-15/articles/vm-design/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//IT" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Italian Documentation Project
diff --git a/it_IT.ISO8859-15/books/handbook/book.xml b/it_IT.ISO8859-15/books/handbook/book.xml
index 72efcac5f3..67a381dbc2 100644
--- a/it_IT.ISO8859-15/books/handbook/book.xml
+++ b/it_IT.ISO8859-15/books/handbook/book.xml
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="iso-8859-15"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//IT" "../../share/xml/entities.ent">
-%entities;
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [
<!ENTITY % chapters SYSTEM "chapters.ent">
%chapters;
diff --git a/it_IT.ISO8859-15/books/unix-introduction/book.xml b/it_IT.ISO8859-15/books/unix-introduction/book.xml
index a863e2b6ec..02390711ae 100644
--- a/it_IT.ISO8859-15/books/unix-introduction/book.xml
+++ b/it_IT.ISO8859-15/books/unix-introduction/book.xml
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="iso-8859-15"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//IT" "../../share/xml/entities.ent">
-%entities;
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [
<!ENTITY % chapters SYSTEM "chapters.ent"> %chapters;
]>
diff --git a/it_IT.ISO8859-15/share/xml/catalog b/it_IT.ISO8859-15/share/xml/catalog
index ad65424b71..8912f7f848 100644
--- a/it_IT.ISO8859-15/share/xml/catalog
+++ b/it_IT.ISO8859-15/share/xml/catalog
@@ -7,7 +7,7 @@
-- $FreeBSD$
--
-PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//IT"
+PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
"entities.ent"
PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
diff --git a/it_IT.ISO8859-15/share/xml/catalog.xml b/it_IT.ISO8859-15/share/xml/catalog.xml
index 3553c62fbc..0b06d43c89 100644
--- a/it_IT.ISO8859-15/share/xml/catalog.xml
+++ b/it_IT.ISO8859-15/share/xml/catalog.xml
@@ -10,6 +10,9 @@
<rewriteURI uriStartString="http://www.FreeBSD.org/XML/www/lang/"
rewritePrefix="../../"/>
+ <public
+ publicId="-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
+ uri="entities.ent" />
<public publicId="-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
uri="l10n.ent" />
<public
diff --git a/ja_JP.eucJP/articles/contributing/article.xml b/ja_JP.eucJP/articles/contributing/article.xml
index 7f5b354665..840519dd05 100644
--- a/ja_JP.eucJP/articles/contributing/article.xml
+++ b/ja_JP.eucJP/articles/contributing/article.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="euc-jp" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//JA" "../../share/xml/entities.ent">
-%entities;
-<!ENTITY % not.published "IGNORE">
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Documentation Project
diff --git a/ja_JP.eucJP/articles/contributors/article.xml b/ja_JP.eucJP/articles/contributors/article.xml
index bbbe90f1df..623b5d082b 100644
--- a/ja_JP.eucJP/articles/contributors/article.xml
+++ b/ja_JP.eucJP/articles/contributors/article.xml
@@ -1,11 +1,8 @@
<?xml version="1.0" encoding="euc-jp" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//JA" "../../share/xml/entities.ent">
-%entities;
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [
<!ENTITY % contrib.ent SYSTEM "../../../en_US.ISO8859-1/articles/contributors/contrib.ent">
%contrib.ent;
-<!ENTITY % not.published "IGNORE">
]>
<!--
diff --git a/ja_JP.eucJP/articles/fbsd-from-scratch/article.xml b/ja_JP.eucJP/articles/fbsd-from-scratch/article.xml
index 40d72ce701..58507f42da 100644
--- a/ja_JP.eucJP/articles/fbsd-from-scratch/article.xml
+++ b/ja_JP.eucJP/articles/fbsd-from-scratch/article.xml
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="euc-jp" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//JA" "../../share/xml/entities.ent">
-%entities;
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [
<!ENTITY scratch.ap "<application>FreeBSD ���������ꤹ��</application>">
]>
diff --git a/ja_JP.eucJP/articles/fonts/article.xml b/ja_JP.eucJP/articles/fonts/article.xml
index 1c20df9bca..f964494fbc 100644
--- a/ja_JP.eucJP/articles/fonts/article.xml
+++ b/ja_JP.eucJP/articles/fonts/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="euc-jp" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//JA" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Documentation Project
diff --git a/ja_JP.eucJP/articles/ipsec-must/article.xml b/ja_JP.eucJP/articles/ipsec-must/article.xml
index 0d4840e369..33ea70d858 100644
--- a/ja_JP.eucJP/articles/ipsec-must/article.xml
+++ b/ja_JP.eucJP/articles/ipsec-must/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="euc-jp" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//JA" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Documentation Project
diff --git a/ja_JP.eucJP/articles/problem-reports/article.xml b/ja_JP.eucJP/articles/problem-reports/article.xml
index 5dddf8a747..7e67f3dc55 100644
--- a/ja_JP.eucJP/articles/problem-reports/article.xml
+++ b/ja_JP.eucJP/articles/problem-reports/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="euc-jp" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//JA" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Japanese Documentation Project
diff --git a/ja_JP.eucJP/books/design-44bsd/book.xml b/ja_JP.eucJP/books/design-44bsd/book.xml
index 61045b3035..5dd4cb5191 100644
--- a/ja_JP.eucJP/books/design-44bsd/book.xml
+++ b/ja_JP.eucJP/books/design-44bsd/book.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="euc-jp" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//JA" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Documentation Project
diff --git a/ja_JP.eucJP/books/faq/book.xml b/ja_JP.eucJP/books/faq/book.xml
index b913f435ab..4436037fb4 100644
--- a/ja_JP.eucJP/books/faq/book.xml
+++ b/ja_JP.eucJP/books/faq/book.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="euc-jp" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//JA" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!-- The FreeBSD Japanese Documentation Project -->
<!-- Original revision: 1.204 -->
diff --git a/ja_JP.eucJP/books/fdp-primer/book.xml b/ja_JP.eucJP/books/fdp-primer/book.xml
index 2ea35255dd..f941f4a8f4 100644
--- a/ja_JP.eucJP/books/fdp-primer/book.xml
+++ b/ja_JP.eucJP/books/fdp-primer/book.xml
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="euc-jp" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//JA" "../../share/xml
-%entities;
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [
<!ENTITY % chapters SYSTEM "chapters.ent"> %chapters;
<!-- ENTITY index SYSTEM "index.xml" -->
]>
diff --git a/ja_JP.eucJP/books/handbook/book.xml b/ja_JP.eucJP/books/handbook/book.xml
index df7ea5494b..19ebff412a 100644
--- a/ja_JP.eucJP/books/handbook/book.xml
+++ b/ja_JP.eucJP/books/handbook/book.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="euc-jp"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//JA" "../../share/xml/entities.ent">
-%entities;
-
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [
<!ENTITY % chapters SYSTEM "chapters.ent">
%chapters;
<!ENTITY % txtfiles SYSTEM "txtfiles.ent">
diff --git a/ja_JP.eucJP/books/porters-handbook/book.xml b/ja_JP.eucJP/books/porters-handbook/book.xml
index c2fa6558d9..22dfc74a7b 100644
--- a/ja_JP.eucJP/books/porters-handbook/book.xml
+++ b/ja_JP.eucJP/books/porters-handbook/book.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="euc-jp" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//JA" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Documentation Project
diff --git a/ja_JP.eucJP/share/xml/catalog b/ja_JP.eucJP/share/xml/catalog
index 3f6c44e4ce..567c8be639 100644
--- a/ja_JP.eucJP/share/xml/catalog
+++ b/ja_JP.eucJP/share/xml/catalog
@@ -4,7 +4,7 @@
-- $FreeBSD$
--
-PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//JA"
+PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
"entities.ent"
PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
diff --git a/ja_JP.eucJP/share/xml/catalog.xml b/ja_JP.eucJP/share/xml/catalog.xml
index 3553c62fbc..0b06d43c89 100644
--- a/ja_JP.eucJP/share/xml/catalog.xml
+++ b/ja_JP.eucJP/share/xml/catalog.xml
@@ -10,6 +10,9 @@
<rewriteURI uriStartString="http://www.FreeBSD.org/XML/www/lang/"
rewritePrefix="../../"/>
+ <public
+ publicId="-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
+ uri="entities.ent" />
<public publicId="-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
uri="l10n.ent" />
<public
diff --git a/mn_MN.UTF-8/books/handbook/book.xml b/mn_MN.UTF-8/books/handbook/book.xml
index 1328ce29dd..a710ce6c1a 100644
--- a/mn_MN.UTF-8/books/handbook/book.xml
+++ b/mn_MN.UTF-8/books/handbook/book.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//MN" "../../share/xml/entities.ent">
-%entities;
-
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [
<!ENTITY % chapters SYSTEM "chapters.ent">
%chapters;
<!ENTITY % txtfiles SYSTEM "txtfiles.ent">
diff --git a/mn_MN.UTF-8/share/xml/catalog b/mn_MN.UTF-8/share/xml/catalog
index 5e9a47fac0..844eae5ee2 100644
--- a/mn_MN.UTF-8/share/xml/catalog
+++ b/mn_MN.UTF-8/share/xml/catalog
@@ -14,7 +14,7 @@
-- $FreeBSD$
--
-PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//MN"
+PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
"entities.ent"
PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
diff --git a/mn_MN.UTF-8/share/xml/catalog.xml b/mn_MN.UTF-8/share/xml/catalog.xml
new file mode 100644
index 0000000000..bc7f459caf
--- /dev/null
+++ b/mn_MN.UTF-8/share/xml/catalog.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN"
+ "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
+
+<!-- $FreeBSD$
+ $FreeBSDde: de-www/share/xml/catalog.xml,v 1.1 2006/10/19 19:26:11 jkois Exp $
+ basiert auf: 1.1
+-->
+
+<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
+ <rewriteSystem systemIdStartString="http://www.FreeBSD.org/XML/www/lang/"
+ rewritePrefix="../../"/>
+ <rewriteURI uriStartString="http://www.FreeBSD.org/XML/www/lang/"
+ rewritePrefix="../../"/>
+
+ <public
+ publicId="-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
+ uri="entities.ent" />
+ <public
+ publicId="-//FreeBSD//ENTITIES DocBook Translator Entities//DE"
+ uri="translators.ent" />
+ <public
+ publicId="-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
+ uri="l10n.ent" />
+</catalog>
diff --git a/nl_NL.ISO8859-1/articles/contributing-ports/article.xml b/nl_NL.ISO8859-1/articles/contributing-ports/article.xml
index 97a0a7cafd..f00082bcd8 100644
--- a/nl_NL.ISO8859-1/articles/contributing-ports/article.xml
+++ b/nl_NL.ISO8859-1/articles/contributing-ports/article.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//NL" "../../share/xml/entities.ent">
-%entities;
-<!ENTITY % not.published "IGNORE">
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
$FreeBSD$
diff --git a/nl_NL.ISO8859-1/articles/contributing/article.xml b/nl_NL.ISO8859-1/articles/contributing/article.xml
index 67249ff3be..2450e11b16 100644
--- a/nl_NL.ISO8859-1/articles/contributing/article.xml
+++ b/nl_NL.ISO8859-1/articles/contributing/article.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//NL" "../../share/xml/entities.ent">
-%entities;
-<!ENTITY % not.published "IGNORE">
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!-- $FreeBSD$ -->
<!-- %SOURCE% en_US.ISO8859-1/articles/contributing/article.sgml -->
diff --git a/nl_NL.ISO8859-1/articles/explaining-bsd/article.xml b/nl_NL.ISO8859-1/articles/explaining-bsd/article.xml
index fbc5a1eb12..d6a15d1d63 100644
--- a/nl_NL.ISO8859-1/articles/explaining-bsd/article.xml
+++ b/nl_NL.ISO8859-1/articles/explaining-bsd/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//NL" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!-- $FreeBSD$ -->
<!-- The FreeBSD Documentation Project -->
diff --git a/nl_NL.ISO8859-1/articles/problem-reports/article.xml b/nl_NL.ISO8859-1/articles/problem-reports/article.xml
index 369ae186fa..b64a2badc8 100644
--- a/nl_NL.ISO8859-1/articles/problem-reports/article.xml
+++ b/nl_NL.ISO8859-1/articles/problem-reports/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//NL" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
$FreeBSD$
diff --git a/nl_NL.ISO8859-1/articles/solid-state/article.xml b/nl_NL.ISO8859-1/articles/solid-state/article.xml
index cf78f56444..3781a135ff 100644
--- a/nl_NL.ISO8859-1/articles/solid-state/article.xml
+++ b/nl_NL.ISO8859-1/articles/solid-state/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//NL" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!-- Copyright (c) 2001 The FreeBSD Documentation Project
diff --git a/nl_NL.ISO8859-1/books/handbook/book.xml b/nl_NL.ISO8859-1/books/handbook/book.xml
index cd956f553e..64d3f2f0d8 100644
--- a/nl_NL.ISO8859-1/books/handbook/book.xml
+++ b/nl_NL.ISO8859-1/books/handbook/book.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//NL" "../../share/xml/entities.ent">
-%entities;
-
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [
<!--
$FreeBSD$
diff --git a/nl_NL.ISO8859-1/share/xml/catalog b/nl_NL.ISO8859-1/share/xml/catalog
index a178f14c85..a59b4d5587 100644
--- a/nl_NL.ISO8859-1/share/xml/catalog
+++ b/nl_NL.ISO8859-1/share/xml/catalog
@@ -6,7 +6,7 @@
-- %SOURCE% en_US.ISO8859-1/share/xml/catalog --
-- %SRCID% 39534 --
-PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//NL"
+PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
"entities.ent"
PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
diff --git a/nl_NL.ISO8859-1/share/xml/catalog.xml b/nl_NL.ISO8859-1/share/xml/catalog.xml
index e131737433..97309b72b9 100644
--- a/nl_NL.ISO8859-1/share/xml/catalog.xml
+++ b/nl_NL.ISO8859-1/share/xml/catalog.xml
@@ -11,6 +11,9 @@
<rewriteURI uriStartString="http://www.FreeBSD.org/XML/www/lang/"
rewritePrefix="../../"/>
+ <public
+ publicId="-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
+ uri="entities.ent" />
<public publicId="-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
uri="l10n.ent" />
<public
diff --git a/pl_PL.ISO8859-2/articles/filtering-bridges/article.xml b/pl_PL.ISO8859-2/articles/filtering-bridges/article.xml
index c4659893b7..e2b2819774 100644
--- a/pl_PL.ISO8859-2/articles/filtering-bridges/article.xml
+++ b/pl_PL.ISO8859-2/articles/filtering-bridges/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//PL" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Polish Documentation Project
diff --git a/pl_PL.ISO8859-2/articles/new-users/article.xml b/pl_PL.ISO8859-2/articles/new-users/article.xml
index baa0b148b9..c487cc2a6e 100644
--- a/pl_PL.ISO8859-2/articles/new-users/article.xml
+++ b/pl_PL.ISO8859-2/articles/new-users/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//PL" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Polish Documentation Project
diff --git a/pl_PL.ISO8859-2/books/handbook/book.xml b/pl_PL.ISO8859-2/books/handbook/book.xml
index e3b5797ad7..292606aca6 100644
--- a/pl_PL.ISO8859-2/books/handbook/book.xml
+++ b/pl_PL.ISO8859-2/books/handbook/book.xml
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="iso-8859-2"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//PL" "../../share/xml/entities.ent">
-%entities;
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [
<!ENTITY % chapters SYSTEM "chapters.ent">
%chapters;
<!ENTITY % txtfiles SYSTEM "txtfiles.ent">
diff --git a/pl_PL.ISO8859-2/share/xml/catalog b/pl_PL.ISO8859-2/share/xml/catalog
index 61f86d1fe8..f97d4c113d 100644
--- a/pl_PL.ISO8859-2/share/xml/catalog
+++ b/pl_PL.ISO8859-2/share/xml/catalog
@@ -5,7 +5,7 @@
Original revision: 1.5
--
-PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//PL"
+PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
"entities.ent"
PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
diff --git a/pl_PL.ISO8859-2/share/xml/catalog.xml b/pl_PL.ISO8859-2/share/xml/catalog.xml
new file mode 100644
index 0000000000..3e43b419ef
--- /dev/null
+++ b/pl_PL.ISO8859-2/share/xml/catalog.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN"
+ "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
+
+<!-- $FreeBSD$
+ $FreeBSDde: de-www/share/xml/catalog.xml,v 1.1 2006/10/19 19:26:11 jkois Exp $
+ basiert auf: 1.1
+-->
+
+<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
+ <rewriteSystem systemIdStartString="http://www.FreeBSD.org/XML/www/lang/"
+ rewritePrefix="../../"/>
+ <rewriteURI uriStartString="http://www.FreeBSD.org/XML/www/lang/"
+ rewritePrefix="../../"/>
+
+ <public
+ publicId="-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
+ uri="entities.ent" />
+ <public
+ publicId="-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
+ uri="l10n.ent" />
+</catalog>
diff --git a/pt_BR.ISO8859-1/articles/building-products/article.xml b/pt_BR.ISO8859-1/articles/building-products/article.xml
index 65ab34d5bc..4073e253c9 100644
--- a/pt_BR.ISO8859-1/articles/building-products/article.xml
+++ b/pt_BR.ISO8859-1/articles/building-products/article.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//PT"
- "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Documentation Project
diff --git a/pt_BR.ISO8859-1/articles/contributing-ports/article.xml b/pt_BR.ISO8859-1/articles/contributing-ports/article.xml
index edcab8972f..d5024e313d 100644
--- a/pt_BR.ISO8859-1/articles/contributing-ports/article.xml
+++ b/pt_BR.ISO8859-1/articles/contributing-ports/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//PT" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Documentation Project
diff --git a/pt_BR.ISO8859-1/articles/contributing/article.xml b/pt_BR.ISO8859-1/articles/contributing/article.xml
index 07bfc91030..d2cf24db38 100644
--- a/pt_BR.ISO8859-1/articles/contributing/article.xml
+++ b/pt_BR.ISO8859-1/articles/contributing/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//PT" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Documentation Project
diff --git a/pt_BR.ISO8859-1/articles/explaining-bsd/article.xml b/pt_BR.ISO8859-1/articles/explaining-bsd/article.xml
index b5e8887f96..bea1fe60fa 100644
--- a/pt_BR.ISO8859-1/articles/explaining-bsd/article.xml
+++ b/pt_BR.ISO8859-1/articles/explaining-bsd/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//PT" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Documentation Project
diff --git a/pt_BR.ISO8859-1/articles/freebsd-questions/article.xml b/pt_BR.ISO8859-1/articles/freebsd-questions/article.xml
index b8edaafb0f..932592e958 100644
--- a/pt_BR.ISO8859-1/articles/freebsd-questions/article.xml
+++ b/pt_BR.ISO8859-1/articles/freebsd-questions/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//PT" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Documentation Project
diff --git a/pt_BR.ISO8859-1/articles/freebsd-update-server/article.xml b/pt_BR.ISO8859-1/articles/freebsd-update-server/article.xml
index ac456abd1d..0a0fd8537e 100644
--- a/pt_BR.ISO8859-1/articles/freebsd-update-server/article.xml
+++ b/pt_BR.ISO8859-1/articles/freebsd-update-server/article.xml
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//PT" "../../share/xml/entities.ent">
-%entities;
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [
<!ENTITY fbus.ap "<application>Servidor de Atualiza��o do FreeBSD</application>">
]>
diff --git a/pt_BR.ISO8859-1/articles/hubs/article.xml b/pt_BR.ISO8859-1/articles/hubs/article.xml
index 3070963f8f..e450adff02 100644
--- a/pt_BR.ISO8859-1/articles/hubs/article.xml
+++ b/pt_BR.ISO8859-1/articles/hubs/article.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
- <!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//PT"
- "../../share/xml/entities.ent">
- %entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Documentation Project
diff --git a/pt_BR.ISO8859-1/articles/linux-users/article.xml b/pt_BR.ISO8859-1/articles/linux-users/article.xml
index f82c3719f4..1bd8dd0aa3 100644
--- a/pt_BR.ISO8859-1/articles/linux-users/article.xml
+++ b/pt_BR.ISO8859-1/articles/linux-users/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//PT" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Documentation Project
diff --git a/pt_BR.ISO8859-1/articles/new-users/article.xml b/pt_BR.ISO8859-1/articles/new-users/article.xml
index fd3c929b95..6b410b9eb7 100644
--- a/pt_BR.ISO8859-1/articles/new-users/article.xml
+++ b/pt_BR.ISO8859-1/articles/new-users/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//PT" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Documentation Project
diff --git a/pt_BR.ISO8859-1/articles/problem-reports/article.xml b/pt_BR.ISO8859-1/articles/problem-reports/article.xml
index 80eb7a1bb4..f6671aff08 100644
--- a/pt_BR.ISO8859-1/articles/problem-reports/article.xml
+++ b/pt_BR.ISO8859-1/articles/problem-reports/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//PT" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Documentation Project
diff --git a/pt_BR.ISO8859-1/books/faq/book.xml b/pt_BR.ISO8859-1/books/faq/book.xml
index c452ef68e0..ea580ceb05 100644
--- a/pt_BR.ISO8859-1/books/faq/book.xml
+++ b/pt_BR.ISO8859-1/books/faq/book.xml
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//PT" "../../share/xml/entities.ent">
-%entities;
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [
<!ENTITY bibliography SYSTEM "../../share/xml/bibliography.xml">
]>
diff --git a/pt_BR.ISO8859-1/books/fdp-primer/book.xml b/pt_BR.ISO8859-1/books/fdp-primer/book.xml
index 2d4b53664e..f6172977c6 100644
--- a/pt_BR.ISO8859-1/books/fdp-primer/book.xml
+++ b/pt_BR.ISO8859-1/books/fdp-primer/book.xml
@@ -1,10 +1,7 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//PT" "../../share/xml/entities.ent">
-%entities;
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [
<!ENTITY % chapters SYSTEM "chapters.ent"> %chapters;
-<!ENTITY % not.published "INCLUDE">
]>
<!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
diff --git a/pt_BR.ISO8859-1/books/handbook/book.xml b/pt_BR.ISO8859-1/books/handbook/book.xml
index 19e3e4feb5..1ed47e2d5e 100644
--- a/pt_BR.ISO8859-1/books/handbook/book.xml
+++ b/pt_BR.ISO8859-1/books/handbook/book.xml
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//PT" "../../share/xml/entities.ent">
-%entities;
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [
<!ENTITY % chapters SYSTEM "chapters.ent"> %chapters;
]>
diff --git a/pt_BR.ISO8859-1/share/xml/catalog.xml b/pt_BR.ISO8859-1/share/xml/catalog.xml
new file mode 100644
index 0000000000..bc7f459caf
--- /dev/null
+++ b/pt_BR.ISO8859-1/share/xml/catalog.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN"
+ "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
+
+<!-- $FreeBSD$
+ $FreeBSDde: de-www/share/xml/catalog.xml,v 1.1 2006/10/19 19:26:11 jkois Exp $
+ basiert auf: 1.1
+-->
+
+<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
+ <rewriteSystem systemIdStartString="http://www.FreeBSD.org/XML/www/lang/"
+ rewritePrefix="../../"/>
+ <rewriteURI uriStartString="http://www.FreeBSD.org/XML/www/lang/"
+ rewritePrefix="../../"/>
+
+ <public
+ publicId="-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
+ uri="entities.ent" />
+ <public
+ publicId="-//FreeBSD//ENTITIES DocBook Translator Entities//DE"
+ uri="translators.ent" />
+ <public
+ publicId="-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
+ uri="l10n.ent" />
+</catalog>
diff --git a/ru_RU.KOI8-R/articles/committers-guide/article.xml b/ru_RU.KOI8-R/articles/committers-guide/article.xml
index 7152ea6a39..a1d0ab3a64 100644
--- a/ru_RU.KOI8-R/articles/committers-guide/article.xml
+++ b/ru_RU.KOI8-R/articles/committers-guide/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="koi8-r" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//RU" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/articles/console-server/article.xml b/ru_RU.KOI8-R/articles/console-server/article.xml
index 50e3756418..b70bd8835d 100644
--- a/ru_RU.KOI8-R/articles/console-server/article.xml
+++ b/ru_RU.KOI8-R/articles/console-server/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="koi8-r" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//RU" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/articles/contributing/article.xml b/ru_RU.KOI8-R/articles/contributing/article.xml
index a671f2f02b..68b757b06a 100644
--- a/ru_RU.KOI8-R/articles/contributing/article.xml
+++ b/ru_RU.KOI8-R/articles/contributing/article.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="koi8-r" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//RU" "../../share/xml/entities.ent">
-%entities;
-<!ENTITY % not.published "IGNORE">
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/articles/cups/article.xml b/ru_RU.KOI8-R/articles/cups/article.xml
index 236c642437..1314c189de 100644
--- a/ru_RU.KOI8-R/articles/cups/article.xml
+++ b/ru_RU.KOI8-R/articles/cups/article.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="koi8-r" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//RU" "../../share/xml/entities.ent">
-%entities;
-<!ENTITY % not.published "IGNORE">
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/articles/custom-gcc/article.xml b/ru_RU.KOI8-R/articles/custom-gcc/article.xml
index e67896530a..d3a301469d 100644
--- a/ru_RU.KOI8-R/articles/custom-gcc/article.xml
+++ b/ru_RU.KOI8-R/articles/custom-gcc/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="koi8-r" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//RU" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/articles/cvs-freebsd/article.xml b/ru_RU.KOI8-R/articles/cvs-freebsd/article.xml
index 395c235b66..fdd2954a60 100644
--- a/ru_RU.KOI8-R/articles/cvs-freebsd/article.xml
+++ b/ru_RU.KOI8-R/articles/cvs-freebsd/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="koi8-r" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//RU" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/articles/cvsup-advanced/article.xml b/ru_RU.KOI8-R/articles/cvsup-advanced/article.xml
index 7abfb45b78..fcacae29eb 100644
--- a/ru_RU.KOI8-R/articles/cvsup-advanced/article.xml
+++ b/ru_RU.KOI8-R/articles/cvsup-advanced/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="koi8-r" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//RU" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/articles/explaining-bsd/article.xml b/ru_RU.KOI8-R/articles/explaining-bsd/article.xml
index 08b343013d..25b9635a4b 100644
--- a/ru_RU.KOI8-R/articles/explaining-bsd/article.xml
+++ b/ru_RU.KOI8-R/articles/explaining-bsd/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="koi8-r" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//RU" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/articles/fbsd-from-scratch/article.xml b/ru_RU.KOI8-R/articles/fbsd-from-scratch/article.xml
index 0e1bf03761..206ff51381 100644
--- a/ru_RU.KOI8-R/articles/fbsd-from-scratch/article.xml
+++ b/ru_RU.KOI8-R/articles/fbsd-from-scratch/article.xml
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="koi8-r" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//RU" "../../share/xml/entities.ent">
-%entities;
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [
<!ENTITY scratch.ap "<application>FreeBSD From Scratch</application>">
]>
diff --git a/ru_RU.KOI8-R/articles/fonts/article.xml b/ru_RU.KOI8-R/articles/fonts/article.xml
index e728588202..0f277e3577 100644
--- a/ru_RU.KOI8-R/articles/fonts/article.xml
+++ b/ru_RU.KOI8-R/articles/fonts/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="koi8-r" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//RU" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/articles/freebsd-questions/article.xml b/ru_RU.KOI8-R/articles/freebsd-questions/article.xml
index 8a20118c4c..6d6421ecec 100644
--- a/ru_RU.KOI8-R/articles/freebsd-questions/article.xml
+++ b/ru_RU.KOI8-R/articles/freebsd-questions/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="koi8-r" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//RU" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/articles/geom-class/article.xml b/ru_RU.KOI8-R/articles/geom-class/article.xml
index 74a2608182..e5942b95cc 100644
--- a/ru_RU.KOI8-R/articles/geom-class/article.xml
+++ b/ru_RU.KOI8-R/articles/geom-class/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="koi8-r" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//RU" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/articles/gjournal-desktop/article.xml b/ru_RU.KOI8-R/articles/gjournal-desktop/article.xml
index 601b103c36..e06dbe2680 100644
--- a/ru_RU.KOI8-R/articles/gjournal-desktop/article.xml
+++ b/ru_RU.KOI8-R/articles/gjournal-desktop/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="koi8-r" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//RU" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/articles/hubs/article.xml b/ru_RU.KOI8-R/articles/hubs/article.xml
index 0ec71a7c38..b0bc37264b 100644
--- a/ru_RU.KOI8-R/articles/hubs/article.xml
+++ b/ru_RU.KOI8-R/articles/hubs/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="koi8-r" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//RU" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/articles/ipsec-must/article.xml b/ru_RU.KOI8-R/articles/ipsec-must/article.xml
index 8aa916e4ae..3dc6fc25d2 100644
--- a/ru_RU.KOI8-R/articles/ipsec-must/article.xml
+++ b/ru_RU.KOI8-R/articles/ipsec-must/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="koi8-r" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//RU" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/articles/laptop/article.xml b/ru_RU.KOI8-R/articles/laptop/article.xml
index 575fd605b1..54bc9b1b8e 100644
--- a/ru_RU.KOI8-R/articles/laptop/article.xml
+++ b/ru_RU.KOI8-R/articles/laptop/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="koi8-r" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//RU" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/articles/linux-comparison/article.xml b/ru_RU.KOI8-R/articles/linux-comparison/article.xml
index ee1f1b5267..bf35993940 100644
--- a/ru_RU.KOI8-R/articles/linux-comparison/article.xml
+++ b/ru_RU.KOI8-R/articles/linux-comparison/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="koi8-r" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//RU" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
Copyright (c) 2005 Dru Lavigne
diff --git a/ru_RU.KOI8-R/articles/mailing-list-faq/article.xml b/ru_RU.KOI8-R/articles/mailing-list-faq/article.xml
index c782e00c39..c04e0983d2 100644
--- a/ru_RU.KOI8-R/articles/mailing-list-faq/article.xml
+++ b/ru_RU.KOI8-R/articles/mailing-list-faq/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="koi8-r" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//RU" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/articles/mh/article.xml b/ru_RU.KOI8-R/articles/mh/article.xml
index eb51be4d32..c4d3cfb59a 100644
--- a/ru_RU.KOI8-R/articles/mh/article.xml
+++ b/ru_RU.KOI8-R/articles/mh/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="koi8-r" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//RU" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/articles/new-users/article.xml b/ru_RU.KOI8-R/articles/new-users/article.xml
index 90a81257ac..f0a6bcaac9 100644
--- a/ru_RU.KOI8-R/articles/new-users/article.xml
+++ b/ru_RU.KOI8-R/articles/new-users/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="koi8-r" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//RU" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/articles/pam/article.xml b/ru_RU.KOI8-R/articles/pam/article.xml
index 47520aadac..39cf9a79b5 100644
--- a/ru_RU.KOI8-R/articles/pam/article.xml
+++ b/ru_RU.KOI8-R/articles/pam/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="koi8-r" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//RU" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/articles/portbuild/article.xml b/ru_RU.KOI8-R/articles/portbuild/article.xml
index 8122fef44a..2c282a694d 100644
--- a/ru_RU.KOI8-R/articles/portbuild/article.xml
+++ b/ru_RU.KOI8-R/articles/portbuild/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="koi8-r" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//RU" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/articles/pr-guidelines/article.xml b/ru_RU.KOI8-R/articles/pr-guidelines/article.xml
index fea3476632..0b16aa96c9 100644
--- a/ru_RU.KOI8-R/articles/pr-guidelines/article.xml
+++ b/ru_RU.KOI8-R/articles/pr-guidelines/article.xml
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="koi8-r" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//RU" "../../share/xml/entities.ent">
-%entities;
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [
<!ENTITY man.edit-pr.1 "<citerefentry><refentrytitle>edit-pr</refentrytitle><manvolnum>1</manvolnum></citerefentry>">
<!ENTITY man.query-pr.1 "<citerefentry><refentrytitle>query-pr</refentrytitle><manvolnum>1</manvolnum></citerefentry>">
]>
diff --git a/ru_RU.KOI8-R/articles/problem-reports/article.xml b/ru_RU.KOI8-R/articles/problem-reports/article.xml
index 5678e9fac3..7af7fe3442 100644
--- a/ru_RU.KOI8-R/articles/problem-reports/article.xml
+++ b/ru_RU.KOI8-R/articles/problem-reports/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="koi8-r" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//RU" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/articles/relaydelay/article.xml b/ru_RU.KOI8-R/articles/relaydelay/article.xml
index 56ca8dc830..0d606c63ba 100644
--- a/ru_RU.KOI8-R/articles/relaydelay/article.xml
+++ b/ru_RU.KOI8-R/articles/relaydelay/article.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="koi8-r" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//RU" "../../share/xml/entities.ent">
-%entities;
-<!ENTITY % not.published "IGNORE">
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/articles/releng-packages/article.xml b/ru_RU.KOI8-R/articles/releng-packages/article.xml
index d39885c76e..e94d1f5e36 100644
--- a/ru_RU.KOI8-R/articles/releng-packages/article.xml
+++ b/ru_RU.KOI8-R/articles/releng-packages/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="koi8-r" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//RU" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/articles/releng/article.xml b/ru_RU.KOI8-R/articles/releng/article.xml
index 4803edde20..dcc82dd336 100644
--- a/ru_RU.KOI8-R/articles/releng/article.xml
+++ b/ru_RU.KOI8-R/articles/releng/article.xml
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="koi8-r" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//RU" "../../share/xml/entities.ent">
-%entities;
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [
<!ENTITY art.re.pkgs '<ulink url="&url.articles.releng-packages;/article.html">The Release Engineering of Third Party Packages</ulink>'>
]>
diff --git a/ru_RU.KOI8-R/articles/solid-state/article.xml b/ru_RU.KOI8-R/articles/solid-state/article.xml
index 3befe7268b..36f365ccdb 100644
--- a/ru_RU.KOI8-R/articles/solid-state/article.xml
+++ b/ru_RU.KOI8-R/articles/solid-state/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="koi8-r" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//RU" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
Copyright (c) 2001 The FreeBSD Documentation Project
diff --git a/ru_RU.KOI8-R/articles/vm-design/article.xml b/ru_RU.KOI8-R/articles/vm-design/article.xml
index bd9d6b0610..eec705a54b 100644
--- a/ru_RU.KOI8-R/articles/vm-design/article.xml
+++ b/ru_RU.KOI8-R/articles/vm-design/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="koi8-r" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//RU" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/books/design-44bsd/book.xml b/ru_RU.KOI8-R/books/design-44bsd/book.xml
index 6cc5534fb7..393277a922 100644
--- a/ru_RU.KOI8-R/books/design-44bsd/book.xml
+++ b/ru_RU.KOI8-R/books/design-44bsd/book.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="koi8-r" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//RU" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/books/developers-handbook/book.xml b/ru_RU.KOI8-R/books/developers-handbook/book.xml
index f799f92b43..dfa30fa25e 100644
--- a/ru_RU.KOI8-R/books/developers-handbook/book.xml
+++ b/ru_RU.KOI8-R/books/developers-handbook/book.xml
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="koi8-r" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//RU" "../../share/xml/entities.ent">
-%entities;
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [
<!ENTITY % chapters SYSTEM "chapters.ent"> %chapters;
]>
diff --git a/ru_RU.KOI8-R/books/faq/book.xml b/ru_RU.KOI8-R/books/faq/book.xml
index e738c0ad85..bb617dc14a 100644
--- a/ru_RU.KOI8-R/books/faq/book.xml
+++ b/ru_RU.KOI8-R/books/faq/book.xml
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="koi8-r" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//RU" "../../share/xml/entities.ent">
-%entities;
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [
<!ENTITY bibliography SYSTEM "../../../share/xml/bibliography.xml">
<!ENTITY rel.head "<emphasis>10-CURRENT</emphasis>">
<!ENTITY rel.head.relx "10.<replaceable>X</replaceable>">
diff --git a/ru_RU.KOI8-R/books/fdp-primer/book.xml b/ru_RU.KOI8-R/books/fdp-primer/book.xml
index 52248aff97..1361912025 100644
--- a/ru_RU.KOI8-R/books/fdp-primer/book.xml
+++ b/ru_RU.KOI8-R/books/fdp-primer/book.xml
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="koi8-r" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//RU" "../../share/xml/entities.ent">
-%entities;
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [
<!ENTITY % chapters SYSTEM "chapters.ent"> %chapters;
]>
diff --git a/ru_RU.KOI8-R/books/handbook/book.xml b/ru_RU.KOI8-R/books/handbook/book.xml
index de3463b36b..e0268464a8 100644
--- a/ru_RU.KOI8-R/books/handbook/book.xml
+++ b/ru_RU.KOI8-R/books/handbook/book.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="koi8-r" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//RU" "../../share/xml/entities.ent">
-%entities;
-
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [
<!ENTITY % chapters SYSTEM "chapters.ent">
%chapters;
<!ENTITY % txtfiles SYSTEM "txtfiles.ent">
diff --git a/ru_RU.KOI8-R/books/porters-handbook/book.xml b/ru_RU.KOI8-R/books/porters-handbook/book.xml
index 3200f37334..5fb338745f 100644
--- a/ru_RU.KOI8-R/books/porters-handbook/book.xml
+++ b/ru_RU.KOI8-R/books/porters-handbook/book.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="koi8-r" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//RU" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/share/xml/catalog b/ru_RU.KOI8-R/share/xml/catalog
index 70dd5a8d35..dc8582b2a8 100644
--- a/ru_RU.KOI8-R/share/xml/catalog
+++ b/ru_RU.KOI8-R/share/xml/catalog
@@ -13,7 +13,7 @@
-- Original revision: r17819
-- ...................................................................... --
-PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//RU"
+PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
"entities.ent"
PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
diff --git a/ru_RU.KOI8-R/share/xml/catalog.xml b/ru_RU.KOI8-R/share/xml/catalog.xml
index 3553c62fbc..0b06d43c89 100644
--- a/ru_RU.KOI8-R/share/xml/catalog.xml
+++ b/ru_RU.KOI8-R/share/xml/catalog.xml
@@ -10,6 +10,9 @@
<rewriteURI uriStartString="http://www.FreeBSD.org/XML/www/lang/"
rewritePrefix="../../"/>
+ <public
+ publicId="-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
+ uri="entities.ent" />
<public publicId="-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
uri="l10n.ent" />
<public
diff --git a/share/xml/freebsd45.dtd b/share/xml/freebsd45.dtd
index 055e722c83..92bd9468bc 100644
--- a/share/xml/freebsd45.dtd
+++ b/share/xml/freebsd45.dtd
@@ -13,6 +13,10 @@
"/usr/local/share/xml/docbook/4.5/docbookx.dtd">
%orig-docbook;
+<!ENTITY % orig-entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
+ "nonexistent">
+%orig-entities;
+
<!ELEMENT hostid (%cptr.char.mix;)*>
<!ATTLIST hostid
role (hostname
diff --git a/tr_TR.ISO8859-9/articles/explaining-bsd/article.xml b/tr_TR.ISO8859-9/articles/explaining-bsd/article.xml
index abb4171564..fadc3c85cb 100644
--- a/tr_TR.ISO8859-9/articles/explaining-bsd/article.xml
+++ b/tr_TR.ISO8859-9/articles/explaining-bsd/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="iso-8859-9" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//TR" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Turkish Documentation Project
diff --git a/tr_TR.ISO8859-9/share/xml/catalog.xml b/tr_TR.ISO8859-9/share/xml/catalog.xml
index 12c0f02504..a3feec86ca 100644
--- a/tr_TR.ISO8859-9/share/xml/catalog.xml
+++ b/tr_TR.ISO8859-9/share/xml/catalog.xml
@@ -9,4 +9,8 @@
rewritePrefix="../../"/>
<rewriteURI uriStartString="http://www.FreeBSD.org/XML/www/lang/"
rewritePrefix="../../"/>
+
+ <public
+ publicId="-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
+ uri="entities.ent" />
</catalog>
diff --git a/zh_CN.GB2312/articles/contributing/article.xml b/zh_CN.GB2312/articles/contributing/article.xml
index 214091369e..8e2a0850bc 100644
--- a/zh_CN.GB2312/articles/contributing/article.xml
+++ b/zh_CN.GB2312/articles/contributing/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="gb2312" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//ZH" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Documentation Project
diff --git a/zh_CN.GB2312/articles/cvs-freebsd/article.xml b/zh_CN.GB2312/articles/cvs-freebsd/article.xml
index 92929ac908..4990c3988b 100644
--- a/zh_CN.GB2312/articles/cvs-freebsd/article.xml
+++ b/zh_CN.GB2312/articles/cvs-freebsd/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="gb2312" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//ZH" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Documentation Project
diff --git a/zh_CN.GB2312/articles/linux-users/article.xml b/zh_CN.GB2312/articles/linux-users/article.xml
index 3a2a157ed0..6cf7b23201 100644
--- a/zh_CN.GB2312/articles/linux-users/article.xml
+++ b/zh_CN.GB2312/articles/linux-users/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="gb2312" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//ZH" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Documentation Project
diff --git a/zh_CN.GB2312/articles/nanobsd/article.xml b/zh_CN.GB2312/articles/nanobsd/article.xml
index aea6323d71..0714dfa5e1 100644
--- a/zh_CN.GB2312/articles/nanobsd/article.xml
+++ b/zh_CN.GB2312/articles/nanobsd/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="gb2312" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//ZH" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Documentation Project
diff --git a/zh_CN.GB2312/articles/rc-scripting/article.xml b/zh_CN.GB2312/articles/rc-scripting/article.xml
index 2b1c46ac6f..2fd0021c35 100644
--- a/zh_CN.GB2312/articles/rc-scripting/article.xml
+++ b/zh_CN.GB2312/articles/rc-scripting/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="gb2312" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//ZH" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Documentation Project
diff --git a/zh_CN.GB2312/articles/remote-install/article.xml b/zh_CN.GB2312/articles/remote-install/article.xml
index 7045b94dfa..5a868bead5 100644
--- a/zh_CN.GB2312/articles/remote-install/article.xml
+++ b/zh_CN.GB2312/articles/remote-install/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="gb2312" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//ZH" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Documentation Project
diff --git a/zh_CN.GB2312/books/arch-handbook/book.xml b/zh_CN.GB2312/books/arch-handbook/book.xml
index ad0d0fac92..cf34a559dd 100644
--- a/zh_CN.GB2312/books/arch-handbook/book.xml
+++ b/zh_CN.GB2312/books/arch-handbook/book.xml
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="gb2312" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//ZH" "../../share/xml/entities.ent">
-%entities;
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [
<!ENTITY % chapters SYSTEM "chapters.ent">
%chapters;
<!ENTITY % mac-entities SYSTEM "mac.ent">
diff --git a/zh_CN.GB2312/books/handbook/book.xml b/zh_CN.GB2312/books/handbook/book.xml
index f451bea069..c37fc7067c 100644
--- a/zh_CN.GB2312/books/handbook/book.xml
+++ b/zh_CN.GB2312/books/handbook/book.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="gb2312"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//ZH" "../../share/xml/entities.ent">
-%entities;
-
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [
<!ENTITY % chapters SYSTEM "chapters.ent">
%chapters;
<!ENTITY % txtfiles SYSTEM "txtfiles.ent">
diff --git a/zh_CN.GB2312/books/porters-handbook/book.xml b/zh_CN.GB2312/books/porters-handbook/book.xml
index 59c0296457..be067e2546 100644
--- a/zh_CN.GB2312/books/porters-handbook/book.xml
+++ b/zh_CN.GB2312/books/porters-handbook/book.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="gb2312" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Books Set//ZH" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Documentation Project
diff --git a/zh_CN.GB2312/share/xml/catalog b/zh_CN.GB2312/share/xml/catalog
index fe5be38b29..9530d38dc5 100644
--- a/zh_CN.GB2312/share/xml/catalog
+++ b/zh_CN.GB2312/share/xml/catalog
@@ -5,7 +5,7 @@
-- $FreeBSD$
--
-PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//ZH"
+PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
"entities.ent"
PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
diff --git a/zh_CN.GB2312/share/xml/catalog.xml b/zh_CN.GB2312/share/xml/catalog.xml
index 3553c62fbc..0b06d43c89 100644
--- a/zh_CN.GB2312/share/xml/catalog.xml
+++ b/zh_CN.GB2312/share/xml/catalog.xml
@@ -10,6 +10,9 @@
<rewriteURI uriStartString="http://www.FreeBSD.org/XML/www/lang/"
rewritePrefix="../../"/>
+ <public
+ publicId="-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
+ uri="entities.ent" />
<public publicId="-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
uri="l10n.ent" />
<public
diff --git a/zh_TW.Big5/articles/contributing/article.xml b/zh_TW.Big5/articles/contributing/article.xml
index fccd4e2de2..aab4b40f43 100644
--- a/zh_TW.Big5/articles/contributing/article.xml
+++ b/zh_TW.Big5/articles/contributing/article.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="big5" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//TW" "../../share/xml/entities.ent">
-%entities;
-<!ENTITY % not.published "IGNORE">
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Documentation Project
diff --git a/zh_TW.Big5/articles/cvs-freebsd/article.xml b/zh_TW.Big5/articles/cvs-freebsd/article.xml
index dd5faf36de..18cc54e08a 100644
--- a/zh_TW.Big5/articles/cvs-freebsd/article.xml
+++ b/zh_TW.Big5/articles/cvs-freebsd/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="big5" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//TW" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!-- $FreeBSD$ -->
<!-- The FreeBSD Documentation Project -->
diff --git a/zh_TW.Big5/articles/freebsd-questions/article.xml b/zh_TW.Big5/articles/freebsd-questions/article.xml
index 62870543c4..43ccab98ce 100644
--- a/zh_TW.Big5/articles/freebsd-questions/article.xml
+++ b/zh_TW.Big5/articles/freebsd-questions/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="big5" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//TW" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
Original revision: 1.24
diff --git a/zh_TW.Big5/articles/hubs/article.xml b/zh_TW.Big5/articles/hubs/article.xml
index f684c31476..8d0bfe14ed 100644
--- a/zh_TW.Big5/articles/hubs/article.xml
+++ b/zh_TW.Big5/articles/hubs/article.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="big5" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//TW" "../../share/xml/entities.ent">
-%entities;
-<!ENTITY % not.published "IGNORE">
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!-- $FreeBSD$ -->
<!-- The FreeBSD Documentation Project -->
diff --git a/zh_TW.Big5/articles/mailing-list-faq/article.xml b/zh_TW.Big5/articles/mailing-list-faq/article.xml
index ba7647983e..4a3c7f68d4 100644
--- a/zh_TW.Big5/articles/mailing-list-faq/article.xml
+++ b/zh_TW.Big5/articles/mailing-list-faq/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="big5" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//TW" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!-- $FreeBSD$ -->
diff --git a/zh_TW.Big5/articles/nanobsd/article.xml b/zh_TW.Big5/articles/nanobsd/article.xml
index d6b819eeee..d8d0147f8a 100644
--- a/zh_TW.Big5/articles/nanobsd/article.xml
+++ b/zh_TW.Big5/articles/nanobsd/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="big5" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//TW" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Documentation Project
diff --git a/zh_TW.Big5/articles/pr-guidelines/article.xml b/zh_TW.Big5/articles/pr-guidelines/article.xml
index 5e6a5dccff..09b69a1a80 100644
--- a/zh_TW.Big5/articles/pr-guidelines/article.xml
+++ b/zh_TW.Big5/articles/pr-guidelines/article.xml
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="big5" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//TW" "../../share/xml/entities.ent">
-%entities;
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [
<!ENTITY man.edit-pr.1 "<citerefentry><refentrytitle>edit-pr</refentrytitle><manvolnum>1</manvolnum></citerefentry>">
<!ENTITY man.query-pr.1 "<citerefentry><refentrytitle>query-pr</refentrytitle><manvolnum>1</manvolnum></citerefentry>">
]>
diff --git a/zh_TW.Big5/articles/problem-reports/article.xml b/zh_TW.Big5/articles/problem-reports/article.xml
index 0eca52284e..72042afc0f 100644
--- a/zh_TW.Big5/articles/problem-reports/article.xml
+++ b/zh_TW.Big5/articles/problem-reports/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="big5" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//TW" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<article lang='zh_tw'>
<articleinfo>
diff --git a/zh_TW.Big5/articles/remote-install/article.xml b/zh_TW.Big5/articles/remote-install/article.xml
index dacfbf8da3..3f35c3ded9 100644
--- a/zh_TW.Big5/articles/remote-install/article.xml
+++ b/zh_TW.Big5/articles/remote-install/article.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="big5" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//TW" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Documentation Project
diff --git a/zh_TW.Big5/books/developers-handbook/book.xml b/zh_TW.Big5/books/developers-handbook/book.xml
index 7ed723cb4b..9ca8271336 100644
--- a/zh_TW.Big5/books/developers-handbook/book.xml
+++ b/zh_TW.Big5/books/developers-handbook/book.xml
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="big5" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//TW" "../../share/xml/entities.ent">
-%entities;
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [
<!ENTITY % chapters SYSTEM "chapters.ent"> %chapters;
]>
diff --git a/zh_TW.Big5/books/faq/book.xml b/zh_TW.Big5/books/faq/book.xml
index be829a904b..774de27d1c 100644
--- a/zh_TW.Big5/books/faq/book.xml
+++ b/zh_TW.Big5/books/faq/book.xml
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="big5"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//TW" "../../share/xml/entities.ent">
-%entities;
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [
<!ENTITY bibliography SYSTEM "../../../share/xml/bibliography.xml">
]>
diff --git a/zh_TW.Big5/books/fdp-primer/book.xml b/zh_TW.Big5/books/fdp-primer/book.xml
index 6309b5fcce..6f40f1e56a 100644
--- a/zh_TW.Big5/books/fdp-primer/book.xml
+++ b/zh_TW.Big5/books/fdp-primer/book.xml
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="big5"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//TW" "../../share/xml/entities.ent">
-%entities;
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [
<!ENTITY % chapters SYSTEM "chapters.ent"> %chapters;
]>
diff --git a/zh_TW.Big5/books/handbook/book.xml b/zh_TW.Big5/books/handbook/book.xml
index b0df515e4e..f41b68b982 100644
--- a/zh_TW.Big5/books/handbook/book.xml
+++ b/zh_TW.Big5/books/handbook/book.xml
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="big5"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//TW" "../../share/xml/entities.ent">
-%entities;
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [
<!ENTITY % chapters SYSTEM "chapters.ent">
%chapters;
<!ENTITY % txtfiles SYSTEM "txtfiles.ent">
diff --git a/zh_TW.Big5/books/porters-handbook/book.xml b/zh_TW.Big5/books/porters-handbook/book.xml
index bdd7379336..d14b8c225d 100644
--- a/zh_TW.Big5/books/porters-handbook/book.xml
+++ b/zh_TW.Big5/books/porters-handbook/book.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="big5" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//TW" "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Documentation Project
diff --git a/zh_TW.Big5/share/xml/catalog b/zh_TW.Big5/share/xml/catalog
index 1fc13ef076..39bb7cb408 100644
--- a/zh_TW.Big5/share/xml/catalog
+++ b/zh_TW.Big5/share/xml/catalog
@@ -4,7 +4,7 @@
-- $FreeBSD$
--
-PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//ZH"
+PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
"entities.ent"
PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
diff --git a/zh_TW.Big5/share/xml/catalog.xml b/zh_TW.Big5/share/xml/catalog.xml
index 91a24be917..dd54826205 100644
--- a/zh_TW.Big5/share/xml/catalog.xml
+++ b/zh_TW.Big5/share/xml/catalog.xml
@@ -10,6 +10,9 @@
<rewriteURI uriStartString="http://www.FreeBSD.org/XML/www/lang/"
rewritePrefix="../../"/>
+ <public
+ publicId="-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
+ uri="entities.ent" />
<public publicId="-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
uri="l10n.ent" />
<public
From 2d41fddf907a47dbbc9d14c3ab11bf88be2973fe Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Wed, 30 Jan 2013 16:10:54 +0000
Subject: [PATCH 027/121] - Some minor adjustments
---
share/xsl/freebsd-xhtml-chunk.xsl | 3 +++
share/xsl/freebsd-xhtml-common.xsl | 5 -----
share/xsl/freebsd-xhtml.xsl | 1 -
3 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/share/xsl/freebsd-xhtml-chunk.xsl b/share/xsl/freebsd-xhtml-chunk.xsl
index 635c922d13..b3485ffb11 100644
--- a/share/xsl/freebsd-xhtml-chunk.xsl
+++ b/share/xsl/freebsd-xhtml-chunk.xsl
@@ -12,5 +12,8 @@
<!-- Pull in common XHTML customizations -->
<xsl:include href="freebsd-xhtml-common.xsl"/>
+
+ <xsl:param name="generate.manifest" select="'1'"/>
+ <xsl:param name="generate.legalnotice.link" select="'1'"/>
</xsl:stylesheet>
diff --git a/share/xsl/freebsd-xhtml-common.xsl b/share/xsl/freebsd-xhtml-common.xsl
index ded9e0f2ab..7ddbdeb6d4 100644
--- a/share/xsl/freebsd-xhtml-common.xsl
+++ b/share/xsl/freebsd-xhtml-common.xsl
@@ -7,10 +7,6 @@
xmlns="http://www.w3.org/TR/xhtml1/transitional"
exclude-result-prefixes="#default">
- <!-- Pull in the base stylesheets -->
- <!-- XXX hardcoded path. Very bad. Should be turned in to a paramater -->
- <xsl:import href="/usr/local/share/xml/docbook/xsl/modular/html/docbook.xsl"/>
-
<!-- Include the common customizations -->
<xsl:include href="freebsd-common.xsl"/>
@@ -22,7 +18,6 @@
<xsl:param name="html.stylesheet" select="'docbook.css'"/>
<xsl:param name="user.id.as.filename" select="'1'"/>
- <xsl:param name="generate.legalnotice.link" select="'1'"/>
<xsl:param name="link.mailto.url" select="'doc@FreeBSD.org'"/>
<xsl:param name="callout.graphics.path" select="'./imagelib/callouts/'"/>
diff --git a/share/xsl/freebsd-xhtml.xsl b/share/xsl/freebsd-xhtml.xsl
index bcb0c26738..9b5a37fe8e 100644
--- a/share/xsl/freebsd-xhtml.xsl
+++ b/share/xsl/freebsd-xhtml.xsl
@@ -13,4 +13,3 @@
<!-- Pull in common XHTML customizations -->
<xsl:include href="freebsd-xhtml-common.xsl"/>
</xsl:stylesheet>
-
From 651943c7e4150a65277455a071d635444b0505b5 Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Wed, 30 Jan 2013 16:19:08 +0000
Subject: [PATCH 028/121] - Generate html and html-split with XSLT rather than
DSSSL - Good bye HTML Tidy
---
share/mk/doc.docbook.mk | 86 ++++-------------------------------------
1 file changed, 8 insertions(+), 78 deletions(-)
diff --git a/share/mk/doc.docbook.mk b/share/mk/doc.docbook.mk
index b2a058e99f..d66736da79 100644
--- a/share/mk/doc.docbook.mk
+++ b/share/mk/doc.docbook.mk
@@ -40,14 +40,9 @@
# used to set additional variables, such as
# "%generate-article-toc%".
#
-# TIDYFLAGS Additional flags to pass to Tidy. Typically
-# used to set "-raw" flag to handle 8bit characters.
-#
# EXTRA_CATALOGS Additional catalog files that should be used by
# any SGML processing applications.
#
-# NO_TIDY If you do not want to use tidy, set this to "YES".
-#
# GEN_INDEX If this document has an index (HAS_INDEX) and this
# variable is defined, then index.xml will be added
# to the list of dependencies for source files, and
@@ -118,9 +113,6 @@ MASTERDOC?= ${.CURDIR}/${DOC}.xml
# List of supported SP_ENCODINGs
SP_ENCODING_LIST?= ISO-8859-2 KOI8-R
-# Which stylesheet type to use. 'dsssl' or 'xsl'
-STYLESHEET_TYPE?= dsssl
-
.if defined(SPELLCHECK)
DSLHTML?= ${DOC_PREFIX}/share/xml/spellcheck.dsl
.endif
@@ -147,25 +139,19 @@ JADE_CMD= ${SETENV} ${JADE_ENV} ${JADE}
DSLHTML?= ${DOC_PREFIX}/share/xml/default.dsl
DSLPRINT?= ${DOC_PREFIX}/share/xml/default.dsl
DSLPGP?= ${DOC_PREFIX}/share/xml/pgp.dsl
+
FREEBSDCATALOG= ${DOC_PREFIX}/share/xml/catalog
LANGUAGECATALOG=${DOC_PREFIX}/${LANGCODE}/share/xml/catalog
-
ISO8879CATALOG= ${PREFIX}/share/sgml/iso8879/catalog
-
-.if ${STYLESHEET_TYPE} == "dsssl"
-DOCBOOKCATALOG= ${PREFIX}/share/sgml/docbook/catalog
-.elif ${STYLESHEET_TYPE} == "xsl"
DOCBOOKCATALOG= ${PREFIX}/share/xml/docbook/catalog
-.endif
-
CATALOG_PORTS_SGML= ${PREFIX}/share/sgml/catalog.ports
-
DSSSLCATALOG= ${PREFIX}/share/sgml/docbook/dsssl/modular/catalog
+
COLLATEINDEX= ${PREFIX}/share/sgml/docbook/dsssl/modular/bin/collateindex.pl
XSLTPROCFLAGS?= --nonet
-XSLHTML?= ${DOC_PREFIX}/share/xsl/freebsd-html.xsl
-XSLHTMLCHUNK?= ${DOC_PREFIX}/share/xsl/freebsd-html-chunk.xsl
+XSLXHTML?= ${DOC_PREFIX}/share/xsl/freebsd-xhtml.xsl
+XSLXHTMLCHUNK?= ${DOC_PREFIX}/share/xsl/freebsd-xhtml-chunk.xsl
XSLFO?= ${DOC_PREFIX}/share/xsl/freebsd-fo.xsl
INDEXREPORTSCRIPT= ${DOC_PREFIX}/share/misc/indexreport.pl
@@ -253,12 +239,6 @@ TOUCH?= /usr/bin/touch
XARGS?= /usr/bin/xargs
GROFF?= groff
-TIDY_VER!= ${TIDY} -v 2>&1
-.if ${TIDY_VER} == "HTML Tidy for FreeBSD released on 7 December 2008"
-TIDYOPTS?= -wrap 90 -m -raw --preserve-entities yes -f /dev/null -asxml ${TIDYFLAGS}
-.else
-TIDYOPTS?= -wrap 90 -m -raw -preserve -f /dev/null -asxml ${TIDYFLAGS}
-.endif
HTML2TXT?= ${PREFIX}/bin/links
HTML2TXTOPTS?= -dump -width 72 ${HTML2TXTFLAGS}
HTML2PDB?= ${PREFIX}/bin/iSiloBSD
@@ -407,10 +387,6 @@ CLEANFILES+= ${.CURDIR:T}.pdb
.endif
.endif
-.if (${STYLESHEET_TYPE} == "xsl")
-CLEANFILES+= ${DOC}.xml .sxerr
-.endif
-
.if (${LOCAL_CSS_SHEET} != ${CSS_SHEET}) && \
(${_cf} == "html-split" || ${_cf} == "html-split.tar" || \
${_cf} == "html" || ${_cf} == "html.tar" || ${_cf} == "txt")
@@ -420,7 +396,6 @@ CLEANFILES+= ${LOCAL_CSS_SHEET}
.if !defined(WITH_INLINE_LEGALNOTICE) || empty(WITH_INLINE_LEGALNOTICE) && \
(${_cf} == "html-split" || ${_cf} == "html-split.tar" || \
${_cf} == "html" || ${_cf} == "html.tar" || ${_cf} == "txt")
-CLEANFILES+= LEGALNOTICE.html trademarks.html
.endif
.endfor # _curformat in ${FORMATS} #
@@ -500,62 +475,17 @@ NO_RTF= yes
.endif
.endfor
-# HTML-SPLIT -------------------------------------------------------------
+# XHTML -------------------------------------------------------------
-.if ${STYLESHEET_TYPE} == "dsssl"
-index.html HTML.manifest: ${SRCS} ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG} \
- ${LOCAL_IMAGES_TXT} ${HTML_SPLIT_INDEX} ${LOCAL_CSS_SHEET}
- ${GEN_INDEX_SGML_CMD}
- ${JADE_CMD} -V html-manifest ${HTMLOPTS} -ioutput.html.images \
- ${JADEOPTS} -t sgml ${XMLDECL} ${MASTERDOC}
-.elif ${STYLESHEET_TYPE} == "xsl"
index.html: ${DOC}.xml ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG} \
${HTML_SPLIT_INDEX} ${LOCAL_CSS_SHEET}
${GEN_INDEX_SGML_CMD}
- ${XSLTPROC} ${XSLTPROCOPTS} --param freebsd.output.html.images "'1'" ${XSLHTMLCHUNK} \
- ${DOC}.xml
-.endif
-.if !defined(NO_TIDY)
- ${REINPLACE_TABS_CMD} $$(${XARGS} < HTML.manifest)
- -${TIDY} ${TIDYOPTS} $$(${XARGS} < HTML.manifest)
-.endif
+ ${XSLTPROC} ${XSLTPROCOPTS} ${XSLXHTMLCHUNK} ${DOC}.xml
-# HTML -------------------------------------------------------------------
-
-.if ${STYLESHEET_TYPE} == "dsssl"
-${DOC}.html: ${SRCS} ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG} \
- ${LOCAL_IMAGES_TXT} ${HTML_INDEX} ${LOCAL_CSS_SHEET}
- ${GEN_INDEX_SGML_CMD}
- ${JADE_CMD} -V nochunks ${HTMLOPTS} -ioutput.html.images \
- ${JADEOPTS} -t sgml ${XMLDECL} ${MASTERDOC} > ${.TARGET} || \
- (${RM} -f ${.TARGET} && false)
-.elif ${STYLESHEET_TYPE} == "xsl"
${DOC}.html: ${DOC}.xml ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG} \
${LOCAL_CSS_SHEET}
${GEN_INDEX_SGML_CMD}
- ${XSLTPROC} ${XSLTPROCOPTS} --param freebsd.output.html.images "'1'" ${XSLHTML} \
- ${DOC}.xml > ${.TARGET}
-.endif
-.if !defined(NO_TIDY)
- ${REINPLACE_TABS_CMD} ${.TARGET}
- -${TIDY} ${TIDYOPTS} ${.TARGET}
-.endif
-
-# HTML-TEXT --------------------------------------------------------------
-
-# Special target to produce HTML with no images in it.
-.if ${STYLESHEET_TYPE} == "dsssl"
-${DOC}.html-text: ${SRCS} ${HTML_INDEX} ${LOCAL_IMAGES_TXT}
- ${GEN_INDEX_SGML_CMD}
- ${JADE_CMD} -V nochunks ${HTMLTXTOPTS} \
- ${JADEOPTS} -t sgml ${XMLDECL} ${MASTERDOC} > ${.TARGET} || \
- (${RM} -f ${.TARGET} && false)
-.elif ${STYLESHEET_TYPE} == "xsl"
-${DOC}.html-text: ${DOC}.xml ${HTML_INDEX}
- ${GEN_INDEX_SGML_CMD}
- ${XSLTPROC} ${XSLTPROCOPTS} --param freebsd.output.html.images "'0'" ${XSLHTML} \
- ${DOC}.xml > ${.TARGET}
-.endif
+ ${XSLTPROC} ${XSLTPROCOPTS} ${XSLXHTML} ${DOC}.xml > ${.TARGET}
${DOC}.html-split.tar: HTML.manifest ${LOCAL_IMAGES_LIB} \
${LOCAL_IMAGES_PNG} ${LOCAL_CSS_SHEET}
@@ -577,7 +507,7 @@ ${DOC}.html.tar: ${DOC}.html ${LOCAL_IMAGES_LIB} \
.if !target(${DOC}.txt)
.if !defined(NO_PLAINTEXT)
-${DOC}.txt: ${DOC}.html-text
+${DOC}.txt: ${DOC}.html
${HTML2TXT} ${HTML2TXTOPTS} ${.ALLSRC} > ${.TARGET}
.else
${DOC}.txt:
From ebeaccc19d53ca865e700a9c9907dc70b9b5c8fd Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Wed, 30 Jan 2013 16:36:59 +0000
Subject: [PATCH 029/121] - Add support for epub generation
---
share/mk/doc.docbook.mk | 18 +++++++++++++++++-
1 file changed, 17 insertions(+), 1 deletion(-)
diff --git a/share/mk/doc.docbook.mk b/share/mk/doc.docbook.mk
index d66736da79..878566172d 100644
--- a/share/mk/doc.docbook.mk
+++ b/share/mk/doc.docbook.mk
@@ -152,6 +152,7 @@ COLLATEINDEX= ${PREFIX}/share/sgml/docbook/dsssl/modular/bin/collateindex.pl
XSLTPROCFLAGS?= --nonet
XSLXHTML?= ${DOC_PREFIX}/share/xsl/freebsd-xhtml.xsl
XSLXHTMLCHUNK?= ${DOC_PREFIX}/share/xsl/freebsd-xhtml-chunk.xsl
+XSLEPUB?= ${DOC_PREFIX}/share/xsl/freebsd-epub.xsl
XSLFO?= ${DOC_PREFIX}/share/xsl/freebsd-fo.xsl
INDEXREPORTSCRIPT= ${DOC_PREFIX}/share/misc/indexreport.pl
@@ -349,6 +350,10 @@ CLEANFILES+= PLIST.${_curformat}
CLEANFILES+= $$([ -f HTML.manifest ] && ${XARGS} < HTML.manifest) \
HTML.manifest ln*.html
+.elif ${_cf} == "epub"
+CLEANFILES+= ${DOC}.epub mimetype
+CLEANDIRS+= META-INF OEBPS
+
.elif ${_cf} == "html.tar"
CLEANFILES+= ${DOC}.html
@@ -413,7 +418,7 @@ CLEANFILES+= ${LOCAL_CSS_SHEET}
_cf=${_curformat}
.for _curcomp in ${INSTALL_COMPRESSED}
-.if ${_cf} != "html-split" && ${_cf} != "html"
+.if ${_cf} != "html-split" && ${_cf} != "html" && ${_cf} != "epub"
_curinst+= install-${_curformat}.${_curcomp}
_docs+= ${DOC}.${_curformat}.${_curcomp}
CLEANFILES+= ${DOC}.${_curformat}.${_curcomp}
@@ -503,6 +508,17 @@ ${DOC}.html.tar: ${DOC}.html ${LOCAL_IMAGES_LIB} \
${TAR} rf ${.TARGET} -C ${IMAGES_EN_DIR}/${DOC}s/${.CURDIR:T} ${_curimage:S|${IMAGES_EN_DIR}/${DOC}s/${.CURDIR:T}/||}
.endfor
+# EPUB -------------------------------------------------------------
+
+${DOC}.epub: ${DOC}.xml ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG} \
+ ${CSS_SHEET}
+ ${XSLTPROC} ${XSLTPROCOPTS} ${XSLEPUB} ${DOC}.xml
+ ${ECHO} "application/epub+zip" > mimetype
+ ${CP} ${CSS_SHEET} OEBPS/
+ zip -0Xq ${DOC}.epub mimetype
+ zip -Xr9D ${DOC}.epub OEBPS META-INF
+
+
# TXT --------------------------------------------------------------------
.if !target(${DOC}.txt)
From 5bf11e4c09a73b6f895e154ac9764ae4eeb050d0 Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Wed, 30 Jan 2013 18:59:41 +0000
Subject: [PATCH 030/121] - Add epub stylesheet customization
---
share/xsl/freebsd-epub.xsl | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
create mode 100644 share/xsl/freebsd-epub.xsl
diff --git a/share/xsl/freebsd-epub.xsl b/share/xsl/freebsd-epub.xsl
new file mode 100644
index 0000000000..1a48cb7164
--- /dev/null
+++ b/share/xsl/freebsd-epub.xsl
@@ -0,0 +1,18 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version='1.0'
+ xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ exclude-result-prefixes="#default">
+
+ <!-- Pull in the base stylesheets -->
+ <xsl:import href="/usr/local/share/xsl/docbook/epub/docbook.xsl"/>
+
+ <!-- Pull in common XHTML customizations -->
+ <xsl:include href="freebsd-xhtml-common.xsl"/>
+
+ <xsl:param name="generate.legalnotice.link" select="'1'"/>
+</xsl:stylesheet>
+
From 5df509eaa2d1f1d2ef80dea6e2cda7839b07cf46 Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Wed, 30 Jan 2013 19:12:36 +0000
Subject: [PATCH 031/121] - Remove standalone="no" statements from XML
declarations since it did not always work and is no use anyway
---
da_DK.ISO8859-1/articles/ipsec-must/article.xml | 2 +-
de_DE.ISO8859-1/articles/contributing-ports/article.xml | 2 +-
de_DE.ISO8859-1/articles/contributing/article.xml | 2 +-
de_DE.ISO8859-1/articles/explaining-bsd/article.xml | 2 +-
de_DE.ISO8859-1/articles/laptop/article.xml | 2 +-
de_DE.ISO8859-1/articles/linux-comparison/article.xml | 2 +-
de_DE.ISO8859-1/articles/new-users/article.xml | 2 +-
de_DE.ISO8859-1/articles/solid-state/article.xml | 2 +-
de_DE.ISO8859-1/books/developers-handbook/book.xml | 2 +-
de_DE.ISO8859-1/books/faq/book.xml | 2 +-
de_DE.ISO8859-1/books/fdp-primer/book.xml | 2 +-
de_DE.ISO8859-1/books/handbook/book.xml | 2 +-
de_DE.ISO8859-1/books/porters-handbook/book.xml | 2 +-
el_GR.ISO8859-7/articles/bsdl-gpl/article.xml | 2 +-
el_GR.ISO8859-7/articles/compiz-fusion/article.xml | 2 +-
el_GR.ISO8859-7/articles/contributing/article.xml | 2 +-
el_GR.ISO8859-7/articles/cvs-freebsd/article.xml | 2 +-
el_GR.ISO8859-7/articles/explaining-bsd/article.xml | 2 +-
el_GR.ISO8859-7/articles/freebsd-questions/article.xml | 2 +-
el_GR.ISO8859-7/articles/gjournal-desktop/article.xml | 2 +-
el_GR.ISO8859-7/articles/greek-language-support/article.xml | 2 +-
el_GR.ISO8859-7/articles/laptop/article.xml | 2 +-
el_GR.ISO8859-7/articles/linux-users/article.xml | 2 +-
el_GR.ISO8859-7/articles/mailing-list-faq/article.xml | 2 +-
el_GR.ISO8859-7/articles/nanobsd/article.xml | 2 +-
el_GR.ISO8859-7/articles/new-users/article.xml | 2 +-
el_GR.ISO8859-7/articles/problem-reports/article.xml | 2 +-
el_GR.ISO8859-7/articles/releng-packages/article.xml | 2 +-
el_GR.ISO8859-7/articles/releng/article.xml | 2 +-
el_GR.ISO8859-7/books/faq/book.xml | 2 +-
el_GR.ISO8859-7/books/handbook/book.xml | 2 +-
en_US.ISO8859-1/articles/bsdl-gpl/article.xml | 2 +-
en_US.ISO8859-1/articles/building-products/article.xml | 2 +-
en_US.ISO8859-1/articles/casestudy-argentina.com/article.xml | 2 +-
en_US.ISO8859-1/articles/committers-guide/article.xml | 2 +-
en_US.ISO8859-1/articles/compiz-fusion/article.xml | 2 +-
en_US.ISO8859-1/articles/console-server/article.xml | 2 +-
en_US.ISO8859-1/articles/contributing-ports/article.xml | 2 +-
en_US.ISO8859-1/articles/contributing/article.xml | 2 +-
en_US.ISO8859-1/articles/contributors/article.xml | 2 +-
en_US.ISO8859-1/articles/cups/article.xml | 2 +-
en_US.ISO8859-1/articles/custom-gcc/article.xml | 2 +-
en_US.ISO8859-1/articles/cvs-freebsd/article.xml | 2 +-
en_US.ISO8859-1/articles/cvsup-advanced/article.xml | 2 +-
en_US.ISO8859-1/articles/explaining-bsd/article.xml | 2 +-
en_US.ISO8859-1/articles/fbsd-from-scratch/article.xml | 2 +-
en_US.ISO8859-1/articles/filtering-bridges/article.xml | 2 +-
en_US.ISO8859-1/articles/fonts/article.xml | 2 +-
en_US.ISO8859-1/articles/freebsd-questions/article.xml | 2 +-
en_US.ISO8859-1/articles/freebsd-update-server/article.xml | 2 +-
en_US.ISO8859-1/articles/geom-class/article.xml | 2 +-
en_US.ISO8859-1/articles/gjournal-desktop/article.xml | 2 +-
en_US.ISO8859-1/articles/hubs/article.xml | 2 +-
en_US.ISO8859-1/articles/ipsec-must/article.xml | 2 +-
en_US.ISO8859-1/articles/laptop/article.xml | 2 +-
en_US.ISO8859-1/articles/ldap-auth/article.xml | 2 +-
en_US.ISO8859-1/articles/linux-comparison/article.xml | 2 +-
en_US.ISO8859-1/articles/linux-emulation/article.xml | 2 +-
en_US.ISO8859-1/articles/linux-users/article.xml | 2 +-
en_US.ISO8859-1/articles/mailing-list-faq/article.xml | 2 +-
en_US.ISO8859-1/articles/mh/article.xml | 2 +-
en_US.ISO8859-1/articles/nanobsd/article.xml | 2 +-
en_US.ISO8859-1/articles/new-users/article.xml | 2 +-
en_US.ISO8859-1/articles/p4-primer/article.xml | 2 +-
en_US.ISO8859-1/articles/pam/article.xml | 2 +-
en_US.ISO8859-1/articles/port-mentor-guidelines/article.xml | 2 +-
en_US.ISO8859-1/articles/portbuild/article.xml | 2 +-
en_US.ISO8859-1/articles/pr-guidelines/article.xml | 2 +-
en_US.ISO8859-1/articles/problem-reports/article.xml | 2 +-
en_US.ISO8859-1/articles/rc-scripting/article.xml | 2 +-
en_US.ISO8859-1/articles/relaydelay/article.xml | 2 +-
en_US.ISO8859-1/articles/releng-packages/article.xml | 2 +-
en_US.ISO8859-1/articles/releng/article.xml | 2 +-
en_US.ISO8859-1/articles/remote-install/article.xml | 2 +-
en_US.ISO8859-1/articles/serial-uart/article.xml | 2 +-
en_US.ISO8859-1/articles/solid-state/article.xml | 2 +-
en_US.ISO8859-1/articles/vm-design/article.xml | 2 +-
en_US.ISO8859-1/articles/wp-toolbox/article.xml | 2 +-
en_US.ISO8859-1/books/arch-handbook/book.xml | 2 +-
en_US.ISO8859-1/books/bibliography/book.xml | 2 +-
en_US.ISO8859-1/books/corp-net-guide/book.xml | 2 +-
en_US.ISO8859-1/books/design-44bsd/book.xml | 2 +-
en_US.ISO8859-1/books/dev-model/book.xml | 2 +-
en_US.ISO8859-1/books/developers-handbook/book.xml | 2 +-
en_US.ISO8859-1/books/faq/book.xml | 2 +-
en_US.ISO8859-1/books/fdp-primer/book.xml | 2 +-
en_US.ISO8859-1/books/handbook/book.xml | 2 +-
en_US.ISO8859-1/books/pmake/book.xml | 2 +-
en_US.ISO8859-1/books/pmake/legalnotice.xml | 2 +-
en_US.ISO8859-1/books/porters-handbook/book.xml | 2 +-
es_ES.ISO8859-1/articles/casestudy-argentina.com/article.xml | 2 +-
es_ES.ISO8859-1/articles/contributing/article.xml | 2 +-
es_ES.ISO8859-1/articles/cvs-freebsd/article.xml | 2 +-
es_ES.ISO8859-1/articles/explaining-bsd/article.xml | 2 +-
es_ES.ISO8859-1/articles/fbsd-from-scratch/article.xml | 2 +-
es_ES.ISO8859-1/articles/fdp-es/article.xml | 2 +-
es_ES.ISO8859-1/articles/laptop/article.xml | 2 +-
es_ES.ISO8859-1/articles/linux-comparison/article.xml | 2 +-
es_ES.ISO8859-1/articles/linux-users/article.xml | 2 +-
es_ES.ISO8859-1/articles/mailing-list-faq/article.xml | 2 +-
es_ES.ISO8859-1/articles/nanobsd/article.xml | 2 +-
es_ES.ISO8859-1/articles/p4-primer/article.xml | 2 +-
es_ES.ISO8859-1/articles/problem-reports/article.xml | 2 +-
es_ES.ISO8859-1/articles/releng/article.xml | 2 +-
es_ES.ISO8859-1/books/faq/book.xml | 2 +-
es_ES.ISO8859-1/books/handbook/book.xml | 2 +-
fr_FR.ISO8859-1/articles/building-products/article.xml | 2 +-
fr_FR.ISO8859-1/articles/committers-guide/article.xml | 2 +-
fr_FR.ISO8859-1/articles/contributing-ports/article.xml | 2 +-
fr_FR.ISO8859-1/articles/contributing/article.xml | 2 +-
fr_FR.ISO8859-1/articles/contributors/article.xml | 2 +-
fr_FR.ISO8859-1/articles/cvsup-advanced/article.xml | 2 +-
fr_FR.ISO8859-1/articles/explaining-bsd/article.xml | 2 +-
fr_FR.ISO8859-1/articles/filtering-bridges/article.xml | 2 +-
fr_FR.ISO8859-1/articles/fonts/article.xml | 2 +-
fr_FR.ISO8859-1/articles/ipsec-must/article.xml | 2 +-
fr_FR.ISO8859-1/articles/laptop/article.xml | 2 +-
fr_FR.ISO8859-1/articles/linux-users/article.xml | 2 +-
fr_FR.ISO8859-1/articles/mh/article.xml | 2 +-
fr_FR.ISO8859-1/articles/nanobsd/article.xml | 2 +-
fr_FR.ISO8859-1/articles/new-users/article.xml | 2 +-
fr_FR.ISO8859-1/articles/pam/article.xml | 2 +-
fr_FR.ISO8859-1/articles/pr-guidelines/article.xml | 2 +-
fr_FR.ISO8859-1/articles/problem-reports/article.xml | 2 +-
fr_FR.ISO8859-1/articles/releng-packages/article.xml | 2 +-
hu_HU.ISO8859-2/articles/compiz-fusion/article.xml | 2 +-
hu_HU.ISO8859-2/articles/cups/article.xml | 2 +-
hu_HU.ISO8859-2/articles/explaining-bsd/article.xml | 2 +-
hu_HU.ISO8859-2/articles/gjournal-desktop/article.xml | 2 +-
hu_HU.ISO8859-2/articles/laptop/article.xml | 2 +-
hu_HU.ISO8859-2/articles/linux-comparison/article.xml | 2 +-
hu_HU.ISO8859-2/articles/linux-users/article.xml | 2 +-
hu_HU.ISO8859-2/books/faq/book.xml | 2 +-
hu_HU.ISO8859-2/books/fdp-primer/book.xml | 2 +-
hu_HU.ISO8859-2/books/handbook/book.xml | 2 +-
it_IT.ISO8859-15/articles/committers-guide/article.xml | 2 +-
it_IT.ISO8859-15/articles/explaining-bsd/article.xml | 2 +-
it_IT.ISO8859-15/articles/filtering-bridges/article.xml | 2 +-
it_IT.ISO8859-15/articles/new-users/article.xml | 2 +-
it_IT.ISO8859-15/articles/vm-design/article.xml | 2 +-
ja_JP.eucJP/articles/contributing/article.xml | 2 +-
ja_JP.eucJP/articles/contributors/article.xml | 2 +-
ja_JP.eucJP/articles/fbsd-from-scratch/article.xml | 2 +-
ja_JP.eucJP/articles/fonts/article.xml | 2 +-
ja_JP.eucJP/articles/ipsec-must/article.xml | 2 +-
ja_JP.eucJP/articles/problem-reports/article.xml | 2 +-
ja_JP.eucJP/books/design-44bsd/book.xml | 2 +-
ja_JP.eucJP/books/faq/book.xml | 2 +-
ja_JP.eucJP/books/fdp-primer/book.xml | 2 +-
ja_JP.eucJP/books/fdp-primer/examples/appendix.xml | 2 +-
ja_JP.eucJP/books/porters-handbook/book.xml | 2 +-
nl_NL.ISO8859-1/articles/contributing-ports/article.xml | 2 +-
nl_NL.ISO8859-1/articles/contributing/article.xml | 2 +-
nl_NL.ISO8859-1/articles/explaining-bsd/article.xml | 2 +-
nl_NL.ISO8859-1/articles/problem-reports/article.xml | 2 +-
nl_NL.ISO8859-1/articles/solid-state/article.xml | 2 +-
nl_NL.ISO8859-1/share/xml/bibliography.xml | 2 +-
no_NO.ISO8859-1/books/handbook/basics/chapter.xml | 2 +-
no_NO.ISO8859-1/books/handbook/bibliography/chapter.xml | 2 +-
no_NO.ISO8859-1/books/handbook/install/chapter.xml | 2 +-
pl_PL.ISO8859-2/articles/filtering-bridges/article.xml | 2 +-
pl_PL.ISO8859-2/articles/new-users/article.xml | 2 +-
pt_BR.ISO8859-1/articles/building-products/article.xml | 2 +-
pt_BR.ISO8859-1/articles/contributing-ports/article.xml | 2 +-
pt_BR.ISO8859-1/articles/contributing/article.xml | 2 +-
pt_BR.ISO8859-1/articles/explaining-bsd/article.xml | 2 +-
pt_BR.ISO8859-1/articles/freebsd-questions/article.xml | 2 +-
pt_BR.ISO8859-1/articles/freebsd-update-server/article.xml | 2 +-
pt_BR.ISO8859-1/articles/hubs/article.xml | 2 +-
pt_BR.ISO8859-1/articles/linux-users/article.xml | 2 +-
pt_BR.ISO8859-1/articles/new-users/article.xml | 2 +-
pt_BR.ISO8859-1/articles/problem-reports/article.xml | 2 +-
pt_BR.ISO8859-1/books/faq/book.xml | 2 +-
pt_BR.ISO8859-1/books/fdp-primer/book.xml | 2 +-
ru_RU.KOI8-R/articles/committers-guide/article.xml | 2 +-
ru_RU.KOI8-R/articles/console-server/article.xml | 2 +-
ru_RU.KOI8-R/articles/contributing/article.xml | 2 +-
ru_RU.KOI8-R/articles/cups/article.xml | 2 +-
ru_RU.KOI8-R/articles/custom-gcc/article.xml | 2 +-
ru_RU.KOI8-R/articles/cvs-freebsd/article.xml | 2 +-
ru_RU.KOI8-R/articles/cvsup-advanced/article.xml | 2 +-
ru_RU.KOI8-R/articles/explaining-bsd/article.xml | 2 +-
ru_RU.KOI8-R/articles/fbsd-from-scratch/article.xml | 2 +-
ru_RU.KOI8-R/articles/fonts/article.xml | 2 +-
ru_RU.KOI8-R/articles/freebsd-questions/article.xml | 2 +-
ru_RU.KOI8-R/articles/geom-class/article.xml | 2 +-
ru_RU.KOI8-R/articles/gjournal-desktop/article.xml | 2 +-
ru_RU.KOI8-R/articles/hubs/article.xml | 2 +-
ru_RU.KOI8-R/articles/ipsec-must/article.xml | 2 +-
ru_RU.KOI8-R/articles/laptop/article.xml | 2 +-
ru_RU.KOI8-R/articles/linux-comparison/article.xml | 2 +-
ru_RU.KOI8-R/articles/mailing-list-faq/article.xml | 2 +-
ru_RU.KOI8-R/articles/mh/article.xml | 2 +-
ru_RU.KOI8-R/articles/new-users/article.xml | 2 +-
ru_RU.KOI8-R/articles/pam/article.xml | 2 +-
ru_RU.KOI8-R/articles/portbuild/article.xml | 2 +-
ru_RU.KOI8-R/articles/pr-guidelines/article.xml | 2 +-
ru_RU.KOI8-R/articles/problem-reports/article.xml | 2 +-
ru_RU.KOI8-R/articles/relaydelay/article.xml | 2 +-
ru_RU.KOI8-R/articles/releng-packages/article.xml | 2 +-
ru_RU.KOI8-R/articles/releng/article.xml | 2 +-
ru_RU.KOI8-R/articles/solid-state/article.xml | 2 +-
ru_RU.KOI8-R/articles/vm-design/article.xml | 2 +-
ru_RU.KOI8-R/books/design-44bsd/book.xml | 2 +-
ru_RU.KOI8-R/books/developers-handbook/book.xml | 2 +-
ru_RU.KOI8-R/books/faq/book.xml | 2 +-
ru_RU.KOI8-R/books/fdp-primer/book.xml | 2 +-
ru_RU.KOI8-R/books/handbook/book.xml | 2 +-
ru_RU.KOI8-R/books/porters-handbook/book.xml | 2 +-
tr_TR.ISO8859-9/articles/explaining-bsd/article.xml | 2 +-
zh_CN.GB2312/articles/contributing/article.xml | 2 +-
zh_CN.GB2312/articles/cvs-freebsd/article.xml | 2 +-
zh_CN.GB2312/articles/linux-users/article.xml | 2 +-
zh_CN.GB2312/articles/nanobsd/article.xml | 2 +-
zh_CN.GB2312/articles/rc-scripting/article.xml | 2 +-
zh_CN.GB2312/articles/remote-install/article.xml | 2 +-
zh_CN.GB2312/books/arch-handbook/book.xml | 2 +-
zh_CN.GB2312/books/porters-handbook/book.xml | 2 +-
zh_TW.Big5/articles/contributing/article.xml | 2 +-
zh_TW.Big5/articles/cvs-freebsd/article.xml | 2 +-
zh_TW.Big5/articles/freebsd-questions/article.xml | 2 +-
zh_TW.Big5/articles/hubs/article.xml | 2 +-
zh_TW.Big5/articles/mailing-list-faq/article.xml | 2 +-
zh_TW.Big5/articles/nanobsd/article.xml | 2 +-
zh_TW.Big5/articles/pr-guidelines/article.xml | 2 +-
zh_TW.Big5/articles/problem-reports/article.xml | 2 +-
zh_TW.Big5/articles/remote-install/article.xml | 2 +-
zh_TW.Big5/books/developers-handbook/book.xml | 2 +-
zh_TW.Big5/books/porters-handbook/book.xml | 2 +-
229 files changed, 229 insertions(+), 229 deletions(-)
diff --git a/da_DK.ISO8859-1/articles/ipsec-must/article.xml b/da_DK.ISO8859-1/articles/ipsec-must/article.xml
index fd9d466684..209cd67e46 100644
--- a/da_DK.ISO8859-1/articles/ipsec-must/article.xml
+++ b/da_DK.ISO8859-1/articles/ipsec-must/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/de_DE.ISO8859-1/articles/contributing-ports/article.xml b/de_DE.ISO8859-1/articles/contributing-ports/article.xml
index 2c0aa074e8..f50e5e9543 100644
--- a/de_DE.ISO8859-1/articles/contributing-ports/article.xml
+++ b/de_DE.ISO8859-1/articles/contributing-ports/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/de_DE.ISO8859-1/articles/contributing/article.xml b/de_DE.ISO8859-1/articles/contributing/article.xml
index 99917e9bef..a280edf3c2 100644
--- a/de_DE.ISO8859-1/articles/contributing/article.xml
+++ b/de_DE.ISO8859-1/articles/contributing/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/de_DE.ISO8859-1/articles/explaining-bsd/article.xml b/de_DE.ISO8859-1/articles/explaining-bsd/article.xml
index 8d77222459..a0b735ecc6 100644
--- a/de_DE.ISO8859-1/articles/explaining-bsd/article.xml
+++ b/de_DE.ISO8859-1/articles/explaining-bsd/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/de_DE.ISO8859-1/articles/laptop/article.xml b/de_DE.ISO8859-1/articles/laptop/article.xml
index 462e54bd29..bb9a958631 100644
--- a/de_DE.ISO8859-1/articles/laptop/article.xml
+++ b/de_DE.ISO8859-1/articles/laptop/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/de_DE.ISO8859-1/articles/linux-comparison/article.xml b/de_DE.ISO8859-1/articles/linux-comparison/article.xml
index 36124e24c3..fcec49289c 100644
--- a/de_DE.ISO8859-1/articles/linux-comparison/article.xml
+++ b/de_DE.ISO8859-1/articles/linux-comparison/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/de_DE.ISO8859-1/articles/new-users/article.xml b/de_DE.ISO8859-1/articles/new-users/article.xml
index 9738c039da..dc13a733cf 100644
--- a/de_DE.ISO8859-1/articles/new-users/article.xml
+++ b/de_DE.ISO8859-1/articles/new-users/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/de_DE.ISO8859-1/articles/solid-state/article.xml b/de_DE.ISO8859-1/articles/solid-state/article.xml
index 62b14ee016..75a6d728c4 100644
--- a/de_DE.ISO8859-1/articles/solid-state/article.xml
+++ b/de_DE.ISO8859-1/articles/solid-state/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/de_DE.ISO8859-1/books/developers-handbook/book.xml b/de_DE.ISO8859-1/books/developers-handbook/book.xml
index b1dff89736..c3b492a770 100644
--- a/de_DE.ISO8859-1/books/developers-handbook/book.xml
+++ b/de_DE.ISO8859-1/books/developers-handbook/book.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd" [
<!ENTITY % chapters SYSTEM "chapters.ent"> %chapters;
diff --git a/de_DE.ISO8859-1/books/faq/book.xml b/de_DE.ISO8859-1/books/faq/book.xml
index 2d88980475..8bdf375c17 100644
--- a/de_DE.ISO8859-1/books/faq/book.xml
+++ b/de_DE.ISO8859-1/books/faq/book.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd" [
<!ENTITY bibliography SYSTEM "../../share/xml/bibliography.xml">
diff --git a/de_DE.ISO8859-1/books/fdp-primer/book.xml b/de_DE.ISO8859-1/books/fdp-primer/book.xml
index 2aa41aacf4..47117f0cfb 100644
--- a/de_DE.ISO8859-1/books/fdp-primer/book.xml
+++ b/de_DE.ISO8859-1/books/fdp-primer/book.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd" [
<!ENTITY % chapters SYSTEM "chapters.ent">
diff --git a/de_DE.ISO8859-1/books/handbook/book.xml b/de_DE.ISO8859-1/books/handbook/book.xml
index a17a451e85..de58618ee9 100644
--- a/de_DE.ISO8859-1/books/handbook/book.xml
+++ b/de_DE.ISO8859-1/books/handbook/book.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd" [
<!ENTITY % chapters SYSTEM "chapters.ent"> %chapters;
diff --git a/de_DE.ISO8859-1/books/porters-handbook/book.xml b/de_DE.ISO8859-1/books/porters-handbook/book.xml
index 166346ccba..57ffbb206c 100644
--- a/de_DE.ISO8859-1/books/porters-handbook/book.xml
+++ b/de_DE.ISO8859-1/books/porters-handbook/book.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/el_GR.ISO8859-7/articles/bsdl-gpl/article.xml b/el_GR.ISO8859-7/articles/bsdl-gpl/article.xml
index f508edbaa6..b655014b69 100644
--- a/el_GR.ISO8859-7/articles/bsdl-gpl/article.xml
+++ b/el_GR.ISO8859-7/articles/bsdl-gpl/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/el_GR.ISO8859-7/articles/compiz-fusion/article.xml b/el_GR.ISO8859-7/articles/compiz-fusion/article.xml
index 4dd03b4b3f..4a64e0bafc 100644
--- a/el_GR.ISO8859-7/articles/compiz-fusion/article.xml
+++ b/el_GR.ISO8859-7/articles/compiz-fusion/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/el_GR.ISO8859-7/articles/contributing/article.xml b/el_GR.ISO8859-7/articles/contributing/article.xml
index bd808b0ba4..8417de73ad 100644
--- a/el_GR.ISO8859-7/articles/contributing/article.xml
+++ b/el_GR.ISO8859-7/articles/contributing/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/el_GR.ISO8859-7/articles/cvs-freebsd/article.xml b/el_GR.ISO8859-7/articles/cvs-freebsd/article.xml
index 8c176b16f9..f39077162e 100644
--- a/el_GR.ISO8859-7/articles/cvs-freebsd/article.xml
+++ b/el_GR.ISO8859-7/articles/cvs-freebsd/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/el_GR.ISO8859-7/articles/explaining-bsd/article.xml b/el_GR.ISO8859-7/articles/explaining-bsd/article.xml
index dc77aa76b6..871cfc6350 100644
--- a/el_GR.ISO8859-7/articles/explaining-bsd/article.xml
+++ b/el_GR.ISO8859-7/articles/explaining-bsd/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/el_GR.ISO8859-7/articles/freebsd-questions/article.xml b/el_GR.ISO8859-7/articles/freebsd-questions/article.xml
index 0db17cc5c6..942163e19b 100644
--- a/el_GR.ISO8859-7/articles/freebsd-questions/article.xml
+++ b/el_GR.ISO8859-7/articles/freebsd-questions/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/el_GR.ISO8859-7/articles/gjournal-desktop/article.xml b/el_GR.ISO8859-7/articles/gjournal-desktop/article.xml
index 30c6ff5411..e044010be0 100644
--- a/el_GR.ISO8859-7/articles/gjournal-desktop/article.xml
+++ b/el_GR.ISO8859-7/articles/gjournal-desktop/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd" [<!ENTITY iso-greek "ISO/IEC 8859-7">
]>
diff --git a/el_GR.ISO8859-7/articles/greek-language-support/article.xml b/el_GR.ISO8859-7/articles/greek-language-support/article.xml
index cfceec5c27..9db16e7b84 100644
--- a/el_GR.ISO8859-7/articles/greek-language-support/article.xml
+++ b/el_GR.ISO8859-7/articles/greek-language-support/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd" [
<!ENTITY iso-greek "ISO/IEC 8859-7">
diff --git a/el_GR.ISO8859-7/articles/laptop/article.xml b/el_GR.ISO8859-7/articles/laptop/article.xml
index 93814a3643..78a77fe4d4 100644
--- a/el_GR.ISO8859-7/articles/laptop/article.xml
+++ b/el_GR.ISO8859-7/articles/laptop/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/el_GR.ISO8859-7/articles/linux-users/article.xml b/el_GR.ISO8859-7/articles/linux-users/article.xml
index 64c5f6bec6..3b800dba5e 100644
--- a/el_GR.ISO8859-7/articles/linux-users/article.xml
+++ b/el_GR.ISO8859-7/articles/linux-users/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/el_GR.ISO8859-7/articles/mailing-list-faq/article.xml b/el_GR.ISO8859-7/articles/mailing-list-faq/article.xml
index ac12864025..dafb174122 100644
--- a/el_GR.ISO8859-7/articles/mailing-list-faq/article.xml
+++ b/el_GR.ISO8859-7/articles/mailing-list-faq/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/el_GR.ISO8859-7/articles/nanobsd/article.xml b/el_GR.ISO8859-7/articles/nanobsd/article.xml
index 78170ec95a..30b61210e6 100644
--- a/el_GR.ISO8859-7/articles/nanobsd/article.xml
+++ b/el_GR.ISO8859-7/articles/nanobsd/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/el_GR.ISO8859-7/articles/new-users/article.xml b/el_GR.ISO8859-7/articles/new-users/article.xml
index 06bd407edf..66f6747099 100644
--- a/el_GR.ISO8859-7/articles/new-users/article.xml
+++ b/el_GR.ISO8859-7/articles/new-users/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/el_GR.ISO8859-7/articles/problem-reports/article.xml b/el_GR.ISO8859-7/articles/problem-reports/article.xml
index 46f7027e59..5ee2aa9f02 100644
--- a/el_GR.ISO8859-7/articles/problem-reports/article.xml
+++ b/el_GR.ISO8859-7/articles/problem-reports/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/el_GR.ISO8859-7/articles/releng-packages/article.xml b/el_GR.ISO8859-7/articles/releng-packages/article.xml
index 5b23a01b31..2d070829a7 100644
--- a/el_GR.ISO8859-7/articles/releng-packages/article.xml
+++ b/el_GR.ISO8859-7/articles/releng-packages/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/el_GR.ISO8859-7/articles/releng/article.xml b/el_GR.ISO8859-7/articles/releng/article.xml
index 58a8794f28..590f04ad16 100644
--- a/el_GR.ISO8859-7/articles/releng/article.xml
+++ b/el_GR.ISO8859-7/articles/releng/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd" [
<!ENTITY art.re.pkgs '<ulink url="../releng-packages/article.html">� �������� ������� ��� ������� ���������� ��� �������</ulink>'>
diff --git a/el_GR.ISO8859-7/books/faq/book.xml b/el_GR.ISO8859-7/books/faq/book.xml
index cca540df68..6f5a7c0cd4 100644
--- a/el_GR.ISO8859-7/books/faq/book.xml
+++ b/el_GR.ISO8859-7/books/faq/book.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd" [
<!ENTITY bibliography SYSTEM "../../../share/xml/bibliography.xml">
diff --git a/el_GR.ISO8859-7/books/handbook/book.xml b/el_GR.ISO8859-7/books/handbook/book.xml
index 8ad7959e60..3bb9c80aa3 100644
--- a/el_GR.ISO8859-7/books/handbook/book.xml
+++ b/el_GR.ISO8859-7/books/handbook/book.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd" [
<!ENTITY % chapters SYSTEM "chapters.ent">
diff --git a/en_US.ISO8859-1/articles/bsdl-gpl/article.xml b/en_US.ISO8859-1/articles/bsdl-gpl/article.xml
index 730169c5ed..8f9bb5f693 100644
--- a/en_US.ISO8859-1/articles/bsdl-gpl/article.xml
+++ b/en_US.ISO8859-1/articles/bsdl-gpl/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/en_US.ISO8859-1/articles/building-products/article.xml b/en_US.ISO8859-1/articles/building-products/article.xml
index dcca43f6a8..a570e7834c 100644
--- a/en_US.ISO8859-1/articles/building-products/article.xml
+++ b/en_US.ISO8859-1/articles/building-products/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/en_US.ISO8859-1/articles/casestudy-argentina.com/article.xml b/en_US.ISO8859-1/articles/casestudy-argentina.com/article.xml
index 0e1181a50a..3f1e4c7121 100644
--- a/en_US.ISO8859-1/articles/casestudy-argentina.com/article.xml
+++ b/en_US.ISO8859-1/articles/casestudy-argentina.com/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/en_US.ISO8859-1/articles/committers-guide/article.xml b/en_US.ISO8859-1/articles/committers-guide/article.xml
index 5c29deda27..16dbbe89a2 100644
--- a/en_US.ISO8859-1/articles/committers-guide/article.xml
+++ b/en_US.ISO8859-1/articles/committers-guide/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/en_US.ISO8859-1/articles/compiz-fusion/article.xml b/en_US.ISO8859-1/articles/compiz-fusion/article.xml
index b3c1a7067f..3c30a2b898 100644
--- a/en_US.ISO8859-1/articles/compiz-fusion/article.xml
+++ b/en_US.ISO8859-1/articles/compiz-fusion/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/en_US.ISO8859-1/articles/console-server/article.xml b/en_US.ISO8859-1/articles/console-server/article.xml
index 43343f39a2..3ba3b11ca0 100644
--- a/en_US.ISO8859-1/articles/console-server/article.xml
+++ b/en_US.ISO8859-1/articles/console-server/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/en_US.ISO8859-1/articles/contributing-ports/article.xml b/en_US.ISO8859-1/articles/contributing-ports/article.xml
index 3d3703ca5c..7f299ebd98 100644
--- a/en_US.ISO8859-1/articles/contributing-ports/article.xml
+++ b/en_US.ISO8859-1/articles/contributing-ports/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/en_US.ISO8859-1/articles/contributing/article.xml b/en_US.ISO8859-1/articles/contributing/article.xml
index 819bf3c014..be8171f5a2 100644
--- a/en_US.ISO8859-1/articles/contributing/article.xml
+++ b/en_US.ISO8859-1/articles/contributing/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/en_US.ISO8859-1/articles/contributors/article.xml b/en_US.ISO8859-1/articles/contributors/article.xml
index 4347df2f37..895a9633f1 100644
--- a/en_US.ISO8859-1/articles/contributors/article.xml
+++ b/en_US.ISO8859-1/articles/contributors/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd" [
<!ENTITY % contrib.ent SYSTEM "contrib.ent">
diff --git a/en_US.ISO8859-1/articles/cups/article.xml b/en_US.ISO8859-1/articles/cups/article.xml
index 5ced963e5d..7f4f83578b 100644
--- a/en_US.ISO8859-1/articles/cups/article.xml
+++ b/en_US.ISO8859-1/articles/cups/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/en_US.ISO8859-1/articles/custom-gcc/article.xml b/en_US.ISO8859-1/articles/custom-gcc/article.xml
index 51b38334f7..f003443fe1 100644
--- a/en_US.ISO8859-1/articles/custom-gcc/article.xml
+++ b/en_US.ISO8859-1/articles/custom-gcc/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/en_US.ISO8859-1/articles/cvs-freebsd/article.xml b/en_US.ISO8859-1/articles/cvs-freebsd/article.xml
index f891a55d87..ddf0d2845b 100644
--- a/en_US.ISO8859-1/articles/cvs-freebsd/article.xml
+++ b/en_US.ISO8859-1/articles/cvs-freebsd/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/en_US.ISO8859-1/articles/cvsup-advanced/article.xml b/en_US.ISO8859-1/articles/cvsup-advanced/article.xml
index 8a16f0bdbb..c8128e0106 100644
--- a/en_US.ISO8859-1/articles/cvsup-advanced/article.xml
+++ b/en_US.ISO8859-1/articles/cvsup-advanced/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/en_US.ISO8859-1/articles/explaining-bsd/article.xml b/en_US.ISO8859-1/articles/explaining-bsd/article.xml
index 5addee3b59..eb6f1530d5 100644
--- a/en_US.ISO8859-1/articles/explaining-bsd/article.xml
+++ b/en_US.ISO8859-1/articles/explaining-bsd/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/en_US.ISO8859-1/articles/fbsd-from-scratch/article.xml b/en_US.ISO8859-1/articles/fbsd-from-scratch/article.xml
index 5db02aff31..a16712e632 100644
--- a/en_US.ISO8859-1/articles/fbsd-from-scratch/article.xml
+++ b/en_US.ISO8859-1/articles/fbsd-from-scratch/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd" [
<!ENTITY scratch.ap "<application>FreeBSD From Scratch</application>">
diff --git a/en_US.ISO8859-1/articles/filtering-bridges/article.xml b/en_US.ISO8859-1/articles/filtering-bridges/article.xml
index 29ee27ba53..bf122f7872 100644
--- a/en_US.ISO8859-1/articles/filtering-bridges/article.xml
+++ b/en_US.ISO8859-1/articles/filtering-bridges/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/en_US.ISO8859-1/articles/fonts/article.xml b/en_US.ISO8859-1/articles/fonts/article.xml
index 050b21d20d..8715ce7311 100644
--- a/en_US.ISO8859-1/articles/fonts/article.xml
+++ b/en_US.ISO8859-1/articles/fonts/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/en_US.ISO8859-1/articles/freebsd-questions/article.xml b/en_US.ISO8859-1/articles/freebsd-questions/article.xml
index 34779524b4..63acc47dc7 100644
--- a/en_US.ISO8859-1/articles/freebsd-questions/article.xml
+++ b/en_US.ISO8859-1/articles/freebsd-questions/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/en_US.ISO8859-1/articles/freebsd-update-server/article.xml b/en_US.ISO8859-1/articles/freebsd-update-server/article.xml
index 7b9dc15ced..0d6fdac872 100644
--- a/en_US.ISO8859-1/articles/freebsd-update-server/article.xml
+++ b/en_US.ISO8859-1/articles/freebsd-update-server/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd" [
<!ENTITY fbus.ap "<application>FreeBSD Update Server</application>">
diff --git a/en_US.ISO8859-1/articles/geom-class/article.xml b/en_US.ISO8859-1/articles/geom-class/article.xml
index 92ec3b3be0..97f7d87c21 100644
--- a/en_US.ISO8859-1/articles/geom-class/article.xml
+++ b/en_US.ISO8859-1/articles/geom-class/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/en_US.ISO8859-1/articles/gjournal-desktop/article.xml b/en_US.ISO8859-1/articles/gjournal-desktop/article.xml
index 37c5e8e597..c10b999ed6 100644
--- a/en_US.ISO8859-1/articles/gjournal-desktop/article.xml
+++ b/en_US.ISO8859-1/articles/gjournal-desktop/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/en_US.ISO8859-1/articles/hubs/article.xml b/en_US.ISO8859-1/articles/hubs/article.xml
index d5ce8be4a4..c3bcf45556 100644
--- a/en_US.ISO8859-1/articles/hubs/article.xml
+++ b/en_US.ISO8859-1/articles/hubs/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/en_US.ISO8859-1/articles/ipsec-must/article.xml b/en_US.ISO8859-1/articles/ipsec-must/article.xml
index 6882cef80c..80abb023d0 100644
--- a/en_US.ISO8859-1/articles/ipsec-must/article.xml
+++ b/en_US.ISO8859-1/articles/ipsec-must/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/en_US.ISO8859-1/articles/laptop/article.xml b/en_US.ISO8859-1/articles/laptop/article.xml
index 72e46ab182..c283427099 100644
--- a/en_US.ISO8859-1/articles/laptop/article.xml
+++ b/en_US.ISO8859-1/articles/laptop/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/en_US.ISO8859-1/articles/ldap-auth/article.xml b/en_US.ISO8859-1/articles/ldap-auth/article.xml
index c5d3bb93ec..7f055fa72a 100644
--- a/en_US.ISO8859-1/articles/ldap-auth/article.xml
+++ b/en_US.ISO8859-1/articles/ldap-auth/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/en_US.ISO8859-1/articles/linux-comparison/article.xml b/en_US.ISO8859-1/articles/linux-comparison/article.xml
index ba841654b2..3d24209113 100644
--- a/en_US.ISO8859-1/articles/linux-comparison/article.xml
+++ b/en_US.ISO8859-1/articles/linux-comparison/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/en_US.ISO8859-1/articles/linux-emulation/article.xml b/en_US.ISO8859-1/articles/linux-emulation/article.xml
index 09bb526a26..0f7b4e9ee6 100644
--- a/en_US.ISO8859-1/articles/linux-emulation/article.xml
+++ b/en_US.ISO8859-1/articles/linux-emulation/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/en_US.ISO8859-1/articles/linux-users/article.xml b/en_US.ISO8859-1/articles/linux-users/article.xml
index c5f32f8c10..ad9e71e091 100644
--- a/en_US.ISO8859-1/articles/linux-users/article.xml
+++ b/en_US.ISO8859-1/articles/linux-users/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/en_US.ISO8859-1/articles/mailing-list-faq/article.xml b/en_US.ISO8859-1/articles/mailing-list-faq/article.xml
index 15c64648bd..d07bb9ee5e 100644
--- a/en_US.ISO8859-1/articles/mailing-list-faq/article.xml
+++ b/en_US.ISO8859-1/articles/mailing-list-faq/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/en_US.ISO8859-1/articles/mh/article.xml b/en_US.ISO8859-1/articles/mh/article.xml
index fc34225cb6..5f31506852 100644
--- a/en_US.ISO8859-1/articles/mh/article.xml
+++ b/en_US.ISO8859-1/articles/mh/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/en_US.ISO8859-1/articles/nanobsd/article.xml b/en_US.ISO8859-1/articles/nanobsd/article.xml
index 6e0fa31216..a126f2f99f 100644
--- a/en_US.ISO8859-1/articles/nanobsd/article.xml
+++ b/en_US.ISO8859-1/articles/nanobsd/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/en_US.ISO8859-1/articles/new-users/article.xml b/en_US.ISO8859-1/articles/new-users/article.xml
index c3a68e8e91..8dac7048bd 100644
--- a/en_US.ISO8859-1/articles/new-users/article.xml
+++ b/en_US.ISO8859-1/articles/new-users/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/en_US.ISO8859-1/articles/p4-primer/article.xml b/en_US.ISO8859-1/articles/p4-primer/article.xml
index d7b8eac378..7d91e1212c 100644
--- a/en_US.ISO8859-1/articles/p4-primer/article.xml
+++ b/en_US.ISO8859-1/articles/p4-primer/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/en_US.ISO8859-1/articles/pam/article.xml b/en_US.ISO8859-1/articles/pam/article.xml
index 67643e2977..408bc17b34 100644
--- a/en_US.ISO8859-1/articles/pam/article.xml
+++ b/en_US.ISO8859-1/articles/pam/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/en_US.ISO8859-1/articles/port-mentor-guidelines/article.xml b/en_US.ISO8859-1/articles/port-mentor-guidelines/article.xml
index 4e4e1cfed8..5d98119f6a 100644
--- a/en_US.ISO8859-1/articles/port-mentor-guidelines/article.xml
+++ b/en_US.ISO8859-1/articles/port-mentor-guidelines/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/en_US.ISO8859-1/articles/portbuild/article.xml b/en_US.ISO8859-1/articles/portbuild/article.xml
index 674417a5c0..5c26bca917 100644
--- a/en_US.ISO8859-1/articles/portbuild/article.xml
+++ b/en_US.ISO8859-1/articles/portbuild/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/en_US.ISO8859-1/articles/pr-guidelines/article.xml b/en_US.ISO8859-1/articles/pr-guidelines/article.xml
index ff7f8e61fb..8fcf1d2b9e 100644
--- a/en_US.ISO8859-1/articles/pr-guidelines/article.xml
+++ b/en_US.ISO8859-1/articles/pr-guidelines/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd" [
<!ENTITY man.edit-pr.1 "<citerefentry><refentrytitle>edit-pr</refentrytitle><manvolnum>1</manvolnum></citerefentry>">
diff --git a/en_US.ISO8859-1/articles/problem-reports/article.xml b/en_US.ISO8859-1/articles/problem-reports/article.xml
index b106a2dac4..5386264d2a 100644
--- a/en_US.ISO8859-1/articles/problem-reports/article.xml
+++ b/en_US.ISO8859-1/articles/problem-reports/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/en_US.ISO8859-1/articles/rc-scripting/article.xml b/en_US.ISO8859-1/articles/rc-scripting/article.xml
index c299b5895a..9a93599a53 100644
--- a/en_US.ISO8859-1/articles/rc-scripting/article.xml
+++ b/en_US.ISO8859-1/articles/rc-scripting/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/en_US.ISO8859-1/articles/relaydelay/article.xml b/en_US.ISO8859-1/articles/relaydelay/article.xml
index 2d17a1bc52..26cfe3903b 100644
--- a/en_US.ISO8859-1/articles/relaydelay/article.xml
+++ b/en_US.ISO8859-1/articles/relaydelay/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/en_US.ISO8859-1/articles/releng-packages/article.xml b/en_US.ISO8859-1/articles/releng-packages/article.xml
index 9e1658fcab..cfcef421c2 100644
--- a/en_US.ISO8859-1/articles/releng-packages/article.xml
+++ b/en_US.ISO8859-1/articles/releng-packages/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/en_US.ISO8859-1/articles/releng/article.xml b/en_US.ISO8859-1/articles/releng/article.xml
index b754ec7f10..0312cfe574 100644
--- a/en_US.ISO8859-1/articles/releng/article.xml
+++ b/en_US.ISO8859-1/articles/releng/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd" [
<!ENTITY art.re.pkgs '<ulink url="&url.articles.releng-packages;/article.html">The Release Engineering of Third Party Packages</ulink>'>
diff --git a/en_US.ISO8859-1/articles/remote-install/article.xml b/en_US.ISO8859-1/articles/remote-install/article.xml
index 95c24ea52c..8907656c4a 100644
--- a/en_US.ISO8859-1/articles/remote-install/article.xml
+++ b/en_US.ISO8859-1/articles/remote-install/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/en_US.ISO8859-1/articles/serial-uart/article.xml b/en_US.ISO8859-1/articles/serial-uart/article.xml
index fd46d4b7b8..0e42ec2833 100644
--- a/en_US.ISO8859-1/articles/serial-uart/article.xml
+++ b/en_US.ISO8859-1/articles/serial-uart/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/en_US.ISO8859-1/articles/solid-state/article.xml b/en_US.ISO8859-1/articles/solid-state/article.xml
index 26f702b248..a4fc36fdfc 100644
--- a/en_US.ISO8859-1/articles/solid-state/article.xml
+++ b/en_US.ISO8859-1/articles/solid-state/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/en_US.ISO8859-1/articles/vm-design/article.xml b/en_US.ISO8859-1/articles/vm-design/article.xml
index 411047b8d7..31c07e471d 100644
--- a/en_US.ISO8859-1/articles/vm-design/article.xml
+++ b/en_US.ISO8859-1/articles/vm-design/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/en_US.ISO8859-1/articles/wp-toolbox/article.xml b/en_US.ISO8859-1/articles/wp-toolbox/article.xml
index 062905f5ff..5b8dc58946 100644
--- a/en_US.ISO8859-1/articles/wp-toolbox/article.xml
+++ b/en_US.ISO8859-1/articles/wp-toolbox/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd" [
<!ENTITY ports "Ports Collection">
diff --git a/en_US.ISO8859-1/books/arch-handbook/book.xml b/en_US.ISO8859-1/books/arch-handbook/book.xml
index 876a72774f..be786d5ac9 100644
--- a/en_US.ISO8859-1/books/arch-handbook/book.xml
+++ b/en_US.ISO8859-1/books/arch-handbook/book.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd" [
<!ENTITY % chapters SYSTEM "chapters.ent">
diff --git a/en_US.ISO8859-1/books/bibliography/book.xml b/en_US.ISO8859-1/books/bibliography/book.xml
index 9a414be0c6..778160a2be 100644
--- a/en_US.ISO8859-1/books/bibliography/book.xml
+++ b/en_US.ISO8859-1/books/bibliography/book.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd" [
<!ENTITY bibliography SYSTEM "../../../share/xml/bibliography.xml">
diff --git a/en_US.ISO8859-1/books/corp-net-guide/book.xml b/en_US.ISO8859-1/books/corp-net-guide/book.xml
index 0171a7044b..abe65ada67 100644
--- a/en_US.ISO8859-1/books/corp-net-guide/book.xml
+++ b/en_US.ISO8859-1/books/corp-net-guide/book.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/en_US.ISO8859-1/books/design-44bsd/book.xml b/en_US.ISO8859-1/books/design-44bsd/book.xml
index 6e8301597e..3b0a11ea93 100644
--- a/en_US.ISO8859-1/books/design-44bsd/book.xml
+++ b/en_US.ISO8859-1/books/design-44bsd/book.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/en_US.ISO8859-1/books/dev-model/book.xml b/en_US.ISO8859-1/books/dev-model/book.xml
index f0082ba893..cd0f309f82 100644
--- a/en_US.ISO8859-1/books/dev-model/book.xml
+++ b/en_US.ISO8859-1/books/dev-model/book.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd" [
<!ENTITY % chapters SYSTEM "chapters.ent">
diff --git a/en_US.ISO8859-1/books/developers-handbook/book.xml b/en_US.ISO8859-1/books/developers-handbook/book.xml
index 0892e8f1f5..6a9a7f220c 100644
--- a/en_US.ISO8859-1/books/developers-handbook/book.xml
+++ b/en_US.ISO8859-1/books/developers-handbook/book.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd" [
<!ENTITY % chapters SYSTEM "chapters.ent"> %chapters;
diff --git a/en_US.ISO8859-1/books/faq/book.xml b/en_US.ISO8859-1/books/faq/book.xml
index f2090e7183..813c654451 100644
--- a/en_US.ISO8859-1/books/faq/book.xml
+++ b/en_US.ISO8859-1/books/faq/book.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd" [
<!ENTITY bibliography SYSTEM "../../../share/xml/bibliography.xml">
diff --git a/en_US.ISO8859-1/books/fdp-primer/book.xml b/en_US.ISO8859-1/books/fdp-primer/book.xml
index c7c6353ad9..b0788ec047 100644
--- a/en_US.ISO8859-1/books/fdp-primer/book.xml
+++ b/en_US.ISO8859-1/books/fdp-primer/book.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd" [
<!ENTITY % chapters SYSTEM "chapters.ent"> %chapters;
diff --git a/en_US.ISO8859-1/books/handbook/book.xml b/en_US.ISO8859-1/books/handbook/book.xml
index 4351f74d1b..7cd70bd50a 100644
--- a/en_US.ISO8859-1/books/handbook/book.xml
+++ b/en_US.ISO8859-1/books/handbook/book.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd" [
<!--
diff --git a/en_US.ISO8859-1/books/pmake/book.xml b/en_US.ISO8859-1/books/pmake/book.xml
index b344674b1c..75a18a7f33 100644
--- a/en_US.ISO8859-1/books/pmake/book.xml
+++ b/en_US.ISO8859-1/books/pmake/book.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd" [
<!ENTITY % chapters.ent SYSTEM "chapters.ent">
diff --git a/en_US.ISO8859-1/books/pmake/legalnotice.xml b/en_US.ISO8859-1/books/pmake/legalnotice.xml
index d443019036..273f8f113a 100644
--- a/en_US.ISO8859-1/books/pmake/legalnotice.xml
+++ b/en_US.ISO8859-1/books/pmake/legalnotice.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
$FreeBSD$
-->
diff --git a/en_US.ISO8859-1/books/porters-handbook/book.xml b/en_US.ISO8859-1/books/porters-handbook/book.xml
index 4ef462a9ac..8b72f40145 100644
--- a/en_US.ISO8859-1/books/porters-handbook/book.xml
+++ b/en_US.ISO8859-1/books/porters-handbook/book.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/es_ES.ISO8859-1/articles/casestudy-argentina.com/article.xml b/es_ES.ISO8859-1/articles/casestudy-argentina.com/article.xml
index 869cc0bdb0..28080609bc 100644
--- a/es_ES.ISO8859-1/articles/casestudy-argentina.com/article.xml
+++ b/es_ES.ISO8859-1/articles/casestudy-argentina.com/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/es_ES.ISO8859-1/articles/contributing/article.xml b/es_ES.ISO8859-1/articles/contributing/article.xml
index 4a6ce7ef76..49212c4bef 100644
--- a/es_ES.ISO8859-1/articles/contributing/article.xml
+++ b/es_ES.ISO8859-1/articles/contributing/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/es_ES.ISO8859-1/articles/cvs-freebsd/article.xml b/es_ES.ISO8859-1/articles/cvs-freebsd/article.xml
index c96e99769b..35f9e5f459 100644
--- a/es_ES.ISO8859-1/articles/cvs-freebsd/article.xml
+++ b/es_ES.ISO8859-1/articles/cvs-freebsd/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/es_ES.ISO8859-1/articles/explaining-bsd/article.xml b/es_ES.ISO8859-1/articles/explaining-bsd/article.xml
index 7876ee6662..4f3e4d17aa 100644
--- a/es_ES.ISO8859-1/articles/explaining-bsd/article.xml
+++ b/es_ES.ISO8859-1/articles/explaining-bsd/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/es_ES.ISO8859-1/articles/fbsd-from-scratch/article.xml b/es_ES.ISO8859-1/articles/fbsd-from-scratch/article.xml
index 244cd4ce1f..216da1b136 100644
--- a/es_ES.ISO8859-1/articles/fbsd-from-scratch/article.xml
+++ b/es_ES.ISO8859-1/articles/fbsd-from-scratch/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd" [
<!ENTITY scratch.ap "<application>FreeBSD From Scratch</application>">
diff --git a/es_ES.ISO8859-1/articles/fdp-es/article.xml b/es_ES.ISO8859-1/articles/fdp-es/article.xml
index 937beeb137..02f4f44c32 100644
--- a/es_ES.ISO8859-1/articles/fdp-es/article.xml
+++ b/es_ES.ISO8859-1/articles/fdp-es/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/es_ES.ISO8859-1/articles/laptop/article.xml b/es_ES.ISO8859-1/articles/laptop/article.xml
index f7c79d6c8d..34d6db171a 100644
--- a/es_ES.ISO8859-1/articles/laptop/article.xml
+++ b/es_ES.ISO8859-1/articles/laptop/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/es_ES.ISO8859-1/articles/linux-comparison/article.xml b/es_ES.ISO8859-1/articles/linux-comparison/article.xml
index 3b9c1757e9..0178b96b45 100644
--- a/es_ES.ISO8859-1/articles/linux-comparison/article.xml
+++ b/es_ES.ISO8859-1/articles/linux-comparison/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/es_ES.ISO8859-1/articles/linux-users/article.xml b/es_ES.ISO8859-1/articles/linux-users/article.xml
index c7af14a8cd..05f59f2195 100644
--- a/es_ES.ISO8859-1/articles/linux-users/article.xml
+++ b/es_ES.ISO8859-1/articles/linux-users/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/es_ES.ISO8859-1/articles/mailing-list-faq/article.xml b/es_ES.ISO8859-1/articles/mailing-list-faq/article.xml
index c0e814482a..04cf0f3ec9 100644
--- a/es_ES.ISO8859-1/articles/mailing-list-faq/article.xml
+++ b/es_ES.ISO8859-1/articles/mailing-list-faq/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/es_ES.ISO8859-1/articles/nanobsd/article.xml b/es_ES.ISO8859-1/articles/nanobsd/article.xml
index 7429cab82c..5bca3b3ecc 100644
--- a/es_ES.ISO8859-1/articles/nanobsd/article.xml
+++ b/es_ES.ISO8859-1/articles/nanobsd/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/es_ES.ISO8859-1/articles/p4-primer/article.xml b/es_ES.ISO8859-1/articles/p4-primer/article.xml
index a680f490f3..85a6a05314 100644
--- a/es_ES.ISO8859-1/articles/p4-primer/article.xml
+++ b/es_ES.ISO8859-1/articles/p4-primer/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/es_ES.ISO8859-1/articles/problem-reports/article.xml b/es_ES.ISO8859-1/articles/problem-reports/article.xml
index 264da4cae5..ad3ac9ab1b 100644
--- a/es_ES.ISO8859-1/articles/problem-reports/article.xml
+++ b/es_ES.ISO8859-1/articles/problem-reports/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/es_ES.ISO8859-1/articles/releng/article.xml b/es_ES.ISO8859-1/articles/releng/article.xml
index 438013aac7..1054c066e8 100644
--- a/es_ES.ISO8859-1/articles/releng/article.xml
+++ b/es_ES.ISO8859-1/articles/releng/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/es_ES.ISO8859-1/books/faq/book.xml b/es_ES.ISO8859-1/books/faq/book.xml
index e0fe8e5a1c..3cc977e35e 100644
--- a/es_ES.ISO8859-1/books/faq/book.xml
+++ b/es_ES.ISO8859-1/books/faq/book.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/es_ES.ISO8859-1/books/handbook/book.xml b/es_ES.ISO8859-1/books/handbook/book.xml
index b76dceb29d..0992d8dcfb 100755
--- a/es_ES.ISO8859-1/books/handbook/book.xml
+++ b/es_ES.ISO8859-1/books/handbook/book.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd" [
<!ENTITY % chapters SYSTEM "chapters.ent">
diff --git a/fr_FR.ISO8859-1/articles/building-products/article.xml b/fr_FR.ISO8859-1/articles/building-products/article.xml
index f6021ad8c9..986d32b720 100644
--- a/fr_FR.ISO8859-1/articles/building-products/article.xml
+++ b/fr_FR.ISO8859-1/articles/building-products/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/fr_FR.ISO8859-1/articles/committers-guide/article.xml b/fr_FR.ISO8859-1/articles/committers-guide/article.xml
index 0a7dd1acc0..ec417b9f4e 100644
--- a/fr_FR.ISO8859-1/articles/committers-guide/article.xml
+++ b/fr_FR.ISO8859-1/articles/committers-guide/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/fr_FR.ISO8859-1/articles/contributing-ports/article.xml b/fr_FR.ISO8859-1/articles/contributing-ports/article.xml
index 2ab239b607..8af66ba7b2 100644
--- a/fr_FR.ISO8859-1/articles/contributing-ports/article.xml
+++ b/fr_FR.ISO8859-1/articles/contributing-ports/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/fr_FR.ISO8859-1/articles/contributing/article.xml b/fr_FR.ISO8859-1/articles/contributing/article.xml
index 68074a9544..b560aa2b68 100644
--- a/fr_FR.ISO8859-1/articles/contributing/article.xml
+++ b/fr_FR.ISO8859-1/articles/contributing/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/fr_FR.ISO8859-1/articles/contributors/article.xml b/fr_FR.ISO8859-1/articles/contributors/article.xml
index 95faeb5aa3..92913e883e 100644
--- a/fr_FR.ISO8859-1/articles/contributors/article.xml
+++ b/fr_FR.ISO8859-1/articles/contributors/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/fr_FR.ISO8859-1/articles/cvsup-advanced/article.xml b/fr_FR.ISO8859-1/articles/cvsup-advanced/article.xml
index 1d16021293..f2a7cd79d0 100644
--- a/fr_FR.ISO8859-1/articles/cvsup-advanced/article.xml
+++ b/fr_FR.ISO8859-1/articles/cvsup-advanced/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/fr_FR.ISO8859-1/articles/explaining-bsd/article.xml b/fr_FR.ISO8859-1/articles/explaining-bsd/article.xml
index 4d10a7d391..382f416e25 100644
--- a/fr_FR.ISO8859-1/articles/explaining-bsd/article.xml
+++ b/fr_FR.ISO8859-1/articles/explaining-bsd/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/fr_FR.ISO8859-1/articles/filtering-bridges/article.xml b/fr_FR.ISO8859-1/articles/filtering-bridges/article.xml
index d70e463a93..032b3146a1 100644
--- a/fr_FR.ISO8859-1/articles/filtering-bridges/article.xml
+++ b/fr_FR.ISO8859-1/articles/filtering-bridges/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/fr_FR.ISO8859-1/articles/fonts/article.xml b/fr_FR.ISO8859-1/articles/fonts/article.xml
index 0b4c8fbc5a..3932729d06 100755
--- a/fr_FR.ISO8859-1/articles/fonts/article.xml
+++ b/fr_FR.ISO8859-1/articles/fonts/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/fr_FR.ISO8859-1/articles/ipsec-must/article.xml b/fr_FR.ISO8859-1/articles/ipsec-must/article.xml
index 34db5cae45..ea23b38459 100644
--- a/fr_FR.ISO8859-1/articles/ipsec-must/article.xml
+++ b/fr_FR.ISO8859-1/articles/ipsec-must/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/fr_FR.ISO8859-1/articles/laptop/article.xml b/fr_FR.ISO8859-1/articles/laptop/article.xml
index dc009b02f9..a3cb19c6b0 100644
--- a/fr_FR.ISO8859-1/articles/laptop/article.xml
+++ b/fr_FR.ISO8859-1/articles/laptop/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/fr_FR.ISO8859-1/articles/linux-users/article.xml b/fr_FR.ISO8859-1/articles/linux-users/article.xml
index c0e4e0abcc..a3c95c3ab0 100644
--- a/fr_FR.ISO8859-1/articles/linux-users/article.xml
+++ b/fr_FR.ISO8859-1/articles/linux-users/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/fr_FR.ISO8859-1/articles/mh/article.xml b/fr_FR.ISO8859-1/articles/mh/article.xml
index 9a85f04080..accbfaa79c 100644
--- a/fr_FR.ISO8859-1/articles/mh/article.xml
+++ b/fr_FR.ISO8859-1/articles/mh/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/fr_FR.ISO8859-1/articles/nanobsd/article.xml b/fr_FR.ISO8859-1/articles/nanobsd/article.xml
index e1ee59862d..402bc17dc5 100644
--- a/fr_FR.ISO8859-1/articles/nanobsd/article.xml
+++ b/fr_FR.ISO8859-1/articles/nanobsd/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/fr_FR.ISO8859-1/articles/new-users/article.xml b/fr_FR.ISO8859-1/articles/new-users/article.xml
index 3a1b587251..a1dd14ff83 100755
--- a/fr_FR.ISO8859-1/articles/new-users/article.xml
+++ b/fr_FR.ISO8859-1/articles/new-users/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/fr_FR.ISO8859-1/articles/pam/article.xml b/fr_FR.ISO8859-1/articles/pam/article.xml
index ee026243b9..cc13df1323 100644
--- a/fr_FR.ISO8859-1/articles/pam/article.xml
+++ b/fr_FR.ISO8859-1/articles/pam/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/fr_FR.ISO8859-1/articles/pr-guidelines/article.xml b/fr_FR.ISO8859-1/articles/pr-guidelines/article.xml
index dfea3e6e3c..f127b5941a 100644
--- a/fr_FR.ISO8859-1/articles/pr-guidelines/article.xml
+++ b/fr_FR.ISO8859-1/articles/pr-guidelines/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/fr_FR.ISO8859-1/articles/problem-reports/article.xml b/fr_FR.ISO8859-1/articles/problem-reports/article.xml
index 591ff049f9..6b6eccd30f 100644
--- a/fr_FR.ISO8859-1/articles/problem-reports/article.xml
+++ b/fr_FR.ISO8859-1/articles/problem-reports/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/fr_FR.ISO8859-1/articles/releng-packages/article.xml b/fr_FR.ISO8859-1/articles/releng-packages/article.xml
index 357ec4a716..9beaa50d61 100644
--- a/fr_FR.ISO8859-1/articles/releng-packages/article.xml
+++ b/fr_FR.ISO8859-1/articles/releng-packages/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/hu_HU.ISO8859-2/articles/compiz-fusion/article.xml b/hu_HU.ISO8859-2/articles/compiz-fusion/article.xml
index b0903a784a..d3fb1c2c2d 100644
--- a/hu_HU.ISO8859-2/articles/compiz-fusion/article.xml
+++ b/hu_HU.ISO8859-2/articles/compiz-fusion/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/hu_HU.ISO8859-2/articles/cups/article.xml b/hu_HU.ISO8859-2/articles/cups/article.xml
index 9d0a7d4897..acf35d5b9f 100644
--- a/hu_HU.ISO8859-2/articles/cups/article.xml
+++ b/hu_HU.ISO8859-2/articles/cups/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/hu_HU.ISO8859-2/articles/explaining-bsd/article.xml b/hu_HU.ISO8859-2/articles/explaining-bsd/article.xml
index 8ffd88cf1f..00332db692 100644
--- a/hu_HU.ISO8859-2/articles/explaining-bsd/article.xml
+++ b/hu_HU.ISO8859-2/articles/explaining-bsd/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/hu_HU.ISO8859-2/articles/gjournal-desktop/article.xml b/hu_HU.ISO8859-2/articles/gjournal-desktop/article.xml
index 9d3f291737..8b12a19ddb 100644
--- a/hu_HU.ISO8859-2/articles/gjournal-desktop/article.xml
+++ b/hu_HU.ISO8859-2/articles/gjournal-desktop/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/hu_HU.ISO8859-2/articles/laptop/article.xml b/hu_HU.ISO8859-2/articles/laptop/article.xml
index 87cf08b87f..b8b046fa3a 100644
--- a/hu_HU.ISO8859-2/articles/laptop/article.xml
+++ b/hu_HU.ISO8859-2/articles/laptop/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/hu_HU.ISO8859-2/articles/linux-comparison/article.xml b/hu_HU.ISO8859-2/articles/linux-comparison/article.xml
index 656c81fd72..1f4c4645d6 100644
--- a/hu_HU.ISO8859-2/articles/linux-comparison/article.xml
+++ b/hu_HU.ISO8859-2/articles/linux-comparison/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/hu_HU.ISO8859-2/articles/linux-users/article.xml b/hu_HU.ISO8859-2/articles/linux-users/article.xml
index b174865fce..67ec405b2c 100644
--- a/hu_HU.ISO8859-2/articles/linux-users/article.xml
+++ b/hu_HU.ISO8859-2/articles/linux-users/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/hu_HU.ISO8859-2/books/faq/book.xml b/hu_HU.ISO8859-2/books/faq/book.xml
index 7d71c9967f..6187090e35 100644
--- a/hu_HU.ISO8859-2/books/faq/book.xml
+++ b/hu_HU.ISO8859-2/books/faq/book.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd" [
<!ENTITY enbase "http://www.FreeBSD.org">
diff --git a/hu_HU.ISO8859-2/books/fdp-primer/book.xml b/hu_HU.ISO8859-2/books/fdp-primer/book.xml
index 1fc09b2c15..2a729e7d53 100644
--- a/hu_HU.ISO8859-2/books/fdp-primer/book.xml
+++ b/hu_HU.ISO8859-2/books/fdp-primer/book.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd" [
<!ENTITY % chapters SYSTEM "chapters.ent"> %chapters;
diff --git a/hu_HU.ISO8859-2/books/handbook/book.xml b/hu_HU.ISO8859-2/books/handbook/book.xml
index ceaacae891..4f2a5509fb 100644
--- a/hu_HU.ISO8859-2/books/handbook/book.xml
+++ b/hu_HU.ISO8859-2/books/handbook/book.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd" [
<!ENTITY % chapters SYSTEM "chapters.ent">
diff --git a/it_IT.ISO8859-15/articles/committers-guide/article.xml b/it_IT.ISO8859-15/articles/committers-guide/article.xml
index daa3e3d763..7f1d560ea9 100644
--- a/it_IT.ISO8859-15/articles/committers-guide/article.xml
+++ b/it_IT.ISO8859-15/articles/committers-guide/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/it_IT.ISO8859-15/articles/explaining-bsd/article.xml b/it_IT.ISO8859-15/articles/explaining-bsd/article.xml
index d429c1d376..c21bfe494e 100644
--- a/it_IT.ISO8859-15/articles/explaining-bsd/article.xml
+++ b/it_IT.ISO8859-15/articles/explaining-bsd/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/it_IT.ISO8859-15/articles/filtering-bridges/article.xml b/it_IT.ISO8859-15/articles/filtering-bridges/article.xml
index f9b2c88528..e6c7a87667 100644
--- a/it_IT.ISO8859-15/articles/filtering-bridges/article.xml
+++ b/it_IT.ISO8859-15/articles/filtering-bridges/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/it_IT.ISO8859-15/articles/new-users/article.xml b/it_IT.ISO8859-15/articles/new-users/article.xml
index 16e9efdd8b..e4cfb54492 100644
--- a/it_IT.ISO8859-15/articles/new-users/article.xml
+++ b/it_IT.ISO8859-15/articles/new-users/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/it_IT.ISO8859-15/articles/vm-design/article.xml b/it_IT.ISO8859-15/articles/vm-design/article.xml
index 182046d44c..5206368afe 100644
--- a/it_IT.ISO8859-15/articles/vm-design/article.xml
+++ b/it_IT.ISO8859-15/articles/vm-design/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/ja_JP.eucJP/articles/contributing/article.xml b/ja_JP.eucJP/articles/contributing/article.xml
index 840519dd05..973094d6e5 100644
--- a/ja_JP.eucJP/articles/contributing/article.xml
+++ b/ja_JP.eucJP/articles/contributing/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
+<?xml version="1.0" encoding="euc-jp"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/ja_JP.eucJP/articles/contributors/article.xml b/ja_JP.eucJP/articles/contributors/article.xml
index 623b5d082b..e380cf893e 100644
--- a/ja_JP.eucJP/articles/contributors/article.xml
+++ b/ja_JP.eucJP/articles/contributors/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
+<?xml version="1.0" encoding="euc-jp"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd" [
<!ENTITY % contrib.ent SYSTEM "../../../en_US.ISO8859-1/articles/contributors/contrib.ent">
diff --git a/ja_JP.eucJP/articles/fbsd-from-scratch/article.xml b/ja_JP.eucJP/articles/fbsd-from-scratch/article.xml
index 58507f42da..0739471fca 100644
--- a/ja_JP.eucJP/articles/fbsd-from-scratch/article.xml
+++ b/ja_JP.eucJP/articles/fbsd-from-scratch/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
+<?xml version="1.0" encoding="euc-jp"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd" [
<!ENTITY scratch.ap "<application>FreeBSD ���������ꤹ��</application>">
diff --git a/ja_JP.eucJP/articles/fonts/article.xml b/ja_JP.eucJP/articles/fonts/article.xml
index f964494fbc..cf40417297 100644
--- a/ja_JP.eucJP/articles/fonts/article.xml
+++ b/ja_JP.eucJP/articles/fonts/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
+<?xml version="1.0" encoding="euc-jp"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/ja_JP.eucJP/articles/ipsec-must/article.xml b/ja_JP.eucJP/articles/ipsec-must/article.xml
index 33ea70d858..effac68cf6 100644
--- a/ja_JP.eucJP/articles/ipsec-must/article.xml
+++ b/ja_JP.eucJP/articles/ipsec-must/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
+<?xml version="1.0" encoding="euc-jp"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/ja_JP.eucJP/articles/problem-reports/article.xml b/ja_JP.eucJP/articles/problem-reports/article.xml
index 7e67f3dc55..0a5cc310fe 100644
--- a/ja_JP.eucJP/articles/problem-reports/article.xml
+++ b/ja_JP.eucJP/articles/problem-reports/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
+<?xml version="1.0" encoding="euc-jp"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/ja_JP.eucJP/books/design-44bsd/book.xml b/ja_JP.eucJP/books/design-44bsd/book.xml
index 5dd4cb5191..ff83f9d3fa 100644
--- a/ja_JP.eucJP/books/design-44bsd/book.xml
+++ b/ja_JP.eucJP/books/design-44bsd/book.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
+<?xml version="1.0" encoding="euc-jp"?>
<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/ja_JP.eucJP/books/faq/book.xml b/ja_JP.eucJP/books/faq/book.xml
index 4436037fb4..e73c949b6d 100644
--- a/ja_JP.eucJP/books/faq/book.xml
+++ b/ja_JP.eucJP/books/faq/book.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
+<?xml version="1.0" encoding="euc-jp"?>
<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/ja_JP.eucJP/books/fdp-primer/book.xml b/ja_JP.eucJP/books/fdp-primer/book.xml
index f941f4a8f4..62c69bfe09 100644
--- a/ja_JP.eucJP/books/fdp-primer/book.xml
+++ b/ja_JP.eucJP/books/fdp-primer/book.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
+<?xml version="1.0" encoding="euc-jp"?>
<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd" [
<!ENTITY % chapters SYSTEM "chapters.ent"> %chapters;
diff --git a/ja_JP.eucJP/books/fdp-primer/examples/appendix.xml b/ja_JP.eucJP/books/fdp-primer/examples/appendix.xml
index 46b5ff22fe..b1167c771d 100644
--- a/ja_JP.eucJP/books/fdp-primer/examples/appendix.xml
+++ b/ja_JP.eucJP/books/fdp-primer/examples/appendix.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
+<?xml version="1.0" encoding="euc-jp"?>
<!-- Copyright (c) 2000 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/ja_JP.eucJP/books/porters-handbook/book.xml b/ja_JP.eucJP/books/porters-handbook/book.xml
index 22dfc74a7b..4a563200cd 100644
--- a/ja_JP.eucJP/books/porters-handbook/book.xml
+++ b/ja_JP.eucJP/books/porters-handbook/book.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
+<?xml version="1.0" encoding="euc-jp"?>
<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/nl_NL.ISO8859-1/articles/contributing-ports/article.xml b/nl_NL.ISO8859-1/articles/contributing-ports/article.xml
index f00082bcd8..6afc36b037 100644
--- a/nl_NL.ISO8859-1/articles/contributing-ports/article.xml
+++ b/nl_NL.ISO8859-1/articles/contributing-ports/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/nl_NL.ISO8859-1/articles/contributing/article.xml b/nl_NL.ISO8859-1/articles/contributing/article.xml
index 2450e11b16..27fee2a590 100644
--- a/nl_NL.ISO8859-1/articles/contributing/article.xml
+++ b/nl_NL.ISO8859-1/articles/contributing/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/nl_NL.ISO8859-1/articles/explaining-bsd/article.xml b/nl_NL.ISO8859-1/articles/explaining-bsd/article.xml
index d6a15d1d63..1b0cb777c6 100644
--- a/nl_NL.ISO8859-1/articles/explaining-bsd/article.xml
+++ b/nl_NL.ISO8859-1/articles/explaining-bsd/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/nl_NL.ISO8859-1/articles/problem-reports/article.xml b/nl_NL.ISO8859-1/articles/problem-reports/article.xml
index b64a2badc8..3249413c28 100644
--- a/nl_NL.ISO8859-1/articles/problem-reports/article.xml
+++ b/nl_NL.ISO8859-1/articles/problem-reports/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/nl_NL.ISO8859-1/articles/solid-state/article.xml b/nl_NL.ISO8859-1/articles/solid-state/article.xml
index 3781a135ff..dbb8f03082 100644
--- a/nl_NL.ISO8859-1/articles/solid-state/article.xml
+++ b/nl_NL.ISO8859-1/articles/solid-state/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/nl_NL.ISO8859-1/share/xml/bibliography.xml b/nl_NL.ISO8859-1/share/xml/bibliography.xml
index 01198bca89..7fe3e5993c 100644
--- a/nl_NL.ISO8859-1/share/xml/bibliography.xml
+++ b/nl_NL.ISO8859-1/share/xml/bibliography.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Dutch Documentation Project
diff --git a/no_NO.ISO8859-1/books/handbook/basics/chapter.xml b/no_NO.ISO8859-1/books/handbook/basics/chapter.xml
index 5a1592b351..1aa2e9a6f3 100644
--- a/no_NO.ISO8859-1/books/handbook/basics/chapter.xml
+++ b/no_NO.ISO8859-1/books/handbook/basics/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/no_NO.ISO8859-1/books/handbook/bibliography/chapter.xml b/no_NO.ISO8859-1/books/handbook/bibliography/chapter.xml
index 4dbe929258..f9cc93e36d 100644
--- a/no_NO.ISO8859-1/books/handbook/bibliography/chapter.xml
+++ b/no_NO.ISO8859-1/books/handbook/bibliography/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The Norwegian FreeBSD Documentation Project
diff --git a/no_NO.ISO8859-1/books/handbook/install/chapter.xml b/no_NO.ISO8859-1/books/handbook/install/chapter.xml
index 46c468a67d..2e759a3ef0 100644
--- a/no_NO.ISO8859-1/books/handbook/install/chapter.xml
+++ b/no_NO.ISO8859-1/books/handbook/install/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The Norwegian FreeBSD Documentation Project
diff --git a/pl_PL.ISO8859-2/articles/filtering-bridges/article.xml b/pl_PL.ISO8859-2/articles/filtering-bridges/article.xml
index e2b2819774..2e7e0509ec 100644
--- a/pl_PL.ISO8859-2/articles/filtering-bridges/article.xml
+++ b/pl_PL.ISO8859-2/articles/filtering-bridges/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/pl_PL.ISO8859-2/articles/new-users/article.xml b/pl_PL.ISO8859-2/articles/new-users/article.xml
index c487cc2a6e..a74c6568af 100644
--- a/pl_PL.ISO8859-2/articles/new-users/article.xml
+++ b/pl_PL.ISO8859-2/articles/new-users/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/pt_BR.ISO8859-1/articles/building-products/article.xml b/pt_BR.ISO8859-1/articles/building-products/article.xml
index 4073e253c9..fb5499b525 100644
--- a/pt_BR.ISO8859-1/articles/building-products/article.xml
+++ b/pt_BR.ISO8859-1/articles/building-products/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/pt_BR.ISO8859-1/articles/contributing-ports/article.xml b/pt_BR.ISO8859-1/articles/contributing-ports/article.xml
index d5024e313d..8bfdb6dbee 100644
--- a/pt_BR.ISO8859-1/articles/contributing-ports/article.xml
+++ b/pt_BR.ISO8859-1/articles/contributing-ports/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/pt_BR.ISO8859-1/articles/contributing/article.xml b/pt_BR.ISO8859-1/articles/contributing/article.xml
index d2cf24db38..99a7dcfb64 100644
--- a/pt_BR.ISO8859-1/articles/contributing/article.xml
+++ b/pt_BR.ISO8859-1/articles/contributing/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/pt_BR.ISO8859-1/articles/explaining-bsd/article.xml b/pt_BR.ISO8859-1/articles/explaining-bsd/article.xml
index bea1fe60fa..54dde6cc38 100644
--- a/pt_BR.ISO8859-1/articles/explaining-bsd/article.xml
+++ b/pt_BR.ISO8859-1/articles/explaining-bsd/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/pt_BR.ISO8859-1/articles/freebsd-questions/article.xml b/pt_BR.ISO8859-1/articles/freebsd-questions/article.xml
index 932592e958..56a9dad85c 100644
--- a/pt_BR.ISO8859-1/articles/freebsd-questions/article.xml
+++ b/pt_BR.ISO8859-1/articles/freebsd-questions/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/pt_BR.ISO8859-1/articles/freebsd-update-server/article.xml b/pt_BR.ISO8859-1/articles/freebsd-update-server/article.xml
index 0a0fd8537e..d4f20eea26 100644
--- a/pt_BR.ISO8859-1/articles/freebsd-update-server/article.xml
+++ b/pt_BR.ISO8859-1/articles/freebsd-update-server/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd" [
<!ENTITY fbus.ap "<application>Servidor de Atualiza��o do FreeBSD</application>">
diff --git a/pt_BR.ISO8859-1/articles/hubs/article.xml b/pt_BR.ISO8859-1/articles/hubs/article.xml
index e450adff02..d6ae971fbb 100644
--- a/pt_BR.ISO8859-1/articles/hubs/article.xml
+++ b/pt_BR.ISO8859-1/articles/hubs/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/pt_BR.ISO8859-1/articles/linux-users/article.xml b/pt_BR.ISO8859-1/articles/linux-users/article.xml
index 1bd8dd0aa3..00770efe9d 100644
--- a/pt_BR.ISO8859-1/articles/linux-users/article.xml
+++ b/pt_BR.ISO8859-1/articles/linux-users/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/pt_BR.ISO8859-1/articles/new-users/article.xml b/pt_BR.ISO8859-1/articles/new-users/article.xml
index 6b410b9eb7..2034619675 100644
--- a/pt_BR.ISO8859-1/articles/new-users/article.xml
+++ b/pt_BR.ISO8859-1/articles/new-users/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/pt_BR.ISO8859-1/articles/problem-reports/article.xml b/pt_BR.ISO8859-1/articles/problem-reports/article.xml
index f6671aff08..ec1f919881 100644
--- a/pt_BR.ISO8859-1/articles/problem-reports/article.xml
+++ b/pt_BR.ISO8859-1/articles/problem-reports/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/pt_BR.ISO8859-1/books/faq/book.xml b/pt_BR.ISO8859-1/books/faq/book.xml
index ea580ceb05..449d044c4b 100644
--- a/pt_BR.ISO8859-1/books/faq/book.xml
+++ b/pt_BR.ISO8859-1/books/faq/book.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd" [
<!ENTITY bibliography SYSTEM "../../share/xml/bibliography.xml">
diff --git a/pt_BR.ISO8859-1/books/fdp-primer/book.xml b/pt_BR.ISO8859-1/books/fdp-primer/book.xml
index f6172977c6..b96fbef5c1 100644
--- a/pt_BR.ISO8859-1/books/fdp-primer/book.xml
+++ b/pt_BR.ISO8859-1/books/fdp-primer/book.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd" [
<!ENTITY % chapters SYSTEM "chapters.ent"> %chapters;
diff --git a/ru_RU.KOI8-R/articles/committers-guide/article.xml b/ru_RU.KOI8-R/articles/committers-guide/article.xml
index a1d0ab3a64..f0f83afa3e 100644
--- a/ru_RU.KOI8-R/articles/committers-guide/article.xml
+++ b/ru_RU.KOI8-R/articles/committers-guide/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/ru_RU.KOI8-R/articles/console-server/article.xml b/ru_RU.KOI8-R/articles/console-server/article.xml
index b70bd8835d..3a8b8bb845 100644
--- a/ru_RU.KOI8-R/articles/console-server/article.xml
+++ b/ru_RU.KOI8-R/articles/console-server/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/ru_RU.KOI8-R/articles/contributing/article.xml b/ru_RU.KOI8-R/articles/contributing/article.xml
index 68b757b06a..d08553b27a 100644
--- a/ru_RU.KOI8-R/articles/contributing/article.xml
+++ b/ru_RU.KOI8-R/articles/contributing/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/ru_RU.KOI8-R/articles/cups/article.xml b/ru_RU.KOI8-R/articles/cups/article.xml
index 1314c189de..42c67da577 100644
--- a/ru_RU.KOI8-R/articles/cups/article.xml
+++ b/ru_RU.KOI8-R/articles/cups/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/ru_RU.KOI8-R/articles/custom-gcc/article.xml b/ru_RU.KOI8-R/articles/custom-gcc/article.xml
index d3a301469d..cd4ed25ab6 100644
--- a/ru_RU.KOI8-R/articles/custom-gcc/article.xml
+++ b/ru_RU.KOI8-R/articles/custom-gcc/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/ru_RU.KOI8-R/articles/cvs-freebsd/article.xml b/ru_RU.KOI8-R/articles/cvs-freebsd/article.xml
index fdd2954a60..fe1b3d814f 100644
--- a/ru_RU.KOI8-R/articles/cvs-freebsd/article.xml
+++ b/ru_RU.KOI8-R/articles/cvs-freebsd/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/ru_RU.KOI8-R/articles/cvsup-advanced/article.xml b/ru_RU.KOI8-R/articles/cvsup-advanced/article.xml
index fcacae29eb..9a6f2e7ffb 100644
--- a/ru_RU.KOI8-R/articles/cvsup-advanced/article.xml
+++ b/ru_RU.KOI8-R/articles/cvsup-advanced/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/ru_RU.KOI8-R/articles/explaining-bsd/article.xml b/ru_RU.KOI8-R/articles/explaining-bsd/article.xml
index 25b9635a4b..0887d8da0a 100644
--- a/ru_RU.KOI8-R/articles/explaining-bsd/article.xml
+++ b/ru_RU.KOI8-R/articles/explaining-bsd/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/ru_RU.KOI8-R/articles/fbsd-from-scratch/article.xml b/ru_RU.KOI8-R/articles/fbsd-from-scratch/article.xml
index 206ff51381..05b7027309 100644
--- a/ru_RU.KOI8-R/articles/fbsd-from-scratch/article.xml
+++ b/ru_RU.KOI8-R/articles/fbsd-from-scratch/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd" [
<!ENTITY scratch.ap "<application>FreeBSD From Scratch</application>">
diff --git a/ru_RU.KOI8-R/articles/fonts/article.xml b/ru_RU.KOI8-R/articles/fonts/article.xml
index 0f277e3577..f4d4a6dc71 100644
--- a/ru_RU.KOI8-R/articles/fonts/article.xml
+++ b/ru_RU.KOI8-R/articles/fonts/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/ru_RU.KOI8-R/articles/freebsd-questions/article.xml b/ru_RU.KOI8-R/articles/freebsd-questions/article.xml
index 6d6421ecec..b8203b7448 100644
--- a/ru_RU.KOI8-R/articles/freebsd-questions/article.xml
+++ b/ru_RU.KOI8-R/articles/freebsd-questions/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/ru_RU.KOI8-R/articles/geom-class/article.xml b/ru_RU.KOI8-R/articles/geom-class/article.xml
index e5942b95cc..0e49f23870 100644
--- a/ru_RU.KOI8-R/articles/geom-class/article.xml
+++ b/ru_RU.KOI8-R/articles/geom-class/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/ru_RU.KOI8-R/articles/gjournal-desktop/article.xml b/ru_RU.KOI8-R/articles/gjournal-desktop/article.xml
index e06dbe2680..12cc7934dd 100644
--- a/ru_RU.KOI8-R/articles/gjournal-desktop/article.xml
+++ b/ru_RU.KOI8-R/articles/gjournal-desktop/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/ru_RU.KOI8-R/articles/hubs/article.xml b/ru_RU.KOI8-R/articles/hubs/article.xml
index b0bc37264b..bc1c80c660 100644
--- a/ru_RU.KOI8-R/articles/hubs/article.xml
+++ b/ru_RU.KOI8-R/articles/hubs/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/ru_RU.KOI8-R/articles/ipsec-must/article.xml b/ru_RU.KOI8-R/articles/ipsec-must/article.xml
index 3dc6fc25d2..7c90168c87 100644
--- a/ru_RU.KOI8-R/articles/ipsec-must/article.xml
+++ b/ru_RU.KOI8-R/articles/ipsec-must/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/ru_RU.KOI8-R/articles/laptop/article.xml b/ru_RU.KOI8-R/articles/laptop/article.xml
index 54bc9b1b8e..88cfb7ba0d 100644
--- a/ru_RU.KOI8-R/articles/laptop/article.xml
+++ b/ru_RU.KOI8-R/articles/laptop/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/ru_RU.KOI8-R/articles/linux-comparison/article.xml b/ru_RU.KOI8-R/articles/linux-comparison/article.xml
index bf35993940..0eb6309b2d 100644
--- a/ru_RU.KOI8-R/articles/linux-comparison/article.xml
+++ b/ru_RU.KOI8-R/articles/linux-comparison/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/ru_RU.KOI8-R/articles/mailing-list-faq/article.xml b/ru_RU.KOI8-R/articles/mailing-list-faq/article.xml
index c04e0983d2..a174c5e432 100644
--- a/ru_RU.KOI8-R/articles/mailing-list-faq/article.xml
+++ b/ru_RU.KOI8-R/articles/mailing-list-faq/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/ru_RU.KOI8-R/articles/mh/article.xml b/ru_RU.KOI8-R/articles/mh/article.xml
index c4d3cfb59a..99b52c2911 100644
--- a/ru_RU.KOI8-R/articles/mh/article.xml
+++ b/ru_RU.KOI8-R/articles/mh/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/ru_RU.KOI8-R/articles/new-users/article.xml b/ru_RU.KOI8-R/articles/new-users/article.xml
index f0a6bcaac9..401b6d78be 100644
--- a/ru_RU.KOI8-R/articles/new-users/article.xml
+++ b/ru_RU.KOI8-R/articles/new-users/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/ru_RU.KOI8-R/articles/pam/article.xml b/ru_RU.KOI8-R/articles/pam/article.xml
index 39cf9a79b5..e481023e04 100644
--- a/ru_RU.KOI8-R/articles/pam/article.xml
+++ b/ru_RU.KOI8-R/articles/pam/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/ru_RU.KOI8-R/articles/portbuild/article.xml b/ru_RU.KOI8-R/articles/portbuild/article.xml
index 2c282a694d..25b6fd6c01 100644
--- a/ru_RU.KOI8-R/articles/portbuild/article.xml
+++ b/ru_RU.KOI8-R/articles/portbuild/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/ru_RU.KOI8-R/articles/pr-guidelines/article.xml b/ru_RU.KOI8-R/articles/pr-guidelines/article.xml
index 0b16aa96c9..0fa6878fb8 100644
--- a/ru_RU.KOI8-R/articles/pr-guidelines/article.xml
+++ b/ru_RU.KOI8-R/articles/pr-guidelines/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd" [
<!ENTITY man.edit-pr.1 "<citerefentry><refentrytitle>edit-pr</refentrytitle><manvolnum>1</manvolnum></citerefentry>">
diff --git a/ru_RU.KOI8-R/articles/problem-reports/article.xml b/ru_RU.KOI8-R/articles/problem-reports/article.xml
index 7af7fe3442..1cfaa31a72 100644
--- a/ru_RU.KOI8-R/articles/problem-reports/article.xml
+++ b/ru_RU.KOI8-R/articles/problem-reports/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/ru_RU.KOI8-R/articles/relaydelay/article.xml b/ru_RU.KOI8-R/articles/relaydelay/article.xml
index 0d606c63ba..13351a86e6 100644
--- a/ru_RU.KOI8-R/articles/relaydelay/article.xml
+++ b/ru_RU.KOI8-R/articles/relaydelay/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/ru_RU.KOI8-R/articles/releng-packages/article.xml b/ru_RU.KOI8-R/articles/releng-packages/article.xml
index e94d1f5e36..65ac41be9a 100644
--- a/ru_RU.KOI8-R/articles/releng-packages/article.xml
+++ b/ru_RU.KOI8-R/articles/releng-packages/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/ru_RU.KOI8-R/articles/releng/article.xml b/ru_RU.KOI8-R/articles/releng/article.xml
index dcc82dd336..d7b388de0b 100644
--- a/ru_RU.KOI8-R/articles/releng/article.xml
+++ b/ru_RU.KOI8-R/articles/releng/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd" [
<!ENTITY art.re.pkgs '<ulink url="&url.articles.releng-packages;/article.html">The Release Engineering of Third Party Packages</ulink>'>
diff --git a/ru_RU.KOI8-R/articles/solid-state/article.xml b/ru_RU.KOI8-R/articles/solid-state/article.xml
index 36f365ccdb..230f0d2dba 100644
--- a/ru_RU.KOI8-R/articles/solid-state/article.xml
+++ b/ru_RU.KOI8-R/articles/solid-state/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/ru_RU.KOI8-R/articles/vm-design/article.xml b/ru_RU.KOI8-R/articles/vm-design/article.xml
index eec705a54b..eb317fb160 100644
--- a/ru_RU.KOI8-R/articles/vm-design/article.xml
+++ b/ru_RU.KOI8-R/articles/vm-design/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/ru_RU.KOI8-R/books/design-44bsd/book.xml b/ru_RU.KOI8-R/books/design-44bsd/book.xml
index 393277a922..cc599874c4 100644
--- a/ru_RU.KOI8-R/books/design-44bsd/book.xml
+++ b/ru_RU.KOI8-R/books/design-44bsd/book.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/ru_RU.KOI8-R/books/developers-handbook/book.xml b/ru_RU.KOI8-R/books/developers-handbook/book.xml
index dfa30fa25e..3abd465dd8 100644
--- a/ru_RU.KOI8-R/books/developers-handbook/book.xml
+++ b/ru_RU.KOI8-R/books/developers-handbook/book.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd" [
<!ENTITY % chapters SYSTEM "chapters.ent"> %chapters;
diff --git a/ru_RU.KOI8-R/books/faq/book.xml b/ru_RU.KOI8-R/books/faq/book.xml
index bb617dc14a..ddf4d45c90 100644
--- a/ru_RU.KOI8-R/books/faq/book.xml
+++ b/ru_RU.KOI8-R/books/faq/book.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd" [
<!ENTITY bibliography SYSTEM "../../../share/xml/bibliography.xml">
diff --git a/ru_RU.KOI8-R/books/fdp-primer/book.xml b/ru_RU.KOI8-R/books/fdp-primer/book.xml
index 1361912025..ec7c536532 100644
--- a/ru_RU.KOI8-R/books/fdp-primer/book.xml
+++ b/ru_RU.KOI8-R/books/fdp-primer/book.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd" [
<!ENTITY % chapters SYSTEM "chapters.ent"> %chapters;
diff --git a/ru_RU.KOI8-R/books/handbook/book.xml b/ru_RU.KOI8-R/books/handbook/book.xml
index e0268464a8..f665bc2676 100644
--- a/ru_RU.KOI8-R/books/handbook/book.xml
+++ b/ru_RU.KOI8-R/books/handbook/book.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd" [
<!ENTITY % chapters SYSTEM "chapters.ent">
diff --git a/ru_RU.KOI8-R/books/porters-handbook/book.xml b/ru_RU.KOI8-R/books/porters-handbook/book.xml
index 5fb338745f..6537f7538f 100644
--- a/ru_RU.KOI8-R/books/porters-handbook/book.xml
+++ b/ru_RU.KOI8-R/books/porters-handbook/book.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/tr_TR.ISO8859-9/articles/explaining-bsd/article.xml b/tr_TR.ISO8859-9/articles/explaining-bsd/article.xml
index fadc3c85cb..1540da870f 100644
--- a/tr_TR.ISO8859-9/articles/explaining-bsd/article.xml
+++ b/tr_TR.ISO8859-9/articles/explaining-bsd/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-9" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-9"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/zh_CN.GB2312/articles/contributing/article.xml b/zh_CN.GB2312/articles/contributing/article.xml
index 8e2a0850bc..4309e0c9bc 100644
--- a/zh_CN.GB2312/articles/contributing/article.xml
+++ b/zh_CN.GB2312/articles/contributing/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/zh_CN.GB2312/articles/cvs-freebsd/article.xml b/zh_CN.GB2312/articles/cvs-freebsd/article.xml
index 4990c3988b..406c9c9c26 100644
--- a/zh_CN.GB2312/articles/cvs-freebsd/article.xml
+++ b/zh_CN.GB2312/articles/cvs-freebsd/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/zh_CN.GB2312/articles/linux-users/article.xml b/zh_CN.GB2312/articles/linux-users/article.xml
index 6cf7b23201..4d0cf09a68 100644
--- a/zh_CN.GB2312/articles/linux-users/article.xml
+++ b/zh_CN.GB2312/articles/linux-users/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/zh_CN.GB2312/articles/nanobsd/article.xml b/zh_CN.GB2312/articles/nanobsd/article.xml
index 0714dfa5e1..6ad4ed1002 100644
--- a/zh_CN.GB2312/articles/nanobsd/article.xml
+++ b/zh_CN.GB2312/articles/nanobsd/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/zh_CN.GB2312/articles/rc-scripting/article.xml b/zh_CN.GB2312/articles/rc-scripting/article.xml
index 2fd0021c35..9a3e890f9d 100644
--- a/zh_CN.GB2312/articles/rc-scripting/article.xml
+++ b/zh_CN.GB2312/articles/rc-scripting/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/zh_CN.GB2312/articles/remote-install/article.xml b/zh_CN.GB2312/articles/remote-install/article.xml
index 5a868bead5..0df5aecb0e 100644
--- a/zh_CN.GB2312/articles/remote-install/article.xml
+++ b/zh_CN.GB2312/articles/remote-install/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/zh_CN.GB2312/books/arch-handbook/book.xml b/zh_CN.GB2312/books/arch-handbook/book.xml
index cf34a559dd..5300306982 100644
--- a/zh_CN.GB2312/books/arch-handbook/book.xml
+++ b/zh_CN.GB2312/books/arch-handbook/book.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd" [
<!ENTITY % chapters SYSTEM "chapters.ent">
diff --git a/zh_CN.GB2312/books/porters-handbook/book.xml b/zh_CN.GB2312/books/porters-handbook/book.xml
index be067e2546..e4c533738f 100644
--- a/zh_CN.GB2312/books/porters-handbook/book.xml
+++ b/zh_CN.GB2312/books/porters-handbook/book.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/zh_TW.Big5/articles/contributing/article.xml b/zh_TW.Big5/articles/contributing/article.xml
index aab4b40f43..d372acf288 100644
--- a/zh_TW.Big5/articles/contributing/article.xml
+++ b/zh_TW.Big5/articles/contributing/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/zh_TW.Big5/articles/cvs-freebsd/article.xml b/zh_TW.Big5/articles/cvs-freebsd/article.xml
index 18cc54e08a..487122f35b 100644
--- a/zh_TW.Big5/articles/cvs-freebsd/article.xml
+++ b/zh_TW.Big5/articles/cvs-freebsd/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/zh_TW.Big5/articles/freebsd-questions/article.xml b/zh_TW.Big5/articles/freebsd-questions/article.xml
index 43ccab98ce..b1af0d52c7 100644
--- a/zh_TW.Big5/articles/freebsd-questions/article.xml
+++ b/zh_TW.Big5/articles/freebsd-questions/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/zh_TW.Big5/articles/hubs/article.xml b/zh_TW.Big5/articles/hubs/article.xml
index 8d0bfe14ed..871b281dca 100644
--- a/zh_TW.Big5/articles/hubs/article.xml
+++ b/zh_TW.Big5/articles/hubs/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/zh_TW.Big5/articles/mailing-list-faq/article.xml b/zh_TW.Big5/articles/mailing-list-faq/article.xml
index 4a3c7f68d4..8daac69625 100644
--- a/zh_TW.Big5/articles/mailing-list-faq/article.xml
+++ b/zh_TW.Big5/articles/mailing-list-faq/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/zh_TW.Big5/articles/nanobsd/article.xml b/zh_TW.Big5/articles/nanobsd/article.xml
index d8d0147f8a..0223df0a6e 100644
--- a/zh_TW.Big5/articles/nanobsd/article.xml
+++ b/zh_TW.Big5/articles/nanobsd/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/zh_TW.Big5/articles/pr-guidelines/article.xml b/zh_TW.Big5/articles/pr-guidelines/article.xml
index 09b69a1a80..9018f4bfa9 100644
--- a/zh_TW.Big5/articles/pr-guidelines/article.xml
+++ b/zh_TW.Big5/articles/pr-guidelines/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd" [
<!ENTITY man.edit-pr.1 "<citerefentry><refentrytitle>edit-pr</refentrytitle><manvolnum>1</manvolnum></citerefentry>">
diff --git a/zh_TW.Big5/articles/problem-reports/article.xml b/zh_TW.Big5/articles/problem-reports/article.xml
index 72042afc0f..bdb7d37812 100644
--- a/zh_TW.Big5/articles/problem-reports/article.xml
+++ b/zh_TW.Big5/articles/problem-reports/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/zh_TW.Big5/articles/remote-install/article.xml b/zh_TW.Big5/articles/remote-install/article.xml
index 3f35c3ded9..cc163f7771 100644
--- a/zh_TW.Big5/articles/remote-install/article.xml
+++ b/zh_TW.Big5/articles/remote-install/article.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
diff --git a/zh_TW.Big5/books/developers-handbook/book.xml b/zh_TW.Big5/books/developers-handbook/book.xml
index 9ca8271336..2253090f85 100644
--- a/zh_TW.Big5/books/developers-handbook/book.xml
+++ b/zh_TW.Big5/books/developers-handbook/book.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd" [
<!ENTITY % chapters SYSTEM "chapters.ent"> %chapters;
diff --git a/zh_TW.Big5/books/porters-handbook/book.xml b/zh_TW.Big5/books/porters-handbook/book.xml
index d14b8c225d..5906438a2b 100644
--- a/zh_TW.Big5/books/porters-handbook/book.xml
+++ b/zh_TW.Big5/books/porters-handbook/book.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"../../../share/xml/freebsd45.dtd">
From 3a9b83582b26bf04c201b290aea91d0dece94d55 Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Wed, 30 Jan 2013 20:11:31 +0000
Subject: [PATCH 032/121] - Use XInclude to include text files instead of
<inlinegraphic> since such inclusion is not supported in standard XSLT and
xsltproc provides no extensions for that
---
.../articles/fbsd-from-scratch/article.xml | 12 +++++-----
en_US.ISO8859-1/articles/pam/article.xml | 11 ++++------
.../articles/fbsd-from-scratch/article.xml | 11 ++++++----
fr_FR.ISO8859-1/articles/pam/article.xml | 12 ++++------
.../articles/fbsd-from-scratch/article.xml | 22 ++++++++++++++-----
.../articles/fbsd-from-scratch/article.xml | 22 ++++++++++++++-----
ru_RU.KOI8-R/articles/pam/article.xml | 15 ++++++++-----
share/mk/doc.docbook.mk | 2 +-
8 files changed, 63 insertions(+), 44 deletions(-)
diff --git a/en_US.ISO8859-1/articles/fbsd-from-scratch/article.xml b/en_US.ISO8859-1/articles/fbsd-from-scratch/article.xml
index a16712e632..8adbfcb619 100644
--- a/en_US.ISO8859-1/articles/fbsd-from-scratch/article.xml
+++ b/en_US.ISO8859-1/articles/fbsd-from-scratch/article.xml
@@ -4,7 +4,7 @@
<!ENTITY scratch.ap "<application>FreeBSD From Scratch</application>">
]>
-<article lang='en'>
+<article xmlns:xi="http://www.w3.org/2001/XInclude" lang='en'>
<articleinfo>
<title>FreeBSD From Scratch</title>
@@ -381,7 +381,7 @@ Do you wish to delete what is left of /var/tmp/temproot.stage1? [no] <userinput>
which you need to modify substantially. The comments give you
enough information what to change.</para>
-<programlisting><inlinegraphic fileref="stage_1.conf.default" format="linespecific"/></programlisting>
+<programlisting><xi:include href="stage_1.conf.default" parse="text"/></programlisting>
<para>Download <ulink
url="stage_1.conf.default"><filename>stage_1.conf.default</filename>
@@ -485,7 +485,7 @@ news inn-stable CONFIGURE_ARGS="--enable-uucp-rnews --enable-setgid-inews"
<filename>LOGDIR/category+port</filename> is created for each port
it actually installs.</para>
-<programlisting><inlinegraphic fileref="stage_2.conf.default" format="linespecific"/></programlisting>
+<programlisting><xi:include href="stage_2.conf.default" parse="text"/></programlisting>
<para>Download <ulink
url="stage_2.conf.default"><filename>stage_2.conf.default</filename></ulink>.</para>
@@ -586,7 +586,7 @@ fi
url="stage_1.sh"><filename>stage_1.sh</filename></ulink>
script, which you should not need to modify.</para>
-<programlisting><inlinegraphic fileref="stage_1.sh" format="linespecific"/></programlisting>
+<programlisting><xi:include href="stage_1.sh" parse="text"/></programlisting>
<para>Download <ulink
url="stage_1.sh"><filename>stage_1.sh</filename></ulink>.</para>
@@ -596,7 +596,7 @@ fi
script. You may want to modify the variables at the
beginning.</para>
-<programlisting><inlinegraphic fileref="stage_2.sh" format="linespecific"/></programlisting>
+<programlisting><xi:include href="stage_2.sh" parse="text"/></programlisting>
<para>Download <ulink
url="stage_2.sh"><filename>stage_2.sh</filename></ulink>.</para>
@@ -605,7 +605,7 @@ fi
url="stage_3.mk"><filename>stage_3.mk</filename></ulink> to
give you an idea how to automate all reconfiguration.</para>
-<programlisting><inlinegraphic fileref="stage_3.mk" format="linespecific"/></programlisting>
+<programlisting><xi:include href="stage_3.mk" parse="text"/></programlisting>
<para>Download <ulink
url="stage_3.mk"><filename>stage_3.mk</filename></ulink>.</para>
diff --git a/en_US.ISO8859-1/articles/pam/article.xml b/en_US.ISO8859-1/articles/pam/article.xml
index 408bc17b34..0bf1ea2848 100644
--- a/en_US.ISO8859-1/articles/pam/article.xml
+++ b/en_US.ISO8859-1/articles/pam/article.xml
@@ -36,7 +36,7 @@
- SUCH DAMAGE.
-->
-<article lang='en'>
+<article xmlns:xi="http://www.w3.org/2001/XInclude" lang='en'>
<articleinfo>
<title>Pluggable Authentication Modules</title>
@@ -1234,8 +1234,7 @@ sshd password required pam_permit.so</programlisting>
starting point, but should not be used in real-world
applications.</para>
-<programlisting><inlinegraphic fileref="pam_app.c"
- format="linespecific"/></programlisting>
+<programlisting><xi:include href="su.c" parse="text"/></programlisting>
</appendix>
<appendix id="pam-sample-module">
@@ -1248,8 +1247,7 @@ sshd password required pam_permit.so</programlisting>
&man.pam.get.authtok.3;, which enormously simplifies prompting
the user for a password.</para>
-<programlisting><inlinegraphic fileref="pam_module.c"
- format="linespecific"/></programlisting>
+<programlisting><xi:include href="pam_unix.c" parse="text"/></programlisting>
</appendix>
<appendix id="pam-sample-conv">
@@ -1265,8 +1263,7 @@ sshd password required pam_permit.so</programlisting>
your uses; we believe it to be as robust as a tty-oriented
conversation function can reasonably get.</para>
-<programlisting><inlinegraphic fileref="pam_conv.c"
- format="linespecific"/></programlisting>
+<programlisting><xi:include href="converse.c" parse="text"/></programlisting>
</appendix>
<bibliography id="pam-further">
diff --git a/es_ES.ISO8859-1/articles/fbsd-from-scratch/article.xml b/es_ES.ISO8859-1/articles/fbsd-from-scratch/article.xml
index 216da1b136..fd0fc8e1d6 100644
--- a/es_ES.ISO8859-1/articles/fbsd-from-scratch/article.xml
+++ b/es_ES.ISO8859-1/articles/fbsd-from-scratch/article.xml
@@ -4,7 +4,7 @@
<!ENTITY scratch.ap "<application>FreeBSD From Scratch</application>">
]>
-<article lang='es'>
+<article xmlns:xi="http://www.w3.org/2001/XInclude" lang='es'>
<articleinfo>
<title>FreeBSD From Scratch</title>
@@ -470,7 +470,8 @@ Do you wish to delete what is left of /var/tmp/temproot.fase1? [no] <userinput>n
dispositivos como corresponda.</para>
</warning>
-<programlisting><inlinegraphic fileref="fase_1.sh" format="linespecific"/></programlisting>
+<programlisting><xi:include href="fase_1.sh" parse="text"
+ encoding="iso-8859-1"/></programlisting>
<para>Descargue <ulink
url="fase_1.sh"><filename>fase_1.sh</filename></ulink>.</para>
@@ -586,7 +587,8 @@ news inn-stable CONFIGURE_ARGS="--enable-uucp-rnews --enable-setgid-inews" make
compartida no olvide copiarlo al sistema nuevo antes de
arrancarlo.</para>
-<programlisting><inlinegraphic fileref="fase_2.sh" format="linespecific"/></programlisting>
+<programlisting><xi:include href="fase_2.sh" parse="text"
+ encoding="iso-8859-1"/></programlisting>
<para>Descargue <ulink
url="fase_2.sh"><filename>fase_2.sh</filename></ulink>.</para>
@@ -624,7 +626,8 @@ news inn-stable CONFIGURE_ARGS="--enable-uucp-rnews --enable-setgid-inews" make
partici�n compartida bien copi�ndolo en alg�n
lugar dentro del nuevo sistema.</para>
-<programlisting><inlinegraphic fileref="fase_3.mk" format="linespecific"/></programlisting>
+<programlisting><xi:include href="fase_3.mk" parse="text"
+ encoding="iso-8859-1"/></programlisting>
<para>Descargue <ulink
url="fase_3.mk"><filename>fase_3.mk</filename></ulink>.</para>
diff --git a/fr_FR.ISO8859-1/articles/pam/article.xml b/fr_FR.ISO8859-1/articles/pam/article.xml
index cc13df1323..f9459e0883 100644
--- a/fr_FR.ISO8859-1/articles/pam/article.xml
+++ b/fr_FR.ISO8859-1/articles/pam/article.xml
@@ -36,7 +36,7 @@
- SUCH DAMAGE.
-->
-<article lang='fr'>
+<article xmlns:xi="http://www.w3.org/2001/XInclude" lang='fr'>
<articleinfo>
<title>Pluggable Authentication Modules</title>
@@ -1218,8 +1218,7 @@ sshd password required pam_permit.so</programlisting>
r�elles.</para>
<programlisting>
-<inlinegraphic fileref="pam_app.c"
- format="linespecific"/>
+<xi:include href="su.c" parse="text"/>
</programlisting>
</appendix>
@@ -1236,8 +1235,7 @@ sshd password required pam_permit.so</programlisting>
<programlisting>
-<inlinegraphic fileref="pam_module.c"
- format="linespecific"/>
+<xi:include href="pam_unix.c" parse="text"/>
</programlisting>
</appendix>
@@ -1256,9 +1254,7 @@ sshd password required pam_permit.so</programlisting>
orient�e tty peut l'�tre.</para>
<programlisting>
-
-<inlinegraphic fileref="pam_conv.c"
- format="linespecific"/>
+<xi:include href="converse.c" parse="text"/>
</programlisting>
</appendix>
diff --git a/ja_JP.eucJP/articles/fbsd-from-scratch/article.xml b/ja_JP.eucJP/articles/fbsd-from-scratch/article.xml
index 0739471fca..e2f4733638 100644
--- a/ja_JP.eucJP/articles/fbsd-from-scratch/article.xml
+++ b/ja_JP.eucJP/articles/fbsd-from-scratch/article.xml
@@ -9,7 +9,7 @@
Original revision: 1.11
-->
-<article lang='ja'>
+<article xmlns:xi="http://www.w3.org/2001/XInclude" lang='ja'>
<articleinfo>
<title>FreeBSD ���������ꤹ��ˤ�</title>
@@ -430,7 +430,9 @@ Do you wish to delete what is left of /var/tmp/temproot.stage1? [no] <userinput>
�ǥХ���̾���ѹ������տ����ԤʤäƤ���������</para>
</warning>
-<programlisting><inlinegraphic fileref="../../../en_US.ISO8859-1/articles/fbsd-from-scratch/stage_1.conf.default" format="linespecific"/></programlisting>
+<programlisting>
+<xi:include href="../../../en_US.ISO8859-1/articles/fbsd-from-scratch/stage_1.conf.default" parse="text"/>
+</programlisting>
<para>�����������: <ulink
url="../../../en_US.ISO8859-1/articles/fbsd-from-scratch/stage_1.conf.default"><filename>stage_1.conf.default</filename>
@@ -536,7 +538,9 @@ news inn-stable CONFIGURE_ARGS="--enable-uucp-rnews --enable-setgid-inews" make
<filename>LOGDIR/category+port</filename>
�Ȥ���̾���Υ����ե����뤬��������ޤ���</para>
-<programlisting><inlinegraphic fileref="../../../en_US.ISO8859-1/articles/fbsd-from-scratch/stage_2.conf.default" format="linespecific"/></programlisting>
+<programlisting>
+<xi:include href="../../../en_US.ISO8859-1/articles/fbsd-from-scratch/stage_2.conf.default" parse="text"/>
+</programlisting>
<para>�����������: <ulink
url="../../../en_US.ISO8859-1/articles/fbsd-from-scratch/stage_2.conf.default"><filename>stage_2.conf.default</filename></ulink>.</para>
@@ -672,7 +676,9 @@ fi
url="../../../en_US.ISO8859-1/articles/fbsd-from-scratch/stage_1.sh"><filename>stage_1.sh</filename></ulink>
������ץȤǤ������Ƥ��ѹ�����ɬ�פϤʤ��Ǥ��礦��</para>
-<programlisting><inlinegraphic fileref="../../../en_US.ISO8859-1/articles/fbsd-from-scratch/stage_1.sh" format="linespecific"/></programlisting>
+<programlisting>
+<xi:include href="../../../en_US.ISO8859-1/articles/fbsd-from-scratch/stage_1.sh" parse="text"/>
+</programlisting>
<para>�����������: <ulink
url="../../../en_US.ISO8859-1/articles/fbsd-from-scratch/stage_1.sh"><filename>stage_1.sh</filename></ulink>.</para>
@@ -681,7 +687,9 @@ fi
url="../../../en_US.ISO8859-1/articles/fbsd-from-scratch/stage_2.sh"><filename>stage_2.sh</filename></ulink>
������ץȤǤ����ǽ����ʬ�ˤ����ѿ����ѹ����ޤ��礦��</para>
-<programlisting><inlinegraphic fileref="../../../en_US.ISO8859-1/articles/fbsd-from-scratch/stage_2.sh" format="linespecific"/></programlisting>
+<programlisting>
+<xi:include href="../../../en_US.ISO8859-1/articles/fbsd-from-scratch/stage_2.sh" parse="text"/>
+</programlisting>
<para>�����������: <ulink
url="../../../en_US.ISO8859-1/articles/fbsd-from-scratch/stage_2.sh"><filename>stage_2.sh</filename></ulink>.</para>
@@ -690,7 +698,9 @@ fi
url="../../../en_US.ISO8859-1/articles/fbsd-from-scratch/stage_3.mk"><filename>stage_3.mk</filename></ulink> �Ǥ���
�����ưŪ�ˤ����ʤ�����μ�����������ޤ���</para>
-<programlisting><inlinegraphic fileref="../../../en_US.ISO8859-1/articles/fbsd-from-scratch/stage_3.mk" format="linespecific"/></programlisting>
+<programlisting>
+<xi:include href="../../../en_US.ISO8859-1/articles/fbsd-from-scratch/stage_3.mk" parse="text"/>
+</programlisting>
<para>�����������: <ulink
url="../../../en_US.ISO8859-1/articles/fbsd-from-scratch/stage_3.mk"><filename>stage_3.mk</filename></ulink>.</para>
diff --git a/ru_RU.KOI8-R/articles/fbsd-from-scratch/article.xml b/ru_RU.KOI8-R/articles/fbsd-from-scratch/article.xml
index 05b7027309..6f801e5da8 100644
--- a/ru_RU.KOI8-R/articles/fbsd-from-scratch/article.xml
+++ b/ru_RU.KOI8-R/articles/fbsd-from-scratch/article.xml
@@ -12,7 +12,7 @@
Original revision: r33355
-->
-<article lang="ru">
+<article xmlns:xi="http://www.w3.org/2001/XInclude" lang="ru">
<articleinfo>
<title>FreeBSD "� ����"</title>
@@ -407,7 +407,9 @@ Do you wish to delete what is left of /var/tmp/temproot.stage1? [no] <userinput>
����� ����������� ��������������. � ������������ ������ ���������� ���������� � ���,
��� ���������� ��������.</para>
- <programlisting><inlinegraphic fileref="stage_1.conf.default" format="linespecific"/></programlisting>
+ <programlisting>
+<xi:include href="../../../en_US.ISO8859-1/articles/fbsd-from-scratch/stage_1.conf.default" parse="text"/>
+ </programlisting>
<para>�������� <ulink url="stage_1.conf.default">
<filename>stage_1.conf.default</filename></ulink>.</para>
@@ -515,7 +517,9 @@ news inn-stable CONFIGURE_ARGS="--enable-uucp-rnews --enable-setgid-inews"
������� �������������� �� ����� ��������� ���� ���������
<filename>LOGDIR/category+port</filename>.</para>
- <programlisting><inlinegraphic fileref="stage_2.conf.default" format="linespecific"/></programlisting>
+ <programlisting>
+<xi:include href="../../../en_US.ISO8859-1/articles/fbsd-from-scratch/stage_1.conf.default" parse="text"/>
+ </programlisting>
<para>�������� <ulink url="stage_2.conf.default">
<filename>stage_2.conf.default</filename></ulink>.</para>
@@ -617,7 +621,9 @@ fi
<filename>stage_1.sh</filename></ulink>, ������� �� �� ������
��������������.</para>
- <programlisting><inlinegraphic fileref="stage_1.sh" format="linespecific"/></programlisting>
+ <programlisting>
+<xi:include href="../../../en_US.ISO8859-1/articles/fbsd-from-scratch/stage_1.conf.default" parse="text"/>
+ </programlisting>
<para>�������� <ulink
url="stage_1.sh"><filename>stage_1.sh</filename></ulink>.</para>
@@ -626,7 +632,9 @@ fi
url="stage_2.sh"><filename>stage_2.sh</filename></ulink>. ��� �����
������������ �������� ���������� � ����� ������ �����.</para>
- <programlisting><inlinegraphic fileref="stage_2.sh" format="linespecific"/></programlisting>
+ <programlisting>
+<xi:include href="../../../en_US.ISO8859-1/articles/fbsd-from-scratch/stage_1.sh" parse="text"/>
+ </programlisting>
<para>�������� <ulink
url="stage_2.sh"><filename>stage_2.sh</filename></ulink>.</para>
@@ -635,7 +643,9 @@ fi
url="stage_3.mk"><filename>stage_3.mk</filename></ulink>, ������� ����
��� ���� � ���, ��� ���������������� ��� ��������� ������������.</para>
- <programlisting><inlinegraphic fileref="stage_3.mk" format="linespecific"/></programlisting>
+ <programlisting>
+<xi:include href="../../../en_US.ISO8859-1/articles/fbsd-from-scratch/stage_1.conf.default" parse="text"/>
+ </programlisting>
<para>�������� <ulink
url="stage_3.mk"><filename>stage_3.mk</filename></ulink>.</para>
diff --git a/ru_RU.KOI8-R/articles/pam/article.xml b/ru_RU.KOI8-R/articles/pam/article.xml
index e481023e04..d10d4b116b 100644
--- a/ru_RU.KOI8-R/articles/pam/article.xml
+++ b/ru_RU.KOI8-R/articles/pam/article.xml
@@ -1272,8 +1272,9 @@ sshd password required pam_permit.so</programlisting>
endterm="pam-sample-conv.title"></link>, ������ � �������� ���������
�����, �� � �������� ����������� �������������� �� �����.</para>
- <programlisting><inlinegraphic fileref="pam_app.c"
- format="linespecific"/></programlisting>
+ <programlisting>
+<xi:include href="../../../en_US.ISO8859-1/articles/pam/su.c" parse="text"/>
+ </programlisting>
</appendix>
<appendix id="pam-sample-module">
@@ -1286,8 +1287,9 @@ sshd password required pam_permit.so</programlisting>
������� &man.pam.get.authtok.3;, ������� ����������� ��������
����������� ����� ������ �������������.</para>
- <programlisting><inlinegraphic fileref="pam_module.c"
- format="linespecific"/></programlisting>
+ <programlisting>
+<xi:include href="../../../en_US.ISO8859-1/articles/pam/pam_unix.c" parse="text"/>
+ </programlisting>
</appendix>
<appendix id="pam-sample-conv">
@@ -1303,8 +1305,9 @@ sshd password required pam_permit.so</programlisting>
�����; �� ��������, ��� ��� ���������� ��ģ��� � �������� �������
��� �������������� � ������������� ������������.</para>
- <programlisting><inlinegraphic fileref="pam_conv.c"
- format="linespecific"/></programlisting>
+ <programlisting>
+<xi:include href="../../../en_US.ISO8859-1/articles/pam/converse.c" parse="text"/>
+ </programlisting>
</appendix>
<bibliography id="pam-further">
diff --git a/share/mk/doc.docbook.mk b/share/mk/doc.docbook.mk
index 878566172d..1fc9c466c8 100644
--- a/share/mk/doc.docbook.mk
+++ b/share/mk/doc.docbook.mk
@@ -149,7 +149,7 @@ DSSSLCATALOG= ${PREFIX}/share/sgml/docbook/dsssl/modular/catalog
COLLATEINDEX= ${PREFIX}/share/sgml/docbook/dsssl/modular/bin/collateindex.pl
-XSLTPROCFLAGS?= --nonet
+XSLTPROCFLAGS?= --nonet --xinclude
XSLXHTML?= ${DOC_PREFIX}/share/xsl/freebsd-xhtml.xsl
XSLXHTMLCHUNK?= ${DOC_PREFIX}/share/xsl/freebsd-xhtml-chunk.xsl
XSLEPUB?= ${DOC_PREFIX}/share/xsl/freebsd-epub.xsl
From 242408c1f196c2478125640a92b4eceae91c8c2a Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Wed, 30 Jan 2013 20:17:43 +0000
Subject: [PATCH 033/121] - Fix some copy-paste bugs
---
da_DK.ISO8859-1/share/xml/catalog.xml | 5 +----
mn_MN.UTF-8/share/xml/catalog.xml | 7 ++-----
pl_PL.ISO8859-2/share/xml/catalog.xml | 5 +----
pt_BR.ISO8859-1/share/xml/catalog.xml | 7 ++-----
4 files changed, 6 insertions(+), 18 deletions(-)
diff --git a/da_DK.ISO8859-1/share/xml/catalog.xml b/da_DK.ISO8859-1/share/xml/catalog.xml
index 34b34af34d..68a49c118f 100644
--- a/da_DK.ISO8859-1/share/xml/catalog.xml
+++ b/da_DK.ISO8859-1/share/xml/catalog.xml
@@ -2,10 +2,7 @@
<!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN"
"http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
-<!-- $FreeBSD$
- $FreeBSDde: de-www/share/xml/catalog.xml,v 1.1 2006/10/19 19:26:11 jkois Exp $
- basiert auf: 1.1
--->
+<!-- $FreeBSD$ -->
<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
<rewriteSystem systemIdStartString="http://www.FreeBSD.org/XML/www/lang/"
diff --git a/mn_MN.UTF-8/share/xml/catalog.xml b/mn_MN.UTF-8/share/xml/catalog.xml
index bc7f459caf..0e9826192d 100644
--- a/mn_MN.UTF-8/share/xml/catalog.xml
+++ b/mn_MN.UTF-8/share/xml/catalog.xml
@@ -2,10 +2,7 @@
<!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN"
"http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
-<!-- $FreeBSD$
- $FreeBSDde: de-www/share/xml/catalog.xml,v 1.1 2006/10/19 19:26:11 jkois Exp $
- basiert auf: 1.1
--->
+<!-- $FreeBSD$ -->
<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
<rewriteSystem systemIdStartString="http://www.FreeBSD.org/XML/www/lang/"
@@ -17,7 +14,7 @@
publicId="-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
uri="entities.ent" />
<public
- publicId="-//FreeBSD//ENTITIES DocBook Translator Entities//DE"
+ publicId="-//FreeBSD//ENTITIES DocBook Translator Entities//MN"
uri="translators.ent" />
<public
publicId="-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
diff --git a/pl_PL.ISO8859-2/share/xml/catalog.xml b/pl_PL.ISO8859-2/share/xml/catalog.xml
index 3e43b419ef..d43f73af53 100644
--- a/pl_PL.ISO8859-2/share/xml/catalog.xml
+++ b/pl_PL.ISO8859-2/share/xml/catalog.xml
@@ -2,10 +2,7 @@
<!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN"
"http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
-<!-- $FreeBSD$
- $FreeBSDde: de-www/share/xml/catalog.xml,v 1.1 2006/10/19 19:26:11 jkois Exp $
- basiert auf: 1.1
--->
+<!-- $FreeBSD$ -->
<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
<rewriteSystem systemIdStartString="http://www.FreeBSD.org/XML/www/lang/"
diff --git a/pt_BR.ISO8859-1/share/xml/catalog.xml b/pt_BR.ISO8859-1/share/xml/catalog.xml
index bc7f459caf..d44a80dbca 100644
--- a/pt_BR.ISO8859-1/share/xml/catalog.xml
+++ b/pt_BR.ISO8859-1/share/xml/catalog.xml
@@ -2,10 +2,7 @@
<!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN"
"http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
-<!-- $FreeBSD$
- $FreeBSDde: de-www/share/xml/catalog.xml,v 1.1 2006/10/19 19:26:11 jkois Exp $
- basiert auf: 1.1
--->
+<!-- $FreeBSD$ -->
<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
<rewriteSystem systemIdStartString="http://www.FreeBSD.org/XML/www/lang/"
@@ -17,7 +14,7 @@
publicId="-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
uri="entities.ent" />
<public
- publicId="-//FreeBSD//ENTITIES DocBook Translator Entities//DE"
+ publicId="-//FreeBSD//ENTITIES DocBook Translator Entities//PT"
uri="translators.ent" />
<public
publicId="-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
From f0af0e2d517bc4e0ccda0a8fbc703f59e4e8112b Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Thu, 31 Jan 2013 09:32:01 +0000
Subject: [PATCH 034/121] - Fix validation in bn_BN
---
bn_BD.ISO10646-1/share/xml/catalog.xml | 16 ++++++++++++++++
bn_BD.ISO10646-1/share/xml/entities.ent | 1 +
2 files changed, 17 insertions(+)
create mode 100644 bn_BD.ISO10646-1/share/xml/catalog.xml
create mode 100644 bn_BD.ISO10646-1/share/xml/entities.ent
diff --git a/bn_BD.ISO10646-1/share/xml/catalog.xml b/bn_BD.ISO10646-1/share/xml/catalog.xml
new file mode 100644
index 0000000000..a3feec86ca
--- /dev/null
+++ b/bn_BD.ISO10646-1/share/xml/catalog.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN"
+ "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
+
+<!-- $FreeBSD$ -->
+
+<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
+ <rewriteSystem systemIdStartString="http://www.FreeBSD.org/XML/www/lang/"
+ rewritePrefix="../../"/>
+ <rewriteURI uriStartString="http://www.FreeBSD.org/XML/www/lang/"
+ rewritePrefix="../../"/>
+
+ <public
+ publicId="-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
+ uri="entities.ent" />
+</catalog>
diff --git a/bn_BD.ISO10646-1/share/xml/entities.ent b/bn_BD.ISO10646-1/share/xml/entities.ent
new file mode 100644
index 0000000000..3eb78e7529
--- /dev/null
+++ b/bn_BD.ISO10646-1/share/xml/entities.ent
@@ -0,0 +1 @@
+<!-- $FreeBSD$ -->
From d891a25dc5393016e3967439dce5ce85324a8faf Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Thu, 31 Jan 2013 09:55:07 +0000
Subject: [PATCH 035/121] - Make sure all source files are ready before
validation - Make sure all source files are ready before building - Clean up
the workarounds from handbook Makefiles
---
de_DE.ISO8859-1/books/handbook/Makefile | 11 -----------
el_GR.ISO8859-7/books/handbook/Makefile | 12 ------------
en_US.ISO8859-1/books/handbook/Makefile | 12 ------------
fr_FR.ISO8859-1/books/handbook/Makefile | 12 ------------
hu_HU.ISO8859-2/books/handbook/Makefile | 12 ------------
it_IT.ISO8859-15/books/handbook/Makefile | 12 ------------
ja_JP.eucJP/books/handbook/Makefile | 11 -----------
mn_MN.UTF-8/books/handbook/Makefile | 12 ------------
nl_NL.ISO8859-1/books/handbook/Makefile | 11 -----------
pl_PL.ISO8859-2/books/handbook/Makefile | 11 -----------
ru_RU.KOI8-R/books/handbook/Makefile | 12 ------------
share/mk/doc.docbook.mk | 4 ++--
zh_CN.GB2312/books/handbook/Makefile | 12 ------------
zh_TW.Big5/books/handbook/Makefile | 12 ------------
14 files changed, 2 insertions(+), 154 deletions(-)
diff --git a/de_DE.ISO8859-1/books/handbook/Makefile b/de_DE.ISO8859-1/books/handbook/Makefile
index 1f459ed8e2..1e9fcbdaf7 100644
--- a/de_DE.ISO8859-1/books/handbook/Makefile
+++ b/de_DE.ISO8859-1/books/handbook/Makefile
@@ -326,16 +326,5 @@ SRCS+= mirrors.lastmod.inc \
mirrors.xml.cvsup.index.inc \
eresources.xml.www.inc \
eresources.xml.www.index.inc
-CLEANFILES+= mirrors.lastmod.inc \
- mirrors.xml.ftp.inc \
- mirrors.xml.ftp.index.inc \
- mirrors.xml.cvsup.inc \
- mirrors.xml.cvsup.index.inc \
- eresources.xml.www.inc \
- eresources.xml.www.index.inc
-
-lint: mirrors.lastmod.inc mirrors.xml.ftp.inc mirrors.xml.ftp.index.inc \
- mirrors.xml.cvsup.inc mirrors.xml.cvsup.index.inc \
- eresources.xml.www.inc eresources.xml.www.index.inc
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/el_GR.ISO8859-7/books/handbook/Makefile b/el_GR.ISO8859-7/books/handbook/Makefile
index 803649118d..843daf88a5 100644
--- a/el_GR.ISO8859-7/books/handbook/Makefile
+++ b/el_GR.ISO8859-7/books/handbook/Makefile
@@ -358,16 +358,4 @@ SRCS+= mirrors.lastmod.inc \
eresources.xml.www.inc \
eresources.xml.www.index.inc
-CLEANFILES+= mirrors.lastmod.inc \
- mirrors.xml.ftp.inc \
- mirrors.xml.ftp.index.inc \
- mirrors.xml.cvsup.inc \
- mirrors.xml.cvsup.index.inc \
- eresources.xml.www.inc \
- eresources.xml.www.index.inc
-
-lint: mirrors.lastmod.inc mirrors.xml.ftp.inc mirrors.xml.ftp.index.inc \
- mirrors.xml.cvsup.inc mirrors.xml.cvsup.index.inc \
- eresources.xml.www.inc eresources.xml.www.index.inc
-
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/en_US.ISO8859-1/books/handbook/Makefile b/en_US.ISO8859-1/books/handbook/Makefile
index 8f09bff7a2..691f66350c 100644
--- a/en_US.ISO8859-1/books/handbook/Makefile
+++ b/en_US.ISO8859-1/books/handbook/Makefile
@@ -355,16 +355,4 @@ SRCS+= mirrors.lastmod.inc \
eresources.xml.www.inc \
eresources.xml.www.index.inc
-SRCS+= mirrors.lastmod.inc \
- mirrors.xml.ftp.inc \
- mirrors.xml.ftp.index.inc \
- mirrors.xml.cvsup.inc \
- mirrors.xml.cvsup.index.inc \
- eresources.xml.www.inc \
- eresources.xml.www.index.inc
-
-lint: mirrors.lastmod.inc mirrors.xml.ftp.inc mirrors.xml.ftp.index.inc \
- mirrors.xml.cvsup.inc mirrors.xml.cvsup.index.inc \
- eresources.xml.www.inc eresources.xml.www.index.inc
-
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/fr_FR.ISO8859-1/books/handbook/Makefile b/fr_FR.ISO8859-1/books/handbook/Makefile
index e301569eff..8663f22dc1 100644
--- a/fr_FR.ISO8859-1/books/handbook/Makefile
+++ b/fr_FR.ISO8859-1/books/handbook/Makefile
@@ -287,16 +287,4 @@ SRCS+= mirrors.lastmod.inc \
eresources.xml.www.inc \
eresources.xml.www.index.inc
-CLEANFILES+= mirrors.lastmod.inc \
- mirrors.xml.ftp.inc \
- mirrors.xml.ftp.index.inc \
- mirrors.xml.cvsup.inc \
- mirrors.xml.cvsup.index.inc \
- eresources.xml.www.inc \
- eresources.xml.www.index.inc
-
-lint: mirrors.lastmod.inc mirrors.xml.ftp.inc mirrors.xml.ftp.index.inc \
- mirrors.xml.cvsup.inc mirrors.xml.cvsup.index.inc \
- eresources.xml.www.inc eresources.xml.www.index.inc
-
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/hu_HU.ISO8859-2/books/handbook/Makefile b/hu_HU.ISO8859-2/books/handbook/Makefile
index dae85bf965..0d112fbd13 100644
--- a/hu_HU.ISO8859-2/books/handbook/Makefile
+++ b/hu_HU.ISO8859-2/books/handbook/Makefile
@@ -320,16 +320,4 @@ SRCS+= mirrors.lastmod.inc \
eresources.xml.www.inc \
eresources.xml.www.index.inc
-CLEANFILES+= mirrors.lastmod.inc \
- mirrors.xml.ftp.inc \
- mirrors.xml.ftp.index.inc \
- mirrors.xml.cvsup.inc \
- mirrors.xml.cvsup.index.inc \
- eresources.xml.www.inc \
- eresources.xml.www.index.inc
-
-lint: mirrors.lastmod.inc mirrors.xml.ftp.inc mirrors.xml.ftp.index.inc \
- mirrors.xml.cvsup.inc mirrors.xml.cvsup.index.inc \
- eresources.xml.www.inc eresources.xml.www.index.inc
-
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/it_IT.ISO8859-15/books/handbook/Makefile b/it_IT.ISO8859-15/books/handbook/Makefile
index 1d0287b18e..6bed57bf25 100644
--- a/it_IT.ISO8859-15/books/handbook/Makefile
+++ b/it_IT.ISO8859-15/books/handbook/Makefile
@@ -288,16 +288,4 @@ SRCS+= mirrors.lastmod.inc \
eresources.xml.www.inc \
eresources.xml.www.index.inc
-CLEANFILES+= mirrors.lastmod.inc \
- mirrors.xml.ftp.inc \
- mirrors.xml.ftp.index.inc \
- mirrors.xml.cvsup.inc \
- mirrors.xml.cvsup.index.inc \
- eresources.xml.www.inc \
- eresources.xml.www.index.inc
-
-lint: mirrors.lastmod.inc mirrors.xml.ftp.inc mirrors.xml.ftp.index.inc \
- mirrors.xml.cvsup.inc mirrors.xml.cvsup.index.inc \
- eresources.xml.www.inc eresources.xml.www.index.inc
-
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/ja_JP.eucJP/books/handbook/Makefile b/ja_JP.eucJP/books/handbook/Makefile
index 25b9a8b818..2ad890a69b 100644
--- a/ja_JP.eucJP/books/handbook/Makefile
+++ b/ja_JP.eucJP/books/handbook/Makefile
@@ -361,15 +361,4 @@ SRCS+= mirrors.lastmod.inc \
eresources.xml.www.inc \
eresources.xml.www.index.inc
-CLEANFILES+= mirrors.lastmod.inc \
- mirrors.xml.ftp.inc \
- mirrors.xml.ftp.index.inc \
- mirrors.xml.cvsup.inc \
- mirrors.xml.cvsup.index.inc \
- eresources.xml.www.inc \
- eresources.xml.www.index.inc
-
-lint: mirrors.lastmod.inc mirrors.xml.ftp.inc mirrors.xml.ftp.index.inc \
- mirrors.xml.cvsup.inc mirrors.xml.cvsup.index.inc \
- eresources.xml.www.inc eresources.xml.www.index.inc
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/mn_MN.UTF-8/books/handbook/Makefile b/mn_MN.UTF-8/books/handbook/Makefile
index 2676cbbd6d..8f5a787732 100644
--- a/mn_MN.UTF-8/books/handbook/Makefile
+++ b/mn_MN.UTF-8/books/handbook/Makefile
@@ -358,16 +358,4 @@ SRCS+= mirrors.lastmod.inc \
eresources.xml.www.inc \
eresources.xml.www.index.inc
-CLEANFILES+= mirrors.lastmod.inc \
- mirrors.xml.ftp.inc \
- mirrors.xml.ftp.index.inc \
- mirrors.xml.cvsup.inc \
- mirrors.xml.cvsup.index.inc \
- eresources.xml.www.inc \
- eresources.xml.www.index.inc
-
-lint: mirrors.lastmod.inc mirrors.xml.ftp.inc mirrors.xml.ftp.index.inc \
- mirrors.xml.cvsup.inc mirrors.xml.cvsup.index.inc \
- eresources.xml.www.inc eresources.xml.www.index.inc
-
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/nl_NL.ISO8859-1/books/handbook/Makefile b/nl_NL.ISO8859-1/books/handbook/Makefile
index 46a034c392..fb101b3ce9 100644
--- a/nl_NL.ISO8859-1/books/handbook/Makefile
+++ b/nl_NL.ISO8859-1/books/handbook/Makefile
@@ -358,15 +358,4 @@ SRCS+= mirrors.lastmod.inc \
eresources.xml.www.inc \
eresources.xml.www.index.inc
-CLEANFILES+= mirrors.lastmod.inc \
- mirrors.xml.ftp.inc \
- mirrors.xml.ftp.index.inc \
- mirrors.xml.cvsup.inc \
- mirrors.xml.cvsup.index.inc \
- eresources.xml.www.inc \
- eresources.xml.www.index.inc
-
-lint: mirrors.lastmod.inc mirrors.xml.ftp.inc mirrors.xml.ftp.index.inc \
- mirrors.xml.cvsup.inc mirrors.xml.cvsup.index.inc \
- eresources.xml.www.inc eresources.xml.www.index.inc
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/pl_PL.ISO8859-2/books/handbook/Makefile b/pl_PL.ISO8859-2/books/handbook/Makefile
index f71bce96a9..65f970104e 100644
--- a/pl_PL.ISO8859-2/books/handbook/Makefile
+++ b/pl_PL.ISO8859-2/books/handbook/Makefile
@@ -256,15 +256,4 @@ SRCS+= mirrors.lastmod.inc \
eresources.xml.www.inc \
eresources.xml.www.index.inc
-CLEANFILES+= mirrors.lastmod.inc \
- mirrors.xml.ftp.inc \
- mirrors.xml.ftp.index.inc \
- mirrors.xml.cvsup.inc \
- mirrors.xml.cvsup.index.inc \
- eresources.xml.www.inc \
- eresources.xml.www.index.inc
-
-lint: mirrors.lastmod.inc mirrors.xml.ftp.inc mirrors.xml.ftp.index.inc \
- mirrors.xml.cvsup.inc mirrors.xml.cvsup.index.inc \
- eresources.xml.www.inc eresources.xml.www.index.inc
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/ru_RU.KOI8-R/books/handbook/Makefile b/ru_RU.KOI8-R/books/handbook/Makefile
index 6ab253ac4d..db8c914aac 100644
--- a/ru_RU.KOI8-R/books/handbook/Makefile
+++ b/ru_RU.KOI8-R/books/handbook/Makefile
@@ -264,16 +264,4 @@ SRCS+= mirrors.lastmod.inc \
eresources.xml.www.inc \
eresources.xml.www.index.inc
-CLEANFILES+= mirrors.lastmod.inc \
- mirrors.xml.ftp.inc \
- mirrors.xml.ftp.index.inc \
- mirrors.xml.cvsup.inc \
- mirrors.xml.cvsup.index.inc \
- eresources.xml.www.inc \
- eresources.xml.www.index.inc
-
-lint: mirrors.lastmod.inc mirrors.xml.ftp.inc mirrors.xml.ftp.index.inc \
- mirrors.xml.cvsup.inc mirrors.xml.cvsup.index.inc \
- eresources.xml.www.inc eresources.xml.www.index.inc
-
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/share/mk/doc.docbook.mk b/share/mk/doc.docbook.mk
index 1fc9c466c8..0b8ceb0e1e 100644
--- a/share/mk/doc.docbook.mk
+++ b/share/mk/doc.docbook.mk
@@ -454,7 +454,7 @@ GEN_INDEX_SGML_CMD?= @${ECHO} "Index is disabled or no index to generate."
.MAIN: all
-all: ${_docs}
+all: ${SRCS} ${_docs}
# put languages which have a problem on rendering printable formats
# by using TeX to NO_TEX_LANG.
@@ -668,7 +668,7 @@ ${DOC}.${_curformat}:
# having to convert it to any other formats
#
-lint validate:
+lint validate: ${SRCS}
${XMLLINT} --catalogs --nonet --noout --noent --valid ${MASTERDOC}
# ------------------------------------------------------------------------
diff --git a/zh_CN.GB2312/books/handbook/Makefile b/zh_CN.GB2312/books/handbook/Makefile
index 9029f3c43d..002ffb24f8 100644
--- a/zh_CN.GB2312/books/handbook/Makefile
+++ b/zh_CN.GB2312/books/handbook/Makefile
@@ -312,16 +312,4 @@ SRCS+= mirrors.lastmod.inc \
eresources.xml.www.inc \
eresources.xml.www.index.inc
-CLEANFILES+= mirrors.lastmod.inc \
- mirrors.xml.ftp.inc \
- mirrors.xml.ftp.index.inc \
- mirrors.xml.cvsup.inc \
- mirrors.xml.cvsup.index.inc \
- eresources.xml.www.inc \
- eresources.xml.www.index.inc
-
-lint: mirrors.lastmod.inc mirrors.xml.ftp.inc mirrors.xml.ftp.index.inc \
- mirrors.xml.cvsup.inc mirrors.xml.cvsup.index.inc \
- eresources.xml.www.inc eresources.xml.www.index.inc
-
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/zh_TW.Big5/books/handbook/Makefile b/zh_TW.Big5/books/handbook/Makefile
index 0b8bb98633..86d6a538c6 100644
--- a/zh_TW.Big5/books/handbook/Makefile
+++ b/zh_TW.Big5/books/handbook/Makefile
@@ -300,16 +300,4 @@ SRCS+= mirrors.lastmod.inc \
eresources.xml.www.inc \
eresources.xml.www.index.inc
-CLEANFILES+= mirrors.lastmod.inc \
- mirrors.xml.ftp.inc \
- mirrors.xml.ftp.index.inc \
- mirrors.xml.cvsup.inc \
- mirrors.xml.cvsup.index.inc \
- eresources.xml.www.inc \
- eresources.xml.www.index.inc
-
-lint: mirrors.lastmod.inc mirrors.xml.ftp.inc mirrors.xml.ftp.index.inc \
- mirrors.xml.cvsup.inc mirrors.xml.cvsup.index.inc \
- eresources.xml.www.inc eresources.xml.www.index.inc
-
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
From 2a1cbc680d04f7969da4afe33b331a96c3c317a8 Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Thu, 31 Jan 2013 10:15:46 +0000
Subject: [PATCH 036/121] - Add epub to KNOWN_FORMATS
---
share/mk/doc.docbook.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/share/mk/doc.docbook.mk b/share/mk/doc.docbook.mk
index 0b8ceb0e1e..90badc5e47 100644
--- a/share/mk/doc.docbook.mk
+++ b/share/mk/doc.docbook.mk
@@ -168,7 +168,7 @@ JADEOPTS= ${JADEFLAGS} ${SGMLFLAGS} ${CATALOGS}
XSLTPROCOPTS= ${XSLTPROCFLAGS}
KNOWN_FORMATS= html html.tar html-split html-split.tar \
- txt rtf ps pdf tex dvi tar pdb
+ epub txt rtf ps pdf tex dvi tar pdb
CSS_SHEET?= ${DOC_PREFIX}/share/misc/docbook.css
PDFTEX_DEF?= ${DOC_PREFIX}/share/web2c/pdftex.def
From 249ab2480a77fae71c10849fb06df31b97f2061c Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Thu, 31 Jan 2013 10:27:59 +0000
Subject: [PATCH 037/121] - Add experimental support for FOP-based PDF and PS
rendering
---
share/mk/doc.docbook.mk | 25 +++++++++++++++++++++++--
1 file changed, 23 insertions(+), 2 deletions(-)
diff --git a/share/mk/doc.docbook.mk b/share/mk/doc.docbook.mk
index 90badc5e47..bae8e4222d 100644
--- a/share/mk/doc.docbook.mk
+++ b/share/mk/doc.docbook.mk
@@ -113,6 +113,9 @@ MASTERDOC?= ${.CURDIR}/${DOC}.xml
# List of supported SP_ENCODINGs
SP_ENCODING_LIST?= ISO-8859-2 KOI8-R
+# Either jade or fop
+PDFENGINE?= jade
+
.if defined(SPELLCHECK)
DSLHTML?= ${DOC_PREFIX}/share/xml/spellcheck.dsl
.endif
@@ -136,6 +139,9 @@ JADE_ENV+= SP_ENCODING=${SP_ENCODING}
.endif
JADE_CMD= ${SETENV} ${JADE_ENV} ${JADE}
+FOP?= ${PREFIX}/bin/fop
+FOPOPTS?=
+
DSLHTML?= ${DOC_PREFIX}/share/xml/default.dsl
DSLPRINT?= ${DOC_PREFIX}/share/xml/default.dsl
DSLPGP?= ${DOC_PREFIX}/share/xml/pgp.dsl
@@ -370,14 +376,15 @@ CLEANFILES+= ${DOC}.rtf-nopng
CLEANFILES+= ${DOC}.aux ${DOC}.log
.elif ${_cf} == "ps"
-CLEANFILES+= ${DOC}.aux ${DOC}.dvi ${DOC}.log ${DOC}.out ${DOC}.tex-ps ${DOC}.tex ${DOC}.tex-tmp
+CLEANFILES+= ${DOC}.aux ${DOC}.dvi ${DOC}.log ${DOC}.out ${DOC}.tex-ps \
+ ${DOC}.tex ${DOC}.tex-tmp ${DOC}.fo
.for _curimage in ${LOCAL_IMAGES_EPS:M*share*}
CLEANFILES+= ${_curimage:T} ${_curimage:H:T}/${_curimage:T}
.endfor
.elif ${_cf} == "pdf"
CLEANFILES+= ${DOC}.aux ${DOC}.dvi ${DOC}.log ${DOC}.out ${DOC}.tex-pdf ${DOC}.tex-pdf-tmp \
- ${DOC}.tex
+ ${DOC}.tex ${DOC}.fo
.for _curimage in ${IMAGES_PDF:M*share*}
CLEANFILES+= ${_curimage:T} ${_curimage:H:T}/${_curimage:T}
.endfor
@@ -564,6 +571,7 @@ ${DOC}.rtf:
# PS/PDF -----------------------------------------------------------------
+.if ${PDFENGINE} == "jade"
.if !defined(NO_TEX)
#
# This sucks, but there's no way round it. The PS and PDF formats need
@@ -643,6 +651,19 @@ ${DOC}.tex-pdf:
.endif
.endif
+.elif ${PDFENGINE} == "fop"
+${DOC}.fo: ${DOC}.xml ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG}
+ ${GEN_INDEX_SGML_CMD}
+ ${XSLTPROC} ${XSLTPROCOPTS} ${XSLFO} ${DOC}.xml > ${.TARGET}
+
+${DOC}.pdf: ${DOC}.fo ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG}
+ ${FOP} ${FOPOPTS} ${DOC}.fo ${.TARGET}
+
+${DOC}.ps: ${DOC}.fo ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG}
+ ${FOP} ${FOPOPTS} ${DOC}.fo ${.TARGET}
+
+.endif
+
${DOC}.tar: ${SRCS} ${LOCAL_IMAGES} ${LOCAL_CSS_SHEET}
${TAR} cf ${.TARGET} -C ${.CURDIR} ${SRCS} \
-C ${.OBJDIR} ${IMAGES} ${CSS_SHEET:T}
From b92622d0e72403970116a0d7392f45ea7d9bcc21 Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Thu, 31 Jan 2013 10:30:41 +0000
Subject: [PATCH 038/121] - Suppress pubdate output since it usually leads to
duplicated $FreeBSD$ keywords in the output
---
share/xsl/freebsd-common.xsl | 2 ++
1 file changed, 2 insertions(+)
diff --git a/share/xsl/freebsd-common.xsl b/share/xsl/freebsd-common.xsl
index 52f2d9c519..12c9d0cdde 100644
--- a/share/xsl/freebsd-common.xsl
+++ b/share/xsl/freebsd-common.xsl
@@ -12,6 +12,8 @@
<xsl:call-template name="inline.monoseq"/>
</xsl:template>
+ <xsl:template match="pubdate"/>
+
<xsl:param name="toc.section.depth" select="1"/>
<xsl:param name="section.autolabel" select="1"/>
<xsl:param name="section.label.includes.component.label" select="1"/>
From f52cae8f60c8592def27726317a8d64f9ea80f4d Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Thu, 31 Jan 2013 22:48:54 +0000
Subject: [PATCH 039/121] - Minor entity cleanup
---
pt_BR.ISO8859-1/share/xml/catalog | 2 +-
share/xml/catalog | 3 ---
share/xml/entities.ent | 22 ----------------------
3 files changed, 1 insertion(+), 26 deletions(-)
delete mode 100644 share/xml/entities.ent
diff --git a/pt_BR.ISO8859-1/share/xml/catalog b/pt_BR.ISO8859-1/share/xml/catalog
index 81fb8e8799..cb8704f8d9 100644
--- a/pt_BR.ISO8859-1/share/xml/catalog
+++ b/pt_BR.ISO8859-1/share/xml/catalog
@@ -13,7 +13,7 @@
-- $FreeBSD$
--
-PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//PT"
+PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
"entities.ent"
PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
diff --git a/share/xml/catalog b/share/xml/catalog
index 524dd812dc..e5f8f771c1 100644
--- a/share/xml/catalog
+++ b/share/xml/catalog
@@ -38,9 +38,6 @@ PUBLIC "-//FreeBSD//DOCUMENT DocBook Common Stylesheet//EN"
PUBLIC "-//FreeBSD//DOCUMENT DocBook Common Lanugage Neutral Stylesheet//EN"
"freebsd-common.dsl"
-PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
- "entities.ent"
-
PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN"
"authors.ent"
diff --git a/share/xml/entities.ent b/share/xml/entities.ent
deleted file mode 100644
index e02fd438f9..0000000000
--- a/share/xml/entities.ent
+++ /dev/null
@@ -1,22 +0,0 @@
-<!-- $FreeBSD$ -->
-
-<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN">
-%l10n;
-<!ENTITY % l10n-common PUBLIC "-//FreeBSD//ENTITIES DocBook Language Neutral Entities//EN">
-%l10n-common;
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
-%man;
-<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
-%freebsd;
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
-%authors;
-<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EN">
-%teams;
-<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN">
-%mailing-lists;
-<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EN">
-%newsgroups;
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
-%trademarks;
-<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN">
-%urls;
From af7381742b95a92cd69ad77de0da6fc03219e207 Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Fri, 1 Feb 2013 09:03:01 +0000
Subject: [PATCH 040/121] - Move language-independent entities directly to the
DTD
---
da_DK.ISO8859-1/share/xml/entities.ent | 6 ------
de_DE.ISO8859-1/share/xml/entities.ent | 6 ------
el_GR.ISO8859-7/share/xml/entities.ent | 6 ------
en_US.ISO8859-1/share/xml/entities.ent | 6 ------
es_ES.ISO8859-1/share/xml/entities.ent | 6 ------
fr_FR.ISO8859-1/share/xml/entities.ent | 6 ------
hu_HU.ISO8859-2/share/xml/entities.ent | 6 ------
it_IT.ISO8859-15/share/xml/entities.ent | 6 ------
ja_JP.eucJP/share/xml/entities.ent | 6 ------
mn_MN.UTF-8/share/xml/entities.ent | 6 ------
nl_NL.ISO8859-1/share/xml/entities.ent | 6 ------
pl_PL.ISO8859-2/share/xml/entities.ent | 6 ------
pt_BR.ISO8859-1/share/xml/entities.ent | 6 ------
ru_RU.KOI8-R/share/xml/entities.ent | 6 ------
share/xml/freebsd45.dtd | 12 +++++++++++-
sr_YU.ISO8859-2/share/xml/entities.ent | 6 ------
tr_TR.ISO8859-9/share/xml/entities.ent | 6 ------
zh_CN.GB2312/share/xml/entities.ent | 6 ------
zh_TW.Big5/share/xml/entities.ent | 6 ------
19 files changed, 11 insertions(+), 109 deletions(-)
diff --git a/da_DK.ISO8859-1/share/xml/entities.ent b/da_DK.ISO8859-1/share/xml/entities.ent
index c7853679a4..f59c2fe83c 100644
--- a/da_DK.ISO8859-1/share/xml/entities.ent
+++ b/da_DK.ISO8859-1/share/xml/entities.ent
@@ -1,12 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<!-- $FreeBSD$ -->
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN"
- "nonexistent">
-%authors;
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN"
- "nonexistent">
-%man;
<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
"nonexistent">
%freebsd;
diff --git a/de_DE.ISO8859-1/share/xml/entities.ent b/de_DE.ISO8859-1/share/xml/entities.ent
index 5061a702fe..d1c5b456a2 100644
--- a/de_DE.ISO8859-1/share/xml/entities.ent
+++ b/de_DE.ISO8859-1/share/xml/entities.ent
@@ -4,18 +4,12 @@
basiert auf: 1.1
-->
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN"
- "nonexistent">
-%man;
<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
"nonexistent">
%freebsd;
<!ENTITY % translators PUBLIC "-//FreeBSD//ENTITIES DocBook Translator Entities//DE"
"translators.ent">
%translators;
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN"
- "nonexistent">
-%authors;
<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EN"
"nonexistent">
%teams;
diff --git a/el_GR.ISO8859-7/share/xml/entities.ent b/el_GR.ISO8859-7/share/xml/entities.ent
index 46e60f1b7d..7a156813e3 100644
--- a/el_GR.ISO8859-7/share/xml/entities.ent
+++ b/el_GR.ISO8859-7/share/xml/entities.ent
@@ -28,9 +28,6 @@
<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EL"
"newsgroups.ent">
%newsgroups;
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN"
- "nonexistent">
-%man;
<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//EL"
"glossary.ent">
%glossary;
@@ -45,9 +42,6 @@
<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
"nonexistent">
%freebsd;
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN"
- "nonexistent">
-%authors;
<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EL"
"teams.ent">
%teams;
diff --git a/en_US.ISO8859-1/share/xml/entities.ent b/en_US.ISO8859-1/share/xml/entities.ent
index b84c1cdbf8..e5a3813abe 100644
--- a/en_US.ISO8859-1/share/xml/entities.ent
+++ b/en_US.ISO8859-1/share/xml/entities.ent
@@ -3,18 +3,12 @@
<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
"l10n.ent">
%l10n;
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN"
- "../../../share/xml/man-refs.ent">
-%man;
<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
"../../../share/xml/freebsd.ent">
%freebsd;
<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//EN"
"glossary.ent">
%glossary;
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN"
- "../../../share/xml/authors.ent">
-%authors;
<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EN"
"teams.ent">
%teams;
diff --git a/es_ES.ISO8859-1/share/xml/entities.ent b/es_ES.ISO8859-1/share/xml/entities.ent
index 11499c8a0a..a651859d38 100644
--- a/es_ES.ISO8859-1/share/xml/entities.ent
+++ b/es_ES.ISO8859-1/share/xml/entities.ent
@@ -5,15 +5,9 @@
<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
"l10n.ent">
%l10n;
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN"
- "nonexistent">
-%man;
<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
"nonexistent">
%freebsd;
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN"
- "nonexistent">
-%authors;
<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//ES"
"teams.ent">
%teams;
diff --git a/fr_FR.ISO8859-1/share/xml/entities.ent b/fr_FR.ISO8859-1/share/xml/entities.ent
index 30ac9f08ed..fd5cf3bbea 100644
--- a/fr_FR.ISO8859-1/share/xml/entities.ent
+++ b/fr_FR.ISO8859-1/share/xml/entities.ent
@@ -17,15 +17,9 @@
<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//FR"
"newsgroups.ent">
%newsgroups;
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN"
- "nonexistent">
-%man;
<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
"nonexistent">
%freebsd;
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN"
- "nonexistent">
-%authors;
<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//FR"
"glossary.ent">
%glossary;
diff --git a/hu_HU.ISO8859-2/share/xml/entities.ent b/hu_HU.ISO8859-2/share/xml/entities.ent
index 9cd4155b4f..97b921021f 100644
--- a/hu_HU.ISO8859-2/share/xml/entities.ent
+++ b/hu_HU.ISO8859-2/share/xml/entities.ent
@@ -8,15 +8,9 @@
<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
"l10n.ent">
%l10n;
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN"
- "nonexistent">
-%man;
<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//HU"
"freebsd.ent">
%freebsd;
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN"
- "nonexistent">
-%authors;
<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//HU"
"teams.ent">
%teams;
diff --git a/it_IT.ISO8859-15/share/xml/entities.ent b/it_IT.ISO8859-15/share/xml/entities.ent
index c4b4a9e7e5..5b4e18e7e0 100644
--- a/it_IT.ISO8859-15/share/xml/entities.ent
+++ b/it_IT.ISO8859-15/share/xml/entities.ent
@@ -7,15 +7,9 @@
<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
"l10n.ent">
%l10n;
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN"
- "nonexistent">
-%man;
<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
"nonexistent">
%freebsd;
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN"
- "nonexistent">
-%authors;
<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EN"
"nonexistent">
%teams;
diff --git a/ja_JP.eucJP/share/xml/entities.ent b/ja_JP.eucJP/share/xml/entities.ent
index ef5b26f204..1450780b91 100644
--- a/ja_JP.eucJP/share/xml/entities.ent
+++ b/ja_JP.eucJP/share/xml/entities.ent
@@ -3,18 +3,12 @@
<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
"l10n.ent">
%l10n;
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN"
- "nonexistent">
-%man;
<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
"nonexistent">
%freebsd;
<!ENTITY % authors-ja PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//JA"
"authors.ent">
%authors-ja;
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN"
- "nonexistent">
-%authors;
<!ENTITY % teams-ja PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//JA"
"teams.ent">
%teams-ja;
diff --git a/mn_MN.UTF-8/share/xml/entities.ent b/mn_MN.UTF-8/share/xml/entities.ent
index ca664ee908..a7528cc690 100644
--- a/mn_MN.UTF-8/share/xml/entities.ent
+++ b/mn_MN.UTF-8/share/xml/entities.ent
@@ -6,15 +6,9 @@
$FreeBSD$
-->
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN"
- "nonexistent">
-%man;
<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
"nonexistent">
%freebsd;
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN"
- "nonexistent">
-%authors;
<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//MN"
"teams.ent">
%teams;
diff --git a/nl_NL.ISO8859-1/share/xml/entities.ent b/nl_NL.ISO8859-1/share/xml/entities.ent
index bd9c5e799f..d411d34cb3 100644
--- a/nl_NL.ISO8859-1/share/xml/entities.ent
+++ b/nl_NL.ISO8859-1/share/xml/entities.ent
@@ -6,15 +6,9 @@
%SRCID% 39534
-->
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN"
- "nonexistent">
-%man;
<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
"nonexistent">
%freebsd;
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN"
- "nonexistent">
-%authors;
<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//NL"
"teams.ent">
%teams;
diff --git a/pl_PL.ISO8859-2/share/xml/entities.ent b/pl_PL.ISO8859-2/share/xml/entities.ent
index 7ec7b52fc2..8c3ea6368a 100644
--- a/pl_PL.ISO8859-2/share/xml/entities.ent
+++ b/pl_PL.ISO8859-2/share/xml/entities.ent
@@ -8,15 +8,9 @@
<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
"l10n.ent">
%l10n;
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN"
- "nonexistent">
-%man;
<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
"nonexistent">
%freebsd;
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN"
- "nonexistent">
-%authors;
<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//PL"
"teams.ent">
%teams;
diff --git a/pt_BR.ISO8859-1/share/xml/entities.ent b/pt_BR.ISO8859-1/share/xml/entities.ent
index 6460afbca2..6776d9dcae 100644
--- a/pt_BR.ISO8859-1/share/xml/entities.ent
+++ b/pt_BR.ISO8859-1/share/xml/entities.ent
@@ -1,12 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<!-- $FreeBSD$ -->
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN"
- "nonexistent">
-%authors;
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN"
- "nonexistent">
-%man;
<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
"nonexistent">
%freebsd;
diff --git a/ru_RU.KOI8-R/share/xml/entities.ent b/ru_RU.KOI8-R/share/xml/entities.ent
index 40caa1f4c0..ee50a6be6e 100644
--- a/ru_RU.KOI8-R/share/xml/entities.ent
+++ b/ru_RU.KOI8-R/share/xml/entities.ent
@@ -7,15 +7,9 @@
Original revision: 1.1 (doc/share/xml)
-->
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN"
- "nonexistent">
-%man;
<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
"nonexistent">
%freebsd;
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN"
- "nonexistent">
-%authors;
<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//RU"
"teams.ent">
%teams;
diff --git a/share/xml/freebsd45.dtd b/share/xml/freebsd45.dtd
index 92bd9468bc..a062247c67 100644
--- a/share/xml/freebsd45.dtd
+++ b/share/xml/freebsd45.dtd
@@ -3,6 +3,8 @@
<!ENTITY % output.print "IGNORE"> <!-- Print output is being generated -->
<!ENTITY % output.print.pdf "IGNORE"> <!-- PDF output -->
+<!ENTITY % jade.compat "IGNORE">
+
<!ENTITY % local.tech.char.class "|hostid|username|groupname|devicename|maketarget|makevar|svnref">
<!ENTITY % filename.element "IGNORE">
@@ -13,8 +15,16 @@
"/usr/local/share/xml/docbook/4.5/docbookx.dtd">
%orig-docbook;
+<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN"
+ "authors.ent">
+%authors;
+
+<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN"
+ "man-refs.ent">
+%man;
+
<!ENTITY % orig-entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
- "nonexistent">
+ "entities.ent">
%orig-entities;
<!ELEMENT hostid (%cptr.char.mix;)*>
diff --git a/sr_YU.ISO8859-2/share/xml/entities.ent b/sr_YU.ISO8859-2/share/xml/entities.ent
index a92856522b..04c582d0f3 100644
--- a/sr_YU.ISO8859-2/share/xml/entities.ent
+++ b/sr_YU.ISO8859-2/share/xml/entities.ent
@@ -1,12 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<!-- $FreeBSD$ -->
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN"
- "nonexistent">
-%authors;
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN"
- "nonexistent">
-%man;
<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
"nonexistent">
%freebsd;
diff --git a/tr_TR.ISO8859-9/share/xml/entities.ent b/tr_TR.ISO8859-9/share/xml/entities.ent
index a92856522b..04c582d0f3 100644
--- a/tr_TR.ISO8859-9/share/xml/entities.ent
+++ b/tr_TR.ISO8859-9/share/xml/entities.ent
@@ -1,12 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<!-- $FreeBSD$ -->
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN"
- "nonexistent">
-%authors;
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN"
- "nonexistent">
-%man;
<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
"nonexistent">
%freebsd;
diff --git a/zh_CN.GB2312/share/xml/entities.ent b/zh_CN.GB2312/share/xml/entities.ent
index cd2064caef..ac85e86b8c 100644
--- a/zh_CN.GB2312/share/xml/entities.ent
+++ b/zh_CN.GB2312/share/xml/entities.ent
@@ -3,9 +3,6 @@
<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
"l10n.ent">
%l10n;
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN"
- "nonexistent">
-%man;
<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
"nonexistent">
%freebsd;
@@ -15,9 +12,6 @@
<!ENTITY % authors.in.author.tag.cn PUBLIC "-//FreeBSD//ENTITIES DocBook Author In Author Tag Entities//ZH"
"authors-in-author-tag.ent">
%authors.in.author.tag.cn;
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN"
- "nonexistent">
-%authors;
<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//ZH"
"teams.ent">
%teams;
diff --git a/zh_TW.Big5/share/xml/entities.ent b/zh_TW.Big5/share/xml/entities.ent
index 24ec0e64ba..3bf1002aee 100644
--- a/zh_TW.Big5/share/xml/entities.ent
+++ b/zh_TW.Big5/share/xml/entities.ent
@@ -3,18 +3,12 @@
<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
"l10n.ent">
%l10n;
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN"
- "nonexistent">
-%man;
<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
"nonexistent">
%freebsd;
<!ENTITY % authors.cn PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//ZH"
"authors.ent">
%authors.cn;
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN"
- "nonexistent">
-%authors;
<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EN"
"nonexistent">
%teams;
From 9162098876d03248ffd1f51600efbd5d4b55aaaa Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Fri, 1 Feb 2013 09:18:30 +0000
Subject: [PATCH 041/121] - Parse the documents with XML tools before passing
them to Jade and turn off Jade validation. This will let us keep using
Jade for printed output rendering and dropping old SGML constructs at the
same time.
---
share/mk/doc.docbook.mk | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
diff --git a/share/mk/doc.docbook.mk b/share/mk/doc.docbook.mk
index bae8e4222d..90d8f2863a 100644
--- a/share/mk/doc.docbook.mk
+++ b/share/mk/doc.docbook.mk
@@ -170,7 +170,7 @@ CATALOGS+= -c ${c}
.endif
.endfor
SGMLFLAGS+= -D ${IMAGES_EN_DIR}/${DOC}s/${.CURDIR:T} -D ${CANONICALOBJDIR}
-JADEOPTS= ${JADEFLAGS} ${SGMLFLAGS} ${CATALOGS}
+JADEOPTS= -w no-valid ${JADEFLAGS} ${SGMLFLAGS}
XSLTPROCOPTS= ${XSLTPROCFLAGS}
KNOWN_FORMATS= html html.tar html-split html-split.tar \
@@ -377,14 +377,14 @@ CLEANFILES+= ${DOC}.aux ${DOC}.log
.elif ${_cf} == "ps"
CLEANFILES+= ${DOC}.aux ${DOC}.dvi ${DOC}.log ${DOC}.out ${DOC}.tex-ps \
- ${DOC}.tex ${DOC}.tex-tmp ${DOC}.fo
+ ${DOC}.tex ${DOC}.tex-tmp ${DOC}.fo ${DOC}.parsed.xml
.for _curimage in ${LOCAL_IMAGES_EPS:M*share*}
CLEANFILES+= ${_curimage:T} ${_curimage:H:T}/${_curimage:T}
.endfor
.elif ${_cf} == "pdf"
CLEANFILES+= ${DOC}.aux ${DOC}.dvi ${DOC}.log ${DOC}.out ${DOC}.tex-pdf ${DOC}.tex-pdf-tmp \
- ${DOC}.tex ${DOC}.fo
+ ${DOC}.tex ${DOC}.fo ${DOC}.parsed.xml
.for _curimage in ${IMAGES_PDF:M*share*}
CLEANFILES+= ${_curimage:T} ${_curimage:H:T}/${_curimage:T}
.endfor
@@ -572,6 +572,10 @@ ${DOC}.rtf:
# PS/PDF -----------------------------------------------------------------
.if ${PDFENGINE} == "jade"
+
+${DOC}.parsed.xml: ${SRCS}
+ ${XMLLINT} --catalogs --nonet --noent --valid --dropdtd ${MASTERDOC} > ${.TARGET}
+
.if !defined(NO_TEX)
#
# This sucks, but there's no way round it. The PS and PDF formats need
@@ -581,22 +585,23 @@ ${DOC}.rtf:
#
${DOC}.tex: ${SRCS} ${LOCAL_IMAGES_EPS} ${PRINT_INDEX} \
- ${LOCAL_IMAGES_TXT} ${LOCAL_IMAGES_EN}
+ ${LOCAL_IMAGES_TXT} ${LOCAL_IMAGES_EN} \
+ ${DOC}.parsed.xml
${GEN_INDEX_SGML_CMD}
${JADE_CMD} -V tex-backend ${PRINTOPTS} \
- ${JADEOPTS} -t tex -o ${.TARGET} ${XMLDECL} ${MASTERDOC}
+ ${JADEOPTS} -t tex -o ${.TARGET} ${XMLDECL} ${DOC}.parsed.xml
${DOC}.tex-ps: ${DOC}.tex
${LN} -f ${.ALLSRC} ${.TARGET}
.if !target(${DOC}.tex-pdf)
${DOC}.tex-pdf: ${SRCS} ${IMAGES_PDF} ${PRINT_INDEX} \
- ${LOCAL_IMAGES_TXT}
+ ${LOCAL_IMAGES_TXT} ${DOC}.parsed.xml
${GEN_INDEX_SGML_CMD}
${RM} -f ${.TARGET}
${CAT} ${PDFTEX_DEF} > ${.TARGET}
${JADE_CMD} -V tex-backend ${PRINTOPTS} -ioutput.print.pdf \
- ${JADEOPTS} -t tex -o /dev/stdout ${XMLDECL} ${MASTERDOC} >> ${.TARGET}
+ ${JADEOPTS} -t tex -o /dev/stdout ${XMLDECL} ${DOC}.parsed.xml >> ${.TARGET}
.endif
.if !target(${DOC}.dvi)
From a3c89a1805c2e7230fb7647c684dbd267fa2dd0c Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Fri, 1 Feb 2013 09:48:25 +0000
Subject: [PATCH 042/121] - Use exclusively the XML catalogs and drop the old
SGML format
---
da_DK.ISO8859-1/share/xml/catalog | 26 -------------
de_DE.ISO8859-1/share/xml/catalog | 57 ----------------------------
el_GR.ISO8859-7/share/xml/catalog | 60 -----------------------------
en_US.ISO8859-1/share/xml/catalog | 35 -----------------
es_ES.ISO8859-1/share/xml/catalog | 53 --------------------------
fr_FR.ISO8859-1/share/xml/catalog | 59 -----------------------------
hu_HU.ISO8859-2/share/xml/catalog | 61 ------------------------------
it_IT.ISO8859-15/share/xml/catalog | 47 -----------------------
ja_JP.eucJP/share/xml/catalog | 44 ---------------------
mn_MN.UTF-8/share/xml/catalog | 42 --------------------
nl_NL.ISO8859-1/share/xml/catalog | 52 -------------------------
pl_PL.ISO8859-2/share/xml/catalog | 27 -------------
pt_BR.ISO8859-1/share/xml/catalog | 48 -----------------------
ru_RU.KOI8-R/share/xml/catalog | 59 -----------------------------
share/mk/doc.docbook.mk | 6 +--
share/mk/doc.xml.mk | 1 -
sr_YU.ISO8859-2/share/xml/catalog | 11 ------
tr_TR.ISO8859-9/share/xml/catalog | 12 ------
zh_CN.GB2312/share/xml/catalog | 48 -----------------------
zh_TW.Big5/share/xml/catalog | 44 ---------------------
20 files changed, 2 insertions(+), 790 deletions(-)
delete mode 100644 da_DK.ISO8859-1/share/xml/catalog
delete mode 100644 de_DE.ISO8859-1/share/xml/catalog
delete mode 100644 el_GR.ISO8859-7/share/xml/catalog
delete mode 100644 en_US.ISO8859-1/share/xml/catalog
delete mode 100644 es_ES.ISO8859-1/share/xml/catalog
delete mode 100644 fr_FR.ISO8859-1/share/xml/catalog
delete mode 100644 hu_HU.ISO8859-2/share/xml/catalog
delete mode 100644 it_IT.ISO8859-15/share/xml/catalog
delete mode 100644 ja_JP.eucJP/share/xml/catalog
delete mode 100644 mn_MN.UTF-8/share/xml/catalog
delete mode 100644 nl_NL.ISO8859-1/share/xml/catalog
delete mode 100644 pl_PL.ISO8859-2/share/xml/catalog
delete mode 100644 pt_BR.ISO8859-1/share/xml/catalog
delete mode 100644 ru_RU.KOI8-R/share/xml/catalog
delete mode 100644 sr_YU.ISO8859-2/share/xml/catalog
delete mode 100644 tr_TR.ISO8859-9/share/xml/catalog
delete mode 100644 zh_CN.GB2312/share/xml/catalog
delete mode 100644 zh_TW.Big5/share/xml/catalog
diff --git a/da_DK.ISO8859-1/share/xml/catalog b/da_DK.ISO8859-1/share/xml/catalog
deleted file mode 100644
index 18d67e74a7..0000000000
--- a/da_DK.ISO8859-1/share/xml/catalog
+++ /dev/null
@@ -1,26 +0,0 @@
- -- ...................................................................... --
- -- FreeBSD SGML Public Identifiers ...................................... --
-
- -- $FreeBSD$
- --
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
- "entities.ent"
-
-PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
- "freebsd.dsl"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//DK"
- "mailing-lists.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
- "l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//DK"
- "newsgroups.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//DK"
- "teams.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Translator Entities//DK"
- "translators.ent"
diff --git a/de_DE.ISO8859-1/share/xml/catalog b/de_DE.ISO8859-1/share/xml/catalog
deleted file mode 100644
index a48b846ada..0000000000
--- a/de_DE.ISO8859-1/share/xml/catalog
+++ /dev/null
@@ -1,57 +0,0 @@
- -- ...................................................................... --
- -- FreeBSD SGML Public Identifiers ...................................... --
-
- -- ...................................................................... --
- -- German specific ...................................................... --
-
- -- $FreeBSD$ --
- -- $FreeBSDde: de-docproj/share/xml/catalog,v 1.10 2004/11/28 18:16:45 jkois Exp $ --
- -- basiert auf: 1.5 --
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
- "entities.ent"
-
-PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
- "freebsd.dsl"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
- "l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//DE"
- "mailing-lists.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//DE"
- "newsgroups.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//DE"
- "teams.ent"
-
-PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//DE"
- "freebsd.dsl"
-
-PUBLIC "-//FreeBSD//DOCUMENT DocBook Language Neutral Stylesheet//DE"
- "freebsd.dsl"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//DE"
- "glossary.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Translator Entities//DE"
- "translators.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//DE"
- "trademarks.ent"
-
- -- ...................................................................... --
- -- HTML docs ........................................................... --
-
-PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
- "l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES FreeBSD Release L10N Entities//EN"
- "release.l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Header L10N Entities//EN"
- "header.l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Navigation Bar L10N Entities//EN"
- "navibar.l10n.ent"
diff --git a/el_GR.ISO8859-7/share/xml/catalog b/el_GR.ISO8859-7/share/xml/catalog
deleted file mode 100644
index 51a93fb332..0000000000
--- a/el_GR.ISO8859-7/share/xml/catalog
+++ /dev/null
@@ -1,60 +0,0 @@
- -- ...................................................................... --
- -- FreeBSD SGML Public Identifiers ...................................... --
-
- -- $FreeBSD$
- --
- -- %SOURCE% en_US.ISO8859-1/share/xml/catalog
- -- %SRCID% 1.5
-
- -- It doesn't make sense to translate all the entity files of the
- -- FreeBSD docs to Greek; some of the entities are better left off in
- -- their original English version. Please use your judgement wisely
- -- when adding new entity translations to the Greek translations.
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
- "entities.ent"
-
-PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
- "freebsd.dsl"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
- "../../../share/xml/freebsd.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EL"
- "freebsd.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//EL"
- "glossary.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EL"
- "mailing-lists.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EL"
- "newsgroups.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EL"
- "teams.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EL"
- "trademarks.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Translator Entities//EL"
- "translators.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
- "l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EL"
- "urls.ent"
-
- -- ...................................................................... --
- -- HTML docs ............................................................ --
-
-PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
- "l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Header L10N Entities//EN"
- "header.l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Navigation Bar L10N Entities//EN"
- "navibar.l10n.ent"
diff --git a/en_US.ISO8859-1/share/xml/catalog b/en_US.ISO8859-1/share/xml/catalog
deleted file mode 100644
index 0079ae91b4..0000000000
--- a/en_US.ISO8859-1/share/xml/catalog
+++ /dev/null
@@ -1,35 +0,0 @@
- -- ...................................................................... --
- -- FreeBSD SGML Public Identifiers ...................................... --
-
- -- $FreeBSD$
- --
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
- "entities.ent"
-
-PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
- "freebsd.dsl"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//EN"
- "glossary.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN"
- "mailing-lists.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
- "l10n.ent"
-
- -- ...................................................................... --
- -- HTML docs ............................................................ --
-
-PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
- "l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES FreeBSD Release L10N Entities//EN"
- "release.l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Header L10N Entities//EN"
- "header.l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Navigation Bar L10N Entities//EN"
- "navibar.l10n.ent"
diff --git a/es_ES.ISO8859-1/share/xml/catalog b/es_ES.ISO8859-1/share/xml/catalog
deleted file mode 100644
index cbd8334622..0000000000
--- a/es_ES.ISO8859-1/share/xml/catalog
+++ /dev/null
@@ -1,53 +0,0 @@
- -- ...................................................................... --
- -- FreeBSD SGML Public Identifiers ...................................... --
-
- -- ...................................................................... --
- -- Spanish specific ..................................................... --
-
- -- $FreeBSD$
- -- $FreeBSDes: doc/es_ES.ISO8859-1/share/xml/catalog,v 1.5 2004/08/05 17:11:47 carvay Exp $
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
- "entities.ent"
-
-PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
- "freebsd.dsl"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//ES"
- "mailing-lists.ent"
-
-PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//ES"
- "freebsd.dsl"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//ES"
- "newsgroups.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//ES"
- "teams.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//ES"
- "trademarks.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Translator Entities//ES"
- "translators.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Spanish Mailing List Entities//ES"
- "es-mailing-lists.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//ES"
- "glossary.ent"
-
- -- ...................................................................... --
- -- HTML docs ............................................................ --
-
-PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
- "l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES FreeBSD Release L10N Entities//EN"
- "release.l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Header L10N Entities//EN"
- "header.l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Navigation Bar L10N Entities//EN"
- "navibar.l10n.ent"
diff --git a/fr_FR.ISO8859-1/share/xml/catalog b/fr_FR.ISO8859-1/share/xml/catalog
deleted file mode 100644
index d729e51785..0000000000
--- a/fr_FR.ISO8859-1/share/xml/catalog
+++ /dev/null
@@ -1,59 +0,0 @@
- -- ...................................................................... --
- -- FreeBSD SGML Public Identifiers ...................................... --
-
- -- ...................................................................... --
- -- French specific ...................................................... --
-
- -- $FreeBSD$
- --
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
- "entities.ent"
-
-PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
- "freebsd.dsl"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
- "l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//FR"
- "mailing-lists.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//FR"
- "newsgroups.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//FR"
- "teams.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//FR"
- "urls.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Translator Entities//FR"
- "translators.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Abstract Entities//FR"
- "abstract.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook ArtHeader Entities//FR"
- "artheader.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//FR"
- "trademarks.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//FR"
- "glossary.ent"
-
- -- ...................................................................... --
- -- HTML docs ............................................................ --
-
-PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
- "l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES FreeBSD Release L10N Entities//EN"
- "release.l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Header L10N Entities//EN"
- "header.l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Navigation Bar L10N Entities//EN"
- "navibar.l10n.ent"
diff --git a/hu_HU.ISO8859-2/share/xml/catalog b/hu_HU.ISO8859-2/share/xml/catalog
deleted file mode 100644
index 17b8de072b..0000000000
--- a/hu_HU.ISO8859-2/share/xml/catalog
+++ /dev/null
@@ -1,61 +0,0 @@
- -- ...................................................................... --
- -- FreeBSD SGML Public Identifiers ...................................... --
-
- -- ...................................................................... --
- -- Hungarian specific ...................................................... --
-
- -- $FreeBSD$ --
-
- -- %SOURCE% share/xml/catalog
- -- %SRCID% 1.32
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
- "entities.ent"
-
-PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
- "freebsd.dsl"
-
-PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//HU"
- "freebsd.dsl"
-
-PUBLIC "-//FreeBSD//DOCUMENT DocBook Language Neutral Stylesheet//HU"
- "freebsd.dsl"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//HU"
- "freebsd.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
- "l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//HU"
- "mailing-lists.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//HU"
- "newsgroups.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//HU"
- "teams.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Translator Entities//HU"
- "translators.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//HU"
- "trademarks.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//HU"
- "glossary.ent"
-
- -- ...................................................................... --
- -- HTML docs ............................................................ --
-
-PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
- "l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES FreeBSD Release L10N Entities//EN"
- "release.l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Header L10N Entities//EN"
- "header.l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Navigation Bar L10N Entities//EN"
- "navibar.l10n.ent"
diff --git a/it_IT.ISO8859-15/share/xml/catalog b/it_IT.ISO8859-15/share/xml/catalog
deleted file mode 100644
index 8912f7f848..0000000000
--- a/it_IT.ISO8859-15/share/xml/catalog
+++ /dev/null
@@ -1,47 +0,0 @@
- -- ...................................................................... --
- -- FreeBSD SGML Public Identifiers ...................................... --
-
- -- ...................................................................... --
- -- Italian specific ..................................................... --
-
- -- $FreeBSD$
- --
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
- "entities.ent"
-
-PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
- "freebsd.dsl"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
- "l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//IT"
- "mailing-lists.ent"
-
-PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//IT"
- "freebsd.dsl"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Translator Entities//IT"
- "translators.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//IT"
- "trademarks.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//IT"
- "glossary.ent"
-
- -- ...................................................................... --
- -- HTML docs ............................................................ --
-
-PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
- "l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES FreeBSD Release L10N Entities//EN"
- "release.l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Header L10N Entities//EN"
- "header.l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Navigation Bar L10N Entities//EN"
- "navibar.l10n.ent"
diff --git a/ja_JP.eucJP/share/xml/catalog b/ja_JP.eucJP/share/xml/catalog
deleted file mode 100644
index 567c8be639..0000000000
--- a/ja_JP.eucJP/share/xml/catalog
+++ /dev/null
@@ -1,44 +0,0 @@
- -- ...................................................................... --
- -- FreeBSD SGML Public Identifiers ...................................... --
-
- -- $FreeBSD$
- --
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
- "entities.ent"
-
-PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
- "freebsd.dsl"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//JA"
- "mailing-lists.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//JA"
- "newsgroups.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
- "l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//JA"
- "authors.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//JA"
- "teams.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//JA"
- "trademarks.ent"
-
- -- ...................................................................... --
- -- HTML docs ............................................................ --
-
-PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
- "l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES FreeBSD Release L10N Entities//EN"
- "release.l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Header L10N Entities//EN"
- "header.l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Navigation Bar L10N Entities//EN"
- "navibar.l10n.ent"
diff --git a/mn_MN.UTF-8/share/xml/catalog b/mn_MN.UTF-8/share/xml/catalog
deleted file mode 100644
index 844eae5ee2..0000000000
--- a/mn_MN.UTF-8/share/xml/catalog
+++ /dev/null
@@ -1,42 +0,0 @@
- -- ...................................................................... --
- -- FreeBSD SGML Public Identifiers ...................................... --
-
- -- ...................................................................... --
- -- Mongolian specific ..................................................... --
-
- -- ...................................................................... --
- -- The FreeBSD Mongolian Documentation Project
- -- ...................................................................... --
- --
- --
- -- ...................................................................... --
- -- Original revision: 1.5
- -- $FreeBSD$
- --
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
- "entities.ent"
-
-PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
- "freebsd.dsl"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//MN"
- "mailing-lists.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
- "l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//MN"
- "newsgroups.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//MN"
- "teams.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//MN"
- "trademarks.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Mongolian Translators Entities//MN"
- "translators.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//MN"
- "glossary.ent"
diff --git a/nl_NL.ISO8859-1/share/xml/catalog b/nl_NL.ISO8859-1/share/xml/catalog
deleted file mode 100644
index a59b4d5587..0000000000
--- a/nl_NL.ISO8859-1/share/xml/catalog
+++ /dev/null
@@ -1,52 +0,0 @@
- -- ...................................................................... --
- -- FreeBSD SGML Public Identifiers ...................................... --
-
- -- $FreeBSD$ --
-
- -- %SOURCE% en_US.ISO8859-1/share/xml/catalog --
- -- %SRCID% 39534 --
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
- "entities.ent"
-
-PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
- "freebsd.dsl"
-
-PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//NL"
- "freebsd.dsl"
-
-PUBLIC "-//FreeBSD//DOCUMENT DocBook Language Neutral Stylesheet//NL"
- "freebsd.dsl"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//NL"
- "mailing-lists.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
- "l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//NL"
- "trademarks.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//NL"
- "teams.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//NL"
- "newsgroups.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//NL"
- "glossary.ent"
-
- -- ...................................................................... --
- -- HTML docs ............................................................ --
-
-PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
- "l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES FreeBSD Release L10N Entities//EN"
- "release.l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Header L10N Entities//EN"
- "header.l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Navigation Bar L10N Entities//EN"
- "navibar.l10n.ent"
diff --git a/pl_PL.ISO8859-2/share/xml/catalog b/pl_PL.ISO8859-2/share/xml/catalog
deleted file mode 100644
index f97d4c113d..0000000000
--- a/pl_PL.ISO8859-2/share/xml/catalog
+++ /dev/null
@@ -1,27 +0,0 @@
- -- ...................................................................... --
- -- FreeBSD SGML Public Identifiers ...................................... --
-
- -- $FreeBSD$
- Original revision: 1.5
- --
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
- "entities.ent"
-
-PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
- "freebsd.dsl"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
- "l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//PL"
- "mailing-lists.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//PL"
- "newsgroups.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//PL"
- "teams.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//PL"
- "trademarks.ent"
diff --git a/pt_BR.ISO8859-1/share/xml/catalog b/pt_BR.ISO8859-1/share/xml/catalog
deleted file mode 100644
index cb8704f8d9..0000000000
--- a/pt_BR.ISO8859-1/share/xml/catalog
+++ /dev/null
@@ -1,48 +0,0 @@
- -- ...................................................................... --
- -- FreeBSD SGML Public Identifiers ...................................... --
-
- -- ...................................................................... --
- -- Portuguese Brazilian specific ........................................ --
-
- -- The FreeBSD Documentation Project
- -- The FreeBSD Brazilian Portuguese Documentation Project
-
- -- Original revision: r38826
-
- --
- -- $FreeBSD$
- --
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
- "entities.ent"
-
-PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
- "freebsd.dsl"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//PT"
- "mailing-lists.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//PT"
- "l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//PT"
- "newsgroups.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//PT"
- "teams.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Translators Entities//PT"
- "translators.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//PT"
- "trademarks.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Specific Word Translations Entities//PT"
- "words.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Books Entity Set//PT"
- "books.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//PT"
- "articles.ent"
-
diff --git a/ru_RU.KOI8-R/share/xml/catalog b/ru_RU.KOI8-R/share/xml/catalog
deleted file mode 100644
index dc8582b2a8..0000000000
--- a/ru_RU.KOI8-R/share/xml/catalog
+++ /dev/null
@@ -1,59 +0,0 @@
- -- ...................................................................... --
- -- FreeBSD SGML Public Identifiers ...................................... --
-
- -- ...................................................................... --
- -- Russian specific ..................................................... --
-
- -- ...................................................................... --
- -- The FreeBSD Russian Documentation Project
- -- ...................................................................... --
- -- $FreeBSD$
- -- $FreeBSDru: frdp/doc/ru_RU.KOI8-R/share/xml/catalog,v 1.13 2004/08/13 07:07:53 den Exp $
- -- ...................................................................... --
- -- Original revision: r17819
- -- ...................................................................... --
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
- "entities.ent"
-
-PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
- "freebsd.dsl"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//RU"
- "mailing-lists.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
- "l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//RU"
- "newsgroups.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//RU"
- "teams.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//RU"
- "trademarks.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Russian Translators Entities//RU"
- "translators.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//RU"
- "urls.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//RU"
- "glossary.ent"
-
- -- ...................................................................... --
- -- HTML docs ............................................................ --
-
-PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
- "l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES FreeBSD Release L10N Entities//EN"
- "release.l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Header L10N Entities//EN"
- "header.l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Navigation Bar L10N Entities//EN"
- "navibar.l10n.ent"
diff --git a/share/mk/doc.docbook.mk b/share/mk/doc.docbook.mk
index 90d8f2863a..cd6b35c16c 100644
--- a/share/mk/doc.docbook.mk
+++ b/share/mk/doc.docbook.mk
@@ -146,8 +146,6 @@ DSLHTML?= ${DOC_PREFIX}/share/xml/default.dsl
DSLPRINT?= ${DOC_PREFIX}/share/xml/default.dsl
DSLPGP?= ${DOC_PREFIX}/share/xml/pgp.dsl
-FREEBSDCATALOG= ${DOC_PREFIX}/share/xml/catalog
-LANGUAGECATALOG=${DOC_PREFIX}/${LANGCODE}/share/xml/catalog
ISO8879CATALOG= ${PREFIX}/share/sgml/iso8879/catalog
DOCBOOKCATALOG= ${PREFIX}/share/xml/docbook/catalog
CATALOG_PORTS_SGML= ${PREFIX}/share/sgml/catalog.ports
@@ -574,7 +572,7 @@ ${DOC}.rtf:
.if ${PDFENGINE} == "jade"
${DOC}.parsed.xml: ${SRCS}
- ${XMLLINT} --catalogs --nonet --noent --valid --dropdtd ${MASTERDOC} > ${.TARGET}
+ ${XMLLINT} --nonet --noent --valid --dropdtd ${MASTERDOC} > ${.TARGET}
.if !defined(NO_TEX)
#
@@ -695,7 +693,7 @@ ${DOC}.${_curformat}:
#
lint validate: ${SRCS}
- ${XMLLINT} --catalogs --nonet --noout --noent --valid ${MASTERDOC}
+ ${XMLLINT} --nonet --noout --noent --valid ${MASTERDOC}
# ------------------------------------------------------------------------
#
diff --git a/share/mk/doc.xml.mk b/share/mk/doc.xml.mk
index 14ee8543de..4e4fd31069 100644
--- a/share/mk/doc.xml.mk
+++ b/share/mk/doc.xml.mk
@@ -272,7 +272,6 @@ XML_NOTICES= ${DOC_PREFIX}/share/xml/notices.xml
# The ${TARGET.<id>} file will not be listed in $DATA if defined.
# NO_DATA.DEFAULT is the setting for all <id>s.
#
-XSLTPROC_ENV+= SGML_CATALOG_FILES=
XSLTPROC_ENV+= XML_CATALOG_FILES="${XML_CATALOG_FILES}"
XSLTPROCOPTS= ${XSLTPROCFLAGS}
diff --git a/sr_YU.ISO8859-2/share/xml/catalog b/sr_YU.ISO8859-2/share/xml/catalog
deleted file mode 100644
index 161058647e..0000000000
--- a/sr_YU.ISO8859-2/share/xml/catalog
+++ /dev/null
@@ -1,11 +0,0 @@
- -- ...................................................................... --
- -- FreeBSD SGML Public Identifiers ...................................... --
-
- -- $FreeBSD$
- --
-
-PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
- "freebsd.dsl"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
- "l10n.ent"
diff --git a/tr_TR.ISO8859-9/share/xml/catalog b/tr_TR.ISO8859-9/share/xml/catalog
deleted file mode 100644
index bae3bb06c0..0000000000
--- a/tr_TR.ISO8859-9/share/xml/catalog
+++ /dev/null
@@ -1,12 +0,0 @@
---
- $FreeBSD$
---
-
-PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
- "l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Header L10N Entities//EN"
- "header.l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Navigation Bar L10N Entities//EN"
- "navibar.l10n.ent"
diff --git a/zh_CN.GB2312/share/xml/catalog b/zh_CN.GB2312/share/xml/catalog
deleted file mode 100644
index 9530d38dc5..0000000000
--- a/zh_CN.GB2312/share/xml/catalog
+++ /dev/null
@@ -1,48 +0,0 @@
- -- ...................................................................... --
- -- FreeBSD SGML Public Identifiers ...................................... --
-
- -- Original Revision: 1.5 --
- -- $FreeBSD$
- --
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
- "entities.ent"
-
-PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
- "freebsd.dsl"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//ZH"
- "mailing-lists.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
- "l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//ZH"
- "authors.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Author In Author Tag Entities//ZH"
- "authors-in-author-tag.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//ZH"
- "teams.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//ZH"
- "trademarks.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//ZH"
- "glossary.ent"
-
- -- ...................................................................... --
- -- HTML docs ............................................................ --
-
-PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
- "l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES FreeBSD Release L10N Entities//EN"
- "release.l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Header L10N Entities//EN"
- "header.l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Navigation Bar L10N Entities//EN"
- "navibar.l10n.ent"
diff --git a/zh_TW.Big5/share/xml/catalog b/zh_TW.Big5/share/xml/catalog
deleted file mode 100644
index 39bb7cb408..0000000000
--- a/zh_TW.Big5/share/xml/catalog
+++ /dev/null
@@ -1,44 +0,0 @@
- -- ...................................................................... --
- -- FreeBSD SGML Public Identifiers ...................................... --
-
- -- $FreeBSD$
- --
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
- "entities.ent"
-
-PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
- "freebsd.dsl"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//ZH"
- "mailing-lists.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
- "l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//ZH"
- "authors.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//ZH"
- "trademarks.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//ZH"
- "urls.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//ZH"
- "glossary.ent"
-
- -- ...................................................................... --
- -- HTML docs ............................................................ --
-
-PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
- "l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES FreeBSD Release L10N Entities//EN"
- "release.l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Header L10N Entities//EN"
- "header.l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Navigation Bar L10N Entities//EN"
- "navibar.l10n.ent"
From 33e89a267c0387e101d67eb23c076fe8debd2e70 Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Fri, 1 Feb 2013 11:04:50 +0000
Subject: [PATCH 043/121] - Always parse the documentation first and use the
parsed XML - s/PDFENGINE/RENDERENGINE/ and add support for generating .rtf
with FOP
---
share/mk/doc.docbook.mk | 51 +++++++++++++++++++++++------------------
1 file changed, 29 insertions(+), 22 deletions(-)
diff --git a/share/mk/doc.docbook.mk b/share/mk/doc.docbook.mk
index cd6b35c16c..a6903d632e 100644
--- a/share/mk/doc.docbook.mk
+++ b/share/mk/doc.docbook.mk
@@ -114,7 +114,7 @@ MASTERDOC?= ${.CURDIR}/${DOC}.xml
SP_ENCODING_LIST?= ISO-8859-2 KOI8-R
# Either jade or fop
-PDFENGINE?= jade
+RENDERENGINE?= jade
.if defined(SPELLCHECK)
DSLHTML?= ${DOC_PREFIX}/share/xml/spellcheck.dsl
@@ -336,6 +336,8 @@ LOCAL_CSS_SHEET= ${.OBJDIR}/${CSS_SHEET:T}
LOCAL_CSS_SHEET= ${CSS_SHEET:T}
.endif
+CLEANFILES+= ${DOC}.parsed.xml
+
.for _curformat in ${FORMATS}
_cf=${_curformat}
@@ -375,14 +377,14 @@ CLEANFILES+= ${DOC}.aux ${DOC}.log
.elif ${_cf} == "ps"
CLEANFILES+= ${DOC}.aux ${DOC}.dvi ${DOC}.log ${DOC}.out ${DOC}.tex-ps \
- ${DOC}.tex ${DOC}.tex-tmp ${DOC}.fo ${DOC}.parsed.xml
+ ${DOC}.tex ${DOC}.tex-tmp ${DOC}.fo
.for _curimage in ${LOCAL_IMAGES_EPS:M*share*}
CLEANFILES+= ${_curimage:T} ${_curimage:H:T}/${_curimage:T}
.endfor
.elif ${_cf} == "pdf"
CLEANFILES+= ${DOC}.aux ${DOC}.dvi ${DOC}.log ${DOC}.out ${DOC}.tex-pdf ${DOC}.tex-pdf-tmp \
- ${DOC}.tex ${DOC}.fo ${DOC}.parsed.xml
+ ${DOC}.tex ${DOC}.fo
.for _curimage in ${IMAGES_PDF:M*share*}
CLEANFILES+= ${_curimage:T} ${_curimage:H:T}/${_curimage:T}
.endfor
@@ -485,17 +487,22 @@ NO_RTF= yes
.endif
.endfor
+# Parsed XML -------------------------------------------------------
+
+${DOC}.parsed.xml: ${SRCS}
+ ${XMLLINT} --nonet --noent --valid --dropdtd ${MASTERDOC} > ${.TARGET}
+
# XHTML -------------------------------------------------------------
-index.html: ${DOC}.xml ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG} \
+index.html: ${DOC}.parsed.xml ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG} \
${HTML_SPLIT_INDEX} ${LOCAL_CSS_SHEET}
${GEN_INDEX_SGML_CMD}
- ${XSLTPROC} ${XSLTPROCOPTS} ${XSLXHTMLCHUNK} ${DOC}.xml
+ ${XSLTPROC} ${XSLTPROCOPTS} ${XSLXHTMLCHUNK} ${DOC}.parsed.xml
-${DOC}.html: ${DOC}.xml ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG} \
+${DOC}.html: ${DOC}.parsed.xml ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG} \
${LOCAL_CSS_SHEET}
${GEN_INDEX_SGML_CMD}
- ${XSLTPROC} ${XSLTPROCOPTS} ${XSLXHTML} ${DOC}.xml > ${.TARGET}
+ ${XSLTPROC} ${XSLTPROCOPTS} ${XSLXHTML} ${DOC}.parsed.xml > ${.TARGET}
${DOC}.html-split.tar: HTML.manifest ${LOCAL_IMAGES_LIB} \
${LOCAL_IMAGES_PNG} ${LOCAL_CSS_SHEET}
@@ -515,9 +522,9 @@ ${DOC}.html.tar: ${DOC}.html ${LOCAL_IMAGES_LIB} \
# EPUB -------------------------------------------------------------
-${DOC}.epub: ${DOC}.xml ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG} \
+${DOC}.epub: ${DOC}.parsed.xml ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG} \
${CSS_SHEET}
- ${XSLTPROC} ${XSLTPROCOPTS} ${XSLEPUB} ${DOC}.xml
+ ${XSLTPROC} ${XSLTPROCOPTS} ${XSLEPUB} ${DOC}.parsed.xml
${ECHO} "application/epub+zip" > mimetype
${CP} ${CSS_SHEET} OEBPS/
zip -0Xq ${DOC}.epub mimetype
@@ -555,11 +562,12 @@ ${.CURDIR:T}.pdb.${_curcomp}: ${DOC}.pdb.${_curcomp}
.if !target(${DOC}.rtf)
.if !defined(NO_RTF)
-${DOC}.rtf: ${SRCS} ${LOCAL_IMAGES_EPS} ${PRINT_INDEX} \
+${DOC}.rtf: ${DOC}.parsed.xml ${LOCAL_IMAGES_EPS} ${PRINT_INDEX} \
${LOCAL_IMAGES_TXT} ${LOCAL_IMAGES_PNG}
${GEN_INDEX_SGML_CMD}
${JADE_CMD} -V rtf-backend ${PRINTOPTS} -ioutput.rtf.images \
- ${JADEOPTS} -t rtf -o ${.TARGET}-nopng ${XMLDECL} ${MASTERDOC}
+ ${JADEOPTS} -t rtf -o ${.TARGET}-nopng ${XMLDECL} \
+ ${DOC}.parsed.xml
${FIXRTF} ${FIXRTFOPTS} < ${.TARGET}-nopng > ${.TARGET}
.else
${DOC}.rtf:
@@ -569,11 +577,7 @@ ${DOC}.rtf:
# PS/PDF -----------------------------------------------------------------
-.if ${PDFENGINE} == "jade"
-
-${DOC}.parsed.xml: ${SRCS}
- ${XMLLINT} --nonet --noent --valid --dropdtd ${MASTERDOC} > ${.TARGET}
-
+.if ${RENDERENGINE} == "jade"
.if !defined(NO_TEX)
#
# This sucks, but there's no way round it. The PS and PDF formats need
@@ -654,17 +658,20 @@ ${DOC}.tex-pdf:
.endif
.endif
-.elif ${PDFENGINE} == "fop"
+.elif ${RENDERENGINE} == "fop"
${DOC}.fo: ${DOC}.xml ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG}
${GEN_INDEX_SGML_CMD}
- ${XSLTPROC} ${XSLTPROCOPTS} ${XSLFO} ${DOC}.xml > ${.TARGET}
+ ${XSLTPROC} ${XSLTPROCOPTS} ${XSLFO} ${DOC}.parsed.xml > ${.TARGET}
${DOC}.pdf: ${DOC}.fo ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG}
${FOP} ${FOPOPTS} ${DOC}.fo ${.TARGET}
${DOC}.ps: ${DOC}.fo ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG}
${FOP} ${FOPOPTS} ${DOC}.fo ${.TARGET}
-
+
+${DOC}.rtf: ${DOC}.fo ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG}
+ ${FOP} ${FOPOPTS} ${DOC}.fo ${.TARGET}
+
.endif
${DOC}.tar: ${SRCS} ${LOCAL_IMAGES} ${LOCAL_CSS_SHEET}
@@ -708,15 +715,15 @@ lint validate: ${SRCS}
#
-${HTML_INDEX}: ${SRCS} ${LOCAL_IMAGES_TXT}
+${HTML_INDEX}: ${DOC}.parsed.xml ${LOCAL_IMAGES_TXT}
${INIT_INDEX_SGML_CMD}
${JADE_CMD} -V html-index -V nochunks ${HTMLOPTS} -ioutput.html.images \
- ${JADEOPTS} -t sgml ${XMLDECL} ${MASTERDOC} > /dev/null
+ ${JADEOPTS} -t sgml ${XMLDECL} ${DOC}.parsed.xml > /dev/null
${HTML_SPLIT_INDEX}: ${SRCS} ${LOCAL_IMAGES_TXT}
${INIT_INDEX_SGML_CMD}
${JADE_CMD} -V html-index ${HTMLOPTS} -ioutput.html.images \
- ${JADEOPTS} -t sgml ${XMLDECL} ${MASTERDOC} > /dev/null
+ ${JADEOPTS} -t sgml ${XMLDECL} ${DOC}.parsed.xml > /dev/null
.if !target(${PRINT_INDEX})
${PRINT_INDEX}: ${HTML_INDEX}
From 5a8e3a368ddd5b89d10ec6c33a865f8f33e00cd6 Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Fri, 1 Feb 2013 13:03:24 +0000
Subject: [PATCH 044/121] - Properly validate and process XInclude
---
share/mk/doc.docbook.mk | 2 +-
share/xml/freebsd45.dtd | 26 ++++++++++++++++++++++++++
2 files changed, 27 insertions(+), 1 deletion(-)
diff --git a/share/mk/doc.docbook.mk b/share/mk/doc.docbook.mk
index a6903d632e..94be9ef2c9 100644
--- a/share/mk/doc.docbook.mk
+++ b/share/mk/doc.docbook.mk
@@ -490,7 +490,7 @@ NO_RTF= yes
# Parsed XML -------------------------------------------------------
${DOC}.parsed.xml: ${SRCS}
- ${XMLLINT} --nonet --noent --valid --dropdtd ${MASTERDOC} > ${.TARGET}
+ ${XMLLINT} --nonet --noent --valid --xinclude --dropdtd ${MASTERDOC} > ${.TARGET}
# XHTML -------------------------------------------------------------
diff --git a/share/xml/freebsd45.dtd b/share/xml/freebsd45.dtd
index a062247c67..8cb58ae4b6 100644
--- a/share/xml/freebsd45.dtd
+++ b/share/xml/freebsd45.dtd
@@ -11,6 +11,32 @@
<!ENTITY % ISOgrk4.module "IGNORE">
+<!ENTITY % xmlns.attrib
+ "xmlns CDATA #IMPLIED">
+
+<!ENTITY % xmlns.xi.attrib
+ "xmlns:xi CDATA #IMPLIED">
+
+<!ENTITY % local.common.attrib "%xmlns.attrib;
+ %xmlns.xi.attrib;">
+
+<!ELEMENT xi:include (xi:fallback?)>
+
+<!ATTLIST xi:include
+ xmlns:xi CDATA #FIXED "http://www.w3.org/2001/XInclude"
+ href CDATA #IMPLIED
+ parse (xml|text) "xml"
+ xpointer CDATA #IMPLIED
+ encoding CDATA #IMPLIED
+ accept CDATA #IMPLIED
+ accept-language CDATA #IMPLIED
+>
+
+<!ELEMENT xi:fallback ANY>
+<!ATTLIST xi:fallback
+ xmlns:xi CDATA #FIXED "http://www.w3.org/2001/XInclude"
+>
+
<!ENTITY % orig-docbook PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
"/usr/local/share/xml/docbook/4.5/docbookx.dtd">
%orig-docbook;
From e1fa809a80d12f687be5e17f92de378d33410442 Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Fri, 1 Feb 2013 13:21:13 +0000
Subject: [PATCH 045/121] - There is no need for XInclude processing at the
point when xsltproc is called
---
share/mk/doc.docbook.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/share/mk/doc.docbook.mk b/share/mk/doc.docbook.mk
index 94be9ef2c9..9e9bce7527 100644
--- a/share/mk/doc.docbook.mk
+++ b/share/mk/doc.docbook.mk
@@ -153,7 +153,7 @@ DSSSLCATALOG= ${PREFIX}/share/sgml/docbook/dsssl/modular/catalog
COLLATEINDEX= ${PREFIX}/share/sgml/docbook/dsssl/modular/bin/collateindex.pl
-XSLTPROCFLAGS?= --nonet --xinclude
+XSLTPROCFLAGS?= --nonet
XSLXHTML?= ${DOC_PREFIX}/share/xsl/freebsd-xhtml.xsl
XSLXHTMLCHUNK?= ${DOC_PREFIX}/share/xsl/freebsd-xhtml-chunk.xsl
XSLEPUB?= ${DOC_PREFIX}/share/xsl/freebsd-epub.xsl
From 7c3ff16ff74200c16c3db532eba59a20c35d18ea Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Fri, 1 Feb 2013 17:35:25 +0000
Subject: [PATCH 046/121] - Actually allow xi:include in DocBook markup
---
share/xml/freebsd45.dtd | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/share/xml/freebsd45.dtd b/share/xml/freebsd45.dtd
index 8cb58ae4b6..8514207a21 100644
--- a/share/xml/freebsd45.dtd
+++ b/share/xml/freebsd45.dtd
@@ -5,7 +5,7 @@
<!ENTITY % jade.compat "IGNORE">
-<!ENTITY % local.tech.char.class "|hostid|username|groupname|devicename|maketarget|makevar|svnref">
+<!ENTITY % local.tech.char.class "|hostid|username|groupname|devicename|maketarget|makevar|svnref|xi:include">
<!ENTITY % filename.element "IGNORE">
From a2e17a8562b0eec53f29df4076d0f633de21d97a Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Fri, 1 Feb 2013 17:36:02 +0000
Subject: [PATCH 047/121] - Make included legalnotice entity well nested and
add DTD declaration for validation to pass
---
en_US.ISO8859-1/books/pmake/book.xml | 18 ++++++++++++++++++
en_US.ISO8859-1/books/pmake/legalnotice.xml | 20 ++------------------
2 files changed, 20 insertions(+), 18 deletions(-)
diff --git a/en_US.ISO8859-1/books/pmake/book.xml b/en_US.ISO8859-1/books/pmake/book.xml
index 75a18a7f33..bbb2b74813 100644
--- a/en_US.ISO8859-1/books/pmake/book.xml
+++ b/en_US.ISO8859-1/books/pmake/book.xml
@@ -14,6 +14,24 @@
<surname>de Boor</surname>
</author>
+ <copyright>
+ <year>1988</year>
+ <year>1989</year>
+ <holder>Adam de Boor</holder>
+ </copyright>
+
+ <copyright>
+ <year>1989</year>
+ <holder>Berkeley Softworks</holder>
+ </copyright>
+
+ <copyright>
+ <year>1988</year>
+ <year>1989</year>
+ <year>1993</year>
+ <holder>The Regents of the University of California.</holder>
+ </copyright>
+
&legalnotice;
<releaseinfo>$FreeBSD$</releaseinfo>
diff --git a/en_US.ISO8859-1/books/pmake/legalnotice.xml b/en_US.ISO8859-1/books/pmake/legalnotice.xml
index 273f8f113a..31254450ce 100644
--- a/en_US.ISO8859-1/books/pmake/legalnotice.xml
+++ b/en_US.ISO8859-1/books/pmake/legalnotice.xml
@@ -1,26 +1,10 @@
<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE legalnotice PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd"
<!--
$FreeBSD$
-->
-<copyright>
- <year>1988</year>
- <year>1989</year>
- <holder>Adam de Boor</holder>
-</copyright>
-
-<copyright>
- <year>1989</year>
- <holder>Berkeley Softworks</holder>
-</copyright>
-
-<copyright>
- <year>1988</year>
- <year>1989</year>
- <year>1993</year>
- <holder>The Regents of the University of California.</holder>
-</copyright>
-
<legalnotice id="legalnotice">
<para>All rights reserved.</para>
From 3a2d8092b90d2c2d08f50b22ef872afb53051ef4 Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Fri, 1 Feb 2013 17:37:53 +0000
Subject: [PATCH 048/121] - Clean up leftovers after make lint
---
share/mk/doc.docbook.mk | 1 +
1 file changed, 1 insertion(+)
diff --git a/share/mk/doc.docbook.mk b/share/mk/doc.docbook.mk
index 9e9bce7527..0958e1ed84 100644
--- a/share/mk/doc.docbook.mk
+++ b/share/mk/doc.docbook.mk
@@ -701,6 +701,7 @@ ${DOC}.${_curformat}:
lint validate: ${SRCS}
${XMLLINT} --nonet --noout --noent --valid ${MASTERDOC}
+ @${RM} -rf ${CLEANFILES} ${CLEANDIRS}
# ------------------------------------------------------------------------
#
From 90daffe2e7dc0bdd0c0e992ca1db0783b5faf0dc Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Fri, 1 Feb 2013 18:45:41 +0000
Subject: [PATCH 049/121] - Remove some SGML leftovers
---
share/mk/doc.docbook.mk | 23 ++---------------------
1 file changed, 2 insertions(+), 21 deletions(-)
diff --git a/share/mk/doc.docbook.mk b/share/mk/doc.docbook.mk
index 0958e1ed84..dd9f8814b2 100644
--- a/share/mk/doc.docbook.mk
+++ b/share/mk/doc.docbook.mk
@@ -125,18 +125,11 @@ XMLDECL?= /usr/local/share/sgml/docbook/dsssl/modular/dtds/decls/xml.dcl
.if exists(${PREFIX}/bin/jade) && !defined(OPENJADE)
JADE?= ${PREFIX}/bin/jade
-JADECATALOG?= ${PREFIX}/share/sgml/jade/catalog
-SX?= ${PREFIX}/bin/sx
.else
JADE?= ${PREFIX}/bin/openjade
-JADECATALOG?= ${PREFIX}/share/sgml/openjade/catalog
JADEFLAGS+= -V openjade
-SX?= ${PREFIX}/bin/osx
.endif
-.if defined(SP_ENCODING)
-JADE_ENV+= SP_ENCODING=${SP_ENCODING}
-.endif
JADE_CMD= ${SETENV} ${JADE_ENV} ${JADE}
FOP?= ${PREFIX}/bin/fop
@@ -146,14 +139,8 @@ DSLHTML?= ${DOC_PREFIX}/share/xml/default.dsl
DSLPRINT?= ${DOC_PREFIX}/share/xml/default.dsl
DSLPGP?= ${DOC_PREFIX}/share/xml/pgp.dsl
-ISO8879CATALOG= ${PREFIX}/share/sgml/iso8879/catalog
-DOCBOOKCATALOG= ${PREFIX}/share/xml/docbook/catalog
-CATALOG_PORTS_SGML= ${PREFIX}/share/sgml/catalog.ports
-DSSSLCATALOG= ${PREFIX}/share/sgml/docbook/dsssl/modular/catalog
-
COLLATEINDEX= ${PREFIX}/share/sgml/docbook/dsssl/modular/bin/collateindex.pl
-XSLTPROCFLAGS?= --nonet
XSLXHTML?= ${DOC_PREFIX}/share/xsl/freebsd-xhtml.xsl
XSLXHTMLCHUNK?= ${DOC_PREFIX}/share/xsl/freebsd-xhtml-chunk.xsl
XSLEPUB?= ${DOC_PREFIX}/share/xsl/freebsd-epub.xsl
@@ -162,14 +149,8 @@ INDEXREPORTSCRIPT= ${DOC_PREFIX}/share/misc/indexreport.pl
IMAGES_LIB?=
-.for c in ${LANGUAGECATALOG} ${FREEBSDCATALOG} ${DSSSLCATALOG} ${ISO8879CATALOG} ${DOCBOOKCATALOG} ${JADECATALOG} ${EXTRA_CATALOGS} ${CATALOG_PORTS_SGML}
-.if exists(${c})
-CATALOGS+= -c ${c}
-.endif
-.endfor
-SGMLFLAGS+= -D ${IMAGES_EN_DIR}/${DOC}s/${.CURDIR:T} -D ${CANONICALOBJDIR}
-JADEOPTS= -w no-valid ${JADEFLAGS} ${SGMLFLAGS}
-XSLTPROCOPTS= ${XSLTPROCFLAGS}
+JADEOPTS?= -w no-valid ${JADEFLAGS} -D ${IMAGES_EN_DIR}/${DOC}s/${.CURDIR:T} -D ${CANONICALOBJDIR}
+XSLTPROCOPTS?= --nonet
KNOWN_FORMATS= html html.tar html-split html-split.tar \
epub txt rtf ps pdf tex dvi tar pdb
From 3327cf64d4dfcb611b9c25d141a93bac26600f45 Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Fri, 1 Feb 2013 18:51:52 +0000
Subject: [PATCH 050/121] - Remove HTML Tidy leftovers
---
de_DE.ISO8859-1/books/handbook/Makefile | 1 -
el_GR.ISO8859-7/books/handbook/Makefile | 1 -
en_US.ISO8859-1/books/handbook/Makefile | 1 -
fr_FR.ISO8859-1/books/handbook/Makefile | 1 -
hu_HU.ISO8859-2/articles/compiz-fusion/Makefile | 2 --
hu_HU.ISO8859-2/articles/cups/Makefile | 2 --
hu_HU.ISO8859-2/articles/explaining-bsd/Makefile | 6 ------
hu_HU.ISO8859-2/articles/gjournal-desktop/Makefile | 2 --
hu_HU.ISO8859-2/articles/laptop/Makefile | 6 ------
hu_HU.ISO8859-2/articles/linux-comparison/Makefile | 6 ------
hu_HU.ISO8859-2/articles/linux-users/Makefile | 6 ------
hu_HU.ISO8859-2/books/faq/Makefile | 2 --
hu_HU.ISO8859-2/books/fdp-primer/Makefile | 2 --
hu_HU.ISO8859-2/books/handbook/Makefile | 7 -------
it_IT.ISO8859-15/books/handbook/Makefile | 1 -
ja_JP.eucJP/books/handbook/Makefile | 1 -
mn_MN.UTF-8/books/handbook/Makefile | 1 -
nl_NL.ISO8859-1/books/handbook/Makefile | 1 -
pl_PL.ISO8859-2/books/handbook/Makefile | 1 -
ru_RU.KOI8-R/books/handbook/Makefile | 1 -
share/mk/doc.project.mk | 1 -
zh_CN.GB2312/books/handbook/Makefile | 1 -
zh_TW.Big5/books/handbook/Makefile | 1 -
23 files changed, 54 deletions(-)
diff --git a/de_DE.ISO8859-1/books/handbook/Makefile b/de_DE.ISO8859-1/books/handbook/Makefile
index 1e9fcbdaf7..a14145b020 100644
--- a/de_DE.ISO8859-1/books/handbook/Makefile
+++ b/de_DE.ISO8859-1/books/handbook/Makefile
@@ -297,7 +297,6 @@ XMLDOCS= lastmod:::mirrors.lastmod.inc \
DEPENDSET.DEFAULT= transtable mirror
XSLT.DEFAULT= ${XSL_MIRRORS}
XML.DEFAULT= ${XML_MIRRORS}
-NO_TIDY.DEFAULT= yes
PARAMS.lastmod+= --param 'target' "'lastmod'"
PARAMS.mirrors-ftp-index+= --param 'type' "'ftp'" \
diff --git a/el_GR.ISO8859-7/books/handbook/Makefile b/el_GR.ISO8859-7/books/handbook/Makefile
index 843daf88a5..ffaec52edc 100644
--- a/el_GR.ISO8859-7/books/handbook/Makefile
+++ b/el_GR.ISO8859-7/books/handbook/Makefile
@@ -328,7 +328,6 @@ XMLDOCS= lastmod:::mirrors.lastmod.inc \
DEPENDSET.DEFAULT= transtable mirror
XSLT.DEFAULT= ${XSL_MIRRORS}
XML.DEFAULT= ${XML_MIRRORS}
-NO_TIDY.DEFAULT= yes
PARAMS.lastmod+= --param 'target' "'lastmod'"
PARAMS.mirrors-ftp-index+= --param 'type' "'ftp'" \
diff --git a/en_US.ISO8859-1/books/handbook/Makefile b/en_US.ISO8859-1/books/handbook/Makefile
index 691f66350c..6f822d303f 100644
--- a/en_US.ISO8859-1/books/handbook/Makefile
+++ b/en_US.ISO8859-1/books/handbook/Makefile
@@ -325,7 +325,6 @@ XMLDOCS= lastmod:::mirrors.lastmod.inc \
DEPENDSET.DEFAULT= transtable mirror
XSLT.DEFAULT= ${XSL_MIRRORS}
XML.DEFAULT= ${XML_MIRRORS}
-NO_TIDY.DEFAULT= yes
PARAMS.lastmod+= --param 'target' "'lastmod'"
PARAMS.mirrors-ftp-index+= --param 'type' "'ftp'" \
diff --git a/fr_FR.ISO8859-1/books/handbook/Makefile b/fr_FR.ISO8859-1/books/handbook/Makefile
index 8663f22dc1..f40a13621f 100644
--- a/fr_FR.ISO8859-1/books/handbook/Makefile
+++ b/fr_FR.ISO8859-1/books/handbook/Makefile
@@ -257,7 +257,6 @@ XMLDOCS= lastmod:::mirrors.lastmod.inc \
DEPENDSET.DEFAULT= transtable mirror
XSLT.DEFAULT= ${XSL_MIRRORS}
XML.DEFAULT= ${XML_MIRRORS}
-NO_TIDY.DEFAULT= yes
PARAMS.lastmod+= --param 'target' "'lastmod'"
PARAMS.mirrors-ftp-index+= --param 'type' "'ftp'" \
diff --git a/hu_HU.ISO8859-2/articles/compiz-fusion/Makefile b/hu_HU.ISO8859-2/articles/compiz-fusion/Makefile
index 1a841fa1fe..156f6d70b8 100644
--- a/hu_HU.ISO8859-2/articles/compiz-fusion/Makefile
+++ b/hu_HU.ISO8859-2/articles/compiz-fusion/Makefile
@@ -7,8 +7,6 @@
# %SRCID% 1.1
#
-NO_TIDY = yes
-
MAINTAINER = doc@FreeBSD.org
DOC?= article
diff --git a/hu_HU.ISO8859-2/articles/cups/Makefile b/hu_HU.ISO8859-2/articles/cups/Makefile
index ae7697c49b..5c1c095cbe 100644
--- a/hu_HU.ISO8859-2/articles/cups/Makefile
+++ b/hu_HU.ISO8859-2/articles/cups/Makefile
@@ -7,8 +7,6 @@
# %SRCID% 1.2
#
-NO_TIDY= yes
-
MAINTAINER= doc@FreeBSD.org
DOC?= article
diff --git a/hu_HU.ISO8859-2/articles/explaining-bsd/Makefile b/hu_HU.ISO8859-2/articles/explaining-bsd/Makefile
index 6c7d521e6a..3d3f3220ed 100644
--- a/hu_HU.ISO8859-2/articles/explaining-bsd/Makefile
+++ b/hu_HU.ISO8859-2/articles/explaining-bsd/Makefile
@@ -6,12 +6,6 @@
# %SRCID% 1.6
#
-#
-# Tidy messes up iso-8859-2 characters
-#
-
-NO_TIDY= yes
-
MAINTAINER= gabor@FreeBSD.org
DOC?= article
diff --git a/hu_HU.ISO8859-2/articles/gjournal-desktop/Makefile b/hu_HU.ISO8859-2/articles/gjournal-desktop/Makefile
index f397ca0ebf..a1ea94ceb9 100644
--- a/hu_HU.ISO8859-2/articles/gjournal-desktop/Makefile
+++ b/hu_HU.ISO8859-2/articles/gjournal-desktop/Makefile
@@ -7,8 +7,6 @@
# %SRCID% 1.1
#
-NO_TIDY= yes
-
MAINTAINER= doc@FreeBSD.org
DOC?= article
diff --git a/hu_HU.ISO8859-2/articles/laptop/Makefile b/hu_HU.ISO8859-2/articles/laptop/Makefile
index d150d68778..f11d6e7e59 100644
--- a/hu_HU.ISO8859-2/articles/laptop/Makefile
+++ b/hu_HU.ISO8859-2/articles/laptop/Makefile
@@ -6,12 +6,6 @@
# %SRCID% 1.4
#
-#
-# Tidy messes up iso-8859-2 characters
-#
-
-NO_TIDY= yes
-
MAINTAINER= doc@FreeBSD.org
DOC?= article
diff --git a/hu_HU.ISO8859-2/articles/linux-comparison/Makefile b/hu_HU.ISO8859-2/articles/linux-comparison/Makefile
index 7e5040c4dd..ec5b75a2cd 100644
--- a/hu_HU.ISO8859-2/articles/linux-comparison/Makefile
+++ b/hu_HU.ISO8859-2/articles/linux-comparison/Makefile
@@ -6,12 +6,6 @@
# %SRCID% 1.1
#
-#
-# Tidy messes up iso-8859-2 characters
-#
-
-NO_TIDY= yes
-
MAINTAINER= gabor@FreeBSD.org
DOC?= article
diff --git a/hu_HU.ISO8859-2/articles/linux-users/Makefile b/hu_HU.ISO8859-2/articles/linux-users/Makefile
index 61647af74b..e258717fb9 100644
--- a/hu_HU.ISO8859-2/articles/linux-users/Makefile
+++ b/hu_HU.ISO8859-2/articles/linux-users/Makefile
@@ -7,12 +7,6 @@
# %SRCID% 1.1
#
-#
-# Tidy messes up iso-8859-2 characters
-#
-
-NO_TIDY = yes
-
MAINTAINER = doc@FreeBSD.org
DOC?= article
diff --git a/hu_HU.ISO8859-2/books/faq/Makefile b/hu_HU.ISO8859-2/books/faq/Makefile
index 232f5b447d..b07db6c6f9 100644
--- a/hu_HU.ISO8859-2/books/faq/Makefile
+++ b/hu_HU.ISO8859-2/books/faq/Makefile
@@ -8,8 +8,6 @@
MAINTAINER=doc@FreeBSD.org
-NO_TIDY = yes
-
DOC?= book
FORMATS?= html-split html
diff --git a/hu_HU.ISO8859-2/books/fdp-primer/Makefile b/hu_HU.ISO8859-2/books/fdp-primer/Makefile
index bdc300ffed..8186281f82 100644
--- a/hu_HU.ISO8859-2/books/fdp-primer/Makefile
+++ b/hu_HU.ISO8859-2/books/fdp-primer/Makefile
@@ -7,8 +7,6 @@
# Build the FreeBSD Documentation Project Primer.
#
-NO_TIDY=yes
-
MAINTAINER=doc@FreeBSD.org
DOC?= book
diff --git a/hu_HU.ISO8859-2/books/handbook/Makefile b/hu_HU.ISO8859-2/books/handbook/Makefile
index 0d112fbd13..883c7411c7 100644
--- a/hu_HU.ISO8859-2/books/handbook/Makefile
+++ b/hu_HU.ISO8859-2/books/handbook/Makefile
@@ -38,12 +38,6 @@
.PATH: ${.CURDIR}/../../share/xml/glossary
-#
-# Tidy messes up iso-8859-2 characters
-#
-
-NO_TIDY= yes
-
MAINTAINER= doc@FreeBSD.org
DOC?= book
@@ -290,7 +284,6 @@ XMLDOCS= lastmod:::mirrors.lastmod.inc \
DEPENDSET.DEFAULT= transtable mirror
XSLT.DEFAULT= ${XSL_MIRRORS}
XML.DEFAULT= ${XML_MIRRORS}
-NO_TIDY.DEFAULT= yes
PARAMS.lastmod+= --param 'target' "'lastmod'"
PARAMS.mirrors-ftp-index+= --param 'type' "'ftp'" \
diff --git a/it_IT.ISO8859-15/books/handbook/Makefile b/it_IT.ISO8859-15/books/handbook/Makefile
index 6bed57bf25..edcc985a12 100644
--- a/it_IT.ISO8859-15/books/handbook/Makefile
+++ b/it_IT.ISO8859-15/books/handbook/Makefile
@@ -258,7 +258,6 @@ XMLDOCS= lastmod:::mirrors.lastmod.inc \
DEPENDSET.DEFAULT= transtable mirror
XSLT.DEFAULT= ${XSL_MIRRORS}
XML.DEFAULT= ${XML_MIRRORS}
-NO_TIDY.DEFAULT= yes
PARAMS.lastmod+= --param 'target' "'lastmod'"
PARAMS.mirrors-ftp-index+= --param 'type' "'ftp'" \
diff --git a/ja_JP.eucJP/books/handbook/Makefile b/ja_JP.eucJP/books/handbook/Makefile
index 2ad890a69b..e41cf1dfad 100644
--- a/ja_JP.eucJP/books/handbook/Makefile
+++ b/ja_JP.eucJP/books/handbook/Makefile
@@ -330,7 +330,6 @@ XMLDOCS= lastmod:::mirrors.lastmod.inc \
DEPENDSET.DEFAULT= transtable mirror
XSLT.DEFAULT= ${XSL_MIRRORS}
XML.DEFAULT= ${XML_MIRRORS}
-NO_TIDY.DEFAULT= yes
PARAMS.lastmod+= --param 'target' "'lastmod'"
diff --git a/mn_MN.UTF-8/books/handbook/Makefile b/mn_MN.UTF-8/books/handbook/Makefile
index 8f5a787732..4dd5b2bc07 100644
--- a/mn_MN.UTF-8/books/handbook/Makefile
+++ b/mn_MN.UTF-8/books/handbook/Makefile
@@ -328,7 +328,6 @@ XMLDOCS= lastmod:::mirrors.lastmod.inc \
DEPENDSET.DEFAULT= transtable mirror
XSLT.DEFAULT= ${XSL_MIRRORS}
XML.DEFAULT= ${XML_MIRRORS}
-NO_TIDY.DEFAULT= yes
PARAMS.lastmod+= --param 'target' "'lastmod'"
PARAMS.mirrors-ftp-index+= --param 'type' "'ftp'" \
diff --git a/nl_NL.ISO8859-1/books/handbook/Makefile b/nl_NL.ISO8859-1/books/handbook/Makefile
index fb101b3ce9..4889f85d55 100644
--- a/nl_NL.ISO8859-1/books/handbook/Makefile
+++ b/nl_NL.ISO8859-1/books/handbook/Makefile
@@ -328,7 +328,6 @@ XMLDOCS= lastmod:::mirrors.lastmod.inc \
DEPENDSET.DEFAULT= transtable mirror
XSLT.DEFAULT= ${XSL_MIRRORS}
XML.DEFAULT= ${XML_MIRRORS}
-NO_TIDY.DEFAULT= yes
PARAMS.lastmod+= --param 'target' "'lastmod'"
PARAMS.mirrors-ftp-index+= --param 'type' "'ftp'" \
diff --git a/pl_PL.ISO8859-2/books/handbook/Makefile b/pl_PL.ISO8859-2/books/handbook/Makefile
index 65f970104e..f56861996e 100644
--- a/pl_PL.ISO8859-2/books/handbook/Makefile
+++ b/pl_PL.ISO8859-2/books/handbook/Makefile
@@ -226,7 +226,6 @@ XMLDOCS= lastmod:::mirrors.lastmod.inc \
DEPENDSET.DEFAULT= transtable mirror
XSLT.DEFAULT= ${XSL_MIRRORS}
XML.DEFAULT= ${XML_MIRRORS}
-NO_TIDY.DEFAULT= yes
PARAMS.lastmod+= --param 'target' "'lastmod'"
PARAMS.mirrors-ftp-index+= --param 'type' "'ftp'" \
diff --git a/ru_RU.KOI8-R/books/handbook/Makefile b/ru_RU.KOI8-R/books/handbook/Makefile
index db8c914aac..8e246cbaec 100644
--- a/ru_RU.KOI8-R/books/handbook/Makefile
+++ b/ru_RU.KOI8-R/books/handbook/Makefile
@@ -234,7 +234,6 @@ XMLDOCS= lastmod:::mirrors.lastmod.inc \
DEPENDSET.DEFAULT= transtable mirror
XSLT.DEFAULT= ${XSL_MIRRORS}
XML.DEFAULT= ${XML_MIRRORS}
-NO_TIDY.DEFAULT= yes
PARAMS.lastmod+= --param 'target' "'lastmod'"
PARAMS.mirrors-ftp-index+= --param 'type' "'ftp'" \
diff --git a/share/mk/doc.project.mk b/share/mk/doc.project.mk
index fac6b42cff..2f4dbb8bcb 100644
--- a/share/mk/doc.project.mk
+++ b/share/mk/doc.project.mk
@@ -92,7 +92,6 @@ PERL?= perl
REALPATH?= /bin/realpath
SETENV?= /usr/bin/env
XSLTPROC?= ${PREFIX}/bin/xsltproc
-TIDY?= ${PREFIX}/bin/tidy
XMLLINT?= ${PREFIX}/bin/xmllint
#
# In teTeX 3.0 and later, pdfetex(1) is used as the default TeX
diff --git a/zh_CN.GB2312/books/handbook/Makefile b/zh_CN.GB2312/books/handbook/Makefile
index 002ffb24f8..3d99334436 100644
--- a/zh_CN.GB2312/books/handbook/Makefile
+++ b/zh_CN.GB2312/books/handbook/Makefile
@@ -282,7 +282,6 @@ XMLDOCS= lastmod:::mirrors.lastmod.inc \
DEPENDSET.DEFAULT= transtable mirror
XSLT.DEFAULT= ${XSL_MIRRORS}
XML.DEFAULT= ${XML_MIRRORS}
-NO_TIDY.DEFAULT= yes
PARAMS.lastmod+= --param 'target' "'lastmod'"
PARAMS.mirrors-ftp-index+= --param 'type' "'ftp'" \
diff --git a/zh_TW.Big5/books/handbook/Makefile b/zh_TW.Big5/books/handbook/Makefile
index 86d6a538c6..b4265c7862 100644
--- a/zh_TW.Big5/books/handbook/Makefile
+++ b/zh_TW.Big5/books/handbook/Makefile
@@ -270,7 +270,6 @@ XMLDOCS= lastmod:::mirrors.lastmod.inc \
DEPENDSET.DEFAULT= transtable mirror
XSLT.DEFAULT= ${XSL_MIRRORS}
XML.DEFAULT= ${XML_MIRRORS}
-NO_TIDY.DEFAULT= yes
PARAMS.lastmod+= --param 'target' "'lastmod'"
PARAMS.mirrors-ftp-index+= --param 'type' "'ftp'" \
From 3a1f4b30050d0ebe1c296b87e84d549e289ab3b0 Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Fri, 1 Feb 2013 19:50:33 +0000
Subject: [PATCH 051/121] - Build index in the DocBook XSL way
---
share/mk/doc.docbook.mk | 74 ++++-------------------------------------
1 file changed, 7 insertions(+), 67 deletions(-)
diff --git a/share/mk/doc.docbook.mk b/share/mk/doc.docbook.mk
index dd9f8814b2..e76d47dd28 100644
--- a/share/mk/doc.docbook.mk
+++ b/share/mk/doc.docbook.mk
@@ -139,13 +139,10 @@ DSLHTML?= ${DOC_PREFIX}/share/xml/default.dsl
DSLPRINT?= ${DOC_PREFIX}/share/xml/default.dsl
DSLPGP?= ${DOC_PREFIX}/share/xml/pgp.dsl
-COLLATEINDEX= ${PREFIX}/share/sgml/docbook/dsssl/modular/bin/collateindex.pl
-
XSLXHTML?= ${DOC_PREFIX}/share/xsl/freebsd-xhtml.xsl
XSLXHTMLCHUNK?= ${DOC_PREFIX}/share/xsl/freebsd-xhtml-chunk.xsl
XSLEPUB?= ${DOC_PREFIX}/share/xsl/freebsd-epub.xsl
XSLFO?= ${DOC_PREFIX}/share/xsl/freebsd-fo.xsl
-INDEXREPORTSCRIPT= ${DOC_PREFIX}/share/misc/indexreport.pl
IMAGES_LIB?=
@@ -158,10 +155,6 @@ KNOWN_FORMATS= html html.tar html-split html-split.tar \
CSS_SHEET?= ${DOC_PREFIX}/share/misc/docbook.css
PDFTEX_DEF?= ${DOC_PREFIX}/share/web2c/pdftex.def
-HTMLOPTS?= -ioutput.html -d ${DSLHTML} ${HTMLFLAGS}
-
-HTMLTXTOPTS?= -ioutput.html -d ${DSLHTML} ${HTMLTXTFLAGS}
-
PRINTOPTS?= -ioutput.print -d ${DSLPRINT} ${PRINTFLAGS}
.if defined(BOOK_OUTPUT)
@@ -268,6 +261,13 @@ ZIP_CMD?= ${PREFIX}/bin/zip -j ${ZIP}
#
NO_SUBDIR= YES
+#
+# Index generation
+#
+
+.if defined(GEN_INDEX)
+XSLTPROCOPTS+= --param generate.index "1"
+.endif
# ------------------------------------------------------------------------
#
@@ -421,25 +421,6 @@ CLEANFILES+= ${.CURDIR:T}.${_curformat}.${_curcomp}
.endfor
.endif
-#
-# Index generation
-#
-
-.if defined(GEN_INDEX) && defined(HAS_INDEX)
-JADEFLAGS+= -i chap.index
-HTML_SPLIT_INDEX?= html-split.index
-HTML_INDEX?= html.index
-PRINT_INDEX?= print.index
-INDEX_SGML?= index.xml
-
-CLEANFILES+= ${INDEX_SGML} ${HTML_SPLIT_INDEX} ${HTML_INDEX} ${PRINT_INDEX}
-
-INIT_INDEX_SGML_CMD?= ${PERL} ${COLLATEINDEX} -i doc-index -N -o ${INDEX_SGML}
-GEN_INDEX_SGML_CMD?= ${PERL} ${COLLATEINDEX} -i doc-index -g -o ${INDEX_SGML} ${.ALLSRC:M*.index}
-.else
-GEN_INDEX_SGML_CMD?= @${ECHO} "Index is disabled or no index to generate."
-.endif
-
.MAIN: all
all: ${SRCS} ${_docs}
@@ -477,12 +458,10 @@ ${DOC}.parsed.xml: ${SRCS}
index.html: ${DOC}.parsed.xml ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG} \
${HTML_SPLIT_INDEX} ${LOCAL_CSS_SHEET}
- ${GEN_INDEX_SGML_CMD}
${XSLTPROC} ${XSLTPROCOPTS} ${XSLXHTMLCHUNK} ${DOC}.parsed.xml
${DOC}.html: ${DOC}.parsed.xml ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG} \
${LOCAL_CSS_SHEET}
- ${GEN_INDEX_SGML_CMD}
${XSLTPROC} ${XSLTPROCOPTS} ${XSLXHTML} ${DOC}.parsed.xml > ${.TARGET}
${DOC}.html-split.tar: HTML.manifest ${LOCAL_IMAGES_LIB} \
@@ -545,7 +524,6 @@ ${.CURDIR:T}.pdb.${_curcomp}: ${DOC}.pdb.${_curcomp}
.if !defined(NO_RTF)
${DOC}.rtf: ${DOC}.parsed.xml ${LOCAL_IMAGES_EPS} ${PRINT_INDEX} \
${LOCAL_IMAGES_TXT} ${LOCAL_IMAGES_PNG}
- ${GEN_INDEX_SGML_CMD}
${JADE_CMD} -V rtf-backend ${PRINTOPTS} -ioutput.rtf.images \
${JADEOPTS} -t rtf -o ${.TARGET}-nopng ${XMLDECL} \
${DOC}.parsed.xml
@@ -570,7 +548,6 @@ ${DOC}.rtf:
${DOC}.tex: ${SRCS} ${LOCAL_IMAGES_EPS} ${PRINT_INDEX} \
${LOCAL_IMAGES_TXT} ${LOCAL_IMAGES_EN} \
${DOC}.parsed.xml
- ${GEN_INDEX_SGML_CMD}
${JADE_CMD} -V tex-backend ${PRINTOPTS} \
${JADEOPTS} -t tex -o ${.TARGET} ${XMLDECL} ${DOC}.parsed.xml
@@ -580,7 +557,6 @@ ${DOC}.tex-ps: ${DOC}.tex
.if !target(${DOC}.tex-pdf)
${DOC}.tex-pdf: ${SRCS} ${IMAGES_PDF} ${PRINT_INDEX} \
${LOCAL_IMAGES_TXT} ${DOC}.parsed.xml
- ${GEN_INDEX_SGML_CMD}
${RM} -f ${.TARGET}
${CAT} ${PDFTEX_DEF} > ${.TARGET}
${JADE_CMD} -V tex-backend ${PRINTOPTS} -ioutput.print.pdf \
@@ -641,7 +617,6 @@ ${DOC}.tex-pdf:
.elif ${RENDERENGINE} == "fop"
${DOC}.fo: ${DOC}.xml ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG}
- ${GEN_INDEX_SGML_CMD}
${XSLTPROC} ${XSLTPROCOPTS} ${XSLFO} ${DOC}.parsed.xml > ${.TARGET}
${DOC}.pdf: ${DOC}.fo ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG}
@@ -684,35 +659,6 @@ lint validate: ${SRCS}
${XMLLINT} --nonet --noout --noent --valid ${MASTERDOC}
@${RM} -rf ${CLEANFILES} ${CLEANDIRS}
-# ------------------------------------------------------------------------
-#
-# Index targets
-#
-
-#
-# Generate a different .index file based on the format name
-#
-# If we're not generating an index (the default) then we need to create
-# an empty index.xml file so that we can reference index.xml in book.sgml
-#
-
-
-${HTML_INDEX}: ${DOC}.parsed.xml ${LOCAL_IMAGES_TXT}
- ${INIT_INDEX_SGML_CMD}
- ${JADE_CMD} -V html-index -V nochunks ${HTMLOPTS} -ioutput.html.images \
- ${JADEOPTS} -t sgml ${XMLDECL} ${DOC}.parsed.xml > /dev/null
-
-${HTML_SPLIT_INDEX}: ${SRCS} ${LOCAL_IMAGES_TXT}
- ${INIT_INDEX_SGML_CMD}
- ${JADE_CMD} -V html-index ${HTMLOPTS} -ioutput.html.images \
- ${JADEOPTS} -t sgml ${XMLDECL} ${DOC}.parsed.xml > /dev/null
-
-.if !target(${PRINT_INDEX})
-${PRINT_INDEX}: ${HTML_INDEX}
- ${CP} -p ${HTML_INDEX} ${.TARGET}
-.endif
-
-
# ------------------------------------------------------------------------
#
# Compress targets
@@ -821,12 +767,6 @@ spellcheck-${_curformat}:
spellcheck: ${FORMATS:C/^/spellcheck-/}
-indexreport:
-.for _entry in ${SRCS:M*.xml}
- @echo "indexreport ${_entry}"
- @${PERL} ${INDEXREPORTSCRIPT} ${.CURDIR}/${_entry}
-.endfor
-
#
# Build a list of install-format targets to be installed. These will be
# dependencies for the "realinstall" target.
From 7919bb16d6e12453f371573b7704f43868c2a036 Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Fri, 1 Feb 2013 19:51:58 +0000
Subject: [PATCH 052/121] - Remove some rarely used and badly supported
features
---
share/mk/doc.docbook.mk | 68 -----------------------------------------
1 file changed, 68 deletions(-)
diff --git a/share/mk/doc.docbook.mk b/share/mk/doc.docbook.mk
index e76d47dd28..ed6593135a 100644
--- a/share/mk/doc.docbook.mk
+++ b/share/mk/doc.docbook.mk
@@ -57,45 +57,6 @@
# spellchecker. For example, PGP keys and filenames
# will be omitted from this output.
#
-# Print-output options :
-#
-# NICE_HEADERS If defined, customized chapter headers will be created
-# that you may find more aesthetically pleasing. Note
-# that this option only effects print output formats for
-# English language books.
-#
-# MIN_SECT_LABELS If defined, do not display the section number for 4th
-# and 5th level section titles. This would change
-# "N.N.N.N Section title" into "Section Title" while
-# higher level sections are still printed with numbers.
-#
-# TRACE={1,2} Trace TeX's memory usage. Set this to 1 for minimal
-# tracing or 2 for maximum tracing. TeX memory
-# statistics will be written out to <filename>.log.
-# For more information see the TeXbook, p301.
-#
-# TWO_SIDE If defined, two sided output will be created. This
-# means that new chapters will only start on odd
-# numbered (aka right side, aka recto) pages and the
-# headers and footers will be aligned appropriately
-# for double sided paper. Blank pages may be added as
-# needed.
-#
-# JUSTIFY If defined, text will be right justified so that the
-# right edge is smooth. Words may be hyphenated using
-# the default TeX hyphenation rules for this purpose.
-#
-# BOOK_OUTPUT A collection of options are set suitable for printing
-# a book. This option may be an order of magnitude more
-# CPU intensive than the default build.
-#
-# RLE Use Run-Length Encoding for EPS files, this will
-# result in significantly smaller PostScript files,
-# but may take longer for a printer to process.
-#
-# GREYSCALE_IMAGES Convert the screenshots to greyscale before
-# embedding them into the PostScript output.
-#
# Package building options:
#
# BZIP2_PACKAGE Use bzip2(1) utility to compress package tarball
@@ -157,38 +118,9 @@ PDFTEX_DEF?= ${DOC_PREFIX}/share/web2c/pdftex.def
PRINTOPTS?= -ioutput.print -d ${DSLPRINT} ${PRINTFLAGS}
-.if defined(BOOK_OUTPUT)
-NICE_HEADERS=1
-MIN_SECT_LABELS=1
-TWO_SIDE=1
-JUSTIFY=1
-#WITH_FOOTNOTES=1
-#GEN_INDEX=1
-.endif
-.if defined(JUSTIFY)
-TEX_CMDSEQ+= \RequirePackage{url}
-PRINTOPTS+= -ioutput.print.justify
-.endif
-.if defined(TWO_SIDE)
-PRINTOPTS+= -V %two-side% -ioutput.print.twoside
-TEX_CMDSEQ+= \def\PageTwoSide{1}
-.endif
-.if defined(NICE_HEADERS)
-PRINTOPTS+= -ioutput.print.niceheaders
-.endif
-.if defined(MIN_SECT_LABELS)
-PRINTOPTS+= -V minimal-section-labels
-.endif
-.if defined(TRACE)
-TEX_CMDSEQ+= \tracingstats=${TRACE}
-.endif
-.if defined(RLE)
-PNMTOPSFLAGS+= -rle
-.endif
.if defined(WWWFREEBSDORG)
HTMLFLAGS+= -V %html-header-script%
.endif
-
.if !defined(WITH_INLINE_LEGALNOTICE) || empty(WITH_INLINE_LEGALNOTICE)
HTMLFLAGS+= -V %generate-legalnotice-link%
.endif
From 81a8fff0b6c1adbbb3988d9ae8f33fbf8a280abb Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Sat, 2 Feb 2013 09:24:31 +0000
Subject: [PATCH 053/121] - Deactivate indexes by default, they are turned on
by setting GEN_INDEX - Add index to handbook
---
en_US.ISO8859-1/books/handbook/chapters.ent | 3 +--
share/xsl/freebsd-common.xsl | 1 +
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/en_US.ISO8859-1/books/handbook/chapters.ent b/en_US.ISO8859-1/books/handbook/chapters.ent
index 6ac388f3c9..d7efb577fe 100644
--- a/en_US.ISO8859-1/books/handbook/chapters.ent
+++ b/en_US.ISO8859-1/books/handbook/chapters.ent
@@ -66,7 +66,6 @@
<!ENTITY chap.eresources.www.inc SYSTEM "eresources.xml.www.inc">
<!ENTITY chap.pgpkeys SYSTEM "pgpkeys/chapter.xml">
<!ENTITY chap.freebsd-glossary "&freebsd-glossary;">
-<!-- XXX -->
- <!ENTITY chap.index "">
+ <!ENTITY chap.index SYSTEM "index.xml">
<!ENTITY chap.colophon SYSTEM "colophon.xml">
diff --git a/share/xsl/freebsd-common.xsl b/share/xsl/freebsd-common.xsl
index 12c9d0cdde..541e3e2881 100644
--- a/share/xsl/freebsd-common.xsl
+++ b/share/xsl/freebsd-common.xsl
@@ -18,4 +18,5 @@
<xsl:param name="section.autolabel" select="1"/>
<xsl:param name="section.label.includes.component.label" select="1"/>
+ <xsl:param name="generate.index" select="0"/>
</xsl:stylesheet>
From 4cb9e266b62d01b0528e5dbb939a21f00453776b Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Sat, 2 Feb 2013 14:52:15 +0000
Subject: [PATCH 054/121] - Remove doc.html.mk, which is not used any more -
Factor out command macros for better readability and consistency and less
duplication - Make some macros more consistent with the rest
---
share/mk/doc.commands.mk | 149 ++++++++++++++++
share/mk/doc.common.mk | 8 -
share/mk/doc.docbook.mk | 70 +-------
share/mk/doc.html.mk | 371 ---------------------------------------
share/mk/doc.images.mk | 36 ----
share/mk/doc.project.mk | 51 +-----
share/mk/web.site.mk | 40 -----
7 files changed, 157 insertions(+), 568 deletions(-)
create mode 100644 share/mk/doc.commands.mk
delete mode 100644 share/mk/doc.html.mk
diff --git a/share/mk/doc.commands.mk b/share/mk/doc.commands.mk
new file mode 100644
index 0000000000..0a94248e87
--- /dev/null
+++ b/share/mk/doc.commands.mk
@@ -0,0 +1,149 @@
+#
+# $FreeBSD$
+#
+
+CP?= /bin/cp
+CAT?= /bin/cat
+ECHO_CMD?= echo
+LN?= /bin/ln
+MKDIR?= /bin/mkdir
+RM?= /bin/rm
+MV?= /bin/mv
+HTML2TXT?= ${PREFIX}/bin/w3m
+HTML2TXTOPTS?= -dump ${HTML2TXTFLAGS}
+ISPELL?= ispell
+ISPELLOPTS?= -l -p /usr/share/dict/freebsd ${ISPELLFLAGS}
+.if exists(/usr/bin/perl)
+PERL?= /usr/bin/perl
+.elif exists(/usr/local/bin/perl)
+PERL?= /usr/local/bin/perl
+.else
+PERL?= perl
+.endif
+REALPATH?= /bin/realpath
+SETENV?= /usr/bin/env
+XSLTPROC?= ${PREFIX}/bin/xsltproc
+XMLLINT?= ${PREFIX}/bin/xmllint
+
+BUNZIP2?= /usr/bin/bunzip2
+FETCH?= /usr/bin/fetch
+FIND?= /usr/bin/find
+LN?= /bin/ln
+SH?= /bin/sh
+SORT?= /usr/bin/sort
+TRUE?= /usr/bin/true
+
+AWK?= /usr/bin/awk
+GREP?= /usr/bin/grep
+SED?= /usr/bin/sed
+
+PKG_CREATE?= /usr/sbin/pkg_create
+TAR?= /usr/bin/tar
+TOUCH?= /usr/bin/touch
+XARGS?= /usr/bin/xargs
+
+BZIP2?= bzip2
+BZIPOPTS?= -qf9
+GZIP?= gzip
+GZIPOPTS?= -qf9
+ZIP?= ${PREFIX}/bin/zip
+ZIPOPTS?= -j9
+
+.if exists(${PREFIX}/bin/jade) && !defined(OPENJADE)
+JADE?= ${PREFIX}/bin/jade
+.else
+JADE?= ${PREFIX}/bin/openjade
+JADEFLAGS+= -V openjade
+.endif
+
+FOP?= ${PREFIX}/bin/fop
+FOPOPTS?=
+
+GROFF?= groff
+HTML2PDB?= ${PREFIX}/bin/iSiloBSD
+HTML2PDBOPTS?= -y -d0 -Idef ${HTML2PDBFLAGS}
+DVIPS?= ${PREFIX}/bin/dvips
+.if defined(PAPERSIZE)
+DVIPSOPTS?= -t ${PAPERSIZE:L}
+.endif
+DVIPSOPTS+= ${DVIPSFLAGS}
+
+#
+# In teTeX 3.0 and later, pdfetex(1) is used as the default TeX
+# engine for JadeTeX and tex(1) cannot be used as ${TEX_CMD} anymore
+# due to incompatibility of the format file. Since the teTeX 3.0
+# distribution has "${PREFIX}/share/texmf-dist/LICENSE.texmf,"
+# it is checked here to determine which TeX engine should be used.
+.if exists(${PREFIX}/share/texmf-dist/LICENSE.texmf)
+TEX_CMD?= ${PREFIX}/bin/etex
+PDFTEX_CMD?= ${PREFIX}/bin/pdfetex
+.else
+TEX_CMD?= ${PREFIX}/bin/tex
+PDFTEX_CMD?= ${PREFIX}/bin/pdftex
+.endif
+LATEX_CMD?= ${PREFIX}/bin/latex
+JADETEX_CMD?= ${TEX_CMD} "&jadetex"
+JADETEX_PREPROCESS?= /bin/cat
+PDFJADETEX_CMD?=${PDFTEX_CMD} "&pdfjadetex"
+PDFJADETEX_PREPROCESS?= /bin/cat
+PS2PDF?= ${PREFIX}/bin/ps2pdf
+FOP_CMD?= ${PREFIX}/share/fop/fop.sh
+XEP_CMD?= sh ${HOME}/XEP/xep.sh
+JAVA_CMD?= ${PREFIX}/bin/javavm
+SAXON_CMD?= ${JAVA_CMD} -jar ${PREFIX}/share/java/classes/saxon.jar
+
+#
+# Currently, we have to use the FixRTF utility available as textproc/fixrtf
+# to apply several RTF fixups:
+#
+# 1. Embed PNGs into RTF. (Option: -p)
+# 2. Embed FreeBSD-specific information into RTF, such as organization name,
+# building time. But unfortunately, so far only Microsoft Word can read
+# them. In contrast, Microsoft Word Viewer and OpenOffice even cannot read
+# this kind of information from RTF created by Microsoft Word and
+# OpenOffice. (Option: -i)
+# 3. Do some locale-specific fixing. (Option: -e <encoding>)
+#
+# This is a transitional solution before Jade/OpenJade provides these features.
+#
+FIXRTF?= ${PREFIX}/bin/fixrtf
+FIXRTFOPTS?= -i -p
+.if defined(SP_ENCODING)
+FIXRTFOPTS+= -e ${SP_ENCODING}
+.endif
+
+SCR2PNG?= ${PREFIX}/bin/scr2png
+SCR2PNGOPTS?= ${SCR2PNGFLAGS}
+SCR2TXT?= ${PREFIX}/bin/scr2txt
+SCR2TXTOPTS?= -l ${SCR2TXTFLAGS}
+EPS2PNM?= ${PREFIX}/bin/gs
+EPS2PNMOPTS?= -q -dBATCH -dGraphicsAlphaBits=4 -dTextAlphaBits=4 \
+ -dEPSCrop -r${EPS2PNM_RES}x${EPS2PNM_RES} \
+ -dNOPAUSE -dSAFER -sDEVICE=pnm -sOutputFile=-
+#
+# epsgeom is a perl script for 1) extracting geometry information
+# from a .eps file and 2) arrange it for ghostscript's pnm driver.
+#
+EPSGEOM?= ${PERL} ${DOC_PREFIX}/share/misc/epsgeom
+EPSGEOMOPTS?= ${EPS2PNM_RES} ${EPS2PNM_RES}
+PNMTOPNG?= ${PREFIX}/bin/pnmtopng
+PNMTOPNGOPTS?= ${PNGTOPNGFLAGS}
+PNGTOPNM?= ${PREFIX}/bin/pngtopnm
+PNGTOPNMOPTS?= ${PNGTOPNMFLAGS}
+PPMTOPGM?= ${PREFIX}/bin/ppmtopgm
+PPMTOPGMOPTS?= ${PPMTOPGMFLAGS}
+PNMTOPS?= ${PREFIX}/bin/pnmtops
+PNMTOPSOPTS?= -noturn ${PNMTOPSFLAGS}
+EPSTOPDF?= ${PREFIX}/bin/epstopdf
+EPSTOPDFOPTS?= ${EPSTOPDFFLAGS}
+#
+PIC2PS?= ${GROFF} -p -S -Wall -mtty-char -man
+#
+PS2EPS?= ${PREFIX}/bin/gs
+PS2EPSOPTS?= -q -dNOPAUSE -dSAFER -dDELAYSAFER \
+ -sPAPERSIZE=letter -r72 -sDEVICE=bit \
+ -sOutputFile=/dev/null ${PS2EPSFLAGS} ps2epsi.ps
+PS2BBOX?= ${PREFIX}/bin/gs
+PS2BBOXOPTS?= -q -dNOPAUSE -dBATCH -dSAFER -dDELAYSAFER \
+ -sPAPERSIZE=letter -r72 -sDEVICE=bbox \
+ -sOutputFile=/dev/null ${PS2BBOXFLAGS}
diff --git a/share/mk/doc.common.mk b/share/mk/doc.common.mk
index 6985f9e796..5785078b24 100644
--- a/share/mk/doc.common.mk
+++ b/share/mk/doc.common.mk
@@ -5,14 +5,6 @@
# documents commonly used in doc/ and www/ tree.
#
-AWK?= /usr/bin/awk
-GREP?= /usr/bin/grep
-REALPATH?= /bin/realpath
-SED?= /usr/bin/sed
-# a hack to keep tidy from converting tabs to spaces
-# replace them with 	 before calling tidy
-REINPLACE_TABS_CMD?= ${SED} -i "" -e 's/ /\&\#09;/g'
-
# ------------------------------------------------------------------------
#
# Work out the language and encoding used for this document.
diff --git a/share/mk/doc.docbook.mk b/share/mk/doc.docbook.mk
index ed6593135a..afcbfd0a3a 100644
--- a/share/mk/doc.docbook.mk
+++ b/share/mk/doc.docbook.mk
@@ -81,21 +81,8 @@ RENDERENGINE?= jade
DSLHTML?= ${DOC_PREFIX}/share/xml/spellcheck.dsl
.endif
-XMLLINT?= /usr/local/bin/xmllint
XMLDECL?= /usr/local/share/sgml/docbook/dsssl/modular/dtds/decls/xml.dcl
-.if exists(${PREFIX}/bin/jade) && !defined(OPENJADE)
-JADE?= ${PREFIX}/bin/jade
-.else
-JADE?= ${PREFIX}/bin/openjade
-JADEFLAGS+= -V openjade
-.endif
-
-JADE_CMD= ${SETENV} ${JADE_ENV} ${JADE}
-
-FOP?= ${PREFIX}/bin/fop
-FOPOPTS?=
-
DSLHTML?= ${DOC_PREFIX}/share/xml/default.dsl
DSLPRINT?= ${DOC_PREFIX}/share/xml/default.dsl
DSLPGP?= ${DOC_PREFIX}/share/xml/pgp.dsl
@@ -142,51 +129,6 @@ HTMLFLAGS+= -V %show-all-trademark-symbols%
PRINTFLAGS+= -V %show-all-trademark-symbols%
.endif
-PERL?= /usr/bin/perl
-PKG_CREATE?= /usr/sbin/pkg_create
-SORT?= /usr/bin/sort
-TAR?= /usr/bin/tar
-TOUCH?= /usr/bin/touch
-XARGS?= /usr/bin/xargs
-
-GROFF?= groff
-HTML2TXT?= ${PREFIX}/bin/links
-HTML2TXTOPTS?= -dump -width 72 ${HTML2TXTFLAGS}
-HTML2PDB?= ${PREFIX}/bin/iSiloBSD
-HTML2PDBOPTS?= -y -d0 -Idef ${HTML2PDBFLAGS}
-DVIPS?= ${PREFIX}/bin/dvips
-.if defined(PAPERSIZE)
-DVIPSOPTS?= -t ${PAPERSIZE:L}
-.endif
-DVIPSOPTS+= ${DVIPSFLAGS}
-
-#
-# Currently, we have to use the FixRTF utility available as textproc/fixrtf
-# to apply several RTF fixups:
-#
-# 1. Embed PNGs into RTF. (Option: -p)
-# 2. Embed FreeBSD-specific information into RTF, such as organization name,
-# building time. But unfortunately, so far only Microsoft Word can read
-# them. In contrast, Microsoft Word Viewer and OpenOffice even cannot read
-# this kind of information from RTF created by Microsoft Word and
-# OpenOffice. (Option: -i)
-# 3. Do some locale-specific fixing. (Option: -e <encoding>)
-#
-# This is a transitional solution before Jade/OpenJade provides these features.
-#
-FIXRTF?= ${PREFIX}/bin/fixrtf
-FIXRTFOPTS?= -i -p
-.if defined(SP_ENCODING)
-FIXRTFOPTS+= -e ${SP_ENCODING}
-.endif
-
-GZIP?= -9
-GZIP_CMD?= gzip -qf ${GZIP}
-BZIP2?= -9
-BZIP2_CMD?= bzip2 -qf ${BZIP2}
-ZIP?= -9
-ZIP_CMD?= ${PREFIX}/bin/zip -j ${ZIP}
-
#
# Instruction for bsd.subdir.mk to not to process SUBDIR directive.
# It is not necessary since doc.docbook.mk do it too.
@@ -456,7 +398,7 @@ ${.CURDIR:T}.pdb.${_curcomp}: ${DOC}.pdb.${_curcomp}
.if !defined(NO_RTF)
${DOC}.rtf: ${DOC}.parsed.xml ${LOCAL_IMAGES_EPS} ${PRINT_INDEX} \
${LOCAL_IMAGES_TXT} ${LOCAL_IMAGES_PNG}
- ${JADE_CMD} -V rtf-backend ${PRINTOPTS} -ioutput.rtf.images \
+ ${JADE} -V rtf-backend ${PRINTOPTS} -ioutput.rtf.images \
${JADEOPTS} -t rtf -o ${.TARGET}-nopng ${XMLDECL} \
${DOC}.parsed.xml
${FIXRTF} ${FIXRTFOPTS} < ${.TARGET}-nopng > ${.TARGET}
@@ -480,7 +422,7 @@ ${DOC}.rtf:
${DOC}.tex: ${SRCS} ${LOCAL_IMAGES_EPS} ${PRINT_INDEX} \
${LOCAL_IMAGES_TXT} ${LOCAL_IMAGES_EN} \
${DOC}.parsed.xml
- ${JADE_CMD} -V tex-backend ${PRINTOPTS} \
+ ${JADE} -V tex-backend ${PRINTOPTS} \
${JADEOPTS} -t tex -o ${.TARGET} ${XMLDECL} ${DOC}.parsed.xml
${DOC}.tex-ps: ${DOC}.tex
@@ -491,7 +433,7 @@ ${DOC}.tex-pdf: ${SRCS} ${IMAGES_PDF} ${PRINT_INDEX} \
${LOCAL_IMAGES_TXT} ${DOC}.parsed.xml
${RM} -f ${.TARGET}
${CAT} ${PDFTEX_DEF} > ${.TARGET}
- ${JADE_CMD} -V tex-backend ${PRINTOPTS} -ioutput.print.pdf \
+ ${JADE} -V tex-backend ${PRINTOPTS} -ioutput.print.pdf \
${JADEOPTS} -t tex -o /dev/stdout ${XMLDECL} ${DOC}.parsed.xml >> ${.TARGET}
.endif
@@ -612,13 +554,13 @@ KNOWN_COMPRESS= gz bz2 zip
#
_PROG_COMPRESS_gz: .USE
- ${GZIP_CMD} < ${.ALLSRC} > ${.TARGET}
+ ${GZIP} ${GZIPOPTS} < ${.ALLSRC} > ${.TARGET}
_PROG_COMPRESS_bz2: .USE
- ${BZIP2_CMD} < ${.ALLSRC} > ${.TARGET}
+ ${BZIP2} ${BZIP2OPTS} < ${.ALLSRC} > ${.TARGET}
_PROG_COMPRESS_zip: .USE
- ${ZIP_CMD} ${.TARGET} ${.ALLSRC}
+ ${ZIP} ${ZIPOPTS} ${.TARGET} ${.ALLSRC}
#
# Build a list of targets for each compression scheme and output format.
diff --git a/share/mk/doc.html.mk b/share/mk/doc.html.mk
deleted file mode 100644
index 85fb4ef7e4..0000000000
--- a/share/mk/doc.html.mk
+++ /dev/null
@@ -1,371 +0,0 @@
-#
-# $FreeBSD$
-#
-# This include file <doc.html.mk> handles building and installing of
-# HTML documentation in the FreeBSD Documentation Project.
-#
-# Documentation using DOCFORMAT=html is expected to be marked up
-# according to the HTML DTD
-#
-
-# ------------------------------------------------------------------------
-#
-# Document-specific variables
-#
-# DOC This should be set to the name of the HTML
-# marked-up file, without the .sgml suffix.
-#
-# It also determins the name of the output files -
-# ${DOC}.html.
-#
-# DOCBOOKSUFFIX The suffix of your document, defaulting to .sgml
-#
-# SRCS The names of all the files that are needed to
-# build this document - This is useful if any of
-# them need to be generated. Changing any file in
-# SRCS causes the documents to be rebuilt.
-#
-
-# ------------------------------------------------------------------------
-#
-# Variables used by both users and documents:
-#
-# EXTRA_CATALOGS Additional catalog files that should be used by
-# any SGML processing applications.
-#
-# Documents should use the += format to access these.
-#
-
-MASTERDOC?= ${.CURDIR}/${DOC}.sgml
-
-KNOWN_FORMATS= html txt tar pdb
-
-CSS_SHEET?=
-
-HTMLCATALOG= ${PREFIX}/share/xml/html/catalog
-
-IMAGES_LIB?=
-
-if exists(${PREFIX}/bin/sgmlnorm) && !defined(OPENJADE)
-NSGMLS?= ${PREFIX}/bin/nsgmls
-SGMLNORM?= ${PREFIX}/bin/sgmlnorm
-.else
-NSGMLS?= ${PREFIX}/bin/onsgmls
-SGMLNORM?= ${PREFIX}/bin/osgmlnorm
-.endif
-
-PKG_CREATE?= /usr/sbin/pkg_create
-TAR?= /usr/bin/tar
-XARGS?= /usr/bin/xargs
-
-HTML2PDB?= ${PREFIX}/bin/iSiloBSD
-HTML2PDBOPTS?= -y -d0 -Idef ${HTML2PDBFLAGS}
-
-GZIP?= -9
-GZIP_CMD?= gzip -qf ${GZIP}
-BZIP2?= -9
-BZIP2_CMD?= bzip2 -qf ${BZIP2}
-ZIP?= -9
-ZIP_CMD?= ${PREFIX}/bin/zip -j ${ZIP}
-
-
-# ------------------------------------------------------------------------
-#
-
-.if ${.OBJDIR} != ${.CURDIR}
-LOCAL_CSS_SHEET= ${.OBJDIR}/${CSS_SHEET:T}
-CLEANFILES+= ${LOCAL_CSS_SHEET}
-.else
-LOCAL_CSS_SHEET= ${CSS_SHEET:T}
-.endif
-
-.for _curformat in ${FORMATS}
-_cf=${_curformat}
-
-# Create a 'bogus' doc for any format we support or not. This is so
-# that we can fake up a target for it later on, and this target can print
-# the warning message about the unsupported format.
-_docs+= ${DOC}.${_curformat}
-CLEANFILES+= ${DOC}.${_curformat}
-CLEANFILES+= PLIST.${_curformat}
-
-.if ${_cf} == "txt"
-.if ${LOCAL_CSS_SHEET} != ${CSS_SHEET}
-CLEANFILES+= ${LOCAL_CSS_SHEET}
-.endif
-
-.elif ${_cf} == "txt"
-CLEANFILES+= ${DOC}.html
-
-.elif ${_cf} == "pdb"
-_docs+= ${.CURDIR:T}.pdb
-CLEANFILES+= ${.CURDIR:T}.pdb
-
-.endif
-.endfor
-
-#
-# Build a list of install-${format}.${compress_format} targets to be
-# by "make install". Also, add ${DOC}.${format}.${compress_format} to
-# ${_docs} and ${CLEANFILES} so they get built/cleaned by "all" and
-# "clean".
-#
-
-.if defined(INSTALL_COMPRESSED) && !empty(INSTALL_COMPRESSED)
-.for _curformat in ${FORMATS}
-_cf=${_curformat}
-.for _curcomp in ${INSTALL_COMPRESSED}
-
-.if ${_cf} != "html-split"
-_curinst+= install-${_curformat}.${_curcomp}
-_docs+= ${DOC}.${_curformat}.${_curcomp}
-CLEANFILES+= ${DOC}.${_curformat}.${_curcomp}
-
-.if ${_cf} == "pdb"
-_docs+= ${.CURDIR:T}.${_curformat}.${_curcomp}
-CLEANFILES+= ${.CURDIR:T}.${_curformat}.${_curcomp}
-
-.endif
-.endif
-.endfor
-.endfor
-.endif
-
-.MAIN: all
-
-all: ${_docs}
-
-${DOC}.html: ${SRCS} ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG} ${LOCAL_CSS_SHEET}
- ${SGMLNORM} -c ${HTMLCATALOG} ${SRCS:S|^|${.CURDIR}/|} > ${.TARGET}
-
-${DOC}.txt: ${DOC}.html
- ${HTML2TXT} ${HTML2TXTOPTS} ${.ALLSRC} > ${.TARGET}
-
-${DOC}.pdb: ${DOC}.html ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG}
- ${HTML2PDB} ${HTML2PDBOPTS} ${DOC}.html ${.TARGET}
-
-${.CURDIR:T}.pdb: ${DOC}.pdb
- ${LN} -f ${.ALLSRC} ${.TARGET}
-
-.if defined(INSTALL_COMPRESSED) && !empty(INSTALL_COMPRESSED)
-.for _curcomp in ${INSTALL_COMPRESSED}
-${.CURDIR:T}.pdb.${_curcomp}: ${DOC}.pdb.${_curcomp}
- ${LN} -f ${.ALLSRC} ${.TARGET}
-.endfor
-.endif
-
-${DOC}.tar: ${SRCS} ${LOCAL_IMAGES} ${LOCAL_CSS_SHEET}
- ${TAR} cf ${.TARGET} -C ${.CURDIR} ${SRCS} \
- -C ${.OBJDIR} ${IMAGES} ${CSS_SHEET:T}
-
-#
-# Build targets for any formats we've missed that we don't handle.
-#
-.for _curformat in ${ALL_FORMATS}
-.if !target(${DOC}.${_curformat})
-${DOC}.${_curformat}:
- @${ECHO_CMD} \"${_curformat}\" is not a valid output format for this document.
-.endif
-.endfor
-
-
-# ------------------------------------------------------------------------
-#
-# Validation targets
-#
-
-#
-# Lets you quickly check that the document conforms to the DTD without
-# having to convert it to any other formats
-#
-
-lint validate:
- ${XMLLINT} --catalogs --nonet --noout --noent --valid ${MASTERDOC}
-
-# ------------------------------------------------------------------------
-#
-# Compress targets
-#
-
-#
-# The list of compression extensions this Makefile knows about. If you
-# add new compression schemes, add to this list (which is a list of
-# extensions, hence bz2, *not* bzip2) and extend the _PROG_COMPRESS_*
-# targets.
-#
-
-KNOWN_COMPRESS= gz bz2 zip
-
-#
-# You can't build suffix rules to do compression, since you can't
-# wildcard the source suffix. So these are defined .USE, to be tacked on
-# as dependencies of the compress-* targets.
-#
-
-_PROG_COMPRESS_gz: .USE
- ${GZIP_CMD} < ${.ALLSRC} > ${.TARGET}
-
-_PROG_COMPRESS_bz2: .USE
- ${BZIP2_CMD} < ${.ALLSRC} > ${.TARGET}
-
-_PROG_COMPRESS_zip: .USE
- ${ZIP_CMD} ${.TARGET} ${.ALLSRC}
-
-#
-# Build a list of targets for each compression scheme and output format.
-# Don't compress the html-split output format.
-#
-.for _curformat in ${KNOWN_FORMATS}
-_cf=${_curformat}
-.for _curcompress in ${KNOWN_COMPRESS}
-${DOC}.${_cf}.${_curcompress}: ${DOC}.${_cf} _PROG_COMPRESS_${_curcompress}
-.endfor
-.endfor
-
-#
-# Build targets for any formats we've missed that we don't handle.
-#
-.for _curformat in ${ALL_FORMATS}
-.for _curcompress in ${KNOWN_COMPRESS}
-.if !target(${DOC}.${_curformat}.${_curcompress})
-${DOC}.${_curformat}.${_curcompress}:
- @${ECHO_CMD} \"${_curformat}.${_curcompress}\" is not a valid output format for this document.
-.endif
-.endfor
-.endfor
-
-
-# ------------------------------------------------------------------------
-#
-# Install targets
-#
-# Build install-* targets, one per allowed value in FORMATS.
-#
-# "beforeinstall" and "afterinstall" are hooks in to this process.
-# Redefine them to do things before and after the files are installed,
-# respectively.
-
-#
-# Build a list of install-format targets to be installed. These will be
-# dependencies for the "realinstall" target.
-#
-
-.if !defined(INSTALL_ONLY_COMPRESSED) || empty(INSTALL_ONLY_COMPRESSED)
-_curinst+= ${FORMATS:S/^/install-/g}
-.endif
-
-realinstall: ${_curinst}
-
-.for _curformat in ${KNOWN_FORMATS}
-_cf=${_curformat}
-.if !target(install-${_cf})
-install-${_curformat}: ${DOC}.${_curformat}
- @[ -d ${DESTDIR} ] || ${MKDIR} -p ${DESTDIR}
- ${INSTALL_DOCS} ${.ALLSRC} ${DESTDIR}
-.if !empty(CSS_SHEET)
- ${INSTALL_DOCS} ${CSS_SHEET} ${DESTDIR}
-.endif
-.for _curimage in ${IMAGES_LIB}
- @[ -d ${DESTDIR}/${LOCAL_IMAGES_LIB_DIR}/${_curimage:H} ] || \
- ${MKDIR} -p ${DESTDIR}/${LOCAL_IMAGES_LIB_DIR}/${_curimage:H}
- ${INSTALL_DOCS} ${LOCAL_IMAGES_LIB_DIR}/${_curimage} \
- ${DESTDIR}/${LOCAL_IMAGES_LIB_DIR}/${_curimage:H}
-.endfor
-# Install the images. First, loop over all the image names that contain a
-# directory separator, make the subdirectories, and install. Then loop over
-# the ones that don't contain a directory separator, and install them in the
-# top level.
-.for _curimage in ${IMAGES_PNG:M*/*:M*share*}
- ${MKDIR} -p ${DESTDIR:H:H}/${_curimage:H:S|${IMAGES_EN_DIR}/||:S|${.CURDIR}||}
- ${INSTALL_DOCS} ${_curimage} ${DESTDIR:H:H}/${_curimage:H:S|${IMAGES_EN_DIR}/||:S|${.CURDIR}||}
-.endfor
-.for _curimage in ${IMAGES_PNG:N*/*}
- ${INSTALL_DOCS} ${.CURDIR}/${_curimage} ${DESTDIR}
-.endfor
-.if ${_cf} == "pdb"
- ${LN} -f ${DESTDIR}/${.ALLSRC} ${DESTDIR}/${.CURDIR:T}.${_curformat}
-.endif
-
-.for _compressext in ${KNOWN_COMPRESS}
-install-${_cf}.${_compressext}: ${DOC}.${_cf}.${_compressext}
- @[ -d ${DESTDIR} ] || ${MKDIR} -p ${DESTDIR}
- ${INSTALL_DOCS} ${.ALLSRC} ${DESTDIR}
-.endfor
-.endif
-.endfor
-
-#
-# Build install- targets for any formats we've missed that we don't handle.
-#
-
-.for _curformat in ${ALL_FORMATS}
-.if !target(install-${_curformat})
-install-${_curformat}:
- @${ECHO_CMD} \"${_curformat}\" is not a valid output format for this document.
-
-.for _compressext in ${KNOWN_COMPRESS}
-install-${_curformat}.${_compressext}:
- @${ECHO_CMD} \"${_curformat}.${_compressext}\" is not a valid output format for this document.
-.endfor
-.endif
-.endfor
-
-
-# ------------------------------------------------------------------------
-#
-# Package building
-#
-
-#
-# realpackage is what is called in each subdirectory when a package
-# target is called, or, rather, package calls realpackage in each
-# subdirectory as it goes.
-#
-# packagelist returns the list of targets that would be called during
-# package building.
-#
-
-realpackage: ${FORMATS:S/^/package-/}
-packagelist:
- @${ECHO_CMD} ${FORMATS:S/^/package-/}
-
-#
-# Build a list of package targets for each output target. Each package
-# target depends on the corresponding install target running.
-#
-
-.for _curformat in ${KNOWN_FORMATS}
-_cf=${_curformat}
-PLIST.${_curformat}: ${DOC}.${_curformat}
- @${ECHO_CMD} ${DOC}.${_curformat} > PLIST.${_curformat}
-.if ${_cf} == "html" && \
- (!empty(LOCAL_IMAGES_LIB) || !empty(IMAGES_PNG) || !empty(CSS_SHEET))
- @${ECHO_CMD} ${LOCAL_IMAGES_LIB} ${IMAGES_PNG} ${CSS_SHEET} | \
- ${XARGS} -n1 >> PLIST.${_curformat}
-.elif ${_cf} == "pdb"
- @${ECHO_CMD} ${.CURDIR:T}.${_curformat} >> PLIST.${_curformat}
-.endif
-
-${PACKAGES}/${.CURDIR:T}.${LANGCODE}.${_curformat}.tgz: PLIST.${_curformat}
- @${PKG_CREATE} -v -f PLIST.${_curformat} -p ${DESTDIR} -s ${.OBJDIR} \
- -c -"FDP ${.CURDIR:T} ${_curformat} package" \
- -d -"FDP ${.CURDIR:T} ${_curformat} package" ${.TARGET}
-
-package-${_curformat}: ${PACKAGES}/${.CURDIR:T}.${LANGCODE}.${_curformat}.tgz
-.endfor
-
-#
-# Build install- targets for any formats we've missed that we don't handle.
-#
-
-.for _curformat in ${ALL_FORMATS}
-.if !target(package-${_curformat})
-package-${_curformat}:
- @${ECHO_CMD} \"${_curformat}\" is not a valid output format for this document.
-.endif
-.endfor
-
-.if ${LOCAL_CSS_SHEET} != ${CSS_SHEET}
-${LOCAL_CSS_SHEET}: ${CSS_SHEET}
- ${CP} -p ${.ALLSRC} ${.TARGET}
-.endif
diff --git a/share/mk/doc.images.mk b/share/mk/doc.images.mk
index 7c3386dfa1..0ea71b2fd3 100644
--- a/share/mk/doc.images.mk
+++ b/share/mk/doc.images.mk
@@ -109,42 +109,6 @@ EPS2PNM_RES?= 100
# shared image directory.
IMAGES_PDF= ${IMAGES_GEN_PDF} ${_IMAGES_PNG}
-SCR2PNG?= ${PREFIX}/bin/scr2png
-SCR2PNGOPTS?= ${SCR2PNGFLAGS}
-SCR2TXT?= ${PREFIX}/bin/scr2txt
-SCR2TXTOPTS?= -l ${SCR2TXTFLAGS}
-SED?= /usr/bin/sed
-EPS2PNM?= ${PREFIX}/bin/gs
-EPS2PNMOPTS?= -q -dBATCH -dGraphicsAlphaBits=4 -dTextAlphaBits=4 \
- -dEPSCrop -r${EPS2PNM_RES}x${EPS2PNM_RES} \
- -dNOPAUSE -dSAFER -sDEVICE=pnm -sOutputFile=-
-#
-# epsgeom is a perl script for 1) extracting geometry information
-# from a .eps file and 2) arrange it for ghostscript's pnm driver.
-#
-EPSGEOM?= ${PERL} ${DOC_PREFIX}/share/misc/epsgeom
-EPSGEOMOPTS?= ${EPS2PNM_RES} ${EPS2PNM_RES}
-PNMTOPNG?= ${PREFIX}/bin/pnmtopng
-PNMTOPNGOPTS?= ${PNGTOPNGFLAGS}
-PNGTOPNM?= ${PREFIX}/bin/pngtopnm
-PNGTOPNMOPTS?= ${PNGTOPNMFLAGS}
-PPMTOPGM?= ${PREFIX}/bin/ppmtopgm
-PPMTOPGMOPTS?= ${PPMTOPGMFLAGS}
-PNMTOPS?= ${PREFIX}/bin/pnmtops
-PNMTOPSOPTS?= -noturn ${PNMTOPSFLAGS}
-EPSTOPDF?= ${PREFIX}/bin/epstopdf
-EPSTOPDFOPTS?= ${EPSTOPDFFLAGS}
-#
-PIC2PS?= ${GROFF} -p -S -Wall -mtty-char -man
-#
-PS2EPS?= ${PREFIX}/bin/gs
-PS2EPSOPTS?= -q -dNOPAUSE -dSAFER -dDELAYSAFER \
- -sPAPERSIZE=letter -r72 -sDEVICE=bit \
- -sOutputFile=/dev/null ${PS2EPSFLAGS} ps2epsi.ps
-PS2BBOX?= ${PREFIX}/bin/gs
-PS2BBOXOPTS?= -q -dNOPAUSE -dBATCH -dSAFER -dDELAYSAFER \
- -sPAPERSIZE=letter -r72 -sDEVICE=bbox \
- -sOutputFile=/dev/null ${PS2BBOXFLAGS}
#
# Use suffix rules to convert .scr files to other formats
.SUFFIXES: .scr .pic .png .ps .eps .txt
diff --git a/share/mk/doc.project.mk b/share/mk/doc.project.mk
index 2f4dbb8bcb..244195bcbc 100644
--- a/share/mk/doc.project.mk
+++ b/share/mk/doc.project.mk
@@ -66,57 +66,13 @@ MAINTAINER?= doc@FreeBSD.org
# formats
ALL_FORMATS= html html.tar html-split html-split.tar txt rtf ps pdf tex dvi tar pdb
+.include "doc.commands.mk"
+
# User-modifiable
LOCALBASE?= /usr/local
PREFIX?= ${LOCALBASE}
PRI_LANG?= en_US.ISO8859-1
-CP?= /bin/cp
-CAT?= /bin/cat
-ECHO_CMD?= echo
-LN?= /bin/ln
-MKDIR?= /bin/mkdir
-RM?= /bin/rm
-MV?= /bin/mv
-HTML2TXT?= ${PREFIX}/bin/links
-HTML2TXTOPTS?= -dump -width 72 ${HTML2TXTFLAGS}
-ISPELL?= ispell
-ISPELLOPTS?= -l -p /usr/share/dict/freebsd ${ISPELLFLAGS}
-.if exists(/usr/bin/perl)
-PERL?= /usr/bin/perl
-.elif exists(/usr/local/bin/perl)
-PERL?= /usr/local/bin/perl
-.else
-PERL?= perl
-.endif
-REALPATH?= /bin/realpath
-SETENV?= /usr/bin/env
-XSLTPROC?= ${PREFIX}/bin/xsltproc
-XMLLINT?= ${PREFIX}/bin/xmllint
-#
-# In teTeX 3.0 and later, pdfetex(1) is used as the default TeX
-# engine for JadeTeX and tex(1) cannot be used as ${TEX_CMD} anymore
-# due to incompatibility of the format file. Since the teTeX 3.0
-# distribution has "${PREFIX}/share/texmf-dist/LICENSE.texmf,"
-# it is checked here to determine which TeX engine should be used.
-.if exists(${PREFIX}/share/texmf-dist/LICENSE.texmf)
-TEX_CMD?= ${PREFIX}/bin/etex
-PDFTEX_CMD?= ${PREFIX}/bin/pdfetex
-.else
-TEX_CMD?= ${PREFIX}/bin/tex
-PDFTEX_CMD?= ${PREFIX}/bin/pdftex
-.endif
-LATEX_CMD?= ${PREFIX}/bin/latex
-JADETEX_CMD?= ${TEX_CMD} "&jadetex"
-JADETEX_PREPROCESS?= /bin/cat
-PDFJADETEX_CMD?=${PDFTEX_CMD} "&pdfjadetex"
-PDFJADETEX_PREPROCESS?= /bin/cat
-PS2PDF?= ${PREFIX}/bin/ps2pdf
-FOP_CMD?= ${PREFIX}/share/fop/fop.sh
-XEP_CMD?= sh ${HOME}/XEP/xep.sh
-JAVA_CMD?= ${PREFIX}/bin/javavm
-SAXON_CMD?= ${JAVA_CMD} -jar ${PREFIX}/share/java/classes/saxon.jar
-
# Image processing (contains code used by the doc.<format>.mk files, so must
# be listed first).
.include "doc.images.mk"
@@ -144,9 +100,6 @@ DOC_LOCAL_MK= ${DOC_PREFIX}/${LANGCODE}/share/mk/doc.local.mk
.if ${DOCFORMAT} == "slides"
.include "doc.slides.mk"
.endif
-.if ${DOCFORMAT} == "html"
-.include "doc.html.mk"
-.endif
.endif
# Subdirectory glue.
diff --git a/share/mk/web.site.mk b/share/mk/web.site.mk
index bb4cde735d..2daefe66f7 100644
--- a/share/mk/web.site.mk
+++ b/share/mk/web.site.mk
@@ -38,52 +38,12 @@ CGIGRP?= www
.endif
CGIMODE?= 775
-BUNZIP2?= /usr/bin/bunzip2
-CP?= /bin/cp
-CVS?= /usr/bin/cvs
-ECHO_CMD?= echo
-FETCH?= /usr/bin/fetch
-FIND?= /usr/bin/find
-SETENV?= /usr/bin/env
-LN?= /bin/ln
-MKDIR?= /bin/mkdir
-MV?= /bin/mv
-PERL?= /usr/bin/perl5
-.if !exists(${PERL}) && exists(/usr/local/bin/perl5)
-PERL= /usr/local/bin/perl5
-.endif
-RM?= /bin/rm
-SED?= /usr/bin/sed
-SH?= /bin/sh
-SORT?= /usr/bin/sort
-TOUCH?= /usr/bin/touch
-TRUE?= /usr/bin/true
-
LOCALBASE?= /usr/local
PREFIX?= ${LOCALBASE}
-.if exists(${PREFIX}/bin/sgmlnorm) && !defined(OPENJADE)
-SGMLNORM?= ${PREFIX}/bin/sgmlnorm
-.else
-SGMLNORM?= ${PREFIX}/bin/osgmlnorm
-.endif
-SGMLNORMOPTS?= -d ${SGMLNORMFLAGS} ${CATALOG:S,^,-c ,} -D ${.CURDIR}
-
-XSLTPROC?= ${PREFIX}/bin/xsltproc
XSLTPROCOPTS?= ${XSLTPROCFLAGS}
-
-XMLLINT?= ${PREFIX}/bin/xmllint
XMLLINTOPTS?= ${XMLLINTFLAGS}
-HTML2TXT?= ${PREFIX}/bin/w3m
-HTML2TXTOPTS?= -dump ${HTML2TXTFLAGS}
-ISPELL?= ispell
-ISPELLOPTS?= -l -p /usr/share/dict/freebsd ${ISPELLFLAGS}
-
-.if defined(WWWFREEBSDORG)
-SGMLNORMOPTS+= -i html.header.script.google
-.endif
-
WEBCHECK?= ${PREFIX}/bin/webcheck
WEBCHECKOPTS?= -ab ${WEBCHECKFLAGS}
WEBCHECKDIR?= /webcheck
From 2f0c94a684909833a7c696e847aeb24c1d70380c Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Sun, 3 Feb 2013 21:11:22 +0000
Subject: [PATCH 055/121] - Do not pass the --catalogs option to
xmllint/xsltproc since we don't have SGML catalogs any more
---
share/mk/doc.xml.mk | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/share/mk/doc.xml.mk b/share/mk/doc.xml.mk
index 4e4fd31069..cc6e86b5ce 100644
--- a/share/mk/doc.xml.mk
+++ b/share/mk/doc.xml.mk
@@ -279,7 +279,7 @@ XSLTPROCOPTS+= --xinclude
XSLTPROCOPTS+= --stringparam LOCALBASE ${LOCALBASE}
XSLTPROCOPTS+= --stringparam DOC_PREFIX ${DOC_PREFIX}
.if defined(XML_CATALOG_FILES) && !empty(XML_CATALOG_FILES)
-XSLTPROCOPTS+= --nonet --catalogs
+XSLTPROCOPTS+= --nonet
.endif
.if defined(WWWFREEBSDORG)
XSLTPROCOPTS+= --param "html.header.script.google" "'INCLUDE'"
@@ -289,7 +289,7 @@ XSLTPROC= env ${XSLTPROC_ENV} ${LOCALBASE}/bin/xsltproc
XMLLINTOPTS= ${XMLLINTFLAGS}
XMLLINTOPTS+= --xinclude --valid --noout
.if defined(XML_CATALOG_FILES) && !empty(XML_CATALOG_FILES)
-XMLLINTOPTS+= --nonet --catalogs
+XMLLINTOPTS+= --nonet
.endif
XMLLINT= env ${XSLTPROC_ENV} ${PREFIX}/bin/xmllint
From f8e80d75f962da3c0f95667cbb805edbefccdaf2 Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Sun, 3 Feb 2013 21:28:23 +0000
Subject: [PATCH 056/121] - Include command macros - Drop some obsolete SGML
constructs
---
share/mk/web.site.mk | 28 ++--------------------------
1 file changed, 2 insertions(+), 26 deletions(-)
diff --git a/share/mk/web.site.mk b/share/mk/web.site.mk
index 2daefe66f7..2f6e5eff9f 100644
--- a/share/mk/web.site.mk
+++ b/share/mk/web.site.mk
@@ -11,6 +11,8 @@
# clean -- remove anything generated by processing
#
+.include "doc.commands.mk"
+
.if exists(${.CURDIR}/../Makefile.inc)
.include "${.CURDIR}/../Makefile.inc"
.endif
@@ -94,32 +96,6 @@ NO_SUBDIR= YES
.include "${DOC_PREFIX}/share/mk/doc.common.mk"
.include "${DOC_PREFIX}/share/mk/doc.xml.mk"
-_INCLIST= navibar.ent \
- navibar.l10n.ent \
- common.ent \
- header.ent \
- header.l10n.ent \
- iso8879.ent \
- l10n.ent \
- release.ent
-_SGML_INCLUDES= ${SGML_INCLUDES}
-
-.for F in ${_INCLIST}
-.if exists(${DOC_PREFIX}/${LANGCODE}/share/xml/${F})
-_SGML_INCLUDES+=${DOC_PREFIX}/${LANGCODE}/share/xml/${F}
-.endif
-.if exists(${DOC_PREFIX}/share/xml/${F})
-_SGML_INCLUDES+=${DOC_PREFIX}/share/xml/${F}
-.endif
-.endfor
-
-CATALOG?= ${PREFIX}/share/xml/html/catalog \
- ${PREFIX}/share/xml/catalog
-.if exists(${DOC_PREFIX}/${LANGCODE}/share/xml/catalog)
-CATALOG+= ${DOC_PREFIX}/${LANGCODE}/share/xml/catalog
-.endif
-CATALOG+= ${DOC_PREFIX}/share/xml/catalog
-
##################################################################
# Transformation rules
From 49010f9fabae168ec8f58296a4ec81ef2bad9168 Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Mon, 4 Feb 2013 09:05:59 +0000
Subject: [PATCH 057/121] - Do not pass unused XSLT params - Remove some
conditionals since we always use XML catalogs
---
share/mk/doc.xml.mk | 12 ++----------
1 file changed, 2 insertions(+), 10 deletions(-)
diff --git a/share/mk/doc.xml.mk b/share/mk/doc.xml.mk
index cc6e86b5ce..500f27b07c 100644
--- a/share/mk/doc.xml.mk
+++ b/share/mk/doc.xml.mk
@@ -275,22 +275,14 @@ XML_NOTICES= ${DOC_PREFIX}/share/xml/notices.xml
XSLTPROC_ENV+= XML_CATALOG_FILES="${XML_CATALOG_FILES}"
XSLTPROCOPTS= ${XSLTPROCFLAGS}
-XSLTPROCOPTS+= --xinclude
-XSLTPROCOPTS+= --stringparam LOCALBASE ${LOCALBASE}
-XSLTPROCOPTS+= --stringparam DOC_PREFIX ${DOC_PREFIX}
-.if defined(XML_CATALOG_FILES) && !empty(XML_CATALOG_FILES)
-XSLTPROCOPTS+= --nonet
-.endif
+XSLTPROCOPTS+= --xinclude --nonet
.if defined(WWWFREEBSDORG)
XSLTPROCOPTS+= --param "html.header.script.google" "'INCLUDE'"
.endif
XSLTPROC= env ${XSLTPROC_ENV} ${LOCALBASE}/bin/xsltproc
XMLLINTOPTS= ${XMLLINTFLAGS}
-XMLLINTOPTS+= --xinclude --valid --noout
-.if defined(XML_CATALOG_FILES) && !empty(XML_CATALOG_FILES)
-XMLLINTOPTS+= --nonet
-.endif
+XMLLINTOPTS+= --xinclude --valid --noout --nonet
XMLLINT= env ${XSLTPROC_ENV} ${PREFIX}/bin/xmllint
.for D in ${XMLDOCS}
From 5be98520031882d40220ca83d603138abb7ef89a Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Mon, 4 Feb 2013 09:41:53 +0000
Subject: [PATCH 058/121] - Better categorize and sort
---
share/mk/doc.commands.mk | 80 +++++++++++++++++++++++++---------------
1 file changed, 51 insertions(+), 29 deletions(-)
diff --git a/share/mk/doc.commands.mk b/share/mk/doc.commands.mk
index 0a94248e87..a099437f37 100644
--- a/share/mk/doc.commands.mk
+++ b/share/mk/doc.commands.mk
@@ -2,15 +2,21 @@
# $FreeBSD$
#
+#
+# General commands
+#
+
+AWK?= /usr/bin/awk
CP?= /bin/cp
CAT?= /bin/cat
ECHO_CMD?= echo
+FETCH?= /usr/bin/fetch
+FIND?= /usr/bin/find
+GREP?= /usr/bin/grep
LN?= /bin/ln
MKDIR?= /bin/mkdir
-RM?= /bin/rm
MV?= /bin/mv
-HTML2TXT?= ${PREFIX}/bin/w3m
-HTML2TXTOPTS?= -dump ${HTML2TXTFLAGS}
+RM?= /bin/rm
ISPELL?= ispell
ISPELLOPTS?= -l -p /usr/share/dict/freebsd ${ISPELLFLAGS}
.if exists(/usr/bin/perl)
@@ -20,35 +26,49 @@ PERL?= /usr/local/bin/perl
.else
PERL?= perl
.endif
+PKG_CREATE?= /usr/sbin/pkg_create
REALPATH?= /bin/realpath
+SED?= /usr/bin/sed
SETENV?= /usr/bin/env
-XSLTPROC?= ${PREFIX}/bin/xsltproc
-XMLLINT?= ${PREFIX}/bin/xmllint
-
-BUNZIP2?= /usr/bin/bunzip2
-FETCH?= /usr/bin/fetch
-FIND?= /usr/bin/find
-LN?= /bin/ln
SH?= /bin/sh
SORT?= /usr/bin/sort
-TRUE?= /usr/bin/true
-
-AWK?= /usr/bin/awk
-GREP?= /usr/bin/grep
-SED?= /usr/bin/sed
-
-PKG_CREATE?= /usr/sbin/pkg_create
-TAR?= /usr/bin/tar
TOUCH?= /usr/bin/touch
+TRUE?= /usr/bin/true
XARGS?= /usr/bin/xargs
+#
+# Compession and decompression
+#
+
+BUNZIP2?= /usr/bin/bunzip2
BZIP2?= bzip2
BZIPOPTS?= -qf9
GZIP?= gzip
GZIPOPTS?= -qf9
+TAR?= /usr/bin/tar
ZIP?= ${PREFIX}/bin/zip
ZIPOPTS?= -j9
+#
+# Rendering and format conversion
+#
+
+DVIPS?= ${PREFIX}/bin/dvips
+.if defined(PAPERSIZE)
+DVIPSOPTS?= -t ${PAPERSIZE:L}
+.endif
+DVIPSOPTS+= ${DVIPSFLAGS}
+
+FOP?= ${PREFIX}/bin/fop
+FOPOPTS?=
+
+GROFF?= groff
+
+HTML2PDB?= ${PREFIX}/bin/iSiloBSD
+HTML2PDBOPTS?= -y -d0 -Idef ${HTML2PDBFLAGS}
+HTML2TXT?= ${PREFIX}/bin/w3m
+HTML2TXTOPTS?= -dump ${HTML2TXTFLAGS}
+
.if exists(${PREFIX}/bin/jade) && !defined(OPENJADE)
JADE?= ${PREFIX}/bin/jade
.else
@@ -56,17 +76,8 @@ JADE?= ${PREFIX}/bin/openjade
JADEFLAGS+= -V openjade
.endif
-FOP?= ${PREFIX}/bin/fop
-FOPOPTS?=
-
-GROFF?= groff
-HTML2PDB?= ${PREFIX}/bin/iSiloBSD
-HTML2PDBOPTS?= -y -d0 -Idef ${HTML2PDBFLAGS}
-DVIPS?= ${PREFIX}/bin/dvips
-.if defined(PAPERSIZE)
-DVIPSOPTS?= -t ${PAPERSIZE:L}
-.endif
-DVIPSOPTS+= ${DVIPSFLAGS}
+XMLLINT?= ${PREFIX}/bin/xmllint
+XSLTPROC?= ${PREFIX}/bin/xsltproc
#
# In teTeX 3.0 and later, pdfetex(1) is used as the default TeX
@@ -112,6 +123,10 @@ FIXRTFOPTS?= -i -p
FIXRTFOPTS+= -e ${SP_ENCODING}
.endif
+#
+# Image processing
+#
+
SCR2PNG?= ${PREFIX}/bin/scr2png
SCR2PNGOPTS?= ${SCR2PNGFLAGS}
SCR2TXT?= ${PREFIX}/bin/scr2txt
@@ -147,3 +162,10 @@ PS2BBOX?= ${PREFIX}/bin/gs
PS2BBOXOPTS?= -q -dNOPAUSE -dBATCH -dSAFER -dDELAYSAFER \
-sPAPERSIZE=letter -r72 -sDEVICE=bbox \
-sOutputFile=/dev/null ${PS2BBOXFLAGS}
+
+#
+# Spell checking
+#
+
+ISPELL?= ispell
+ISPELLOPTS?= -l -p /usr/share/dict/freebsd ${ISPELLFLAGS}
From 95241d6c326c5568fbe4ae1975e9ea0d44854611 Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Tue, 5 Feb 2013 09:29:28 +0000
Subject: [PATCH 059/121] - Name XHTML chunks after the ID as we have been
doing it with DSSSL
---
share/xsl/freebsd-xhtml-common.xsl | 1 +
1 file changed, 1 insertion(+)
diff --git a/share/xsl/freebsd-xhtml-common.xsl b/share/xsl/freebsd-xhtml-common.xsl
index 7ddbdeb6d4..09cc221f4f 100644
--- a/share/xsl/freebsd-xhtml-common.xsl
+++ b/share/xsl/freebsd-xhtml-common.xsl
@@ -16,6 +16,7 @@
<!-- HTML specific customisation goes here -->
+ <xsl:param name="use.id.as.filename" select="1"/>
<xsl:param name="html.stylesheet" select="'docbook.css'"/>
<xsl:param name="user.id.as.filename" select="'1'"/>
<xsl:param name="link.mailto.url" select="'doc@FreeBSD.org'"/>
From f91ca3af3653ff6b2b76d5ace4af6956bec877de Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Tue, 5 Feb 2013 09:39:04 +0000
Subject: [PATCH 060/121] - Use bsdtar to create zip archives
Submitted by: hrs
---
share/mk/doc.commands.mk | 4 ++--
share/mk/doc.docbook.mk | 4 +---
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/share/mk/doc.commands.mk b/share/mk/doc.commands.mk
index a099437f37..a0bb9de688 100644
--- a/share/mk/doc.commands.mk
+++ b/share/mk/doc.commands.mk
@@ -46,8 +46,8 @@ BZIPOPTS?= -qf9
GZIP?= gzip
GZIPOPTS?= -qf9
TAR?= /usr/bin/tar
-ZIP?= ${PREFIX}/bin/zip
-ZIPOPTS?= -j9
+ZIP?= ${TAR}
+ZIPOPTS?= -c --format=zip --options zip:compression=deflate -f
#
# Rendering and format conversion
diff --git a/share/mk/doc.docbook.mk b/share/mk/doc.docbook.mk
index 876bec596f..40f3246ade 100644
--- a/share/mk/doc.docbook.mk
+++ b/share/mk/doc.docbook.mk
@@ -361,9 +361,7 @@ ${DOC}.epub: ${DOC}.parsed.xml ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG} \
${XSLTPROC} ${XSLTPROCOPTS} ${XSLEPUB} ${DOC}.parsed.xml
${ECHO} "application/epub+zip" > mimetype
${CP} ${CSS_SHEET} OEBPS/
- zip -0Xq ${DOC}.epub mimetype
- zip -Xr9D ${DOC}.epub OEBPS META-INF
-
+ ${ZIP} ${ZIPOPTS} ${DOC}.epub mimetype OEBPS META-INF
# TXT --------------------------------------------------------------------
From 5ab0b5a9282d74e59e0892a957aad773a4ddca08 Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Tue, 5 Feb 2013 10:02:36 +0000
Subject: [PATCH 061/121] - Also add images to the epub archive
---
share/mk/doc.docbook.mk | 3 +++
1 file changed, 3 insertions(+)
diff --git a/share/mk/doc.docbook.mk b/share/mk/doc.docbook.mk
index 40f3246ade..91697efe48 100644
--- a/share/mk/doc.docbook.mk
+++ b/share/mk/doc.docbook.mk
@@ -361,6 +361,9 @@ ${DOC}.epub: ${DOC}.parsed.xml ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG} \
${XSLTPROC} ${XSLTPROCOPTS} ${XSLEPUB} ${DOC}.parsed.xml
${ECHO} "application/epub+zip" > mimetype
${CP} ${CSS_SHEET} OEBPS/
+.if defined(LOCAL_IMAGES_LIB) || defined(LOCAL_IMAGES_PNG)
+ ${CP} ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG} OEBPS/
+.endif
${ZIP} ${ZIPOPTS} ${DOC}.epub mimetype OEBPS META-INF
# TXT --------------------------------------------------------------------
From f1a9c7762c17da0452a85d76b37e1f02afaac808 Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Tue, 5 Feb 2013 10:11:29 +0000
Subject: [PATCH 062/121] - Revert r40891 since the created archive has
compatibility problems
---
share/mk/doc.commands.mk | 4 ++--
share/mk/doc.docbook.mk | 3 ++-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/share/mk/doc.commands.mk b/share/mk/doc.commands.mk
index a0bb9de688..38c4163d3e 100644
--- a/share/mk/doc.commands.mk
+++ b/share/mk/doc.commands.mk
@@ -46,8 +46,8 @@ BZIPOPTS?= -qf9
GZIP?= gzip
GZIPOPTS?= -qf9
TAR?= /usr/bin/tar
-ZIP?= ${TAR}
-ZIPOPTS?= -c --format=zip --options zip:compression=deflate -f
+ZIP?= ${PREFIX}/bin/zip
+ZIPOPTS?= -9X
#
# Rendering and format conversion
diff --git a/share/mk/doc.docbook.mk b/share/mk/doc.docbook.mk
index 91697efe48..90fa9b935b 100644
--- a/share/mk/doc.docbook.mk
+++ b/share/mk/doc.docbook.mk
@@ -364,7 +364,8 @@ ${DOC}.epub: ${DOC}.parsed.xml ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG} \
.if defined(LOCAL_IMAGES_LIB) || defined(LOCAL_IMAGES_PNG)
${CP} ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG} OEBPS/
.endif
- ${ZIP} ${ZIPOPTS} ${DOC}.epub mimetype OEBPS META-INF
+ ${ZIP} ${ZIPOPTS} ${DOC}.epub mimetype
+ ${ZIP} ${ZIPOPTS} -Dr ${DOC}.epub OEBPS META-INF
# TXT --------------------------------------------------------------------
From 5b97aa983ee2daf626d9e64661a5dbc87295c354 Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Tue, 5 Feb 2013 15:59:54 +0000
Subject: [PATCH 063/121] - Rename entity
---
en_US.ISO8859-1/books/pmake/book.xml | 2 +-
en_US.ISO8859-1/books/pmake/chapters.ent | 2 +-
en_US.ISO8859-1/books/pmake/legalnotice.xml | 2 --
3 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/en_US.ISO8859-1/books/pmake/book.xml b/en_US.ISO8859-1/books/pmake/book.xml
index bbb2b74813..6fd4709813 100644
--- a/en_US.ISO8859-1/books/pmake/book.xml
+++ b/en_US.ISO8859-1/books/pmake/book.xml
@@ -32,7 +32,7 @@
<holder>The Regents of the University of California.</holder>
</copyright>
- &legalnotice;
+ &pmake.legalnotice;
<releaseinfo>$FreeBSD$</releaseinfo>
</bookinfo>
diff --git a/en_US.ISO8859-1/books/pmake/chapters.ent b/en_US.ISO8859-1/books/pmake/chapters.ent
index 709d6a73f3..c1bb3f5f28 100644
--- a/en_US.ISO8859-1/books/pmake/chapters.ent
+++ b/en_US.ISO8859-1/books/pmake/chapters.ent
@@ -5,7 +5,7 @@
$FreeBSD$
-->
-<!ENTITY legalnotice SYSTEM "legalnotice.xml">
+<!ENTITY pmake.legalnotice SYSTEM "legalnotice.xml">
<!ENTITY chap.intro SYSTEM "intro/chapter.xml">
<!ENTITY chap.basics SYSTEM "basics/chapter.xml">
<!ENTITY chap.shortcuts SYSTEM "shortcuts/chapter.xml">
diff --git a/en_US.ISO8859-1/books/pmake/legalnotice.xml b/en_US.ISO8859-1/books/pmake/legalnotice.xml
index 31254450ce..5226e208a0 100644
--- a/en_US.ISO8859-1/books/pmake/legalnotice.xml
+++ b/en_US.ISO8859-1/books/pmake/legalnotice.xml
@@ -1,6 +1,4 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE legalnotice PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
- "../../../share/xml/freebsd45.dtd"
<!--
$FreeBSD$
-->
From 8c3f9c475fa120792c11d6f81727cecf8c3b85ab Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Tue, 5 Feb 2013 17:24:39 +0000
Subject: [PATCH 064/121] - Detach zh_TW FAQ from the build since it has an
invalid Big5 character sequence and does not build
---
zh_TW.Big5/books/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/zh_TW.Big5/books/Makefile b/zh_TW.Big5/books/Makefile
index 45eb550a9a..176ffedb82 100644
--- a/zh_TW.Big5/books/Makefile
+++ b/zh_TW.Big5/books/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
SUBDIR = developers-handbook
-SUBDIR+= faq
+#SUBDIR+= faq
SUBDIR+= fdp-primer
SUBDIR+= handbook
SUBDIR+= porters-handbook
From 28d065247c427ed8d21974efc5c1ffc0945666c8 Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Mon, 18 Feb 2013 13:03:19 +0000
Subject: [PATCH 065/121] - Fix rendering of Handbook with (Open)Jade
---
share/mk/doc.commands.mk | 6 +++---
share/mk/doc.docbook.mk | 15 ++++++++++-----
share/xml/freebsd45.dtd | 12 ++++++++++++
3 files changed, 25 insertions(+), 8 deletions(-)
diff --git a/share/mk/doc.commands.mk b/share/mk/doc.commands.mk
index 38c4163d3e..0bf81f3905 100644
--- a/share/mk/doc.commands.mk
+++ b/share/mk/doc.commands.mk
@@ -70,9 +70,9 @@ HTML2TXT?= ${PREFIX}/bin/w3m
HTML2TXTOPTS?= -dump ${HTML2TXTFLAGS}
.if exists(${PREFIX}/bin/jade) && !defined(OPENJADE)
-JADE?= ${PREFIX}/bin/jade
+JADE?= ${ENV} SP_ENCODING=XML ${PREFIX}/bin/jade
.else
-JADE?= ${PREFIX}/bin/openjade
+JADE?= ${ENV} SP_ENCODING=XML ${PREFIX}/bin/openjade
JADEFLAGS+= -V openjade
.endif
@@ -93,7 +93,7 @@ TEX_CMD?= ${PREFIX}/bin/tex
PDFTEX_CMD?= ${PREFIX}/bin/pdftex
.endif
LATEX_CMD?= ${PREFIX}/bin/latex
-JADETEX_CMD?= ${TEX_CMD} "&jadetex"
+JADETEX_CMD?= ${PDFTEX_CMD} "&jadetex"
JADETEX_PREPROCESS?= /bin/cat
PDFJADETEX_CMD?=${PDFTEX_CMD} "&pdfjadetex"
PDFJADETEX_PREPROCESS?= /bin/cat
diff --git a/share/mk/doc.docbook.mk b/share/mk/doc.docbook.mk
index 90fa9b935b..1106193ede 100644
--- a/share/mk/doc.docbook.mk
+++ b/share/mk/doc.docbook.mk
@@ -71,9 +71,6 @@
MASTERDOC?= ${.CURDIR}/${DOC}.xml
-# List of supported SP_ENCODINGs
-SP_ENCODING_LIST?= ISO-8859-2 KOI8-R
-
# Either jade or fop
RENDERENGINE?= jade
@@ -94,7 +91,8 @@ XSLFO?= ${DOC_PREFIX}/share/xsl/freebsd-fo.xsl
IMAGES_LIB?=
-JADEOPTS?= -w no-valid ${JADEFLAGS} -D ${IMAGES_EN_DIR}/${DOC}s/${.CURDIR:T} -D ${CANONICALOBJDIR}
+JADEOPTS?= -ijade.compat -w no-valid ${JADEFLAGS} \
+ -D ${IMAGES_EN_DIR}/${DOC}s/${.CURDIR:T} -D ${CANONICALOBJDIR}
XSLTPROCOPTS?= --nonet
KNOWN_FORMATS= html html.tar html-split html-split.tar \
@@ -326,7 +324,14 @@ NO_RTF= yes
# Parsed XML -------------------------------------------------------
${DOC}.parsed.xml: ${SRCS}
- ${XMLLINT} --nonet --noent --valid --xinclude --dropdtd ${MASTERDOC} > ${.TARGET}
+ ${GREP} '^<?xml version=.*?>' ${DOC}.xml > ${.TARGET}
+.if ${DOC} == "book"
+ ${ECHO_CMD} '<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN" "../../../share/xml/freebsd45.dtd">' >> ${.TARGET}
+.else
+ ${ECHO_CMD} '<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN" "../../../share/xml/freebsd45.dtd">' >> ${.TARGET}
+.endif
+ ${XMLLINT} --nonet --noent --valid --xinclude --dropdtd ${MASTERDOC} | \
+ ${GREP} -v '^<?xml version=.*?>' >> ${.TARGET}
# XHTML -------------------------------------------------------------
diff --git a/share/xml/freebsd45.dtd b/share/xml/freebsd45.dtd
index 8514207a21..43188e7b1a 100644
--- a/share/xml/freebsd45.dtd
+++ b/share/xml/freebsd45.dtd
@@ -3,7 +3,17 @@
<!ENTITY % output.print "IGNORE"> <!-- Print output is being generated -->
<!ENTITY % output.print.pdf "IGNORE"> <!-- PDF output -->
+<!-- XXX: Jade is given a totally parsed document with XML tools
+ so it does not need to pull in entity sets and catalogs
+ are only provided in XML format, yet this compatibility
+ nit is necessary otherwise it would look for the entity sets
+ and fail, lacking SGML catalogs.
+-->
<!ENTITY % jade.compat "IGNORE">
+<![%jade.compat;[
+<!ENTITY % freebsd.entities "IGNORE">
+]]>
+<!ENTITY % freebsd.entities "INCLUDE">
<!ENTITY % local.tech.char.class "|hostid|username|groupname|devicename|maketarget|makevar|svnref|xi:include">
@@ -41,6 +51,7 @@
"/usr/local/share/xml/docbook/4.5/docbookx.dtd">
%orig-docbook;
+<![%freebsd.entities;[
<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN"
"authors.ent">
%authors;
@@ -52,6 +63,7 @@
<!ENTITY % orig-entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
"entities.ent">
%orig-entities;
+]]>
<!ELEMENT hostid (%cptr.char.mix;)*>
<!ATTLIST hostid
From 59d4db958481a98b959b0c556270bdadee1f378f Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Tue, 19 Feb 2013 16:14:00 +0000
Subject: [PATCH 066/121] - Add back SGML catalogs (trimmed to minimally
necessary content) since they are still needed for language-specific DSSSL
customizations
---
da_DK.ISO8859-1/share/xml/catalog | 2 +
de_DE.ISO8859-1/share/xml/catalog | 2 +
el_GR.ISO8859-7/share/xml/catalog | 2 +
en_US.ISO8859-1/share/xml/catalog | 2 +
es_ES.ISO8859-1/share/xml/catalog | 2 +
fr_FR.ISO8859-1/share/xml/catalog | 2 +
hu_HU.ISO8859-2/share/xml/catalog | 2 +
it_IT.ISO8859-15/share/xml/catalog | 2 +
ja_JP.eucJP/share/xml/catalog | 2 +
mn_MN.UTF-8/share/xml/catalog | 2 +
nl_NL.ISO8859-1/share/xml/catalog | 2 +
pl_PL.ISO8859-2/share/xml/catalog | 2 +
pt_BR.ISO8859-1/share/xml/catalog | 2 +
ru_RU.KOI8-R/share/xml/catalog | 2 +
share/mk/doc.docbook.mk | 23 +++++--
share/xml/catalog | 96 ------------------------------
sr_YU.ISO8859-2/share/xml/catalog | 2 +
zh_CN.GB2312/share/xml/catalog | 2 +
zh_TW.Big5/share/xml/catalog | 2 +
19 files changed, 51 insertions(+), 102 deletions(-)
create mode 100644 da_DK.ISO8859-1/share/xml/catalog
create mode 100644 de_DE.ISO8859-1/share/xml/catalog
create mode 100644 el_GR.ISO8859-7/share/xml/catalog
create mode 100644 en_US.ISO8859-1/share/xml/catalog
create mode 100644 es_ES.ISO8859-1/share/xml/catalog
create mode 100644 fr_FR.ISO8859-1/share/xml/catalog
create mode 100644 hu_HU.ISO8859-2/share/xml/catalog
create mode 100644 it_IT.ISO8859-15/share/xml/catalog
create mode 100644 ja_JP.eucJP/share/xml/catalog
create mode 100644 mn_MN.UTF-8/share/xml/catalog
create mode 100644 nl_NL.ISO8859-1/share/xml/catalog
create mode 100644 pl_PL.ISO8859-2/share/xml/catalog
create mode 100644 pt_BR.ISO8859-1/share/xml/catalog
create mode 100644 ru_RU.KOI8-R/share/xml/catalog
create mode 100644 sr_YU.ISO8859-2/share/xml/catalog
create mode 100644 zh_CN.GB2312/share/xml/catalog
create mode 100644 zh_TW.Big5/share/xml/catalog
diff --git a/da_DK.ISO8859-1/share/xml/catalog b/da_DK.ISO8859-1/share/xml/catalog
new file mode 100644
index 0000000000..2422c1740c
--- /dev/null
+++ b/da_DK.ISO8859-1/share/xml/catalog
@@ -0,0 +1,2 @@
+PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
+ "freebsd.dsl"
diff --git a/de_DE.ISO8859-1/share/xml/catalog b/de_DE.ISO8859-1/share/xml/catalog
new file mode 100644
index 0000000000..2422c1740c
--- /dev/null
+++ b/de_DE.ISO8859-1/share/xml/catalog
@@ -0,0 +1,2 @@
+PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
+ "freebsd.dsl"
diff --git a/el_GR.ISO8859-7/share/xml/catalog b/el_GR.ISO8859-7/share/xml/catalog
new file mode 100644
index 0000000000..2422c1740c
--- /dev/null
+++ b/el_GR.ISO8859-7/share/xml/catalog
@@ -0,0 +1,2 @@
+PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
+ "freebsd.dsl"
diff --git a/en_US.ISO8859-1/share/xml/catalog b/en_US.ISO8859-1/share/xml/catalog
new file mode 100644
index 0000000000..2422c1740c
--- /dev/null
+++ b/en_US.ISO8859-1/share/xml/catalog
@@ -0,0 +1,2 @@
+PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
+ "freebsd.dsl"
diff --git a/es_ES.ISO8859-1/share/xml/catalog b/es_ES.ISO8859-1/share/xml/catalog
new file mode 100644
index 0000000000..2422c1740c
--- /dev/null
+++ b/es_ES.ISO8859-1/share/xml/catalog
@@ -0,0 +1,2 @@
+PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
+ "freebsd.dsl"
diff --git a/fr_FR.ISO8859-1/share/xml/catalog b/fr_FR.ISO8859-1/share/xml/catalog
new file mode 100644
index 0000000000..2422c1740c
--- /dev/null
+++ b/fr_FR.ISO8859-1/share/xml/catalog
@@ -0,0 +1,2 @@
+PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
+ "freebsd.dsl"
diff --git a/hu_HU.ISO8859-2/share/xml/catalog b/hu_HU.ISO8859-2/share/xml/catalog
new file mode 100644
index 0000000000..2422c1740c
--- /dev/null
+++ b/hu_HU.ISO8859-2/share/xml/catalog
@@ -0,0 +1,2 @@
+PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
+ "freebsd.dsl"
diff --git a/it_IT.ISO8859-15/share/xml/catalog b/it_IT.ISO8859-15/share/xml/catalog
new file mode 100644
index 0000000000..2422c1740c
--- /dev/null
+++ b/it_IT.ISO8859-15/share/xml/catalog
@@ -0,0 +1,2 @@
+PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
+ "freebsd.dsl"
diff --git a/ja_JP.eucJP/share/xml/catalog b/ja_JP.eucJP/share/xml/catalog
new file mode 100644
index 0000000000..2422c1740c
--- /dev/null
+++ b/ja_JP.eucJP/share/xml/catalog
@@ -0,0 +1,2 @@
+PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
+ "freebsd.dsl"
diff --git a/mn_MN.UTF-8/share/xml/catalog b/mn_MN.UTF-8/share/xml/catalog
new file mode 100644
index 0000000000..2422c1740c
--- /dev/null
+++ b/mn_MN.UTF-8/share/xml/catalog
@@ -0,0 +1,2 @@
+PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
+ "freebsd.dsl"
diff --git a/nl_NL.ISO8859-1/share/xml/catalog b/nl_NL.ISO8859-1/share/xml/catalog
new file mode 100644
index 0000000000..2422c1740c
--- /dev/null
+++ b/nl_NL.ISO8859-1/share/xml/catalog
@@ -0,0 +1,2 @@
+PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
+ "freebsd.dsl"
diff --git a/pl_PL.ISO8859-2/share/xml/catalog b/pl_PL.ISO8859-2/share/xml/catalog
new file mode 100644
index 0000000000..2422c1740c
--- /dev/null
+++ b/pl_PL.ISO8859-2/share/xml/catalog
@@ -0,0 +1,2 @@
+PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
+ "freebsd.dsl"
diff --git a/pt_BR.ISO8859-1/share/xml/catalog b/pt_BR.ISO8859-1/share/xml/catalog
new file mode 100644
index 0000000000..2422c1740c
--- /dev/null
+++ b/pt_BR.ISO8859-1/share/xml/catalog
@@ -0,0 +1,2 @@
+PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
+ "freebsd.dsl"
diff --git a/ru_RU.KOI8-R/share/xml/catalog b/ru_RU.KOI8-R/share/xml/catalog
new file mode 100644
index 0000000000..2422c1740c
--- /dev/null
+++ b/ru_RU.KOI8-R/share/xml/catalog
@@ -0,0 +1,2 @@
+PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
+ "freebsd.dsl"
diff --git a/share/mk/doc.docbook.mk b/share/mk/doc.docbook.mk
index 1106193ede..8ba1041ab9 100644
--- a/share/mk/doc.docbook.mk
+++ b/share/mk/doc.docbook.mk
@@ -74,13 +74,9 @@ MASTERDOC?= ${.CURDIR}/${DOC}.xml
# Either jade or fop
RENDERENGINE?= jade
-.if defined(SPELLCHECK)
-DSLHTML?= ${DOC_PREFIX}/share/xml/spellcheck.dsl
-.endif
-
XMLDECL?= /usr/local/share/sgml/docbook/dsssl/modular/dtds/decls/xml.dcl
-DSLHTML?= ${DOC_PREFIX}/share/xml/default.dsl
+DSLHTML?= ${DOC_PREFIX}/share/xml/spellcheck.dsl
DSLPRINT?= ${DOC_PREFIX}/share/xml/default.dsl
DSLPGP?= ${DOC_PREFIX}/share/xml/pgp.dsl
@@ -91,8 +87,23 @@ XSLFO?= ${DOC_PREFIX}/share/xsl/freebsd-fo.xsl
IMAGES_LIB?=
+.if exists(${PREFIX}/bin/jade) && !defined(OPENJADE)
+JADECATALOG?= ${PREFIX}/share/sgml/jade/catalog
+.else
+JADECATALOG?= ${PREFIX}/share/sgml/openjade/catalog
+.endif
+FREEBSDCATALOG= ${DOC_PREFIX}/share/xml/catalog
+LANGUAGECATALOG=${DOC_PREFIX}/${LANGCODE}/share/xml/catalog
+DSSSLCATALOG= ${PREFIX}/share/sgml/docbook/dsssl/modular/catalog
+.for c in ${LANGUAGECATALOG} ${FREEBSDCATALOG} ${DSSSLCATALOG} ${JADECATALOG}
+.if exists(${c})
+CATALOGS+= -c ${c}
+.endif
+.endfor
+
JADEOPTS?= -ijade.compat -w no-valid ${JADEFLAGS} \
- -D ${IMAGES_EN_DIR}/${DOC}s/${.CURDIR:T} -D ${CANONICALOBJDIR}
+ -D ${IMAGES_EN_DIR}/${DOC}s/${.CURDIR:T} -D ${CANONICALOBJDIR} \
+ ${CATALOGS}
XSLTPROCOPTS?= --nonet
KNOWN_FORMATS= html html.tar html-split html-split.tar \
diff --git a/share/xml/catalog b/share/xml/catalog
index e5f8f771c1..f01953c0cf 100644
--- a/share/xml/catalog
+++ b/share/xml/catalog
@@ -4,13 +4,6 @@
-- $FreeBSD$
--
- -- ...................................................................... --
- -- Language neutral ..................................................... --
-
- -- These identifiers are shared across all translations of the FreeBSD
- documentation, even though the listed language is "EN"
- --
-
PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
"freebsd45.dtd"
@@ -20,12 +13,6 @@ PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
PUBLIC "-//FreeBSD//DOCUMENT DocBook Language Neutral Stylesheet//EN"
"freebsd.dsl"
-PUBLIC "-//FreeBSD//DOCUMENT DocBook HTML Stylesheet//EN"
- "freebsd-html.dsl"
-
-PUBLIC "-//FreeBSD//DOCUMENT DocBook HTML Lanugage Neutral Stylesheet//EN"
- "freebsd-html.dsl"
-
PUBLIC "-//FreeBSD//DOCUMENT DocBook Print Stylesheet//EN"
"freebsd-print.dsl"
@@ -37,86 +24,3 @@ PUBLIC "-//FreeBSD//DOCUMENT DocBook Common Stylesheet//EN"
PUBLIC "-//FreeBSD//DOCUMENT DocBook Common Lanugage Neutral Stylesheet//EN"
"freebsd-common.dsl"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN"
- "authors.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN"
- "man-refs.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
- "freebsd.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
- "l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Language Neutral Entities//EN"
- "l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN"
- "trademarks.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN"
- "urls.ent"
-
- -- ...................................................................... --
- -- HTML docs ............................................................ --
-
-PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN"
- "html401-freebsd.dtd"
-
-PUBLIC "-//FreeBSD//ENTITIES ISO 8879:1986 Entity Set//EN"
- "iso8879.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
- "l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES FreeBSD Common Entities//EN"
- "common.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES FreeBSD Developers Entities//EN"
- "developers.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES FreeBSD Release Entities//EN"
- "release.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES FreeBSD Release L10N Entities//EN"
- "release.l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Header L10N Entities//EN"
- "header.l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Header Entities//EN"
- "header.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Navigation Bar L10N Entities//EN"
- "navibar.l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Navigation Bar Entities//EN"
- "navibar.ent"
-
- -- ...................................................................... --
- -- English specific ..................................................... --
-
- -- These identifiers should only be used by English language versions of
- the FreeBSD Documentation.
-
- All other translations should base their FPIs on these, but change the
- final parameter in the FPI to represent the target language, as
- appropriate. Do not change the rest of the FPI
- --
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN"
- "../../en_US.ISO8859-1/share/xml/authors.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EN"
- "../../en_US.ISO8859-1/share/xml/teams.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//EN"
- "../../en_US.ISO8859-1/share/xml/glossary.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN"
- "../../en_US.ISO8859-1/share/xml/mailing-lists.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EN"
- "../../en_US.ISO8859-1/share/xml/newsgroups.ent"
diff --git a/sr_YU.ISO8859-2/share/xml/catalog b/sr_YU.ISO8859-2/share/xml/catalog
new file mode 100644
index 0000000000..2422c1740c
--- /dev/null
+++ b/sr_YU.ISO8859-2/share/xml/catalog
@@ -0,0 +1,2 @@
+PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
+ "freebsd.dsl"
diff --git a/zh_CN.GB2312/share/xml/catalog b/zh_CN.GB2312/share/xml/catalog
new file mode 100644
index 0000000000..2422c1740c
--- /dev/null
+++ b/zh_CN.GB2312/share/xml/catalog
@@ -0,0 +1,2 @@
+PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
+ "freebsd.dsl"
diff --git a/zh_TW.Big5/share/xml/catalog b/zh_TW.Big5/share/xml/catalog
new file mode 100644
index 0000000000..2422c1740c
--- /dev/null
+++ b/zh_TW.Big5/share/xml/catalog
@@ -0,0 +1,2 @@
+PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
+ "freebsd.dsl"
From 9f052111c65f513cbf56cc49f9b9fdf8adf7f924 Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Tue, 19 Feb 2013 16:20:38 +0000
Subject: [PATCH 067/121] - Remove a couple of DSSSL leftovers
---
de_DE.ISO8859-1/books/porters-handbook/Makefile | 1 -
en_US.ISO8859-1/books/design-44bsd/Makefile | 1 -
en_US.ISO8859-1/books/porters-handbook/Makefile | 1 -
fr_FR.ISO8859-1/books/porters-handbook/Makefile | 1 -
ja_JP.eucJP/books/design-44bsd/Makefile | 1 -
ja_JP.eucJP/books/porters-handbook/Makefile | 1 -
ru_RU.KOI8-R/books/design-44bsd/Makefile | 1 -
ru_RU.KOI8-R/books/porters-handbook/Makefile | 1 -
zh_CN.GB2312/books/porters-handbook/Makefile | 1 -
zh_TW.Big5/books/porters-handbook/Makefile | 1 -
10 files changed, 10 deletions(-)
diff --git a/de_DE.ISO8859-1/books/porters-handbook/Makefile b/de_DE.ISO8859-1/books/porters-handbook/Makefile
index 82650b4629..5d175d24d7 100644
--- a/de_DE.ISO8859-1/books/porters-handbook/Makefile
+++ b/de_DE.ISO8859-1/books/porters-handbook/Makefile
@@ -23,7 +23,6 @@ INSTALL_ONLY_COMPRESSED?=
SRCS= book.xml
# Use the local DSSSL file
-DSLHTML?= ${.CURDIR}/freebsd.dsl
DSLPRINT?= ${.CURDIR}/freebsd.dsl
# Images from the cross-document image library
diff --git a/en_US.ISO8859-1/books/design-44bsd/Makefile b/en_US.ISO8859-1/books/design-44bsd/Makefile
index 927603f613..11d460c057 100644
--- a/en_US.ISO8859-1/books/design-44bsd/Makefile
+++ b/en_US.ISO8859-1/books/design-44bsd/Makefile
@@ -12,7 +12,6 @@ INSTALL_ONLY_COMPRESSED?=
SRCS= book.xml
# Use the local DSSSL file
-DSLHTML?= ${.CURDIR}/freebsd.dsl
DSLPRINT?= ${.CURDIR}/freebsd.dsl
DOC_PREFIX?= ${.CURDIR}/../../..
diff --git a/en_US.ISO8859-1/books/porters-handbook/Makefile b/en_US.ISO8859-1/books/porters-handbook/Makefile
index 4fe2d4775d..8fec2756e6 100644
--- a/en_US.ISO8859-1/books/porters-handbook/Makefile
+++ b/en_US.ISO8859-1/books/porters-handbook/Makefile
@@ -22,7 +22,6 @@ INSTALL_ONLY_COMPRESSED?=
SRCS= book.xml
# Use the local DSSSL file
-DSLHTML?= ${.CURDIR}/freebsd.dsl
DSLPRINT?= ${.CURDIR}/freebsd.dsl
# Images from the cross-document image library
diff --git a/fr_FR.ISO8859-1/books/porters-handbook/Makefile b/fr_FR.ISO8859-1/books/porters-handbook/Makefile
index ce788f016c..cf9da4c2a1 100644
--- a/fr_FR.ISO8859-1/books/porters-handbook/Makefile
+++ b/fr_FR.ISO8859-1/books/porters-handbook/Makefile
@@ -23,7 +23,6 @@ INSTALL_ONLY_COMPRESSED?=
SRCS= book.xml
# Use the local DSSSL file
-DSLHTML?= ${.CURDIR}/freebsd.dsl
DSLPRINT?= ${.CURDIR}/freebsd.dsl
DOC_PREFIX?= ${.CURDIR}/../../..
diff --git a/ja_JP.eucJP/books/design-44bsd/Makefile b/ja_JP.eucJP/books/design-44bsd/Makefile
index 31d1526ff8..13c1b3ad8f 100644
--- a/ja_JP.eucJP/books/design-44bsd/Makefile
+++ b/ja_JP.eucJP/books/design-44bsd/Makefile
@@ -13,7 +13,6 @@ INSTALL_ONLY_COMPRESSED?=
SRCS= book.xml
# Use the local DSSSL file
-DSLHTML?= ${.CURDIR}/freebsd.dsl
DSLPRINT?= ${.CURDIR}/freebsd.dsl
DOC_PREFIX?= ${.CURDIR}/../../..
diff --git a/ja_JP.eucJP/books/porters-handbook/Makefile b/ja_JP.eucJP/books/porters-handbook/Makefile
index 5b43c3b471..8ffd52343d 100644
--- a/ja_JP.eucJP/books/porters-handbook/Makefile
+++ b/ja_JP.eucJP/books/porters-handbook/Makefile
@@ -23,7 +23,6 @@ INSTALL_ONLY_COMPRESSED?=
SRCS= book.xml
# Use the local DSSSL file
-DSLHTML?= ${.CURDIR}/freebsd.dsl
DSLPRINT?= ${.CURDIR}/freebsd.dsl
DOC_PREFIX?= ${.CURDIR}/../../..
diff --git a/ru_RU.KOI8-R/books/design-44bsd/Makefile b/ru_RU.KOI8-R/books/design-44bsd/Makefile
index 6086ac11d4..839359820f 100644
--- a/ru_RU.KOI8-R/books/design-44bsd/Makefile
+++ b/ru_RU.KOI8-R/books/design-44bsd/Makefile
@@ -17,7 +17,6 @@ INSTALL_ONLY_COMPRESSED?=
SRCS= book.xml
# Use the local DSSSL file
-DSLHTML?= ${.CURDIR}/freebsd.dsl
DSLPRINT?= ${.CURDIR}/freebsd.dsl
DOC_PREFIX?= ${.CURDIR}/../../..
diff --git a/ru_RU.KOI8-R/books/porters-handbook/Makefile b/ru_RU.KOI8-R/books/porters-handbook/Makefile
index 1dbd9c19ad..8601bee4a6 100644
--- a/ru_RU.KOI8-R/books/porters-handbook/Makefile
+++ b/ru_RU.KOI8-R/books/porters-handbook/Makefile
@@ -32,7 +32,6 @@ SRCS= book.xml
#SRCS+= ../../../en_US.ISO8859-1/books/handbook/authors.ent
# Use the local DSSSL file
-DSLHTML?= ${.CURDIR}/freebsd.dsl
DSLPRINT?= ${.CURDIR}/freebsd.dsl
DOC_PREFIX?= ${.CURDIR}/../../..
diff --git a/zh_CN.GB2312/books/porters-handbook/Makefile b/zh_CN.GB2312/books/porters-handbook/Makefile
index a565d9c5e0..863a51db83 100644
--- a/zh_CN.GB2312/books/porters-handbook/Makefile
+++ b/zh_CN.GB2312/books/porters-handbook/Makefile
@@ -26,7 +26,6 @@ INSTALL_ONLY_COMPRESSED?=
SRCS= book.xml
# Use the local DSSSL file
-DSLHTML?= ${.CURDIR}/freebsd.dsl
DSLPRINT?= ${.CURDIR}/freebsd.dsl
# Images from the cross-document image library
diff --git a/zh_TW.Big5/books/porters-handbook/Makefile b/zh_TW.Big5/books/porters-handbook/Makefile
index 7d3466c14b..60e7dfa999 100644
--- a/zh_TW.Big5/books/porters-handbook/Makefile
+++ b/zh_TW.Big5/books/porters-handbook/Makefile
@@ -22,7 +22,6 @@ INSTALL_ONLY_COMPRESSED?=
SRCS= book.xml
# Use the local DSSSL file
-DSLHTML?= ${.CURDIR}/freebsd.dsl
DSLPRINT?= ${.CURDIR}/freebsd.dsl
# Images from the cross-document image library
From f5b13d3d30641c46446224ecdcfa163f8aa53a23 Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Tue, 19 Feb 2013 17:08:14 +0000
Subject: [PATCH 068/121] - Clean up more DSSSL leftovers
---
da_DK.ISO8859-1/share/xml/freebsd.dsl | 35 --
.../books/porters-handbook/freebsd.dsl | 22 -
de_DE.ISO8859-1/share/xml/freebsd.dsl | 26 --
el_GR.ISO8859-7/share/xml/freebsd.dsl | 54 ---
.../books/porters-handbook/freebsd.dsl | 22 -
en_US.ISO8859-1/share/xml/freebsd.dsl | 7 -
es_ES.ISO8859-1/share/xml/freebsd.dsl | 36 --
.../books/porters-handbook/freebsd.dsl | 22 -
fr_FR.ISO8859-1/share/xml/freebsd.dsl | 41 --
hu_HU.ISO8859-2/share/xml/freebsd.dsl | 32 --
it_IT.ISO8859-15/share/xml/freebsd.dsl | 34 --
.../books/porters-handbook/freebsd.dsl | 22 -
ja_JP.eucJP/share/xml/freebsd.dsl | 35 --
mn_MN.UTF-8/share/xml/freebsd.dsl | 45 --
nl_NL.ISO8859-1/share/xml/freebsd.dsl | 6 -
pl_PL.ISO8859-2/share/xml/freebsd.dsl | 36 --
.../books/porters-handbook/freebsd.dsl | 22 -
ru_RU.KOI8-R/share/xml/freebsd.dsl | 53 ---
share/xml/freebsd-common.dsl | 12 +-
share/xml/freebsd-html.dsl | 410 ------------------
share/xml/freebsd-print.dsl | 5 -
share/xml/freebsd.dsl | 15 -
sr_YU.ISO8859-2/share/xml/freebsd.dsl | 32 --
.../books/porters-handbook/freebsd.dsl | 22 -
zh_CN.GB2312/share/xml/freebsd.dsl | 322 --------------
zh_TW.Big5/books/porters-handbook/freebsd.dsl | 22 -
zh_TW.Big5/share/xml/freebsd.dsl | 48 --
27 files changed, 1 insertion(+), 1437 deletions(-)
delete mode 100644 share/xml/freebsd-html.dsl
diff --git a/da_DK.ISO8859-1/share/xml/freebsd.dsl b/da_DK.ISO8859-1/share/xml/freebsd.dsl
index be8e51cbc7..3672899869 100644
--- a/da_DK.ISO8859-1/share/xml/freebsd.dsl
+++ b/da_DK.ISO8859-1/share/xml/freebsd.dsl
@@ -2,46 +2,11 @@
<!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
<!ENTITY freebsd.dsl PUBLIC "-//FreeBSD//DOCUMENT DocBook Language Neutral Stylesheet//EN" CDATA DSSSL>
-
-<!ENTITY % output.html "IGNORE">
-<!ENTITY % output.print "IGNORE">
]>
<style-sheet>
<style-specification use="docbook">
<style-specification-body>
- <!-- HTML only .................................................... -->
-
- <![ %output.html; [
-
- (define ($email-footer$)
- (make sequence
- (make element gi: "p"
- attributes: (list (list "align" "center"))
- (make element gi: "small"
- (literal "Dette og andre dokumenter kan downloades fra ")
- (create-link
- (list (list "HREF" "ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/"))
- (literal "ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/"))
- (literal ".")))
- (make element gi: "p"
- attributes: (list (list "align" "center"))
- (make element gi: "small"
- (literal "For sp�rgsm�l om FreeBSD, l�s ")
- (create-link
- (list (list "HREF" "http://www.FreeBSD.org/docs.html"))
- (literal "dokumentationen"))
- (literal " f�r du kontakter <")
- (create-link
- (list (list "HREF" "mailto:questions@FreeBSD.org"))
- (literal "questions@FreeBSD.org"))
- (literal ">.")
- (make empty-element gi: "br")
- (literal "For sp�rgsm�l ang�ende denne dokumentation, e-mail <")
- (create-link (list (list "HREF" "mailto:doc@FreeBSD.org"))
- (literal "doc@FreeBSD.org"))
- (literal ">.")))))
- ]]>
<!-- Fix a problem with the Danish localisation. -->
(define (local-da-label-title-sep)
(list
diff --git a/de_DE.ISO8859-1/books/porters-handbook/freebsd.dsl b/de_DE.ISO8859-1/books/porters-handbook/freebsd.dsl
index 957e41347f..cf5208b9d4 100644
--- a/de_DE.ISO8859-1/books/porters-handbook/freebsd.dsl
+++ b/de_DE.ISO8859-1/books/porters-handbook/freebsd.dsl
@@ -13,33 +13,11 @@
<!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
<!ENTITY freebsd.dsl SYSTEM "../../share/xml/freebsd.dsl" CDATA DSSSL>
-<!ENTITY % output.html "IGNORE">
]>
<style-sheet>
<style-specification use="docbook">
<style-specification-body>
-
- <![ %output.html; [
- (define ($email-footer$)
- (make sequence
- (make empty-element gi: "br")
- (literal "Fragen zum FreeBSD Ports-System richten Sie bitte an <")
- (create-link (list (list "HREF" "mailto:ports@FreeBSD.org"))
- (literal "ports@FreeBSD.org"))
- (literal ">,")
- (literal " Fragen zu diesem Dokument hingegen an <")
- (create-link (list (list "HREF" "mailto:de-bsd-translators@de.FreeBSD.org"))
- (literal "de-bsd-translators@de.FreeBSD.org"))
- (literal ">.")))
-
- <!-- Convert " ... " to `` ... '' in the HTML output. -->
- (element quote
- (make sequence
- (literal "``")
- (process-children)
- (literal "''")))
- ]]>
</style-specification-body>
</style-specification>
diff --git a/de_DE.ISO8859-1/share/xml/freebsd.dsl b/de_DE.ISO8859-1/share/xml/freebsd.dsl
index 0342573287..09befccd31 100644
--- a/de_DE.ISO8859-1/share/xml/freebsd.dsl
+++ b/de_DE.ISO8859-1/share/xml/freebsd.dsl
@@ -6,37 +6,11 @@
<!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
<!ENTITY freebsd.dsl PUBLIC "-//FreeBSD//DOCUMENT DocBook Language Neutral Stylesheet//EN" CDATA DSSSL>
-
-<!ENTITY % freebsd.l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN">
-%freebsd.l10n;
-
-<!ENTITY % output.html "IGNORE">
-<!ENTITY % output.print "IGNORE">
]>
<style-sheet>
<style-specification use="docbook">
<style-specification-body>
-
- <![ %output.html; [
-
- (define ($email-footer$)
- (make sequence
- (make element gi: "p"
- attributes: (list (list "align" "center"))
- (make element gi: "small"
- (literal "Wenn Sie Fragen zu FreeBSD haben, schicken Sie eine E-Mail an <")
- (make element gi: "a"
- attributes: (list (list "href" "mailto:de-bsd-questions@de.FreeBSD.org"))
- (literal "de-bsd-questions@de.FreeBSD.org"))
- (literal ">.")
- (make empty-element gi: "br")
- (literal "Wenn Sie Fragen zu dieser Dokumentation haben, schicken Sie eine E-Mail an <")
- (make element gi: "a"
- attributes: (list (list "href" "mailto:de-bsd-translators@de.FreeBSD.org"))
- (literal "de-bsd-translators@de.FreeBSD.org"))
- (literal ">.")))))
- ]]>
</style-specification-body>
</style-specification>
diff --git a/el_GR.ISO8859-7/share/xml/freebsd.dsl b/el_GR.ISO8859-7/share/xml/freebsd.dsl
index a825f1eace..a84951bb2e 100644
--- a/el_GR.ISO8859-7/share/xml/freebsd.dsl
+++ b/el_GR.ISO8859-7/share/xml/freebsd.dsl
@@ -11,57 +11,11 @@
<!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
<!ENTITY freebsd.dsl PUBLIC "-//FreeBSD//DOCUMENT DocBook Language Neutral Stylesheet//EN" CDATA DSSSL>
-
-<!ENTITY % freebsd.l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN">
-%freebsd.l10n;
-
-<!ENTITY % output.html "IGNORE">
-<!ENTITY % output.print "IGNORE">
-<!ENTITY % lang.el.dsssl "IGNORE">
]>
<style-sheet>
<style-specification use="docbook">
<style-specification-body>
- <!-- HTML only .................................................... -->
-
- <![ %output.html; [
-
- (define ($email-footer$)
- (make sequence
- (make element gi: "p"
- attributes: (list (list "align" "center"))
- (make element gi: "small"
- (literal "���� �� �������, ��� ���� �������, ������ �� ������ ��� ")
- (create-link
- (list (list "HREF" "ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/"))
- (literal "ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/"))
- (literal ".")))
- (make element gi: "p"
- attributes: (list (list "align" "center"))
- (make element gi: "small"
- (literal "��� ��������� ������� �� �� FreeBSD, �������� ��� ")
- (create-link
- (list (list "HREF" "http://www.FreeBSD.org/docs.html"))
- (literal "����������"))
- (literal " ���� �� �������������� �� ��� <")
- (create-link
- (list (list "HREF" "mailto:questions@FreeBSD.org"))
- (literal "questions@FreeBSD.org"))
- (literal ">.")
- (make empty-element gi: "br")
- (literal "��� ��������� ������� �� ���� ��� ����������, ������� e-mail ���� <")
- (create-link (list (list "HREF" "mailto:doc@FreeBSD.org"))
- (literal "doc@FreeBSD.org"))
- (literal ">.")))))
-
- (element quote
- (make sequence
- (make entity-ref name: "laquo")
- (process-children)
- (make entity-ref name: "raquo")))
- ]]>
-
(define (local-el-label-title-sep)
(list
(list (normalize "warning") ": ")
@@ -79,11 +33,3 @@
<external-specification id="docbook" document="freebsd.dsl">
</style-sheet>
-
-<!--
-Local variables:
-coding: iso-8859-7
-mode: dsssl
-fill-column: 78
-End:
--->
diff --git a/en_US.ISO8859-1/books/porters-handbook/freebsd.dsl b/en_US.ISO8859-1/books/porters-handbook/freebsd.dsl
index f5e26338e4..7cbc062778 100644
--- a/en_US.ISO8859-1/books/porters-handbook/freebsd.dsl
+++ b/en_US.ISO8859-1/books/porters-handbook/freebsd.dsl
@@ -6,33 +6,11 @@
<!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
<!ENTITY freebsd.dsl SYSTEM "../../share/xml/freebsd.dsl" CDATA DSSSL>
-<!ENTITY % output.html "IGNORE">
]>
<style-sheet>
<style-specification use="docbook">
<style-specification-body>
-
- <![ %output.html; [
- (define ($email-footer$)
- (make sequence
- (literal "For questions about the FreeBSD ports system, e-mail <")
- (create-link (list (list "HREF" "mailto:ports@FreeBSD.org"))
- (literal "ports@FreeBSD.org"))
- (literal ">.")
- (make empty-element gi: "br")
- (literal "For questions about this documentation, e-mail <")
- (create-link (list (list "HREF" "mailto:doc@FreeBSD.org"))
- (literal "doc@FreeBSD.org"))
- (literal ">.")))
-
- <!-- Convert " ... " to `` ... '' in the HTML output. -->
- (element quote
- (make sequence
- (literal "``")
- (process-children)
- (literal "''")))
- ]]>
</style-specification-body>
</style-specification>
diff --git a/en_US.ISO8859-1/share/xml/freebsd.dsl b/en_US.ISO8859-1/share/xml/freebsd.dsl
index a6e8b41aea..30c745f542 100644
--- a/en_US.ISO8859-1/share/xml/freebsd.dsl
+++ b/en_US.ISO8859-1/share/xml/freebsd.dsl
@@ -2,13 +2,6 @@
<!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
<!ENTITY freebsd.dsl PUBLIC "-//FreeBSD//DOCUMENT DocBook Language Neutral Stylesheet//EN" CDATA DSSSL>
-
-<!ENTITY % freebsd.l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN">
-%freebsd.l10n;
-
-<!ENTITY % output.html "IGNORE">
-<!ENTITY % output.print "IGNORE">
-<!ENTITY % output.print.niceheaders "IGNORE">
]>
<style-sheet>
diff --git a/es_ES.ISO8859-1/share/xml/freebsd.dsl b/es_ES.ISO8859-1/share/xml/freebsd.dsl
index 1c61f2c5fc..30c745f542 100644
--- a/es_ES.ISO8859-1/share/xml/freebsd.dsl
+++ b/es_ES.ISO8859-1/share/xml/freebsd.dsl
@@ -2,47 +2,11 @@
<!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
<!ENTITY freebsd.dsl PUBLIC "-//FreeBSD//DOCUMENT DocBook Language Neutral Stylesheet//EN" CDATA DSSSL>
-
-<!ENTITY % output.html "IGNORE">
-<!ENTITY % output.print "IGNORE">
]>
<style-sheet>
<style-specification use="docbook">
<style-specification-body>
- <!-- HTML only .................................................... -->
-
- <![ %output.html; [
-
- (define ($email-footer$)
- (make sequence
- (make element gi: "p"
- attributes: (list (list "align" "center"))
- (make element gi: "small"
- (literal "Puede descargar �ste y muchos otros documentos desde ")
- (create-link
- (list (list "HREF" "ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/"))
- (literal "ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/"))
- (literal ".")))
- (make element gi: "p"
- attributes: (list (list "align" "center"))
- (make element gi: "small"
- (literal "Si tiene dudas sobre FreeBSD consulte la ")
- (create-link
- (list (list "HREF" "http://www.FreeBSD.org/docs.html"))
- (literal "documentaci�n"))
- (literal " antes de escribir a la lista <")
- (create-link
- (list (list "HREF" "mailto:questions@FreeBSD.org"))
- (literal "questions@FreeBSD.org"))
- (literal ">.")
- (make empty-element gi: "br")
- (literal "Env�e sus preguntas sobre la documentaci�n a <")
- (create-link (list (list "HREF" "mailto:doc@FreeBSD.org"))
- (literal "doc@FreeBSD.org"))
- (literal ">.")))))
- ]]>
-
</style-specification-body>
</style-specification>
diff --git a/fr_FR.ISO8859-1/books/porters-handbook/freebsd.dsl b/fr_FR.ISO8859-1/books/porters-handbook/freebsd.dsl
index 16d795c0a4..6dcdc75392 100644
--- a/fr_FR.ISO8859-1/books/porters-handbook/freebsd.dsl
+++ b/fr_FR.ISO8859-1/books/porters-handbook/freebsd.dsl
@@ -12,33 +12,11 @@
<!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
<!ENTITY freebsd.dsl SYSTEM "../../share/xml/freebsd.dsl" CDATA DSSSL>
-<!ENTITY % output.html "IGNORE">
]>
<style-sheet>
<style-specification use="docbook">
<style-specification-body>
-
- <![ %output.html; [
- (define ($email-footer$)
- (make sequence
- (literal "Pour toutes questions sur le systeme des ports, e-mail <")
- (create-link (list (list "HREF" "mailto:ports@FreeBSD.org"))
- (literal "ports@FreeBSD.org"))
- (literal ">.")
- (make empty-element gi: "br")
- (literal "Pour toutes questions a propos de la documentation, e-mail <")
- (create-link (list (list "HREF" "mailto:doc@FreeBSD.org"))
- (literal "doc@FreeBSD.org"))
- (literal ">.")))
-
- <!-- Convert " ... " to `` ... '' in the HTML output. -->
- (element quote
- (make sequence
- (literal "``")
- (process-children)
- (literal "''")))
- ]]>
</style-specification-body>
</style-specification>
diff --git a/fr_FR.ISO8859-1/share/xml/freebsd.dsl b/fr_FR.ISO8859-1/share/xml/freebsd.dsl
index 310845b2d1..b573e51290 100644
--- a/fr_FR.ISO8859-1/share/xml/freebsd.dsl
+++ b/fr_FR.ISO8859-1/share/xml/freebsd.dsl
@@ -10,53 +10,12 @@
<!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
<!ENTITY freebsd.dsl PUBLIC "-//FreeBSD//DOCUMENT DocBook Language Neutral Stylesheet//EN" CDATA DSSSL>
-
-<!ENTITY % output.html "IGNORE">
-<!ENTITY % output.print "IGNORE">
]>
<style-sheet>
<style-specification use="docbook">
<style-specification-body>
- <![ %output.html; [
-
- <!-- Fix a problem with the French localisation. This should really
- be a patch to the dsssl-docbook-modular port, but this gets it
- more widely available sooner. A patch will be applied to the
- port as well, and then this can be removed. -->
- (define (gentext-fr-nav-prev prev)
- (make sequence (literal "Pr\U-00E9;c\U-00E9;dent")))
-
- (define ($email-footer$)
- (make sequence
- (make element gi: "p"
- attributes: (list (list "align" "center"))
- (make element gi: "small"
- (literal "Ce document, ainsi que d'autres peut �tre t�l�charg� sur ")
- (make element gi: "a"
- attributes: (list (list "href" "ftp://ftp.FreeBSD.org/pub/FreeBSD/doc"))
- (literal "ftp.FreeBSD.org/pub/FreeBSD/doc/"))
- (literal ".")))
- (make element gi: "p"
- attributes: (list (list "align" "center"))
- (make element gi: "small"
- (literal "Pour toutes questions � propos de FreeBSD, lisez la ")
- (make element gi: "a"
- attributes: (list (list "href" "http://www.freebsd.org/docs.html"))
- (literal "documentation"))
- (literal " avant de contacter <")
- (make element gi: "a"
- attributes: (list (list "href" "mailto:questions@FreeBSD.org"))
- (literal "questions@FreeBSD.org"))
- (literal ">.")
- (make empty-element gi: "br")
- (literal "Pour les questions sur cette documentation, contactez <")
- (make element gi: "a"
- attributes: (list (list "href" "mailto:doc@FreeBSD.org"))
- (literal "doc@FreeBSD.org"))
- (literal ">.")))))
- ]]>
<!-- Fix a problem with the French localisation. The bug was
submitted to authors of docbook project -->
(define (local-fr-label-title-sep)
diff --git a/hu_HU.ISO8859-2/share/xml/freebsd.dsl b/hu_HU.ISO8859-2/share/xml/freebsd.dsl
index cf3b08fe2c..36f1c23016 100644
--- a/hu_HU.ISO8859-2/share/xml/freebsd.dsl
+++ b/hu_HU.ISO8859-2/share/xml/freebsd.dsl
@@ -8,43 +8,11 @@
<!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
<!ENTITY freebsd.dsl PUBLIC "-//FreeBSD//DOCUMENT DocBook Language Neutral Stylesheet//EN" CDATA DSSSL>
-
-<!ENTITY % freebsd.l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN">
-%freebsd.l10n;
-
-<!ENTITY % output.html "IGNORE">
-<!ENTITY % output.print "IGNORE">
]>
<style-sheet>
<style-specification use="docbook">
<style-specification-body>
-
- <![ %output.html; [
- (define ($email-footer$)
- (make sequence
- (make element gi: "p"
- attributes: (list (list "align" "center"))
- (make element gi: "small"
- (literal "Ha k�rd�se van a FreeBSD-vel kapcsolatban, a k�vetkez�
- c�mre �rhat (angolul): <")
- (make element gi: "a"
- attributes: (list (list "href" "mailto:freebsd-questions@FreeBSD.org"))
- (literal "freebsd-questions@FreeBSD.org>."))
- (make empty-element gi: "br")
- (literal "Ha ezzel a dokumentummal kapcsolatban van k�rd�se,
- k�rj�k erre a c�mre �rjon: <")
- (make element gi: "a"
- attributes: (list (list "href" "mailto:gabor@FreeBSD.org"))
- (literal "gabor@FreeBSD.org>."))
- ))))
-
- (define (local-hu-label-title-sep)
- (list
- (list (normalize "caution") ": ")
- (list (normalize "warning") ": ")
- ))
- ]]>
</style-specification-body>
</style-specification>
diff --git a/it_IT.ISO8859-15/share/xml/freebsd.dsl b/it_IT.ISO8859-15/share/xml/freebsd.dsl
index d9f009ce74..b94833e7ae 100644
--- a/it_IT.ISO8859-15/share/xml/freebsd.dsl
+++ b/it_IT.ISO8859-15/share/xml/freebsd.dsl
@@ -7,45 +7,11 @@
<!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
<!ENTITY freebsd.dsl PUBLIC "-//FreeBSD//DOCUMENT DocBook Language Neutral Stylesheet//EN" CDATA DSSSL>
-
-<!ENTITY % output.html "IGNORE">
-<!ENTITY % output.print "IGNORE">
]>
<style-sheet>
<style-specification use="docbook">
<style-specification-body>
- <![ %output.html; [
-
- (define ($email-footer$)
- (make sequence
- (make element gi: "p"
- attributes: (list (list "align" "center"))
- (make element gi: "small"
- (literal "Questo, ed altri documenti, possono essere scaricati da ")
- (create-link
- (list (list "HREF" "ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/"))
- (literal "ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/"))
- (literal ".")))
- (make element gi: "p"
- attributes: (list (list "align" "center"))
- (make element gi: "small"
- (literal "Per domande su FreeBSD, leggi la ")
- (create-link
- (list (list "HREF" "http://www.FreeBSD.org/docs.html"))
- (literal "documentazione"))
- (literal " prima di contattare <")
- (create-link
- (list (list "HREF" "mailto:questions@FreeBSD.org"))
- (literal "questions@FreeBSD.org"))
- (literal ">.")
- (make empty-element gi: "br")
- (literal "Per domande su questa documentazione, invia una e-mail a <")
- (create-link (list (list "HREF" "mailto:doc@FreeBSD.org"))
- (literal "doc@FreeBSD.org"))
- (literal ">.")))))
- ]]>
-
(define (local-it-label-title-sep)
(list
(list (normalize "warning") ": ")
diff --git a/ja_JP.eucJP/books/porters-handbook/freebsd.dsl b/ja_JP.eucJP/books/porters-handbook/freebsd.dsl
index d90bcb235c..3221583b4f 100644
--- a/ja_JP.eucJP/books/porters-handbook/freebsd.dsl
+++ b/ja_JP.eucJP/books/porters-handbook/freebsd.dsl
@@ -12,33 +12,11 @@
<!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
<!ENTITY freebsd.dsl SYSTEM "../../share/xml/freebsd.dsl" CDATA DSSSL>
-<!ENTITY % output.html "IGNORE">
]>
<style-sheet>
<style-specification use="docbook">
<style-specification-body>
-
- <![ %output.html; [
- (define ($email-footer$)
- (make sequence
- (literal "FreeBSD ports �����ƥ�˴ؤ������ϡ�(�Ѹ��) <")
- (create-link (list (list "HREF" "mailto:ports@FreeBSD.org"))
- (literal "ports@FreeBSD.org"))
- (literal "> �ء�")
- (make empty-element gi: "br")
- (literal "����ʸ��θ�ʸ�˴ؤ��뤪�䤤��碌�ϡ�(�Ѹ��) <")
- (create-link (list (list "HREF" "mailto:doc@FreeBSD.org"))
- (literal "doc@FreeBSD.org"))
- (literal "> �ޤǤ��ꤤ���ޤ���")))
-
- <!-- Convert " ... " to `` ... '' in the HTML output. -->
- (element quote
- (make sequence
- (literal "``")
- (process-children)
- (literal "''")))
- ]]>
</style-specification-body>
</style-specification>
diff --git a/ja_JP.eucJP/share/xml/freebsd.dsl b/ja_JP.eucJP/share/xml/freebsd.dsl
index 24287b9b34..30c745f542 100644
--- a/ja_JP.eucJP/share/xml/freebsd.dsl
+++ b/ja_JP.eucJP/share/xml/freebsd.dsl
@@ -2,46 +2,11 @@
<!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
<!ENTITY freebsd.dsl PUBLIC "-//FreeBSD//DOCUMENT DocBook Language Neutral Stylesheet//EN" CDATA DSSSL>
-
-<!ENTITY % freebsd.l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN">
-%freebsd.l10n;
-
-<!ENTITY % output.html "IGNORE">
-<!ENTITY % output.print "IGNORE">
]>
<style-sheet>
<style-specification use="docbook">
<style-specification-body>
- <![ %output.html; [
- (define ($email-footer$)
- (make sequence
- (make element gi: "p"
- attributes: (list (list "align" "center"))
- (make element gi: "small"
- (literal "��ʸ�����¾��ʸ��� ")
- (create-link
- (list (list "HREF" "ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/"))
- (literal "ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/"))
- (literal " �������������ɤǤ��ޤ���")))
- (make element gi: "p"
- attributes: (list (list "align" "center"))
- (make element gi: "small"
- (literal "FreeBSD �˴ؤ�����䤬������ˤϡ�")
- (create-link
- (list (list "HREF" "http://www.FreeBSD.org/ja/docs.html"))
- (literal "�ɥ������"))
- (literal " ���ɤ����� <")
- (create-link
- (list (list "HREF" "mailto:questions@FreeBSD.org"))
- (literal "questions@FreeBSD.org"))
- (literal "> �ޤ� (�Ѹ��) Ϣ�����Ƥ���������")
- (make empty-element gi: "br")
- (literal "��ʸ��˴ؤ������ˤĤ��Ƥϡ�<")
- (create-link (list (list "HREF" "mailto:doc@FreeBSD.org"))
- (literal "doc@FreeBSD.org"))
- (literal "> �ޤ��Żҥ��� (�Ѹ��) ���äƤ���������")))))
- ]]>
</style-specification-body>
</style-specification>
diff --git a/mn_MN.UTF-8/share/xml/freebsd.dsl b/mn_MN.UTF-8/share/xml/freebsd.dsl
index 10f299013f..1de7e806e1 100644
--- a/mn_MN.UTF-8/share/xml/freebsd.dsl
+++ b/mn_MN.UTF-8/share/xml/freebsd.dsl
@@ -8,56 +8,11 @@
<!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
<!ENTITY freebsd.dsl PUBLIC "-//FreeBSD//DOCUMENT DocBook Language Neutral Stylesheet//EN" CDATA DSSSL>
-<!ENTITY % lang.mn.dsssl "IGNORE">
-
-<!ENTITY % freebsd.l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN">
-%freebsd.l10n;
-
-<!ENTITY % output.html "IGNORE">
-<!ENTITY % output.print "IGNORE">
]>
<style-sheet>
<style-specification use="docbook">
<style-specification-body>
- <![ %output.html; [
-
- <![ %lang.mn.dsssl; [
- (define %gentext-language% "mn")
- ]]>
- (define ($email-footer$)
- (make sequence
- (make element gi: "p"
- attributes: (list (list "align" "center"))
- (make element gi: "small"
- (literal "Энэ болон бусад баримтуудыг ")
- (create-link
- (list (list "HREF" "ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/"))
- (literal "ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/"))
- (literal " хаягаас татаж авч болно.")))
- (make element gi: "p"
- attributes: (list (list "align" "center"))
- (make element gi: "small"
- (literal "FreeBSD-ийн талаар <")
- (create-link
- (list (list "HREF" "mailto:questions@FreeBSD.org"))
- (literal "questions@FreeBSD.org"))
- (literal "> хаягтай холбоо барихаасаа өмнө ")
- (create-link
- (list (list "HREF" "http://www.FreeBSD.org/docs.html"))
- (literal "баримтыг"))
- (literal " уншина уу.")
- (make empty-element gi: "br")
- (literal "Энэ бичиг баримттай холбоотой асуулт байвал <")
- (create-link (list (list "HREF" "mailto:doc@FreeBSD.org"))
- (literal "doc@FreeBSD.org"))
- (literal "> хаягаар цахим захидал явуулна уу.")
- (make empty-element gi: "br")
- (literal "Энэ бичиг баримтын орчуулгатай холбоотой асуулт байвал <")
- (create-link (list (list "HREF" "mailto:admin@mnbsd.org"))
- (literal "admin@mnbsd.org"))
- (literal "> хаягаар цахим захидал явуулна уу.")))))
- ]]>
(define (local-mn-label-title-sep)
(list
diff --git a/nl_NL.ISO8859-1/share/xml/freebsd.dsl b/nl_NL.ISO8859-1/share/xml/freebsd.dsl
index ef287dc3c0..75709a3ca0 100644
--- a/nl_NL.ISO8859-1/share/xml/freebsd.dsl
+++ b/nl_NL.ISO8859-1/share/xml/freebsd.dsl
@@ -8,12 +8,6 @@
<!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
<!ENTITY freebsd.dsl PUBLIC "-//FreeBSD//DOCUMENT DocBook Language Neutral Stylesheet//EN" CDATA DSSSL>
-
-<!ENTITY % freebsd.l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN">
-%freebsd.l10n;
-
-<!ENTITY % output.html "IGNORE">
-<!ENTITY % output.print "IGNORE">
]>
<style-sheet>
diff --git a/pl_PL.ISO8859-2/share/xml/freebsd.dsl b/pl_PL.ISO8859-2/share/xml/freebsd.dsl
index 24be6027d0..8877f4abc8 100644
--- a/pl_PL.ISO8859-2/share/xml/freebsd.dsl
+++ b/pl_PL.ISO8859-2/share/xml/freebsd.dsl
@@ -8,47 +8,11 @@
<!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
<!ENTITY freebsd.dsl PUBLIC "-//FreeBSD//DOCUMENT DocBook Language Neutral Stylesheet//EN" CDATA DSSSL>
-
-<!ENTITY % freebsd.l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN">
-%freebsd.l10n;
-
-<!ENTITY % output.html "IGNORE">
-<!ENTITY % output.print "IGNORE">
]>
<style-sheet>
<style-specification use="docbook">
<style-specification-body>
- <![ %output.html; [
-
- (define ($email-footer$)
- (make sequence
- (make element gi: "p"
- attributes: (list (list "align" "center"))
- (make element gi: "small"
- (literal "Ten i inne dokumenty mo�na pobra� z ")
- (create-link
- (list (list "HREF" "ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/"))
- (literal "ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/"))
- (literal ".")))
- (make element gi: "p"
- attributes: (list (list "align" "center"))
- (make element gi: "small"
- (literal "W przypadku pyta� o FreeBSD prosimy przeczyta� dost�pn� ")
- (create-link
- (list (list "HREF" "http://www.FreeBSD.org/docs.html"))
- (literal "dokumentacj�"))
- (literal " przed kontaktem z <")
- (create-link
- (list (list "HREF" "mailto:questions@FreeBSD.org"))
- (literal "questions@FreeBSD.org"))
- (literal ">.")
- (make empty-element gi: "br")
- (literal "W sprawie zapyta� o t� dokumentacj� prosimy o kontakt z <")
- (create-link (list (list "HREF" "mailto:doc@FreeBSD.org"))
- (literal "doc@FreeBSD.org"))
- (literal ">.")))))
- ]]>
</style-specification-body>
</style-specification>
diff --git a/ru_RU.KOI8-R/books/porters-handbook/freebsd.dsl b/ru_RU.KOI8-R/books/porters-handbook/freebsd.dsl
index 768cd759b7..135e7902b6 100644
--- a/ru_RU.KOI8-R/books/porters-handbook/freebsd.dsl
+++ b/ru_RU.KOI8-R/books/porters-handbook/freebsd.dsl
@@ -13,33 +13,11 @@
<!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
<!ENTITY freebsd.dsl SYSTEM "../../share/xml/freebsd.dsl" CDATA DSSSL>
-<!ENTITY % output.html "IGNORE">
]>
<style-sheet>
<style-specification use="docbook">
<style-specification-body>
-
- <![ %output.html; [
- (define ($email-footer$)
- (make sequence
- (literal "�� �������� ��������� � �������� ������ ��� FreeBSD, ������ �� ������ <")
- (create-link (list (list "HREF" "mailto:ports@FreeBSD.org"))
- (literal "ports@FreeBSD.org"))
- (literal ">.")
- (make empty-element gi: "br")
- (literal "�� ��������, ��������� � ���� �������������, ������ �� ������ <")
- (create-link (list (list "HREF" "mailto:doc@FreeBSD.org"))
- (literal "doc@FreeBSD.org"))
- (literal ">.")))
-
- <!-- Convert " ... " to `` ... '' in the HTML output. -->
- (element quote
- (make sequence
- (literal "``")
- (process-children)
- (literal "''")))
- ]]>
</style-specification-body>
</style-specification>
diff --git a/ru_RU.KOI8-R/share/xml/freebsd.dsl b/ru_RU.KOI8-R/share/xml/freebsd.dsl
index 2ee520e26f..4ae7a0880a 100644
--- a/ru_RU.KOI8-R/share/xml/freebsd.dsl
+++ b/ru_RU.KOI8-R/share/xml/freebsd.dsl
@@ -9,65 +9,12 @@
<!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
<!ENTITY freebsd.dsl PUBLIC "-//FreeBSD//DOCUMENT DocBook Language Neutral Stylesheet//EN" CDATA DSSSL>
-<!ENTITY % lang.ru.dsssl "IGNORE">
-
-<!ENTITY % freebsd.l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN">
-%freebsd.l10n;
-
-<!ENTITY % output.html "IGNORE">
-<!ENTITY % output.print "IGNORE">
]>
<style-sheet>
<style-specification use="docbook">
<style-specification-body>
- <![ %output.html; [
-
- <![ %lang.ru.dsssl; [
- (define %gentext-language% "ru")
- ]]>
-
- (define ($email-footer$)
- (make sequence
- (make element gi: "p"
- attributes: (list (list "align" "center"))
- (make element gi: "small"
- (literal "����, � ������ ���������, ����� ���� ������� � ")
- (create-link
- (list (list "HREF" "ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/"))
- (literal "ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/"))
- (literal ".")))
- (make element gi: "p"
- attributes: (list (list "align" "center"))
- (make element gi: "small"
- (literal "�� ��������, ��������� � FreeBSD, ���������� ")
- (create-link
- (list (list "HREF" "http://www.FreeBSD.org/ru/docs.html"))
- (literal "������������"))
- (literal " ������ ��� ������ � <")
- (create-link
- (list (list "HREF" "mailto:questions@FreeBSD.org"))
- (literal "questions@FreeBSD.org"))
- (literal ">.")
- (make empty-element gi: "br")
- (literal "�� ��������, ��������� � ���� �������������, ������ <")
- (create-link (list (list "HREF" "mailto:doc@FreeBSD.org"))
- (literal "doc@FreeBSD.org"))
- (literal ">.")
- (make empty-element gi: "br")
- (literal "�� ��������, ��������� � ������� ��������� ������������, ������ � �������� <")
- (create-link (list (list "HREF" "mailto:frdp@FreeBSD.org.ua"))
- (literal "frdp@FreeBSD.org.ua"))
- (literal ">.")
- (make empty-element gi: "br")
- (literal "���������� �� �������� �� ��� �������� ��������� �� ")
- (create-link
- (list (list "HREF" "http://www.FreeBSD.org.ua/resources.html"))
- (literal "����� ������� ��������"))
- (literal ".")))))
- ]]>
-
<!-- Convert " ... " to '' ... '' in the HTML output. -->
(element quote
(make sequence
diff --git a/share/xml/freebsd-common.dsl b/share/xml/freebsd-common.dsl
index 7a98397c4e..b3ef17e96f 100644
--- a/share/xml/freebsd-common.dsl
+++ b/share/xml/freebsd-common.dsl
@@ -1,14 +1,6 @@
<!-- $FreeBSD$ -->
-<!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
-<!ENTITY % freebsd.l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN">
-%freebsd.l10n;
-<!ENTITY % freebsd.l10n-common PUBLIC "-//FreeBSD//ENTITIES DocBook Language Neutral Entities//EN">
-%freebsd.l10n-common;
-
-<!ENTITY % output.html "IGNORE">
-<!ENTITY % output.print "IGNORE">
-]>
+<!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN">
<style-sheet>
<style-specification>
@@ -153,9 +145,7 @@
(element errorname
(make sequence
- <![ %output.html; [ (literal "“") ]]>
($mono-seq$ (process-children))
- <![ %output.html; [ (literal "”") ]]>
))
<!-- John Fieber's 'instant' translation specification had
diff --git a/share/xml/freebsd-html.dsl b/share/xml/freebsd-html.dsl
deleted file mode 100644
index c10a01047b..0000000000
--- a/share/xml/freebsd-html.dsl
+++ /dev/null
@@ -1,410 +0,0 @@
-<!-- $FreeBSD$ -->
-
-<!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
-<!ENTITY % output.html "IGNORE">
-<!ENTITY % output.html.images "IGNORE">
-
-<!ENTITY % freebsd.l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN">
-%freebsd.l10n;
-<!ENTITY % freebsd.l10n-common PUBLIC "-//FreeBSD//ENTITIES DocBook Language Neutral Entities//EN">
-%freebsd.l10n-common;
-]>
-
-<style-sheet>
- <style-specification>
- <style-specification-body>
-
- (declare-flow-object-class formatting-instruction
- "UNREGISTERED::James Clark//Flow Object Class::formatting-instruction")
-
- <!-- HTML only .................................................... -->
-
- <![ %output.html; [
- <!-- Configure the stylesheet using documented variables -->
-
- (define %hyphenation% #f) <!-- Silence a warning -->
-
- <!--
- Redefine $user-html-header$ to put </script> in a single line.
- This is an ugly hack but it should work.
- -->
- (define ($user-html-header$ #!optional
- (home (empty-node-list))
- (up (empty-node-list))
- (prev (empty-node-list))
- (next (empty-node-list)))
- ;; Add additional header tags.
- (let loop ((tl %html-header-tags%))
- (if (or (null? tl) (null? (car tl)))
- (empty-sosofo)
- (make sequence
- (cond
- ((equal? (normalize "SCRIPT") (car (car tl)))
- (make sequence
- (make empty-element gi: (car (car tl))
- attributes: (cdr (car tl)))
- (htmlnewline)
- (make formatting-instruction data: "</")
- (make formatting-instruction data: "SCRIPT>")))
- (else
- (make sequence
- (make empty-element gi: (car (car tl))
- attributes: (cdr (car tl))))))
- (loop (cdr tl))))))
-
- <!-- Use javascript for google analytics -->
- (define %html-header-script-googlejs%
- "http://www.FreeBSD.org/layout/js/google.js")
- (define %html-header-script%
- #f)
-
- (define %html-header-tags%
- (list (quote ("META"
- ("HTTP-EQUIV" "Content-Type")
- ("CONTENT" "text/html; charset=&doc.html.charset;")))
- (if %html-header-script%
- (list "SCRIPT"
- (list "TYPE" "text/javascript")
- (list "SRC" %html-header-script-googlejs%))
- '())))
-
- (define %gentext-nav-use-tables%
- ;; Use tables to build the navigation headers and footers?
- #t)
-
- (define %html-ext%
- ;; Default extension for HTML output files
- ".html")
-
- (define %shade-verbatim%
- ;; Should verbatim environments be shaded?
- #f)
-
- (define %use-id-as-filename%
- ;; Use ID attributes as name for component HTML files?
- #t)
-
- (define %root-filename%
- ;; Name for the root HTML document
- "index")
-
- (define html-manifest
- ;; Write a manifest?
- #f)
-
- (define %generate-legalnotice-link%
- ;; Should legal notices be a link to a separate file?
- ;;
- ;; Naturally, this has no effect if you're building one big
- ;; HTML file.
- #f)
-
- (define %generate-docformat-navi-link%
- ;; Create docformat navi link for HTML output?
- #f)
-
-;; Taken from Norm's stylesheets; modified to add support for TITLE so
-;; that we get a mouse over definition for acronyms in HTML output.
-
- (define ($acronym-seq$ #!optional (sosofo (process-children)))
- (let* ((acronym-remark (select-elements
- (children (current-node))
- (normalize "remark"))))
- (let* ((title (if (and acronym-remark
- (equal? (attribute-string (normalize "role") acronym-remark) "acronym"))
- (data acronym-remark)
- "")))
- (make element gi: "ACRONYM"
- attributes: (list
- (list "CLASS" (gi))
- (list "TITLE" title))
- sosofo))))
-
- (define (book-titlepage-recto-elements)
- (list (normalize "title")
- (normalize "subtitle")
- (normalize "graphic")
- (normalize "mediaobject")
- (normalize "corpauthor")
- (normalize "authorgroup")
- (normalize "author")
- (normalize "editor")
- (normalize "copyright")
- (normalize "abstract")
- (normalize "legalnotice")
- (normalize "isbn")))
-
- ;; Create a simple navigation link
- ;; if %generate-docformat-navi-link% defined.
- (define (make-docformat-navi tlist)
- (let ((rootgi (gi (sgml-root-element))))
- (make element gi: "DIV"
- attributes: '(("CLASS" "DOCFORAMTNAVI"))
- (literal "[ ")
- (make-docformat-navi-link rootgi tlist)
- (literal " ]"))))
-
- (define (make-docformat-navi-link rootgi tlist)
- (make sequence
- (cond
- ((null? tlist) (empty-sosofo))
- ((null? (car tlist)) (empty-sosofo))
- ((not (symbol? (car tlist))) (empty-sosofo))
- ((equal? (car tlist) 'html-split)
- (make sequence
- (create-link (list (list "href" "./index.html"))
- (literal "&docnavi.split-html;"))
- (if (not (null? (cdr tlist)))
- (make sequence
- (literal " / ")
- (make-docformat-navi-link rootgi (cdr tlist)))
- (empty-sosofo))))
- ((equal? (car tlist) 'html-single)
- (make sequence
- (create-link (list (list "href"
- (string-append "./" (case-fold-down rootgi) ".html")))
- (literal "&docnavi.single-html;"))
- (if (not (null? (cdr tlist)))
- (make sequence
- (literal " / ")
- (make-docformat-navi-link rootgi (cdr tlist)))
- (empty-sosofo))))
- (else (empty-sosofo)))))
-
- (define (article-titlepage-separator side)
- (make sequence
- (if %generate-docformat-navi-link%
- (make-docformat-navi '(html-split html-single))
- (empty-sosofo))
- (make empty-element gi: "HR")))
-
- (define (book-titlepage-separator side)
- (if (equal? side 'recto)
- (make sequence
- (if %generate-docformat-navi-link%
- (make-docformat-navi '(html-split html-single))
- (empty-sosofo))
- (make empty-element gi: "HR"))
- (empty-sosofo)))
-
- <!-- This is the text to display at the bottom of each page.
- Defaults to nothing. The individual stylesheets should
- redefine this as necessary. -->
- (define ($email-footer$)
- (empty-sosofo))
-
- (define html-index-filename
- (if nochunks
- "html.index"
- "html-split.index"))
-
- (define %stylesheet%
- "docbook.css")
-
- <!-- This code handles displaying $email-footer$ at the bottom
- of each page.
-
- If "nochunks" is turned on then we make sure that an <hr>
- is shown first.
-
- Then create a centered paragraph ("<p>"), and reduce the font
- size ("<small>"). Then run $email-footer$, which should
- create the text and links as necessary. -->
- (define ($html-body-end$)
- (if (equal? $email-footer$ (normalize ""))
- (empty-sosofo)
- (make sequence
- (if nochunks
- (make empty-element gi: "hr")
- (empty-sosofo))
- ($email-footer$))))
-
- (define %refentry-xref-link%
- ;; REFENTRY refentry-xref-link
- ;; PURP Generate URL links when cross-referencing RefEntrys?
- ;; DESC
- ;; If true, a web link will be generated, presumably
- ;; to an online man->HTML gateway. The text of the link is
- ;; generated by the $create-refentry-xref-link$ function.
- ;; /DESC
- ;; AUTHOR N/A
- ;; /REFENTRY
- #t)
-
- <!-- Specify how to generate the man page link HREF -->
- (define ($create-refentry-xref-link$ #!optional (n (current-node)))
- (let* ((r (select-elements (children n) (normalize "refentrytitle")))
- (m (select-elements (children n) (normalize "manvolnum")))
- (v (attribute-string (normalize "vendor") n))
- (u (string-append "http://www.FreeBSD.org/cgi/man.cgi?query="
- (data r) "&" "amp;" "sektion=" (data m))))
- (case v
- (("current") (string-append u "&" "amp;" "manpath=FreeBSD+9-current"))
- (("xfree86") (string-append u "&" "amp;" "manpath=XFree86+4.7.0"))
- (("xorg") (string-append u "&" "amp;" "manpath=X11R7.4"))
- (("netbsd") (string-append u "&" "amp;" "manpath=NetBSD+5.1"))
- (("openbsd") (string-append u "&" "amp;" "manpath=OpenBSD+4.7"))
- (("ports") (string-append u "&" "amp;" "manpath=FreeBSD+8.2-RELEASE+and+Ports"))
- (else u))))
-
- <!-- Specify how to generate the link HREF to SVN revision commit page -->
- <!-- http://svnweb.freebsd.org/base?view=revision&revision=222741 -->
- (element svnref
- (let ((svnurl (string-append
- "http://svnweb.freebsd.org/base?view=revision" "&" "amp;" "revision="
- (data (current-node)))))
- (create-link (list (list "HREF" svnurl)) ($mono-seq$))))
-
- (element application ($bold-seq$))
-
- (element citerefentry
- (let ((href ($create-refentry-xref-link$)))
- (if %refentry-xref-link%
- (create-link (list (list "HREF" href))
- (if %refentry-xref-italic%
- ($italic-seq$)
- ($charseq$)))
- (if %refentry-xref-italic%
- ($italic-seq$)
- ($charseq$)))))
-
- (element filename
- (let* ((class (attribute-string (normalize "role"))))
- (cond
- ((equal? class "package")
- (let* ((urlurl "http://svnweb.FreeBSD.org/")
- (href (string-append urlurl "ports/head/"
- (data (current-node))
- "/pkg-descr?revision=HEAD")))
- (create-link (list (list "HREF" href)) ($mono-seq$))))
- (else ($mono-seq$)))))
-
- ;; Do not render email with mailto: when nolink role attribute
- ;; is used or when the email address matches
- ;; @example.{com|net|org}
- (element email
- (let* ((class (attribute-string (normalize "role"))))
- (cond
- ((or (equal? class "nolink")
- (and (> (string-length (data (current-node)))
- 11)
- (string=?
- (substring (data (current-node))
- (- (string-length (data (current-node))) 11)
- (- (string-length (data (current-node))) 4))
- "example")))
- ($code-seq$
- (make sequence
- (literal "<")
- (process-children)
- (literal ">"))))
- (else
- (next-match)))))
-
- ;; Ensure that we start with no preferred mediaobject notations,
- ;; so that in the text-only case we don't choose any of the
- ;; possible images, and fallback to the most appropriate
- ;; textobject
- (define preferred-mediaobject-notations
- '())
-
- <!-- Convert " ... " to `` ... '' in the HTML output. -->
- (element quote
- (make sequence
- (literal "“")
- (process-children)
- (literal "”")))
-
- ;; The special FreeBSD version of the trademark tag handling.
- ;; This function was more or less taken from the DocBook DSSSL
- ;; stylesheets by Norman Walsh.
- (element trademark
- (if (show-tm-symbol? (current-node))
- (make sequence
- ($charseq$)
- (cond
- ((equal? (attribute-string "class") (normalize "copyright"))
- (make entity-ref name: "copy"))
- ((equal? (attribute-string "class") (normalize "registered"))
- (make entity-ref name: "reg"))
- ((equal? (attribute-string "class") (normalize "service"))
- (make element gi: "SUP"
- (literal "SM")))
- (else
- (make entity-ref name: "#8482"))))
- ($charseq$)))
-
- ;; multiple copyright holders should be separated.
- (element (copyright holder)
- (make sequence
- ($charseq$)
- (if (not (last-sibling? (current-node)))
- (literal ", ")
- (empty-sosofo))))
- ]]>
-
- <!-- HTML with images ............................................ -->
-
- <![ %output.html.images [
-
-; The new Cascading Style Sheets for the HTML output are very confused
-; by our images when used with div class="mediaobject". We can
-; clear up the confusion by ignoring the whole mess and just
-; displaying the image.
-
- (element mediaobject
- (make element gi: "P"
- ($mediaobject$)))
-
- (define %graphic-default-extension%
- "png")
-
- (define %callout-graphics%
- ;; Use graphics in callouts?
- #t)
-
- (define %callout-graphics-ext%
- ;; The extension to use for callout images. This is an extension
- ;; to the stylesheets, they do not support this functionality
- ;; natively.
- ".png")
-
- (define %callout-graphics-number-limit%
- ;; Number of largest callout graphic
- 30)
-
- (define %callout-graphics-path%
- ;; Path to callout graphics
- "./imagelib/callouts/")
-
- ;; Redefine $callout-bug$ to support the %callout-graphic-ext%
- ;; variable.
- (define ($callout-bug$ conumber)
- (let ((number (if conumber (format-number conumber "1") "0")))
- (if conumber
- (if %callout-graphics%
- (if (<= conumber %callout-graphics-number-limit%)
- (make empty-element gi: "IMG"
- attributes: (list (list "SRC"
- (root-rel-path
- (string-append
- %callout-graphics-path%
- number
- %callout-graphics-ext%)))
- (list "HSPACE" "0")
- (list "VSPACE" "0")
- (list "BORDER" "0")
- (list "ALT"
- (string-append
- "(" number ")"))))
- (make element gi: "B"
- (literal "(" (format-number conumber "1") ")")))
- (make element gi: "B"
- (literal "(" (format-number conumber "1") ")")))
- (make element gi: "B"
- (literal "(??)")))))
- ]]>
-
- </style-specification-body>
- </style-specification>
-</style-sheet>
diff --git a/share/xml/freebsd-print.dsl b/share/xml/freebsd-print.dsl
index ec691517d6..1641de9c4c 100644
--- a/share/xml/freebsd-print.dsl
+++ b/share/xml/freebsd-print.dsl
@@ -7,11 +7,6 @@
<!ENTITY % output.print.justify "IGNORE">
<!ENTITY % output.print.twoside "IGNORE">
<!ENTITY % output.print.niceheaders "IGNORE">
-
-<!ENTITY % freebsd.l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN">
-%freebsd.l10n;
-<!ENTITY % freebsd.l10n-common PUBLIC "-//FreeBSD//ENTITIES DocBook Language Neutral Entities//EN">
-%freebsd.l10n-common;
]>
<style-sheet>
diff --git a/share/xml/freebsd.dsl b/share/xml/freebsd.dsl
index ee0bda0923..01b4a3149b 100644
--- a/share/xml/freebsd.dsl
+++ b/share/xml/freebsd.dsl
@@ -1,23 +1,8 @@
<!-- $FreeBSD$ -->
<!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
-<!ENTITY % output.html "IGNORE">
-<!ENTITY % output.print "IGNORE">
-
-<!ENTITY % freebsd.l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN">
-%freebsd.l10n;
-<!ENTITY % freebsd.l10n-common PUBLIC "-//FreeBSD//ENTITIES DocBook Language Neutral Entities//EN">
-%freebsd.l10n-common;
-
-<![ %output.html; [
-<!ENTITY docbook.dsl PUBLIC "-//Norman Walsh//DOCUMENT DocBook HTML Stylesheet//EN" CDATA DSSSL>
-<!ENTITY freebsd.dsl PUBLIC "-//FreeBSD//DOCUMENT DocBook HTML Stylesheet//EN" CDATA DSSSL>
-]]>
-<![ %output.print; [
<!ENTITY docbook.dsl PUBLIC "-//Norman Walsh//DOCUMENT DocBook Print Stylesheet//EN" CDATA DSSSL>
<!ENTITY freebsd.dsl PUBLIC "-//FreeBSD//DOCUMENT DocBook Print Stylesheet//EN" CDATA DSSSL>
-]]>
-
<!ENTITY freebsd-common.dsl PUBLIC "-//FreeBSD//DOCUMENT DocBook Common Stylesheet//EN" CDATA DSSSL>
]>
diff --git a/sr_YU.ISO8859-2/share/xml/freebsd.dsl b/sr_YU.ISO8859-2/share/xml/freebsd.dsl
index 9b13aea7c8..1a35d82243 100644
--- a/sr_YU.ISO8859-2/share/xml/freebsd.dsl
+++ b/sr_YU.ISO8859-2/share/xml/freebsd.dsl
@@ -2,8 +2,6 @@
<!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
<!ENTITY freebsd.dsl PUBLIC "-//FreeBSD//DOCUMENT DocBook Language Neutral Stylesheet//EN" CDATA DSSSL>
-<!ENTITY % output.html "IGNORE">
-<!ENTITY % output.print "IGNORE">
<!ENTITY % lang.sr.dsssl "IGNORE">
]>
@@ -15,36 +13,6 @@
(define %gentext-language% "sr")
]]>
- <![ %output.html; [
- (define ($email-footer$)
- (make sequence
- (make element gi: "p"
- attributes: (list (list "align" "center"))
- (make element gi: "small"
- (literal "This, and other documents, can be downloaded from ")
- (make element gi: "a"
- attributes: (list (list "href" "ftp://ftp.FreeBSD.org/pub/FreeBSD/doc"))
- (literal "ftp.FreeBSD.org/pub/FreeBSD/doc/"))
- (literal ".")))
- (make element gi: "p"
- attributes: (list (list "align" "center"))
- (make element gi: "small"
- (literal "For questions about FreeBSD, read the ")
- (make element gi: "a"
- attributes: (list (list "href" "http://www.freebsd.org/docs.html"))
- (literal "documentation"))
- (literal " before contacting <")
- (make element gi: "a"
- attributes: (list (list "href" "mailto:questions@FreeBSD.org"))
- (literal "questions@FreeBSD.org"))
- (literal ">.")
- (make empty-element gi: "br")
- (literal "For questions about this documentation, e-mail <")
- (make element gi: "a"
- attributes: (list (list "href" "mailto:doc@FreeBSD.org"))
- (literal "doc@FreeBSD.org"))
- (literal ">.")))))
- ]]>
</style-specification-body>
</style-specification>
diff --git a/zh_CN.GB2312/books/porters-handbook/freebsd.dsl b/zh_CN.GB2312/books/porters-handbook/freebsd.dsl
index 148e39a6ac..13411064cf 100644
--- a/zh_CN.GB2312/books/porters-handbook/freebsd.dsl
+++ b/zh_CN.GB2312/books/porters-handbook/freebsd.dsl
@@ -11,33 +11,11 @@
<!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
<!ENTITY freebsd.dsl SYSTEM "../../share/xml/freebsd.dsl" CDATA DSSSL>
-<!ENTITY % output.html "IGNORE">
]>
<style-sheet>
<style-specification use="docbook">
<style-specification-body>
-
- <![ %output.html; [
- (define ($email-footer$)
- (make sequence
- (literal "�����й��� FreeBSD ports ϵͳ�����⣬ �뷢�͵����ʼ��� <")
- (create-link (list (list "HREF" "mailto:ports@FreeBSD.org"))
- (literal "ports@FreeBSD.org"))
- (literal ">��")
- (make empty-element gi: "br")
- (literal "���ڴ��ĵ����κ����⣬ ���º� <")
- (create-link (list (list "HREF" "mailto:doc@FreeBSD.org"))
- (literal "doc@FreeBSD.org"))
- (literal ">��")))
-
- <!-- Convert " ... " to `` ... '' in the HTML output. -->
- (element quote
- (make sequence
- (literal "��")
- (process-children)
- (literal "��")))
- ]]>
</style-specification-body>
</style-specification>
diff --git a/zh_CN.GB2312/share/xml/freebsd.dsl b/zh_CN.GB2312/share/xml/freebsd.dsl
index 5d1ac551d0..055fded769 100644
--- a/zh_CN.GB2312/share/xml/freebsd.dsl
+++ b/zh_CN.GB2312/share/xml/freebsd.dsl
@@ -7,329 +7,11 @@
<!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
<!ENTITY freebsd.dsl PUBLIC "-//FreeBSD//DOCUMENT DocBook Language Neutral Stylesheet//EN" CDATA DSSSL>
-
-<!ENTITY % freebsd.l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN">
-%freebsd.l10n;
-
-<!ENTITY % output.html "IGNORE">
-<!ENTITY % output.print "IGNORE">
]>
<style-sheet>
<style-specification use="docbook">
<style-specification-body>
- <![ %output.html; [
- (define ($email-footer$)
- (make sequence
- (make element gi: "p"
- attributes: (list (list "align" "center"))
- (make element gi: "small"
- (literal "���ĵ��������ĵ��ɴ��������أ�")
- (create-link
- (list (list "HREF" "ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/"))
- (literal "ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/"))
- (literal ".")))
- (make element gi: "p"
- attributes: (list (list "align" "center"))
- (make element gi: "small"
- (literal "�������FreeBSD�����⣬�����Ķ�")
- (create-link
- (list (list "HREF" "http://www.FreeBSD.org/docs.html"))
- (literal "�ĵ�"))
- (literal "���粻�ܽ������ϵ<")
- (create-link
- (list (list "HREF" "mailto:questions@FreeBSD.org"))
- (literal "questions@FreeBSD.org"))
- (literal ">.")
- (make empty-element gi: "br")
- (literal "���ڱ��ĵ��������뷢����ϵ <")
- (create-link (list (list "HREF" "mailto:doc@FreeBSD.org"))
- (literal "doc@FreeBSD.org"))
- (literal ">.")))))
-
-;; ���¼�������ɲ���������ϰ�ߵ��½ںš�
-;; ����֣���֪��������
-;; /usr/local/share/xml/docbook/dsssl/modular/common/dbl1zhcn.dsl
-;; �е�zhcn-xref-stringsΪʲô�������á�
-;; ��Google�����������������Է����ߴ��౧Թ�����¡�
-
-;; toc-entry
-;; ���� /usr/local/share/xml/docbook/dsssl/modular/html/dbautoc.dsl
-;; Id: dbautoc.dsl,v 1.3 2003/01/15 08:24:13 adicarlo Exp
-;; ��Ŀ¼����ʾ��
-;; �� 1 �� XXXXXX
-;; 1.1 XXXXXX (��)
-;; 1.2 XXXXXX (��)
-;; ��¼ A XXXXXXX
-;; A.1 XXXXXXX (��)
-;; A.2 XXXXXXX (��)
-
-(define (toc-entry tocentry)
- (make element gi: "DT"
- (make sequence
- (if (equal? (element-label tocentry) "")
- (empty-sosofo)
- (if (member (gi tocentry) (list (normalize "part") (normalize "chapter")))
- (make sequence
- (literal "��")
- (literal (element-label tocentry))
- (literal (gentext-element-name tocentry))
- (literal (gentext-label-title-sep (gi tocentry)))
- )
- (if (equal? (gi tocentry) (normalize "appendix"))
- (make sequence
- (literal (gentext-element-name tocentry))
- (literal (element-label tocentry))
- (literal (gentext-label-title-sep (gi tocentry)))
- )
- (make sequence
- (literal (element-label tocentry))
- (literal (gentext-label-title-sep (gi tocentry)))
- )
- )
- )
- )
-
- ;; If the tocentry isn't in its own
- ;; chunk, don't make a link...
- (if (and #f (not (chunk? tocentry)))
- (element-title-sosofo tocentry)
- (make element gi: "A"
- attributes: (list
- (list "HREF"
- (href-to tocentry)))
- (element-title-sosofo tocentry)))
-
- ;; Maybe annotate...
- (if (and %annotate-toc%
- (equal? (gi tocentry) (normalize "refentry")))
- (make sequence
- (dingbat-sosofo "nbsp");
- (dingbat-sosofo "em-dash");
- (dingbat-sosofo "nbsp");
- (toc-annotation tocentry))
- (empty-sosofo)))))
-
-;; lot-entry
-;; ���� /usr/local/share/xml/docbook/dsssl/modular/html/dbautoc.dsl
-;; Id: dbautoc.dsl,v 1.3 2003/01/15 08:24:13 adicarlo Exp
-;; �ڱ����嵥����ʾ��
-;; �� xx-xx. ....
-;; �ڲ�ͼ�嵥����ʾ��
-;; ͼ xx-xx. ....
-;; �ڷ����嵥����ʾ��
-;; �� xx-xx. ....
-
-
-(define (lot-entry tocentry)
- (make element gi: "DT"
- (make sequence
- (if (equal? (element-label tocentry) "")
- (empty-sosofo)
- (make sequence
- (literal (gentext-element-name tocentry))
- (literal (element-label tocentry))
- (literal (gentext-label-title-sep
- (gi tocentry)))))
-
- ;; If the tocentry isn't in its own
- ;; chunk, don't make a link...
- (if (and #f (not (chunk? tocentry)))
- (element-title-sosofo tocentry)
- (make element gi: "A"
- attributes: (list
- (list "HREF"
- (href-to tocentry)))
- (element-title-sosofo tocentry))))))
-
-;; ���� /usr/local/share/xml/docbook/dsssl/modular/html/dbttlpg.dsl
-;; Id: dbttlpg.dsl,v 1.10 2004/10/10 11:55:10 petere78 Exp
-;; ʹÿ���ֵĿ�ͷҳ(��ΪTitle Page)��ʾ����xx���֡�
-
-(mode part-titlepage-recto-mode
- (element title
- (let ((division (ancestor-member (current-node) (division-element-list))))
- (make element gi: "H1"
- attributes: (list (list "CLASS" (gi)))
- (if (string=? (element-label division) "")
- (empty-sosofo)
- (literal "��"
- (element-label division)
- (gentext-element-name division)
- (gentext-label-title-sep (gi division))))
- (with-mode title-mode
- (process-children)))))
-)
-
-
-;; ����/usr/local/share/xml/docbook/dsssl/modular/html/dbcompon.dsl
-;; Id: dbcompon.dsl,v 1.8 2003/04/29 05:49:21 adicarlo Exp
-;; ʹÿ�µ�һҳ����ʾ����xx�¡�
-
-(define ($component-title$ #!optional (titlegi "H1") (subtitlegi "H2"))
- (let* ((info (cond
- ((equal? (gi) (normalize "article"))
- (node-list-filter-by-gi (children (current-node))
- (list (normalize "artheader")
- (normalize "articleinfo"))))
- ((or
- (equal? (gi) (normalize "appendix"))
- (equal? (gi) (normalize "bibliography"))
- (equal? (gi) (normalize "chapter"))
- (equal? (gi) (normalize "glossary"))
- (equal? (gi) (normalize "index"))
- (equal? (gi) (normalize "preface"))
- (equal? (gi) (normalize "reference"))
- (equal? (gi) (normalize "setindex")))
- (select-elements (children (current-node)) (normalize "docinfo")))
- (else
- (empty-node-list))))
- (exp-children (if (node-list-empty? info)
- (empty-node-list)
- (expand-children (children info)
- (list (normalize "bookbiblio")
- (normalize "bibliomisc")
- (normalize "biblioset")))))
- (parent-titles (select-elements (children (current-node)) (normalize "title")))
- (titles (if (node-list-empty? parent-titles)
- (select-elements exp-children (normalize "title"))
- parent-titles))
- (parent-subttl (select-elements (children (current-node)) (normalize "subtitle")))
- (subtitles (if (node-list-empty? parent-subttl)
- (select-elements exp-children (normalize "subtitle"))
- parent-subttl)))
- (make sequence
- (make element gi: titlegi
- (make sequence
- (make element gi: "A"
- attributes: (list (list "NAME" (element-id)))
- (empty-sosofo))
- (if (and %chapter-autolabel%
- (or (equal? (gi) (normalize "chapter"))
- (equal? (gi) (normalize "appendix"))))
- (if (equal? (gi) (normalize "chapter"))
- (literal "��"
- (element-label (current-node))
- (gentext-element-name-space (gi))
- (gentext-label-title-sep (gi))
- )
- (literal (gentext-element-name-space (gi))
- (element-label (current-node))
- (gentext-label-title-sep (gi))
- )
- )
- (empty-sosofo))
- (if (node-list-empty? titles)
- (element-title-sosofo) ;; get a default!
- (with-mode title-mode
- (process-node-list titles)))))
- (if (node-list-empty? subtitles)
- (empty-sosofo)
- (with-mode subtitle-mode
- (make element gi: subtitlegi
- (process-node-list subtitles)))))))
-
-;; ����/usr/local/share/xml/docbook/dsssl/modular/html/dbnavig.dsl
-;; Id: dbnavig.dsl,v 1.3 2001/07/05 12:08:42 nwalsh Exp
-;; ʹҳü����ʾ����xx�¡��ȵȡ�
-
-(define (nav-context-sosofo elemnode)
- (let* ((component (ancestor-member elemnode
- (append (book-element-list)
- (division-element-list)
- (component-element-list))))
- (context-text (inherited-dbhtml-value elemnode "context-text")))
- (if (and context-text (not (string=? context-text "")))
- (literal context-text)
- (if (equal? (element-label component) "")
- (make sequence
- (element-title-sosofo component))
- (make sequence
- ;; Special case. This is a bit of a hack.
- ;; I need to revisit this aspect of
- ;; appendixes.
- (if (and (equal? (gi component) (normalize "appendix"))
- (or (equal? (gi elemnode) (normalize "sect1"))
- (equal? (gi elemnode) (normalize "section")))
- (equal? (gi (parent component)) (normalize "article")))
- (element-label-sosofo component)
- (if (equal? (gi component) (normalize "chapter"))
- (make sequence
- (literal "��")
- (element-label-sosofo component)
- (literal (gentext-element-name-space (gi component)))
- )
- (make sequence
- (literal (gentext-element-name-space (gi component)))
- (element-label-sosofo component)
- )
- )
- )
- (literal (gentext-label-title-sep (gi component)))
- (element-title-sosofo component))))))
-
-<!--
- ���� /usr/local/share/xml/docbook/dsssl/modular/html/dbhtml.dsl
- Id: dbhtml.dsl,v 1.5 2004/10/10 11:55:10 petere78 Exp
- ��������дϰ�ߣ�ÿ�ο�ͷ�������
- ������ע�͡��б����ض�λ�ã���ȻҲʹ����SGML��<para></para>��ǣ�ȴ��Ӧ������
- ��ֻ��<para></para>����������һ��λ��ʱ������Ҫ������
--->
-
-(define ($paragraph$ #!optional (para-wrapper "P"))
- (let ((footnotes (select-elements (descendants (current-node))
- (normalize "footnote")))
- (tgroup (have-ancestor? (normalize "tgroup"))))
- (make sequence
- (make element gi: para-wrapper
- attributes: (append
- (if %default-quadding%
- (list (list "ALIGN" %default-quadding%))
- '()))
- (if (equal? (gi) (normalize "para"))
- (if (member (gi (parent (current-node)))
- (list (normalize "article")
- (normalize "book")
- (normalize "abstract")
- (normalize "chapter")
- (normalize "sect1")
- (normalize "sect2")
- (normalize "sect3")
- (normalize "sect4")
- (normalize "sect5")
- )
- )
- (literal "����")
- (empty-sosofo)
- )
- (empty-sosofo)
- )
- (process-children))
- (if (or %footnotes-at-end% tgroup (node-list-empty? footnotes))
- (empty-sosofo)
- (make element gi: "BLOCKQUOTE"
- attributes: (list
- (list "CLASS" "FOOTNOTES"))
- (with-mode footnote-mode
- (process-node-list footnotes)))))))
-
-;; ����Ҫǿ���IJ��֣�����ϰ����ֻ�ô��壬б���ֲ�����Ŀ
-;; ����/usr/local/share/xml/docbook/dsssl/modular/html/dbinline.dsl
-;; Id: dbinline.dsl,v 1.11 2004/09/14 14:47:10 petere78 Exp
-
-(element emphasis
- (let* ((class (if (and (attribute-string (normalize "role"))
- %emphasis-propagates-style%)
- (attribute-string (normalize "role"))
- "emphasis")))
- (make element gi: "SPAN"
- attributes: (list (list "CLASS" class))
- ($bold-seq$))))
-
- ]]>
-
-
- <![ %output.print; [
;; ����/usr/local/share/xml/docbook/dsssl/modular/print/dbcompon.dsl
;; Id: dbcompon.dsl,v 1.5 2003/04/29 06:33:10 adicarlo Exp
@@ -600,10 +282,6 @@
($bold-seq$)
)
- ]]>
-
- <!-- Both sets of stylesheets ..................................... -->
-
(define (local-zhcn-label-title-sep)
(list
(list (normalize "warning") ": ")
diff --git a/zh_TW.Big5/books/porters-handbook/freebsd.dsl b/zh_TW.Big5/books/porters-handbook/freebsd.dsl
index f5e26338e4..7cbc062778 100644
--- a/zh_TW.Big5/books/porters-handbook/freebsd.dsl
+++ b/zh_TW.Big5/books/porters-handbook/freebsd.dsl
@@ -6,33 +6,11 @@
<!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
<!ENTITY freebsd.dsl SYSTEM "../../share/xml/freebsd.dsl" CDATA DSSSL>
-<!ENTITY % output.html "IGNORE">
]>
<style-sheet>
<style-specification use="docbook">
<style-specification-body>
-
- <![ %output.html; [
- (define ($email-footer$)
- (make sequence
- (literal "For questions about the FreeBSD ports system, e-mail <")
- (create-link (list (list "HREF" "mailto:ports@FreeBSD.org"))
- (literal "ports@FreeBSD.org"))
- (literal ">.")
- (make empty-element gi: "br")
- (literal "For questions about this documentation, e-mail <")
- (create-link (list (list "HREF" "mailto:doc@FreeBSD.org"))
- (literal "doc@FreeBSD.org"))
- (literal ">.")))
-
- <!-- Convert " ... " to `` ... '' in the HTML output. -->
- (element quote
- (make sequence
- (literal "``")
- (process-children)
- (literal "''")))
- ]]>
</style-specification-body>
</style-specification>
diff --git a/zh_TW.Big5/share/xml/freebsd.dsl b/zh_TW.Big5/share/xml/freebsd.dsl
index 918a41390c..30c745f542 100644
--- a/zh_TW.Big5/share/xml/freebsd.dsl
+++ b/zh_TW.Big5/share/xml/freebsd.dsl
@@ -2,59 +2,11 @@
<!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
<!ENTITY freebsd.dsl PUBLIC "-//FreeBSD//DOCUMENT DocBook Language Neutral Stylesheet//EN" CDATA DSSSL>
-
-<!ENTITY % output.html "IGNORE">
-<!ENTITY % output.print "IGNORE">
]>
<style-sheet>
<style-specification use="docbook">
<style-specification-body>
- <![ %output.html; [
-
- (define ($email-footer$)
- (make sequence
- (make element gi: "p"
- attributes: (list (list "align" "center"))
- (make element gi: "small"
- (literal "����Ψ�L���A�i�Ѧ��U���G")
- (create-link
- (list (list "HREF" "ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/"))
- (literal "ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/"))
- (literal "�C")))
- (make element gi: "p"
- attributes: (list (list "align" "center"))
- (make element gi: "small"
- (literal "�Y�� FreeBSD �譱�ðݡA�Х��\Ū ")
- (create-link
- (list (list "HREF" "http://www.FreeBSD.org/docs.html"))
- (literal "FreeBSD �������"))
- (literal "�A�p����ѨM���ܡA�A���� <")
- (create-link
- (list (list "HREF" "mailto:questions@FreeBSD.org"))
- (literal "questions@FreeBSD.org"))
- (literal ">�C")
- (make empty-element gi: "br")
- (literal "������D�A���� <")
- (create-link (list (list "HREF" "mailto:doc@FreeBSD.org"))
- (literal "doc@FreeBSD.org"))
- (literal ">�C")))))
-
-;; ���n�j�ժ������A����D�β���A�������r�������ءA�B��ê�\Ū�A
-;; �ק�� /usr/local/share/xml/docbook/dsssl/modular/html/dbinline.dsl
-;; Id: dbinline.dsl,v 1.11 2004/09/14 14:47:10 petere78 Exp
-;; chinsan: �o�q���� zh_CN ���G :p
-
-(element emphasis
- (let* ((class (if (and (attribute-string (normalize "role"))
- %emphasis-propagates-style%)
- (attribute-string (normalize "role"))
- "emphasis")))
- (make element gi: "SPAN"
- attributes: (list (list "CLASS" class))
- ($bold-seq$))))
-
- ]]>
</style-specification-body>
</style-specification>
From f501b6192e558d3015afe34dfada68ade9dad261 Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Mon, 25 Feb 2013 19:57:24 +0000
Subject: [PATCH 069/121] - Remove some unused parameters
---
share/xsl/freebsd-xhtml-common.xsl | 5 -----
1 file changed, 5 deletions(-)
diff --git a/share/xsl/freebsd-xhtml-common.xsl b/share/xsl/freebsd-xhtml-common.xsl
index 09cc221f4f..1529c6e461 100644
--- a/share/xsl/freebsd-xhtml-common.xsl
+++ b/share/xsl/freebsd-xhtml-common.xsl
@@ -11,14 +11,9 @@
<xsl:include href="freebsd-common.xsl"/>
<!-- Redefine variables, and replace templates as necessary here -->
- <xsl:param name="freebsd.output.html" select="'0'"/>
- <xsl:param name="freebsd.output.html.images" select="'0'"/>
-
- <!-- HTML specific customisation goes here -->
<xsl:param name="use.id.as.filename" select="1"/>
<xsl:param name="html.stylesheet" select="'docbook.css'"/>
- <xsl:param name="user.id.as.filename" select="'1'"/>
<xsl:param name="link.mailto.url" select="'doc@FreeBSD.org'"/>
<xsl:param name="callout.graphics.path" select="'./imagelib/callouts/'"/>
From 06f710c8aa6062d60f8c89e411522b5337fbda62 Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Mon, 25 Feb 2013 20:04:29 +0000
Subject: [PATCH 070/121] - Remove more DSSSL leftovers
---
.../books/porters-handbook/Makefile | 3 ---
.../books/porters-handbook/freebsd.dsl | 25 ------------------
en_US.ISO8859-1/books/design-44bsd/Makefile | 3 ---
.../books/design-44bsd/freebsd.dsl | 18 -------------
.../books/porters-handbook/Makefile | 3 ---
.../books/porters-handbook/freebsd.dsl | 18 -------------
.../books/porters-handbook/Makefile | 3 ---
.../books/porters-handbook/freebsd.dsl | 24 -----------------
ja_JP.eucJP/books/design-44bsd/Makefile | 3 ---
ja_JP.eucJP/books/design-44bsd/freebsd.dsl | 20 --------------
ja_JP.eucJP/books/porters-handbook/Makefile | 3 ---
.../books/porters-handbook/freebsd.dsl | 24 -----------------
ru_RU.KOI8-R/books/design-44bsd/Makefile | 3 ---
ru_RU.KOI8-R/books/design-44bsd/freebsd.dsl | 26 -------------------
ru_RU.KOI8-R/books/porters-handbook/Makefile | 3 ---
.../books/porters-handbook/freebsd.dsl | 25 ------------------
zh_CN.GB2312/books/porters-handbook/Makefile | 3 ---
.../books/porters-handbook/freebsd.dsl | 23 ----------------
zh_TW.Big5/books/porters-handbook/Makefile | 3 ---
zh_TW.Big5/books/porters-handbook/freebsd.dsl | 18 -------------
20 files changed, 251 deletions(-)
delete mode 100644 de_DE.ISO8859-1/books/porters-handbook/freebsd.dsl
delete mode 100644 en_US.ISO8859-1/books/design-44bsd/freebsd.dsl
delete mode 100644 en_US.ISO8859-1/books/porters-handbook/freebsd.dsl
delete mode 100644 fr_FR.ISO8859-1/books/porters-handbook/freebsd.dsl
delete mode 100644 ja_JP.eucJP/books/design-44bsd/freebsd.dsl
delete mode 100644 ja_JP.eucJP/books/porters-handbook/freebsd.dsl
delete mode 100644 ru_RU.KOI8-R/books/design-44bsd/freebsd.dsl
delete mode 100644 ru_RU.KOI8-R/books/porters-handbook/freebsd.dsl
delete mode 100644 zh_CN.GB2312/books/porters-handbook/freebsd.dsl
delete mode 100644 zh_TW.Big5/books/porters-handbook/freebsd.dsl
diff --git a/de_DE.ISO8859-1/books/porters-handbook/Makefile b/de_DE.ISO8859-1/books/porters-handbook/Makefile
index 5d175d24d7..cc63278fb8 100644
--- a/de_DE.ISO8859-1/books/porters-handbook/Makefile
+++ b/de_DE.ISO8859-1/books/porters-handbook/Makefile
@@ -22,9 +22,6 @@ INSTALL_ONLY_COMPRESSED?=
# XML content
SRCS= book.xml
-# Use the local DSSSL file
-DSLPRINT?= ${.CURDIR}/freebsd.dsl
-
# Images from the cross-document image library
IMAGES_LIB+= callouts/1.png
IMAGES_LIB+= callouts/2.png
diff --git a/de_DE.ISO8859-1/books/porters-handbook/freebsd.dsl b/de_DE.ISO8859-1/books/porters-handbook/freebsd.dsl
deleted file mode 100644
index cf5208b9d4..0000000000
--- a/de_DE.ISO8859-1/books/porters-handbook/freebsd.dsl
+++ /dev/null
@@ -1,25 +0,0 @@
-<!--
- The FreeBSD Documentation Project
- The FreeBSD German Documentation Project
- $FreeBSD$
- $FreeBSDde: de-docproj/books/porters-handbook/freebsd.dsl,v 1.2 2007/07/29 11:57:54 jkois Exp $
- basiert auf: 1.5
--->
-<!--
- Local DSSSL file for the Porter's Handbook. This is so we can include
- a link to the -ports mailing list at the bottom of the HTML files,
- rather than the -questions mailing list.
--->
-
-<!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
-<!ENTITY freebsd.dsl SYSTEM "../../share/xml/freebsd.dsl" CDATA DSSSL>
-]>
-
-<style-sheet>
- <style-specification use="docbook">
- <style-specification-body>
- </style-specification-body>
- </style-specification>
-
- <external-specification id="docbook" document="freebsd.dsl">
-</style-sheet>
diff --git a/en_US.ISO8859-1/books/design-44bsd/Makefile b/en_US.ISO8859-1/books/design-44bsd/Makefile
index 11d460c057..04041c8de2 100644
--- a/en_US.ISO8859-1/books/design-44bsd/Makefile
+++ b/en_US.ISO8859-1/books/design-44bsd/Makefile
@@ -11,9 +11,6 @@ INSTALL_ONLY_COMPRESSED?=
SRCS= book.xml
-# Use the local DSSSL file
-DSLPRINT?= ${.CURDIR}/freebsd.dsl
-
DOC_PREFIX?= ${.CURDIR}/../../..
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/en_US.ISO8859-1/books/design-44bsd/freebsd.dsl b/en_US.ISO8859-1/books/design-44bsd/freebsd.dsl
deleted file mode 100644
index 59efdeff4e..0000000000
--- a/en_US.ISO8859-1/books/design-44bsd/freebsd.dsl
+++ /dev/null
@@ -1,18 +0,0 @@
-<!-- $FreeBSD$ -->
-
-<!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
-<!ENTITY freebsd.dsl PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN" CDATA DSSSL>
-]>
-
-<style-sheet>
- <style-specification use="docbook">
- <style-specification-body>
-
- ;; Keep the legalnotice together with the rest of the text
- (define %generate-legalnotice-link%
- #f)
- </style-specification-body>
- </style-specification>
-
- <external-specification id="docbook" document="freebsd.dsl">
-</style-sheet>
diff --git a/en_US.ISO8859-1/books/porters-handbook/Makefile b/en_US.ISO8859-1/books/porters-handbook/Makefile
index 8fec2756e6..95a62ca124 100644
--- a/en_US.ISO8859-1/books/porters-handbook/Makefile
+++ b/en_US.ISO8859-1/books/porters-handbook/Makefile
@@ -21,9 +21,6 @@ INSTALL_ONLY_COMPRESSED?=
# XML content
SRCS= book.xml
-# Use the local DSSSL file
-DSLPRINT?= ${.CURDIR}/freebsd.dsl
-
# Images from the cross-document image library
IMAGES_LIB+= callouts/1.png
IMAGES_LIB+= callouts/2.png
diff --git a/en_US.ISO8859-1/books/porters-handbook/freebsd.dsl b/en_US.ISO8859-1/books/porters-handbook/freebsd.dsl
deleted file mode 100644
index 7cbc062778..0000000000
--- a/en_US.ISO8859-1/books/porters-handbook/freebsd.dsl
+++ /dev/null
@@ -1,18 +0,0 @@
-<!-- $FreeBSD$ -->
-
-<!-- Local DSSSL file for the Porter's Handbook. This is so we can include
- a link to the -ports mailing list at the bottom of the HTML files,
- rather than the -questions mailing list. -->
-
-<!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
-<!ENTITY freebsd.dsl SYSTEM "../../share/xml/freebsd.dsl" CDATA DSSSL>
-]>
-
-<style-sheet>
- <style-specification use="docbook">
- <style-specification-body>
- </style-specification-body>
- </style-specification>
-
- <external-specification id="docbook" document="freebsd.dsl">
-</style-sheet>
diff --git a/fr_FR.ISO8859-1/books/porters-handbook/Makefile b/fr_FR.ISO8859-1/books/porters-handbook/Makefile
index cf9da4c2a1..72d7b727fb 100644
--- a/fr_FR.ISO8859-1/books/porters-handbook/Makefile
+++ b/fr_FR.ISO8859-1/books/porters-handbook/Makefile
@@ -22,8 +22,5 @@ INSTALL_ONLY_COMPRESSED?=
# XML content
SRCS= book.xml
-# Use the local DSSSL file
-DSLPRINT?= ${.CURDIR}/freebsd.dsl
-
DOC_PREFIX?= ${.CURDIR}/../../..
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/fr_FR.ISO8859-1/books/porters-handbook/freebsd.dsl b/fr_FR.ISO8859-1/books/porters-handbook/freebsd.dsl
deleted file mode 100644
index 6dcdc75392..0000000000
--- a/fr_FR.ISO8859-1/books/porters-handbook/freebsd.dsl
+++ /dev/null
@@ -1,24 +0,0 @@
-<!--
- The FreeBSD Documentation Project
- The FreeBSD French Documentation Project
-
- $FreeBSD$
- Original Revision: 1.5
--->
-
-<!-- Local DSSSL file for the Porter's Handbook. This is so we can include
- a link to the -ports mailing list at the bottom of the HTML files,
- rather than the -questions mailing list. -->
-
-<!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
-<!ENTITY freebsd.dsl SYSTEM "../../share/xml/freebsd.dsl" CDATA DSSSL>
-]>
-
-<style-sheet>
- <style-specification use="docbook">
- <style-specification-body>
- </style-specification-body>
- </style-specification>
-
- <external-specification id="docbook" document="freebsd.dsl">
-</style-sheet>
diff --git a/ja_JP.eucJP/books/design-44bsd/Makefile b/ja_JP.eucJP/books/design-44bsd/Makefile
index 13c1b3ad8f..da2fc43c7a 100644
--- a/ja_JP.eucJP/books/design-44bsd/Makefile
+++ b/ja_JP.eucJP/books/design-44bsd/Makefile
@@ -12,9 +12,6 @@ INSTALL_ONLY_COMPRESSED?=
SRCS= book.xml
-# Use the local DSSSL file
-DSLPRINT?= ${.CURDIR}/freebsd.dsl
-
DOC_PREFIX?= ${.CURDIR}/../../..
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/ja_JP.eucJP/books/design-44bsd/freebsd.dsl b/ja_JP.eucJP/books/design-44bsd/freebsd.dsl
deleted file mode 100644
index 953a9e8bbc..0000000000
--- a/ja_JP.eucJP/books/design-44bsd/freebsd.dsl
+++ /dev/null
@@ -1,20 +0,0 @@
-<!-- $FreeBSD$ -->
-<!-- FreeBSD Japanese Documentation Project -->
-<!-- Original revision: 1.3 -->
-
-<!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
-<!ENTITY freebsd.dsl PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN" CDATA DSSSL>
-]>
-
-<style-sheet>
- <style-specification use="docbook">
- <style-specification-body>
-
- ;; Keep the legalnotice together with the rest of the text
- (define %generate-legalnotice-link%
- #f)
- </style-specification-body>
- </style-specification>
-
- <external-specification id="docbook" document="freebsd.dsl">
-</style-sheet>
diff --git a/ja_JP.eucJP/books/porters-handbook/Makefile b/ja_JP.eucJP/books/porters-handbook/Makefile
index 8ffd52343d..5c5a5acb52 100644
--- a/ja_JP.eucJP/books/porters-handbook/Makefile
+++ b/ja_JP.eucJP/books/porters-handbook/Makefile
@@ -22,8 +22,5 @@ INSTALL_ONLY_COMPRESSED?=
# XML content
SRCS= book.xml
-# Use the local DSSSL file
-DSLPRINT?= ${.CURDIR}/freebsd.dsl
-
DOC_PREFIX?= ${.CURDIR}/../../..
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/ja_JP.eucJP/books/porters-handbook/freebsd.dsl b/ja_JP.eucJP/books/porters-handbook/freebsd.dsl
deleted file mode 100644
index 3221583b4f..0000000000
--- a/ja_JP.eucJP/books/porters-handbook/freebsd.dsl
+++ /dev/null
@@ -1,24 +0,0 @@
-<!--
- The FreeBSD Documentation Project
- The FreeBSD Japanese Documentation Project
-
- Original revision: 1.5
- $FreeBSD$
--->
-
-<!-- Local DSSSL file for the Porter's Handbook. This is so we can include
- a link to the -ports mailing list at the bottom of the HTML files,
- rather than the -questions mailing list. -->
-
-<!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
-<!ENTITY freebsd.dsl SYSTEM "../../share/xml/freebsd.dsl" CDATA DSSSL>
-]>
-
-<style-sheet>
- <style-specification use="docbook">
- <style-specification-body>
- </style-specification-body>
- </style-specification>
-
- <external-specification id="docbook" document="freebsd.dsl">
-</style-sheet>
diff --git a/ru_RU.KOI8-R/books/design-44bsd/Makefile b/ru_RU.KOI8-R/books/design-44bsd/Makefile
index 839359820f..42efc865fb 100644
--- a/ru_RU.KOI8-R/books/design-44bsd/Makefile
+++ b/ru_RU.KOI8-R/books/design-44bsd/Makefile
@@ -16,9 +16,6 @@ INSTALL_ONLY_COMPRESSED?=
SRCS= book.xml
-# Use the local DSSSL file
-DSLPRINT?= ${.CURDIR}/freebsd.dsl
-
DOC_PREFIX?= ${.CURDIR}/../../..
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/ru_RU.KOI8-R/books/design-44bsd/freebsd.dsl b/ru_RU.KOI8-R/books/design-44bsd/freebsd.dsl
deleted file mode 100644
index 541aa98d83..0000000000
--- a/ru_RU.KOI8-R/books/design-44bsd/freebsd.dsl
+++ /dev/null
@@ -1,26 +0,0 @@
-<!--
-
- The FreeBSD Russian Documentation Project
-
- $FreeBSD$
- $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/design-44bsd/freebsd.dsl,v 1.1 2001/07/11 19:27:16 phantom Exp $
- Original revision: r9530
-
--->
-
-<!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
-<!ENTITY freebsd.dsl SYSTEM "../../share/xml/freebsd.dsl" CDATA DSSSL>
-]>
-
-<style-sheet>
- <style-specification use="docbook">
- <style-specification-body>
-
- ;; Keep the legalnotice together with the rest of the text
- (define %generate-legalnotice-link%
- #f)
- </style-specification-body>
- </style-specification>
-
- <external-specification id="docbook" document="freebsd.dsl">
-</style-sheet>
diff --git a/ru_RU.KOI8-R/books/porters-handbook/Makefile b/ru_RU.KOI8-R/books/porters-handbook/Makefile
index 8601bee4a6..c9c08fd9e7 100644
--- a/ru_RU.KOI8-R/books/porters-handbook/Makefile
+++ b/ru_RU.KOI8-R/books/porters-handbook/Makefile
@@ -31,8 +31,5 @@ SRCS= book.xml
# Entities
#SRCS+= ../../../en_US.ISO8859-1/books/handbook/authors.ent
-# Use the local DSSSL file
-DSLPRINT?= ${.CURDIR}/freebsd.dsl
-
DOC_PREFIX?= ${.CURDIR}/../../..
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/ru_RU.KOI8-R/books/porters-handbook/freebsd.dsl b/ru_RU.KOI8-R/books/porters-handbook/freebsd.dsl
deleted file mode 100644
index 135e7902b6..0000000000
--- a/ru_RU.KOI8-R/books/porters-handbook/freebsd.dsl
+++ /dev/null
@@ -1,25 +0,0 @@
-<!--
- The FreeBSD Russian Documentation Project
-
- $FreeBSD$
- $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/porters-handbook/freebsd.dsl,v 1.6 2006/09/08 13:59:56 den Exp $
-
- Original revision: r10492
--->
-
-<!-- Local DSSSL file for the Porter's Handbook. This is so we can include
- a link to the -ports mailing list at the bottom of the HTML files,
- rather than the -questions mailing list. -->
-
-<!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
-<!ENTITY freebsd.dsl SYSTEM "../../share/xml/freebsd.dsl" CDATA DSSSL>
-]>
-
-<style-sheet>
- <style-specification use="docbook">
- <style-specification-body>
- </style-specification-body>
- </style-specification>
-
- <external-specification id="docbook" document="freebsd.dsl">
-</style-sheet>
diff --git a/zh_CN.GB2312/books/porters-handbook/Makefile b/zh_CN.GB2312/books/porters-handbook/Makefile
index 863a51db83..203fe22fdb 100644
--- a/zh_CN.GB2312/books/porters-handbook/Makefile
+++ b/zh_CN.GB2312/books/porters-handbook/Makefile
@@ -25,9 +25,6 @@ INSTALL_ONLY_COMPRESSED?=
# XML content
SRCS= book.xml
-# Use the local DSSSL file
-DSLPRINT?= ${.CURDIR}/freebsd.dsl
-
# Images from the cross-document image library
IMAGES_LIB+= callouts/1.png
IMAGES_LIB+= callouts/2.png
diff --git a/zh_CN.GB2312/books/porters-handbook/freebsd.dsl b/zh_CN.GB2312/books/porters-handbook/freebsd.dsl
deleted file mode 100644
index 13411064cf..0000000000
--- a/zh_CN.GB2312/books/porters-handbook/freebsd.dsl
+++ /dev/null
@@ -1,23 +0,0 @@
-<!--
- The FreeBSD Simplified Chinese Project
-
- Original Revision: 1.5
- $FreeBSD$
--->
-
-<!-- Local DSSSL file for the Porter's Handbook. This is so we can include
- a link to the -ports mailing list at the bottom of the HTML files,
- rather than the -questions mailing list. -->
-
-<!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
-<!ENTITY freebsd.dsl SYSTEM "../../share/xml/freebsd.dsl" CDATA DSSSL>
-]>
-
-<style-sheet>
- <style-specification use="docbook">
- <style-specification-body>
- </style-specification-body>
- </style-specification>
-
- <external-specification id="docbook" document="freebsd.dsl">
-</style-sheet>
diff --git a/zh_TW.Big5/books/porters-handbook/Makefile b/zh_TW.Big5/books/porters-handbook/Makefile
index 60e7dfa999..50b8633a0b 100644
--- a/zh_TW.Big5/books/porters-handbook/Makefile
+++ b/zh_TW.Big5/books/porters-handbook/Makefile
@@ -21,9 +21,6 @@ INSTALL_ONLY_COMPRESSED?=
# XML content
SRCS= book.xml
-# Use the local DSSSL file
-DSLPRINT?= ${.CURDIR}/freebsd.dsl
-
# Images from the cross-document image library
IMAGES_LIB+= callouts/1.png
IMAGES_LIB+= callouts/2.png
diff --git a/zh_TW.Big5/books/porters-handbook/freebsd.dsl b/zh_TW.Big5/books/porters-handbook/freebsd.dsl
deleted file mode 100644
index 7cbc062778..0000000000
--- a/zh_TW.Big5/books/porters-handbook/freebsd.dsl
+++ /dev/null
@@ -1,18 +0,0 @@
-<!-- $FreeBSD$ -->
-
-<!-- Local DSSSL file for the Porter's Handbook. This is so we can include
- a link to the -ports mailing list at the bottom of the HTML files,
- rather than the -questions mailing list. -->
-
-<!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
-<!ENTITY freebsd.dsl SYSTEM "../../share/xml/freebsd.dsl" CDATA DSSSL>
-]>
-
-<style-sheet>
- <style-specification use="docbook">
- <style-specification-body>
- </style-specification-body>
- </style-specification>
-
- <external-specification id="docbook" document="freebsd.dsl">
-</style-sheet>
From 0701bf45bdd354892469bd3f1ea17ac1db444467 Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Mon, 25 Feb 2013 20:17:26 +0000
Subject: [PATCH 071/121] - Add infrastructure for language-specific XSLT
customizations
---
bn_BD.ISO10646-1/share/xsl/freebsd-epub.xsl | 12 ++++++++++++
bn_BD.ISO10646-1/share/xsl/freebsd-fo.xsl | 12 ++++++++++++
bn_BD.ISO10646-1/share/xsl/freebsd-xhtml-chunk.xsl | 12 ++++++++++++
bn_BD.ISO10646-1/share/xsl/freebsd-xhtml.xsl | 12 ++++++++++++
da_DK.ISO8859-1/share/xsl/freebsd-epub.xsl | 12 ++++++++++++
da_DK.ISO8859-1/share/xsl/freebsd-fo.xsl | 12 ++++++++++++
da_DK.ISO8859-1/share/xsl/freebsd-xhtml-chunk.xsl | 12 ++++++++++++
da_DK.ISO8859-1/share/xsl/freebsd-xhtml.xsl | 12 ++++++++++++
de_DE.ISO8859-1/share/xsl/freebsd-epub.xsl | 12 ++++++++++++
de_DE.ISO8859-1/share/xsl/freebsd-fo.xsl | 12 ++++++++++++
de_DE.ISO8859-1/share/xsl/freebsd-xhtml-chunk.xsl | 12 ++++++++++++
de_DE.ISO8859-1/share/xsl/freebsd-xhtml.xsl | 12 ++++++++++++
el_GR.ISO8859-7/share/xsl/freebsd-epub.xsl | 12 ++++++++++++
el_GR.ISO8859-7/share/xsl/freebsd-fo.xsl | 12 ++++++++++++
el_GR.ISO8859-7/share/xsl/freebsd-xhtml-chunk.xsl | 12 ++++++++++++
el_GR.ISO8859-7/share/xsl/freebsd-xhtml.xsl | 12 ++++++++++++
en_US.ISO8859-1/share/xsl/freebsd-epub.xsl | 12 ++++++++++++
en_US.ISO8859-1/share/xsl/freebsd-fo.xsl | 12 ++++++++++++
en_US.ISO8859-1/share/xsl/freebsd-xhtml-chunk.xsl | 12 ++++++++++++
en_US.ISO8859-1/share/xsl/freebsd-xhtml.xsl | 12 ++++++++++++
es_ES.ISO8859-1/share/xsl/freebsd-epub.xsl | 12 ++++++++++++
es_ES.ISO8859-1/share/xsl/freebsd-fo.xsl | 12 ++++++++++++
es_ES.ISO8859-1/share/xsl/freebsd-xhtml-chunk.xsl | 12 ++++++++++++
es_ES.ISO8859-1/share/xsl/freebsd-xhtml.xsl | 12 ++++++++++++
fr_FR.ISO8859-1/share/xsl/freebsd-epub.xsl | 12 ++++++++++++
fr_FR.ISO8859-1/share/xsl/freebsd-fo.xsl | 12 ++++++++++++
fr_FR.ISO8859-1/share/xsl/freebsd-xhtml-chunk.xsl | 12 ++++++++++++
fr_FR.ISO8859-1/share/xsl/freebsd-xhtml.xsl | 12 ++++++++++++
hu_HU.ISO8859-2/share/xsl/freebsd-epub.xsl | 12 ++++++++++++
hu_HU.ISO8859-2/share/xsl/freebsd-fo.xsl | 12 ++++++++++++
hu_HU.ISO8859-2/share/xsl/freebsd-xhtml-chunk.xsl | 12 ++++++++++++
hu_HU.ISO8859-2/share/xsl/freebsd-xhtml.xsl | 12 ++++++++++++
it_IT.ISO8859-15/share/xsl/freebsd-epub.xsl | 12 ++++++++++++
it_IT.ISO8859-15/share/xsl/freebsd-fo.xsl | 12 ++++++++++++
it_IT.ISO8859-15/share/xsl/freebsd-xhtml-chunk.xsl | 12 ++++++++++++
it_IT.ISO8859-15/share/xsl/freebsd-xhtml.xsl | 12 ++++++++++++
ja_JP.eucJP/share/xsl/freebsd-epub.xsl | 12 ++++++++++++
ja_JP.eucJP/share/xsl/freebsd-fo.xsl | 12 ++++++++++++
ja_JP.eucJP/share/xsl/freebsd-xhtml-chunk.xsl | 12 ++++++++++++
ja_JP.eucJP/share/xsl/freebsd-xhtml.xsl | 12 ++++++++++++
mn_MN.UTF-8/share/xsl/freebsd-epub.xsl | 12 ++++++++++++
mn_MN.UTF-8/share/xsl/freebsd-fo.xsl | 12 ++++++++++++
mn_MN.UTF-8/share/xsl/freebsd-xhtml-chunk.xsl | 12 ++++++++++++
mn_MN.UTF-8/share/xsl/freebsd-xhtml.xsl | 12 ++++++++++++
nl_NL.ISO8859-1/share/xsl/freebsd-epub.xsl | 12 ++++++++++++
nl_NL.ISO8859-1/share/xsl/freebsd-fo.xsl | 12 ++++++++++++
nl_NL.ISO8859-1/share/xsl/freebsd-xhtml-chunk.xsl | 12 ++++++++++++
nl_NL.ISO8859-1/share/xsl/freebsd-xhtml.xsl | 12 ++++++++++++
pl_PL.ISO8859-2/share/xsl/freebsd-epub.xsl | 12 ++++++++++++
pl_PL.ISO8859-2/share/xsl/freebsd-fo.xsl | 12 ++++++++++++
pl_PL.ISO8859-2/share/xsl/freebsd-xhtml-chunk.xsl | 12 ++++++++++++
pl_PL.ISO8859-2/share/xsl/freebsd-xhtml.xsl | 12 ++++++++++++
pt_BR.ISO8859-1/share/xsl/freebsd-epub.xsl | 12 ++++++++++++
pt_BR.ISO8859-1/share/xsl/freebsd-fo.xsl | 12 ++++++++++++
pt_BR.ISO8859-1/share/xsl/freebsd-xhtml-chunk.xsl | 12 ++++++++++++
pt_BR.ISO8859-1/share/xsl/freebsd-xhtml.xsl | 12 ++++++++++++
ru_RU.KOI8-R/share/xsl/freebsd-epub.xsl | 12 ++++++++++++
ru_RU.KOI8-R/share/xsl/freebsd-fo.xsl | 12 ++++++++++++
ru_RU.KOI8-R/share/xsl/freebsd-xhtml-chunk.xsl | 12 ++++++++++++
ru_RU.KOI8-R/share/xsl/freebsd-xhtml.xsl | 12 ++++++++++++
share/mk/doc.docbook.mk | 8 ++++----
sr_YU.ISO8859-2/share/xsl/freebsd-epub.xsl | 12 ++++++++++++
sr_YU.ISO8859-2/share/xsl/freebsd-fo.xsl | 12 ++++++++++++
sr_YU.ISO8859-2/share/xsl/freebsd-xhtml-chunk.xsl | 12 ++++++++++++
sr_YU.ISO8859-2/share/xsl/freebsd-xhtml.xsl | 12 ++++++++++++
tr_TR.ISO8859-9/share/xsl/freebsd-epub.xsl | 12 ++++++++++++
tr_TR.ISO8859-9/share/xsl/freebsd-fo.xsl | 12 ++++++++++++
tr_TR.ISO8859-9/share/xsl/freebsd-xhtml-chunk.xsl | 12 ++++++++++++
tr_TR.ISO8859-9/share/xsl/freebsd-xhtml.xsl | 12 ++++++++++++
zh_CN.GB2312/share/xsl/freebsd-epub.xsl | 12 ++++++++++++
zh_CN.GB2312/share/xsl/freebsd-fo.xsl | 12 ++++++++++++
zh_CN.GB2312/share/xsl/freebsd-xhtml-chunk.xsl | 12 ++++++++++++
zh_CN.GB2312/share/xsl/freebsd-xhtml.xsl | 12 ++++++++++++
zh_TW.Big5/share/xsl/freebsd-epub.xsl | 12 ++++++++++++
zh_TW.Big5/share/xsl/freebsd-fo.xsl | 12 ++++++++++++
zh_TW.Big5/share/xsl/freebsd-xhtml-chunk.xsl | 12 ++++++++++++
zh_TW.Big5/share/xsl/freebsd-xhtml.xsl | 12 ++++++++++++
77 files changed, 916 insertions(+), 4 deletions(-)
create mode 100644 bn_BD.ISO10646-1/share/xsl/freebsd-epub.xsl
create mode 100644 bn_BD.ISO10646-1/share/xsl/freebsd-fo.xsl
create mode 100644 bn_BD.ISO10646-1/share/xsl/freebsd-xhtml-chunk.xsl
create mode 100644 bn_BD.ISO10646-1/share/xsl/freebsd-xhtml.xsl
create mode 100644 da_DK.ISO8859-1/share/xsl/freebsd-epub.xsl
create mode 100644 da_DK.ISO8859-1/share/xsl/freebsd-fo.xsl
create mode 100644 da_DK.ISO8859-1/share/xsl/freebsd-xhtml-chunk.xsl
create mode 100644 da_DK.ISO8859-1/share/xsl/freebsd-xhtml.xsl
create mode 100644 de_DE.ISO8859-1/share/xsl/freebsd-epub.xsl
create mode 100644 de_DE.ISO8859-1/share/xsl/freebsd-fo.xsl
create mode 100644 de_DE.ISO8859-1/share/xsl/freebsd-xhtml-chunk.xsl
create mode 100644 de_DE.ISO8859-1/share/xsl/freebsd-xhtml.xsl
create mode 100644 el_GR.ISO8859-7/share/xsl/freebsd-epub.xsl
create mode 100644 el_GR.ISO8859-7/share/xsl/freebsd-fo.xsl
create mode 100644 el_GR.ISO8859-7/share/xsl/freebsd-xhtml-chunk.xsl
create mode 100644 el_GR.ISO8859-7/share/xsl/freebsd-xhtml.xsl
create mode 100644 en_US.ISO8859-1/share/xsl/freebsd-epub.xsl
create mode 100644 en_US.ISO8859-1/share/xsl/freebsd-fo.xsl
create mode 100644 en_US.ISO8859-1/share/xsl/freebsd-xhtml-chunk.xsl
create mode 100644 en_US.ISO8859-1/share/xsl/freebsd-xhtml.xsl
create mode 100644 es_ES.ISO8859-1/share/xsl/freebsd-epub.xsl
create mode 100644 es_ES.ISO8859-1/share/xsl/freebsd-fo.xsl
create mode 100644 es_ES.ISO8859-1/share/xsl/freebsd-xhtml-chunk.xsl
create mode 100644 es_ES.ISO8859-1/share/xsl/freebsd-xhtml.xsl
create mode 100644 fr_FR.ISO8859-1/share/xsl/freebsd-epub.xsl
create mode 100644 fr_FR.ISO8859-1/share/xsl/freebsd-fo.xsl
create mode 100644 fr_FR.ISO8859-1/share/xsl/freebsd-xhtml-chunk.xsl
create mode 100644 fr_FR.ISO8859-1/share/xsl/freebsd-xhtml.xsl
create mode 100644 hu_HU.ISO8859-2/share/xsl/freebsd-epub.xsl
create mode 100644 hu_HU.ISO8859-2/share/xsl/freebsd-fo.xsl
create mode 100644 hu_HU.ISO8859-2/share/xsl/freebsd-xhtml-chunk.xsl
create mode 100644 hu_HU.ISO8859-2/share/xsl/freebsd-xhtml.xsl
create mode 100644 it_IT.ISO8859-15/share/xsl/freebsd-epub.xsl
create mode 100644 it_IT.ISO8859-15/share/xsl/freebsd-fo.xsl
create mode 100644 it_IT.ISO8859-15/share/xsl/freebsd-xhtml-chunk.xsl
create mode 100644 it_IT.ISO8859-15/share/xsl/freebsd-xhtml.xsl
create mode 100644 ja_JP.eucJP/share/xsl/freebsd-epub.xsl
create mode 100644 ja_JP.eucJP/share/xsl/freebsd-fo.xsl
create mode 100644 ja_JP.eucJP/share/xsl/freebsd-xhtml-chunk.xsl
create mode 100644 ja_JP.eucJP/share/xsl/freebsd-xhtml.xsl
create mode 100644 mn_MN.UTF-8/share/xsl/freebsd-epub.xsl
create mode 100644 mn_MN.UTF-8/share/xsl/freebsd-fo.xsl
create mode 100644 mn_MN.UTF-8/share/xsl/freebsd-xhtml-chunk.xsl
create mode 100644 mn_MN.UTF-8/share/xsl/freebsd-xhtml.xsl
create mode 100644 nl_NL.ISO8859-1/share/xsl/freebsd-epub.xsl
create mode 100644 nl_NL.ISO8859-1/share/xsl/freebsd-fo.xsl
create mode 100644 nl_NL.ISO8859-1/share/xsl/freebsd-xhtml-chunk.xsl
create mode 100644 nl_NL.ISO8859-1/share/xsl/freebsd-xhtml.xsl
create mode 100644 pl_PL.ISO8859-2/share/xsl/freebsd-epub.xsl
create mode 100644 pl_PL.ISO8859-2/share/xsl/freebsd-fo.xsl
create mode 100644 pl_PL.ISO8859-2/share/xsl/freebsd-xhtml-chunk.xsl
create mode 100644 pl_PL.ISO8859-2/share/xsl/freebsd-xhtml.xsl
create mode 100644 pt_BR.ISO8859-1/share/xsl/freebsd-epub.xsl
create mode 100644 pt_BR.ISO8859-1/share/xsl/freebsd-fo.xsl
create mode 100644 pt_BR.ISO8859-1/share/xsl/freebsd-xhtml-chunk.xsl
create mode 100644 pt_BR.ISO8859-1/share/xsl/freebsd-xhtml.xsl
create mode 100644 ru_RU.KOI8-R/share/xsl/freebsd-epub.xsl
create mode 100644 ru_RU.KOI8-R/share/xsl/freebsd-fo.xsl
create mode 100644 ru_RU.KOI8-R/share/xsl/freebsd-xhtml-chunk.xsl
create mode 100644 ru_RU.KOI8-R/share/xsl/freebsd-xhtml.xsl
create mode 100644 sr_YU.ISO8859-2/share/xsl/freebsd-epub.xsl
create mode 100644 sr_YU.ISO8859-2/share/xsl/freebsd-fo.xsl
create mode 100644 sr_YU.ISO8859-2/share/xsl/freebsd-xhtml-chunk.xsl
create mode 100644 sr_YU.ISO8859-2/share/xsl/freebsd-xhtml.xsl
create mode 100644 tr_TR.ISO8859-9/share/xsl/freebsd-epub.xsl
create mode 100644 tr_TR.ISO8859-9/share/xsl/freebsd-fo.xsl
create mode 100644 tr_TR.ISO8859-9/share/xsl/freebsd-xhtml-chunk.xsl
create mode 100644 tr_TR.ISO8859-9/share/xsl/freebsd-xhtml.xsl
create mode 100644 zh_CN.GB2312/share/xsl/freebsd-epub.xsl
create mode 100644 zh_CN.GB2312/share/xsl/freebsd-fo.xsl
create mode 100644 zh_CN.GB2312/share/xsl/freebsd-xhtml-chunk.xsl
create mode 100644 zh_CN.GB2312/share/xsl/freebsd-xhtml.xsl
create mode 100644 zh_TW.Big5/share/xsl/freebsd-epub.xsl
create mode 100644 zh_TW.Big5/share/xsl/freebsd-fo.xsl
create mode 100644 zh_TW.Big5/share/xsl/freebsd-xhtml-chunk.xsl
create mode 100644 zh_TW.Big5/share/xsl/freebsd-xhtml.xsl
diff --git a/bn_BD.ISO10646-1/share/xsl/freebsd-epub.xsl b/bn_BD.ISO10646-1/share/xsl/freebsd-epub.xsl
new file mode 100644
index 0000000000..88e727a761
--- /dev/null
+++ b/bn_BD.ISO10646-1/share/xsl/freebsd-epub.xsl
@@ -0,0 +1,12 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version='1.0'
+ xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ exclude-result-prefixes="#default">
+
+ <!-- Pull in the language-independent stylesheet -->
+ <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-epub.xsl"/>
+</xsl:stylesheet>
diff --git a/bn_BD.ISO10646-1/share/xsl/freebsd-fo.xsl b/bn_BD.ISO10646-1/share/xsl/freebsd-fo.xsl
new file mode 100644
index 0000000000..c29de88df8
--- /dev/null
+++ b/bn_BD.ISO10646-1/share/xsl/freebsd-fo.xsl
@@ -0,0 +1,12 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version='1.0'
+ xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ exclude-result-prefixes="#default">
+
+ <!-- Pull in the language-independent stylesheet -->
+ <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-fo.xsl"/>
+</xsl:stylesheet>
diff --git a/bn_BD.ISO10646-1/share/xsl/freebsd-xhtml-chunk.xsl b/bn_BD.ISO10646-1/share/xsl/freebsd-xhtml-chunk.xsl
new file mode 100644
index 0000000000..9f5872f807
--- /dev/null
+++ b/bn_BD.ISO10646-1/share/xsl/freebsd-xhtml-chunk.xsl
@@ -0,0 +1,12 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version='1.0'
+ xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ exclude-result-prefixes="#default">
+
+ <!-- Pull in the language-independent stylesheet -->
+ <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-xhtml-chunk.xsl"/>
+</xsl:stylesheet>
diff --git a/bn_BD.ISO10646-1/share/xsl/freebsd-xhtml.xsl b/bn_BD.ISO10646-1/share/xsl/freebsd-xhtml.xsl
new file mode 100644
index 0000000000..92267b2357
--- /dev/null
+++ b/bn_BD.ISO10646-1/share/xsl/freebsd-xhtml.xsl
@@ -0,0 +1,12 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version='1.0'
+ xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ exclude-result-prefixes="#default">
+
+ <!-- Pull in the language-independent stylesheet -->
+ <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-xhtml.xsl"/>
+</xsl:stylesheet>
diff --git a/da_DK.ISO8859-1/share/xsl/freebsd-epub.xsl b/da_DK.ISO8859-1/share/xsl/freebsd-epub.xsl
new file mode 100644
index 0000000000..88e727a761
--- /dev/null
+++ b/da_DK.ISO8859-1/share/xsl/freebsd-epub.xsl
@@ -0,0 +1,12 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version='1.0'
+ xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ exclude-result-prefixes="#default">
+
+ <!-- Pull in the language-independent stylesheet -->
+ <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-epub.xsl"/>
+</xsl:stylesheet>
diff --git a/da_DK.ISO8859-1/share/xsl/freebsd-fo.xsl b/da_DK.ISO8859-1/share/xsl/freebsd-fo.xsl
new file mode 100644
index 0000000000..c29de88df8
--- /dev/null
+++ b/da_DK.ISO8859-1/share/xsl/freebsd-fo.xsl
@@ -0,0 +1,12 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version='1.0'
+ xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ exclude-result-prefixes="#default">
+
+ <!-- Pull in the language-independent stylesheet -->
+ <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-fo.xsl"/>
+</xsl:stylesheet>
diff --git a/da_DK.ISO8859-1/share/xsl/freebsd-xhtml-chunk.xsl b/da_DK.ISO8859-1/share/xsl/freebsd-xhtml-chunk.xsl
new file mode 100644
index 0000000000..9f5872f807
--- /dev/null
+++ b/da_DK.ISO8859-1/share/xsl/freebsd-xhtml-chunk.xsl
@@ -0,0 +1,12 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version='1.0'
+ xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ exclude-result-prefixes="#default">
+
+ <!-- Pull in the language-independent stylesheet -->
+ <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-xhtml-chunk.xsl"/>
+</xsl:stylesheet>
diff --git a/da_DK.ISO8859-1/share/xsl/freebsd-xhtml.xsl b/da_DK.ISO8859-1/share/xsl/freebsd-xhtml.xsl
new file mode 100644
index 0000000000..92267b2357
--- /dev/null
+++ b/da_DK.ISO8859-1/share/xsl/freebsd-xhtml.xsl
@@ -0,0 +1,12 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version='1.0'
+ xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ exclude-result-prefixes="#default">
+
+ <!-- Pull in the language-independent stylesheet -->
+ <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-xhtml.xsl"/>
+</xsl:stylesheet>
diff --git a/de_DE.ISO8859-1/share/xsl/freebsd-epub.xsl b/de_DE.ISO8859-1/share/xsl/freebsd-epub.xsl
new file mode 100644
index 0000000000..88e727a761
--- /dev/null
+++ b/de_DE.ISO8859-1/share/xsl/freebsd-epub.xsl
@@ -0,0 +1,12 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version='1.0'
+ xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ exclude-result-prefixes="#default">
+
+ <!-- Pull in the language-independent stylesheet -->
+ <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-epub.xsl"/>
+</xsl:stylesheet>
diff --git a/de_DE.ISO8859-1/share/xsl/freebsd-fo.xsl b/de_DE.ISO8859-1/share/xsl/freebsd-fo.xsl
new file mode 100644
index 0000000000..c29de88df8
--- /dev/null
+++ b/de_DE.ISO8859-1/share/xsl/freebsd-fo.xsl
@@ -0,0 +1,12 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version='1.0'
+ xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ exclude-result-prefixes="#default">
+
+ <!-- Pull in the language-independent stylesheet -->
+ <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-fo.xsl"/>
+</xsl:stylesheet>
diff --git a/de_DE.ISO8859-1/share/xsl/freebsd-xhtml-chunk.xsl b/de_DE.ISO8859-1/share/xsl/freebsd-xhtml-chunk.xsl
new file mode 100644
index 0000000000..9f5872f807
--- /dev/null
+++ b/de_DE.ISO8859-1/share/xsl/freebsd-xhtml-chunk.xsl
@@ -0,0 +1,12 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version='1.0'
+ xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ exclude-result-prefixes="#default">
+
+ <!-- Pull in the language-independent stylesheet -->
+ <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-xhtml-chunk.xsl"/>
+</xsl:stylesheet>
diff --git a/de_DE.ISO8859-1/share/xsl/freebsd-xhtml.xsl b/de_DE.ISO8859-1/share/xsl/freebsd-xhtml.xsl
new file mode 100644
index 0000000000..92267b2357
--- /dev/null
+++ b/de_DE.ISO8859-1/share/xsl/freebsd-xhtml.xsl
@@ -0,0 +1,12 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version='1.0'
+ xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ exclude-result-prefixes="#default">
+
+ <!-- Pull in the language-independent stylesheet -->
+ <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-xhtml.xsl"/>
+</xsl:stylesheet>
diff --git a/el_GR.ISO8859-7/share/xsl/freebsd-epub.xsl b/el_GR.ISO8859-7/share/xsl/freebsd-epub.xsl
new file mode 100644
index 0000000000..88e727a761
--- /dev/null
+++ b/el_GR.ISO8859-7/share/xsl/freebsd-epub.xsl
@@ -0,0 +1,12 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version='1.0'
+ xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ exclude-result-prefixes="#default">
+
+ <!-- Pull in the language-independent stylesheet -->
+ <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-epub.xsl"/>
+</xsl:stylesheet>
diff --git a/el_GR.ISO8859-7/share/xsl/freebsd-fo.xsl b/el_GR.ISO8859-7/share/xsl/freebsd-fo.xsl
new file mode 100644
index 0000000000..c29de88df8
--- /dev/null
+++ b/el_GR.ISO8859-7/share/xsl/freebsd-fo.xsl
@@ -0,0 +1,12 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version='1.0'
+ xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ exclude-result-prefixes="#default">
+
+ <!-- Pull in the language-independent stylesheet -->
+ <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-fo.xsl"/>
+</xsl:stylesheet>
diff --git a/el_GR.ISO8859-7/share/xsl/freebsd-xhtml-chunk.xsl b/el_GR.ISO8859-7/share/xsl/freebsd-xhtml-chunk.xsl
new file mode 100644
index 0000000000..9f5872f807
--- /dev/null
+++ b/el_GR.ISO8859-7/share/xsl/freebsd-xhtml-chunk.xsl
@@ -0,0 +1,12 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version='1.0'
+ xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ exclude-result-prefixes="#default">
+
+ <!-- Pull in the language-independent stylesheet -->
+ <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-xhtml-chunk.xsl"/>
+</xsl:stylesheet>
diff --git a/el_GR.ISO8859-7/share/xsl/freebsd-xhtml.xsl b/el_GR.ISO8859-7/share/xsl/freebsd-xhtml.xsl
new file mode 100644
index 0000000000..92267b2357
--- /dev/null
+++ b/el_GR.ISO8859-7/share/xsl/freebsd-xhtml.xsl
@@ -0,0 +1,12 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version='1.0'
+ xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ exclude-result-prefixes="#default">
+
+ <!-- Pull in the language-independent stylesheet -->
+ <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-xhtml.xsl"/>
+</xsl:stylesheet>
diff --git a/en_US.ISO8859-1/share/xsl/freebsd-epub.xsl b/en_US.ISO8859-1/share/xsl/freebsd-epub.xsl
new file mode 100644
index 0000000000..88e727a761
--- /dev/null
+++ b/en_US.ISO8859-1/share/xsl/freebsd-epub.xsl
@@ -0,0 +1,12 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version='1.0'
+ xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ exclude-result-prefixes="#default">
+
+ <!-- Pull in the language-independent stylesheet -->
+ <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-epub.xsl"/>
+</xsl:stylesheet>
diff --git a/en_US.ISO8859-1/share/xsl/freebsd-fo.xsl b/en_US.ISO8859-1/share/xsl/freebsd-fo.xsl
new file mode 100644
index 0000000000..c29de88df8
--- /dev/null
+++ b/en_US.ISO8859-1/share/xsl/freebsd-fo.xsl
@@ -0,0 +1,12 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version='1.0'
+ xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ exclude-result-prefixes="#default">
+
+ <!-- Pull in the language-independent stylesheet -->
+ <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-fo.xsl"/>
+</xsl:stylesheet>
diff --git a/en_US.ISO8859-1/share/xsl/freebsd-xhtml-chunk.xsl b/en_US.ISO8859-1/share/xsl/freebsd-xhtml-chunk.xsl
new file mode 100644
index 0000000000..9f5872f807
--- /dev/null
+++ b/en_US.ISO8859-1/share/xsl/freebsd-xhtml-chunk.xsl
@@ -0,0 +1,12 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version='1.0'
+ xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ exclude-result-prefixes="#default">
+
+ <!-- Pull in the language-independent stylesheet -->
+ <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-xhtml-chunk.xsl"/>
+</xsl:stylesheet>
diff --git a/en_US.ISO8859-1/share/xsl/freebsd-xhtml.xsl b/en_US.ISO8859-1/share/xsl/freebsd-xhtml.xsl
new file mode 100644
index 0000000000..92267b2357
--- /dev/null
+++ b/en_US.ISO8859-1/share/xsl/freebsd-xhtml.xsl
@@ -0,0 +1,12 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version='1.0'
+ xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ exclude-result-prefixes="#default">
+
+ <!-- Pull in the language-independent stylesheet -->
+ <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-xhtml.xsl"/>
+</xsl:stylesheet>
diff --git a/es_ES.ISO8859-1/share/xsl/freebsd-epub.xsl b/es_ES.ISO8859-1/share/xsl/freebsd-epub.xsl
new file mode 100644
index 0000000000..88e727a761
--- /dev/null
+++ b/es_ES.ISO8859-1/share/xsl/freebsd-epub.xsl
@@ -0,0 +1,12 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version='1.0'
+ xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ exclude-result-prefixes="#default">
+
+ <!-- Pull in the language-independent stylesheet -->
+ <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-epub.xsl"/>
+</xsl:stylesheet>
diff --git a/es_ES.ISO8859-1/share/xsl/freebsd-fo.xsl b/es_ES.ISO8859-1/share/xsl/freebsd-fo.xsl
new file mode 100644
index 0000000000..c29de88df8
--- /dev/null
+++ b/es_ES.ISO8859-1/share/xsl/freebsd-fo.xsl
@@ -0,0 +1,12 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version='1.0'
+ xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ exclude-result-prefixes="#default">
+
+ <!-- Pull in the language-independent stylesheet -->
+ <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-fo.xsl"/>
+</xsl:stylesheet>
diff --git a/es_ES.ISO8859-1/share/xsl/freebsd-xhtml-chunk.xsl b/es_ES.ISO8859-1/share/xsl/freebsd-xhtml-chunk.xsl
new file mode 100644
index 0000000000..9f5872f807
--- /dev/null
+++ b/es_ES.ISO8859-1/share/xsl/freebsd-xhtml-chunk.xsl
@@ -0,0 +1,12 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version='1.0'
+ xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ exclude-result-prefixes="#default">
+
+ <!-- Pull in the language-independent stylesheet -->
+ <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-xhtml-chunk.xsl"/>
+</xsl:stylesheet>
diff --git a/es_ES.ISO8859-1/share/xsl/freebsd-xhtml.xsl b/es_ES.ISO8859-1/share/xsl/freebsd-xhtml.xsl
new file mode 100644
index 0000000000..92267b2357
--- /dev/null
+++ b/es_ES.ISO8859-1/share/xsl/freebsd-xhtml.xsl
@@ -0,0 +1,12 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version='1.0'
+ xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ exclude-result-prefixes="#default">
+
+ <!-- Pull in the language-independent stylesheet -->
+ <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-xhtml.xsl"/>
+</xsl:stylesheet>
diff --git a/fr_FR.ISO8859-1/share/xsl/freebsd-epub.xsl b/fr_FR.ISO8859-1/share/xsl/freebsd-epub.xsl
new file mode 100644
index 0000000000..88e727a761
--- /dev/null
+++ b/fr_FR.ISO8859-1/share/xsl/freebsd-epub.xsl
@@ -0,0 +1,12 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version='1.0'
+ xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ exclude-result-prefixes="#default">
+
+ <!-- Pull in the language-independent stylesheet -->
+ <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-epub.xsl"/>
+</xsl:stylesheet>
diff --git a/fr_FR.ISO8859-1/share/xsl/freebsd-fo.xsl b/fr_FR.ISO8859-1/share/xsl/freebsd-fo.xsl
new file mode 100644
index 0000000000..c29de88df8
--- /dev/null
+++ b/fr_FR.ISO8859-1/share/xsl/freebsd-fo.xsl
@@ -0,0 +1,12 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version='1.0'
+ xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ exclude-result-prefixes="#default">
+
+ <!-- Pull in the language-independent stylesheet -->
+ <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-fo.xsl"/>
+</xsl:stylesheet>
diff --git a/fr_FR.ISO8859-1/share/xsl/freebsd-xhtml-chunk.xsl b/fr_FR.ISO8859-1/share/xsl/freebsd-xhtml-chunk.xsl
new file mode 100644
index 0000000000..9f5872f807
--- /dev/null
+++ b/fr_FR.ISO8859-1/share/xsl/freebsd-xhtml-chunk.xsl
@@ -0,0 +1,12 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version='1.0'
+ xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ exclude-result-prefixes="#default">
+
+ <!-- Pull in the language-independent stylesheet -->
+ <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-xhtml-chunk.xsl"/>
+</xsl:stylesheet>
diff --git a/fr_FR.ISO8859-1/share/xsl/freebsd-xhtml.xsl b/fr_FR.ISO8859-1/share/xsl/freebsd-xhtml.xsl
new file mode 100644
index 0000000000..92267b2357
--- /dev/null
+++ b/fr_FR.ISO8859-1/share/xsl/freebsd-xhtml.xsl
@@ -0,0 +1,12 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version='1.0'
+ xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ exclude-result-prefixes="#default">
+
+ <!-- Pull in the language-independent stylesheet -->
+ <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-xhtml.xsl"/>
+</xsl:stylesheet>
diff --git a/hu_HU.ISO8859-2/share/xsl/freebsd-epub.xsl b/hu_HU.ISO8859-2/share/xsl/freebsd-epub.xsl
new file mode 100644
index 0000000000..88e727a761
--- /dev/null
+++ b/hu_HU.ISO8859-2/share/xsl/freebsd-epub.xsl
@@ -0,0 +1,12 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version='1.0'
+ xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ exclude-result-prefixes="#default">
+
+ <!-- Pull in the language-independent stylesheet -->
+ <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-epub.xsl"/>
+</xsl:stylesheet>
diff --git a/hu_HU.ISO8859-2/share/xsl/freebsd-fo.xsl b/hu_HU.ISO8859-2/share/xsl/freebsd-fo.xsl
new file mode 100644
index 0000000000..c29de88df8
--- /dev/null
+++ b/hu_HU.ISO8859-2/share/xsl/freebsd-fo.xsl
@@ -0,0 +1,12 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version='1.0'
+ xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ exclude-result-prefixes="#default">
+
+ <!-- Pull in the language-independent stylesheet -->
+ <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-fo.xsl"/>
+</xsl:stylesheet>
diff --git a/hu_HU.ISO8859-2/share/xsl/freebsd-xhtml-chunk.xsl b/hu_HU.ISO8859-2/share/xsl/freebsd-xhtml-chunk.xsl
new file mode 100644
index 0000000000..9f5872f807
--- /dev/null
+++ b/hu_HU.ISO8859-2/share/xsl/freebsd-xhtml-chunk.xsl
@@ -0,0 +1,12 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version='1.0'
+ xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ exclude-result-prefixes="#default">
+
+ <!-- Pull in the language-independent stylesheet -->
+ <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-xhtml-chunk.xsl"/>
+</xsl:stylesheet>
diff --git a/hu_HU.ISO8859-2/share/xsl/freebsd-xhtml.xsl b/hu_HU.ISO8859-2/share/xsl/freebsd-xhtml.xsl
new file mode 100644
index 0000000000..92267b2357
--- /dev/null
+++ b/hu_HU.ISO8859-2/share/xsl/freebsd-xhtml.xsl
@@ -0,0 +1,12 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version='1.0'
+ xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ exclude-result-prefixes="#default">
+
+ <!-- Pull in the language-independent stylesheet -->
+ <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-xhtml.xsl"/>
+</xsl:stylesheet>
diff --git a/it_IT.ISO8859-15/share/xsl/freebsd-epub.xsl b/it_IT.ISO8859-15/share/xsl/freebsd-epub.xsl
new file mode 100644
index 0000000000..88e727a761
--- /dev/null
+++ b/it_IT.ISO8859-15/share/xsl/freebsd-epub.xsl
@@ -0,0 +1,12 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version='1.0'
+ xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ exclude-result-prefixes="#default">
+
+ <!-- Pull in the language-independent stylesheet -->
+ <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-epub.xsl"/>
+</xsl:stylesheet>
diff --git a/it_IT.ISO8859-15/share/xsl/freebsd-fo.xsl b/it_IT.ISO8859-15/share/xsl/freebsd-fo.xsl
new file mode 100644
index 0000000000..c29de88df8
--- /dev/null
+++ b/it_IT.ISO8859-15/share/xsl/freebsd-fo.xsl
@@ -0,0 +1,12 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version='1.0'
+ xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ exclude-result-prefixes="#default">
+
+ <!-- Pull in the language-independent stylesheet -->
+ <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-fo.xsl"/>
+</xsl:stylesheet>
diff --git a/it_IT.ISO8859-15/share/xsl/freebsd-xhtml-chunk.xsl b/it_IT.ISO8859-15/share/xsl/freebsd-xhtml-chunk.xsl
new file mode 100644
index 0000000000..9f5872f807
--- /dev/null
+++ b/it_IT.ISO8859-15/share/xsl/freebsd-xhtml-chunk.xsl
@@ -0,0 +1,12 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version='1.0'
+ xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ exclude-result-prefixes="#default">
+
+ <!-- Pull in the language-independent stylesheet -->
+ <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-xhtml-chunk.xsl"/>
+</xsl:stylesheet>
diff --git a/it_IT.ISO8859-15/share/xsl/freebsd-xhtml.xsl b/it_IT.ISO8859-15/share/xsl/freebsd-xhtml.xsl
new file mode 100644
index 0000000000..92267b2357
--- /dev/null
+++ b/it_IT.ISO8859-15/share/xsl/freebsd-xhtml.xsl
@@ -0,0 +1,12 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version='1.0'
+ xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ exclude-result-prefixes="#default">
+
+ <!-- Pull in the language-independent stylesheet -->
+ <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-xhtml.xsl"/>
+</xsl:stylesheet>
diff --git a/ja_JP.eucJP/share/xsl/freebsd-epub.xsl b/ja_JP.eucJP/share/xsl/freebsd-epub.xsl
new file mode 100644
index 0000000000..88e727a761
--- /dev/null
+++ b/ja_JP.eucJP/share/xsl/freebsd-epub.xsl
@@ -0,0 +1,12 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version='1.0'
+ xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ exclude-result-prefixes="#default">
+
+ <!-- Pull in the language-independent stylesheet -->
+ <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-epub.xsl"/>
+</xsl:stylesheet>
diff --git a/ja_JP.eucJP/share/xsl/freebsd-fo.xsl b/ja_JP.eucJP/share/xsl/freebsd-fo.xsl
new file mode 100644
index 0000000000..c29de88df8
--- /dev/null
+++ b/ja_JP.eucJP/share/xsl/freebsd-fo.xsl
@@ -0,0 +1,12 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version='1.0'
+ xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ exclude-result-prefixes="#default">
+
+ <!-- Pull in the language-independent stylesheet -->
+ <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-fo.xsl"/>
+</xsl:stylesheet>
diff --git a/ja_JP.eucJP/share/xsl/freebsd-xhtml-chunk.xsl b/ja_JP.eucJP/share/xsl/freebsd-xhtml-chunk.xsl
new file mode 100644
index 0000000000..9f5872f807
--- /dev/null
+++ b/ja_JP.eucJP/share/xsl/freebsd-xhtml-chunk.xsl
@@ -0,0 +1,12 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version='1.0'
+ xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ exclude-result-prefixes="#default">
+
+ <!-- Pull in the language-independent stylesheet -->
+ <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-xhtml-chunk.xsl"/>
+</xsl:stylesheet>
diff --git a/ja_JP.eucJP/share/xsl/freebsd-xhtml.xsl b/ja_JP.eucJP/share/xsl/freebsd-xhtml.xsl
new file mode 100644
index 0000000000..92267b2357
--- /dev/null
+++ b/ja_JP.eucJP/share/xsl/freebsd-xhtml.xsl
@@ -0,0 +1,12 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version='1.0'
+ xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ exclude-result-prefixes="#default">
+
+ <!-- Pull in the language-independent stylesheet -->
+ <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-xhtml.xsl"/>
+</xsl:stylesheet>
diff --git a/mn_MN.UTF-8/share/xsl/freebsd-epub.xsl b/mn_MN.UTF-8/share/xsl/freebsd-epub.xsl
new file mode 100644
index 0000000000..88e727a761
--- /dev/null
+++ b/mn_MN.UTF-8/share/xsl/freebsd-epub.xsl
@@ -0,0 +1,12 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version='1.0'
+ xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ exclude-result-prefixes="#default">
+
+ <!-- Pull in the language-independent stylesheet -->
+ <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-epub.xsl"/>
+</xsl:stylesheet>
diff --git a/mn_MN.UTF-8/share/xsl/freebsd-fo.xsl b/mn_MN.UTF-8/share/xsl/freebsd-fo.xsl
new file mode 100644
index 0000000000..c29de88df8
--- /dev/null
+++ b/mn_MN.UTF-8/share/xsl/freebsd-fo.xsl
@@ -0,0 +1,12 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version='1.0'
+ xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ exclude-result-prefixes="#default">
+
+ <!-- Pull in the language-independent stylesheet -->
+ <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-fo.xsl"/>
+</xsl:stylesheet>
diff --git a/mn_MN.UTF-8/share/xsl/freebsd-xhtml-chunk.xsl b/mn_MN.UTF-8/share/xsl/freebsd-xhtml-chunk.xsl
new file mode 100644
index 0000000000..9f5872f807
--- /dev/null
+++ b/mn_MN.UTF-8/share/xsl/freebsd-xhtml-chunk.xsl
@@ -0,0 +1,12 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version='1.0'
+ xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ exclude-result-prefixes="#default">
+
+ <!-- Pull in the language-independent stylesheet -->
+ <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-xhtml-chunk.xsl"/>
+</xsl:stylesheet>
diff --git a/mn_MN.UTF-8/share/xsl/freebsd-xhtml.xsl b/mn_MN.UTF-8/share/xsl/freebsd-xhtml.xsl
new file mode 100644
index 0000000000..92267b2357
--- /dev/null
+++ b/mn_MN.UTF-8/share/xsl/freebsd-xhtml.xsl
@@ -0,0 +1,12 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version='1.0'
+ xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ exclude-result-prefixes="#default">
+
+ <!-- Pull in the language-independent stylesheet -->
+ <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-xhtml.xsl"/>
+</xsl:stylesheet>
diff --git a/nl_NL.ISO8859-1/share/xsl/freebsd-epub.xsl b/nl_NL.ISO8859-1/share/xsl/freebsd-epub.xsl
new file mode 100644
index 0000000000..88e727a761
--- /dev/null
+++ b/nl_NL.ISO8859-1/share/xsl/freebsd-epub.xsl
@@ -0,0 +1,12 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version='1.0'
+ xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ exclude-result-prefixes="#default">
+
+ <!-- Pull in the language-independent stylesheet -->
+ <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-epub.xsl"/>
+</xsl:stylesheet>
diff --git a/nl_NL.ISO8859-1/share/xsl/freebsd-fo.xsl b/nl_NL.ISO8859-1/share/xsl/freebsd-fo.xsl
new file mode 100644
index 0000000000..c29de88df8
--- /dev/null
+++ b/nl_NL.ISO8859-1/share/xsl/freebsd-fo.xsl
@@ -0,0 +1,12 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version='1.0'
+ xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ exclude-result-prefixes="#default">
+
+ <!-- Pull in the language-independent stylesheet -->
+ <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-fo.xsl"/>
+</xsl:stylesheet>
diff --git a/nl_NL.ISO8859-1/share/xsl/freebsd-xhtml-chunk.xsl b/nl_NL.ISO8859-1/share/xsl/freebsd-xhtml-chunk.xsl
new file mode 100644
index 0000000000..9f5872f807
--- /dev/null
+++ b/nl_NL.ISO8859-1/share/xsl/freebsd-xhtml-chunk.xsl
@@ -0,0 +1,12 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version='1.0'
+ xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ exclude-result-prefixes="#default">
+
+ <!-- Pull in the language-independent stylesheet -->
+ <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-xhtml-chunk.xsl"/>
+</xsl:stylesheet>
diff --git a/nl_NL.ISO8859-1/share/xsl/freebsd-xhtml.xsl b/nl_NL.ISO8859-1/share/xsl/freebsd-xhtml.xsl
new file mode 100644
index 0000000000..92267b2357
--- /dev/null
+++ b/nl_NL.ISO8859-1/share/xsl/freebsd-xhtml.xsl
@@ -0,0 +1,12 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version='1.0'
+ xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ exclude-result-prefixes="#default">
+
+ <!-- Pull in the language-independent stylesheet -->
+ <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-xhtml.xsl"/>
+</xsl:stylesheet>
diff --git a/pl_PL.ISO8859-2/share/xsl/freebsd-epub.xsl b/pl_PL.ISO8859-2/share/xsl/freebsd-epub.xsl
new file mode 100644
index 0000000000..88e727a761
--- /dev/null
+++ b/pl_PL.ISO8859-2/share/xsl/freebsd-epub.xsl
@@ -0,0 +1,12 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version='1.0'
+ xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ exclude-result-prefixes="#default">
+
+ <!-- Pull in the language-independent stylesheet -->
+ <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-epub.xsl"/>
+</xsl:stylesheet>
diff --git a/pl_PL.ISO8859-2/share/xsl/freebsd-fo.xsl b/pl_PL.ISO8859-2/share/xsl/freebsd-fo.xsl
new file mode 100644
index 0000000000..c29de88df8
--- /dev/null
+++ b/pl_PL.ISO8859-2/share/xsl/freebsd-fo.xsl
@@ -0,0 +1,12 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version='1.0'
+ xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ exclude-result-prefixes="#default">
+
+ <!-- Pull in the language-independent stylesheet -->
+ <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-fo.xsl"/>
+</xsl:stylesheet>
diff --git a/pl_PL.ISO8859-2/share/xsl/freebsd-xhtml-chunk.xsl b/pl_PL.ISO8859-2/share/xsl/freebsd-xhtml-chunk.xsl
new file mode 100644
index 0000000000..9f5872f807
--- /dev/null
+++ b/pl_PL.ISO8859-2/share/xsl/freebsd-xhtml-chunk.xsl
@@ -0,0 +1,12 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version='1.0'
+ xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ exclude-result-prefixes="#default">
+
+ <!-- Pull in the language-independent stylesheet -->
+ <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-xhtml-chunk.xsl"/>
+</xsl:stylesheet>
diff --git a/pl_PL.ISO8859-2/share/xsl/freebsd-xhtml.xsl b/pl_PL.ISO8859-2/share/xsl/freebsd-xhtml.xsl
new file mode 100644
index 0000000000..92267b2357
--- /dev/null
+++ b/pl_PL.ISO8859-2/share/xsl/freebsd-xhtml.xsl
@@ -0,0 +1,12 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version='1.0'
+ xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ exclude-result-prefixes="#default">
+
+ <!-- Pull in the language-independent stylesheet -->
+ <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-xhtml.xsl"/>
+</xsl:stylesheet>
diff --git a/pt_BR.ISO8859-1/share/xsl/freebsd-epub.xsl b/pt_BR.ISO8859-1/share/xsl/freebsd-epub.xsl
new file mode 100644
index 0000000000..88e727a761
--- /dev/null
+++ b/pt_BR.ISO8859-1/share/xsl/freebsd-epub.xsl
@@ -0,0 +1,12 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version='1.0'
+ xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ exclude-result-prefixes="#default">
+
+ <!-- Pull in the language-independent stylesheet -->
+ <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-epub.xsl"/>
+</xsl:stylesheet>
diff --git a/pt_BR.ISO8859-1/share/xsl/freebsd-fo.xsl b/pt_BR.ISO8859-1/share/xsl/freebsd-fo.xsl
new file mode 100644
index 0000000000..c29de88df8
--- /dev/null
+++ b/pt_BR.ISO8859-1/share/xsl/freebsd-fo.xsl
@@ -0,0 +1,12 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version='1.0'
+ xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ exclude-result-prefixes="#default">
+
+ <!-- Pull in the language-independent stylesheet -->
+ <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-fo.xsl"/>
+</xsl:stylesheet>
diff --git a/pt_BR.ISO8859-1/share/xsl/freebsd-xhtml-chunk.xsl b/pt_BR.ISO8859-1/share/xsl/freebsd-xhtml-chunk.xsl
new file mode 100644
index 0000000000..9f5872f807
--- /dev/null
+++ b/pt_BR.ISO8859-1/share/xsl/freebsd-xhtml-chunk.xsl
@@ -0,0 +1,12 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version='1.0'
+ xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ exclude-result-prefixes="#default">
+
+ <!-- Pull in the language-independent stylesheet -->
+ <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-xhtml-chunk.xsl"/>
+</xsl:stylesheet>
diff --git a/pt_BR.ISO8859-1/share/xsl/freebsd-xhtml.xsl b/pt_BR.ISO8859-1/share/xsl/freebsd-xhtml.xsl
new file mode 100644
index 0000000000..92267b2357
--- /dev/null
+++ b/pt_BR.ISO8859-1/share/xsl/freebsd-xhtml.xsl
@@ -0,0 +1,12 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version='1.0'
+ xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ exclude-result-prefixes="#default">
+
+ <!-- Pull in the language-independent stylesheet -->
+ <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-xhtml.xsl"/>
+</xsl:stylesheet>
diff --git a/ru_RU.KOI8-R/share/xsl/freebsd-epub.xsl b/ru_RU.KOI8-R/share/xsl/freebsd-epub.xsl
new file mode 100644
index 0000000000..88e727a761
--- /dev/null
+++ b/ru_RU.KOI8-R/share/xsl/freebsd-epub.xsl
@@ -0,0 +1,12 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version='1.0'
+ xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ exclude-result-prefixes="#default">
+
+ <!-- Pull in the language-independent stylesheet -->
+ <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-epub.xsl"/>
+</xsl:stylesheet>
diff --git a/ru_RU.KOI8-R/share/xsl/freebsd-fo.xsl b/ru_RU.KOI8-R/share/xsl/freebsd-fo.xsl
new file mode 100644
index 0000000000..c29de88df8
--- /dev/null
+++ b/ru_RU.KOI8-R/share/xsl/freebsd-fo.xsl
@@ -0,0 +1,12 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version='1.0'
+ xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ exclude-result-prefixes="#default">
+
+ <!-- Pull in the language-independent stylesheet -->
+ <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-fo.xsl"/>
+</xsl:stylesheet>
diff --git a/ru_RU.KOI8-R/share/xsl/freebsd-xhtml-chunk.xsl b/ru_RU.KOI8-R/share/xsl/freebsd-xhtml-chunk.xsl
new file mode 100644
index 0000000000..9f5872f807
--- /dev/null
+++ b/ru_RU.KOI8-R/share/xsl/freebsd-xhtml-chunk.xsl
@@ -0,0 +1,12 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version='1.0'
+ xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ exclude-result-prefixes="#default">
+
+ <!-- Pull in the language-independent stylesheet -->
+ <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-xhtml-chunk.xsl"/>
+</xsl:stylesheet>
diff --git a/ru_RU.KOI8-R/share/xsl/freebsd-xhtml.xsl b/ru_RU.KOI8-R/share/xsl/freebsd-xhtml.xsl
new file mode 100644
index 0000000000..92267b2357
--- /dev/null
+++ b/ru_RU.KOI8-R/share/xsl/freebsd-xhtml.xsl
@@ -0,0 +1,12 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version='1.0'
+ xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ exclude-result-prefixes="#default">
+
+ <!-- Pull in the language-independent stylesheet -->
+ <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-xhtml.xsl"/>
+</xsl:stylesheet>
diff --git a/share/mk/doc.docbook.mk b/share/mk/doc.docbook.mk
index 8ba1041ab9..256182b6ba 100644
--- a/share/mk/doc.docbook.mk
+++ b/share/mk/doc.docbook.mk
@@ -80,10 +80,10 @@ DSLHTML?= ${DOC_PREFIX}/share/xml/spellcheck.dsl
DSLPRINT?= ${DOC_PREFIX}/share/xml/default.dsl
DSLPGP?= ${DOC_PREFIX}/share/xml/pgp.dsl
-XSLXHTML?= ${DOC_PREFIX}/share/xsl/freebsd-xhtml.xsl
-XSLXHTMLCHUNK?= ${DOC_PREFIX}/share/xsl/freebsd-xhtml-chunk.xsl
-XSLEPUB?= ${DOC_PREFIX}/share/xsl/freebsd-epub.xsl
-XSLFO?= ${DOC_PREFIX}/share/xsl/freebsd-fo.xsl
+XSLXHTML?= ${DOC_PREFIX}/${LANGCODE}/share/xsl/freebsd-xhtml.xsl
+XSLXHTMLCHUNK?= ${DOC_PREFIX}/${LANGCODE}/share/xsl/freebsd-xhtml-chunk.xsl
+XSLEPUB?= ${DOC_PREFIX}/${LANGCODE}/share/xsl/freebsd-epub.xsl
+XSLFO?= ${DOC_PREFIX}/${LANGCODE}/share/xsl/freebsd-fo.xsl
IMAGES_LIB?=
diff --git a/sr_YU.ISO8859-2/share/xsl/freebsd-epub.xsl b/sr_YU.ISO8859-2/share/xsl/freebsd-epub.xsl
new file mode 100644
index 0000000000..88e727a761
--- /dev/null
+++ b/sr_YU.ISO8859-2/share/xsl/freebsd-epub.xsl
@@ -0,0 +1,12 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version='1.0'
+ xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ exclude-result-prefixes="#default">
+
+ <!-- Pull in the language-independent stylesheet -->
+ <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-epub.xsl"/>
+</xsl:stylesheet>
diff --git a/sr_YU.ISO8859-2/share/xsl/freebsd-fo.xsl b/sr_YU.ISO8859-2/share/xsl/freebsd-fo.xsl
new file mode 100644
index 0000000000..c29de88df8
--- /dev/null
+++ b/sr_YU.ISO8859-2/share/xsl/freebsd-fo.xsl
@@ -0,0 +1,12 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version='1.0'
+ xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ exclude-result-prefixes="#default">
+
+ <!-- Pull in the language-independent stylesheet -->
+ <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-fo.xsl"/>
+</xsl:stylesheet>
diff --git a/sr_YU.ISO8859-2/share/xsl/freebsd-xhtml-chunk.xsl b/sr_YU.ISO8859-2/share/xsl/freebsd-xhtml-chunk.xsl
new file mode 100644
index 0000000000..9f5872f807
--- /dev/null
+++ b/sr_YU.ISO8859-2/share/xsl/freebsd-xhtml-chunk.xsl
@@ -0,0 +1,12 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version='1.0'
+ xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ exclude-result-prefixes="#default">
+
+ <!-- Pull in the language-independent stylesheet -->
+ <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-xhtml-chunk.xsl"/>
+</xsl:stylesheet>
diff --git a/sr_YU.ISO8859-2/share/xsl/freebsd-xhtml.xsl b/sr_YU.ISO8859-2/share/xsl/freebsd-xhtml.xsl
new file mode 100644
index 0000000000..92267b2357
--- /dev/null
+++ b/sr_YU.ISO8859-2/share/xsl/freebsd-xhtml.xsl
@@ -0,0 +1,12 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version='1.0'
+ xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ exclude-result-prefixes="#default">
+
+ <!-- Pull in the language-independent stylesheet -->
+ <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-xhtml.xsl"/>
+</xsl:stylesheet>
diff --git a/tr_TR.ISO8859-9/share/xsl/freebsd-epub.xsl b/tr_TR.ISO8859-9/share/xsl/freebsd-epub.xsl
new file mode 100644
index 0000000000..88e727a761
--- /dev/null
+++ b/tr_TR.ISO8859-9/share/xsl/freebsd-epub.xsl
@@ -0,0 +1,12 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version='1.0'
+ xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ exclude-result-prefixes="#default">
+
+ <!-- Pull in the language-independent stylesheet -->
+ <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-epub.xsl"/>
+</xsl:stylesheet>
diff --git a/tr_TR.ISO8859-9/share/xsl/freebsd-fo.xsl b/tr_TR.ISO8859-9/share/xsl/freebsd-fo.xsl
new file mode 100644
index 0000000000..c29de88df8
--- /dev/null
+++ b/tr_TR.ISO8859-9/share/xsl/freebsd-fo.xsl
@@ -0,0 +1,12 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version='1.0'
+ xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ exclude-result-prefixes="#default">
+
+ <!-- Pull in the language-independent stylesheet -->
+ <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-fo.xsl"/>
+</xsl:stylesheet>
diff --git a/tr_TR.ISO8859-9/share/xsl/freebsd-xhtml-chunk.xsl b/tr_TR.ISO8859-9/share/xsl/freebsd-xhtml-chunk.xsl
new file mode 100644
index 0000000000..9f5872f807
--- /dev/null
+++ b/tr_TR.ISO8859-9/share/xsl/freebsd-xhtml-chunk.xsl
@@ -0,0 +1,12 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version='1.0'
+ xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ exclude-result-prefixes="#default">
+
+ <!-- Pull in the language-independent stylesheet -->
+ <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-xhtml-chunk.xsl"/>
+</xsl:stylesheet>
diff --git a/tr_TR.ISO8859-9/share/xsl/freebsd-xhtml.xsl b/tr_TR.ISO8859-9/share/xsl/freebsd-xhtml.xsl
new file mode 100644
index 0000000000..92267b2357
--- /dev/null
+++ b/tr_TR.ISO8859-9/share/xsl/freebsd-xhtml.xsl
@@ -0,0 +1,12 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version='1.0'
+ xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ exclude-result-prefixes="#default">
+
+ <!-- Pull in the language-independent stylesheet -->
+ <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-xhtml.xsl"/>
+</xsl:stylesheet>
diff --git a/zh_CN.GB2312/share/xsl/freebsd-epub.xsl b/zh_CN.GB2312/share/xsl/freebsd-epub.xsl
new file mode 100644
index 0000000000..88e727a761
--- /dev/null
+++ b/zh_CN.GB2312/share/xsl/freebsd-epub.xsl
@@ -0,0 +1,12 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version='1.0'
+ xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ exclude-result-prefixes="#default">
+
+ <!-- Pull in the language-independent stylesheet -->
+ <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-epub.xsl"/>
+</xsl:stylesheet>
diff --git a/zh_CN.GB2312/share/xsl/freebsd-fo.xsl b/zh_CN.GB2312/share/xsl/freebsd-fo.xsl
new file mode 100644
index 0000000000..c29de88df8
--- /dev/null
+++ b/zh_CN.GB2312/share/xsl/freebsd-fo.xsl
@@ -0,0 +1,12 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version='1.0'
+ xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ exclude-result-prefixes="#default">
+
+ <!-- Pull in the language-independent stylesheet -->
+ <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-fo.xsl"/>
+</xsl:stylesheet>
diff --git a/zh_CN.GB2312/share/xsl/freebsd-xhtml-chunk.xsl b/zh_CN.GB2312/share/xsl/freebsd-xhtml-chunk.xsl
new file mode 100644
index 0000000000..9f5872f807
--- /dev/null
+++ b/zh_CN.GB2312/share/xsl/freebsd-xhtml-chunk.xsl
@@ -0,0 +1,12 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version='1.0'
+ xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ exclude-result-prefixes="#default">
+
+ <!-- Pull in the language-independent stylesheet -->
+ <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-xhtml-chunk.xsl"/>
+</xsl:stylesheet>
diff --git a/zh_CN.GB2312/share/xsl/freebsd-xhtml.xsl b/zh_CN.GB2312/share/xsl/freebsd-xhtml.xsl
new file mode 100644
index 0000000000..92267b2357
--- /dev/null
+++ b/zh_CN.GB2312/share/xsl/freebsd-xhtml.xsl
@@ -0,0 +1,12 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version='1.0'
+ xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ exclude-result-prefixes="#default">
+
+ <!-- Pull in the language-independent stylesheet -->
+ <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-xhtml.xsl"/>
+</xsl:stylesheet>
diff --git a/zh_TW.Big5/share/xsl/freebsd-epub.xsl b/zh_TW.Big5/share/xsl/freebsd-epub.xsl
new file mode 100644
index 0000000000..88e727a761
--- /dev/null
+++ b/zh_TW.Big5/share/xsl/freebsd-epub.xsl
@@ -0,0 +1,12 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version='1.0'
+ xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ exclude-result-prefixes="#default">
+
+ <!-- Pull in the language-independent stylesheet -->
+ <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-epub.xsl"/>
+</xsl:stylesheet>
diff --git a/zh_TW.Big5/share/xsl/freebsd-fo.xsl b/zh_TW.Big5/share/xsl/freebsd-fo.xsl
new file mode 100644
index 0000000000..c29de88df8
--- /dev/null
+++ b/zh_TW.Big5/share/xsl/freebsd-fo.xsl
@@ -0,0 +1,12 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version='1.0'
+ xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ exclude-result-prefixes="#default">
+
+ <!-- Pull in the language-independent stylesheet -->
+ <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-fo.xsl"/>
+</xsl:stylesheet>
diff --git a/zh_TW.Big5/share/xsl/freebsd-xhtml-chunk.xsl b/zh_TW.Big5/share/xsl/freebsd-xhtml-chunk.xsl
new file mode 100644
index 0000000000..9f5872f807
--- /dev/null
+++ b/zh_TW.Big5/share/xsl/freebsd-xhtml-chunk.xsl
@@ -0,0 +1,12 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version='1.0'
+ xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ exclude-result-prefixes="#default">
+
+ <!-- Pull in the language-independent stylesheet -->
+ <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-xhtml-chunk.xsl"/>
+</xsl:stylesheet>
diff --git a/zh_TW.Big5/share/xsl/freebsd-xhtml.xsl b/zh_TW.Big5/share/xsl/freebsd-xhtml.xsl
new file mode 100644
index 0000000000..92267b2357
--- /dev/null
+++ b/zh_TW.Big5/share/xsl/freebsd-xhtml.xsl
@@ -0,0 +1,12 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version='1.0'
+ xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ exclude-result-prefixes="#default">
+
+ <!-- Pull in the language-independent stylesheet -->
+ <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-xhtml.xsl"/>
+</xsl:stylesheet>
From d55a546a05b84d5f2be1f80a81cb01a242e4a141 Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Mon, 25 Feb 2013 20:19:29 +0000
Subject: [PATCH 072/121] - Work around a DocBook XSL bug which lists
unexisting files in the manifest
---
share/mk/doc.docbook.mk | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/share/mk/doc.docbook.mk b/share/mk/doc.docbook.mk
index 256182b6ba..83a255e2ce 100644
--- a/share/mk/doc.docbook.mk
+++ b/share/mk/doc.docbook.mk
@@ -698,7 +698,11 @@ install-${_curformat}: ${DOC}.${_curformat}
.endif
@[ -d ${DESTDIR} ] || ${MKDIR} -p ${DESTDIR}
.if ${_cf} == "html-split"
- ${INSTALL_DOCS} $$(${XARGS} < HTML.manifest) ${DESTDIR}
+.for f in ${_html_docs}
+.if exists(${f})
+ ${INSTALL_DOCS} ${f} ${DESTDIR}
+.endif
+.endfor
.else
${INSTALL_DOCS} ${.ALLSRC} ${DESTDIR}
.endif
From 998b28cb3e52955280322c8c97e5797aa0afca9d Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Tue, 26 Feb 2013 09:43:12 +0000
Subject: [PATCH 073/121] - Add more customization layers - Localize footers
---
bn_BD.ISO10646-1/share/xsl/freebsd-common.xsl | 10 +++++++
bn_BD.ISO10646-1/share/xsl/freebsd-epub.xsl | 3 +++
bn_BD.ISO10646-1/share/xsl/freebsd-fo.xsl | 3 +++
.../share/xsl/freebsd-xhtml-chunk.xsl | 6 +++++
.../share/xsl/freebsd-xhtml-common.xsl | 10 +++++++
bn_BD.ISO10646-1/share/xsl/freebsd-xhtml.xsl | 6 +++++
da_DK.ISO8859-1/share/xsl/freebsd-common.xsl | 10 +++++++
da_DK.ISO8859-1/share/xsl/freebsd-epub.xsl | 3 +++
da_DK.ISO8859-1/share/xsl/freebsd-fo.xsl | 3 +++
.../share/xsl/freebsd-xhtml-chunk.xsl | 6 +++++
.../share/xsl/freebsd-xhtml-common.xsl | 20 ++++++++++++++
da_DK.ISO8859-1/share/xsl/freebsd-xhtml.xsl | 6 +++++
de_DE.ISO8859-1/share/xsl/freebsd-common.xsl | 10 +++++++
de_DE.ISO8859-1/share/xsl/freebsd-epub.xsl | 3 +++
de_DE.ISO8859-1/share/xsl/freebsd-fo.xsl | 3 +++
.../share/xsl/freebsd-xhtml-chunk.xsl | 6 +++++
.../share/xsl/freebsd-xhtml-common.xsl | 16 ++++++++++++
de_DE.ISO8859-1/share/xsl/freebsd-xhtml.xsl | 6 +++++
el_GR.ISO8859-7/share/xsl/freebsd-common.xsl | 10 +++++++
el_GR.ISO8859-7/share/xsl/freebsd-epub.xsl | 3 +++
el_GR.ISO8859-7/share/xsl/freebsd-fo.xsl | 3 +++
.../share/xsl/freebsd-xhtml-chunk.xsl | 6 +++++
.../share/xsl/freebsd-xhtml-common.xsl | 20 ++++++++++++++
el_GR.ISO8859-7/share/xsl/freebsd-xhtml.xsl | 6 +++++
en_US.ISO8859-1/share/xsl/freebsd-common.xsl | 10 +++++++
en_US.ISO8859-1/share/xsl/freebsd-epub.xsl | 3 +++
en_US.ISO8859-1/share/xsl/freebsd-fo.xsl | 3 +++
.../share/xsl/freebsd-xhtml-chunk.xsl | 6 +++++
.../share/xsl/freebsd-xhtml-common.xsl | 10 +++++++
en_US.ISO8859-1/share/xsl/freebsd-xhtml.xsl | 6 +++++
es_ES.ISO8859-1/share/xsl/freebsd-common.xsl | 10 +++++++
es_ES.ISO8859-1/share/xsl/freebsd-epub.xsl | 3 +++
es_ES.ISO8859-1/share/xsl/freebsd-fo.xsl | 3 +++
.../share/xsl/freebsd-xhtml-chunk.xsl | 6 +++++
.../share/xsl/freebsd-xhtml-common.xsl | 20 ++++++++++++++
es_ES.ISO8859-1/share/xsl/freebsd-xhtml.xsl | 6 +++++
fr_FR.ISO8859-1/share/xsl/freebsd-common.xsl | 10 +++++++
fr_FR.ISO8859-1/share/xsl/freebsd-epub.xsl | 3 +++
fr_FR.ISO8859-1/share/xsl/freebsd-fo.xsl | 3 +++
.../share/xsl/freebsd-xhtml-chunk.xsl | 6 +++++
.../share/xsl/freebsd-xhtml-common.xsl | 20 ++++++++++++++
fr_FR.ISO8859-1/share/xsl/freebsd-xhtml.xsl | 6 +++++
hu_HU.ISO8859-2/share/xsl/freebsd-common.xsl | 10 +++++++
hu_HU.ISO8859-2/share/xsl/freebsd-epub.xsl | 3 +++
hu_HU.ISO8859-2/share/xsl/freebsd-fo.xsl | 3 +++
.../share/xsl/freebsd-xhtml-chunk.xsl | 6 +++++
.../share/xsl/freebsd-xhtml-common.xsl | 17 ++++++++++++
hu_HU.ISO8859-2/share/xsl/freebsd-xhtml.xsl | 6 +++++
it_IT.ISO8859-15/share/xsl/freebsd-common.xsl | 10 +++++++
it_IT.ISO8859-15/share/xsl/freebsd-epub.xsl | 3 +++
it_IT.ISO8859-15/share/xsl/freebsd-fo.xsl | 3 +++
.../share/xsl/freebsd-xhtml-chunk.xsl | 6 +++++
.../share/xsl/freebsd-xhtml-common.xsl | 20 ++++++++++++++
it_IT.ISO8859-15/share/xsl/freebsd-xhtml.xsl | 6 +++++
ja_JP.eucJP/share/xsl/freebsd-common.xsl | 10 +++++++
ja_JP.eucJP/share/xsl/freebsd-epub.xsl | 3 +++
ja_JP.eucJP/share/xsl/freebsd-fo.xsl | 3 +++
ja_JP.eucJP/share/xsl/freebsd-xhtml-chunk.xsl | 6 +++++
.../share/xsl/freebsd-xhtml-common.xsl | 21 +++++++++++++++
ja_JP.eucJP/share/xsl/freebsd-xhtml.xsl | 6 +++++
mn_MN.UTF-8/share/xsl/freebsd-common.xsl | 10 +++++++
mn_MN.UTF-8/share/xsl/freebsd-epub.xsl | 3 +++
mn_MN.UTF-8/share/xsl/freebsd-fo.xsl | 3 +++
mn_MN.UTF-8/share/xsl/freebsd-xhtml-chunk.xsl | 6 +++++
.../share/xsl/freebsd-xhtml-common.xsl | 26 +++++++++++++++++++
mn_MN.UTF-8/share/xsl/freebsd-xhtml.xsl | 6 +++++
nl_NL.ISO8859-1/share/xsl/freebsd-common.xsl | 10 +++++++
nl_NL.ISO8859-1/share/xsl/freebsd-epub.xsl | 3 +++
nl_NL.ISO8859-1/share/xsl/freebsd-fo.xsl | 3 +++
.../share/xsl/freebsd-xhtml-chunk.xsl | 6 +++++
.../share/xsl/freebsd-xhtml-common.xsl | 11 ++++++++
nl_NL.ISO8859-1/share/xsl/freebsd-xhtml.xsl | 6 +++++
pl_PL.ISO8859-2/share/xsl/freebsd-common.xsl | 10 +++++++
pl_PL.ISO8859-2/share/xsl/freebsd-epub.xsl | 3 +++
pl_PL.ISO8859-2/share/xsl/freebsd-fo.xsl | 3 +++
.../share/xsl/freebsd-xhtml-chunk.xsl | 6 +++++
.../share/xsl/freebsd-xhtml-common.xsl | 10 +++++++
pl_PL.ISO8859-2/share/xsl/freebsd-xhtml.xsl | 6 +++++
pt_BR.ISO8859-1/share/xsl/freebsd-common.xsl | 10 +++++++
pt_BR.ISO8859-1/share/xsl/freebsd-epub.xsl | 3 +++
pt_BR.ISO8859-1/share/xsl/freebsd-fo.xsl | 3 +++
.../share/xsl/freebsd-xhtml-chunk.xsl | 6 +++++
.../share/xsl/freebsd-xhtml-common.xsl | 20 ++++++++++++++
pt_BR.ISO8859-1/share/xsl/freebsd-xhtml.xsl | 6 +++++
ru_RU.KOI8-R/share/xsl/freebsd-common.xsl | 10 +++++++
ru_RU.KOI8-R/share/xsl/freebsd-epub.xsl | 3 +++
ru_RU.KOI8-R/share/xsl/freebsd-fo.xsl | 3 +++
.../share/xsl/freebsd-xhtml-chunk.xsl | 6 +++++
.../share/xsl/freebsd-xhtml-common.xsl | 24 +++++++++++++++++
ru_RU.KOI8-R/share/xsl/freebsd-xhtml.xsl | 6 +++++
sr_YU.ISO8859-2/share/xsl/freebsd-common.xsl | 10 +++++++
sr_YU.ISO8859-2/share/xsl/freebsd-epub.xsl | 3 +++
sr_YU.ISO8859-2/share/xsl/freebsd-fo.xsl | 3 +++
.../share/xsl/freebsd-xhtml-chunk.xsl | 6 +++++
.../share/xsl/freebsd-xhtml-common.xsl | 10 +++++++
sr_YU.ISO8859-2/share/xsl/freebsd-xhtml.xsl | 6 +++++
tr_TR.ISO8859-9/share/xsl/freebsd-common.xsl | 10 +++++++
tr_TR.ISO8859-9/share/xsl/freebsd-epub.xsl | 3 +++
tr_TR.ISO8859-9/share/xsl/freebsd-fo.xsl | 3 +++
.../share/xsl/freebsd-xhtml-chunk.xsl | 6 +++++
.../share/xsl/freebsd-xhtml-common.xsl | 10 +++++++
tr_TR.ISO8859-9/share/xsl/freebsd-xhtml.xsl | 6 +++++
zh_CN.GB2312/share/xsl/freebsd-common.xsl | 10 +++++++
zh_CN.GB2312/share/xsl/freebsd-epub.xsl | 3 +++
zh_CN.GB2312/share/xsl/freebsd-fo.xsl | 3 +++
.../share/xsl/freebsd-xhtml-chunk.xsl | 6 +++++
.../share/xsl/freebsd-xhtml-common.xsl | 20 ++++++++++++++
zh_CN.GB2312/share/xsl/freebsd-xhtml.xsl | 6 +++++
zh_TW.Big5/share/xsl/freebsd-common.xsl | 10 +++++++
zh_TW.Big5/share/xsl/freebsd-epub.xsl | 3 +++
zh_TW.Big5/share/xsl/freebsd-fo.xsl | 3 +++
zh_TW.Big5/share/xsl/freebsd-xhtml-chunk.xsl | 6 +++++
zh_TW.Big5/share/xsl/freebsd-xhtml-common.xsl | 20 ++++++++++++++
zh_TW.Big5/share/xsl/freebsd-xhtml.xsl | 6 +++++
114 files changed, 857 insertions(+)
create mode 100644 bn_BD.ISO10646-1/share/xsl/freebsd-common.xsl
create mode 100644 bn_BD.ISO10646-1/share/xsl/freebsd-xhtml-common.xsl
create mode 100644 da_DK.ISO8859-1/share/xsl/freebsd-common.xsl
create mode 100644 da_DK.ISO8859-1/share/xsl/freebsd-xhtml-common.xsl
create mode 100644 de_DE.ISO8859-1/share/xsl/freebsd-common.xsl
create mode 100644 de_DE.ISO8859-1/share/xsl/freebsd-xhtml-common.xsl
create mode 100644 el_GR.ISO8859-7/share/xsl/freebsd-common.xsl
create mode 100644 el_GR.ISO8859-7/share/xsl/freebsd-xhtml-common.xsl
create mode 100644 en_US.ISO8859-1/share/xsl/freebsd-common.xsl
create mode 100644 en_US.ISO8859-1/share/xsl/freebsd-xhtml-common.xsl
create mode 100644 es_ES.ISO8859-1/share/xsl/freebsd-common.xsl
create mode 100644 es_ES.ISO8859-1/share/xsl/freebsd-xhtml-common.xsl
create mode 100644 fr_FR.ISO8859-1/share/xsl/freebsd-common.xsl
create mode 100644 fr_FR.ISO8859-1/share/xsl/freebsd-xhtml-common.xsl
create mode 100644 hu_HU.ISO8859-2/share/xsl/freebsd-common.xsl
create mode 100644 hu_HU.ISO8859-2/share/xsl/freebsd-xhtml-common.xsl
create mode 100644 it_IT.ISO8859-15/share/xsl/freebsd-common.xsl
create mode 100644 it_IT.ISO8859-15/share/xsl/freebsd-xhtml-common.xsl
create mode 100644 ja_JP.eucJP/share/xsl/freebsd-common.xsl
create mode 100644 ja_JP.eucJP/share/xsl/freebsd-xhtml-common.xsl
create mode 100644 mn_MN.UTF-8/share/xsl/freebsd-common.xsl
create mode 100644 mn_MN.UTF-8/share/xsl/freebsd-xhtml-common.xsl
create mode 100644 nl_NL.ISO8859-1/share/xsl/freebsd-common.xsl
create mode 100644 nl_NL.ISO8859-1/share/xsl/freebsd-xhtml-common.xsl
create mode 100644 pl_PL.ISO8859-2/share/xsl/freebsd-common.xsl
create mode 100644 pl_PL.ISO8859-2/share/xsl/freebsd-xhtml-common.xsl
create mode 100644 pt_BR.ISO8859-1/share/xsl/freebsd-common.xsl
create mode 100644 pt_BR.ISO8859-1/share/xsl/freebsd-xhtml-common.xsl
create mode 100644 ru_RU.KOI8-R/share/xsl/freebsd-common.xsl
create mode 100644 ru_RU.KOI8-R/share/xsl/freebsd-xhtml-common.xsl
create mode 100644 sr_YU.ISO8859-2/share/xsl/freebsd-common.xsl
create mode 100644 sr_YU.ISO8859-2/share/xsl/freebsd-xhtml-common.xsl
create mode 100644 tr_TR.ISO8859-9/share/xsl/freebsd-common.xsl
create mode 100644 tr_TR.ISO8859-9/share/xsl/freebsd-xhtml-common.xsl
create mode 100644 zh_CN.GB2312/share/xsl/freebsd-common.xsl
create mode 100644 zh_CN.GB2312/share/xsl/freebsd-xhtml-common.xsl
create mode 100644 zh_TW.Big5/share/xsl/freebsd-common.xsl
create mode 100644 zh_TW.Big5/share/xsl/freebsd-xhtml-common.xsl
diff --git a/bn_BD.ISO10646-1/share/xsl/freebsd-common.xsl b/bn_BD.ISO10646-1/share/xsl/freebsd-common.xsl
new file mode 100644
index 0000000000..25f2b6a3a9
--- /dev/null
+++ b/bn_BD.ISO10646-1/share/xsl/freebsd-common.xsl
@@ -0,0 +1,10 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version='1.0'
+ xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ exclude-result-prefixes="#default">
+
+</xsl:stylesheet>
diff --git a/bn_BD.ISO10646-1/share/xsl/freebsd-epub.xsl b/bn_BD.ISO10646-1/share/xsl/freebsd-epub.xsl
index 88e727a761..7309b5fc24 100644
--- a/bn_BD.ISO10646-1/share/xsl/freebsd-epub.xsl
+++ b/bn_BD.ISO10646-1/share/xsl/freebsd-epub.xsl
@@ -9,4 +9,7 @@
<!-- Pull in the language-independent stylesheet -->
<xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-epub.xsl"/>
+
+ <!-- Language-specific general customizations -->
+ <xsl:import href="freebsd-common.xsl"/>
</xsl:stylesheet>
diff --git a/bn_BD.ISO10646-1/share/xsl/freebsd-fo.xsl b/bn_BD.ISO10646-1/share/xsl/freebsd-fo.xsl
index c29de88df8..cbc743b04b 100644
--- a/bn_BD.ISO10646-1/share/xsl/freebsd-fo.xsl
+++ b/bn_BD.ISO10646-1/share/xsl/freebsd-fo.xsl
@@ -9,4 +9,7 @@
<!-- Pull in the language-independent stylesheet -->
<xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-fo.xsl"/>
+
+ <!-- Language-specific general customizations -->
+ <xsl:import href="freebsd-common.xsl"/>
</xsl:stylesheet>
diff --git a/bn_BD.ISO10646-1/share/xsl/freebsd-xhtml-chunk.xsl b/bn_BD.ISO10646-1/share/xsl/freebsd-xhtml-chunk.xsl
index 9f5872f807..3dfe2db188 100644
--- a/bn_BD.ISO10646-1/share/xsl/freebsd-xhtml-chunk.xsl
+++ b/bn_BD.ISO10646-1/share/xsl/freebsd-xhtml-chunk.xsl
@@ -9,4 +9,10 @@
<!-- Pull in the language-independent stylesheet -->
<xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-xhtml-chunk.xsl"/>
+
+ <!-- Language-specific general customizations -->
+ <xsl:import href="freebsd-common.xsl"/>
+
+ <!-- Language-specific common XHTML customizations -->
+ <xsl:import href="freebsd-xhtml-common.xsl"/>
</xsl:stylesheet>
diff --git a/bn_BD.ISO10646-1/share/xsl/freebsd-xhtml-common.xsl b/bn_BD.ISO10646-1/share/xsl/freebsd-xhtml-common.xsl
new file mode 100644
index 0000000000..25f2b6a3a9
--- /dev/null
+++ b/bn_BD.ISO10646-1/share/xsl/freebsd-xhtml-common.xsl
@@ -0,0 +1,10 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version='1.0'
+ xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ exclude-result-prefixes="#default">
+
+</xsl:stylesheet>
diff --git a/bn_BD.ISO10646-1/share/xsl/freebsd-xhtml.xsl b/bn_BD.ISO10646-1/share/xsl/freebsd-xhtml.xsl
index 92267b2357..3e3d7cb6b2 100644
--- a/bn_BD.ISO10646-1/share/xsl/freebsd-xhtml.xsl
+++ b/bn_BD.ISO10646-1/share/xsl/freebsd-xhtml.xsl
@@ -9,4 +9,10 @@
<!-- Pull in the language-independent stylesheet -->
<xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-xhtml.xsl"/>
+
+ <!-- Language-specific general customizations -->
+ <xsl:import href="freebsd-common.xsl"/>
+
+ <!-- Language-specific common XHTML customizations -->
+ <xsl:import href="freebsd-xhtml-common.xsl"/>
</xsl:stylesheet>
diff --git a/da_DK.ISO8859-1/share/xsl/freebsd-common.xsl b/da_DK.ISO8859-1/share/xsl/freebsd-common.xsl
new file mode 100644
index 0000000000..25f2b6a3a9
--- /dev/null
+++ b/da_DK.ISO8859-1/share/xsl/freebsd-common.xsl
@@ -0,0 +1,10 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version='1.0'
+ xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ exclude-result-prefixes="#default">
+
+</xsl:stylesheet>
diff --git a/da_DK.ISO8859-1/share/xsl/freebsd-epub.xsl b/da_DK.ISO8859-1/share/xsl/freebsd-epub.xsl
index 88e727a761..7309b5fc24 100644
--- a/da_DK.ISO8859-1/share/xsl/freebsd-epub.xsl
+++ b/da_DK.ISO8859-1/share/xsl/freebsd-epub.xsl
@@ -9,4 +9,7 @@
<!-- Pull in the language-independent stylesheet -->
<xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-epub.xsl"/>
+
+ <!-- Language-specific general customizations -->
+ <xsl:import href="freebsd-common.xsl"/>
</xsl:stylesheet>
diff --git a/da_DK.ISO8859-1/share/xsl/freebsd-fo.xsl b/da_DK.ISO8859-1/share/xsl/freebsd-fo.xsl
index c29de88df8..cbc743b04b 100644
--- a/da_DK.ISO8859-1/share/xsl/freebsd-fo.xsl
+++ b/da_DK.ISO8859-1/share/xsl/freebsd-fo.xsl
@@ -9,4 +9,7 @@
<!-- Pull in the language-independent stylesheet -->
<xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-fo.xsl"/>
+
+ <!-- Language-specific general customizations -->
+ <xsl:import href="freebsd-common.xsl"/>
</xsl:stylesheet>
diff --git a/da_DK.ISO8859-1/share/xsl/freebsd-xhtml-chunk.xsl b/da_DK.ISO8859-1/share/xsl/freebsd-xhtml-chunk.xsl
index 9f5872f807..3dfe2db188 100644
--- a/da_DK.ISO8859-1/share/xsl/freebsd-xhtml-chunk.xsl
+++ b/da_DK.ISO8859-1/share/xsl/freebsd-xhtml-chunk.xsl
@@ -9,4 +9,10 @@
<!-- Pull in the language-independent stylesheet -->
<xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-xhtml-chunk.xsl"/>
+
+ <!-- Language-specific general customizations -->
+ <xsl:import href="freebsd-common.xsl"/>
+
+ <!-- Language-specific common XHTML customizations -->
+ <xsl:import href="freebsd-xhtml-common.xsl"/>
</xsl:stylesheet>
diff --git a/da_DK.ISO8859-1/share/xsl/freebsd-xhtml-common.xsl b/da_DK.ISO8859-1/share/xsl/freebsd-xhtml-common.xsl
new file mode 100644
index 0000000000..4327a4c5de
--- /dev/null
+++ b/da_DK.ISO8859-1/share/xsl/freebsd-xhtml-common.xsl
@@ -0,0 +1,20 @@
+<?xml version='1.0' encoding='iso-8859-1'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version='1.0'
+ xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ exclude-result-prefixes="#default">
+
+ <xsl:template name="user.footer.content">
+ <p align="center"><small>Dette og andre dokumenter kan downloades fra
+ <a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/">ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/</a></small></p>
+
+ <p align="center"><small>For sp�rgsm�l om FreeBSD, l�s
+ <a href="http://www.FreeBSD.org/docs.html">documentationen</a> f�r du kontakter
+ <<a href="mailto:questions@FreeBSD.org">questions@FreeBSD.org</a>>.<br/>
+ For sp�rgsm�l ang�ende denne dokumentation, e-mail
+ <<a href="mailto:doc@FreeBSD.org">doc@FreeBSD.org</a>>.</small></p>
+ </xsl:template>
+</xsl:stylesheet>
diff --git a/da_DK.ISO8859-1/share/xsl/freebsd-xhtml.xsl b/da_DK.ISO8859-1/share/xsl/freebsd-xhtml.xsl
index 92267b2357..3e3d7cb6b2 100644
--- a/da_DK.ISO8859-1/share/xsl/freebsd-xhtml.xsl
+++ b/da_DK.ISO8859-1/share/xsl/freebsd-xhtml.xsl
@@ -9,4 +9,10 @@
<!-- Pull in the language-independent stylesheet -->
<xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-xhtml.xsl"/>
+
+ <!-- Language-specific general customizations -->
+ <xsl:import href="freebsd-common.xsl"/>
+
+ <!-- Language-specific common XHTML customizations -->
+ <xsl:import href="freebsd-xhtml-common.xsl"/>
</xsl:stylesheet>
diff --git a/de_DE.ISO8859-1/share/xsl/freebsd-common.xsl b/de_DE.ISO8859-1/share/xsl/freebsd-common.xsl
new file mode 100644
index 0000000000..25f2b6a3a9
--- /dev/null
+++ b/de_DE.ISO8859-1/share/xsl/freebsd-common.xsl
@@ -0,0 +1,10 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version='1.0'
+ xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ exclude-result-prefixes="#default">
+
+</xsl:stylesheet>
diff --git a/de_DE.ISO8859-1/share/xsl/freebsd-epub.xsl b/de_DE.ISO8859-1/share/xsl/freebsd-epub.xsl
index 88e727a761..7309b5fc24 100644
--- a/de_DE.ISO8859-1/share/xsl/freebsd-epub.xsl
+++ b/de_DE.ISO8859-1/share/xsl/freebsd-epub.xsl
@@ -9,4 +9,7 @@
<!-- Pull in the language-independent stylesheet -->
<xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-epub.xsl"/>
+
+ <!-- Language-specific general customizations -->
+ <xsl:import href="freebsd-common.xsl"/>
</xsl:stylesheet>
diff --git a/de_DE.ISO8859-1/share/xsl/freebsd-fo.xsl b/de_DE.ISO8859-1/share/xsl/freebsd-fo.xsl
index c29de88df8..cbc743b04b 100644
--- a/de_DE.ISO8859-1/share/xsl/freebsd-fo.xsl
+++ b/de_DE.ISO8859-1/share/xsl/freebsd-fo.xsl
@@ -9,4 +9,7 @@
<!-- Pull in the language-independent stylesheet -->
<xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-fo.xsl"/>
+
+ <!-- Language-specific general customizations -->
+ <xsl:import href="freebsd-common.xsl"/>
</xsl:stylesheet>
diff --git a/de_DE.ISO8859-1/share/xsl/freebsd-xhtml-chunk.xsl b/de_DE.ISO8859-1/share/xsl/freebsd-xhtml-chunk.xsl
index 9f5872f807..3dfe2db188 100644
--- a/de_DE.ISO8859-1/share/xsl/freebsd-xhtml-chunk.xsl
+++ b/de_DE.ISO8859-1/share/xsl/freebsd-xhtml-chunk.xsl
@@ -9,4 +9,10 @@
<!-- Pull in the language-independent stylesheet -->
<xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-xhtml-chunk.xsl"/>
+
+ <!-- Language-specific general customizations -->
+ <xsl:import href="freebsd-common.xsl"/>
+
+ <!-- Language-specific common XHTML customizations -->
+ <xsl:import href="freebsd-xhtml-common.xsl"/>
</xsl:stylesheet>
diff --git a/de_DE.ISO8859-1/share/xsl/freebsd-xhtml-common.xsl b/de_DE.ISO8859-1/share/xsl/freebsd-xhtml-common.xsl
new file mode 100644
index 0000000000..6d863623c0
--- /dev/null
+++ b/de_DE.ISO8859-1/share/xsl/freebsd-xhtml-common.xsl
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='iso-8859-1'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version='1.0'
+ xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ exclude-result-prefixes="#default">
+
+ <xsl:template name="user.footer.content">
+ <p align="center"><small>Wenn Sie Fragen zu FreeBSD haben, schicken Sie eine E-Mail an
+ <<a href="mailto:de-bsd-questions@de.FreeBSD.org">de-bsd-questions@de.FreeBSD.org</a>>.<br/>
+ Wenn Sie Fragen zu dieser Dokumentation haben, schicken Sie eine E-Mail an
+ <<a href="mailto:de-bsd-translators@de.FreeBSD.org">de-bsd-translators@de.FreeBSD.org</a>>.</small></p>
+ </xsl:template>
+</xsl:stylesheet>
diff --git a/de_DE.ISO8859-1/share/xsl/freebsd-xhtml.xsl b/de_DE.ISO8859-1/share/xsl/freebsd-xhtml.xsl
index 92267b2357..3e3d7cb6b2 100644
--- a/de_DE.ISO8859-1/share/xsl/freebsd-xhtml.xsl
+++ b/de_DE.ISO8859-1/share/xsl/freebsd-xhtml.xsl
@@ -9,4 +9,10 @@
<!-- Pull in the language-independent stylesheet -->
<xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-xhtml.xsl"/>
+
+ <!-- Language-specific general customizations -->
+ <xsl:import href="freebsd-common.xsl"/>
+
+ <!-- Language-specific common XHTML customizations -->
+ <xsl:import href="freebsd-xhtml-common.xsl"/>
</xsl:stylesheet>
diff --git a/el_GR.ISO8859-7/share/xsl/freebsd-common.xsl b/el_GR.ISO8859-7/share/xsl/freebsd-common.xsl
new file mode 100644
index 0000000000..25f2b6a3a9
--- /dev/null
+++ b/el_GR.ISO8859-7/share/xsl/freebsd-common.xsl
@@ -0,0 +1,10 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version='1.0'
+ xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ exclude-result-prefixes="#default">
+
+</xsl:stylesheet>
diff --git a/el_GR.ISO8859-7/share/xsl/freebsd-epub.xsl b/el_GR.ISO8859-7/share/xsl/freebsd-epub.xsl
index 88e727a761..7309b5fc24 100644
--- a/el_GR.ISO8859-7/share/xsl/freebsd-epub.xsl
+++ b/el_GR.ISO8859-7/share/xsl/freebsd-epub.xsl
@@ -9,4 +9,7 @@
<!-- Pull in the language-independent stylesheet -->
<xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-epub.xsl"/>
+
+ <!-- Language-specific general customizations -->
+ <xsl:import href="freebsd-common.xsl"/>
</xsl:stylesheet>
diff --git a/el_GR.ISO8859-7/share/xsl/freebsd-fo.xsl b/el_GR.ISO8859-7/share/xsl/freebsd-fo.xsl
index c29de88df8..cbc743b04b 100644
--- a/el_GR.ISO8859-7/share/xsl/freebsd-fo.xsl
+++ b/el_GR.ISO8859-7/share/xsl/freebsd-fo.xsl
@@ -9,4 +9,7 @@
<!-- Pull in the language-independent stylesheet -->
<xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-fo.xsl"/>
+
+ <!-- Language-specific general customizations -->
+ <xsl:import href="freebsd-common.xsl"/>
</xsl:stylesheet>
diff --git a/el_GR.ISO8859-7/share/xsl/freebsd-xhtml-chunk.xsl b/el_GR.ISO8859-7/share/xsl/freebsd-xhtml-chunk.xsl
index 9f5872f807..3dfe2db188 100644
--- a/el_GR.ISO8859-7/share/xsl/freebsd-xhtml-chunk.xsl
+++ b/el_GR.ISO8859-7/share/xsl/freebsd-xhtml-chunk.xsl
@@ -9,4 +9,10 @@
<!-- Pull in the language-independent stylesheet -->
<xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-xhtml-chunk.xsl"/>
+
+ <!-- Language-specific general customizations -->
+ <xsl:import href="freebsd-common.xsl"/>
+
+ <!-- Language-specific common XHTML customizations -->
+ <xsl:import href="freebsd-xhtml-common.xsl"/>
</xsl:stylesheet>
diff --git a/el_GR.ISO8859-7/share/xsl/freebsd-xhtml-common.xsl b/el_GR.ISO8859-7/share/xsl/freebsd-xhtml-common.xsl
new file mode 100644
index 0000000000..7ea8a81483
--- /dev/null
+++ b/el_GR.ISO8859-7/share/xsl/freebsd-xhtml-common.xsl
@@ -0,0 +1,20 @@
+<?xml version='1.0' encoding='iso-8859-7'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version='1.0'
+ xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ exclude-result-prefixes="#default">
+
+ <xsl:template name="user.footer.content">
+ <p align="center"><small>���� �� �������, ��� ���� �������, ������ �� ������ ���
+ <a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/">ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/</a></small></p>
+
+ <p align="center"><small>��� ��������� ������� �� �� FreeBSD, �������� ���
+ <a href="http://www.FreeBSD.org/docs.html">����������</a> ���� �� �������������� �� ���
+ <<a href="mailto:questions@FreeBSD.org">questions@FreeBSD.org</a>>.<br/>
+ ��� ��������� ������� �� ���� ��� ����������, ������� e-mail ����
+ <<a href="mailto:doc@FreeBSD.org">doc@FreeBSD.org</a>>.</small></p>
+ </xsl:template>
+</xsl:stylesheet>
diff --git a/el_GR.ISO8859-7/share/xsl/freebsd-xhtml.xsl b/el_GR.ISO8859-7/share/xsl/freebsd-xhtml.xsl
index 92267b2357..3e3d7cb6b2 100644
--- a/el_GR.ISO8859-7/share/xsl/freebsd-xhtml.xsl
+++ b/el_GR.ISO8859-7/share/xsl/freebsd-xhtml.xsl
@@ -9,4 +9,10 @@
<!-- Pull in the language-independent stylesheet -->
<xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-xhtml.xsl"/>
+
+ <!-- Language-specific general customizations -->
+ <xsl:import href="freebsd-common.xsl"/>
+
+ <!-- Language-specific common XHTML customizations -->
+ <xsl:import href="freebsd-xhtml-common.xsl"/>
</xsl:stylesheet>
diff --git a/en_US.ISO8859-1/share/xsl/freebsd-common.xsl b/en_US.ISO8859-1/share/xsl/freebsd-common.xsl
new file mode 100644
index 0000000000..25f2b6a3a9
--- /dev/null
+++ b/en_US.ISO8859-1/share/xsl/freebsd-common.xsl
@@ -0,0 +1,10 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version='1.0'
+ xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ exclude-result-prefixes="#default">
+
+</xsl:stylesheet>
diff --git a/en_US.ISO8859-1/share/xsl/freebsd-epub.xsl b/en_US.ISO8859-1/share/xsl/freebsd-epub.xsl
index 88e727a761..7309b5fc24 100644
--- a/en_US.ISO8859-1/share/xsl/freebsd-epub.xsl
+++ b/en_US.ISO8859-1/share/xsl/freebsd-epub.xsl
@@ -9,4 +9,7 @@
<!-- Pull in the language-independent stylesheet -->
<xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-epub.xsl"/>
+
+ <!-- Language-specific general customizations -->
+ <xsl:import href="freebsd-common.xsl"/>
</xsl:stylesheet>
diff --git a/en_US.ISO8859-1/share/xsl/freebsd-fo.xsl b/en_US.ISO8859-1/share/xsl/freebsd-fo.xsl
index c29de88df8..cbc743b04b 100644
--- a/en_US.ISO8859-1/share/xsl/freebsd-fo.xsl
+++ b/en_US.ISO8859-1/share/xsl/freebsd-fo.xsl
@@ -9,4 +9,7 @@
<!-- Pull in the language-independent stylesheet -->
<xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-fo.xsl"/>
+
+ <!-- Language-specific general customizations -->
+ <xsl:import href="freebsd-common.xsl"/>
</xsl:stylesheet>
diff --git a/en_US.ISO8859-1/share/xsl/freebsd-xhtml-chunk.xsl b/en_US.ISO8859-1/share/xsl/freebsd-xhtml-chunk.xsl
index 9f5872f807..3dfe2db188 100644
--- a/en_US.ISO8859-1/share/xsl/freebsd-xhtml-chunk.xsl
+++ b/en_US.ISO8859-1/share/xsl/freebsd-xhtml-chunk.xsl
@@ -9,4 +9,10 @@
<!-- Pull in the language-independent stylesheet -->
<xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-xhtml-chunk.xsl"/>
+
+ <!-- Language-specific general customizations -->
+ <xsl:import href="freebsd-common.xsl"/>
+
+ <!-- Language-specific common XHTML customizations -->
+ <xsl:import href="freebsd-xhtml-common.xsl"/>
</xsl:stylesheet>
diff --git a/en_US.ISO8859-1/share/xsl/freebsd-xhtml-common.xsl b/en_US.ISO8859-1/share/xsl/freebsd-xhtml-common.xsl
new file mode 100644
index 0000000000..2e5af6f86d
--- /dev/null
+++ b/en_US.ISO8859-1/share/xsl/freebsd-xhtml-common.xsl
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding="iso-8859-1"?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version='1.0'
+ xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ exclude-result-prefixes="#default">
+
+</xsl:stylesheet>
diff --git a/en_US.ISO8859-1/share/xsl/freebsd-xhtml.xsl b/en_US.ISO8859-1/share/xsl/freebsd-xhtml.xsl
index 92267b2357..3e3d7cb6b2 100644
--- a/en_US.ISO8859-1/share/xsl/freebsd-xhtml.xsl
+++ b/en_US.ISO8859-1/share/xsl/freebsd-xhtml.xsl
@@ -9,4 +9,10 @@
<!-- Pull in the language-independent stylesheet -->
<xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-xhtml.xsl"/>
+
+ <!-- Language-specific general customizations -->
+ <xsl:import href="freebsd-common.xsl"/>
+
+ <!-- Language-specific common XHTML customizations -->
+ <xsl:import href="freebsd-xhtml-common.xsl"/>
</xsl:stylesheet>
diff --git a/es_ES.ISO8859-1/share/xsl/freebsd-common.xsl b/es_ES.ISO8859-1/share/xsl/freebsd-common.xsl
new file mode 100644
index 0000000000..25f2b6a3a9
--- /dev/null
+++ b/es_ES.ISO8859-1/share/xsl/freebsd-common.xsl
@@ -0,0 +1,10 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version='1.0'
+ xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ exclude-result-prefixes="#default">
+
+</xsl:stylesheet>
diff --git a/es_ES.ISO8859-1/share/xsl/freebsd-epub.xsl b/es_ES.ISO8859-1/share/xsl/freebsd-epub.xsl
index 88e727a761..7309b5fc24 100644
--- a/es_ES.ISO8859-1/share/xsl/freebsd-epub.xsl
+++ b/es_ES.ISO8859-1/share/xsl/freebsd-epub.xsl
@@ -9,4 +9,7 @@
<!-- Pull in the language-independent stylesheet -->
<xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-epub.xsl"/>
+
+ <!-- Language-specific general customizations -->
+ <xsl:import href="freebsd-common.xsl"/>
</xsl:stylesheet>
diff --git a/es_ES.ISO8859-1/share/xsl/freebsd-fo.xsl b/es_ES.ISO8859-1/share/xsl/freebsd-fo.xsl
index c29de88df8..cbc743b04b 100644
--- a/es_ES.ISO8859-1/share/xsl/freebsd-fo.xsl
+++ b/es_ES.ISO8859-1/share/xsl/freebsd-fo.xsl
@@ -9,4 +9,7 @@
<!-- Pull in the language-independent stylesheet -->
<xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-fo.xsl"/>
+
+ <!-- Language-specific general customizations -->
+ <xsl:import href="freebsd-common.xsl"/>
</xsl:stylesheet>
diff --git a/es_ES.ISO8859-1/share/xsl/freebsd-xhtml-chunk.xsl b/es_ES.ISO8859-1/share/xsl/freebsd-xhtml-chunk.xsl
index 9f5872f807..3dfe2db188 100644
--- a/es_ES.ISO8859-1/share/xsl/freebsd-xhtml-chunk.xsl
+++ b/es_ES.ISO8859-1/share/xsl/freebsd-xhtml-chunk.xsl
@@ -9,4 +9,10 @@
<!-- Pull in the language-independent stylesheet -->
<xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-xhtml-chunk.xsl"/>
+
+ <!-- Language-specific general customizations -->
+ <xsl:import href="freebsd-common.xsl"/>
+
+ <!-- Language-specific common XHTML customizations -->
+ <xsl:import href="freebsd-xhtml-common.xsl"/>
</xsl:stylesheet>
diff --git a/es_ES.ISO8859-1/share/xsl/freebsd-xhtml-common.xsl b/es_ES.ISO8859-1/share/xsl/freebsd-xhtml-common.xsl
new file mode 100644
index 0000000000..05b96db37c
--- /dev/null
+++ b/es_ES.ISO8859-1/share/xsl/freebsd-xhtml-common.xsl
@@ -0,0 +1,20 @@
+<?xml version='1.0' encoding='iso-8859-1'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version='1.0'
+ xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ exclude-result-prefixes="#default">
+
+ <xsl:template name="user.footer.content">
+ <p align="center"><small>Puede descargar �ste y muchos otros documentos desde
+ <a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/">ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/</a></small></p>
+
+ <p align="center"><small>Si tiene dudas sobre FreeBSD consulte la
+ <a href="http://www.FreeBSD.org/docs.html">documentaci�n</a> antes de escribir a la lista
+ <<a href="mailto:questions@FreeBSD.org">questions@FreeBSD.org</a>>.<br/>
+ Env�e sus preguntas sobre la documentaci�n a
+ <<a href="mailto:doc@FreeBSD.org">doc@FreeBSD.org</a>>.</small></p>
+ </xsl:template>
+</xsl:stylesheet>
diff --git a/es_ES.ISO8859-1/share/xsl/freebsd-xhtml.xsl b/es_ES.ISO8859-1/share/xsl/freebsd-xhtml.xsl
index 92267b2357..3e3d7cb6b2 100644
--- a/es_ES.ISO8859-1/share/xsl/freebsd-xhtml.xsl
+++ b/es_ES.ISO8859-1/share/xsl/freebsd-xhtml.xsl
@@ -9,4 +9,10 @@
<!-- Pull in the language-independent stylesheet -->
<xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-xhtml.xsl"/>
+
+ <!-- Language-specific general customizations -->
+ <xsl:import href="freebsd-common.xsl"/>
+
+ <!-- Language-specific common XHTML customizations -->
+ <xsl:import href="freebsd-xhtml-common.xsl"/>
</xsl:stylesheet>
diff --git a/fr_FR.ISO8859-1/share/xsl/freebsd-common.xsl b/fr_FR.ISO8859-1/share/xsl/freebsd-common.xsl
new file mode 100644
index 0000000000..25f2b6a3a9
--- /dev/null
+++ b/fr_FR.ISO8859-1/share/xsl/freebsd-common.xsl
@@ -0,0 +1,10 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version='1.0'
+ xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ exclude-result-prefixes="#default">
+
+</xsl:stylesheet>
diff --git a/fr_FR.ISO8859-1/share/xsl/freebsd-epub.xsl b/fr_FR.ISO8859-1/share/xsl/freebsd-epub.xsl
index 88e727a761..7309b5fc24 100644
--- a/fr_FR.ISO8859-1/share/xsl/freebsd-epub.xsl
+++ b/fr_FR.ISO8859-1/share/xsl/freebsd-epub.xsl
@@ -9,4 +9,7 @@
<!-- Pull in the language-independent stylesheet -->
<xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-epub.xsl"/>
+
+ <!-- Language-specific general customizations -->
+ <xsl:import href="freebsd-common.xsl"/>
</xsl:stylesheet>
diff --git a/fr_FR.ISO8859-1/share/xsl/freebsd-fo.xsl b/fr_FR.ISO8859-1/share/xsl/freebsd-fo.xsl
index c29de88df8..cbc743b04b 100644
--- a/fr_FR.ISO8859-1/share/xsl/freebsd-fo.xsl
+++ b/fr_FR.ISO8859-1/share/xsl/freebsd-fo.xsl
@@ -9,4 +9,7 @@
<!-- Pull in the language-independent stylesheet -->
<xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-fo.xsl"/>
+
+ <!-- Language-specific general customizations -->
+ <xsl:import href="freebsd-common.xsl"/>
</xsl:stylesheet>
diff --git a/fr_FR.ISO8859-1/share/xsl/freebsd-xhtml-chunk.xsl b/fr_FR.ISO8859-1/share/xsl/freebsd-xhtml-chunk.xsl
index 9f5872f807..3dfe2db188 100644
--- a/fr_FR.ISO8859-1/share/xsl/freebsd-xhtml-chunk.xsl
+++ b/fr_FR.ISO8859-1/share/xsl/freebsd-xhtml-chunk.xsl
@@ -9,4 +9,10 @@
<!-- Pull in the language-independent stylesheet -->
<xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-xhtml-chunk.xsl"/>
+
+ <!-- Language-specific general customizations -->
+ <xsl:import href="freebsd-common.xsl"/>
+
+ <!-- Language-specific common XHTML customizations -->
+ <xsl:import href="freebsd-xhtml-common.xsl"/>
</xsl:stylesheet>
diff --git a/fr_FR.ISO8859-1/share/xsl/freebsd-xhtml-common.xsl b/fr_FR.ISO8859-1/share/xsl/freebsd-xhtml-common.xsl
new file mode 100644
index 0000000000..c183a4b192
--- /dev/null
+++ b/fr_FR.ISO8859-1/share/xsl/freebsd-xhtml-common.xsl
@@ -0,0 +1,20 @@
+<?xml version='1.0' encoding='iso-8859-1'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version='1.0'
+ xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ exclude-result-prefixes="#default">
+
+ <xsl:template name="user.footer.content">
+ <p align="center"><small>Ce document, ainsi que d'autres peut �tre t�l�charg� sur
+ <a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/">ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/</a></small></p>
+
+ <p align="center"><small>Pour toutes questions � propos de FreeBSD, lisez la
+ <a href="http://www.FreeBSD.org/docs.html">documentation</a> avant de contacter
+ <<a href="mailto:questions@FreeBSD.org">questions@FreeBSD.org</a>>.<br/>
+ Pour les questions sur cette documentation, contactez
+ <<a href="mailto:doc@FreeBSD.org">doc@FreeBSD.org</a>>.</small></p>
+ </xsl:template>
+</xsl:stylesheet>
diff --git a/fr_FR.ISO8859-1/share/xsl/freebsd-xhtml.xsl b/fr_FR.ISO8859-1/share/xsl/freebsd-xhtml.xsl
index 92267b2357..3e3d7cb6b2 100644
--- a/fr_FR.ISO8859-1/share/xsl/freebsd-xhtml.xsl
+++ b/fr_FR.ISO8859-1/share/xsl/freebsd-xhtml.xsl
@@ -9,4 +9,10 @@
<!-- Pull in the language-independent stylesheet -->
<xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-xhtml.xsl"/>
+
+ <!-- Language-specific general customizations -->
+ <xsl:import href="freebsd-common.xsl"/>
+
+ <!-- Language-specific common XHTML customizations -->
+ <xsl:import href="freebsd-xhtml-common.xsl"/>
</xsl:stylesheet>
diff --git a/hu_HU.ISO8859-2/share/xsl/freebsd-common.xsl b/hu_HU.ISO8859-2/share/xsl/freebsd-common.xsl
new file mode 100644
index 0000000000..25f2b6a3a9
--- /dev/null
+++ b/hu_HU.ISO8859-2/share/xsl/freebsd-common.xsl
@@ -0,0 +1,10 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version='1.0'
+ xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ exclude-result-prefixes="#default">
+
+</xsl:stylesheet>
diff --git a/hu_HU.ISO8859-2/share/xsl/freebsd-epub.xsl b/hu_HU.ISO8859-2/share/xsl/freebsd-epub.xsl
index 88e727a761..7309b5fc24 100644
--- a/hu_HU.ISO8859-2/share/xsl/freebsd-epub.xsl
+++ b/hu_HU.ISO8859-2/share/xsl/freebsd-epub.xsl
@@ -9,4 +9,7 @@
<!-- Pull in the language-independent stylesheet -->
<xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-epub.xsl"/>
+
+ <!-- Language-specific general customizations -->
+ <xsl:import href="freebsd-common.xsl"/>
</xsl:stylesheet>
diff --git a/hu_HU.ISO8859-2/share/xsl/freebsd-fo.xsl b/hu_HU.ISO8859-2/share/xsl/freebsd-fo.xsl
index c29de88df8..cbc743b04b 100644
--- a/hu_HU.ISO8859-2/share/xsl/freebsd-fo.xsl
+++ b/hu_HU.ISO8859-2/share/xsl/freebsd-fo.xsl
@@ -9,4 +9,7 @@
<!-- Pull in the language-independent stylesheet -->
<xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-fo.xsl"/>
+
+ <!-- Language-specific general customizations -->
+ <xsl:import href="freebsd-common.xsl"/>
</xsl:stylesheet>
diff --git a/hu_HU.ISO8859-2/share/xsl/freebsd-xhtml-chunk.xsl b/hu_HU.ISO8859-2/share/xsl/freebsd-xhtml-chunk.xsl
index 9f5872f807..3dfe2db188 100644
--- a/hu_HU.ISO8859-2/share/xsl/freebsd-xhtml-chunk.xsl
+++ b/hu_HU.ISO8859-2/share/xsl/freebsd-xhtml-chunk.xsl
@@ -9,4 +9,10 @@
<!-- Pull in the language-independent stylesheet -->
<xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-xhtml-chunk.xsl"/>
+
+ <!-- Language-specific general customizations -->
+ <xsl:import href="freebsd-common.xsl"/>
+
+ <!-- Language-specific common XHTML customizations -->
+ <xsl:import href="freebsd-xhtml-common.xsl"/>
</xsl:stylesheet>
diff --git a/hu_HU.ISO8859-2/share/xsl/freebsd-xhtml-common.xsl b/hu_HU.ISO8859-2/share/xsl/freebsd-xhtml-common.xsl
new file mode 100644
index 0000000000..262641982e
--- /dev/null
+++ b/hu_HU.ISO8859-2/share/xsl/freebsd-xhtml-common.xsl
@@ -0,0 +1,17 @@
+<?xml version='1.0' encoding='iso-8859-2'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version='1.0'
+ xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ exclude-result-prefixes="#default">
+
+ <xsl:template name="user.footer.content">
+ <p align="center"><small>Ha k�rd�se van a FreeBSD-vel kapcsolatban, a
+ k�vetkez� c�mre �rhat (angolul):
+ <<a href="mailto:questions@FreeBSD.org">questions@FreeBSD.org</a>>.<br/>
+ Ha ezzel a dokumentummal kapcsolatban van k�rd�se, k�rj�k erre a c�mre �rjon:
+ <<a href="mailto:gabor@FreeBSD.org">gabor@FreeBSD.org</a>>.</small></p>
+ </xsl:template>
+</xsl:stylesheet>
diff --git a/hu_HU.ISO8859-2/share/xsl/freebsd-xhtml.xsl b/hu_HU.ISO8859-2/share/xsl/freebsd-xhtml.xsl
index 92267b2357..3e3d7cb6b2 100644
--- a/hu_HU.ISO8859-2/share/xsl/freebsd-xhtml.xsl
+++ b/hu_HU.ISO8859-2/share/xsl/freebsd-xhtml.xsl
@@ -9,4 +9,10 @@
<!-- Pull in the language-independent stylesheet -->
<xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-xhtml.xsl"/>
+
+ <!-- Language-specific general customizations -->
+ <xsl:import href="freebsd-common.xsl"/>
+
+ <!-- Language-specific common XHTML customizations -->
+ <xsl:import href="freebsd-xhtml-common.xsl"/>
</xsl:stylesheet>
diff --git a/it_IT.ISO8859-15/share/xsl/freebsd-common.xsl b/it_IT.ISO8859-15/share/xsl/freebsd-common.xsl
new file mode 100644
index 0000000000..25f2b6a3a9
--- /dev/null
+++ b/it_IT.ISO8859-15/share/xsl/freebsd-common.xsl
@@ -0,0 +1,10 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version='1.0'
+ xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ exclude-result-prefixes="#default">
+
+</xsl:stylesheet>
diff --git a/it_IT.ISO8859-15/share/xsl/freebsd-epub.xsl b/it_IT.ISO8859-15/share/xsl/freebsd-epub.xsl
index 88e727a761..7309b5fc24 100644
--- a/it_IT.ISO8859-15/share/xsl/freebsd-epub.xsl
+++ b/it_IT.ISO8859-15/share/xsl/freebsd-epub.xsl
@@ -9,4 +9,7 @@
<!-- Pull in the language-independent stylesheet -->
<xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-epub.xsl"/>
+
+ <!-- Language-specific general customizations -->
+ <xsl:import href="freebsd-common.xsl"/>
</xsl:stylesheet>
diff --git a/it_IT.ISO8859-15/share/xsl/freebsd-fo.xsl b/it_IT.ISO8859-15/share/xsl/freebsd-fo.xsl
index c29de88df8..cbc743b04b 100644
--- a/it_IT.ISO8859-15/share/xsl/freebsd-fo.xsl
+++ b/it_IT.ISO8859-15/share/xsl/freebsd-fo.xsl
@@ -9,4 +9,7 @@
<!-- Pull in the language-independent stylesheet -->
<xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-fo.xsl"/>
+
+ <!-- Language-specific general customizations -->
+ <xsl:import href="freebsd-common.xsl"/>
</xsl:stylesheet>
diff --git a/it_IT.ISO8859-15/share/xsl/freebsd-xhtml-chunk.xsl b/it_IT.ISO8859-15/share/xsl/freebsd-xhtml-chunk.xsl
index 9f5872f807..3dfe2db188 100644
--- a/it_IT.ISO8859-15/share/xsl/freebsd-xhtml-chunk.xsl
+++ b/it_IT.ISO8859-15/share/xsl/freebsd-xhtml-chunk.xsl
@@ -9,4 +9,10 @@
<!-- Pull in the language-independent stylesheet -->
<xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-xhtml-chunk.xsl"/>
+
+ <!-- Language-specific general customizations -->
+ <xsl:import href="freebsd-common.xsl"/>
+
+ <!-- Language-specific common XHTML customizations -->
+ <xsl:import href="freebsd-xhtml-common.xsl"/>
</xsl:stylesheet>
diff --git a/it_IT.ISO8859-15/share/xsl/freebsd-xhtml-common.xsl b/it_IT.ISO8859-15/share/xsl/freebsd-xhtml-common.xsl
new file mode 100644
index 0000000000..5889576de4
--- /dev/null
+++ b/it_IT.ISO8859-15/share/xsl/freebsd-xhtml-common.xsl
@@ -0,0 +1,20 @@
+<?xml version='1.0' encoding='iso-8859-15'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version='1.0'
+ xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ exclude-result-prefixes="#default">
+
+ <xsl:template name="user.footer.content">
+ <p align="center"><small>Questo, ed altri documenti, possono essere scaricati da
+ <a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/">ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/</a></small></p>
+
+ <p align="center"><small>Per domande su FreeBSD, leggi la
+ <a href="http://www.FreeBSD.org/docs.html">documentazione</a> prima di contattare
+ <<a href="mailto:questions@FreeBSD.org">questions@FreeBSD.org</a>>.<br/>
+ Per domande su questa documentazione, invia una e-mail a
+ <<a href="mailto:doc@FreeBSD.org">doc@FreeBSD.org</a>>.</small></p>
+ </xsl:template>
+</xsl:stylesheet>
diff --git a/it_IT.ISO8859-15/share/xsl/freebsd-xhtml.xsl b/it_IT.ISO8859-15/share/xsl/freebsd-xhtml.xsl
index 92267b2357..3e3d7cb6b2 100644
--- a/it_IT.ISO8859-15/share/xsl/freebsd-xhtml.xsl
+++ b/it_IT.ISO8859-15/share/xsl/freebsd-xhtml.xsl
@@ -9,4 +9,10 @@
<!-- Pull in the language-independent stylesheet -->
<xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-xhtml.xsl"/>
+
+ <!-- Language-specific general customizations -->
+ <xsl:import href="freebsd-common.xsl"/>
+
+ <!-- Language-specific common XHTML customizations -->
+ <xsl:import href="freebsd-xhtml-common.xsl"/>
</xsl:stylesheet>
diff --git a/ja_JP.eucJP/share/xsl/freebsd-common.xsl b/ja_JP.eucJP/share/xsl/freebsd-common.xsl
new file mode 100644
index 0000000000..25f2b6a3a9
--- /dev/null
+++ b/ja_JP.eucJP/share/xsl/freebsd-common.xsl
@@ -0,0 +1,10 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version='1.0'
+ xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ exclude-result-prefixes="#default">
+
+</xsl:stylesheet>
diff --git a/ja_JP.eucJP/share/xsl/freebsd-epub.xsl b/ja_JP.eucJP/share/xsl/freebsd-epub.xsl
index 88e727a761..7309b5fc24 100644
--- a/ja_JP.eucJP/share/xsl/freebsd-epub.xsl
+++ b/ja_JP.eucJP/share/xsl/freebsd-epub.xsl
@@ -9,4 +9,7 @@
<!-- Pull in the language-independent stylesheet -->
<xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-epub.xsl"/>
+
+ <!-- Language-specific general customizations -->
+ <xsl:import href="freebsd-common.xsl"/>
</xsl:stylesheet>
diff --git a/ja_JP.eucJP/share/xsl/freebsd-fo.xsl b/ja_JP.eucJP/share/xsl/freebsd-fo.xsl
index c29de88df8..cbc743b04b 100644
--- a/ja_JP.eucJP/share/xsl/freebsd-fo.xsl
+++ b/ja_JP.eucJP/share/xsl/freebsd-fo.xsl
@@ -9,4 +9,7 @@
<!-- Pull in the language-independent stylesheet -->
<xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-fo.xsl"/>
+
+ <!-- Language-specific general customizations -->
+ <xsl:import href="freebsd-common.xsl"/>
</xsl:stylesheet>
diff --git a/ja_JP.eucJP/share/xsl/freebsd-xhtml-chunk.xsl b/ja_JP.eucJP/share/xsl/freebsd-xhtml-chunk.xsl
index 9f5872f807..3dfe2db188 100644
--- a/ja_JP.eucJP/share/xsl/freebsd-xhtml-chunk.xsl
+++ b/ja_JP.eucJP/share/xsl/freebsd-xhtml-chunk.xsl
@@ -9,4 +9,10 @@
<!-- Pull in the language-independent stylesheet -->
<xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-xhtml-chunk.xsl"/>
+
+ <!-- Language-specific general customizations -->
+ <xsl:import href="freebsd-common.xsl"/>
+
+ <!-- Language-specific common XHTML customizations -->
+ <xsl:import href="freebsd-xhtml-common.xsl"/>
</xsl:stylesheet>
diff --git a/ja_JP.eucJP/share/xsl/freebsd-xhtml-common.xsl b/ja_JP.eucJP/share/xsl/freebsd-xhtml-common.xsl
new file mode 100644
index 0000000000..8b8ed47575
--- /dev/null
+++ b/ja_JP.eucJP/share/xsl/freebsd-xhtml-common.xsl
@@ -0,0 +1,21 @@
+<?xml version='1.0' encoding='euc-jp'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version='1.0'
+ xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ exclude-result-prefixes="#default">
+
+ <xsl:template name="user.footer.content">
+ <p align="center"><small>��ʸ�����¾��ʸ���
+ <a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/">ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/</a>
+ �������������ɤǤ��ޤ���</small></p>
+
+ <p align="center"><small>FreeBSD �˴ؤ�����䤬������ˤϡ�
+ <a href="http://www.FreeBSD.org/ja/docs.html">�ɥ������</a> ���ɤ�����
+ <<a href="mailto:questions@FreeBSD.org">questions@FreeBSD.org</a>> �ޤ� (�Ѹ��) Ϣ�����Ƥ���������<br/>
+ ��ʸ��˴ؤ������ˤĤ��Ƥϡ�
+ <<a href="mailto:doc@FreeBSD.org">doc@FreeBSD.org</a>> �ޤ��Żҥ��� (�Ѹ��) ���äƤ���������</small></p>
+ </xsl:template>
+</xsl:stylesheet>
diff --git a/ja_JP.eucJP/share/xsl/freebsd-xhtml.xsl b/ja_JP.eucJP/share/xsl/freebsd-xhtml.xsl
index 92267b2357..3e3d7cb6b2 100644
--- a/ja_JP.eucJP/share/xsl/freebsd-xhtml.xsl
+++ b/ja_JP.eucJP/share/xsl/freebsd-xhtml.xsl
@@ -9,4 +9,10 @@
<!-- Pull in the language-independent stylesheet -->
<xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-xhtml.xsl"/>
+
+ <!-- Language-specific general customizations -->
+ <xsl:import href="freebsd-common.xsl"/>
+
+ <!-- Language-specific common XHTML customizations -->
+ <xsl:import href="freebsd-xhtml-common.xsl"/>
</xsl:stylesheet>
diff --git a/mn_MN.UTF-8/share/xsl/freebsd-common.xsl b/mn_MN.UTF-8/share/xsl/freebsd-common.xsl
new file mode 100644
index 0000000000..25f2b6a3a9
--- /dev/null
+++ b/mn_MN.UTF-8/share/xsl/freebsd-common.xsl
@@ -0,0 +1,10 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version='1.0'
+ xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ exclude-result-prefixes="#default">
+
+</xsl:stylesheet>
diff --git a/mn_MN.UTF-8/share/xsl/freebsd-epub.xsl b/mn_MN.UTF-8/share/xsl/freebsd-epub.xsl
index 88e727a761..7309b5fc24 100644
--- a/mn_MN.UTF-8/share/xsl/freebsd-epub.xsl
+++ b/mn_MN.UTF-8/share/xsl/freebsd-epub.xsl
@@ -9,4 +9,7 @@
<!-- Pull in the language-independent stylesheet -->
<xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-epub.xsl"/>
+
+ <!-- Language-specific general customizations -->
+ <xsl:import href="freebsd-common.xsl"/>
</xsl:stylesheet>
diff --git a/mn_MN.UTF-8/share/xsl/freebsd-fo.xsl b/mn_MN.UTF-8/share/xsl/freebsd-fo.xsl
index c29de88df8..cbc743b04b 100644
--- a/mn_MN.UTF-8/share/xsl/freebsd-fo.xsl
+++ b/mn_MN.UTF-8/share/xsl/freebsd-fo.xsl
@@ -9,4 +9,7 @@
<!-- Pull in the language-independent stylesheet -->
<xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-fo.xsl"/>
+
+ <!-- Language-specific general customizations -->
+ <xsl:import href="freebsd-common.xsl"/>
</xsl:stylesheet>
diff --git a/mn_MN.UTF-8/share/xsl/freebsd-xhtml-chunk.xsl b/mn_MN.UTF-8/share/xsl/freebsd-xhtml-chunk.xsl
index 9f5872f807..3dfe2db188 100644
--- a/mn_MN.UTF-8/share/xsl/freebsd-xhtml-chunk.xsl
+++ b/mn_MN.UTF-8/share/xsl/freebsd-xhtml-chunk.xsl
@@ -9,4 +9,10 @@
<!-- Pull in the language-independent stylesheet -->
<xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-xhtml-chunk.xsl"/>
+
+ <!-- Language-specific general customizations -->
+ <xsl:import href="freebsd-common.xsl"/>
+
+ <!-- Language-specific common XHTML customizations -->
+ <xsl:import href="freebsd-xhtml-common.xsl"/>
</xsl:stylesheet>
diff --git a/mn_MN.UTF-8/share/xsl/freebsd-xhtml-common.xsl b/mn_MN.UTF-8/share/xsl/freebsd-xhtml-common.xsl
new file mode 100644
index 0000000000..33eec8e971
--- /dev/null
+++ b/mn_MN.UTF-8/share/xsl/freebsd-xhtml-common.xsl
@@ -0,0 +1,26 @@
+<?xml version='1.0' encoding='utf-8'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version='1.0'
+ xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ exclude-result-prefixes="#default">
+
+ <xsl:template name="user.footer.content">
+ <p align="center"><small>Энэ болон бусад баримтуудыг
+ <a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/">ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/</a>
+ хаягаас татаж авч болно.</small></p>
+
+ <p align="center"><small>FreeBSD-ийн талаар
+ <<a href="mailto:questions@FreeBSD.org">questions@FreeBSD.org</a>>
+ хаягтай холбоо барихаасаа өмнө
+ <a href="http://www.FreeBSD.org/docs.html">баримтыг</a> уншина уу.<br/>
+ Энэ бичиг баримттай холбоотой асуулт байвал
+ <<a href="mailto:doc@FreeBSD.org">doc@FreeBSD.org</a>>
+ хаягаар цахим захидал явуулна уу.<br/>
+ Энэ бичиг баримтын орчуулгатай холбоотой асуулт байвал
+ <<a href="mailto:admin@mnbsd.org">admin@mnbsd.org</a>>
+ хаягаар цахим захидал явуулна уу.</small></p>
+ </xsl:template>
+</xsl:stylesheet>
diff --git a/mn_MN.UTF-8/share/xsl/freebsd-xhtml.xsl b/mn_MN.UTF-8/share/xsl/freebsd-xhtml.xsl
index 92267b2357..3e3d7cb6b2 100644
--- a/mn_MN.UTF-8/share/xsl/freebsd-xhtml.xsl
+++ b/mn_MN.UTF-8/share/xsl/freebsd-xhtml.xsl
@@ -9,4 +9,10 @@
<!-- Pull in the language-independent stylesheet -->
<xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-xhtml.xsl"/>
+
+ <!-- Language-specific general customizations -->
+ <xsl:import href="freebsd-common.xsl"/>
+
+ <!-- Language-specific common XHTML customizations -->
+ <xsl:import href="freebsd-xhtml-common.xsl"/>
</xsl:stylesheet>
diff --git a/nl_NL.ISO8859-1/share/xsl/freebsd-common.xsl b/nl_NL.ISO8859-1/share/xsl/freebsd-common.xsl
new file mode 100644
index 0000000000..25f2b6a3a9
--- /dev/null
+++ b/nl_NL.ISO8859-1/share/xsl/freebsd-common.xsl
@@ -0,0 +1,10 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version='1.0'
+ xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ exclude-result-prefixes="#default">
+
+</xsl:stylesheet>
diff --git a/nl_NL.ISO8859-1/share/xsl/freebsd-epub.xsl b/nl_NL.ISO8859-1/share/xsl/freebsd-epub.xsl
index 88e727a761..7309b5fc24 100644
--- a/nl_NL.ISO8859-1/share/xsl/freebsd-epub.xsl
+++ b/nl_NL.ISO8859-1/share/xsl/freebsd-epub.xsl
@@ -9,4 +9,7 @@
<!-- Pull in the language-independent stylesheet -->
<xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-epub.xsl"/>
+
+ <!-- Language-specific general customizations -->
+ <xsl:import href="freebsd-common.xsl"/>
</xsl:stylesheet>
diff --git a/nl_NL.ISO8859-1/share/xsl/freebsd-fo.xsl b/nl_NL.ISO8859-1/share/xsl/freebsd-fo.xsl
index c29de88df8..cbc743b04b 100644
--- a/nl_NL.ISO8859-1/share/xsl/freebsd-fo.xsl
+++ b/nl_NL.ISO8859-1/share/xsl/freebsd-fo.xsl
@@ -9,4 +9,7 @@
<!-- Pull in the language-independent stylesheet -->
<xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-fo.xsl"/>
+
+ <!-- Language-specific general customizations -->
+ <xsl:import href="freebsd-common.xsl"/>
</xsl:stylesheet>
diff --git a/nl_NL.ISO8859-1/share/xsl/freebsd-xhtml-chunk.xsl b/nl_NL.ISO8859-1/share/xsl/freebsd-xhtml-chunk.xsl
index 9f5872f807..3dfe2db188 100644
--- a/nl_NL.ISO8859-1/share/xsl/freebsd-xhtml-chunk.xsl
+++ b/nl_NL.ISO8859-1/share/xsl/freebsd-xhtml-chunk.xsl
@@ -9,4 +9,10 @@
<!-- Pull in the language-independent stylesheet -->
<xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-xhtml-chunk.xsl"/>
+
+ <!-- Language-specific general customizations -->
+ <xsl:import href="freebsd-common.xsl"/>
+
+ <!-- Language-specific common XHTML customizations -->
+ <xsl:import href="freebsd-xhtml-common.xsl"/>
</xsl:stylesheet>
diff --git a/nl_NL.ISO8859-1/share/xsl/freebsd-xhtml-common.xsl b/nl_NL.ISO8859-1/share/xsl/freebsd-xhtml-common.xsl
new file mode 100644
index 0000000000..50bc187323
--- /dev/null
+++ b/nl_NL.ISO8859-1/share/xsl/freebsd-xhtml-common.xsl
@@ -0,0 +1,11 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version='1.0'
+ xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ exclude-result-prefixes="#default">
+
+ <xsl:template name="user.footer.content"/>
+</xsl:stylesheet>
diff --git a/nl_NL.ISO8859-1/share/xsl/freebsd-xhtml.xsl b/nl_NL.ISO8859-1/share/xsl/freebsd-xhtml.xsl
index 92267b2357..3e3d7cb6b2 100644
--- a/nl_NL.ISO8859-1/share/xsl/freebsd-xhtml.xsl
+++ b/nl_NL.ISO8859-1/share/xsl/freebsd-xhtml.xsl
@@ -9,4 +9,10 @@
<!-- Pull in the language-independent stylesheet -->
<xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-xhtml.xsl"/>
+
+ <!-- Language-specific general customizations -->
+ <xsl:import href="freebsd-common.xsl"/>
+
+ <!-- Language-specific common XHTML customizations -->
+ <xsl:import href="freebsd-xhtml-common.xsl"/>
</xsl:stylesheet>
diff --git a/pl_PL.ISO8859-2/share/xsl/freebsd-common.xsl b/pl_PL.ISO8859-2/share/xsl/freebsd-common.xsl
new file mode 100644
index 0000000000..25f2b6a3a9
--- /dev/null
+++ b/pl_PL.ISO8859-2/share/xsl/freebsd-common.xsl
@@ -0,0 +1,10 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version='1.0'
+ xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ exclude-result-prefixes="#default">
+
+</xsl:stylesheet>
diff --git a/pl_PL.ISO8859-2/share/xsl/freebsd-epub.xsl b/pl_PL.ISO8859-2/share/xsl/freebsd-epub.xsl
index 88e727a761..7309b5fc24 100644
--- a/pl_PL.ISO8859-2/share/xsl/freebsd-epub.xsl
+++ b/pl_PL.ISO8859-2/share/xsl/freebsd-epub.xsl
@@ -9,4 +9,7 @@
<!-- Pull in the language-independent stylesheet -->
<xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-epub.xsl"/>
+
+ <!-- Language-specific general customizations -->
+ <xsl:import href="freebsd-common.xsl"/>
</xsl:stylesheet>
diff --git a/pl_PL.ISO8859-2/share/xsl/freebsd-fo.xsl b/pl_PL.ISO8859-2/share/xsl/freebsd-fo.xsl
index c29de88df8..cbc743b04b 100644
--- a/pl_PL.ISO8859-2/share/xsl/freebsd-fo.xsl
+++ b/pl_PL.ISO8859-2/share/xsl/freebsd-fo.xsl
@@ -9,4 +9,7 @@
<!-- Pull in the language-independent stylesheet -->
<xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-fo.xsl"/>
+
+ <!-- Language-specific general customizations -->
+ <xsl:import href="freebsd-common.xsl"/>
</xsl:stylesheet>
diff --git a/pl_PL.ISO8859-2/share/xsl/freebsd-xhtml-chunk.xsl b/pl_PL.ISO8859-2/share/xsl/freebsd-xhtml-chunk.xsl
index 9f5872f807..3dfe2db188 100644
--- a/pl_PL.ISO8859-2/share/xsl/freebsd-xhtml-chunk.xsl
+++ b/pl_PL.ISO8859-2/share/xsl/freebsd-xhtml-chunk.xsl
@@ -9,4 +9,10 @@
<!-- Pull in the language-independent stylesheet -->
<xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-xhtml-chunk.xsl"/>
+
+ <!-- Language-specific general customizations -->
+ <xsl:import href="freebsd-common.xsl"/>
+
+ <!-- Language-specific common XHTML customizations -->
+ <xsl:import href="freebsd-xhtml-common.xsl"/>
</xsl:stylesheet>
diff --git a/pl_PL.ISO8859-2/share/xsl/freebsd-xhtml-common.xsl b/pl_PL.ISO8859-2/share/xsl/freebsd-xhtml-common.xsl
new file mode 100644
index 0000000000..25f2b6a3a9
--- /dev/null
+++ b/pl_PL.ISO8859-2/share/xsl/freebsd-xhtml-common.xsl
@@ -0,0 +1,10 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version='1.0'
+ xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ exclude-result-prefixes="#default">
+
+</xsl:stylesheet>
diff --git a/pl_PL.ISO8859-2/share/xsl/freebsd-xhtml.xsl b/pl_PL.ISO8859-2/share/xsl/freebsd-xhtml.xsl
index 92267b2357..3e3d7cb6b2 100644
--- a/pl_PL.ISO8859-2/share/xsl/freebsd-xhtml.xsl
+++ b/pl_PL.ISO8859-2/share/xsl/freebsd-xhtml.xsl
@@ -9,4 +9,10 @@
<!-- Pull in the language-independent stylesheet -->
<xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-xhtml.xsl"/>
+
+ <!-- Language-specific general customizations -->
+ <xsl:import href="freebsd-common.xsl"/>
+
+ <!-- Language-specific common XHTML customizations -->
+ <xsl:import href="freebsd-xhtml-common.xsl"/>
</xsl:stylesheet>
diff --git a/pt_BR.ISO8859-1/share/xsl/freebsd-common.xsl b/pt_BR.ISO8859-1/share/xsl/freebsd-common.xsl
new file mode 100644
index 0000000000..25f2b6a3a9
--- /dev/null
+++ b/pt_BR.ISO8859-1/share/xsl/freebsd-common.xsl
@@ -0,0 +1,10 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version='1.0'
+ xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ exclude-result-prefixes="#default">
+
+</xsl:stylesheet>
diff --git a/pt_BR.ISO8859-1/share/xsl/freebsd-epub.xsl b/pt_BR.ISO8859-1/share/xsl/freebsd-epub.xsl
index 88e727a761..7309b5fc24 100644
--- a/pt_BR.ISO8859-1/share/xsl/freebsd-epub.xsl
+++ b/pt_BR.ISO8859-1/share/xsl/freebsd-epub.xsl
@@ -9,4 +9,7 @@
<!-- Pull in the language-independent stylesheet -->
<xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-epub.xsl"/>
+
+ <!-- Language-specific general customizations -->
+ <xsl:import href="freebsd-common.xsl"/>
</xsl:stylesheet>
diff --git a/pt_BR.ISO8859-1/share/xsl/freebsd-fo.xsl b/pt_BR.ISO8859-1/share/xsl/freebsd-fo.xsl
index c29de88df8..cbc743b04b 100644
--- a/pt_BR.ISO8859-1/share/xsl/freebsd-fo.xsl
+++ b/pt_BR.ISO8859-1/share/xsl/freebsd-fo.xsl
@@ -9,4 +9,7 @@
<!-- Pull in the language-independent stylesheet -->
<xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-fo.xsl"/>
+
+ <!-- Language-specific general customizations -->
+ <xsl:import href="freebsd-common.xsl"/>
</xsl:stylesheet>
diff --git a/pt_BR.ISO8859-1/share/xsl/freebsd-xhtml-chunk.xsl b/pt_BR.ISO8859-1/share/xsl/freebsd-xhtml-chunk.xsl
index 9f5872f807..3dfe2db188 100644
--- a/pt_BR.ISO8859-1/share/xsl/freebsd-xhtml-chunk.xsl
+++ b/pt_BR.ISO8859-1/share/xsl/freebsd-xhtml-chunk.xsl
@@ -9,4 +9,10 @@
<!-- Pull in the language-independent stylesheet -->
<xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-xhtml-chunk.xsl"/>
+
+ <!-- Language-specific general customizations -->
+ <xsl:import href="freebsd-common.xsl"/>
+
+ <!-- Language-specific common XHTML customizations -->
+ <xsl:import href="freebsd-xhtml-common.xsl"/>
</xsl:stylesheet>
diff --git a/pt_BR.ISO8859-1/share/xsl/freebsd-xhtml-common.xsl b/pt_BR.ISO8859-1/share/xsl/freebsd-xhtml-common.xsl
new file mode 100644
index 0000000000..d94c23a72b
--- /dev/null
+++ b/pt_BR.ISO8859-1/share/xsl/freebsd-xhtml-common.xsl
@@ -0,0 +1,20 @@
+<?xml version='1.0' encoding='iso-8859-1'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version='1.0'
+ xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ exclude-result-prefixes="#default">
+
+ <xsl:template name="user.footer.content">
+ <p align="center"><small>Este, e outros documentos, podem ser obtidos em
+ <a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/">ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/</a></small></p>
+
+ <p align="center"><small>Para perguntas sobre FreeBSD, leia a
+ <a href="http://www.FreeBSD.org/docs.html">documenta��o</a> antes de contatar
+ <<a href="mailto:questions@FreeBSD.org">questions@FreeBSD.org</a>>.<br/>
+ Para perguntas sobre esta documenta��o, envie e-mail para
+ <<a href="mailto:doc@FreeBSD.org">doc@FreeBSD.org</a>>.</small></p>
+ </xsl:template>
+</xsl:stylesheet>
diff --git a/pt_BR.ISO8859-1/share/xsl/freebsd-xhtml.xsl b/pt_BR.ISO8859-1/share/xsl/freebsd-xhtml.xsl
index 92267b2357..3e3d7cb6b2 100644
--- a/pt_BR.ISO8859-1/share/xsl/freebsd-xhtml.xsl
+++ b/pt_BR.ISO8859-1/share/xsl/freebsd-xhtml.xsl
@@ -9,4 +9,10 @@
<!-- Pull in the language-independent stylesheet -->
<xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-xhtml.xsl"/>
+
+ <!-- Language-specific general customizations -->
+ <xsl:import href="freebsd-common.xsl"/>
+
+ <!-- Language-specific common XHTML customizations -->
+ <xsl:import href="freebsd-xhtml-common.xsl"/>
</xsl:stylesheet>
diff --git a/ru_RU.KOI8-R/share/xsl/freebsd-common.xsl b/ru_RU.KOI8-R/share/xsl/freebsd-common.xsl
new file mode 100644
index 0000000000..25f2b6a3a9
--- /dev/null
+++ b/ru_RU.KOI8-R/share/xsl/freebsd-common.xsl
@@ -0,0 +1,10 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version='1.0'
+ xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ exclude-result-prefixes="#default">
+
+</xsl:stylesheet>
diff --git a/ru_RU.KOI8-R/share/xsl/freebsd-epub.xsl b/ru_RU.KOI8-R/share/xsl/freebsd-epub.xsl
index 88e727a761..7309b5fc24 100644
--- a/ru_RU.KOI8-R/share/xsl/freebsd-epub.xsl
+++ b/ru_RU.KOI8-R/share/xsl/freebsd-epub.xsl
@@ -9,4 +9,7 @@
<!-- Pull in the language-independent stylesheet -->
<xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-epub.xsl"/>
+
+ <!-- Language-specific general customizations -->
+ <xsl:import href="freebsd-common.xsl"/>
</xsl:stylesheet>
diff --git a/ru_RU.KOI8-R/share/xsl/freebsd-fo.xsl b/ru_RU.KOI8-R/share/xsl/freebsd-fo.xsl
index c29de88df8..cbc743b04b 100644
--- a/ru_RU.KOI8-R/share/xsl/freebsd-fo.xsl
+++ b/ru_RU.KOI8-R/share/xsl/freebsd-fo.xsl
@@ -9,4 +9,7 @@
<!-- Pull in the language-independent stylesheet -->
<xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-fo.xsl"/>
+
+ <!-- Language-specific general customizations -->
+ <xsl:import href="freebsd-common.xsl"/>
</xsl:stylesheet>
diff --git a/ru_RU.KOI8-R/share/xsl/freebsd-xhtml-chunk.xsl b/ru_RU.KOI8-R/share/xsl/freebsd-xhtml-chunk.xsl
index 9f5872f807..3dfe2db188 100644
--- a/ru_RU.KOI8-R/share/xsl/freebsd-xhtml-chunk.xsl
+++ b/ru_RU.KOI8-R/share/xsl/freebsd-xhtml-chunk.xsl
@@ -9,4 +9,10 @@
<!-- Pull in the language-independent stylesheet -->
<xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-xhtml-chunk.xsl"/>
+
+ <!-- Language-specific general customizations -->
+ <xsl:import href="freebsd-common.xsl"/>
+
+ <!-- Language-specific common XHTML customizations -->
+ <xsl:import href="freebsd-xhtml-common.xsl"/>
</xsl:stylesheet>
diff --git a/ru_RU.KOI8-R/share/xsl/freebsd-xhtml-common.xsl b/ru_RU.KOI8-R/share/xsl/freebsd-xhtml-common.xsl
new file mode 100644
index 0000000000..f8cedcc6af
--- /dev/null
+++ b/ru_RU.KOI8-R/share/xsl/freebsd-xhtml-common.xsl
@@ -0,0 +1,24 @@
+<?xml version='1.0' encoding='koi8-r'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version='1.0'
+ xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ exclude-result-prefixes="#default">
+
+ <xsl:template name="user.footer.content">
+ <p align="center"><small>����, � ������ ���������, ����� ���� ������� �
+ <a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/">ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/</a>.</small></p>
+
+ <p align="center"><small>�� ��������, ��������� � FreeBSD, ����������
+ <a href="http://www.FreeBSD.org/ru/docs.html">������������</a> ������ ��� ������ �
+ <<a href="mailto:questions@FreeBSD.org">questions@FreeBSD.org</a>>.<br/>
+ �� ��������, ��������� � ���� �������������, ������
+ <<a href="mailto:doc@FreeBSD.org">doc@FreeBSD.org</a>>.<br/>
+ �� ��������, ��������� � ������� ��������� ������������, ������ � ��������
+ <<a href="mailto:frdp@FreeBSD.org.ua">frdp@FreeBSD.org.ua</a>>.<br/>
+ ���������� �� �������� �� ��� �������� ��������� ��
+ <a href="http://www.freebsd.org.ua/resources.html">����� ������� ��������</a>.</small></p>
+ </xsl:template>
+</xsl:stylesheet>
diff --git a/ru_RU.KOI8-R/share/xsl/freebsd-xhtml.xsl b/ru_RU.KOI8-R/share/xsl/freebsd-xhtml.xsl
index 92267b2357..3e3d7cb6b2 100644
--- a/ru_RU.KOI8-R/share/xsl/freebsd-xhtml.xsl
+++ b/ru_RU.KOI8-R/share/xsl/freebsd-xhtml.xsl
@@ -9,4 +9,10 @@
<!-- Pull in the language-independent stylesheet -->
<xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-xhtml.xsl"/>
+
+ <!-- Language-specific general customizations -->
+ <xsl:import href="freebsd-common.xsl"/>
+
+ <!-- Language-specific common XHTML customizations -->
+ <xsl:import href="freebsd-xhtml-common.xsl"/>
</xsl:stylesheet>
diff --git a/sr_YU.ISO8859-2/share/xsl/freebsd-common.xsl b/sr_YU.ISO8859-2/share/xsl/freebsd-common.xsl
new file mode 100644
index 0000000000..25f2b6a3a9
--- /dev/null
+++ b/sr_YU.ISO8859-2/share/xsl/freebsd-common.xsl
@@ -0,0 +1,10 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version='1.0'
+ xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ exclude-result-prefixes="#default">
+
+</xsl:stylesheet>
diff --git a/sr_YU.ISO8859-2/share/xsl/freebsd-epub.xsl b/sr_YU.ISO8859-2/share/xsl/freebsd-epub.xsl
index 88e727a761..7309b5fc24 100644
--- a/sr_YU.ISO8859-2/share/xsl/freebsd-epub.xsl
+++ b/sr_YU.ISO8859-2/share/xsl/freebsd-epub.xsl
@@ -9,4 +9,7 @@
<!-- Pull in the language-independent stylesheet -->
<xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-epub.xsl"/>
+
+ <!-- Language-specific general customizations -->
+ <xsl:import href="freebsd-common.xsl"/>
</xsl:stylesheet>
diff --git a/sr_YU.ISO8859-2/share/xsl/freebsd-fo.xsl b/sr_YU.ISO8859-2/share/xsl/freebsd-fo.xsl
index c29de88df8..cbc743b04b 100644
--- a/sr_YU.ISO8859-2/share/xsl/freebsd-fo.xsl
+++ b/sr_YU.ISO8859-2/share/xsl/freebsd-fo.xsl
@@ -9,4 +9,7 @@
<!-- Pull in the language-independent stylesheet -->
<xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-fo.xsl"/>
+
+ <!-- Language-specific general customizations -->
+ <xsl:import href="freebsd-common.xsl"/>
</xsl:stylesheet>
diff --git a/sr_YU.ISO8859-2/share/xsl/freebsd-xhtml-chunk.xsl b/sr_YU.ISO8859-2/share/xsl/freebsd-xhtml-chunk.xsl
index 9f5872f807..3dfe2db188 100644
--- a/sr_YU.ISO8859-2/share/xsl/freebsd-xhtml-chunk.xsl
+++ b/sr_YU.ISO8859-2/share/xsl/freebsd-xhtml-chunk.xsl
@@ -9,4 +9,10 @@
<!-- Pull in the language-independent stylesheet -->
<xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-xhtml-chunk.xsl"/>
+
+ <!-- Language-specific general customizations -->
+ <xsl:import href="freebsd-common.xsl"/>
+
+ <!-- Language-specific common XHTML customizations -->
+ <xsl:import href="freebsd-xhtml-common.xsl"/>
</xsl:stylesheet>
diff --git a/sr_YU.ISO8859-2/share/xsl/freebsd-xhtml-common.xsl b/sr_YU.ISO8859-2/share/xsl/freebsd-xhtml-common.xsl
new file mode 100644
index 0000000000..25f2b6a3a9
--- /dev/null
+++ b/sr_YU.ISO8859-2/share/xsl/freebsd-xhtml-common.xsl
@@ -0,0 +1,10 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version='1.0'
+ xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ exclude-result-prefixes="#default">
+
+</xsl:stylesheet>
diff --git a/sr_YU.ISO8859-2/share/xsl/freebsd-xhtml.xsl b/sr_YU.ISO8859-2/share/xsl/freebsd-xhtml.xsl
index 92267b2357..3e3d7cb6b2 100644
--- a/sr_YU.ISO8859-2/share/xsl/freebsd-xhtml.xsl
+++ b/sr_YU.ISO8859-2/share/xsl/freebsd-xhtml.xsl
@@ -9,4 +9,10 @@
<!-- Pull in the language-independent stylesheet -->
<xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-xhtml.xsl"/>
+
+ <!-- Language-specific general customizations -->
+ <xsl:import href="freebsd-common.xsl"/>
+
+ <!-- Language-specific common XHTML customizations -->
+ <xsl:import href="freebsd-xhtml-common.xsl"/>
</xsl:stylesheet>
diff --git a/tr_TR.ISO8859-9/share/xsl/freebsd-common.xsl b/tr_TR.ISO8859-9/share/xsl/freebsd-common.xsl
new file mode 100644
index 0000000000..25f2b6a3a9
--- /dev/null
+++ b/tr_TR.ISO8859-9/share/xsl/freebsd-common.xsl
@@ -0,0 +1,10 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version='1.0'
+ xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ exclude-result-prefixes="#default">
+
+</xsl:stylesheet>
diff --git a/tr_TR.ISO8859-9/share/xsl/freebsd-epub.xsl b/tr_TR.ISO8859-9/share/xsl/freebsd-epub.xsl
index 88e727a761..7309b5fc24 100644
--- a/tr_TR.ISO8859-9/share/xsl/freebsd-epub.xsl
+++ b/tr_TR.ISO8859-9/share/xsl/freebsd-epub.xsl
@@ -9,4 +9,7 @@
<!-- Pull in the language-independent stylesheet -->
<xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-epub.xsl"/>
+
+ <!-- Language-specific general customizations -->
+ <xsl:import href="freebsd-common.xsl"/>
</xsl:stylesheet>
diff --git a/tr_TR.ISO8859-9/share/xsl/freebsd-fo.xsl b/tr_TR.ISO8859-9/share/xsl/freebsd-fo.xsl
index c29de88df8..cbc743b04b 100644
--- a/tr_TR.ISO8859-9/share/xsl/freebsd-fo.xsl
+++ b/tr_TR.ISO8859-9/share/xsl/freebsd-fo.xsl
@@ -9,4 +9,7 @@
<!-- Pull in the language-independent stylesheet -->
<xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-fo.xsl"/>
+
+ <!-- Language-specific general customizations -->
+ <xsl:import href="freebsd-common.xsl"/>
</xsl:stylesheet>
diff --git a/tr_TR.ISO8859-9/share/xsl/freebsd-xhtml-chunk.xsl b/tr_TR.ISO8859-9/share/xsl/freebsd-xhtml-chunk.xsl
index 9f5872f807..3dfe2db188 100644
--- a/tr_TR.ISO8859-9/share/xsl/freebsd-xhtml-chunk.xsl
+++ b/tr_TR.ISO8859-9/share/xsl/freebsd-xhtml-chunk.xsl
@@ -9,4 +9,10 @@
<!-- Pull in the language-independent stylesheet -->
<xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-xhtml-chunk.xsl"/>
+
+ <!-- Language-specific general customizations -->
+ <xsl:import href="freebsd-common.xsl"/>
+
+ <!-- Language-specific common XHTML customizations -->
+ <xsl:import href="freebsd-xhtml-common.xsl"/>
</xsl:stylesheet>
diff --git a/tr_TR.ISO8859-9/share/xsl/freebsd-xhtml-common.xsl b/tr_TR.ISO8859-9/share/xsl/freebsd-xhtml-common.xsl
new file mode 100644
index 0000000000..25f2b6a3a9
--- /dev/null
+++ b/tr_TR.ISO8859-9/share/xsl/freebsd-xhtml-common.xsl
@@ -0,0 +1,10 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version='1.0'
+ xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ exclude-result-prefixes="#default">
+
+</xsl:stylesheet>
diff --git a/tr_TR.ISO8859-9/share/xsl/freebsd-xhtml.xsl b/tr_TR.ISO8859-9/share/xsl/freebsd-xhtml.xsl
index 92267b2357..3e3d7cb6b2 100644
--- a/tr_TR.ISO8859-9/share/xsl/freebsd-xhtml.xsl
+++ b/tr_TR.ISO8859-9/share/xsl/freebsd-xhtml.xsl
@@ -9,4 +9,10 @@
<!-- Pull in the language-independent stylesheet -->
<xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-xhtml.xsl"/>
+
+ <!-- Language-specific general customizations -->
+ <xsl:import href="freebsd-common.xsl"/>
+
+ <!-- Language-specific common XHTML customizations -->
+ <xsl:import href="freebsd-xhtml-common.xsl"/>
</xsl:stylesheet>
diff --git a/zh_CN.GB2312/share/xsl/freebsd-common.xsl b/zh_CN.GB2312/share/xsl/freebsd-common.xsl
new file mode 100644
index 0000000000..25f2b6a3a9
--- /dev/null
+++ b/zh_CN.GB2312/share/xsl/freebsd-common.xsl
@@ -0,0 +1,10 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version='1.0'
+ xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ exclude-result-prefixes="#default">
+
+</xsl:stylesheet>
diff --git a/zh_CN.GB2312/share/xsl/freebsd-epub.xsl b/zh_CN.GB2312/share/xsl/freebsd-epub.xsl
index 88e727a761..7309b5fc24 100644
--- a/zh_CN.GB2312/share/xsl/freebsd-epub.xsl
+++ b/zh_CN.GB2312/share/xsl/freebsd-epub.xsl
@@ -9,4 +9,7 @@
<!-- Pull in the language-independent stylesheet -->
<xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-epub.xsl"/>
+
+ <!-- Language-specific general customizations -->
+ <xsl:import href="freebsd-common.xsl"/>
</xsl:stylesheet>
diff --git a/zh_CN.GB2312/share/xsl/freebsd-fo.xsl b/zh_CN.GB2312/share/xsl/freebsd-fo.xsl
index c29de88df8..cbc743b04b 100644
--- a/zh_CN.GB2312/share/xsl/freebsd-fo.xsl
+++ b/zh_CN.GB2312/share/xsl/freebsd-fo.xsl
@@ -9,4 +9,7 @@
<!-- Pull in the language-independent stylesheet -->
<xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-fo.xsl"/>
+
+ <!-- Language-specific general customizations -->
+ <xsl:import href="freebsd-common.xsl"/>
</xsl:stylesheet>
diff --git a/zh_CN.GB2312/share/xsl/freebsd-xhtml-chunk.xsl b/zh_CN.GB2312/share/xsl/freebsd-xhtml-chunk.xsl
index 9f5872f807..3dfe2db188 100644
--- a/zh_CN.GB2312/share/xsl/freebsd-xhtml-chunk.xsl
+++ b/zh_CN.GB2312/share/xsl/freebsd-xhtml-chunk.xsl
@@ -9,4 +9,10 @@
<!-- Pull in the language-independent stylesheet -->
<xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-xhtml-chunk.xsl"/>
+
+ <!-- Language-specific general customizations -->
+ <xsl:import href="freebsd-common.xsl"/>
+
+ <!-- Language-specific common XHTML customizations -->
+ <xsl:import href="freebsd-xhtml-common.xsl"/>
</xsl:stylesheet>
diff --git a/zh_CN.GB2312/share/xsl/freebsd-xhtml-common.xsl b/zh_CN.GB2312/share/xsl/freebsd-xhtml-common.xsl
new file mode 100644
index 0000000000..6284cbdfd0
--- /dev/null
+++ b/zh_CN.GB2312/share/xsl/freebsd-xhtml-common.xsl
@@ -0,0 +1,20 @@
+<?xml version='1.0' encoding='gb2312'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version='1.0'
+ xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ exclude-result-prefixes="#default">
+
+ <xsl:template name="user.footer.content">
+ <p align="center"><small>���ĵ��������ĵ��ɴ��������أ�
+ <a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/">ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/</a>.</small></p>
+
+ <p align="center"><small>�������FreeBSD�����⣬�����Ķ�
+ <a href="http://www.FreeBSD.org/docs.html">�ĵ�</a>���粻�ܽ������ϵ
+ <<a href="mailto:questions@FreeBSD.org">questions@FreeBSD.org</a>>.<br/>
+ ���ڱ��ĵ��������뷢����ϵ
+ <<a href="mailto:doc@FreeBSD.org">doc@FreeBSD.org</a>>.</small></p>
+ </xsl:template>
+</xsl:stylesheet>
diff --git a/zh_CN.GB2312/share/xsl/freebsd-xhtml.xsl b/zh_CN.GB2312/share/xsl/freebsd-xhtml.xsl
index 92267b2357..3e3d7cb6b2 100644
--- a/zh_CN.GB2312/share/xsl/freebsd-xhtml.xsl
+++ b/zh_CN.GB2312/share/xsl/freebsd-xhtml.xsl
@@ -9,4 +9,10 @@
<!-- Pull in the language-independent stylesheet -->
<xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-xhtml.xsl"/>
+
+ <!-- Language-specific general customizations -->
+ <xsl:import href="freebsd-common.xsl"/>
+
+ <!-- Language-specific common XHTML customizations -->
+ <xsl:import href="freebsd-xhtml-common.xsl"/>
</xsl:stylesheet>
diff --git a/zh_TW.Big5/share/xsl/freebsd-common.xsl b/zh_TW.Big5/share/xsl/freebsd-common.xsl
new file mode 100644
index 0000000000..25f2b6a3a9
--- /dev/null
+++ b/zh_TW.Big5/share/xsl/freebsd-common.xsl
@@ -0,0 +1,10 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version='1.0'
+ xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ exclude-result-prefixes="#default">
+
+</xsl:stylesheet>
diff --git a/zh_TW.Big5/share/xsl/freebsd-epub.xsl b/zh_TW.Big5/share/xsl/freebsd-epub.xsl
index 88e727a761..7309b5fc24 100644
--- a/zh_TW.Big5/share/xsl/freebsd-epub.xsl
+++ b/zh_TW.Big5/share/xsl/freebsd-epub.xsl
@@ -9,4 +9,7 @@
<!-- Pull in the language-independent stylesheet -->
<xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-epub.xsl"/>
+
+ <!-- Language-specific general customizations -->
+ <xsl:import href="freebsd-common.xsl"/>
</xsl:stylesheet>
diff --git a/zh_TW.Big5/share/xsl/freebsd-fo.xsl b/zh_TW.Big5/share/xsl/freebsd-fo.xsl
index c29de88df8..cbc743b04b 100644
--- a/zh_TW.Big5/share/xsl/freebsd-fo.xsl
+++ b/zh_TW.Big5/share/xsl/freebsd-fo.xsl
@@ -9,4 +9,7 @@
<!-- Pull in the language-independent stylesheet -->
<xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-fo.xsl"/>
+
+ <!-- Language-specific general customizations -->
+ <xsl:import href="freebsd-common.xsl"/>
</xsl:stylesheet>
diff --git a/zh_TW.Big5/share/xsl/freebsd-xhtml-chunk.xsl b/zh_TW.Big5/share/xsl/freebsd-xhtml-chunk.xsl
index 9f5872f807..3dfe2db188 100644
--- a/zh_TW.Big5/share/xsl/freebsd-xhtml-chunk.xsl
+++ b/zh_TW.Big5/share/xsl/freebsd-xhtml-chunk.xsl
@@ -9,4 +9,10 @@
<!-- Pull in the language-independent stylesheet -->
<xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-xhtml-chunk.xsl"/>
+
+ <!-- Language-specific general customizations -->
+ <xsl:import href="freebsd-common.xsl"/>
+
+ <!-- Language-specific common XHTML customizations -->
+ <xsl:import href="freebsd-xhtml-common.xsl"/>
</xsl:stylesheet>
diff --git a/zh_TW.Big5/share/xsl/freebsd-xhtml-common.xsl b/zh_TW.Big5/share/xsl/freebsd-xhtml-common.xsl
new file mode 100644
index 0000000000..90fe29f2d8
--- /dev/null
+++ b/zh_TW.Big5/share/xsl/freebsd-xhtml-common.xsl
@@ -0,0 +1,20 @@
+<?xml version='1.0' encoding='big5'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version='1.0'
+ xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ exclude-result-prefixes="#default">
+
+ <xsl:template name="user.footer.content">
+ <p align="center"><small>����Ψ�L���A�i�Ѧ��U���G
+ <a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/">ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/</a>�C</small></p>
+
+ <p align="center"><small>�Y�� FreeBSD �譱�ðݡA�Х��\Ū
+ <a href="http://www.FreeBSD.org/docs.html">FreeBSD �������</a>�A�p����ѨM���ܡA�A����
+ <<a href="mailto:questions@FreeBSD.org">questions@FreeBSD.org</a>>�C<br/>
+ ������D�A����
+ <<a href="mailto:doc@FreeBSD.org">doc@FreeBSD.org</a>>�C</small></p>
+ </xsl:template>
+</xsl:stylesheet>
diff --git a/zh_TW.Big5/share/xsl/freebsd-xhtml.xsl b/zh_TW.Big5/share/xsl/freebsd-xhtml.xsl
index 92267b2357..3e3d7cb6b2 100644
--- a/zh_TW.Big5/share/xsl/freebsd-xhtml.xsl
+++ b/zh_TW.Big5/share/xsl/freebsd-xhtml.xsl
@@ -9,4 +9,10 @@
<!-- Pull in the language-independent stylesheet -->
<xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-xhtml.xsl"/>
+
+ <!-- Language-specific general customizations -->
+ <xsl:import href="freebsd-common.xsl"/>
+
+ <!-- Language-specific common XHTML customizations -->
+ <xsl:import href="freebsd-xhtml-common.xsl"/>
</xsl:stylesheet>
From 01df0bc997dce41045cd7fedb2d2696fb63fe7e3 Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Sun, 3 Mar 2013 21:07:39 +0000
Subject: [PATCH 074/121] - Generate manpage links
---
share/xsl/freebsd-xhtml-common.xsl | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/share/xsl/freebsd-xhtml-common.xsl b/share/xsl/freebsd-xhtml-common.xsl
index 1529c6e461..dfff3249a9 100644
--- a/share/xsl/freebsd-xhtml-common.xsl
+++ b/share/xsl/freebsd-xhtml-common.xsl
@@ -16,6 +16,7 @@
<xsl:param name="html.stylesheet" select="'docbook.css'"/>
<xsl:param name="link.mailto.url" select="'doc@FreeBSD.org'"/>
<xsl:param name="callout.graphics.path" select="'./imagelib/callouts/'"/>
+ <xsl:param name="citerefentry.link" select="1"/>
<xsl:template name="user.footer.content">
<p align="center"><small>This, and other documents, can be downloaded
@@ -30,4 +31,11 @@
<xsl:template match="hostid|username|groupname|devicename|maketarget|makevar">
<xsl:call-template name="inline.monoseq"/>
</xsl:template>
+
+ <xsl:template name="generate.citerefentry.link">
+ <xsl:text>http://www.FreeBSD.org/cgi/man.cgi?query=</xsl:text>
+ <xsl:value-of select="refentrytitle"/>
+ <xsl:text>&amp;sektion=</xsl:text>
+ <xsl:value-of select="manvolnum"/>
+ </xsl:template>
</xsl:stylesheet>
From 6186404cc92131b2b996dbf9c118bd6c6a36ede8 Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Sun, 3 Mar 2013 21:08:24 +0000
Subject: [PATCH 075/121] - Readjust CSS styling to work with the new XHTML
structure
---
share/misc/docbook.css | 22 +++++++++++++---------
1 file changed, 13 insertions(+), 9 deletions(-)
diff --git a/share/misc/docbook.css b/share/misc/docbook.css
index 22a430f2dd..fbcd1214e6 100644
--- a/share/misc/docbook.css
+++ b/share/misc/docbook.css
@@ -135,10 +135,6 @@ html {
padding: 0;
}
-body p b.application {
- color: #000000;
-}
-
.filename {
color: #007a00;
}
@@ -191,34 +187,34 @@ blockquote {
padding: 0 2ex;
}
-blockquote.note {
+.note {
color: #222;
background: #eee;
border: 1px solid #ccc;
width: 85%;
}
-blockquote.tip {
+.tip {
color: #004F00;
background: #d8ecd6;
border: 1px solid green;
width: 85%;
}
-blockquote.important {
+.important {
font-style:italic;
border: 1px solid #a00;
border-left: 12px solid #c00;
}
-blockquote.warning {
+.warning {
color: #9F1313;
background: #f8e8e8;
border: 1px solid #e59595;
width: 85%;
}
-blockquote.caution {
+.caution {
color: #3E3535;
background: #FFC;
border: 1px solid #e59595;
@@ -237,3 +233,11 @@ blockquote.caution {
padding-left: 1em;
padding-right: 1em;
}
+
+.application {
+ font-weight: bold;
+}
+
+pre.screen strong {
+ font-weight: normal;
+}
From 6dc14c39e49479ab6a9830cc0ac646b4c283fe42 Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Fri, 8 Mar 2013 09:33:05 +0000
Subject: [PATCH 076/121] - Fix formatting of warning, tip, etc.
---
share/misc/docbook.css | 39 +++++++++++++++++-------------
share/xsl/freebsd-xhtml-common.xsl | 24 ++++++++++++++++++
2 files changed, 46 insertions(+), 17 deletions(-)
diff --git a/share/misc/docbook.css b/share/misc/docbook.css
index fbcd1214e6..a173736976 100644
--- a/share/misc/docbook.css
+++ b/share/misc/docbook.css
@@ -31,12 +31,6 @@ body address {
margin: .6em 0;
}
-body blockquote {
- margin-top: .75em;
- line-height: 1.3;
- margin-bottom: .75em;
-}
-
html body {
margin: 1em 8% 1em 10%;
line-height: 1.2;
@@ -70,7 +64,6 @@ body form {
margin: .6em 0;
}
-h1, h2, h3, h4, h5, h6,
div.example p b,
.question,
div.table p b,
@@ -78,24 +71,26 @@ div.procedure p b {
color: #990000;
}
-body h1, body h2, body h3, body h4, body h5, body h6 {
+h1.title, h2.title, h3.title, h4.title, h5.title, h6.title,
+h3.author {
line-height: 1.3;
margin-left: 0;
+ color: #990000;
}
-body h1, body h2 {
+h1.title, h2.title {
margin: .8em 0 0 -4%;
}
-body h3, body h4 {
+h3.title, h4.title {
margin: .8em 0 0 -3%;
}
-body h5 {
+h5.title {
margin: .8em 0 0 -2%;
}
-body h6 {
+h6.title {
margin: .8em 0 0 -1%;
}
@@ -167,6 +162,7 @@ svnref {
padding: 1ex;
background-color: #eee;
border: 1px solid #ccc;
+ border-radius: 6px;
line-height: 1.1;
}
@@ -179,12 +175,11 @@ svnref {
text-align: left;
}
-blockquote, .example, .programlisting {
+.note, .tip, .important, .warning, .caution, .example {
border-radius: 6px;
-}
-
-blockquote {
- padding: 0 2ex;
+ padding: 2ex 2ex;
+ margin: .75em 3em .75em 3em;
+ line-height: 1.3;
}
.note {
@@ -229,6 +224,16 @@ blockquote {
width: 90%;
}
+.admontitle {
+ display: inline;
+ line-height: 1;
+ margin-right: 0;
+}
+
+.note p, .tip p, .important p, .warning p, .caution p, .example p {
+ display: inline;
+}
+
.informaltable table.calstable tr td {
padding-left: 1em;
padding-right: 1em;
diff --git a/share/xsl/freebsd-xhtml-common.xsl b/share/xsl/freebsd-xhtml-common.xsl
index dfff3249a9..a4507b330b 100644
--- a/share/xsl/freebsd-xhtml-common.xsl
+++ b/share/xsl/freebsd-xhtml-common.xsl
@@ -17,6 +17,7 @@
<xsl:param name="link.mailto.url" select="'doc@FreeBSD.org'"/>
<xsl:param name="callout.graphics.path" select="'./imagelib/callouts/'"/>
<xsl:param name="citerefentry.link" select="1"/>
+ <xsl:param name="admon.style"/>
<xsl:template name="user.footer.content">
<p align="center"><small>This, and other documents, can be downloaded
@@ -38,4 +39,27 @@
<xsl:text>&amp;sektion=</xsl:text>
<xsl:value-of select="manvolnum"/>
</xsl:template>
+
+ <xsl:template name="nongraphical.admonition">
+ <div>
+ <xsl:call-template name="common.html.attributes">
+ <xsl:with-param name="inherit" select="1"/>
+ </xsl:call-template>
+ <xsl:if test="$admon.style">
+ <xsl:attribute name="style">
+ <xsl:value-of select="$admon.style"/>
+ </xsl:attribute>
+ </xsl:if>
+
+ <xsl:if test="$admon.textlabel != 0 or title or info/title">
+ <h3 class="admontitle">
+ <xsl:call-template name="anchor"/>
+ <xsl:apply-templates select="." mode="object.title.markup"/>
+ <xsl:text>: </xsl:text>
+ </h3>
+ </xsl:if>
+
+ <xsl:apply-templates/>
+ </div>
+ </xsl:template>
</xsl:stylesheet>
From eb47c4686524c2698f35ba1403163c35ad865967 Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Thu, 14 Mar 2013 09:19:23 +0000
Subject: [PATCH 077/121] - Fix erroneous fileref's that result in missing
images - Also fix fdp-primer examples
---
.../books/fdp-primer/sgml-markup/chapter.xml | 6 +-
.../handbook/advanced-networking/chapter.xml | 10 +-
.../books/handbook/basics/chapter.xml | 12 +-
.../books/handbook/bsdinstall/chapter.xml | 88 ++++++-------
.../books/handbook/geom/chapter.xml | 2 +-
.../books/handbook/install/chapter.xml | 114 ++++++++---------
.../books/handbook/mail/chapter.xml | 16 +--
.../books/handbook/vinum/chapter.xml | 14 +-
.../books/handbook/virtualization/chapter.xml | 74 +++++------
.../handbook/advanced-networking/chapter.xml | 10 +-
.../books/handbook/basics/chapter.xml | 12 +-
.../books/handbook/bsdinstall/chapter.xml | 88 ++++++-------
.../books/handbook/geom/chapter.xml | 2 +-
.../books/handbook/install/chapter.xml | 114 ++++++++---------
.../books/handbook/mail/chapter.xml | 16 +--
.../books/handbook/security/chapter.xml | 8 +-
.../books/handbook/vinum/chapter.xml | 14 +-
.../books/handbook/virtualization/chapter.xml | 76 +++++------
.../articles/building-products/article.xml | 4 +-
en_US.ISO8859-1/articles/releng/article.xml | 16 +--
.../articles/vm-design/article.xml | 8 +-
en_US.ISO8859-1/books/design-44bsd/book.xml | 4 +-
.../developers-handbook/sockets/chapter.xml | 22 ++--
.../books/fdp-primer/sgml-markup/chapter.xml | 6 +-
.../handbook/advanced-networking/chapter.xml | 12 +-
.../books/handbook/basics/chapter.xml | 12 +-
.../books/handbook/bsdinstall/chapter.xml | 88 ++++++-------
.../books/handbook/geom/chapter.xml | 2 +-
.../books/handbook/install/chapter.xml | 114 ++++++++---------
.../books/handbook/mail/chapter.xml | 16 +--
.../books/handbook/vinum/chapter.xml | 14 +-
.../books/handbook/virtualization/chapter.xml | 76 +++++------
es_ES.ISO8859-1/articles/releng/article.xml | 6 +-
.../handbook/advanced-networking/chapter.xml | 8 +-
.../books/handbook/basics/chapter.xml | 12 +-
.../books/handbook/geom/chapter.xml | 2 +-
.../books/handbook/install/chapter.xml | 110 ++++++++--------
.../books/handbook/mail/chapter.xml | 16 +--
.../books/handbook/security/chapter.xml | 8 +-
.../books/handbook/vinum/chapter.xml | 14 +-
.../articles/building-products/article.xml | 4 +-
.../handbook/advanced-networking/chapter.xml | 10 +-
.../books/handbook/basics/chapter.xml | 12 +-
.../books/handbook/geom/chapter.xml | 2 +-
.../books/handbook/install/chapter.xml | 114 ++++++++---------
.../books/handbook/mail/chapter.xml | 16 +--
.../books/handbook/vinum/chapter.xml | 14 +-
.../books/handbook/virtualization/chapter.xml | 52 ++++----
.../books/fdp-primer/sgml-markup/chapter.xml | 6 +-
.../handbook/advanced-networking/chapter.xml | 10 +-
.../books/handbook/basics/chapter.xml | 12 +-
.../books/handbook/geom/chapter.xml | 2 +-
.../books/handbook/install/chapter.xml | 116 ++++++++---------
.../books/handbook/mail/chapter.xml | 16 +--
.../books/handbook/vinum/chapter.xml | 14 +-
.../books/handbook/virtualization/chapter.xml | 76 +++++------
.../articles/vm-design/article.xml | 8 +-
.../books/handbook/basics/chapter.xml | 12 +-
.../books/handbook/geom/chapter.xml | 2 +-
.../books/handbook/install/chapter.xml | 116 ++++++++---------
.../books/handbook/mail/chapter.xml | 16 +--
.../books/handbook/vinum/chapter.xml | 14 +-
ja_JP.eucJP/books/design-44bsd/book.xml | 4 +-
.../handbook/advanced-networking/chapter.xml | 8 +-
.../books/handbook/bsdinstall/chapter.xml | 88 ++++++-------
.../books/handbook/install/chapter.xml | 114 ++++++++---------
.../handbook/advanced-networking/chapter.xml | 12 +-
mn_MN.UTF-8/books/handbook/basics/chapter.xml | 12 +-
.../books/handbook/bsdinstall/chapter.xml | 88 ++++++-------
mn_MN.UTF-8/books/handbook/geom/chapter.xml | 2 +-
.../books/handbook/install/chapter.xml | 114 ++++++++---------
mn_MN.UTF-8/books/handbook/mail/chapter.xml | 16 +--
mn_MN.UTF-8/books/handbook/vinum/chapter.xml | 14 +-
.../books/handbook/virtualization/chapter.xml | 76 +++++------
.../handbook/advanced-networking/chapter.xml | 12 +-
.../books/handbook/basics/chapter.xml | 12 +-
.../books/handbook/geom/chapter.xml | 2 +-
.../books/handbook/install/chapter.xml | 114 ++++++++---------
.../books/handbook/mail/chapter.xml | 16 +--
.../books/handbook/vinum/chapter.xml | 14 +-
.../books/handbook/virtualization/chapter.xml | 76 +++++------
.../books/handbook/basics/chapter.xml | 2 +-
.../books/handbook/install/chapter.xml | 120 +++++++++---------
.../handbook/advanced-networking/chapter.xml | 10 +-
.../books/handbook/basics/chapter.xml | 12 +-
.../books/handbook/geom/chapter.xml | 2 +-
.../books/handbook/install/chapter.xml | 116 ++++++++---------
.../books/handbook/mail/chapter.xml | 16 +--
.../books/handbook/security/chapter.xml | 8 +-
.../books/handbook/vinum/chapter.xml | 14 +-
.../articles/building-products/article.xml | 4 +-
.../books/fdp-primer/sgml-markup/chapter.xml | 6 +-
ru_RU.KOI8-R/articles/releng/article.xml | 16 +--
ru_RU.KOI8-R/articles/vm-design/article.xml | 8 +-
ru_RU.KOI8-R/books/design-44bsd/book.xml | 4 +-
.../books/fdp-primer/sgml-markup/chapter.xml | 6 +-
.../handbook/advanced-networking/chapter.xml | 10 +-
.../books/handbook/basics/chapter.xml | 12 +-
.../books/handbook/bsdinstall/chapter.xml | 88 ++++++-------
ru_RU.KOI8-R/books/handbook/geom/chapter.xml | 2 +-
.../books/handbook/install/chapter.xml | 114 ++++++++---------
ru_RU.KOI8-R/books/handbook/mail/chapter.xml | 16 +--
.../books/handbook/security/chapter.xml | 8 +-
ru_RU.KOI8-R/books/handbook/vinum/chapter.xml | 14 +-
.../handbook/advanced-networking/chapter.xml | 10 +-
.../books/handbook/basics/chapter.xml | 12 +-
.../books/handbook/bsdinstall/chapter.xml | 88 ++++++-------
zh_CN.GB2312/books/handbook/geom/chapter.xml | 2 +-
.../books/handbook/install/chapter.xml | 116 ++++++++---------
zh_CN.GB2312/books/handbook/mail/chapter.xml | 16 +--
zh_CN.GB2312/books/handbook/vinum/chapter.xml | 14 +-
.../books/handbook/virtualization/chapter.xml | 76 +++++------
.../developers-handbook/sockets/chapter.xml | 22 ++--
.../books/fdp-primer/sgml-markup/chapter.xml | 6 +-
.../handbook/advanced-networking/chapter.xml | 10 +-
zh_TW.Big5/books/handbook/basics/chapter.xml | 12 +-
zh_TW.Big5/books/handbook/geom/chapter.xml | 2 +-
zh_TW.Big5/books/handbook/install/chapter.xml | 114 ++++++++---------
zh_TW.Big5/books/handbook/mail/chapter.xml | 16 +--
.../books/handbook/security/chapter.xml | 8 +-
zh_TW.Big5/books/handbook/vinum/chapter.xml | 14 +-
.../books/handbook/virtualization/chapter.xml | 76 +++++------
122 files changed, 1953 insertions(+), 1953 deletions(-)
diff --git a/de_DE.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml b/de_DE.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml
index b5237ecd27..b43c488ff7 100644
--- a/de_DE.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml
+++ b/de_DE.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml
@@ -2610,13 +2610,13 @@ This is the file called 'foo2'</screen>
<para>Das folgende Beispiel soll das bisher geschriebene
illustrieren. Angenommen es liegt eine einzubindene Grafik
- in der Datei <filename>bild1</filename> vor, die die
+ in der Datei <filename>bild1.png</filename> vor, die die
Darstellung eines As in einem Rechteck enth�lt. Die
ASCII-Alternative k�nnte so ausgezeichnet werden:</para>
<programlisting><mediaobject>
<imageobject>
- <imagedata fileref="bild1"> <co id="co-image-ext"/>
+ <imagedata fileref="bild1.png"> <co id="co-image-ext"/>
</imageobject>
<textobject>
<literallayout class="monospaced">+ - - - - - - - - - - - - - - -+ <co id="co-image-literal"/>
@@ -2730,7 +2730,7 @@ IMAGES+= bild3.png
<programlisting><mediaobject>
<imageobject>
- <imagedata fileref="kapitel1/bild1"> <co id="co-image-dir"/>
+ <imagedata fileref="kapitel1/bild1.png"> <co id="co-image-dir"/>
</imageobject>
…
diff --git a/de_DE.ISO8859-1/books/handbook/advanced-networking/chapter.xml b/de_DE.ISO8859-1/books/handbook/advanced-networking/chapter.xml
index 95c92266d1..5f3f62dcc0 100644
--- a/de_DE.ISO8859-1/books/handbook/advanced-networking/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/advanced-networking/chapter.xml
@@ -365,7 +365,7 @@ host2.example.com link#1 UC 0 0
<mediaobject>
<imageobject>
- <imagedata fileref="advanced-networking/net-routing"/>
+ <imagedata fileref="advanced-networking/net-routing.pic"/>
</imageobject>
<textobject>
@@ -580,7 +580,7 @@ host2.example.com link#1 UC 0 0
<mediaobject>
<imageobject>
- <imagedata fileref="advanced-networking/static-routes"/>
+ <imagedata fileref="advanced-networking/static-routes.pic"/>
</imageobject>
<textobject>
@@ -5057,7 +5057,7 @@ cd /usr/src/etc; make distribution</programlisting>
<mediaobject>
<imageobject>
- <imagedata fileref="advanced-networking/isdn-bus"/>
+ <imagedata fileref="advanced-networking/isdn-bus.eps"/>
</imageobject>
<textobject>
@@ -5096,7 +5096,7 @@ ISDN BRI Verbindung
<mediaobject>
<imageobject>
- <imagedata fileref="advanced-networking/isdn-twisted-pair"/>
+ <imagedata fileref="advanced-networking/isdn-twisted-pair.eps"/>
</imageobject>
<textobject>
@@ -5217,7 +5217,7 @@ ISDN BRI Verbindung
<mediaobject>
<imageobject>
- <imagedata fileref="advanced-networking/natd"/>
+ <imagedata fileref="advanced-networking/natd.eps"/>
</imageobject>
<textobject>
diff --git a/de_DE.ISO8859-1/books/handbook/basics/chapter.xml b/de_DE.ISO8859-1/books/handbook/basics/chapter.xml
index 5bca0654f8..5e28e05edc 100644
--- a/de_DE.ISO8859-1/books/handbook/basics/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/basics/chapter.xml
@@ -1191,7 +1191,7 @@ Old Password:</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir1" format="EPS"/>
+ <imagedata fileref="install/example-dir1.eps" format="EPS"/>
</imageobject>
<textobject>
@@ -1214,7 +1214,7 @@ Old Password:</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir2" format="EPS"/>
+ <imagedata fileref="install/example-dir2.eps" format="EPS"/>
</imageobject>
<textobject>
@@ -1249,7 +1249,7 @@ Old Password:</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir3" format="EPS"/>
+ <imagedata fileref="install/example-dir3.eps" format="EPS"/>
</imageobject>
<textobject>
@@ -1277,7 +1277,7 @@ Old Password:</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir4" format="EPS"/>
+ <imagedata fileref="install/example-dir4.eps" format="EPS"/>
</imageobject>
<textobject>
@@ -1303,7 +1303,7 @@ Old Password:</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir5" format="EPS"/>
+ <imagedata fileref="install/example-dir5.eps" format="EPS"/>
</imageobject>
<textobject>
@@ -1641,7 +1641,7 @@ Old Password:</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/disk-layout" format="EPS"/>
+ <imagedata fileref="install/disk-layout.eps" format="EPS"/>
</imageobject>
<textobject>
diff --git a/de_DE.ISO8859-1/books/handbook/bsdinstall/chapter.xml b/de_DE.ISO8859-1/books/handbook/bsdinstall/chapter.xml
index b6f0d268bc..7a9093a649 100644
--- a/de_DE.ISO8859-1/books/handbook/bsdinstall/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/bsdinstall/chapter.xml
@@ -725,7 +725,7 @@ Loading /boot/defaults/loader.conf
<title>Das &os;-Bootloader Men�</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-boot-loader-menu"
+ <imagedata fileref="bsdinstall/bsdinstall-boot-loader-menu.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -1023,7 +1023,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-choose-mode" format="PNG"/>
+ fileref="bsdinstall/bsdinstall-choose-mode.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1066,7 +1066,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>Tastaturbelegung festlegen</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-keymap-select-default" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-keymap-select-default.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1080,7 +1080,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>Tastaturauswahlbildschirm</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-config-keymap" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-config-keymap.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1110,7 +1110,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>Festlegen des Rechnernamens</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-config-hostname" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-config-hostname.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1131,7 +1131,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>Komponenten f�r die Installation ausw�hlen</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-config-components" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-config-components.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1224,7 +1224,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-netinstall-files" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-netinstall-files.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1244,7 +1244,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-netinstall-mirrorselect" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-netinstall-mirrorselect.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1271,7 +1271,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>Gef�hrte oder manuelle Partitionierung ausw�hlen</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-part-guided-manual" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-part-guided-manual.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1286,7 +1286,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>Aus mehreren Platten eine ausw�hlen</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-part-guided-disk" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-part-guided-disk.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1304,7 +1304,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>Auswahl der gesamten Platte oder einer Partition</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-part-entire-part" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-part-entire-part.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1325,7 +1325,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>�berpr�fen der erstellen Partitionen</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-part-review" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-part-review.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1341,7 +1341,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>Partitionen manuell erstellen</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-part-manual-create" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-part-manual-create.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1356,7 +1356,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>Partitionen manuell anlegen</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-part-manual-partscheme" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-part-manual-partscheme.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1429,7 +1429,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>Partitionen manuell erzeugen</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-part-manual-addpart" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-part-manual-addpart.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1608,7 +1608,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>Letzte Best�tigung</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-final-confirmation" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-final-confirmation.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1640,7 +1640,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>Herunterladen der Distributionsdateien</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-distfile-fetching" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-distfile-fetching.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1654,7 +1654,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>�berpr�fen der Distributionsdateien</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-distfile-verifying" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-distfile-verifying.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1666,7 +1666,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>Entpacken der Distributionsdateien</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-distfile-extracting" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-distfile-extracting.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1700,7 +1700,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-post-root-passwd" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-post-root-passwd.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1728,7 +1728,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1764,7 +1764,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>Nach drahtlosen Access Points scannen</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-configure-wireless-scan" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-configure-wireless-scan.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1787,7 +1787,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>Ein drahtloses Netzwerk ausw�hlen</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-configure-wireless-accesspoints" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-configure-wireless-accesspoints.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1805,7 +1805,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>Verbindungsaufbau mit WPA2</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-configure-wireless-wpa2setup" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-configure-wireless-wpa2setup.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1827,7 +1827,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-ipv4" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-ipv4.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1863,7 +1863,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-ipv4-dhcp" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-ipv4-dhcp.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1880,7 +1880,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-ipv4-static" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-ipv4-static.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1924,7 +1924,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-ipv6" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-ipv6.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1951,7 +1951,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-slaac" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-slaac.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1969,7 +1969,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-ipv6-static" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-ipv6-static.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2018,7 +2018,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-configure-network-ipv4-dns" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-configure-network-ipv4-dns.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2042,7 +2042,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>Lokale oder UTC-Zeit</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-set-clock-local-utc" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-set-clock-local-utc.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2059,7 +2059,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>Das Gebiet ausw�hlen</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-timezone-region" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-timezone-region.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2072,7 +2072,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>Das Land ausw�hlen</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-timezone-country" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-timezone-country.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2085,7 +2085,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>W�hlen einer Zeitzone</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-timezone-zone" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-timezone-zone.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2098,7 +2098,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>Best�tigen der Zeitzone</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-timezone-confirm" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-timezone-confirm.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2120,7 +2120,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>Auswahl zus�tzlicher Dienste</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-config-services" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-config-services.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2169,7 +2169,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>Aktivierung der Absturzaufzeichnung</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-config-crashdump" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-config-crashdump.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2194,7 +2194,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-adduser1" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-adduser1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2207,7 +2207,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-adduser2" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-adduser2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2310,7 +2310,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-adduser3" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-adduser3.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2337,7 +2337,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-finalconfiguration" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-finalconfiguration.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2394,7 +2394,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-final-modification-shell" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-final-modification-shell.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2412,7 +2412,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-mainexit" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-mainexit.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
diff --git a/de_DE.ISO8859-1/books/handbook/geom/chapter.xml b/de_DE.ISO8859-1/books/handbook/geom/chapter.xml
index 6b80fc3b3f..b1063e6ab0 100644
--- a/de_DE.ISO8859-1/books/handbook/geom/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/geom/chapter.xml
@@ -163,7 +163,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="geom/striping" align="center"/>
+ <imagedata fileref="geom/striping.pic" align="center"/>
</imageobject>
<textobject>
diff --git a/de_DE.ISO8859-1/books/handbook/install/chapter.xml b/de_DE.ISO8859-1/books/handbook/install/chapter.xml
index d855dcfbee..496d37d0ba 100644
--- a/de_DE.ISO8859-1/books/handbook/install/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/install/chapter.xml
@@ -1113,7 +1113,7 @@ Insert disk labelled "Kernel floppy 1" and press any key...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/boot-loader-menu" format="PNG"/>
+ <imagedata fileref="install/boot-loader-menu.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1291,7 +1291,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/config-country" format="PNG"/>
+ <imagedata fileref="install/config-country.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1309,7 +1309,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/config-keymap" format="PNG"/>
+ <imagedata fileref="install/config-keymap.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1353,7 +1353,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main1" format="PNG"/>
+ <imagedata fileref="install/main1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1370,7 +1370,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main-doc" format="PNG"/>
+ <imagedata fileref="install/main-doc.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1382,7 +1382,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/docmenu1" format="PNG"/>
+ <imagedata fileref="install/docmenu1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1414,7 +1414,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main-keymap" format="PNG"/>
+ <imagedata fileref="install/main-keymap.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1438,7 +1438,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/keymap" format="PNG"/>
+ <imagedata fileref="install/keymap.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1455,7 +1455,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main-options" format="PNG"/>
+ <imagedata fileref="install/main-options.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1465,7 +1465,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/options" format="PNG"/>
+ <imagedata fileref="install/options.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1504,7 +1504,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main-std" format="PNG"/>
+ <imagedata fileref="install/main-std.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1699,7 +1699,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/fdisk-drive1" format="PNG"/>
+ <imagedata fileref="install/fdisk-drive1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1775,7 +1775,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/fdisk-edit1" format="PNG"/>
+ <imagedata fileref="install/fdisk-edit1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1824,7 +1824,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/fdisk-edit2" format="PNG"/>
+ <imagedata fileref="install/fdisk-edit2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1871,7 +1871,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/boot-mgr" format="PNG"/>
+ <imagedata fileref="install/boot-mgr.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1903,7 +1903,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/fdisk-drive2" format="PNG"/>
+ <imagedata fileref="install/fdisk-drive2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2177,7 +2177,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-ed1" format="PNG"/>
+ <imagedata fileref="install/disklabel-ed1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2207,7 +2207,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-auto" format="PNG"/>
+ <imagedata fileref="install/disklabel-auto.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2235,7 +2235,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-root1" format="PNG"/>
+ <imagedata fileref="install/disklabel-root1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2255,7 +2255,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-root2" format="PNG"/>
+ <imagedata fileref="install/disklabel-root2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2273,7 +2273,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-fs" format="PNG"/>
+ <imagedata fileref="install/disklabel-fs.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2291,7 +2291,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-root3" format="PNG"/>
+ <imagedata fileref="install/disklabel-root3.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2317,7 +2317,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-ed2" format="PNG"/>
+ <imagedata fileref="install/disklabel-ed2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2375,7 +2375,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/dist-set" format="PNG"/>
+ <imagedata fileref="install/dist-set.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2434,7 +2434,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/dist-set2" format="PNG"/>
+ <imagedata fileref="install/dist-set2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2471,7 +2471,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/media" format="PNG"/>
+ <imagedata fileref="install/media.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2679,7 +2679,7 @@ installation menus to retry whichever operations have failed.
<mediaobject>
<imageobject>
- <imagedata fileref="install/ed0-conf" format="PNG"/>
+ <imagedata fileref="install/ed0-conf.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2732,7 +2732,7 @@ installation menus to retry whichever operations have failed.
<mediaobject>
<imageobject>
- <imagedata fileref="install/ed0-conf2" format="PNG"/>
+ <imagedata fileref="install/ed0-conf2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2917,7 +2917,7 @@ use the current settings.
<mediaobject>
<imageobject>
- <imagedata fileref="install/edit-inetd-conf" format="PNG"/>
+ <imagedata fileref="install/edit-inetd-conf.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3017,7 +3017,7 @@ use the current settings.
<mediaobject>
<imageobject>
- <imagedata fileref="install/ftp-anon1" format="PNG"/>
+ <imagedata fileref="install/ftp-anon1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3100,7 +3100,7 @@ use the current settings.
<mediaobject>
<imageobject>
- <imagedata fileref="install/ftp-anon2" format="PNG"/>
+ <imagedata fileref="install/ftp-anon2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3164,7 +3164,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/nfs-server-edit" format="PNG"/>
+ <imagedata fileref="install/nfs-server-edit.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3219,7 +3219,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/console-saver1" format="PNG"/>
+ <imagedata fileref="install/console-saver1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3234,7 +3234,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/console-saver2" format="PNG"/>
+ <imagedata fileref="install/console-saver2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3257,7 +3257,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/console-saver3" format="PNG"/>
+ <imagedata fileref="install/console-saver3.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3271,7 +3271,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/console-saver4" format="PNG"/>
+ <imagedata fileref="install/console-saver4.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3318,7 +3318,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/timezone1" format="PNG"/>
+ <imagedata fileref="install/timezone1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3331,7 +3331,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/timezone2" format="PNG"/>
+ <imagedata fileref="install/timezone2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3344,7 +3344,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/timezone3" format="PNG"/>
+ <imagedata fileref="install/timezone3.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3416,7 +3416,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse1" format="PNG"/>
+ <imagedata fileref="install/mouse1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3430,7 +3430,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse2" format="PNG"/>
+ <imagedata fileref="install/mouse2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3447,7 +3447,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse3" format="PNG"/>
+ <imagedata fileref="install/mouse3.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3461,7 +3461,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse4" format="PNG"/>
+ <imagedata fileref="install/mouse4.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3477,7 +3477,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse5" format="PNG"/>
+ <imagedata fileref="install/mouse5.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3493,7 +3493,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse6" format="PNG"/>
+ <imagedata fileref="install/mouse6.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3542,7 +3542,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/pkg-cat" format="PNG"/>
+ <imagedata fileref="install/pkg-cat.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3565,7 +3565,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/pkg-sel" format="PNG"/>
+ <imagedata fileref="install/pkg-sel.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3599,7 +3599,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/pkg-install" format="PNG"/>
+ <imagedata fileref="install/pkg-install.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3615,7 +3615,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/pkg-confirm" format="PNG"/>
+ <imagedata fileref="install/pkg-confirm.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3672,7 +3672,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/adduser1" format="PNG"/>
+ <imagedata fileref="install/adduser1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3686,7 +3686,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/adduser2" format="PNG"/>
+ <imagedata fileref="install/adduser2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3795,7 +3795,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/adduser3" format="PNG"/>
+ <imagedata fileref="install/adduser3.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3863,7 +3863,7 @@ Retype new password :</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/mainexit" format="PNG"/>
+ <imagedata fileref="install/mainexit.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3942,7 +3942,7 @@ Be sure to remove the media from the drive.
<mediaobject>
<imageobject>
- <imagedata fileref="install/net-config-menu1" format="PNG"/>
+ <imagedata fileref="install/net-config-menu1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -4016,7 +4016,7 @@ Be sure to remove the media from the drive.
<mediaobject>
<imageobject>
- <imagedata fileref="install/mta-main" format="PNG"/>
+ <imagedata fileref="install/mta-main.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -4073,7 +4073,7 @@ Be sure to remove the media from the drive.
<mediaobject>
<imageobject>
- <imagedata fileref="install/ntp-config" format="PNG"/>
+ <imagedata fileref="install/ntp-config.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -4101,7 +4101,7 @@ Be sure to remove the media from the drive.
<mediaobject>
<imageobject>
- <imagedata fileref="install/net-config-menu2" format="PNG"/>
+ <imagedata fileref="install/net-config-menu2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
diff --git a/de_DE.ISO8859-1/books/handbook/mail/chapter.xml b/de_DE.ISO8859-1/books/handbook/mail/chapter.xml
index d0f9654228..c2a5608de4 100644
--- a/de_DE.ISO8859-1/books/handbook/mail/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/mail/chapter.xml
@@ -2082,7 +2082,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/mutt1" format="PNG"/>
+ <imagedata fileref="mail/mutt1.png" format="PNG"/>
</imageobject>
</mediaobject>
@@ -2093,7 +2093,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/mutt2" format="PNG"/>
+ <imagedata fileref="mail/mutt2.png" format="PNG"/>
</imageobject>
</mediaobject>
@@ -2137,7 +2137,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/mutt3" format="PNG"/>
+ <imagedata fileref="mail/mutt3.png" format="PNG"/>
</imageobject>
</mediaobject>
@@ -2192,7 +2192,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine1" format="PNG"/>
+ <imagedata fileref="mail/pine1.png" format="PNG"/>
</imageobject>
</mediaobject>
@@ -2214,7 +2214,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine2" format="PNG"/>
+ <imagedata fileref="mail/pine2.png" format="PNG"/>
</imageobject>
</mediaobject>
@@ -2225,7 +2225,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine3" format="PNG"/>
+ <imagedata fileref="mail/pine3.png" format="PNG"/>
</imageobject>
</mediaobject>
@@ -2238,7 +2238,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine4" format="PNG"/>
+ <imagedata fileref="mail/pine4.png" format="PNG"/>
</imageobject>
</mediaobject>
@@ -2258,7 +2258,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine5" format="PNG"/>
+ <imagedata fileref="mail/pine5.png" format="PNG"/>
</imageobject>
</mediaobject>
diff --git a/de_DE.ISO8859-1/books/handbook/vinum/chapter.xml b/de_DE.ISO8859-1/books/handbook/vinum/chapter.xml
index 3a4089f3e7..bab6be4025 100644
--- a/de_DE.ISO8859-1/books/handbook/vinum/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/vinum/chapter.xml
@@ -214,7 +214,7 @@
<para>
<figure id="vinum-concat">
<title>Konkatenierte Anordnung</title>
- <graphic fileref="vinum/vinum-concat"/>
+ <graphic fileref="vinum/vinum-concat.pic"/>
</figure>
</para>
@@ -258,7 +258,7 @@
<para>
<figure id="vinum-striped">
<title>Striped-Anordnung</title>
- <graphic fileref="vinum/vinum-striped"/>
+ <graphic fileref="vinum/vinum-striped.pic"/>
</figure>
</para>
</sect1>
@@ -333,7 +333,7 @@
<para>
<figure id="vinum-raid5-org">
<title>RAID-5 Aufbau</title>
- <graphic fileref="vinum/vinum-raid5-org"/>
+ <graphic fileref="vinum/vinum-raid5-org.pic"/>
</figure>
</para>
@@ -646,7 +646,7 @@
<para>
<figure id="vinum-simple-vol">
<title>Ein einfaches Vinum-Volume</title>
- <graphic fileref="vinum/vinum-simple-vol"/>
+ <graphic fileref="vinum/vinum-simple-vol.pic"/>
</figure>
</para>
@@ -717,7 +717,7 @@
<para>
<figure id="vinum-mirrored-vol">
<title>Ein gespiegeltes Vinum Volume</title>
- <graphic fileref="vinum/vinum-mirrored-vol"/>
+ <graphic fileref="vinum/vinum-mirrored-vol.pic"/>
</figure>
</para>
@@ -786,7 +786,7 @@
<para>
<figure id="vinum-striped-vol">
<title>Ein Striped Vinum Volume</title>
- <graphic fileref="vinum/vinum-striped-vol"/>
+ <graphic fileref="vinum/vinum-striped-vol.pic"/>
</figure>
</para>
@@ -833,7 +833,7 @@
<para>
<figure id="vinum-raid10-vol">
<title>Ein gespiegeltes, Striped Vinum Volume</title>
- <graphic fileref="vinum/vinum-raid10-vol"/>
+ <graphic fileref="vinum/vinum-raid10-vol.pic"/>
</figure>
</para>
</sect2>
diff --git a/de_DE.ISO8859-1/books/handbook/virtualization/chapter.xml b/de_DE.ISO8859-1/books/handbook/virtualization/chapter.xml
index 433fc3898c..5cb283d384 100644
--- a/de_DE.ISO8859-1/books/handbook/virtualization/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/virtualization/chapter.xml
@@ -127,7 +127,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd1"/>
+ <imagedata fileref="virtualization/parallels-freebsd1.png"/>
</imageobject>
</mediaobject>
@@ -139,25 +139,25 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd2"/>
+ <imagedata fileref="virtualization/parallels-freebsd2.png"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd3"/>
+ <imagedata fileref="virtualization/parallels-freebsd3.png"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd4"/>
+ <imagedata fileref="virtualization/parallels-freebsd4.png"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd5"/>
+ <imagedata fileref="virtualization/parallels-freebsd5.png"/>
</imageobject>
</mediaobject>
@@ -166,13 +166,13 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd6"/>
+ <imagedata fileref="virtualization/parallels-freebsd6.png"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd7"/>
+ <imagedata fileref="virtualization/parallels-freebsd7.png"/>
</imageobject>
</mediaobject>
@@ -181,13 +181,13 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd8"/>
+ <imagedata fileref="virtualization/parallels-freebsd8.png"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd9"/>
+ <imagedata fileref="virtualization/parallels-freebsd9.png"/>
</imageobject>
</mediaobject>
@@ -204,7 +204,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd11"/>
+ <imagedata fileref="virtualization/parallels-freebsd11.png"/>
</imageobject>
</mediaobject>
@@ -218,7 +218,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd10"/>
+ <imagedata fileref="virtualization/parallels-freebsd10.png"/>
</imageobject>
</mediaobject>
@@ -230,7 +230,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd12"/>
+ <imagedata fileref="virtualization/parallels-freebsd12.png"/>
</imageobject>
</mediaobject>
@@ -239,7 +239,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd13"/>
+ <imagedata fileref="virtualization/parallels-freebsd13.png"/>
</imageobject>
</mediaobject>
</sect3>
@@ -647,13 +647,13 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd1"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd1.png"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd2"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd2.png"/>
</imageobject>
</mediaobject>
@@ -663,7 +663,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd3"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd3.png"/>
</imageobject>
</mediaobject>
@@ -675,13 +675,13 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd4"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd4.png"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd5"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd5.png"/>
</imageobject>
</mediaobject>
@@ -690,7 +690,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd6"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd6.png"/>
</imageobject>
</mediaobject>
@@ -701,13 +701,13 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd7"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd7.png"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd8"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd8.png"/>
</imageobject>
</mediaobject>
@@ -728,13 +728,13 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd9"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd9.png"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd10"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd10.png"/>
</imageobject>
</mediaobject>
@@ -748,7 +748,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd11"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd11.png"/>
</imageobject>
</mediaobject>
@@ -761,7 +761,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd12"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd12.png"/>
</imageobject>
</mediaobject>
@@ -772,7 +772,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd13"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd13.png"/>
</imageobject>
</mediaobject>
</sect3>
@@ -870,7 +870,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd01"/>
+ <imagedata fileref="virtualization/vmware-freebsd01.png"/>
</imageobject>
</mediaobject>
@@ -880,7 +880,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd02"/>
+ <imagedata fileref="virtualization/vmware-freebsd02.png"/>
</imageobject>
</mediaobject>
@@ -894,7 +894,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd03"/>
+ <imagedata fileref="virtualization/vmware-freebsd03.png"/>
</imageobject>
</mediaobject>
@@ -903,7 +903,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd04"/>
+ <imagedata fileref="virtualization/vmware-freebsd04.png"/>
</imageobject>
</mediaobject>
@@ -912,7 +912,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd06"/>
+ <imagedata fileref="virtualization/vmware-freebsd06.png"/>
</imageobject>
</mediaobject>
@@ -921,7 +921,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd07"/>
+ <imagedata fileref="virtualization/vmware-freebsd07.png"/>
</imageobject>
</mediaobject>
@@ -930,7 +930,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd08"/>
+ <imagedata fileref="virtualization/vmware-freebsd08.png"/>
</imageobject>
</mediaobject>
@@ -946,7 +946,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd09"/>
+ <imagedata fileref="virtualization/vmware-freebsd09.png"/>
</imageobject>
</mediaobject>
@@ -954,7 +954,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd10"/>
+ <imagedata fileref="virtualization/vmware-freebsd10.png"/>
</imageobject>
</mediaobject>
@@ -964,7 +964,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd11"/>
+ <imagedata fileref="virtualization/vmware-freebsd11.png"/>
</imageobject>
</mediaobject>
@@ -982,7 +982,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd12"/>
+ <imagedata fileref="virtualization/vmware-freebsd12.png"/>
</imageobject>
</mediaobject>
diff --git a/el_GR.ISO8859-7/books/handbook/advanced-networking/chapter.xml b/el_GR.ISO8859-7/books/handbook/advanced-networking/chapter.xml
index 81538410ca..290605189a 100644
--- a/el_GR.ISO8859-7/books/handbook/advanced-networking/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/advanced-networking/chapter.xml
@@ -292,7 +292,7 @@ host2.example.com link#1 UC 0 0
<mediaobject>
<imageobject>
- <imagedata fileref="advanced-networking/net-routing"/>
+ <imagedata fileref="advanced-networking/net-routing.pic"/>
</imageobject>
<textobject>
@@ -478,7 +478,7 @@ host2.example.com link#1 UC 0 0
<mediaobject>
<imageobject>
- <imagedata fileref="advanced-networking/static-routes"/>
+ <imagedata fileref="advanced-networking/static-routes.pic"/>
</imageobject>
<textobject>
@@ -3486,7 +3486,7 @@ cd /usr/src/etc; make distribution</programlisting>
<mediaobject>
<imageobject>
- <imagedata fileref="advanced-networking/isdn-bus"/>
+ <imagedata fileref="advanced-networking/isdn-bus.eps"/>
</imageobject>
<textobject>
@@ -3520,7 +3520,7 @@ ISDN BRI line</literallayout>
<mediaobject>
<imageobject>
- <imagedata fileref="advanced-networking/isdn-twisted-pair"/>
+ <imagedata fileref="advanced-networking/isdn-twisted-pair.eps"/>
</imageobject>
<textobject>
@@ -3623,7 +3623,7 @@ ISDN BRI line</literallayout>
<mediaobject>
<imageobject>
- <imagedata fileref="advanced-networking/natd"/>
+ <imagedata fileref="advanced-networking/natd.eps"/>
</imageobject>
<textobject>
diff --git a/el_GR.ISO8859-7/books/handbook/basics/chapter.xml b/el_GR.ISO8859-7/books/handbook/basics/chapter.xml
index bbb16b7598..2689d1903c 100644
--- a/el_GR.ISO8859-7/books/handbook/basics/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/basics/chapter.xml
@@ -1214,7 +1214,7 @@ root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01 passwd</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir1" format="EPS" />
+ <imagedata fileref="install/example-dir1.eps" format="EPS" />
</imageobject>
<textobject>
@@ -1235,7 +1235,7 @@ root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01 passwd</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir2" format="EPS"/>
+ <imagedata fileref="install/example-dir2.eps" format="EPS"/>
</imageobject>
<textobject>
@@ -1264,7 +1264,7 @@ root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01 passwd</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir3" format="EPS" />
+ <imagedata fileref="install/example-dir3.eps" format="EPS" />
</imageobject>
<textobject>
@@ -1291,7 +1291,7 @@ root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01 passwd</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir4" format="EPS"/>
+ <imagedata fileref="install/example-dir4.eps" format="EPS"/>
</imageobject>
<textobject>
@@ -1317,7 +1317,7 @@ root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01 passwd</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir5" format="EPS"/>
+ <imagedata fileref="install/example-dir5.eps" format="EPS"/>
</imageobject>
<textobject>
@@ -1635,7 +1635,7 @@ root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01 passwd</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/disk-layout" format="EPS"/>
+ <imagedata fileref="install/disk-layout.eps" format="EPS"/>
</imageobject>
<textobject>
diff --git a/el_GR.ISO8859-7/books/handbook/bsdinstall/chapter.xml b/el_GR.ISO8859-7/books/handbook/bsdinstall/chapter.xml
index 562791a918..6d01ce27a6 100644
--- a/el_GR.ISO8859-7/books/handbook/bsdinstall/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/bsdinstall/chapter.xml
@@ -693,7 +693,7 @@ Loading /boot/defaults/loader.conf
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-boot-loader-menu" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-boot-loader-menu.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -986,7 +986,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-choose-mode" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-choose-mode.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1032,7 +1032,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-keymap-select-default" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-keymap-select-default.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1047,7 +1047,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-config-keymap" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-config-keymap.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1076,7 +1076,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-config-hostname" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-config-hostname.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1098,7 +1098,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-config-components" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-config-components.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1188,7 +1188,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-netinstall-files" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-netinstall-files.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1205,7 +1205,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-netinstall-mirrorselect" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-netinstall-mirrorselect.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1232,7 +1232,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-part-guided-manual" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-part-guided-manual.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1248,7 +1248,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-part-guided-disk" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-part-guided-disk.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1267,7 +1267,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-part-entire-part" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-part-entire-part.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1288,7 +1288,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-part-review" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-part-review.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1305,7 +1305,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-part-manual-create" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-part-manual-create.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1321,7 +1321,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-part-manual-partscheme" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-part-manual-partscheme.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1397,7 +1397,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-part-manual-addpart" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-part-manual-addpart.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1581,7 +1581,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-final-confirmation" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-final-confirmation.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1613,7 +1613,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-distfile-fetching" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-distfile-fetching.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1627,7 +1627,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-distfile-verifying" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-distfile-verifying.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1640,7 +1640,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-distfile-extracting" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-distfile-extracting.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1674,7 +1674,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-post-root-passwd" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-post-root-passwd.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1700,7 +1700,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1735,7 +1735,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-configure-wireless-scan" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-configure-wireless-scan.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1756,7 +1756,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-configure-wireless-accesspoints" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-configure-wireless-accesspoints.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1774,7 +1774,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-configure-wireless-wpa2setup" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-configure-wireless-wpa2setup.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1795,7 +1795,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-ipv4" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-ipv4.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1826,7 +1826,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-ipv4-dhcp" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-ipv4-dhcp.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1843,7 +1843,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-ipv4-static" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-ipv4-static.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1888,7 +1888,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-ipv6" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-ipv6.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1914,7 +1914,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-slaac" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-slaac.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1931,7 +1931,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-ipv6-static" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-ipv6-static.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1978,7 +1978,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-configure-network-ipv4-dns" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-configure-network-ipv4-dns.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2002,7 +2002,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-set-clock-local-utc" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-set-clock-local-utc.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2020,7 +2020,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-timezone-region" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-timezone-region.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2033,7 +2033,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-timezone-country" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-timezone-country.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2046,7 +2046,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-timezone-zone" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-timezone-zone.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2059,7 +2059,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-timezone-confirm" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-timezone-confirm.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2081,7 +2081,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-config-services" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-config-services.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2131,7 +2131,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-config-crashdump" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-config-crashdump.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2156,7 +2156,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-adduser1" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-adduser1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2168,7 +2168,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-adduser2" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-adduser2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2272,7 +2272,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-adduser3" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-adduser3.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2298,7 +2298,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-finalconfiguration" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-finalconfiguration.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2355,7 +2355,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-final-modification-shell" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-final-modification-shell.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2372,7 +2372,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-mainexit" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-mainexit.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
diff --git a/el_GR.ISO8859-7/books/handbook/geom/chapter.xml b/el_GR.ISO8859-7/books/handbook/geom/chapter.xml
index 661117e46c..f6e61edf1f 100644
--- a/el_GR.ISO8859-7/books/handbook/geom/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/geom/chapter.xml
@@ -149,7 +149,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="geom/striping" align="center"/>
+ <imagedata fileref="geom/striping.pic" align="center"/>
</imageobject>
<textobject>
diff --git a/el_GR.ISO8859-7/books/handbook/install/chapter.xml b/el_GR.ISO8859-7/books/handbook/install/chapter.xml
index 66347a8c87..60ec6bf12f 100644
--- a/el_GR.ISO8859-7/books/handbook/install/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/install/chapter.xml
@@ -1066,7 +1066,7 @@ Insert disk labelled "Kernel floppy 1" and press any key...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/boot-loader-menu" format="PNG"/>
+ <imagedata fileref="install/boot-loader-menu.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1235,7 +1235,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/config-country" format="PNG"/>
+ <imagedata fileref="install/config-country.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1251,7 +1251,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/config-keymap" format="PNG"/>
+ <imagedata fileref="install/config-keymap.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1291,7 +1291,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main1" format="PNG"/>
+ <imagedata fileref="install/main1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1307,7 +1307,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main-doc" format="PNG"/>
+ <imagedata fileref="install/main-doc.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1319,7 +1319,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/docmenu1" format="PNG"/>
+ <imagedata fileref="install/docmenu1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1350,7 +1350,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main-keymap" format="PNG"/>
+ <imagedata fileref="install/main-keymap.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1372,7 +1372,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/keymap" format="PNG"/>
+ <imagedata fileref="install/keymap.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1389,7 +1389,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main-options" format="PNG"/>
+ <imagedata fileref="install/main-options.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1399,7 +1399,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/options" format="PNG"/>
+ <imagedata fileref="install/options.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1437,7 +1437,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main-std" format="PNG"/>
+ <imagedata fileref="install/main-std.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1619,7 +1619,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/fdisk-drive1" format="PNG"/>
+ <imagedata fileref="install/fdisk-drive1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1688,7 +1688,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/fdisk-edit1" format="PNG"/>
+ <imagedata fileref="install/fdisk-edit1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1734,7 +1734,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/fdisk-edit2" format="PNG"/>
+ <imagedata fileref="install/fdisk-edit2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1779,7 +1779,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/boot-mgr" format="PNG"/>
+ <imagedata fileref="install/boot-mgr.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1811,7 +1811,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/fdisk-drive2" format="PNG"/>
+ <imagedata fileref="install/fdisk-drive2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2070,7 +2070,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-ed1" format="PNG"/>
+ <imagedata fileref="install/disklabel-ed1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2100,7 +2100,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-auto" format="PNG"/>
+ <imagedata fileref="install/disklabel-auto.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2127,7 +2127,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-root1" format="PNG"/>
+ <imagedata fileref="install/disklabel-root1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2146,7 +2146,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-root2" format="PNG"/>
+ <imagedata fileref="install/disklabel-root2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2164,7 +2164,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-fs" format="PNG"/>
+ <imagedata fileref="install/disklabel-fs.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2181,7 +2181,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-root3" format="PNG"/>
+ <imagedata fileref="install/disklabel-root3.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2204,7 +2204,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-ed2" format="PNG"/>
+ <imagedata fileref="install/disklabel-ed2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2259,7 +2259,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/dist-set" format="PNG"/>
+ <imagedata fileref="install/dist-set.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2313,7 +2313,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/dist-set2" format="PNG"/>
+ <imagedata fileref="install/dist-set2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2346,7 +2346,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/media" format="PNG"/>
+ <imagedata fileref="install/media.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2549,7 +2549,7 @@ installation menus to retry whichever operations have failed.
<mediaobject>
<imageobject>
- <imagedata fileref="install/ed0-conf" format="PNG"/>
+ <imagedata fileref="install/ed0-conf.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2594,7 +2594,7 @@ installation menus to retry whichever operations have failed.
<mediaobject>
<imageobject>
- <imagedata fileref="install/ed0-conf2" format="PNG"/>
+ <imagedata fileref="install/ed0-conf2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2775,7 +2775,7 @@ use the current settings.
<mediaobject>
<imageobject>
- <imagedata fileref="install/edit-inetd-conf" format="PNG"/>
+ <imagedata fileref="install/edit-inetd-conf.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2870,7 +2870,7 @@ use the current settings.
<mediaobject>
<imageobject>
- <imagedata fileref="install/ftp-anon1" format="PNG"/>
+ <imagedata fileref="install/ftp-anon1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2952,7 +2952,7 @@ use the current settings.
<mediaobject>
<imageobject>
- <imagedata fileref="install/ftp-anon2" format="PNG"/>
+ <imagedata fileref="install/ftp-anon2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3012,7 +3012,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/nfs-server-edit" format="PNG"/>
+ <imagedata fileref="install/nfs-server-edit.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3064,7 +3064,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/console-saver1" format="PNG"/>
+ <imagedata fileref="install/console-saver1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3079,7 +3079,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/console-saver2" format="PNG"/>
+ <imagedata fileref="install/console-saver2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3099,7 +3099,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/console-saver3" format="PNG"/>
+ <imagedata fileref="install/console-saver3.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3113,7 +3113,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/console-saver4" format="PNG"/>
+ <imagedata fileref="install/console-saver4.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3156,7 +3156,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/timezone1" format="PNG"/>
+ <imagedata fileref="install/timezone1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3169,7 +3169,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/timezone2" format="PNG"/>
+ <imagedata fileref="install/timezone2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3182,7 +3182,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/timezone3" format="PNG"/>
+ <imagedata fileref="install/timezone3.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3251,7 +3251,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse1" format="PNG"/>
+ <imagedata fileref="install/mouse1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3265,7 +3265,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse2" format="PNG"/>
+ <imagedata fileref="install/mouse2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3282,7 +3282,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse3" format="PNG"/>
+ <imagedata fileref="install/mouse3.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3296,7 +3296,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse4" format="PNG"/>
+ <imagedata fileref="install/mouse4.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3311,7 +3311,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse5" format="PNG"/>
+ <imagedata fileref="install/mouse5.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3327,7 +3327,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse6" format="PNG"/>
+ <imagedata fileref="install/mouse6.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3370,7 +3370,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/pkg-cat" format="PNG"/>
+ <imagedata fileref="install/pkg-cat.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3391,7 +3391,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/pkg-sel" format="PNG"/>
+ <imagedata fileref="install/pkg-sel.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3420,7 +3420,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/pkg-install" format="PNG"/>
+ <imagedata fileref="install/pkg-install.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3435,7 +3435,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/pkg-confirm" format="PNG"/>
+ <imagedata fileref="install/pkg-confirm.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3477,7 +3477,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/adduser1" format="PNG"/>
+ <imagedata fileref="install/adduser1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3490,7 +3490,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/adduser2" format="PNG"/>
+ <imagedata fileref="install/adduser2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3593,7 +3593,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/adduser3" format="PNG"/>
+ <imagedata fileref="install/adduser3.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3658,7 +3658,7 @@ Retype new password :</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/mainexit" format="PNG"/>
+ <imagedata fileref="install/mainexit.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3733,7 +3733,7 @@ Retype new password :</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/net-config-menu1" format="PNG"/>
+ <imagedata fileref="install/net-config-menu1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3807,7 +3807,7 @@ Retype new password :</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/mta-main" format="PNG"/>
+ <imagedata fileref="install/mta-main.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3865,7 +3865,7 @@ Retype new password :</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/ntp-config" format="PNG"/>
+ <imagedata fileref="install/ntp-config.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3890,7 +3890,7 @@ Retype new password :</screen>
<title>������� ������� Lower-level (��������� ��������)</title>
<mediaobject>
<imageobject>
- <imagedata fileref="install/net-config-menu2" format="PNG"/>
+ <imagedata fileref="install/net-config-menu2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
diff --git a/el_GR.ISO8859-7/books/handbook/mail/chapter.xml b/el_GR.ISO8859-7/books/handbook/mail/chapter.xml
index 94d5860884..61a98b1d8e 100644
--- a/el_GR.ISO8859-7/books/handbook/mail/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/mail/chapter.xml
@@ -2031,7 +2031,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/mutt1" format="PNG"/>
+ <imagedata fileref="mail/mutt1.png" format="PNG"/>
</imageobject>
</mediaobject>
@@ -2042,7 +2042,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/mutt2" format="PNG"/>
+ <imagedata fileref="mail/mutt2.png" format="PNG"/>
</imageobject>
</mediaobject>
@@ -2080,7 +2080,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/mutt3" format="PNG"/>
+ <imagedata fileref="mail/mutt3.png" format="PNG"/>
</imageobject>
</mediaobject>
@@ -2133,7 +2133,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine1" format="PNG"/>
+ <imagedata fileref="mail/pine1.png" format="PNG"/>
</imageobject>
</mediaobject>
@@ -2154,7 +2154,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine2" format="PNG"/>
+ <imagedata fileref="mail/pine2.png" format="PNG"/>
</imageobject>
</mediaobject>
@@ -2165,7 +2165,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine3" format="PNG"/>
+ <imagedata fileref="mail/pine3.png" format="PNG"/>
</imageobject>
</mediaobject>
@@ -2178,7 +2178,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine4" format="PNG"/>
+ <imagedata fileref="mail/pine4.png" format="PNG"/>
</imageobject>
</mediaobject>
@@ -2196,7 +2196,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine5" format="PNG"/>
+ <imagedata fileref="mail/pine5.png" format="PNG"/>
</imageobject>
</mediaobject>
diff --git a/el_GR.ISO8859-7/books/handbook/security/chapter.xml b/el_GR.ISO8859-7/books/handbook/security/chapter.xml
index 4a0eaae769..fd8f0d47d8 100644
--- a/el_GR.ISO8859-7/books/handbook/security/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/security/chapter.xml
@@ -3281,7 +3281,7 @@ options IPSEC_DEBUG #debug for IP security
<mediaobject>
<imageobject>
- <imagedata fileref="security/ipsec-network" align="center"/>
+ <imagedata fileref="security/ipsec-network.pic" align="center"/>
</imageobject>
<textobject>
@@ -3778,7 +3778,7 @@ ipfw add 1 allow udp from W.X.Y.Z to A.B.C.D isakmp
<mediaobject>
<imageobject>
- <imagedata fileref="security/ipsec-out-pkt" align="center"/>
+ <imagedata fileref="security/ipsec-out-pkt.pic" align="center"/>
</imageobject>
<textobject>
@@ -3798,7 +3798,7 @@ ipfw add 1 allow udp from W.X.Y.Z to A.B.C.D isakmp
<mediaobject>
<imageobject>
- <imagedata fileref="security/ipsec-encap-pkt" align="center"/>
+ <imagedata fileref="security/ipsec-encap-pkt.pic" align="center"/>
</imageobject>
<textobject>
@@ -3932,7 +3932,7 @@ ipfw add 1 allow ipencap from W.X.Y.Z to A.B.C.D
<mediaobject>
<imageobject>
- <imagedata fileref="security/ipsec-crypt-pkt" align="center"/>
+ <imagedata fileref="security/ipsec-crypt-pkt.pic" align="center"/>
</imageobject>
<textobject>
diff --git a/el_GR.ISO8859-7/books/handbook/vinum/chapter.xml b/el_GR.ISO8859-7/books/handbook/vinum/chapter.xml
index 4d6b51e7bf..d6028b5eab 100644
--- a/el_GR.ISO8859-7/books/handbook/vinum/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/vinum/chapter.xml
@@ -189,7 +189,7 @@
<para>
<figure id="vinum-concat">
<title>�������� ���������</title>
- <graphic fileref="vinum/vinum-concat"/>
+ <graphic fileref="vinum/vinum-concat.pic"/>
</figure>
</para>
@@ -232,7 +232,7 @@
<para>
<figure id="vinum-striped">
<title>Striped Organization</title>
- <graphic fileref="vinum/vinum-striped"/>
+ <graphic fileref="vinum/vinum-striped.pic"/>
</figure>
</para>
</sect1>
@@ -304,7 +304,7 @@
<para>
<figure id="vinum-raid5-org">
<title>RAID-5 Organization</title>
- <graphic fileref="vinum/vinum-raid5-org"/>
+ <graphic fileref="vinum/vinum-raid5-org.pic"/>
</figure>
</para>
@@ -593,7 +593,7 @@
<para>
<figure id="vinum-simple-vol">
<title>���� ����� ����� Vinum</title>
- <graphic fileref="vinum/vinum-simple-vol"/>
+ <graphic fileref="vinum/vinum-simple-vol.pic"/>
</figure>
</para>
@@ -662,7 +662,7 @@
<para>
<figure id="vinum-mirrored-vol">
<title>���� Mirrored ����� Vinum </title>
- <graphic fileref="vinum/vinum-mirrored-vol"/>
+ <graphic fileref="vinum/vinum-mirrored-vol.pic"/>
</figure>
</para>
@@ -730,7 +730,7 @@
<para>
<figure id="vinum-striped-vol">
<title>���� Striped ����� Vinum</title>
- <graphic fileref="vinum/vinum-striped-vol"/>
+ <graphic fileref="vinum/vinum-striped-vol.pic"/>
</figure>
</para>
@@ -776,7 +776,7 @@
<para>
<figure id="vinum-raid10-vol">
<title>���� Mirrored ��� Striped ����� ��� Vinum</title>
- <graphic fileref="vinum/vinum-raid10-vol"/>
+ <graphic fileref="vinum/vinum-raid10-vol.pic"/>
</figure>
</para>
</sect2>
diff --git a/el_GR.ISO8859-7/books/handbook/virtualization/chapter.xml b/el_GR.ISO8859-7/books/handbook/virtualization/chapter.xml
index dd2f79e415..b0367e9f00 100644
--- a/el_GR.ISO8859-7/books/handbook/virtualization/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/virtualization/chapter.xml
@@ -116,7 +116,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd1"/>
+ <imagedata fileref="virtualization/parallels-freebsd1.png"/>
</imageobject>
</mediaobject>
@@ -128,25 +128,25 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd2"/>
+ <imagedata fileref="virtualization/parallels-freebsd2.png"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd3"/>
+ <imagedata fileref="virtualization/parallels-freebsd3.png"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd4"/>
+ <imagedata fileref="virtualization/parallels-freebsd4.png"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd5"/>
+ <imagedata fileref="virtualization/parallels-freebsd5.png"/>
</imageobject>
</mediaobject>
@@ -154,13 +154,13 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd6"/>
+ <imagedata fileref="virtualization/parallels-freebsd6.png"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd7"/>
+ <imagedata fileref="virtualization/parallels-freebsd7.png"/>
</imageobject>
</mediaobject>
@@ -168,13 +168,13 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd8"/>
+ <imagedata fileref="virtualization/parallels-freebsd8.png"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd9"/>
+ <imagedata fileref="virtualization/parallels-freebsd9.png"/>
</imageobject>
</mediaobject>
@@ -190,7 +190,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd11"/>
+ <imagedata fileref="virtualization/parallels-freebsd11.png"/>
</imageobject>
</mediaobject>
@@ -203,7 +203,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd10"/>
+ <imagedata fileref="virtualization/parallels-freebsd10.png"/>
</imageobject>
</mediaobject>
@@ -215,7 +215,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd12"/>
+ <imagedata fileref="virtualization/parallels-freebsd12.png"/>
</imageobject>
</mediaobject>
@@ -224,7 +224,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd13"/>
+ <imagedata fileref="virtualization/parallels-freebsd13.png"/>
</imageobject>
</mediaobject>
</sect3>
@@ -606,13 +606,13 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd1"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd1.png"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd2"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd2.png"/>
</imageobject>
</mediaobject>
@@ -621,7 +621,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd3"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd3.png"/>
</imageobject>
</mediaobject>
@@ -633,13 +633,13 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd4"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd4.png"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd5"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd5.png"/>
</imageobject>
</mediaobject>
@@ -647,7 +647,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd6"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd6.png"/>
</imageobject>
</mediaobject>
@@ -657,13 +657,13 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd7"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd7.png"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd8"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd8.png"/>
</imageobject>
</mediaobject>
@@ -682,13 +682,13 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd9"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd9.png"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd10"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd10.png"/>
</imageobject>
</mediaobject>
@@ -702,7 +702,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd11"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd11.png"/>
</imageobject>
</mediaobject>
@@ -715,7 +715,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd12"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd12.png"/>
</imageobject>
</mediaobject>
@@ -726,7 +726,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd13"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd13.png"/>
</imageobject>
</mediaobject>
</sect3>
@@ -808,7 +808,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd01"/>
+ <imagedata fileref="virtualization/vmware-freebsd01.png"/>
</imageobject>
</mediaobject>
@@ -818,7 +818,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd02"/>
+ <imagedata fileref="virtualization/vmware-freebsd02.png"/>
</imageobject>
</mediaobject>
@@ -830,7 +830,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd03"/>
+ <imagedata fileref="virtualization/vmware-freebsd03.png"/>
</imageobject>
</mediaobject>
@@ -839,7 +839,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd04"/>
+ <imagedata fileref="virtualization/vmware-freebsd04.png"/>
</imageobject>
</mediaobject>
@@ -848,7 +848,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd05"/>
+ <imagedata fileref="virtualization/vmware-freebsd05.png"/>
</imageobject>
</mediaobject>
@@ -857,7 +857,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd06"/>
+ <imagedata fileref="virtualization/vmware-freebsd06.png"/>
</imageobject>
</mediaobject>
@@ -866,7 +866,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd07"/>
+ <imagedata fileref="virtualization/vmware-freebsd07.png"/>
</imageobject>
</mediaobject>
@@ -876,7 +876,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd08"/>
+ <imagedata fileref="virtualization/vmware-freebsd08.png"/>
</imageobject>
</mediaobject>
@@ -891,7 +891,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd09"/>
+ <imagedata fileref="virtualization/vmware-freebsd09.png"/>
</imageobject>
</mediaobject>
@@ -900,7 +900,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd10"/>
+ <imagedata fileref="virtualization/vmware-freebsd10.png"/>
</imageobject>
</mediaobject>
@@ -912,7 +912,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd11"/>
+ <imagedata fileref="virtualization/vmware-freebsd11.png"/>
</imageobject>
</mediaobject>
@@ -927,7 +927,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd12"/>
+ <imagedata fileref="virtualization/vmware-freebsd12.png"/>
</imageobject>
</mediaobject>
diff --git a/en_US.ISO8859-1/articles/building-products/article.xml b/en_US.ISO8859-1/articles/building-products/article.xml
index a570e7834c..5cca22d6a0 100644
--- a/en_US.ISO8859-1/articles/building-products/article.xml
+++ b/en_US.ISO8859-1/articles/building-products/article.xml
@@ -392,7 +392,7 @@
<title>FreeBSD Organization</title>
<mediaobject>
<imageobject>
- <imagedata fileref="freebsd-organization" format="PIC"/>
+ <imagedata fileref="freebsd-organization.pic" format="PIC"/>
</imageobject>
</mediaobject>
</figure>
@@ -445,7 +445,7 @@
<title>FreeBSD Release Branches</title>
<mediaobject>
<imageobject>
- <imagedata fileref="freebsd-branches" format="EPS"/>
+ <imagedata fileref="freebsd-branches.eps" format="EPS"/>
</imageobject>
</mediaobject>
</figure>
diff --git a/en_US.ISO8859-1/articles/releng/article.xml b/en_US.ISO8859-1/articles/releng/article.xml
index 0312cfe574..f6d53836ef 100644
--- a/en_US.ISO8859-1/articles/releng/article.xml
+++ b/en_US.ISO8859-1/articles/releng/article.xml
@@ -290,7 +290,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="branches-head" align="center"/>
+ <imagedata fileref="branches-head.pic" align="center"/>
</imageobject>
<textobject>
@@ -300,7 +300,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="branches-releng3" align="center"/>
+ <imagedata fileref="branches-releng3.pic" align="center"/>
</imageobject>
<textobject>
@@ -310,7 +310,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="branches-releng4" align="center"/>
+ <imagedata fileref="branches-releng4.pic" align="center"/>
</imageobject>
<textobject>
@@ -320,7 +320,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="branches-releng5" align="center"/>
+ <imagedata fileref="branches-releng5.pic" align="center"/>
</imageobject>
<textobject>
@@ -330,7 +330,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="branches-releng6" align="center"/>
+ <imagedata fileref="branches-releng6.pic" align="center"/>
</imageobject>
<textobject>
@@ -340,7 +340,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="branches-releng7" align="center"/>
+ <imagedata fileref="branches-releng7.pic" align="center"/>
</imageobject>
<textobject>
@@ -350,7 +350,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="branches-releng8" align="center"/>
+ <imagedata fileref="branches-releng8.pic" align="center"/>
</imageobject>
<textobject>
@@ -360,7 +360,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="branches-releng9" align="center"/>
+ <imagedata fileref="branches-releng9.pic" align="center"/>
</imageobject>
<textobject>
diff --git a/en_US.ISO8859-1/articles/vm-design/article.xml b/en_US.ISO8859-1/articles/vm-design/article.xml
index 31c07e471d..e02a57fa3f 100644
--- a/en_US.ISO8859-1/articles/vm-design/article.xml
+++ b/en_US.ISO8859-1/articles/vm-design/article.xml
@@ -185,7 +185,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="fig1" format="EPS"/>
+ <imagedata fileref="fig1.eps" format="EPS"/>
</imageobject>
<textobject>
@@ -207,7 +207,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="fig2" format="EPS"/>
+ <imagedata fileref="fig2.eps" format="EPS"/>
</imageobject>
<textobject>
@@ -227,7 +227,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="fig3" format="EPS"/>
+ <imagedata fileref="fig3.eps" format="EPS"/>
</imageobject>
<textobject>
@@ -257,7 +257,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="fig4" format="EPS"/>
+ <imagedata fileref="fig4.eps" format="EPS"/>
</imageobject>
<textobject>
diff --git a/en_US.ISO8859-1/books/design-44bsd/book.xml b/en_US.ISO8859-1/books/design-44bsd/book.xml
index 3b0a11ea93..f3b0b720d3 100644
--- a/en_US.ISO8859-1/books/design-44bsd/book.xml
+++ b/en_US.ISO8859-1/books/design-44bsd/book.xml
@@ -677,7 +677,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="fig1" format="EPS"/>
+ <imagedata fileref="fig1.eps" format="EPS"/>
</imageobject>
<textobject>
@@ -1663,7 +1663,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="fig2" format="EPS"/>
+ <imagedata fileref="fig2.eps" format="EPS"/>
</imageobject>
<textobject>
diff --git a/en_US.ISO8859-1/books/developers-handbook/sockets/chapter.xml b/en_US.ISO8859-1/books/developers-handbook/sockets/chapter.xml
index 7cb263be69..3eec7e8b70 100644
--- a/en_US.ISO8859-1/books/developers-handbook/sockets/chapter.xml
+++ b/en_US.ISO8859-1/books/developers-handbook/sockets/chapter.xml
@@ -111,7 +111,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="sockets/layers"/>
+ <imagedata fileref="sockets/layers.eps"/>
</imageobject>
<textobject>
@@ -288,7 +288,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="sockets/slayers"/>
+ <imagedata fileref="sockets/slayers.eps"/>
</imageobject>
<textobject>
@@ -561,7 +561,7 @@ struct sockaddr_in {
<mediaobject>
<imageobject>
- <imagedata fileref="sockets/sain"/>
+ <imagedata fileref="sockets/sain.eps"/>
</imageobject>
<textobject>
@@ -605,7 +605,7 @@ struct sockaddr_in {
<mediaobject>
<imageobject>
- <imagedata fileref="sockets/sainfill"/>
+ <imagedata fileref="sockets/sainfill.eps"/>
</imageobject>
<textobject>
@@ -669,7 +669,7 @@ struct in_addr {
<mediaobject>
<imageobject>
- <imagedata fileref="sockets/sainlsb"/>
+ <imagedata fileref="sockets/sainlsb.eps"/>
</imageobject>
<textobject>
@@ -695,7 +695,7 @@ struct in_addr {
<mediaobject>
<imageobject>
- <imagedata fileref="sockets/sainmsb"/>
+ <imagedata fileref="sockets/sainmsb.eps"/>
</imageobject>
<textobject>
@@ -789,7 +789,7 @@ struct in_addr {
<mediaobject>
<imageobject>
- <imagedata fileref="sockets/sainlsb"/>
+ <imagedata fileref="sockets/sainlsb.eps"/>
</imageobject>
<textobject>
@@ -816,7 +816,7 @@ struct in_addr {
<mediaobject>
<imageobject>
- <imagedata fileref="sockets/sainmsb"/>
+ <imagedata fileref="sockets/sainmsb.eps"/>
</imageobject>
<textobject>
@@ -1073,7 +1073,7 @@ int bind(int s, const struct sockaddr *addr, socklen_t addrlen);
<mediaobject>
<imageobject>
- <imagedata fileref="sockets/sainserv"/>
+ <imagedata fileref="sockets/sainserv.eps"/>
</imageobject>
<textobject>
@@ -1336,7 +1336,7 @@ int main() {
<mediaobject>
<imageobject>
- <imagedata fileref="sockets/serv"/>
+ <imagedata fileref="sockets/serv.eps"/>
</imageobject>
<textobject>
@@ -1693,7 +1693,7 @@ struct servent * getservbyname(const char *name, const char *proto);
<mediaobject>
<imageobject>
- <imagedata fileref="sockets/serv2"/>
+ <imagedata fileref="sockets/serv2.eps"/>
</imageobject>
<textobject>
diff --git a/en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml b/en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml
index 9ada557496..d5add73974 100644
--- a/en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml
+++ b/en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml
@@ -2413,13 +2413,13 @@ This is the file called 'foo2'</screen>
<para>An example will probably make things easier to
understand. Suppose you have an image, called
- <filename>fig1</filename>, that you want to include in the
+ <filename>fig1.png</filename>, that you want to include in the
document. This image is of a rectangle with an A inside it.
The markup for this would be as follows.</para>
<programlisting><mediaobject>
<imageobject>
- <imagedata fileref="fig1"> <co id="co-image-ext"/>
+ <imagedata fileref="fig1.png"> <co id="co-image-ext"/>
</imageobject>
<textobject>
@@ -2534,7 +2534,7 @@ IMAGES+= fig3.png
<programlisting><mediaobject>
<imageobject>
- <imagedata fileref="chapter1/fig1"> <co id="co-image-dir"/>
+ <imagedata fileref="chapter1/fig1.png"> <co id="co-image-dir"/>
</imageobject>
…
diff --git a/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml b/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml
index 143646add5..63642effc3 100644
--- a/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml
@@ -298,7 +298,7 @@ host2.example.com link#1 UC 0 0
<mediaobject>
<imageobject>
- <imagedata fileref="advanced-networking/net-routing"/>
+ <imagedata fileref="advanced-networking/net-routing.pic"/>
</imageobject>
<textobject>
@@ -490,7 +490,7 @@ host2.example.com link#1 UC 0 0
<mediaobject>
<imageobject>
- <imagedata fileref="advanced-networking/static-routes"/>
+ <imagedata fileref="advanced-networking/static-routes.pic"/>
</imageobject>
<textobject>
@@ -4654,7 +4654,7 @@ myhost.example.com:/b/tftpboot/FreeBSD/install / nfs ro
<area id="co-pxenfs5" coords="3108,2666 3519,1800"/>
</areaspec>
<imageobject>
- <imagedata fileref="advanced-networking/pxe-nfs"/>
+ <imagedata fileref="advanced-networking/pxe-nfs.png"/>
</imageobject>
<calloutlist>
<callout arearefs="co-pxenfs1">
@@ -4977,7 +4977,7 @@ Received 264951 bytes in 0.1 seconds</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="advanced-networking/isdn-bus"/>
+ <imagedata fileref="advanced-networking/isdn-bus.eps"/>
</imageobject>
<textobject>
@@ -5012,7 +5012,7 @@ ISDN BRI line</literallayout>
<mediaobject>
<imageobject>
<imagedata
- fileref="advanced-networking/isdn-twisted-pair"/>
+ fileref="advanced-networking/isdn-twisted-pair.eps"/>
</imageobject>
<textobject>
@@ -5126,7 +5126,7 @@ ISDN BRI line</literallayout>
<mediaobject>
<imageobject>
- <imagedata fileref="advanced-networking/natd"/>
+ <imagedata fileref="advanced-networking/natd.eps"/>
</imageobject>
<textobject>
diff --git a/en_US.ISO8859-1/books/handbook/basics/chapter.xml b/en_US.ISO8859-1/books/handbook/basics/chapter.xml
index 23dde1ae1f..56dd5d180a 100644
--- a/en_US.ISO8859-1/books/handbook/basics/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/basics/chapter.xml
@@ -1113,7 +1113,7 @@ root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01 passwd</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir1" format="EPS"/>
+ <imagedata fileref="install/example-dir1.eps" format="EPS"/>
</imageobject>
<textobject>
@@ -1134,7 +1134,7 @@ root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01 passwd</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir2" format="EPS"/>
+ <imagedata fileref="install/example-dir2.eps" format="EPS"/>
</imageobject>
<textobject>
@@ -1164,7 +1164,7 @@ root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01 passwd</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir3" format="EPS"/>
+ <imagedata fileref="install/example-dir3.eps" format="EPS"/>
</imageobject>
<textobject>
@@ -1191,7 +1191,7 @@ root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01 passwd</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir4" format="EPS"/>
+ <imagedata fileref="install/example-dir4.eps" format="EPS"/>
</imageobject>
<textobject>
@@ -1217,7 +1217,7 @@ root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01 passwd</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir5" format="EPS"/>
+ <imagedata fileref="install/example-dir5.eps" format="EPS"/>
</imageobject>
<textobject>
@@ -1517,7 +1517,7 @@ root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01 passwd</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/disk-layout" format="EPS"/>
+ <imagedata fileref="install/disk-layout.eps" format="EPS"/>
</imageobject>
<textobject>
diff --git a/en_US.ISO8859-1/books/handbook/bsdinstall/chapter.xml b/en_US.ISO8859-1/books/handbook/bsdinstall/chapter.xml
index 125358081a..1a92e19665 100644
--- a/en_US.ISO8859-1/books/handbook/bsdinstall/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/bsdinstall/chapter.xml
@@ -667,7 +667,7 @@ Loading /boot/defaults/loader.conf
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-boot-loader-menu"
+ fileref="bsdinstall/bsdinstall-boot-loader-menu.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -959,7 +959,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-choose-mode"
+ <imagedata fileref="bsdinstall/bsdinstall-choose-mode.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -1005,7 +1005,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-keymap-select-default"
+ fileref="bsdinstall/bsdinstall-keymap-select-default.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -1021,7 +1021,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-config-keymap"
+ <imagedata fileref="bsdinstall/bsdinstall-config-keymap.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -1051,7 +1051,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-config-hostname"
+ <imagedata fileref="bsdinstall/bsdinstall-config-hostname.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -1074,7 +1074,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-config-components"
+ fileref="bsdinstall/bsdinstall-config-components.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -1163,7 +1163,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-netinstall-files"
+ <imagedata fileref="bsdinstall/bsdinstall-netinstall-files.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -1183,7 +1183,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-netinstall-mirrorselect"
+ fileref="bsdinstall/bsdinstall-netinstall-mirrorselect.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -1210,7 +1210,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-part-guided-manual"
+ fileref="bsdinstall/bsdinstall-part-guided-manual.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -1228,7 +1228,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-part-guided-disk"
+ fileref="bsdinstall/bsdinstall-part-guided-disk.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -1248,7 +1248,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-part-entire-part"
+ fileref="bsdinstall/bsdinstall-part-entire-part.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -1269,7 +1269,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-part-review"
+ <imagedata fileref="bsdinstall/bsdinstall-part-review.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -1288,7 +1288,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-part-manual-create"
+ fileref="bsdinstall/bsdinstall-part-manual-create.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -1306,7 +1306,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-part-manual-partscheme"
+ fileref="bsdinstall/bsdinstall-part-manual-partscheme.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -1387,7 +1387,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-part-manual-addpart"
+ fileref="bsdinstall/bsdinstall-part-manual-addpart.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -1567,7 +1567,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-final-confirmation"
+ fileref="bsdinstall/bsdinstall-final-confirmation.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -1600,7 +1600,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-distfile-fetching"
+ <imagedata fileref="bsdinstall/bsdinstall-distfile-fetching.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -1616,7 +1616,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-distfile-verifying"
+ fileref="bsdinstall/bsdinstall-distfile-verifying.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -1631,7 +1631,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-distfile-extracting"
+ fileref="bsdinstall/bsdinstall-distfile-extracting.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -1666,7 +1666,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-post-root-passwd"
+ fileref="bsdinstall/bsdinstall-post-root-passwd.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -1694,7 +1694,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-configure-network-interface"
+ fileref="bsdinstall/bsdinstall-configure-network-interface.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -1729,7 +1729,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-configure-wireless-scan"
+ fileref="bsdinstall/bsdinstall-configure-wireless-scan.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -1752,7 +1752,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-configure-wireless-accesspoints"
+ fileref="bsdinstall/bsdinstall-configure-wireless-accesspoints.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -1772,7 +1772,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-configure-wireless-wpa2setup"
+ fileref="bsdinstall/bsdinstall-configure-wireless-wpa2setup.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -1795,7 +1795,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-configure-network-interface-ipv4"
+ fileref="bsdinstall/bsdinstall-configure-network-interface-ipv4.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -1829,7 +1829,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-configure-network-interface-ipv4-dhcp"
+ fileref="bsdinstall/bsdinstall-configure-network-interface-ipv4-dhcp.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -1848,7 +1848,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-configure-network-interface-ipv4-static"
+ fileref="bsdinstall/bsdinstall-configure-network-interface-ipv4-static.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -1895,7 +1895,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-configure-network-interface-ipv6"
+ fileref="bsdinstall/bsdinstall-configure-network-interface-ipv6.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -1924,7 +1924,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-configure-network-interface-slaac"
+ fileref="bsdinstall/bsdinstall-configure-network-interface-slaac.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -1943,7 +1943,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-configure-network-interface-ipv6-static"
+ fileref="bsdinstall/bsdinstall-configure-network-interface-ipv6-static.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -1993,7 +1993,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-configure-network-ipv4-dns"
+ fileref="bsdinstall/bsdinstall-configure-network-ipv4-dns.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -2018,7 +2018,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-set-clock-local-utc"
+ fileref="bsdinstall/bsdinstall-set-clock-local-utc.onf"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -2037,7 +2037,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-timezone-region"
+ <imagedata fileref="bsdinstall/bsdinstall-timezone-region.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -2052,7 +2052,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-timezone-country"
+ fileref="bsdinstall/bsdinstall-timezone-country.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -2066,7 +2066,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-timezone-zone"
+ <imagedata fileref="bsdinstall/bsdinstall-timezone-zone.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -2081,7 +2081,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-timezone-confirm"
+ fileref="bsdinstall/bsdinstall-timezone-confirm.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -2103,7 +2103,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-config-services"
+ <imagedata fileref="bsdinstall/bsdinstall-config-services.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -2153,7 +2153,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-config-crashdump"
+ fileref="bsdinstall/bsdinstall-config-crashdump.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -2178,7 +2178,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-adduser1"
+ <imagedata fileref="bsdinstall/bsdinstall-adduser1.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -2191,7 +2191,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-adduser2"
+ <imagedata fileref="bsdinstall/bsdinstall-adduser2.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -2292,7 +2292,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-adduser3"
+ <imagedata fileref="bsdinstall/bsdinstall-adduser3.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -2319,7 +2319,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-finalconfiguration"
+ fileref="bsdinstall/bsdinstall-finalconfiguration.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -2376,7 +2376,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-final-modification-shell"
+ fileref="bsdinstall/bsdinstall-final-modification-shell.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -2395,7 +2395,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-mainexit"
+ <imagedata fileref="bsdinstall/bsdinstall-mainexit.png"
format="PNG"/>
</imageobject>
</mediaobject>
diff --git a/en_US.ISO8859-1/books/handbook/geom/chapter.xml b/en_US.ISO8859-1/books/handbook/geom/chapter.xml
index 603e7f00b4..4c7e37c9c5 100644
--- a/en_US.ISO8859-1/books/handbook/geom/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/geom/chapter.xml
@@ -137,7 +137,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="geom/striping" align="center"/>
+ <imagedata fileref="geom/striping.pic" align="center"/>
</imageobject>
<textobject>
diff --git a/en_US.ISO8859-1/books/handbook/install/chapter.xml b/en_US.ISO8859-1/books/handbook/install/chapter.xml
index 821abfb3a9..deb590cf20 100644
--- a/en_US.ISO8859-1/books/handbook/install/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/install/chapter.xml
@@ -1006,7 +1006,7 @@ Insert disk labelled "Kernel floppy 1" and press any key...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/boot-loader-menu" format="PNG"/>
+ <imagedata fileref="install/boot-loader-menu.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1174,7 +1174,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/config-country" format="PNG"/>
+ <imagedata fileref="install/config-country.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1190,7 +1190,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/config-keymap" format="PNG"/>
+ <imagedata fileref="install/config-keymap.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1229,7 +1229,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main1" format="PNG"/>
+ <imagedata fileref="install/main1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1246,7 +1246,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main-doc" format="PNG"/>
+ <imagedata fileref="install/main-doc.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1258,7 +1258,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/docmenu1" format="PNG"/>
+ <imagedata fileref="install/docmenu1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1288,7 +1288,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main-keymap" format="PNG"/>
+ <imagedata fileref="install/main-keymap.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1308,7 +1308,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/keymap" format="PNG"/>
+ <imagedata fileref="install/keymap.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1326,7 +1326,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main-options" format="PNG"/>
+ <imagedata fileref="install/main-options.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1336,7 +1336,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/options" format="PNG"/>
+ <imagedata fileref="install/options.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1370,7 +1370,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main-std" format="PNG"/>
+ <imagedata fileref="install/main-std.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1535,7 +1535,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/fdisk-drive1" format="PNG"/>
+ <imagedata fileref="install/fdisk-drive1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1601,7 +1601,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/fdisk-edit1" format="PNG"/>
+ <imagedata fileref="install/fdisk-edit1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1644,7 +1644,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/fdisk-edit2" format="PNG"/>
+ <imagedata fileref="install/fdisk-edit2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1686,7 +1686,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/boot-mgr" format="PNG"/>
+ <imagedata fileref="install/boot-mgr.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1716,7 +1716,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/fdisk-drive2" format="PNG"/>
+ <imagedata fileref="install/fdisk-drive2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1965,7 +1965,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-ed1" format="PNG"/>
+ <imagedata fileref="install/disklabel-ed1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1993,7 +1993,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-auto" format="PNG"/>
+ <imagedata fileref="install/disklabel-auto.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2020,7 +2020,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-root1" format="PNG"/>
+ <imagedata fileref="install/disklabel-root1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2038,7 +2038,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-root2" format="PNG"/>
+ <imagedata fileref="install/disklabel-root2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2055,7 +2055,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-fs" format="PNG"/>
+ <imagedata fileref="install/disklabel-fs.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2072,7 +2072,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-root3" format="PNG"/>
+ <imagedata fileref="install/disklabel-root3.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2094,7 +2094,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-ed2" format="PNG"/>
+ <imagedata fileref="install/disklabel-ed2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2146,7 +2146,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/dist-set" format="PNG"/>
+ <imagedata fileref="install/dist-set.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2201,7 +2201,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/dist-set2" format="PNG"/>
+ <imagedata fileref="install/dist-set2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2234,7 +2234,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/media" format="PNG"/>
+ <imagedata fileref="install/media.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2431,7 +2431,7 @@ installation menus to retry whichever operations have failed.
<mediaobject>
<imageobject>
- <imagedata fileref="install/ed0-conf" format="PNG"/>
+ <imagedata fileref="install/ed0-conf.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2477,7 +2477,7 @@ installation menus to retry whichever operations have failed.
<mediaobject>
<imageobject>
- <imagedata fileref="install/ed0-conf2" format="PNG"/>
+ <imagedata fileref="install/ed0-conf2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2652,7 +2652,7 @@ use the current settings.
<mediaobject>
<imageobject>
- <imagedata fileref="install/edit-inetd-conf" format="PNG"/>
+ <imagedata fileref="install/edit-inetd-conf.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2745,7 +2745,7 @@ use the current settings.
<mediaobject>
<imageobject>
- <imagedata fileref="install/ftp-anon1" format="PNG"/>
+ <imagedata fileref="install/ftp-anon1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2824,7 +2824,7 @@ use the current settings.
<mediaobject>
<imageobject>
- <imagedata fileref="install/ftp-anon2" format="PNG"/>
+ <imagedata fileref="install/ftp-anon2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2881,7 +2881,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/nfs-server-edit" format="PNG"/>
+ <imagedata fileref="install/nfs-server-edit.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2931,7 +2931,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/console-saver1" format="PNG"/>
+ <imagedata fileref="install/console-saver1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2945,7 +2945,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/console-saver2" format="PNG"/>
+ <imagedata fileref="install/console-saver2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2965,7 +2965,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/console-saver3" format="PNG"/>
+ <imagedata fileref="install/console-saver3.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2979,7 +2979,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/console-saver4" format="PNG"/>
+ <imagedata fileref="install/console-saver4.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3023,7 +3023,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/timezone1" format="PNG"/>
+ <imagedata fileref="install/timezone1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3036,7 +3036,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/timezone2" format="PNG"/>
+ <imagedata fileref="install/timezone2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3049,7 +3049,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/timezone3" format="PNG"/>
+ <imagedata fileref="install/timezone3.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3115,7 +3115,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse1" format="PNG"/>
+ <imagedata fileref="install/mouse1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3128,7 +3128,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse2" format="PNG"/>
+ <imagedata fileref="install/mouse2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3143,7 +3143,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse3" format="PNG"/>
+ <imagedata fileref="install/mouse3.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3156,7 +3156,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse4" format="PNG"/>
+ <imagedata fileref="install/mouse4.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3170,7 +3170,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse5" format="PNG"/>
+ <imagedata fileref="install/mouse5.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3186,7 +3186,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse6" format="PNG"/>
+ <imagedata fileref="install/mouse6.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3231,7 +3231,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/pkg-cat" format="PNG"/>
+ <imagedata fileref="install/pkg-cat.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3252,7 +3252,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/pkg-sel" format="PNG"/>
+ <imagedata fileref="install/pkg-sel.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3279,7 +3279,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/pkg-install" format="PNG"/>
+ <imagedata fileref="install/pkg-install.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3293,7 +3293,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/pkg-confirm" format="PNG"/>
+ <imagedata fileref="install/pkg-confirm.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3333,7 +3333,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/adduser1" format="PNG"/>
+ <imagedata fileref="install/adduser1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3346,7 +3346,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/adduser2" format="PNG"/>
+ <imagedata fileref="install/adduser2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3446,7 +3446,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/adduser3" format="PNG"/>
+ <imagedata fileref="install/adduser3.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3511,7 +3511,7 @@ Retype new password :</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/mainexit" format="PNG"/>
+ <imagedata fileref="install/mainexit.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3586,7 +3586,7 @@ Retype new password :</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/net-config-menu1" format="PNG"/>
+ <imagedata fileref="install/net-config-menu1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3653,7 +3653,7 @@ Retype new password :</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/mta-main" format="PNG"/>
+ <imagedata fileref="install/mta-main.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3707,7 +3707,7 @@ Retype new password :</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/ntp-config" format="PNG"/>
+ <imagedata fileref="install/ntp-config.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3733,7 +3733,7 @@ Retype new password :</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/net-config-menu2" format="PNG"/>
+ <imagedata fileref="install/net-config-menu2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
diff --git a/en_US.ISO8859-1/books/handbook/mail/chapter.xml b/en_US.ISO8859-1/books/handbook/mail/chapter.xml
index 325b1cbc38..3d4e58e619 100644
--- a/en_US.ISO8859-1/books/handbook/mail/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/mail/chapter.xml
@@ -1960,7 +1960,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/mutt1" format="PNG"/>
+ <imagedata fileref="mail/mutt1.png" format="PNG"/>
</imageobject>
</mediaobject>
@@ -1971,7 +1971,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/mutt2" format="PNG"/>
+ <imagedata fileref="mail/mutt2.png" format="PNG"/>
</imageobject>
</mediaobject>
@@ -2009,7 +2009,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/mutt3" format="PNG"/>
+ <imagedata fileref="mail/mutt3.png" format="PNG"/>
</imageobject>
</mediaobject>
@@ -2061,7 +2061,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine1" format="PNG"/>
+ <imagedata fileref="mail/pine1.png" format="PNG"/>
</imageobject>
</mediaobject>
@@ -2082,7 +2082,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine2" format="PNG"/>
+ <imagedata fileref="mail/pine2.png" format="PNG"/>
</imageobject>
</mediaobject>
@@ -2093,7 +2093,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine3" format="PNG"/>
+ <imagedata fileref="mail/pine3.png" format="PNG"/>
</imageobject>
</mediaobject>
@@ -2106,7 +2106,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine4" format="PNG"/>
+ <imagedata fileref="mail/pine4.png" format="PNG"/>
</imageobject>
</mediaobject>
@@ -2125,7 +2125,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine5" format="PNG"/>
+ <imagedata fileref="mail/pine5.png" format="PNG"/>
</imageobject>
</mediaobject>
diff --git a/en_US.ISO8859-1/books/handbook/vinum/chapter.xml b/en_US.ISO8859-1/books/handbook/vinum/chapter.xml
index ed9aceabc5..ece904aa9e 100644
--- a/en_US.ISO8859-1/books/handbook/vinum/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/vinum/chapter.xml
@@ -176,7 +176,7 @@
<figure id="vinum-concat">
<title>Concatenated Organization</title>
- <graphic fileref="vinum/vinum-concat"/>
+ <graphic fileref="vinum/vinum-concat.pic"/>
</figure></para>
<indexterm>
@@ -215,7 +215,7 @@
<figure id="vinum-striped">
<title>Striped Organization</title>
- <graphic fileref="vinum/vinum-striped"/>
+ <graphic fileref="vinum/vinum-striped.pic"/>
</figure></para>
</sect1>
@@ -283,7 +283,7 @@
<figure id="vinum-raid5-org">
<title>RAID-5 Organization</title>
- <graphic fileref="vinum/vinum-raid5-org"/>
+ <graphic fileref="vinum/vinum-raid5-org.pic"/>
</figure></para>
<para>Compared to mirroring, <acronym>RAID-5</acronym> has the
@@ -563,7 +563,7 @@
<figure id="vinum-simple-vol">
<title>A Simple Vinum Volume</title>
- <graphic fileref="vinum/vinum-simple-vol"/>
+ <graphic fileref="vinum/vinum-simple-vol.pic"/>
</figure></para>
<para>This figure, and the ones which follow, represent a
@@ -630,7 +630,7 @@
<figure id="vinum-mirrored-vol">
<title>A Mirrored Vinum Volume</title>
- <graphic fileref="vinum/vinum-mirrored-vol"/>
+ <graphic fileref="vinum/vinum-mirrored-vol.pic"/>
</figure></para>
<para>In this example, each plex contains the full 512 MB
@@ -696,7 +696,7 @@
<figure id="vinum-striped-vol">
<title>A Striped Vinum Volume</title>
- <graphic fileref="vinum/vinum-striped-vol"/>
+ <graphic fileref="vinum/vinum-striped-vol.pic"/>
</figure></para>
<para>This volume is represented in
@@ -740,7 +740,7 @@
<figure id="vinum-raid10-vol">
<title>A Mirrored, Striped Vinum Volume</title>
- <graphic fileref="vinum/vinum-raid10-vol"/>
+ <graphic fileref="vinum/vinum-raid10-vol.pic"/>
</figure></para>
</sect2>
</sect1>
diff --git a/en_US.ISO8859-1/books/handbook/virtualization/chapter.xml b/en_US.ISO8859-1/books/handbook/virtualization/chapter.xml
index 0156ea9091..aff54284e1 100644
--- a/en_US.ISO8859-1/books/handbook/virtualization/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/virtualization/chapter.xml
@@ -112,7 +112,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd1"/>
+ <imagedata fileref="virtualization/parallels-freebsd1.png"/>
</imageobject>
</mediaobject>
@@ -123,25 +123,25 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd2"/>
+ <imagedata fileref="virtualization/parallels-freebsd2.png"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd3"/>
+ <imagedata fileref="virtualization/parallels-freebsd3.png"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd4"/>
+ <imagedata fileref="virtualization/parallels-freebsd4.png"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd5"/>
+ <imagedata fileref="virtualization/parallels-freebsd5.png"/>
</imageobject>
</mediaobject>
@@ -150,13 +150,13 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd6"/>
+ <imagedata fileref="virtualization/parallels-freebsd6.png"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd7"/>
+ <imagedata fileref="virtualization/parallels-freebsd7.png"/>
</imageobject>
</mediaobject>
@@ -164,13 +164,13 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd8"/>
+ <imagedata fileref="virtualization/parallels-freebsd8.png"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd9"/>
+ <imagedata fileref="virtualization/parallels-freebsd9.png"/>
</imageobject>
</mediaobject>
@@ -187,7 +187,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd11"/>
+ <imagedata fileref="virtualization/parallels-freebsd11.png"/>
</imageobject>
</mediaobject>
@@ -200,7 +200,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd10"/>
+ <imagedata fileref="virtualization/parallels-freebsd10.png"/>
</imageobject>
</mediaobject>
@@ -212,7 +212,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd12"/>
+ <imagedata fileref="virtualization/parallels-freebsd12.png"/>
</imageobject>
</mediaobject>
@@ -221,7 +221,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd13"/>
+ <imagedata fileref="virtualization/parallels-freebsd13.png"/>
</imageobject>
</mediaobject>
</sect3>
@@ -615,13 +615,13 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd1"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd1.png"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd2"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd2.png"/>
</imageobject>
</mediaobject>
@@ -631,7 +631,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd3"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd3.png"/>
</imageobject>
</mediaobject>
@@ -643,13 +643,13 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd4"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd4.png"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd5"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd5.png"/>
</imageobject>
</mediaobject>
@@ -657,7 +657,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd6"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd6.png"/>
</imageobject>
</mediaobject>
@@ -667,13 +667,13 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd7"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd7.png"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd8"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd8.png"/>
</imageobject>
</mediaobject>
@@ -692,13 +692,13 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd9"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd9.png"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd10"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd10.png"/>
</imageobject>
</mediaobject>
@@ -712,7 +712,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd11"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd11.png"/>
</imageobject>
</mediaobject>
@@ -724,7 +724,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd12"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd12.png"/>
</imageobject>
</mediaobject>
@@ -734,7 +734,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd13"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd13.png"/>
</imageobject>
</mediaobject>
</sect3>
@@ -817,7 +817,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd01"/>
+ <imagedata fileref="virtualization/vmware-freebsd01.png"/>
</imageobject>
</mediaobject>
@@ -826,7 +826,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd02"/>
+ <imagedata fileref="virtualization/vmware-freebsd02.png"/>
</imageobject>
</mediaobject>
@@ -839,7 +839,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd03"/>
+ <imagedata fileref="virtualization/vmware-freebsd03.png"/>
</imageobject>
</mediaobject>
@@ -848,7 +848,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd04"/>
+ <imagedata fileref="virtualization/vmware-freebsd04.png"/>
</imageobject>
</mediaobject>
@@ -857,7 +857,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd05"/>
+ <imagedata fileref="virtualization/vmware-freebsd05.png"/>
</imageobject>
</mediaobject>
@@ -866,7 +866,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd06"/>
+ <imagedata fileref="virtualization/vmware-freebsd06.png"/>
</imageobject>
</mediaobject>
@@ -874,7 +874,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd07"/>
+ <imagedata fileref="virtualization/vmware-freebsd07.png"/>
</imageobject>
</mediaobject>
@@ -883,7 +883,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd08"/>
+ <imagedata fileref="virtualization/vmware-freebsd08.png"/>
</imageobject>
</mediaobject>
@@ -897,7 +897,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd09"/>
+ <imagedata fileref="virtualization/vmware-freebsd09.png"/>
</imageobject>
</mediaobject>
@@ -905,7 +905,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd10"/>
+ <imagedata fileref="virtualization/vmware-freebsd10.png"/>
</imageobject>
</mediaobject>
@@ -915,7 +915,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd11"/>
+ <imagedata fileref="virtualization/vmware-freebsd11.png"/>
</imageobject>
</mediaobject>
@@ -930,7 +930,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd12"/>
+ <imagedata fileref="virtualization/vmware-freebsd12.png"/>
</imageobject>
</mediaobject>
diff --git a/es_ES.ISO8859-1/articles/releng/article.xml b/es_ES.ISO8859-1/articles/releng/article.xml
index 1054c066e8..92003d6a42 100644
--- a/es_ES.ISO8859-1/articles/releng/article.xml
+++ b/es_ES.ISO8859-1/articles/releng/article.xml
@@ -292,7 +292,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="branches-head" align="center"/>
+ <imagedata fileref="branches-head.pic" align="center"/>
</imageobject>
<textobject>
@@ -302,7 +302,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="branches-releng3" align="center"/>
+ <imagedata fileref="branches-releng3.pic" align="center"/>
</imageobject>
<textobject>
@@ -312,7 +312,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="branches-releng4" align="center"/>
+ <imagedata fileref="branches-releng4.pic" align="center"/>
</imageobject>
<textobject>
diff --git a/es_ES.ISO8859-1/books/handbook/advanced-networking/chapter.xml b/es_ES.ISO8859-1/books/handbook/advanced-networking/chapter.xml
index 6dacb31790..5050a6b714 100755
--- a/es_ES.ISO8859-1/books/handbook/advanced-networking/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/advanced-networking/chapter.xml
@@ -360,7 +360,7 @@ host2.ejemplo.com link#1 UC 0 0
<mediaobject>
<imageobject>
- <imagedata fileref="advanced-networking/net-routing"/>
+ <imagedata fileref="advanced-networking/net-routing.pic"/>
</imageobject>
<textobject>
@@ -3983,7 +3983,7 @@ host margaux {
<mediaobject>
<imageobject>
- <imagedata fileref="advanced-networking/isdn-bus"/>
+ <imagedata fileref="advanced-networking/isdn-bus.eps"/>
</imageobject>
<textobject>
@@ -4018,7 +4018,7 @@ ISDN BRI line</literallayout>
<mediaobject>
<imageobject>
- <imagedata fileref="advanced-networking/isdn-twisted-pair"/>
+ <imagedata fileref="advanced-networking/isdn-twisted-pair.eps"/>
</imageobject>
<textobject>
@@ -7513,7 +7513,7 @@ driftfile /var/db/ntp.drift</programlisting>
<mediaobject>
<imageobject>
- <imagedata fileref="advanced-networking/natd"/>
+ <imagedata fileref="advanced-networking/natd.eps"/>
</imageobject>
<textobject>
diff --git a/es_ES.ISO8859-1/books/handbook/basics/chapter.xml b/es_ES.ISO8859-1/books/handbook/basics/chapter.xml
index 307ff0a43f..0b8e4ffa5d 100755
--- a/es_ES.ISO8859-1/books/handbook/basics/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/basics/chapter.xml
@@ -1232,7 +1232,7 @@ root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01 passwd</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir1" format="EPS"/>
+ <imagedata fileref="install/example-dir1.eps" format="EPS"/>
</imageobject>
<textobject>
@@ -1254,7 +1254,7 @@ root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01 passwd</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir2" format="EPS"/>
+ <imagedata fileref="install/example-dir2.eps" format="EPS"/>
</imageobject>
<textobject>
@@ -1284,7 +1284,7 @@ root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01 passwd</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir3" format="EPS"/>
+ <imagedata fileref="install/example-dir3.eps" format="EPS"/>
</imageobject>
<textobject>
@@ -1311,7 +1311,7 @@ root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01 passwd</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir4" format="EPS"/>
+ <imagedata fileref="install/example-dir4.eps" format="EPS"/>
</imageobject>
<textobject>
@@ -1337,7 +1337,7 @@ root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01 passwd</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir5" format="EPS"/>
+ <imagedata fileref="install/example-dir5.eps" format="EPS"/>
</imageobject>
<textobject>
@@ -1681,7 +1681,7 @@ root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01 passwd</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/disk-layout" format="EPS"/>
+ <imagedata fileref="install/disk-layout.eps" format="EPS"/>
</imageobject>
<textobject>
diff --git a/es_ES.ISO8859-1/books/handbook/geom/chapter.xml b/es_ES.ISO8859-1/books/handbook/geom/chapter.xml
index fa47c57455..9bf634f68b 100644
--- a/es_ES.ISO8859-1/books/handbook/geom/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/geom/chapter.xml
@@ -151,7 +151,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="geom/striping" align="center"/>
+ <imagedata fileref="geom/striping.pic" align="center"/>
</imageobject>
<textobject>
diff --git a/es_ES.ISO8859-1/books/handbook/install/chapter.xml b/es_ES.ISO8859-1/books/handbook/install/chapter.xml
index 1a690d30b6..6fdb135d28 100755
--- a/es_ES.ISO8859-1/books/handbook/install/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/install/chapter.xml
@@ -1308,7 +1308,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/config-country" format="PNG"/>
+ <imagedata fileref="install/config-country.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1318,7 +1318,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/sysinstall-exit" format="PNG"/>
+ <imagedata fileref="install/sysinstall-exit.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1376,7 +1376,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main1" format="PNG"/>
+ <imagedata fileref="install/main1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1394,7 +1394,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main-doc" format="PNG"/>
+ <imagedata fileref="install/main-doc.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1406,7 +1406,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/docmenu1" format="PNG"/>
+ <imagedata fileref="install/docmenu1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1436,7 +1436,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main-keymap" format="PNG"/>
+ <imagedata fileref="install/main-keymap.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1458,7 +1458,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/keymap" format="PNG"/>
+ <imagedata fileref="install/keymap.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1476,7 +1476,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main-options" format="PNG"/>
+ <imagedata fileref="install/main-options.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1486,7 +1486,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/options" format="PNG"/>
+ <imagedata fileref="install/options.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1526,7 +1526,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main-std" format="PNG"/>
+ <imagedata fileref="install/main-std.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1726,7 +1726,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/fdisk-drive1" format="PNG"/>
+ <imagedata fileref="install/fdisk-drive1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1809,7 +1809,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/fdisk-edit1" format="PNG"/>
+ <imagedata fileref="install/fdisk-edit1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1860,7 +1860,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/fdisk-edit2" format="PNG"/>
+ <imagedata fileref="install/fdisk-edit2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1903,7 +1903,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/boot-mgr" format="PNG"/>
+ <imagedata fileref="install/boot-mgr.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1937,7 +1937,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/fdisk-drive2" format="PNG"/>
+ <imagedata fileref="install/fdisk-drive2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2227,7 +2227,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-ed1" format="PNG"/>
+ <imagedata fileref="install/disklabel-ed1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2256,7 +2256,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-auto" format="PNG"/>
+ <imagedata fileref="install/disklabel-auto.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2287,7 +2287,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-root1" format="PNG"/>
+ <imagedata fileref="install/disklabel-root1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2308,7 +2308,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-root2" format="PNG"/>
+ <imagedata fileref="install/disklabel-root2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2327,7 +2327,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-fs" format="PNG"/>
+ <imagedata fileref="install/disklabel-fs.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2345,7 +2345,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-root3" format="PNG"/>
+ <imagedata fileref="install/disklabel-root3.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2371,7 +2371,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-ed2" format="PNG"/>
+ <imagedata fileref="install/disklabel-ed2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2438,7 +2438,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/dist-set" format="PNG"/>
+ <imagedata fileref="install/dist-set.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2522,7 +2522,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/dist-set2" format="PNG"/>
+ <imagedata fileref="install/dist-set2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2557,7 +2557,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/media" format="PNG"/>
+ <imagedata fileref="install/media.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2815,7 +2815,7 @@ operaci
<mediaobject>
<imageobject>
- <imagedata fileref="install/ed0-conf" format="PNG"/>
+ <imagedata fileref="install/ed0-conf.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2862,7 +2862,7 @@ operaci
<mediaobject>
<imageobject>
- <imagedata fileref="install/ed0-conf2" format="PNG"/>
+ <imagedata fileref="install/ed0-conf2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3057,7 +3057,7 @@ Dicho esto ?desea activar inetd?
<mediaobject>
<imageobject>
- <imagedata fileref="install/edit-inetd-conf" format="PNG"/>
+ <imagedata fileref="install/edit-inetd-conf.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3197,7 +3197,7 @@ Upload subdirectory:
<mediaobject>
<imageobject>
- <imagedata fileref="install/ftp-anon2" format="PNG"/>
+ <imagedata fileref="install/ftp-anon2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3272,7 +3272,7 @@ Pulse [Intro] para abrir /etc/exports en un editor
<mediaobject>
<imageobject>
- <imagedata fileref="install/nfs-server-edit" format="PNG"/>
+ <imagedata fileref="install/nfs-server-edit.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3327,7 +3327,7 @@ Pulse [Intro] para abrir /etc/exports en un editor
<mediaobject>
<imageobject>
- <imagedata fileref="install/console-saver1" format="PNG"/>
+ <imagedata fileref="install/console-saver1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3344,7 +3344,7 @@ Pulse [Intro] para abrir /etc/exports en un editor
<mediaobject>
<imageobject>
- <imagedata fileref="install/console-saver2" format="PNG"/>
+ <imagedata fileref="install/console-saver2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3365,7 +3365,7 @@ Pulse [Intro] para abrir /etc/exports en un editor
<mediaobject>
<imageobject>
- <imagedata fileref="install/console-saver3" format="PNG"/>
+ <imagedata fileref="install/console-saver3.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3379,7 +3379,7 @@ Pulse [Intro] para abrir /etc/exports en un editor
<mediaobject>
<imageobject>
- <imagedata fileref="install/console-saver4" format="PNG"/>
+ <imagedata fileref="install/console-saver4.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3432,7 +3432,7 @@ Pulse [Intro] para abrir /etc/exports en un editor
<mediaobject>
<imageobject>
- <imagedata fileref="install/timezone1" format="PNG"/>
+ <imagedata fileref="install/timezone1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3445,7 +3445,7 @@ Pulse [Intro] para abrir /etc/exports en un editor
<mediaobject>
<imageobject>
- <imagedata fileref="install/timezone2" format="PNG"/>
+ <imagedata fileref="install/timezone2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3458,7 +3458,7 @@ Pulse [Intro] para abrir /etc/exports en un editor
<mediaobject>
<imageobject>
- <imagedata fileref="install/timezone3" format="PNG"/>
+ <imagedata fileref="install/timezone3.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3524,7 +3524,7 @@ Pulse [Intro] para abrir /etc/exports en un editor
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse1" format="PNG"/>
+ <imagedata fileref="install/mouse1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3537,7 +3537,7 @@ Pulse [Intro] para abrir /etc/exports en un editor
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse2" format="PNG"/>
+ <imagedata fileref="install/mouse2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3554,7 +3554,7 @@ Pulse [Intro] para abrir /etc/exports en un editor
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse3" format="PNG"/>
+ <imagedata fileref="install/mouse3.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3567,7 +3567,7 @@ Pulse [Intro] para abrir /etc/exports en un editor
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse4" format="PNG"/>
+ <imagedata fileref="install/mouse4.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3582,7 +3582,7 @@ Pulse [Intro] para abrir /etc/exports en un editor
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse5" format="PNG"/>
+ <imagedata fileref="install/mouse5.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3598,7 +3598,7 @@ Pulse [Intro] para abrir /etc/exports en un editor
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse6" format="PNG"/>
+ <imagedata fileref="install/mouse6.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3645,7 +3645,7 @@ Pulse [Intro] para abrir /etc/exports en un editor
<mediaobject>
<imageobject>
- <imagedata fileref="install/pkg-cat" format="PNG"/>
+ <imagedata fileref="install/pkg-cat.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3669,7 +3669,7 @@ Pulse [Intro] para abrir /etc/exports en un editor
<mediaobject>
<imageobject>
- <imagedata fileref="install/pkg-sel" format="PNG"/>
+ <imagedata fileref="install/pkg-sel.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3703,7 +3703,7 @@ Pulse [Intro] para abrir /etc/exports en un editor
<mediaobject>
<imageobject>
- <imagedata fileref="install/pkg-install" format="PNG"/>
+ <imagedata fileref="install/pkg-install.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3718,7 +3718,7 @@ Pulse [Intro] para abrir /etc/exports en un editor
<mediaobject>
<imageobject>
- <imagedata fileref="install/pkg-confirm" format="PNG"/>
+ <imagedata fileref="install/pkg-confirm.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3776,7 +3776,7 @@ Pulse [Intro] para abrir /etc/exports en un editor
<mediaobject>
<imageobject>
- <imagedata fileref="install/adduser1" format="PNG"/>
+ <imagedata fileref="install/adduser1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3789,7 +3789,7 @@ Pulse [Intro] para abrir /etc/exports en un editor
<mediaobject>
<imageobject>
- <imagedata fileref="install/adduser2" format="PNG"/>
+ <imagedata fileref="install/adduser2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3898,7 +3898,7 @@ Pulse [Intro] para abrir /etc/exports en un editor
<mediaobject>
<imageobject>
- <imagedata fileref="install/adduser3" format="PNG"/>
+ <imagedata fileref="install/adduser3.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3977,7 +3977,7 @@ Retype new password :</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/mainexit" format="PNG"/>
+ <imagedata fileref="install/mainexit.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -4067,7 +4067,7 @@ Retype new password :</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/net-config-menu1" format="PNG"/>
+ <imagedata fileref="install/net-config-menu1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -4138,7 +4138,7 @@ Retype new password :</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/mta-main" format="PNG"/>
+ <imagedata fileref="install/mta-main.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -4196,7 +4196,7 @@ Retype new password :</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/ntp-config" format="PNG"/>
+ <imagedata fileref="install/ntp-config.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -4224,7 +4224,7 @@ Retype new password :</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/net-config-menu2" format="PNG"/>
+ <imagedata fileref="install/net-config-menu2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
diff --git a/es_ES.ISO8859-1/books/handbook/mail/chapter.xml b/es_ES.ISO8859-1/books/handbook/mail/chapter.xml
index e386dd54fb..040757015a 100755
--- a/es_ES.ISO8859-1/books/handbook/mail/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/mail/chapter.xml
@@ -2190,7 +2190,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/mutt1" format="PNG"/>
+ <imagedata fileref="mail/mutt1.png" format="PNG"/>
</imageobject>
</mediaobject>
@@ -2201,7 +2201,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/mutt2" format="PNG"/>
+ <imagedata fileref="mail/mutt2.png" format="PNG"/>
</imageobject>
</mediaobject>
@@ -2233,7 +2233,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/mutt3" format="PNG"/>
+ <imagedata fileref="mail/mutt3.png" format="PNG"/>
</imageobject>
</mediaobject>
@@ -2288,7 +2288,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine1" format="PNG"/>
+ <imagedata fileref="mail/pine1.png" format="PNG"/>
</imageobject>
</mediaobject>
@@ -2311,7 +2311,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine2" format="PNG"/>
+ <imagedata fileref="mail/pine2.png" format="PNG"/>
</imageobject>
</mediaobject>
@@ -2322,7 +2322,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine3" format="PNG"/>
+ <imagedata fileref="mail/pine3.png" format="PNG"/>
</imageobject>
</mediaobject>
@@ -2334,7 +2334,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine4" format="PNG"/>
+ <imagedata fileref="mail/pine4.png" format="PNG"/>
</imageobject>
</mediaobject>
@@ -2353,7 +2353,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine5" format="PNG"/>
+ <imagedata fileref="mail/pine5.png" format="PNG"/>
</imageobject>
</mediaobject>
diff --git a/es_ES.ISO8859-1/books/handbook/security/chapter.xml b/es_ES.ISO8859-1/books/handbook/security/chapter.xml
index 6de38d9e3d..628ce81177 100755
--- a/es_ES.ISO8859-1/books/handbook/security/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/security/chapter.xml
@@ -3786,7 +3786,7 @@ options IPSEC_DEBUG #debug for IP security
<mediaobject>
<imageobject>
- <imagedata fileref="security/ipsec-network" align="center"/>
+ <imagedata fileref="security/ipsec-network.pic" align="center"/>
</imageobject>
<textobject>
@@ -4347,7 +4347,7 @@ ipfw add 1 allow udp from W.X.Y.Z to A.B.C.D isakmp
<mediaobject>
<imageobject>
- <imagedata fileref="security/ipsec-out-pkt" align="center"/>
+ <imagedata fileref="security/ipsec-out-pkt.pic" align="center"/>
</imageobject>
<textobject>
@@ -4366,7 +4366,7 @@ ipfw add 1 allow udp from W.X.Y.Z to A.B.C.D isakmp
<mediaobject>
<imageobject>
- <imagedata fileref="security/ipsec-encap-pkt" align="center"/>
+ <imagedata fileref="security/ipsec-encap-pkt.pic" align="center"/>
</imageobject>
<textobject>
@@ -4513,7 +4513,7 @@ ipfw add 1 allow ipencap from W.X.Y.Z to A.B.C.D
<mediaobject>
<imageobject>
- <imagedata fileref="security/ipsec-crypt-pkt" align="center"/>
+ <imagedata fileref="security/ipsec-crypt-pkt.pic" align="center"/>
</imageobject>
<textobject>
diff --git a/es_ES.ISO8859-1/books/handbook/vinum/chapter.xml b/es_ES.ISO8859-1/books/handbook/vinum/chapter.xml
index 4d44745af3..0607f61fa9 100644
--- a/es_ES.ISO8859-1/books/handbook/vinum/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/vinum/chapter.xml
@@ -63,7 +63,7 @@
<para>
<figure id="vinum-concat">
<title>Organizaci�n Concatenada</title>
- <graphic fileref="vinum/vinum-concat"/>
+ <graphic fileref="vinum/vinum-concat.pic"/>
</figure>
</para>
@@ -81,7 +81,7 @@
<para>
<figure id="vinum-striped">
<title>Organizaci�n con <quote>Striping</quote></title>
- <graphic fileref="vinum/vinum-striped"/>
+ <graphic fileref="vinum/vinum-striped.pic"/>
</figure>
</para>
</sect1>
@@ -105,7 +105,7 @@
<para>
<figure id="vinum-raid5-org">
<title>Organizaci�n en RAID-5</title>
- <graphic fileref="vinum/vinum-raid5-org"/>
+ <graphic fileref="vinum/vinum-raid5-org.pic"/>
</figure>
</para>
@@ -166,7 +166,7 @@
<para>
<figure id="vinum-simple-vol">
<title>Un Volumen Vinum Sencillo</title>
- <graphic fileref="vinum/vinum-simple-vol"/>
+ <graphic fileref="vinum/vinum-simple-vol.pic"/>
</figure>
</para>
@@ -179,7 +179,7 @@
<para>
<figure id="vinum-mirrored-vol">
<title>Un Volumen Vinum Replicado</title>
- <graphic fileref="vinum/vinum-mirrored-vol"/>
+ <graphic fileref="vinum/vinum-mirrored-vol.pic"/>
</figure>
</para>
@@ -191,7 +191,7 @@
<para>
<figure id="vinum-striped-vol">
<title>Un Volumen Vinum en <quote>Striping</quote></title>
- <graphic fileref="vinum/vinum-striped-vol"/>
+ <graphic fileref="vinum/vinum-striped-vol.pic"/>
</figure>
</para>
@@ -207,7 +207,7 @@
<figure id="vinum-raid10-vol">
<title>Un Volumen Vinum Replicado y en
<quote>Striping</quote></title>
- <graphic fileref="vinum/vinum-raid10-vol"/>
+ <graphic fileref="vinum/vinum-raid10-vol.pic"/>
</figure>
</para>
</sect2>
diff --git a/fr_FR.ISO8859-1/articles/building-products/article.xml b/fr_FR.ISO8859-1/articles/building-products/article.xml
index 986d32b720..ab6c6392ca 100644
--- a/fr_FR.ISO8859-1/articles/building-products/article.xml
+++ b/fr_FR.ISO8859-1/articles/building-products/article.xml
@@ -516,7 +516,7 @@
<title>L'organisation &os;</title>
<mediaobject>
<imageobject>
- <imagedata fileref="freebsd-organization" format="PIC"/>
+ <imagedata fileref="freebsd-organization.pic" format="PIC"/>
</imageobject>
</mediaobject>
</figure>
@@ -584,7 +584,7 @@
<title>Les branches &os;</title>
<mediaobject>
<imageobject>
- <imagedata fileref="freebsd-branches" format="EPS"/>
+ <imagedata fileref="freebsd-branches.eps" format="EPS"/>
</imageobject>
</mediaobject>
</figure>
diff --git a/fr_FR.ISO8859-1/books/handbook/advanced-networking/chapter.xml b/fr_FR.ISO8859-1/books/handbook/advanced-networking/chapter.xml
index 271dcc3991..232384f566 100644
--- a/fr_FR.ISO8859-1/books/handbook/advanced-networking/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/advanced-networking/chapter.xml
@@ -327,7 +327,7 @@ host2.example.com link#1 UC 0 0
<mediaobject>
<imageobject>
- <imagedata fileref="advanced-networking/net-routing"/>
+ <imagedata fileref="advanced-networking/net-routing.pic"/>
</imageobject>
<textobject>
@@ -537,7 +537,7 @@ host2.example.com link#1 UC 0 0
<mediaobject>
<imageobject>
- <imagedata fileref="advanced-networking/static-routes"/>
+ <imagedata fileref="advanced-networking/static-routes.pic"/>
</imageobject>
<textobject>
@@ -3664,7 +3664,7 @@ host margaux {
<mediaobject>
<imageobject>
- <imagedata fileref="advanced-networking/isdn-bus"/>
+ <imagedata fileref="advanced-networking/isdn-bus.eps"/>
</imageobject>
<textobject>
@@ -3700,7 +3700,7 @@ Liaison ISDN BRI</literallayout>
<mediaobject>
<imageobject>
- <imagedata fileref="advanced-networking/isdn-twisted-pair"/>
+ <imagedata fileref="advanced-networking/isdn-twisted-pair.eps"/>
</imageobject>
<textobject>
@@ -3827,7 +3827,7 @@ Liaison ISDN BRI</literallayout>
<mediaobject>
<imageobject>
- <imagedata fileref="advanced-networking/natd"/>
+ <imagedata fileref="advanced-networking/natd.eps"/>
</imageobject>
<textobject>
diff --git a/fr_FR.ISO8859-1/books/handbook/basics/chapter.xml b/fr_FR.ISO8859-1/books/handbook/basics/chapter.xml
index b4c8e3a726..4c59e10312 100644
--- a/fr_FR.ISO8859-1/books/handbook/basics/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/basics/chapter.xml
@@ -1165,7 +1165,7 @@ total 530
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir1" format="EPS"/>
+ <imagedata fileref="install/example-dir1.eps" format="EPS"/>
</imageobject>
<textobject>
@@ -1188,7 +1188,7 @@ total 530
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir2" format="EPS"/>
+ <imagedata fileref="install/example-dir2.eps" format="EPS"/>
</imageobject>
<textobject>
@@ -1219,7 +1219,7 @@ total 530
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir3" format="EPS"/>
+ <imagedata fileref="install/example-dir3.eps" format="EPS"/>
</imageobject>
<textobject>
@@ -1248,7 +1248,7 @@ total 530
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir4" format="EPS"/>
+ <imagedata fileref="install/example-dir4.eps" format="EPS"/>
</imageobject>
<textobject>
@@ -1275,7 +1275,7 @@ total 530
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir5" format="EPS"/>
+ <imagedata fileref="install/example-dir5.eps" format="EPS"/>
</imageobject>
<textobject>
@@ -1643,7 +1643,7 @@ total 530
<mediaobject>
<imageobject>
- <imagedata fileref="install/disk-layout" format="EPS"/>
+ <imagedata fileref="install/disk-layout.eps" format="EPS"/>
</imageobject>
<textobject>
diff --git a/fr_FR.ISO8859-1/books/handbook/geom/chapter.xml b/fr_FR.ISO8859-1/books/handbook/geom/chapter.xml
index a322c2a23a..63dc43a140 100644
--- a/fr_FR.ISO8859-1/books/handbook/geom/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/geom/chapter.xml
@@ -153,7 +153,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="geom/striping" align="center"/>
+ <imagedata fileref="geom/striping.pic" align="center"/>
</imageobject>
<textobject>
diff --git a/fr_FR.ISO8859-1/books/handbook/install/chapter.xml b/fr_FR.ISO8859-1/books/handbook/install/chapter.xml
index aa29c95f44..a99699d320 100644
--- a/fr_FR.ISO8859-1/books/handbook/install/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/install/chapter.xml
@@ -1100,7 +1100,7 @@ Insert disk labelled "Kernel floppy 1" and press any key...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/boot-loader-menu" format="PNG"/>
+ <imagedata fileref="install/boot-loader-menu.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1355,7 +1355,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/config-country" format="PNG"/>
+ <imagedata fileref="install/config-country.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1365,7 +1365,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/sysinstall-exit" format="PNG"/>
+ <imagedata fileref="install/sysinstall-exit.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1427,7 +1427,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main1" format="PNG"/>
+ <imagedata fileref="install/main1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1444,7 +1444,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main-doc" format="PNG"/>
+ <imagedata fileref="install/main-doc.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1456,7 +1456,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/docmenu1" format="PNG"/>
+ <imagedata fileref="install/docmenu1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1490,7 +1490,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main-keymap" format="PNG"/>
+ <imagedata fileref="install/main-keymap.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1515,7 +1515,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/keymap" format="PNG"/>
+ <imagedata fileref="install/keymap.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1533,7 +1533,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main-options" format="PNG"/>
+ <imagedata fileref="install/main-options.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1543,7 +1543,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/options" format="PNG"/>
+ <imagedata fileref="install/options.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1583,7 +1583,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main-std" format="PNG"/>
+ <imagedata fileref="install/main-std.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1793,7 +1793,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/fdisk-drive1" format="PNG"/>
+ <imagedata fileref="install/fdisk-drive1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1875,7 +1875,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/fdisk-edit1" format="PNG"/>
+ <imagedata fileref="install/fdisk-edit1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1932,7 +1932,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/fdisk-edit2" format="PNG"/>
+ <imagedata fileref="install/fdisk-edit2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1982,7 +1982,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/boot-mgr" format="PNG"/>
+ <imagedata fileref="install/boot-mgr.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2017,7 +2017,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/fdisk-drive2" format="PNG"/>
+ <imagedata fileref="install/fdisk-drive2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2303,7 +2303,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-ed1" format="PNG"/>
+ <imagedata fileref="install/disklabel-ed1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2336,7 +2336,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-auto" format="PNG"/>
+ <imagedata fileref="install/disklabel-auto.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2368,7 +2368,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-root1" format="PNG"/>
+ <imagedata fileref="install/disklabel-root1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2386,7 +2386,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-root2" format="PNG"/>
+ <imagedata fileref="install/disklabel-root2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2406,7 +2406,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-fs" format="PNG"/>
+ <imagedata fileref="install/disklabel-fs.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2426,7 +2426,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-root3" format="PNG"/>
+ <imagedata fileref="install/disklabel-root3.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2454,7 +2454,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-ed2" format="PNG"/>
+ <imagedata fileref="install/disklabel-ed2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2520,7 +2520,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/dist-set" format="PNG"/>
+ <imagedata fileref="install/dist-set.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2580,7 +2580,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/dist-set2" format="PNG"/>
+ <imagedata fileref="install/dist-set2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2616,7 +2616,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/media" format="PNG"/>
+ <imagedata fileref="install/media.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2824,7 +2824,7 @@ installation menus to retry whichever operations have failed.
<mediaobject>
<imageobject>
- <imagedata fileref="install/ed0-conf" format="PNG"/>
+ <imagedata fileref="install/ed0-conf.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2878,7 +2878,7 @@ installation menus to retry whichever operations have failed.
<mediaobject>
<imageobject>
- <imagedata fileref="install/ed0-conf2" format="PNG"/>
+ <imagedata fileref="install/ed0-conf2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3062,7 +3062,7 @@ use the current settings.
<mediaobject>
<imageobject>
- <imagedata fileref="install/edit-inetd-conf" format="PNG"/>
+ <imagedata fileref="install/edit-inetd-conf.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3167,7 +3167,7 @@ use the current settings.
<mediaobject>
<imageobject>
- <imagedata fileref="install/ftp-anon1" format="PNG"/>
+ <imagedata fileref="install/ftp-anon1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3255,7 +3255,7 @@ use the current settings.
<mediaobject>
<imageobject>
- <imagedata fileref="install/ftp-anon2" format="PNG"/>
+ <imagedata fileref="install/ftp-anon2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3321,7 +3321,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/nfs-server-edit" format="PNG"/>
+ <imagedata fileref="install/nfs-server-edit.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3375,7 +3375,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/console-saver1" format="PNG"/>
+ <imagedata fileref="install/console-saver1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3391,7 +3391,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/console-saver2" format="PNG"/>
+ <imagedata fileref="install/console-saver2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3417,7 +3417,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/console-saver3" format="PNG"/>
+ <imagedata fileref="install/console-saver3.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3432,7 +3432,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/console-saver4" format="PNG"/>
+ <imagedata fileref="install/console-saver4.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3480,7 +3480,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/timezone1" format="PNG"/>
+ <imagedata fileref="install/timezone1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3494,7 +3494,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/timezone2" format="PNG"/>
+ <imagedata fileref="install/timezone2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3508,7 +3508,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/timezone3" format="PNG"/>
+ <imagedata fileref="install/timezone3.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3575,7 +3575,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse1" format="PNG"/>
+ <imagedata fileref="install/mouse1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3589,7 +3589,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse2" format="PNG"/>
+ <imagedata fileref="install/mouse2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3606,7 +3606,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse3" format="PNG"/>
+ <imagedata fileref="install/mouse3.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3620,7 +3620,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse4" format="PNG"/>
+ <imagedata fileref="install/mouse4.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3637,7 +3637,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse5" format="PNG"/>
+ <imagedata fileref="install/mouse5.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3652,7 +3652,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse6" format="PNG"/>
+ <imagedata fileref="install/mouse6.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3707,7 +3707,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/pkg-cat" format="PNG"/>
+ <imagedata fileref="install/pkg-cat.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3732,7 +3732,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/pkg-sel" format="PNG"/>
+ <imagedata fileref="install/pkg-sel.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3769,7 +3769,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/pkg-install" format="PNG"/>
+ <imagedata fileref="install/pkg-install.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3784,7 +3784,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/pkg-confirm" format="PNG"/>
+ <imagedata fileref="install/pkg-confirm.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3830,7 +3830,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/adduser1" format="PNG"/>
+ <imagedata fileref="install/adduser1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3844,7 +3844,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/adduser2" format="PNG"/>
+ <imagedata fileref="install/adduser2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3956,7 +3956,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/adduser3" format="PNG"/>
+ <imagedata fileref="install/adduser3.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -4025,7 +4025,7 @@ Retype new password :</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/mainexit" format="PNG"/>
+ <imagedata fileref="install/mainexit.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -4106,7 +4106,7 @@ Retype new password :</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/net-config-menu1" format="PNG"/>
+ <imagedata fileref="install/net-config-menu1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -4194,7 +4194,7 @@ Retype new password :</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/mta-main" format="PNG"/>
+ <imagedata fileref="install/mta-main.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -4259,7 +4259,7 @@ Retype new password :</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/ntp-config" format="PNG"/>
+ <imagedata fileref="install/ntp-config.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -4287,7 +4287,7 @@ Retype new password :</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/net-config-menu2" format="PNG"/>
+ <imagedata fileref="install/net-config-menu2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
diff --git a/fr_FR.ISO8859-1/books/handbook/mail/chapter.xml b/fr_FR.ISO8859-1/books/handbook/mail/chapter.xml
index 1bba5dd2c0..64fe5a0109 100644
--- a/fr_FR.ISO8859-1/books/handbook/mail/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/mail/chapter.xml
@@ -2251,7 +2251,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/mutt1" format="PNG"/>
+ <imagedata fileref="mail/mutt1.png" format="PNG"/>
</imageobject>
</mediaobject>
@@ -2263,7 +2263,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/mutt2" format="PNG"/>
+ <imagedata fileref="mail/mutt2.png" format="PNG"/>
</imageobject>
</mediaobject>
@@ -2304,7 +2304,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/mutt3" format="PNG"/>
+ <imagedata fileref="mail/mutt3.png" format="PNG"/>
</imageobject>
</mediaobject>
@@ -2365,7 +2365,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine1" format="PNG"/>
+ <imagedata fileref="mail/pine1.png" format="PNG"/>
</imageobject>
</mediaobject>
@@ -2388,7 +2388,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine2" format="PNG"/>
+ <imagedata fileref="mail/pine2.png" format="PNG"/>
</imageobject>
</mediaobject>
@@ -2400,7 +2400,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine3" format="PNG"/>
+ <imagedata fileref="mail/pine3.png" format="PNG"/>
</imageobject>
</mediaobject>
@@ -2414,7 +2414,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine4" format="PNG"/>
+ <imagedata fileref="mail/pine4.png" format="PNG"/>
</imageobject>
</mediaobject>
@@ -2435,7 +2435,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine5" format="PNG"/>
+ <imagedata fileref="mail/pine5.png" format="PNG"/>
</imageobject>
</mediaobject>
diff --git a/fr_FR.ISO8859-1/books/handbook/vinum/chapter.xml b/fr_FR.ISO8859-1/books/handbook/vinum/chapter.xml
index d3e6bc9bdf..b0cd599dde 100644
--- a/fr_FR.ISO8859-1/books/handbook/vinum/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/vinum/chapter.xml
@@ -164,7 +164,7 @@
<para>
<figure id="vinum-concat">
<title>Organisation par concat�nation</title>
- <graphic fileref="vinum/vinum-concat"/>
+ <graphic fileref="vinum/vinum-concat.pic"/>
</figure>
</para>
@@ -216,7 +216,7 @@
<para>
<figure id="vinum-striped">
<title>Organisation segment�e</title>
- <graphic fileref="vinum/vinum-striped"/>
+ <graphic fileref="vinum/vinum-striped.pic"/>
</figure>
</para>
</sect1>
@@ -296,7 +296,7 @@
<para>
<figure id="vinum-raid5-org">
<title>Organisation RAID-5</title>
- <graphic fileref="vinum/vinum-raid5-org"/>
+ <graphic fileref="vinum/vinum-raid5-org.pic"/>
</figure>
</para>
@@ -592,7 +592,7 @@
<para>
<figure id="vinum-simple-vol">
<title>Un simple volume Vinum</title>
- <graphic fileref="vinum/vinum-simple-vol"/>
+ <graphic fileref="vinum/vinum-simple-vol.pic"/>
</figure>
</para>
@@ -664,7 +664,7 @@
<para>
<figure id="vinum-mirrored-vol">
<title>Un volume Vinum en mode miroir</title>
- <graphic fileref="vinum/vinum-mirrored-vol"/>
+ <graphic fileref="vinum/vinum-mirrored-vol.pic"/>
</figure>
</para>
@@ -733,7 +733,7 @@
<para>
<figure id="vinum-striped-vol">
<title>Un volume Vinum segment�</title>
- <graphic fileref="vinum/vinum-striped-vol"/>
+ <graphic fileref="vinum/vinum-striped-vol.pic"/>
</figure>
</para>
@@ -779,7 +779,7 @@
<para>
<figure id="vinum-raid10-vol">
<title>Un volume Vinum en mode miroir segment�</title>
- <graphic fileref="vinum/vinum-raid10-vol"/>
+ <graphic fileref="vinum/vinum-raid10-vol.pic"/>
</figure>
</para>
</sect2>
diff --git a/fr_FR.ISO8859-1/books/handbook/virtualization/chapter.xml b/fr_FR.ISO8859-1/books/handbook/virtualization/chapter.xml
index bf11412fcb..e120a995f4 100644
--- a/fr_FR.ISO8859-1/books/handbook/virtualization/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/virtualization/chapter.xml
@@ -120,7 +120,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd1"/>
+ <imagedata fileref="virtualization/parallels-freebsd1.png"/>
</imageobject>
</mediaobject>
@@ -133,25 +133,25 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd2"/>
+ <imagedata fileref="virtualization/parallels-freebsd2.png"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd3"/>
+ <imagedata fileref="virtualization/parallels-freebsd3.png"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd4"/>
+ <imagedata fileref="virtualization/parallels-freebsd4.png"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd5"/>
+ <imagedata fileref="virtualization/parallels-freebsd5.png"/>
</imageobject>
</mediaobject>
@@ -160,13 +160,13 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd6"/>
+ <imagedata fileref="virtualization/parallels-freebsd6.png"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd7"/>
+ <imagedata fileref="virtualization/parallels-freebsd7.png"/>
</imageobject>
</mediaobject>
@@ -174,13 +174,13 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd8"/>
+ <imagedata fileref="virtualization/parallels-freebsd8.png"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd9"/>
+ <imagedata fileref="virtualization/parallels-freebsd9.png"/>
</imageobject>
</mediaobject>
@@ -200,7 +200,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd11"/>
+ <imagedata fileref="virtualization/parallels-freebsd11.png"/>
</imageobject>
</mediaobject>
@@ -214,7 +214,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd10"/>
+ <imagedata fileref="virtualization/parallels-freebsd10.png"/>
</imageobject>
</mediaobject>
@@ -227,7 +227,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd12"/>
+ <imagedata fileref="virtualization/parallels-freebsd12.png"/>
</imageobject>
</mediaobject>
@@ -236,7 +236,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd13"/>
+ <imagedata fileref="virtualization/parallels-freebsd13.png"/>
</imageobject>
</mediaobject>
</sect3>
@@ -645,13 +645,13 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd1"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd1.png"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd2"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd2.png"/>
</imageobject>
</mediaobject>
@@ -661,7 +661,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd3"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd3.png"/>
</imageobject>
</mediaobject>
@@ -674,13 +674,13 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd4"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd4.png"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd5"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd5.png"/>
</imageobject>
</mediaobject>
@@ -688,7 +688,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd6"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd6.png"/>
</imageobject>
</mediaobject>
@@ -699,13 +699,13 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd7"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd7.png"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd8"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd8.png"/>
</imageobject>
</mediaobject>
@@ -728,13 +728,13 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd9"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd9.png"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd10"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd10.png"/>
</imageobject>
</mediaobject>
@@ -748,7 +748,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd11"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd11.png"/>
</imageobject>
</mediaobject>
@@ -761,7 +761,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd12"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd12.png"/>
</imageobject>
</mediaobject>
@@ -772,7 +772,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd13"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd13.png"/>
</imageobject>
</mediaobject>
</sect3>
diff --git a/hu_HU.ISO8859-2/books/fdp-primer/sgml-markup/chapter.xml b/hu_HU.ISO8859-2/books/fdp-primer/sgml-markup/chapter.xml
index fff5bf42a2..b9ce86b2a7 100644
--- a/hu_HU.ISO8859-2/books/fdp-primer/sgml-markup/chapter.xml
+++ b/hu_HU.ISO8859-2/books/fdp-primer/sgml-markup/chapter.xml
@@ -3006,7 +3006,7 @@ Ez lenne az 'ize2' nev
<para>Egy p�ld�n kereszt�l mindez
val�sz�n�leg sokkal k�nnyebben
�rthet�v� v�lik. Tegy�k
- teh�t most fel, hogy van egy <filename>abra1</filename>
+ teh�t most fel, hogy van egy <filename>abra1.png</filename>
nev� k�p�nk, amelyet szeretn�nk
betenni a dokumentumba. Ez a k�p egy A bet�t
�br�zol egy t�glalapban. A
@@ -3015,7 +3015,7 @@ Ez lenne az 'ize2' nev
<programlisting><mediaobject>
<imageobject>
- <imagedata fileref="abra1"> <co id="co-image-ext"/>
+ <imagedata fileref="abra1.png"> <co id="co-image-ext"/>
</imageobject>
<textobject>
@@ -3149,7 +3149,7 @@ IMAGES+= abra3.png
<programlisting><mediaobject>
<imageobject>
- <imagedata fileref="fejezet1/abra1"> <co id="co-image-dir"/>
+ <imagedata fileref="fejezet1/abra1.png"> <co id="co-image-dir"/>
</imageobject>
…
diff --git a/hu_HU.ISO8859-2/books/handbook/advanced-networking/chapter.xml b/hu_HU.ISO8859-2/books/handbook/advanced-networking/chapter.xml
index c4beaade54..e4625cdd5c 100644
--- a/hu_HU.ISO8859-2/books/handbook/advanced-networking/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/advanced-networking/chapter.xml
@@ -380,7 +380,7 @@ host2.example.com link#1 UC 0 0
<mediaobject>
<imageobject>
- <imagedata fileref="advanced-networking/net-routing"/>
+ <imagedata fileref="advanced-networking/net-routing.pic"/>
</imageobject>
<textobject>
@@ -639,7 +639,7 @@ host2.example.com link#1 UC 0 0
<mediaobject>
<imageobject>
- <imagedata fileref="advanced-networking/static-routes"/>
+ <imagedata fileref="advanced-networking/static-routes.pic"/>
</imageobject>
<textobject>
@@ -6288,7 +6288,7 @@ cd /usr/src/etc; make distribution</programlisting>
<mediaobject>
<imageobject>
- <imagedata fileref="advanced-networking/isdn-bus"/>
+ <imagedata fileref="advanced-networking/isdn-buse.eps"/>
</imageobject>
<textobject>
@@ -6328,7 +6328,7 @@ ISDN BRI vonal</literallayout>
<mediaobject>
<imageobject>
- <imagedata fileref="advanced-networking/isdn-twisted-pair"/>
+ <imagedata fileref="advanced-networking/isdn-twisted-pair.eps"/>
</imageobject>
<textobject>
@@ -6480,7 +6480,7 @@ ISDN BRI vonal</literallayout>
<mediaobject>
<imageobject>
- <imagedata fileref="advanced-networking/natd"/>
+ <imagedata fileref="advanced-networking/natd.eps"/>
</imageobject>
<textobject>
diff --git a/hu_HU.ISO8859-2/books/handbook/basics/chapter.xml b/hu_HU.ISO8859-2/books/handbook/basics/chapter.xml
index 2d0498e19c..bbfe9b9280 100644
--- a/hu_HU.ISO8859-2/books/handbook/basics/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/basics/chapter.xml
@@ -1531,7 +1531,7 @@ drwxrwxrwt 10 root wheel 512 Aug 31 01:49 tmp</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir1" format="EPS"/>
+ <imagedata fileref="install/example-dir1.eps" format="EPS"/>
</imageobject>
<textobject>
@@ -1558,7 +1558,7 @@ drwxrwxrwt 10 root wheel 512 Aug 31 01:49 tmp</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir2" format="EPS"/>
+ <imagedata fileref="install/example-dir2.eps" format="EPS"/>
</imageobject>
<textobject>
@@ -1593,7 +1593,7 @@ drwxrwxrwt 10 root wheel 512 Aug 31 01:49 tmp</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir3" format="EPS"/>
+ <imagedata fileref="install/example-dir3.eps" format="EPS"/>
</imageobject>
<textobject>
@@ -1625,7 +1625,7 @@ drwxrwxrwt 10 root wheel 512 Aug 31 01:49 tmp</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir4" format="EPS"/>
+ <imagedata fileref="install/example-dir4.eps" format="EPS"/>
</imageobject>
<textobject>
@@ -1652,7 +1652,7 @@ drwxrwxrwt 10 root wheel 512 Aug 31 01:49 tmp</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir5" format="EPS"/>
+ <imagedata fileref="install/example-dir5.eps" format="EPS"/>
</imageobject>
<textobject>
@@ -2058,7 +2058,7 @@ drwxrwxrwt 10 root wheel 512 Aug 31 01:49 tmp</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/disk-layout" format="EPS"/>
+ <imagedata fileref="install/disk-layout.eps" format="EPS"/>
</imageobject>
<textobject>
diff --git a/hu_HU.ISO8859-2/books/handbook/geom/chapter.xml b/hu_HU.ISO8859-2/books/handbook/geom/chapter.xml
index fdca1d5761..2ee26a3ca7 100644
--- a/hu_HU.ISO8859-2/books/handbook/geom/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/geom/chapter.xml
@@ -172,7 +172,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="geom/striping" align="center"/>
+ <imagedata fileref="geom/striping.pic" align="center"/>
</imageobject>
<textobject>
diff --git a/hu_HU.ISO8859-2/books/handbook/install/chapter.xml b/hu_HU.ISO8859-2/books/handbook/install/chapter.xml
index 3eb62e7aa5..df6c13a3bf 100644
--- a/hu_HU.ISO8859-2/books/handbook/install/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/install/chapter.xml
@@ -1320,7 +1320,7 @@ Insert disk labelled "Kernel floppy 1" and press any key...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/boot-loader-menu" format="PNG"/>
+ <imagedata fileref="install/boot-loader-menu.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1531,7 +1531,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/config-country" format="PNG"/>
+ <imagedata fileref="install/config-country.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1554,7 +1554,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/config-keymap" format="PNG"/>
+ <imagedata fileref="install/config-keymap.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1565,7 +1565,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/sysinstall-exit" format="PNG"/>
+ <imagedata fileref="install/sysinstall-exit.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1649,7 +1649,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main1" format="PNG"/>
+ <imagedata fileref="install/main1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1669,7 +1669,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main-doc" format="PNG"/>
+ <imagedata fileref="install/main-doc.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1683,7 +1683,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/docmenu1" format="PNG"/>
+ <imagedata fileref="install/docmenu1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1728,7 +1728,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main-keymap" format="PNG"/>
+ <imagedata fileref="install/main-keymap.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1757,7 +1757,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/keymap" format="PNG"/>
+ <imagedata fileref="install/keymap.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1778,7 +1778,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main-options" format="PNG"/>
+ <imagedata fileref="install/main-options.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1789,7 +1789,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/options" format="PNG"/>
+ <imagedata fileref="install/options.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1841,7 +1841,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main-std" format="PNG"/>
+ <imagedata fileref="install/main-std.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2115,7 +2115,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/fdisk-drive1" format="PNG"/>
+ <imagedata fileref="install/fdisk-drive1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2216,7 +2216,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/fdisk-edit1" format="PNG"/>
+ <imagedata fileref="install/fdisk-edit1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2287,7 +2287,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/fdisk-edit2" format="PNG"/>
+ <imagedata fileref="install/fdisk-edit2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2349,7 +2349,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/boot-mgr" format="PNG"/>
+ <imagedata fileref="install/boot-mgr.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2391,7 +2391,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/fdisk-drive2" format="PNG"/>
+ <imagedata fileref="install/fdisk-drive2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2724,7 +2724,7 @@ a k
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-ed1" format="PNG"/>
+ <imagedata fileref="install/disklabel-ed1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2767,7 +2767,7 @@ a k
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-auto" format="PNG"/>
+ <imagedata fileref="install/disklabel-auto.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2804,7 +2804,7 @@ a k
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-root1" format="PNG"/>
+ <imagedata fileref="install/disklabel-root1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2830,7 +2830,7 @@ a k
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-root2" format="PNG"/>
+ <imagedata fileref="install/disklabel-root2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2854,7 +2854,7 @@ a k
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-fs" format="PNG"/>
+ <imagedata fileref="install/disklabel-fs.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2878,7 +2878,7 @@ a k
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-root3" format="PNG"/>
+ <imagedata fileref="install/disklabel-root3.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2913,7 +2913,7 @@ a k
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-ed2" format="PNG"/>
+ <imagedata fileref="install/disklabel-ed2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2998,7 +2998,7 @@ a k
<mediaobject>
<imageobject>
- <imagedata fileref="install/dist-set" format="PNG"/>
+ <imagedata fileref="install/dist-set.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3092,7 +3092,7 @@ a k
<mediaobject>
<imageobject>
- <imagedata fileref="install/dist-set2" format="PNG"/>
+ <imagedata fileref="install/dist-set2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3140,7 +3140,7 @@ a k
<mediaobject>
<imageobject>
- <imagedata fileref="install/media" format="PNG"/>
+ <imagedata fileref="install/media.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3447,7 +3447,7 @@ megpr
<mediaobject>
<imageobject>
- <imagedata fileref="install/ed0-conf" format="PNG"/>
+ <imagedata fileref="install/ed0-conf.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3524,7 +3524,7 @@ megpr
<mediaobject>
<imageobject>
- <imagedata fileref="install/ed0-conf2" format="PNG"/>
+ <imagedata fileref="install/ed0-conf2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3800,7 +3800,7 @@ fogadjuk el.
<mediaobject>
<imageobject>
- <imagedata fileref="install/edit-inetd-conf" format="PNG"/>
+ <imagedata fileref="install/edit-inetd-conf.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3956,7 +3956,7 @@ fogadjuk el.
<mediaobject>
<imageobject>
- <imagedata fileref="install/ftp-anon1" format="PNG"/>
+ <imagedata fileref="install/ftp-anon1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -4059,7 +4059,7 @@ fogadjuk el.
<mediaobject>
<imageobject>
- <imagedata fileref="install/ftp-anon2" format="PNG"/>
+ <imagedata fileref="install/ftp-anon2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -4159,7 +4159,7 @@ szerkeszt
<mediaobject>
<imageobject>
- <imagedata fileref="install/nfs-server-edit" format="PNG"/>
+ <imagedata fileref="install/nfs-server-edit.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -4241,7 +4241,7 @@ szerkeszt
<mediaobject>
<imageobject>
- <imagedata fileref="install/console-saver1" format="PNG"/>
+ <imagedata fileref="install/console-saver1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -4258,7 +4258,7 @@ szerkeszt
<mediaobject>
<imageobject>
- <imagedata fileref="install/console-saver2" format="PNG"/>
+ <imagedata fileref="install/console-saver2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -4289,7 +4289,7 @@ szerkeszt
<mediaobject>
<imageobject>
- <imagedata fileref="install/console-saver3" format="PNG"/>
+ <imagedata fileref="install/console-saver3.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -4308,7 +4308,7 @@ szerkeszt
<mediaobject>
<imageobject>
- <imagedata fileref="install/console-saver4" format="PNG"/>
+ <imagedata fileref="install/console-saver4.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -4384,7 +4384,7 @@ szerkeszt
<mediaobject>
<imageobject>
- <imagedata fileref="install/timezone1" format="PNG"/>
+ <imagedata fileref="install/timezone1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -4399,7 +4399,7 @@ szerkeszt
<mediaobject>
<imageobject>
- <imagedata fileref="install/timezone2" format="PNG"/>
+ <imagedata fileref="install/timezone2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -4414,7 +4414,7 @@ szerkeszt
<mediaobject>
<imageobject>
- <imagedata fileref="install/timezone3" format="PNG"/>
+ <imagedata fileref="install/timezone3.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -4522,7 +4522,7 @@ szerkeszt
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse1" format="PNG"/>
+ <imagedata fileref="install/mouse1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -4538,7 +4538,7 @@ szerkeszt
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse2" format="PNG"/>
+ <imagedata fileref="install/mouse2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -4559,7 +4559,7 @@ szerkeszt
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse3" format="PNG"/>
+ <imagedata fileref="install/mouse3.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -4574,7 +4574,7 @@ szerkeszt
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse4" format="PNG"/>
+ <imagedata fileref="install/mouse4.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -4593,7 +4593,7 @@ szerkeszt
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse5" format="PNG"/>
+ <imagedata fileref="install/mouse5.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -4610,7 +4610,7 @@ szerkeszt
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse6" format="PNG"/>
+ <imagedata fileref="install/mouse6.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -4678,7 +4678,7 @@ szerkeszt
<mediaobject>
<imageobject>
- <imagedata fileref="install/pkg-cat" format="PNG"/>
+ <imagedata fileref="install/pkg-cat.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -4703,7 +4703,7 @@ szerkeszt
<mediaobject>
<imageobject>
- <imagedata fileref="install/pkg-sel" format="PNG"/>
+ <imagedata fileref="install/pkg-sel.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -4744,7 +4744,7 @@ szerkeszt
<mediaobject>
<imageobject>
- <imagedata fileref="install/pkg-install" format="PNG"/>
+ <imagedata fileref="install/pkg-install.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -4763,7 +4763,7 @@ szerkeszt
<mediaobject>
<imageobject>
- <imagedata fileref="install/pkg-confirm" format="PNG"/>
+ <imagedata fileref="install/pkg-confirm.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -4830,7 +4830,7 @@ szerkeszt
<mediaobject>
<imageobject>
- <imagedata fileref="install/adduser1" format="PNG"/>
+ <imagedata fileref="install/adduser1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -4846,7 +4846,7 @@ szerkeszt
<mediaobject>
<imageobject>
- <imagedata fileref="install/adduser2" format="PNG"/>
+ <imagedata fileref="install/adduser2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -4978,7 +4978,7 @@ szerkeszt
<mediaobject>
<imageobject>
- <imagedata fileref="install/adduser3" format="PNG"/>
+ <imagedata fileref="install/adduser3.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -5080,7 +5080,7 @@ Retype new password :</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/mainexit" format="PNG"/>
+ <imagedata fileref="install/mainexit.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -5202,7 +5202,7 @@ Retype new password :</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/net-config-menu1" format="PNG"/>
+ <imagedata fileref="install/net-config-menu1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -5307,7 +5307,7 @@ Retype new password :</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/mta-main" format="PNG"/>
+ <imagedata fileref="install/mta-main.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -5392,7 +5392,7 @@ Retype new password :</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/ntp-config" format="PNG"/>
+ <imagedata fileref="install/ntp-config.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -5428,7 +5428,7 @@ Retype new password :</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/net-config-menu2" format="PNG"/>
+ <imagedata fileref="install/net-config-menu2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
diff --git a/hu_HU.ISO8859-2/books/handbook/mail/chapter.xml b/hu_HU.ISO8859-2/books/handbook/mail/chapter.xml
index 538a5aaa68..a6eef1b19a 100644
--- a/hu_HU.ISO8859-2/books/handbook/mail/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/mail/chapter.xml
@@ -2571,7 +2571,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/mutt1" format="PNG"/>
+ <imagedata fileref="mail/mutt1.png" format="PNG"/>
</imageobject>
</mediaobject>
@@ -2583,7 +2583,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/mutt2" format="PNG"/>
+ <imagedata fileref="mail/mutt2.png" format="PNG"/>
</imageobject>
</mediaobject>
@@ -2634,7 +2634,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/mutt3" format="PNG"/>
+ <imagedata fileref="mail/mutt3.png" format="PNG"/>
</imageobject>
</mediaobject>
@@ -2702,7 +2702,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine1" format="PNG"/>
+ <imagedata fileref="mail/pine1.png" format="PNG"/>
</imageobject>
</mediaobject>
@@ -2729,7 +2729,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine2" format="PNG"/>
+ <imagedata fileref="mail/pine2.png" format="PNG"/>
</imageobject>
</mediaobject>
@@ -2742,7 +2742,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine3" format="PNG"/>
+ <imagedata fileref="mail/pine3.png" format="PNG"/>
</imageobject>
</mediaobject>
@@ -2758,7 +2758,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine4" format="PNG"/>
+ <imagedata fileref="mail/pine4.png" format="PNG"/>
</imageobject>
</mediaobject>
@@ -2779,7 +2779,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine5" format="PNG"/>
+ <imagedata fileref="mail/pine5.png" format="PNG"/>
</imageobject>
</mediaobject>
diff --git a/hu_HU.ISO8859-2/books/handbook/vinum/chapter.xml b/hu_HU.ISO8859-2/books/handbook/vinum/chapter.xml
index 032905b69e..cea8a6efb8 100644
--- a/hu_HU.ISO8859-2/books/handbook/vinum/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/vinum/chapter.xml
@@ -245,7 +245,7 @@
<figure id="vinum-concat">
<title>Az �sszef�z�tt szervez�si
m�d</title>
- <graphic fileref="vinum/vinum-concat"/>
+ <graphic fileref="vinum/vinum-concat.pic"/>
</figure>
</para>
@@ -290,7 +290,7 @@
<para>
<figure id="vinum-striped">
<title>A cs�kozott szervez�si m�d</title>
- <graphic fileref="vinum/vinum-striped"/>
+ <graphic fileref="vinum/vinum-striped.pic"/>
</figure>
</para>
@@ -387,7 +387,7 @@
<para>
<figure id="vinum-raid5-org">
<title>A RAID-5 szervez�si m�d</title>
- <graphic fileref="vinum/vinum-raid5-org"/>
+ <graphic fileref="vinum/vinum-raid5-org.pic"/>
</figure>
</para>
@@ -755,7 +755,7 @@
<para>
<figure id="vinum-simple-vol">
<title>Egyszer� Vinum-k�tet</title>
- <graphic fileref="vinum/vinum-simple-vol"/>
+ <graphic fileref="vinum/vinum-simple-vol.pic"/>
</figure>
</para>
@@ -835,7 +835,7 @@
<para>
<figure id="vinum-mirrored-vol">
<title>T�kr�z�tt Vinum-k�tet</title>
- <graphic fileref="vinum/vinum-mirrored-vol"/>
+ <graphic fileref="vinum/vinum-mirrored-vol.pic"/>
</figure>
</para>
@@ -915,7 +915,7 @@
<para>
<figure id="vinum-striped-vol">
<title>Cs�kozott Vinum-k�tet</title>
- <graphic fileref="vinum/vinum-striped-vol"/>
+ <graphic fileref="vinum/vinum-striped-vol.pic"/>
</figure>
</para>
@@ -969,7 +969,7 @@
<figure id="vinum-raid10-vol">
<title>T�kr�z�tt, cs�kozott
Vinum-k�tet</title>
- <graphic fileref="vinum/vinum-raid10-vol"/>
+ <graphic fileref="vinum/vinum-raid10-vol.pic"/>
</figure>
</para>
diff --git a/hu_HU.ISO8859-2/books/handbook/virtualization/chapter.xml b/hu_HU.ISO8859-2/books/handbook/virtualization/chapter.xml
index c299662d14..99208ff90b 100644
--- a/hu_HU.ISO8859-2/books/handbook/virtualization/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/virtualization/chapter.xml
@@ -135,7 +135,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd1"/>
+ <imagedata fileref="virtualization/parallels-freebsd1.png"/>
</imageobject>
</mediaobject>
@@ -152,25 +152,25 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd2"/>
+ <imagedata fileref="virtualization/parallels-freebsd2.png"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd3"/>
+ <imagedata fileref="virtualization/parallels-freebsd3.png"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd4"/>
+ <imagedata fileref="virtualization/parallels-freebsd4.png"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd5"/>
+ <imagedata fileref="virtualization/parallels-freebsd5.png"/>
</imageobject>
</mediaobject>
@@ -180,13 +180,13 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd6"/>
+ <imagedata fileref="virtualization/parallels-freebsd6.png"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd7"/>
+ <imagedata fileref="virtualization/parallels-freebsd7.png"/>
</imageobject>
</mediaobject>
@@ -195,13 +195,13 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd8"/>
+ <imagedata fileref="virtualization/parallels-freebsd8.png"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd9"/>
+ <imagedata fileref="virtualization/parallels-freebsd9.png"/>
</imageobject>
</mediaobject>
@@ -227,7 +227,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd11"/>
+ <imagedata fileref="virtualization/parallels-freebsd11.png"/>
</imageobject>
</mediaobject>
@@ -239,7 +239,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd10"/>
+ <imagedata fileref="virtualization/parallels-freebsd10.png"/>
</imageobject>
</mediaobject>
@@ -255,7 +255,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd12"/>
+ <imagedata fileref="virtualization/parallels-freebsd12.png"/>
</imageobject>
</mediaobject>
@@ -266,7 +266,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd13"/>
+ <imagedata fileref="virtualization/parallels-freebsd13.png"/>
</imageobject>
</mediaobject>
</sect3>
@@ -713,13 +713,13 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd1"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd1.png"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd2"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd2.png"/>
</imageobject>
</mediaobject>
@@ -731,7 +731,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd3"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd3.png"/>
</imageobject>
</mediaobject>
@@ -747,13 +747,13 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd4"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd4.png"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd5"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd5.png"/>
</imageobject>
</mediaobject>
@@ -762,7 +762,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd6"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd6.png"/>
</imageobject>
</mediaobject>
@@ -776,13 +776,13 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd7"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd7.png"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd8"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd8.png"/>
</imageobject>
</mediaobject>
@@ -812,13 +812,13 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd9"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd9.png"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd10"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd10.png"/>
</imageobject>
</mediaobject>
@@ -838,7 +838,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd11"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd11.png"/>
</imageobject>
</mediaobject>
@@ -854,7 +854,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd12"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd12.png"/>
</imageobject>
</mediaobject>
@@ -868,7 +868,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd13"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd13.png"/>
</imageobject>
</mediaobject>
</sect3>
@@ -984,7 +984,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd01"/>
+ <imagedata fileref="virtualization/vmware-freebsd01.png"/>
</imageobject>
</mediaobject>
@@ -996,7 +996,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd02"/>
+ <imagedata fileref="virtualization/vmware-freebsd02.png"/>
</imageobject>
</mediaobject>
@@ -1013,7 +1013,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd03"/>
+ <imagedata fileref="virtualization/vmware-freebsd03.png"/>
</imageobject>
</mediaobject>
@@ -1023,7 +1023,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd04"/>
+ <imagedata fileref="virtualization/vmware-freebsd04.png"/>
</imageobject>
</mediaobject>
@@ -1033,7 +1033,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd05"/>
+ <imagedata fileref="virtualization/vmware-freebsd05.png"/>
</imageobject>
</mediaobject>
@@ -1044,7 +1044,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd06"/>
+ <imagedata fileref="virtualization/vmware-freebsd06.png"/>
</imageobject>
</mediaobject>
@@ -1053,7 +1053,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd07"/>
+ <imagedata fileref="virtualization/vmware-freebsd07.png"/>
</imageobject>
</mediaobject>
@@ -1063,7 +1063,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd08"/>
+ <imagedata fileref="virtualization/vmware-freebsd08.png"/>
</imageobject>
</mediaobject>
@@ -1081,7 +1081,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd09"/>
+ <imagedata fileref="virtualization/vmware-freebsd09.png"/>
</imageobject>
</mediaobject>
@@ -1091,7 +1091,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd10"/>
+ <imagedata fileref="virtualization/vmware-freebsd10.png"/>
</imageobject>
</mediaobject>
@@ -1103,7 +1103,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd11"/>
+ <imagedata fileref="virtualization/vmware-freebsd11.png"/>
</imageobject>
</mediaobject>
@@ -1124,7 +1124,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd12"/>
+ <imagedata fileref="virtualization/vmware-freebsd12.png"/>
</imageobject>
</mediaobject>
diff --git a/it_IT.ISO8859-15/articles/vm-design/article.xml b/it_IT.ISO8859-15/articles/vm-design/article.xml
index 5206368afe..ba8e4456d4 100644
--- a/it_IT.ISO8859-15/articles/vm-design/article.xml
+++ b/it_IT.ISO8859-15/articles/vm-design/article.xml
@@ -231,7 +231,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="fig1" format="EPS"/>
+ <imagedata fileref="fig1.eps" format="EPS"/>
</imageobject>
<textobject>
@@ -257,7 +257,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="fig2" format="EPS"/>
+ <imagedata fileref="fig2.eps" format="EPS"/>
</imageobject>
<textobject>
@@ -278,7 +278,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="fig3" format="EPS"/>
+ <imagedata fileref="fig3.eps" format="EPS"/>
</imageobject>
<textobject>
@@ -313,7 +313,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="fig4" format="EPS"/>
+ <imagedata fileref="fig4.eps" format="EPS"/>
</imageobject>
<textobject>
diff --git a/it_IT.ISO8859-15/books/handbook/basics/chapter.xml b/it_IT.ISO8859-15/books/handbook/basics/chapter.xml
index b8a5bcabba..67a83ce3f4 100644
--- a/it_IT.ISO8859-15/books/handbook/basics/chapter.xml
+++ b/it_IT.ISO8859-15/books/handbook/basics/chapter.xml
@@ -1134,7 +1134,7 @@ total 530
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir1" format="EPS"/>
+ <imagedata fileref="install/example-dir1.eps" format="EPS"/>
</imageobject>
<textobject>
@@ -1154,7 +1154,7 @@ total 530
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir2" format="EPS"/>
+ <imagedata fileref="install/example-dir2.eps" format="EPS"/>
</imageobject>
<textobject>
@@ -1183,7 +1183,7 @@ total 530
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir3" format="EPS"/>
+ <imagedata fileref="install/example-dir3.eps" format="EPS"/>
</imageobject>
<textobject>
@@ -1210,7 +1210,7 @@ total 530
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir4" format="EPS"/>
+ <imagedata fileref="install/example-dir4.eps" format="EPS"/>
</imageobject>
<textobject>
@@ -1236,7 +1236,7 @@ total 530
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir5" format="EPS"/>
+ <imagedata fileref="install/example-dir5.eps" format="EPS"/>
</imageobject>
<textobject>
@@ -1556,7 +1556,7 @@ total 530
<mediaobject>
<imageobject>
- <imagedata fileref="install/disk-layout" format="EPS"/>
+ <imagedata fileref="install/disk-layout.eps" format="EPS"/>
</imageobject>
<textobject>
diff --git a/it_IT.ISO8859-15/books/handbook/geom/chapter.xml b/it_IT.ISO8859-15/books/handbook/geom/chapter.xml
index c01e0fb637..3ac563d168 100644
--- a/it_IT.ISO8859-15/books/handbook/geom/chapter.xml
+++ b/it_IT.ISO8859-15/books/handbook/geom/chapter.xml
@@ -146,7 +146,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="geom/striping" align="center"/>
+ <imagedata fileref="geom/striping.pic" align="center"/>
</imageobject>
<textobject>
diff --git a/it_IT.ISO8859-15/books/handbook/install/chapter.xml b/it_IT.ISO8859-15/books/handbook/install/chapter.xml
index fb6bddbab6..f708d59b4b 100644
--- a/it_IT.ISO8859-15/books/handbook/install/chapter.xml
+++ b/it_IT.ISO8859-15/books/handbook/install/chapter.xml
@@ -1022,7 +1022,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/sysinstall-exit" format="PNG"/>
+ <imagedata fileref="install/sysinstall-exit.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1077,7 +1077,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main1" format="PNG"/>
+ <imagedata fileref="install/main1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1093,7 +1093,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main-doc" format="PNG"/>
+ <imagedata fileref="install/main-doc.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1105,7 +1105,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/docmenu1" format="PNG"/>
+ <imagedata fileref="install/docmenu1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1135,7 +1135,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main-keymap" format="PNG"/>
+ <imagedata fileref="install/main-keymap.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1156,7 +1156,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/keymap" format="PNG"/>
+ <imagedata fileref="install/keymap.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1173,7 +1173,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main-options" format="PNG"/>
+ <imagedata fileref="install/main-options.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1183,7 +1183,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/options" format="PNG"/>
+ <imagedata fileref="install/options.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1217,7 +1217,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main-std" format="PNG"/>
+ <imagedata fileref="install/main-std.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1400,7 +1400,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/fdisk-drive1" format="PNG"/>
+ <imagedata fileref="install/fdisk-drive1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1470,7 +1470,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/fdisk-edit1" format="PNG"/>
+ <imagedata fileref="install/fdisk-edit1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1514,7 +1514,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/fdisk-edit2" format="PNG"/>
+ <imagedata fileref="install/fdisk-edit2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1556,7 +1556,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/boot-mgr" format="PNG"/>
+ <imagedata fileref="install/boot-mgr.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1587,7 +1587,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/fdisk-drive2" format="PNG"/>
+ <imagedata fileref="install/fdisk-drive2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1830,7 +1830,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-ed1" format="PNG"/>
+ <imagedata fileref="install/disklabel-ed1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1858,7 +1858,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-auto" format="PNG"/>
+ <imagedata fileref="install/disklabel-auto.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1897,7 +1897,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-root1" format="PNG"/>
+ <imagedata fileref="install/disklabel-root1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1915,7 +1915,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-root2" format="PNG"/>
+ <imagedata fileref="install/disklabel-root2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1932,7 +1932,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-fs" format="PNG"/>
+ <imagedata fileref="install/disklabel-fs.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1949,7 +1949,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-root3" format="PNG"/>
+ <imagedata fileref="install/disklabel-root3.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1972,7 +1972,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-ed2" format="PNG"/>
+ <imagedata fileref="install/disklabel-ed2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2033,7 +2033,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/dist-set" format="PNG"/>
+ <imagedata fileref="install/dist-set.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2089,7 +2089,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/dist-set2" format="PNG"/>
+ <imagedata fileref="install/dist-set2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2121,7 +2121,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/media" format="PNG"/>
+ <imagedata fileref="install/media.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2313,7 +2313,7 @@ installation menus to retry whichever operations have failed.
<mediaobject>
<imageobject>
- <imagedata fileref="install/ed0-conf" format="PNG"/>
+ <imagedata fileref="install/ed0-conf.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2360,7 +2360,7 @@ installation menus to retry whichever operations have failed.
<mediaobject>
<imageobject>
- <imagedata fileref="install/ed0-conf2" format="PNG"/>
+ <imagedata fileref="install/ed0-conf2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2534,7 +2534,7 @@ use the current settings.
<mediaobject>
<imageobject>
- <imagedata fileref="install/edit-inetd-conf" format="PNG"/>
+ <imagedata fileref="install/edit-inetd-conf.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2584,7 +2584,7 @@ use the current settings.
<mediaobject>
<imageobject>
- <imagedata fileref="install/ftp-anon1" format="PNG"/>
+ <imagedata fileref="install/ftp-anon1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2634,7 +2634,7 @@ Upload subdirectory:
<mediaobject>
<imageobject>
- <imagedata fileref="install/ftp-anon2" format="PNG"/>
+ <imagedata fileref="install/ftp-anon2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2692,7 +2692,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/nfs-server-edit" format="PNG"/>
+ <imagedata fileref="install/nfs-server-edit.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2839,7 +2839,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/security" format="PNG"/>
+ <imagedata fileref="install/security.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2918,7 +2918,7 @@ To change any of these settings later, edit /etc/rc.conf
<mediaobject>
<imageobject>
- <imagedata fileref="install/console-saver1" format="PNG"/>
+ <imagedata fileref="install/console-saver1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2933,7 +2933,7 @@ To change any of these settings later, edit /etc/rc.conf
<mediaobject>
<imageobject>
- <imagedata fileref="install/console-saver2" format="PNG"/>
+ <imagedata fileref="install/console-saver2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2954,7 +2954,7 @@ To change any of these settings later, edit /etc/rc.conf
<mediaobject>
<imageobject>
- <imagedata fileref="install/console-saver3" format="PNG"/>
+ <imagedata fileref="install/console-saver3.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2968,7 +2968,7 @@ To change any of these settings later, edit /etc/rc.conf
<mediaobject>
<imageobject>
- <imagedata fileref="install/console-saver4" format="PNG"/>
+ <imagedata fileref="install/console-saver4.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3013,7 +3013,7 @@ To change any of these settings later, edit /etc/rc.conf
<mediaobject>
<imageobject>
- <imagedata fileref="install/timezone1" format="PNG"/>
+ <imagedata fileref="install/timezone1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3026,7 +3026,7 @@ To change any of these settings later, edit /etc/rc.conf
<mediaobject>
<imageobject>
- <imagedata fileref="install/timezone2" format="PNG"/>
+ <imagedata fileref="install/timezone2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3039,7 +3039,7 @@ To change any of these settings later, edit /etc/rc.conf
<mediaobject>
<imageobject>
- <imagedata fileref="install/timezone3" format="PNG"/>
+ <imagedata fileref="install/timezone3.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3098,7 +3098,7 @@ To change any of these settings later, edit /etc/rc.conf
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse1" format="PNG"/>
+ <imagedata fileref="install/mouse1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3111,7 +3111,7 @@ To change any of these settings later, edit /etc/rc.conf
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse2" format="PNG"/>
+ <imagedata fileref="install/mouse2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3127,7 +3127,7 @@ To change any of these settings later, edit /etc/rc.conf
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse3" format="PNG"/>
+ <imagedata fileref="install/mouse3.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3140,7 +3140,7 @@ To change any of these settings later, edit /etc/rc.conf
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse4" format="PNG"/>
+ <imagedata fileref="install/mouse4.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3155,7 +3155,7 @@ To change any of these settings later, edit /etc/rc.conf
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse5" format="PNG"/>
+ <imagedata fileref="install/mouse5.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3169,7 +3169,7 @@ To change any of these settings later, edit /etc/rc.conf
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse6" format="PNG"/>
+ <imagedata fileref="install/mouse6.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3230,7 +3230,7 @@ To change any of these settings later, edit /etc/rc.conf
<mediaobject>
<imageobject>
- <imagedata fileref="install/net-config-menu1" format="PNG"/>
+ <imagedata fileref="install/net-config-menu1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3302,7 +3302,7 @@ To change any of these settings later, edit /etc/rc.conf
<mediaobject>
<imageobject>
- <imagedata fileref="install/mta-main" format="PNG"/>
+ <imagedata fileref="install/mta-main.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3356,7 +3356,7 @@ To change any of these settings later, edit /etc/rc.conf
<mediaobject>
<imageobject>
- <imagedata fileref="install/ntp-config" format="PNG"/>
+ <imagedata fileref="install/ntp-config.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3383,7 +3383,7 @@ To change any of these settings later, edit /etc/rc.conf
<mediaobject>
<imageobject>
- <imagedata fileref="install/net-config-menu2" format="PNG"/>
+ <imagedata fileref="install/net-config-menu2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3513,7 +3513,7 @@ To change any of these settings later, edit /etc/rc.conf
<mediaobject>
<imageobject>
- <imagedata fileref="install/xf86setup" format="PNG"/>
+ <imagedata fileref="install/xf86setup.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -4035,7 +4035,7 @@ failed. Would you like to try again?
<mediaobject>
<imageobject>
- <imagedata fileref="install/desktop" format="PNG"/>
+ <imagedata fileref="install/desktop.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -4073,7 +4073,7 @@ failed. Would you like to try again?
<mediaobject>
<imageobject>
- <imagedata fileref="install/pkg-cat" format="PNG"/>
+ <imagedata fileref="install/pkg-cat.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -4095,7 +4095,7 @@ failed. Would you like to try again?
<mediaobject>
<imageobject>
- <imagedata fileref="install/pkg-sel" format="PNG"/>
+ <imagedata fileref="install/pkg-sel.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -4123,7 +4123,7 @@ failed. Would you like to try again?
<mediaobject>
<imageobject>
- <imagedata fileref="install/pkg-install" format="PNG"/>
+ <imagedata fileref="install/pkg-install.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -4138,7 +4138,7 @@ failed. Would you like to try again?
<mediaobject>
<imageobject>
- <imagedata fileref="install/pkg-confirm" format="PNG"/>
+ <imagedata fileref="install/pkg-confirm.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -4180,7 +4180,7 @@ failed. Would you like to try again?
<mediaobject>
<imageobject>
- <imagedata fileref="install/adduser1" format="PNG"/>
+ <imagedata fileref="install/adduser1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -4193,7 +4193,7 @@ failed. Would you like to try again?
<mediaobject>
<imageobject>
- <imagedata fileref="install/adduser2" format="PNG"/>
+ <imagedata fileref="install/adduser2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -4297,7 +4297,7 @@ failed. Would you like to try again?
<mediaobject>
<imageobject>
- <imagedata fileref="install/adduser3" format="PNG"/>
+ <imagedata fileref="install/adduser3.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -4364,7 +4364,7 @@ Retype new password :</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/mainexit" format="PNG"/>
+ <imagedata fileref="install/mainexit.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
diff --git a/it_IT.ISO8859-15/books/handbook/mail/chapter.xml b/it_IT.ISO8859-15/books/handbook/mail/chapter.xml
index 413aa662fd..34100bda3c 100644
--- a/it_IT.ISO8859-15/books/handbook/mail/chapter.xml
+++ b/it_IT.ISO8859-15/books/handbook/mail/chapter.xml
@@ -2017,7 +2017,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/mutt1" format="PNG"/>
+ <imagedata fileref="mail/mutt1.png" format="PNG"/>
</imageobject>
</mediaobject>
@@ -2027,7 +2027,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/mutt2" format="PNG"/>
+ <imagedata fileref="mail/mutt2.png" format="PNG"/>
</imageobject>
</mediaobject>
@@ -2063,7 +2063,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/mutt3" format="PNG"/>
+ <imagedata fileref="mail/mutt3.png" format="PNG"/>
</imageobject>
</mediaobject>
@@ -2114,7 +2114,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine1" format="PNG"/>
+ <imagedata fileref="mail/pine1.png" format="PNG"/>
</imageobject>
</mediaobject>
@@ -2134,7 +2134,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine2" format="PNG"/>
+ <imagedata fileref="mail/pine2.png" format="PNG"/>
</imageobject>
</mediaobject>
@@ -2145,7 +2145,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine3" format="PNG"/>
+ <imagedata fileref="mail/pine3.png" format="PNG"/>
</imageobject>
</mediaobject>
@@ -2158,7 +2158,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine4" format="PNG"/>
+ <imagedata fileref="mail/pine4.png" format="PNG"/>
</imageobject>
</mediaobject>
@@ -2175,7 +2175,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine5" format="PNG"/>
+ <imagedata fileref="mail/pine5.png" format="PNG"/>
</imageobject>
</mediaobject>
diff --git a/it_IT.ISO8859-15/books/handbook/vinum/chapter.xml b/it_IT.ISO8859-15/books/handbook/vinum/chapter.xml
index 333e299d01..1b9e317a42 100644
--- a/it_IT.ISO8859-15/books/handbook/vinum/chapter.xml
+++ b/it_IT.ISO8859-15/books/handbook/vinum/chapter.xml
@@ -159,7 +159,7 @@
<figure id="vinum-concat">
<title>Organizzazione Concatenata</title>
- <graphic fileref="vinum/vinum-concat"/>
+ <graphic fileref="vinum/vinum-concat.pic"/>
</figure>
</para>
@@ -203,7 +203,7 @@
<figure id="vinum-striped">
<title>Organizzazione in Striping</title>
- <graphic fileref="vinum/vinum-striped"/>
+ <graphic fileref="vinum/vinum-striped.pic"/>
</figure>
</para>
</sect1>
@@ -278,7 +278,7 @@
<figure id="vinum-raid5-org">
<title>Organizzazione RAID-5</title>
- <graphic fileref="vinum/vinum-raid5-org"/>
+ <graphic fileref="vinum/vinum-raid5-org.pic"/>
</figure>
</para>
@@ -569,7 +569,7 @@
<figure id="vinum-simple-vol">
<title>Un Semplice Volume Vinum</title>
- <graphic fileref="vinum/vinum-simple-vol"/>
+ <graphic fileref="vinum/vinum-simple-vol.pic"/>
</figure>
</para>
@@ -635,7 +635,7 @@
<figure id="vinum-mirrored-vol">
<title>Un Volume Vinum in Mirroring</title>
- <graphic fileref="vinum/vinum-mirrored-vol"/>
+ <graphic fileref="vinum/vinum-mirrored-vol.pic"/>
</figure>
</para>
@@ -701,7 +701,7 @@
<figure id="vinum-striped-vol">
<title>Un Volume Vinum in Striping</title>
- <graphic fileref="vinum/vinum-striped-vol"/>
+ <graphic fileref="vinum/vinum-striped-vol.pic"/>
</figure>
</para>
@@ -746,7 +746,7 @@
<figure id="vinum-raid10-vol">
<title>Un Volume Vinum in Mirroring e Striping</title>
- <graphic fileref="vinum/vinum-raid10-vol"/>
+ <graphic fileref="vinum/vinum-raid10-vol.pic"/>
</figure>
</para>
</sect2>
diff --git a/ja_JP.eucJP/books/design-44bsd/book.xml b/ja_JP.eucJP/books/design-44bsd/book.xml
index ff83f9d3fa..c9ff75195d 100644
--- a/ja_JP.eucJP/books/design-44bsd/book.xml
+++ b/ja_JP.eucJP/books/design-44bsd/book.xml
@@ -637,7 +637,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="fig1" format="EPS"/>
+ <imagedata fileref="fig1.eps" format="EPS"/>
</imageobject>
<textobject>
@@ -1440,7 +1440,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="fig2" format="EPS"/>
+ <imagedata fileref="fig2.eps" format="EPS"/>
</imageobject>
<textobject>
diff --git a/ja_JP.eucJP/books/handbook/advanced-networking/chapter.xml b/ja_JP.eucJP/books/handbook/advanced-networking/chapter.xml
index 38b4dfd103..1a73933ece 100644
--- a/ja_JP.eucJP/books/handbook/advanced-networking/chapter.xml
+++ b/ja_JP.eucJP/books/handbook/advanced-networking/chapter.xml
@@ -307,7 +307,7 @@ host2.example.com link#1 UC 0 0
<mediaobject>
<imageobject>
- <imagedata fileref="advanced-networking/net-routing"/>
+ <imagedata fileref="advanced-networking/net-routing.pic"/>
</imageobject>
<textobject>
@@ -3199,7 +3199,7 @@ Exports list on foobar:
<mediaobject>
<imageobject>
- <imagedata fileref="advanced-networking/isdn-bus"/>
+ <imagedata fileref="advanced-networking/isdn-bus.eps"/>
</imageobject>
<textobject>
@@ -3233,7 +3233,7 @@ ISDN BRI
<mediaobject>
<imageobject>
- <imagedata fileref="advanced-networking/isdn-twisted-pair"/>
+ <imagedata fileref="advanced-networking/isdn-twisted-pair.eps"/>
</imageobject>
<textobject>
<literallayout class="monospaced"> -------Novell ������
@@ -6421,7 +6421,7 @@ driftfile /var/db/ntp.drift</programlisting>
<mediaobject>
<imageobject>
- <imagedata fileref="advanced-networking/natd"/>
+ <imagedata fileref="advanced-networking/natd.eps"/>
</imageobject>
<textobject>
diff --git a/ja_JP.eucJP/books/handbook/bsdinstall/chapter.xml b/ja_JP.eucJP/books/handbook/bsdinstall/chapter.xml
index 9823b6e039..681b18b9aa 100644
--- a/ja_JP.eucJP/books/handbook/bsdinstall/chapter.xml
+++ b/ja_JP.eucJP/books/handbook/bsdinstall/chapter.xml
@@ -671,7 +671,7 @@ Loading /boot/defaults/loader.conf
<title>&os; �֡��ȥ�������˥塼</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-boot-loader-menu" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-boot-loader-menu.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -962,7 +962,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>���ȡ����ǥ���������⡼��</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-choose-mode" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-choose-mode.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1003,7 +1003,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>�����ޥåפ�����</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-keymap-select-default" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-keymap-select-default.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1017,7 +1017,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>�����ܡ��ɥ�˥塼������</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-config-keymap" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-config-keymap.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1044,7 +1044,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>�ۥ���̾������</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-config-hostname" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-config-hostname.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1064,7 +1064,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>���ȡ��뤹�륳��ݡ��ͥ�Ȥ�����</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-config-components" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-config-components.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1153,7 +1153,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-netinstall-files" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-netinstall-files.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1170,7 +1170,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-netinstall-mirrorselect" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-netinstall-mirrorselect.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1195,7 +1195,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-part-guided-manual" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-part-guided-manual.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1210,7 +1210,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>ʣ���Υǥ�������������</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-part-guided-disk" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-part-guided-disk.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1225,7 +1225,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>Entire Disk �ޤ��� Partition ������</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-part-entire-part" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-part-entire-part.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1246,7 +1246,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>�������줿�ѡ��ƥ������γ�ǧ</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-part-review" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-part-review.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1262,7 +1262,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>Manual �ˤ��ѡ��ƥ�������ʬ��</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-part-manual-create" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-part-manual-create.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1276,7 +1276,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>��ư�ǥѡ��ƥ��������������</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-part-manual-partscheme" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-part-manual-partscheme.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1352,7 +1352,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>��ư�ǥѡ��ƥ��������������</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-part-manual-addpart" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-part-manual-addpart.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1531,7 +1531,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>�Ǹ�γ�ǧ</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-final-confirmation" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-final-confirmation.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1561,7 +1561,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>���ۥե�����Υ����������</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-distfile-fetching" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-distfile-fetching.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1574,7 +1574,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>���ۥե�����θ���</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-distfile-verifying" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-distfile-verifying.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1585,7 +1585,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>���ۥե�����μ��Ф�</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-distfile-extracting" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-distfile-extracting.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1617,7 +1617,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-post-root-passwd" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-post-root-passwd.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1642,7 +1642,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1672,7 +1672,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>�磻��쥹���������ݥ���ȤΥ������</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-configure-wireless-scan" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-configure-wireless-scan.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1692,7 +1692,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>�磻��쥹�ͥåȥ��������</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-configure-wireless-accesspoints" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-configure-wireless-accesspoints.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1707,7 +1707,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>WPA2 �Υ��åȥ��å�</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-configure-wireless-wpa2setup" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-configure-wireless-wpa2setup.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1727,7 +1727,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-ipv4" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-ipv4.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1758,7 +1758,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-ipv4-dhcp" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-ipv4-dhcp.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1775,7 +1775,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-ipv4-static" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-ipv4-static.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1818,7 +1818,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-ipv6" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-ipv6.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1844,7 +1844,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-slaac" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-slaac.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1861,7 +1861,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-ipv6-static" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-ipv6-static.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1907,7 +1907,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-configure-network-ipv4-dns" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-configure-network-ipv4-dns.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1929,7 +1929,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>��������ޤ��� UTC �����å�������</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-set-clock-local-utc" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-set-clock-local-utc.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1946,7 +1946,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>�ϰ������</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-timezone-region" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-timezone-region.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1958,7 +1958,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>��̾������</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-timezone-country" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-timezone-country.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1970,7 +1970,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>�����ॾ���������</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-timezone-zone" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-timezone-zone.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1982,7 +1982,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>�����ॾ����γ���</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-timezone-confirm" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-timezone-confirm.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2002,7 +2002,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>�ɲä�ͭ���ˤ��륵���ӥ�������</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-config-services" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-config-services.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2049,7 +2049,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>����å������פ�����</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-config-crashdump" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-config-crashdump.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2073,7 +2073,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-adduser1" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-adduser1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2085,7 +2085,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-adduser2" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-adduser2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2187,7 +2187,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-adduser3" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-adduser3.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2212,7 +2212,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-finalconfiguration" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-finalconfiguration.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2268,7 +2268,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-final-modification-shell" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-final-modification-shell.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2286,7 +2286,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-mainexit" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-mainexit.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
diff --git a/ja_JP.eucJP/books/handbook/install/chapter.xml b/ja_JP.eucJP/books/handbook/install/chapter.xml
index 0412a28d4c..05ae6a6ddd 100644
--- a/ja_JP.eucJP/books/handbook/install/chapter.xml
+++ b/ja_JP.eucJP/books/handbook/install/chapter.xml
@@ -1041,7 +1041,7 @@ Insert disk labelled "Kernel floppy 1" and press any key...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/boot-loader-menu" format="PNG"/>
+ <imagedata fileref="install/boot-loader-menu.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1206,7 +1206,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/config-country" format="PNG"/>
+ <imagedata fileref="install/config-country.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1222,7 +1222,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/config-keymap" format="PNG"/>
+ <imagedata fileref="install/config-keymap.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1259,7 +1259,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main1" format="PNG"/>
+ <imagedata fileref="install/main1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1276,7 +1276,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main-doc" format="PNG"/>
+ <imagedata fileref="install/main-doc.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1288,7 +1288,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/docmenu1" format="PNG"/>
+ <imagedata fileref="install/docmenu1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1318,7 +1318,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main-keymap" format="PNG"/>
+ <imagedata fileref="install/main-keymap.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1339,7 +1339,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/keymap" format="PNG"/>
+ <imagedata fileref="install/keymap.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1357,7 +1357,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main-options" format="PNG"/>
+ <imagedata fileref="install/main-options.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1367,7 +1367,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/options" format="PNG"/>
+ <imagedata fileref="install/options.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1399,7 +1399,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main-std" format="PNG"/>
+ <imagedata fileref="install/main-std.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1570,7 +1570,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/fdisk-drive1" format="PNG"/>
+ <imagedata fileref="install/fdisk-drive1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1642,7 +1642,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/fdisk-edit1" format="PNG"/>
+ <imagedata fileref="install/fdisk-edit1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1691,7 +1691,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/fdisk-edit2" format="PNG"/>
+ <imagedata fileref="install/fdisk-edit2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1732,7 +1732,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/boot-mgr" format="PNG"/>
+ <imagedata fileref="install/boot-mgr.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1763,7 +1763,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/fdisk-drive2" format="PNG"/>
+ <imagedata fileref="install/fdisk-drive2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2029,7 +2029,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-ed1" format="PNG"/>
+ <imagedata fileref="install/disklabel-ed1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2061,7 +2061,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-auto" format="PNG"/>
+ <imagedata fileref="install/disklabel-auto.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2091,7 +2091,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-root1" format="PNG"/>
+ <imagedata fileref="install/disklabel-root1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2108,7 +2108,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-root2" format="PNG"/>
+ <imagedata fileref="install/disklabel-root2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2127,7 +2127,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-fs" format="PNG"/>
+ <imagedata fileref="install/disklabel-fs.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2146,7 +2146,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-root3" format="PNG"/>
+ <imagedata fileref="install/disklabel-root3.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2171,7 +2171,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-ed2" format="PNG"/>
+ <imagedata fileref="install/disklabel-ed2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2217,7 +2217,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/dist-set" format="PNG"/>
+ <imagedata fileref="install/dist-set.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2270,7 +2270,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/dist-set2" format="PNG"/>
+ <imagedata fileref="install/dist-set2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2301,7 +2301,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/media" format="PNG"/>
+ <imagedata fileref="install/media.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2502,7 +2502,7 @@ installation menus to retry whichever operations have failed.
<mediaobject>
<imageobject>
- <imagedata fileref="install/ed0-conf" format="PNG"/>
+ <imagedata fileref="install/ed0-conf.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2551,7 +2551,7 @@ installation menus to retry whichever operations have failed.
<mediaobject>
<imageobject>
- <imagedata fileref="install/ed0-conf2" format="PNG"/>
+ <imagedata fileref="install/ed0-conf2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2739,7 +2739,7 @@ use the current settings.
<mediaobject>
<imageobject>
- <imagedata fileref="install/edit-inetd-conf" format="PNG"/>
+ <imagedata fileref="install/edit-inetd-conf.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2835,7 +2835,7 @@ use the current settings.
<mediaobject>
<imageobject>
- <imagedata fileref="install/ftp-anon1" format="PNG"/>
+ <imagedata fileref="install/ftp-anon1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2911,7 +2911,7 @@ use the current settings.
<mediaobject>
<imageobject>
- <imagedata fileref="install/ftp-anon2" format="PNG"/>
+ <imagedata fileref="install/ftp-anon2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2970,7 +2970,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/nfs-server-edit" format="PNG"/>
+ <imagedata fileref="install/nfs-server-edit.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3019,7 +3019,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/console-saver1" format="PNG"/>
+ <imagedata fileref="install/console-saver1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3033,7 +3033,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/console-saver2" format="PNG"/>
+ <imagedata fileref="install/console-saver2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3055,7 +3055,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/console-saver3" format="PNG"/>
+ <imagedata fileref="install/console-saver3.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3069,7 +3069,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/console-saver4" format="PNG"/>
+ <imagedata fileref="install/console-saver4.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3112,7 +3112,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/timezone1" format="PNG"/>
+ <imagedata fileref="install/timezone1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3125,7 +3125,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/timezone2" format="PNG"/>
+ <imagedata fileref="install/timezone2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3138,7 +3138,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/timezone3" format="PNG"/>
+ <imagedata fileref="install/timezone3.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3209,7 +3209,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse1" format="PNG"/>
+ <imagedata fileref="install/mouse1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3222,7 +3222,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse2" format="PNG"/>
+ <imagedata fileref="install/mouse2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3238,7 +3238,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse3" format="PNG"/>
+ <imagedata fileref="install/mouse3.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3251,7 +3251,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse4" format="PNG"/>
+ <imagedata fileref="install/mouse4.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3266,7 +3266,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse5" format="PNG"/>
+ <imagedata fileref="install/mouse5.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3280,7 +3280,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse6" format="PNG"/>
+ <imagedata fileref="install/mouse6.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3324,7 +3324,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/pkg-cat" format="PNG"/>
+ <imagedata fileref="install/pkg-cat.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3345,7 +3345,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/pkg-sel" format="PNG"/>
+ <imagedata fileref="install/pkg-sel.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3374,7 +3374,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/pkg-install" format="PNG"/>
+ <imagedata fileref="install/pkg-install.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3388,7 +3388,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/pkg-confirm" format="PNG"/>
+ <imagedata fileref="install/pkg-confirm.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3428,7 +3428,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/adduser1" format="PNG"/>
+ <imagedata fileref="install/adduser1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3441,7 +3441,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/adduser2" format="PNG"/>
+ <imagedata fileref="install/adduser2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3544,7 +3544,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/adduser3" format="PNG"/>
+ <imagedata fileref="install/adduser3.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3610,7 +3610,7 @@ Retype new password :</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/mainexit" format="PNG"/>
+ <imagedata fileref="install/mainexit.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3688,7 +3688,7 @@ Retype new password :</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/net-config-menu1" format="PNG"/>
+ <imagedata fileref="install/net-config-menu1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3758,7 +3758,7 @@ Retype new password :</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/mta-main" format="PNG"/>
+ <imagedata fileref="install/mta-main.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3814,7 +3814,7 @@ Retype new password :</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/ntp-config" format="PNG"/>
+ <imagedata fileref="install/ntp-config.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3842,7 +3842,7 @@ Retype new password :</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/net-config-menu2" format="PNG"/>
+ <imagedata fileref="install/net-config-menu2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
diff --git a/mn_MN.UTF-8/books/handbook/advanced-networking/chapter.xml b/mn_MN.UTF-8/books/handbook/advanced-networking/chapter.xml
index dace6c01dc..d001f63c9d 100644
--- a/mn_MN.UTF-8/books/handbook/advanced-networking/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/advanced-networking/chapter.xml
@@ -291,7 +291,7 @@ host2.example.com link#1 UC 0 0
<mediaobject>
<imageobject>
- <imagedata fileref="advanced-networking/net-routing"/>
+ <imagedata fileref="advanced-networking/net-routing.pic"/>
</imageobject>
<textobject>
@@ -468,7 +468,7 @@ host2.example.com link#1 UC 0 0
<mediaobject>
<imageobject>
- <imagedata fileref="advanced-networking/static-routes"/>
+ <imagedata fileref="advanced-networking/static-routes.pic"/>
</imageobject>
<textobject>
@@ -4266,7 +4266,7 @@ myhost.example.com:/b/tftpboot/FreeBSD/install / nfs ro
<area id="co-pxenfs5" coords="3108,2666 3519,1800"/>
</areaspec>
<imageobject>
- <imagedata fileref="advanced-networking/pxe-nfs"/>
+ <imagedata fileref="advanced-networking/pxe-nfs.png"/>
</imageobject>
<calloutlist>
<callout arearefs="co-pxenfs1">
@@ -4566,7 +4566,7 @@ Received 264951 bytes in 0.1 seconds</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="advanced-networking/isdn-bus"/>
+ <imagedata fileref="advanced-networking/isdn-bus.eps"/>
</imageobject>
<textobject>
@@ -4601,7 +4601,7 @@ ISDN BRI line</literallayout>
<mediaobject>
<imageobject>
- <imagedata fileref="advanced-networking/isdn-twisted-pair"/>
+ <imagedata fileref="advanced-networking/isdn-twisted-pair.eps"/>
</imageobject>
<textobject>
@@ -4699,7 +4699,7 @@ ISDN BRI line</literallayout>
<mediaobject>
<imageobject>
- <imagedata fileref="advanced-networking/natd"/>
+ <imagedata fileref="advanced-networking/natd.eps"/>
</imageobject>
<textobject>
diff --git a/mn_MN.UTF-8/books/handbook/basics/chapter.xml b/mn_MN.UTF-8/books/handbook/basics/chapter.xml
index cbe05d7935..86df2040e9 100644
--- a/mn_MN.UTF-8/books/handbook/basics/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/basics/chapter.xml
@@ -1131,7 +1131,7 @@ root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01 passwd</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir1" format="EPS"/>
+ <imagedata fileref="install/example-dir1.eps" format="EPS"/>
</imageobject>
<textobject>
@@ -1149,7 +1149,7 @@ root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01 passwd</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir2" format="EPS"/>
+ <imagedata fileref="install/example-dir2.eps" format="EPS"/>
</imageobject>
<textobject>
@@ -1175,7 +1175,7 @@ root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01 passwd</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir3" format="EPS"/>
+ <imagedata fileref="install/example-dir3.eps" format="EPS"/>
</imageobject>
<textobject>
@@ -1199,7 +1199,7 @@ root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01 passwd</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir4" format="EPS"/>
+ <imagedata fileref="install/example-dir4.eps" format="EPS"/>
</imageobject>
<textobject>
@@ -1225,7 +1225,7 @@ root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01 passwd</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir5" format="EPS"/>
+ <imagedata fileref="install/example-dir5.eps" format="EPS"/>
</imageobject>
<textobject>
@@ -1517,7 +1517,7 @@ root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01 passwd</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/disk-layout" format="EPS"/>
+ <imagedata fileref="install/disk-layout.eps" format="EPS"/>
</imageobject>
<textobject>
diff --git a/mn_MN.UTF-8/books/handbook/bsdinstall/chapter.xml b/mn_MN.UTF-8/books/handbook/bsdinstall/chapter.xml
index 5af6487681..fff0251723 100644
--- a/mn_MN.UTF-8/books/handbook/bsdinstall/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/bsdinstall/chapter.xml
@@ -642,7 +642,7 @@ Loading /boot/defaults/loader.conf
<title>&os; ачаалагч дуудагч цэс</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-boot-loader-menu" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-boot-loader-menu.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -921,7 +921,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>Суулгалтын зөөвөрлөгч сонгох нь</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-choose-mode" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-choose-mode.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -964,7 +964,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>Гарын байрлалын сонголт</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-keymap-select-default" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-keymap-select-default.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -978,7 +978,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>Гарын цэсийг сонгох</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-config-keymap" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-config-keymap.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1005,7 +1005,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>Хостын нэрийг тохируулах</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-config-hostname" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-config-hostname.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1024,7 +1024,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>Бүрэлдэхүүн хэсгүүдийг суулгахаар сонгох</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-config-components" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-config-components.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1110,7 +1110,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-netinstall-files" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-netinstall-files.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1128,7 +1128,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-netinstall-mirrorselect" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-netinstall-mirrorselect.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1152,7 +1152,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>Зааварчилсан эсвэл Гар аргаар хуваах горимыг сонгох</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-part-guided-manual" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-part-guided-manual.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1167,7 +1167,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>Олон дискээс сонгох</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-part-guided-disk" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-part-guided-disk.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1183,7 +1183,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>Бүх диск эсвэл хуваалтыг сонгох</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-part-entire-part" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-part-entire-part.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1201,7 +1201,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>Үүсгэсэн хуваалтуудыг шалгах</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-part-review" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-part-review.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1217,7 +1217,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>Хуваалтуудыг гараар хийх нь</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-part-manual-create" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-part-manual-create.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1232,7 +1232,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>Хуваалтуудыг гараах хийх нь</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-part-manual-partscheme" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-part-manual-partscheme.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1306,7 +1306,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>Гараар хуваалтуудыг үүсгэх нь</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-part-manual-addpart" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-part-manual-addpart.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1480,7 +1480,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>Сүүлийн лавлагаа</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-final-confirmation" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-final-confirmation.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1509,7 +1509,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>Түгээлтийн файлуудыг татах нь</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-distfile-fetching" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-distfile-fetching.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1522,7 +1522,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>Түгээлтийн файлуудыг шалгах нь</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-distfile-verifying" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-distfile-verifying.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1534,7 +1534,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>Түгээлтийн файлуудыг задлах нь</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-distfile-extracting" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-distfile-extracting.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1566,7 +1566,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-post-root-passwd" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-post-root-passwd.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1592,7 +1592,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1625,7 +1625,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>Утасгүй сүлжээний холболтын цэгийг хайх</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-configure-wireless-scan" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-configure-wireless-scan.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1642,7 +1642,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>Утасгүй сүлжээг сонгох нь</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-configure-wireless-accesspoints" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-configure-wireless-accesspoints.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1659,7 +1659,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>WPA2 тохируулга</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-configure-wireless-wpa2setup" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-configure-wireless-wpa2setup.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1679,7 +1679,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-ipv4" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-ipv4.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1711,7 +1711,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-ipv4-dhcp" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-ipv4-dhcp.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1728,7 +1728,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-ipv4-static" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-ipv4-static.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1770,7 +1770,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-ipv6" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-ipv6.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1795,7 +1795,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-slaac" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-slaac.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1812,7 +1812,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-ipv6-static" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-ipv6-static.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1855,7 +1855,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-configure-network-ipv4-dns" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-configure-network-ipv4-dns.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1878,7 +1878,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>Локал эсвэл UTC цагийг сонгох</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-set-clock-local-utc" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-set-clock-local-utc.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1895,7 +1895,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>Бүсийг сонгох</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-timezone-region" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-timezone-region.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1907,7 +1907,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>Улсыг сонгох</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-timezone-country" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-timezone-country.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1919,7 +1919,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>Цагийн бүсийг сонгох</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-timezone-zone" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-timezone-zone.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1931,7 +1931,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>Цагийн бүсийг зөвшөөрөх</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-timezone-confirm" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-timezone-confirm.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1952,7 +1952,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>Нэмэлт үйлчилгээнүүдийг идэвхжүүлэхийг сонгох</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-config-services" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-config-services.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1998,7 +1998,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>Сүйрлийн үеийн мэдээллийг хадгалахыг идэвхжүүлэх</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-config-crashdump" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-config-crashdump.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2022,7 +2022,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-adduser1" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-adduser1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2034,7 +2034,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-adduser2" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-adduser2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2133,7 +2133,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-adduser3" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-adduser3.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2158,7 +2158,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-finalconfiguration" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-finalconfiguration.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2213,7 +2213,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-final-modification-shell" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-final-modification-shell.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2229,7 +2229,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-mainexit" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-mainexit.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
diff --git a/mn_MN.UTF-8/books/handbook/geom/chapter.xml b/mn_MN.UTF-8/books/handbook/geom/chapter.xml
index 66bb464ee9..72ab7a054c 100644
--- a/mn_MN.UTF-8/books/handbook/geom/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/geom/chapter.xml
@@ -148,7 +148,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="geom/striping" align="center"/>
+ <imagedata fileref="geom/striping.pic" align="center"/>
</imageobject>
<textobject>
diff --git a/mn_MN.UTF-8/books/handbook/install/chapter.xml b/mn_MN.UTF-8/books/handbook/install/chapter.xml
index bc67b687ce..83ff412ccf 100644
--- a/mn_MN.UTF-8/books/handbook/install/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/install/chapter.xml
@@ -985,7 +985,7 @@ Insert disk labelled "Kernel floppy 1" and press any key...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/boot-loader-menu" format="PNG"/>
+ <imagedata fileref="install/boot-loader-menu.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1151,7 +1151,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/config-country" format="PNG"/>
+ <imagedata fileref="install/config-country.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1167,7 +1167,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/config-keymap" format="PNG"/>
+ <imagedata fileref="install/config-keymap.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1204,7 +1204,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main1" format="PNG"/>
+ <imagedata fileref="install/main1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1220,7 +1220,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main-doc" format="PNG"/>
+ <imagedata fileref="install/main-doc.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1232,7 +1232,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/docmenu1" format="PNG"/>
+ <imagedata fileref="install/docmenu1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1263,7 +1263,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main-keymap" format="PNG"/>
+ <imagedata fileref="install/main-keymap.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1283,7 +1283,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/keymap" format="PNG"/>
+ <imagedata fileref="install/keymap.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1301,7 +1301,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main-options" format="PNG"/>
+ <imagedata fileref="install/main-options.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1311,7 +1311,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/options" format="PNG"/>
+ <imagedata fileref="install/options.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1342,7 +1342,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main-std" format="PNG"/>
+ <imagedata fileref="install/main-std.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1516,7 +1516,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/fdisk-drive1" format="PNG"/>
+ <imagedata fileref="install/fdisk-drive1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1581,7 +1581,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/fdisk-edit1" format="PNG"/>
+ <imagedata fileref="install/fdisk-edit1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1621,7 +1621,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/fdisk-edit2" format="PNG"/>
+ <imagedata fileref="install/fdisk-edit2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1664,7 +1664,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/boot-mgr" format="PNG"/>
+ <imagedata fileref="install/boot-mgr.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1692,7 +1692,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/fdisk-drive2" format="PNG"/>
+ <imagedata fileref="install/fdisk-drive2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1939,7 +1939,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-ed1" format="PNG"/>
+ <imagedata fileref="install/disklabel-ed1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1966,7 +1966,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-auto" format="PNG"/>
+ <imagedata fileref="install/disklabel-auto.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1991,7 +1991,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-root1" format="PNG"/>
+ <imagedata fileref="install/disklabel-root1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2008,7 +2008,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-root2" format="PNG"/>
+ <imagedata fileref="install/disklabel-root2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2026,7 +2026,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-fs" format="PNG"/>
+ <imagedata fileref="install/disklabel-fs.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2043,7 +2043,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-root3" format="PNG"/>
+ <imagedata fileref="install/disklabel-root3.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2069,7 +2069,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-ed2" format="PNG"/>
+ <imagedata fileref="install/disklabel-ed2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2119,7 +2119,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/dist-set" format="PNG"/>
+ <imagedata fileref="install/dist-set.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2171,7 +2171,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/dist-set2" format="PNG"/>
+ <imagedata fileref="install/dist-set2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2204,7 +2204,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/media" format="PNG"/>
+ <imagedata fileref="install/media.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2389,7 +2389,7 @@ installation menus to retry whichever operations have failed.
<mediaobject>
<imageobject>
- <imagedata fileref="install/ed0-conf" format="PNG"/>
+ <imagedata fileref="install/ed0-conf.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2423,7 +2423,7 @@ installation menus to retry whichever operations have failed.
<mediaobject>
<imageobject>
- <imagedata fileref="install/ed0-conf2" format="PNG"/>
+ <imagedata fileref="install/ed0-conf2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2576,7 +2576,7 @@ use the current settings.
<mediaobject>
<imageobject>
- <imagedata fileref="install/edit-inetd-conf" format="PNG"/>
+ <imagedata fileref="install/edit-inetd-conf.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2667,7 +2667,7 @@ use the current settings.
<mediaobject>
<imageobject>
- <imagedata fileref="install/ftp-anon1" format="PNG"/>
+ <imagedata fileref="install/ftp-anon1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2743,7 +2743,7 @@ use the current settings.
<mediaobject>
<imageobject>
- <imagedata fileref="install/ftp-anon2" format="PNG"/>
+ <imagedata fileref="install/ftp-anon2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2798,7 +2798,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/nfs-server-edit" format="PNG"/>
+ <imagedata fileref="install/nfs-server-edit.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2846,7 +2846,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/console-saver1" format="PNG"/>
+ <imagedata fileref="install/console-saver1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2860,7 +2860,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/console-saver2" format="PNG"/>
+ <imagedata fileref="install/console-saver2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2879,7 +2879,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/console-saver3" format="PNG"/>
+ <imagedata fileref="install/console-saver3.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2892,7 +2892,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/console-saver4" format="PNG"/>
+ <imagedata fileref="install/console-saver4.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2933,7 +2933,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/timezone1" format="PNG"/>
+ <imagedata fileref="install/timezone1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2946,7 +2946,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/timezone2" format="PNG"/>
+ <imagedata fileref="install/timezone2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2958,7 +2958,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/timezone3" format="PNG"/>
+ <imagedata fileref="install/timezone3.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3021,7 +3021,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse1" format="PNG"/>
+ <imagedata fileref="install/mouse1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3033,7 +3033,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse2" format="PNG"/>
+ <imagedata fileref="install/mouse2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3047,7 +3047,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse3" format="PNG"/>
+ <imagedata fileref="install/mouse3.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3059,7 +3059,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse4" format="PNG"/>
+ <imagedata fileref="install/mouse4.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3073,7 +3073,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse5" format="PNG"/>
+ <imagedata fileref="install/mouse5.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3089,7 +3089,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse6" format="PNG"/>
+ <imagedata fileref="install/mouse6.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3126,7 +3126,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/pkg-cat" format="PNG"/>
+ <imagedata fileref="install/pkg-cat.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3143,7 +3143,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/pkg-sel" format="PNG"/>
+ <imagedata fileref="install/pkg-sel.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3166,7 +3166,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/pkg-install" format="PNG"/>
+ <imagedata fileref="install/pkg-install.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3178,7 +3178,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/pkg-confirm" format="PNG"/>
+ <imagedata fileref="install/pkg-confirm.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3211,7 +3211,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/adduser1" format="PNG"/>
+ <imagedata fileref="install/adduser1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3224,7 +3224,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/adduser2" format="PNG"/>
+ <imagedata fileref="install/adduser2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3313,7 +3313,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/adduser3" format="PNG"/>
+ <imagedata fileref="install/adduser3.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3369,7 +3369,7 @@ Retype new password :</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/mainexit" format="PNG"/>
+ <imagedata fileref="install/mainexit.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3423,7 +3423,7 @@ Retype new password :</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/net-config-menu1" format="PNG"/>
+ <imagedata fileref="install/net-config-menu1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3474,7 +3474,7 @@ Retype new password :</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/mta-main" format="PNG"/>
+ <imagedata fileref="install/mta-main.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3506,7 +3506,7 @@ Retype new password :</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/ntp-config" format="PNG"/>
+ <imagedata fileref="install/ntp-config.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3527,7 +3527,7 @@ Retype new password :</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/net-config-menu2" format="PNG"/>
+ <imagedata fileref="install/net-config-menu2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
diff --git a/mn_MN.UTF-8/books/handbook/mail/chapter.xml b/mn_MN.UTF-8/books/handbook/mail/chapter.xml
index 69c2e8025e..7aad16863f 100644
--- a/mn_MN.UTF-8/books/handbook/mail/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/mail/chapter.xml
@@ -1863,7 +1863,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/mutt1" format="PNG"/>
+ <imagedata fileref="mail/mutt1.png" format="PNG"/>
</imageobject>
</mediaobject>
@@ -1875,7 +1875,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/mutt2" format="PNG"/>
+ <imagedata fileref="mail/mutt2.png" format="PNG"/>
</imageobject>
</mediaobject>
@@ -1912,7 +1912,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/mutt3" format="PNG"/>
+ <imagedata fileref="mail/mutt3.png" format="PNG"/>
</imageobject>
</mediaobject>
@@ -1961,7 +1961,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine1" format="PNG"/>
+ <imagedata fileref="mail/pine1.png" format="PNG"/>
</imageobject>
</mediaobject>
@@ -1980,7 +1980,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine2" format="PNG"/>
+ <imagedata fileref="mail/pine2.png" format="PNG"/>
</imageobject>
</mediaobject>
@@ -1990,7 +1990,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine3" format="PNG"/>
+ <imagedata fileref="mail/pine3.png" format="PNG"/>
</imageobject>
</mediaobject>
@@ -2002,7 +2002,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine4" format="PNG"/>
+ <imagedata fileref="mail/pine4.png" format="PNG"/>
</imageobject>
</mediaobject>
@@ -2019,7 +2019,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine5" format="PNG"/>
+ <imagedata fileref="mail/pine5.png" format="PNG"/>
</imageobject>
</mediaobject>
diff --git a/mn_MN.UTF-8/books/handbook/vinum/chapter.xml b/mn_MN.UTF-8/books/handbook/vinum/chapter.xml
index 535dd94e9b..365671719e 100644
--- a/mn_MN.UTF-8/books/handbook/vinum/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/vinum/chapter.xml
@@ -170,7 +170,7 @@
<para>
<figure id="vinum-concat">
<title>Нийлүүлэгдсэн зохион байгуулалт</title>
- <graphic fileref="vinum/vinum-concat"/>
+ <graphic fileref="vinum/vinum-concat.pic"/>
</figure>
</para>
@@ -209,7 +209,7 @@
<para>
<figure id="vinum-striped">
<title>Судалчлагдсан зохион байгуулалт</title>
- <graphic fileref="vinum/vinum-striped"/>
+ <graphic fileref="vinum/vinum-striped.pic"/>
</figure>
</para>
</sect1>
@@ -276,7 +276,7 @@
<para>
<figure id="vinum-raid5-org">
<title>RAID-5 зохион байгуулалт</title>
- <graphic fileref="vinum/vinum-raid5-org"/>
+ <graphic fileref="vinum/vinum-raid5-org.pic"/>
</figure>
</para>
@@ -545,7 +545,7 @@
<para>
<figure id="vinum-simple-vol">
<title>Энгийн Vinum эзлэхүүн</title>
- <graphic fileref="vinum/vinum-simple-vol"/>
+ <graphic fileref="vinum/vinum-simple-vol.pic"/>
</figure>
</para>
@@ -610,7 +610,7 @@
<para>
<figure id="vinum-mirrored-vol">
<title>Толин тусгал хийгдсэн Vinum эзлэхүүн</title>
- <graphic fileref="vinum/vinum-mirrored-vol"/>
+ <graphic fileref="vinum/vinum-mirrored-vol.pic"/>
</figure>
</para>
@@ -676,7 +676,7 @@
<para>
<figure id="vinum-striped-vol">
<title>Судалчлагдсан Vinum эзлэхүүн</title>
- <graphic fileref="vinum/vinum-striped-vol"/>
+ <graphic fileref="vinum/vinum-striped-vol.pic"/>
</figure>
</para>
@@ -720,7 +720,7 @@
<para>
<figure id="vinum-raid10-vol">
<title>Толин тусгал хийгдсэн, судалчлагдсан Vinum эзлэхүүн</title>
- <graphic fileref="vinum/vinum-raid10-vol"/>
+ <graphic fileref="vinum/vinum-raid10-vol.pic"/>
</figure>
</para>
</sect2>
diff --git a/mn_MN.UTF-8/books/handbook/virtualization/chapter.xml b/mn_MN.UTF-8/books/handbook/virtualization/chapter.xml
index acaafc113f..6fdff95732 100644
--- a/mn_MN.UTF-8/books/handbook/virtualization/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/virtualization/chapter.xml
@@ -115,7 +115,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd1"/>
+ <imagedata fileref="virtualization/parallels-freebsd1.png"/>
</imageobject>
</mediaobject>
@@ -126,25 +126,25 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd2"/>
+ <imagedata fileref="virtualization/parallels-freebsd2.png"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd3"/>
+ <imagedata fileref="virtualization/parallels-freebsd3.png"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd4"/>
+ <imagedata fileref="virtualization/parallels-freebsd4.png"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd5"/>
+ <imagedata fileref="virtualization/parallels-freebsd5.png"/>
</imageobject>
</mediaobject>
@@ -152,13 +152,13 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd6"/>
+ <imagedata fileref="virtualization/parallels-freebsd6.png"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd7"/>
+ <imagedata fileref="virtualization/parallels-freebsd7.png"/>
</imageobject>
</mediaobject>
@@ -166,13 +166,13 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd8"/>
+ <imagedata fileref="virtualization/parallels-freebsd8.png"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd9"/>
+ <imagedata fileref="virtualization/parallels-freebsd9.png"/>
</imageobject>
</mediaobject>
@@ -189,7 +189,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd11"/>
+ <imagedata fileref="virtualization/parallels-freebsd11.png"/>
</imageobject>
</mediaobject>
@@ -200,7 +200,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd10"/>
+ <imagedata fileref="virtualization/parallels-freebsd10.png"/>
</imageobject>
</mediaobject>
@@ -212,7 +212,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd12"/>
+ <imagedata fileref="virtualization/parallels-freebsd12.png"/>
</imageobject>
</mediaobject>
@@ -222,7 +222,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd13"/>
+ <imagedata fileref="virtualization/parallels-freebsd13.png"/>
</imageobject>
</mediaobject>
</sect3>
@@ -599,13 +599,13 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd1"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd1.png"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd2"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd2.png"/>
</imageobject>
</mediaobject>
@@ -614,7 +614,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd3"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd3.png"/>
</imageobject>
</mediaobject>
@@ -625,13 +625,13 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd4"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd4.png"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd5"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd5.png"/>
</imageobject>
</mediaobject>
@@ -639,7 +639,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd6"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd6.png"/>
</imageobject>
</mediaobject>
@@ -649,13 +649,13 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd7"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd7.png"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd8"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd8.png"/>
</imageobject>
</mediaobject>
@@ -673,13 +673,13 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd9"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd9.png"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd10"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd10.png"/>
</imageobject>
</mediaobject>
@@ -692,7 +692,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd11"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd11.png"/>
</imageobject>
</mediaobject>
@@ -704,7 +704,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd12"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd12.png"/>
</imageobject>
</mediaobject>
@@ -714,7 +714,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd13"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd13.png"/>
</imageobject>
</mediaobject>
</sect3>
@@ -795,7 +795,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd01"/>
+ <imagedata fileref="virtualization/vmware-freebsd01.png"/>
</imageobject>
</mediaobject>
@@ -805,7 +805,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd02"/>
+ <imagedata fileref="virtualization/vmware-freebsd02.png"/>
</imageobject>
</mediaobject>
@@ -818,7 +818,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd03"/>
+ <imagedata fileref="virtualization/vmware-freebsd03.png"/>
</imageobject>
</mediaobject>
@@ -827,7 +827,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd04"/>
+ <imagedata fileref="virtualization/vmware-freebsd04.png"/>
</imageobject>
</mediaobject>
@@ -836,7 +836,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd05"/>
+ <imagedata fileref="virtualization/vmware-freebsd05.png"/>
</imageobject>
</mediaobject>
@@ -845,7 +845,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd06"/>
+ <imagedata fileref="virtualization/vmware-freebsd06.png"/>
</imageobject>
</mediaobject>
@@ -853,7 +853,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd07"/>
+ <imagedata fileref="virtualization/vmware-freebsd07.png"/>
</imageobject>
</mediaobject>
@@ -862,7 +862,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd08"/>
+ <imagedata fileref="virtualization/vmware-freebsd08.png"/>
</imageobject>
</mediaobject>
@@ -876,7 +876,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd09"/>
+ <imagedata fileref="virtualization/vmware-freebsd09.png"/>
</imageobject>
</mediaobject>
@@ -884,7 +884,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd10"/>
+ <imagedata fileref="virtualization/vmware-freebsd10.png"/>
</imageobject>
</mediaobject>
@@ -893,7 +893,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd11"/>
+ <imagedata fileref="virtualization/vmware-freebsd11.png"/>
</imageobject>
</mediaobject>
@@ -911,7 +911,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd12"/>
+ <imagedata fileref="virtualization/vmware-freebsd12.png"/>
</imageobject>
</mediaobject>
diff --git a/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.xml b/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.xml
index 7bc93874f0..ac91538a0d 100644
--- a/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.xml
@@ -327,7 +327,7 @@ host2.example.com link#1 UC 0 0
<mediaobject>
<imageobject>
- <imagedata fileref="advanced-networking/net-routing"/>
+ <imagedata fileref="advanced-networking/net-routing.pic"/>
</imageobject>
<textobject>
@@ -537,7 +537,7 @@ host2.example.com link#1 UC 0 0
<mediaobject>
<imageobject>
- <imagedata fileref="advanced-networking/static-routes"/>
+ <imagedata fileref="advanced-networking/static-routes.pic"/>
</imageobject>
<textobject>
@@ -4843,7 +4843,7 @@ mijnhost.example.com:/b/tftpboot/FreeBSD/install / nfs ro
<area id="co-pxenfs5" coords="3108,2666,3519,1800"/>
</areaspec>
<imageobject>
- <imagedata fileref="advanced-networking/pxe-nfs"/>
+ <imagedata fileref="advanced-networking/pxe-nfs.png"/>
</imageobject>
<calloutlist>
<callout arearefs="co-pxenfs1">
@@ -5183,7 +5183,7 @@ Received 264951 bytes in 0.1 seconds</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="advanced-networking/isdn-bus"/>
+ <imagedata fileref="advanced-networking/isdn-bus.eps"/>
</imageobject>
<textobject>
@@ -5219,7 +5219,7 @@ ISDN BRI lijn</literallayout>
<mediaobject>
<imageobject>
- <imagedata fileref="advanced-networking/isdn-twisted-pair"/>
+ <imagedata fileref="advanced-networking/isdn-twisted-pair.eps"/>
</imageobject>
<textobject>
@@ -5334,7 +5334,7 @@ ISDN BRI lijn</literallayout>
<mediaobject>
<imageobject>
- <imagedata fileref="advanced-networking/natd"/>
+ <imagedata fileref="advanced-networking/natd.eps"/>
</imageobject>
<textobject>
diff --git a/nl_NL.ISO8859-1/books/handbook/basics/chapter.xml b/nl_NL.ISO8859-1/books/handbook/basics/chapter.xml
index 89fe9d0ac2..133e016e29 100644
--- a/nl_NL.ISO8859-1/books/handbook/basics/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/basics/chapter.xml
@@ -1282,7 +1282,7 @@ root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir1" format="EPS"/>
+ <imagedata fileref="install/example-dir1.eps" format="EPS"/>
</imageobject>
<textobject>
@@ -1303,7 +1303,7 @@ root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir2" format="EPS"/>
+ <imagedata fileref="install/example-dir2.eps" format="EPS"/>
</imageobject>
<textobject>
@@ -1331,7 +1331,7 @@ root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir3" format="EPS"/>
+ <imagedata fileref="install/example-dir3.eps" format="EPS"/>
</imageobject>
<textobject>
@@ -1359,7 +1359,7 @@ root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir4" format="EPS"/>
+ <imagedata fileref="install/example-dir4.eps" format="EPS"/>
</imageobject>
<textobject>
@@ -1385,7 +1385,7 @@ root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir5" format="EPS"/>
+ <imagedata fileref="install/example-dir5.eps" format="EPS"/>
</imageobject>
<textobject>
@@ -1716,7 +1716,7 @@ root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/disk-layout" format="EPS"/>
+ <imagedata fileref="install/disk-layout.eps" format="EPS"/>
</imageobject>
<textobject>
diff --git a/nl_NL.ISO8859-1/books/handbook/geom/chapter.xml b/nl_NL.ISO8859-1/books/handbook/geom/chapter.xml
index 6a402409d4..9a85db0f31 100644
--- a/nl_NL.ISO8859-1/books/handbook/geom/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/geom/chapter.xml
@@ -150,7 +150,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="geom/striping" align="center"/>
+ <imagedata fileref="geom/striping.pic" align="center"/>
</imageobject>
<textobject>
diff --git a/nl_NL.ISO8859-1/books/handbook/install/chapter.xml b/nl_NL.ISO8859-1/books/handbook/install/chapter.xml
index 29b3fc295a..3417b6745e 100644
--- a/nl_NL.ISO8859-1/books/handbook/install/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/install/chapter.xml
@@ -1065,7 +1065,7 @@ Insert disk labelled "Kernel floppy 1" and press any key...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/boot-loader-menu" format="PNG"/>
+ <imagedata fileref="install/boot-loader-menu.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1234,7 +1234,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/config-country" format="PNG"/>
+ <imagedata fileref="install/config-country.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1250,7 +1250,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/config-keymap" format="PNG"/>
+ <imagedata fileref="install/config-keymap.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1291,7 +1291,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main1" format="PNG"/>
+ <imagedata fileref="install/main1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1308,7 +1308,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main-doc" format="PNG"/>
+ <imagedata fileref="install/main-doc.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1320,7 +1320,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/docmenu1" format="PNG"/>
+ <imagedata fileref="install/docmenu1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1351,7 +1351,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main-keymap" format="PNG"/>
+ <imagedata fileref="install/main-keymap.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1374,7 +1374,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/keymap" format="PNG"/>
+ <imagedata fileref="install/keymap.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1391,7 +1391,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main-options" format="PNG"/>
+ <imagedata fileref="install/main-options.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1401,7 +1401,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/options" format="PNG"/>
+ <imagedata fileref="install/options.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1437,7 +1437,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main-std" format="PNG"/>
+ <imagedata fileref="install/main-std.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1623,7 +1623,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/fdisk-drive1" format="PNG"/>
+ <imagedata fileref="install/fdisk-drive1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1696,7 +1696,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/fdisk-edit1" format="PNG"/>
+ <imagedata fileref="install/fdisk-edit1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1744,7 +1744,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/fdisk-edit2" format="PNG"/>
+ <imagedata fileref="install/fdisk-edit2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1790,7 +1790,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/boot-mgr" format="PNG"/>
+ <imagedata fileref="install/boot-mgr.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1821,7 +1821,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/fdisk-drive2" format="PNG"/>
+ <imagedata fileref="install/fdisk-drive2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2090,7 +2090,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-ed1" format="PNG"/>
+ <imagedata fileref="install/disklabel-ed1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2120,7 +2120,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-auto" format="PNG"/>
+ <imagedata fileref="install/disklabel-auto.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2147,7 +2147,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-root1" format="PNG"/>
+ <imagedata fileref="install/disklabel-root1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2165,7 +2165,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-root2" format="PNG"/>
+ <imagedata fileref="install/disklabel-root2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2183,7 +2183,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-fs" format="PNG"/>
+ <imagedata fileref="install/disklabel-fs.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2201,7 +2201,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-root3" format="PNG"/>
+ <imagedata fileref="install/disklabel-root3.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2224,7 +2224,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-ed2" format="PNG"/>
+ <imagedata fileref="install/disklabel-ed2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2279,7 +2279,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/dist-set" format="PNG"/>
+ <imagedata fileref="install/dist-set.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2334,7 +2334,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/dist-set2" format="PNG"/>
+ <imagedata fileref="install/dist-set2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2366,7 +2366,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/media" format="PNG"/>
+ <imagedata fileref="install/media.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2570,7 +2570,7 @@ installation menus to retry whichever operations have failed.
<mediaobject>
<imageobject>
- <imagedata fileref="install/ed0-conf" format="PNG"/>
+ <imagedata fileref="install/ed0-conf.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2615,7 +2615,7 @@ installation menus to retry whichever operations have failed.
<mediaobject>
<imageobject>
- <imagedata fileref="install/ed0-conf2" format="PNG"/>
+ <imagedata fileref="install/ed0-conf2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2791,7 +2791,7 @@ use the current settings.
<mediaobject>
<imageobject>
- <imagedata fileref="install/edit-inetd-conf" format="PNG"/>
+ <imagedata fileref="install/edit-inetd-conf.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2888,7 +2888,7 @@ Do you wish to continue configuring anonymous FTP?
<mediaobject>
<imageobject>
- <imagedata fileref="install/ftp-anon1" format="PNG"/>
+ <imagedata fileref="install/ftp-anon1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2968,7 +2968,7 @@ Do you wish to continue configuring anonymous FTP?
<mediaobject>
<imageobject>
- <imagedata fileref="install/ftp-anon2" format="PNG"/>
+ <imagedata fileref="install/ftp-anon2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3027,7 +3027,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/nfs-server-edit" format="PNG"/>
+ <imagedata fileref="install/nfs-server-edit.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3078,7 +3078,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/console-saver1" format="PNG"/>
+ <imagedata fileref="install/console-saver1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3092,7 +3092,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/console-saver2" format="PNG"/>
+ <imagedata fileref="install/console-saver2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3113,7 +3113,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/console-saver3" format="PNG"/>
+ <imagedata fileref="install/console-saver3.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3127,7 +3127,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/console-saver4" format="PNG"/>
+ <imagedata fileref="install/console-saver4.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3172,7 +3172,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/timezone1" format="PNG"/>
+ <imagedata fileref="install/timezone1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3185,7 +3185,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/timezone2" format="PNG"/>
+ <imagedata fileref="install/timezone2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3198,7 +3198,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/timezone3" format="PNG"/>
+ <imagedata fileref="install/timezone3.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3266,7 +3266,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse1" format="PNG"/>
+ <imagedata fileref="install/mouse1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3280,7 +3280,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse2" format="PNG"/>
+ <imagedata fileref="install/mouse2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3297,7 +3297,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse3" format="PNG"/>
+ <imagedata fileref="install/mouse3.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3311,7 +3311,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse4" format="PNG"/>
+ <imagedata fileref="install/mouse4.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3326,7 +3326,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse5" format="PNG"/>
+ <imagedata fileref="install/mouse5.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3341,7 +3341,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse6" format="PNG"/>
+ <imagedata fileref="install/mouse6.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3384,7 +3384,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/pkg-cat" format="PNG"/>
+ <imagedata fileref="install/pkg-cat.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3407,7 +3407,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/pkg-sel" format="PNG"/>
+ <imagedata fileref="install/pkg-sel.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3437,7 +3437,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/pkg-install" format="PNG"/>
+ <imagedata fileref="install/pkg-install.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3452,7 +3452,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/pkg-confirm" format="PNG"/>
+ <imagedata fileref="install/pkg-confirm.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3495,7 +3495,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/adduser1" format="PNG"/>
+ <imagedata fileref="install/adduser1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3508,7 +3508,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/adduser2" format="PNG"/>
+ <imagedata fileref="install/adduser2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3614,7 +3614,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/adduser3" format="PNG"/>
+ <imagedata fileref="install/adduser3.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3682,7 +3682,7 @@ Retype new password :</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/mainexit" format="PNG"/>
+ <imagedata fileref="install/mainexit.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3759,7 +3759,7 @@ Retype new password :</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/net-config-menu1" format="PNG"/>
+ <imagedata fileref="install/net-config-menu1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3831,7 +3831,7 @@ Retype new password :</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/mta-main" format="PNG"/>
+ <imagedata fileref="install/mta-main.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3889,7 +3889,7 @@ Retype new password :</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/ntp-config" format="PNG"/>
+ <imagedata fileref="install/ntp-config.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3916,7 +3916,7 @@ Retype new password :</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/net-config-menu2" format="PNG"/>
+ <imagedata fileref="install/net-config-menu2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
diff --git a/nl_NL.ISO8859-1/books/handbook/mail/chapter.xml b/nl_NL.ISO8859-1/books/handbook/mail/chapter.xml
index 69ac98edc5..90f5ea8932 100644
--- a/nl_NL.ISO8859-1/books/handbook/mail/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/mail/chapter.xml
@@ -1940,7 +1940,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/mutt1" format="PNG"/>
+ <imagedata fileref="mail/mutt1.png" format="PNG"/>
</imageobject>
</mediaobject>
@@ -1950,7 +1950,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/mutt2" format="PNG"/>
+ <imagedata fileref="mail/mutt2.png" format="PNG"/>
</imageobject>
</mediaobject>
@@ -1986,7 +1986,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/mutt3" format="PNG"/>
+ <imagedata fileref="mail/mutt3.png" format="PNG"/>
</imageobject>
</mediaobject>
@@ -2038,7 +2038,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine1" format="PNG"/>
+ <imagedata fileref="mail/pine1.png" format="PNG"/>
</imageobject>
</mediaobject>
@@ -2057,7 +2057,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine2" format="PNG"/>
+ <imagedata fileref="mail/pine2.png" format="PNG"/>
</imageobject>
</mediaobject>
@@ -2068,7 +2068,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine3" format="PNG"/>
+ <imagedata fileref="mail/pine3.png" format="PNG"/>
</imageobject>
</mediaobject>
@@ -2081,7 +2081,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine4" format="PNG"/>
+ <imagedata fileref="mail/pine4.png" format="PNG"/>
</imageobject>
</mediaobject>
@@ -2100,7 +2100,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine5" format="PNG"/>
+ <imagedata fileref="mail/pine5.png" format="PNG"/>
</imageobject>
</mediaobject>
diff --git a/nl_NL.ISO8859-1/books/handbook/vinum/chapter.xml b/nl_NL.ISO8859-1/books/handbook/vinum/chapter.xml
index c5bb64c310..b1a6926140 100644
--- a/nl_NL.ISO8859-1/books/handbook/vinum/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/vinum/chapter.xml
@@ -199,7 +199,7 @@
<figure id="vinum-concat">
<title>Aaneengeschakeld georganiseerd</title>
- <graphic fileref="vinum/vinum-concat"/>
+ <graphic fileref="vinum/vinum-concat.pic"/>
</figure></para>
<indexterm>
@@ -242,7 +242,7 @@
<figure id="vinum-striped">
<title>Verdeeld georganiseerd</title>
- <graphic fileref="vinum/vinum-striped"/>
+ <graphic fileref="vinum/vinum-striped.pic"/>
</figure></para>
</sect1>
@@ -319,7 +319,7 @@
<figure id="vinum-raid5-org">
<title>RAID-5 georganiseerd</title>
- <graphic fileref="vinum/vinum-raid5-org"/>
+ <graphic fileref="vinum/vinum-raid5-org.pic"/>
</figure></para>
<para>Vergeleken met spiegelen heeft <acronym>RAID-5</acronym> het
@@ -626,7 +626,7 @@
<figure id="vinum-simple-vol">
<title>Een eenvoudig Vinum volume</title>
- <graphic fileref="vinum/vinum-simple-vol"/>
+ <graphic fileref="vinum/vinum-simple-vol.pic"/>
</figure></para>
<para>Deze en de volgende figuren stellen een volume voor dat
@@ -693,7 +693,7 @@
<figure id="vinum-mirrored-vol">
<title>Een gespiegeld Vinum volume</title>
- <graphic fileref="vinum/vinum-mirrored-vol"/>
+ <graphic fileref="vinum/vinum-mirrored-vol.pic"/>
</figure></para>
<para>In dit voorbeeld bevat iedere samenstelling de volledige 512
@@ -762,7 +762,7 @@
<figure id="vinum-striped-vol">
<title>Een verdeeld Vinum volume</title>
- <graphic fileref="vinum/vinum-striped-vol"/>
+ <graphic fileref="vinum/vinum-striped-vol.pic"/>
</figure></para>
<para>Dit volume wordt weergegeven in
@@ -807,7 +807,7 @@
<figure id="vinum-raid10-vol">
<title>Een gespiegeld en verdeeld Vinum volume</title>
- <graphic fileref="vinum/vinum-raid10-vol"/>
+ <graphic fileref="vinum/vinum-raid10-vol.pic"/>
</figure></para>
</sect2>
</sect1>
diff --git a/nl_NL.ISO8859-1/books/handbook/virtualization/chapter.xml b/nl_NL.ISO8859-1/books/handbook/virtualization/chapter.xml
index 5cfe99dc0a..cd75b8e22a 100644
--- a/nl_NL.ISO8859-1/books/handbook/virtualization/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/virtualization/chapter.xml
@@ -123,7 +123,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd1"/>
+ <imagedata fileref="virtualization/parallels-freebsd1.png"/>
</imageobject>
</mediaobject>
@@ -135,25 +135,25 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd2"/>
+ <imagedata fileref="virtualization/parallels-freebsd2.png"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd3"/>
+ <imagedata fileref="virtualization/parallels-freebsd3.png"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd4"/>
+ <imagedata fileref="virtualization/parallels-freebsd4.png"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd5"/>
+ <imagedata fileref="virtualization/parallels-freebsd5.png"/>
</imageobject>
</mediaobject>
@@ -161,13 +161,13 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd6"/>
+ <imagedata fileref="virtualization/parallels-freebsd6.png"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd7"/>
+ <imagedata fileref="virtualization/parallels-freebsd7.png"/>
</imageobject>
</mediaobject>
@@ -175,13 +175,13 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd8"/>
+ <imagedata fileref="virtualization/parallels-freebsd8.png"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd9"/>
+ <imagedata fileref="virtualization/parallels-freebsd9.png"/>
</imageobject>
</mediaobject>
@@ -199,7 +199,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd11"/>
+ <imagedata fileref="virtualization/parallels-freebsd11.png"/>
</imageobject>
</mediaobject>
@@ -212,7 +212,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd10"/>
+ <imagedata fileref="virtualization/parallels-freebsd10.png"/>
</imageobject>
</mediaobject>
@@ -224,7 +224,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd12"/>
+ <imagedata fileref="virtualization/parallels-freebsd12.png"/>
</imageobject>
</mediaobject>
@@ -233,7 +233,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd13"/>
+ <imagedata fileref="virtualization/parallels-freebsd13.png"/>
</imageobject>
</mediaobject>
</sect3>
@@ -625,13 +625,13 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd1"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd1.png"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd2"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd2.png"/>
</imageobject>
</mediaobject>
@@ -641,7 +641,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd3"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd3.png"/>
</imageobject>
</mediaobject>
@@ -653,13 +653,13 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd4"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd4.png"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd5"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd5.png"/>
</imageobject>
</mediaobject>
@@ -667,7 +667,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd6"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd6.png"/>
</imageobject>
</mediaobject>
@@ -677,13 +677,13 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd7"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd7.png"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd8"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd8.png"/>
</imageobject>
</mediaobject>
@@ -702,13 +702,13 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd9"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd9.png"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd10"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd10.png"/>
</imageobject>
</mediaobject>
@@ -721,7 +721,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd11"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd11.png"/>
</imageobject>
</mediaobject>
@@ -733,7 +733,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd12"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd12.png"/>
</imageobject>
</mediaobject>
@@ -743,7 +743,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd13"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd13.png"/>
</imageobject>
</mediaobject>
</sect3>
@@ -823,7 +823,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd01"/>
+ <imagedata fileref="virtualization/vmware-freebsd01.png"/>
</imageobject>
</mediaobject>
@@ -832,7 +832,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd02"/>
+ <imagedata fileref="virtualization/vmware-freebsd02.png"/>
</imageobject>
</mediaobject>
@@ -845,7 +845,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd03"/>
+ <imagedata fileref="virtualization/vmware-freebsd03.png"/>
</imageobject>
</mediaobject>
@@ -854,7 +854,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd04"/>
+ <imagedata fileref="virtualization/vmware-freebsd04.png"/>
</imageobject>
</mediaobject>
@@ -862,7 +862,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd05"/>
+ <imagedata fileref="virtualization/vmware-freebsd05.png"/>
</imageobject>
</mediaobject>
@@ -871,7 +871,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd06"/>
+ <imagedata fileref="virtualization/vmware-freebsd06.png"/>
</imageobject>
</mediaobject>
@@ -879,7 +879,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd07"/>
+ <imagedata fileref="virtualization/vmware-freebsd07.png"/>
</imageobject>
</mediaobject>
@@ -888,7 +888,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd08"/>
+ <imagedata fileref="virtualization/vmware-freebsd08.png"/>
</imageobject>
</mediaobject>
@@ -902,7 +902,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd09"/>
+ <imagedata fileref="virtualization/vmware-freebsd09.png"/>
</imageobject>
</mediaobject>
@@ -910,7 +910,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd10"/>
+ <imagedata fileref="virtualization/vmware-freebsd10.png"/>
</imageobject>
</mediaobject>
@@ -920,7 +920,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd11"/>
+ <imagedata fileref="virtualization/vmware-freebsd11.png"/>
</imageobject>
</mediaobject>
@@ -936,7 +936,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd12"/>
+ <imagedata fileref="virtualization/vmware-freebsd12.png"/>
</imageobject>
</mediaobject>
diff --git a/no_NO.ISO8859-1/books/handbook/basics/chapter.xml b/no_NO.ISO8859-1/books/handbook/basics/chapter.xml
index 1aa2e9a6f3..1e0514c1d5 100644
--- a/no_NO.ISO8859-1/books/handbook/basics/chapter.xml
+++ b/no_NO.ISO8859-1/books/handbook/basics/chapter.xml
@@ -1246,7 +1246,7 @@ total 530
<mediaobject>
<imageobject>
- <imagedata fileref="install/disk-layout" format="EPS">
+ <imagedata fileref="install/disk-layout.eps" format="EPS">
</imageobject>
<textobject>
diff --git a/no_NO.ISO8859-1/books/handbook/install/chapter.xml b/no_NO.ISO8859-1/books/handbook/install/chapter.xml
index 2e759a3ef0..0c8446dd10 100644
--- a/no_NO.ISO8859-1/books/handbook/install/chapter.xml
+++ b/no_NO.ISO8859-1/books/handbook/install/chapter.xml
@@ -825,7 +825,7 @@ Booting [kernel] in 9 seconds... _</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/userconfig" format="PNG">
+ <imagedata fileref="install/userconfig.png" format="PNG">
</imageobject>
</mediaobject>
</figure>
@@ -865,7 +865,7 @@ Booting [kernel] in 9 seconds... _</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/userconfig2" format="PNG">
+ <imagedata fileref="install/userconfig2.png" format="PNG">
</imageobject>
</mediaobject>
</figure>
@@ -892,7 +892,7 @@ Booting [kernel] in 9 seconds... _</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/hdwrconf" format="PNG">
+ <imagedata fileref="install/hdwrconf.png" format="PNG">
</imageobject>
</mediaobject>
</figure>
@@ -961,7 +961,7 @@ Booting [kernel] in 9 seconds... _</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/probstart" format="PNG">
+ <imagedata fileref="install/probstart.png" format="PNG">
</imageobject>
</mediaobject>
</figure>
@@ -986,7 +986,7 @@ Booting [kernel] in 9 seconds... _</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/main1" format="PNG">
+ <imagedata fileref="install/main1.png" format="PNG">
</imageobject>
</mediaobject>
</figure>
@@ -1090,7 +1090,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/sysinstall-exit" format="PNG">
+ <imagedata fileref="install/sysinstall-exit.png" format="PNG">
</imageobject>
</mediaobject>
</figure>
@@ -1141,7 +1141,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main1" format="PNG">
+ <imagedata fileref="install/main1.png" format="PNG">
</imageobject>
</mediaobject>
</figure>
@@ -1157,7 +1157,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main-doc" format="PNG">
+ <imagedata fileref="install/main-doc.png" format="PNG">
</imageobject>
</mediaobject>
</figure>
@@ -1169,7 +1169,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/docmenu1" format="PNG">
+ <imagedata fileref="install/docmenu1.png" format="PNG">
</imageobject>
</mediaobject>
</figure>
@@ -1198,7 +1198,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main-keymap" format="PNG">
+ <imagedata fileref="install/main-keymap.png" format="PNG">
</imageobject>
</mediaobject>
</figure>
@@ -1218,7 +1218,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/keymap" format="PNG">
+ <imagedata fileref="install/keymap.png" format="PNG">
</imageobject>
</mediaobject>
</figure>
@@ -1236,7 +1236,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main-options" format="PNG">
+ <imagedata fileref="install/main-options.png" format="PNG">
</imageobject>
</mediaobject>
</figure>
@@ -1246,7 +1246,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/options" format="PNG">
+ <imagedata fileref="install/options.png" format="PNG">
</imageobject>
</mediaobject>
</figure>
@@ -1278,7 +1278,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main-std" format="PNG">
+ <imagedata fileref="install/main-std.png" format="PNG">
</imageobject>
</mediaobject>
</figure>
@@ -1802,7 +1802,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disk-layout" format="EPS">
+ <imagedata fileref="install/disk-layout.eps" format="EPS">
</imageobject>
<textobject>
@@ -1877,7 +1877,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/fdisk-drive1" format="PNG">
+ <imagedata fileref="install/fdisk-drive1.png" format="PNG">
</imageobject>
</mediaobject>
</figure>
@@ -1939,7 +1939,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/fdisk-edit1" format="PNG">
+ <imagedata fileref="install/fdisk-edit1.png" format="PNG">
</imageobject>
</mediaobject>
</figure>
@@ -1977,7 +1977,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/fdisk-edit2" format="PNG">
+ <imagedata fileref="install/fdisk-edit2.png" format="PNG">
</imageobject>
</mediaobject>
</figure>
@@ -2013,7 +2013,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/boot-mgr" format="PNG">
+ <imagedata fileref="install/boot-mgr.png" format="PNG">
</imageobject>
</mediaobject>
</figure>
@@ -2037,7 +2037,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/fdisk-drive2" format="PNG">
+ <imagedata fileref="install/fdisk-drive2.png" format="PNG">
</imageobject>
</mediaobject>
</figure>
@@ -2261,7 +2261,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-ed1" format="PNG">
+ <imagedata fileref="install/disklabel-ed1.png" format="PNG">
</imageobject>
</mediaobject>
</figure>
@@ -2287,7 +2287,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-auto" format="PNG">
+ <imagedata fileref="install/disklabel-auto.png" format="PNG">
</imageobject>
</mediaobject>
</figure>
@@ -2311,7 +2311,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-root1" format="PNG">
+ <imagedata fileref="install/disklabel-root1.png" format="PNG">
</imageobject>
</mediaobject>
</figure>
@@ -2329,7 +2329,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-root2" format="PNG">
+ <imagedata fileref="install/disklabel-root2.png" format="PNG">
</imageobject>
</mediaobject>
</figure>
@@ -2346,7 +2346,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-fs" format="PNG">
+ <imagedata fileref="install/disklabel-fs.png" format="PNG">
</imageobject>
</mediaobject>
</figure>
@@ -2362,7 +2362,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-root3" format="PNG">
+ <imagedata fileref="install/disklabel-root3.png" format="PNG">
</imageobject>
</mediaobject>
</figure>
@@ -2383,7 +2383,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-ed2" format="PNG">
+ <imagedata fileref="install/disklabel-ed2.png" format="PNG">
</imageobject>
</mediaobject>
</figure>
@@ -2442,7 +2442,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/dist-set" format="PNG">
+ <imagedata fileref="install/dist-set.png" format="PNG">
</imageobject>
</mediaobject>
</figure>
@@ -2491,7 +2491,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/dist-set2" format="PNG">
+ <imagedata fileref="install/dist-set2.png" format="PNG">
</imageobject>
</mediaobject>
</figure>
@@ -2524,7 +2524,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/media" format="PNG">
+ <imagedata fileref="install/media.png" format="PNG">
</imageobject>
</mediaobject>
</figure>
@@ -2717,7 +2717,7 @@ installation menus to try and retry whichever operations have failed.
<mediaobject>
<imageobject>
- <imagedata fileref="install/ed0-conf" format="PNG">
+ <imagedata fileref="install/ed0-conf.png" format="PNG">
</imageobject>
</mediaobject>
</figure>
@@ -2761,7 +2761,7 @@ installation menus to try and retry whichever operations have failed.
<mediaobject>
<imageobject>
- <imagedata fileref="install/ed0-conf2" format="PNG">
+ <imagedata fileref="install/ed0-conf2.png" format="PNG">
</imageobject>
</mediaobject>
</figure>
@@ -2922,7 +2922,7 @@ use the current settings.
<mediaobject>
<imageobject>
- <imagedata fileref="install/edit-inetd-conf" format="PNG">
+ <imagedata fileref="install/edit-inetd-conf.png" format="PNG">
</imageobject>
</mediaobject>
</figure>
@@ -2966,7 +2966,7 @@ use the current settings.
<mediaobject>
<imageobject>
- <imagedata fileref="install/ftp-anon1" format="PNG">
+ <imagedata fileref="install/ftp-anon1.png" format="PNG">
</imageobject>
</mediaobject>
</figure>
@@ -3016,7 +3016,7 @@ Upload subdirectory:
<mediaobject>
<imageobject>
- <imagedata fileref="install/ftp-anon2" format="PNG">
+ <imagedata fileref="install/ftp-anon2.png" format="PNG">
</imageobject>
</mediaobject>
</figure>
@@ -3071,7 +3071,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/nfs-server-edit" format="PNG">
+ <imagedata fileref="install/nfs-server-edit.png" format="PNG">
</imageobject>
</mediaobject>
</figure>
@@ -3215,7 +3215,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/security" format="PNG">
+ <imagedata fileref="install/security.png" format="PNG">
</imageobject>
</mediaobject>
</figure>
@@ -3295,7 +3295,7 @@ To change any of these settings later, edit /etc/rc.conf
<title>Systemets konsollopsjoner</title>
<mediaobject>
<imageobject>
- <imagedata fileref="install/console-saver1" format="PNG">
+ <imagedata fileref="install/console-saver1.png" format="PNG">
</imageobject>
</mediaobject>
</figure>
@@ -3309,7 +3309,7 @@ To change any of these settings later, edit /etc/rc.conf
<mediaobject>
<imageobject>
- <imagedata fileref="install/console-saver2" format="PNG">
+ <imagedata fileref="install/console-saver2.png" format="PNG">
</imageobject>
</mediaobject>
</figure>
@@ -3329,7 +3329,7 @@ To change any of these settings later, edit /etc/rc.conf
<mediaobject>
<imageobject>
- <imagedata fileref="install/console-saver3" format="PNG">
+ <imagedata fileref="install/console-saver3.png" format="PNG">
</imageobject>
</mediaobject>
</figure>
@@ -3343,7 +3343,7 @@ To change any of these settings later, edit /etc/rc.conf
<mediaobject>
<imageobject>
- <imagedata fileref="install/console-saver4" format="PNG">
+ <imagedata fileref="install/console-saver4.png" format="PNG">
</imageobject>
</mediaobject>
</figure>
@@ -3385,7 +3385,7 @@ To change any of these settings later, edit /etc/rc.conf
<mediaobject>
<imageobject>
- <imagedata fileref="install/timezone1" format="PNG">
+ <imagedata fileref="install/timezone1.png" format="PNG">
</imageobject>
</mediaobject>
</figure>
@@ -3398,7 +3398,7 @@ To change any of these settings later, edit /etc/rc.conf
<mediaobject>
<imageobject>
- <imagedata fileref="install/timezone2" format="PNG">
+ <imagedata fileref="install/timezone2.png" format="PNG">
</imageobject>
</mediaobject>
</figure>
@@ -3411,7 +3411,7 @@ To change any of these settings later, edit /etc/rc.conf
<mediaobject>
<imageobject>
- <imagedata fileref="install/timezone3" format="PNG">
+ <imagedata fileref="install/timezone3.png" format="PNG">
</imageobject>
</mediaobject>
</figure>
@@ -3476,7 +3476,7 @@ To change any of these settings later, edit /etc/rc.conf
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse1" format="PNG">
+ <imagedata fileref="install/mouse1.png" format="PNG">
</imageobject>
</mediaobject>
</figure>
@@ -3489,7 +3489,7 @@ To change any of these settings later, edit /etc/rc.conf
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse2" format="PNG">
+ <imagedata fileref="install/mouse2.png" format="PNG">
</imageobject>
</mediaobject>
</figure>
@@ -3504,7 +3504,7 @@ To change any of these settings later, edit /etc/rc.conf
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse3" format="PNG">
+ <imagedata fileref="install/mouse3.png" format="PNG">
</imageobject>
</mediaobject>
</figure>
@@ -3517,7 +3517,7 @@ To change any of these settings later, edit /etc/rc.conf
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse4" format="PNG">
+ <imagedata fileref="install/mouse4.png" format="PNG">
</imageobject>
</mediaobject>
</figure>
@@ -3531,7 +3531,7 @@ To change any of these settings later, edit /etc/rc.conf
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse5" format="PNG">
+ <imagedata fileref="install/mouse5.png" format="PNG">
</imageobject>
</mediaobject>
</figure>
@@ -3543,7 +3543,7 @@ To change any of these settings later, edit /etc/rc.conf
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse6" format="PNG">
+ <imagedata fileref="install/mouse6.png" format="PNG">
</imageobject>
</mediaobject>
</figure>
@@ -3598,7 +3598,7 @@ To change any of these settings later, edit /etc/rc.conf
<mediaobject>
<imageobject>
- <imagedata fileref="install/xf86setup" format="PNG">
+ <imagedata fileref="install/xf86setup.png" format="PNG">
</imageobject>
</mediaobject>
</figure>
@@ -4109,7 +4109,7 @@ failed. Would you like to try again?
<mediaobject>
<imageobject>
- <imagedata fileref="install/desktop" format="PNG">
+ <imagedata fileref="install/desktop.png" format="PNG">
</imageobject>
</mediaobject>
</figure>
@@ -4146,7 +4146,7 @@ failed. Would you like to try again?
<mediaobject>
<imageobject>
- <imagedata fileref="install/pkg-cat" format="PNG">
+ <imagedata fileref="install/pkg-cat.png" format="PNG">
</imageobject>
</mediaobject>
</figure>
@@ -4170,7 +4170,7 @@ failed. Would you like to try again?
<mediaobject>
<imageobject>
- <imagedata fileref="install/pkg-sel" format="PNG">
+ <imagedata fileref="install/pkg-sel.png" format="PNG">
</imageobject>
</mediaobject>
</figure>
@@ -4197,7 +4197,7 @@ failed. Would you like to try again?
<mediaobject>
<imageobject>
- <imagedata fileref="install/pkg-install" format="PNG">
+ <imagedata fileref="install/pkg-install.png" format="PNG">
</imageobject>
</mediaobject>
</figure>
@@ -4211,7 +4211,7 @@ failed. Would you like to try again?
<mediaobject>
<imageobject>
- <imagedata fileref="install/pkg-confirm" format="PNG">
+ <imagedata fileref="install/pkg-confirm.png" format="PNG">
</imageobject>
</mediaobject>
</figure>
@@ -4249,7 +4249,7 @@ failed. Would you like to try again?
<mediaobject>
<imageobject>
- <imagedata fileref="install/adduser1" format="PNG">
+ <imagedata fileref="install/adduser1.png" format="PNG">
</imageobject>
</mediaobject>
</figure>
@@ -4262,7 +4262,7 @@ failed. Would you like to try again?
<mediaobject>
<imageobject>
- <imagedata fileref="install/adduser2" format="PNG">
+ <imagedata fileref="install/adduser2.png" format="PNG">
</imageobject>
</mediaobject>
</figure>
@@ -4360,7 +4360,7 @@ failed. Would you like to try again?
<mediaobject>
<imageobject>
- <imagedata fileref="install/adduser3" format="PNG">
+ <imagedata fileref="install/adduser3.png" format="PNG">
</imageobject>
</mediaobject>
</figure>
@@ -4422,7 +4422,7 @@ failed. Would you like to try again?
<mediaobject>
<imageobject>
- <imagedata fileref="install/mainexit" format="PNG">
+ <imagedata fileref="install/mainexit.png" format="PNG">
</imageobject>
</mediaobject>
</figure>
diff --git a/pl_PL.ISO8859-2/books/handbook/advanced-networking/chapter.xml b/pl_PL.ISO8859-2/books/handbook/advanced-networking/chapter.xml
index c23d4afc19..24811ff299 100644
--- a/pl_PL.ISO8859-2/books/handbook/advanced-networking/chapter.xml
+++ b/pl_PL.ISO8859-2/books/handbook/advanced-networking/chapter.xml
@@ -278,7 +278,7 @@ host2.example.com link#1 UC 0 0
<mediaobject>
<imageobject>
- <imagedata fileref="advanced-networking/net-routing"/>
+ <imagedata fileref="advanced-networking/net-routing.pic"/>
</imageobject>
<textobject>
@@ -464,7 +464,7 @@ host2.example.com link#1 UC 0 0
<mediaobject>
<imageobject>
- <imagedata fileref="advanced-networking/static-routes"/>
+ <imagedata fileref="advanced-networking/static-routes.pic"/>
</imageobject>
<textobject>
@@ -3455,7 +3455,7 @@ cd /usr/src/etc; make distribution</programlisting>
<mediaobject>
<imageobject>
- <imagedata fileref="advanced-networking/isdn-bus"/>
+ <imagedata fileref="advanced-networking/isdn-bus.eps"/>
</imageobject>
<textobject>
@@ -3489,7 +3489,7 @@ ISDN BRI line</literallayout>
<mediaobject>
<imageobject>
- <imagedata fileref="advanced-networking/isdn-twisted-pair"/>
+ <imagedata fileref="advanced-networking/isdn-twisted-pair.eps"/>
</imageobject>
<textobject>
@@ -3592,7 +3592,7 @@ ISDN BRI line</literallayout>
<mediaobject>
<imageobject>
- <imagedata fileref="advanced-networking/natd"/>
+ <imagedata fileref="advanced-networking/natd.eps"/>
</imageobject>
<textobject>
diff --git a/pl_PL.ISO8859-2/books/handbook/basics/chapter.xml b/pl_PL.ISO8859-2/books/handbook/basics/chapter.xml
index e78b35b459..96bcb23408 100644
--- a/pl_PL.ISO8859-2/books/handbook/basics/chapter.xml
+++ b/pl_PL.ISO8859-2/books/handbook/basics/chapter.xml
@@ -987,7 +987,7 @@ total 530
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir1" format="EPS"/>
+ <imagedata fileref="install/example-dir1.eps" format="EPS"/>
</imageobject>
<textobject>
@@ -1007,7 +1007,7 @@ total 530
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir2" format="EPS"/>
+ <imagedata fileref="install/example-dir2.eps" format="EPS"/>
</imageobject>
<textobject>
@@ -1036,7 +1036,7 @@ total 530
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir3" format="EPS"/>
+ <imagedata fileref="install/example-dir3.eps" format="EPS"/>
</imageobject>
<textobject>
@@ -1062,7 +1062,7 @@ total 530
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir4" format="EPS"/>
+ <imagedata fileref="install/example-dir4.eps" format="EPS"/>
</imageobject>
<textobject>
@@ -1088,7 +1088,7 @@ total 530
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir5" format="EPS"/>
+ <imagedata fileref="install/example-dir5.eps" format="EPS"/>
</imageobject>
<textobject>
@@ -1400,7 +1400,7 @@ total 530
<mediaobject>
<imageobject>
- <imagedata fileref="install/disk-layout" format="EPS"/>
+ <imagedata fileref="install/disk-layout.eps" format="EPS"/>
</imageobject>
<textobject>
diff --git a/pl_PL.ISO8859-2/books/handbook/geom/chapter.xml b/pl_PL.ISO8859-2/books/handbook/geom/chapter.xml
index 2026d043cc..662fc56e84 100644
--- a/pl_PL.ISO8859-2/books/handbook/geom/chapter.xml
+++ b/pl_PL.ISO8859-2/books/handbook/geom/chapter.xml
@@ -137,7 +137,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="geom/striping" align="center"/>
+ <imagedata fileref="geom/striping.pic" align="center"/>
</imageobject>
<textobject>
diff --git a/pl_PL.ISO8859-2/books/handbook/install/chapter.xml b/pl_PL.ISO8859-2/books/handbook/install/chapter.xml
index c1d716fc30..a7cb41476d 100644
--- a/pl_PL.ISO8859-2/books/handbook/install/chapter.xml
+++ b/pl_PL.ISO8859-2/books/handbook/install/chapter.xml
@@ -1014,7 +1014,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/sysinstall-exit" format="PNG"/>
+ <imagedata fileref="install/sysinstall-exit.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1071,7 +1071,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main1" format="PNG"/>
+ <imagedata fileref="install/main1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1087,7 +1087,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main-doc" format="PNG"/>
+ <imagedata fileref="install/main-doc.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1099,7 +1099,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/docmenu1" format="PNG"/>
+ <imagedata fileref="install/docmenu1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1130,7 +1130,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main-keymap" format="PNG"/>
+ <imagedata fileref="install/main-keymap.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1151,7 +1151,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/keymap" format="PNG"/>
+ <imagedata fileref="install/keymap.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1169,7 +1169,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main-options" format="PNG"/>
+ <imagedata fileref="install/main-options.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1179,7 +1179,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/options" format="PNG"/>
+ <imagedata fileref="install/options.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1213,7 +1213,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main-std" format="PNG"/>
+ <imagedata fileref="install/main-std.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1372,7 +1372,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/fdisk-drive1" format="PNG"/>
+ <imagedata fileref="install/fdisk-drive1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1439,7 +1439,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/fdisk-edit1" format="PNG"/>
+ <imagedata fileref="install/fdisk-edit1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1486,7 +1486,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/fdisk-edit2" format="PNG"/>
+ <imagedata fileref="install/fdisk-edit2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1531,7 +1531,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/boot-mgr" format="PNG"/>
+ <imagedata fileref="install/boot-mgr.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1562,7 +1562,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/fdisk-drive2" format="PNG"/>
+ <imagedata fileref="install/fdisk-drive2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1800,7 +1800,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-ed1" format="PNG"/>
+ <imagedata fileref="install/disklabel-ed1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1825,7 +1825,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-auto" format="PNG"/>
+ <imagedata fileref="install/disklabel-auto.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1859,7 +1859,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-root1" format="PNG"/>
+ <imagedata fileref="install/disklabel-root1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1877,7 +1877,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-root2" format="PNG"/>
+ <imagedata fileref="install/disklabel-root2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1893,7 +1893,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-fs" format="PNG"/>
+ <imagedata fileref="install/disklabel-fs.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1910,7 +1910,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-root3" format="PNG"/>
+ <imagedata fileref="install/disklabel-root3.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1933,7 +1933,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-ed2" format="PNG"/>
+ <imagedata fileref="install/disklabel-ed2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1990,7 +1990,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/dist-set" format="PNG"/>
+ <imagedata fileref="install/dist-set.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2042,7 +2042,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/dist-set2" format="PNG"/>
+ <imagedata fileref="install/dist-set2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2077,7 +2077,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/media" format="PNG"/>
+ <imagedata fileref="install/media.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2279,7 +2279,7 @@ installation menus to retry whichever operations have failed.
<mediaobject>
<imageobject>
- <imagedata fileref="install/ed0-conf" format="PNG"/>
+ <imagedata fileref="install/ed0-conf.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2323,7 +2323,7 @@ installation menus to retry whichever operations have failed.
<mediaobject>
<imageobject>
- <imagedata fileref="install/ed0-conf2" format="PNG"/>
+ <imagedata fileref="install/ed0-conf2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2492,7 +2492,7 @@ use the current settings.
<mediaobject>
<imageobject>
- <imagedata fileref="install/edit-inetd-conf" format="PNG"/>
+ <imagedata fileref="install/edit-inetd-conf.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2542,7 +2542,7 @@ use the current settings.
<mediaobject>
<imageobject>
- <imagedata fileref="install/ftp-anon1" format="PNG"/>
+ <imagedata fileref="install/ftp-anon1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2595,7 +2595,7 @@ Upload subdirectory:
<mediaobject>
<imageobject>
- <imagedata fileref="install/ftp-anon2" format="PNG"/>
+ <imagedata fileref="install/ftp-anon2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2656,7 +2656,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/nfs-server-edit" format="PNG"/>
+ <imagedata fileref="install/nfs-server-edit.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2806,7 +2806,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/security" format="PNG"/>
+ <imagedata fileref="install/security.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2887,7 +2887,7 @@ To change any of these settings later, edit /etc/rc.conf
<mediaobject>
<imageobject>
- <imagedata fileref="install/console-saver1" format="PNG"/>
+ <imagedata fileref="install/console-saver1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2901,7 +2901,7 @@ To change any of these settings later, edit /etc/rc.conf
<mediaobject>
<imageobject>
- <imagedata fileref="install/console-saver2" format="PNG"/>
+ <imagedata fileref="install/console-saver2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2921,7 +2921,7 @@ To change any of these settings later, edit /etc/rc.conf
<mediaobject>
<imageobject>
- <imagedata fileref="install/console-saver3" format="PNG"/>
+ <imagedata fileref="install/console-saver3.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2935,7 +2935,7 @@ To change any of these settings later, edit /etc/rc.conf
<mediaobject>
<imageobject>
- <imagedata fileref="install/console-saver4" format="PNG"/>
+ <imagedata fileref="install/console-saver4.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2981,7 +2981,7 @@ To change any of these settings later, edit /etc/rc.conf
<mediaobject>
<imageobject>
- <imagedata fileref="install/timezone1" format="PNG"/>
+ <imagedata fileref="install/timezone1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2994,7 +2994,7 @@ To change any of these settings later, edit /etc/rc.conf
<mediaobject>
<imageobject>
- <imagedata fileref="install/timezone2" format="PNG"/>
+ <imagedata fileref="install/timezone2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3007,7 +3007,7 @@ To change any of these settings later, edit /etc/rc.conf
<mediaobject>
<imageobject>
- <imagedata fileref="install/timezone3" format="PNG"/>
+ <imagedata fileref="install/timezone3.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3070,7 +3070,7 @@ To change any of these settings later, edit /etc/rc.conf
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse1" format="PNG"/>
+ <imagedata fileref="install/mouse1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3083,7 +3083,7 @@ To change any of these settings later, edit /etc/rc.conf
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse2" format="PNG"/>
+ <imagedata fileref="install/mouse2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3099,7 +3099,7 @@ To change any of these settings later, edit /etc/rc.conf
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse3" format="PNG"/>
+ <imagedata fileref="install/mouse3.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3112,7 +3112,7 @@ To change any of these settings later, edit /etc/rc.conf
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse4" format="PNG"/>
+ <imagedata fileref="install/mouse4.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3127,7 +3127,7 @@ To change any of these settings later, edit /etc/rc.conf
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse5" format="PNG"/>
+ <imagedata fileref="install/mouse5.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3142,7 +3142,7 @@ To change any of these settings later, edit /etc/rc.conf
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse6" format="PNG"/>
+ <imagedata fileref="install/mouse6.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3202,7 +3202,7 @@ To change any of these settings later, edit /etc/rc.conf
<mediaobject>
<imageobject>
- <imagedata fileref="install/net-config-menu1" format="PNG"/>
+ <imagedata fileref="install/net-config-menu1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3266,7 +3266,7 @@ To change any of these settings later, edit /etc/rc.conf
<mediaobject>
<imageobject>
- <imagedata fileref="install/mta-main" format="PNG"/>
+ <imagedata fileref="install/mta-main.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3316,7 +3316,7 @@ To change any of these settings later, edit /etc/rc.conf
<mediaobject>
<imageobject>
- <imagedata fileref="install/ntp-config" format="PNG"/>
+ <imagedata fileref="install/ntp-config.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3337,7 +3337,7 @@ To change any of these settings later, edit /etc/rc.conf
<mediaobject>
<imageobject>
- <imagedata fileref="install/net-config-menu2" format="PNG"/>
+ <imagedata fileref="install/net-config-menu2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3442,7 +3442,7 @@ To change any of these settings later, edit /etc/rc.conf
<mediaobject>
<imageobject>
- <imagedata fileref="install/xf86setup" format="PNG"/>
+ <imagedata fileref="install/xf86setup.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3959,7 +3959,7 @@ failed. Would you like to try again?
<mediaobject>
<imageobject>
- <imagedata fileref="install/desktop" format="PNG"/>
+ <imagedata fileref="install/desktop.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3995,7 +3995,7 @@ failed. Would you like to try again?
<mediaobject>
<imageobject>
- <imagedata fileref="install/pkg-cat" format="PNG"/>
+ <imagedata fileref="install/pkg-cat.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -4015,7 +4015,7 @@ failed. Would you like to try again?
<mediaobject>
<imageobject>
- <imagedata fileref="install/pkg-sel" format="PNG"/>
+ <imagedata fileref="install/pkg-sel.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -4041,7 +4041,7 @@ failed. Would you like to try again?
<mediaobject>
<imageobject>
- <imagedata fileref="install/pkg-install" format="PNG"/>
+ <imagedata fileref="install/pkg-install.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -4055,7 +4055,7 @@ failed. Would you like to try again?
<mediaobject>
<imageobject>
- <imagedata fileref="install/pkg-confirm" format="PNG"/>
+ <imagedata fileref="install/pkg-confirm.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -4095,7 +4095,7 @@ failed. Would you like to try again?
<mediaobject>
<imageobject>
- <imagedata fileref="install/adduser1" format="PNG"/>
+ <imagedata fileref="install/adduser1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -4108,7 +4108,7 @@ failed. Would you like to try again?
<mediaobject>
<imageobject>
- <imagedata fileref="install/adduser2" format="PNG"/>
+ <imagedata fileref="install/adduser2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -4206,7 +4206,7 @@ failed. Would you like to try again?
<mediaobject>
<imageobject>
- <imagedata fileref="install/adduser3" format="PNG"/>
+ <imagedata fileref="install/adduser3.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -4272,7 +4272,7 @@ Retype new password :</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/mainexit" format="PNG"/>
+ <imagedata fileref="install/mainexit.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
diff --git a/pl_PL.ISO8859-2/books/handbook/mail/chapter.xml b/pl_PL.ISO8859-2/books/handbook/mail/chapter.xml
index e051dc67aa..1d6906bf50 100644
--- a/pl_PL.ISO8859-2/books/handbook/mail/chapter.xml
+++ b/pl_PL.ISO8859-2/books/handbook/mail/chapter.xml
@@ -1968,7 +1968,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/mutt1" format="PNG"/>
+ <imagedata fileref="mail/mutt1.png" format="PNG"/>
</imageobject>
</mediaobject>
@@ -1979,7 +1979,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/mutt2" format="PNG"/>
+ <imagedata fileref="mail/mutt2.png" format="PNG"/>
</imageobject>
</mediaobject>
@@ -2011,7 +2011,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/mutt3" format="PNG"/>
+ <imagedata fileref="mail/mutt3.png" format="PNG"/>
</imageobject>
</mediaobject>
@@ -2059,7 +2059,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine1" format="PNG"/>
+ <imagedata fileref="mail/pine1.png" format="PNG"/>
</imageobject>
</mediaobject>
@@ -2077,7 +2077,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine2" format="PNG"/>
+ <imagedata fileref="mail/pine2.png" format="PNG"/>
</imageobject>
</mediaobject>
@@ -2088,7 +2088,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine3" format="PNG"/>
+ <imagedata fileref="mail/pine3.png" format="PNG"/>
</imageobject>
</mediaobject>
@@ -2101,7 +2101,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine4" format="PNG"/>
+ <imagedata fileref="mail/pine4.png" format="PNG"/>
</imageobject>
</mediaobject>
@@ -2118,7 +2118,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine5" format="PNG"/>
+ <imagedata fileref="mail/pine5.png" format="PNG"/>
</imageobject>
</mediaobject>
diff --git a/pl_PL.ISO8859-2/books/handbook/security/chapter.xml b/pl_PL.ISO8859-2/books/handbook/security/chapter.xml
index 3da3d06fc4..5e3d21ece0 100644
--- a/pl_PL.ISO8859-2/books/handbook/security/chapter.xml
+++ b/pl_PL.ISO8859-2/books/handbook/security/chapter.xml
@@ -3276,7 +3276,7 @@ options IPSEC_DEBUG #debug for IP security
<mediaobject>
<imageobject>
- <imagedata fileref="security/ipsec-network" align="center"/>
+ <imagedata fileref="security/ipsec-network.pic" align="center"/>
</imageobject>
<textobject>
@@ -3770,7 +3770,7 @@ ipfw add 1 allow udp from W.X.Y.Z to A.B.C.D isakmp
<mediaobject>
<imageobject>
- <imagedata fileref="security/ipsec-out-pkt" align="center"/>
+ <imagedata fileref="security/ipsec-out-pkt.pic" align="center"/>
</imageobject>
<textobject>
@@ -3790,7 +3790,7 @@ ipfw add 1 allow udp from W.X.Y.Z to A.B.C.D isakmp
<mediaobject>
<imageobject>
- <imagedata fileref="security/ipsec-encap-pkt" align="center"/>
+ <imagedata fileref="security/ipsec-encap-pkt.pic" align="center"/>
</imageobject>
<textobject>
@@ -3924,7 +3924,7 @@ ipfw add 1 allow ipencap from W.X.Y.Z to A.B.C.D
<mediaobject>
<imageobject>
- <imagedata fileref="security/ipsec-crypt-pkt" align="center"/>
+ <imagedata fileref="security/ipsec-crypt-pkt.pic" align="center"/>
</imageobject>
<textobject>
diff --git a/pl_PL.ISO8859-2/books/handbook/vinum/chapter.xml b/pl_PL.ISO8859-2/books/handbook/vinum/chapter.xml
index f25d496c46..2b5c2abba2 100644
--- a/pl_PL.ISO8859-2/books/handbook/vinum/chapter.xml
+++ b/pl_PL.ISO8859-2/books/handbook/vinum/chapter.xml
@@ -175,7 +175,7 @@ disk storage, and an introduction to the Vinum Volume Manager.</para>
<para>
<figure id="vinum-concat">
<title>Concatenated Organization</title>
- <graphic fileref="vinum/vinum-concat"/>
+ <graphic fileref="vinum/vinum-concat.pic"/>
</figure>
</para>
@@ -214,7 +214,7 @@ disk storage, and an introduction to the Vinum Volume Manager.</para>
<para>
<figure id="vinum-striped">
<title>Striped Organization</title>
- <graphic fileref="vinum/vinum-striped"/>
+ <graphic fileref="vinum/vinum-striped.pic"/>
</figure>
</para>
</sect1>
@@ -284,7 +284,7 @@ disk storage, and an introduction to the Vinum Volume Manager.</para>
<para>
<figure id="vinum-raid5-org">
<title>RAID-5 Organization</title>
- <graphic fileref="vinum/vinum-raid5-org"/>
+ <graphic fileref="vinum/vinum-raid5-org.pic"/>
</figure>
</para>
@@ -560,7 +560,7 @@ disk storage, and an introduction to the Vinum Volume Manager.</para>
<para>
<figure id="vinum-simple-vol">
<title>A Simple Vinum Volume</title>
- <graphic fileref="vinum/vinum-simple-vol"/>
+ <graphic fileref="vinum/vinum-simple-vol.pic"/>
</figure>
</para>
@@ -628,7 +628,7 @@ disk storage, and an introduction to the Vinum Volume Manager.</para>
<para>
<figure id="vinum-mirrored-vol">
<title>A Mirrored Vinum Volume</title>
- <graphic fileref="vinum/vinum-mirrored-vol"/>
+ <graphic fileref="vinum/vinum-mirrored-vol.pic"/>
</figure>
</para>
@@ -695,7 +695,7 @@ disk storage, and an introduction to the Vinum Volume Manager.</para>
<para>
<figure id="vinum-striped-vol">
<title>A Striped Vinum Volume</title>
- <graphic fileref="vinum/vinum-striped-vol"/>
+ <graphic fileref="vinum/vinum-striped-vol.pic"/>
</figure>
</para>
@@ -739,7 +739,7 @@ disk storage, and an introduction to the Vinum Volume Manager.</para>
<para>
<figure id="vinum-raid10-vol">
<title>A Mirrored, Striped Vinum Volume</title>
- <graphic fileref="vinum/vinum-raid10-vol"/>
+ <graphic fileref="vinum/vinum-raid10-vol.pic"/>
</figure>
</para>
</sect2>
diff --git a/pt_BR.ISO8859-1/articles/building-products/article.xml b/pt_BR.ISO8859-1/articles/building-products/article.xml
index fb5499b525..b5bfbed8e2 100644
--- a/pt_BR.ISO8859-1/articles/building-products/article.xml
+++ b/pt_BR.ISO8859-1/articles/building-products/article.xml
@@ -451,7 +451,7 @@
<title>Organiza��o do FreeBSD</title>
<mediaobject>
<imageobject>
- <imagedata fileref="freebsd-organization" format="PIC"/>
+ <imagedata fileref="freebsd-organization.pic" format="PIC"/>
</imageobject>
</mediaobject>
</figure>
@@ -510,7 +510,7 @@
<title>Ramos de vers�es do FreeBSD</title>
<mediaobject>
<imageobject>
- <imagedata fileref="freebsd-branches" format="EPS"/>
+ <imagedata fileref="freebsd-branches.eps" format="EPS"/>
</imageobject>
</mediaobject>
</figure>
diff --git a/pt_BR.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml b/pt_BR.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml
index 2cc9f6046c..7c524df1c7 100644
--- a/pt_BR.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml
+++ b/pt_BR.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml
@@ -2666,14 +2666,14 @@ bom valor para <replaceable>n</replaceable>.</para>
<para>Um exemplo provavelmente ir� tornar as coisas
mais f�ceis de se entender. Suponha que voc�
- tenha uma imagem, chamada <filename>fig1</filename>, que
+ tenha uma imagem, chamada <filename>fig1.png</filename>, que
voc� queira incluir no documento. Esta imagem
� um ret�ngulo com um A dentro dele. A
marca��o para isso ser�:</para>
<programlisting><mediaobject>
<imageobject>
- <imagedata fileref="fig1"> <co id="co-image-ext"/>
+ <imagedata fileref="fig1.png"> <co id="co-image-ext"/>
</imageobject>
<textobject>
@@ -2792,7 +2792,7 @@ IMAGES+= fig3.png
<programlisting><mediaobject>
<imageobject>
- <imagedata fileref="chapter1/fig1"> <co id="co-image-dir"/>
+ <imagedata fileref="chapter1/fig1.png"> <co id="co-image-dir"/>
</imageobject>
…
diff --git a/ru_RU.KOI8-R/articles/releng/article.xml b/ru_RU.KOI8-R/articles/releng/article.xml
index d7b388de0b..946b5feb94 100644
--- a/ru_RU.KOI8-R/articles/releng/article.xml
+++ b/ru_RU.KOI8-R/articles/releng/article.xml
@@ -302,7 +302,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="branches-head" align="center"/>
+ <imagedata fileref="branches-head.pic" align="center"/>
</imageobject>
<textobject>
@@ -312,7 +312,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="branches-releng3" align="center"/>
+ <imagedata fileref="branches-releng3.pic" align="center"/>
</imageobject>
<textobject>
@@ -322,7 +322,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="branches-releng4" align="center"/>
+ <imagedata fileref="branches-releng4.pic" align="center"/>
</imageobject>
<textobject>
@@ -332,7 +332,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="branches-releng5" align="center"/>
+ <imagedata fileref="branches-releng5.pic" align="center"/>
</imageobject>
<textobject>
@@ -342,7 +342,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="branches-releng6" align="center"/>
+ <imagedata fileref="branches-releng6.pic" align="center"/>
</imageobject>
<textobject>
@@ -352,7 +352,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="branches-releng7" align="center"/>
+ <imagedata fileref="branches-releng7.pic" align="center"/>
</imageobject>
<textobject>
@@ -362,7 +362,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="branches-releng8" align="center"/>
+ <imagedata fileref="branches-releng8.pic" align="center"/>
</imageobject>
<textobject>
@@ -372,7 +372,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="branches-releng9" align="center"/>
+ <imagedata fileref="branches-releng9.pic" align="center"/>
</imageobject>
<textobject>
diff --git a/ru_RU.KOI8-R/articles/vm-design/article.xml b/ru_RU.KOI8-R/articles/vm-design/article.xml
index eb317fb160..ad438a04c7 100644
--- a/ru_RU.KOI8-R/articles/vm-design/article.xml
+++ b/ru_RU.KOI8-R/articles/vm-design/article.xml
@@ -207,7 +207,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="fig1" format="EPS"/>
+ <imagedata fileref="fig1.eps" format="EPS"/>
</imageobject>
<textobject>
@@ -230,7 +230,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="fig2" format="EPS"/>
+ <imagedata fileref="fig2.eps" format="EPS"/>
</imageobject>
<textobject>
@@ -251,7 +251,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="fig3" format="EPS"/>
+ <imagedata fileref="fig3.eps" format="EPS"/>
</imageobject>
<textobject>
@@ -283,7 +283,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="fig4" format="EPS"/>
+ <imagedata fileref="fig4.eps" format="EPS"/>
</imageobject>
<textobject>
diff --git a/ru_RU.KOI8-R/books/design-44bsd/book.xml b/ru_RU.KOI8-R/books/design-44bsd/book.xml
index cc599874c4..26e4264480 100644
--- a/ru_RU.KOI8-R/books/design-44bsd/book.xml
+++ b/ru_RU.KOI8-R/books/design-44bsd/book.xml
@@ -600,7 +600,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="fig1" format="EPS">
+ <imagedata fileref="fig1.eps" format="EPS">
</imageobject>
<textobject>
@@ -1375,7 +1375,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="fig2" format="EPS">
+ <imagedata fileref="fig2.eps" format="EPS">
</imageobject>
<textobject>
diff --git a/ru_RU.KOI8-R/books/fdp-primer/sgml-markup/chapter.xml b/ru_RU.KOI8-R/books/fdp-primer/sgml-markup/chapter.xml
index d98faffea9..1109c9007b 100644
--- a/ru_RU.KOI8-R/books/fdp-primer/sgml-markup/chapter.xml
+++ b/ru_RU.KOI8-R/books/fdp-primer/sgml-markup/chapter.xml
@@ -2409,14 +2409,14 @@ tion</replaceable>;</literal>
</itemizedlist>
<para>��������, ������ ������� ��������� ��������� �����. �����������,
- ��� � ��� ���� ���� ����������� � ������ <filename>fig1</filename>,
+ ��� � ��� ���� ���� ����������� � ������ <filename>fig1.png</filename>,
������� �� ������ �������� � ��������. ��� ����������� ������������
����� ������������� � ������ A ������. �������� ��� ����� ������
����� ������.</para>
<programlisting><mediaobject>
<imageobject>
- <imagedata fileref="fig1"> <co id="co-image-ext">
+ <imagedata fileref="fig1.png"> <co id="co-image-ext">
</imageobject>
<textobject>
@@ -2522,7 +2522,7 @@ IMAGES+= fig3.png
<programlisting><mediaobject>
<imageobject>
- <imagedata fileref="chapter1/fig1"> <co id="co-image-dir">
+ <imagedata fileref="chapter1/fig1.png"> <co id="co-image-dir">
</imageobject>
…
diff --git a/ru_RU.KOI8-R/books/handbook/advanced-networking/chapter.xml b/ru_RU.KOI8-R/books/handbook/advanced-networking/chapter.xml
index 8daf304fa4..bac2e30479 100644
--- a/ru_RU.KOI8-R/books/handbook/advanced-networking/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/advanced-networking/chapter.xml
@@ -298,7 +298,7 @@ host2.example.com link#1 UC 0 0
<mediaobject>
<imageobject>
- <imagedata fileref="advanced-networking/net-routing"/>
+ <imagedata fileref="advanced-networking/net-routing.pic"/>
</imageobject>
<textobject>
@@ -491,7 +491,7 @@ host2.example.com link#1 UC 0 0
<mediaobject>
<imageobject>
- <imagedata fileref="advanced-networking/static-routes"/>
+ <imagedata fileref="advanced-networking/static-routes.pic"/>
</imageobject>
<textobject>
@@ -3060,7 +3060,7 @@ cd /usr/src/etc; make distribution</programlisting>
<mediaobject>
<imageobject>
- <imagedata fileref="advanced-networking/isdn-bus"/>
+ <imagedata fileref="advanced-networking/isdn-bus.eps"/>
</imageobject>
<textobject>
@@ -3094,7 +3094,7 @@ cd /usr/src/etc; make distribution</programlisting>
<mediaobject>
<imageobject>
- <imagedata fileref="advanced-networking/isdn-twisted-pair"/>
+ <imagedata fileref="advanced-networking/isdn-twisted-pair.eps"/>
</imageobject>
<textobject>
@@ -3212,7 +3212,7 @@ cd /usr/src/etc; make distribution</programlisting>
<mediaobject>
<imageobject>
- <imagedata fileref="advanced-networking/natd"/>
+ <imagedata fileref="advanced-networking/natd.eps"/>
</imageobject>
<textobject>
diff --git a/ru_RU.KOI8-R/books/handbook/basics/chapter.xml b/ru_RU.KOI8-R/books/handbook/basics/chapter.xml
index 4a1c1c9b6b..f94809e0eb 100644
--- a/ru_RU.KOI8-R/books/handbook/basics/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/basics/chapter.xml
@@ -1166,7 +1166,7 @@ root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01 passwd</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir1" format="EPS"/>
+ <imagedata fileref="install/example-dir1.eps" format="EPS"/>
</imageobject>
<textobject>
@@ -1186,7 +1186,7 @@ root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01 passwd</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir2" format="EPS"/>
+ <imagedata fileref="install/example-dir2.eps" format="EPS"/>
</imageobject>
<textobject>
@@ -1214,7 +1214,7 @@ root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01 passwd</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir3" format="EPS"/>
+ <imagedata fileref="install/example-dir3.eps" format="EPS"/>
</imageobject>
<textobject>
@@ -1240,7 +1240,7 @@ root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01 passwd</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir4" format="EPS"/>
+ <imagedata fileref="install/example-dir4.eps" format="EPS"/>
</imageobject>
<textobject>
@@ -1266,7 +1266,7 @@ root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01 passwd</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir5" format="EPS"/>
+ <imagedata fileref="install/example-dir5.eps" format="EPS"/>
</imageobject>
<textobject>
@@ -1580,7 +1580,7 @@ root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01 passwd</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/disk-layout" format="EPS"/>
+ <imagedata fileref="install/disk-layout.eps" format="EPS"/>
</imageobject>
<textobject>
diff --git a/ru_RU.KOI8-R/books/handbook/bsdinstall/chapter.xml b/ru_RU.KOI8-R/books/handbook/bsdinstall/chapter.xml
index cacc11b825..d89b7a79e4 100644
--- a/ru_RU.KOI8-R/books/handbook/bsdinstall/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/bsdinstall/chapter.xml
@@ -667,7 +667,7 @@ Loading /boot/defaults/loader.conf
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-boot-loader-menu"
+ <imagedata fileref="bsdinstall/bsdinstall-boot-loader-menu.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -961,7 +961,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-choose-mode"
+ <imagedata fileref="bsdinstall/bsdinstall-choose-mode.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -1005,7 +1005,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-keymap-select-default"
+ <imagedata fileref="bsdinstall/bsdinstall-keymap-select-default.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -1021,7 +1021,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-config-keymap"
+ <imagedata fileref="bsdinstall/bsdinstall-config-keymap.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -1051,7 +1051,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-config-hostname"
+ <imagedata fileref="bsdinstall/bsdinstall-config-hostname.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -1072,7 +1072,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-config-components"
+ <imagedata fileref="bsdinstall/bsdinstall-config-components.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -1159,7 +1159,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-netinstall-files"
+ <imagedata fileref="bsdinstall/bsdinstall-netinstall-files.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -1178,7 +1178,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-netinstall-mirrorselect"
+ <imagedata fileref="bsdinstall/bsdinstall-netinstall-mirrorselect.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -1205,7 +1205,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-part-guided-manual"
+ <imagedata fileref="bsdinstall/bsdinstall-part-guided-manual.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -1222,7 +1222,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-part-guided-disk"
+ <imagedata fileref="bsdinstall/bsdinstall-part-guided-disk.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -1239,7 +1239,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-part-entire-part"
+ <imagedata fileref="bsdinstall/bsdinstall-part-entire-part.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -1260,7 +1260,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-part-review"
+ <imagedata fileref="bsdinstall/bsdinstall-part-review.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -1277,7 +1277,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-part-manual-create"
+ <imagedata fileref="bsdinstall/bsdinstall-part-manual-create.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -1293,7 +1293,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-part-manual-partscheme"
+ <imagedata fileref="bsdinstall/bsdinstall-part-manual-partscheme.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -1378,7 +1378,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-part-manual-addpart"
+ <imagedata fileref="bsdinstall/bsdinstall-part-manual-addpart.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -1551,7 +1551,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-final-confirmation"
+ <imagedata fileref="bsdinstall/bsdinstall-final-confirmation.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -1581,7 +1581,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-distfile-fetching"
+ <imagedata fileref="bsdinstall/bsdinstall-distfile-fetching.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -1596,7 +1596,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-distfile-verifying"
+ <imagedata fileref="bsdinstall/bsdinstall-distfile-verifying.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -1609,7 +1609,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-distfile-extracting"
+ <imagedata fileref="bsdinstall/bsdinstall-distfile-extracting.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -1642,7 +1642,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-post-root-passwd"
+ <imagedata fileref="bsdinstall/bsdinstall-post-root-passwd.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -1669,7 +1669,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-configure-network-interface"
+ fileref="bsdinstall/bsdinstall-configure-network-interface.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -1703,7 +1703,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-configure-wireless-scan"
+ fileref="bsdinstall/bsdinstall-configure-wireless-scan.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -1725,7 +1725,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-configure-wireless-accesspoints"
+ fileref="bsdinstall/bsdinstall-configure-wireless-accesspoints.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -1745,7 +1745,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-configure-wireless-wpa2setup"
+ fileref="bsdinstall/bsdinstall-configure-wireless-wpa2setup.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -1766,7 +1766,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-ipv4"
+ <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-ipv4.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -1799,7 +1799,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-ipv4-dhcp"
+ <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-ipv4-dhcp.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -1818,7 +1818,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-ipv4-static"
+ <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-ipv4-static.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -1862,7 +1862,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-ipv6"
+ <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-ipv6.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -1888,7 +1888,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-slaac"
+ <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-slaac.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -1907,7 +1907,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-ipv6-static"
+ <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-ipv6-static.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -1953,7 +1953,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-configure-network-ipv4-dns"
+ <imagedata fileref="bsdinstall/bsdinstall-configure-network-ipv4-dns.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -1977,7 +1977,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-set-clock-local-utc"
+ <imagedata fileref="bsdinstall/bsdinstall-set-clock-local-utc.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -1996,7 +1996,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-timezone-region"
+ <imagedata fileref="bsdinstall/bsdinstall-timezone-region.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -2010,7 +2010,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-timezone-country"
+ <imagedata fileref="bsdinstall/bsdinstall-timezone-country.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -2024,7 +2024,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-timezone-zone"
+ <imagedata fileref="bsdinstall/bsdinstall-timezone-zone.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -2038,7 +2038,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-timezone-confirm"
+ <imagedata fileref="bsdinstall/bsdinstall-timezone-confirm.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -2062,7 +2062,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-config-services"
+ <imagedata fileref="bsdinstall/bsdinstall-config-services.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -2112,7 +2112,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-config-crashdump"
+ <imagedata fileref="bsdinstall/bsdinstall-config-crashdump.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -2137,7 +2137,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-adduser1" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-adduser1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2149,7 +2149,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-adduser2" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-adduser2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2252,7 +2252,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-adduser3" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-adduser3.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2278,7 +2278,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-finalconfiguration"
+ <imagedata fileref="bsdinstall/bsdinstall-finalconfiguration.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -2335,7 +2335,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-final-modification-shell"
+ <imagedata fileref="bsdinstall/bsdinstall-final-modification-shell.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -2353,7 +2353,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-mainexit" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-mainexit.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
diff --git a/ru_RU.KOI8-R/books/handbook/geom/chapter.xml b/ru_RU.KOI8-R/books/handbook/geom/chapter.xml
index 7e6939a30b..c9fcebfc43 100644
--- a/ru_RU.KOI8-R/books/handbook/geom/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/geom/chapter.xml
@@ -148,7 +148,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="geom/striping" align="center"/>
+ <imagedata fileref="geom/striping.pic" align="center"/>
</imageobject>
<textobject>
diff --git a/ru_RU.KOI8-R/books/handbook/install/chapter.xml b/ru_RU.KOI8-R/books/handbook/install/chapter.xml
index 5a9042ab18..19589f0b8b 100644
--- a/ru_RU.KOI8-R/books/handbook/install/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/install/chapter.xml
@@ -1022,7 +1022,7 @@ Insert disk labelled "Kernel floppy 1" and press any key...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/boot-loader-menu" format="PNG"/>
+ <imagedata fileref="install/boot-loader-menu.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1186,7 +1186,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/config-country" format="PNG"/>
+ <imagedata fileref="install/config-country.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1202,7 +1202,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/config-keymap" format="PNG"/>
+ <imagedata fileref="install/config-keymap.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1239,7 +1239,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main1" format="PNG"/>
+ <imagedata fileref="install/main1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1255,7 +1255,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main-doc" format="PNG"/>
+ <imagedata fileref="install/main-doc.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1267,7 +1267,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/docmenu1" format="PNG"/>
+ <imagedata fileref="install/docmenu1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1297,7 +1297,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main-keymap" format="PNG"/>
+ <imagedata fileref="install/main-keymap.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1318,7 +1318,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/keymap" format="PNG"/>
+ <imagedata fileref="install/keymap.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1336,7 +1336,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main-options" format="PNG"/>
+ <imagedata fileref="install/main-options.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1346,7 +1346,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/options" format="PNG"/>
+ <imagedata fileref="install/options.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1382,7 +1382,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main-std" format="PNG"/>
+ <imagedata fileref="install/main-std.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1560,7 +1560,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/fdisk-drive1" format="PNG"/>
+ <imagedata fileref="install/fdisk-drive1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1628,7 +1628,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/fdisk-edit1" format="PNG"/>
+ <imagedata fileref="install/fdisk-edit1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1673,7 +1673,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/fdisk-edit2" format="PNG"/>
+ <imagedata fileref="install/fdisk-edit2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1716,7 +1716,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/boot-mgr" format="PNG"/>
+ <imagedata fileref="install/boot-mgr.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1746,7 +1746,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/fdisk-drive2" format="PNG"/>
+ <imagedata fileref="install/fdisk-drive2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1995,7 +1995,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-ed1" format="PNG"/>
+ <imagedata fileref="install/disklabel-ed1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2023,7 +2023,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-auto" format="PNG"/>
+ <imagedata fileref="install/disklabel-auto.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2049,7 +2049,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-root1" format="PNG"/>
+ <imagedata fileref="install/disklabel-root1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2066,7 +2066,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-root2" format="PNG"/>
+ <imagedata fileref="install/disklabel-root2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2083,7 +2083,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-fs" format="PNG"/>
+ <imagedata fileref="install/disklabel-fs.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2100,7 +2100,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-root3" format="PNG"/>
+ <imagedata fileref="install/disklabel-root3.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2122,7 +2122,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-ed2" format="PNG"/>
+ <imagedata fileref="install/disklabel-ed2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2172,7 +2172,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/dist-set" format="PNG"/>
+ <imagedata fileref="install/dist-set.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2225,7 +2225,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/dist-set2" format="PNG"/>
+ <imagedata fileref="install/dist-set2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2258,7 +2258,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/media" format="PNG"/>
+ <imagedata fileref="install/media.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2448,7 +2448,7 @@ installation menus to retry whichever operations have failed.
<mediaobject>
<imageobject>
- <imagedata fileref="install/ed0-conf" format="PNG"/>
+ <imagedata fileref="install/ed0-conf.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2494,7 +2494,7 @@ installation menus to retry whichever operations have failed.
<mediaobject>
<imageobject>
- <imagedata fileref="install/ed0-conf2" format="PNG"/>
+ <imagedata fileref="install/ed0-conf2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2665,7 +2665,7 @@ use the current settings.
<mediaobject>
<imageobject>
- <imagedata fileref="install/edit-inetd-conf" format="PNG"/>
+ <imagedata fileref="install/edit-inetd-conf.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2759,7 +2759,7 @@ use the current settings.
<mediaobject>
<imageobject>
- <imagedata fileref="install/ftp-anon1" format="PNG"/>
+ <imagedata fileref="install/ftp-anon1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2838,7 +2838,7 @@ use the current settings.
<mediaobject>
<imageobject>
- <imagedata fileref="install/ftp-anon2" format="PNG"/>
+ <imagedata fileref="install/ftp-anon2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2897,7 +2897,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/nfs-server-edit" format="PNG"/>
+ <imagedata fileref="install/nfs-server-edit.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2947,7 +2947,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/console-saver1" format="PNG"/>
+ <imagedata fileref="install/console-saver1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2962,7 +2962,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/console-saver2" format="PNG"/>
+ <imagedata fileref="install/console-saver2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2982,7 +2982,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/console-saver3" format="PNG"/>
+ <imagedata fileref="install/console-saver3.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2996,7 +2996,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/console-saver4" format="PNG"/>
+ <imagedata fileref="install/console-saver4.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3040,7 +3040,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/timezone1" format="PNG"/>
+ <imagedata fileref="install/timezone1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3053,7 +3053,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/timezone2" format="PNG"/>
+ <imagedata fileref="install/timezone2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3066,7 +3066,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/timezone3" format="PNG"/>
+ <imagedata fileref="install/timezone3.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3134,7 +3134,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse1" format="PNG"/>
+ <imagedata fileref="install/mouse1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3148,7 +3148,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse2" format="PNG"/>
+ <imagedata fileref="install/mouse2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3164,7 +3164,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse3" format="PNG"/>
+ <imagedata fileref="install/mouse3.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3178,7 +3178,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse4" format="PNG"/>
+ <imagedata fileref="install/mouse4.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3192,7 +3192,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse5" format="PNG"/>
+ <imagedata fileref="install/mouse5.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3207,7 +3207,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse6" format="PNG"/>
+ <imagedata fileref="install/mouse6.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3251,7 +3251,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/pkg-cat" format="PNG"/>
+ <imagedata fileref="install/pkg-cat.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3272,7 +3272,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/pkg-sel" format="PNG"/>
+ <imagedata fileref="install/pkg-sel.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3300,7 +3300,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/pkg-install" format="PNG"/>
+ <imagedata fileref="install/pkg-install.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3314,7 +3314,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/pkg-confirm" format="PNG"/>
+ <imagedata fileref="install/pkg-confirm.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3355,7 +3355,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/adduser1" format="PNG"/>
+ <imagedata fileref="install/adduser1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3368,7 +3368,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/adduser2" format="PNG"/>
+ <imagedata fileref="install/adduser2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3470,7 +3470,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/adduser3" format="PNG"/>
+ <imagedata fileref="install/adduser3.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3532,7 +3532,7 @@ Retype new password :</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/mainexit" format="PNG"/>
+ <imagedata fileref="install/mainexit.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3609,7 +3609,7 @@ Retype new password :</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/net-config-menu1" format="PNG"/>
+ <imagedata fileref="install/net-config-menu1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3679,7 +3679,7 @@ Retype new password :</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/mta-main" format="PNG"/>
+ <imagedata fileref="install/mta-main.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3733,7 +3733,7 @@ Retype new password :</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/ntp-config" format="PNG"/>
+ <imagedata fileref="install/ntp-config.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3759,7 +3759,7 @@ Retype new password :</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/net-config-menu2" format="PNG"/>
+ <imagedata fileref="install/net-config-menu2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
diff --git a/ru_RU.KOI8-R/books/handbook/mail/chapter.xml b/ru_RU.KOI8-R/books/handbook/mail/chapter.xml
index 96414f30ab..1145dda277 100644
--- a/ru_RU.KOI8-R/books/handbook/mail/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/mail/chapter.xml
@@ -2008,7 +2008,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/mutt1" format="PNG"/>
+ <imagedata fileref="mail/mutt1.png" format="PNG"/>
</imageobject>
</mediaobject>
@@ -2019,7 +2019,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/mutt2" format="PNG"/>
+ <imagedata fileref="mail/mutt2.png" format="PNG"/>
</imageobject>
</mediaobject>
@@ -2052,7 +2052,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/mutt3" format="PNG"/>
+ <imagedata fileref="mail/mutt3.png" format="PNG"/>
</imageobject>
</mediaobject>
@@ -2102,7 +2102,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine1" format="PNG"/>
+ <imagedata fileref="mail/pine1.png" format="PNG"/>
</imageobject>
</mediaobject>
@@ -2120,7 +2120,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine2" format="PNG"/>
+ <imagedata fileref="mail/pine2.png" format="PNG"/>
</imageobject>
</mediaobject>
@@ -2130,7 +2130,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine3" format="PNG"/>
+ <imagedata fileref="mail/pine3.png" format="PNG"/>
</imageobject>
</mediaobject>
@@ -2142,7 +2142,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine4" format="PNG"/>
+ <imagedata fileref="mail/pine4.png" format="PNG"/>
</imageobject>
</mediaobject>
@@ -2158,7 +2158,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine5" format="PNG"/>
+ <imagedata fileref="mail/pine5.png" format="PNG"/>
</imageobject>
</mediaobject>
diff --git a/ru_RU.KOI8-R/books/handbook/security/chapter.xml b/ru_RU.KOI8-R/books/handbook/security/chapter.xml
index 59d47db0f4..65c360dcd9 100644
--- a/ru_RU.KOI8-R/books/handbook/security/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/security/chapter.xml
@@ -3266,7 +3266,7 @@ options IPSEC_DEBUG #debug for IP security
<mediaobject>
<imageobject>
- <imagedata fileref="security/ipsec-network" align="center"/>
+ <imagedata fileref="security/ipsec-network.pic" align="center"/>
</imageobject>
<textobject>
@@ -3755,7 +3755,7 @@ ipfw add 1 allow udp from W.X.Y.Z to A.B.C.D isakmp
<mediaobject>
<imageobject>
- <imagedata fileref="security/ipsec-out-pkt" align="center"/>
+ <imagedata fileref="security/ipsec-out-pkt.pic" align="center"/>
</imageobject>
<textobject>
@@ -3775,7 +3775,7 @@ ipfw add 1 allow udp from W.X.Y.Z to A.B.C.D isakmp
<mediaobject>
<imageobject>
- <imagedata fileref="security/ipsec-encap-pkt" align="center"/>
+ <imagedata fileref="security/ipsec-encap-pkt.pic" align="center"/>
</imageobject>
<textobject>
@@ -3911,7 +3911,7 @@ ipfw add 1 allow ipencap from W.X.Y.Z to A.B.C.D
<mediaobject>
<imageobject>
- <imagedata fileref="security/ipsec-crypt-pkt" align="center"/>
+ <imagedata fileref="security/ipsec-crypt-pkt.pic" align="center"/>
</imageobject>
<textobject>
diff --git a/ru_RU.KOI8-R/books/handbook/vinum/chapter.xml b/ru_RU.KOI8-R/books/handbook/vinum/chapter.xml
index a15938582d..2215cf59de 100644
--- a/ru_RU.KOI8-R/books/handbook/vinum/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/vinum/chapter.xml
@@ -188,7 +188,7 @@
<para>
<figure id="vinum-concat">
<title>����������� ���������� ������</title>
- <graphic fileref="vinum/vinum-concat"/>
+ <graphic fileref="vinum/vinum-concat.pic"/>
</figure>
</para>
@@ -231,7 +231,7 @@
<para>
<figure id="vinum-striped">
<title>����������� � ������������</title>
- <graphic fileref="vinum/vinum-striped"/>
+ <graphic fileref="vinum/vinum-striped.pic"/>
</figure>
</para>
</sect1>
@@ -297,7 +297,7 @@
<para>
<figure id="vinum-raid5-org">
<title>����������� RAID-5</title>
- <graphic fileref="vinum/vinum-raid5-org"/>
+ <graphic fileref="vinum/vinum-raid5-org.pic"/>
</figure>
</para>
@@ -568,7 +568,7 @@
<para>
<figure id="vinum-simple-vol">
<title>������� ��� Vinum</title>
- <graphic fileref="vinum/vinum-simple-vol"/>
+ <graphic fileref="vinum/vinum-simple-vol.pic"/>
</figure>
</para>
@@ -633,7 +633,7 @@
<para>
<figure id="vinum-mirrored-vol">
<title>��������������� ��� Vinum</title>
- <graphic fileref="vinum/vinum-mirrored-vol"/>
+ <graphic fileref="vinum/vinum-mirrored-vol.pic"/>
</figure>
</para>
@@ -699,7 +699,7 @@
<para>
<figure id="vinum-striped-vol">
<title>��� � ������������</title>
- <graphic fileref="vinum/vinum-striped-vol"/>
+ <graphic fileref="vinum/vinum-striped-vol.pic"/>
</figure>
</para>
@@ -744,7 +744,7 @@
<para>
<figure id="vinum-raid10-vol">
<title>��������������� ��� � ������������</title>
- <graphic fileref="vinum/vinum-raid10-vol"/>
+ <graphic fileref="vinum/vinum-raid10-vol.pic"/>
</figure>
</para>
</sect2>
diff --git a/zh_CN.GB2312/books/handbook/advanced-networking/chapter.xml b/zh_CN.GB2312/books/handbook/advanced-networking/chapter.xml
index c4b8385eb2..5dbfa119d6 100644
--- a/zh_CN.GB2312/books/handbook/advanced-networking/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/advanced-networking/chapter.xml
@@ -279,7 +279,7 @@ host2.example.com link#1 UC 0 0
<mediaobject>
<imageobject>
- <imagedata fileref="advanced-networking/net-routing"/>
+ <imagedata fileref="advanced-networking/net-routing.pic"/>
</imageobject>
<textobject>
@@ -462,7 +462,7 @@ host2.example.com link#1 UC 0 0
<mediaobject>
<imageobject>
- <imagedata fileref="advanced-networking/static-routes"/>
+ <imagedata fileref="advanced-networking/static-routes.pic"/>
</imageobject>
<textobject>
@@ -4354,7 +4354,7 @@ Received 264951 bytes in 0.1 seconds</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="advanced-networking/isdn-bus"/>
+ <imagedata fileref="advanced-networking/isdn-bus.eps"/>
</imageobject>
<textobject>
@@ -4385,7 +4385,7 @@ ISDN BRI line</literallayout>
<mediaobject>
<imageobject>
- <imagedata fileref="advanced-networking/isdn-twisted-pair"/>
+ <imagedata fileref="advanced-networking/isdn-twisted-pair.eps"/>
</imageobject>
<textobject>
@@ -4492,7 +4492,7 @@ ISDN BRI line</literallayout>
<mediaobject>
<imageobject>
- <imagedata fileref="advanced-networking/natd"/>
+ <imagedata fileref="advanced-networking/natd.eps"/>
</imageobject>
<textobject>
<literallayout class="monospaced"> _______ __________ ________
diff --git a/zh_CN.GB2312/books/handbook/basics/chapter.xml b/zh_CN.GB2312/books/handbook/basics/chapter.xml
index cdc139f443..c4a8c9988c 100644
--- a/zh_CN.GB2312/books/handbook/basics/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/basics/chapter.xml
@@ -1049,7 +1049,7 @@ root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01 passwd</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir1" format="EPS"/>
+ <imagedata fileref="install/example-dir1.eps" format="EPS"/>
</imageobject>
<textobject>
@@ -1069,7 +1069,7 @@ root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01 passwd</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir2" format="EPS"/>
+ <imagedata fileref="install/example-dir2.eps" format="EPS"/>
</imageobject>
<textobject>
@@ -1102,7 +1102,7 @@ root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01 passwd</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir3" format="EPS"/>
+ <imagedata fileref="install/example-dir3.eps" format="EPS"/>
</imageobject>
<textobject>
@@ -1128,7 +1128,7 @@ root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01 passwd</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir4" format="EPS"/>
+ <imagedata fileref="install/example-dir4.eps" format="EPS"/>
</imageobject>
<textobject>
@@ -1153,7 +1153,7 @@ root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01 passwd</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir5" format="EPS"/>
+ <imagedata fileref="install/example-dir5.eps" format="EPS"/>
</imageobject>
<textobject>
@@ -1445,7 +1445,7 @@ root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01 passwd</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/disk-layout" format="EPS"/>
+ <imagedata fileref="install/disk-layout.eps" format="EPS"/>
</imageobject>
<textobject>
diff --git a/zh_CN.GB2312/books/handbook/bsdinstall/chapter.xml b/zh_CN.GB2312/books/handbook/bsdinstall/chapter.xml
index 89a5e0ed97..d0c49741ab 100644
--- a/zh_CN.GB2312/books/handbook/bsdinstall/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/bsdinstall/chapter.xml
@@ -582,7 +582,7 @@ Loading /boot/defaults/loader.conf
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-boot-loader-menu"
+ fileref="bsdinstall/bsdinstall-boot-loader-menu.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -855,7 +855,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>ѡ��װ���ʵ�ʹ�÷�ʽ</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-choose-mode"
+ <imagedata fileref="bsdinstall/bsdinstall-choose-mode.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -899,7 +899,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-keymap-select-default"
+ fileref="bsdinstall/bsdinstall-keymap-select-default.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -912,7 +912,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>����ѡ��˵�</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-config-keymap"
+ <imagedata fileref="bsdinstall/bsdinstall-config-keymap.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -939,7 +939,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>����������</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-config-hostname"
+ <imagedata fileref="bsdinstall/bsdinstall-config-hostname.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -961,7 +961,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-config-components"
+ fileref="bsdinstall/bsdinstall-config-components.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -1034,7 +1034,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-netinstall-files"
+ <imagedata fileref="bsdinstall/bsdinstall-netinstall-files.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -1051,7 +1051,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-netinstall-mirrorselect"
+ fileref="bsdinstall/bsdinstall-netinstall-mirrorselect.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -1076,7 +1076,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-part-guided-manual"
+ fileref="bsdinstall/bsdinstall-part-guided-manual.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -1092,7 +1092,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-part-guided-disk"
+ fileref="bsdinstall/bsdinstall-part-guided-disk.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -1111,7 +1111,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-part-entire-part"
+ fileref="bsdinstall/bsdinstall-part-entire-part.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -1129,7 +1129,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>����Ѵ�������</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-part-review"
+ <imagedata fileref="bsdinstall/bsdinstall-part-review.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -1147,7 +1147,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-part-manual-create"
+ fileref="bsdinstall/bsdinstall-part-manual-create.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -1163,7 +1163,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-part-manual-partscheme"
+ fileref="bsdinstall/bsdinstall-part-manual-partscheme.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -1244,7 +1244,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-part-manual-addpart"
+ fileref="bsdinstall/bsdinstall-part-manual-addpart.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -1398,7 +1398,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-final-confirmation"
+ fileref="bsdinstall/bsdinstall-final-confirmation.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -1426,7 +1426,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-distfile-fetching"
+ <imagedata fileref="bsdinstall/bsdinstall-distfile-fetching.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -1441,7 +1441,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-distfile-verifying"
+ fileref="bsdinstall/bsdinstall-distfile-verifying.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -1455,7 +1455,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-distfile-extracting"
+ fileref="bsdinstall/bsdinstall-distfile-extracting.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -1485,7 +1485,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-post-root-passwd"
+ fileref="bsdinstall/bsdinstall-post-root-passwd.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -1511,7 +1511,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-configure-network-interface"
+ fileref="bsdinstall/bsdinstall-configure-network-interface.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -1544,7 +1544,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-configure-wireless-scan"
+ fileref="bsdinstall/bsdinstall-configure-wireless-scan.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -1565,7 +1565,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-configure-wireless-accesspoints"
+ fileref="bsdinstall/bsdinstall-configure-wireless-accesspoints.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -1584,7 +1584,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-configure-wireless-wpa2setup"
+ fileref="bsdinstall/bsdinstall-configure-wireless-wpa2setup.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -1605,7 +1605,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-configure-network-interface-ipv4"
+ fileref="bsdinstall/bsdinstall-configure-network-interface-ipv4.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -1636,7 +1636,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-configure-network-interface-ipv4-dhcp"
+ fileref="bsdinstall/bsdinstall-configure-network-interface-ipv4-dhcp.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -1654,7 +1654,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-configure-network-interface-ipv4-static"
+ fileref="bsdinstall/bsdinstall-configure-network-interface-ipv4-static.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -1696,7 +1696,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-configure-network-interface-ipv6"
+ fileref="bsdinstall/bsdinstall-configure-network-interface-ipv6.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -1723,7 +1723,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-configure-network-interface-slaac"
+ fileref="bsdinstall/bsdinstall-configure-network-interface-slaac.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -1741,7 +1741,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-configure-network-interface-ipv6-static"
+ fileref="bsdinstall/bsdinstall-configure-network-interface-ipv6-static.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -1785,7 +1785,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-configure-network-ipv4-dns"
+ fileref="bsdinstall/bsdinstall-configure-network-ipv4-dns.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -1808,7 +1808,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-set-clock-local-utc"
+ fileref="bsdinstall/bsdinstall-set-clock-local-utc.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -1825,7 +1825,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-timezone-region"
+ <imagedata fileref="bsdinstall/bsdinstall-timezone-region.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -1839,7 +1839,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-timezone-country"
+ fileref="bsdinstall/bsdinstall-timezone-country.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -1852,7 +1852,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-timezone-zone"
+ <imagedata fileref="bsdinstall/bsdinstall-timezone-zone.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -1866,7 +1866,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-timezone-confirm"
+ fileref="bsdinstall/bsdinstall-timezone-confirm.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -1887,7 +1887,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-config-services"
+ <imagedata fileref="bsdinstall/bsdinstall-config-services.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -1934,7 +1934,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-config-crashdump"
+ fileref="bsdinstall/bsdinstall-config-crashdump.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -1957,7 +1957,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-adduser1"
+ <imagedata fileref="bsdinstall/bsdinstall-adduser1.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -1970,7 +1970,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-adduser2"
+ <imagedata fileref="bsdinstall/bsdinstall-adduser2.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -2063,7 +2063,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-adduser3"
+ <imagedata fileref="bsdinstall/bsdinstall-adduser3.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -2087,7 +2087,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-finalconfiguration"
+ fileref="bsdinstall/bsdinstall-finalconfiguration.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -2143,7 +2143,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-final-modification-shell"
+ fileref="bsdinstall/bsdinstall-final-modification-shell.png"
format="PNG"/>
</imageobject>
</mediaobject>
@@ -2160,7 +2160,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-mainexit"
+ <imagedata fileref="bsdinstall/bsdinstall-mainexit.png"
format="PNG"/>
</imageobject>
</mediaobject>
diff --git a/zh_CN.GB2312/books/handbook/geom/chapter.xml b/zh_CN.GB2312/books/handbook/geom/chapter.xml
index cbf6ca6033..92156cacaf 100644
--- a/zh_CN.GB2312/books/handbook/geom/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/geom/chapter.xml
@@ -128,7 +128,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="geom/striping" align="center"/>
+ <imagedata fileref="geom/striping.pic" align="center"/>
</imageobject>
<textobject>
diff --git a/zh_CN.GB2312/books/handbook/install/chapter.xml b/zh_CN.GB2312/books/handbook/install/chapter.xml
index c4c71e7c34..db5b64b06b 100644
--- a/zh_CN.GB2312/books/handbook/install/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/install/chapter.xml
@@ -863,7 +863,7 @@ Insert disk labelled "Kernel floppy 1" and press any key...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/boot-loader-menu" format="PNG"/>
+ <imagedata fileref="install/boot-loader-menu.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1028,7 +1028,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/config-country" format="PNG"/>
+ <imagedata fileref="install/config-country.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1043,7 +1043,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/config-keymap" format="PNG"/>
+ <imagedata fileref="install/config-keymap.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1053,7 +1053,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/sysinstall-exit" format="PNG"/>
+ <imagedata fileref="install/sysinstall-exit.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1099,7 +1099,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main1" format="PNG"/>
+ <imagedata fileref="install/main1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1115,7 +1115,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main-doc" format="PNG"/>
+ <imagedata fileref="install/main-doc.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1127,7 +1127,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/docmenu1" format="PNG"/>
+ <imagedata fileref="install/docmenu1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1155,7 +1155,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main-keymap" format="PNG"/>
+ <imagedata fileref="install/main-keymap.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1174,7 +1174,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/keymap" format="PNG"/>
+ <imagedata fileref="install/keymap.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1192,7 +1192,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main-options" format="PNG"/>
+ <imagedata fileref="install/main-options.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1202,7 +1202,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/options" format="PNG"/>
+ <imagedata fileref="install/options.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1233,7 +1233,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main-std" format="PNG"/>
+ <imagedata fileref="install/main-std.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1371,7 +1371,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/fdisk-drive1" format="PNG"/>
+ <imagedata fileref="install/fdisk-drive1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1428,7 +1428,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/fdisk-edit1" format="PNG"/>
+ <imagedata fileref="install/fdisk-edit1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1466,7 +1466,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/fdisk-edit2" format="PNG"/>
+ <imagedata fileref="install/fdisk-edit2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1507,7 +1507,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/boot-mgr" format="PNG"/>
+ <imagedata fileref="install/boot-mgr.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1534,7 +1534,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/fdisk-drive2" format="PNG"/>
+ <imagedata fileref="install/fdisk-drive2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1760,7 +1760,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-ed1" format="PNG"/>
+ <imagedata fileref="install/disklabel-ed1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1785,7 +1785,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-auto" format="PNG"/>
+ <imagedata fileref="install/disklabel-auto.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1810,7 +1810,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-root1" format="PNG"/>
+ <imagedata fileref="install/disklabel-root1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1827,7 +1827,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-root2" format="PNG"/>
+ <imagedata fileref="install/disklabel-root2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1842,7 +1842,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-fs" format="PNG"/>
+ <imagedata fileref="install/disklabel-fs.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1858,7 +1858,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-root3" format="PNG"/>
+ <imagedata fileref="install/disklabel-root3.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1878,7 +1878,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-ed2" format="PNG"/>
+ <imagedata fileref="install/disklabel-ed2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1922,7 +1922,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/dist-set" format="PNG"/>
+ <imagedata fileref="install/dist-set.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1971,7 +1971,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/dist-set2" format="PNG"/>
+ <imagedata fileref="install/dist-set2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2001,7 +2001,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/media" format="PNG"/>
+ <imagedata fileref="install/media.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2174,7 +2174,7 @@ installation menus to retry whichever operations have failed.
<mediaobject>
<imageobject>
- <imagedata fileref="install/ed0-conf" format="PNG"/>
+ <imagedata fileref="install/ed0-conf.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2213,7 +2213,7 @@ installation menus to retry whichever operations have failed.
<mediaobject>
<imageobject>
- <imagedata fileref="install/ed0-conf2" format="PNG"/>
+ <imagedata fileref="install/ed0-conf2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2376,7 +2376,7 @@ use the current settings.
<mediaobject>
<imageobject>
- <imagedata fileref="install/edit-inetd-conf" format="PNG"/>
+ <imagedata fileref="install/edit-inetd-conf.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2468,7 +2468,7 @@ use the current settings.
<mediaobject>
<imageobject>
- <imagedata fileref="install/ftp-anon1" format="PNG"/>
+ <imagedata fileref="install/ftp-anon1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2543,7 +2543,7 @@ use the current settings.
<mediaobject>
<imageobject>
- <imagedata fileref="install/ftp-anon2" format="PNG"/>
+ <imagedata fileref="install/ftp-anon2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2595,7 +2595,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/nfs-server-edit" format="PNG"/>
+ <imagedata fileref="install/nfs-server-edit.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2641,7 +2641,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/console-saver1" format="PNG"/>
+ <imagedata fileref="install/console-saver1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2655,7 +2655,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/console-saver2" format="PNG"/>
+ <imagedata fileref="install/console-saver2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2673,7 +2673,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/console-saver3" format="PNG"/>
+ <imagedata fileref="install/console-saver3.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2686,7 +2686,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/console-saver4" format="PNG"/>
+ <imagedata fileref="install/console-saver4.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2726,7 +2726,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/timezone1" format="PNG"/>
+ <imagedata fileref="install/timezone1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2738,7 +2738,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/timezone2" format="PNG"/>
+ <imagedata fileref="install/timezone2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2750,7 +2750,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/timezone3" format="PNG"/>
+ <imagedata fileref="install/timezone3.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2812,7 +2812,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse1" format="PNG"/>
+ <imagedata fileref="install/mouse1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2825,7 +2825,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse2" format="PNG"/>
+ <imagedata fileref="install/mouse2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2840,7 +2840,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse3" format="PNG"/>
+ <imagedata fileref="install/mouse3.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2853,7 +2853,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse4" format="PNG"/>
+ <imagedata fileref="install/mouse4.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2867,7 +2867,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse5" format="PNG"/>
+ <imagedata fileref="install/mouse5.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2881,7 +2881,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse6" format="PNG"/>
+ <imagedata fileref="install/mouse6.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2921,7 +2921,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/pkg-cat" format="PNG"/>
+ <imagedata fileref="install/pkg-cat.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2940,7 +2940,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/pkg-sel" format="PNG"/>
+ <imagedata fileref="install/pkg-sel.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2966,7 +2966,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/pkg-install" format="PNG"/>
+ <imagedata fileref="install/pkg-install.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2981,7 +2981,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/pkg-confirm" format="PNG"/>
+ <imagedata fileref="install/pkg-confirm.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3020,7 +3020,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/adduser1" format="PNG"/>
+ <imagedata fileref="install/adduser1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3033,7 +3033,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/adduser2" format="PNG"/>
+ <imagedata fileref="install/adduser2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3125,7 +3125,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/adduser3" format="PNG"/>
+ <imagedata fileref="install/adduser3.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3185,7 +3185,7 @@ Retype new password :</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/mainexit" format="PNG"/>
+ <imagedata fileref="install/mainexit.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3252,7 +3252,7 @@ Retype new password :</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/net-config-menu1" format="PNG"/>
+ <imagedata fileref="install/net-config-menu1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3314,7 +3314,7 @@ Retype new password :</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/mta-main" format="PNG"/>
+ <imagedata fileref="install/mta-main.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3362,7 +3362,7 @@ Retype new password :</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/ntp-config" format="PNG"/>
+ <imagedata fileref="install/ntp-config.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3384,7 +3384,7 @@ Retype new password :</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/net-config-menu2" format="PNG"/>
+ <imagedata fileref="install/net-config-menu2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
diff --git a/zh_CN.GB2312/books/handbook/mail/chapter.xml b/zh_CN.GB2312/books/handbook/mail/chapter.xml
index 4916e361fd..2a692321cf 100644
--- a/zh_CN.GB2312/books/handbook/mail/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/mail/chapter.xml
@@ -1713,7 +1713,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/mutt1" format="PNG"/>
+ <imagedata fileref="mail/mutt1.png" format="PNG"/>
</imageobject>
</mediaobject>
@@ -1723,7 +1723,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/mutt2" format="PNG"/>
+ <imagedata fileref="mail/mutt2.png" format="PNG"/>
</imageobject>
</mediaobject>
@@ -1756,7 +1756,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/mutt3" format="PNG"/>
+ <imagedata fileref="mail/mutt3.png" format="PNG"/>
</imageobject>
</mediaobject>
@@ -1801,7 +1801,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine1" format="PNG"/>
+ <imagedata fileref="mail/pine1.png" format="PNG"/>
</imageobject>
</mediaobject>
@@ -1819,7 +1819,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine2" format="PNG"/>
+ <imagedata fileref="mail/pine2.png" format="PNG"/>
</imageobject>
</mediaobject>
@@ -1829,7 +1829,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine3" format="PNG"/>
+ <imagedata fileref="mail/pine3.png" format="PNG"/>
</imageobject>
</mediaobject>
@@ -1840,7 +1840,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine4" format="PNG"/>
+ <imagedata fileref="mail/pine4.png" format="PNG"/>
</imageobject>
</mediaobject>
@@ -1856,7 +1856,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine5" format="PNG"/>
+ <imagedata fileref="mail/pine5.png" format="PNG"/>
</imageobject>
</mediaobject>
diff --git a/zh_CN.GB2312/books/handbook/vinum/chapter.xml b/zh_CN.GB2312/books/handbook/vinum/chapter.xml
index 9accce3d03..fccac5066a 100644
--- a/zh_CN.GB2312/books/handbook/vinum/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/vinum/chapter.xml
@@ -148,7 +148,7 @@
<para>
<figure id="vinum-concat">
<title>������֯</title>
- <graphic fileref="vinum/vinum-concat"/>
+ <graphic fileref="vinum/vinum-concat.pic"/>
</figure>
</para>
@@ -182,7 +182,7 @@
<para>
<figure id="vinum-striped">
<title>�ֶ���֯</title>
- <graphic fileref="vinum/vinum-striped"/>
+ <graphic fileref="vinum/vinum-striped.pic"/>
</figure>
</para>
</sect1>
@@ -246,7 +246,7 @@
<para>
<figure id="vinum-raid5-org">
<title>RAID-5 ����֯</title>
- <graphic fileref="vinum/vinum-raid5-org"/>
+ <graphic fileref="vinum/vinum-raid5-org.pic"/>
</figure>
</para>
@@ -490,7 +490,7 @@
<para>
<figure id="vinum-simple-vol">
<title>һ����Vinum ��</title>
- <graphic fileref="vinum/vinum-simple-vol"/>
+ <graphic fileref="vinum/vinum-simple-vol.pic"/>
</figure>
</para>
@@ -550,7 +550,7 @@
<para>
<figure id="vinum-mirrored-vol">
<title>���� Vinum ��</title>
- <graphic fileref="vinum/vinum-mirrored-vol"/>
+ <graphic fileref="vinum/vinum-mirrored-vol.pic"/>
</figure>
</para>
@@ -612,7 +612,7 @@
<para>
<figure id="vinum-striped-vol">
<title>�������� Vinum ��</title>
- <graphic fileref="vinum/vinum-striped-vol"/>
+ <graphic fileref="vinum/vinum-striped-vol.pic"/>
</figure>
</para>
@@ -654,7 +654,7 @@
<para>
<figure id="vinum-raid10-vol">
<title>������������ Vinum ��</title>
- <graphic fileref="vinum/vinum-raid10-vol"/>
+ <graphic fileref="vinum/vinum-raid10-vol.pic"/>
</figure>
</para>
</sect2>
diff --git a/zh_CN.GB2312/books/handbook/virtualization/chapter.xml b/zh_CN.GB2312/books/handbook/virtualization/chapter.xml
index 8565f6db12..9a0e7a3025 100644
--- a/zh_CN.GB2312/books/handbook/virtualization/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/virtualization/chapter.xml
@@ -102,7 +102,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd1"/>
+ <imagedata fileref="virtualization/parallels-freebsd1.png"/>
</imageobject>
</mediaobject>
@@ -111,25 +111,25 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd2"/>
+ <imagedata fileref="virtualization/parallels-freebsd2.png"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd3"/>
+ <imagedata fileref="virtualization/parallels-freebsd3.png"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd4"/>
+ <imagedata fileref="virtualization/parallels-freebsd4.png"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd5"/>
+ <imagedata fileref="virtualization/parallels-freebsd5.png"/>
</imageobject>
</mediaobject>
@@ -137,13 +137,13 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd6"/>
+ <imagedata fileref="virtualization/parallels-freebsd6.png"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd7"/>
+ <imagedata fileref="virtualization/parallels-freebsd7.png"/>
</imageobject>
</mediaobject>
@@ -151,13 +151,13 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd8"/>
+ <imagedata fileref="virtualization/parallels-freebsd8.png"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd9"/>
+ <imagedata fileref="virtualization/parallels-freebsd9.png"/>
</imageobject>
</mediaobject>
@@ -171,7 +171,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd11"/>
+ <imagedata fileref="virtualization/parallels-freebsd11.png"/>
</imageobject>
</mediaobject>
@@ -182,7 +182,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd10"/>
+ <imagedata fileref="virtualization/parallels-freebsd10.png"/>
</imageobject>
</mediaobject>
@@ -191,7 +191,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd12"/>
+ <imagedata fileref="virtualization/parallels-freebsd12.png"/>
</imageobject>
</mediaobject>
@@ -200,7 +200,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd13"/>
+ <imagedata fileref="virtualization/parallels-freebsd13.png"/>
</imageobject>
</mediaobject>
</sect3>
@@ -567,13 +567,13 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd1"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd1.png"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd2"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd2.png"/>
</imageobject>
</mediaobject>
@@ -582,7 +582,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd3"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd3.png"/>
</imageobject>
</mediaobject>
@@ -592,13 +592,13 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd4"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd4.png"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd5"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd5.png"/>
</imageobject>
</mediaobject>
@@ -606,7 +606,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd6"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd6.png"/>
</imageobject>
</mediaobject>
@@ -615,13 +615,13 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd7"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd7.png"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd8"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd8.png"/>
</imageobject>
</mediaobject>
@@ -636,13 +636,13 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd9"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd9.png"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd10"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd10.png"/>
</imageobject>
</mediaobject>
@@ -653,7 +653,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd11"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd11.png"/>
</imageobject>
</mediaobject>
@@ -664,7 +664,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd12"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd12.png"/>
</imageobject>
</mediaobject>
@@ -673,7 +673,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd13"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd13.png"/>
</imageobject>
</mediaobject>
</sect3>
@@ -747,7 +747,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd01"/>
+ <imagedata fileref="virtualization/vmware-freebsd01.png"/>
</imageobject>
</mediaobject>
@@ -756,7 +756,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd02"/>
+ <imagedata fileref="virtualization/vmware-freebsd02.png"/>
</imageobject>
</mediaobject>
@@ -767,7 +767,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd03"/>
+ <imagedata fileref="virtualization/vmware-freebsd03.png"/>
</imageobject>
</mediaobject>
@@ -775,7 +775,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd04"/>
+ <imagedata fileref="virtualization/vmware-freebsd04.png"/>
</imageobject>
</mediaobject>
@@ -783,7 +783,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd05"/>
+ <imagedata fileref="virtualization/vmware-freebsd05.png"/>
</imageobject>
</mediaobject>
@@ -791,7 +791,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd06"/>
+ <imagedata fileref="virtualization/vmware-freebsd06.png"/>
</imageobject>
</mediaobject>
@@ -799,7 +799,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd07"/>
+ <imagedata fileref="virtualization/vmware-freebsd07.png"/>
</imageobject>
</mediaobject>
@@ -808,7 +808,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd08"/>
+ <imagedata fileref="virtualization/vmware-freebsd08.png"/>
</imageobject>
</mediaobject>
@@ -820,7 +820,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd09"/>
+ <imagedata fileref="virtualization/vmware-freebsd09.png"/>
</imageobject>
</mediaobject>
@@ -828,7 +828,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd10"/>
+ <imagedata fileref="virtualization/vmware-freebsd10.png"/>
</imageobject>
</mediaobject>
@@ -837,7 +837,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd11"/>
+ <imagedata fileref="virtualization/vmware-freebsd11.png"/>
</imageobject>
</mediaobject>
@@ -850,7 +850,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd12"/>
+ <imagedata fileref="virtualization/vmware-freebsd12.png"/>
</imageobject>
</mediaobject>
diff --git a/zh_TW.Big5/books/developers-handbook/sockets/chapter.xml b/zh_TW.Big5/books/developers-handbook/sockets/chapter.xml
index aa2eed2c9f..c5a233f753 100644
--- a/zh_TW.Big5/books/developers-handbook/sockets/chapter.xml
+++ b/zh_TW.Big5/books/developers-handbook/sockets/chapter.xml
@@ -111,7 +111,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="sockets/layers"/>
+ <imagedata fileref="sockets/layers.eps"/>
</imageobject>
<textobject>
@@ -288,7 +288,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="sockets/slayers"/>
+ <imagedata fileref="sockets/slayers.eps"/>
</imageobject>
<textobject>
@@ -561,7 +561,7 @@ struct sockaddr_in {
<mediaobject>
<imageobject>
- <imagedata fileref="sockets/sain"/>
+ <imagedata fileref="sockets/sain.eps"/>
</imageobject>
<textobject>
@@ -605,7 +605,7 @@ struct sockaddr_in {
<mediaobject>
<imageobject>
- <imagedata fileref="sockets/sainfill"/>
+ <imagedata fileref="sockets/sainfill.eps"/>
</imageobject>
<textobject>
@@ -669,7 +669,7 @@ struct in_addr {
<mediaobject>
<imageobject>
- <imagedata fileref="sockets/sainlsb"/>
+ <imagedata fileref="sockets/sainlsb.eps"/>
</imageobject>
<textobject>
@@ -695,7 +695,7 @@ struct in_addr {
<mediaobject>
<imageobject>
- <imagedata fileref="sockets/sainmsb"/>
+ <imagedata fileref="sockets/sainmsb.eps"/>
</imageobject>
<textobject>
@@ -789,7 +789,7 @@ struct in_addr {
<mediaobject>
<imageobject>
- <imagedata fileref="sockets/sainlsb"/>
+ <imagedata fileref="sockets/sainlsb.eps"/>
</imageobject>
<textobject>
@@ -816,7 +816,7 @@ struct in_addr {
<mediaobject>
<imageobject>
- <imagedata fileref="sockets/sainmsb"/>
+ <imagedata fileref="sockets/sainmsb.eps"/>
</imageobject>
<textobject>
@@ -1072,7 +1072,7 @@ int bind(int s, const struct sockaddr *addr, socklen_t addrlen);
<mediaobject>
<imageobject>
- <imagedata fileref="sockets/sainserv"/>
+ <imagedata fileref="sockets/sainserv.eps"/>
</imageobject>
<textobject>
@@ -1334,7 +1334,7 @@ int main() {
<mediaobject>
<imageobject>
- <imagedata fileref="sockets/serv"/>
+ <imagedata fileref="sockets/serv.eps"/>
</imageobject>
<textobject>
@@ -1691,7 +1691,7 @@ struct servent * getservbyname(const char *name, const char *proto);
<mediaobject>
<imageobject>
- <imagedata fileref="sockets/serv2"/>
+ <imagedata fileref="sockets/serv2.eps"/>
</imageobject>
<textobject>
diff --git a/zh_TW.Big5/books/fdp-primer/sgml-markup/chapter.xml b/zh_TW.Big5/books/fdp-primer/sgml-markup/chapter.xml
index 90a6c91b93..6fbb9cac85 100644
--- a/zh_TW.Big5/books/fdp-primer/sgml-markup/chapter.xml
+++ b/zh_TW.Big5/books/fdp-primer/sgml-markup/chapter.xml
@@ -2370,14 +2370,14 @@ This is the file called 'foo2'</screen>
</itemizedlist>
<para>An example will probably make things easier to understand.
- Suppose you have an image, called <filename>fig1</filename>, that
+ Suppose you have an image, called <filename>fig1.png</filename>, that
you want to include in the document. This image is of a rectangle
with an A inside it. The markup for this would be as
follows.</para>
<programlisting><mediaobject>
<imageobject>
- <imagedata fileref="fig1"> <co id="co-image-ext"/>
+ <imagedata fileref="fig1.png"> <co id="co-image-ext"/>
</imageobject>
<textobject>
@@ -2483,7 +2483,7 @@ IMAGES+= fig3.png
<programlisting><mediaobject>
<imageobject>
- <imagedata fileref="chapter1/fig1"> <co id="co-image-dir"/>
+ <imagedata fileref="chapter1/fig1.png"> <co id="co-image-dir"/>
</imageobject>
…
diff --git a/zh_TW.Big5/books/handbook/advanced-networking/chapter.xml b/zh_TW.Big5/books/handbook/advanced-networking/chapter.xml
index ad4e269ce1..5e89d1dc37 100644
--- a/zh_TW.Big5/books/handbook/advanced-networking/chapter.xml
+++ b/zh_TW.Big5/books/handbook/advanced-networking/chapter.xml
@@ -280,7 +280,7 @@ host2.example.com link#1 UC 0 0
<mediaobject>
<imageobject>
- <imagedata fileref="advanced-networking/net-routing"/>
+ <imagedata fileref="advanced-networking/net-routing.pic"/>
</imageobject>
<textobject>
@@ -466,7 +466,7 @@ host2.example.com link#1 UC 0 0
<mediaobject>
<imageobject>
- <imagedata fileref="advanced-networking/static-routes"/>
+ <imagedata fileref="advanced-networking/static-routes.pic"/>
</imageobject>
<textobject>
@@ -4225,7 +4225,7 @@ cd /usr/src/etc; make distribution</programlisting>
<mediaobject>
<imageobject>
- <imagedata fileref="advanced-networking/isdn-bus"/>
+ <imagedata fileref="advanced-networking/isdn-bus.eps"/>
</imageobject>
<textobject>
@@ -4259,7 +4259,7 @@ ISDN BRI line</literallayout>
<mediaobject>
<imageobject>
- <imagedata fileref="advanced-networking/isdn-twisted-pair"/>
+ <imagedata fileref="advanced-networking/isdn-twisted-pair.eps"/>
</imageobject>
<textobject>
@@ -4362,7 +4362,7 @@ ISDN BRI line</literallayout>
<mediaobject>
<imageobject>
- <imagedata fileref="advanced-networking/natd"/>
+ <imagedata fileref="advanced-networking/natd.eps"/>
</imageobject>
<textobject>
diff --git a/zh_TW.Big5/books/handbook/basics/chapter.xml b/zh_TW.Big5/books/handbook/basics/chapter.xml
index e4e1e89f85..09bd98f966 100644
--- a/zh_TW.Big5/books/handbook/basics/chapter.xml
+++ b/zh_TW.Big5/books/handbook/basics/chapter.xml
@@ -906,7 +906,7 @@ total 530
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir1" format="EPS"/>
+ <imagedata fileref="install/example-dir1.eps" format="EPS"/>
</imageobject>
<textobject>
@@ -926,7 +926,7 @@ total 530
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir2" format="EPS"/>
+ <imagedata fileref="install/example-dir2.eps" format="EPS"/>
</imageobject>
<textobject>
@@ -954,7 +954,7 @@ total 530
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir3" format="EPS"/>
+ <imagedata fileref="install/example-dir3.eps" format="EPS"/>
</imageobject>
<textobject>
@@ -980,7 +980,7 @@ total 530
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir4" format="EPS"/>
+ <imagedata fileref="install/example-dir4.eps" format="EPS"/>
</imageobject>
<textobject>
@@ -1005,7 +1005,7 @@ total 530
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir5" format="EPS"/>
+ <imagedata fileref="install/example-dir5.eps" format="EPS"/>
</imageobject>
<textobject>
@@ -1292,7 +1292,7 @@ total 530
<mediaobject>
<imageobject>
- <imagedata fileref="install/disk-layout" format="EPS"/>
+ <imagedata fileref="install/disk-layout.eps" format="EPS"/>
</imageobject>
<textobject>
diff --git a/zh_TW.Big5/books/handbook/geom/chapter.xml b/zh_TW.Big5/books/handbook/geom/chapter.xml
index a5dcddefe2..af676b6e24 100644
--- a/zh_TW.Big5/books/handbook/geom/chapter.xml
+++ b/zh_TW.Big5/books/handbook/geom/chapter.xml
@@ -124,7 +124,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="geom/striping" align="center"/>
+ <imagedata fileref="geom/striping.pic" align="center"/>
</imageobject>
<textobject>
diff --git a/zh_TW.Big5/books/handbook/install/chapter.xml b/zh_TW.Big5/books/handbook/install/chapter.xml
index a3e7a65571..106c768d1a 100644
--- a/zh_TW.Big5/books/handbook/install/chapter.xml
+++ b/zh_TW.Big5/books/handbook/install/chapter.xml
@@ -864,7 +864,7 @@ Insert disk labelled "Kernel floppy 1" and press any key...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/boot-loader-menu" format="PNG"/>
+ <imagedata fileref="install/boot-loader-menu.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1079,7 +1079,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/config-country" format="PNG"/>
+ <imagedata fileref="install/config-country.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1089,7 +1089,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/sysinstall-exit" format="PNG"/>
+ <imagedata fileref="install/sysinstall-exit.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1138,7 +1138,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main1" format="PNG"/>
+ <imagedata fileref="install/main1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1154,7 +1154,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main-doc" format="PNG"/>
+ <imagedata fileref="install/main-doc.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1166,7 +1166,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/docmenu1" format="PNG"/>
+ <imagedata fileref="install/docmenu1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1195,7 +1195,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main-keymap" format="PNG"/>
+ <imagedata fileref="install/main-keymap.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1215,7 +1215,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/keymap" format="PNG"/>
+ <imagedata fileref="install/keymap.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1233,7 +1233,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main-options" format="PNG"/>
+ <imagedata fileref="install/main-options.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1243,7 +1243,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/options" format="PNG"/>
+ <imagedata fileref="install/options.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1273,7 +1273,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main-std" format="PNG"/>
+ <imagedata fileref="install/main-std.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1417,7 +1417,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/fdisk-drive1" format="PNG"/>
+ <imagedata fileref="install/fdisk-drive1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1474,7 +1474,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/fdisk-edit1" format="PNG"/>
+ <imagedata fileref="install/fdisk-edit1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1509,7 +1509,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/fdisk-edit2" format="PNG"/>
+ <imagedata fileref="install/fdisk-edit2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1548,7 +1548,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/boot-mgr" format="PNG"/>
+ <imagedata fileref="install/boot-mgr.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1575,7 +1575,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/fdisk-drive2" format="PNG"/>
+ <imagedata fileref="install/fdisk-drive2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1793,7 +1793,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-ed1" format="PNG"/>
+ <imagedata fileref="install/disklabel-ed1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1815,7 +1815,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-auto" format="PNG"/>
+ <imagedata fileref="install/disklabel-auto.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1848,7 +1848,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-root1" format="PNG"/>
+ <imagedata fileref="install/disklabel-root1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1864,7 +1864,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-root2" format="PNG"/>
+ <imagedata fileref="install/disklabel-root2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1879,7 +1879,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-fs" format="PNG"/>
+ <imagedata fileref="install/disklabel-fs.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1895,7 +1895,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-root3" format="PNG"/>
+ <imagedata fileref="install/disklabel-root3.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1914,7 +1914,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-ed2" format="PNG"/>
+ <imagedata fileref="install/disklabel-ed2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1957,7 +1957,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/dist-set" format="PNG"/>
+ <imagedata fileref="install/dist-set.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2004,7 +2004,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/dist-set2" format="PNG"/>
+ <imagedata fileref="install/dist-set2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2034,7 +2034,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/media" format="PNG"/>
+ <imagedata fileref="install/media.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2207,7 +2207,7 @@ installation menus to retry whichever operations have failed.
<mediaobject>
<imageobject>
- <imagedata fileref="install/ed0-conf" format="PNG"/>
+ <imagedata fileref="install/ed0-conf.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2249,7 +2249,7 @@ installation menus to retry whichever operations have failed.
<mediaobject>
<imageobject>
- <imagedata fileref="install/ed0-conf2" format="PNG"/>
+ <imagedata fileref="install/ed0-conf2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2421,7 +2421,7 @@ use the current settings.
<mediaobject>
<imageobject>
- <imagedata fileref="install/edit-inetd-conf" format="PNG"/>
+ <imagedata fileref="install/edit-inetd-conf.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2489,7 +2489,7 @@ use the current settings.
<mediaobject>
<imageobject>
- <imagedata fileref="install/ftp-anon1" format="PNG"/>
+ <imagedata fileref="install/ftp-anon1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2539,7 +2539,7 @@ Upload subdirectory:
<mediaobject>
<imageobject>
- <imagedata fileref="install/ftp-anon2" format="PNG"/>
+ <imagedata fileref="install/ftp-anon2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2596,7 +2596,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/nfs-server-edit" format="PNG"/>
+ <imagedata fileref="install/nfs-server-edit.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2646,7 +2646,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/console-saver1" format="PNG"/>
+ <imagedata fileref="install/console-saver1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2660,7 +2660,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/console-saver2" format="PNG"/>
+ <imagedata fileref="install/console-saver2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2680,7 +2680,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/console-saver3" format="PNG"/>
+ <imagedata fileref="install/console-saver3.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2694,7 +2694,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/console-saver4" format="PNG"/>
+ <imagedata fileref="install/console-saver4.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2738,7 +2738,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/timezone1" format="PNG"/>
+ <imagedata fileref="install/timezone1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2751,7 +2751,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/timezone2" format="PNG"/>
+ <imagedata fileref="install/timezone2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2764,7 +2764,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/timezone3" format="PNG"/>
+ <imagedata fileref="install/timezone3.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2824,7 +2824,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse1" format="PNG"/>
+ <imagedata fileref="install/mouse1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2837,7 +2837,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse2" format="PNG"/>
+ <imagedata fileref="install/mouse2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2852,7 +2852,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse3" format="PNG"/>
+ <imagedata fileref="install/mouse3.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2865,7 +2865,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse4" format="PNG"/>
+ <imagedata fileref="install/mouse4.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2879,7 +2879,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse5" format="PNG"/>
+ <imagedata fileref="install/mouse5.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2895,7 +2895,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse6" format="PNG"/>
+ <imagedata fileref="install/mouse6.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2940,7 +2940,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/pkg-cat" format="PNG"/>
+ <imagedata fileref="install/pkg-cat.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2961,7 +2961,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/pkg-sel" format="PNG"/>
+ <imagedata fileref="install/pkg-sel.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -2988,7 +2988,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/pkg-install" format="PNG"/>
+ <imagedata fileref="install/pkg-install.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3002,7 +3002,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/pkg-confirm" format="PNG"/>
+ <imagedata fileref="install/pkg-confirm.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3042,7 +3042,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/adduser1" format="PNG"/>
+ <imagedata fileref="install/adduser1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3055,7 +3055,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/adduser2" format="PNG"/>
+ <imagedata fileref="install/adduser2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3155,7 +3155,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/adduser3" format="PNG"/>
+ <imagedata fileref="install/adduser3.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3221,7 +3221,7 @@ Retype new password :</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/mainexit" format="PNG"/>
+ <imagedata fileref="install/mainexit.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3288,7 +3288,7 @@ Retype new password :</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/net-config-menu1" format="PNG"/>
+ <imagedata fileref="install/net-config-menu1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3355,7 +3355,7 @@ Retype new password :</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/mta-main" format="PNG"/>
+ <imagedata fileref="install/mta-main.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3409,7 +3409,7 @@ Retype new password :</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/ntp-config" format="PNG"/>
+ <imagedata fileref="install/ntp-config.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -3435,7 +3435,7 @@ Retype new password :</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/net-config-menu2" format="PNG"/>
+ <imagedata fileref="install/net-config-menu2.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
diff --git a/zh_TW.Big5/books/handbook/mail/chapter.xml b/zh_TW.Big5/books/handbook/mail/chapter.xml
index fe4683e079..706fb1cb7a 100644
--- a/zh_TW.Big5/books/handbook/mail/chapter.xml
+++ b/zh_TW.Big5/books/handbook/mail/chapter.xml
@@ -1956,7 +1956,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/mutt1" format="PNG"/>
+ <imagedata fileref="mail/mutt1.png" format="PNG"/>
</imageobject>
</mediaobject>
@@ -1967,7 +1967,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/mutt2" format="PNG"/>
+ <imagedata fileref="mail/mutt2.png" format="PNG"/>
</imageobject>
</mediaobject>
@@ -2003,7 +2003,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/mutt3" format="PNG"/>
+ <imagedata fileref="mail/mutt3.png" format="PNG"/>
</imageobject>
</mediaobject>
@@ -2052,7 +2052,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine1" format="PNG"/>
+ <imagedata fileref="mail/pine1.png" format="PNG"/>
</imageobject>
</mediaobject>
@@ -2070,7 +2070,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine2" format="PNG"/>
+ <imagedata fileref="mail/pine2.png" format="PNG"/>
</imageobject>
</mediaobject>
@@ -2081,7 +2081,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine3" format="PNG"/>
+ <imagedata fileref="mail/pine3.png" format="PNG"/>
</imageobject>
</mediaobject>
@@ -2094,7 +2094,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine4" format="PNG"/>
+ <imagedata fileref="mail/pine4.png" format="PNG"/>
</imageobject>
</mediaobject>
@@ -2111,7 +2111,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine5" format="PNG"/>
+ <imagedata fileref="mail/pine5.png" format="PNG"/>
</imageobject>
</mediaobject>
diff --git a/zh_TW.Big5/books/handbook/security/chapter.xml b/zh_TW.Big5/books/handbook/security/chapter.xml
index bc48598f6d..e69dd616da 100644
--- a/zh_TW.Big5/books/handbook/security/chapter.xml
+++ b/zh_TW.Big5/books/handbook/security/chapter.xml
@@ -3373,7 +3373,7 @@ options IPSEC_DEBUG #debug for IP security
<mediaobject>
<imageobject>
- <imagedata fileref="security/ipsec-network" align="center"/>
+ <imagedata fileref="security/ipsec-network.pic" align="center"/>
</imageobject>
<textobject>
@@ -3873,7 +3873,7 @@ ipfw add 1 allow udp from W.X.Y.Z to A.B.C.D isakmp
<mediaobject>
<imageobject>
- <imagedata fileref="security/ipsec-out-pkt" align="center"/>
+ <imagedata fileref="security/ipsec-out-pkt.pic" align="center"/>
</imageobject>
<textobject>
@@ -3893,7 +3893,7 @@ ipfw add 1 allow udp from W.X.Y.Z to A.B.C.D isakmp
<mediaobject>
<imageobject>
- <imagedata fileref="security/ipsec-encap-pkt" align="center"/>
+ <imagedata fileref="security/ipsec-encap-pkt.pic" align="center"/>
</imageobject>
<textobject>
@@ -4027,7 +4027,7 @@ ipfw add 1 allow ipencap from W.X.Y.Z to A.B.C.D
<mediaobject>
<imageobject>
- <imagedata fileref="security/ipsec-crypt-pkt" align="center"/>
+ <imagedata fileref="security/ipsec-crypt-pkt.pic" align="center"/>
</imageobject>
<textobject>
diff --git a/zh_TW.Big5/books/handbook/vinum/chapter.xml b/zh_TW.Big5/books/handbook/vinum/chapter.xml
index 1e8a1cc888..1538781c3f 100644
--- a/zh_TW.Big5/books/handbook/vinum/chapter.xml
+++ b/zh_TW.Big5/books/handbook/vinum/chapter.xml
@@ -160,7 +160,7 @@ disk storage, and an introduction to the Vinum Volume Manager.</para>
<para>
<figure id="vinum-concat">
<title>Concatenated Organization</title>
- <graphic fileref="vinum/vinum-concat"/>
+ <graphic fileref="vinum/vinum-concat.pic"/>
</figure>
</para>
@@ -199,7 +199,7 @@ disk storage, and an introduction to the Vinum Volume Manager.</para>
<para>
<figure id="vinum-striped">
<title>Striped Organization</title>
- <graphic fileref="vinum/vinum-striped"/>
+ <graphic fileref="vinum/vinum-striped.pic"/>
</figure>
</para>
</sect1>
@@ -269,7 +269,7 @@ disk storage, and an introduction to the Vinum Volume Manager.</para>
<para>
<figure id="vinum-raid5-org">
<title>RAID-5 Organization</title>
- <graphic fileref="vinum/vinum-raid5-org"/>
+ <graphic fileref="vinum/vinum-raid5-org.pic"/>
</figure>
</para>
@@ -545,7 +545,7 @@ disk storage, and an introduction to the Vinum Volume Manager.</para>
<para>
<figure id="vinum-simple-vol">
<title>A Simple Vinum Volume</title>
- <graphic fileref="vinum/vinum-simple-vol"/>
+ <graphic fileref="vinum/vinum-simple-vol.pic"/>
</figure>
</para>
@@ -613,7 +613,7 @@ disk storage, and an introduction to the Vinum Volume Manager.</para>
<para>
<figure id="vinum-mirrored-vol">
<title>A Mirrored Vinum Volume</title>
- <graphic fileref="vinum/vinum-mirrored-vol"/>
+ <graphic fileref="vinum/vinum-mirrored-vol.pic"/>
</figure>
</para>
@@ -680,7 +680,7 @@ disk storage, and an introduction to the Vinum Volume Manager.</para>
<para>
<figure id="vinum-striped-vol">
<title>A Striped Vinum Volume</title>
- <graphic fileref="vinum/vinum-striped-vol"/>
+ <graphic fileref="vinum/vinum-striped-vol.pic"/>
</figure>
</para>
@@ -724,7 +724,7 @@ disk storage, and an introduction to the Vinum Volume Manager.</para>
<para>
<figure id="vinum-raid10-vol">
<title>A Mirrored, Striped Vinum Volume</title>
- <graphic fileref="vinum/vinum-raid10-vol"/>
+ <graphic fileref="vinum/vinum-raid10-vol.pic"/>
</figure>
</para>
</sect2>
diff --git a/zh_TW.Big5/books/handbook/virtualization/chapter.xml b/zh_TW.Big5/books/handbook/virtualization/chapter.xml
index 5601b4b410..80e62ae3d3 100644
--- a/zh_TW.Big5/books/handbook/virtualization/chapter.xml
+++ b/zh_TW.Big5/books/handbook/virtualization/chapter.xml
@@ -100,7 +100,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd1"/>
+ <imagedata fileref="virtualization/parallels-freebsd1.png"/>
</imageobject>
</mediaobject>
@@ -110,25 +110,25 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd2"/>
+ <imagedata fileref="virtualization/parallels-freebsd2.png"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd3"/>
+ <imagedata fileref="virtualization/parallels-freebsd3.png"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd4"/>
+ <imagedata fileref="virtualization/parallels-freebsd4.png"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd5"/>
+ <imagedata fileref="virtualization/parallels-freebsd5.png"/>
</imageobject>
</mediaobject>
@@ -136,13 +136,13 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd6"/>
+ <imagedata fileref="virtualization/parallels-freebsd6.png"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd7"/>
+ <imagedata fileref="virtualization/parallels-freebsd7.png"/>
</imageobject>
</mediaobject>
@@ -150,13 +150,13 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd8"/>
+ <imagedata fileref="virtualization/parallels-freebsd8.png"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd9"/>
+ <imagedata fileref="virtualization/parallels-freebsd9.png"/>
</imageobject>
</mediaobject>
@@ -170,7 +170,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd11"/>
+ <imagedata fileref="virtualization/parallels-freebsd11.png"/>
</imageobject>
</mediaobject>
@@ -180,7 +180,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd10"/>
+ <imagedata fileref="virtualization/parallels-freebsd10.png"/>
</imageobject>
</mediaobject>
@@ -191,7 +191,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd12"/>
+ <imagedata fileref="virtualization/parallels-freebsd12.png"/>
</imageobject>
</mediaobject>
@@ -199,7 +199,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd13"/>
+ <imagedata fileref="virtualization/parallels-freebsd13.png"/>
</imageobject>
</mediaobject>
</sect3>
@@ -560,13 +560,13 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd1"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd1.png"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd2"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd2.png"/>
</imageobject>
</mediaobject>
@@ -575,7 +575,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd3"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd3.png"/>
</imageobject>
</mediaobject>
@@ -585,13 +585,13 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd4"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd4.png"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd5"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd5.png"/>
</imageobject>
</mediaobject>
@@ -599,7 +599,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd6"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd6.png"/>
</imageobject>
</mediaobject>
@@ -608,13 +608,13 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd7"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd7.png"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd8"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd8.png"/>
</imageobject>
</mediaobject>
@@ -630,13 +630,13 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd9"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd9.png"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd10"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd10.png"/>
</imageobject>
</mediaobject>
@@ -647,7 +647,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd11"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd11.png"/>
</imageobject>
</mediaobject>
@@ -657,7 +657,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd12"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd12.png"/>
</imageobject>
</mediaobject>
@@ -666,7 +666,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd13"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd13.png"/>
</imageobject>
</mediaobject>
</sect3>
@@ -736,7 +736,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd01"/>
+ <imagedata fileref="virtualization/vmware-freebsd01.png"/>
</imageobject>
</mediaobject>
@@ -745,7 +745,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd02"/>
+ <imagedata fileref="virtualization/vmware-freebsd02.png"/>
</imageobject>
</mediaobject>
@@ -758,7 +758,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd03"/>
+ <imagedata fileref="virtualization/vmware-freebsd03.png"/>
</imageobject>
</mediaobject>
@@ -766,7 +766,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd04"/>
+ <imagedata fileref="virtualization/vmware-freebsd04.png"/>
</imageobject>
</mediaobject>
@@ -774,7 +774,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd05"/>
+ <imagedata fileref="virtualization/vmware-freebsd05.png"/>
</imageobject>
</mediaobject>
@@ -782,7 +782,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd06"/>
+ <imagedata fileref="virtualization/vmware-freebsd06.png"/>
</imageobject>
</mediaobject>
@@ -790,7 +790,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd07"/>
+ <imagedata fileref="virtualization/vmware-freebsd07.png"/>
</imageobject>
</mediaobject>
@@ -799,7 +799,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd08"/>
+ <imagedata fileref="virtualization/vmware-freebsd08.png"/>
</imageobject>
</mediaobject>
@@ -811,7 +811,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd09"/>
+ <imagedata fileref="virtualization/vmware-freebsd09.png"/>
</imageobject>
</mediaobject>
@@ -819,7 +819,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd10"/>
+ <imagedata fileref="virtualization/vmware-freebsd10.png"/>
</imageobject>
</mediaobject>
@@ -827,7 +827,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd11"/>
+ <imagedata fileref="virtualization/vmware-freebsd11.png"/>
</imageobject>
</mediaobject>
@@ -839,7 +839,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd12"/>
+ <imagedata fileref="virtualization/vmware-freebsd12.png"/>
</imageobject>
</mediaobject>
From 44368e58596a7eb01d4129273fa9a1fe55d6f8a0 Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Thu, 14 Mar 2013 10:25:23 +0000
Subject: [PATCH 078/121] - Add support for Schematron validation - Add a
simple Schematron file that validates file references - Silence the output of
validation so that the result be more readable
---
share/mk/doc.docbook.mk | 40 +++++++++++++++++++++++++++++++++++++---
share/xml/freebsd.sch | 11 +++++++++++
2 files changed, 48 insertions(+), 3 deletions(-)
create mode 100644 share/xml/freebsd.sch
diff --git a/share/mk/doc.docbook.mk b/share/mk/doc.docbook.mk
index 83a255e2ce..da8f4bf56d 100644
--- a/share/mk/doc.docbook.mk
+++ b/share/mk/doc.docbook.mk
@@ -85,8 +85,12 @@ XSLXHTMLCHUNK?= ${DOC_PREFIX}/${LANGCODE}/share/xsl/freebsd-xhtml-chunk.xsl
XSLEPUB?= ${DOC_PREFIX}/${LANGCODE}/share/xsl/freebsd-epub.xsl
XSLFO?= ${DOC_PREFIX}/${LANGCODE}/share/xsl/freebsd-fo.xsl
+XSLSCH?= /usr/local/share/xsl/iso-schematron/xslt1/iso_schematron_skeleton_for_xslt1.xsl
+
IMAGES_LIB?=
+SCHEMATRONS?= ${DOC_PREFIX}/share/xml/freebsd.sch
+
.if exists(${PREFIX}/bin/jade) && !defined(OPENJADE)
JADECATALOG?= ${PREFIX}/share/sgml/jade/catalog
.else
@@ -332,6 +336,15 @@ NO_RTF= yes
.endif
.endfor
+.if defined(SCHEMATRONS)
+.for sch in ${SCHEMATRONS}
+schxslts+= ${sch}.xsl
+
+${sch}.xsl: ${sch}
+ ${XSLTPROC} ${XSLSCH} ${.ALLSRC} > ${.TARGET}
+.endfor
+.endif
+
# Parsed XML -------------------------------------------------------
${DOC}.parsed.xml: ${SRCS}
@@ -341,6 +354,7 @@ ${DOC}.parsed.xml: ${SRCS}
.else
${ECHO_CMD} '<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN" "../../../share/xml/freebsd45.dtd">' >> ${.TARGET}
.endif
+ @${ECHO} "==> Basic validation"
${XMLLINT} --nonet --noent --valid --xinclude --dropdtd ${MASTERDOC} | \
${GREP} -v '^<?xml version=.*?>' >> ${.TARGET}
@@ -547,9 +561,29 @@ ${DOC}.${_curformat}:
# having to convert it to any other formats
#
-lint validate: ${SRCS}
- ${XMLLINT} --nonet --noout --noent --valid ${MASTERDOC}
- @${RM} -rf ${CLEANFILES} ${CLEANDIRS}
+#
+# XXX: There is duplicated code below. In general, we want to see what
+# is actually run but when validation is executed, it is better to
+# silence the command invocation so that only error messages appear.
+#
+
+lint validate: ${SRCS} ${schxslts}
+ @${GREP} '^<?xml version=.*?>' ${DOC}.xml > ${DOC}.parsed.xml
+.if ${DOC} == "book"
+ @${ECHO_CMD} '<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN" "../../../share/xml/freebsd45.dtd">' >> ${DOC}.parsed.xml
+.else
+ @${ECHO_CMD} '<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN" "../../../share/xml/freebsd45.dtd">' >> ${DOC}.parsed.xml
+.endif
+ @${ECHO} "==> Basic validation"
+ @${XMLLINT} --nonet --noent --valid --xinclude --dropdtd ${MASTERDOC} | \
+ ${GREP} -v '^<?xml version=.*?>' >>${DOC}.parsed.xml
+.if defined(schxslts)
+ @${ECHO} "==> Validating with Schematron constraints"
+.for sch in ${schxslts}
+ @${XSLTPROC} ${sch} ${DOC}.parsed.xml
+.endfor
+.endif
+ @${RM} -rf ${CLEANFILES} ${CLEANDIRS} ${DOC}.parsed.xml
# ------------------------------------------------------------------------
#
diff --git a/share/xml/freebsd.sch b/share/xml/freebsd.sch
new file mode 100644
index 0000000000..f67995f02e
--- /dev/null
+++ b/share/xml/freebsd.sch
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+
+<!-- $FreeBSD$ -->
+
+<schema xmlns="http://purl.oclc.org/dsdl/schematron">
+ <pattern name="Check file reference validity">
+ <rule context="//*/@fileref">
+ <assert test="contains(., '.')">File reference does not have an extension.</assert>
+ </rule>
+ </pattern>
+</schema>
From be2bbeeff4db55ad932946cd8226d7100eae72bb Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Thu, 14 Mar 2013 20:36:44 +0000
Subject: [PATCH 079/121] - Add support for the svnref element
---
share/misc/docbook.css | 2 +-
share/xsl/freebsd-xhtml-common.xsl | 13 +++++++++++--
2 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/share/misc/docbook.css b/share/misc/docbook.css
index a173736976..9f28311acb 100644
--- a/share/misc/docbook.css
+++ b/share/misc/docbook.css
@@ -134,7 +134,7 @@ html {
color: #007a00;
}
-svnref {
+.svnref {
color: #007a00;
}
diff --git a/share/xsl/freebsd-xhtml-common.xsl b/share/xsl/freebsd-xhtml-common.xsl
index a4507b330b..b92885c8cd 100644
--- a/share/xsl/freebsd-xhtml-common.xsl
+++ b/share/xsl/freebsd-xhtml-common.xsl
@@ -29,8 +29,17 @@
For questions about this documentation, e-mail <<a href="mailto:doc@FreeBSD.org">doc@FreeBSD.org</a>>.</small></p>
</xsl:template>
- <xsl:template match="hostid|username|groupname|devicename|maketarget|makevar">
- <xsl:call-template name="inline.monoseq"/>
+ <xsl:template match="svnref">
+ <a>
+ <xsl:attribute name="href">
+ <xsl:text>http://svnweb.freebsd.org/base?view=revision&revision=</xsl:text>
+ <xsl:value-of select="."/>
+ </xsl:attribute>
+
+ <span class="svnref">
+ <xsl:value-of select="."/>
+ </span>
+ </a>
</xsl:template>
<xsl:template name="generate.citerefentry.link">
From f6c79f1bc88705e4d81eadb9b7f56ab2bd994c52 Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Thu, 14 Mar 2013 20:51:01 +0000
Subject: [PATCH 080/121] - Change screenco to screen + co since the former is
not supported properly with xsltproc and the latter is simpler - Add a
constraint to prevent using screenco, programlistingco and graphicco in the
future - Note that mediaobjectco is used in the documentation to properly
compose a figure element but the callout bugs are already there in the
source image and not placed there by the stylesheets
---
de_DE.ISO8859-1/books/handbook/bsdinstall/chapter.xml | 11 ++---------
de_DE.ISO8859-1/books/handbook/install/chapter.xml | 11 ++---------
el_GR.ISO8859-7/books/handbook/bsdinstall/chapter.xml | 11 ++---------
el_GR.ISO8859-7/books/handbook/install/chapter.xml | 11 ++---------
en_US.ISO8859-1/books/handbook/bsdinstall/chapter.xml | 11 ++---------
en_US.ISO8859-1/books/handbook/install/chapter.xml | 11 ++---------
es_ES.ISO8859-1/books/handbook/install/chapter.xml | 11 ++---------
fr_FR.ISO8859-1/books/handbook/install/chapter.xml | 11 ++---------
hu_HU.ISO8859-2/books/handbook/install/chapter.xml | 11 ++---------
ja_JP.eucJP/books/handbook/bsdinstall/chapter.xml | 11 ++---------
ja_JP.eucJP/books/handbook/install/chapter.xml | 11 ++---------
mn_MN.UTF-8/books/handbook/bsdinstall/chapter.xml | 11 ++---------
mn_MN.UTF-8/books/handbook/install/chapter.xml | 11 ++---------
nl_NL.ISO8859-1/books/handbook/install/chapter.xml | 11 ++---------
ru_RU.KOI8-R/books/handbook/bsdinstall/chapter.xml | 11 ++---------
ru_RU.KOI8-R/books/handbook/install/chapter.xml | 11 ++---------
share/xml/freebsd.sch | 11 +++++++++++
zh_CN.GB2312/books/handbook/bsdinstall/chapter.xml | 11 ++---------
zh_CN.GB2312/books/handbook/install/chapter.xml | 11 ++---------
zh_TW.Big5/books/handbook/install/chapter.xml | 11 ++---------
20 files changed, 49 insertions(+), 171 deletions(-)
diff --git a/de_DE.ISO8859-1/books/handbook/bsdinstall/chapter.xml b/de_DE.ISO8859-1/books/handbook/bsdinstall/chapter.xml
index 7a9093a649..f26de3f3aa 100644
--- a/de_DE.ISO8859-1/books/handbook/bsdinstall/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/bsdinstall/chapter.xml
@@ -798,14 +798,8 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</screen>
role="Programmable Read Only Memory">PROM</acronym>
Befehlszeile zu gelangen. Es sieht dann so aus:</para>
- <screenco>
- <areaspec>
- <area id="bsdinstall-prompt-single" coords="1 5"/>
- <area id="bsdinstall-prompt-smp" coords="2 5"/>
- </areaspec>
-
- <screen><prompt>ok </prompt>
-<prompt>ok {0} </prompt></screen>
+ <screen><prompt>ok </prompt><co id="bsdinstall-prompt-single"/>
+<prompt>ok {0} </prompt><co id="bsdinstall-prompt-smp"/></screen>
<calloutlist>
<callout arearefs="bsdinstall-prompt-single">
@@ -818,7 +812,6 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</screen>
Die Zahl gibt die Nummer der aktiven CPU an.</para>
</callout>
</calloutlist>
- </screenco>
<para>An dieser Eingabeaufforderung angekommen, legen Sie nun
die CD-ROM in Ihr Laufwerk und geben Sie
diff --git a/de_DE.ISO8859-1/books/handbook/install/chapter.xml b/de_DE.ISO8859-1/books/handbook/install/chapter.xml
index 496d37d0ba..248a075302 100644
--- a/de_DE.ISO8859-1/books/handbook/install/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/install/chapter.xml
@@ -1155,14 +1155,8 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</screen>
Programmen &man.tip.1; oder &man.cu.1;). In beiden F�llen
landen Sie anschlie�end am PROM-Prompt:</para>
- <screenco>
- <areaspec>
- <area id="prompt-single" coords="1 5"/>
- <area id="prompt-smp" coords="2 5"/>
- </areaspec>
-
- <screen><prompt>ok </prompt>
-<prompt>ok {0} </prompt></screen>
+ <screen><prompt>ok </prompt><co id="prompt-single"/>
+<prompt>ok {0} </prompt><co id="prompt-smp"/></screen>
<calloutlist>
<callout arearefs="prompt-single">
@@ -1174,7 +1168,6 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</screen>
dabei f�r die Anzahl der vorhandenen Prozessoren.</para>
</callout>
</calloutlist>
- </screenco>
<para>Nun legen Sie Ihre CD-ROM in das Laufwerk ein und geben am
PROM-Prompt <command>boot cdrom</command> ein. Danach startet Ihr
diff --git a/el_GR.ISO8859-7/books/handbook/bsdinstall/chapter.xml b/el_GR.ISO8859-7/books/handbook/bsdinstall/chapter.xml
index 6d01ce27a6..d6e1b31d76 100644
--- a/el_GR.ISO8859-7/books/handbook/bsdinstall/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/bsdinstall/chapter.xml
@@ -766,14 +766,8 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</screen>
role="Programmable Read Only Memory">PROM</acronym> � �����
������� �� ��� ��������:</para>
- <screenco>
- <areaspec>
- <area id="bsdinstall-prompt-single" coords="1 5"/>
- <area id="bsdinstall-prompt-smp" coords="2 5"/>
- </areaspec>
-
- <screen><prompt>ok </prompt>
-<prompt>ok {0} </prompt></screen>
+ <screen><prompt>ok </prompt><co id="bsdinstall-prompt-single"/>
+<prompt>ok {0} </prompt><co id="bsdinstall-prompt-smp"/></screen>
<calloutlist>
<callout arearefs="bsdinstall-prompt-single">
@@ -786,7 +780,6 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</screen>
������� ��� ������ ��� ������� CPU.</para>
</callout>
</calloutlist>
- </screenco>
<para>��� ������ ����, ����������� �� CDROM ���� ����� ���
���� �������� ��� <acronym>PROM</acronym> ������
diff --git a/el_GR.ISO8859-7/books/handbook/install/chapter.xml b/el_GR.ISO8859-7/books/handbook/install/chapter.xml
index 60ec6bf12f..bac1fbf536 100644
--- a/el_GR.ISO8859-7/books/handbook/install/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/install/chapter.xml
@@ -1104,14 +1104,8 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</screen>
<command>~#</command> ��� &man.tip.1; � ��� &man.cu.1;) ��� ��
������� ���� �������� ��� PROM. �������� ���� ��������:</para>
- <screenco>
- <areaspec>
- <area id="prompt-single" coords="1 5"/>
- <area id="prompt-smp" coords="2 5"/>
- </areaspec>
-
- <screen><prompt>ok </prompt>
-<prompt>ok {0} </prompt></screen>
+ <screen><prompt>ok </prompt><co id="prompt-single"/>
+<prompt>ok {0} </prompt><co id="prompt-smp"/></screen>
<calloutlist>
<callout arearefs="prompt-single">
@@ -1124,7 +1118,6 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</screen>
SMP, �� ����� ������� ��� ������ ��� ������� CPU.</para>
</callout>
</calloutlist>
- </screenco>
<para>��� ������ ����, ����������� �� CDROM ���� �����, ��� ��� ���
�������� ��� PROM, ������ <command>boot cdrom</command>.</para>
diff --git a/en_US.ISO8859-1/books/handbook/bsdinstall/chapter.xml b/en_US.ISO8859-1/books/handbook/bsdinstall/chapter.xml
index 1a92e19665..518083590c 100644
--- a/en_US.ISO8859-1/books/handbook/bsdinstall/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/bsdinstall/chapter.xml
@@ -739,14 +739,8 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</screen>
role="Programmable Read Only Memory">PROM</acronym>
prompt. It looks like this:</para>
- <screenco>
- <areaspec>
- <area id="bsdinstall-prompt-single" coords="1 5"/>
- <area id="bsdinstall-prompt-smp" coords="2 5"/>
- </areaspec>
-
- <screen><prompt>ok </prompt>
-<prompt>ok {0} </prompt></screen>
+ <screen><prompt>ok </prompt><co id="bsdinstall-prompt-single"/>
+<prompt>ok {0} </prompt><co id="bsdinstall-prompt-smp"/></screen>
<calloutlist>
<callout arearefs="bsdinstall-prompt-single">
@@ -759,7 +753,6 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</screen>
indicates the number of the active CPU.</para>
</callout>
</calloutlist>
- </screenco>
<para>At this point, place the CDROM into your drive, and from
the <acronym>PROM</acronym> prompt, type
diff --git a/en_US.ISO8859-1/books/handbook/install/chapter.xml b/en_US.ISO8859-1/books/handbook/install/chapter.xml
index deb590cf20..92fcf25a8d 100644
--- a/en_US.ISO8859-1/books/handbook/install/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/install/chapter.xml
@@ -1044,14 +1044,8 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</screen>
&man.tip.1; or &man.cu.1;) to get to the PROM prompt. It
looks like this:</para>
- <screenco>
- <areaspec>
- <area id="prompt-single" coords="1 5"/>
- <area id="prompt-smp" coords="2 5"/>
- </areaspec>
-
- <screen><prompt>ok </prompt>
-<prompt>ok {0} </prompt></screen>
+ <screen><prompt>ok </prompt><co id="prompt-single"/>
+<prompt>ok {0} </prompt><co id="prompt-smp"/></screen>
<calloutlist>
<callout arearefs="prompt-single">
@@ -1064,7 +1058,6 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</screen>
indicates the number of the active CPU.</para>
</callout>
</calloutlist>
- </screenco>
<para>At this point, place the CDROM into your drive, and from
the PROM prompt, type <command>boot cdrom</command>.</para>
diff --git a/es_ES.ISO8859-1/books/handbook/install/chapter.xml b/es_ES.ISO8859-1/books/handbook/install/chapter.xml
index 6fdb135d28..67c3edc8c8 100755
--- a/es_ES.ISO8859-1/books/handbook/install/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/install/chapter.xml
@@ -1169,14 +1169,8 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</screen>
&man.tip.1; o &man.cu.1;) para as� recuperar el prompt de
PROM. Tiene este aspecto:</para>
- <screenco>
- <areaspec>
- <area id="prompt-single" coords="1 5"/>
- <area id="prompt-smp" coords="2 5"/>
- </areaspec>
-
- <screen><prompt>ok </prompt>
-<prompt>ok {0} </prompt></screen>
+ <screen><prompt>ok </prompt><co id="prompt-single"/>
+<prompt>ok {0} </prompt><co id="prompt-smp"/></screen>
<calloutlist>
<callout arearefs="prompt-single">
@@ -1189,7 +1183,6 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</screen>
indica el n�mero de la CPU activa.</para>
</callout>
</calloutlist>
- </screenco>
<para>Ponga el CDROM dentro de la unidad y tecl�e
<command>boot cdrom</command> en el prompt
diff --git a/fr_FR.ISO8859-1/books/handbook/install/chapter.xml b/fr_FR.ISO8859-1/books/handbook/install/chapter.xml
index a99699d320..d67d47f38a 100644
--- a/fr_FR.ISO8859-1/books/handbook/install/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/install/chapter.xml
@@ -1208,14 +1208,8 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</screen>
ou &man.cu.1;) pour obtenir l'invite PROM. Elle ressemble
à ceci:</para>
- <screenco>
- <areaspec>
- <area id="prompt-single" coords="1 5"/>
- <area id="prompt-smp" coords="2 5"/>
- </areaspec>
-
- <screen><prompt>ok </prompt>
-<prompt>ok {0} </prompt></screen>
+ <screen><prompt>ok </prompt><co id="prompt-single"/>
+<prompt>ok {0} </prompt><co id="prompt-smp"/></screen>
<calloutlist>
<callout arearefs="prompt-single">
@@ -1229,7 +1223,6 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</screen>
CPU actifs.</para>
</callout>
</calloutlist>
- </screenco>
<para>En ce point, placez le CDROM dans le lecteur, et
à l'invite PROM, tapez <command>boot
diff --git a/hu_HU.ISO8859-2/books/handbook/install/chapter.xml b/hu_HU.ISO8859-2/books/handbook/install/chapter.xml
index df6c13a3bf..13cfaeeed0 100644
--- a/hu_HU.ISO8859-2/books/handbook/install/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/install/chapter.xml
@@ -1371,14 +1371,8 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</screen>
haszn�lat�val). K�r�lbel�l
�gy n�z ki:</para>
- <screenco>
- <areaspec>
- <area id="prompt-single" coords="1 5"/>
- <area id="prompt-smp" coords="2 5"/>
- </areaspec>
-
- <screen><prompt>ok </prompt>
-<prompt>ok {0} </prompt></screen>
+ <screen><prompt>ok </prompt><co id="prompt-single"/>
+<prompt>ok {0} </prompt><co id="prompt-smp"/></screen>
<calloutlist>
<callout arearefs="prompt-single">
@@ -1393,7 +1387,6 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</screen>
sorsz�m�t jel�li.</para>
</callout>
</calloutlist>
- </screenco>
<para>Most helyezz�k a CD-t a meghajt�ba, �s
a PROM parancssor�ban pedig g�pelj�k be
diff --git a/ja_JP.eucJP/books/handbook/bsdinstall/chapter.xml b/ja_JP.eucJP/books/handbook/bsdinstall/chapter.xml
index 681b18b9aa..563b9757ad 100644
--- a/ja_JP.eucJP/books/handbook/bsdinstall/chapter.xml
+++ b/ja_JP.eucJP/books/handbook/bsdinstall/chapter.xml
@@ -746,14 +746,8 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</screen>
�ץ���ץȤ�ɽ�����Ƥ���������
���Τ褦��ɽ���Ǥ���</para>
- <screenco>
- <areaspec>
- <area id="bsdinstall-prompt-single" coords="1 5"/>
- <area id="bsdinstall-prompt-smp" coords="2 5"/>
- </areaspec>
-
- <screen><prompt>ok </prompt>
-<prompt>ok {0} </prompt></screen>
+ <screen><prompt>ok </prompt><co id="bsdinstall-prompt-single"/>
+<prompt>ok {0} </prompt><co id="bsdinstall-prompt-smp"/></screen>
<calloutlist>
<callout arearefs="bsdinstall-prompt-single">
@@ -764,7 +758,6 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</screen>
<para>SMP �����ƥ�Υץ���ץȡ������ϥ����ƥ��֤� CPU �ο���</para>
</callout>
</calloutlist>
- </screenco>
<para>�����ǡ�CDROM ��ɥ饤�֤���������
<acronym>PROM</acronym> �ץ���ץȤ�
diff --git a/ja_JP.eucJP/books/handbook/install/chapter.xml b/ja_JP.eucJP/books/handbook/install/chapter.xml
index 05ae6a6ddd..9f492af624 100644
--- a/ja_JP.eucJP/books/handbook/install/chapter.xml
+++ b/ja_JP.eucJP/books/handbook/install/chapter.xml
@@ -1080,14 +1080,8 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</screen>
���������ơ�PROM �ץ���ץȤ�ɽ�����Ƥ���������
���Τ褦��ɽ���Ǥ���</para>
- <screenco>
- <areaspec>
- <area id="prompt-single" coords="1 5"/>
- <area id="prompt-smp" coords="2 5"/>
- </areaspec>
-
- <screen><prompt>ok </prompt>
-<prompt>ok {0} </prompt></screen>
+ <screen><prompt>ok </prompt><co id="prompt-single"/>
+<prompt>ok {0} </prompt><co id="prompt-smp"/></screen>
<calloutlist>
<callout arearefs="prompt-single">
@@ -1098,7 +1092,6 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</screen>
<para>SMP �����ƥ�Υץ���ץȡ������ϥ����ƥ��֤� CPU �ο���</para>
</callout>
</calloutlist>
- </screenco>
<para>�����ǡ�CDROM ��ɥ饤�֤���������
PROM �ץ���ץȤ� <command>boot cdrom</command> �����Ϥ��Ƥ���������</para>
diff --git a/mn_MN.UTF-8/books/handbook/bsdinstall/chapter.xml b/mn_MN.UTF-8/books/handbook/bsdinstall/chapter.xml
index fff0251723..d9946e1dfc 100644
--- a/mn_MN.UTF-8/books/handbook/bsdinstall/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/bsdinstall/chapter.xml
@@ -705,14 +705,8 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</screen>
дарах юм уу эсвэл сериал консолоор <command>BREAK</command> илгээх хэрэгтэй.
Иймэрхүү харагдах болно:</para>
- <screenco>
- <areaspec>
- <area id="bsdinstall-prompt-single" coords="1 5"/>
- <area id="bsdinstall-prompt-smp" coords="2 5"/>
- </areaspec>
-
- <screen><prompt>ok </prompt>
-<prompt>ok {0} </prompt></screen>
+ <screen><prompt>ok </prompt><co id="bsdinstall-prompt-single"/>
+<prompt>ok {0} </prompt><co id="bsdinstall-prompt-smp"/></screen>
<calloutlist>
<callout arearefs="bsdinstall-prompt-single">
@@ -725,7 +719,6 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</screen>
indicates the number of the active CPU.</para>
</callout>
</calloutlist>
- </screenco>
<para>Энэ үед хөтөч дотроо CDROM-оо хийгээд <acronym>PROM</acronym>
дээрээс <command>boot cdrom</command> гэж бичнэ.</para>
diff --git a/mn_MN.UTF-8/books/handbook/install/chapter.xml b/mn_MN.UTF-8/books/handbook/install/chapter.xml
index 83ff412ccf..d32fd6c8e6 100644
--- a/mn_MN.UTF-8/books/handbook/install/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/install/chapter.xml
@@ -1022,14 +1022,8 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</screen>
эсвэл &man.cu.1; дээр <command>~#</command>-г ашиглан) <command>BREAK</command>-г
илгээх хэрэгтэй. Энэ нь иймэрхүү харагдах болно:</para>
- <screenco>
- <areaspec>
- <area id="prompt-single" coords="1 5"/>
- <area id="prompt-smp" coords="2 5"/>
- </areaspec>
-
- <screen><prompt>ok </prompt>
-<prompt>ok {0} </prompt></screen>
+ <screen><prompt>ok </prompt><co id="prompt-single"/>
+<prompt>ok {0} </prompt><co id="prompt-smp"/></screen>
<calloutlist>
<callout arearefs="prompt-single">
@@ -1042,7 +1036,6 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</screen>
тоо нь идэвхтэй байгаа CPU-ийн тоог илэрхийлдэг.</para>
</callout>
</calloutlist>
- </screenco>
<para>Энэ хүрэхэд өөрийн хөтөчдөө CDROM-оо хийгээд PROM хүлээх мөрөөс
<command>boot cdrom</command> тушаалыг бичих хэрэгтэй.</para>
diff --git a/nl_NL.ISO8859-1/books/handbook/install/chapter.xml b/nl_NL.ISO8859-1/books/handbook/install/chapter.xml
index 3417b6745e..5d5a59be36 100644
--- a/nl_NL.ISO8859-1/books/handbook/install/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/install/chapter.xml
@@ -1103,14 +1103,8 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</screen>
&man.tip.1; of &man.cu.1; te gebruiken) om bij de PROM-prompt
te komen. Het ziet er als volgt uit:</para>
- <screenco>
- <areaspec>
- <area id="prompt-single" coords="1 5"/>
- <area id="prompt-smp" coords="2 5"/>
- </areaspec>
-
- <screen><prompt>ok </prompt>
-<prompt>ok {0} </prompt></screen>
+ <screen><prompt>ok </prompt><co id="prompt-single"/>
+<prompt>ok {0} </prompt><co id="prompt-smp"/></screen>
<calloutlist>
<callout arearefs="prompt-single">
@@ -1123,7 +1117,6 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</screen>
cijfer geeft het aantal actieve CPUs aan.</para>
</callout>
</calloutlist>
- </screenco>
<para>Stop hier de CDROM in uw drive, en typ op de PROM-prompt
<command>boot cdrom</command>.</para>
diff --git a/ru_RU.KOI8-R/books/handbook/bsdinstall/chapter.xml b/ru_RU.KOI8-R/books/handbook/bsdinstall/chapter.xml
index d89b7a79e4..3a97dbbbce 100644
--- a/ru_RU.KOI8-R/books/handbook/bsdinstall/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/bsdinstall/chapter.xml
@@ -741,14 +741,8 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</screen>
� &man.tip.1; ��� &man.cu.1;). ����������� �������� �������
����������:</para>
- <screenco>
- <areaspec>
- <area id="bsdinstall-prompt-single" coords="1 5"/>
- <area id="bsdinstall-prompt-smp" coords="2 5"/>
- </areaspec>
-
- <screen><prompt>ok </prompt>
-<prompt>ok {0} </prompt></screen>
+ <screen><prompt>ok </prompt><co id="bsdinstall-prompt-single"/>
+<prompt>ok {0} </prompt><co id="bsdinstall-prompt-smp"/></screen>
<calloutlist>
<callout arearefs="bsdinstall-prompt-single">
@@ -762,7 +756,6 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</screen>
�����������.</para>
</callout>
</calloutlist>
- </screenco>
<para>�� ���� ����� �������� CDROM � ������ � �������� <command>boot
cdrom</command> � ����������� <acronym>PROM</acronym>.</para>
diff --git a/ru_RU.KOI8-R/books/handbook/install/chapter.xml b/ru_RU.KOI8-R/books/handbook/install/chapter.xml
index 19589f0b8b..9eff9fcd72 100644
--- a/ru_RU.KOI8-R/books/handbook/install/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/install/chapter.xml
@@ -1059,14 +1059,8 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</screen>
(��������, ������ <command>~#</command> � &man.tip.1; ��� &man.cu.1;).
����������� PROM �������� ������� ����������:</para>
- <screenco>
- <areaspec>
- <area id="prompt-single" coords="1 5"/>
- <area id="prompt-smp" coords="2 5"/>
- </areaspec>
-
- <screen><prompt>ok </prompt>
-<prompt>ok {0} </prompt></screen>
+ <screen><prompt>ok </prompt><co id="prompt-single"/>
+<prompt>ok {0} </prompt><co id="prompt-smp"/></screen>
<calloutlist>
<callout arearefs="prompt-single">
@@ -1078,7 +1072,6 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</screen>
����� ���������� ����� ��������� ����������.</para>
</callout>
</calloutlist>
- </screenco>
<para>�� ���� ������ ���������� �������� CDROM � ������ � �������
<command>boot cdrom</command> � ����������� PROM.</para>
diff --git a/share/xml/freebsd.sch b/share/xml/freebsd.sch
index f67995f02e..289cf9d56f 100644
--- a/share/xml/freebsd.sch
+++ b/share/xml/freebsd.sch
@@ -8,4 +8,15 @@
<assert test="contains(., '.')">File reference does not have an extension.</assert>
</rule>
</pattern>
+
+ <pattern name="Check callout validity">
+ <rule context="/">
+ <assert test="//screenco">Callouts with screenco are not supported;
+ use screen and co instead.</assert>
+ <assert test="//programlistingco">Callouts with programlistingco
+ are not supported; use programlisting and co instead.</assert>
+ <assert test="//graphicco">Callouts on
+ graphics are not supported.</assert>
+ </rule>
+ </pattern>
</schema>
diff --git a/zh_CN.GB2312/books/handbook/bsdinstall/chapter.xml b/zh_CN.GB2312/books/handbook/bsdinstall/chapter.xml
index d0c49741ab..92fed93a45 100644
--- a/zh_CN.GB2312/books/handbook/bsdinstall/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/bsdinstall/chapter.xml
@@ -645,14 +645,8 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</screen>
<acronym role="Programmable Read Only Memory">PROM</acronym> ��ʾ����
��Ӧ��������ʾ��</para>
- <screenco>
- <areaspec>
- <area id="bsdinstall-prompt-single" coords="1 5"/>
- <area id="bsdinstall-prompt-smp" coords="2 5"/>
- </areaspec>
-
- <screen><prompt>ok </prompt>
-<prompt>ok {0} </prompt></screen>
+ <screen><prompt>ok </prompt><co id="bsdinstall-prompt-single"/>
+<prompt>ok {0} </prompt><co id="bsdinstall-prompt-smp"/></screen>
<calloutlist>
<callout arearefs="bsdinstall-prompt-single">
@@ -664,7 +658,6 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</screen>
���е����ֱ�ʾ���õ� CPU ������</para>
</callout>
</calloutlist>
- </screenco>
<para>���ڣ� ���� CDROM ���� <acronym>PROM</acronym> ��ʾ��������
<command>boot cdrom</command>��</para>
diff --git a/zh_CN.GB2312/books/handbook/install/chapter.xml b/zh_CN.GB2312/books/handbook/install/chapter.xml
index db5b64b06b..8de343e445 100644
--- a/zh_CN.GB2312/books/handbook/install/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/install/chapter.xml
@@ -902,14 +902,8 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</screen>
<command>~#</command>) �Ա���� PROM ��ʾ����
��Ӧ������������������</para>
- <screenco>
- <areaspec>
- <area id="prompt-single" coords="1 5"/>
- <area id="prompt-smp" coords="2 5"/>
- </areaspec>
-
- <screen><prompt>ok </prompt>
-<prompt>ok {0} </prompt></screen>
+ <screen><prompt>ok </prompt><co id="prompt-single"/>
+<prompt>ok {0} </prompt><co id="prompt-smp"/></screen>
<calloutlist>
<callout arearefs="prompt-single">
@@ -922,7 +916,6 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</screen>
��ϵͳ�п��õ� CPU ������</para>
</callout>
</calloutlist>
- </screenco>
<para>��ʱ�� �� CDROM ������������ ���� PROM ��ʾ�����棬
���� <command>boot cdrom</command>��</para>
diff --git a/zh_TW.Big5/books/handbook/install/chapter.xml b/zh_TW.Big5/books/handbook/install/chapter.xml
index 106c768d1a..6881e76ff3 100644
--- a/zh_TW.Big5/books/handbook/install/chapter.xml
+++ b/zh_TW.Big5/books/handbook/install/chapter.xml
@@ -951,14 +951,8 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</screen>
������ <command>~#</command> ������) �e�X <command>BREAK</command>
���O�Ӷi�J PROM prompt�C �j���|���U���G</para>
- <screenco>
- <areaspec>
- <area id="prompt-single" coords="1 5"/>
- <area id="prompt-smp" coords="2 5"/>
- </areaspec>
-
- <screen><prompt>ok </prompt>
-<prompt>ok {0} </prompt></screen>
+ <screen><prompt>ok </prompt><co id="prompt-single"/>
+<prompt>ok {0} </prompt><co id="prompt-smp"/></screen>
<calloutlist>
<callout arearefs="prompt-single">
@@ -970,7 +964,6 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</screen>
�s���C</para>
</callout>
</calloutlist>
- </screenco>
<para>���ɽЧ�w�˥��Щ�J���о����A�M��b PROM prompt ��
<command>boot cdrom</command> �Y�i�C</para>
From c5bbd26680123ba8ce3012d1411b6006545c0e8c Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Fri, 15 Mar 2013 07:44:31 +0000
Subject: [PATCH 081/121] - Do not use line break in assert text since it will
also break the text when printed out
---
share/xml/freebsd.sch | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/share/xml/freebsd.sch b/share/xml/freebsd.sch
index 289cf9d56f..52da4aa1dd 100644
--- a/share/xml/freebsd.sch
+++ b/share/xml/freebsd.sch
@@ -11,12 +11,9 @@
<pattern name="Check callout validity">
<rule context="/">
- <assert test="//screenco">Callouts with screenco are not supported;
- use screen and co instead.</assert>
- <assert test="//programlistingco">Callouts with programlistingco
- are not supported; use programlisting and co instead.</assert>
- <assert test="//graphicco">Callouts on
- graphics are not supported.</assert>
+ <assert test="//screenco">Callouts with screenco are not supported; use screen and co instead.</assert>
+ <assert test="//programlistingco">Callouts with programlistingco are not supported; use programlisting and co instead.</assert>
+ <assert test="//graphicco">Callouts on graphics are not supported.</assert>
</rule>
</pattern>
</schema>
From 53b00294cd42030c7b15f55dbcd163860881e47a Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Fri, 15 Mar 2013 07:47:22 +0000
Subject: [PATCH 082/121] - Fix the last three test cases
---
share/xml/freebsd.sch | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/share/xml/freebsd.sch b/share/xml/freebsd.sch
index 52da4aa1dd..2bd3bc8d94 100644
--- a/share/xml/freebsd.sch
+++ b/share/xml/freebsd.sch
@@ -11,9 +11,9 @@
<pattern name="Check callout validity">
<rule context="/">
- <assert test="//screenco">Callouts with screenco are not supported; use screen and co instead.</assert>
- <assert test="//programlistingco">Callouts with programlistingco are not supported; use programlisting and co instead.</assert>
- <assert test="//graphicco">Callouts on graphics are not supported.</assert>
+ <report test="//screenco">Callouts with screenco are not supported; use screen and co instead.</report>
+ <report test="//programlistingco">Callouts with programlistingco are not supported; use programlisting and co instead.</report>
+ <report test="//graphicco">Callouts on graphics are not supported.</report>
</rule>
</pattern>
</schema>
From 96d2077fac992798b3925fc3f37ad2bb8db60401 Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Fri, 15 Mar 2013 07:49:33 +0000
Subject: [PATCH 083/121] - Make the validate/lint target fail when Schematron
validation gives output. This is useful when running lint from upper
directories. Otherwise, a validation error would not cause make to halt and
an error could remain unspotted.
---
share/mk/doc.docbook.mk | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/share/mk/doc.docbook.mk b/share/mk/doc.docbook.mk
index da8f4bf56d..fe0a9f0c75 100644
--- a/share/mk/doc.docbook.mk
+++ b/share/mk/doc.docbook.mk
@@ -580,7 +580,11 @@ lint validate: ${SRCS} ${schxslts}
.if defined(schxslts)
@${ECHO} "==> Validating with Schematron constraints"
.for sch in ${schxslts}
- @${XSLTPROC} ${sch} ${DOC}.parsed.xml
+ @( out=`${XSLTPROC} ${sch} ${DOC}.parsed.xml`; \
+ if [ -n "$${out}" ]; then \
+ echo "$${out}"; \
+ false; \
+ fi )
.endfor
.endif
@${RM} -rf ${CLEANFILES} ${CLEANDIRS} ${DOC}.parsed.xml
From a1f0eaf2716e86f457015a28362f3b52c13d46f5 Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Fri, 15 Mar 2013 08:06:33 +0000
Subject: [PATCH 084/121] - Place the footer below the navigation as it used to
be
---
da_DK.ISO8859-1/share/xsl/freebsd-xhtml-common.xsl | 2 +-
de_DE.ISO8859-1/share/xsl/freebsd-xhtml-common.xsl | 2 +-
el_GR.ISO8859-7/share/xsl/freebsd-xhtml-common.xsl | 2 +-
es_ES.ISO8859-1/share/xsl/freebsd-xhtml-common.xsl | 2 +-
fr_FR.ISO8859-1/share/xsl/freebsd-xhtml-common.xsl | 2 +-
hu_HU.ISO8859-2/share/xsl/freebsd-xhtml-common.xsl | 2 +-
it_IT.ISO8859-15/share/xsl/freebsd-xhtml-common.xsl | 2 +-
ja_JP.eucJP/share/xsl/freebsd-xhtml-common.xsl | 2 +-
mn_MN.UTF-8/share/xsl/freebsd-xhtml-common.xsl | 2 +-
nl_NL.ISO8859-1/share/xsl/freebsd-xhtml-common.xsl | 2 +-
pt_BR.ISO8859-1/share/xsl/freebsd-xhtml-common.xsl | 2 +-
ru_RU.KOI8-R/share/xsl/freebsd-xhtml-common.xsl | 2 +-
share/xsl/freebsd-xhtml-common.xsl | 2 +-
zh_CN.GB2312/share/xsl/freebsd-xhtml-common.xsl | 2 +-
zh_TW.Big5/share/xsl/freebsd-xhtml-common.xsl | 2 +-
15 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/da_DK.ISO8859-1/share/xsl/freebsd-xhtml-common.xsl b/da_DK.ISO8859-1/share/xsl/freebsd-xhtml-common.xsl
index 4327a4c5de..22d504e228 100644
--- a/da_DK.ISO8859-1/share/xsl/freebsd-xhtml-common.xsl
+++ b/da_DK.ISO8859-1/share/xsl/freebsd-xhtml-common.xsl
@@ -7,7 +7,7 @@
xmlns="http://www.w3.org/TR/xhtml1/transitional"
exclude-result-prefixes="#default">
- <xsl:template name="user.footer.content">
+ <xsl:template name="user.footer.navigation">
<p align="center"><small>Dette og andre dokumenter kan downloades fra
<a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/">ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/</a></small></p>
diff --git a/de_DE.ISO8859-1/share/xsl/freebsd-xhtml-common.xsl b/de_DE.ISO8859-1/share/xsl/freebsd-xhtml-common.xsl
index 6d863623c0..bae15af13e 100644
--- a/de_DE.ISO8859-1/share/xsl/freebsd-xhtml-common.xsl
+++ b/de_DE.ISO8859-1/share/xsl/freebsd-xhtml-common.xsl
@@ -7,7 +7,7 @@
xmlns="http://www.w3.org/TR/xhtml1/transitional"
exclude-result-prefixes="#default">
- <xsl:template name="user.footer.content">
+ <xsl:template name="user.footer.navigation">
<p align="center"><small>Wenn Sie Fragen zu FreeBSD haben, schicken Sie eine E-Mail an
<<a href="mailto:de-bsd-questions@de.FreeBSD.org">de-bsd-questions@de.FreeBSD.org</a>>.<br/>
Wenn Sie Fragen zu dieser Dokumentation haben, schicken Sie eine E-Mail an
diff --git a/el_GR.ISO8859-7/share/xsl/freebsd-xhtml-common.xsl b/el_GR.ISO8859-7/share/xsl/freebsd-xhtml-common.xsl
index 7ea8a81483..f1e6f1701c 100644
--- a/el_GR.ISO8859-7/share/xsl/freebsd-xhtml-common.xsl
+++ b/el_GR.ISO8859-7/share/xsl/freebsd-xhtml-common.xsl
@@ -7,7 +7,7 @@
xmlns="http://www.w3.org/TR/xhtml1/transitional"
exclude-result-prefixes="#default">
- <xsl:template name="user.footer.content">
+ <xsl:template name="user.footer.navigation">
<p align="center"><small>���� �� �������, ��� ���� �������, ������ �� ������ ���
<a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/">ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/</a></small></p>
diff --git a/es_ES.ISO8859-1/share/xsl/freebsd-xhtml-common.xsl b/es_ES.ISO8859-1/share/xsl/freebsd-xhtml-common.xsl
index 05b96db37c..3604f423a4 100644
--- a/es_ES.ISO8859-1/share/xsl/freebsd-xhtml-common.xsl
+++ b/es_ES.ISO8859-1/share/xsl/freebsd-xhtml-common.xsl
@@ -7,7 +7,7 @@
xmlns="http://www.w3.org/TR/xhtml1/transitional"
exclude-result-prefixes="#default">
- <xsl:template name="user.footer.content">
+ <xsl:template name="user.footer.navigation">
<p align="center"><small>Puede descargar �ste y muchos otros documentos desde
<a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/">ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/</a></small></p>
diff --git a/fr_FR.ISO8859-1/share/xsl/freebsd-xhtml-common.xsl b/fr_FR.ISO8859-1/share/xsl/freebsd-xhtml-common.xsl
index c183a4b192..3865c406a6 100644
--- a/fr_FR.ISO8859-1/share/xsl/freebsd-xhtml-common.xsl
+++ b/fr_FR.ISO8859-1/share/xsl/freebsd-xhtml-common.xsl
@@ -7,7 +7,7 @@
xmlns="http://www.w3.org/TR/xhtml1/transitional"
exclude-result-prefixes="#default">
- <xsl:template name="user.footer.content">
+ <xsl:template name="user.footer.navigation">
<p align="center"><small>Ce document, ainsi que d'autres peut �tre t�l�charg� sur
<a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/">ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/</a></small></p>
diff --git a/hu_HU.ISO8859-2/share/xsl/freebsd-xhtml-common.xsl b/hu_HU.ISO8859-2/share/xsl/freebsd-xhtml-common.xsl
index 262641982e..e43c36bdc3 100644
--- a/hu_HU.ISO8859-2/share/xsl/freebsd-xhtml-common.xsl
+++ b/hu_HU.ISO8859-2/share/xsl/freebsd-xhtml-common.xsl
@@ -7,7 +7,7 @@
xmlns="http://www.w3.org/TR/xhtml1/transitional"
exclude-result-prefixes="#default">
- <xsl:template name="user.footer.content">
+ <xsl:template name="user.footer.navigation">
<p align="center"><small>Ha k�rd�se van a FreeBSD-vel kapcsolatban, a
k�vetkez� c�mre �rhat (angolul):
<<a href="mailto:questions@FreeBSD.org">questions@FreeBSD.org</a>>.<br/>
diff --git a/it_IT.ISO8859-15/share/xsl/freebsd-xhtml-common.xsl b/it_IT.ISO8859-15/share/xsl/freebsd-xhtml-common.xsl
index 5889576de4..c9729c5199 100644
--- a/it_IT.ISO8859-15/share/xsl/freebsd-xhtml-common.xsl
+++ b/it_IT.ISO8859-15/share/xsl/freebsd-xhtml-common.xsl
@@ -7,7 +7,7 @@
xmlns="http://www.w3.org/TR/xhtml1/transitional"
exclude-result-prefixes="#default">
- <xsl:template name="user.footer.content">
+ <xsl:template name="user.footer.navigation">
<p align="center"><small>Questo, ed altri documenti, possono essere scaricati da
<a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/">ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/</a></small></p>
diff --git a/ja_JP.eucJP/share/xsl/freebsd-xhtml-common.xsl b/ja_JP.eucJP/share/xsl/freebsd-xhtml-common.xsl
index 8b8ed47575..a9a8b154f1 100644
--- a/ja_JP.eucJP/share/xsl/freebsd-xhtml-common.xsl
+++ b/ja_JP.eucJP/share/xsl/freebsd-xhtml-common.xsl
@@ -7,7 +7,7 @@
xmlns="http://www.w3.org/TR/xhtml1/transitional"
exclude-result-prefixes="#default">
- <xsl:template name="user.footer.content">
+ <xsl:template name="user.footer.navigation">
<p align="center"><small>��ʸ�����¾��ʸ���
<a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/">ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/</a>
�������������ɤǤ��ޤ���</small></p>
diff --git a/mn_MN.UTF-8/share/xsl/freebsd-xhtml-common.xsl b/mn_MN.UTF-8/share/xsl/freebsd-xhtml-common.xsl
index 33eec8e971..286e4b3657 100644
--- a/mn_MN.UTF-8/share/xsl/freebsd-xhtml-common.xsl
+++ b/mn_MN.UTF-8/share/xsl/freebsd-xhtml-common.xsl
@@ -7,7 +7,7 @@
xmlns="http://www.w3.org/TR/xhtml1/transitional"
exclude-result-prefixes="#default">
- <xsl:template name="user.footer.content">
+ <xsl:template name="user.footer.navigation">
<p align="center"><small>Энэ болон бусад баримтуудыг
<a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/">ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/</a>
хаягаас татаж авч болно.</small></p>
diff --git a/nl_NL.ISO8859-1/share/xsl/freebsd-xhtml-common.xsl b/nl_NL.ISO8859-1/share/xsl/freebsd-xhtml-common.xsl
index 50bc187323..1a676215eb 100644
--- a/nl_NL.ISO8859-1/share/xsl/freebsd-xhtml-common.xsl
+++ b/nl_NL.ISO8859-1/share/xsl/freebsd-xhtml-common.xsl
@@ -7,5 +7,5 @@
xmlns="http://www.w3.org/TR/xhtml1/transitional"
exclude-result-prefixes="#default">
- <xsl:template name="user.footer.content"/>
+ <xsl:template name="user.footer.navigation"/>
</xsl:stylesheet>
diff --git a/pt_BR.ISO8859-1/share/xsl/freebsd-xhtml-common.xsl b/pt_BR.ISO8859-1/share/xsl/freebsd-xhtml-common.xsl
index d94c23a72b..c3a42ead9b 100644
--- a/pt_BR.ISO8859-1/share/xsl/freebsd-xhtml-common.xsl
+++ b/pt_BR.ISO8859-1/share/xsl/freebsd-xhtml-common.xsl
@@ -7,7 +7,7 @@
xmlns="http://www.w3.org/TR/xhtml1/transitional"
exclude-result-prefixes="#default">
- <xsl:template name="user.footer.content">
+ <xsl:template name="user.footer.navigation">
<p align="center"><small>Este, e outros documentos, podem ser obtidos em
<a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/">ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/</a></small></p>
diff --git a/ru_RU.KOI8-R/share/xsl/freebsd-xhtml-common.xsl b/ru_RU.KOI8-R/share/xsl/freebsd-xhtml-common.xsl
index f8cedcc6af..a97eec4fb7 100644
--- a/ru_RU.KOI8-R/share/xsl/freebsd-xhtml-common.xsl
+++ b/ru_RU.KOI8-R/share/xsl/freebsd-xhtml-common.xsl
@@ -7,7 +7,7 @@
xmlns="http://www.w3.org/TR/xhtml1/transitional"
exclude-result-prefixes="#default">
- <xsl:template name="user.footer.content">
+ <xsl:template name="user.footer.navigation">
<p align="center"><small>����, � ������ ���������, ����� ���� ������� �
<a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/">ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/</a>.</small></p>
diff --git a/share/xsl/freebsd-xhtml-common.xsl b/share/xsl/freebsd-xhtml-common.xsl
index b92885c8cd..f8e5d199f4 100644
--- a/share/xsl/freebsd-xhtml-common.xsl
+++ b/share/xsl/freebsd-xhtml-common.xsl
@@ -19,7 +19,7 @@
<xsl:param name="citerefentry.link" select="1"/>
<xsl:param name="admon.style"/>
- <xsl:template name="user.footer.content">
+ <xsl:template name="user.footer.navigation">
<p align="center"><small>This, and other documents, can be downloaded
from <a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/">ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/</a></small></p>
diff --git a/zh_CN.GB2312/share/xsl/freebsd-xhtml-common.xsl b/zh_CN.GB2312/share/xsl/freebsd-xhtml-common.xsl
index 6284cbdfd0..81f340d7e4 100644
--- a/zh_CN.GB2312/share/xsl/freebsd-xhtml-common.xsl
+++ b/zh_CN.GB2312/share/xsl/freebsd-xhtml-common.xsl
@@ -7,7 +7,7 @@
xmlns="http://www.w3.org/TR/xhtml1/transitional"
exclude-result-prefixes="#default">
- <xsl:template name="user.footer.content">
+ <xsl:template name="user.footer.navigation">
<p align="center"><small>���ĵ��������ĵ��ɴ��������أ�
<a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/">ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/</a>.</small></p>
diff --git a/zh_TW.Big5/share/xsl/freebsd-xhtml-common.xsl b/zh_TW.Big5/share/xsl/freebsd-xhtml-common.xsl
index 90fe29f2d8..5f12fe294c 100644
--- a/zh_TW.Big5/share/xsl/freebsd-xhtml-common.xsl
+++ b/zh_TW.Big5/share/xsl/freebsd-xhtml-common.xsl
@@ -7,7 +7,7 @@
xmlns="http://www.w3.org/TR/xhtml1/transitional"
exclude-result-prefixes="#default">
- <xsl:template name="user.footer.content">
+ <xsl:template name="user.footer.navigation">
<p align="center"><small>����Ψ�L���A�i�Ѧ��U���G
<a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/">ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/</a>�C</small></p>
From 12a63b01e2752df19715a1045a364d9c74e5e2b3 Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Fri, 15 Mar 2013 08:36:58 +0000
Subject: [PATCH 085/121] - Add support for an edition profiling attribute that
can be used to mark up parts that are only rendered either in the online or
in the print editions of handbook
---
share/xml/freebsd45.dtd | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/share/xml/freebsd45.dtd b/share/xml/freebsd45.dtd
index 43188e7b1a..3475484ae7 100644
--- a/share/xml/freebsd45.dtd
+++ b/share/xml/freebsd45.dtd
@@ -30,6 +30,11 @@
<!ENTITY % local.common.attrib "%xmlns.attrib;
%xmlns.xi.attrib;">
+<!ENTITY % edition.attrib
+ "edition CDATA #IMPLIED">
+
+<!ENTITY % local.effectivity.attrib "%edition.attrib;">
+
<!ELEMENT xi:include (xi:fallback?)>
<!ATTLIST xi:include
From 1a1367cdbc5f182604a8a193e54fdf2b0296d7d1 Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Fri, 15 Mar 2013 08:37:25 +0000
Subject: [PATCH 086/121] - Add constraints for profiling attributes
---
share/xml/freebsd.sch | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/share/xml/freebsd.sch b/share/xml/freebsd.sch
index 2bd3bc8d94..d4e203cd93 100644
--- a/share/xml/freebsd.sch
+++ b/share/xml/freebsd.sch
@@ -16,4 +16,13 @@
<report test="//graphicco">Callouts on graphics are not supported.</report>
</rule>
</pattern>
+
+ <pattern name="Check profiling attributes">
+ <rule context="//*/@edition">
+ <assert test="(. = 'online') or (. = 'print')">The edition attribute can only be set to 'online' or "print".</assert>
+ </rule>
+ <rule context="//*/@os">
+ <assert test="(. = 'freebsd8') or (. = 'freebsd9') or (. = 'freebsd10')">The os attribute can only be set to 'freebsd8', 'freebsd9' or 'freebsd10'.</assert>
+ </rule>
+ </pattern>
</schema>
From c1ddd50c4cd708d95e9d6403cb2c6554d2e7359f Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Fri, 15 Mar 2013 08:40:03 +0000
Subject: [PATCH 087/121] - Suppress the XML declaration emitted by the
Schematron XSLT
---
share/mk/doc.docbook.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/share/mk/doc.docbook.mk b/share/mk/doc.docbook.mk
index fe0a9f0c75..f152445107 100644
--- a/share/mk/doc.docbook.mk
+++ b/share/mk/doc.docbook.mk
@@ -582,7 +582,7 @@ lint validate: ${SRCS} ${schxslts}
.for sch in ${schxslts}
@( out=`${XSLTPROC} ${sch} ${DOC}.parsed.xml`; \
if [ -n "$${out}" ]; then \
- echo "$${out}"; \
+ echo "$${out}" | ${GREP} -v '^<?xml'; \
false; \
fi )
.endfor
From 996eb9dce9ec81d0e6af3b78c5606714b1597c1c Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Fri, 15 Mar 2013 10:26:27 +0000
Subject: [PATCH 088/121] - Add support for profiling
---
share/mk/doc.docbook.mk | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/share/mk/doc.docbook.mk b/share/mk/doc.docbook.mk
index f152445107..1dd75a000b 100644
--- a/share/mk/doc.docbook.mk
+++ b/share/mk/doc.docbook.mk
@@ -80,6 +80,7 @@ DSLHTML?= ${DOC_PREFIX}/share/xml/spellcheck.dsl
DSLPRINT?= ${DOC_PREFIX}/share/xml/default.dsl
DSLPGP?= ${DOC_PREFIX}/share/xml/pgp.dsl
+XSLPROF?= /usr/local/share/xsl/docbook/profiling/profile.xsl
XSLXHTML?= ${DOC_PREFIX}/${LANGCODE}/share/xsl/freebsd-xhtml.xsl
XSLXHTMLCHUNK?= ${DOC_PREFIX}/${LANGCODE}/share/xsl/freebsd-xhtml-chunk.xsl
XSLEPUB?= ${DOC_PREFIX}/${LANGCODE}/share/xsl/freebsd-epub.xsl
@@ -348,15 +349,22 @@ ${sch}.xsl: ${sch}
# Parsed XML -------------------------------------------------------
${DOC}.parsed.xml: ${SRCS}
- ${GREP} '^<?xml version=.*?>' ${DOC}.xml > ${.TARGET}
+ ${GREP} '^<?xml version=.*?>' ${DOC}.xml > ${.TARGET}.tmp
.if ${DOC} == "book"
- ${ECHO_CMD} '<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN" "../../../share/xml/freebsd45.dtd">' >> ${.TARGET}
+ ${ECHO_CMD} '<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN" "../../../share/xml/freebsd45.dtd">' >> ${.TARGET}.tmp
.else
- ${ECHO_CMD} '<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN" "../../../share/xml/freebsd45.dtd">' >> ${.TARGET}
+ ${ECHO_CMD} '<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN" "../../../share/xml/freebsd45.dtd">' >> ${.TARGET}.tmp
.endif
@${ECHO} "==> Basic validation"
${XMLLINT} --nonet --noent --valid --xinclude --dropdtd ${MASTERDOC} | \
- ${GREP} -v '^<?xml version=.*?>' >> ${.TARGET}
+ ${GREP} -v '^<?xml version=.*?>' >> ${.TARGET}.tmp
+.if defined(PROFILING)
+ @${ECHO} "==> Profiling"
+ ${XSLTPROC} ${PROFILING} ${XSLPROF} ${.TARGET}.tmp > ${.TARGET}
+ ${RM} ${.TARGET}.tmp
+.else
+ ${MV} ${.TARGET}.tmp ${.TARGET}
+.endif
# XHTML -------------------------------------------------------------
From 9334bf876f2e06e18557803b52314d08f669af42 Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Sat, 23 Mar 2013 21:21:23 +0000
Subject: [PATCH 089/121] - Add titlepage customization so that chapter authors
can be rendered as they used to be
---
share/misc/docbook.css | 4 +
share/xsl/freebsd-xhtml-common.xsl | 44 +
share/xsl/freebsd-xhtml-titlepage.xsl | 3819 +++++++++++++++++++++++++
share/xsl/titlepage.templates.xml | 718 +++++
4 files changed, 4585 insertions(+)
create mode 100644 share/xsl/freebsd-xhtml-titlepage.xsl
create mode 100644 share/xsl/titlepage.templates.xml
diff --git a/share/misc/docbook.css b/share/misc/docbook.css
index 9f28311acb..b4186ccebf 100644
--- a/share/misc/docbook.css
+++ b/share/misc/docbook.css
@@ -239,6 +239,10 @@ html {
padding-right: 1em;
}
+.authorgroup {
+ font-style: italic;
+}
+
.application {
font-weight: bold;
}
diff --git a/share/xsl/freebsd-xhtml-common.xsl b/share/xsl/freebsd-xhtml-common.xsl
index f8e5d199f4..9fe99f2fc9 100644
--- a/share/xsl/freebsd-xhtml-common.xsl
+++ b/share/xsl/freebsd-xhtml-common.xsl
@@ -10,6 +10,9 @@
<!-- Include the common customizations -->
<xsl:include href="freebsd-common.xsl"/>
+ <!-- Include customized XHTML titlepage -->
+ <xsl:include href="freebsd-xhtml-titlepage.xsl"/>
+
<!-- Redefine variables, and replace templates as necessary here -->
<xsl:param name="use.id.as.filename" select="1"/>
@@ -71,4 +74,45 @@
<xsl:apply-templates/>
</div>
</xsl:template>
+
+ <xsl:template name="chapter.authorgroup">
+ <span class="authorgroup">
+
+ <!-- XXX: our docs use a quirky semantics for this -->
+ <xsl:if test="(contrib|author/contrib)[1]">
+ <xsl:apply-templates select="(contrib|author/contrib)[1]"/>
+ </xsl:if>
+
+ <xsl:for-each select="author">
+ <xsl:apply-templates select="."/>
+
+ <xsl:choose>
+ <xsl:when test="position() < (last() - 1)">
+ <xsl:text>, </xsl:text>
+ </xsl:when>
+
+ <xsl:when test="position() = (last() - 1)">
+ <xsl:call-template name="gentext.space"/>
+ <xsl:call-template name="gentext">
+ <xsl:with-param name="key" select="'and'"/>
+ </xsl:call-template>
+ <xsl:call-template name="gentext.space"/>
+ </xsl:when>
+ </xsl:choose>
+ </xsl:for-each>
+ <xsl:text>. </xsl:text>
+ </span>
+ </xsl:template>
+
+ <xsl:template match="contrib">
+ <xsl:apply-templates/>
+ </xsl:template>
+
+ <xsl:template name="chapter.author">
+ <xsl:if test="contrib">
+ <xsl:apply-templates select="contrib"/>
+ <xsl:text> </xsl:text>
+ </xsl:if>
+ <xsl:apply-templates select="*[not(self::contrib)]"/>
+ </xsl:template>
</xsl:stylesheet>
diff --git a/share/xsl/freebsd-xhtml-titlepage.xsl b/share/xsl/freebsd-xhtml-titlepage.xsl
new file mode 100644
index 0000000000..1b64c37f8e
--- /dev/null
+++ b/share/xsl/freebsd-xhtml-titlepage.xsl
@@ -0,0 +1,3819 @@
+<?xml version="1.0"?>
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:exsl="http://exslt.org/common" version="1.0" exclude-result-prefixes="exsl">
+
+<!-- This stylesheet was created by template/titlepage.xsl-->
+
+<xsl:template name="article.titlepage.recto">
+ <xsl:choose>
+ <xsl:when test="articleinfo/title">
+ <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="articleinfo/title"/>
+ </xsl:when>
+ <xsl:when test="artheader/title">
+ <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="artheader/title"/>
+ </xsl:when>
+ <xsl:when test="info/title">
+ <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="info/title"/>
+ </xsl:when>
+ <xsl:when test="title">
+ <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="title"/>
+ </xsl:when>
+ </xsl:choose>
+
+ <xsl:choose>
+ <xsl:when test="articleinfo/subtitle">
+ <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="articleinfo/subtitle"/>
+ </xsl:when>
+ <xsl:when test="artheader/subtitle">
+ <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="artheader/subtitle"/>
+ </xsl:when>
+ <xsl:when test="info/subtitle">
+ <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="info/subtitle"/>
+ </xsl:when>
+ <xsl:when test="subtitle">
+ <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="subtitle"/>
+ </xsl:when>
+ </xsl:choose>
+
+ <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="articleinfo/corpauthor"/>
+ <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="artheader/corpauthor"/>
+ <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="info/corpauthor"/>
+ <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="articleinfo/authorgroup"/>
+ <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="artheader/authorgroup"/>
+ <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="info/authorgroup"/>
+ <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="articleinfo/author"/>
+ <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="artheader/author"/>
+ <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="info/author"/>
+ <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="articleinfo/othercredit"/>
+ <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="artheader/othercredit"/>
+ <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="info/othercredit"/>
+ <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="articleinfo/releaseinfo"/>
+ <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="artheader/releaseinfo"/>
+ <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="info/releaseinfo"/>
+ <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="articleinfo/copyright"/>
+ <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="artheader/copyright"/>
+ <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="info/copyright"/>
+ <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="articleinfo/legalnotice"/>
+ <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="artheader/legalnotice"/>
+ <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="info/legalnotice"/>
+ <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="articleinfo/pubdate"/>
+ <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="artheader/pubdate"/>
+ <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="info/pubdate"/>
+ <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="articleinfo/revision"/>
+ <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="artheader/revision"/>
+ <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="info/revision"/>
+ <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="articleinfo/revhistory"/>
+ <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="artheader/revhistory"/>
+ <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="info/revhistory"/>
+ <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="articleinfo/abstract"/>
+ <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="artheader/abstract"/>
+ <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="info/abstract"/>
+</xsl:template>
+
+<xsl:template name="article.titlepage.verso">
+</xsl:template>
+
+<xsl:template name="article.titlepage.separator"><hr/>
+</xsl:template>
+
+<xsl:template name="article.titlepage.before.recto">
+</xsl:template>
+
+<xsl:template name="article.titlepage.before.verso">
+</xsl:template>
+
+<xsl:template name="article.titlepage">
+ <div class="titlepage">
+ <xsl:variable name="recto.content">
+ <xsl:call-template name="article.titlepage.before.recto"/>
+ <xsl:call-template name="article.titlepage.recto"/>
+ </xsl:variable>
+ <xsl:variable name="recto.elements.count">
+ <xsl:choose>
+ <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
+ <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
+ <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
+ <xsl:otherwise>1</xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+ <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count > 0)">
+ <div><xsl:copy-of select="$recto.content"/></div>
+ </xsl:if>
+ <xsl:variable name="verso.content">
+ <xsl:call-template name="article.titlepage.before.verso"/>
+ <xsl:call-template name="article.titlepage.verso"/>
+ </xsl:variable>
+ <xsl:variable name="verso.elements.count">
+ <xsl:choose>
+ <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
+ <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
+ <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
+ <xsl:otherwise>1</xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+ <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count > 0)">
+ <div><xsl:copy-of select="$verso.content"/></div>
+ </xsl:if>
+ <xsl:call-template name="article.titlepage.separator"/>
+ </div>
+</xsl:template>
+
+<xsl:template match="*" mode="article.titlepage.recto.mode">
+ <!-- if an element isn't found in this mode, -->
+ <!-- try the generic titlepage.mode -->
+ <xsl:apply-templates select="." mode="titlepage.mode"/>
+</xsl:template>
+
+<xsl:template match="*" mode="article.titlepage.verso.mode">
+ <!-- if an element isn't found in this mode, -->
+ <!-- try the generic titlepage.mode -->
+ <xsl:apply-templates select="." mode="titlepage.mode"/>
+</xsl:template>
+
+<xsl:template match="title" mode="article.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="article.titlepage.recto.style">
+<xsl:apply-templates select="." mode="article.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="subtitle" mode="article.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="article.titlepage.recto.style">
+<xsl:apply-templates select="." mode="article.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="corpauthor" mode="article.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="article.titlepage.recto.style">
+<xsl:apply-templates select="." mode="article.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="authorgroup" mode="article.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="article.titlepage.recto.style">
+<xsl:apply-templates select="." mode="article.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="author" mode="article.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="article.titlepage.recto.style">
+<xsl:apply-templates select="." mode="article.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="othercredit" mode="article.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="article.titlepage.recto.style">
+<xsl:apply-templates select="." mode="article.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="releaseinfo" mode="article.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="article.titlepage.recto.style">
+<xsl:apply-templates select="." mode="article.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="copyright" mode="article.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="article.titlepage.recto.style">
+<xsl:apply-templates select="." mode="article.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="legalnotice" mode="article.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="article.titlepage.recto.style">
+<xsl:apply-templates select="." mode="article.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="pubdate" mode="article.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="article.titlepage.recto.style">
+<xsl:apply-templates select="." mode="article.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="revision" mode="article.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="article.titlepage.recto.style">
+<xsl:apply-templates select="." mode="article.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="revhistory" mode="article.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="article.titlepage.recto.style">
+<xsl:apply-templates select="." mode="article.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="abstract" mode="article.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="article.titlepage.recto.style">
+<xsl:apply-templates select="." mode="article.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template name="set.titlepage.recto">
+ <xsl:choose>
+ <xsl:when test="setinfo/title">
+ <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="setinfo/title"/>
+ </xsl:when>
+ <xsl:when test="info/title">
+ <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="info/title"/>
+ </xsl:when>
+ <xsl:when test="title">
+ <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="title"/>
+ </xsl:when>
+ </xsl:choose>
+
+ <xsl:choose>
+ <xsl:when test="setinfo/subtitle">
+ <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="setinfo/subtitle"/>
+ </xsl:when>
+ <xsl:when test="info/subtitle">
+ <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="info/subtitle"/>
+ </xsl:when>
+ <xsl:when test="subtitle">
+ <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="subtitle"/>
+ </xsl:when>
+ </xsl:choose>
+
+ <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="setinfo/corpauthor"/>
+ <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="info/corpauthor"/>
+ <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="setinfo/authorgroup"/>
+ <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="info/authorgroup"/>
+ <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="setinfo/author"/>
+ <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="info/author"/>
+ <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="setinfo/othercredit"/>
+ <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="info/othercredit"/>
+ <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="setinfo/releaseinfo"/>
+ <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="info/releaseinfo"/>
+ <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="setinfo/copyright"/>
+ <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="info/copyright"/>
+ <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="setinfo/legalnotice"/>
+ <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="info/legalnotice"/>
+ <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="setinfo/pubdate"/>
+ <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="info/pubdate"/>
+ <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="setinfo/revision"/>
+ <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="info/revision"/>
+ <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="setinfo/revhistory"/>
+ <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="info/revhistory"/>
+ <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="setinfo/abstract"/>
+ <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="info/abstract"/>
+</xsl:template>
+
+<xsl:template name="set.titlepage.verso">
+</xsl:template>
+
+<xsl:template name="set.titlepage.separator"><hr/>
+</xsl:template>
+
+<xsl:template name="set.titlepage.before.recto">
+</xsl:template>
+
+<xsl:template name="set.titlepage.before.verso">
+</xsl:template>
+
+<xsl:template name="set.titlepage">
+ <div class="titlepage">
+ <xsl:variable name="recto.content">
+ <xsl:call-template name="set.titlepage.before.recto"/>
+ <xsl:call-template name="set.titlepage.recto"/>
+ </xsl:variable>
+ <xsl:variable name="recto.elements.count">
+ <xsl:choose>
+ <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
+ <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
+ <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
+ <xsl:otherwise>1</xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+ <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count > 0)">
+ <div><xsl:copy-of select="$recto.content"/></div>
+ </xsl:if>
+ <xsl:variable name="verso.content">
+ <xsl:call-template name="set.titlepage.before.verso"/>
+ <xsl:call-template name="set.titlepage.verso"/>
+ </xsl:variable>
+ <xsl:variable name="verso.elements.count">
+ <xsl:choose>
+ <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
+ <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
+ <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
+ <xsl:otherwise>1</xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+ <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count > 0)">
+ <div><xsl:copy-of select="$verso.content"/></div>
+ </xsl:if>
+ <xsl:call-template name="set.titlepage.separator"/>
+ </div>
+</xsl:template>
+
+<xsl:template match="*" mode="set.titlepage.recto.mode">
+ <!-- if an element isn't found in this mode, -->
+ <!-- try the generic titlepage.mode -->
+ <xsl:apply-templates select="." mode="titlepage.mode"/>
+</xsl:template>
+
+<xsl:template match="*" mode="set.titlepage.verso.mode">
+ <!-- if an element isn't found in this mode, -->
+ <!-- try the generic titlepage.mode -->
+ <xsl:apply-templates select="." mode="titlepage.mode"/>
+</xsl:template>
+
+<xsl:template match="title" mode="set.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="set.titlepage.recto.style">
+<xsl:apply-templates select="." mode="set.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="subtitle" mode="set.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="set.titlepage.recto.style">
+<xsl:apply-templates select="." mode="set.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="corpauthor" mode="set.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="set.titlepage.recto.style">
+<xsl:apply-templates select="." mode="set.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="authorgroup" mode="set.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="set.titlepage.recto.style">
+<xsl:apply-templates select="." mode="set.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="author" mode="set.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="set.titlepage.recto.style">
+<xsl:apply-templates select="." mode="set.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="othercredit" mode="set.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="set.titlepage.recto.style">
+<xsl:apply-templates select="." mode="set.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="releaseinfo" mode="set.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="set.titlepage.recto.style">
+<xsl:apply-templates select="." mode="set.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="copyright" mode="set.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="set.titlepage.recto.style">
+<xsl:apply-templates select="." mode="set.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="legalnotice" mode="set.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="set.titlepage.recto.style">
+<xsl:apply-templates select="." mode="set.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="pubdate" mode="set.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="set.titlepage.recto.style">
+<xsl:apply-templates select="." mode="set.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="revision" mode="set.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="set.titlepage.recto.style">
+<xsl:apply-templates select="." mode="set.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="revhistory" mode="set.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="set.titlepage.recto.style">
+<xsl:apply-templates select="." mode="set.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="abstract" mode="set.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="set.titlepage.recto.style">
+<xsl:apply-templates select="." mode="set.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template name="book.titlepage.recto">
+ <xsl:choose>
+ <xsl:when test="bookinfo/title">
+ <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/title"/>
+ </xsl:when>
+ <xsl:when test="info/title">
+ <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/title"/>
+ </xsl:when>
+ <xsl:when test="title">
+ <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="title"/>
+ </xsl:when>
+ </xsl:choose>
+
+ <xsl:choose>
+ <xsl:when test="bookinfo/subtitle">
+ <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/subtitle"/>
+ </xsl:when>
+ <xsl:when test="info/subtitle">
+ <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/subtitle"/>
+ </xsl:when>
+ <xsl:when test="subtitle">
+ <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="subtitle"/>
+ </xsl:when>
+ </xsl:choose>
+
+ <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/corpauthor"/>
+ <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/corpauthor"/>
+ <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/authorgroup"/>
+ <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/authorgroup"/>
+ <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/author"/>
+ <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/author"/>
+ <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/othercredit"/>
+ <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/othercredit"/>
+ <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/releaseinfo"/>
+ <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/releaseinfo"/>
+ <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/copyright"/>
+ <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/copyright"/>
+ <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/legalnotice"/>
+ <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/legalnotice"/>
+ <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/pubdate"/>
+ <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/pubdate"/>
+ <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/revision"/>
+ <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/revision"/>
+ <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/revhistory"/>
+ <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/revhistory"/>
+ <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/abstract"/>
+ <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/abstract"/>
+</xsl:template>
+
+<xsl:template name="book.titlepage.verso">
+</xsl:template>
+
+<xsl:template name="book.titlepage.separator"><hr/>
+</xsl:template>
+
+<xsl:template name="book.titlepage.before.recto">
+</xsl:template>
+
+<xsl:template name="book.titlepage.before.verso">
+</xsl:template>
+
+<xsl:template name="book.titlepage">
+ <div class="titlepage">
+ <xsl:variable name="recto.content">
+ <xsl:call-template name="book.titlepage.before.recto"/>
+ <xsl:call-template name="book.titlepage.recto"/>
+ </xsl:variable>
+ <xsl:variable name="recto.elements.count">
+ <xsl:choose>
+ <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
+ <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
+ <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
+ <xsl:otherwise>1</xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+ <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count > 0)">
+ <div><xsl:copy-of select="$recto.content"/></div>
+ </xsl:if>
+ <xsl:variable name="verso.content">
+ <xsl:call-template name="book.titlepage.before.verso"/>
+ <xsl:call-template name="book.titlepage.verso"/>
+ </xsl:variable>
+ <xsl:variable name="verso.elements.count">
+ <xsl:choose>
+ <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
+ <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
+ <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
+ <xsl:otherwise>1</xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+ <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count > 0)">
+ <div><xsl:copy-of select="$verso.content"/></div>
+ </xsl:if>
+ <xsl:call-template name="book.titlepage.separator"/>
+ </div>
+</xsl:template>
+
+<xsl:template match="*" mode="book.titlepage.recto.mode">
+ <!-- if an element isn't found in this mode, -->
+ <!-- try the generic titlepage.mode -->
+ <xsl:apply-templates select="." mode="titlepage.mode"/>
+</xsl:template>
+
+<xsl:template match="*" mode="book.titlepage.verso.mode">
+ <!-- if an element isn't found in this mode, -->
+ <!-- try the generic titlepage.mode -->
+ <xsl:apply-templates select="." mode="titlepage.mode"/>
+</xsl:template>
+
+<xsl:template match="title" mode="book.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="book.titlepage.recto.style">
+<xsl:apply-templates select="." mode="book.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="subtitle" mode="book.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="book.titlepage.recto.style">
+<xsl:apply-templates select="." mode="book.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="corpauthor" mode="book.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="book.titlepage.recto.style">
+<xsl:apply-templates select="." mode="book.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="authorgroup" mode="book.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="book.titlepage.recto.style">
+<xsl:apply-templates select="." mode="book.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="author" mode="book.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="book.titlepage.recto.style">
+<xsl:apply-templates select="." mode="book.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="othercredit" mode="book.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="book.titlepage.recto.style">
+<xsl:apply-templates select="." mode="book.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="releaseinfo" mode="book.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="book.titlepage.recto.style">
+<xsl:apply-templates select="." mode="book.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="copyright" mode="book.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="book.titlepage.recto.style">
+<xsl:apply-templates select="." mode="book.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="legalnotice" mode="book.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="book.titlepage.recto.style">
+<xsl:apply-templates select="." mode="book.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="pubdate" mode="book.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="book.titlepage.recto.style">
+<xsl:apply-templates select="." mode="book.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="revision" mode="book.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="book.titlepage.recto.style">
+<xsl:apply-templates select="." mode="book.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="revhistory" mode="book.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="book.titlepage.recto.style">
+<xsl:apply-templates select="." mode="book.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="abstract" mode="book.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="book.titlepage.recto.style">
+<xsl:apply-templates select="." mode="book.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template name="part.titlepage.recto">
+ <div xsl:use-attribute-sets="part.titlepage.recto.style">
+<xsl:call-template name="division.title">
+<xsl:with-param name="node" select="ancestor-or-self::part[1]"/>
+</xsl:call-template></div>
+ <xsl:choose>
+ <xsl:when test="partinfo/subtitle">
+ <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="partinfo/subtitle"/>
+ </xsl:when>
+ <xsl:when test="docinfo/subtitle">
+ <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="docinfo/subtitle"/>
+ </xsl:when>
+ <xsl:when test="info/subtitle">
+ <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="info/subtitle"/>
+ </xsl:when>
+ <xsl:when test="subtitle">
+ <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="subtitle"/>
+ </xsl:when>
+ </xsl:choose>
+
+ <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="partinfo/corpauthor"/>
+ <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="docinfo/corpauthor"/>
+ <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="info/corpauthor"/>
+ <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="partinfo/authorgroup"/>
+ <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="docinfo/authorgroup"/>
+ <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="info/authorgroup"/>
+ <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="partinfo/author"/>
+ <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="docinfo/author"/>
+ <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="info/author"/>
+ <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="partinfo/othercredit"/>
+ <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="docinfo/othercredit"/>
+ <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="info/othercredit"/>
+ <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="partinfo/releaseinfo"/>
+ <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="docinfo/releaseinfo"/>
+ <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="info/releaseinfo"/>
+ <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="partinfo/copyright"/>
+ <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="docinfo/copyright"/>
+ <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="info/copyright"/>
+ <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="partinfo/legalnotice"/>
+ <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="docinfo/legalnotice"/>
+ <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="info/legalnotice"/>
+ <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="partinfo/pubdate"/>
+ <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="docinfo/pubdate"/>
+ <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="info/pubdate"/>
+ <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="partinfo/revision"/>
+ <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="docinfo/revision"/>
+ <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="info/revision"/>
+ <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="partinfo/revhistory"/>
+ <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="docinfo/revhistory"/>
+ <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="info/revhistory"/>
+ <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="partinfo/abstract"/>
+ <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="docinfo/abstract"/>
+ <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="info/abstract"/>
+</xsl:template>
+
+<xsl:template name="part.titlepage.verso">
+</xsl:template>
+
+<xsl:template name="part.titlepage.separator">
+</xsl:template>
+
+<xsl:template name="part.titlepage.before.recto">
+</xsl:template>
+
+<xsl:template name="part.titlepage.before.verso">
+</xsl:template>
+
+<xsl:template name="part.titlepage">
+ <div class="titlepage">
+ <xsl:variable name="recto.content">
+ <xsl:call-template name="part.titlepage.before.recto"/>
+ <xsl:call-template name="part.titlepage.recto"/>
+ </xsl:variable>
+ <xsl:variable name="recto.elements.count">
+ <xsl:choose>
+ <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
+ <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
+ <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
+ <xsl:otherwise>1</xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+ <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count > 0)">
+ <div><xsl:copy-of select="$recto.content"/></div>
+ </xsl:if>
+ <xsl:variable name="verso.content">
+ <xsl:call-template name="part.titlepage.before.verso"/>
+ <xsl:call-template name="part.titlepage.verso"/>
+ </xsl:variable>
+ <xsl:variable name="verso.elements.count">
+ <xsl:choose>
+ <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
+ <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
+ <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
+ <xsl:otherwise>1</xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+ <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count > 0)">
+ <div><xsl:copy-of select="$verso.content"/></div>
+ </xsl:if>
+ <xsl:call-template name="part.titlepage.separator"/>
+ </div>
+</xsl:template>
+
+<xsl:template match="*" mode="part.titlepage.recto.mode">
+ <!-- if an element isn't found in this mode, -->
+ <!-- try the generic titlepage.mode -->
+ <xsl:apply-templates select="." mode="titlepage.mode"/>
+</xsl:template>
+
+<xsl:template match="*" mode="part.titlepage.verso.mode">
+ <!-- if an element isn't found in this mode, -->
+ <!-- try the generic titlepage.mode -->
+ <xsl:apply-templates select="." mode="titlepage.mode"/>
+</xsl:template>
+
+<xsl:template match="subtitle" mode="part.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="part.titlepage.recto.style">
+<xsl:apply-templates select="." mode="part.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="corpauthor" mode="part.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="part.titlepage.recto.style">
+<xsl:apply-templates select="." mode="part.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="authorgroup" mode="part.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="part.titlepage.recto.style">
+<xsl:apply-templates select="." mode="part.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="author" mode="part.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="part.titlepage.recto.style">
+<xsl:apply-templates select="." mode="part.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="othercredit" mode="part.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="part.titlepage.recto.style">
+<xsl:apply-templates select="." mode="part.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="releaseinfo" mode="part.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="part.titlepage.recto.style">
+<xsl:apply-templates select="." mode="part.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="copyright" mode="part.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="part.titlepage.recto.style">
+<xsl:apply-templates select="." mode="part.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="legalnotice" mode="part.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="part.titlepage.recto.style">
+<xsl:apply-templates select="." mode="part.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="pubdate" mode="part.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="part.titlepage.recto.style">
+<xsl:apply-templates select="." mode="part.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="revision" mode="part.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="part.titlepage.recto.style">
+<xsl:apply-templates select="." mode="part.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="revhistory" mode="part.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="part.titlepage.recto.style">
+<xsl:apply-templates select="." mode="part.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="abstract" mode="part.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="part.titlepage.recto.style">
+<xsl:apply-templates select="." mode="part.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template name="partintro.titlepage.recto">
+ <xsl:choose>
+ <xsl:when test="partintroinfo/title">
+ <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="partintroinfo/title"/>
+ </xsl:when>
+ <xsl:when test="docinfo/title">
+ <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="docinfo/title"/>
+ </xsl:when>
+ <xsl:when test="info/title">
+ <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="info/title"/>
+ </xsl:when>
+ <xsl:when test="title">
+ <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="title"/>
+ </xsl:when>
+ </xsl:choose>
+
+ <xsl:choose>
+ <xsl:when test="partintroinfo/subtitle">
+ <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="partintroinfo/subtitle"/>
+ </xsl:when>
+ <xsl:when test="docinfo/subtitle">
+ <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="docinfo/subtitle"/>
+ </xsl:when>
+ <xsl:when test="info/subtitle">
+ <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="info/subtitle"/>
+ </xsl:when>
+ <xsl:when test="subtitle">
+ <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="subtitle"/>
+ </xsl:when>
+ </xsl:choose>
+
+ <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="partintroinfo/corpauthor"/>
+ <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="docinfo/corpauthor"/>
+ <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="info/corpauthor"/>
+ <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="partintroinfo/authorgroup"/>
+ <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="docinfo/authorgroup"/>
+ <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="info/authorgroup"/>
+ <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="partintroinfo/author"/>
+ <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="docinfo/author"/>
+ <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="info/author"/>
+ <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="partintroinfo/othercredit"/>
+ <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="docinfo/othercredit"/>
+ <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="info/othercredit"/>
+ <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="partintroinfo/releaseinfo"/>
+ <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="docinfo/releaseinfo"/>
+ <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="info/releaseinfo"/>
+ <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="partintroinfo/copyright"/>
+ <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="docinfo/copyright"/>
+ <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="info/copyright"/>
+ <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="partintroinfo/legalnotice"/>
+ <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="docinfo/legalnotice"/>
+ <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="info/legalnotice"/>
+ <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="partintroinfo/pubdate"/>
+ <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="docinfo/pubdate"/>
+ <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="info/pubdate"/>
+ <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="partintroinfo/revision"/>
+ <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="docinfo/revision"/>
+ <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="info/revision"/>
+ <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="partintroinfo/revhistory"/>
+ <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="docinfo/revhistory"/>
+ <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="info/revhistory"/>
+ <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="partintroinfo/abstract"/>
+ <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="docinfo/abstract"/>
+ <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="info/abstract"/>
+</xsl:template>
+
+<xsl:template name="partintro.titlepage.verso">
+</xsl:template>
+
+<xsl:template name="partintro.titlepage.separator">
+</xsl:template>
+
+<xsl:template name="partintro.titlepage.before.recto">
+</xsl:template>
+
+<xsl:template name="partintro.titlepage.before.verso">
+</xsl:template>
+
+<xsl:template name="partintro.titlepage">
+ <div>
+ <xsl:variable name="recto.content">
+ <xsl:call-template name="partintro.titlepage.before.recto"/>
+ <xsl:call-template name="partintro.titlepage.recto"/>
+ </xsl:variable>
+ <xsl:variable name="recto.elements.count">
+ <xsl:choose>
+ <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
+ <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
+ <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
+ <xsl:otherwise>1</xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+ <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count > 0)">
+ <div><xsl:copy-of select="$recto.content"/></div>
+ </xsl:if>
+ <xsl:variable name="verso.content">
+ <xsl:call-template name="partintro.titlepage.before.verso"/>
+ <xsl:call-template name="partintro.titlepage.verso"/>
+ </xsl:variable>
+ <xsl:variable name="verso.elements.count">
+ <xsl:choose>
+ <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
+ <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
+ <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
+ <xsl:otherwise>1</xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+ <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count > 0)">
+ <div><xsl:copy-of select="$verso.content"/></div>
+ </xsl:if>
+ <xsl:call-template name="partintro.titlepage.separator"/>
+ </div>
+</xsl:template>
+
+<xsl:template match="*" mode="partintro.titlepage.recto.mode">
+ <!-- if an element isn't found in this mode, -->
+ <!-- try the generic titlepage.mode -->
+ <xsl:apply-templates select="." mode="titlepage.mode"/>
+</xsl:template>
+
+<xsl:template match="*" mode="partintro.titlepage.verso.mode">
+ <!-- if an element isn't found in this mode, -->
+ <!-- try the generic titlepage.mode -->
+ <xsl:apply-templates select="." mode="titlepage.mode"/>
+</xsl:template>
+
+<xsl:template match="title" mode="partintro.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="partintro.titlepage.recto.style">
+<xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="subtitle" mode="partintro.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="partintro.titlepage.recto.style">
+<xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="corpauthor" mode="partintro.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="partintro.titlepage.recto.style">
+<xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="authorgroup" mode="partintro.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="partintro.titlepage.recto.style">
+<xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="author" mode="partintro.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="partintro.titlepage.recto.style">
+<xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="othercredit" mode="partintro.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="partintro.titlepage.recto.style">
+<xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="releaseinfo" mode="partintro.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="partintro.titlepage.recto.style">
+<xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="copyright" mode="partintro.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="partintro.titlepage.recto.style">
+<xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="legalnotice" mode="partintro.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="partintro.titlepage.recto.style">
+<xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="pubdate" mode="partintro.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="partintro.titlepage.recto.style">
+<xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="revision" mode="partintro.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="partintro.titlepage.recto.style">
+<xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="revhistory" mode="partintro.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="partintro.titlepage.recto.style">
+<xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="abstract" mode="partintro.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="partintro.titlepage.recto.style">
+<xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template name="reference.titlepage.recto">
+ <xsl:choose>
+ <xsl:when test="referenceinfo/title">
+ <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="referenceinfo/title"/>
+ </xsl:when>
+ <xsl:when test="docinfo/title">
+ <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="docinfo/title"/>
+ </xsl:when>
+ <xsl:when test="info/title">
+ <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="info/title"/>
+ </xsl:when>
+ <xsl:when test="title">
+ <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="title"/>
+ </xsl:when>
+ </xsl:choose>
+
+ <xsl:choose>
+ <xsl:when test="referenceinfo/subtitle">
+ <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="referenceinfo/subtitle"/>
+ </xsl:when>
+ <xsl:when test="docinfo/subtitle">
+ <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="docinfo/subtitle"/>
+ </xsl:when>
+ <xsl:when test="info/subtitle">
+ <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="info/subtitle"/>
+ </xsl:when>
+ <xsl:when test="subtitle">
+ <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="subtitle"/>
+ </xsl:when>
+ </xsl:choose>
+
+ <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="referenceinfo/corpauthor"/>
+ <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="docinfo/corpauthor"/>
+ <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="info/corpauthor"/>
+ <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="referenceinfo/authorgroup"/>
+ <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="docinfo/authorgroup"/>
+ <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="info/authorgroup"/>
+ <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="referenceinfo/author"/>
+ <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="docinfo/author"/>
+ <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="info/author"/>
+ <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="referenceinfo/othercredit"/>
+ <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="docinfo/othercredit"/>
+ <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="info/othercredit"/>
+ <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="referenceinfo/releaseinfo"/>
+ <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="docinfo/releaseinfo"/>
+ <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="info/releaseinfo"/>
+ <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="referenceinfo/copyright"/>
+ <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="docinfo/copyright"/>
+ <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="info/copyright"/>
+ <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="referenceinfo/legalnotice"/>
+ <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="docinfo/legalnotice"/>
+ <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="info/legalnotice"/>
+ <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="referenceinfo/pubdate"/>
+ <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="docinfo/pubdate"/>
+ <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="info/pubdate"/>
+ <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="referenceinfo/revision"/>
+ <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="docinfo/revision"/>
+ <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="info/revision"/>
+ <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="referenceinfo/revhistory"/>
+ <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="docinfo/revhistory"/>
+ <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="info/revhistory"/>
+ <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="referenceinfo/abstract"/>
+ <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="docinfo/abstract"/>
+ <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="info/abstract"/>
+</xsl:template>
+
+<xsl:template name="reference.titlepage.verso">
+</xsl:template>
+
+<xsl:template name="reference.titlepage.separator"><hr/>
+</xsl:template>
+
+<xsl:template name="reference.titlepage.before.recto">
+</xsl:template>
+
+<xsl:template name="reference.titlepage.before.verso">
+</xsl:template>
+
+<xsl:template name="reference.titlepage">
+ <div class="titlepage">
+ <xsl:variable name="recto.content">
+ <xsl:call-template name="reference.titlepage.before.recto"/>
+ <xsl:call-template name="reference.titlepage.recto"/>
+ </xsl:variable>
+ <xsl:variable name="recto.elements.count">
+ <xsl:choose>
+ <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
+ <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
+ <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
+ <xsl:otherwise>1</xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+ <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count > 0)">
+ <div><xsl:copy-of select="$recto.content"/></div>
+ </xsl:if>
+ <xsl:variable name="verso.content">
+ <xsl:call-template name="reference.titlepage.before.verso"/>
+ <xsl:call-template name="reference.titlepage.verso"/>
+ </xsl:variable>
+ <xsl:variable name="verso.elements.count">
+ <xsl:choose>
+ <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
+ <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
+ <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
+ <xsl:otherwise>1</xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+ <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count > 0)">
+ <div><xsl:copy-of select="$verso.content"/></div>
+ </xsl:if>
+ <xsl:call-template name="reference.titlepage.separator"/>
+ </div>
+</xsl:template>
+
+<xsl:template match="*" mode="reference.titlepage.recto.mode">
+ <!-- if an element isn't found in this mode, -->
+ <!-- try the generic titlepage.mode -->
+ <xsl:apply-templates select="." mode="titlepage.mode"/>
+</xsl:template>
+
+<xsl:template match="*" mode="reference.titlepage.verso.mode">
+ <!-- if an element isn't found in this mode, -->
+ <!-- try the generic titlepage.mode -->
+ <xsl:apply-templates select="." mode="titlepage.mode"/>
+</xsl:template>
+
+<xsl:template match="title" mode="reference.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="reference.titlepage.recto.style">
+<xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="subtitle" mode="reference.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="reference.titlepage.recto.style">
+<xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="corpauthor" mode="reference.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="reference.titlepage.recto.style">
+<xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="authorgroup" mode="reference.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="reference.titlepage.recto.style">
+<xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="author" mode="reference.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="reference.titlepage.recto.style">
+<xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="othercredit" mode="reference.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="reference.titlepage.recto.style">
+<xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="releaseinfo" mode="reference.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="reference.titlepage.recto.style">
+<xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="copyright" mode="reference.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="reference.titlepage.recto.style">
+<xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="legalnotice" mode="reference.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="reference.titlepage.recto.style">
+<xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="pubdate" mode="reference.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="reference.titlepage.recto.style">
+<xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="revision" mode="reference.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="reference.titlepage.recto.style">
+<xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="revhistory" mode="reference.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="reference.titlepage.recto.style">
+<xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="abstract" mode="reference.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="reference.titlepage.recto.style">
+<xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template name="refentry.titlepage.recto">
+</xsl:template>
+
+<xsl:template name="refentry.titlepage.verso">
+</xsl:template>
+
+<xsl:template name="refentry.titlepage.separator">
+</xsl:template>
+
+<xsl:template name="refentry.titlepage.before.recto">
+</xsl:template>
+
+<xsl:template name="refentry.titlepage.before.verso">
+</xsl:template>
+
+<xsl:template name="refentry.titlepage">
+ <div class="titlepage">
+ <xsl:variable name="recto.content">
+ <xsl:call-template name="refentry.titlepage.before.recto"/>
+ <xsl:call-template name="refentry.titlepage.recto"/>
+ </xsl:variable>
+ <xsl:variable name="recto.elements.count">
+ <xsl:choose>
+ <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
+ <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
+ <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
+ <xsl:otherwise>1</xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+ <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count > 0)">
+ <div><xsl:copy-of select="$recto.content"/></div>
+ </xsl:if>
+ <xsl:variable name="verso.content">
+ <xsl:call-template name="refentry.titlepage.before.verso"/>
+ <xsl:call-template name="refentry.titlepage.verso"/>
+ </xsl:variable>
+ <xsl:variable name="verso.elements.count">
+ <xsl:choose>
+ <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
+ <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
+ <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
+ <xsl:otherwise>1</xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+ <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count > 0)">
+ <div><xsl:copy-of select="$verso.content"/></div>
+ </xsl:if>
+ <xsl:call-template name="refentry.titlepage.separator"/>
+ </div>
+</xsl:template>
+
+<xsl:template match="*" mode="refentry.titlepage.recto.mode">
+ <!-- if an element isn't found in this mode, -->
+ <!-- try the generic titlepage.mode -->
+ <xsl:apply-templates select="." mode="titlepage.mode"/>
+</xsl:template>
+
+<xsl:template match="*" mode="refentry.titlepage.verso.mode">
+ <!-- if an element isn't found in this mode, -->
+ <!-- try the generic titlepage.mode -->
+ <xsl:apply-templates select="." mode="titlepage.mode"/>
+</xsl:template>
+
+<xsl:template name="dedication.titlepage.recto">
+ <div xsl:use-attribute-sets="dedication.titlepage.recto.style">
+<xsl:call-template name="component.title">
+<xsl:with-param name="node" select="ancestor-or-self::dedication[1]"/>
+</xsl:call-template></div>
+ <xsl:choose>
+ <xsl:when test="dedicationinfo/subtitle">
+ <xsl:apply-templates mode="dedication.titlepage.recto.auto.mode" select="dedicationinfo/subtitle"/>
+ </xsl:when>
+ <xsl:when test="docinfo/subtitle">
+ <xsl:apply-templates mode="dedication.titlepage.recto.auto.mode" select="docinfo/subtitle"/>
+ </xsl:when>
+ <xsl:when test="info/subtitle">
+ <xsl:apply-templates mode="dedication.titlepage.recto.auto.mode" select="info/subtitle"/>
+ </xsl:when>
+ <xsl:when test="subtitle">
+ <xsl:apply-templates mode="dedication.titlepage.recto.auto.mode" select="subtitle"/>
+ </xsl:when>
+ </xsl:choose>
+
+</xsl:template>
+
+<xsl:template name="dedication.titlepage.verso">
+</xsl:template>
+
+<xsl:template name="dedication.titlepage.separator">
+</xsl:template>
+
+<xsl:template name="dedication.titlepage.before.recto">
+</xsl:template>
+
+<xsl:template name="dedication.titlepage.before.verso">
+</xsl:template>
+
+<xsl:template name="dedication.titlepage">
+ <div class="titlepage">
+ <xsl:variable name="recto.content">
+ <xsl:call-template name="dedication.titlepage.before.recto"/>
+ <xsl:call-template name="dedication.titlepage.recto"/>
+ </xsl:variable>
+ <xsl:variable name="recto.elements.count">
+ <xsl:choose>
+ <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
+ <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
+ <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
+ <xsl:otherwise>1</xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+ <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count > 0)">
+ <div><xsl:copy-of select="$recto.content"/></div>
+ </xsl:if>
+ <xsl:variable name="verso.content">
+ <xsl:call-template name="dedication.titlepage.before.verso"/>
+ <xsl:call-template name="dedication.titlepage.verso"/>
+ </xsl:variable>
+ <xsl:variable name="verso.elements.count">
+ <xsl:choose>
+ <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
+ <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
+ <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
+ <xsl:otherwise>1</xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+ <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count > 0)">
+ <div><xsl:copy-of select="$verso.content"/></div>
+ </xsl:if>
+ <xsl:call-template name="dedication.titlepage.separator"/>
+ </div>
+</xsl:template>
+
+<xsl:template match="*" mode="dedication.titlepage.recto.mode">
+ <!-- if an element isn't found in this mode, -->
+ <!-- try the generic titlepage.mode -->
+ <xsl:apply-templates select="." mode="titlepage.mode"/>
+</xsl:template>
+
+<xsl:template match="*" mode="dedication.titlepage.verso.mode">
+ <!-- if an element isn't found in this mode, -->
+ <!-- try the generic titlepage.mode -->
+ <xsl:apply-templates select="." mode="titlepage.mode"/>
+</xsl:template>
+
+<xsl:template match="subtitle" mode="dedication.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="dedication.titlepage.recto.style">
+<xsl:apply-templates select="." mode="dedication.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template name="acknowledgements.titlepage.recto">
+ <div xsl:use-attribute-sets="acknowledgements.titlepage.recto.style">
+<xsl:call-template name="component.title">
+<xsl:with-param name="node" select="ancestor-or-self::acknowledgements[1]"/>
+</xsl:call-template></div>
+ <xsl:choose>
+ <xsl:when test="acknowledgementsinfo/subtitle">
+ <xsl:apply-templates mode="acknowledgements.titlepage.recto.auto.mode" select="acknowledgementsinfo/subtitle"/>
+ </xsl:when>
+ <xsl:when test="docinfo/subtitle">
+ <xsl:apply-templates mode="acknowledgements.titlepage.recto.auto.mode" select="docinfo/subtitle"/>
+ </xsl:when>
+ <xsl:when test="info/subtitle">
+ <xsl:apply-templates mode="acknowledgements.titlepage.recto.auto.mode" select="info/subtitle"/>
+ </xsl:when>
+ <xsl:when test="subtitle">
+ <xsl:apply-templates mode="acknowledgements.titlepage.recto.auto.mode" select="subtitle"/>
+ </xsl:when>
+ </xsl:choose>
+
+</xsl:template>
+
+<xsl:template name="acknowledgements.titlepage.verso">
+</xsl:template>
+
+<xsl:template name="acknowledgements.titlepage.separator">
+</xsl:template>
+
+<xsl:template name="acknowledgements.titlepage.before.recto">
+</xsl:template>
+
+<xsl:template name="acknowledgements.titlepage.before.verso">
+</xsl:template>
+
+<xsl:template name="acknowledgements.titlepage">
+ <div class="titlepage">
+ <xsl:variable name="recto.content">
+ <xsl:call-template name="acknowledgements.titlepage.before.recto"/>
+ <xsl:call-template name="acknowledgements.titlepage.recto"/>
+ </xsl:variable>
+ <xsl:variable name="recto.elements.count">
+ <xsl:choose>
+ <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
+ <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
+ <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
+ <xsl:otherwise>1</xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+ <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count > 0)">
+ <div><xsl:copy-of select="$recto.content"/></div>
+ </xsl:if>
+ <xsl:variable name="verso.content">
+ <xsl:call-template name="acknowledgements.titlepage.before.verso"/>
+ <xsl:call-template name="acknowledgements.titlepage.verso"/>
+ </xsl:variable>
+ <xsl:variable name="verso.elements.count">
+ <xsl:choose>
+ <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
+ <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
+ <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
+ <xsl:otherwise>1</xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+ <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count > 0)">
+ <div><xsl:copy-of select="$verso.content"/></div>
+ </xsl:if>
+ <xsl:call-template name="acknowledgements.titlepage.separator"/>
+ </div>
+</xsl:template>
+
+<xsl:template match="*" mode="acknowledgements.titlepage.recto.mode">
+ <!-- if an element isn't found in this mode, -->
+ <!-- try the generic titlepage.mode -->
+ <xsl:apply-templates select="." mode="titlepage.mode"/>
+</xsl:template>
+
+<xsl:template match="*" mode="acknowledgements.titlepage.verso.mode">
+ <!-- if an element isn't found in this mode, -->
+ <!-- try the generic titlepage.mode -->
+ <xsl:apply-templates select="." mode="titlepage.mode"/>
+</xsl:template>
+
+<xsl:template match="subtitle" mode="acknowledgements.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="acknowledgements.titlepage.recto.style">
+<xsl:apply-templates select="." mode="acknowledgements.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template name="preface.titlepage.recto">
+ <xsl:choose>
+ <xsl:when test="prefaceinfo/title">
+ <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/title"/>
+ </xsl:when>
+ <xsl:when test="docinfo/title">
+ <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/title"/>
+ </xsl:when>
+ <xsl:when test="info/title">
+ <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="info/title"/>
+ </xsl:when>
+ <xsl:when test="title">
+ <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="title"/>
+ </xsl:when>
+ </xsl:choose>
+
+ <xsl:choose>
+ <xsl:when test="prefaceinfo/subtitle">
+ <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/subtitle"/>
+ </xsl:when>
+ <xsl:when test="docinfo/subtitle">
+ <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/subtitle"/>
+ </xsl:when>
+ <xsl:when test="info/subtitle">
+ <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="info/subtitle"/>
+ </xsl:when>
+ <xsl:when test="subtitle">
+ <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="subtitle"/>
+ </xsl:when>
+ </xsl:choose>
+
+ <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/corpauthor"/>
+ <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/corpauthor"/>
+ <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="info/corpauthor"/>
+ <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/authorgroup"/>
+ <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/authorgroup"/>
+ <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="info/authorgroup"/>
+ <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/author"/>
+ <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/author"/>
+ <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="info/author"/>
+ <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/othercredit"/>
+ <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/othercredit"/>
+ <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="info/othercredit"/>
+ <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/releaseinfo"/>
+ <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/releaseinfo"/>
+ <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="info/releaseinfo"/>
+ <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/copyright"/>
+ <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/copyright"/>
+ <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="info/copyright"/>
+ <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/legalnotice"/>
+ <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/legalnotice"/>
+ <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="info/legalnotice"/>
+ <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/pubdate"/>
+ <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/pubdate"/>
+ <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="info/pubdate"/>
+ <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/revision"/>
+ <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/revision"/>
+ <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="info/revision"/>
+ <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/revhistory"/>
+ <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/revhistory"/>
+ <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="info/revhistory"/>
+ <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/abstract"/>
+ <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/abstract"/>
+ <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="info/abstract"/>
+</xsl:template>
+
+<xsl:template name="preface.titlepage.verso">
+</xsl:template>
+
+<xsl:template name="preface.titlepage.separator">
+</xsl:template>
+
+<xsl:template name="preface.titlepage.before.recto">
+</xsl:template>
+
+<xsl:template name="preface.titlepage.before.verso">
+</xsl:template>
+
+<xsl:template name="preface.titlepage">
+ <div class="titlepage">
+ <xsl:variable name="recto.content">
+ <xsl:call-template name="preface.titlepage.before.recto"/>
+ <xsl:call-template name="preface.titlepage.recto"/>
+ </xsl:variable>
+ <xsl:variable name="recto.elements.count">
+ <xsl:choose>
+ <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
+ <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
+ <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
+ <xsl:otherwise>1</xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+ <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count > 0)">
+ <div><xsl:copy-of select="$recto.content"/></div>
+ </xsl:if>
+ <xsl:variable name="verso.content">
+ <xsl:call-template name="preface.titlepage.before.verso"/>
+ <xsl:call-template name="preface.titlepage.verso"/>
+ </xsl:variable>
+ <xsl:variable name="verso.elements.count">
+ <xsl:choose>
+ <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
+ <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
+ <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
+ <xsl:otherwise>1</xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+ <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count > 0)">
+ <div><xsl:copy-of select="$verso.content"/></div>
+ </xsl:if>
+ <xsl:call-template name="preface.titlepage.separator"/>
+ </div>
+</xsl:template>
+
+<xsl:template match="*" mode="preface.titlepage.recto.mode">
+ <!-- if an element isn't found in this mode, -->
+ <!-- try the generic titlepage.mode -->
+ <xsl:apply-templates select="." mode="titlepage.mode"/>
+</xsl:template>
+
+<xsl:template match="*" mode="preface.titlepage.verso.mode">
+ <!-- if an element isn't found in this mode, -->
+ <!-- try the generic titlepage.mode -->
+ <xsl:apply-templates select="." mode="titlepage.mode"/>
+</xsl:template>
+
+<xsl:template match="title" mode="preface.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="preface.titlepage.recto.style">
+<xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="subtitle" mode="preface.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="preface.titlepage.recto.style">
+<xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="corpauthor" mode="preface.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="preface.titlepage.recto.style">
+<xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="authorgroup" mode="preface.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="preface.titlepage.recto.style">
+<xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="author" mode="preface.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="preface.titlepage.recto.style">
+<xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="othercredit" mode="preface.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="preface.titlepage.recto.style">
+<xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="releaseinfo" mode="preface.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="preface.titlepage.recto.style">
+<xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="copyright" mode="preface.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="preface.titlepage.recto.style">
+<xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="legalnotice" mode="preface.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="preface.titlepage.recto.style">
+<xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="pubdate" mode="preface.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="preface.titlepage.recto.style">
+<xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="revision" mode="preface.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="preface.titlepage.recto.style">
+<xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="revhistory" mode="preface.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="preface.titlepage.recto.style">
+<xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="abstract" mode="preface.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="preface.titlepage.recto.style">
+<xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template name="chapter.titlepage.recto">
+ <xsl:choose>
+ <xsl:when test="chapterinfo/title">
+ <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="chapterinfo/title"/>
+ </xsl:when>
+ <xsl:when test="docinfo/title">
+ <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="docinfo/title"/>
+ </xsl:when>
+ <xsl:when test="info/title">
+ <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="info/title"/>
+ </xsl:when>
+ <xsl:when test="title">
+ <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="title"/>
+ </xsl:when>
+ </xsl:choose>
+
+ <xsl:choose>
+ <xsl:when test="chapterinfo/subtitle">
+ <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="chapterinfo/subtitle"/>
+ </xsl:when>
+ <xsl:when test="docinfo/subtitle">
+ <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="docinfo/subtitle"/>
+ </xsl:when>
+ <xsl:when test="info/subtitle">
+ <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="info/subtitle"/>
+ </xsl:when>
+ <xsl:when test="subtitle">
+ <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="subtitle"/>
+ </xsl:when>
+ </xsl:choose>
+
+ <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="chapterinfo/corpauthor"/>
+ <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="docinfo/corpauthor"/>
+ <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="info/corpauthor"/>
+ <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="chapterinfo/authorgroup"/>
+ <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="docinfo/authorgroup"/>
+ <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="info/authorgroup"/>
+ <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="chapterinfo/author"/>
+ <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="docinfo/author"/>
+ <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="info/author"/>
+ <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="chapterinfo/othercredit"/>
+ <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="docinfo/othercredit"/>
+ <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="info/othercredit"/>
+ <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="chapterinfo/releaseinfo"/>
+ <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="docinfo/releaseinfo"/>
+ <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="info/releaseinfo"/>
+ <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="chapterinfo/copyright"/>
+ <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="docinfo/copyright"/>
+ <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="info/copyright"/>
+ <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="chapterinfo/legalnotice"/>
+ <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="docinfo/legalnotice"/>
+ <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="info/legalnotice"/>
+ <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="chapterinfo/pubdate"/>
+ <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="docinfo/pubdate"/>
+ <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="info/pubdate"/>
+ <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="chapterinfo/revision"/>
+ <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="docinfo/revision"/>
+ <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="info/revision"/>
+ <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="chapterinfo/revhistory"/>
+ <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="docinfo/revhistory"/>
+ <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="info/revhistory"/>
+ <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="chapterinfo/abstract"/>
+ <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="docinfo/abstract"/>
+ <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="info/abstract"/>
+</xsl:template>
+
+<xsl:template name="chapter.titlepage.verso">
+</xsl:template>
+
+<xsl:template name="chapter.titlepage.separator">
+</xsl:template>
+
+<xsl:template name="chapter.titlepage.before.recto">
+</xsl:template>
+
+<xsl:template name="chapter.titlepage.before.verso">
+</xsl:template>
+
+<xsl:template name="chapter.titlepage">
+ <div class="titlepage">
+ <xsl:variable name="recto.content">
+ <xsl:call-template name="chapter.titlepage.before.recto"/>
+ <xsl:call-template name="chapter.titlepage.recto"/>
+ </xsl:variable>
+ <xsl:variable name="recto.elements.count">
+ <xsl:choose>
+ <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
+ <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
+ <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
+ <xsl:otherwise>1</xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+ <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count > 0)">
+ <div><xsl:copy-of select="$recto.content"/></div>
+ </xsl:if>
+ <xsl:variable name="verso.content">
+ <xsl:call-template name="chapter.titlepage.before.verso"/>
+ <xsl:call-template name="chapter.titlepage.verso"/>
+ </xsl:variable>
+ <xsl:variable name="verso.elements.count">
+ <xsl:choose>
+ <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
+ <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
+ <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
+ <xsl:otherwise>1</xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+ <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count > 0)">
+ <div><xsl:copy-of select="$verso.content"/></div>
+ </xsl:if>
+ <xsl:call-template name="chapter.titlepage.separator"/>
+ </div>
+</xsl:template>
+
+<xsl:template match="*" mode="chapter.titlepage.recto.mode">
+ <!-- if an element isn't found in this mode, -->
+ <!-- try the generic titlepage.mode -->
+ <xsl:apply-templates select="." mode="titlepage.mode"/>
+</xsl:template>
+
+<xsl:template match="*" mode="chapter.titlepage.verso.mode">
+ <!-- if an element isn't found in this mode, -->
+ <!-- try the generic titlepage.mode -->
+ <xsl:apply-templates select="." mode="titlepage.mode"/>
+</xsl:template>
+
+<xsl:template match="title" mode="chapter.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="chapter.titlepage.recto.style">
+<xsl:apply-templates select="." mode="chapter.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="subtitle" mode="chapter.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="chapter.titlepage.recto.style">
+<xsl:apply-templates select="." mode="chapter.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="corpauthor" mode="chapter.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="chapter.titlepage.recto.style">
+<xsl:apply-templates select="." mode="chapter.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="authorgroup" mode="chapter.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="chapter.titlepage.recto.style">
+<xsl:call-template name="chapter.authorgroup">
+</xsl:call-template>
+</div>
+</xsl:template>
+
+<xsl:template match="author" mode="chapter.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="chapter.titlepage.recto.style">
+<xsl:call-template name="chapter.author">
+</xsl:call-template>
+</div>
+</xsl:template>
+
+<xsl:template match="othercredit" mode="chapter.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="chapter.titlepage.recto.style">
+<xsl:apply-templates select="." mode="chapter.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="releaseinfo" mode="chapter.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="chapter.titlepage.recto.style">
+<xsl:apply-templates select="." mode="chapter.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="copyright" mode="chapter.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="chapter.titlepage.recto.style">
+<xsl:apply-templates select="." mode="chapter.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="legalnotice" mode="chapter.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="chapter.titlepage.recto.style">
+<xsl:apply-templates select="." mode="chapter.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="pubdate" mode="chapter.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="chapter.titlepage.recto.style">
+<xsl:apply-templates select="." mode="chapter.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="revision" mode="chapter.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="chapter.titlepage.recto.style">
+<xsl:apply-templates select="." mode="chapter.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="revhistory" mode="chapter.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="chapter.titlepage.recto.style">
+<xsl:apply-templates select="." mode="chapter.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="abstract" mode="chapter.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="chapter.titlepage.recto.style">
+<xsl:apply-templates select="." mode="chapter.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template name="appendix.titlepage.recto">
+ <xsl:choose>
+ <xsl:when test="appendixinfo/title">
+ <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="appendixinfo/title"/>
+ </xsl:when>
+ <xsl:when test="docinfo/title">
+ <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="docinfo/title"/>
+ </xsl:when>
+ <xsl:when test="info/title">
+ <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="info/title"/>
+ </xsl:when>
+ <xsl:when test="title">
+ <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="title"/>
+ </xsl:when>
+ </xsl:choose>
+
+ <xsl:choose>
+ <xsl:when test="appendixinfo/subtitle">
+ <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="appendixinfo/subtitle"/>
+ </xsl:when>
+ <xsl:when test="docinfo/subtitle">
+ <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="docinfo/subtitle"/>
+ </xsl:when>
+ <xsl:when test="info/subtitle">
+ <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="info/subtitle"/>
+ </xsl:when>
+ <xsl:when test="subtitle">
+ <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="subtitle"/>
+ </xsl:when>
+ </xsl:choose>
+
+ <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="appendixinfo/corpauthor"/>
+ <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="docinfo/corpauthor"/>
+ <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="info/corpauthor"/>
+ <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="appendixinfo/authorgroup"/>
+ <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="docinfo/authorgroup"/>
+ <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="info/authorgroup"/>
+ <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="appendixinfo/author"/>
+ <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="docinfo/author"/>
+ <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="info/author"/>
+ <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="appendixinfo/othercredit"/>
+ <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="docinfo/othercredit"/>
+ <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="info/othercredit"/>
+ <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="appendixinfo/releaseinfo"/>
+ <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="docinfo/releaseinfo"/>
+ <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="info/releaseinfo"/>
+ <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="appendixinfo/copyright"/>
+ <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="docinfo/copyright"/>
+ <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="info/copyright"/>
+ <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="appendixinfo/legalnotice"/>
+ <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="docinfo/legalnotice"/>
+ <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="info/legalnotice"/>
+ <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="appendixinfo/pubdate"/>
+ <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="docinfo/pubdate"/>
+ <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="info/pubdate"/>
+ <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="appendixinfo/revision"/>
+ <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="docinfo/revision"/>
+ <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="info/revision"/>
+ <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="appendixinfo/revhistory"/>
+ <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="docinfo/revhistory"/>
+ <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="info/revhistory"/>
+ <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="appendixinfo/abstract"/>
+ <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="docinfo/abstract"/>
+ <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="info/abstract"/>
+</xsl:template>
+
+<xsl:template name="appendix.titlepage.verso">
+</xsl:template>
+
+<xsl:template name="appendix.titlepage.separator">
+</xsl:template>
+
+<xsl:template name="appendix.titlepage.before.recto">
+</xsl:template>
+
+<xsl:template name="appendix.titlepage.before.verso">
+</xsl:template>
+
+<xsl:template name="appendix.titlepage">
+ <div class="titlepage">
+ <xsl:variable name="recto.content">
+ <xsl:call-template name="appendix.titlepage.before.recto"/>
+ <xsl:call-template name="appendix.titlepage.recto"/>
+ </xsl:variable>
+ <xsl:variable name="recto.elements.count">
+ <xsl:choose>
+ <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
+ <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
+ <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
+ <xsl:otherwise>1</xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+ <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count > 0)">
+ <div><xsl:copy-of select="$recto.content"/></div>
+ </xsl:if>
+ <xsl:variable name="verso.content">
+ <xsl:call-template name="appendix.titlepage.before.verso"/>
+ <xsl:call-template name="appendix.titlepage.verso"/>
+ </xsl:variable>
+ <xsl:variable name="verso.elements.count">
+ <xsl:choose>
+ <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
+ <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
+ <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
+ <xsl:otherwise>1</xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+ <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count > 0)">
+ <div><xsl:copy-of select="$verso.content"/></div>
+ </xsl:if>
+ <xsl:call-template name="appendix.titlepage.separator"/>
+ </div>
+</xsl:template>
+
+<xsl:template match="*" mode="appendix.titlepage.recto.mode">
+ <!-- if an element isn't found in this mode, -->
+ <!-- try the generic titlepage.mode -->
+ <xsl:apply-templates select="." mode="titlepage.mode"/>
+</xsl:template>
+
+<xsl:template match="*" mode="appendix.titlepage.verso.mode">
+ <!-- if an element isn't found in this mode, -->
+ <!-- try the generic titlepage.mode -->
+ <xsl:apply-templates select="." mode="titlepage.mode"/>
+</xsl:template>
+
+<xsl:template match="title" mode="appendix.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="appendix.titlepage.recto.style">
+<xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="subtitle" mode="appendix.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="appendix.titlepage.recto.style">
+<xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="corpauthor" mode="appendix.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="appendix.titlepage.recto.style">
+<xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="authorgroup" mode="appendix.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="appendix.titlepage.recto.style">
+<xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="author" mode="appendix.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="appendix.titlepage.recto.style">
+<xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="othercredit" mode="appendix.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="appendix.titlepage.recto.style">
+<xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="releaseinfo" mode="appendix.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="appendix.titlepage.recto.style">
+<xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="copyright" mode="appendix.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="appendix.titlepage.recto.style">
+<xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="legalnotice" mode="appendix.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="appendix.titlepage.recto.style">
+<xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="pubdate" mode="appendix.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="appendix.titlepage.recto.style">
+<xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="revision" mode="appendix.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="appendix.titlepage.recto.style">
+<xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="revhistory" mode="appendix.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="appendix.titlepage.recto.style">
+<xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="abstract" mode="appendix.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="appendix.titlepage.recto.style">
+<xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template name="section.titlepage.recto">
+ <xsl:choose>
+ <xsl:when test="sectioninfo/title">
+ <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="sectioninfo/title"/>
+ </xsl:when>
+ <xsl:when test="info/title">
+ <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="info/title"/>
+ </xsl:when>
+ <xsl:when test="title">
+ <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="title"/>
+ </xsl:when>
+ </xsl:choose>
+
+ <xsl:choose>
+ <xsl:when test="sectioninfo/subtitle">
+ <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="sectioninfo/subtitle"/>
+ </xsl:when>
+ <xsl:when test="info/subtitle">
+ <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="info/subtitle"/>
+ </xsl:when>
+ <xsl:when test="subtitle">
+ <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="subtitle"/>
+ </xsl:when>
+ </xsl:choose>
+
+ <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="sectioninfo/corpauthor"/>
+ <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="info/corpauthor"/>
+ <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="sectioninfo/authorgroup"/>
+ <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="info/authorgroup"/>
+ <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="sectioninfo/author"/>
+ <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="info/author"/>
+ <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="sectioninfo/othercredit"/>
+ <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="info/othercredit"/>
+ <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="sectioninfo/releaseinfo"/>
+ <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="info/releaseinfo"/>
+ <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="sectioninfo/copyright"/>
+ <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="info/copyright"/>
+ <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="sectioninfo/legalnotice"/>
+ <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="info/legalnotice"/>
+ <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="sectioninfo/pubdate"/>
+ <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="info/pubdate"/>
+ <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="sectioninfo/revision"/>
+ <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="info/revision"/>
+ <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="sectioninfo/revhistory"/>
+ <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="info/revhistory"/>
+ <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="sectioninfo/abstract"/>
+ <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="info/abstract"/>
+</xsl:template>
+
+<xsl:template name="section.titlepage.verso">
+</xsl:template>
+
+<xsl:template name="section.titlepage.separator"><xsl:if test="count(parent::*)='0'"><hr/></xsl:if>
+</xsl:template>
+
+<xsl:template name="section.titlepage.before.recto">
+</xsl:template>
+
+<xsl:template name="section.titlepage.before.verso">
+</xsl:template>
+
+<xsl:template name="section.titlepage">
+ <div class="titlepage">
+ <xsl:variable name="recto.content">
+ <xsl:call-template name="section.titlepage.before.recto"/>
+ <xsl:call-template name="section.titlepage.recto"/>
+ </xsl:variable>
+ <xsl:variable name="recto.elements.count">
+ <xsl:choose>
+ <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
+ <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
+ <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
+ <xsl:otherwise>1</xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+ <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count > 0)">
+ <div><xsl:copy-of select="$recto.content"/></div>
+ </xsl:if>
+ <xsl:variable name="verso.content">
+ <xsl:call-template name="section.titlepage.before.verso"/>
+ <xsl:call-template name="section.titlepage.verso"/>
+ </xsl:variable>
+ <xsl:variable name="verso.elements.count">
+ <xsl:choose>
+ <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
+ <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
+ <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
+ <xsl:otherwise>1</xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+ <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count > 0)">
+ <div><xsl:copy-of select="$verso.content"/></div>
+ </xsl:if>
+ <xsl:call-template name="section.titlepage.separator"/>
+ </div>
+</xsl:template>
+
+<xsl:template match="*" mode="section.titlepage.recto.mode">
+ <!-- if an element isn't found in this mode, -->
+ <!-- try the generic titlepage.mode -->
+ <xsl:apply-templates select="." mode="titlepage.mode"/>
+</xsl:template>
+
+<xsl:template match="*" mode="section.titlepage.verso.mode">
+ <!-- if an element isn't found in this mode, -->
+ <!-- try the generic titlepage.mode -->
+ <xsl:apply-templates select="." mode="titlepage.mode"/>
+</xsl:template>
+
+<xsl:template match="title" mode="section.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="section.titlepage.recto.style">
+<xsl:apply-templates select="." mode="section.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="subtitle" mode="section.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="section.titlepage.recto.style">
+<xsl:apply-templates select="." mode="section.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="corpauthor" mode="section.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="section.titlepage.recto.style">
+<xsl:apply-templates select="." mode="section.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="authorgroup" mode="section.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="section.titlepage.recto.style">
+<xsl:apply-templates select="." mode="section.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="author" mode="section.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="section.titlepage.recto.style">
+<xsl:apply-templates select="." mode="section.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="othercredit" mode="section.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="section.titlepage.recto.style">
+<xsl:apply-templates select="." mode="section.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="releaseinfo" mode="section.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="section.titlepage.recto.style">
+<xsl:apply-templates select="." mode="section.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="copyright" mode="section.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="section.titlepage.recto.style">
+<xsl:apply-templates select="." mode="section.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="legalnotice" mode="section.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="section.titlepage.recto.style">
+<xsl:apply-templates select="." mode="section.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="pubdate" mode="section.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="section.titlepage.recto.style">
+<xsl:apply-templates select="." mode="section.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="revision" mode="section.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="section.titlepage.recto.style">
+<xsl:apply-templates select="." mode="section.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="revhistory" mode="section.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="section.titlepage.recto.style">
+<xsl:apply-templates select="." mode="section.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="abstract" mode="section.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="section.titlepage.recto.style">
+<xsl:apply-templates select="." mode="section.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template name="sect1.titlepage.recto">
+ <xsl:choose>
+ <xsl:when test="sect1info/title">
+ <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="sect1info/title"/>
+ </xsl:when>
+ <xsl:when test="info/title">
+ <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="info/title"/>
+ </xsl:when>
+ <xsl:when test="title">
+ <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="title"/>
+ </xsl:when>
+ </xsl:choose>
+
+ <xsl:choose>
+ <xsl:when test="sect1info/subtitle">
+ <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="sect1info/subtitle"/>
+ </xsl:when>
+ <xsl:when test="info/subtitle">
+ <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="info/subtitle"/>
+ </xsl:when>
+ <xsl:when test="subtitle">
+ <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="subtitle"/>
+ </xsl:when>
+ </xsl:choose>
+
+ <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="sect1info/corpauthor"/>
+ <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="info/corpauthor"/>
+ <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="sect1info/authorgroup"/>
+ <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="info/authorgroup"/>
+ <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="sect1info/author"/>
+ <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="info/author"/>
+ <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="sect1info/othercredit"/>
+ <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="info/othercredit"/>
+ <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="sect1info/releaseinfo"/>
+ <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="info/releaseinfo"/>
+ <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="sect1info/copyright"/>
+ <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="info/copyright"/>
+ <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="sect1info/legalnotice"/>
+ <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="info/legalnotice"/>
+ <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="sect1info/pubdate"/>
+ <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="info/pubdate"/>
+ <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="sect1info/revision"/>
+ <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="info/revision"/>
+ <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="sect1info/revhistory"/>
+ <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="info/revhistory"/>
+ <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="sect1info/abstract"/>
+ <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="info/abstract"/>
+</xsl:template>
+
+<xsl:template name="sect1.titlepage.verso">
+</xsl:template>
+
+<xsl:template name="sect1.titlepage.separator"><xsl:if test="count(parent::*)='0'"><hr/></xsl:if>
+</xsl:template>
+
+<xsl:template name="sect1.titlepage.before.recto">
+</xsl:template>
+
+<xsl:template name="sect1.titlepage.before.verso">
+</xsl:template>
+
+<xsl:template name="sect1.titlepage">
+ <div class="titlepage">
+ <xsl:variable name="recto.content">
+ <xsl:call-template name="sect1.titlepage.before.recto"/>
+ <xsl:call-template name="sect1.titlepage.recto"/>
+ </xsl:variable>
+ <xsl:variable name="recto.elements.count">
+ <xsl:choose>
+ <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
+ <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
+ <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
+ <xsl:otherwise>1</xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+ <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count > 0)">
+ <div><xsl:copy-of select="$recto.content"/></div>
+ </xsl:if>
+ <xsl:variable name="verso.content">
+ <xsl:call-template name="sect1.titlepage.before.verso"/>
+ <xsl:call-template name="sect1.titlepage.verso"/>
+ </xsl:variable>
+ <xsl:variable name="verso.elements.count">
+ <xsl:choose>
+ <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
+ <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
+ <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
+ <xsl:otherwise>1</xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+ <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count > 0)">
+ <div><xsl:copy-of select="$verso.content"/></div>
+ </xsl:if>
+ <xsl:call-template name="sect1.titlepage.separator"/>
+ </div>
+</xsl:template>
+
+<xsl:template match="*" mode="sect1.titlepage.recto.mode">
+ <!-- if an element isn't found in this mode, -->
+ <!-- try the generic titlepage.mode -->
+ <xsl:apply-templates select="." mode="titlepage.mode"/>
+</xsl:template>
+
+<xsl:template match="*" mode="sect1.titlepage.verso.mode">
+ <!-- if an element isn't found in this mode, -->
+ <!-- try the generic titlepage.mode -->
+ <xsl:apply-templates select="." mode="titlepage.mode"/>
+</xsl:template>
+
+<xsl:template match="title" mode="sect1.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect1.titlepage.recto.style">
+<xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="subtitle" mode="sect1.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect1.titlepage.recto.style">
+<xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="corpauthor" mode="sect1.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect1.titlepage.recto.style">
+<xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="authorgroup" mode="sect1.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect1.titlepage.recto.style">
+<xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="author" mode="sect1.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect1.titlepage.recto.style">
+<xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="othercredit" mode="sect1.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect1.titlepage.recto.style">
+<xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="releaseinfo" mode="sect1.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect1.titlepage.recto.style">
+<xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="copyright" mode="sect1.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect1.titlepage.recto.style">
+<xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="legalnotice" mode="sect1.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect1.titlepage.recto.style">
+<xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="pubdate" mode="sect1.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect1.titlepage.recto.style">
+<xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="revision" mode="sect1.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect1.titlepage.recto.style">
+<xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="revhistory" mode="sect1.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect1.titlepage.recto.style">
+<xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="abstract" mode="sect1.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect1.titlepage.recto.style">
+<xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template name="sect2.titlepage.recto">
+ <xsl:choose>
+ <xsl:when test="sect2info/title">
+ <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="sect2info/title"/>
+ </xsl:when>
+ <xsl:when test="info/title">
+ <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="info/title"/>
+ </xsl:when>
+ <xsl:when test="title">
+ <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="title"/>
+ </xsl:when>
+ </xsl:choose>
+
+ <xsl:choose>
+ <xsl:when test="sect2info/subtitle">
+ <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="sect2info/subtitle"/>
+ </xsl:when>
+ <xsl:when test="info/subtitle">
+ <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="info/subtitle"/>
+ </xsl:when>
+ <xsl:when test="subtitle">
+ <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="subtitle"/>
+ </xsl:when>
+ </xsl:choose>
+
+ <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="sect2info/corpauthor"/>
+ <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="info/corpauthor"/>
+ <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="sect2info/authorgroup"/>
+ <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="info/authorgroup"/>
+ <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="sect2info/author"/>
+ <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="info/author"/>
+ <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="sect2info/othercredit"/>
+ <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="info/othercredit"/>
+ <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="sect2info/releaseinfo"/>
+ <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="info/releaseinfo"/>
+ <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="sect2info/copyright"/>
+ <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="info/copyright"/>
+ <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="sect2info/legalnotice"/>
+ <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="info/legalnotice"/>
+ <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="sect2info/pubdate"/>
+ <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="info/pubdate"/>
+ <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="sect2info/revision"/>
+ <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="info/revision"/>
+ <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="sect2info/revhistory"/>
+ <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="info/revhistory"/>
+ <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="sect2info/abstract"/>
+ <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="info/abstract"/>
+</xsl:template>
+
+<xsl:template name="sect2.titlepage.verso">
+</xsl:template>
+
+<xsl:template name="sect2.titlepage.separator"><xsl:if test="count(parent::*)='0'"><hr/></xsl:if>
+</xsl:template>
+
+<xsl:template name="sect2.titlepage.before.recto">
+</xsl:template>
+
+<xsl:template name="sect2.titlepage.before.verso">
+</xsl:template>
+
+<xsl:template name="sect2.titlepage">
+ <div class="titlepage">
+ <xsl:variable name="recto.content">
+ <xsl:call-template name="sect2.titlepage.before.recto"/>
+ <xsl:call-template name="sect2.titlepage.recto"/>
+ </xsl:variable>
+ <xsl:variable name="recto.elements.count">
+ <xsl:choose>
+ <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
+ <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
+ <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
+ <xsl:otherwise>1</xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+ <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count > 0)">
+ <div><xsl:copy-of select="$recto.content"/></div>
+ </xsl:if>
+ <xsl:variable name="verso.content">
+ <xsl:call-template name="sect2.titlepage.before.verso"/>
+ <xsl:call-template name="sect2.titlepage.verso"/>
+ </xsl:variable>
+ <xsl:variable name="verso.elements.count">
+ <xsl:choose>
+ <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
+ <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
+ <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
+ <xsl:otherwise>1</xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+ <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count > 0)">
+ <div><xsl:copy-of select="$verso.content"/></div>
+ </xsl:if>
+ <xsl:call-template name="sect2.titlepage.separator"/>
+ </div>
+</xsl:template>
+
+<xsl:template match="*" mode="sect2.titlepage.recto.mode">
+ <!-- if an element isn't found in this mode, -->
+ <!-- try the generic titlepage.mode -->
+ <xsl:apply-templates select="." mode="titlepage.mode"/>
+</xsl:template>
+
+<xsl:template match="*" mode="sect2.titlepage.verso.mode">
+ <!-- if an element isn't found in this mode, -->
+ <!-- try the generic titlepage.mode -->
+ <xsl:apply-templates select="." mode="titlepage.mode"/>
+</xsl:template>
+
+<xsl:template match="title" mode="sect2.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect2.titlepage.recto.style">
+<xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="subtitle" mode="sect2.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect2.titlepage.recto.style">
+<xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="corpauthor" mode="sect2.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect2.titlepage.recto.style">
+<xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="authorgroup" mode="sect2.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect2.titlepage.recto.style">
+<xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="author" mode="sect2.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect2.titlepage.recto.style">
+<xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="othercredit" mode="sect2.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect2.titlepage.recto.style">
+<xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="releaseinfo" mode="sect2.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect2.titlepage.recto.style">
+<xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="copyright" mode="sect2.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect2.titlepage.recto.style">
+<xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="legalnotice" mode="sect2.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect2.titlepage.recto.style">
+<xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="pubdate" mode="sect2.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect2.titlepage.recto.style">
+<xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="revision" mode="sect2.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect2.titlepage.recto.style">
+<xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="revhistory" mode="sect2.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect2.titlepage.recto.style">
+<xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="abstract" mode="sect2.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect2.titlepage.recto.style">
+<xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template name="sect3.titlepage.recto">
+ <xsl:choose>
+ <xsl:when test="sect3info/title">
+ <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="sect3info/title"/>
+ </xsl:when>
+ <xsl:when test="info/title">
+ <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="info/title"/>
+ </xsl:when>
+ <xsl:when test="title">
+ <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="title"/>
+ </xsl:when>
+ </xsl:choose>
+
+ <xsl:choose>
+ <xsl:when test="sect3info/subtitle">
+ <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="sect3info/subtitle"/>
+ </xsl:when>
+ <xsl:when test="info/subtitle">
+ <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="info/subtitle"/>
+ </xsl:when>
+ <xsl:when test="subtitle">
+ <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="subtitle"/>
+ </xsl:when>
+ </xsl:choose>
+
+ <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="sect3info/corpauthor"/>
+ <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="info/corpauthor"/>
+ <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="sect3info/authorgroup"/>
+ <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="info/authorgroup"/>
+ <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="sect3info/author"/>
+ <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="info/author"/>
+ <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="sect3info/othercredit"/>
+ <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="info/othercredit"/>
+ <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="sect3info/releaseinfo"/>
+ <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="info/releaseinfo"/>
+ <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="sect3info/copyright"/>
+ <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="info/copyright"/>
+ <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="sect3info/legalnotice"/>
+ <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="info/legalnotice"/>
+ <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="sect3info/pubdate"/>
+ <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="info/pubdate"/>
+ <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="sect3info/revision"/>
+ <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="info/revision"/>
+ <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="sect3info/revhistory"/>
+ <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="info/revhistory"/>
+ <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="sect3info/abstract"/>
+ <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="info/abstract"/>
+</xsl:template>
+
+<xsl:template name="sect3.titlepage.verso">
+</xsl:template>
+
+<xsl:template name="sect3.titlepage.separator"><xsl:if test="count(parent::*)='0'"><hr/></xsl:if>
+</xsl:template>
+
+<xsl:template name="sect3.titlepage.before.recto">
+</xsl:template>
+
+<xsl:template name="sect3.titlepage.before.verso">
+</xsl:template>
+
+<xsl:template name="sect3.titlepage">
+ <div class="titlepage">
+ <xsl:variable name="recto.content">
+ <xsl:call-template name="sect3.titlepage.before.recto"/>
+ <xsl:call-template name="sect3.titlepage.recto"/>
+ </xsl:variable>
+ <xsl:variable name="recto.elements.count">
+ <xsl:choose>
+ <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
+ <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
+ <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
+ <xsl:otherwise>1</xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+ <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count > 0)">
+ <div><xsl:copy-of select="$recto.content"/></div>
+ </xsl:if>
+ <xsl:variable name="verso.content">
+ <xsl:call-template name="sect3.titlepage.before.verso"/>
+ <xsl:call-template name="sect3.titlepage.verso"/>
+ </xsl:variable>
+ <xsl:variable name="verso.elements.count">
+ <xsl:choose>
+ <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
+ <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
+ <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
+ <xsl:otherwise>1</xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+ <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count > 0)">
+ <div><xsl:copy-of select="$verso.content"/></div>
+ </xsl:if>
+ <xsl:call-template name="sect3.titlepage.separator"/>
+ </div>
+</xsl:template>
+
+<xsl:template match="*" mode="sect3.titlepage.recto.mode">
+ <!-- if an element isn't found in this mode, -->
+ <!-- try the generic titlepage.mode -->
+ <xsl:apply-templates select="." mode="titlepage.mode"/>
+</xsl:template>
+
+<xsl:template match="*" mode="sect3.titlepage.verso.mode">
+ <!-- if an element isn't found in this mode, -->
+ <!-- try the generic titlepage.mode -->
+ <xsl:apply-templates select="." mode="titlepage.mode"/>
+</xsl:template>
+
+<xsl:template match="title" mode="sect3.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect3.titlepage.recto.style">
+<xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="subtitle" mode="sect3.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect3.titlepage.recto.style">
+<xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="corpauthor" mode="sect3.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect3.titlepage.recto.style">
+<xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="authorgroup" mode="sect3.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect3.titlepage.recto.style">
+<xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="author" mode="sect3.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect3.titlepage.recto.style">
+<xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="othercredit" mode="sect3.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect3.titlepage.recto.style">
+<xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="releaseinfo" mode="sect3.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect3.titlepage.recto.style">
+<xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="copyright" mode="sect3.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect3.titlepage.recto.style">
+<xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="legalnotice" mode="sect3.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect3.titlepage.recto.style">
+<xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="pubdate" mode="sect3.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect3.titlepage.recto.style">
+<xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="revision" mode="sect3.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect3.titlepage.recto.style">
+<xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="revhistory" mode="sect3.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect3.titlepage.recto.style">
+<xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="abstract" mode="sect3.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect3.titlepage.recto.style">
+<xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template name="sect4.titlepage.recto">
+ <xsl:choose>
+ <xsl:when test="sect4info/title">
+ <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="sect4info/title"/>
+ </xsl:when>
+ <xsl:when test="info/title">
+ <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="info/title"/>
+ </xsl:when>
+ <xsl:when test="title">
+ <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="title"/>
+ </xsl:when>
+ </xsl:choose>
+
+ <xsl:choose>
+ <xsl:when test="sect4info/subtitle">
+ <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="sect4info/subtitle"/>
+ </xsl:when>
+ <xsl:when test="info/subtitle">
+ <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="info/subtitle"/>
+ </xsl:when>
+ <xsl:when test="subtitle">
+ <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="subtitle"/>
+ </xsl:when>
+ </xsl:choose>
+
+ <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="sect4info/corpauthor"/>
+ <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="info/corpauthor"/>
+ <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="sect4info/authorgroup"/>
+ <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="info/authorgroup"/>
+ <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="sect4info/author"/>
+ <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="info/author"/>
+ <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="sect4info/othercredit"/>
+ <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="info/othercredit"/>
+ <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="sect4info/releaseinfo"/>
+ <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="info/releaseinfo"/>
+ <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="sect4info/copyright"/>
+ <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="info/copyright"/>
+ <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="sect4info/legalnotice"/>
+ <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="info/legalnotice"/>
+ <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="sect4info/pubdate"/>
+ <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="info/pubdate"/>
+ <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="sect4info/revision"/>
+ <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="info/revision"/>
+ <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="sect4info/revhistory"/>
+ <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="info/revhistory"/>
+ <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="sect4info/abstract"/>
+ <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="info/abstract"/>
+</xsl:template>
+
+<xsl:template name="sect4.titlepage.verso">
+</xsl:template>
+
+<xsl:template name="sect4.titlepage.separator"><xsl:if test="count(parent::*)='0'"><hr/></xsl:if>
+</xsl:template>
+
+<xsl:template name="sect4.titlepage.before.recto">
+</xsl:template>
+
+<xsl:template name="sect4.titlepage.before.verso">
+</xsl:template>
+
+<xsl:template name="sect4.titlepage">
+ <div class="titlepage">
+ <xsl:variable name="recto.content">
+ <xsl:call-template name="sect4.titlepage.before.recto"/>
+ <xsl:call-template name="sect4.titlepage.recto"/>
+ </xsl:variable>
+ <xsl:variable name="recto.elements.count">
+ <xsl:choose>
+ <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
+ <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
+ <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
+ <xsl:otherwise>1</xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+ <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count > 0)">
+ <div><xsl:copy-of select="$recto.content"/></div>
+ </xsl:if>
+ <xsl:variable name="verso.content">
+ <xsl:call-template name="sect4.titlepage.before.verso"/>
+ <xsl:call-template name="sect4.titlepage.verso"/>
+ </xsl:variable>
+ <xsl:variable name="verso.elements.count">
+ <xsl:choose>
+ <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
+ <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
+ <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
+ <xsl:otherwise>1</xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+ <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count > 0)">
+ <div><xsl:copy-of select="$verso.content"/></div>
+ </xsl:if>
+ <xsl:call-template name="sect4.titlepage.separator"/>
+ </div>
+</xsl:template>
+
+<xsl:template match="*" mode="sect4.titlepage.recto.mode">
+ <!-- if an element isn't found in this mode, -->
+ <!-- try the generic titlepage.mode -->
+ <xsl:apply-templates select="." mode="titlepage.mode"/>
+</xsl:template>
+
+<xsl:template match="*" mode="sect4.titlepage.verso.mode">
+ <!-- if an element isn't found in this mode, -->
+ <!-- try the generic titlepage.mode -->
+ <xsl:apply-templates select="." mode="titlepage.mode"/>
+</xsl:template>
+
+<xsl:template match="title" mode="sect4.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect4.titlepage.recto.style">
+<xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="subtitle" mode="sect4.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect4.titlepage.recto.style">
+<xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="corpauthor" mode="sect4.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect4.titlepage.recto.style">
+<xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="authorgroup" mode="sect4.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect4.titlepage.recto.style">
+<xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="author" mode="sect4.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect4.titlepage.recto.style">
+<xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="othercredit" mode="sect4.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect4.titlepage.recto.style">
+<xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="releaseinfo" mode="sect4.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect4.titlepage.recto.style">
+<xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="copyright" mode="sect4.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect4.titlepage.recto.style">
+<xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="legalnotice" mode="sect4.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect4.titlepage.recto.style">
+<xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="pubdate" mode="sect4.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect4.titlepage.recto.style">
+<xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="revision" mode="sect4.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect4.titlepage.recto.style">
+<xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="revhistory" mode="sect4.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect4.titlepage.recto.style">
+<xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="abstract" mode="sect4.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect4.titlepage.recto.style">
+<xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template name="sect5.titlepage.recto">
+ <xsl:choose>
+ <xsl:when test="sect5info/title">
+ <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="sect5info/title"/>
+ </xsl:when>
+ <xsl:when test="info/title">
+ <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="info/title"/>
+ </xsl:when>
+ <xsl:when test="title">
+ <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="title"/>
+ </xsl:when>
+ </xsl:choose>
+
+ <xsl:choose>
+ <xsl:when test="sect5info/subtitle">
+ <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="sect5info/subtitle"/>
+ </xsl:when>
+ <xsl:when test="info/subtitle">
+ <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="info/subtitle"/>
+ </xsl:when>
+ <xsl:when test="subtitle">
+ <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="subtitle"/>
+ </xsl:when>
+ </xsl:choose>
+
+ <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="sect5info/corpauthor"/>
+ <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="info/corpauthor"/>
+ <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="sect5info/authorgroup"/>
+ <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="info/authorgroup"/>
+ <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="sect5info/author"/>
+ <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="info/author"/>
+ <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="sect5info/othercredit"/>
+ <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="info/othercredit"/>
+ <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="sect5info/releaseinfo"/>
+ <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="info/releaseinfo"/>
+ <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="sect5info/copyright"/>
+ <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="info/copyright"/>
+ <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="sect5info/legalnotice"/>
+ <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="info/legalnotice"/>
+ <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="sect5info/pubdate"/>
+ <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="info/pubdate"/>
+ <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="sect5info/revision"/>
+ <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="info/revision"/>
+ <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="sect5info/revhistory"/>
+ <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="info/revhistory"/>
+ <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="sect5info/abstract"/>
+ <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="info/abstract"/>
+</xsl:template>
+
+<xsl:template name="sect5.titlepage.verso">
+</xsl:template>
+
+<xsl:template name="sect5.titlepage.separator"><xsl:if test="count(parent::*)='0'"><hr/></xsl:if>
+</xsl:template>
+
+<xsl:template name="sect5.titlepage.before.recto">
+</xsl:template>
+
+<xsl:template name="sect5.titlepage.before.verso">
+</xsl:template>
+
+<xsl:template name="sect5.titlepage">
+ <div class="titlepage">
+ <xsl:variable name="recto.content">
+ <xsl:call-template name="sect5.titlepage.before.recto"/>
+ <xsl:call-template name="sect5.titlepage.recto"/>
+ </xsl:variable>
+ <xsl:variable name="recto.elements.count">
+ <xsl:choose>
+ <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
+ <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
+ <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
+ <xsl:otherwise>1</xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+ <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count > 0)">
+ <div><xsl:copy-of select="$recto.content"/></div>
+ </xsl:if>
+ <xsl:variable name="verso.content">
+ <xsl:call-template name="sect5.titlepage.before.verso"/>
+ <xsl:call-template name="sect5.titlepage.verso"/>
+ </xsl:variable>
+ <xsl:variable name="verso.elements.count">
+ <xsl:choose>
+ <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
+ <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
+ <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
+ <xsl:otherwise>1</xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+ <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count > 0)">
+ <div><xsl:copy-of select="$verso.content"/></div>
+ </xsl:if>
+ <xsl:call-template name="sect5.titlepage.separator"/>
+ </div>
+</xsl:template>
+
+<xsl:template match="*" mode="sect5.titlepage.recto.mode">
+ <!-- if an element isn't found in this mode, -->
+ <!-- try the generic titlepage.mode -->
+ <xsl:apply-templates select="." mode="titlepage.mode"/>
+</xsl:template>
+
+<xsl:template match="*" mode="sect5.titlepage.verso.mode">
+ <!-- if an element isn't found in this mode, -->
+ <!-- try the generic titlepage.mode -->
+ <xsl:apply-templates select="." mode="titlepage.mode"/>
+</xsl:template>
+
+<xsl:template match="title" mode="sect5.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect5.titlepage.recto.style">
+<xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="subtitle" mode="sect5.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect5.titlepage.recto.style">
+<xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="corpauthor" mode="sect5.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect5.titlepage.recto.style">
+<xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="authorgroup" mode="sect5.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect5.titlepage.recto.style">
+<xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="author" mode="sect5.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect5.titlepage.recto.style">
+<xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="othercredit" mode="sect5.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect5.titlepage.recto.style">
+<xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="releaseinfo" mode="sect5.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect5.titlepage.recto.style">
+<xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="copyright" mode="sect5.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect5.titlepage.recto.style">
+<xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="legalnotice" mode="sect5.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect5.titlepage.recto.style">
+<xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="pubdate" mode="sect5.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect5.titlepage.recto.style">
+<xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="revision" mode="sect5.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect5.titlepage.recto.style">
+<xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="revhistory" mode="sect5.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect5.titlepage.recto.style">
+<xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="abstract" mode="sect5.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect5.titlepage.recto.style">
+<xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template name="simplesect.titlepage.recto">
+ <xsl:choose>
+ <xsl:when test="simplesectinfo/title">
+ <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="simplesectinfo/title"/>
+ </xsl:when>
+ <xsl:when test="docinfo/title">
+ <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="docinfo/title"/>
+ </xsl:when>
+ <xsl:when test="info/title">
+ <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="info/title"/>
+ </xsl:when>
+ <xsl:when test="title">
+ <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="title"/>
+ </xsl:when>
+ </xsl:choose>
+
+ <xsl:choose>
+ <xsl:when test="simplesectinfo/subtitle">
+ <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="simplesectinfo/subtitle"/>
+ </xsl:when>
+ <xsl:when test="docinfo/subtitle">
+ <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="docinfo/subtitle"/>
+ </xsl:when>
+ <xsl:when test="info/subtitle">
+ <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="info/subtitle"/>
+ </xsl:when>
+ <xsl:when test="subtitle">
+ <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="subtitle"/>
+ </xsl:when>
+ </xsl:choose>
+
+ <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="simplesectinfo/corpauthor"/>
+ <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="docinfo/corpauthor"/>
+ <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="info/corpauthor"/>
+ <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="simplesectinfo/authorgroup"/>
+ <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="docinfo/authorgroup"/>
+ <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="info/authorgroup"/>
+ <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="simplesectinfo/author"/>
+ <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="docinfo/author"/>
+ <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="info/author"/>
+ <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="simplesectinfo/othercredit"/>
+ <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="docinfo/othercredit"/>
+ <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="info/othercredit"/>
+ <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="simplesectinfo/releaseinfo"/>
+ <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="docinfo/releaseinfo"/>
+ <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="info/releaseinfo"/>
+ <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="simplesectinfo/copyright"/>
+ <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="docinfo/copyright"/>
+ <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="info/copyright"/>
+ <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="simplesectinfo/legalnotice"/>
+ <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="docinfo/legalnotice"/>
+ <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="info/legalnotice"/>
+ <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="simplesectinfo/pubdate"/>
+ <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="docinfo/pubdate"/>
+ <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="info/pubdate"/>
+ <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="simplesectinfo/revision"/>
+ <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="docinfo/revision"/>
+ <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="info/revision"/>
+ <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="simplesectinfo/revhistory"/>
+ <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="docinfo/revhistory"/>
+ <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="info/revhistory"/>
+ <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="simplesectinfo/abstract"/>
+ <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="docinfo/abstract"/>
+ <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="info/abstract"/>
+</xsl:template>
+
+<xsl:template name="simplesect.titlepage.verso">
+</xsl:template>
+
+<xsl:template name="simplesect.titlepage.separator"><xsl:if test="count(parent::*)='0'"><hr/></xsl:if>
+</xsl:template>
+
+<xsl:template name="simplesect.titlepage.before.recto">
+</xsl:template>
+
+<xsl:template name="simplesect.titlepage.before.verso">
+</xsl:template>
+
+<xsl:template name="simplesect.titlepage">
+ <div class="titlepage">
+ <xsl:variable name="recto.content">
+ <xsl:call-template name="simplesect.titlepage.before.recto"/>
+ <xsl:call-template name="simplesect.titlepage.recto"/>
+ </xsl:variable>
+ <xsl:variable name="recto.elements.count">
+ <xsl:choose>
+ <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
+ <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
+ <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
+ <xsl:otherwise>1</xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+ <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count > 0)">
+ <div><xsl:copy-of select="$recto.content"/></div>
+ </xsl:if>
+ <xsl:variable name="verso.content">
+ <xsl:call-template name="simplesect.titlepage.before.verso"/>
+ <xsl:call-template name="simplesect.titlepage.verso"/>
+ </xsl:variable>
+ <xsl:variable name="verso.elements.count">
+ <xsl:choose>
+ <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
+ <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
+ <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
+ <xsl:otherwise>1</xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+ <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count > 0)">
+ <div><xsl:copy-of select="$verso.content"/></div>
+ </xsl:if>
+ <xsl:call-template name="simplesect.titlepage.separator"/>
+ </div>
+</xsl:template>
+
+<xsl:template match="*" mode="simplesect.titlepage.recto.mode">
+ <!-- if an element isn't found in this mode, -->
+ <!-- try the generic titlepage.mode -->
+ <xsl:apply-templates select="." mode="titlepage.mode"/>
+</xsl:template>
+
+<xsl:template match="*" mode="simplesect.titlepage.verso.mode">
+ <!-- if an element isn't found in this mode, -->
+ <!-- try the generic titlepage.mode -->
+ <xsl:apply-templates select="." mode="titlepage.mode"/>
+</xsl:template>
+
+<xsl:template match="title" mode="simplesect.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="simplesect.titlepage.recto.style">
+<xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="subtitle" mode="simplesect.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="simplesect.titlepage.recto.style">
+<xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="corpauthor" mode="simplesect.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="simplesect.titlepage.recto.style">
+<xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="authorgroup" mode="simplesect.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="simplesect.titlepage.recto.style">
+<xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="author" mode="simplesect.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="simplesect.titlepage.recto.style">
+<xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="othercredit" mode="simplesect.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="simplesect.titlepage.recto.style">
+<xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="releaseinfo" mode="simplesect.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="simplesect.titlepage.recto.style">
+<xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="copyright" mode="simplesect.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="simplesect.titlepage.recto.style">
+<xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="legalnotice" mode="simplesect.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="simplesect.titlepage.recto.style">
+<xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="pubdate" mode="simplesect.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="simplesect.titlepage.recto.style">
+<xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="revision" mode="simplesect.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="simplesect.titlepage.recto.style">
+<xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="revhistory" mode="simplesect.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="simplesect.titlepage.recto.style">
+<xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="abstract" mode="simplesect.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="simplesect.titlepage.recto.style">
+<xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template name="bibliography.titlepage.recto">
+ <div xsl:use-attribute-sets="bibliography.titlepage.recto.style">
+<xsl:call-template name="component.title">
+<xsl:with-param name="node" select="ancestor-or-self::bibliography[1]"/>
+</xsl:call-template></div>
+ <xsl:choose>
+ <xsl:when test="bibliographyinfo/subtitle">
+ <xsl:apply-templates mode="bibliography.titlepage.recto.auto.mode" select="bibliographyinfo/subtitle"/>
+ </xsl:when>
+ <xsl:when test="docinfo/subtitle">
+ <xsl:apply-templates mode="bibliography.titlepage.recto.auto.mode" select="docinfo/subtitle"/>
+ </xsl:when>
+ <xsl:when test="info/subtitle">
+ <xsl:apply-templates mode="bibliography.titlepage.recto.auto.mode" select="info/subtitle"/>
+ </xsl:when>
+ <xsl:when test="subtitle">
+ <xsl:apply-templates mode="bibliography.titlepage.recto.auto.mode" select="subtitle"/>
+ </xsl:when>
+ </xsl:choose>
+
+</xsl:template>
+
+<xsl:template name="bibliography.titlepage.verso">
+</xsl:template>
+
+<xsl:template name="bibliography.titlepage.separator">
+</xsl:template>
+
+<xsl:template name="bibliography.titlepage.before.recto">
+</xsl:template>
+
+<xsl:template name="bibliography.titlepage.before.verso">
+</xsl:template>
+
+<xsl:template name="bibliography.titlepage">
+ <div class="titlepage">
+ <xsl:variable name="recto.content">
+ <xsl:call-template name="bibliography.titlepage.before.recto"/>
+ <xsl:call-template name="bibliography.titlepage.recto"/>
+ </xsl:variable>
+ <xsl:variable name="recto.elements.count">
+ <xsl:choose>
+ <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
+ <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
+ <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
+ <xsl:otherwise>1</xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+ <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count > 0)">
+ <div><xsl:copy-of select="$recto.content"/></div>
+ </xsl:if>
+ <xsl:variable name="verso.content">
+ <xsl:call-template name="bibliography.titlepage.before.verso"/>
+ <xsl:call-template name="bibliography.titlepage.verso"/>
+ </xsl:variable>
+ <xsl:variable name="verso.elements.count">
+ <xsl:choose>
+ <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
+ <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
+ <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
+ <xsl:otherwise>1</xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+ <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count > 0)">
+ <div><xsl:copy-of select="$verso.content"/></div>
+ </xsl:if>
+ <xsl:call-template name="bibliography.titlepage.separator"/>
+ </div>
+</xsl:template>
+
+<xsl:template match="*" mode="bibliography.titlepage.recto.mode">
+ <!-- if an element isn't found in this mode, -->
+ <!-- try the generic titlepage.mode -->
+ <xsl:apply-templates select="." mode="titlepage.mode"/>
+</xsl:template>
+
+<xsl:template match="*" mode="bibliography.titlepage.verso.mode">
+ <!-- if an element isn't found in this mode, -->
+ <!-- try the generic titlepage.mode -->
+ <xsl:apply-templates select="." mode="titlepage.mode"/>
+</xsl:template>
+
+<xsl:template match="subtitle" mode="bibliography.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="bibliography.titlepage.recto.style">
+<xsl:apply-templates select="." mode="bibliography.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template name="glossary.titlepage.recto">
+ <div xsl:use-attribute-sets="glossary.titlepage.recto.style">
+<xsl:call-template name="component.title">
+<xsl:with-param name="node" select="ancestor-or-self::glossary[1]"/>
+</xsl:call-template></div>
+ <xsl:choose>
+ <xsl:when test="glossaryinfo/subtitle">
+ <xsl:apply-templates mode="glossary.titlepage.recto.auto.mode" select="glossaryinfo/subtitle"/>
+ </xsl:when>
+ <xsl:when test="docinfo/subtitle">
+ <xsl:apply-templates mode="glossary.titlepage.recto.auto.mode" select="docinfo/subtitle"/>
+ </xsl:when>
+ <xsl:when test="info/subtitle">
+ <xsl:apply-templates mode="glossary.titlepage.recto.auto.mode" select="info/subtitle"/>
+ </xsl:when>
+ <xsl:when test="subtitle">
+ <xsl:apply-templates mode="glossary.titlepage.recto.auto.mode" select="subtitle"/>
+ </xsl:when>
+ </xsl:choose>
+
+</xsl:template>
+
+<xsl:template name="glossary.titlepage.verso">
+</xsl:template>
+
+<xsl:template name="glossary.titlepage.separator">
+</xsl:template>
+
+<xsl:template name="glossary.titlepage.before.recto">
+</xsl:template>
+
+<xsl:template name="glossary.titlepage.before.verso">
+</xsl:template>
+
+<xsl:template name="glossary.titlepage">
+ <div class="titlepage">
+ <xsl:variable name="recto.content">
+ <xsl:call-template name="glossary.titlepage.before.recto"/>
+ <xsl:call-template name="glossary.titlepage.recto"/>
+ </xsl:variable>
+ <xsl:variable name="recto.elements.count">
+ <xsl:choose>
+ <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
+ <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
+ <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
+ <xsl:otherwise>1</xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+ <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count > 0)">
+ <div><xsl:copy-of select="$recto.content"/></div>
+ </xsl:if>
+ <xsl:variable name="verso.content">
+ <xsl:call-template name="glossary.titlepage.before.verso"/>
+ <xsl:call-template name="glossary.titlepage.verso"/>
+ </xsl:variable>
+ <xsl:variable name="verso.elements.count">
+ <xsl:choose>
+ <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
+ <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
+ <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
+ <xsl:otherwise>1</xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+ <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count > 0)">
+ <div><xsl:copy-of select="$verso.content"/></div>
+ </xsl:if>
+ <xsl:call-template name="glossary.titlepage.separator"/>
+ </div>
+</xsl:template>
+
+<xsl:template match="*" mode="glossary.titlepage.recto.mode">
+ <!-- if an element isn't found in this mode, -->
+ <!-- try the generic titlepage.mode -->
+ <xsl:apply-templates select="." mode="titlepage.mode"/>
+</xsl:template>
+
+<xsl:template match="*" mode="glossary.titlepage.verso.mode">
+ <!-- if an element isn't found in this mode, -->
+ <!-- try the generic titlepage.mode -->
+ <xsl:apply-templates select="." mode="titlepage.mode"/>
+</xsl:template>
+
+<xsl:template match="subtitle" mode="glossary.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="glossary.titlepage.recto.style">
+<xsl:apply-templates select="." mode="glossary.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template name="index.titlepage.recto">
+ <div xsl:use-attribute-sets="index.titlepage.recto.style">
+<xsl:call-template name="component.title">
+<xsl:with-param name="node" select="ancestor-or-self::index[1]"/>
+</xsl:call-template></div>
+ <xsl:choose>
+ <xsl:when test="indexinfo/subtitle">
+ <xsl:apply-templates mode="index.titlepage.recto.auto.mode" select="indexinfo/subtitle"/>
+ </xsl:when>
+ <xsl:when test="docinfo/subtitle">
+ <xsl:apply-templates mode="index.titlepage.recto.auto.mode" select="docinfo/subtitle"/>
+ </xsl:when>
+ <xsl:when test="info/subtitle">
+ <xsl:apply-templates mode="index.titlepage.recto.auto.mode" select="info/subtitle"/>
+ </xsl:when>
+ <xsl:when test="subtitle">
+ <xsl:apply-templates mode="index.titlepage.recto.auto.mode" select="subtitle"/>
+ </xsl:when>
+ </xsl:choose>
+
+</xsl:template>
+
+<xsl:template name="index.titlepage.verso">
+</xsl:template>
+
+<xsl:template name="index.titlepage.separator">
+</xsl:template>
+
+<xsl:template name="index.titlepage.before.recto">
+</xsl:template>
+
+<xsl:template name="index.titlepage.before.verso">
+</xsl:template>
+
+<xsl:template name="index.titlepage">
+ <div class="titlepage">
+ <xsl:variable name="recto.content">
+ <xsl:call-template name="index.titlepage.before.recto"/>
+ <xsl:call-template name="index.titlepage.recto"/>
+ </xsl:variable>
+ <xsl:variable name="recto.elements.count">
+ <xsl:choose>
+ <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
+ <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
+ <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
+ <xsl:otherwise>1</xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+ <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count > 0)">
+ <div><xsl:copy-of select="$recto.content"/></div>
+ </xsl:if>
+ <xsl:variable name="verso.content">
+ <xsl:call-template name="index.titlepage.before.verso"/>
+ <xsl:call-template name="index.titlepage.verso"/>
+ </xsl:variable>
+ <xsl:variable name="verso.elements.count">
+ <xsl:choose>
+ <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
+ <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
+ <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
+ <xsl:otherwise>1</xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+ <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count > 0)">
+ <div><xsl:copy-of select="$verso.content"/></div>
+ </xsl:if>
+ <xsl:call-template name="index.titlepage.separator"/>
+ </div>
+</xsl:template>
+
+<xsl:template match="*" mode="index.titlepage.recto.mode">
+ <!-- if an element isn't found in this mode, -->
+ <!-- try the generic titlepage.mode -->
+ <xsl:apply-templates select="." mode="titlepage.mode"/>
+</xsl:template>
+
+<xsl:template match="*" mode="index.titlepage.verso.mode">
+ <!-- if an element isn't found in this mode, -->
+ <!-- try the generic titlepage.mode -->
+ <xsl:apply-templates select="." mode="titlepage.mode"/>
+</xsl:template>
+
+<xsl:template match="subtitle" mode="index.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="index.titlepage.recto.style">
+<xsl:apply-templates select="." mode="index.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template name="setindex.titlepage.recto">
+ <div xsl:use-attribute-sets="setindex.titlepage.recto.style">
+<xsl:call-template name="component.title">
+<xsl:with-param name="node" select="ancestor-or-self::setindex[1]"/>
+</xsl:call-template></div>
+ <xsl:choose>
+ <xsl:when test="setindexinfo/subtitle">
+ <xsl:apply-templates mode="setindex.titlepage.recto.auto.mode" select="setindexinfo/subtitle"/>
+ </xsl:when>
+ <xsl:when test="docinfo/subtitle">
+ <xsl:apply-templates mode="setindex.titlepage.recto.auto.mode" select="docinfo/subtitle"/>
+ </xsl:when>
+ <xsl:when test="info/subtitle">
+ <xsl:apply-templates mode="setindex.titlepage.recto.auto.mode" select="info/subtitle"/>
+ </xsl:when>
+ <xsl:when test="subtitle">
+ <xsl:apply-templates mode="setindex.titlepage.recto.auto.mode" select="subtitle"/>
+ </xsl:when>
+ </xsl:choose>
+
+</xsl:template>
+
+<xsl:template name="setindex.titlepage.verso">
+</xsl:template>
+
+<xsl:template name="setindex.titlepage.separator">
+</xsl:template>
+
+<xsl:template name="setindex.titlepage.before.recto">
+</xsl:template>
+
+<xsl:template name="setindex.titlepage.before.verso">
+</xsl:template>
+
+<xsl:template name="setindex.titlepage">
+ <div class="titlepage">
+ <xsl:variable name="recto.content">
+ <xsl:call-template name="setindex.titlepage.before.recto"/>
+ <xsl:call-template name="setindex.titlepage.recto"/>
+ </xsl:variable>
+ <xsl:variable name="recto.elements.count">
+ <xsl:choose>
+ <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
+ <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
+ <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
+ <xsl:otherwise>1</xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+ <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count > 0)">
+ <div><xsl:copy-of select="$recto.content"/></div>
+ </xsl:if>
+ <xsl:variable name="verso.content">
+ <xsl:call-template name="setindex.titlepage.before.verso"/>
+ <xsl:call-template name="setindex.titlepage.verso"/>
+ </xsl:variable>
+ <xsl:variable name="verso.elements.count">
+ <xsl:choose>
+ <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
+ <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
+ <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
+ <xsl:otherwise>1</xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+ <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count > 0)">
+ <div><xsl:copy-of select="$verso.content"/></div>
+ </xsl:if>
+ <xsl:call-template name="setindex.titlepage.separator"/>
+ </div>
+</xsl:template>
+
+<xsl:template match="*" mode="setindex.titlepage.recto.mode">
+ <!-- if an element isn't found in this mode, -->
+ <!-- try the generic titlepage.mode -->
+ <xsl:apply-templates select="." mode="titlepage.mode"/>
+</xsl:template>
+
+<xsl:template match="*" mode="setindex.titlepage.verso.mode">
+ <!-- if an element isn't found in this mode, -->
+ <!-- try the generic titlepage.mode -->
+ <xsl:apply-templates select="." mode="titlepage.mode"/>
+</xsl:template>
+
+<xsl:template match="subtitle" mode="setindex.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="setindex.titlepage.recto.style">
+<xsl:apply-templates select="." mode="setindex.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template name="sidebar.titlepage.recto">
+ <xsl:choose>
+ <xsl:when test="sidebarinfo/title">
+ <xsl:apply-templates mode="sidebar.titlepage.recto.auto.mode" select="sidebarinfo/title"/>
+ </xsl:when>
+ <xsl:when test="docinfo/title">
+ <xsl:apply-templates mode="sidebar.titlepage.recto.auto.mode" select="docinfo/title"/>
+ </xsl:when>
+ <xsl:when test="info/title">
+ <xsl:apply-templates mode="sidebar.titlepage.recto.auto.mode" select="info/title"/>
+ </xsl:when>
+ <xsl:when test="title">
+ <xsl:apply-templates mode="sidebar.titlepage.recto.auto.mode" select="title"/>
+ </xsl:when>
+ </xsl:choose>
+
+ <xsl:choose>
+ <xsl:when test="sidebarinfo/subtitle">
+ <xsl:apply-templates mode="sidebar.titlepage.recto.auto.mode" select="sidebarinfo/subtitle"/>
+ </xsl:when>
+ <xsl:when test="docinfo/subtitle">
+ <xsl:apply-templates mode="sidebar.titlepage.recto.auto.mode" select="docinfo/subtitle"/>
+ </xsl:when>
+ <xsl:when test="info/subtitle">
+ <xsl:apply-templates mode="sidebar.titlepage.recto.auto.mode" select="info/subtitle"/>
+ </xsl:when>
+ <xsl:when test="subtitle">
+ <xsl:apply-templates mode="sidebar.titlepage.recto.auto.mode" select="subtitle"/>
+ </xsl:when>
+ </xsl:choose>
+
+</xsl:template>
+
+<xsl:template name="sidebar.titlepage.verso">
+</xsl:template>
+
+<xsl:template name="sidebar.titlepage.separator">
+</xsl:template>
+
+<xsl:template name="sidebar.titlepage.before.recto">
+</xsl:template>
+
+<xsl:template name="sidebar.titlepage.before.verso">
+</xsl:template>
+
+<xsl:template name="sidebar.titlepage">
+ <div class="titlepage">
+ <xsl:variable name="recto.content">
+ <xsl:call-template name="sidebar.titlepage.before.recto"/>
+ <xsl:call-template name="sidebar.titlepage.recto"/>
+ </xsl:variable>
+ <xsl:variable name="recto.elements.count">
+ <xsl:choose>
+ <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
+ <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
+ <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
+ <xsl:otherwise>1</xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+ <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count > 0)">
+ <div><xsl:copy-of select="$recto.content"/></div>
+ </xsl:if>
+ <xsl:variable name="verso.content">
+ <xsl:call-template name="sidebar.titlepage.before.verso"/>
+ <xsl:call-template name="sidebar.titlepage.verso"/>
+ </xsl:variable>
+ <xsl:variable name="verso.elements.count">
+ <xsl:choose>
+ <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
+ <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
+ <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
+ <xsl:otherwise>1</xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+ <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count > 0)">
+ <div><xsl:copy-of select="$verso.content"/></div>
+ </xsl:if>
+ <xsl:call-template name="sidebar.titlepage.separator"/>
+ </div>
+</xsl:template>
+
+<xsl:template match="*" mode="sidebar.titlepage.recto.mode">
+ <!-- if an element isn't found in this mode, -->
+ <!-- try the generic titlepage.mode -->
+ <xsl:apply-templates select="." mode="titlepage.mode"/>
+</xsl:template>
+
+<xsl:template match="*" mode="sidebar.titlepage.verso.mode">
+ <!-- if an element isn't found in this mode, -->
+ <!-- try the generic titlepage.mode -->
+ <xsl:apply-templates select="." mode="titlepage.mode"/>
+</xsl:template>
+
+<xsl:template match="title" mode="sidebar.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sidebar.titlepage.recto.style">
+<xsl:call-template name="formal.object.heading">
+<xsl:with-param name="object" select="ancestor-or-self::sidebar[1]"/>
+</xsl:call-template>
+</div>
+</xsl:template>
+
+<xsl:template match="subtitle" mode="sidebar.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sidebar.titlepage.recto.style">
+<xsl:apply-templates select="." mode="sidebar.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+</xsl:stylesheet>
+
diff --git a/share/xsl/titlepage.templates.xml b/share/xsl/titlepage.templates.xml
new file mode 100644
index 0000000000..4aea970113
--- /dev/null
+++ b/share/xsl/titlepage.templates.xml
@@ -0,0 +1,718 @@
+<t:templates xmlns:t="http://nwalsh.com/docbook/xsl/template/1.0"
+ xmlns:param="http://nwalsh.com/docbook/xsl/template/1.0/param"
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+
+<!-- ==================================================================== -->
+
+<!-- $FreeBSD$ -->
+
+<!--
+ Use this template to generate freebsd-xhtml-titlepage.xsl by
+ running:
+
+ xsltproc /usr/local/share/xsl/docbook/template/titlepage.xsl titlepage.templates.xml > freebsd-xhtml-titlepage.xsl
+
+-->
+
+<t:titlepage t:element="article" t:wrapper="div" class="titlepage">
+ <t:titlepage-content t:side="recto">
+ <title/>
+ <subtitle/>
+ <corpauthor/>
+ <authorgroup/>
+ <author/>
+ <othercredit/>
+ <releaseinfo/>
+ <copyright/>
+ <legalnotice/>
+ <pubdate/>
+ <revision/>
+ <revhistory/>
+ <abstract/>
+ </t:titlepage-content>
+
+ <t:titlepage-content t:side="verso">
+ </t:titlepage-content>
+
+ <t:titlepage-separator>
+ <hr/>
+ </t:titlepage-separator>
+
+ <t:titlepage-before t:side="recto">
+ </t:titlepage-before>
+
+ <t:titlepage-before t:side="verso">
+ </t:titlepage-before>
+</t:titlepage>
+
+<!-- ==================================================================== -->
+
+<t:titlepage t:element="set" t:wrapper="div" class="titlepage">
+ <t:titlepage-content t:side="recto">
+ <title/>
+ <subtitle/>
+ <corpauthor/>
+ <authorgroup/>
+ <author/>
+ <othercredit/>
+ <releaseinfo/>
+ <copyright/>
+ <legalnotice/>
+ <pubdate/>
+ <revision/>
+ <revhistory/>
+ <abstract/>
+ </t:titlepage-content>
+
+ <t:titlepage-content t:side="verso">
+ </t:titlepage-content>
+
+ <t:titlepage-separator>
+ <hr/>
+ </t:titlepage-separator>
+
+ <t:titlepage-before t:side="recto">
+ </t:titlepage-before>
+
+ <t:titlepage-before t:side="verso">
+ </t:titlepage-before>
+</t:titlepage>
+
+<!-- ==================================================================== -->
+
+<t:titlepage t:element="book" t:wrapper="div" class="titlepage">
+ <t:titlepage-content t:side="recto">
+ <title/>
+ <subtitle/>
+ <corpauthor/>
+ <authorgroup/>
+ <author/>
+ <othercredit/>
+ <releaseinfo/>
+ <copyright/>
+ <legalnotice/>
+ <pubdate/>
+ <revision/>
+ <revhistory/>
+ <abstract/>
+ </t:titlepage-content>
+
+ <t:titlepage-content t:side="verso">
+ </t:titlepage-content>
+
+ <t:titlepage-separator>
+ <hr/>
+ </t:titlepage-separator>
+
+ <t:titlepage-before t:side="recto">
+ </t:titlepage-before>
+
+ <t:titlepage-before t:side="verso">
+ </t:titlepage-before>
+</t:titlepage>
+
+<!-- ==================================================================== -->
+
+<t:titlepage t:element="part" t:wrapper="div" class="titlepage">
+ <t:titlepage-content t:side="recto">
+ <title
+ t:force="1"
+ t:named-template="division.title"
+ param:node="ancestor-or-self::part[1]"/>
+ <subtitle/>
+ <corpauthor/>
+ <authorgroup/>
+ <author/>
+ <othercredit/>
+ <releaseinfo/>
+ <copyright/>
+ <legalnotice/>
+ <pubdate/>
+ <revision/>
+ <revhistory/>
+ <abstract/>
+ </t:titlepage-content>
+
+ <t:titlepage-content t:side="verso">
+ </t:titlepage-content>
+
+ <t:titlepage-separator>
+ </t:titlepage-separator>
+
+ <t:titlepage-before t:side="recto">
+ </t:titlepage-before>
+
+ <t:titlepage-before t:side="verso">
+ </t:titlepage-before>
+</t:titlepage>
+
+<t:titlepage t:element="partintro" t:wrapper="div">
+ <t:titlepage-content t:side="recto">
+ <title/>
+ <subtitle/>
+ <corpauthor/>
+ <authorgroup/>
+ <author/>
+ <othercredit/>
+ <releaseinfo/>
+ <copyright/>
+ <legalnotice/>
+ <pubdate/>
+ <revision/>
+ <revhistory/>
+ <abstract/>
+ </t:titlepage-content>
+
+ <t:titlepage-content t:side="verso">
+ </t:titlepage-content>
+
+ <t:titlepage-separator>
+ </t:titlepage-separator>
+
+ <t:titlepage-before t:side="recto">
+ </t:titlepage-before>
+
+ <t:titlepage-before t:side="verso">
+ </t:titlepage-before>
+</t:titlepage>
+
+<!-- ==================================================================== -->
+
+<t:titlepage t:element="reference" t:wrapper="div" class="titlepage">
+ <t:titlepage-content t:side="recto">
+ <title/>
+ <subtitle/>
+ <corpauthor/>
+ <authorgroup/>
+ <author/>
+ <othercredit/>
+ <releaseinfo/>
+ <copyright/>
+ <legalnotice/>
+ <pubdate/>
+ <revision/>
+ <revhistory/>
+ <abstract/>
+ </t:titlepage-content>
+
+ <t:titlepage-content t:side="verso">
+ </t:titlepage-content>
+
+ <t:titlepage-separator>
+ <hr/>
+ </t:titlepage-separator>
+
+ <t:titlepage-before t:side="recto">
+ </t:titlepage-before>
+
+ <t:titlepage-before t:side="verso">
+ </t:titlepage-before>
+</t:titlepage>
+
+<!-- ==================================================================== -->
+
+<t:titlepage t:element="refentry" t:wrapper="div" class="titlepage">
+ <t:titlepage-content t:side="recto">
+<!-- uncomment this if you want refentry titlepages
+ <title t:force="1"
+ t:named-template="refentry.title"
+ param:node="ancestor-or-self::refentry[1]"/>
+-->
+ </t:titlepage-content>
+
+ <t:titlepage-content t:side="verso">
+ </t:titlepage-content>
+
+ <t:titlepage-separator/>
+
+ <t:titlepage-before t:side="recto">
+ </t:titlepage-before>
+
+ <t:titlepage-before t:side="verso">
+ </t:titlepage-before>
+</t:titlepage>
+
+<!-- ==================================================================== -->
+
+ <t:titlepage t:element="dedication" t:wrapper="div" class="titlepage">
+ <t:titlepage-content t:side="recto">
+ <title
+ t:force="1"
+ t:named-template="component.title"
+ param:node="ancestor-or-self::dedication[1]"/>
+ <subtitle/>
+ </t:titlepage-content>
+
+ <t:titlepage-content t:side="verso">
+ </t:titlepage-content>
+
+ <t:titlepage-separator>
+ </t:titlepage-separator>
+
+ <t:titlepage-before t:side="recto">
+ </t:titlepage-before>
+
+ <t:titlepage-before t:side="verso">
+ </t:titlepage-before>
+</t:titlepage>
+
+<!-- ==================================================================== -->
+
+<t:titlepage t:element="acknowledgements" t:wrapper="div" class="titlepage">
+ <t:titlepage-content t:side="recto">
+ <title
+ t:force="1"
+ t:named-template="component.title"
+ param:node="ancestor-or-self::acknowledgements[1]"/>
+ <subtitle/>
+ </t:titlepage-content>
+
+ <t:titlepage-content t:side="verso">
+ </t:titlepage-content>
+
+ <t:titlepage-separator>
+ </t:titlepage-separator>
+
+ <t:titlepage-before t:side="recto">
+ </t:titlepage-before>
+
+ <t:titlepage-before t:side="verso">
+ </t:titlepage-before>
+</t:titlepage>
+
+<!-- ==================================================================== -->
+
+<t:titlepage t:element="preface" t:wrapper="div" class="titlepage">
+ <t:titlepage-content t:side="recto">
+ <title/>
+ <subtitle/>
+ <corpauthor/>
+ <authorgroup/>
+ <author/>
+ <othercredit/>
+ <releaseinfo/>
+ <copyright/>
+ <legalnotice/>
+ <pubdate/>
+ <revision/>
+ <revhistory/>
+ <abstract/>
+ </t:titlepage-content>
+
+ <t:titlepage-content t:side="verso">
+ </t:titlepage-content>
+
+ <t:titlepage-separator>
+ </t:titlepage-separator>
+
+ <t:titlepage-before t:side="recto">
+ </t:titlepage-before>
+
+ <t:titlepage-before t:side="verso">
+ </t:titlepage-before>
+</t:titlepage>
+
+<!-- ==================================================================== -->
+
+<t:titlepage t:element="chapter" t:wrapper="div" class="titlepage">
+ <t:titlepage-content t:side="recto">
+ <title/>
+ <subtitle/>
+ <corpauthor/>
+ <authorgroup t:named-template="chapter.authorgroup"/>
+ <author t:named-template="chapter.author"/>
+ <othercredit/>
+ <releaseinfo/>
+ <copyright/>
+ <legalnotice/>
+ <pubdate/>
+ <revision/>
+ <revhistory/>
+ <abstract/>
+ </t:titlepage-content>
+
+ <t:titlepage-content t:side="verso">
+ </t:titlepage-content>
+
+ <t:titlepage-separator>
+ </t:titlepage-separator>
+
+ <t:titlepage-before t:side="recto">
+ </t:titlepage-before>
+
+ <t:titlepage-before t:side="verso">
+ </t:titlepage-before>
+</t:titlepage>
+
+<!-- ==================================================================== -->
+
+<t:titlepage t:element="appendix" t:wrapper="div" class="titlepage">
+ <t:titlepage-content t:side="recto">
+ <title/>
+ <subtitle/>
+ <corpauthor/>
+ <authorgroup/>
+ <author/>
+ <othercredit/>
+ <releaseinfo/>
+ <copyright/>
+ <legalnotice/>
+ <pubdate/>
+ <revision/>
+ <revhistory/>
+ <abstract/>
+ </t:titlepage-content>
+
+ <t:titlepage-content t:side="verso">
+ </t:titlepage-content>
+
+ <t:titlepage-separator>
+ </t:titlepage-separator>
+
+ <t:titlepage-before t:side="recto">
+ </t:titlepage-before>
+
+ <t:titlepage-before t:side="verso">
+ </t:titlepage-before>
+</t:titlepage>
+
+<!-- ==================================================================== -->
+
+<t:titlepage t:element="section" t:wrapper="div" class="titlepage">
+ <t:titlepage-content t:side="recto">
+ <title/>
+ <subtitle/>
+ <corpauthor/>
+ <authorgroup/>
+ <author/>
+ <othercredit/>
+ <releaseinfo/>
+ <copyright/>
+ <legalnotice/>
+ <pubdate/>
+ <revision/>
+ <revhistory/>
+ <abstract/>
+ </t:titlepage-content>
+
+ <t:titlepage-content t:side="verso">
+ </t:titlepage-content>
+
+ <t:titlepage-separator>
+ <xsl:if test="count(parent::*)='0'"><hr/></xsl:if>
+ </t:titlepage-separator>
+
+ <t:titlepage-before t:side="recto">
+ </t:titlepage-before>
+
+ <t:titlepage-before t:side="verso">
+ </t:titlepage-before>
+</t:titlepage>
+
+<t:titlepage t:element="sect1" t:wrapper="div" class="titlepage">
+ <t:titlepage-content t:side="recto">
+ <title/>
+ <subtitle/>
+ <corpauthor/>
+ <authorgroup/>
+ <author/>
+ <othercredit/>
+ <releaseinfo/>
+ <copyright/>
+ <legalnotice/>
+ <pubdate/>
+ <revision/>
+ <revhistory/>
+ <abstract/>
+ </t:titlepage-content>
+
+ <t:titlepage-content t:side="verso">
+ </t:titlepage-content>
+
+ <t:titlepage-separator>
+ <xsl:if test="count(parent::*)='0'"><hr/></xsl:if>
+ </t:titlepage-separator>
+
+ <t:titlepage-before t:side="recto">
+ </t:titlepage-before>
+
+ <t:titlepage-before t:side="verso">
+ </t:titlepage-before>
+</t:titlepage>
+
+<t:titlepage t:element="sect2" t:wrapper="div" class="titlepage">
+ <t:titlepage-content t:side="recto">
+ <title/>
+ <subtitle/>
+ <corpauthor/>
+ <authorgroup/>
+ <author/>
+ <othercredit/>
+ <releaseinfo/>
+ <copyright/>
+ <legalnotice/>
+ <pubdate/>
+ <revision/>
+ <revhistory/>
+ <abstract/>
+ </t:titlepage-content>
+
+ <t:titlepage-content t:side="verso">
+ </t:titlepage-content>
+
+ <t:titlepage-separator>
+ <xsl:if test="count(parent::*)='0'"><hr/></xsl:if>
+ </t:titlepage-separator>
+
+ <t:titlepage-before t:side="recto">
+ </t:titlepage-before>
+
+ <t:titlepage-before t:side="verso">
+ </t:titlepage-before>
+</t:titlepage>
+
+<t:titlepage t:element="sect3" t:wrapper="div" class="titlepage">
+ <t:titlepage-content t:side="recto">
+ <title/>
+ <subtitle/>
+ <corpauthor/>
+ <authorgroup/>
+ <author/>
+ <othercredit/>
+ <releaseinfo/>
+ <copyright/>
+ <legalnotice/>
+ <pubdate/>
+ <revision/>
+ <revhistory/>
+ <abstract/>
+ </t:titlepage-content>
+
+ <t:titlepage-content t:side="verso">
+ </t:titlepage-content>
+
+ <t:titlepage-separator>
+ <xsl:if test="count(parent::*)='0'"><hr/></xsl:if>
+ </t:titlepage-separator>
+
+ <t:titlepage-before t:side="recto">
+ </t:titlepage-before>
+
+ <t:titlepage-before t:side="verso">
+ </t:titlepage-before>
+</t:titlepage>
+
+<t:titlepage t:element="sect4" t:wrapper="div" class="titlepage">
+ <t:titlepage-content t:side="recto">
+ <title/>
+ <subtitle/>
+ <corpauthor/>
+ <authorgroup/>
+ <author/>
+ <othercredit/>
+ <releaseinfo/>
+ <copyright/>
+ <legalnotice/>
+ <pubdate/>
+ <revision/>
+ <revhistory/>
+ <abstract/>
+ </t:titlepage-content>
+
+ <t:titlepage-content t:side="verso">
+ </t:titlepage-content>
+
+ <t:titlepage-separator>
+ <xsl:if test="count(parent::*)='0'"><hr/></xsl:if>
+ </t:titlepage-separator>
+
+ <t:titlepage-before t:side="recto">
+ </t:titlepage-before>
+
+ <t:titlepage-before t:side="verso">
+ </t:titlepage-before>
+</t:titlepage>
+
+<t:titlepage t:element="sect5" t:wrapper="div" class="titlepage">
+ <t:titlepage-content t:side="recto">
+ <title/>
+ <subtitle/>
+ <corpauthor/>
+ <authorgroup/>
+ <author/>
+ <othercredit/>
+ <releaseinfo/>
+ <copyright/>
+ <legalnotice/>
+ <pubdate/>
+ <revision/>
+ <revhistory/>
+ <abstract/>
+ </t:titlepage-content>
+
+ <t:titlepage-content t:side="verso">
+ </t:titlepage-content>
+
+ <t:titlepage-separator>
+ <xsl:if test="count(parent::*)='0'"><hr/></xsl:if>
+ </t:titlepage-separator>
+
+ <t:titlepage-before t:side="recto">
+ </t:titlepage-before>
+
+ <t:titlepage-before t:side="verso">
+ </t:titlepage-before>
+</t:titlepage>
+
+<t:titlepage t:element="simplesect" t:wrapper="div" class="titlepage">
+ <t:titlepage-content t:side="recto">
+ <title/>
+ <subtitle/>
+ <corpauthor/>
+ <authorgroup/>
+ <author/>
+ <othercredit/>
+ <releaseinfo/>
+ <copyright/>
+ <legalnotice/>
+ <pubdate/>
+ <revision/>
+ <revhistory/>
+ <abstract/>
+ </t:titlepage-content>
+
+ <t:titlepage-content t:side="verso">
+ </t:titlepage-content>
+
+ <t:titlepage-separator>
+ <xsl:if test="count(parent::*)='0'"><hr/></xsl:if>
+ </t:titlepage-separator>
+
+ <t:titlepage-before t:side="recto">
+ </t:titlepage-before>
+
+ <t:titlepage-before t:side="verso">
+ </t:titlepage-before>
+</t:titlepage>
+
+<!-- ==================================================================== -->
+
+<t:titlepage t:element="bibliography" t:wrapper="div" class="titlepage">
+ <t:titlepage-content t:side="recto">
+ <title
+ t:force="1"
+ t:named-template="component.title"
+ param:node="ancestor-or-self::bibliography[1]"/>
+ <subtitle/>
+ </t:titlepage-content>
+
+ <t:titlepage-content t:side="verso">
+ </t:titlepage-content>
+
+ <t:titlepage-separator>
+ </t:titlepage-separator>
+
+ <t:titlepage-before t:side="recto">
+ </t:titlepage-before>
+
+ <t:titlepage-before t:side="verso">
+ </t:titlepage-before>
+</t:titlepage>
+
+<!-- ==================================================================== -->
+
+<t:titlepage t:element="glossary" t:wrapper="div" class="titlepage">
+ <t:titlepage-content t:side="recto">
+ <title
+ t:force="1"
+ t:named-template="component.title"
+ param:node="ancestor-or-self::glossary[1]"/>
+ <subtitle/>
+ </t:titlepage-content>
+
+ <t:titlepage-content t:side="verso">
+ </t:titlepage-content>
+
+ <t:titlepage-separator>
+ </t:titlepage-separator>
+
+ <t:titlepage-before t:side="recto">
+ </t:titlepage-before>
+
+ <t:titlepage-before t:side="verso">
+ </t:titlepage-before>
+</t:titlepage>
+
+<!-- ==================================================================== -->
+
+<t:titlepage t:element="index" t:wrapper="div" class="titlepage">
+ <t:titlepage-content t:side="recto">
+ <title
+ t:force="1"
+ t:named-template="component.title"
+ param:node="ancestor-or-self::index[1]"/>
+ <subtitle/>
+ </t:titlepage-content>
+
+ <t:titlepage-content t:side="verso">
+ </t:titlepage-content>
+
+ <t:titlepage-separator>
+ </t:titlepage-separator>
+
+ <t:titlepage-before t:side="recto">
+ </t:titlepage-before>
+
+ <t:titlepage-before t:side="verso">
+ </t:titlepage-before>
+</t:titlepage>
+
+<!-- ==================================================================== -->
+
+<t:titlepage t:element="setindex" t:wrapper="div" class="titlepage">
+ <t:titlepage-content t:side="recto">
+ <title
+ t:force="1"
+ t:named-template="component.title"
+ param:node="ancestor-or-self::setindex[1]"/>
+ <subtitle/>
+ </t:titlepage-content>
+
+ <t:titlepage-content t:side="verso">
+ </t:titlepage-content>
+
+ <t:titlepage-separator>
+ </t:titlepage-separator>
+
+ <t:titlepage-before t:side="recto">
+ </t:titlepage-before>
+
+ <t:titlepage-before t:side="verso">
+ </t:titlepage-before>
+</t:titlepage>
+
+<!-- ==================================================================== -->
+<t:titlepage t:element="sidebar" t:wrapper="div" class="titlepage">
+ <t:titlepage-content t:side="recto">
+ <title
+ t:named-template="formal.object.heading"
+ param:object="ancestor-or-self::sidebar[1]"/>
+ <subtitle/>
+ </t:titlepage-content>
+
+ <t:titlepage-content t:side="verso">
+ </t:titlepage-content>
+
+ <t:titlepage-separator>
+ </t:titlepage-separator>
+
+ <t:titlepage-before t:side="recto">
+ </t:titlepage-before>
+
+ <t:titlepage-before t:side="verso">
+ </t:titlepage-before>
+</t:titlepage>
+
+<!-- ==================================================================== -->
+
+</t:templates>
From c8eadc33695d4bf8b974a43f9db0c19fa14ea273 Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Sun, 31 Mar 2013 21:11:07 +0000
Subject: [PATCH 090/121] Always build pdf from ps and remove related nits.
This is what was already done with Handbook and building pdf directly does
not seem to work correctly anyway. This change will help simplifying the
build process and spare some image conversions.
---
de_DE.ISO8859-1/books/handbook/Makefile | 1 -
el_GR.ISO8859-7/books/handbook/Makefile | 1 -
en_US.ISO8859-1/books/handbook/Makefile | 1 -
es_ES.ISO8859-1/books/handbook/Makefile | 1 -
fr_FR.ISO8859-1/books/handbook/Makefile | 1 -
hu_HU.ISO8859-2/books/handbook/Makefile | 1 -
it_IT.ISO8859-15/books/handbook/Makefile | 1 -
ja_JP.eucJP/books/handbook/Makefile | 1 -
mn_MN.UTF-8/books/handbook/Makefile | 1 -
nl_NL.ISO8859-1/books/handbook/Makefile | 1 -
pl_PL.ISO8859-2/books/handbook/Makefile | 1 -
pt_BR.ISO8859-1/books/handbook/Makefile | 1 -
ru_RU.KOI8-R/books/handbook/Makefile | 1 -
share/mk/doc.docbook.mk | 45 +++---------------------
zh_CN.GB2312/books/handbook/Makefile | 1 -
zh_TW.Big5/books/handbook/Makefile | 1 -
16 files changed, 4 insertions(+), 56 deletions(-)
diff --git a/de_DE.ISO8859-1/books/handbook/Makefile b/de_DE.ISO8859-1/books/handbook/Makefile
index 5787f7d20e..d3775164db 100644
--- a/de_DE.ISO8859-1/books/handbook/Makefile
+++ b/de_DE.ISO8859-1/books/handbook/Makefile
@@ -23,7 +23,6 @@ DOC?= book
FORMATS?= html-split
HAS_INDEX= true
-USE_PS2PDF= yes
INSTALL_COMPRESSED?= gz
INSTALL_ONLY_COMPRESSED?=
diff --git a/el_GR.ISO8859-7/books/handbook/Makefile b/el_GR.ISO8859-7/books/handbook/Makefile
index 8038073aa3..fe5f159acd 100644
--- a/el_GR.ISO8859-7/books/handbook/Makefile
+++ b/el_GR.ISO8859-7/books/handbook/Makefile
@@ -44,7 +44,6 @@ DOC?= book
FORMATS?= html-split
HAS_INDEX= true
-USE_PS2PDF= yes
INSTALL_COMPRESSED?= gz
INSTALL_ONLY_COMPRESSED?=
diff --git a/en_US.ISO8859-1/books/handbook/Makefile b/en_US.ISO8859-1/books/handbook/Makefile
index 5f31dca821..65e6220067 100644
--- a/en_US.ISO8859-1/books/handbook/Makefile
+++ b/en_US.ISO8859-1/books/handbook/Makefile
@@ -40,7 +40,6 @@ DOC?= book
FORMATS?= html-split
HAS_INDEX= true
-USE_PS2PDF= yes
INSTALL_COMPRESSED?= gz
INSTALL_ONLY_COMPRESSED?=
diff --git a/es_ES.ISO8859-1/books/handbook/Makefile b/es_ES.ISO8859-1/books/handbook/Makefile
index 4b13f0b455..96f6a5e7fa 100755
--- a/es_ES.ISO8859-1/books/handbook/Makefile
+++ b/es_ES.ISO8859-1/books/handbook/Makefile
@@ -37,7 +37,6 @@ DOC?= book
FORMATS?= html-split
HAS_INDEX= true
-USE_PS2PDF= yes
INSTALL_COMPRESSED?= gz
INSTALL_ONLY_COMPRESSED?=
diff --git a/fr_FR.ISO8859-1/books/handbook/Makefile b/fr_FR.ISO8859-1/books/handbook/Makefile
index 7547f19f3f..e19bd2cc04 100644
--- a/fr_FR.ISO8859-1/books/handbook/Makefile
+++ b/fr_FR.ISO8859-1/books/handbook/Makefile
@@ -34,7 +34,6 @@ DOC?= book
FORMATS?= html-split
HAS_INDEX= true
-USE_PS2PDF= yes
INSTALL_COMPRESSED?= gz
INSTALL_ONLY_COMPRESSED?=
diff --git a/hu_HU.ISO8859-2/books/handbook/Makefile b/hu_HU.ISO8859-2/books/handbook/Makefile
index 5096c38eb2..abc2388059 100644
--- a/hu_HU.ISO8859-2/books/handbook/Makefile
+++ b/hu_HU.ISO8859-2/books/handbook/Makefile
@@ -45,7 +45,6 @@ DOC?= book
FORMATS?= html-split
HAS_INDEX= true
-USE_PS2PDF= yes
INSTALL_COMPRESSED?= gz
INSTALL_ONLY_COMPRESSED?=
diff --git a/it_IT.ISO8859-15/books/handbook/Makefile b/it_IT.ISO8859-15/books/handbook/Makefile
index ac5c446808..185b307110 100644
--- a/it_IT.ISO8859-15/books/handbook/Makefile
+++ b/it_IT.ISO8859-15/books/handbook/Makefile
@@ -35,7 +35,6 @@ DOC?= book
FORMATS?= html-split
HAS_INDEX= true
-USE_PS2PDF= yes
INSTALL_COMPRESSED?= gz
INSTALL_ONLY_COMPRESSED?=
diff --git a/ja_JP.eucJP/books/handbook/Makefile b/ja_JP.eucJP/books/handbook/Makefile
index c8d615af24..1bd163b587 100644
--- a/ja_JP.eucJP/books/handbook/Makefile
+++ b/ja_JP.eucJP/books/handbook/Makefile
@@ -42,7 +42,6 @@ DOC?= book
FORMATS?= html-split
HAS_INDEX= true
-USE_PS2PDF= yes
INSTALL_COMPRESSED?= gz
INSTALL_ONLY_COMPRESSED?=
diff --git a/mn_MN.UTF-8/books/handbook/Makefile b/mn_MN.UTF-8/books/handbook/Makefile
index 3b0258dab4..7485ab93cd 100644
--- a/mn_MN.UTF-8/books/handbook/Makefile
+++ b/mn_MN.UTF-8/books/handbook/Makefile
@@ -43,7 +43,6 @@ DOC?= book
FORMATS?= html-split
HAS_INDEX= true
-USE_PS2PDF= yes
INSTALL_COMPRESSED?= gz
INSTALL_ONLY_COMPRESSED?=
diff --git a/nl_NL.ISO8859-1/books/handbook/Makefile b/nl_NL.ISO8859-1/books/handbook/Makefile
index ae8a4d7ab1..68d8975067 100644
--- a/nl_NL.ISO8859-1/books/handbook/Makefile
+++ b/nl_NL.ISO8859-1/books/handbook/Makefile
@@ -43,7 +43,6 @@ DOC?= book
FORMATS?= html-split
HAS_INDEX= true
-USE_PS2PDF= yes
INSTALL_COMPRESSED?= gz
INSTALL_ONLY_COMPRESSED?=
diff --git a/pl_PL.ISO8859-2/books/handbook/Makefile b/pl_PL.ISO8859-2/books/handbook/Makefile
index 5d124e69b0..e1aaa878a6 100644
--- a/pl_PL.ISO8859-2/books/handbook/Makefile
+++ b/pl_PL.ISO8859-2/books/handbook/Makefile
@@ -35,7 +35,6 @@ DOC?= book
FORMATS?= html-split
HAS_INDEX= true
-USE_PS2PDF= yes
INSTALL_COMPRESSED?= gz
INSTALL_ONLY_COMPRESSED?=
diff --git a/pt_BR.ISO8859-1/books/handbook/Makefile b/pt_BR.ISO8859-1/books/handbook/Makefile
index eec5933db2..69946296b9 100644
--- a/pt_BR.ISO8859-1/books/handbook/Makefile
+++ b/pt_BR.ISO8859-1/books/handbook/Makefile
@@ -36,7 +36,6 @@ DOC?= book
FORMATS?= html-split
HAS_INDEX= true
-USE_PS2PDF= yes
INSTALL_COMPRESSED?= gz
INSTALL_ONLY_COMPRESSED?=
diff --git a/ru_RU.KOI8-R/books/handbook/Makefile b/ru_RU.KOI8-R/books/handbook/Makefile
index 2d3e729f56..1cf517348f 100644
--- a/ru_RU.KOI8-R/books/handbook/Makefile
+++ b/ru_RU.KOI8-R/books/handbook/Makefile
@@ -38,7 +38,6 @@ DOC?= book
FORMATS?= html-split
#HAS_INDEX= true
-USE_PS2PDF= yes
INSTALL_COMPRESSED?= gz
INSTALL_ONLY_COMPRESSED?=
diff --git a/share/mk/doc.docbook.mk b/share/mk/doc.docbook.mk
index 1dd75a000b..8d560c028c 100644
--- a/share/mk/doc.docbook.mk
+++ b/share/mk/doc.docbook.mk
@@ -452,31 +452,12 @@ ${DOC}.rtf:
.if ${RENDERENGINE} == "jade"
.if !defined(NO_TEX)
-#
-# This sucks, but there's no way round it. The PS and PDF formats need
-# to use different image formats, which are chosen at the .tex stage. So,
-# we need to create a different .tex file depending on our eventual output
-# format, which will then lead on to a different .dvi file as well.
-#
-
${DOC}.tex: ${SRCS} ${LOCAL_IMAGES_EPS} ${PRINT_INDEX} \
${LOCAL_IMAGES_TXT} ${LOCAL_IMAGES_EN} \
${DOC}.parsed.xml
${JADE} -V tex-backend ${PRINTOPTS} \
${JADEOPTS} -t tex -o ${.TARGET} ${XMLDECL} ${DOC}.parsed.xml
-${DOC}.tex-ps: ${DOC}.tex
- ${LN} -f ${.ALLSRC} ${.TARGET}
-
-.if !target(${DOC}.tex-pdf)
-${DOC}.tex-pdf: ${SRCS} ${IMAGES_PDF} ${PRINT_INDEX} \
- ${LOCAL_IMAGES_TXT} ${DOC}.parsed.xml
- ${RM} -f ${.TARGET}
- ${CAT} ${PDFTEX_DEF} > ${.TARGET}
- ${JADE} -V tex-backend ${PRINTOPTS} -ioutput.print.pdf \
- ${JADEOPTS} -t tex -o /dev/stdout ${XMLDECL} ${DOC}.parsed.xml >> ${.TARGET}
-.endif
-
.if !target(${DOC}.dvi)
${DOC}.dvi: ${DOC}.tex ${LOCAL_IMAGES_EPS}
.for _curimage in ${LOCAL_IMAGES_EPS:M*share*}
@@ -492,41 +473,23 @@ ${DOC}.dvi: ${DOC}.tex ${LOCAL_IMAGES_EPS}
.endif
.if !target(${DOC}.pdf)
-.if !defined(USE_PS2PDF)
-${DOC}.pdf: ${DOC}.tex-pdf ${IMAGES_PDF}
-.else
${DOC}.pdf: ${DOC}.ps ${IMAGES_PDF}
-.endif
-.for _curimage in ${IMAGES_PDF:M*share*}
- ${CP} -p ${_curimage} ${.CURDIR:H:H}/${_curimage:H:S|${IMAGES_EN_DIR}/||:S|${.CURDIR}||}
-.endfor
-.if !defined(USE_PS2PDF)
- ${PDFJADETEX_PREPROCESS} < ${DOC}.tex-pdf > ${DOC}.tex-pdf-tmp
- @${ECHO} "==> PDFTeX pass 1/3"
- -${PDFJADETEX_CMD} '${TEX_CMDSEQ} \nonstopmode\input{${DOC}.tex-pdf-tmp}'
- @${ECHO} "==> PDFTeX pass 2/3"
- -${PDFJADETEX_CMD} '${TEX_CMDSEQ} \nonstopmode\input{${DOC}.tex-pdf-tmp}'
- @${ECHO} "==> PDFTeX pass 3/3"
- -${PDFJADETEX_CMD} '${TEX_CMDSEQ} \nonstopmode\input{${DOC}.tex-pdf-tmp}'
-.else
+#.for _curimage in ${IMAGES_PDF:M*share*}
+# ${CP} -p ${_curimage} ${.CURDIR:H:H}/${_curimage:H:S|${IMAGES_EN_DIR}/||:S|${.CURDIR}||}
+#.endfor
${PS2PDF} ${DOC}.ps ${.TARGET}
.endif
-.endif
${DOC}.ps: ${DOC}.dvi
${DVIPS} ${DVIPSOPTS} -o ${.TARGET} ${.ALLSRC}
.else
# NO_TEX
-${DOC}.tex ${DOC}.tex-ps ${DOC}.dvi ${DOC}.ps:
+${DOC}.tex ${DOC}.dvi ${DOC}.ps:
${TOUCH} ${.TARGET}
.if !target(${DOC}.pdf)
${DOC}.pdf:
${TOUCH} ${.TARGET}
.endif
-.if !target(${DOC}.tex-pdf)
-${DOC}.tex-pdf:
- ${TOUCH} ${.TARGET}
-.endif
.endif
.elif ${RENDERENGINE} == "fop"
diff --git a/zh_CN.GB2312/books/handbook/Makefile b/zh_CN.GB2312/books/handbook/Makefile
index 5ab9d25bab..2163726fd9 100644
--- a/zh_CN.GB2312/books/handbook/Makefile
+++ b/zh_CN.GB2312/books/handbook/Makefile
@@ -41,7 +41,6 @@ DOC?= book
FORMATS?= html-split
HAS_INDEX= true
-USE_PS2PDF= yes
INSTALL_COMPRESSED?= gz
INSTALL_ONLY_COMPRESSED?=
diff --git a/zh_TW.Big5/books/handbook/Makefile b/zh_TW.Big5/books/handbook/Makefile
index 5c92346891..a86b5c2c8f 100644
--- a/zh_TW.Big5/books/handbook/Makefile
+++ b/zh_TW.Big5/books/handbook/Makefile
@@ -34,7 +34,6 @@ DOC?= book
FORMATS?= html-split
HAS_INDEX= true
-USE_PS2PDF= yes
INSTALL_COMPRESSED?= gz
INSTALL_ONLY_COMPRESSED?=
From 68eb6e1a6cfed937462c0beb7683bbf4ced1ba5a Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Sun, 31 Mar 2013 21:35:32 +0000
Subject: [PATCH 091/121] - Remove more leftovers - Simplify image processing
so that html always uses .png and printed formats always use .eps
---
share/mk/doc.docbook.mk | 7 -------
share/mk/doc.images.mk | 45 +++++++++--------------------------------
2 files changed, 10 insertions(+), 42 deletions(-)
diff --git a/share/mk/doc.docbook.mk b/share/mk/doc.docbook.mk
index 8d560c028c..bb90244dea 100644
--- a/share/mk/doc.docbook.mk
+++ b/share/mk/doc.docbook.mk
@@ -115,7 +115,6 @@ KNOWN_FORMATS= html html.tar html-split html-split.tar \
epub txt rtf ps pdf tex dvi tar pdb
CSS_SHEET?= ${DOC_PREFIX}/share/misc/docbook.css
-PDFTEX_DEF?= ${DOC_PREFIX}/share/web2c/pdftex.def
PRINTOPTS?= -ioutput.print -d ${DSLPRINT} ${PRINTFLAGS}
@@ -254,9 +253,6 @@ CLEANFILES+= ${_curimage:T} ${_curimage:H:T}/${_curimage:T}
.elif ${_cf} == "pdf"
CLEANFILES+= ${DOC}.aux ${DOC}.dvi ${DOC}.log ${DOC}.out ${DOC}.tex-pdf ${DOC}.tex-pdf-tmp \
${DOC}.tex ${DOC}.fo
-.for _curimage in ${IMAGES_PDF:M*share*}
-CLEANFILES+= ${_curimage:T} ${_curimage:H:T}/${_curimage:T}
-.endfor
.for _curimage in ${LOCAL_IMAGES_EPS:M*share*}
CLEANFILES+= ${_curimage:T} ${_curimage:H:T}/${_curimage:T}
.endfor
@@ -474,9 +470,6 @@ ${DOC}.dvi: ${DOC}.tex ${LOCAL_IMAGES_EPS}
.if !target(${DOC}.pdf)
${DOC}.pdf: ${DOC}.ps ${IMAGES_PDF}
-#.for _curimage in ${IMAGES_PDF:M*share*}
-# ${CP} -p ${_curimage} ${.CURDIR:H:H}/${_curimage:H:S|${IMAGES_EN_DIR}/||:S|${.CURDIR}||}
-#.endfor
${PS2PDF} ${DOC}.ps ${.TARGET}
.endif
diff --git a/share/mk/doc.images.mk b/share/mk/doc.images.mk
index 0ea71b2fd3..6adacf8d4f 100644
--- a/share/mk/doc.images.mk
+++ b/share/mk/doc.images.mk
@@ -71,33 +71,20 @@ _IMAGES_TXT+= ${LOCAL_IMAGES_EN:M*.txt}
_IMAGES_PIC= ${IMAGES:M*.pic}
_IMAGES_PIC+= ${LOCAL_IMAGES_EN:M*.pic}
-IMAGES_GEN_PNG= ${_IMAGES_EPS:S/.eps$/.png/}
-IMAGES_GEN_EPS= ${_IMAGES_PNG:S/.png$/.eps/}
-IMAGES_GEN_PDF= ${_IMAGES_EPS:S/.eps$/.pdf/}
-IMAGES_SCR_PNG= ${_IMAGES_SCR:S/.scr$/.png/}
-IMAGES_SCR_EPS= ${_IMAGES_SCR:S/.scr$/.eps/}
-IMAGES_SCR_PDF= ${_IMAGES_SCR:S/.scr$/.pdf/}
-IMAGES_SCR_TXT= ${_IMAGES_SCR:S/.scr$/.txt/}
-IMAGES_PIC_PNG= ${_IMAGES_PIC:S/.pic$/.png/}
-IMAGES_PIC_EPS= ${_IMAGES_PIC:S/.pic$/.eps/}
-IMAGES_PIC_PDF= ${_IMAGES_PIC:S/.pic$/.pdf/}
-IMAGES_GEN_PDF+= ${IMAGES_PIC_PDF} ${IMAGES_SCR_PDF}
+IMAGES_GEN_PNG= ${_IMAGES_EPS:S/.eps$/.png/} ${_IMAGES_SCR:S/.scr$/.png/} ${_IMAGES_PIC:S/.pic$/.png/}
+IMAGES_GEN_EPS= ${_IMAGES_PNG:S/.png$/.eps/} ${_IMAGES_SCR:S/.scr$/.eps/} ${_IMAGES_PIC:S/.pic$/.eps/}
-CLEANFILES+= ${IMAGES_GEN_PNG} ${IMAGES_GEN_EPS} ${IMAGES_GEN_PDF}
-CLEANFILES+= ${IMAGES_SCR_PNG} ${IMAGES_SCR_EPS} ${IMAGES_SCR_TXT}
-CLEANFILES+= ${IMAGES_PIC_PNG} ${IMAGES_PIC_EPS} ${_IMAGES_PIC:S/.pic$/.ps/}
+CLEANFILES+= ${IMAGES_GEN_PNG} ${IMAGES_GEN_EPS}
-IMAGES_PNG= ${_IMAGES_PNG} ${IMAGES_GEN_PNG} ${IMAGES_SCR_PNG} ${IMAGES_PIC_PNG}
-IMAGES_EPS= ${_IMAGES_EPS} ${IMAGES_GEN_EPS} ${IMAGES_SCR_EPS} ${IMAGES_PIC_EPS}
-IMAGES_TXT= ${_IMAGES_TXT} ${IMAGES_SCR_TXT}
+IMAGES_PNG= ${_IMAGES_PNG} ${IMAGES_GEN_PNG}
+IMAGES_EPS= ${_IMAGES_EPS} ${IMAGES_GEN_EPS}
LOCAL_IMAGES= ${IMAGES}
LOCAL_IMAGES_PNG= ${_IMAGES_PNG}
LOCAL_IMAGES_EPS= ${_IMAGES_EPS}
LOCAL_IMAGES_TXT= ${_IMAGES_TXT}
-LOCAL_IMAGES_PNG+= ${IMAGES_GEN_PNG} ${IMAGES_SCR_PNG} ${IMAGES_PIC_PNG}
-LOCAL_IMAGES_EPS+= ${IMAGES_GEN_EPS} ${IMAGES_SCR_EPS} ${IMAGES_PIC_EPS}
-LOCAL_IMAGES_TXT+= ${IMAGES_SCR_TXT}
+LOCAL_IMAGES_PNG+= ${IMAGES_GEN_PNG}
+LOCAL_IMAGES_EPS+= ${IMAGES_GEN_EPS}
# The default resolution eps2png (82) assumes a 640x480 monitor, and is too
# low for the typical monitor in use today. The resolution of 100 looks
@@ -105,10 +92,6 @@ LOCAL_IMAGES_TXT+= ${IMAGES_SCR_TXT}
# a 640x480 monitor.
EPS2PNM_RES?= 100
-# We need to list ${_IMAGES_PNG} here since the images might be in a
-# shared image directory.
-IMAGES_PDF= ${IMAGES_GEN_PDF} ${_IMAGES_PNG}
-
#
# Use suffix rules to convert .scr files to other formats
.SUFFIXES: .scr .pic .png .ps .eps .txt
@@ -142,9 +125,6 @@ IMAGES_PDF= ${IMAGES_GEN_PDF} ${_IMAGES_PNG}
-g`${EPSGEOM} -geom ${EPSGEOMOPTS} ${.TARGET:S/.png$/.eps/}` - \
| ${PNMTOPNG} > ${.TARGET}
-.pic.ps:
- ${PIC2PS} ${.ALLSRC} > ${.TARGET}
-
# When ghostscript built with A4=yes is used, ps2epsi's paper size also
# becomes the A4 size. However, the ps2epsi fails to convert grops(1)
# outputs, which is the letter size, and we cannot change ps2epsi's paper size
@@ -178,25 +158,20 @@ IMAGES_PDF= ${IMAGES_GEN_PDF} ${_IMAGES_PNG}
# vice versa, leading to a loop in the dependency graph. Instead, build
# the targets on the fly.
-.for _curimage in ${IMAGES_GEN_PNG}
-${_curimage}: ${_curimage:S/.png$/.eps/}
+.for _curimage in ${_IMAGES_EPS:S/.eps$/.png/}
+${_curimage}: ${_curimage:S/.png/.eps/}
${EPSGEOM} -offset ${EPSGEOMOPTS} ${.ALLSRC} \
| ${EPS2PNM} ${EPS2PNMOPTS} \
-g`${EPSGEOM} -geom ${EPSGEOMOPTS} ${.ALLSRC}` - \
| ${PNMTOPNG} > ${.TARGET}
.endfor
-.for _curimage in ${IMAGES_GEN_EPS}
+.for _curimage in ${_IMAGES_EPS:S/.png$/.eps/}
${_curimage}: ${_curimage:S/.eps$/.png/}
${PNGTOPNM} ${PNGTOPNMOPTS} ${.ALLSRC} | \
${PNMTOPS} ${PNMTOPSOPTS} > ${.TARGET}
.endfor
-.for _curimage in ${IMAGES_GEN_PDF}
-${_curimage}: ${_curimage:S/.pdf$/.eps/}
- ${EPSTOPDF} ${EPSTOPDFOPTS} --outfile=${.TARGET} ${.ALLSRC}
-.endfor
-
.if ${.OBJDIR} != ${.CURDIR}
.for _curimage in ${IMAGES}
${.OBJDIR}/${_curimage}: ${_curimage}
From d5c6e245d4c32cbf9e02a4fe4db6874c800606f9 Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Mon, 1 Apr 2013 08:16:09 +0000
Subject: [PATCH 092/121] - Remove some further unused leftovers - Make sure
printed docs generated with DSSSL always use .eps images - And XSLT-based
output always uses .png - Fix image conversion
---
share/mk/doc.images.mk | 5 +-
share/xml/freebsd-print.dsl | 328 +----------------------------------
share/xml/freebsd.dtd | 1 -
share/xml/freebsd45.dtd | 1 -
share/xsl/freebsd-common.xsl | 2 +
share/xsl/freebsd-fo.xsl | 9 -
6 files changed, 10 insertions(+), 336 deletions(-)
diff --git a/share/mk/doc.images.mk b/share/mk/doc.images.mk
index 6adacf8d4f..0066d6d3d3 100644
--- a/share/mk/doc.images.mk
+++ b/share/mk/doc.images.mk
@@ -125,6 +125,9 @@ EPS2PNM_RES?= 100
-g`${EPSGEOM} -geom ${EPSGEOMOPTS} ${.TARGET:S/.png$/.eps/}` - \
| ${PNMTOPNG} > ${.TARGET}
+.pic.ps:
+ ${PIC2PS} ${.ALLSRC} > ${.TARGET}
+
# When ghostscript built with A4=yes is used, ps2epsi's paper size also
# becomes the A4 size. However, the ps2epsi fails to convert grops(1)
# outputs, which is the letter size, and we cannot change ps2epsi's paper size
@@ -166,7 +169,7 @@ ${_curimage}: ${_curimage:S/.png/.eps/}
| ${PNMTOPNG} > ${.TARGET}
.endfor
-.for _curimage in ${_IMAGES_EPS:S/.png$/.eps/}
+.for _curimage in ${_IMAGES_PNG:S/.png$/.eps/}
${_curimage}: ${_curimage:S/.eps$/.png/}
${PNGTOPNM} ${PNGTOPNMOPTS} ${.ALLSRC} | \
${PNMTOPS} ${PNMTOPSOPTS} > ${.TARGET}
diff --git a/share/xml/freebsd-print.dsl b/share/xml/freebsd-print.dsl
index 1641de9c4c..495c02ac06 100644
--- a/share/xml/freebsd-print.dsl
+++ b/share/xml/freebsd-print.dsl
@@ -3,10 +3,6 @@
<!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
<!ENTITY % output.rtf.images "IGNORE">
<!ENTITY % output.print "IGNORE">
-<!ENTITY % output.print.pdf "IGNORE">
-<!ENTITY % output.print.justify "IGNORE">
-<!ENTITY % output.print.twoside "IGNORE">
-<!ENTITY % output.print.niceheaders "IGNORE">
]>
<style-sheet>
@@ -28,310 +24,6 @@
#f)
]]>
- <!-- Two-sided Print output ....................................... -->
- <![ %output.print.twoside; [
-
- ;; From an email by Ian Castle to the DocBook-apps list
-
- (define ($component$)
- (make simple-page-sequence
- page-n-columns: %page-n-columns%
- page-number-restart?: (or %page-number-restart%
-; (book-start?)
- (first-chapter?))
- page-number-format: ($page-number-format$)
- use: default-text-style
- left-header: ($left-header$)
- center-header: ($center-header$)
- right-header: ($right-header$)
- left-footer: ($left-footer$)
- center-footer: ($center-footer$)
- right-footer: ($right-footer$)
- start-indent: %body-start-indent%
- input-whitespace-treatment: 'collapse
- quadding: %default-quadding%
- (make sequence
- ($component-title$)
- (process-children))
- (make-endnotes)))
-
- ;; From an email by Ian Castle to the DocBook-apps list
-
- (define (first-part?)
- (let* ((book (ancestor (normalize "book")))
- (nd (ancestor-member (current-node)
- (append
- (component-element-list)
- (division-element-list))))
- (bookch (children book)))
- (let loop ((nl bookch))
- (if (node-list-empty? nl)
- #f
- (if (equal? (gi (node-list-first nl)) (normalize "part"))
- (if (node-list=? (node-list-first nl) nd)
- #t
- #f)
- (loop (node-list-rest nl)))))))
-
-
- ;; From an email by Ian Castle to the DocBook-apps list
-
- (define (first-chapter?)
- ;; Returns #t if the current-node is in the first chapter of a book
- (if (has-ancestor-member? (current-node) (division-element-list))
- #f
- (let* ((book (ancestor (normalize "book")))
- (nd (ancestor-member (current-node)
- (append (component-element-list)
- (division-element-list))))
- (bookch (children book))
- (bookcomp (expand-children bookch (list (normalize "part")))))
- (let loop ((nl bookcomp))
- (if (node-list-empty? nl)
- #f
- (if (equal? (gi (node-list-first nl)) (normalize "chapter"))
- (if (node-list=? (node-list-first nl) nd)
- #t
- #f)
- (loop (node-list-rest nl))))))))
-
-
- ; By default, the Part I title page will be given a roman numeral,
- ; which is wrong so we have to fix it
-
- (define (part-titlepage elements #!optional (side 'recto))
- (let ((nodelist (titlepage-nodelist
- (if (equal? side 'recto)
- (part-titlepage-recto-elements)
- (part-titlepage-verso-elements))
- elements))
- ;; partintro is a special case...
- (partintro (node-list-first
- (node-list-filter-by-gi elements (list (normalize "partintro"))))))
- (if (part-titlepage-content? elements side)
- (make simple-page-sequence
- page-n-columns: %titlepage-n-columns%
- ;; Make sure that page number format is correct.
- page-number-format: ($page-number-format$)
- ;; Make sure that the page number is set to 1 if this is the first part
- ;; in the book
- page-number-restart?: (first-part?)
- input-whitespace-treatment: 'collapse
- use: default-text-style
-
- ;; This hack is required for the RTF backend. If an
- ;; external-graphic is the first thing on the page,
- ;; RTF doesn't seem to do the right thing (the graphic
- ;; winds up on the baseline of the first line of the
- ;; page, left justified). This "one point rule" fixes
- ;; that problem.
-
- (make paragraph
- line-spacing: 1pt
- (literal ""))
-
- (let loop ((nl nodelist) (lastnode (empty-node-list)))
- (if (node-list-empty? nl)
- (empty-sosofo)
- (make sequence
- (if (or (node-list-empty? lastnode)
- (not (equal? (gi (node-list-first nl))
- (gi lastnode))))
- (part-titlepage-before (node-list-first nl) side)
- (empty-sosofo))
- (cond
- ((equal? (gi (node-list-first nl)) (normalize "subtitle"))
- (part-titlepage-subtitle (node-list-first nl) side))
- ((equal? (gi (node-list-first nl)) (normalize "title"))
- (part-titlepage-title (node-list-first nl) side))
- (else
- (part-titlepage-default (node-list-first nl) side)))
- (loop (node-list-rest nl) (node-list-first nl)))))
- (if (and %generate-part-toc%
- %generate-part-toc-on-titlepage%
- (equal? side 'recto))
- (make display-group
- (build-toc (current-node)
- (toc-depth (current-node))))
- (empty-sosofo))
-
- ;; PartIntro is a special case
- (if (and (equal? side 'recto)
- (not (node-list-empty? partintro))
- %generate-partintro-on-titlepage%)
- ($process-partintro$ partintro #f)
- (empty-sosofo)))
- (empty-sosofo))))
-
- ]]>
-
- <!-- Print with justification ..................................... -->
- <![ %output.print.justify; [
-
- (define %default-quadding%
- 'justify)
-
- (define %hyphenation%
- #t)
-
-
- ;; The url.sty package is making all of the links purple/pink.
- ;; Someone please fix this!
-
- (define (urlwrap)
- (let ((%factor% (if %verbatim-size-factor%
- %verbatim-size-factor%
- 1.0)))
- (make sequence
- font-family-name: %mono-font-family%
- font-size: (* (inherited-font-size) %factor%)
- (make formatting-instruction data:
- (string-append
- "\\url|"
- (data (current-node))
- "|")))))
-
- (define (pathwrap)
- (let ((%factor% (if %verbatim-size-factor%
- %verbatim-size-factor%
- 1.0)))
- (make sequence
- font-family-name: %mono-font-family%
- font-size: (* (inherited-font-size) %factor%)
- (make formatting-instruction data:
- (string-append
- "\\path|"
- (data (current-node))
- "|")))))
-
- ;; Some others may check the value of %hyphenation% and be
- ;; specified below
-
-; (element email
-; (make sequence
-; (literal "<")
-; (urlwrap)
-; (literal ">")))
-
- (element filename
- (pathwrap))
-
- (element varname
- (pathwrap))
-
- ]]>
-
- <![ %output.print.niceheaders; [
-
- (define niceheader-rule-spacebefore (* (HSIZE 5) %head-before-factor%))
- (define niceheader-rule-spaceafter 0pt)
-
- (define ($component-title$)
- (let* ((info (cond
- ((equal? (gi) (normalize "appendix"))
- (select-elements (children (current-node)) (normalize "docinfo")))
- ((equal? (gi) (normalize "article"))
- (node-list-filter-by-gi (children (current-node))
- (list (normalize "artheader")
- (normalize "articleinfo"))))
- ((equal? (gi) (normalize "bibliography"))
- (select-elements (children (current-node)) (normalize "docinfo")))
- ((equal? (gi) (normalize "chapter"))
- (select-elements (children (current-node)) (normalize "docinfo")))
- ((equal? (gi) (normalize "dedication"))
- (empty-node-list))
- ((equal? (gi) (normalize "glossary"))
- (select-elements (children (current-node)) (normalize "docinfo")))
- ((equal? (gi) (normalize "index"))
- (select-elements (children (current-node)) (normalize "docinfo")))
- ((equal? (gi) (normalize "preface"))
- (select-elements (children (current-node)) (normalize "docinfo")))
- ((equal? (gi) (normalize "reference"))
- (select-elements (children (current-node)) (normalize "docinfo")))
- ((equal? (gi) (normalize "setindex"))
- (select-elements (children (current-node)) (normalize "docinfo")))
- (else
- (empty-node-list))))
- (exp-children (if (node-list-empty? info)
- (empty-node-list)
- (expand-children (children info)
- (list (normalize "bookbiblio")
- (normalize "bibliomisc")
- (normalize "biblioset")))))
- (parent-titles (select-elements (children (current-node)) (normalize "title")))
- (info-titles (select-elements exp-children (normalize "title")))
- (titles (if (node-list-empty? parent-titles)
- info-titles
- parent-titles))
- (subtitles (select-elements exp-children (normalize "subtitle"))))
- (make sequence
- (make paragraph
- font-family-name: %title-font-family%
- font-weight: 'bold
- font-size: (HSIZE 4)
- line-spacing: (* (HSIZE 4) %line-spacing-factor%)
- space-before: (* (HSIZE 4) %head-before-factor%)
- start-indent: 0pt
- first-line-start-indent: 0pt
- quadding: %component-title-quadding%
- heading-level: (if %generate-heading-level% 1 0)
- keep-with-next?: #t
-
- (if (string=? (element-label) "")
- (empty-sosofo)
- (literal (gentext-element-name-space (current-node))
- (element-label)
- (gentext-label-title-sep (gi)))))
- (make paragraph
- font-family-name: %title-font-family%
- font-weight: 'bold
- font-posture: 'italic
- font-size: (HSIZE 6)
- line-spacing: (* (HSIZE 6) %line-spacing-factor%)
-; space-before: (* (HSIZE 5) %head-before-factor%)
- start-indent: 0pt
- first-line-start-indent: 0pt
- quadding: %component-title-quadding%
- heading-level: (if %generate-heading-level% 1 0)
- keep-with-next?: #t
-
- (if (node-list-empty? titles)
- (element-title-sosofo) ;; get a default!
- (with-mode component-title-mode
- (make sequence
- (process-node-list titles)))))
-
- (make paragraph
- font-family-name: %title-font-family%
- font-weight: 'bold
- font-posture: 'italic
- font-size: (HSIZE 3)
- line-spacing: (* (HSIZE 3) %line-spacing-factor%)
- space-before: (* 0.5 (* (HSIZE 3) %head-before-factor%))
- space-after: (* (HSIZE 4) %head-after-factor%)
- start-indent: 0pt
- first-line-start-indent: 0pt
- quadding: %component-subtitle-quadding%
- keep-with-next?: #t
-
- (with-mode component-title-mode
- (make sequence
- (process-node-list subtitles))))
-
- (if (equal? (gi) (normalize "index"))
- (empty-sosofo)
- (make rule
- length: %body-width%
- display-alignment: 'start
- space-before: niceheader-rule-spacebefore
- space-after: niceheader-rule-spaceafter
- line-thickness: 0.5pt)))))
-
- (element authorgroup
- (empty-sosofo))
-
- ]]>
-
<!-- Print only ................................................... -->
<![ %output.print; [
(define withpgpkeys
@@ -470,18 +162,10 @@
(notation (attribute-string (normalize "format") objdata)))
(node-list-first nl)))))
- ;; When selecting a filename to use, don't append the default
- ;; extension, instead, just use the bare filename, and let TeX
- ;; work it out. jadetex will use the .eps file, while pdfjadetex
- ;; will use the .png file automatically.
- (define (graphic-file filename)
- (let ((ext (file-extension filename)))
- (if (or tex-backend ;; TeX can work this out itself
- (not filename)
- (not %graphic-default-extension%)
- (member ext %graphic-extensions%))
- filename
- (string-append filename "." %graphic-default-extension%))))
+ ;; Printed formats always use .eps images.
+ (define %graphic-default-extension%
+ "eps")
+
;; Including bitmaps in the PS and PDF output tends to scale them
;; horribly. The solution is to scale them down by 50%.
@@ -700,10 +384,6 @@
(process-node-list c)))))))))))
]]>
- <![ %output.print.pdf; [
-
- ]]>
-
</style-specification-body>
</style-specification>
</style-sheet>
diff --git a/share/xml/freebsd.dtd b/share/xml/freebsd.dtd
index ee4b6f8b7c..1d51d54f7f 100644
--- a/share/xml/freebsd.dtd
+++ b/share/xml/freebsd.dtd
@@ -20,7 +20,6 @@
<!ENTITY % output.html "IGNORE"> <!-- HTML output is being generated -->
<!ENTITY % output.html.images "IGNORE"> <!-- HTML with images -->
<!ENTITY % output.print "IGNORE"> <!-- Print output is being generated -->
-<!ENTITY % output.print.pdf "IGNORE"> <!-- PDF output -->
<!-- ..................................................................... -->
<!-- Entities for element classes and mixtures ........................... -->
diff --git a/share/xml/freebsd45.dtd b/share/xml/freebsd45.dtd
index 3475484ae7..61f8e571ba 100644
--- a/share/xml/freebsd45.dtd
+++ b/share/xml/freebsd45.dtd
@@ -1,7 +1,6 @@
<!ENTITY % output.html "IGNORE"> <!-- HTML output is being generated -->
<!ENTITY % output.html.images "IGNORE"> <!-- HTML with images -->
<!ENTITY % output.print "IGNORE"> <!-- Print output is being generated -->
-<!ENTITY % output.print.pdf "IGNORE"> <!-- PDF output -->
<!-- XXX: Jade is given a totally parsed document with XML tools
so it does not need to pull in entity sets and catalogs
diff --git a/share/xsl/freebsd-common.xsl b/share/xsl/freebsd-common.xsl
index 541e3e2881..e98abb2e70 100644
--- a/share/xsl/freebsd-common.xsl
+++ b/share/xsl/freebsd-common.xsl
@@ -19,4 +19,6 @@
<xsl:param name="section.label.includes.component.label" select="1"/>
<xsl:param name="generate.index" select="0"/>
+
+ <xsl:param name="graphic.default.extension">png</xsl:param>
</xsl:stylesheet>
diff --git a/share/xsl/freebsd-fo.xsl b/share/xsl/freebsd-fo.xsl
index be0987069b..a21ff9080b 100644
--- a/share/xsl/freebsd-fo.xsl
+++ b/share/xsl/freebsd-fo.xsl
@@ -16,15 +16,6 @@
<!-- Redefine variables, and replace templates as necessary here -->
- <xsl:param name="freebsd.output.print"
- select="'0'"/>
- <xsl:param name="freebsd.output.print.pdf"
- select="'0'"/>
- <xsl:param name="freebsd.output.print.justify"
- select="'0'"/>
- <xsl:param name="freebsd.output.print.twoside"
- select="'0'"/>
-
<!-- FO specific customisation goes here -->
<xsl:param name="use.extensions" select="1"/>
From e8e2dfdbabfabc0fcdc5301c0f86ccc706e6b5b7 Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Tue, 2 Apr 2013 09:50:10 +0000
Subject: [PATCH 093/121] - Do not specify image file extensions in documents;
the proper extension is appended during rendering - For the same reason, do
not specify format either - Add constraints to enforce this
---
.../books/fdp-primer/sgml-markup/chapter.xml | 4 +-
.../handbook/advanced-networking/chapter.xml | 10 +-
.../books/handbook/basics/chapter.xml | 12 +-
.../books/handbook/bsdinstall/chapter.xml | 90 +++++-----
.../books/handbook/geom/chapter.xml | 2 +-
.../books/handbook/install/chapter.xml | 114 ++++++------
.../books/handbook/mail/chapter.xml | 16 +-
.../books/handbook/vinum/chapter.xml | 14 +-
.../books/handbook/virtualization/chapter.xml | 74 ++++----
.../articles/gjournal-desktop/article.xml | 4 +-
.../handbook/advanced-networking/chapter.xml | 10 +-
.../books/handbook/basics/chapter.xml | 12 +-
.../books/handbook/bsdinstall/chapter.xml | 88 ++++-----
.../books/handbook/geom/chapter.xml | 2 +-
.../books/handbook/install/chapter.xml | 114 ++++++------
.../books/handbook/mail/chapter.xml | 16 +-
.../books/handbook/security/chapter.xml | 8 +-
.../books/handbook/vinum/chapter.xml | 14 +-
.../books/handbook/virtualization/chapter.xml | 76 ++++----
.../articles/building-products/article.xml | 4 +-
.../articles/console-server/article.xml | 2 +-
.../articles/gjournal-desktop/article.xml | 4 +-
en_US.ISO8859-1/articles/releng/article.xml | 16 +-
.../articles/vm-design/article.xml | 8 +-
en_US.ISO8859-1/books/design-44bsd/book.xml | 4 +-
en_US.ISO8859-1/books/dev-model/book.xml | 32 ++--
.../developers-handbook/sockets/chapter.xml | 22 +--
.../books/fdp-primer/sgml-markup/chapter.xml | 4 +-
.../handbook/advanced-networking/chapter.xml | 12 +-
.../books/handbook/basics/chapter.xml | 12 +-
.../books/handbook/bsdinstall/chapter.xml | 170 +++++++++---------
.../books/handbook/geom/chapter.xml | 2 +-
.../books/handbook/install/chapter.xml | 114 ++++++------
.../books/handbook/mail/chapter.xml | 16 +-
.../books/handbook/vinum/chapter.xml | 14 +-
.../books/handbook/virtualization/chapter.xml | 76 ++++----
es_ES.ISO8859-1/articles/releng/article.xml | 6 +-
.../handbook/advanced-networking/chapter.xml | 8 +-
.../books/handbook/basics/chapter.xml | 12 +-
.../books/handbook/geom/chapter.xml | 2 +-
.../books/handbook/install/chapter.xml | 110 ++++++------
.../books/handbook/mail/chapter.xml | 16 +-
.../books/handbook/security/chapter.xml | 8 +-
.../books/handbook/vinum/chapter.xml | 14 +-
.../articles/building-products/article.xml | 4 +-
.../handbook/advanced-networking/chapter.xml | 10 +-
.../books/handbook/basics/chapter.xml | 12 +-
.../books/handbook/geom/chapter.xml | 2 +-
.../books/handbook/install/chapter.xml | 114 ++++++------
.../books/handbook/mail/chapter.xml | 16 +-
.../books/handbook/vinum/chapter.xml | 14 +-
.../books/handbook/virtualization/chapter.xml | 52 +++---
.../articles/gjournal-desktop/article.xml | 4 +-
.../books/fdp-primer/sgml-markup/chapter.xml | 4 +-
.../handbook/advanced-networking/chapter.xml | 10 +-
.../books/handbook/basics/chapter.xml | 12 +-
.../books/handbook/geom/chapter.xml | 2 +-
.../books/handbook/install/chapter.xml | 116 ++++++------
.../books/handbook/mail/chapter.xml | 16 +-
.../books/handbook/vinum/chapter.xml | 14 +-
.../books/handbook/virtualization/chapter.xml | 76 ++++----
.../articles/vm-design/article.xml | 8 +-
.../books/handbook/basics/chapter.xml | 12 +-
.../books/handbook/geom/chapter.xml | 2 +-
.../books/handbook/install/chapter.xml | 116 ++++++------
.../books/handbook/mail/chapter.xml | 16 +-
.../books/handbook/vinum/chapter.xml | 14 +-
ja_JP.eucJP/books/design-44bsd/book.xml | 4 +-
.../handbook/advanced-networking/chapter.xml | 8 +-
.../books/handbook/bsdinstall/chapter.xml | 88 ++++-----
.../books/handbook/install/chapter.xml | 114 ++++++------
.../handbook/advanced-networking/chapter.xml | 12 +-
mn_MN.UTF-8/books/handbook/basics/chapter.xml | 12 +-
.../books/handbook/bsdinstall/chapter.xml | 88 ++++-----
mn_MN.UTF-8/books/handbook/geom/chapter.xml | 2 +-
.../books/handbook/install/chapter.xml | 114 ++++++------
mn_MN.UTF-8/books/handbook/mail/chapter.xml | 16 +-
mn_MN.UTF-8/books/handbook/vinum/chapter.xml | 14 +-
.../books/handbook/virtualization/chapter.xml | 76 ++++----
.../handbook/advanced-networking/chapter.xml | 12 +-
.../books/handbook/basics/chapter.xml | 12 +-
.../books/handbook/geom/chapter.xml | 2 +-
.../books/handbook/install/chapter.xml | 114 ++++++------
.../books/handbook/mail/chapter.xml | 16 +-
.../books/handbook/vinum/chapter.xml | 14 +-
.../books/handbook/virtualization/chapter.xml | 76 ++++----
.../books/handbook/basics/chapter.xml | 2 +-
.../books/handbook/install/chapter.xml | 120 ++++++-------
.../handbook/advanced-networking/chapter.xml | 10 +-
.../books/handbook/basics/chapter.xml | 12 +-
.../books/handbook/geom/chapter.xml | 2 +-
.../books/handbook/install/chapter.xml | 116 ++++++------
.../books/handbook/mail/chapter.xml | 16 +-
.../books/handbook/security/chapter.xml | 8 +-
.../books/handbook/vinum/chapter.xml | 14 +-
.../articles/building-products/article.xml | 4 +-
.../books/fdp-primer/sgml-markup/chapter.xml | 4 +-
.../articles/console-server/article.xml | 2 +-
.../articles/gjournal-desktop/article.xml | 4 +-
ru_RU.KOI8-R/articles/releng/article.xml | 16 +-
ru_RU.KOI8-R/articles/vm-design/article.xml | 8 +-
ru_RU.KOI8-R/books/design-44bsd/book.xml | 4 +-
.../books/fdp-primer/sgml-markup/chapter.xml | 4 +-
.../handbook/advanced-networking/chapter.xml | 10 +-
.../books/handbook/basics/chapter.xml | 12 +-
.../books/handbook/bsdinstall/chapter.xml | 163 ++++++++---------
ru_RU.KOI8-R/books/handbook/geom/chapter.xml | 2 +-
.../books/handbook/install/chapter.xml | 114 ++++++------
ru_RU.KOI8-R/books/handbook/mail/chapter.xml | 16 +-
.../books/handbook/security/chapter.xml | 8 +-
ru_RU.KOI8-R/books/handbook/vinum/chapter.xml | 14 +-
share/xml/freebsd.sch | 5 +-
.../handbook/advanced-networking/chapter.xml | 10 +-
.../books/handbook/basics/chapter.xml | 12 +-
.../books/handbook/bsdinstall/chapter.xml | 170 +++++++++---------
zh_CN.GB2312/books/handbook/geom/chapter.xml | 2 +-
.../books/handbook/install/chapter.xml | 116 ++++++------
zh_CN.GB2312/books/handbook/mail/chapter.xml | 16 +-
zh_CN.GB2312/books/handbook/vinum/chapter.xml | 14 +-
.../books/handbook/virtualization/chapter.xml | 76 ++++----
.../developers-handbook/sockets/chapter.xml | 22 +--
.../books/fdp-primer/sgml-markup/chapter.xml | 4 +-
.../handbook/advanced-networking/chapter.xml | 10 +-
zh_TW.Big5/books/handbook/basics/chapter.xml | 12 +-
zh_TW.Big5/books/handbook/geom/chapter.xml | 2 +-
zh_TW.Big5/books/handbook/install/chapter.xml | 114 ++++++------
zh_TW.Big5/books/handbook/mail/chapter.xml | 16 +-
.../books/handbook/security/chapter.xml | 8 +-
zh_TW.Big5/books/handbook/vinum/chapter.xml | 14 +-
.../books/handbook/virtualization/chapter.xml | 76 ++++----
130 files changed, 2088 insertions(+), 2104 deletions(-)
diff --git a/de_DE.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml b/de_DE.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml
index b43c488ff7..6ad69cb4be 100644
--- a/de_DE.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml
+++ b/de_DE.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml
@@ -2616,7 +2616,7 @@ This is the file called 'foo2'</screen>
<programlisting><mediaobject>
<imageobject>
- <imagedata fileref="bild1.png"> <co id="co-image-ext"/>
+ <imagedata fileref="bild1"> <co id="co-image-ext"/>
</imageobject>
<textobject>
<literallayout class="monospaced">+ - - - - - - - - - - - - - - -+ <co id="co-image-literal"/>
@@ -2730,7 +2730,7 @@ IMAGES+= bild3.png
<programlisting><mediaobject>
<imageobject>
- <imagedata fileref="kapitel1/bild1.png"> <co id="co-image-dir"/>
+ <imagedata fileref="kapitel1/bild1"> <co id="co-image-dir"/>
</imageobject>
…
diff --git a/de_DE.ISO8859-1/books/handbook/advanced-networking/chapter.xml b/de_DE.ISO8859-1/books/handbook/advanced-networking/chapter.xml
index 5f3f62dcc0..95c92266d1 100644
--- a/de_DE.ISO8859-1/books/handbook/advanced-networking/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/advanced-networking/chapter.xml
@@ -365,7 +365,7 @@ host2.example.com link#1 UC 0 0
<mediaobject>
<imageobject>
- <imagedata fileref="advanced-networking/net-routing.pic"/>
+ <imagedata fileref="advanced-networking/net-routing"/>
</imageobject>
<textobject>
@@ -580,7 +580,7 @@ host2.example.com link#1 UC 0 0
<mediaobject>
<imageobject>
- <imagedata fileref="advanced-networking/static-routes.pic"/>
+ <imagedata fileref="advanced-networking/static-routes"/>
</imageobject>
<textobject>
@@ -5057,7 +5057,7 @@ cd /usr/src/etc; make distribution</programlisting>
<mediaobject>
<imageobject>
- <imagedata fileref="advanced-networking/isdn-bus.eps"/>
+ <imagedata fileref="advanced-networking/isdn-bus"/>
</imageobject>
<textobject>
@@ -5096,7 +5096,7 @@ ISDN BRI Verbindung
<mediaobject>
<imageobject>
- <imagedata fileref="advanced-networking/isdn-twisted-pair.eps"/>
+ <imagedata fileref="advanced-networking/isdn-twisted-pair"/>
</imageobject>
<textobject>
@@ -5217,7 +5217,7 @@ ISDN BRI Verbindung
<mediaobject>
<imageobject>
- <imagedata fileref="advanced-networking/natd.eps"/>
+ <imagedata fileref="advanced-networking/natd"/>
</imageobject>
<textobject>
diff --git a/de_DE.ISO8859-1/books/handbook/basics/chapter.xml b/de_DE.ISO8859-1/books/handbook/basics/chapter.xml
index 5e28e05edc..20c6598b89 100644
--- a/de_DE.ISO8859-1/books/handbook/basics/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/basics/chapter.xml
@@ -1191,7 +1191,7 @@ Old Password:</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir1.eps" format="EPS"/>
+ <imagedata fileref="install/example-dir1"/>
</imageobject>
<textobject>
@@ -1214,7 +1214,7 @@ Old Password:</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir2.eps" format="EPS"/>
+ <imagedata fileref="install/example-dir2"/>
</imageobject>
<textobject>
@@ -1249,7 +1249,7 @@ Old Password:</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir3.eps" format="EPS"/>
+ <imagedata fileref="install/example-dir3"/>
</imageobject>
<textobject>
@@ -1277,7 +1277,7 @@ Old Password:</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir4.eps" format="EPS"/>
+ <imagedata fileref="install/example-dir4"/>
</imageobject>
<textobject>
@@ -1303,7 +1303,7 @@ Old Password:</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir5.eps" format="EPS"/>
+ <imagedata fileref="install/example-dir5"/>
</imageobject>
<textobject>
@@ -1641,7 +1641,7 @@ Old Password:</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/disk-layout.eps" format="EPS"/>
+ <imagedata fileref="install/disk-layout"/>
</imageobject>
<textobject>
diff --git a/de_DE.ISO8859-1/books/handbook/bsdinstall/chapter.xml b/de_DE.ISO8859-1/books/handbook/bsdinstall/chapter.xml
index f26de3f3aa..27fa6d5e83 100644
--- a/de_DE.ISO8859-1/books/handbook/bsdinstall/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/bsdinstall/chapter.xml
@@ -725,8 +725,8 @@ Loading /boot/defaults/loader.conf
<title>Das &os;-Bootloader Men�</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-boot-loader-menu.png"
- format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-boot-loader-menu"
+ />
</imageobject>
</mediaobject>
</figure>
@@ -1016,7 +1016,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-choose-mode.png" format="PNG"/>
+ fileref="bsdinstall/bsdinstall-choose-mode"/>
</imageobject>
</mediaobject>
</figure>
@@ -1059,7 +1059,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>Tastaturbelegung festlegen</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-keymap-select-default.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-keymap-select-default"/>
</imageobject>
</mediaobject>
</figure>
@@ -1073,7 +1073,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>Tastaturauswahlbildschirm</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-config-keymap.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-config-keymap"/>
</imageobject>
</mediaobject>
</figure>
@@ -1103,7 +1103,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>Festlegen des Rechnernamens</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-config-hostname.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-config-hostname"/>
</imageobject>
</mediaobject>
</figure>
@@ -1124,7 +1124,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>Komponenten f�r die Installation ausw�hlen</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-config-components.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-config-components"/>
</imageobject>
</mediaobject>
</figure>
@@ -1217,7 +1217,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-netinstall-files.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-netinstall-files"/>
</imageobject>
</mediaobject>
</figure>
@@ -1237,7 +1237,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-netinstall-mirrorselect.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-netinstall-mirrorselect"/>
</imageobject>
</mediaobject>
</figure>
@@ -1264,7 +1264,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>Gef�hrte oder manuelle Partitionierung ausw�hlen</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-part-guided-manual.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-part-guided-manual"/>
</imageobject>
</mediaobject>
</figure>
@@ -1279,7 +1279,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>Aus mehreren Platten eine ausw�hlen</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-part-guided-disk.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-part-guided-disk"/>
</imageobject>
</mediaobject>
</figure>
@@ -1297,7 +1297,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>Auswahl der gesamten Platte oder einer Partition</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-part-entire-part.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-part-entire-part"/>
</imageobject>
</mediaobject>
</figure>
@@ -1318,7 +1318,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>�berpr�fen der erstellen Partitionen</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-part-review.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-part-review"/>
</imageobject>
</mediaobject>
</figure>
@@ -1334,7 +1334,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>Partitionen manuell erstellen</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-part-manual-create.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-part-manual-create"/>
</imageobject>
</mediaobject>
</figure>
@@ -1349,7 +1349,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>Partitionen manuell anlegen</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-part-manual-partscheme.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-part-manual-partscheme"/>
</imageobject>
</mediaobject>
</figure>
@@ -1422,7 +1422,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>Partitionen manuell erzeugen</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-part-manual-addpart.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-part-manual-addpart"/>
</imageobject>
</mediaobject>
</figure>
@@ -1601,7 +1601,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>Letzte Best�tigung</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-final-confirmation.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-final-confirmation"/>
</imageobject>
</mediaobject>
</figure>
@@ -1633,7 +1633,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>Herunterladen der Distributionsdateien</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-distfile-fetching.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-distfile-fetching"/>
</imageobject>
</mediaobject>
</figure>
@@ -1647,7 +1647,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>�berpr�fen der Distributionsdateien</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-distfile-verifying.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-distfile-verifying"/>
</imageobject>
</mediaobject>
</figure>
@@ -1659,7 +1659,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>Entpacken der Distributionsdateien</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-distfile-extracting.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-distfile-extracting"/>
</imageobject>
</mediaobject>
</figure>
@@ -1693,7 +1693,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-post-root-passwd.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-post-root-passwd"/>
</imageobject>
</mediaobject>
</figure>
@@ -1721,7 +1721,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface"/>
</imageobject>
</mediaobject>
</figure>
@@ -1757,7 +1757,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>Nach drahtlosen Access Points scannen</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-configure-wireless-scan.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-configure-wireless-scan"/>
</imageobject>
</mediaobject>
</figure>
@@ -1780,7 +1780,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>Ein drahtloses Netzwerk ausw�hlen</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-configure-wireless-accesspoints.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-configure-wireless-accesspoints"/>
</imageobject>
</mediaobject>
</figure>
@@ -1798,7 +1798,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>Verbindungsaufbau mit WPA2</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-configure-wireless-wpa2setup.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-configure-wireless-wpa2setup"/>
</imageobject>
</mediaobject>
</figure>
@@ -1820,7 +1820,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-ipv4.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-ipv4"/>
</imageobject>
</mediaobject>
</figure>
@@ -1856,7 +1856,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-ipv4-dhcp.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-ipv4-dhcp"/>
</imageobject>
</mediaobject>
</figure>
@@ -1873,7 +1873,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-ipv4-static.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-ipv4-static"/>
</imageobject>
</mediaobject>
</figure>
@@ -1917,7 +1917,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-ipv6.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-ipv6"/>
</imageobject>
</mediaobject>
</figure>
@@ -1944,7 +1944,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-slaac.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-slaac"/>
</imageobject>
</mediaobject>
</figure>
@@ -1962,7 +1962,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-ipv6-static.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-ipv6-static"/>
</imageobject>
</mediaobject>
</figure>
@@ -2011,7 +2011,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-configure-network-ipv4-dns.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-configure-network-ipv4-dns"/>
</imageobject>
</mediaobject>
</figure>
@@ -2035,7 +2035,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>Lokale oder UTC-Zeit</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-set-clock-local-utc.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-set-clock-local-utc"/>
</imageobject>
</mediaobject>
</figure>
@@ -2052,7 +2052,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>Das Gebiet ausw�hlen</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-timezone-region.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-timezone-region"/>
</imageobject>
</mediaobject>
</figure>
@@ -2065,7 +2065,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>Das Land ausw�hlen</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-timezone-country.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-timezone-country"/>
</imageobject>
</mediaobject>
</figure>
@@ -2078,7 +2078,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>W�hlen einer Zeitzone</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-timezone-zone.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-timezone-zone"/>
</imageobject>
</mediaobject>
</figure>
@@ -2091,7 +2091,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>Best�tigen der Zeitzone</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-timezone-confirm.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-timezone-confirm"/>
</imageobject>
</mediaobject>
</figure>
@@ -2113,7 +2113,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>Auswahl zus�tzlicher Dienste</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-config-services.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-config-services"/>
</imageobject>
</mediaobject>
</figure>
@@ -2162,7 +2162,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>Aktivierung der Absturzaufzeichnung</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-config-crashdump.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-config-crashdump"/>
</imageobject>
</mediaobject>
</figure>
@@ -2187,7 +2187,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-adduser1.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-adduser1"/>
</imageobject>
</mediaobject>
</figure>
@@ -2200,7 +2200,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-adduser2.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-adduser2"/>
</imageobject>
</mediaobject>
</figure>
@@ -2303,7 +2303,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-adduser3.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-adduser3"/>
</imageobject>
</mediaobject>
</figure>
@@ -2330,7 +2330,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-finalconfiguration.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-finalconfiguration"/>
</imageobject>
</mediaobject>
</figure>
@@ -2387,7 +2387,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-final-modification-shell.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-final-modification-shell"/>
</imageobject>
</mediaobject>
</figure>
@@ -2405,7 +2405,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-mainexit.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-mainexit"/>
</imageobject>
</mediaobject>
</figure>
diff --git a/de_DE.ISO8859-1/books/handbook/geom/chapter.xml b/de_DE.ISO8859-1/books/handbook/geom/chapter.xml
index e526d3d612..13ee15d505 100644
--- a/de_DE.ISO8859-1/books/handbook/geom/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/geom/chapter.xml
@@ -163,7 +163,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="geom/striping.pic" align="center"/>
+ <imagedata fileref="geom/striping" align="center"/>
</imageobject>
<textobject>
diff --git a/de_DE.ISO8859-1/books/handbook/install/chapter.xml b/de_DE.ISO8859-1/books/handbook/install/chapter.xml
index 248a075302..46232bc007 100644
--- a/de_DE.ISO8859-1/books/handbook/install/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/install/chapter.xml
@@ -1113,7 +1113,7 @@ Insert disk labelled "Kernel floppy 1" and press any key...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/boot-loader-menu.png" format="PNG"/>
+ <imagedata fileref="install/boot-loader-menu"/>
</imageobject>
</mediaobject>
</figure>
@@ -1284,7 +1284,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/config-country.png" format="PNG"/>
+ <imagedata fileref="install/config-country"/>
</imageobject>
</mediaobject>
</figure>
@@ -1302,7 +1302,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/config-keymap.png" format="PNG"/>
+ <imagedata fileref="install/config-keymap"/>
</imageobject>
</mediaobject>
</figure>
@@ -1346,7 +1346,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main1.png" format="PNG"/>
+ <imagedata fileref="install/main1"/>
</imageobject>
</mediaobject>
</figure>
@@ -1363,7 +1363,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main-doc.png" format="PNG"/>
+ <imagedata fileref="install/main-doc"/>
</imageobject>
</mediaobject>
</figure>
@@ -1375,7 +1375,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/docmenu1.png" format="PNG"/>
+ <imagedata fileref="install/docmenu1"/>
</imageobject>
</mediaobject>
</figure>
@@ -1407,7 +1407,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main-keymap.png" format="PNG"/>
+ <imagedata fileref="install/main-keymap"/>
</imageobject>
</mediaobject>
</figure>
@@ -1431,7 +1431,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/keymap.png" format="PNG"/>
+ <imagedata fileref="install/keymap"/>
</imageobject>
</mediaobject>
</figure>
@@ -1448,7 +1448,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main-options.png" format="PNG"/>
+ <imagedata fileref="install/main-options"/>
</imageobject>
</mediaobject>
</figure>
@@ -1458,7 +1458,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/options.png" format="PNG"/>
+ <imagedata fileref="install/options"/>
</imageobject>
</mediaobject>
</figure>
@@ -1497,7 +1497,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main-std.png" format="PNG"/>
+ <imagedata fileref="install/main-std"/>
</imageobject>
</mediaobject>
</figure>
@@ -1692,7 +1692,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/fdisk-drive1.png" format="PNG"/>
+ <imagedata fileref="install/fdisk-drive1"/>
</imageobject>
</mediaobject>
</figure>
@@ -1768,7 +1768,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/fdisk-edit1.png" format="PNG"/>
+ <imagedata fileref="install/fdisk-edit1"/>
</imageobject>
</mediaobject>
</figure>
@@ -1817,7 +1817,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/fdisk-edit2.png" format="PNG"/>
+ <imagedata fileref="install/fdisk-edit2"/>
</imageobject>
</mediaobject>
</figure>
@@ -1864,7 +1864,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/boot-mgr.png" format="PNG"/>
+ <imagedata fileref="install/boot-mgr"/>
</imageobject>
</mediaobject>
</figure>
@@ -1896,7 +1896,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/fdisk-drive2.png" format="PNG"/>
+ <imagedata fileref="install/fdisk-drive2"/>
</imageobject>
</mediaobject>
</figure>
@@ -2170,7 +2170,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-ed1.png" format="PNG"/>
+ <imagedata fileref="install/disklabel-ed1"/>
</imageobject>
</mediaobject>
</figure>
@@ -2200,7 +2200,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-auto.png" format="PNG"/>
+ <imagedata fileref="install/disklabel-auto"/>
</imageobject>
</mediaobject>
</figure>
@@ -2228,7 +2228,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-root1.png" format="PNG"/>
+ <imagedata fileref="install/disklabel-root1"/>
</imageobject>
</mediaobject>
</figure>
@@ -2248,7 +2248,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-root2.png" format="PNG"/>
+ <imagedata fileref="install/disklabel-root2"/>
</imageobject>
</mediaobject>
</figure>
@@ -2266,7 +2266,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-fs.png" format="PNG"/>
+ <imagedata fileref="install/disklabel-fs"/>
</imageobject>
</mediaobject>
</figure>
@@ -2284,7 +2284,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-root3.png" format="PNG"/>
+ <imagedata fileref="install/disklabel-root3"/>
</imageobject>
</mediaobject>
</figure>
@@ -2310,7 +2310,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-ed2.png" format="PNG"/>
+ <imagedata fileref="install/disklabel-ed2"/>
</imageobject>
</mediaobject>
</figure>
@@ -2368,7 +2368,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/dist-set.png" format="PNG"/>
+ <imagedata fileref="install/dist-set"/>
</imageobject>
</mediaobject>
</figure>
@@ -2427,7 +2427,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/dist-set2.png" format="PNG"/>
+ <imagedata fileref="install/dist-set2"/>
</imageobject>
</mediaobject>
</figure>
@@ -2464,7 +2464,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/media.png" format="PNG"/>
+ <imagedata fileref="install/media"/>
</imageobject>
</mediaobject>
</figure>
@@ -2672,7 +2672,7 @@ installation menus to retry whichever operations have failed.
<mediaobject>
<imageobject>
- <imagedata fileref="install/ed0-conf.png" format="PNG"/>
+ <imagedata fileref="install/ed0-conf"/>
</imageobject>
</mediaobject>
</figure>
@@ -2725,7 +2725,7 @@ installation menus to retry whichever operations have failed.
<mediaobject>
<imageobject>
- <imagedata fileref="install/ed0-conf2.png" format="PNG"/>
+ <imagedata fileref="install/ed0-conf2"/>
</imageobject>
</mediaobject>
</figure>
@@ -2910,7 +2910,7 @@ use the current settings.
<mediaobject>
<imageobject>
- <imagedata fileref="install/edit-inetd-conf.png" format="PNG"/>
+ <imagedata fileref="install/edit-inetd-conf"/>
</imageobject>
</mediaobject>
</figure>
@@ -3010,7 +3010,7 @@ use the current settings.
<mediaobject>
<imageobject>
- <imagedata fileref="install/ftp-anon1.png" format="PNG"/>
+ <imagedata fileref="install/ftp-anon1"/>
</imageobject>
</mediaobject>
</figure>
@@ -3093,7 +3093,7 @@ use the current settings.
<mediaobject>
<imageobject>
- <imagedata fileref="install/ftp-anon2.png" format="PNG"/>
+ <imagedata fileref="install/ftp-anon2"/>
</imageobject>
</mediaobject>
</figure>
@@ -3157,7 +3157,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/nfs-server-edit.png" format="PNG"/>
+ <imagedata fileref="install/nfs-server-edit"/>
</imageobject>
</mediaobject>
</figure>
@@ -3212,7 +3212,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/console-saver1.png" format="PNG"/>
+ <imagedata fileref="install/console-saver1"/>
</imageobject>
</mediaobject>
</figure>
@@ -3227,7 +3227,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/console-saver2.png" format="PNG"/>
+ <imagedata fileref="install/console-saver2"/>
</imageobject>
</mediaobject>
</figure>
@@ -3250,7 +3250,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/console-saver3.png" format="PNG"/>
+ <imagedata fileref="install/console-saver3"/>
</imageobject>
</mediaobject>
</figure>
@@ -3264,7 +3264,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/console-saver4.png" format="PNG"/>
+ <imagedata fileref="install/console-saver4"/>
</imageobject>
</mediaobject>
</figure>
@@ -3311,7 +3311,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/timezone1.png" format="PNG"/>
+ <imagedata fileref="install/timezone1"/>
</imageobject>
</mediaobject>
</figure>
@@ -3324,7 +3324,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/timezone2.png" format="PNG"/>
+ <imagedata fileref="install/timezone2"/>
</imageobject>
</mediaobject>
</figure>
@@ -3337,7 +3337,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/timezone3.png" format="PNG"/>
+ <imagedata fileref="install/timezone3"/>
</imageobject>
</mediaobject>
</figure>
@@ -3409,7 +3409,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse1.png" format="PNG"/>
+ <imagedata fileref="install/mouse1"/>
</imageobject>
</mediaobject>
</figure>
@@ -3423,7 +3423,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse2.png" format="PNG"/>
+ <imagedata fileref="install/mouse2"/>
</imageobject>
</mediaobject>
</figure>
@@ -3440,7 +3440,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse3.png" format="PNG"/>
+ <imagedata fileref="install/mouse3"/>
</imageobject>
</mediaobject>
</figure>
@@ -3454,7 +3454,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse4.png" format="PNG"/>
+ <imagedata fileref="install/mouse4"/>
</imageobject>
</mediaobject>
</figure>
@@ -3470,7 +3470,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse5.png" format="PNG"/>
+ <imagedata fileref="install/mouse5"/>
</imageobject>
</mediaobject>
</figure>
@@ -3486,7 +3486,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse6.png" format="PNG"/>
+ <imagedata fileref="install/mouse6"/>
</imageobject>
</mediaobject>
</figure>
@@ -3535,7 +3535,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/pkg-cat.png" format="PNG"/>
+ <imagedata fileref="install/pkg-cat"/>
</imageobject>
</mediaobject>
</figure>
@@ -3558,7 +3558,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/pkg-sel.png" format="PNG"/>
+ <imagedata fileref="install/pkg-sel"/>
</imageobject>
</mediaobject>
</figure>
@@ -3592,7 +3592,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/pkg-install.png" format="PNG"/>
+ <imagedata fileref="install/pkg-install"/>
</imageobject>
</mediaobject>
</figure>
@@ -3608,7 +3608,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/pkg-confirm.png" format="PNG"/>
+ <imagedata fileref="install/pkg-confirm"/>
</imageobject>
</mediaobject>
</figure>
@@ -3665,7 +3665,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/adduser1.png" format="PNG"/>
+ <imagedata fileref="install/adduser1"/>
</imageobject>
</mediaobject>
</figure>
@@ -3679,7 +3679,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/adduser2.png" format="PNG"/>
+ <imagedata fileref="install/adduser2"/>
</imageobject>
</mediaobject>
</figure>
@@ -3788,7 +3788,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/adduser3.png" format="PNG"/>
+ <imagedata fileref="install/adduser3"/>
</imageobject>
</mediaobject>
</figure>
@@ -3856,7 +3856,7 @@ Retype new password :</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/mainexit.png" format="PNG"/>
+ <imagedata fileref="install/mainexit"/>
</imageobject>
</mediaobject>
</figure>
@@ -3935,7 +3935,7 @@ Be sure to remove the media from the drive.
<mediaobject>
<imageobject>
- <imagedata fileref="install/net-config-menu1.png" format="PNG"/>
+ <imagedata fileref="install/net-config-menu1"/>
</imageobject>
</mediaobject>
</figure>
@@ -4009,7 +4009,7 @@ Be sure to remove the media from the drive.
<mediaobject>
<imageobject>
- <imagedata fileref="install/mta-main.png" format="PNG"/>
+ <imagedata fileref="install/mta-main"/>
</imageobject>
</mediaobject>
</figure>
@@ -4066,7 +4066,7 @@ Be sure to remove the media from the drive.
<mediaobject>
<imageobject>
- <imagedata fileref="install/ntp-config.png" format="PNG"/>
+ <imagedata fileref="install/ntp-config"/>
</imageobject>
</mediaobject>
</figure>
@@ -4094,7 +4094,7 @@ Be sure to remove the media from the drive.
<mediaobject>
<imageobject>
- <imagedata fileref="install/net-config-menu2.png" format="PNG"/>
+ <imagedata fileref="install/net-config-menu2"/>
</imageobject>
</mediaobject>
</figure>
diff --git a/de_DE.ISO8859-1/books/handbook/mail/chapter.xml b/de_DE.ISO8859-1/books/handbook/mail/chapter.xml
index c2a5608de4..be3fbc3bca 100644
--- a/de_DE.ISO8859-1/books/handbook/mail/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/mail/chapter.xml
@@ -2082,7 +2082,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/mutt1.png" format="PNG"/>
+ <imagedata fileref="mail/mutt1"/>
</imageobject>
</mediaobject>
@@ -2093,7 +2093,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/mutt2.png" format="PNG"/>
+ <imagedata fileref="mail/mutt2"/>
</imageobject>
</mediaobject>
@@ -2137,7 +2137,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/mutt3.png" format="PNG"/>
+ <imagedata fileref="mail/mutt3"/>
</imageobject>
</mediaobject>
@@ -2192,7 +2192,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine1.png" format="PNG"/>
+ <imagedata fileref="mail/pine1"/>
</imageobject>
</mediaobject>
@@ -2214,7 +2214,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine2.png" format="PNG"/>
+ <imagedata fileref="mail/pine2"/>
</imageobject>
</mediaobject>
@@ -2225,7 +2225,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine3.png" format="PNG"/>
+ <imagedata fileref="mail/pine3"/>
</imageobject>
</mediaobject>
@@ -2238,7 +2238,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine4.png" format="PNG"/>
+ <imagedata fileref="mail/pine4"/>
</imageobject>
</mediaobject>
@@ -2258,7 +2258,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine5.png" format="PNG"/>
+ <imagedata fileref="mail/pine5"/>
</imageobject>
</mediaobject>
diff --git a/de_DE.ISO8859-1/books/handbook/vinum/chapter.xml b/de_DE.ISO8859-1/books/handbook/vinum/chapter.xml
index bab6be4025..3a4089f3e7 100644
--- a/de_DE.ISO8859-1/books/handbook/vinum/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/vinum/chapter.xml
@@ -214,7 +214,7 @@
<para>
<figure id="vinum-concat">
<title>Konkatenierte Anordnung</title>
- <graphic fileref="vinum/vinum-concat.pic"/>
+ <graphic fileref="vinum/vinum-concat"/>
</figure>
</para>
@@ -258,7 +258,7 @@
<para>
<figure id="vinum-striped">
<title>Striped-Anordnung</title>
- <graphic fileref="vinum/vinum-striped.pic"/>
+ <graphic fileref="vinum/vinum-striped"/>
</figure>
</para>
</sect1>
@@ -333,7 +333,7 @@
<para>
<figure id="vinum-raid5-org">
<title>RAID-5 Aufbau</title>
- <graphic fileref="vinum/vinum-raid5-org.pic"/>
+ <graphic fileref="vinum/vinum-raid5-org"/>
</figure>
</para>
@@ -646,7 +646,7 @@
<para>
<figure id="vinum-simple-vol">
<title>Ein einfaches Vinum-Volume</title>
- <graphic fileref="vinum/vinum-simple-vol.pic"/>
+ <graphic fileref="vinum/vinum-simple-vol"/>
</figure>
</para>
@@ -717,7 +717,7 @@
<para>
<figure id="vinum-mirrored-vol">
<title>Ein gespiegeltes Vinum Volume</title>
- <graphic fileref="vinum/vinum-mirrored-vol.pic"/>
+ <graphic fileref="vinum/vinum-mirrored-vol"/>
</figure>
</para>
@@ -786,7 +786,7 @@
<para>
<figure id="vinum-striped-vol">
<title>Ein Striped Vinum Volume</title>
- <graphic fileref="vinum/vinum-striped-vol.pic"/>
+ <graphic fileref="vinum/vinum-striped-vol"/>
</figure>
</para>
@@ -833,7 +833,7 @@
<para>
<figure id="vinum-raid10-vol">
<title>Ein gespiegeltes, Striped Vinum Volume</title>
- <graphic fileref="vinum/vinum-raid10-vol.pic"/>
+ <graphic fileref="vinum/vinum-raid10-vol"/>
</figure>
</para>
</sect2>
diff --git a/de_DE.ISO8859-1/books/handbook/virtualization/chapter.xml b/de_DE.ISO8859-1/books/handbook/virtualization/chapter.xml
index 5cb283d384..433fc3898c 100644
--- a/de_DE.ISO8859-1/books/handbook/virtualization/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/virtualization/chapter.xml
@@ -127,7 +127,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd1.png"/>
+ <imagedata fileref="virtualization/parallels-freebsd1"/>
</imageobject>
</mediaobject>
@@ -139,25 +139,25 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd2.png"/>
+ <imagedata fileref="virtualization/parallels-freebsd2"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd3.png"/>
+ <imagedata fileref="virtualization/parallels-freebsd3"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd4.png"/>
+ <imagedata fileref="virtualization/parallels-freebsd4"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd5.png"/>
+ <imagedata fileref="virtualization/parallels-freebsd5"/>
</imageobject>
</mediaobject>
@@ -166,13 +166,13 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd6.png"/>
+ <imagedata fileref="virtualization/parallels-freebsd6"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd7.png"/>
+ <imagedata fileref="virtualization/parallels-freebsd7"/>
</imageobject>
</mediaobject>
@@ -181,13 +181,13 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd8.png"/>
+ <imagedata fileref="virtualization/parallels-freebsd8"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd9.png"/>
+ <imagedata fileref="virtualization/parallels-freebsd9"/>
</imageobject>
</mediaobject>
@@ -204,7 +204,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd11.png"/>
+ <imagedata fileref="virtualization/parallels-freebsd11"/>
</imageobject>
</mediaobject>
@@ -218,7 +218,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd10.png"/>
+ <imagedata fileref="virtualization/parallels-freebsd10"/>
</imageobject>
</mediaobject>
@@ -230,7 +230,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd12.png"/>
+ <imagedata fileref="virtualization/parallels-freebsd12"/>
</imageobject>
</mediaobject>
@@ -239,7 +239,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd13.png"/>
+ <imagedata fileref="virtualization/parallels-freebsd13"/>
</imageobject>
</mediaobject>
</sect3>
@@ -647,13 +647,13 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd1.png"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd1"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd2.png"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd2"/>
</imageobject>
</mediaobject>
@@ -663,7 +663,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd3.png"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd3"/>
</imageobject>
</mediaobject>
@@ -675,13 +675,13 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd4.png"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd4"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd5.png"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd5"/>
</imageobject>
</mediaobject>
@@ -690,7 +690,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd6.png"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd6"/>
</imageobject>
</mediaobject>
@@ -701,13 +701,13 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd7.png"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd7"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd8.png"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd8"/>
</imageobject>
</mediaobject>
@@ -728,13 +728,13 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd9.png"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd9"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd10.png"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd10"/>
</imageobject>
</mediaobject>
@@ -748,7 +748,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd11.png"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd11"/>
</imageobject>
</mediaobject>
@@ -761,7 +761,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd12.png"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd12"/>
</imageobject>
</mediaobject>
@@ -772,7 +772,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd13.png"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd13"/>
</imageobject>
</mediaobject>
</sect3>
@@ -870,7 +870,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd01.png"/>
+ <imagedata fileref="virtualization/vmware-freebsd01"/>
</imageobject>
</mediaobject>
@@ -880,7 +880,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd02.png"/>
+ <imagedata fileref="virtualization/vmware-freebsd02"/>
</imageobject>
</mediaobject>
@@ -894,7 +894,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd03.png"/>
+ <imagedata fileref="virtualization/vmware-freebsd03"/>
</imageobject>
</mediaobject>
@@ -903,7 +903,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd04.png"/>
+ <imagedata fileref="virtualization/vmware-freebsd04"/>
</imageobject>
</mediaobject>
@@ -912,7 +912,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd06.png"/>
+ <imagedata fileref="virtualization/vmware-freebsd06"/>
</imageobject>
</mediaobject>
@@ -921,7 +921,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd07.png"/>
+ <imagedata fileref="virtualization/vmware-freebsd07"/>
</imageobject>
</mediaobject>
@@ -930,7 +930,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd08.png"/>
+ <imagedata fileref="virtualization/vmware-freebsd08"/>
</imageobject>
</mediaobject>
@@ -946,7 +946,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd09.png"/>
+ <imagedata fileref="virtualization/vmware-freebsd09"/>
</imageobject>
</mediaobject>
@@ -954,7 +954,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd10.png"/>
+ <imagedata fileref="virtualization/vmware-freebsd10"/>
</imageobject>
</mediaobject>
@@ -964,7 +964,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd11.png"/>
+ <imagedata fileref="virtualization/vmware-freebsd11"/>
</imageobject>
</mediaobject>
@@ -982,7 +982,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd12.png"/>
+ <imagedata fileref="virtualization/vmware-freebsd12"/>
</imageobject>
</mediaobject>
diff --git a/el_GR.ISO8859-7/articles/gjournal-desktop/article.xml b/el_GR.ISO8859-7/articles/gjournal-desktop/article.xml
index e044010be0..3c61f4d901 100644
--- a/el_GR.ISO8859-7/articles/gjournal-desktop/article.xml
+++ b/el_GR.ISO8859-7/articles/gjournal-desktop/article.xml
@@ -274,7 +274,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="disklabel1.png"/>
+ <imagedata fileref="disklabel1"/>
</imageobject>
</mediaobject>
@@ -350,7 +350,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="disklabel2.png"/>
+ <imagedata fileref="disklabel2"/>
</imageobject>
</mediaobject>
diff --git a/el_GR.ISO8859-7/books/handbook/advanced-networking/chapter.xml b/el_GR.ISO8859-7/books/handbook/advanced-networking/chapter.xml
index 290605189a..81538410ca 100644
--- a/el_GR.ISO8859-7/books/handbook/advanced-networking/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/advanced-networking/chapter.xml
@@ -292,7 +292,7 @@ host2.example.com link#1 UC 0 0
<mediaobject>
<imageobject>
- <imagedata fileref="advanced-networking/net-routing.pic"/>
+ <imagedata fileref="advanced-networking/net-routing"/>
</imageobject>
<textobject>
@@ -478,7 +478,7 @@ host2.example.com link#1 UC 0 0
<mediaobject>
<imageobject>
- <imagedata fileref="advanced-networking/static-routes.pic"/>
+ <imagedata fileref="advanced-networking/static-routes"/>
</imageobject>
<textobject>
@@ -3486,7 +3486,7 @@ cd /usr/src/etc; make distribution</programlisting>
<mediaobject>
<imageobject>
- <imagedata fileref="advanced-networking/isdn-bus.eps"/>
+ <imagedata fileref="advanced-networking/isdn-bus"/>
</imageobject>
<textobject>
@@ -3520,7 +3520,7 @@ ISDN BRI line</literallayout>
<mediaobject>
<imageobject>
- <imagedata fileref="advanced-networking/isdn-twisted-pair.eps"/>
+ <imagedata fileref="advanced-networking/isdn-twisted-pair"/>
</imageobject>
<textobject>
@@ -3623,7 +3623,7 @@ ISDN BRI line</literallayout>
<mediaobject>
<imageobject>
- <imagedata fileref="advanced-networking/natd.eps"/>
+ <imagedata fileref="advanced-networking/natd"/>
</imageobject>
<textobject>
diff --git a/el_GR.ISO8859-7/books/handbook/basics/chapter.xml b/el_GR.ISO8859-7/books/handbook/basics/chapter.xml
index 2689d1903c..23fa33a490 100644
--- a/el_GR.ISO8859-7/books/handbook/basics/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/basics/chapter.xml
@@ -1214,7 +1214,7 @@ root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01 passwd</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir1.eps" format="EPS" />
+ <imagedata fileref="install/example-dir1" />
</imageobject>
<textobject>
@@ -1235,7 +1235,7 @@ root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01 passwd</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir2.eps" format="EPS"/>
+ <imagedata fileref="install/example-dir2"/>
</imageobject>
<textobject>
@@ -1264,7 +1264,7 @@ root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01 passwd</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir3.eps" format="EPS" />
+ <imagedata fileref="install/example-dir3" />
</imageobject>
<textobject>
@@ -1291,7 +1291,7 @@ root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01 passwd</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir4.eps" format="EPS"/>
+ <imagedata fileref="install/example-dir4"/>
</imageobject>
<textobject>
@@ -1317,7 +1317,7 @@ root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01 passwd</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir5.eps" format="EPS"/>
+ <imagedata fileref="install/example-dir5"/>
</imageobject>
<textobject>
@@ -1635,7 +1635,7 @@ root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01 passwd</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/disk-layout.eps" format="EPS"/>
+ <imagedata fileref="install/disk-layout"/>
</imageobject>
<textobject>
diff --git a/el_GR.ISO8859-7/books/handbook/bsdinstall/chapter.xml b/el_GR.ISO8859-7/books/handbook/bsdinstall/chapter.xml
index d6e1b31d76..6aaf503c34 100644
--- a/el_GR.ISO8859-7/books/handbook/bsdinstall/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/bsdinstall/chapter.xml
@@ -693,7 +693,7 @@ Loading /boot/defaults/loader.conf
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-boot-loader-menu.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-boot-loader-menu"/>
</imageobject>
</mediaobject>
</figure>
@@ -979,7 +979,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-choose-mode.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-choose-mode"/>
</imageobject>
</mediaobject>
</figure>
@@ -1025,7 +1025,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-keymap-select-default.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-keymap-select-default"/>
</imageobject>
</mediaobject>
</figure>
@@ -1040,7 +1040,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-config-keymap.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-config-keymap"/>
</imageobject>
</mediaobject>
</figure>
@@ -1069,7 +1069,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-config-hostname.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-config-hostname"/>
</imageobject>
</mediaobject>
</figure>
@@ -1091,7 +1091,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-config-components.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-config-components"/>
</imageobject>
</mediaobject>
</figure>
@@ -1181,7 +1181,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-netinstall-files.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-netinstall-files"/>
</imageobject>
</mediaobject>
</figure>
@@ -1198,7 +1198,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-netinstall-mirrorselect.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-netinstall-mirrorselect"/>
</imageobject>
</mediaobject>
</figure>
@@ -1225,7 +1225,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-part-guided-manual.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-part-guided-manual"/>
</imageobject>
</mediaobject>
</figure>
@@ -1241,7 +1241,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-part-guided-disk.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-part-guided-disk"/>
</imageobject>
</mediaobject>
</figure>
@@ -1260,7 +1260,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-part-entire-part.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-part-entire-part"/>
</imageobject>
</mediaobject>
</figure>
@@ -1281,7 +1281,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-part-review.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-part-review"/>
</imageobject>
</mediaobject>
</figure>
@@ -1298,7 +1298,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-part-manual-create.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-part-manual-create"/>
</imageobject>
</mediaobject>
</figure>
@@ -1314,7 +1314,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-part-manual-partscheme.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-part-manual-partscheme"/>
</imageobject>
</mediaobject>
</figure>
@@ -1390,7 +1390,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-part-manual-addpart.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-part-manual-addpart"/>
</imageobject>
</mediaobject>
</figure>
@@ -1574,7 +1574,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-final-confirmation.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-final-confirmation"/>
</imageobject>
</mediaobject>
</figure>
@@ -1606,7 +1606,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-distfile-fetching.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-distfile-fetching"/>
</imageobject>
</mediaobject>
</figure>
@@ -1620,7 +1620,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-distfile-verifying.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-distfile-verifying"/>
</imageobject>
</mediaobject>
</figure>
@@ -1633,7 +1633,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-distfile-extracting.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-distfile-extracting"/>
</imageobject>
</mediaobject>
</figure>
@@ -1667,7 +1667,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-post-root-passwd.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-post-root-passwd"/>
</imageobject>
</mediaobject>
</figure>
@@ -1693,7 +1693,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface"/>
</imageobject>
</mediaobject>
</figure>
@@ -1728,7 +1728,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-configure-wireless-scan.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-configure-wireless-scan"/>
</imageobject>
</mediaobject>
</figure>
@@ -1749,7 +1749,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-configure-wireless-accesspoints.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-configure-wireless-accesspoints"/>
</imageobject>
</mediaobject>
</figure>
@@ -1767,7 +1767,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-configure-wireless-wpa2setup.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-configure-wireless-wpa2setup"/>
</imageobject>
</mediaobject>
</figure>
@@ -1788,7 +1788,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-ipv4.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-ipv4"/>
</imageobject>
</mediaobject>
</figure>
@@ -1819,7 +1819,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-ipv4-dhcp.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-ipv4-dhcp"/>
</imageobject>
</mediaobject>
</figure>
@@ -1836,7 +1836,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-ipv4-static.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-ipv4-static"/>
</imageobject>
</mediaobject>
</figure>
@@ -1881,7 +1881,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-ipv6.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-ipv6"/>
</imageobject>
</mediaobject>
</figure>
@@ -1907,7 +1907,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-slaac.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-slaac"/>
</imageobject>
</mediaobject>
</figure>
@@ -1924,7 +1924,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-ipv6-static.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-ipv6-static"/>
</imageobject>
</mediaobject>
</figure>
@@ -1971,7 +1971,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-configure-network-ipv4-dns.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-configure-network-ipv4-dns"/>
</imageobject>
</mediaobject>
</figure>
@@ -1995,7 +1995,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-set-clock-local-utc.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-set-clock-local-utc"/>
</imageobject>
</mediaobject>
</figure>
@@ -2013,7 +2013,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-timezone-region.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-timezone-region"/>
</imageobject>
</mediaobject>
</figure>
@@ -2026,7 +2026,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-timezone-country.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-timezone-country"/>
</imageobject>
</mediaobject>
</figure>
@@ -2039,7 +2039,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-timezone-zone.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-timezone-zone"/>
</imageobject>
</mediaobject>
</figure>
@@ -2052,7 +2052,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-timezone-confirm.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-timezone-confirm"/>
</imageobject>
</mediaobject>
</figure>
@@ -2074,7 +2074,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-config-services.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-config-services"/>
</imageobject>
</mediaobject>
</figure>
@@ -2124,7 +2124,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-config-crashdump.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-config-crashdump"/>
</imageobject>
</mediaobject>
</figure>
@@ -2149,7 +2149,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-adduser1.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-adduser1"/>
</imageobject>
</mediaobject>
</figure>
@@ -2161,7 +2161,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-adduser2.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-adduser2"/>
</imageobject>
</mediaobject>
</figure>
@@ -2265,7 +2265,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-adduser3.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-adduser3"/>
</imageobject>
</mediaobject>
</figure>
@@ -2291,7 +2291,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-finalconfiguration.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-finalconfiguration"/>
</imageobject>
</mediaobject>
</figure>
@@ -2348,7 +2348,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-final-modification-shell.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-final-modification-shell"/>
</imageobject>
</mediaobject>
</figure>
@@ -2365,7 +2365,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-mainexit.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-mainexit"/>
</imageobject>
</mediaobject>
</figure>
diff --git a/el_GR.ISO8859-7/books/handbook/geom/chapter.xml b/el_GR.ISO8859-7/books/handbook/geom/chapter.xml
index f6e61edf1f..661117e46c 100644
--- a/el_GR.ISO8859-7/books/handbook/geom/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/geom/chapter.xml
@@ -149,7 +149,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="geom/striping.pic" align="center"/>
+ <imagedata fileref="geom/striping" align="center"/>
</imageobject>
<textobject>
diff --git a/el_GR.ISO8859-7/books/handbook/install/chapter.xml b/el_GR.ISO8859-7/books/handbook/install/chapter.xml
index bac1fbf536..8af797331d 100644
--- a/el_GR.ISO8859-7/books/handbook/install/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/install/chapter.xml
@@ -1066,7 +1066,7 @@ Insert disk labelled "Kernel floppy 1" and press any key...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/boot-loader-menu.png" format="PNG"/>
+ <imagedata fileref="install/boot-loader-menu"/>
</imageobject>
</mediaobject>
</figure>
@@ -1228,7 +1228,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/config-country.png" format="PNG"/>
+ <imagedata fileref="install/config-country"/>
</imageobject>
</mediaobject>
</figure>
@@ -1244,7 +1244,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/config-keymap.png" format="PNG"/>
+ <imagedata fileref="install/config-keymap"/>
</imageobject>
</mediaobject>
</figure>
@@ -1284,7 +1284,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main1.png" format="PNG"/>
+ <imagedata fileref="install/main1"/>
</imageobject>
</mediaobject>
</figure>
@@ -1300,7 +1300,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main-doc.png" format="PNG"/>
+ <imagedata fileref="install/main-doc"/>
</imageobject>
</mediaobject>
</figure>
@@ -1312,7 +1312,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/docmenu1.png" format="PNG"/>
+ <imagedata fileref="install/docmenu1"/>
</imageobject>
</mediaobject>
</figure>
@@ -1343,7 +1343,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main-keymap.png" format="PNG"/>
+ <imagedata fileref="install/main-keymap"/>
</imageobject>
</mediaobject>
</figure>
@@ -1365,7 +1365,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/keymap.png" format="PNG"/>
+ <imagedata fileref="install/keymap"/>
</imageobject>
</mediaobject>
</figure>
@@ -1382,7 +1382,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main-options.png" format="PNG"/>
+ <imagedata fileref="install/main-options"/>
</imageobject>
</mediaobject>
</figure>
@@ -1392,7 +1392,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/options.png" format="PNG"/>
+ <imagedata fileref="install/options"/>
</imageobject>
</mediaobject>
</figure>
@@ -1430,7 +1430,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main-std.png" format="PNG"/>
+ <imagedata fileref="install/main-std"/>
</imageobject>
</mediaobject>
</figure>
@@ -1612,7 +1612,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/fdisk-drive1.png" format="PNG"/>
+ <imagedata fileref="install/fdisk-drive1"/>
</imageobject>
</mediaobject>
</figure>
@@ -1681,7 +1681,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/fdisk-edit1.png" format="PNG"/>
+ <imagedata fileref="install/fdisk-edit1"/>
</imageobject>
</mediaobject>
</figure>
@@ -1727,7 +1727,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/fdisk-edit2.png" format="PNG"/>
+ <imagedata fileref="install/fdisk-edit2"/>
</imageobject>
</mediaobject>
</figure>
@@ -1772,7 +1772,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/boot-mgr.png" format="PNG"/>
+ <imagedata fileref="install/boot-mgr"/>
</imageobject>
</mediaobject>
</figure>
@@ -1804,7 +1804,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/fdisk-drive2.png" format="PNG"/>
+ <imagedata fileref="install/fdisk-drive2"/>
</imageobject>
</mediaobject>
</figure>
@@ -2063,7 +2063,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-ed1.png" format="PNG"/>
+ <imagedata fileref="install/disklabel-ed1"/>
</imageobject>
</mediaobject>
</figure>
@@ -2093,7 +2093,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-auto.png" format="PNG"/>
+ <imagedata fileref="install/disklabel-auto"/>
</imageobject>
</mediaobject>
</figure>
@@ -2120,7 +2120,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-root1.png" format="PNG"/>
+ <imagedata fileref="install/disklabel-root1"/>
</imageobject>
</mediaobject>
</figure>
@@ -2139,7 +2139,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-root2.png" format="PNG"/>
+ <imagedata fileref="install/disklabel-root2"/>
</imageobject>
</mediaobject>
</figure>
@@ -2157,7 +2157,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-fs.png" format="PNG"/>
+ <imagedata fileref="install/disklabel-fs"/>
</imageobject>
</mediaobject>
</figure>
@@ -2174,7 +2174,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-root3.png" format="PNG"/>
+ <imagedata fileref="install/disklabel-root3"/>
</imageobject>
</mediaobject>
</figure>
@@ -2197,7 +2197,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-ed2.png" format="PNG"/>
+ <imagedata fileref="install/disklabel-ed2"/>
</imageobject>
</mediaobject>
</figure>
@@ -2252,7 +2252,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/dist-set.png" format="PNG"/>
+ <imagedata fileref="install/dist-set"/>
</imageobject>
</mediaobject>
</figure>
@@ -2306,7 +2306,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/dist-set2.png" format="PNG"/>
+ <imagedata fileref="install/dist-set2"/>
</imageobject>
</mediaobject>
</figure>
@@ -2339,7 +2339,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/media.png" format="PNG"/>
+ <imagedata fileref="install/media"/>
</imageobject>
</mediaobject>
</figure>
@@ -2542,7 +2542,7 @@ installation menus to retry whichever operations have failed.
<mediaobject>
<imageobject>
- <imagedata fileref="install/ed0-conf.png" format="PNG"/>
+ <imagedata fileref="install/ed0-conf"/>
</imageobject>
</mediaobject>
</figure>
@@ -2587,7 +2587,7 @@ installation menus to retry whichever operations have failed.
<mediaobject>
<imageobject>
- <imagedata fileref="install/ed0-conf2.png" format="PNG"/>
+ <imagedata fileref="install/ed0-conf2"/>
</imageobject>
</mediaobject>
</figure>
@@ -2768,7 +2768,7 @@ use the current settings.
<mediaobject>
<imageobject>
- <imagedata fileref="install/edit-inetd-conf.png" format="PNG"/>
+ <imagedata fileref="install/edit-inetd-conf"/>
</imageobject>
</mediaobject>
</figure>
@@ -2863,7 +2863,7 @@ use the current settings.
<mediaobject>
<imageobject>
- <imagedata fileref="install/ftp-anon1.png" format="PNG"/>
+ <imagedata fileref="install/ftp-anon1"/>
</imageobject>
</mediaobject>
</figure>
@@ -2945,7 +2945,7 @@ use the current settings.
<mediaobject>
<imageobject>
- <imagedata fileref="install/ftp-anon2.png" format="PNG"/>
+ <imagedata fileref="install/ftp-anon2"/>
</imageobject>
</mediaobject>
</figure>
@@ -3005,7 +3005,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/nfs-server-edit.png" format="PNG"/>
+ <imagedata fileref="install/nfs-server-edit"/>
</imageobject>
</mediaobject>
</figure>
@@ -3057,7 +3057,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/console-saver1.png" format="PNG"/>
+ <imagedata fileref="install/console-saver1"/>
</imageobject>
</mediaobject>
</figure>
@@ -3072,7 +3072,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/console-saver2.png" format="PNG"/>
+ <imagedata fileref="install/console-saver2"/>
</imageobject>
</mediaobject>
</figure>
@@ -3092,7 +3092,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/console-saver3.png" format="PNG"/>
+ <imagedata fileref="install/console-saver3"/>
</imageobject>
</mediaobject>
</figure>
@@ -3106,7 +3106,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/console-saver4.png" format="PNG"/>
+ <imagedata fileref="install/console-saver4"/>
</imageobject>
</mediaobject>
</figure>
@@ -3149,7 +3149,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/timezone1.png" format="PNG"/>
+ <imagedata fileref="install/timezone1"/>
</imageobject>
</mediaobject>
</figure>
@@ -3162,7 +3162,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/timezone2.png" format="PNG"/>
+ <imagedata fileref="install/timezone2"/>
</imageobject>
</mediaobject>
</figure>
@@ -3175,7 +3175,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/timezone3.png" format="PNG"/>
+ <imagedata fileref="install/timezone3"/>
</imageobject>
</mediaobject>
</figure>
@@ -3244,7 +3244,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse1.png" format="PNG"/>
+ <imagedata fileref="install/mouse1"/>
</imageobject>
</mediaobject>
</figure>
@@ -3258,7 +3258,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse2.png" format="PNG"/>
+ <imagedata fileref="install/mouse2"/>
</imageobject>
</mediaobject>
</figure>
@@ -3275,7 +3275,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse3.png" format="PNG"/>
+ <imagedata fileref="install/mouse3"/>
</imageobject>
</mediaobject>
</figure>
@@ -3289,7 +3289,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse4.png" format="PNG"/>
+ <imagedata fileref="install/mouse4"/>
</imageobject>
</mediaobject>
</figure>
@@ -3304,7 +3304,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse5.png" format="PNG"/>
+ <imagedata fileref="install/mouse5"/>
</imageobject>
</mediaobject>
</figure>
@@ -3320,7 +3320,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse6.png" format="PNG"/>
+ <imagedata fileref="install/mouse6"/>
</imageobject>
</mediaobject>
</figure>
@@ -3363,7 +3363,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/pkg-cat.png" format="PNG"/>
+ <imagedata fileref="install/pkg-cat"/>
</imageobject>
</mediaobject>
</figure>
@@ -3384,7 +3384,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/pkg-sel.png" format="PNG"/>
+ <imagedata fileref="install/pkg-sel"/>
</imageobject>
</mediaobject>
</figure>
@@ -3413,7 +3413,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/pkg-install.png" format="PNG"/>
+ <imagedata fileref="install/pkg-install"/>
</imageobject>
</mediaobject>
</figure>
@@ -3428,7 +3428,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/pkg-confirm.png" format="PNG"/>
+ <imagedata fileref="install/pkg-confirm"/>
</imageobject>
</mediaobject>
</figure>
@@ -3470,7 +3470,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/adduser1.png" format="PNG"/>
+ <imagedata fileref="install/adduser1"/>
</imageobject>
</mediaobject>
</figure>
@@ -3483,7 +3483,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/adduser2.png" format="PNG"/>
+ <imagedata fileref="install/adduser2"/>
</imageobject>
</mediaobject>
</figure>
@@ -3586,7 +3586,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/adduser3.png" format="PNG"/>
+ <imagedata fileref="install/adduser3"/>
</imageobject>
</mediaobject>
</figure>
@@ -3651,7 +3651,7 @@ Retype new password :</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/mainexit.png" format="PNG"/>
+ <imagedata fileref="install/mainexit"/>
</imageobject>
</mediaobject>
</figure>
@@ -3726,7 +3726,7 @@ Retype new password :</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/net-config-menu1.png" format="PNG"/>
+ <imagedata fileref="install/net-config-menu1"/>
</imageobject>
</mediaobject>
</figure>
@@ -3800,7 +3800,7 @@ Retype new password :</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/mta-main.png" format="PNG"/>
+ <imagedata fileref="install/mta-main"/>
</imageobject>
</mediaobject>
</figure>
@@ -3858,7 +3858,7 @@ Retype new password :</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/ntp-config.png" format="PNG"/>
+ <imagedata fileref="install/ntp-config"/>
</imageobject>
</mediaobject>
</figure>
@@ -3883,7 +3883,7 @@ Retype new password :</screen>
<title>������� ������� Lower-level (��������� ��������)</title>
<mediaobject>
<imageobject>
- <imagedata fileref="install/net-config-menu2.png" format="PNG"/>
+ <imagedata fileref="install/net-config-menu2"/>
</imageobject>
</mediaobject>
</figure>
diff --git a/el_GR.ISO8859-7/books/handbook/mail/chapter.xml b/el_GR.ISO8859-7/books/handbook/mail/chapter.xml
index 61a98b1d8e..6779668675 100644
--- a/el_GR.ISO8859-7/books/handbook/mail/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/mail/chapter.xml
@@ -2031,7 +2031,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/mutt1.png" format="PNG"/>
+ <imagedata fileref="mail/mutt1"/>
</imageobject>
</mediaobject>
@@ -2042,7 +2042,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/mutt2.png" format="PNG"/>
+ <imagedata fileref="mail/mutt2"/>
</imageobject>
</mediaobject>
@@ -2080,7 +2080,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/mutt3.png" format="PNG"/>
+ <imagedata fileref="mail/mutt3"/>
</imageobject>
</mediaobject>
@@ -2133,7 +2133,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine1.png" format="PNG"/>
+ <imagedata fileref="mail/pine1"/>
</imageobject>
</mediaobject>
@@ -2154,7 +2154,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine2.png" format="PNG"/>
+ <imagedata fileref="mail/pine2"/>
</imageobject>
</mediaobject>
@@ -2165,7 +2165,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine3.png" format="PNG"/>
+ <imagedata fileref="mail/pine3"/>
</imageobject>
</mediaobject>
@@ -2178,7 +2178,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine4.png" format="PNG"/>
+ <imagedata fileref="mail/pine4"/>
</imageobject>
</mediaobject>
@@ -2196,7 +2196,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine5.png" format="PNG"/>
+ <imagedata fileref="mail/pine5"/>
</imageobject>
</mediaobject>
diff --git a/el_GR.ISO8859-7/books/handbook/security/chapter.xml b/el_GR.ISO8859-7/books/handbook/security/chapter.xml
index fd8f0d47d8..4a0eaae769 100644
--- a/el_GR.ISO8859-7/books/handbook/security/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/security/chapter.xml
@@ -3281,7 +3281,7 @@ options IPSEC_DEBUG #debug for IP security
<mediaobject>
<imageobject>
- <imagedata fileref="security/ipsec-network.pic" align="center"/>
+ <imagedata fileref="security/ipsec-network" align="center"/>
</imageobject>
<textobject>
@@ -3778,7 +3778,7 @@ ipfw add 1 allow udp from W.X.Y.Z to A.B.C.D isakmp
<mediaobject>
<imageobject>
- <imagedata fileref="security/ipsec-out-pkt.pic" align="center"/>
+ <imagedata fileref="security/ipsec-out-pkt" align="center"/>
</imageobject>
<textobject>
@@ -3798,7 +3798,7 @@ ipfw add 1 allow udp from W.X.Y.Z to A.B.C.D isakmp
<mediaobject>
<imageobject>
- <imagedata fileref="security/ipsec-encap-pkt.pic" align="center"/>
+ <imagedata fileref="security/ipsec-encap-pkt" align="center"/>
</imageobject>
<textobject>
@@ -3932,7 +3932,7 @@ ipfw add 1 allow ipencap from W.X.Y.Z to A.B.C.D
<mediaobject>
<imageobject>
- <imagedata fileref="security/ipsec-crypt-pkt.pic" align="center"/>
+ <imagedata fileref="security/ipsec-crypt-pkt" align="center"/>
</imageobject>
<textobject>
diff --git a/el_GR.ISO8859-7/books/handbook/vinum/chapter.xml b/el_GR.ISO8859-7/books/handbook/vinum/chapter.xml
index d6028b5eab..4d6b51e7bf 100644
--- a/el_GR.ISO8859-7/books/handbook/vinum/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/vinum/chapter.xml
@@ -189,7 +189,7 @@
<para>
<figure id="vinum-concat">
<title>�������� ���������</title>
- <graphic fileref="vinum/vinum-concat.pic"/>
+ <graphic fileref="vinum/vinum-concat"/>
</figure>
</para>
@@ -232,7 +232,7 @@
<para>
<figure id="vinum-striped">
<title>Striped Organization</title>
- <graphic fileref="vinum/vinum-striped.pic"/>
+ <graphic fileref="vinum/vinum-striped"/>
</figure>
</para>
</sect1>
@@ -304,7 +304,7 @@
<para>
<figure id="vinum-raid5-org">
<title>RAID-5 Organization</title>
- <graphic fileref="vinum/vinum-raid5-org.pic"/>
+ <graphic fileref="vinum/vinum-raid5-org"/>
</figure>
</para>
@@ -593,7 +593,7 @@
<para>
<figure id="vinum-simple-vol">
<title>���� ����� ����� Vinum</title>
- <graphic fileref="vinum/vinum-simple-vol.pic"/>
+ <graphic fileref="vinum/vinum-simple-vol"/>
</figure>
</para>
@@ -662,7 +662,7 @@
<para>
<figure id="vinum-mirrored-vol">
<title>���� Mirrored ����� Vinum </title>
- <graphic fileref="vinum/vinum-mirrored-vol.pic"/>
+ <graphic fileref="vinum/vinum-mirrored-vol"/>
</figure>
</para>
@@ -730,7 +730,7 @@
<para>
<figure id="vinum-striped-vol">
<title>���� Striped ����� Vinum</title>
- <graphic fileref="vinum/vinum-striped-vol.pic"/>
+ <graphic fileref="vinum/vinum-striped-vol"/>
</figure>
</para>
@@ -776,7 +776,7 @@
<para>
<figure id="vinum-raid10-vol">
<title>���� Mirrored ��� Striped ����� ��� Vinum</title>
- <graphic fileref="vinum/vinum-raid10-vol.pic"/>
+ <graphic fileref="vinum/vinum-raid10-vol"/>
</figure>
</para>
</sect2>
diff --git a/el_GR.ISO8859-7/books/handbook/virtualization/chapter.xml b/el_GR.ISO8859-7/books/handbook/virtualization/chapter.xml
index b0367e9f00..dd2f79e415 100644
--- a/el_GR.ISO8859-7/books/handbook/virtualization/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/virtualization/chapter.xml
@@ -116,7 +116,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd1.png"/>
+ <imagedata fileref="virtualization/parallels-freebsd1"/>
</imageobject>
</mediaobject>
@@ -128,25 +128,25 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd2.png"/>
+ <imagedata fileref="virtualization/parallels-freebsd2"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd3.png"/>
+ <imagedata fileref="virtualization/parallels-freebsd3"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd4.png"/>
+ <imagedata fileref="virtualization/parallels-freebsd4"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd5.png"/>
+ <imagedata fileref="virtualization/parallels-freebsd5"/>
</imageobject>
</mediaobject>
@@ -154,13 +154,13 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd6.png"/>
+ <imagedata fileref="virtualization/parallels-freebsd6"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd7.png"/>
+ <imagedata fileref="virtualization/parallels-freebsd7"/>
</imageobject>
</mediaobject>
@@ -168,13 +168,13 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd8.png"/>
+ <imagedata fileref="virtualization/parallels-freebsd8"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd9.png"/>
+ <imagedata fileref="virtualization/parallels-freebsd9"/>
</imageobject>
</mediaobject>
@@ -190,7 +190,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd11.png"/>
+ <imagedata fileref="virtualization/parallels-freebsd11"/>
</imageobject>
</mediaobject>
@@ -203,7 +203,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd10.png"/>
+ <imagedata fileref="virtualization/parallels-freebsd10"/>
</imageobject>
</mediaobject>
@@ -215,7 +215,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd12.png"/>
+ <imagedata fileref="virtualization/parallels-freebsd12"/>
</imageobject>
</mediaobject>
@@ -224,7 +224,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd13.png"/>
+ <imagedata fileref="virtualization/parallels-freebsd13"/>
</imageobject>
</mediaobject>
</sect3>
@@ -606,13 +606,13 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd1.png"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd1"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd2.png"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd2"/>
</imageobject>
</mediaobject>
@@ -621,7 +621,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd3.png"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd3"/>
</imageobject>
</mediaobject>
@@ -633,13 +633,13 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd4.png"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd4"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd5.png"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd5"/>
</imageobject>
</mediaobject>
@@ -647,7 +647,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd6.png"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd6"/>
</imageobject>
</mediaobject>
@@ -657,13 +657,13 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd7.png"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd7"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd8.png"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd8"/>
</imageobject>
</mediaobject>
@@ -682,13 +682,13 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd9.png"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd9"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd10.png"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd10"/>
</imageobject>
</mediaobject>
@@ -702,7 +702,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd11.png"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd11"/>
</imageobject>
</mediaobject>
@@ -715,7 +715,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd12.png"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd12"/>
</imageobject>
</mediaobject>
@@ -726,7 +726,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd13.png"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd13"/>
</imageobject>
</mediaobject>
</sect3>
@@ -808,7 +808,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd01.png"/>
+ <imagedata fileref="virtualization/vmware-freebsd01"/>
</imageobject>
</mediaobject>
@@ -818,7 +818,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd02.png"/>
+ <imagedata fileref="virtualization/vmware-freebsd02"/>
</imageobject>
</mediaobject>
@@ -830,7 +830,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd03.png"/>
+ <imagedata fileref="virtualization/vmware-freebsd03"/>
</imageobject>
</mediaobject>
@@ -839,7 +839,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd04.png"/>
+ <imagedata fileref="virtualization/vmware-freebsd04"/>
</imageobject>
</mediaobject>
@@ -848,7 +848,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd05.png"/>
+ <imagedata fileref="virtualization/vmware-freebsd05"/>
</imageobject>
</mediaobject>
@@ -857,7 +857,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd06.png"/>
+ <imagedata fileref="virtualization/vmware-freebsd06"/>
</imageobject>
</mediaobject>
@@ -866,7 +866,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd07.png"/>
+ <imagedata fileref="virtualization/vmware-freebsd07"/>
</imageobject>
</mediaobject>
@@ -876,7 +876,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd08.png"/>
+ <imagedata fileref="virtualization/vmware-freebsd08"/>
</imageobject>
</mediaobject>
@@ -891,7 +891,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd09.png"/>
+ <imagedata fileref="virtualization/vmware-freebsd09"/>
</imageobject>
</mediaobject>
@@ -900,7 +900,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd10.png"/>
+ <imagedata fileref="virtualization/vmware-freebsd10"/>
</imageobject>
</mediaobject>
@@ -912,7 +912,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd11.png"/>
+ <imagedata fileref="virtualization/vmware-freebsd11"/>
</imageobject>
</mediaobject>
@@ -927,7 +927,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd12.png"/>
+ <imagedata fileref="virtualization/vmware-freebsd12"/>
</imageobject>
</mediaobject>
diff --git a/en_US.ISO8859-1/articles/building-products/article.xml b/en_US.ISO8859-1/articles/building-products/article.xml
index 5cca22d6a0..86ae7b5600 100644
--- a/en_US.ISO8859-1/articles/building-products/article.xml
+++ b/en_US.ISO8859-1/articles/building-products/article.xml
@@ -392,7 +392,7 @@
<title>FreeBSD Organization</title>
<mediaobject>
<imageobject>
- <imagedata fileref="freebsd-organization.pic" format="PIC"/>
+ <imagedata fileref="freebsd-organization"/>
</imageobject>
</mediaobject>
</figure>
@@ -445,7 +445,7 @@
<title>FreeBSD Release Branches</title>
<mediaobject>
<imageobject>
- <imagedata fileref="freebsd-branches.eps" format="EPS"/>
+ <imagedata fileref="freebsd-branches"/>
</imageobject>
</mediaobject>
</figure>
diff --git a/en_US.ISO8859-1/articles/console-server/article.xml b/en_US.ISO8859-1/articles/console-server/article.xml
index 3ba3b11ca0..b0c78d3ef3 100644
--- a/en_US.ISO8859-1/articles/console-server/article.xml
+++ b/en_US.ISO8859-1/articles/console-server/article.xml
@@ -783,7 +783,7 @@ exit 0</programlisting>
<mediaobject>
<imageobject>
- <imagedata fileref="tk0231-9-1.png"/>
+ <imagedata fileref="tk0231-9-1"/>
</imageobject>
<textobject>
diff --git a/en_US.ISO8859-1/articles/gjournal-desktop/article.xml b/en_US.ISO8859-1/articles/gjournal-desktop/article.xml
index c10b999ed6..1b0566cba2 100644
--- a/en_US.ISO8859-1/articles/gjournal-desktop/article.xml
+++ b/en_US.ISO8859-1/articles/gjournal-desktop/article.xml
@@ -221,7 +221,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="disklabel1.png"/>
+ <imagedata fileref="disklabel1"/>
</imageobject>
</mediaobject>
@@ -283,7 +283,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="disklabel2.png"/>
+ <imagedata fileref="disklabel2"/>
</imageobject>
</mediaobject>
diff --git a/en_US.ISO8859-1/articles/releng/article.xml b/en_US.ISO8859-1/articles/releng/article.xml
index 777969ced9..2f92b6a7bc 100644
--- a/en_US.ISO8859-1/articles/releng/article.xml
+++ b/en_US.ISO8859-1/articles/releng/article.xml
@@ -326,7 +326,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="branches-head.pic" align="center"/>
+ <imagedata fileref="branches-head" align="center"/>
</imageobject>
<textobject>
@@ -336,7 +336,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="branches-releng3.pic" align="center"/>
+ <imagedata fileref="branches-releng3" align="center"/>
</imageobject>
<textobject>
@@ -346,7 +346,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="branches-releng4.pic" align="center"/>
+ <imagedata fileref="branches-releng4" align="center"/>
</imageobject>
<textobject>
@@ -356,7 +356,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="branches-releng5.pic" align="center"/>
+ <imagedata fileref="branches-releng5" align="center"/>
</imageobject>
<textobject>
@@ -366,7 +366,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="branches-releng6.pic" align="center"/>
+ <imagedata fileref="branches-releng6" align="center"/>
</imageobject>
<textobject>
@@ -376,7 +376,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="branches-releng7.pic" align="center"/>
+ <imagedata fileref="branches-releng7" align="center"/>
</imageobject>
<textobject>
@@ -386,7 +386,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="branches-releng8.pic" align="center"/>
+ <imagedata fileref="branches-releng8" align="center"/>
</imageobject>
<textobject>
@@ -396,7 +396,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="branches-releng9.pic" align="center"/>
+ <imagedata fileref="branches-releng9" align="center"/>
</imageobject>
<textobject>
diff --git a/en_US.ISO8859-1/articles/vm-design/article.xml b/en_US.ISO8859-1/articles/vm-design/article.xml
index e02a57fa3f..4a4de7d640 100644
--- a/en_US.ISO8859-1/articles/vm-design/article.xml
+++ b/en_US.ISO8859-1/articles/vm-design/article.xml
@@ -185,7 +185,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="fig1.eps" format="EPS"/>
+ <imagedata fileref="fig1"/>
</imageobject>
<textobject>
@@ -207,7 +207,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="fig2.eps" format="EPS"/>
+ <imagedata fileref="fig2"/>
</imageobject>
<textobject>
@@ -227,7 +227,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="fig3.eps" format="EPS"/>
+ <imagedata fileref="fig3"/>
</imageobject>
<textobject>
@@ -257,7 +257,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="fig4.eps" format="EPS"/>
+ <imagedata fileref="fig4"/>
</imageobject>
<textobject>
diff --git a/en_US.ISO8859-1/books/design-44bsd/book.xml b/en_US.ISO8859-1/books/design-44bsd/book.xml
index f3b0b720d3..04637580a8 100644
--- a/en_US.ISO8859-1/books/design-44bsd/book.xml
+++ b/en_US.ISO8859-1/books/design-44bsd/book.xml
@@ -677,7 +677,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="fig1.eps" format="EPS"/>
+ <imagedata fileref="fig1"/>
</imageobject>
<textobject>
@@ -1663,7 +1663,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="fig2.eps" format="EPS"/>
+ <imagedata fileref="fig2"/>
</imageobject>
<textobject>
diff --git a/en_US.ISO8859-1/books/dev-model/book.xml b/en_US.ISO8859-1/books/dev-model/book.xml
index ad561cf0b0..97213996fd 100644
--- a/en_US.ISO8859-1/books/dev-model/book.xml
+++ b/en_US.ISO8859-1/books/dev-model/book.xml
@@ -286,7 +286,7 @@
<para>
<figure>
<title>The FreeBSD Project's structure</title>
- <graphic fileref="orghierarchy.png" format="PNG"/>
+ <graphic fileref="orghierarchy"/>
</figure>
</para>
@@ -344,7 +344,7 @@
<para>
<figure>
<title>The FreeBSD Project's structure with committers in categories</title>
- <graphic fileref="orghierarchy2.png" format="PNG"/>
+ <graphic fileref="orghierarchy2"/>
</figure>
</para>
<para>
@@ -438,7 +438,7 @@
<para>
<figure>
<title>Jørgenssen's model for change integration</title>
- <graphic fileref="maintenance.png" format="PNG"/>
+ <graphic fileref="maintenance"/>
</figure>
</para>
@@ -603,7 +603,7 @@
<para>
<figure>
<title>The FreeBSD release tree</title>
- <graphic fileref="branches.png" format="PNG"/>
+ <graphic fileref="branches"/>
</figure>
</para>
<para>
@@ -684,7 +684,7 @@
<para>
<figure>
<title>The overall development model</title>
- <graphic fileref="freebsd-code-model.png" format="PNG"/>
+ <graphic fileref="freebsd-code-model"/>
</figure>
</para>
<para>
@@ -864,7 +864,7 @@
<para>
<figure>
<title>Overview of official hats</title>
- <graphic fileref="hats-overview.png" format="PNG"/>
+ <graphic fileref="hats-overview"/>
</figure>
</para>
@@ -1322,7 +1322,7 @@
<para>
<figure>
<title>Process summary: adding a new committer</title>
- <graphic fileref="proc-add-committer.png" format="PNG"/>
+ <graphic fileref="proc-add-committer"/>
</figure>
</para>
@@ -1354,7 +1354,7 @@
<para>
<figure>
<title>Process summary: removing a committer</title>
- <graphic fileref="proc-rm-committer.png" format="PNG"/>
+ <graphic fileref="proc-rm-committer"/>
</figure>
</para>
@@ -1448,7 +1448,7 @@
<para>
<figure>
<title>Process summary: adding a CVSup mirror</title>
- <graphic fileref="proc-add-cvsup.png" format="PNG"/>
+ <graphic fileref="proc-add-cvsup"/>
</figure>
</para>
@@ -1552,7 +1552,7 @@
<para>
<figure>
<title>Process summary: A committer commits code</title>
- <graphic fileref="proc-commit.png" format="PNG"/>
+ <graphic fileref="proc-commit"/>
</figure>
</para>
@@ -1576,7 +1576,7 @@
<para>
<figure>
<title>Process summary: A contributor commits code</title>
- <graphic fileref="proc-contrib.png" format="PNG"/>
+ <graphic fileref="proc-contrib"/>
</figure>
</para>
@@ -1676,7 +1676,7 @@
<para>
<figure>
<title>Process summary: Core elections</title>
- <graphic fileref="proc-elections.png" format="PNG"/>
+ <graphic fileref="proc-elections"/>
</figure>
</para>
@@ -1838,7 +1838,7 @@
<para>
<figure>
<title>Jørgenssen's model for change integration</title>
- <graphic fileref="maintenance.png" format="PNG"/>
+ <graphic fileref="maintenance"/>
</figure>
</para>
@@ -1918,7 +1918,7 @@
<para>
<figure>
<title>Process summary: problem reporting</title>
- <graphic fileref="proc-pr.png" format="PNG"/>
+ <graphic fileref="proc-pr"/>
</figure>
</para>
@@ -2155,7 +2155,7 @@
<para>
<figure>
<title>Process summary: release engineering</title>
- <graphic fileref="proc-releng.png" format="PNG"/>
+ <graphic fileref="proc-releng"/>
</figure>
</para>
@@ -2319,7 +2319,7 @@
<para>
<figure id="fig-ports">
<title>Number of ports added between 1996 and 2005</title>
- <graphic fileref="portsstatus.png" format="PNG"/>
+ <graphic fileref="portsstatus"/>
</figure>
</para>
diff --git a/en_US.ISO8859-1/books/developers-handbook/sockets/chapter.xml b/en_US.ISO8859-1/books/developers-handbook/sockets/chapter.xml
index 3eec7e8b70..7cb263be69 100644
--- a/en_US.ISO8859-1/books/developers-handbook/sockets/chapter.xml
+++ b/en_US.ISO8859-1/books/developers-handbook/sockets/chapter.xml
@@ -111,7 +111,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="sockets/layers.eps"/>
+ <imagedata fileref="sockets/layers"/>
</imageobject>
<textobject>
@@ -288,7 +288,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="sockets/slayers.eps"/>
+ <imagedata fileref="sockets/slayers"/>
</imageobject>
<textobject>
@@ -561,7 +561,7 @@ struct sockaddr_in {
<mediaobject>
<imageobject>
- <imagedata fileref="sockets/sain.eps"/>
+ <imagedata fileref="sockets/sain"/>
</imageobject>
<textobject>
@@ -605,7 +605,7 @@ struct sockaddr_in {
<mediaobject>
<imageobject>
- <imagedata fileref="sockets/sainfill.eps"/>
+ <imagedata fileref="sockets/sainfill"/>
</imageobject>
<textobject>
@@ -669,7 +669,7 @@ struct in_addr {
<mediaobject>
<imageobject>
- <imagedata fileref="sockets/sainlsb.eps"/>
+ <imagedata fileref="sockets/sainlsb"/>
</imageobject>
<textobject>
@@ -695,7 +695,7 @@ struct in_addr {
<mediaobject>
<imageobject>
- <imagedata fileref="sockets/sainmsb.eps"/>
+ <imagedata fileref="sockets/sainmsb"/>
</imageobject>
<textobject>
@@ -789,7 +789,7 @@ struct in_addr {
<mediaobject>
<imageobject>
- <imagedata fileref="sockets/sainlsb.eps"/>
+ <imagedata fileref="sockets/sainlsb"/>
</imageobject>
<textobject>
@@ -816,7 +816,7 @@ struct in_addr {
<mediaobject>
<imageobject>
- <imagedata fileref="sockets/sainmsb.eps"/>
+ <imagedata fileref="sockets/sainmsb"/>
</imageobject>
<textobject>
@@ -1073,7 +1073,7 @@ int bind(int s, const struct sockaddr *addr, socklen_t addrlen);
<mediaobject>
<imageobject>
- <imagedata fileref="sockets/sainserv.eps"/>
+ <imagedata fileref="sockets/sainserv"/>
</imageobject>
<textobject>
@@ -1336,7 +1336,7 @@ int main() {
<mediaobject>
<imageobject>
- <imagedata fileref="sockets/serv.eps"/>
+ <imagedata fileref="sockets/serv"/>
</imageobject>
<textobject>
@@ -1693,7 +1693,7 @@ struct servent * getservbyname(const char *name, const char *proto);
<mediaobject>
<imageobject>
- <imagedata fileref="sockets/serv2.eps"/>
+ <imagedata fileref="sockets/serv2"/>
</imageobject>
<textobject>
diff --git a/en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml b/en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml
index d5add73974..35c9680552 100644
--- a/en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml
+++ b/en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml
@@ -2419,7 +2419,7 @@ This is the file called 'foo2'</screen>
<programlisting><mediaobject>
<imageobject>
- <imagedata fileref="fig1.png"> <co id="co-image-ext"/>
+ <imagedata fileref="fig1"> <co id="co-image-ext"/>
</imageobject>
<textobject>
@@ -2534,7 +2534,7 @@ IMAGES+= fig3.png
<programlisting><mediaobject>
<imageobject>
- <imagedata fileref="chapter1/fig1.png"> <co id="co-image-dir"/>
+ <imagedata fileref="chapter1/fig1"> <co id="co-image-dir"/>
</imageobject>
…
diff --git a/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml b/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml
index b4dc3f8b59..38876324db 100644
--- a/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml
@@ -298,7 +298,7 @@ host2.example.com link#1 UC 0 0
<mediaobject>
<imageobject>
- <imagedata fileref="advanced-networking/net-routing.pic"/>
+ <imagedata fileref="advanced-networking/net-routing"/>
</imageobject>
<textobject>
@@ -490,7 +490,7 @@ host2.example.com link#1 UC 0 0
<mediaobject>
<imageobject>
- <imagedata fileref="advanced-networking/static-routes.pic"/>
+ <imagedata fileref="advanced-networking/static-routes"/>
</imageobject>
<textobject>
@@ -4618,7 +4618,7 @@ myhost.example.com:/b/tftpboot/FreeBSD/install / nfs ro
<area id="co-pxenfs5" coords="3108,2666 3519,1800"/>
</areaspec>
<imageobject>
- <imagedata fileref="advanced-networking/pxe-nfs.png"/>
+ <imagedata fileref="advanced-networking/pxe-nfs"/>
</imageobject>
<calloutlist>
<callout arearefs="co-pxenfs1">
@@ -4941,7 +4941,7 @@ Received 264951 bytes in 0.1 seconds</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="advanced-networking/isdn-bus.eps"/>
+ <imagedata fileref="advanced-networking/isdn-bus"/>
</imageobject>
<textobject>
@@ -4976,7 +4976,7 @@ ISDN BRI line</literallayout>
<mediaobject>
<imageobject>
<imagedata
- fileref="advanced-networking/isdn-twisted-pair.eps"/>
+ fileref="advanced-networking/isdn-twisted-pair"/>
</imageobject>
<textobject>
@@ -5090,7 +5090,7 @@ ISDN BRI line</literallayout>
<mediaobject>
<imageobject>
- <imagedata fileref="advanced-networking/natd.eps"/>
+ <imagedata fileref="advanced-networking/natd"/>
</imageobject>
<textobject>
diff --git a/en_US.ISO8859-1/books/handbook/basics/chapter.xml b/en_US.ISO8859-1/books/handbook/basics/chapter.xml
index aac296771e..f00c1cc8f4 100644
--- a/en_US.ISO8859-1/books/handbook/basics/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/basics/chapter.xml
@@ -1117,7 +1117,7 @@ root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01 passwd</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir1.eps" format="EPS"/>
+ <imagedata fileref="install/example-dir1"/>
</imageobject>
<textobject>
@@ -1138,7 +1138,7 @@ root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01 passwd</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir2.eps" format="EPS"/>
+ <imagedata fileref="install/example-dir2"/>
</imageobject>
<textobject>
@@ -1170,7 +1170,7 @@ root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01 passwd</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir3.eps" format="EPS"/>
+ <imagedata fileref="install/example-dir3"/>
</imageobject>
<textobject>
@@ -1199,7 +1199,7 @@ root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01 passwd</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir4.eps" format="EPS"/>
+ <imagedata fileref="install/example-dir4"/>
</imageobject>
<textobject>
@@ -1225,7 +1225,7 @@ root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01 passwd</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir5.eps" format="EPS"/>
+ <imagedata fileref="install/example-dir5"/>
</imageobject>
<textobject>
@@ -1525,7 +1525,7 @@ root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01 passwd</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/disk-layout.eps" format="EPS"/>
+ <imagedata fileref="install/disk-layout"/>
</imageobject>
<textobject>
diff --git a/en_US.ISO8859-1/books/handbook/bsdinstall/chapter.xml b/en_US.ISO8859-1/books/handbook/bsdinstall/chapter.xml
index 518083590c..f6ae2a4985 100644
--- a/en_US.ISO8859-1/books/handbook/bsdinstall/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/bsdinstall/chapter.xml
@@ -667,8 +667,8 @@ Loading /boot/defaults/loader.conf
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-boot-loader-menu.png"
- format="PNG"/>
+ fileref="bsdinstall/bsdinstall-boot-loader-menu"
+ />
</imageobject>
</mediaobject>
</figure>
@@ -952,8 +952,8 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-choose-mode.png"
- format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-choose-mode"
+ />
</imageobject>
</mediaobject>
</figure>
@@ -998,8 +998,8 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-keymap-select-default.png"
- format="PNG"/>
+ fileref="bsdinstall/bsdinstall-keymap-select-default"
+ />
</imageobject>
</mediaobject>
</figure>
@@ -1014,8 +1014,8 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-config-keymap.png"
- format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-config-keymap"
+ />
</imageobject>
</mediaobject>
</figure>
@@ -1044,8 +1044,8 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-config-hostname.png"
- format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-config-hostname"
+ />
</imageobject>
</mediaobject>
</figure>
@@ -1067,8 +1067,8 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-config-components.png"
- format="PNG"/>
+ fileref="bsdinstall/bsdinstall-config-components"
+ />
</imageobject>
</mediaobject>
</figure>
@@ -1156,8 +1156,8 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-netinstall-files.png"
- format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-netinstall-files"
+ />
</imageobject>
</mediaobject>
</figure>
@@ -1176,8 +1176,8 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-netinstall-mirrorselect.png"
- format="PNG"/>
+ fileref="bsdinstall/bsdinstall-netinstall-mirrorselect"
+ />
</imageobject>
</mediaobject>
</figure>
@@ -1203,8 +1203,8 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-part-guided-manual.png"
- format="PNG"/>
+ fileref="bsdinstall/bsdinstall-part-guided-manual"
+ />
</imageobject>
</mediaobject>
</figure>
@@ -1221,8 +1221,8 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-part-guided-disk.png"
- format="PNG"/>
+ fileref="bsdinstall/bsdinstall-part-guided-disk"
+ />
</imageobject>
</mediaobject>
</figure>
@@ -1241,8 +1241,8 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-part-entire-part.png"
- format="PNG"/>
+ fileref="bsdinstall/bsdinstall-part-entire-part"
+ />
</imageobject>
</mediaobject>
</figure>
@@ -1262,8 +1262,8 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-part-review.png"
- format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-part-review"
+ />
</imageobject>
</mediaobject>
</figure>
@@ -1281,8 +1281,8 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-part-manual-create.png"
- format="PNG"/>
+ fileref="bsdinstall/bsdinstall-part-manual-create"
+ />
</imageobject>
</mediaobject>
</figure>
@@ -1299,8 +1299,8 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-part-manual-partscheme.png"
- format="PNG"/>
+ fileref="bsdinstall/bsdinstall-part-manual-partscheme"
+ />
</imageobject>
</mediaobject>
</figure>
@@ -1380,8 +1380,8 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-part-manual-addpart.png"
- format="PNG"/>
+ fileref="bsdinstall/bsdinstall-part-manual-addpart"
+ />
</imageobject>
</mediaobject>
</figure>
@@ -1560,8 +1560,8 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-final-confirmation.png"
- format="PNG"/>
+ fileref="bsdinstall/bsdinstall-final-confirmation"
+ />
</imageobject>
</mediaobject>
</figure>
@@ -1593,8 +1593,8 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-distfile-fetching.png"
- format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-distfile-fetching"
+ />
</imageobject>
</mediaobject>
</figure>
@@ -1609,8 +1609,8 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-distfile-verifying.png"
- format="PNG"/>
+ fileref="bsdinstall/bsdinstall-distfile-verifying"
+ />
</imageobject>
</mediaobject>
</figure>
@@ -1624,8 +1624,8 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-distfile-extracting.png"
- format="PNG"/>
+ fileref="bsdinstall/bsdinstall-distfile-extracting"
+ />
</imageobject>
</mediaobject>
</figure>
@@ -1659,8 +1659,8 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-post-root-passwd.png"
- format="PNG"/>
+ fileref="bsdinstall/bsdinstall-post-root-passwd"
+ />
</imageobject>
</mediaobject>
</figure>
@@ -1687,8 +1687,8 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-configure-network-interface.png"
- format="PNG"/>
+ fileref="bsdinstall/bsdinstall-configure-network-interface"
+ />
</imageobject>
</mediaobject>
</figure>
@@ -1722,8 +1722,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-configure-wireless-scan.png"
- format="PNG"/>
+ fileref="bsdinstall/bsdinstall-configure-wireless-scan"/>
</imageobject>
</mediaobject>
</figure>
@@ -1745,8 +1744,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-configure-wireless-accesspoints.png"
- format="PNG"/>
+ fileref="bsdinstall/bsdinstall-configure-wireless-accesspoints"/>
</imageobject>
</mediaobject>
</figure>
@@ -1765,8 +1763,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-configure-wireless-wpa2setup.png"
- format="PNG"/>
+ fileref="bsdinstall/bsdinstall-configure-wireless-wpa2setup"/>
</imageobject>
</mediaobject>
</figure>
@@ -1788,8 +1785,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-configure-network-interface-ipv4.png"
- format="PNG"/>
+ fileref="bsdinstall/bsdinstall-configure-network-interface-ipv4"/>
</imageobject>
</mediaobject>
</figure>
@@ -1822,8 +1818,8 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-configure-network-interface-ipv4-dhcp.png"
- format="PNG"/>
+ fileref="bsdinstall/bsdinstall-configure-network-interface-ipv4-dhcp"
+ />
</imageobject>
</mediaobject>
</figure>
@@ -1841,8 +1837,8 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-configure-network-interface-ipv4-static.png"
- format="PNG"/>
+ fileref="bsdinstall/bsdinstall-configure-network-interface-ipv4-static"
+ />
</imageobject>
</mediaobject>
</figure>
@@ -1888,8 +1884,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-configure-network-interface-ipv6.png"
- format="PNG"/>
+ fileref="bsdinstall/bsdinstall-configure-network-interface-ipv6"/>
</imageobject>
</mediaobject>
</figure>
@@ -1917,8 +1912,8 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-configure-network-interface-slaac.png"
- format="PNG"/>
+ fileref="bsdinstall/bsdinstall-configure-network-interface-slaac"
+ />
</imageobject>
</mediaobject>
</figure>
@@ -1936,8 +1931,8 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-configure-network-interface-ipv6-static.png"
- format="PNG"/>
+ fileref="bsdinstall/bsdinstall-configure-network-interface-ipv6-static"
+ />
</imageobject>
</mediaobject>
</figure>
@@ -1986,8 +1981,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-configure-network-ipv4-dns.png"
- format="PNG"/>
+ fileref="bsdinstall/bsdinstall-configure-network-ipv4-dns"/>
</imageobject>
</mediaobject>
</figure>
@@ -2011,8 +2005,8 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-set-clock-local-utc.onf"
- format="PNG"/>
+ fileref="bsdinstall/bsdinstall-set-clock-local-utc"
+ />
</imageobject>
</mediaobject>
</figure>
@@ -2030,8 +2024,8 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-timezone-region.png"
- format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-timezone-region"
+ />
</imageobject>
</mediaobject>
</figure>
@@ -2045,8 +2039,8 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-timezone-country.png"
- format="PNG"/>
+ fileref="bsdinstall/bsdinstall-timezone-country"
+ />
</imageobject>
</mediaobject>
</figure>
@@ -2059,8 +2053,8 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-timezone-zone.png"
- format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-timezone-zone"
+ />
</imageobject>
</mediaobject>
</figure>
@@ -2074,8 +2068,8 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-timezone-confirm.png"
- format="PNG"/>
+ fileref="bsdinstall/bsdinstall-timezone-confirm"
+ />
</imageobject>
</mediaobject>
</figure>
@@ -2096,8 +2090,8 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-config-services.png"
- format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-config-services"
+ />
</imageobject>
</mediaobject>
</figure>
@@ -2146,8 +2140,8 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-config-crashdump.png"
- format="PNG"/>
+ fileref="bsdinstall/bsdinstall-config-crashdump"
+ />
</imageobject>
</mediaobject>
</figure>
@@ -2171,8 +2165,8 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-adduser1.png"
- format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-adduser1"
+ />
</imageobject>
</mediaobject>
</figure>
@@ -2184,8 +2178,8 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-adduser2.png"
- format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-adduser2"
+ />
</imageobject>
</mediaobject>
</figure>
@@ -2285,8 +2279,8 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-adduser3.png"
- format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-adduser3"
+ />
</imageobject>
</mediaobject>
</figure>
@@ -2312,8 +2306,8 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-finalconfiguration.png"
- format="PNG"/>
+ fileref="bsdinstall/bsdinstall-finalconfiguration"
+ />
</imageobject>
</mediaobject>
</figure>
@@ -2369,8 +2363,8 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-final-modification-shell.png"
- format="PNG"/>
+ fileref="bsdinstall/bsdinstall-final-modification-shell"
+ />
</imageobject>
</mediaobject>
</figure>
@@ -2388,8 +2382,8 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-mainexit.png"
- format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-mainexit"
+ />
</imageobject>
</mediaobject>
</figure>
diff --git a/en_US.ISO8859-1/books/handbook/geom/chapter.xml b/en_US.ISO8859-1/books/handbook/geom/chapter.xml
index 4c7e37c9c5..603e7f00b4 100644
--- a/en_US.ISO8859-1/books/handbook/geom/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/geom/chapter.xml
@@ -137,7 +137,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="geom/striping.pic" align="center"/>
+ <imagedata fileref="geom/striping" align="center"/>
</imageobject>
<textobject>
diff --git a/en_US.ISO8859-1/books/handbook/install/chapter.xml b/en_US.ISO8859-1/books/handbook/install/chapter.xml
index 9515660d8c..bbdf7cc3a8 100644
--- a/en_US.ISO8859-1/books/handbook/install/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/install/chapter.xml
@@ -989,7 +989,7 @@ Insert disk labelled "Kernel floppy 1" and press any key...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/boot-loader-menu.png" format="PNG"/>
+ <imagedata fileref="install/boot-loader-menu"/>
</imageobject>
</mediaobject>
</figure>
@@ -1150,7 +1150,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/config-country.png" format="PNG"/>
+ <imagedata fileref="install/config-country"/>
</imageobject>
</mediaobject>
</figure>
@@ -1166,7 +1166,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/config-keymap.png" format="PNG"/>
+ <imagedata fileref="install/config-keymap"/>
</imageobject>
</mediaobject>
</figure>
@@ -1205,7 +1205,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main1.png" format="PNG"/>
+ <imagedata fileref="install/main1"/>
</imageobject>
</mediaobject>
</figure>
@@ -1222,7 +1222,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main-doc.png" format="PNG"/>
+ <imagedata fileref="install/main-doc"/>
</imageobject>
</mediaobject>
</figure>
@@ -1234,7 +1234,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/docmenu1.png" format="PNG"/>
+ <imagedata fileref="install/docmenu1"/>
</imageobject>
</mediaobject>
</figure>
@@ -1264,7 +1264,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main-keymap.png" format="PNG"/>
+ <imagedata fileref="install/main-keymap"/>
</imageobject>
</mediaobject>
</figure>
@@ -1284,7 +1284,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/keymap.png" format="PNG"/>
+ <imagedata fileref="install/keymap"/>
</imageobject>
</mediaobject>
</figure>
@@ -1302,7 +1302,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main-options.png" format="PNG"/>
+ <imagedata fileref="install/main-options"/>
</imageobject>
</mediaobject>
</figure>
@@ -1312,7 +1312,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/options.png" format="PNG"/>
+ <imagedata fileref="install/options"/>
</imageobject>
</mediaobject>
</figure>
@@ -1346,7 +1346,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main-std.png" format="PNG"/>
+ <imagedata fileref="install/main-std"/>
</imageobject>
</mediaobject>
</figure>
@@ -1511,7 +1511,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/fdisk-drive1.png" format="PNG"/>
+ <imagedata fileref="install/fdisk-drive1"/>
</imageobject>
</mediaobject>
</figure>
@@ -1577,7 +1577,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/fdisk-edit1.png" format="PNG"/>
+ <imagedata fileref="install/fdisk-edit1"/>
</imageobject>
</mediaobject>
</figure>
@@ -1620,7 +1620,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/fdisk-edit2.png" format="PNG"/>
+ <imagedata fileref="install/fdisk-edit2"/>
</imageobject>
</mediaobject>
</figure>
@@ -1662,7 +1662,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/boot-mgr.png" format="PNG"/>
+ <imagedata fileref="install/boot-mgr"/>
</imageobject>
</mediaobject>
</figure>
@@ -1692,7 +1692,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/fdisk-drive2.png" format="PNG"/>
+ <imagedata fileref="install/fdisk-drive2"/>
</imageobject>
</mediaobject>
</figure>
@@ -1941,7 +1941,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-ed1.png" format="PNG"/>
+ <imagedata fileref="install/disklabel-ed1"/>
</imageobject>
</mediaobject>
</figure>
@@ -1969,7 +1969,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-auto.png" format="PNG"/>
+ <imagedata fileref="install/disklabel-auto"/>
</imageobject>
</mediaobject>
</figure>
@@ -1996,7 +1996,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-root1.png" format="PNG"/>
+ <imagedata fileref="install/disklabel-root1"/>
</imageobject>
</mediaobject>
</figure>
@@ -2014,7 +2014,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-root2.png" format="PNG"/>
+ <imagedata fileref="install/disklabel-root2"/>
</imageobject>
</mediaobject>
</figure>
@@ -2031,7 +2031,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-fs.png" format="PNG"/>
+ <imagedata fileref="install/disklabel-fs"/>
</imageobject>
</mediaobject>
</figure>
@@ -2048,7 +2048,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-root3.png" format="PNG"/>
+ <imagedata fileref="install/disklabel-root3"/>
</imageobject>
</mediaobject>
</figure>
@@ -2070,7 +2070,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-ed2.png" format="PNG"/>
+ <imagedata fileref="install/disklabel-ed2"/>
</imageobject>
</mediaobject>
</figure>
@@ -2122,7 +2122,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/dist-set.png" format="PNG"/>
+ <imagedata fileref="install/dist-set"/>
</imageobject>
</mediaobject>
</figure>
@@ -2177,7 +2177,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/dist-set2.png" format="PNG"/>
+ <imagedata fileref="install/dist-set2"/>
</imageobject>
</mediaobject>
</figure>
@@ -2210,7 +2210,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/media.png" format="PNG"/>
+ <imagedata fileref="install/media"/>
</imageobject>
</mediaobject>
</figure>
@@ -2407,7 +2407,7 @@ installation menus to retry whichever operations have failed.
<mediaobject>
<imageobject>
- <imagedata fileref="install/ed0-conf.png" format="PNG"/>
+ <imagedata fileref="install/ed0-conf"/>
</imageobject>
</mediaobject>
</figure>
@@ -2453,7 +2453,7 @@ installation menus to retry whichever operations have failed.
<mediaobject>
<imageobject>
- <imagedata fileref="install/ed0-conf2.png" format="PNG"/>
+ <imagedata fileref="install/ed0-conf2"/>
</imageobject>
</mediaobject>
</figure>
@@ -2628,7 +2628,7 @@ use the current settings.
<mediaobject>
<imageobject>
- <imagedata fileref="install/edit-inetd-conf.png" format="PNG"/>
+ <imagedata fileref="install/edit-inetd-conf"/>
</imageobject>
</mediaobject>
</figure>
@@ -2721,7 +2721,7 @@ use the current settings.
<mediaobject>
<imageobject>
- <imagedata fileref="install/ftp-anon1.png" format="PNG"/>
+ <imagedata fileref="install/ftp-anon1"/>
</imageobject>
</mediaobject>
</figure>
@@ -2800,7 +2800,7 @@ use the current settings.
<mediaobject>
<imageobject>
- <imagedata fileref="install/ftp-anon2.png" format="PNG"/>
+ <imagedata fileref="install/ftp-anon2"/>
</imageobject>
</mediaobject>
</figure>
@@ -2857,7 +2857,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/nfs-server-edit.png" format="PNG"/>
+ <imagedata fileref="install/nfs-server-edit"/>
</imageobject>
</mediaobject>
</figure>
@@ -2907,7 +2907,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/console-saver1.png" format="PNG"/>
+ <imagedata fileref="install/console-saver1"/>
</imageobject>
</mediaobject>
</figure>
@@ -2921,7 +2921,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/console-saver2.png" format="PNG"/>
+ <imagedata fileref="install/console-saver2"/>
</imageobject>
</mediaobject>
</figure>
@@ -2941,7 +2941,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/console-saver3.png" format="PNG"/>
+ <imagedata fileref="install/console-saver3"/>
</imageobject>
</mediaobject>
</figure>
@@ -2955,7 +2955,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/console-saver4.png" format="PNG"/>
+ <imagedata fileref="install/console-saver4"/>
</imageobject>
</mediaobject>
</figure>
@@ -2999,7 +2999,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/timezone1.png" format="PNG"/>
+ <imagedata fileref="install/timezone1"/>
</imageobject>
</mediaobject>
</figure>
@@ -3012,7 +3012,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/timezone2.png" format="PNG"/>
+ <imagedata fileref="install/timezone2"/>
</imageobject>
</mediaobject>
</figure>
@@ -3025,7 +3025,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/timezone3.png" format="PNG"/>
+ <imagedata fileref="install/timezone3"/>
</imageobject>
</mediaobject>
</figure>
@@ -3066,7 +3066,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse1.png" format="PNG"/>
+ <imagedata fileref="install/mouse1"/>
</imageobject>
</mediaobject>
</figure>
@@ -3079,7 +3079,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse2.png" format="PNG"/>
+ <imagedata fileref="install/mouse2"/>
</imageobject>
</mediaobject>
</figure>
@@ -3094,7 +3094,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse3.png" format="PNG"/>
+ <imagedata fileref="install/mouse3"/>
</imageobject>
</mediaobject>
</figure>
@@ -3107,7 +3107,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse4.png" format="PNG"/>
+ <imagedata fileref="install/mouse4"/>
</imageobject>
</mediaobject>
</figure>
@@ -3121,7 +3121,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse5.png" format="PNG"/>
+ <imagedata fileref="install/mouse5"/>
</imageobject>
</mediaobject>
</figure>
@@ -3137,7 +3137,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse6.png" format="PNG"/>
+ <imagedata fileref="install/mouse6"/>
</imageobject>
</mediaobject>
</figure>
@@ -3182,7 +3182,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/pkg-cat.png" format="PNG"/>
+ <imagedata fileref="install/pkg-cat"/>
</imageobject>
</mediaobject>
</figure>
@@ -3203,7 +3203,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/pkg-sel.png" format="PNG"/>
+ <imagedata fileref="install/pkg-sel"/>
</imageobject>
</mediaobject>
</figure>
@@ -3230,7 +3230,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/pkg-install.png" format="PNG"/>
+ <imagedata fileref="install/pkg-install"/>
</imageobject>
</mediaobject>
</figure>
@@ -3244,7 +3244,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/pkg-confirm.png" format="PNG"/>
+ <imagedata fileref="install/pkg-confirm"/>
</imageobject>
</mediaobject>
</figure>
@@ -3284,7 +3284,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/adduser1.png" format="PNG"/>
+ <imagedata fileref="install/adduser1"/>
</imageobject>
</mediaobject>
</figure>
@@ -3297,7 +3297,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/adduser2.png" format="PNG"/>
+ <imagedata fileref="install/adduser2"/>
</imageobject>
</mediaobject>
</figure>
@@ -3397,7 +3397,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/adduser3.png" format="PNG"/>
+ <imagedata fileref="install/adduser3"/>
</imageobject>
</mediaobject>
</figure>
@@ -3462,7 +3462,7 @@ Retype new password :</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/mainexit.png" format="PNG"/>
+ <imagedata fileref="install/mainexit"/>
</imageobject>
</mediaobject>
</figure>
@@ -3537,7 +3537,7 @@ Retype new password :</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/net-config-menu1.png" format="PNG"/>
+ <imagedata fileref="install/net-config-menu1"/>
</imageobject>
</mediaobject>
</figure>
@@ -3604,7 +3604,7 @@ Retype new password :</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/mta-main.png" format="PNG"/>
+ <imagedata fileref="install/mta-main"/>
</imageobject>
</mediaobject>
</figure>
@@ -3658,7 +3658,7 @@ Retype new password :</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/ntp-config.png" format="PNG"/>
+ <imagedata fileref="install/ntp-config"/>
</imageobject>
</mediaobject>
</figure>
@@ -3684,7 +3684,7 @@ Retype new password :</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/net-config-menu2.png" format="PNG"/>
+ <imagedata fileref="install/net-config-menu2"/>
</imageobject>
</mediaobject>
</figure>
diff --git a/en_US.ISO8859-1/books/handbook/mail/chapter.xml b/en_US.ISO8859-1/books/handbook/mail/chapter.xml
index 3d4e58e619..5d6aea0866 100644
--- a/en_US.ISO8859-1/books/handbook/mail/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/mail/chapter.xml
@@ -1960,7 +1960,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/mutt1.png" format="PNG"/>
+ <imagedata fileref="mail/mutt1"/>
</imageobject>
</mediaobject>
@@ -1971,7 +1971,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/mutt2.png" format="PNG"/>
+ <imagedata fileref="mail/mutt2"/>
</imageobject>
</mediaobject>
@@ -2009,7 +2009,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/mutt3.png" format="PNG"/>
+ <imagedata fileref="mail/mutt3"/>
</imageobject>
</mediaobject>
@@ -2061,7 +2061,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine1.png" format="PNG"/>
+ <imagedata fileref="mail/pine1"/>
</imageobject>
</mediaobject>
@@ -2082,7 +2082,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine2.png" format="PNG"/>
+ <imagedata fileref="mail/pine2"/>
</imageobject>
</mediaobject>
@@ -2093,7 +2093,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine3.png" format="PNG"/>
+ <imagedata fileref="mail/pine3"/>
</imageobject>
</mediaobject>
@@ -2106,7 +2106,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine4.png" format="PNG"/>
+ <imagedata fileref="mail/pine4"/>
</imageobject>
</mediaobject>
@@ -2125,7 +2125,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine5.png" format="PNG"/>
+ <imagedata fileref="mail/pine5"/>
</imageobject>
</mediaobject>
diff --git a/en_US.ISO8859-1/books/handbook/vinum/chapter.xml b/en_US.ISO8859-1/books/handbook/vinum/chapter.xml
index 0d6d3fa1cd..e3dc800c4a 100644
--- a/en_US.ISO8859-1/books/handbook/vinum/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/vinum/chapter.xml
@@ -150,7 +150,7 @@
<figure id="vinum-concat">
<title>Concatenated Organization</title>
- <graphic fileref="vinum/vinum-concat.pic"/>
+ <graphic fileref="vinum/vinum-concat"/>
</figure></para>
<indexterm>
@@ -187,7 +187,7 @@
<figure id="vinum-striped">
<title>Striped Organization</title>
- <graphic fileref="vinum/vinum-striped.pic"/>
+ <graphic fileref="vinum/vinum-striped"/>
</figure></para>
</sect1>
@@ -254,7 +254,7 @@
<figure id="vinum-raid5-org">
<title><acronym>RAID</acronym>-5 Organization</title>
- <graphic fileref="vinum/vinum-raid5-org.pic"/>
+ <graphic fileref="vinum/vinum-raid5-org"/>
</figure></para>
<para>Compared to mirroring, <acronym>RAID-5</acronym> has the
@@ -520,7 +520,7 @@
<title>A Simple <devicename>vinum</devicename>
Volume</title>
- <graphic fileref="vinum/vinum-simple-vol.pic"/>
+ <graphic fileref="vinum/vinum-simple-vol"/>
</figure></para>
<para>This figure, and the ones which follow, represent a
@@ -587,7 +587,7 @@
<title>A Mirrored <devicename>vinum</devicename>
Volume</title>
- <graphic fileref="vinum/vinum-mirrored-vol.pic"/>
+ <graphic fileref="vinum/vinum-mirrored-vol"/>
</figure></para>
<para>In this example, each plex contains the full 512 MB
@@ -655,7 +655,7 @@
<title>A Striped <devicename>vinum</devicename>
Volume</title>
- <graphic fileref="vinum/vinum-striped-vol.pic"/>
+ <graphic fileref="vinum/vinum-striped-vol"/>
</figure></para>
<para>This volume is represented in <link
@@ -701,7 +701,7 @@
<title>A Mirrored, Striped <devicename>vinum</devicename>
Volume</title>
- <graphic fileref="vinum/vinum-raid10-vol.pic"/>
+ <graphic fileref="vinum/vinum-raid10-vol"/>
</figure></para>
</sect2>
</sect1>
diff --git a/en_US.ISO8859-1/books/handbook/virtualization/chapter.xml b/en_US.ISO8859-1/books/handbook/virtualization/chapter.xml
index d990a1088d..fffefbac57 100644
--- a/en_US.ISO8859-1/books/handbook/virtualization/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/virtualization/chapter.xml
@@ -112,7 +112,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd1.png"/>
+ <imagedata fileref="virtualization/parallels-freebsd1"/>
</imageobject>
</mediaobject>
@@ -123,25 +123,25 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd2.png"/>
+ <imagedata fileref="virtualization/parallels-freebsd2"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd3.png"/>
+ <imagedata fileref="virtualization/parallels-freebsd3"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd4.png"/>
+ <imagedata fileref="virtualization/parallels-freebsd4"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd5.png"/>
+ <imagedata fileref="virtualization/parallels-freebsd5"/>
</imageobject>
</mediaobject>
@@ -150,13 +150,13 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd6.png"/>
+ <imagedata fileref="virtualization/parallels-freebsd6"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd7.png"/>
+ <imagedata fileref="virtualization/parallels-freebsd7"/>
</imageobject>
</mediaobject>
@@ -164,13 +164,13 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd8.png"/>
+ <imagedata fileref="virtualization/parallels-freebsd8"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd9.png"/>
+ <imagedata fileref="virtualization/parallels-freebsd9"/>
</imageobject>
</mediaobject>
@@ -187,7 +187,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd11.png"/>
+ <imagedata fileref="virtualization/parallels-freebsd11"/>
</imageobject>
</mediaobject>
@@ -198,7 +198,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd10.png"/>
+ <imagedata fileref="virtualization/parallels-freebsd10"/>
</imageobject>
</mediaobject>
@@ -209,7 +209,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd12.png"/>
+ <imagedata fileref="virtualization/parallels-freebsd12"/>
</imageobject>
</mediaobject>
@@ -218,7 +218,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd13.png"/>
+ <imagedata fileref="virtualization/parallels-freebsd13"/>
</imageobject>
</mediaobject>
</sect3>
@@ -611,13 +611,13 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd1.png"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd1"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd2.png"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd2"/>
</imageobject>
</mediaobject>
@@ -627,7 +627,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd3.png"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd3"/>
</imageobject>
</mediaobject>
@@ -638,13 +638,13 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd4.png"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd4"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd5.png"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd5"/>
</imageobject>
</mediaobject>
@@ -652,7 +652,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd6.png"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd6"/>
</imageobject>
</mediaobject>
@@ -662,13 +662,13 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd7.png"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd7"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd8.png"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd8"/>
</imageobject>
</mediaobject>
@@ -687,13 +687,13 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd9.png"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd9"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd10.png"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd10"/>
</imageobject>
</mediaobject>
@@ -705,7 +705,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd11.png"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd11"/>
</imageobject>
</mediaobject>
@@ -716,7 +716,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd12.png"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd12"/>
</imageobject>
</mediaobject>
@@ -726,7 +726,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd13.png"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd13"/>
</imageobject>
</mediaobject>
</sect3>
@@ -811,7 +811,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd01.png"/>
+ <imagedata fileref="virtualization/vmware-freebsd01"/>
</imageobject>
</mediaobject>
@@ -820,7 +820,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd02.png"/>
+ <imagedata fileref="virtualization/vmware-freebsd02"/>
</imageobject>
</mediaobject>
@@ -832,7 +832,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd03.png"/>
+ <imagedata fileref="virtualization/vmware-freebsd03"/>
</imageobject>
</mediaobject>
@@ -841,7 +841,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd04.png"/>
+ <imagedata fileref="virtualization/vmware-freebsd04"/>
</imageobject>
</mediaobject>
@@ -850,7 +850,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd05.png"/>
+ <imagedata fileref="virtualization/vmware-freebsd05"/>
</imageobject>
</mediaobject>
@@ -859,7 +859,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd06.png"/>
+ <imagedata fileref="virtualization/vmware-freebsd06"/>
</imageobject>
</mediaobject>
@@ -868,7 +868,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd07.png"/>
+ <imagedata fileref="virtualization/vmware-freebsd07"/>
</imageobject>
</mediaobject>
@@ -876,7 +876,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd08.png"/>
+ <imagedata fileref="virtualization/vmware-freebsd08"/>
</imageobject>
</mediaobject>
@@ -892,7 +892,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd09.png"/>
+ <imagedata fileref="virtualization/vmware-freebsd09"/>
</imageobject>
</mediaobject>
@@ -901,7 +901,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd10.png"/>
+ <imagedata fileref="virtualization/vmware-freebsd10"/>
</imageobject>
</mediaobject>
@@ -911,7 +911,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd11.png"/>
+ <imagedata fileref="virtualization/vmware-freebsd11"/>
</imageobject>
</mediaobject>
@@ -927,7 +927,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd12.png"/>
+ <imagedata fileref="virtualization/vmware-freebsd12"/>
</imageobject>
</mediaobject>
diff --git a/es_ES.ISO8859-1/articles/releng/article.xml b/es_ES.ISO8859-1/articles/releng/article.xml
index 92003d6a42..1054c066e8 100644
--- a/es_ES.ISO8859-1/articles/releng/article.xml
+++ b/es_ES.ISO8859-1/articles/releng/article.xml
@@ -292,7 +292,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="branches-head.pic" align="center"/>
+ <imagedata fileref="branches-head" align="center"/>
</imageobject>
<textobject>
@@ -302,7 +302,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="branches-releng3.pic" align="center"/>
+ <imagedata fileref="branches-releng3" align="center"/>
</imageobject>
<textobject>
@@ -312,7 +312,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="branches-releng4.pic" align="center"/>
+ <imagedata fileref="branches-releng4" align="center"/>
</imageobject>
<textobject>
diff --git a/es_ES.ISO8859-1/books/handbook/advanced-networking/chapter.xml b/es_ES.ISO8859-1/books/handbook/advanced-networking/chapter.xml
index 5050a6b714..6dacb31790 100755
--- a/es_ES.ISO8859-1/books/handbook/advanced-networking/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/advanced-networking/chapter.xml
@@ -360,7 +360,7 @@ host2.ejemplo.com link#1 UC 0 0
<mediaobject>
<imageobject>
- <imagedata fileref="advanced-networking/net-routing.pic"/>
+ <imagedata fileref="advanced-networking/net-routing"/>
</imageobject>
<textobject>
@@ -3983,7 +3983,7 @@ host margaux {
<mediaobject>
<imageobject>
- <imagedata fileref="advanced-networking/isdn-bus.eps"/>
+ <imagedata fileref="advanced-networking/isdn-bus"/>
</imageobject>
<textobject>
@@ -4018,7 +4018,7 @@ ISDN BRI line</literallayout>
<mediaobject>
<imageobject>
- <imagedata fileref="advanced-networking/isdn-twisted-pair.eps"/>
+ <imagedata fileref="advanced-networking/isdn-twisted-pair"/>
</imageobject>
<textobject>
@@ -7513,7 +7513,7 @@ driftfile /var/db/ntp.drift</programlisting>
<mediaobject>
<imageobject>
- <imagedata fileref="advanced-networking/natd.eps"/>
+ <imagedata fileref="advanced-networking/natd"/>
</imageobject>
<textobject>
diff --git a/es_ES.ISO8859-1/books/handbook/basics/chapter.xml b/es_ES.ISO8859-1/books/handbook/basics/chapter.xml
index 0b8e4ffa5d..b22187d26b 100755
--- a/es_ES.ISO8859-1/books/handbook/basics/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/basics/chapter.xml
@@ -1232,7 +1232,7 @@ root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01 passwd</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir1.eps" format="EPS"/>
+ <imagedata fileref="install/example-dir1"/>
</imageobject>
<textobject>
@@ -1254,7 +1254,7 @@ root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01 passwd</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir2.eps" format="EPS"/>
+ <imagedata fileref="install/example-dir2"/>
</imageobject>
<textobject>
@@ -1284,7 +1284,7 @@ root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01 passwd</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir3.eps" format="EPS"/>
+ <imagedata fileref="install/example-dir3"/>
</imageobject>
<textobject>
@@ -1311,7 +1311,7 @@ root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01 passwd</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir4.eps" format="EPS"/>
+ <imagedata fileref="install/example-dir4"/>
</imageobject>
<textobject>
@@ -1337,7 +1337,7 @@ root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01 passwd</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir5.eps" format="EPS"/>
+ <imagedata fileref="install/example-dir5"/>
</imageobject>
<textobject>
@@ -1681,7 +1681,7 @@ root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01 passwd</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/disk-layout.eps" format="EPS"/>
+ <imagedata fileref="install/disk-layout"/>
</imageobject>
<textobject>
diff --git a/es_ES.ISO8859-1/books/handbook/geom/chapter.xml b/es_ES.ISO8859-1/books/handbook/geom/chapter.xml
index 9bf634f68b..fa47c57455 100644
--- a/es_ES.ISO8859-1/books/handbook/geom/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/geom/chapter.xml
@@ -151,7 +151,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="geom/striping.pic" align="center"/>
+ <imagedata fileref="geom/striping" align="center"/>
</imageobject>
<textobject>
diff --git a/es_ES.ISO8859-1/books/handbook/install/chapter.xml b/es_ES.ISO8859-1/books/handbook/install/chapter.xml
index 67c3edc8c8..8e7762ee27 100755
--- a/es_ES.ISO8859-1/books/handbook/install/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/install/chapter.xml
@@ -1301,7 +1301,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/config-country.png" format="PNG"/>
+ <imagedata fileref="install/config-country"/>
</imageobject>
</mediaobject>
</figure>
@@ -1311,7 +1311,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/sysinstall-exit.png" format="PNG"/>
+ <imagedata fileref="install/sysinstall-exit"/>
</imageobject>
</mediaobject>
</figure>
@@ -1369,7 +1369,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main1.png" format="PNG"/>
+ <imagedata fileref="install/main1"/>
</imageobject>
</mediaobject>
</figure>
@@ -1387,7 +1387,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main-doc.png" format="PNG"/>
+ <imagedata fileref="install/main-doc"/>
</imageobject>
</mediaobject>
</figure>
@@ -1399,7 +1399,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/docmenu1.png" format="PNG"/>
+ <imagedata fileref="install/docmenu1"/>
</imageobject>
</mediaobject>
</figure>
@@ -1429,7 +1429,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main-keymap.png" format="PNG"/>
+ <imagedata fileref="install/main-keymap"/>
</imageobject>
</mediaobject>
</figure>
@@ -1451,7 +1451,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/keymap.png" format="PNG"/>
+ <imagedata fileref="install/keymap"/>
</imageobject>
</mediaobject>
</figure>
@@ -1469,7 +1469,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main-options.png" format="PNG"/>
+ <imagedata fileref="install/main-options"/>
</imageobject>
</mediaobject>
</figure>
@@ -1479,7 +1479,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/options.png" format="PNG"/>
+ <imagedata fileref="install/options"/>
</imageobject>
</mediaobject>
</figure>
@@ -1519,7 +1519,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main-std.png" format="PNG"/>
+ <imagedata fileref="install/main-std"/>
</imageobject>
</mediaobject>
</figure>
@@ -1719,7 +1719,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/fdisk-drive1.png" format="PNG"/>
+ <imagedata fileref="install/fdisk-drive1"/>
</imageobject>
</mediaobject>
</figure>
@@ -1802,7 +1802,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/fdisk-edit1.png" format="PNG"/>
+ <imagedata fileref="install/fdisk-edit1"/>
</imageobject>
</mediaobject>
</figure>
@@ -1853,7 +1853,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/fdisk-edit2.png" format="PNG"/>
+ <imagedata fileref="install/fdisk-edit2"/>
</imageobject>
</mediaobject>
</figure>
@@ -1896,7 +1896,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/boot-mgr.png" format="PNG"/>
+ <imagedata fileref="install/boot-mgr"/>
</imageobject>
</mediaobject>
</figure>
@@ -1930,7 +1930,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/fdisk-drive2.png" format="PNG"/>
+ <imagedata fileref="install/fdisk-drive2"/>
</imageobject>
</mediaobject>
</figure>
@@ -2220,7 +2220,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-ed1.png" format="PNG"/>
+ <imagedata fileref="install/disklabel-ed1"/>
</imageobject>
</mediaobject>
</figure>
@@ -2249,7 +2249,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-auto.png" format="PNG"/>
+ <imagedata fileref="install/disklabel-auto"/>
</imageobject>
</mediaobject>
</figure>
@@ -2280,7 +2280,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-root1.png" format="PNG"/>
+ <imagedata fileref="install/disklabel-root1"/>
</imageobject>
</mediaobject>
</figure>
@@ -2301,7 +2301,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-root2.png" format="PNG"/>
+ <imagedata fileref="install/disklabel-root2"/>
</imageobject>
</mediaobject>
</figure>
@@ -2320,7 +2320,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-fs.png" format="PNG"/>
+ <imagedata fileref="install/disklabel-fs"/>
</imageobject>
</mediaobject>
</figure>
@@ -2338,7 +2338,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-root3.png" format="PNG"/>
+ <imagedata fileref="install/disklabel-root3"/>
</imageobject>
</mediaobject>
</figure>
@@ -2364,7 +2364,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-ed2.png" format="PNG"/>
+ <imagedata fileref="install/disklabel-ed2"/>
</imageobject>
</mediaobject>
</figure>
@@ -2431,7 +2431,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/dist-set.png" format="PNG"/>
+ <imagedata fileref="install/dist-set"/>
</imageobject>
</mediaobject>
</figure>
@@ -2515,7 +2515,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/dist-set2.png" format="PNG"/>
+ <imagedata fileref="install/dist-set2"/>
</imageobject>
</mediaobject>
</figure>
@@ -2550,7 +2550,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/media.png" format="PNG"/>
+ <imagedata fileref="install/media"/>
</imageobject>
</mediaobject>
</figure>
@@ -2808,7 +2808,7 @@ operaci
<mediaobject>
<imageobject>
- <imagedata fileref="install/ed0-conf.png" format="PNG"/>
+ <imagedata fileref="install/ed0-conf"/>
</imageobject>
</mediaobject>
</figure>
@@ -2855,7 +2855,7 @@ operaci
<mediaobject>
<imageobject>
- <imagedata fileref="install/ed0-conf2.png" format="PNG"/>
+ <imagedata fileref="install/ed0-conf2"/>
</imageobject>
</mediaobject>
</figure>
@@ -3050,7 +3050,7 @@ Dicho esto ?desea activar inetd?
<mediaobject>
<imageobject>
- <imagedata fileref="install/edit-inetd-conf.png" format="PNG"/>
+ <imagedata fileref="install/edit-inetd-conf"/>
</imageobject>
</mediaobject>
</figure>
@@ -3190,7 +3190,7 @@ Upload subdirectory:
<mediaobject>
<imageobject>
- <imagedata fileref="install/ftp-anon2.png" format="PNG"/>
+ <imagedata fileref="install/ftp-anon2"/>
</imageobject>
</mediaobject>
</figure>
@@ -3265,7 +3265,7 @@ Pulse [Intro] para abrir /etc/exports en un editor
<mediaobject>
<imageobject>
- <imagedata fileref="install/nfs-server-edit.png" format="PNG"/>
+ <imagedata fileref="install/nfs-server-edit"/>
</imageobject>
</mediaobject>
</figure>
@@ -3320,7 +3320,7 @@ Pulse [Intro] para abrir /etc/exports en un editor
<mediaobject>
<imageobject>
- <imagedata fileref="install/console-saver1.png" format="PNG"/>
+ <imagedata fileref="install/console-saver1"/>
</imageobject>
</mediaobject>
</figure>
@@ -3337,7 +3337,7 @@ Pulse [Intro] para abrir /etc/exports en un editor
<mediaobject>
<imageobject>
- <imagedata fileref="install/console-saver2.png" format="PNG"/>
+ <imagedata fileref="install/console-saver2"/>
</imageobject>
</mediaobject>
</figure>
@@ -3358,7 +3358,7 @@ Pulse [Intro] para abrir /etc/exports en un editor
<mediaobject>
<imageobject>
- <imagedata fileref="install/console-saver3.png" format="PNG"/>
+ <imagedata fileref="install/console-saver3"/>
</imageobject>
</mediaobject>
</figure>
@@ -3372,7 +3372,7 @@ Pulse [Intro] para abrir /etc/exports en un editor
<mediaobject>
<imageobject>
- <imagedata fileref="install/console-saver4.png" format="PNG"/>
+ <imagedata fileref="install/console-saver4"/>
</imageobject>
</mediaobject>
</figure>
@@ -3425,7 +3425,7 @@ Pulse [Intro] para abrir /etc/exports en un editor
<mediaobject>
<imageobject>
- <imagedata fileref="install/timezone1.png" format="PNG"/>
+ <imagedata fileref="install/timezone1"/>
</imageobject>
</mediaobject>
</figure>
@@ -3438,7 +3438,7 @@ Pulse [Intro] para abrir /etc/exports en un editor
<mediaobject>
<imageobject>
- <imagedata fileref="install/timezone2.png" format="PNG"/>
+ <imagedata fileref="install/timezone2"/>
</imageobject>
</mediaobject>
</figure>
@@ -3451,7 +3451,7 @@ Pulse [Intro] para abrir /etc/exports en un editor
<mediaobject>
<imageobject>
- <imagedata fileref="install/timezone3.png" format="PNG"/>
+ <imagedata fileref="install/timezone3"/>
</imageobject>
</mediaobject>
</figure>
@@ -3517,7 +3517,7 @@ Pulse [Intro] para abrir /etc/exports en un editor
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse1.png" format="PNG"/>
+ <imagedata fileref="install/mouse1"/>
</imageobject>
</mediaobject>
</figure>
@@ -3530,7 +3530,7 @@ Pulse [Intro] para abrir /etc/exports en un editor
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse2.png" format="PNG"/>
+ <imagedata fileref="install/mouse2"/>
</imageobject>
</mediaobject>
</figure>
@@ -3547,7 +3547,7 @@ Pulse [Intro] para abrir /etc/exports en un editor
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse3.png" format="PNG"/>
+ <imagedata fileref="install/mouse3"/>
</imageobject>
</mediaobject>
</figure>
@@ -3560,7 +3560,7 @@ Pulse [Intro] para abrir /etc/exports en un editor
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse4.png" format="PNG"/>
+ <imagedata fileref="install/mouse4"/>
</imageobject>
</mediaobject>
</figure>
@@ -3575,7 +3575,7 @@ Pulse [Intro] para abrir /etc/exports en un editor
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse5.png" format="PNG"/>
+ <imagedata fileref="install/mouse5"/>
</imageobject>
</mediaobject>
</figure>
@@ -3591,7 +3591,7 @@ Pulse [Intro] para abrir /etc/exports en un editor
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse6.png" format="PNG"/>
+ <imagedata fileref="install/mouse6"/>
</imageobject>
</mediaobject>
</figure>
@@ -3638,7 +3638,7 @@ Pulse [Intro] para abrir /etc/exports en un editor
<mediaobject>
<imageobject>
- <imagedata fileref="install/pkg-cat.png" format="PNG"/>
+ <imagedata fileref="install/pkg-cat"/>
</imageobject>
</mediaobject>
</figure>
@@ -3662,7 +3662,7 @@ Pulse [Intro] para abrir /etc/exports en un editor
<mediaobject>
<imageobject>
- <imagedata fileref="install/pkg-sel.png" format="PNG"/>
+ <imagedata fileref="install/pkg-sel"/>
</imageobject>
</mediaobject>
</figure>
@@ -3696,7 +3696,7 @@ Pulse [Intro] para abrir /etc/exports en un editor
<mediaobject>
<imageobject>
- <imagedata fileref="install/pkg-install.png" format="PNG"/>
+ <imagedata fileref="install/pkg-install"/>
</imageobject>
</mediaobject>
</figure>
@@ -3711,7 +3711,7 @@ Pulse [Intro] para abrir /etc/exports en un editor
<mediaobject>
<imageobject>
- <imagedata fileref="install/pkg-confirm.png" format="PNG"/>
+ <imagedata fileref="install/pkg-confirm"/>
</imageobject>
</mediaobject>
</figure>
@@ -3769,7 +3769,7 @@ Pulse [Intro] para abrir /etc/exports en un editor
<mediaobject>
<imageobject>
- <imagedata fileref="install/adduser1.png" format="PNG"/>
+ <imagedata fileref="install/adduser1"/>
</imageobject>
</mediaobject>
</figure>
@@ -3782,7 +3782,7 @@ Pulse [Intro] para abrir /etc/exports en un editor
<mediaobject>
<imageobject>
- <imagedata fileref="install/adduser2.png" format="PNG"/>
+ <imagedata fileref="install/adduser2"/>
</imageobject>
</mediaobject>
</figure>
@@ -3891,7 +3891,7 @@ Pulse [Intro] para abrir /etc/exports en un editor
<mediaobject>
<imageobject>
- <imagedata fileref="install/adduser3.png" format="PNG"/>
+ <imagedata fileref="install/adduser3"/>
</imageobject>
</mediaobject>
</figure>
@@ -3970,7 +3970,7 @@ Retype new password :</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/mainexit.png" format="PNG"/>
+ <imagedata fileref="install/mainexit"/>
</imageobject>
</mediaobject>
</figure>
@@ -4060,7 +4060,7 @@ Retype new password :</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/net-config-menu1.png" format="PNG"/>
+ <imagedata fileref="install/net-config-menu1"/>
</imageobject>
</mediaobject>
</figure>
@@ -4131,7 +4131,7 @@ Retype new password :</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/mta-main.png" format="PNG"/>
+ <imagedata fileref="install/mta-main"/>
</imageobject>
</mediaobject>
</figure>
@@ -4189,7 +4189,7 @@ Retype new password :</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/ntp-config.png" format="PNG"/>
+ <imagedata fileref="install/ntp-config"/>
</imageobject>
</mediaobject>
</figure>
@@ -4217,7 +4217,7 @@ Retype new password :</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/net-config-menu2.png" format="PNG"/>
+ <imagedata fileref="install/net-config-menu2"/>
</imageobject>
</mediaobject>
</figure>
diff --git a/es_ES.ISO8859-1/books/handbook/mail/chapter.xml b/es_ES.ISO8859-1/books/handbook/mail/chapter.xml
index 040757015a..d045d6c9ac 100755
--- a/es_ES.ISO8859-1/books/handbook/mail/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/mail/chapter.xml
@@ -2190,7 +2190,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/mutt1.png" format="PNG"/>
+ <imagedata fileref="mail/mutt1"/>
</imageobject>
</mediaobject>
@@ -2201,7 +2201,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/mutt2.png" format="PNG"/>
+ <imagedata fileref="mail/mutt2"/>
</imageobject>
</mediaobject>
@@ -2233,7 +2233,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/mutt3.png" format="PNG"/>
+ <imagedata fileref="mail/mutt3"/>
</imageobject>
</mediaobject>
@@ -2288,7 +2288,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine1.png" format="PNG"/>
+ <imagedata fileref="mail/pine1"/>
</imageobject>
</mediaobject>
@@ -2311,7 +2311,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine2.png" format="PNG"/>
+ <imagedata fileref="mail/pine2"/>
</imageobject>
</mediaobject>
@@ -2322,7 +2322,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine3.png" format="PNG"/>
+ <imagedata fileref="mail/pine3"/>
</imageobject>
</mediaobject>
@@ -2334,7 +2334,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine4.png" format="PNG"/>
+ <imagedata fileref="mail/pine4"/>
</imageobject>
</mediaobject>
@@ -2353,7 +2353,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine5.png" format="PNG"/>
+ <imagedata fileref="mail/pine5"/>
</imageobject>
</mediaobject>
diff --git a/es_ES.ISO8859-1/books/handbook/security/chapter.xml b/es_ES.ISO8859-1/books/handbook/security/chapter.xml
index 628ce81177..6de38d9e3d 100755
--- a/es_ES.ISO8859-1/books/handbook/security/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/security/chapter.xml
@@ -3786,7 +3786,7 @@ options IPSEC_DEBUG #debug for IP security
<mediaobject>
<imageobject>
- <imagedata fileref="security/ipsec-network.pic" align="center"/>
+ <imagedata fileref="security/ipsec-network" align="center"/>
</imageobject>
<textobject>
@@ -4347,7 +4347,7 @@ ipfw add 1 allow udp from W.X.Y.Z to A.B.C.D isakmp
<mediaobject>
<imageobject>
- <imagedata fileref="security/ipsec-out-pkt.pic" align="center"/>
+ <imagedata fileref="security/ipsec-out-pkt" align="center"/>
</imageobject>
<textobject>
@@ -4366,7 +4366,7 @@ ipfw add 1 allow udp from W.X.Y.Z to A.B.C.D isakmp
<mediaobject>
<imageobject>
- <imagedata fileref="security/ipsec-encap-pkt.pic" align="center"/>
+ <imagedata fileref="security/ipsec-encap-pkt" align="center"/>
</imageobject>
<textobject>
@@ -4513,7 +4513,7 @@ ipfw add 1 allow ipencap from W.X.Y.Z to A.B.C.D
<mediaobject>
<imageobject>
- <imagedata fileref="security/ipsec-crypt-pkt.pic" align="center"/>
+ <imagedata fileref="security/ipsec-crypt-pkt" align="center"/>
</imageobject>
<textobject>
diff --git a/es_ES.ISO8859-1/books/handbook/vinum/chapter.xml b/es_ES.ISO8859-1/books/handbook/vinum/chapter.xml
index 0607f61fa9..4d44745af3 100644
--- a/es_ES.ISO8859-1/books/handbook/vinum/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/vinum/chapter.xml
@@ -63,7 +63,7 @@
<para>
<figure id="vinum-concat">
<title>Organizaci�n Concatenada</title>
- <graphic fileref="vinum/vinum-concat.pic"/>
+ <graphic fileref="vinum/vinum-concat"/>
</figure>
</para>
@@ -81,7 +81,7 @@
<para>
<figure id="vinum-striped">
<title>Organizaci�n con <quote>Striping</quote></title>
- <graphic fileref="vinum/vinum-striped.pic"/>
+ <graphic fileref="vinum/vinum-striped"/>
</figure>
</para>
</sect1>
@@ -105,7 +105,7 @@
<para>
<figure id="vinum-raid5-org">
<title>Organizaci�n en RAID-5</title>
- <graphic fileref="vinum/vinum-raid5-org.pic"/>
+ <graphic fileref="vinum/vinum-raid5-org"/>
</figure>
</para>
@@ -166,7 +166,7 @@
<para>
<figure id="vinum-simple-vol">
<title>Un Volumen Vinum Sencillo</title>
- <graphic fileref="vinum/vinum-simple-vol.pic"/>
+ <graphic fileref="vinum/vinum-simple-vol"/>
</figure>
</para>
@@ -179,7 +179,7 @@
<para>
<figure id="vinum-mirrored-vol">
<title>Un Volumen Vinum Replicado</title>
- <graphic fileref="vinum/vinum-mirrored-vol.pic"/>
+ <graphic fileref="vinum/vinum-mirrored-vol"/>
</figure>
</para>
@@ -191,7 +191,7 @@
<para>
<figure id="vinum-striped-vol">
<title>Un Volumen Vinum en <quote>Striping</quote></title>
- <graphic fileref="vinum/vinum-striped-vol.pic"/>
+ <graphic fileref="vinum/vinum-striped-vol"/>
</figure>
</para>
@@ -207,7 +207,7 @@
<figure id="vinum-raid10-vol">
<title>Un Volumen Vinum Replicado y en
<quote>Striping</quote></title>
- <graphic fileref="vinum/vinum-raid10-vol.pic"/>
+ <graphic fileref="vinum/vinum-raid10-vol"/>
</figure>
</para>
</sect2>
diff --git a/fr_FR.ISO8859-1/articles/building-products/article.xml b/fr_FR.ISO8859-1/articles/building-products/article.xml
index ab6c6392ca..e2254ac3bf 100644
--- a/fr_FR.ISO8859-1/articles/building-products/article.xml
+++ b/fr_FR.ISO8859-1/articles/building-products/article.xml
@@ -516,7 +516,7 @@
<title>L'organisation &os;</title>
<mediaobject>
<imageobject>
- <imagedata fileref="freebsd-organization.pic" format="PIC"/>
+ <imagedata fileref="freebsd-organization"/>
</imageobject>
</mediaobject>
</figure>
@@ -584,7 +584,7 @@
<title>Les branches &os;</title>
<mediaobject>
<imageobject>
- <imagedata fileref="freebsd-branches.eps" format="EPS"/>
+ <imagedata fileref="freebsd-branches"/>
</imageobject>
</mediaobject>
</figure>
diff --git a/fr_FR.ISO8859-1/books/handbook/advanced-networking/chapter.xml b/fr_FR.ISO8859-1/books/handbook/advanced-networking/chapter.xml
index 232384f566..271dcc3991 100644
--- a/fr_FR.ISO8859-1/books/handbook/advanced-networking/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/advanced-networking/chapter.xml
@@ -327,7 +327,7 @@ host2.example.com link#1 UC 0 0
<mediaobject>
<imageobject>
- <imagedata fileref="advanced-networking/net-routing.pic"/>
+ <imagedata fileref="advanced-networking/net-routing"/>
</imageobject>
<textobject>
@@ -537,7 +537,7 @@ host2.example.com link#1 UC 0 0
<mediaobject>
<imageobject>
- <imagedata fileref="advanced-networking/static-routes.pic"/>
+ <imagedata fileref="advanced-networking/static-routes"/>
</imageobject>
<textobject>
@@ -3664,7 +3664,7 @@ host margaux {
<mediaobject>
<imageobject>
- <imagedata fileref="advanced-networking/isdn-bus.eps"/>
+ <imagedata fileref="advanced-networking/isdn-bus"/>
</imageobject>
<textobject>
@@ -3700,7 +3700,7 @@ Liaison ISDN BRI</literallayout>
<mediaobject>
<imageobject>
- <imagedata fileref="advanced-networking/isdn-twisted-pair.eps"/>
+ <imagedata fileref="advanced-networking/isdn-twisted-pair"/>
</imageobject>
<textobject>
@@ -3827,7 +3827,7 @@ Liaison ISDN BRI</literallayout>
<mediaobject>
<imageobject>
- <imagedata fileref="advanced-networking/natd.eps"/>
+ <imagedata fileref="advanced-networking/natd"/>
</imageobject>
<textobject>
diff --git a/fr_FR.ISO8859-1/books/handbook/basics/chapter.xml b/fr_FR.ISO8859-1/books/handbook/basics/chapter.xml
index 4c59e10312..63f50c97a5 100644
--- a/fr_FR.ISO8859-1/books/handbook/basics/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/basics/chapter.xml
@@ -1165,7 +1165,7 @@ total 530
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir1.eps" format="EPS"/>
+ <imagedata fileref="install/example-dir1"/>
</imageobject>
<textobject>
@@ -1188,7 +1188,7 @@ total 530
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir2.eps" format="EPS"/>
+ <imagedata fileref="install/example-dir2"/>
</imageobject>
<textobject>
@@ -1219,7 +1219,7 @@ total 530
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir3.eps" format="EPS"/>
+ <imagedata fileref="install/example-dir3"/>
</imageobject>
<textobject>
@@ -1248,7 +1248,7 @@ total 530
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir4.eps" format="EPS"/>
+ <imagedata fileref="install/example-dir4"/>
</imageobject>
<textobject>
@@ -1275,7 +1275,7 @@ total 530
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir5.eps" format="EPS"/>
+ <imagedata fileref="install/example-dir5"/>
</imageobject>
<textobject>
@@ -1643,7 +1643,7 @@ total 530
<mediaobject>
<imageobject>
- <imagedata fileref="install/disk-layout.eps" format="EPS"/>
+ <imagedata fileref="install/disk-layout"/>
</imageobject>
<textobject>
diff --git a/fr_FR.ISO8859-1/books/handbook/geom/chapter.xml b/fr_FR.ISO8859-1/books/handbook/geom/chapter.xml
index 63dc43a140..a322c2a23a 100644
--- a/fr_FR.ISO8859-1/books/handbook/geom/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/geom/chapter.xml
@@ -153,7 +153,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="geom/striping.pic" align="center"/>
+ <imagedata fileref="geom/striping" align="center"/>
</imageobject>
<textobject>
diff --git a/fr_FR.ISO8859-1/books/handbook/install/chapter.xml b/fr_FR.ISO8859-1/books/handbook/install/chapter.xml
index d67d47f38a..64b3f810ba 100644
--- a/fr_FR.ISO8859-1/books/handbook/install/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/install/chapter.xml
@@ -1100,7 +1100,7 @@ Insert disk labelled "Kernel floppy 1" and press any key...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/boot-loader-menu.png" format="PNG"/>
+ <imagedata fileref="install/boot-loader-menu"/>
</imageobject>
</mediaobject>
</figure>
@@ -1348,7 +1348,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/config-country.png" format="PNG"/>
+ <imagedata fileref="install/config-country"/>
</imageobject>
</mediaobject>
</figure>
@@ -1358,7 +1358,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/sysinstall-exit.png" format="PNG"/>
+ <imagedata fileref="install/sysinstall-exit"/>
</imageobject>
</mediaobject>
</figure>
@@ -1420,7 +1420,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main1.png" format="PNG"/>
+ <imagedata fileref="install/main1"/>
</imageobject>
</mediaobject>
</figure>
@@ -1437,7 +1437,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main-doc.png" format="PNG"/>
+ <imagedata fileref="install/main-doc"/>
</imageobject>
</mediaobject>
</figure>
@@ -1449,7 +1449,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/docmenu1.png" format="PNG"/>
+ <imagedata fileref="install/docmenu1"/>
</imageobject>
</mediaobject>
</figure>
@@ -1483,7 +1483,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main-keymap.png" format="PNG"/>
+ <imagedata fileref="install/main-keymap"/>
</imageobject>
</mediaobject>
</figure>
@@ -1508,7 +1508,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/keymap.png" format="PNG"/>
+ <imagedata fileref="install/keymap"/>
</imageobject>
</mediaobject>
</figure>
@@ -1526,7 +1526,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main-options.png" format="PNG"/>
+ <imagedata fileref="install/main-options"/>
</imageobject>
</mediaobject>
</figure>
@@ -1536,7 +1536,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/options.png" format="PNG"/>
+ <imagedata fileref="install/options"/>
</imageobject>
</mediaobject>
</figure>
@@ -1576,7 +1576,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main-std.png" format="PNG"/>
+ <imagedata fileref="install/main-std"/>
</imageobject>
</mediaobject>
</figure>
@@ -1786,7 +1786,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/fdisk-drive1.png" format="PNG"/>
+ <imagedata fileref="install/fdisk-drive1"/>
</imageobject>
</mediaobject>
</figure>
@@ -1868,7 +1868,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/fdisk-edit1.png" format="PNG"/>
+ <imagedata fileref="install/fdisk-edit1"/>
</imageobject>
</mediaobject>
</figure>
@@ -1925,7 +1925,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/fdisk-edit2.png" format="PNG"/>
+ <imagedata fileref="install/fdisk-edit2"/>
</imageobject>
</mediaobject>
</figure>
@@ -1975,7 +1975,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/boot-mgr.png" format="PNG"/>
+ <imagedata fileref="install/boot-mgr"/>
</imageobject>
</mediaobject>
</figure>
@@ -2010,7 +2010,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/fdisk-drive2.png" format="PNG"/>
+ <imagedata fileref="install/fdisk-drive2"/>
</imageobject>
</mediaobject>
</figure>
@@ -2296,7 +2296,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-ed1.png" format="PNG"/>
+ <imagedata fileref="install/disklabel-ed1"/>
</imageobject>
</mediaobject>
</figure>
@@ -2329,7 +2329,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-auto.png" format="PNG"/>
+ <imagedata fileref="install/disklabel-auto"/>
</imageobject>
</mediaobject>
</figure>
@@ -2361,7 +2361,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-root1.png" format="PNG"/>
+ <imagedata fileref="install/disklabel-root1"/>
</imageobject>
</mediaobject>
</figure>
@@ -2379,7 +2379,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-root2.png" format="PNG"/>
+ <imagedata fileref="install/disklabel-root2"/>
</imageobject>
</mediaobject>
</figure>
@@ -2399,7 +2399,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-fs.png" format="PNG"/>
+ <imagedata fileref="install/disklabel-fs"/>
</imageobject>
</mediaobject>
</figure>
@@ -2419,7 +2419,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-root3.png" format="PNG"/>
+ <imagedata fileref="install/disklabel-root3"/>
</imageobject>
</mediaobject>
</figure>
@@ -2447,7 +2447,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-ed2.png" format="PNG"/>
+ <imagedata fileref="install/disklabel-ed2"/>
</imageobject>
</mediaobject>
</figure>
@@ -2513,7 +2513,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/dist-set.png" format="PNG"/>
+ <imagedata fileref="install/dist-set"/>
</imageobject>
</mediaobject>
</figure>
@@ -2573,7 +2573,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/dist-set2.png" format="PNG"/>
+ <imagedata fileref="install/dist-set2"/>
</imageobject>
</mediaobject>
</figure>
@@ -2609,7 +2609,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/media.png" format="PNG"/>
+ <imagedata fileref="install/media"/>
</imageobject>
</mediaobject>
</figure>
@@ -2817,7 +2817,7 @@ installation menus to retry whichever operations have failed.
<mediaobject>
<imageobject>
- <imagedata fileref="install/ed0-conf.png" format="PNG"/>
+ <imagedata fileref="install/ed0-conf"/>
</imageobject>
</mediaobject>
</figure>
@@ -2871,7 +2871,7 @@ installation menus to retry whichever operations have failed.
<mediaobject>
<imageobject>
- <imagedata fileref="install/ed0-conf2.png" format="PNG"/>
+ <imagedata fileref="install/ed0-conf2"/>
</imageobject>
</mediaobject>
</figure>
@@ -3055,7 +3055,7 @@ use the current settings.
<mediaobject>
<imageobject>
- <imagedata fileref="install/edit-inetd-conf.png" format="PNG"/>
+ <imagedata fileref="install/edit-inetd-conf"/>
</imageobject>
</mediaobject>
</figure>
@@ -3160,7 +3160,7 @@ use the current settings.
<mediaobject>
<imageobject>
- <imagedata fileref="install/ftp-anon1.png" format="PNG"/>
+ <imagedata fileref="install/ftp-anon1"/>
</imageobject>
</mediaobject>
</figure>
@@ -3248,7 +3248,7 @@ use the current settings.
<mediaobject>
<imageobject>
- <imagedata fileref="install/ftp-anon2.png" format="PNG"/>
+ <imagedata fileref="install/ftp-anon2"/>
</imageobject>
</mediaobject>
</figure>
@@ -3314,7 +3314,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/nfs-server-edit.png" format="PNG"/>
+ <imagedata fileref="install/nfs-server-edit"/>
</imageobject>
</mediaobject>
</figure>
@@ -3368,7 +3368,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/console-saver1.png" format="PNG"/>
+ <imagedata fileref="install/console-saver1"/>
</imageobject>
</mediaobject>
</figure>
@@ -3384,7 +3384,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/console-saver2.png" format="PNG"/>
+ <imagedata fileref="install/console-saver2"/>
</imageobject>
</mediaobject>
</figure>
@@ -3410,7 +3410,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/console-saver3.png" format="PNG"/>
+ <imagedata fileref="install/console-saver3"/>
</imageobject>
</mediaobject>
</figure>
@@ -3425,7 +3425,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/console-saver4.png" format="PNG"/>
+ <imagedata fileref="install/console-saver4"/>
</imageobject>
</mediaobject>
</figure>
@@ -3473,7 +3473,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/timezone1.png" format="PNG"/>
+ <imagedata fileref="install/timezone1"/>
</imageobject>
</mediaobject>
</figure>
@@ -3487,7 +3487,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/timezone2.png" format="PNG"/>
+ <imagedata fileref="install/timezone2"/>
</imageobject>
</mediaobject>
</figure>
@@ -3501,7 +3501,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/timezone3.png" format="PNG"/>
+ <imagedata fileref="install/timezone3"/>
</imageobject>
</mediaobject>
</figure>
@@ -3568,7 +3568,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse1.png" format="PNG"/>
+ <imagedata fileref="install/mouse1"/>
</imageobject>
</mediaobject>
</figure>
@@ -3582,7 +3582,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse2.png" format="PNG"/>
+ <imagedata fileref="install/mouse2"/>
</imageobject>
</mediaobject>
</figure>
@@ -3599,7 +3599,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse3.png" format="PNG"/>
+ <imagedata fileref="install/mouse3"/>
</imageobject>
</mediaobject>
</figure>
@@ -3613,7 +3613,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse4.png" format="PNG"/>
+ <imagedata fileref="install/mouse4"/>
</imageobject>
</mediaobject>
</figure>
@@ -3630,7 +3630,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse5.png" format="PNG"/>
+ <imagedata fileref="install/mouse5"/>
</imageobject>
</mediaobject>
</figure>
@@ -3645,7 +3645,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse6.png" format="PNG"/>
+ <imagedata fileref="install/mouse6"/>
</imageobject>
</mediaobject>
</figure>
@@ -3700,7 +3700,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/pkg-cat.png" format="PNG"/>
+ <imagedata fileref="install/pkg-cat"/>
</imageobject>
</mediaobject>
</figure>
@@ -3725,7 +3725,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/pkg-sel.png" format="PNG"/>
+ <imagedata fileref="install/pkg-sel"/>
</imageobject>
</mediaobject>
</figure>
@@ -3762,7 +3762,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/pkg-install.png" format="PNG"/>
+ <imagedata fileref="install/pkg-install"/>
</imageobject>
</mediaobject>
</figure>
@@ -3777,7 +3777,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/pkg-confirm.png" format="PNG"/>
+ <imagedata fileref="install/pkg-confirm"/>
</imageobject>
</mediaobject>
</figure>
@@ -3823,7 +3823,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/adduser1.png" format="PNG"/>
+ <imagedata fileref="install/adduser1"/>
</imageobject>
</mediaobject>
</figure>
@@ -3837,7 +3837,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/adduser2.png" format="PNG"/>
+ <imagedata fileref="install/adduser2"/>
</imageobject>
</mediaobject>
</figure>
@@ -3949,7 +3949,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/adduser3.png" format="PNG"/>
+ <imagedata fileref="install/adduser3"/>
</imageobject>
</mediaobject>
</figure>
@@ -4018,7 +4018,7 @@ Retype new password :</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/mainexit.png" format="PNG"/>
+ <imagedata fileref="install/mainexit"/>
</imageobject>
</mediaobject>
</figure>
@@ -4099,7 +4099,7 @@ Retype new password :</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/net-config-menu1.png" format="PNG"/>
+ <imagedata fileref="install/net-config-menu1"/>
</imageobject>
</mediaobject>
</figure>
@@ -4187,7 +4187,7 @@ Retype new password :</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/mta-main.png" format="PNG"/>
+ <imagedata fileref="install/mta-main"/>
</imageobject>
</mediaobject>
</figure>
@@ -4252,7 +4252,7 @@ Retype new password :</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/ntp-config.png" format="PNG"/>
+ <imagedata fileref="install/ntp-config"/>
</imageobject>
</mediaobject>
</figure>
@@ -4280,7 +4280,7 @@ Retype new password :</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/net-config-menu2.png" format="PNG"/>
+ <imagedata fileref="install/net-config-menu2"/>
</imageobject>
</mediaobject>
</figure>
diff --git a/fr_FR.ISO8859-1/books/handbook/mail/chapter.xml b/fr_FR.ISO8859-1/books/handbook/mail/chapter.xml
index 64fe5a0109..aa2d3b96b1 100644
--- a/fr_FR.ISO8859-1/books/handbook/mail/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/mail/chapter.xml
@@ -2251,7 +2251,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/mutt1.png" format="PNG"/>
+ <imagedata fileref="mail/mutt1"/>
</imageobject>
</mediaobject>
@@ -2263,7 +2263,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/mutt2.png" format="PNG"/>
+ <imagedata fileref="mail/mutt2"/>
</imageobject>
</mediaobject>
@@ -2304,7 +2304,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/mutt3.png" format="PNG"/>
+ <imagedata fileref="mail/mutt3"/>
</imageobject>
</mediaobject>
@@ -2365,7 +2365,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine1.png" format="PNG"/>
+ <imagedata fileref="mail/pine1"/>
</imageobject>
</mediaobject>
@@ -2388,7 +2388,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine2.png" format="PNG"/>
+ <imagedata fileref="mail/pine2"/>
</imageobject>
</mediaobject>
@@ -2400,7 +2400,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine3.png" format="PNG"/>
+ <imagedata fileref="mail/pine3"/>
</imageobject>
</mediaobject>
@@ -2414,7 +2414,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine4.png" format="PNG"/>
+ <imagedata fileref="mail/pine4"/>
</imageobject>
</mediaobject>
@@ -2435,7 +2435,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine5.png" format="PNG"/>
+ <imagedata fileref="mail/pine5"/>
</imageobject>
</mediaobject>
diff --git a/fr_FR.ISO8859-1/books/handbook/vinum/chapter.xml b/fr_FR.ISO8859-1/books/handbook/vinum/chapter.xml
index b0cd599dde..d3e6bc9bdf 100644
--- a/fr_FR.ISO8859-1/books/handbook/vinum/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/vinum/chapter.xml
@@ -164,7 +164,7 @@
<para>
<figure id="vinum-concat">
<title>Organisation par concat�nation</title>
- <graphic fileref="vinum/vinum-concat.pic"/>
+ <graphic fileref="vinum/vinum-concat"/>
</figure>
</para>
@@ -216,7 +216,7 @@
<para>
<figure id="vinum-striped">
<title>Organisation segment�e</title>
- <graphic fileref="vinum/vinum-striped.pic"/>
+ <graphic fileref="vinum/vinum-striped"/>
</figure>
</para>
</sect1>
@@ -296,7 +296,7 @@
<para>
<figure id="vinum-raid5-org">
<title>Organisation RAID-5</title>
- <graphic fileref="vinum/vinum-raid5-org.pic"/>
+ <graphic fileref="vinum/vinum-raid5-org"/>
</figure>
</para>
@@ -592,7 +592,7 @@
<para>
<figure id="vinum-simple-vol">
<title>Un simple volume Vinum</title>
- <graphic fileref="vinum/vinum-simple-vol.pic"/>
+ <graphic fileref="vinum/vinum-simple-vol"/>
</figure>
</para>
@@ -664,7 +664,7 @@
<para>
<figure id="vinum-mirrored-vol">
<title>Un volume Vinum en mode miroir</title>
- <graphic fileref="vinum/vinum-mirrored-vol.pic"/>
+ <graphic fileref="vinum/vinum-mirrored-vol"/>
</figure>
</para>
@@ -733,7 +733,7 @@
<para>
<figure id="vinum-striped-vol">
<title>Un volume Vinum segment�</title>
- <graphic fileref="vinum/vinum-striped-vol.pic"/>
+ <graphic fileref="vinum/vinum-striped-vol"/>
</figure>
</para>
@@ -779,7 +779,7 @@
<para>
<figure id="vinum-raid10-vol">
<title>Un volume Vinum en mode miroir segment�</title>
- <graphic fileref="vinum/vinum-raid10-vol.pic"/>
+ <graphic fileref="vinum/vinum-raid10-vol"/>
</figure>
</para>
</sect2>
diff --git a/fr_FR.ISO8859-1/books/handbook/virtualization/chapter.xml b/fr_FR.ISO8859-1/books/handbook/virtualization/chapter.xml
index e120a995f4..bf11412fcb 100644
--- a/fr_FR.ISO8859-1/books/handbook/virtualization/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/virtualization/chapter.xml
@@ -120,7 +120,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd1.png"/>
+ <imagedata fileref="virtualization/parallels-freebsd1"/>
</imageobject>
</mediaobject>
@@ -133,25 +133,25 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd2.png"/>
+ <imagedata fileref="virtualization/parallels-freebsd2"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd3.png"/>
+ <imagedata fileref="virtualization/parallels-freebsd3"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd4.png"/>
+ <imagedata fileref="virtualization/parallels-freebsd4"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd5.png"/>
+ <imagedata fileref="virtualization/parallels-freebsd5"/>
</imageobject>
</mediaobject>
@@ -160,13 +160,13 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd6.png"/>
+ <imagedata fileref="virtualization/parallels-freebsd6"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd7.png"/>
+ <imagedata fileref="virtualization/parallels-freebsd7"/>
</imageobject>
</mediaobject>
@@ -174,13 +174,13 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd8.png"/>
+ <imagedata fileref="virtualization/parallels-freebsd8"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd9.png"/>
+ <imagedata fileref="virtualization/parallels-freebsd9"/>
</imageobject>
</mediaobject>
@@ -200,7 +200,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd11.png"/>
+ <imagedata fileref="virtualization/parallels-freebsd11"/>
</imageobject>
</mediaobject>
@@ -214,7 +214,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd10.png"/>
+ <imagedata fileref="virtualization/parallels-freebsd10"/>
</imageobject>
</mediaobject>
@@ -227,7 +227,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd12.png"/>
+ <imagedata fileref="virtualization/parallels-freebsd12"/>
</imageobject>
</mediaobject>
@@ -236,7 +236,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd13.png"/>
+ <imagedata fileref="virtualization/parallels-freebsd13"/>
</imageobject>
</mediaobject>
</sect3>
@@ -645,13 +645,13 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd1.png"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd1"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd2.png"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd2"/>
</imageobject>
</mediaobject>
@@ -661,7 +661,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd3.png"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd3"/>
</imageobject>
</mediaobject>
@@ -674,13 +674,13 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd4.png"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd4"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd5.png"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd5"/>
</imageobject>
</mediaobject>
@@ -688,7 +688,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd6.png"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd6"/>
</imageobject>
</mediaobject>
@@ -699,13 +699,13 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd7.png"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd7"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd8.png"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd8"/>
</imageobject>
</mediaobject>
@@ -728,13 +728,13 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd9.png"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd9"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd10.png"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd10"/>
</imageobject>
</mediaobject>
@@ -748,7 +748,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd11.png"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd11"/>
</imageobject>
</mediaobject>
@@ -761,7 +761,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd12.png"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd12"/>
</imageobject>
</mediaobject>
@@ -772,7 +772,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd13.png"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd13"/>
</imageobject>
</mediaobject>
</sect3>
diff --git a/hu_HU.ISO8859-2/articles/gjournal-desktop/article.xml b/hu_HU.ISO8859-2/articles/gjournal-desktop/article.xml
index 8b12a19ddb..5aba2911ae 100644
--- a/hu_HU.ISO8859-2/articles/gjournal-desktop/article.xml
+++ b/hu_HU.ISO8859-2/articles/gjournal-desktop/article.xml
@@ -366,7 +366,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="disklabel1.png"/>
+ <imagedata fileref="disklabel1"/>
</imageobject>
</mediaobject>
@@ -471,7 +471,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="disklabel2.png"/>
+ <imagedata fileref="disklabel2"/>
</imageobject>
</mediaobject>
diff --git a/hu_HU.ISO8859-2/books/fdp-primer/sgml-markup/chapter.xml b/hu_HU.ISO8859-2/books/fdp-primer/sgml-markup/chapter.xml
index b9ce86b2a7..66a5801a54 100644
--- a/hu_HU.ISO8859-2/books/fdp-primer/sgml-markup/chapter.xml
+++ b/hu_HU.ISO8859-2/books/fdp-primer/sgml-markup/chapter.xml
@@ -3015,7 +3015,7 @@ Ez lenne az 'ize2' nev
<programlisting><mediaobject>
<imageobject>
- <imagedata fileref="abra1.png"> <co id="co-image-ext"/>
+ <imagedata fileref="abra1"> <co id="co-image-ext"/>
</imageobject>
<textobject>
@@ -3149,7 +3149,7 @@ IMAGES+= abra3.png
<programlisting><mediaobject>
<imageobject>
- <imagedata fileref="fejezet1/abra1.png"> <co id="co-image-dir"/>
+ <imagedata fileref="fejezet1/abra1"> <co id="co-image-dir"/>
</imageobject>
…
diff --git a/hu_HU.ISO8859-2/books/handbook/advanced-networking/chapter.xml b/hu_HU.ISO8859-2/books/handbook/advanced-networking/chapter.xml
index e4625cdd5c..02d63e3fd2 100644
--- a/hu_HU.ISO8859-2/books/handbook/advanced-networking/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/advanced-networking/chapter.xml
@@ -380,7 +380,7 @@ host2.example.com link#1 UC 0 0
<mediaobject>
<imageobject>
- <imagedata fileref="advanced-networking/net-routing.pic"/>
+ <imagedata fileref="advanced-networking/net-routing"/>
</imageobject>
<textobject>
@@ -639,7 +639,7 @@ host2.example.com link#1 UC 0 0
<mediaobject>
<imageobject>
- <imagedata fileref="advanced-networking/static-routes.pic"/>
+ <imagedata fileref="advanced-networking/static-routes"/>
</imageobject>
<textobject>
@@ -6288,7 +6288,7 @@ cd /usr/src/etc; make distribution</programlisting>
<mediaobject>
<imageobject>
- <imagedata fileref="advanced-networking/isdn-buse.eps"/>
+ <imagedata fileref="advanced-networking/isdn-buse"/>
</imageobject>
<textobject>
@@ -6328,7 +6328,7 @@ ISDN BRI vonal</literallayout>
<mediaobject>
<imageobject>
- <imagedata fileref="advanced-networking/isdn-twisted-pair.eps"/>
+ <imagedata fileref="advanced-networking/isdn-twisted-pair"/>
</imageobject>
<textobject>
@@ -6480,7 +6480,7 @@ ISDN BRI vonal</literallayout>
<mediaobject>
<imageobject>
- <imagedata fileref="advanced-networking/natd.eps"/>
+ <imagedata fileref="advanced-networking/natd"/>
</imageobject>
<textobject>
diff --git a/hu_HU.ISO8859-2/books/handbook/basics/chapter.xml b/hu_HU.ISO8859-2/books/handbook/basics/chapter.xml
index bbfe9b9280..927e9e5e7e 100644
--- a/hu_HU.ISO8859-2/books/handbook/basics/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/basics/chapter.xml
@@ -1531,7 +1531,7 @@ drwxrwxrwt 10 root wheel 512 Aug 31 01:49 tmp</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir1.eps" format="EPS"/>
+ <imagedata fileref="install/example-dir1"/>
</imageobject>
<textobject>
@@ -1558,7 +1558,7 @@ drwxrwxrwt 10 root wheel 512 Aug 31 01:49 tmp</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir2.eps" format="EPS"/>
+ <imagedata fileref="install/example-dir2"/>
</imageobject>
<textobject>
@@ -1593,7 +1593,7 @@ drwxrwxrwt 10 root wheel 512 Aug 31 01:49 tmp</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir3.eps" format="EPS"/>
+ <imagedata fileref="install/example-dir3"/>
</imageobject>
<textobject>
@@ -1625,7 +1625,7 @@ drwxrwxrwt 10 root wheel 512 Aug 31 01:49 tmp</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir4.eps" format="EPS"/>
+ <imagedata fileref="install/example-dir4"/>
</imageobject>
<textobject>
@@ -1652,7 +1652,7 @@ drwxrwxrwt 10 root wheel 512 Aug 31 01:49 tmp</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir5.eps" format="EPS"/>
+ <imagedata fileref="install/example-dir5"/>
</imageobject>
<textobject>
@@ -2058,7 +2058,7 @@ drwxrwxrwt 10 root wheel 512 Aug 31 01:49 tmp</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/disk-layout.eps" format="EPS"/>
+ <imagedata fileref="install/disk-layout"/>
</imageobject>
<textobject>
diff --git a/hu_HU.ISO8859-2/books/handbook/geom/chapter.xml b/hu_HU.ISO8859-2/books/handbook/geom/chapter.xml
index 2ee26a3ca7..fdca1d5761 100644
--- a/hu_HU.ISO8859-2/books/handbook/geom/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/geom/chapter.xml
@@ -172,7 +172,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="geom/striping.pic" align="center"/>
+ <imagedata fileref="geom/striping" align="center"/>
</imageobject>
<textobject>
diff --git a/hu_HU.ISO8859-2/books/handbook/install/chapter.xml b/hu_HU.ISO8859-2/books/handbook/install/chapter.xml
index 13cfaeeed0..99694a019f 100644
--- a/hu_HU.ISO8859-2/books/handbook/install/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/install/chapter.xml
@@ -1320,7 +1320,7 @@ Insert disk labelled "Kernel floppy 1" and press any key...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/boot-loader-menu.png" format="PNG"/>
+ <imagedata fileref="install/boot-loader-menu"/>
</imageobject>
</mediaobject>
</figure>
@@ -1524,7 +1524,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/config-country.png" format="PNG"/>
+ <imagedata fileref="install/config-country"/>
</imageobject>
</mediaobject>
</figure>
@@ -1547,7 +1547,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/config-keymap.png" format="PNG"/>
+ <imagedata fileref="install/config-keymap"/>
</imageobject>
</mediaobject>
</figure>
@@ -1558,7 +1558,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/sysinstall-exit.png" format="PNG"/>
+ <imagedata fileref="install/sysinstall-exit"/>
</imageobject>
</mediaobject>
</figure>
@@ -1642,7 +1642,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main1.png" format="PNG"/>
+ <imagedata fileref="install/main1"/>
</imageobject>
</mediaobject>
</figure>
@@ -1662,7 +1662,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main-doc.png" format="PNG"/>
+ <imagedata fileref="install/main-doc"/>
</imageobject>
</mediaobject>
</figure>
@@ -1676,7 +1676,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/docmenu1.png" format="PNG"/>
+ <imagedata fileref="install/docmenu1"/>
</imageobject>
</mediaobject>
</figure>
@@ -1721,7 +1721,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main-keymap.png" format="PNG"/>
+ <imagedata fileref="install/main-keymap"/>
</imageobject>
</mediaobject>
</figure>
@@ -1750,7 +1750,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/keymap.png" format="PNG"/>
+ <imagedata fileref="install/keymap"/>
</imageobject>
</mediaobject>
</figure>
@@ -1771,7 +1771,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main-options.png" format="PNG"/>
+ <imagedata fileref="install/main-options"/>
</imageobject>
</mediaobject>
</figure>
@@ -1782,7 +1782,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/options.png" format="PNG"/>
+ <imagedata fileref="install/options"/>
</imageobject>
</mediaobject>
</figure>
@@ -1834,7 +1834,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main-std.png" format="PNG"/>
+ <imagedata fileref="install/main-std"/>
</imageobject>
</mediaobject>
</figure>
@@ -2108,7 +2108,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/fdisk-drive1.png" format="PNG"/>
+ <imagedata fileref="install/fdisk-drive1"/>
</imageobject>
</mediaobject>
</figure>
@@ -2209,7 +2209,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/fdisk-edit1.png" format="PNG"/>
+ <imagedata fileref="install/fdisk-edit1"/>
</imageobject>
</mediaobject>
</figure>
@@ -2280,7 +2280,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/fdisk-edit2.png" format="PNG"/>
+ <imagedata fileref="install/fdisk-edit2"/>
</imageobject>
</mediaobject>
</figure>
@@ -2342,7 +2342,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/boot-mgr.png" format="PNG"/>
+ <imagedata fileref="install/boot-mgr"/>
</imageobject>
</mediaobject>
</figure>
@@ -2384,7 +2384,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/fdisk-drive2.png" format="PNG"/>
+ <imagedata fileref="install/fdisk-drive2"/>
</imageobject>
</mediaobject>
</figure>
@@ -2717,7 +2717,7 @@ a k
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-ed1.png" format="PNG"/>
+ <imagedata fileref="install/disklabel-ed1"/>
</imageobject>
</mediaobject>
</figure>
@@ -2760,7 +2760,7 @@ a k
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-auto.png" format="PNG"/>
+ <imagedata fileref="install/disklabel-auto"/>
</imageobject>
</mediaobject>
</figure>
@@ -2797,7 +2797,7 @@ a k
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-root1.png" format="PNG"/>
+ <imagedata fileref="install/disklabel-root1"/>
</imageobject>
</mediaobject>
</figure>
@@ -2823,7 +2823,7 @@ a k
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-root2.png" format="PNG"/>
+ <imagedata fileref="install/disklabel-root2"/>
</imageobject>
</mediaobject>
</figure>
@@ -2847,7 +2847,7 @@ a k
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-fs.png" format="PNG"/>
+ <imagedata fileref="install/disklabel-fs"/>
</imageobject>
</mediaobject>
</figure>
@@ -2871,7 +2871,7 @@ a k
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-root3.png" format="PNG"/>
+ <imagedata fileref="install/disklabel-root3"/>
</imageobject>
</mediaobject>
</figure>
@@ -2906,7 +2906,7 @@ a k
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-ed2.png" format="PNG"/>
+ <imagedata fileref="install/disklabel-ed2"/>
</imageobject>
</mediaobject>
</figure>
@@ -2991,7 +2991,7 @@ a k
<mediaobject>
<imageobject>
- <imagedata fileref="install/dist-set.png" format="PNG"/>
+ <imagedata fileref="install/dist-set"/>
</imageobject>
</mediaobject>
</figure>
@@ -3085,7 +3085,7 @@ a k
<mediaobject>
<imageobject>
- <imagedata fileref="install/dist-set2.png" format="PNG"/>
+ <imagedata fileref="install/dist-set2"/>
</imageobject>
</mediaobject>
</figure>
@@ -3133,7 +3133,7 @@ a k
<mediaobject>
<imageobject>
- <imagedata fileref="install/media.png" format="PNG"/>
+ <imagedata fileref="install/media"/>
</imageobject>
</mediaobject>
</figure>
@@ -3440,7 +3440,7 @@ megpr
<mediaobject>
<imageobject>
- <imagedata fileref="install/ed0-conf.png" format="PNG"/>
+ <imagedata fileref="install/ed0-conf"/>
</imageobject>
</mediaobject>
</figure>
@@ -3517,7 +3517,7 @@ megpr
<mediaobject>
<imageobject>
- <imagedata fileref="install/ed0-conf2.png" format="PNG"/>
+ <imagedata fileref="install/ed0-conf2"/>
</imageobject>
</mediaobject>
</figure>
@@ -3793,7 +3793,7 @@ fogadjuk el.
<mediaobject>
<imageobject>
- <imagedata fileref="install/edit-inetd-conf.png" format="PNG"/>
+ <imagedata fileref="install/edit-inetd-conf"/>
</imageobject>
</mediaobject>
</figure>
@@ -3949,7 +3949,7 @@ fogadjuk el.
<mediaobject>
<imageobject>
- <imagedata fileref="install/ftp-anon1.png" format="PNG"/>
+ <imagedata fileref="install/ftp-anon1"/>
</imageobject>
</mediaobject>
</figure>
@@ -4052,7 +4052,7 @@ fogadjuk el.
<mediaobject>
<imageobject>
- <imagedata fileref="install/ftp-anon2.png" format="PNG"/>
+ <imagedata fileref="install/ftp-anon2"/>
</imageobject>
</mediaobject>
</figure>
@@ -4152,7 +4152,7 @@ szerkeszt
<mediaobject>
<imageobject>
- <imagedata fileref="install/nfs-server-edit.png" format="PNG"/>
+ <imagedata fileref="install/nfs-server-edit"/>
</imageobject>
</mediaobject>
</figure>
@@ -4234,7 +4234,7 @@ szerkeszt
<mediaobject>
<imageobject>
- <imagedata fileref="install/console-saver1.png" format="PNG"/>
+ <imagedata fileref="install/console-saver1"/>
</imageobject>
</mediaobject>
</figure>
@@ -4251,7 +4251,7 @@ szerkeszt
<mediaobject>
<imageobject>
- <imagedata fileref="install/console-saver2.png" format="PNG"/>
+ <imagedata fileref="install/console-saver2"/>
</imageobject>
</mediaobject>
</figure>
@@ -4282,7 +4282,7 @@ szerkeszt
<mediaobject>
<imageobject>
- <imagedata fileref="install/console-saver3.png" format="PNG"/>
+ <imagedata fileref="install/console-saver3"/>
</imageobject>
</mediaobject>
</figure>
@@ -4301,7 +4301,7 @@ szerkeszt
<mediaobject>
<imageobject>
- <imagedata fileref="install/console-saver4.png" format="PNG"/>
+ <imagedata fileref="install/console-saver4"/>
</imageobject>
</mediaobject>
</figure>
@@ -4377,7 +4377,7 @@ szerkeszt
<mediaobject>
<imageobject>
- <imagedata fileref="install/timezone1.png" format="PNG"/>
+ <imagedata fileref="install/timezone1"/>
</imageobject>
</mediaobject>
</figure>
@@ -4392,7 +4392,7 @@ szerkeszt
<mediaobject>
<imageobject>
- <imagedata fileref="install/timezone2.png" format="PNG"/>
+ <imagedata fileref="install/timezone2"/>
</imageobject>
</mediaobject>
</figure>
@@ -4407,7 +4407,7 @@ szerkeszt
<mediaobject>
<imageobject>
- <imagedata fileref="install/timezone3.png" format="PNG"/>
+ <imagedata fileref="install/timezone3"/>
</imageobject>
</mediaobject>
</figure>
@@ -4515,7 +4515,7 @@ szerkeszt
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse1.png" format="PNG"/>
+ <imagedata fileref="install/mouse1"/>
</imageobject>
</mediaobject>
</figure>
@@ -4531,7 +4531,7 @@ szerkeszt
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse2.png" format="PNG"/>
+ <imagedata fileref="install/mouse2"/>
</imageobject>
</mediaobject>
</figure>
@@ -4552,7 +4552,7 @@ szerkeszt
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse3.png" format="PNG"/>
+ <imagedata fileref="install/mouse3"/>
</imageobject>
</mediaobject>
</figure>
@@ -4567,7 +4567,7 @@ szerkeszt
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse4.png" format="PNG"/>
+ <imagedata fileref="install/mouse4"/>
</imageobject>
</mediaobject>
</figure>
@@ -4586,7 +4586,7 @@ szerkeszt
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse5.png" format="PNG"/>
+ <imagedata fileref="install/mouse5"/>
</imageobject>
</mediaobject>
</figure>
@@ -4603,7 +4603,7 @@ szerkeszt
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse6.png" format="PNG"/>
+ <imagedata fileref="install/mouse6"/>
</imageobject>
</mediaobject>
</figure>
@@ -4671,7 +4671,7 @@ szerkeszt
<mediaobject>
<imageobject>
- <imagedata fileref="install/pkg-cat.png" format="PNG"/>
+ <imagedata fileref="install/pkg-cat"/>
</imageobject>
</mediaobject>
</figure>
@@ -4696,7 +4696,7 @@ szerkeszt
<mediaobject>
<imageobject>
- <imagedata fileref="install/pkg-sel.png" format="PNG"/>
+ <imagedata fileref="install/pkg-sel"/>
</imageobject>
</mediaobject>
</figure>
@@ -4737,7 +4737,7 @@ szerkeszt
<mediaobject>
<imageobject>
- <imagedata fileref="install/pkg-install.png" format="PNG"/>
+ <imagedata fileref="install/pkg-install"/>
</imageobject>
</mediaobject>
</figure>
@@ -4756,7 +4756,7 @@ szerkeszt
<mediaobject>
<imageobject>
- <imagedata fileref="install/pkg-confirm.png" format="PNG"/>
+ <imagedata fileref="install/pkg-confirm"/>
</imageobject>
</mediaobject>
</figure>
@@ -4823,7 +4823,7 @@ szerkeszt
<mediaobject>
<imageobject>
- <imagedata fileref="install/adduser1.png" format="PNG"/>
+ <imagedata fileref="install/adduser1"/>
</imageobject>
</mediaobject>
</figure>
@@ -4839,7 +4839,7 @@ szerkeszt
<mediaobject>
<imageobject>
- <imagedata fileref="install/adduser2.png" format="PNG"/>
+ <imagedata fileref="install/adduser2"/>
</imageobject>
</mediaobject>
</figure>
@@ -4971,7 +4971,7 @@ szerkeszt
<mediaobject>
<imageobject>
- <imagedata fileref="install/adduser3.png" format="PNG"/>
+ <imagedata fileref="install/adduser3"/>
</imageobject>
</mediaobject>
</figure>
@@ -5073,7 +5073,7 @@ Retype new password :</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/mainexit.png" format="PNG"/>
+ <imagedata fileref="install/mainexit"/>
</imageobject>
</mediaobject>
</figure>
@@ -5195,7 +5195,7 @@ Retype new password :</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/net-config-menu1.png" format="PNG"/>
+ <imagedata fileref="install/net-config-menu1"/>
</imageobject>
</mediaobject>
</figure>
@@ -5300,7 +5300,7 @@ Retype new password :</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/mta-main.png" format="PNG"/>
+ <imagedata fileref="install/mta-main"/>
</imageobject>
</mediaobject>
</figure>
@@ -5385,7 +5385,7 @@ Retype new password :</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/ntp-config.png" format="PNG"/>
+ <imagedata fileref="install/ntp-config"/>
</imageobject>
</mediaobject>
</figure>
@@ -5421,7 +5421,7 @@ Retype new password :</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/net-config-menu2.png" format="PNG"/>
+ <imagedata fileref="install/net-config-menu2"/>
</imageobject>
</mediaobject>
</figure>
diff --git a/hu_HU.ISO8859-2/books/handbook/mail/chapter.xml b/hu_HU.ISO8859-2/books/handbook/mail/chapter.xml
index a6eef1b19a..d616070a3a 100644
--- a/hu_HU.ISO8859-2/books/handbook/mail/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/mail/chapter.xml
@@ -2571,7 +2571,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/mutt1.png" format="PNG"/>
+ <imagedata fileref="mail/mutt1"/>
</imageobject>
</mediaobject>
@@ -2583,7 +2583,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/mutt2.png" format="PNG"/>
+ <imagedata fileref="mail/mutt2"/>
</imageobject>
</mediaobject>
@@ -2634,7 +2634,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/mutt3.png" format="PNG"/>
+ <imagedata fileref="mail/mutt3"/>
</imageobject>
</mediaobject>
@@ -2702,7 +2702,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine1.png" format="PNG"/>
+ <imagedata fileref="mail/pine1"/>
</imageobject>
</mediaobject>
@@ -2729,7 +2729,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine2.png" format="PNG"/>
+ <imagedata fileref="mail/pine2"/>
</imageobject>
</mediaobject>
@@ -2742,7 +2742,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine3.png" format="PNG"/>
+ <imagedata fileref="mail/pine3"/>
</imageobject>
</mediaobject>
@@ -2758,7 +2758,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine4.png" format="PNG"/>
+ <imagedata fileref="mail/pine4"/>
</imageobject>
</mediaobject>
@@ -2779,7 +2779,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine5.png" format="PNG"/>
+ <imagedata fileref="mail/pine5"/>
</imageobject>
</mediaobject>
diff --git a/hu_HU.ISO8859-2/books/handbook/vinum/chapter.xml b/hu_HU.ISO8859-2/books/handbook/vinum/chapter.xml
index cea8a6efb8..032905b69e 100644
--- a/hu_HU.ISO8859-2/books/handbook/vinum/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/vinum/chapter.xml
@@ -245,7 +245,7 @@
<figure id="vinum-concat">
<title>Az �sszef�z�tt szervez�si
m�d</title>
- <graphic fileref="vinum/vinum-concat.pic"/>
+ <graphic fileref="vinum/vinum-concat"/>
</figure>
</para>
@@ -290,7 +290,7 @@
<para>
<figure id="vinum-striped">
<title>A cs�kozott szervez�si m�d</title>
- <graphic fileref="vinum/vinum-striped.pic"/>
+ <graphic fileref="vinum/vinum-striped"/>
</figure>
</para>
@@ -387,7 +387,7 @@
<para>
<figure id="vinum-raid5-org">
<title>A RAID-5 szervez�si m�d</title>
- <graphic fileref="vinum/vinum-raid5-org.pic"/>
+ <graphic fileref="vinum/vinum-raid5-org"/>
</figure>
</para>
@@ -755,7 +755,7 @@
<para>
<figure id="vinum-simple-vol">
<title>Egyszer� Vinum-k�tet</title>
- <graphic fileref="vinum/vinum-simple-vol.pic"/>
+ <graphic fileref="vinum/vinum-simple-vol"/>
</figure>
</para>
@@ -835,7 +835,7 @@
<para>
<figure id="vinum-mirrored-vol">
<title>T�kr�z�tt Vinum-k�tet</title>
- <graphic fileref="vinum/vinum-mirrored-vol.pic"/>
+ <graphic fileref="vinum/vinum-mirrored-vol"/>
</figure>
</para>
@@ -915,7 +915,7 @@
<para>
<figure id="vinum-striped-vol">
<title>Cs�kozott Vinum-k�tet</title>
- <graphic fileref="vinum/vinum-striped-vol.pic"/>
+ <graphic fileref="vinum/vinum-striped-vol"/>
</figure>
</para>
@@ -969,7 +969,7 @@
<figure id="vinum-raid10-vol">
<title>T�kr�z�tt, cs�kozott
Vinum-k�tet</title>
- <graphic fileref="vinum/vinum-raid10-vol.pic"/>
+ <graphic fileref="vinum/vinum-raid10-vol"/>
</figure>
</para>
diff --git a/hu_HU.ISO8859-2/books/handbook/virtualization/chapter.xml b/hu_HU.ISO8859-2/books/handbook/virtualization/chapter.xml
index 99208ff90b..c299662d14 100644
--- a/hu_HU.ISO8859-2/books/handbook/virtualization/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/virtualization/chapter.xml
@@ -135,7 +135,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd1.png"/>
+ <imagedata fileref="virtualization/parallels-freebsd1"/>
</imageobject>
</mediaobject>
@@ -152,25 +152,25 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd2.png"/>
+ <imagedata fileref="virtualization/parallels-freebsd2"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd3.png"/>
+ <imagedata fileref="virtualization/parallels-freebsd3"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd4.png"/>
+ <imagedata fileref="virtualization/parallels-freebsd4"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd5.png"/>
+ <imagedata fileref="virtualization/parallels-freebsd5"/>
</imageobject>
</mediaobject>
@@ -180,13 +180,13 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd6.png"/>
+ <imagedata fileref="virtualization/parallels-freebsd6"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd7.png"/>
+ <imagedata fileref="virtualization/parallels-freebsd7"/>
</imageobject>
</mediaobject>
@@ -195,13 +195,13 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd8.png"/>
+ <imagedata fileref="virtualization/parallels-freebsd8"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd9.png"/>
+ <imagedata fileref="virtualization/parallels-freebsd9"/>
</imageobject>
</mediaobject>
@@ -227,7 +227,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd11.png"/>
+ <imagedata fileref="virtualization/parallels-freebsd11"/>
</imageobject>
</mediaobject>
@@ -239,7 +239,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd10.png"/>
+ <imagedata fileref="virtualization/parallels-freebsd10"/>
</imageobject>
</mediaobject>
@@ -255,7 +255,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd12.png"/>
+ <imagedata fileref="virtualization/parallels-freebsd12"/>
</imageobject>
</mediaobject>
@@ -266,7 +266,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd13.png"/>
+ <imagedata fileref="virtualization/parallels-freebsd13"/>
</imageobject>
</mediaobject>
</sect3>
@@ -713,13 +713,13 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd1.png"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd1"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd2.png"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd2"/>
</imageobject>
</mediaobject>
@@ -731,7 +731,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd3.png"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd3"/>
</imageobject>
</mediaobject>
@@ -747,13 +747,13 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd4.png"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd4"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd5.png"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd5"/>
</imageobject>
</mediaobject>
@@ -762,7 +762,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd6.png"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd6"/>
</imageobject>
</mediaobject>
@@ -776,13 +776,13 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd7.png"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd7"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd8.png"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd8"/>
</imageobject>
</mediaobject>
@@ -812,13 +812,13 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd9.png"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd9"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd10.png"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd10"/>
</imageobject>
</mediaobject>
@@ -838,7 +838,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd11.png"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd11"/>
</imageobject>
</mediaobject>
@@ -854,7 +854,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd12.png"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd12"/>
</imageobject>
</mediaobject>
@@ -868,7 +868,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd13.png"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd13"/>
</imageobject>
</mediaobject>
</sect3>
@@ -984,7 +984,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd01.png"/>
+ <imagedata fileref="virtualization/vmware-freebsd01"/>
</imageobject>
</mediaobject>
@@ -996,7 +996,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd02.png"/>
+ <imagedata fileref="virtualization/vmware-freebsd02"/>
</imageobject>
</mediaobject>
@@ -1013,7 +1013,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd03.png"/>
+ <imagedata fileref="virtualization/vmware-freebsd03"/>
</imageobject>
</mediaobject>
@@ -1023,7 +1023,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd04.png"/>
+ <imagedata fileref="virtualization/vmware-freebsd04"/>
</imageobject>
</mediaobject>
@@ -1033,7 +1033,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd05.png"/>
+ <imagedata fileref="virtualization/vmware-freebsd05"/>
</imageobject>
</mediaobject>
@@ -1044,7 +1044,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd06.png"/>
+ <imagedata fileref="virtualization/vmware-freebsd06"/>
</imageobject>
</mediaobject>
@@ -1053,7 +1053,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd07.png"/>
+ <imagedata fileref="virtualization/vmware-freebsd07"/>
</imageobject>
</mediaobject>
@@ -1063,7 +1063,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd08.png"/>
+ <imagedata fileref="virtualization/vmware-freebsd08"/>
</imageobject>
</mediaobject>
@@ -1081,7 +1081,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd09.png"/>
+ <imagedata fileref="virtualization/vmware-freebsd09"/>
</imageobject>
</mediaobject>
@@ -1091,7 +1091,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd10.png"/>
+ <imagedata fileref="virtualization/vmware-freebsd10"/>
</imageobject>
</mediaobject>
@@ -1103,7 +1103,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd11.png"/>
+ <imagedata fileref="virtualization/vmware-freebsd11"/>
</imageobject>
</mediaobject>
@@ -1124,7 +1124,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd12.png"/>
+ <imagedata fileref="virtualization/vmware-freebsd12"/>
</imageobject>
</mediaobject>
diff --git a/it_IT.ISO8859-15/articles/vm-design/article.xml b/it_IT.ISO8859-15/articles/vm-design/article.xml
index ba8e4456d4..aaccaa4e5d 100644
--- a/it_IT.ISO8859-15/articles/vm-design/article.xml
+++ b/it_IT.ISO8859-15/articles/vm-design/article.xml
@@ -231,7 +231,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="fig1.eps" format="EPS"/>
+ <imagedata fileref="fig1"/>
</imageobject>
<textobject>
@@ -257,7 +257,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="fig2.eps" format="EPS"/>
+ <imagedata fileref="fig2"/>
</imageobject>
<textobject>
@@ -278,7 +278,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="fig3.eps" format="EPS"/>
+ <imagedata fileref="fig3"/>
</imageobject>
<textobject>
@@ -313,7 +313,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="fig4.eps" format="EPS"/>
+ <imagedata fileref="fig4"/>
</imageobject>
<textobject>
diff --git a/it_IT.ISO8859-15/books/handbook/basics/chapter.xml b/it_IT.ISO8859-15/books/handbook/basics/chapter.xml
index 67a83ce3f4..1058ad1fb6 100644
--- a/it_IT.ISO8859-15/books/handbook/basics/chapter.xml
+++ b/it_IT.ISO8859-15/books/handbook/basics/chapter.xml
@@ -1134,7 +1134,7 @@ total 530
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir1.eps" format="EPS"/>
+ <imagedata fileref="install/example-dir1"/>
</imageobject>
<textobject>
@@ -1154,7 +1154,7 @@ total 530
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir2.eps" format="EPS"/>
+ <imagedata fileref="install/example-dir2"/>
</imageobject>
<textobject>
@@ -1183,7 +1183,7 @@ total 530
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir3.eps" format="EPS"/>
+ <imagedata fileref="install/example-dir3"/>
</imageobject>
<textobject>
@@ -1210,7 +1210,7 @@ total 530
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir4.eps" format="EPS"/>
+ <imagedata fileref="install/example-dir4"/>
</imageobject>
<textobject>
@@ -1236,7 +1236,7 @@ total 530
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir5.eps" format="EPS"/>
+ <imagedata fileref="install/example-dir5"/>
</imageobject>
<textobject>
@@ -1556,7 +1556,7 @@ total 530
<mediaobject>
<imageobject>
- <imagedata fileref="install/disk-layout.eps" format="EPS"/>
+ <imagedata fileref="install/disk-layout"/>
</imageobject>
<textobject>
diff --git a/it_IT.ISO8859-15/books/handbook/geom/chapter.xml b/it_IT.ISO8859-15/books/handbook/geom/chapter.xml
index 3ac563d168..c01e0fb637 100644
--- a/it_IT.ISO8859-15/books/handbook/geom/chapter.xml
+++ b/it_IT.ISO8859-15/books/handbook/geom/chapter.xml
@@ -146,7 +146,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="geom/striping.pic" align="center"/>
+ <imagedata fileref="geom/striping" align="center"/>
</imageobject>
<textobject>
diff --git a/it_IT.ISO8859-15/books/handbook/install/chapter.xml b/it_IT.ISO8859-15/books/handbook/install/chapter.xml
index f708d59b4b..1f8ad96141 100644
--- a/it_IT.ISO8859-15/books/handbook/install/chapter.xml
+++ b/it_IT.ISO8859-15/books/handbook/install/chapter.xml
@@ -1022,7 +1022,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/sysinstall-exit.png" format="PNG"/>
+ <imagedata fileref="install/sysinstall-exit"/>
</imageobject>
</mediaobject>
</figure>
@@ -1077,7 +1077,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main1.png" format="PNG"/>
+ <imagedata fileref="install/main1"/>
</imageobject>
</mediaobject>
</figure>
@@ -1093,7 +1093,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main-doc.png" format="PNG"/>
+ <imagedata fileref="install/main-doc"/>
</imageobject>
</mediaobject>
</figure>
@@ -1105,7 +1105,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/docmenu1.png" format="PNG"/>
+ <imagedata fileref="install/docmenu1"/>
</imageobject>
</mediaobject>
</figure>
@@ -1135,7 +1135,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main-keymap.png" format="PNG"/>
+ <imagedata fileref="install/main-keymap"/>
</imageobject>
</mediaobject>
</figure>
@@ -1156,7 +1156,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/keymap.png" format="PNG"/>
+ <imagedata fileref="install/keymap"/>
</imageobject>
</mediaobject>
</figure>
@@ -1173,7 +1173,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main-options.png" format="PNG"/>
+ <imagedata fileref="install/main-options"/>
</imageobject>
</mediaobject>
</figure>
@@ -1183,7 +1183,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/options.png" format="PNG"/>
+ <imagedata fileref="install/options"/>
</imageobject>
</mediaobject>
</figure>
@@ -1217,7 +1217,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main-std.png" format="PNG"/>
+ <imagedata fileref="install/main-std"/>
</imageobject>
</mediaobject>
</figure>
@@ -1400,7 +1400,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/fdisk-drive1.png" format="PNG"/>
+ <imagedata fileref="install/fdisk-drive1"/>
</imageobject>
</mediaobject>
</figure>
@@ -1470,7 +1470,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/fdisk-edit1.png" format="PNG"/>
+ <imagedata fileref="install/fdisk-edit1"/>
</imageobject>
</mediaobject>
</figure>
@@ -1514,7 +1514,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/fdisk-edit2.png" format="PNG"/>
+ <imagedata fileref="install/fdisk-edit2"/>
</imageobject>
</mediaobject>
</figure>
@@ -1556,7 +1556,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/boot-mgr.png" format="PNG"/>
+ <imagedata fileref="install/boot-mgr"/>
</imageobject>
</mediaobject>
</figure>
@@ -1587,7 +1587,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/fdisk-drive2.png" format="PNG"/>
+ <imagedata fileref="install/fdisk-drive2"/>
</imageobject>
</mediaobject>
</figure>
@@ -1830,7 +1830,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-ed1.png" format="PNG"/>
+ <imagedata fileref="install/disklabel-ed1"/>
</imageobject>
</mediaobject>
</figure>
@@ -1858,7 +1858,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-auto.png" format="PNG"/>
+ <imagedata fileref="install/disklabel-auto"/>
</imageobject>
</mediaobject>
</figure>
@@ -1897,7 +1897,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-root1.png" format="PNG"/>
+ <imagedata fileref="install/disklabel-root1"/>
</imageobject>
</mediaobject>
</figure>
@@ -1915,7 +1915,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-root2.png" format="PNG"/>
+ <imagedata fileref="install/disklabel-root2"/>
</imageobject>
</mediaobject>
</figure>
@@ -1932,7 +1932,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-fs.png" format="PNG"/>
+ <imagedata fileref="install/disklabel-fs"/>
</imageobject>
</mediaobject>
</figure>
@@ -1949,7 +1949,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-root3.png" format="PNG"/>
+ <imagedata fileref="install/disklabel-root3"/>
</imageobject>
</mediaobject>
</figure>
@@ -1972,7 +1972,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-ed2.png" format="PNG"/>
+ <imagedata fileref="install/disklabel-ed2"/>
</imageobject>
</mediaobject>
</figure>
@@ -2033,7 +2033,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/dist-set.png" format="PNG"/>
+ <imagedata fileref="install/dist-set"/>
</imageobject>
</mediaobject>
</figure>
@@ -2089,7 +2089,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/dist-set2.png" format="PNG"/>
+ <imagedata fileref="install/dist-set2"/>
</imageobject>
</mediaobject>
</figure>
@@ -2121,7 +2121,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/media.png" format="PNG"/>
+ <imagedata fileref="install/media"/>
</imageobject>
</mediaobject>
</figure>
@@ -2313,7 +2313,7 @@ installation menus to retry whichever operations have failed.
<mediaobject>
<imageobject>
- <imagedata fileref="install/ed0-conf.png" format="PNG"/>
+ <imagedata fileref="install/ed0-conf"/>
</imageobject>
</mediaobject>
</figure>
@@ -2360,7 +2360,7 @@ installation menus to retry whichever operations have failed.
<mediaobject>
<imageobject>
- <imagedata fileref="install/ed0-conf2.png" format="PNG"/>
+ <imagedata fileref="install/ed0-conf2"/>
</imageobject>
</mediaobject>
</figure>
@@ -2534,7 +2534,7 @@ use the current settings.
<mediaobject>
<imageobject>
- <imagedata fileref="install/edit-inetd-conf.png" format="PNG"/>
+ <imagedata fileref="install/edit-inetd-conf"/>
</imageobject>
</mediaobject>
</figure>
@@ -2584,7 +2584,7 @@ use the current settings.
<mediaobject>
<imageobject>
- <imagedata fileref="install/ftp-anon1.png" format="PNG"/>
+ <imagedata fileref="install/ftp-anon1"/>
</imageobject>
</mediaobject>
</figure>
@@ -2634,7 +2634,7 @@ Upload subdirectory:
<mediaobject>
<imageobject>
- <imagedata fileref="install/ftp-anon2.png" format="PNG"/>
+ <imagedata fileref="install/ftp-anon2"/>
</imageobject>
</mediaobject>
</figure>
@@ -2692,7 +2692,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/nfs-server-edit.png" format="PNG"/>
+ <imagedata fileref="install/nfs-server-edit"/>
</imageobject>
</mediaobject>
</figure>
@@ -2839,7 +2839,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/security.png" format="PNG"/>
+ <imagedata fileref="install/security"/>
</imageobject>
</mediaobject>
</figure>
@@ -2918,7 +2918,7 @@ To change any of these settings later, edit /etc/rc.conf
<mediaobject>
<imageobject>
- <imagedata fileref="install/console-saver1.png" format="PNG"/>
+ <imagedata fileref="install/console-saver1"/>
</imageobject>
</mediaobject>
</figure>
@@ -2933,7 +2933,7 @@ To change any of these settings later, edit /etc/rc.conf
<mediaobject>
<imageobject>
- <imagedata fileref="install/console-saver2.png" format="PNG"/>
+ <imagedata fileref="install/console-saver2"/>
</imageobject>
</mediaobject>
</figure>
@@ -2954,7 +2954,7 @@ To change any of these settings later, edit /etc/rc.conf
<mediaobject>
<imageobject>
- <imagedata fileref="install/console-saver3.png" format="PNG"/>
+ <imagedata fileref="install/console-saver3"/>
</imageobject>
</mediaobject>
</figure>
@@ -2968,7 +2968,7 @@ To change any of these settings later, edit /etc/rc.conf
<mediaobject>
<imageobject>
- <imagedata fileref="install/console-saver4.png" format="PNG"/>
+ <imagedata fileref="install/console-saver4"/>
</imageobject>
</mediaobject>
</figure>
@@ -3013,7 +3013,7 @@ To change any of these settings later, edit /etc/rc.conf
<mediaobject>
<imageobject>
- <imagedata fileref="install/timezone1.png" format="PNG"/>
+ <imagedata fileref="install/timezone1"/>
</imageobject>
</mediaobject>
</figure>
@@ -3026,7 +3026,7 @@ To change any of these settings later, edit /etc/rc.conf
<mediaobject>
<imageobject>
- <imagedata fileref="install/timezone2.png" format="PNG"/>
+ <imagedata fileref="install/timezone2"/>
</imageobject>
</mediaobject>
</figure>
@@ -3039,7 +3039,7 @@ To change any of these settings later, edit /etc/rc.conf
<mediaobject>
<imageobject>
- <imagedata fileref="install/timezone3.png" format="PNG"/>
+ <imagedata fileref="install/timezone3"/>
</imageobject>
</mediaobject>
</figure>
@@ -3098,7 +3098,7 @@ To change any of these settings later, edit /etc/rc.conf
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse1.png" format="PNG"/>
+ <imagedata fileref="install/mouse1"/>
</imageobject>
</mediaobject>
</figure>
@@ -3111,7 +3111,7 @@ To change any of these settings later, edit /etc/rc.conf
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse2.png" format="PNG"/>
+ <imagedata fileref="install/mouse2"/>
</imageobject>
</mediaobject>
</figure>
@@ -3127,7 +3127,7 @@ To change any of these settings later, edit /etc/rc.conf
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse3.png" format="PNG"/>
+ <imagedata fileref="install/mouse3"/>
</imageobject>
</mediaobject>
</figure>
@@ -3140,7 +3140,7 @@ To change any of these settings later, edit /etc/rc.conf
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse4.png" format="PNG"/>
+ <imagedata fileref="install/mouse4"/>
</imageobject>
</mediaobject>
</figure>
@@ -3155,7 +3155,7 @@ To change any of these settings later, edit /etc/rc.conf
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse5.png" format="PNG"/>
+ <imagedata fileref="install/mouse5"/>
</imageobject>
</mediaobject>
</figure>
@@ -3169,7 +3169,7 @@ To change any of these settings later, edit /etc/rc.conf
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse6.png" format="PNG"/>
+ <imagedata fileref="install/mouse6"/>
</imageobject>
</mediaobject>
</figure>
@@ -3230,7 +3230,7 @@ To change any of these settings later, edit /etc/rc.conf
<mediaobject>
<imageobject>
- <imagedata fileref="install/net-config-menu1.png" format="PNG"/>
+ <imagedata fileref="install/net-config-menu1"/>
</imageobject>
</mediaobject>
</figure>
@@ -3302,7 +3302,7 @@ To change any of these settings later, edit /etc/rc.conf
<mediaobject>
<imageobject>
- <imagedata fileref="install/mta-main.png" format="PNG"/>
+ <imagedata fileref="install/mta-main"/>
</imageobject>
</mediaobject>
</figure>
@@ -3356,7 +3356,7 @@ To change any of these settings later, edit /etc/rc.conf
<mediaobject>
<imageobject>
- <imagedata fileref="install/ntp-config.png" format="PNG"/>
+ <imagedata fileref="install/ntp-config"/>
</imageobject>
</mediaobject>
</figure>
@@ -3383,7 +3383,7 @@ To change any of these settings later, edit /etc/rc.conf
<mediaobject>
<imageobject>
- <imagedata fileref="install/net-config-menu2.png" format="PNG"/>
+ <imagedata fileref="install/net-config-menu2"/>
</imageobject>
</mediaobject>
</figure>
@@ -3513,7 +3513,7 @@ To change any of these settings later, edit /etc/rc.conf
<mediaobject>
<imageobject>
- <imagedata fileref="install/xf86setup.png" format="PNG"/>
+ <imagedata fileref="install/xf86setup"/>
</imageobject>
</mediaobject>
</figure>
@@ -4035,7 +4035,7 @@ failed. Would you like to try again?
<mediaobject>
<imageobject>
- <imagedata fileref="install/desktop.png" format="PNG"/>
+ <imagedata fileref="install/desktop"/>
</imageobject>
</mediaobject>
</figure>
@@ -4073,7 +4073,7 @@ failed. Would you like to try again?
<mediaobject>
<imageobject>
- <imagedata fileref="install/pkg-cat.png" format="PNG"/>
+ <imagedata fileref="install/pkg-cat"/>
</imageobject>
</mediaobject>
</figure>
@@ -4095,7 +4095,7 @@ failed. Would you like to try again?
<mediaobject>
<imageobject>
- <imagedata fileref="install/pkg-sel.png" format="PNG"/>
+ <imagedata fileref="install/pkg-sel"/>
</imageobject>
</mediaobject>
</figure>
@@ -4123,7 +4123,7 @@ failed. Would you like to try again?
<mediaobject>
<imageobject>
- <imagedata fileref="install/pkg-install.png" format="PNG"/>
+ <imagedata fileref="install/pkg-install"/>
</imageobject>
</mediaobject>
</figure>
@@ -4138,7 +4138,7 @@ failed. Would you like to try again?
<mediaobject>
<imageobject>
- <imagedata fileref="install/pkg-confirm.png" format="PNG"/>
+ <imagedata fileref="install/pkg-confirm"/>
</imageobject>
</mediaobject>
</figure>
@@ -4180,7 +4180,7 @@ failed. Would you like to try again?
<mediaobject>
<imageobject>
- <imagedata fileref="install/adduser1.png" format="PNG"/>
+ <imagedata fileref="install/adduser1"/>
</imageobject>
</mediaobject>
</figure>
@@ -4193,7 +4193,7 @@ failed. Would you like to try again?
<mediaobject>
<imageobject>
- <imagedata fileref="install/adduser2.png" format="PNG"/>
+ <imagedata fileref="install/adduser2"/>
</imageobject>
</mediaobject>
</figure>
@@ -4297,7 +4297,7 @@ failed. Would you like to try again?
<mediaobject>
<imageobject>
- <imagedata fileref="install/adduser3.png" format="PNG"/>
+ <imagedata fileref="install/adduser3"/>
</imageobject>
</mediaobject>
</figure>
@@ -4364,7 +4364,7 @@ Retype new password :</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/mainexit.png" format="PNG"/>
+ <imagedata fileref="install/mainexit"/>
</imageobject>
</mediaobject>
</figure>
diff --git a/it_IT.ISO8859-15/books/handbook/mail/chapter.xml b/it_IT.ISO8859-15/books/handbook/mail/chapter.xml
index 34100bda3c..c82eea6e8a 100644
--- a/it_IT.ISO8859-15/books/handbook/mail/chapter.xml
+++ b/it_IT.ISO8859-15/books/handbook/mail/chapter.xml
@@ -2017,7 +2017,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/mutt1.png" format="PNG"/>
+ <imagedata fileref="mail/mutt1"/>
</imageobject>
</mediaobject>
@@ -2027,7 +2027,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/mutt2.png" format="PNG"/>
+ <imagedata fileref="mail/mutt2"/>
</imageobject>
</mediaobject>
@@ -2063,7 +2063,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/mutt3.png" format="PNG"/>
+ <imagedata fileref="mail/mutt3"/>
</imageobject>
</mediaobject>
@@ -2114,7 +2114,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine1.png" format="PNG"/>
+ <imagedata fileref="mail/pine1"/>
</imageobject>
</mediaobject>
@@ -2134,7 +2134,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine2.png" format="PNG"/>
+ <imagedata fileref="mail/pine2"/>
</imageobject>
</mediaobject>
@@ -2145,7 +2145,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine3.png" format="PNG"/>
+ <imagedata fileref="mail/pine3"/>
</imageobject>
</mediaobject>
@@ -2158,7 +2158,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine4.png" format="PNG"/>
+ <imagedata fileref="mail/pine4"/>
</imageobject>
</mediaobject>
@@ -2175,7 +2175,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine5.png" format="PNG"/>
+ <imagedata fileref="mail/pine5"/>
</imageobject>
</mediaobject>
diff --git a/it_IT.ISO8859-15/books/handbook/vinum/chapter.xml b/it_IT.ISO8859-15/books/handbook/vinum/chapter.xml
index 1b9e317a42..333e299d01 100644
--- a/it_IT.ISO8859-15/books/handbook/vinum/chapter.xml
+++ b/it_IT.ISO8859-15/books/handbook/vinum/chapter.xml
@@ -159,7 +159,7 @@
<figure id="vinum-concat">
<title>Organizzazione Concatenata</title>
- <graphic fileref="vinum/vinum-concat.pic"/>
+ <graphic fileref="vinum/vinum-concat"/>
</figure>
</para>
@@ -203,7 +203,7 @@
<figure id="vinum-striped">
<title>Organizzazione in Striping</title>
- <graphic fileref="vinum/vinum-striped.pic"/>
+ <graphic fileref="vinum/vinum-striped"/>
</figure>
</para>
</sect1>
@@ -278,7 +278,7 @@
<figure id="vinum-raid5-org">
<title>Organizzazione RAID-5</title>
- <graphic fileref="vinum/vinum-raid5-org.pic"/>
+ <graphic fileref="vinum/vinum-raid5-org"/>
</figure>
</para>
@@ -569,7 +569,7 @@
<figure id="vinum-simple-vol">
<title>Un Semplice Volume Vinum</title>
- <graphic fileref="vinum/vinum-simple-vol.pic"/>
+ <graphic fileref="vinum/vinum-simple-vol"/>
</figure>
</para>
@@ -635,7 +635,7 @@
<figure id="vinum-mirrored-vol">
<title>Un Volume Vinum in Mirroring</title>
- <graphic fileref="vinum/vinum-mirrored-vol.pic"/>
+ <graphic fileref="vinum/vinum-mirrored-vol"/>
</figure>
</para>
@@ -701,7 +701,7 @@
<figure id="vinum-striped-vol">
<title>Un Volume Vinum in Striping</title>
- <graphic fileref="vinum/vinum-striped-vol.pic"/>
+ <graphic fileref="vinum/vinum-striped-vol"/>
</figure>
</para>
@@ -746,7 +746,7 @@
<figure id="vinum-raid10-vol">
<title>Un Volume Vinum in Mirroring e Striping</title>
- <graphic fileref="vinum/vinum-raid10-vol.pic"/>
+ <graphic fileref="vinum/vinum-raid10-vol"/>
</figure>
</para>
</sect2>
diff --git a/ja_JP.eucJP/books/design-44bsd/book.xml b/ja_JP.eucJP/books/design-44bsd/book.xml
index c9ff75195d..c383b96f9e 100644
--- a/ja_JP.eucJP/books/design-44bsd/book.xml
+++ b/ja_JP.eucJP/books/design-44bsd/book.xml
@@ -637,7 +637,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="fig1.eps" format="EPS"/>
+ <imagedata fileref="fig1"/>
</imageobject>
<textobject>
@@ -1440,7 +1440,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="fig2.eps" format="EPS"/>
+ <imagedata fileref="fig2"/>
</imageobject>
<textobject>
diff --git a/ja_JP.eucJP/books/handbook/advanced-networking/chapter.xml b/ja_JP.eucJP/books/handbook/advanced-networking/chapter.xml
index 1a73933ece..38b4dfd103 100644
--- a/ja_JP.eucJP/books/handbook/advanced-networking/chapter.xml
+++ b/ja_JP.eucJP/books/handbook/advanced-networking/chapter.xml
@@ -307,7 +307,7 @@ host2.example.com link#1 UC 0 0
<mediaobject>
<imageobject>
- <imagedata fileref="advanced-networking/net-routing.pic"/>
+ <imagedata fileref="advanced-networking/net-routing"/>
</imageobject>
<textobject>
@@ -3199,7 +3199,7 @@ Exports list on foobar:
<mediaobject>
<imageobject>
- <imagedata fileref="advanced-networking/isdn-bus.eps"/>
+ <imagedata fileref="advanced-networking/isdn-bus"/>
</imageobject>
<textobject>
@@ -3233,7 +3233,7 @@ ISDN BRI
<mediaobject>
<imageobject>
- <imagedata fileref="advanced-networking/isdn-twisted-pair.eps"/>
+ <imagedata fileref="advanced-networking/isdn-twisted-pair"/>
</imageobject>
<textobject>
<literallayout class="monospaced"> -------Novell ������
@@ -6421,7 +6421,7 @@ driftfile /var/db/ntp.drift</programlisting>
<mediaobject>
<imageobject>
- <imagedata fileref="advanced-networking/natd.eps"/>
+ <imagedata fileref="advanced-networking/natd"/>
</imageobject>
<textobject>
diff --git a/ja_JP.eucJP/books/handbook/bsdinstall/chapter.xml b/ja_JP.eucJP/books/handbook/bsdinstall/chapter.xml
index 563b9757ad..1918e673c9 100644
--- a/ja_JP.eucJP/books/handbook/bsdinstall/chapter.xml
+++ b/ja_JP.eucJP/books/handbook/bsdinstall/chapter.xml
@@ -671,7 +671,7 @@ Loading /boot/defaults/loader.conf
<title>&os; �֡��ȥ�������˥塼</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-boot-loader-menu.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-boot-loader-menu"/>
</imageobject>
</mediaobject>
</figure>
@@ -955,7 +955,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>���ȡ����ǥ���������⡼��</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-choose-mode.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-choose-mode"/>
</imageobject>
</mediaobject>
</figure>
@@ -996,7 +996,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>�����ޥåפ�����</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-keymap-select-default.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-keymap-select-default"/>
</imageobject>
</mediaobject>
</figure>
@@ -1010,7 +1010,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>�����ܡ��ɥ�˥塼������</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-config-keymap.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-config-keymap"/>
</imageobject>
</mediaobject>
</figure>
@@ -1037,7 +1037,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>�ۥ���̾������</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-config-hostname.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-config-hostname"/>
</imageobject>
</mediaobject>
</figure>
@@ -1057,7 +1057,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>���ȡ��뤹�륳��ݡ��ͥ�Ȥ�����</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-config-components.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-config-components"/>
</imageobject>
</mediaobject>
</figure>
@@ -1146,7 +1146,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-netinstall-files.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-netinstall-files"/>
</imageobject>
</mediaobject>
</figure>
@@ -1163,7 +1163,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-netinstall-mirrorselect.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-netinstall-mirrorselect"/>
</imageobject>
</mediaobject>
</figure>
@@ -1188,7 +1188,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-part-guided-manual.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-part-guided-manual"/>
</imageobject>
</mediaobject>
</figure>
@@ -1203,7 +1203,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>ʣ���Υǥ�������������</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-part-guided-disk.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-part-guided-disk"/>
</imageobject>
</mediaobject>
</figure>
@@ -1218,7 +1218,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>Entire Disk �ޤ��� Partition ������</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-part-entire-part.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-part-entire-part"/>
</imageobject>
</mediaobject>
</figure>
@@ -1239,7 +1239,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>�������줿�ѡ��ƥ������γ�ǧ</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-part-review.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-part-review"/>
</imageobject>
</mediaobject>
</figure>
@@ -1255,7 +1255,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>Manual �ˤ��ѡ��ƥ�������ʬ��</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-part-manual-create.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-part-manual-create"/>
</imageobject>
</mediaobject>
</figure>
@@ -1269,7 +1269,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>��ư�ǥѡ��ƥ��������������</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-part-manual-partscheme.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-part-manual-partscheme"/>
</imageobject>
</mediaobject>
</figure>
@@ -1345,7 +1345,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>��ư�ǥѡ��ƥ��������������</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-part-manual-addpart.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-part-manual-addpart"/>
</imageobject>
</mediaobject>
</figure>
@@ -1524,7 +1524,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>�Ǹ�γ�ǧ</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-final-confirmation.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-final-confirmation"/>
</imageobject>
</mediaobject>
</figure>
@@ -1554,7 +1554,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>���ۥե�����Υ����������</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-distfile-fetching.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-distfile-fetching"/>
</imageobject>
</mediaobject>
</figure>
@@ -1567,7 +1567,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>���ۥե�����θ���</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-distfile-verifying.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-distfile-verifying"/>
</imageobject>
</mediaobject>
</figure>
@@ -1578,7 +1578,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>���ۥե�����μ��Ф�</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-distfile-extracting.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-distfile-extracting"/>
</imageobject>
</mediaobject>
</figure>
@@ -1610,7 +1610,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-post-root-passwd.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-post-root-passwd"/>
</imageobject>
</mediaobject>
</figure>
@@ -1635,7 +1635,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface"/>
</imageobject>
</mediaobject>
</figure>
@@ -1665,7 +1665,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>�磻��쥹���������ݥ���ȤΥ������</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-configure-wireless-scan.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-configure-wireless-scan"/>
</imageobject>
</mediaobject>
</figure>
@@ -1685,7 +1685,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>�磻��쥹�ͥåȥ��������</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-configure-wireless-accesspoints.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-configure-wireless-accesspoints"/>
</imageobject>
</mediaobject>
</figure>
@@ -1700,7 +1700,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>WPA2 �Υ��åȥ��å�</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-configure-wireless-wpa2setup.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-configure-wireless-wpa2setup"/>
</imageobject>
</mediaobject>
</figure>
@@ -1720,7 +1720,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-ipv4.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-ipv4"/>
</imageobject>
</mediaobject>
</figure>
@@ -1751,7 +1751,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-ipv4-dhcp.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-ipv4-dhcp"/>
</imageobject>
</mediaobject>
</figure>
@@ -1768,7 +1768,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-ipv4-static.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-ipv4-static"/>
</imageobject>
</mediaobject>
</figure>
@@ -1811,7 +1811,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-ipv6.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-ipv6"/>
</imageobject>
</mediaobject>
</figure>
@@ -1837,7 +1837,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-slaac.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-slaac"/>
</imageobject>
</mediaobject>
</figure>
@@ -1854,7 +1854,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-ipv6-static.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-ipv6-static"/>
</imageobject>
</mediaobject>
</figure>
@@ -1900,7 +1900,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-configure-network-ipv4-dns.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-configure-network-ipv4-dns"/>
</imageobject>
</mediaobject>
</figure>
@@ -1922,7 +1922,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>��������ޤ��� UTC �����å�������</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-set-clock-local-utc.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-set-clock-local-utc"/>
</imageobject>
</mediaobject>
</figure>
@@ -1939,7 +1939,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>�ϰ������</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-timezone-region.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-timezone-region"/>
</imageobject>
</mediaobject>
</figure>
@@ -1951,7 +1951,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>��̾������</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-timezone-country.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-timezone-country"/>
</imageobject>
</mediaobject>
</figure>
@@ -1963,7 +1963,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>�����ॾ���������</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-timezone-zone.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-timezone-zone"/>
</imageobject>
</mediaobject>
</figure>
@@ -1975,7 +1975,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>�����ॾ����γ���</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-timezone-confirm.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-timezone-confirm"/>
</imageobject>
</mediaobject>
</figure>
@@ -1995,7 +1995,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>�ɲä�ͭ���ˤ��륵���ӥ�������</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-config-services.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-config-services"/>
</imageobject>
</mediaobject>
</figure>
@@ -2042,7 +2042,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>����å������פ�����</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-config-crashdump.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-config-crashdump"/>
</imageobject>
</mediaobject>
</figure>
@@ -2066,7 +2066,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-adduser1.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-adduser1"/>
</imageobject>
</mediaobject>
</figure>
@@ -2078,7 +2078,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-adduser2.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-adduser2"/>
</imageobject>
</mediaobject>
</figure>
@@ -2180,7 +2180,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-adduser3.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-adduser3"/>
</imageobject>
</mediaobject>
</figure>
@@ -2205,7 +2205,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-finalconfiguration.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-finalconfiguration"/>
</imageobject>
</mediaobject>
</figure>
@@ -2261,7 +2261,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-final-modification-shell.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-final-modification-shell"/>
</imageobject>
</mediaobject>
</figure>
@@ -2279,7 +2279,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-mainexit.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-mainexit"/>
</imageobject>
</mediaobject>
</figure>
diff --git a/ja_JP.eucJP/books/handbook/install/chapter.xml b/ja_JP.eucJP/books/handbook/install/chapter.xml
index 76612008c2..8d6e6bbf79 100644
--- a/ja_JP.eucJP/books/handbook/install/chapter.xml
+++ b/ja_JP.eucJP/books/handbook/install/chapter.xml
@@ -1023,7 +1023,7 @@ Insert disk labelled "Kernel floppy 1" and press any key...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/boot-loader-menu.png" format="PNG"/>
+ <imagedata fileref="install/boot-loader-menu"/>
</imageobject>
</mediaobject>
</figure>
@@ -1181,7 +1181,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/config-country.png" format="PNG"/>
+ <imagedata fileref="install/config-country"/>
</imageobject>
</mediaobject>
</figure>
@@ -1197,7 +1197,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/config-keymap.png" format="PNG"/>
+ <imagedata fileref="install/config-keymap"/>
</imageobject>
</mediaobject>
</figure>
@@ -1234,7 +1234,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main1.png" format="PNG"/>
+ <imagedata fileref="install/main1"/>
</imageobject>
</mediaobject>
</figure>
@@ -1251,7 +1251,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main-doc.png" format="PNG"/>
+ <imagedata fileref="install/main-doc"/>
</imageobject>
</mediaobject>
</figure>
@@ -1263,7 +1263,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/docmenu1.png" format="PNG"/>
+ <imagedata fileref="install/docmenu1"/>
</imageobject>
</mediaobject>
</figure>
@@ -1293,7 +1293,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main-keymap.png" format="PNG"/>
+ <imagedata fileref="install/main-keymap"/>
</imageobject>
</mediaobject>
</figure>
@@ -1314,7 +1314,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/keymap.png" format="PNG"/>
+ <imagedata fileref="install/keymap"/>
</imageobject>
</mediaobject>
</figure>
@@ -1332,7 +1332,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main-options.png" format="PNG"/>
+ <imagedata fileref="install/main-options"/>
</imageobject>
</mediaobject>
</figure>
@@ -1342,7 +1342,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/options.png" format="PNG"/>
+ <imagedata fileref="install/options"/>
</imageobject>
</mediaobject>
</figure>
@@ -1374,7 +1374,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main-std.png" format="PNG"/>
+ <imagedata fileref="install/main-std"/>
</imageobject>
</mediaobject>
</figure>
@@ -1546,7 +1546,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/fdisk-drive1.png" format="PNG"/>
+ <imagedata fileref="install/fdisk-drive1"/>
</imageobject>
</mediaobject>
</figure>
@@ -1618,7 +1618,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/fdisk-edit1.png" format="PNG"/>
+ <imagedata fileref="install/fdisk-edit1"/>
</imageobject>
</mediaobject>
</figure>
@@ -1667,7 +1667,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/fdisk-edit2.png" format="PNG"/>
+ <imagedata fileref="install/fdisk-edit2"/>
</imageobject>
</mediaobject>
</figure>
@@ -1708,7 +1708,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/boot-mgr.png" format="PNG"/>
+ <imagedata fileref="install/boot-mgr"/>
</imageobject>
</mediaobject>
</figure>
@@ -1739,7 +1739,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/fdisk-drive2.png" format="PNG"/>
+ <imagedata fileref="install/fdisk-drive2"/>
</imageobject>
</mediaobject>
</figure>
@@ -2005,7 +2005,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-ed1.png" format="PNG"/>
+ <imagedata fileref="install/disklabel-ed1"/>
</imageobject>
</mediaobject>
</figure>
@@ -2037,7 +2037,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-auto.png" format="PNG"/>
+ <imagedata fileref="install/disklabel-auto"/>
</imageobject>
</mediaobject>
</figure>
@@ -2067,7 +2067,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-root1.png" format="PNG"/>
+ <imagedata fileref="install/disklabel-root1"/>
</imageobject>
</mediaobject>
</figure>
@@ -2084,7 +2084,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-root2.png" format="PNG"/>
+ <imagedata fileref="install/disklabel-root2"/>
</imageobject>
</mediaobject>
</figure>
@@ -2103,7 +2103,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-fs.png" format="PNG"/>
+ <imagedata fileref="install/disklabel-fs"/>
</imageobject>
</mediaobject>
</figure>
@@ -2122,7 +2122,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-root3.png" format="PNG"/>
+ <imagedata fileref="install/disklabel-root3"/>
</imageobject>
</mediaobject>
</figure>
@@ -2147,7 +2147,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-ed2.png" format="PNG"/>
+ <imagedata fileref="install/disklabel-ed2"/>
</imageobject>
</mediaobject>
</figure>
@@ -2193,7 +2193,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/dist-set.png" format="PNG"/>
+ <imagedata fileref="install/dist-set"/>
</imageobject>
</mediaobject>
</figure>
@@ -2246,7 +2246,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/dist-set2.png" format="PNG"/>
+ <imagedata fileref="install/dist-set2"/>
</imageobject>
</mediaobject>
</figure>
@@ -2277,7 +2277,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/media.png" format="PNG"/>
+ <imagedata fileref="install/media"/>
</imageobject>
</mediaobject>
</figure>
@@ -2481,7 +2481,7 @@ installation menus to retry whichever operations have failed.
<mediaobject>
<imageobject>
- <imagedata fileref="install/ed0-conf.png" format="PNG"/>
+ <imagedata fileref="install/ed0-conf"/>
</imageobject>
</mediaobject>
</figure>
@@ -2530,7 +2530,7 @@ installation menus to retry whichever operations have failed.
<mediaobject>
<imageobject>
- <imagedata fileref="install/ed0-conf2.png" format="PNG"/>
+ <imagedata fileref="install/ed0-conf2"/>
</imageobject>
</mediaobject>
</figure>
@@ -2718,7 +2718,7 @@ use the current settings.
<mediaobject>
<imageobject>
- <imagedata fileref="install/edit-inetd-conf.png" format="PNG"/>
+ <imagedata fileref="install/edit-inetd-conf"/>
</imageobject>
</mediaobject>
</figure>
@@ -2814,7 +2814,7 @@ use the current settings.
<mediaobject>
<imageobject>
- <imagedata fileref="install/ftp-anon1.png" format="PNG"/>
+ <imagedata fileref="install/ftp-anon1"/>
</imageobject>
</mediaobject>
</figure>
@@ -2890,7 +2890,7 @@ use the current settings.
<mediaobject>
<imageobject>
- <imagedata fileref="install/ftp-anon2.png" format="PNG"/>
+ <imagedata fileref="install/ftp-anon2"/>
</imageobject>
</mediaobject>
</figure>
@@ -2949,7 +2949,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/nfs-server-edit.png" format="PNG"/>
+ <imagedata fileref="install/nfs-server-edit"/>
</imageobject>
</mediaobject>
</figure>
@@ -2998,7 +2998,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/console-saver1.png" format="PNG"/>
+ <imagedata fileref="install/console-saver1"/>
</imageobject>
</mediaobject>
</figure>
@@ -3012,7 +3012,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/console-saver2.png" format="PNG"/>
+ <imagedata fileref="install/console-saver2"/>
</imageobject>
</mediaobject>
</figure>
@@ -3034,7 +3034,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/console-saver3.png" format="PNG"/>
+ <imagedata fileref="install/console-saver3"/>
</imageobject>
</mediaobject>
</figure>
@@ -3048,7 +3048,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/console-saver4.png" format="PNG"/>
+ <imagedata fileref="install/console-saver4"/>
</imageobject>
</mediaobject>
</figure>
@@ -3091,7 +3091,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/timezone1.png" format="PNG"/>
+ <imagedata fileref="install/timezone1"/>
</imageobject>
</mediaobject>
</figure>
@@ -3104,7 +3104,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/timezone2.png" format="PNG"/>
+ <imagedata fileref="install/timezone2"/>
</imageobject>
</mediaobject>
</figure>
@@ -3117,7 +3117,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/timezone3.png" format="PNG"/>
+ <imagedata fileref="install/timezone3"/>
</imageobject>
</mediaobject>
</figure>
@@ -3161,7 +3161,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse1.png" format="PNG"/>
+ <imagedata fileref="install/mouse1"/>
</imageobject>
</mediaobject>
</figure>
@@ -3174,7 +3174,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse2.png" format="PNG"/>
+ <imagedata fileref="install/mouse2"/>
</imageobject>
</mediaobject>
</figure>
@@ -3190,7 +3190,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse3.png" format="PNG"/>
+ <imagedata fileref="install/mouse3"/>
</imageobject>
</mediaobject>
</figure>
@@ -3203,7 +3203,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse4.png" format="PNG"/>
+ <imagedata fileref="install/mouse4"/>
</imageobject>
</mediaobject>
</figure>
@@ -3218,7 +3218,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse5.png" format="PNG"/>
+ <imagedata fileref="install/mouse5"/>
</imageobject>
</mediaobject>
</figure>
@@ -3232,7 +3232,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse6.png" format="PNG"/>
+ <imagedata fileref="install/mouse6"/>
</imageobject>
</mediaobject>
</figure>
@@ -3276,7 +3276,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/pkg-cat.png" format="PNG"/>
+ <imagedata fileref="install/pkg-cat"/>
</imageobject>
</mediaobject>
</figure>
@@ -3297,7 +3297,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/pkg-sel.png" format="PNG"/>
+ <imagedata fileref="install/pkg-sel"/>
</imageobject>
</mediaobject>
</figure>
@@ -3326,7 +3326,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/pkg-install.png" format="PNG"/>
+ <imagedata fileref="install/pkg-install"/>
</imageobject>
</mediaobject>
</figure>
@@ -3340,7 +3340,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/pkg-confirm.png" format="PNG"/>
+ <imagedata fileref="install/pkg-confirm"/>
</imageobject>
</mediaobject>
</figure>
@@ -3380,7 +3380,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/adduser1.png" format="PNG"/>
+ <imagedata fileref="install/adduser1"/>
</imageobject>
</mediaobject>
</figure>
@@ -3393,7 +3393,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/adduser2.png" format="PNG"/>
+ <imagedata fileref="install/adduser2"/>
</imageobject>
</mediaobject>
</figure>
@@ -3496,7 +3496,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/adduser3.png" format="PNG"/>
+ <imagedata fileref="install/adduser3"/>
</imageobject>
</mediaobject>
</figure>
@@ -3562,7 +3562,7 @@ Retype new password :</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/mainexit.png" format="PNG"/>
+ <imagedata fileref="install/mainexit"/>
</imageobject>
</mediaobject>
</figure>
@@ -3640,7 +3640,7 @@ Retype new password :</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/net-config-menu1.png" format="PNG"/>
+ <imagedata fileref="install/net-config-menu1"/>
</imageobject>
</mediaobject>
</figure>
@@ -3710,7 +3710,7 @@ Retype new password :</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/mta-main.png" format="PNG"/>
+ <imagedata fileref="install/mta-main"/>
</imageobject>
</mediaobject>
</figure>
@@ -3766,7 +3766,7 @@ Retype new password :</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/ntp-config.png" format="PNG"/>
+ <imagedata fileref="install/ntp-config"/>
</imageobject>
</mediaobject>
</figure>
@@ -3794,7 +3794,7 @@ Retype new password :</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/net-config-menu2.png" format="PNG"/>
+ <imagedata fileref="install/net-config-menu2"/>
</imageobject>
</mediaobject>
</figure>
diff --git a/mn_MN.UTF-8/books/handbook/advanced-networking/chapter.xml b/mn_MN.UTF-8/books/handbook/advanced-networking/chapter.xml
index a0188faa3b..ab1b04e996 100644
--- a/mn_MN.UTF-8/books/handbook/advanced-networking/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/advanced-networking/chapter.xml
@@ -287,7 +287,7 @@ host2.example.com link#1 UC 0 0
<mediaobject>
<imageobject>
- <imagedata fileref="advanced-networking/net-routing.pic"/>
+ <imagedata fileref="advanced-networking/net-routing"/>
</imageobject>
<textobject>
@@ -464,7 +464,7 @@ host2.example.com link#1 UC 0 0
<mediaobject>
<imageobject>
- <imagedata fileref="advanced-networking/static-routes.pic"/>
+ <imagedata fileref="advanced-networking/static-routes"/>
</imageobject>
<textobject>
@@ -4092,7 +4092,7 @@ myhost.example.com:/b/tftpboot/FreeBSD/install / nfs ro
<area id="co-pxenfs5" coords="3108,2666 3519,1800"/>
</areaspec>
<imageobject>
- <imagedata fileref="advanced-networking/pxe-nfs.png"/>
+ <imagedata fileref="advanced-networking/pxe-nfs"/>
</imageobject>
<calloutlist>
<callout arearefs="co-pxenfs1">
@@ -4392,7 +4392,7 @@ Received 264951 bytes in 0.1 seconds</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="advanced-networking/isdn-bus.eps"/>
+ <imagedata fileref="advanced-networking/isdn-bus"/>
</imageobject>
<textobject>
@@ -4427,7 +4427,7 @@ ISDN BRI line</literallayout>
<mediaobject>
<imageobject>
- <imagedata fileref="advanced-networking/isdn-twisted-pair.eps"/>
+ <imagedata fileref="advanced-networking/isdn-twisted-pair"/>
</imageobject>
<textobject>
@@ -4525,7 +4525,7 @@ ISDN BRI line</literallayout>
<mediaobject>
<imageobject>
- <imagedata fileref="advanced-networking/natd.eps"/>
+ <imagedata fileref="advanced-networking/natd"/>
</imageobject>
<textobject>
diff --git a/mn_MN.UTF-8/books/handbook/basics/chapter.xml b/mn_MN.UTF-8/books/handbook/basics/chapter.xml
index 86df2040e9..70a5c29398 100644
--- a/mn_MN.UTF-8/books/handbook/basics/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/basics/chapter.xml
@@ -1131,7 +1131,7 @@ root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01 passwd</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir1.eps" format="EPS"/>
+ <imagedata fileref="install/example-dir1"/>
</imageobject>
<textobject>
@@ -1149,7 +1149,7 @@ root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01 passwd</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir2.eps" format="EPS"/>
+ <imagedata fileref="install/example-dir2"/>
</imageobject>
<textobject>
@@ -1175,7 +1175,7 @@ root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01 passwd</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir3.eps" format="EPS"/>
+ <imagedata fileref="install/example-dir3"/>
</imageobject>
<textobject>
@@ -1199,7 +1199,7 @@ root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01 passwd</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir4.eps" format="EPS"/>
+ <imagedata fileref="install/example-dir4"/>
</imageobject>
<textobject>
@@ -1225,7 +1225,7 @@ root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01 passwd</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir5.eps" format="EPS"/>
+ <imagedata fileref="install/example-dir5"/>
</imageobject>
<textobject>
@@ -1517,7 +1517,7 @@ root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01 passwd</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/disk-layout.eps" format="EPS"/>
+ <imagedata fileref="install/disk-layout"/>
</imageobject>
<textobject>
diff --git a/mn_MN.UTF-8/books/handbook/bsdinstall/chapter.xml b/mn_MN.UTF-8/books/handbook/bsdinstall/chapter.xml
index c67357e54c..074ee3577b 100644
--- a/mn_MN.UTF-8/books/handbook/bsdinstall/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/bsdinstall/chapter.xml
@@ -642,7 +642,7 @@ Loading /boot/defaults/loader.conf
<title>&os; ачаалагч дуудагч цэс</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-boot-loader-menu.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-boot-loader-menu"/>
</imageobject>
</mediaobject>
</figure>
@@ -914,7 +914,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>Суулгалтын зөөвөрлөгч сонгох нь</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-choose-mode.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-choose-mode"/>
</imageobject>
</mediaobject>
</figure>
@@ -957,7 +957,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>Гарын байрлалын сонголт</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-keymap-select-default.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-keymap-select-default"/>
</imageobject>
</mediaobject>
</figure>
@@ -971,7 +971,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>Гарын цэсийг сонгох</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-config-keymap.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-config-keymap"/>
</imageobject>
</mediaobject>
</figure>
@@ -998,7 +998,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>Хостын нэрийг тохируулах</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-config-hostname.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-config-hostname"/>
</imageobject>
</mediaobject>
</figure>
@@ -1017,7 +1017,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>Бүрэлдэхүүн хэсгүүдийг суулгахаар сонгох</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-config-components.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-config-components"/>
</imageobject>
</mediaobject>
</figure>
@@ -1103,7 +1103,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-netinstall-files.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-netinstall-files"/>
</imageobject>
</mediaobject>
</figure>
@@ -1121,7 +1121,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-netinstall-mirrorselect.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-netinstall-mirrorselect"/>
</imageobject>
</mediaobject>
</figure>
@@ -1145,7 +1145,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>Зааварчилсан эсвэл Гар аргаар хуваах горимыг сонгох</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-part-guided-manual.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-part-guided-manual"/>
</imageobject>
</mediaobject>
</figure>
@@ -1160,7 +1160,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>Олон дискээс сонгох</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-part-guided-disk.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-part-guided-disk"/>
</imageobject>
</mediaobject>
</figure>
@@ -1176,7 +1176,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>Бүх диск эсвэл хуваалтыг сонгох</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-part-entire-part.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-part-entire-part"/>
</imageobject>
</mediaobject>
</figure>
@@ -1194,7 +1194,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>Үүсгэсэн хуваалтуудыг шалгах</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-part-review.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-part-review"/>
</imageobject>
</mediaobject>
</figure>
@@ -1210,7 +1210,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>Хуваалтуудыг гараар хийх нь</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-part-manual-create.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-part-manual-create"/>
</imageobject>
</mediaobject>
</figure>
@@ -1225,7 +1225,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>Хуваалтуудыг гараах хийх нь</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-part-manual-partscheme.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-part-manual-partscheme"/>
</imageobject>
</mediaobject>
</figure>
@@ -1299,7 +1299,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>Гараар хуваалтуудыг үүсгэх нь</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-part-manual-addpart.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-part-manual-addpart"/>
</imageobject>
</mediaobject>
</figure>
@@ -1473,7 +1473,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>Сүүлийн лавлагаа</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-final-confirmation.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-final-confirmation"/>
</imageobject>
</mediaobject>
</figure>
@@ -1502,7 +1502,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>Түгээлтийн файлуудыг татах нь</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-distfile-fetching.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-distfile-fetching"/>
</imageobject>
</mediaobject>
</figure>
@@ -1515,7 +1515,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>Түгээлтийн файлуудыг шалгах нь</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-distfile-verifying.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-distfile-verifying"/>
</imageobject>
</mediaobject>
</figure>
@@ -1527,7 +1527,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>Түгээлтийн файлуудыг задлах нь</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-distfile-extracting.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-distfile-extracting"/>
</imageobject>
</mediaobject>
</figure>
@@ -1559,7 +1559,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-post-root-passwd.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-post-root-passwd"/>
</imageobject>
</mediaobject>
</figure>
@@ -1585,7 +1585,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface"/>
</imageobject>
</mediaobject>
</figure>
@@ -1618,7 +1618,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>Утасгүй сүлжээний холболтын цэгийг хайх</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-configure-wireless-scan.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-configure-wireless-scan"/>
</imageobject>
</mediaobject>
</figure>
@@ -1635,7 +1635,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>Утасгүй сүлжээг сонгох нь</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-configure-wireless-accesspoints.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-configure-wireless-accesspoints"/>
</imageobject>
</mediaobject>
</figure>
@@ -1652,7 +1652,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>WPA2 тохируулга</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-configure-wireless-wpa2setup.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-configure-wireless-wpa2setup"/>
</imageobject>
</mediaobject>
</figure>
@@ -1672,7 +1672,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-ipv4.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-ipv4"/>
</imageobject>
</mediaobject>
</figure>
@@ -1704,7 +1704,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-ipv4-dhcp.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-ipv4-dhcp"/>
</imageobject>
</mediaobject>
</figure>
@@ -1721,7 +1721,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-ipv4-static.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-ipv4-static"/>
</imageobject>
</mediaobject>
</figure>
@@ -1763,7 +1763,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-ipv6.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-ipv6"/>
</imageobject>
</mediaobject>
</figure>
@@ -1788,7 +1788,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-slaac.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-slaac"/>
</imageobject>
</mediaobject>
</figure>
@@ -1805,7 +1805,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-ipv6-static.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-ipv6-static"/>
</imageobject>
</mediaobject>
</figure>
@@ -1848,7 +1848,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-configure-network-ipv4-dns.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-configure-network-ipv4-dns"/>
</imageobject>
</mediaobject>
</figure>
@@ -1871,7 +1871,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>Локал эсвэл UTC цагийг сонгох</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-set-clock-local-utc.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-set-clock-local-utc"/>
</imageobject>
</mediaobject>
</figure>
@@ -1888,7 +1888,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>Бүсийг сонгох</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-timezone-region.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-timezone-region"/>
</imageobject>
</mediaobject>
</figure>
@@ -1900,7 +1900,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>Улсыг сонгох</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-timezone-country.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-timezone-country"/>
</imageobject>
</mediaobject>
</figure>
@@ -1912,7 +1912,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>Цагийн бүсийг сонгох</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-timezone-zone.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-timezone-zone"/>
</imageobject>
</mediaobject>
</figure>
@@ -1924,7 +1924,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>Цагийн бүсийг зөвшөөрөх</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-timezone-confirm.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-timezone-confirm"/>
</imageobject>
</mediaobject>
</figure>
@@ -1945,7 +1945,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>Нэмэлт үйлчилгээнүүдийг идэвхжүүлэхийг сонгох</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-config-services.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-config-services"/>
</imageobject>
</mediaobject>
</figure>
@@ -1991,7 +1991,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>Сүйрлийн үеийн мэдээллийг хадгалахыг идэвхжүүлэх</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-config-crashdump.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-config-crashdump"/>
</imageobject>
</mediaobject>
</figure>
@@ -2015,7 +2015,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-adduser1.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-adduser1"/>
</imageobject>
</mediaobject>
</figure>
@@ -2027,7 +2027,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-adduser2.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-adduser2"/>
</imageobject>
</mediaobject>
</figure>
@@ -2126,7 +2126,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-adduser3.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-adduser3"/>
</imageobject>
</mediaobject>
</figure>
@@ -2151,7 +2151,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-finalconfiguration.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-finalconfiguration"/>
</imageobject>
</mediaobject>
</figure>
@@ -2206,7 +2206,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-final-modification-shell.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-final-modification-shell"/>
</imageobject>
</mediaobject>
</figure>
@@ -2222,7 +2222,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-mainexit.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-mainexit"/>
</imageobject>
</mediaobject>
</figure>
diff --git a/mn_MN.UTF-8/books/handbook/geom/chapter.xml b/mn_MN.UTF-8/books/handbook/geom/chapter.xml
index 72ab7a054c..66bb464ee9 100644
--- a/mn_MN.UTF-8/books/handbook/geom/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/geom/chapter.xml
@@ -148,7 +148,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="geom/striping.pic" align="center"/>
+ <imagedata fileref="geom/striping" align="center"/>
</imageobject>
<textobject>
diff --git a/mn_MN.UTF-8/books/handbook/install/chapter.xml b/mn_MN.UTF-8/books/handbook/install/chapter.xml
index a027f95f5a..f9708964a8 100644
--- a/mn_MN.UTF-8/books/handbook/install/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/install/chapter.xml
@@ -965,7 +965,7 @@ Insert disk labelled "Kernel floppy 1" and press any key...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/boot-loader-menu.png" format="PNG"/>
+ <imagedata fileref="install/boot-loader-menu"/>
</imageobject>
</mediaobject>
</figure>
@@ -1124,7 +1124,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/config-country.png" format="PNG"/>
+ <imagedata fileref="install/config-country"/>
</imageobject>
</mediaobject>
</figure>
@@ -1140,7 +1140,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/config-keymap.png" format="PNG"/>
+ <imagedata fileref="install/config-keymap"/>
</imageobject>
</mediaobject>
</figure>
@@ -1177,7 +1177,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main1.png" format="PNG"/>
+ <imagedata fileref="install/main1"/>
</imageobject>
</mediaobject>
</figure>
@@ -1193,7 +1193,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main-doc.png" format="PNG"/>
+ <imagedata fileref="install/main-doc"/>
</imageobject>
</mediaobject>
</figure>
@@ -1205,7 +1205,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/docmenu1.png" format="PNG"/>
+ <imagedata fileref="install/docmenu1"/>
</imageobject>
</mediaobject>
</figure>
@@ -1236,7 +1236,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main-keymap.png" format="PNG"/>
+ <imagedata fileref="install/main-keymap"/>
</imageobject>
</mediaobject>
</figure>
@@ -1256,7 +1256,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/keymap.png" format="PNG"/>
+ <imagedata fileref="install/keymap"/>
</imageobject>
</mediaobject>
</figure>
@@ -1274,7 +1274,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main-options.png" format="PNG"/>
+ <imagedata fileref="install/main-options"/>
</imageobject>
</mediaobject>
</figure>
@@ -1284,7 +1284,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/options.png" format="PNG"/>
+ <imagedata fileref="install/options"/>
</imageobject>
</mediaobject>
</figure>
@@ -1315,7 +1315,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main-std.png" format="PNG"/>
+ <imagedata fileref="install/main-std"/>
</imageobject>
</mediaobject>
</figure>
@@ -1489,7 +1489,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/fdisk-drive1.png" format="PNG"/>
+ <imagedata fileref="install/fdisk-drive1"/>
</imageobject>
</mediaobject>
</figure>
@@ -1554,7 +1554,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/fdisk-edit1.png" format="PNG"/>
+ <imagedata fileref="install/fdisk-edit1"/>
</imageobject>
</mediaobject>
</figure>
@@ -1594,7 +1594,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/fdisk-edit2.png" format="PNG"/>
+ <imagedata fileref="install/fdisk-edit2"/>
</imageobject>
</mediaobject>
</figure>
@@ -1637,7 +1637,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/boot-mgr.png" format="PNG"/>
+ <imagedata fileref="install/boot-mgr"/>
</imageobject>
</mediaobject>
</figure>
@@ -1665,7 +1665,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/fdisk-drive2.png" format="PNG"/>
+ <imagedata fileref="install/fdisk-drive2"/>
</imageobject>
</mediaobject>
</figure>
@@ -1912,7 +1912,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-ed1.png" format="PNG"/>
+ <imagedata fileref="install/disklabel-ed1"/>
</imageobject>
</mediaobject>
</figure>
@@ -1939,7 +1939,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-auto.png" format="PNG"/>
+ <imagedata fileref="install/disklabel-auto"/>
</imageobject>
</mediaobject>
</figure>
@@ -1964,7 +1964,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-root1.png" format="PNG"/>
+ <imagedata fileref="install/disklabel-root1"/>
</imageobject>
</mediaobject>
</figure>
@@ -1981,7 +1981,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-root2.png" format="PNG"/>
+ <imagedata fileref="install/disklabel-root2"/>
</imageobject>
</mediaobject>
</figure>
@@ -1999,7 +1999,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-fs.png" format="PNG"/>
+ <imagedata fileref="install/disklabel-fs"/>
</imageobject>
</mediaobject>
</figure>
@@ -2016,7 +2016,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-root3.png" format="PNG"/>
+ <imagedata fileref="install/disklabel-root3"/>
</imageobject>
</mediaobject>
</figure>
@@ -2042,7 +2042,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-ed2.png" format="PNG"/>
+ <imagedata fileref="install/disklabel-ed2"/>
</imageobject>
</mediaobject>
</figure>
@@ -2092,7 +2092,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/dist-set.png" format="PNG"/>
+ <imagedata fileref="install/dist-set"/>
</imageobject>
</mediaobject>
</figure>
@@ -2144,7 +2144,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/dist-set2.png" format="PNG"/>
+ <imagedata fileref="install/dist-set2"/>
</imageobject>
</mediaobject>
</figure>
@@ -2177,7 +2177,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/media.png" format="PNG"/>
+ <imagedata fileref="install/media"/>
</imageobject>
</mediaobject>
</figure>
@@ -2362,7 +2362,7 @@ installation menus to retry whichever operations have failed.
<mediaobject>
<imageobject>
- <imagedata fileref="install/ed0-conf.png" format="PNG"/>
+ <imagedata fileref="install/ed0-conf"/>
</imageobject>
</mediaobject>
</figure>
@@ -2396,7 +2396,7 @@ installation menus to retry whichever operations have failed.
<mediaobject>
<imageobject>
- <imagedata fileref="install/ed0-conf2.png" format="PNG"/>
+ <imagedata fileref="install/ed0-conf2"/>
</imageobject>
</mediaobject>
</figure>
@@ -2549,7 +2549,7 @@ use the current settings.
<mediaobject>
<imageobject>
- <imagedata fileref="install/edit-inetd-conf.png" format="PNG"/>
+ <imagedata fileref="install/edit-inetd-conf"/>
</imageobject>
</mediaobject>
</figure>
@@ -2640,7 +2640,7 @@ use the current settings.
<mediaobject>
<imageobject>
- <imagedata fileref="install/ftp-anon1.png" format="PNG"/>
+ <imagedata fileref="install/ftp-anon1"/>
</imageobject>
</mediaobject>
</figure>
@@ -2716,7 +2716,7 @@ use the current settings.
<mediaobject>
<imageobject>
- <imagedata fileref="install/ftp-anon2.png" format="PNG"/>
+ <imagedata fileref="install/ftp-anon2"/>
</imageobject>
</mediaobject>
</figure>
@@ -2771,7 +2771,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/nfs-server-edit.png" format="PNG"/>
+ <imagedata fileref="install/nfs-server-edit"/>
</imageobject>
</mediaobject>
</figure>
@@ -2819,7 +2819,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/console-saver1.png" format="PNG"/>
+ <imagedata fileref="install/console-saver1"/>
</imageobject>
</mediaobject>
</figure>
@@ -2833,7 +2833,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/console-saver2.png" format="PNG"/>
+ <imagedata fileref="install/console-saver2"/>
</imageobject>
</mediaobject>
</figure>
@@ -2852,7 +2852,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/console-saver3.png" format="PNG"/>
+ <imagedata fileref="install/console-saver3"/>
</imageobject>
</mediaobject>
</figure>
@@ -2865,7 +2865,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/console-saver4.png" format="PNG"/>
+ <imagedata fileref="install/console-saver4"/>
</imageobject>
</mediaobject>
</figure>
@@ -2906,7 +2906,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/timezone1.png" format="PNG"/>
+ <imagedata fileref="install/timezone1"/>
</imageobject>
</mediaobject>
</figure>
@@ -2919,7 +2919,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/timezone2.png" format="PNG"/>
+ <imagedata fileref="install/timezone2"/>
</imageobject>
</mediaobject>
</figure>
@@ -2931,7 +2931,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/timezone3.png" format="PNG"/>
+ <imagedata fileref="install/timezone3"/>
</imageobject>
</mediaobject>
</figure>
@@ -2970,7 +2970,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse1.png" format="PNG"/>
+ <imagedata fileref="install/mouse1"/>
</imageobject>
</mediaobject>
</figure>
@@ -2982,7 +2982,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse2.png" format="PNG"/>
+ <imagedata fileref="install/mouse2"/>
</imageobject>
</mediaobject>
</figure>
@@ -2996,7 +2996,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse3.png" format="PNG"/>
+ <imagedata fileref="install/mouse3"/>
</imageobject>
</mediaobject>
</figure>
@@ -3008,7 +3008,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse4.png" format="PNG"/>
+ <imagedata fileref="install/mouse4"/>
</imageobject>
</mediaobject>
</figure>
@@ -3022,7 +3022,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse5.png" format="PNG"/>
+ <imagedata fileref="install/mouse5"/>
</imageobject>
</mediaobject>
</figure>
@@ -3038,7 +3038,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse6.png" format="PNG"/>
+ <imagedata fileref="install/mouse6"/>
</imageobject>
</mediaobject>
</figure>
@@ -3075,7 +3075,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/pkg-cat.png" format="PNG"/>
+ <imagedata fileref="install/pkg-cat"/>
</imageobject>
</mediaobject>
</figure>
@@ -3092,7 +3092,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/pkg-sel.png" format="PNG"/>
+ <imagedata fileref="install/pkg-sel"/>
</imageobject>
</mediaobject>
</figure>
@@ -3115,7 +3115,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/pkg-install.png" format="PNG"/>
+ <imagedata fileref="install/pkg-install"/>
</imageobject>
</mediaobject>
</figure>
@@ -3127,7 +3127,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/pkg-confirm.png" format="PNG"/>
+ <imagedata fileref="install/pkg-confirm"/>
</imageobject>
</mediaobject>
</figure>
@@ -3160,7 +3160,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/adduser1.png" format="PNG"/>
+ <imagedata fileref="install/adduser1"/>
</imageobject>
</mediaobject>
</figure>
@@ -3173,7 +3173,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/adduser2.png" format="PNG"/>
+ <imagedata fileref="install/adduser2"/>
</imageobject>
</mediaobject>
</figure>
@@ -3262,7 +3262,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/adduser3.png" format="PNG"/>
+ <imagedata fileref="install/adduser3"/>
</imageobject>
</mediaobject>
</figure>
@@ -3318,7 +3318,7 @@ Retype new password :</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/mainexit.png" format="PNG"/>
+ <imagedata fileref="install/mainexit"/>
</imageobject>
</mediaobject>
</figure>
@@ -3372,7 +3372,7 @@ Retype new password :</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/net-config-menu1.png" format="PNG"/>
+ <imagedata fileref="install/net-config-menu1"/>
</imageobject>
</mediaobject>
</figure>
@@ -3423,7 +3423,7 @@ Retype new password :</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/mta-main.png" format="PNG"/>
+ <imagedata fileref="install/mta-main"/>
</imageobject>
</mediaobject>
</figure>
@@ -3455,7 +3455,7 @@ Retype new password :</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/ntp-config.png" format="PNG"/>
+ <imagedata fileref="install/ntp-config"/>
</imageobject>
</mediaobject>
</figure>
@@ -3476,7 +3476,7 @@ Retype new password :</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/net-config-menu2.png" format="PNG"/>
+ <imagedata fileref="install/net-config-menu2"/>
</imageobject>
</mediaobject>
</figure>
diff --git a/mn_MN.UTF-8/books/handbook/mail/chapter.xml b/mn_MN.UTF-8/books/handbook/mail/chapter.xml
index 4bb8d09f97..8fa6f74eff 100644
--- a/mn_MN.UTF-8/books/handbook/mail/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/mail/chapter.xml
@@ -1863,7 +1863,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/mutt1.png" format="PNG"/>
+ <imagedata fileref="mail/mutt1"/>
</imageobject>
</mediaobject>
@@ -1875,7 +1875,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/mutt2.png" format="PNG"/>
+ <imagedata fileref="mail/mutt2"/>
</imageobject>
</mediaobject>
@@ -1912,7 +1912,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/mutt3.png" format="PNG"/>
+ <imagedata fileref="mail/mutt3"/>
</imageobject>
</mediaobject>
@@ -1961,7 +1961,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine1.png" format="PNG"/>
+ <imagedata fileref="mail/pine1"/>
</imageobject>
</mediaobject>
@@ -1980,7 +1980,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine2.png" format="PNG"/>
+ <imagedata fileref="mail/pine2"/>
</imageobject>
</mediaobject>
@@ -1990,7 +1990,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine3.png" format="PNG"/>
+ <imagedata fileref="mail/pine3"/>
</imageobject>
</mediaobject>
@@ -2002,7 +2002,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine4.png" format="PNG"/>
+ <imagedata fileref="mail/pine4"/>
</imageobject>
</mediaobject>
@@ -2019,7 +2019,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine5.png" format="PNG"/>
+ <imagedata fileref="mail/pine5"/>
</imageobject>
</mediaobject>
diff --git a/mn_MN.UTF-8/books/handbook/vinum/chapter.xml b/mn_MN.UTF-8/books/handbook/vinum/chapter.xml
index 17d5c4c3fe..088946e90a 100644
--- a/mn_MN.UTF-8/books/handbook/vinum/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/vinum/chapter.xml
@@ -170,7 +170,7 @@
<para>
<figure id="vinum-concat">
<title>Нийлүүлэгдсэн зохион байгуулалт</title>
- <graphic fileref="vinum/vinum-concat.pic"/>
+ <graphic fileref="vinum/vinum-concat"/>
</figure>
</para>
@@ -209,7 +209,7 @@
<para>
<figure id="vinum-striped">
<title>Судалчлагдсан зохион байгуулалт</title>
- <graphic fileref="vinum/vinum-striped.pic"/>
+ <graphic fileref="vinum/vinum-striped"/>
</figure>
</para>
</sect1>
@@ -276,7 +276,7 @@
<para>
<figure id="vinum-raid5-org">
<title>RAID-5 зохион байгуулалт</title>
- <graphic fileref="vinum/vinum-raid5-org.pic"/>
+ <graphic fileref="vinum/vinum-raid5-org"/>
</figure>
</para>
@@ -545,7 +545,7 @@
<para>
<figure id="vinum-simple-vol">
<title>Энгийн Vinum эзлэхүүн</title>
- <graphic fileref="vinum/vinum-simple-vol.pic"/>
+ <graphic fileref="vinum/vinum-simple-vol"/>
</figure>
</para>
@@ -610,7 +610,7 @@
<para>
<figure id="vinum-mirrored-vol">
<title>Толин тусгал хийгдсэн Vinum эзлэхүүн</title>
- <graphic fileref="vinum/vinum-mirrored-vol.pic"/>
+ <graphic fileref="vinum/vinum-mirrored-vol"/>
</figure>
</para>
@@ -676,7 +676,7 @@
<para>
<figure id="vinum-striped-vol">
<title>Судалчлагдсан Vinum эзлэхүүн</title>
- <graphic fileref="vinum/vinum-striped-vol.pic"/>
+ <graphic fileref="vinum/vinum-striped-vol"/>
</figure>
</para>
@@ -720,7 +720,7 @@
<para>
<figure id="vinum-raid10-vol">
<title>Толин тусгал хийгдсэн, судалчлагдсан Vinum эзлэхүүн</title>
- <graphic fileref="vinum/vinum-raid10-vol.pic"/>
+ <graphic fileref="vinum/vinum-raid10-vol"/>
</figure>
</para>
</sect2>
diff --git a/mn_MN.UTF-8/books/handbook/virtualization/chapter.xml b/mn_MN.UTF-8/books/handbook/virtualization/chapter.xml
index 256f078fe0..af962f3378 100644
--- a/mn_MN.UTF-8/books/handbook/virtualization/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/virtualization/chapter.xml
@@ -115,7 +115,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd1.png"/>
+ <imagedata fileref="virtualization/parallels-freebsd1"/>
</imageobject>
</mediaobject>
@@ -126,25 +126,25 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd2.png"/>
+ <imagedata fileref="virtualization/parallels-freebsd2"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd3.png"/>
+ <imagedata fileref="virtualization/parallels-freebsd3"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd4.png"/>
+ <imagedata fileref="virtualization/parallels-freebsd4"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd5.png"/>
+ <imagedata fileref="virtualization/parallels-freebsd5"/>
</imageobject>
</mediaobject>
@@ -152,13 +152,13 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd6.png"/>
+ <imagedata fileref="virtualization/parallels-freebsd6"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd7.png"/>
+ <imagedata fileref="virtualization/parallels-freebsd7"/>
</imageobject>
</mediaobject>
@@ -166,13 +166,13 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd8.png"/>
+ <imagedata fileref="virtualization/parallels-freebsd8"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd9.png"/>
+ <imagedata fileref="virtualization/parallels-freebsd9"/>
</imageobject>
</mediaobject>
@@ -189,7 +189,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd11.png"/>
+ <imagedata fileref="virtualization/parallels-freebsd11"/>
</imageobject>
</mediaobject>
@@ -200,7 +200,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd10.png"/>
+ <imagedata fileref="virtualization/parallels-freebsd10"/>
</imageobject>
</mediaobject>
@@ -211,7 +211,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd12.png"/>
+ <imagedata fileref="virtualization/parallels-freebsd12"/>
</imageobject>
</mediaobject>
@@ -221,7 +221,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd13.png"/>
+ <imagedata fileref="virtualization/parallels-freebsd13"/>
</imageobject>
</mediaobject>
</sect3>
@@ -599,13 +599,13 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd1.png"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd1"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd2.png"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd2"/>
</imageobject>
</mediaobject>
@@ -614,7 +614,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd3.png"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd3"/>
</imageobject>
</mediaobject>
@@ -625,13 +625,13 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd4.png"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd4"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd5.png"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd5"/>
</imageobject>
</mediaobject>
@@ -639,7 +639,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd6.png"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd6"/>
</imageobject>
</mediaobject>
@@ -649,13 +649,13 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd7.png"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd7"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd8.png"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd8"/>
</imageobject>
</mediaobject>
@@ -673,13 +673,13 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd9.png"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd9"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd10.png"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd10"/>
</imageobject>
</mediaobject>
@@ -692,7 +692,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd11.png"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd11"/>
</imageobject>
</mediaobject>
@@ -703,7 +703,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd12.png"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd12"/>
</imageobject>
</mediaobject>
@@ -713,7 +713,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd13.png"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd13"/>
</imageobject>
</mediaobject>
</sect3>
@@ -794,7 +794,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd01.png"/>
+ <imagedata fileref="virtualization/vmware-freebsd01"/>
</imageobject>
</mediaobject>
@@ -804,7 +804,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd02.png"/>
+ <imagedata fileref="virtualization/vmware-freebsd02"/>
</imageobject>
</mediaobject>
@@ -816,7 +816,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd03.png"/>
+ <imagedata fileref="virtualization/vmware-freebsd03"/>
</imageobject>
</mediaobject>
@@ -825,7 +825,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd04.png"/>
+ <imagedata fileref="virtualization/vmware-freebsd04"/>
</imageobject>
</mediaobject>
@@ -834,7 +834,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd05.png"/>
+ <imagedata fileref="virtualization/vmware-freebsd05"/>
</imageobject>
</mediaobject>
@@ -843,7 +843,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd06.png"/>
+ <imagedata fileref="virtualization/vmware-freebsd06"/>
</imageobject>
</mediaobject>
@@ -852,7 +852,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd07.png"/>
+ <imagedata fileref="virtualization/vmware-freebsd07"/>
</imageobject>
</mediaobject>
@@ -860,7 +860,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd08.png"/>
+ <imagedata fileref="virtualization/vmware-freebsd08"/>
</imageobject>
</mediaobject>
@@ -874,7 +874,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd09.png"/>
+ <imagedata fileref="virtualization/vmware-freebsd09"/>
</imageobject>
</mediaobject>
@@ -882,7 +882,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd10.png"/>
+ <imagedata fileref="virtualization/vmware-freebsd10"/>
</imageobject>
</mediaobject>
@@ -891,7 +891,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd11.png"/>
+ <imagedata fileref="virtualization/vmware-freebsd11"/>
</imageobject>
</mediaobject>
@@ -909,7 +909,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd12.png"/>
+ <imagedata fileref="virtualization/vmware-freebsd12"/>
</imageobject>
</mediaobject>
diff --git a/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.xml b/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.xml
index 21f0a9f285..2600f5169b 100644
--- a/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.xml
@@ -327,7 +327,7 @@ host2.example.com link#1 UC 0 0
<mediaobject>
<imageobject>
- <imagedata fileref="advanced-networking/net-routing.pic"/>
+ <imagedata fileref="advanced-networking/net-routing"/>
</imageobject>
<textobject>
@@ -537,7 +537,7 @@ host2.example.com link#1 UC 0 0
<mediaobject>
<imageobject>
- <imagedata fileref="advanced-networking/static-routes.pic"/>
+ <imagedata fileref="advanced-networking/static-routes"/>
</imageobject>
<textobject>
@@ -4800,7 +4800,7 @@ mijnhost.example.com:/b/tftpboot/FreeBSD/install / nfs ro
<area id="co-pxenfs5" coords="3108,2666,3519,1800"/>
</areaspec>
<imageobject>
- <imagedata fileref="advanced-networking/pxe-nfs.png"/>
+ <imagedata fileref="advanced-networking/pxe-nfs"/>
</imageobject>
<calloutlist>
<callout arearefs="co-pxenfs1">
@@ -5140,7 +5140,7 @@ Received 264951 bytes in 0.1 seconds</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="advanced-networking/isdn-bus.eps"/>
+ <imagedata fileref="advanced-networking/isdn-bus"/>
</imageobject>
<textobject>
@@ -5176,7 +5176,7 @@ ISDN BRI lijn</literallayout>
<mediaobject>
<imageobject>
- <imagedata fileref="advanced-networking/isdn-twisted-pair.eps"/>
+ <imagedata fileref="advanced-networking/isdn-twisted-pair"/>
</imageobject>
<textobject>
@@ -5291,7 +5291,7 @@ ISDN BRI lijn</literallayout>
<mediaobject>
<imageobject>
- <imagedata fileref="advanced-networking/natd.eps"/>
+ <imagedata fileref="advanced-networking/natd"/>
</imageobject>
<textobject>
diff --git a/nl_NL.ISO8859-1/books/handbook/basics/chapter.xml b/nl_NL.ISO8859-1/books/handbook/basics/chapter.xml
index 133e016e29..511d19850a 100644
--- a/nl_NL.ISO8859-1/books/handbook/basics/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/basics/chapter.xml
@@ -1282,7 +1282,7 @@ root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir1.eps" format="EPS"/>
+ <imagedata fileref="install/example-dir1"/>
</imageobject>
<textobject>
@@ -1303,7 +1303,7 @@ root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir2.eps" format="EPS"/>
+ <imagedata fileref="install/example-dir2"/>
</imageobject>
<textobject>
@@ -1331,7 +1331,7 @@ root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir3.eps" format="EPS"/>
+ <imagedata fileref="install/example-dir3"/>
</imageobject>
<textobject>
@@ -1359,7 +1359,7 @@ root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir4.eps" format="EPS"/>
+ <imagedata fileref="install/example-dir4"/>
</imageobject>
<textobject>
@@ -1385,7 +1385,7 @@ root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir5.eps" format="EPS"/>
+ <imagedata fileref="install/example-dir5"/>
</imageobject>
<textobject>
@@ -1716,7 +1716,7 @@ root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/disk-layout.eps" format="EPS"/>
+ <imagedata fileref="install/disk-layout"/>
</imageobject>
<textobject>
diff --git a/nl_NL.ISO8859-1/books/handbook/geom/chapter.xml b/nl_NL.ISO8859-1/books/handbook/geom/chapter.xml
index 9a85db0f31..6a402409d4 100644
--- a/nl_NL.ISO8859-1/books/handbook/geom/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/geom/chapter.xml
@@ -150,7 +150,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="geom/striping.pic" align="center"/>
+ <imagedata fileref="geom/striping" align="center"/>
</imageobject>
<textobject>
diff --git a/nl_NL.ISO8859-1/books/handbook/install/chapter.xml b/nl_NL.ISO8859-1/books/handbook/install/chapter.xml
index 5d5a59be36..beb8925e23 100644
--- a/nl_NL.ISO8859-1/books/handbook/install/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/install/chapter.xml
@@ -1065,7 +1065,7 @@ Insert disk labelled "Kernel floppy 1" and press any key...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/boot-loader-menu.png" format="PNG"/>
+ <imagedata fileref="install/boot-loader-menu"/>
</imageobject>
</mediaobject>
</figure>
@@ -1227,7 +1227,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/config-country.png" format="PNG"/>
+ <imagedata fileref="install/config-country"/>
</imageobject>
</mediaobject>
</figure>
@@ -1243,7 +1243,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/config-keymap.png" format="PNG"/>
+ <imagedata fileref="install/config-keymap"/>
</imageobject>
</mediaobject>
</figure>
@@ -1284,7 +1284,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main1.png" format="PNG"/>
+ <imagedata fileref="install/main1"/>
</imageobject>
</mediaobject>
</figure>
@@ -1301,7 +1301,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main-doc.png" format="PNG"/>
+ <imagedata fileref="install/main-doc"/>
</imageobject>
</mediaobject>
</figure>
@@ -1313,7 +1313,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/docmenu1.png" format="PNG"/>
+ <imagedata fileref="install/docmenu1"/>
</imageobject>
</mediaobject>
</figure>
@@ -1344,7 +1344,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main-keymap.png" format="PNG"/>
+ <imagedata fileref="install/main-keymap"/>
</imageobject>
</mediaobject>
</figure>
@@ -1367,7 +1367,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/keymap.png" format="PNG"/>
+ <imagedata fileref="install/keymap"/>
</imageobject>
</mediaobject>
</figure>
@@ -1384,7 +1384,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main-options.png" format="PNG"/>
+ <imagedata fileref="install/main-options"/>
</imageobject>
</mediaobject>
</figure>
@@ -1394,7 +1394,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/options.png" format="PNG"/>
+ <imagedata fileref="install/options"/>
</imageobject>
</mediaobject>
</figure>
@@ -1430,7 +1430,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main-std.png" format="PNG"/>
+ <imagedata fileref="install/main-std"/>
</imageobject>
</mediaobject>
</figure>
@@ -1616,7 +1616,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/fdisk-drive1.png" format="PNG"/>
+ <imagedata fileref="install/fdisk-drive1"/>
</imageobject>
</mediaobject>
</figure>
@@ -1689,7 +1689,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/fdisk-edit1.png" format="PNG"/>
+ <imagedata fileref="install/fdisk-edit1"/>
</imageobject>
</mediaobject>
</figure>
@@ -1737,7 +1737,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/fdisk-edit2.png" format="PNG"/>
+ <imagedata fileref="install/fdisk-edit2"/>
</imageobject>
</mediaobject>
</figure>
@@ -1783,7 +1783,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/boot-mgr.png" format="PNG"/>
+ <imagedata fileref="install/boot-mgr"/>
</imageobject>
</mediaobject>
</figure>
@@ -1814,7 +1814,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/fdisk-drive2.png" format="PNG"/>
+ <imagedata fileref="install/fdisk-drive2"/>
</imageobject>
</mediaobject>
</figure>
@@ -2083,7 +2083,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-ed1.png" format="PNG"/>
+ <imagedata fileref="install/disklabel-ed1"/>
</imageobject>
</mediaobject>
</figure>
@@ -2113,7 +2113,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-auto.png" format="PNG"/>
+ <imagedata fileref="install/disklabel-auto"/>
</imageobject>
</mediaobject>
</figure>
@@ -2140,7 +2140,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-root1.png" format="PNG"/>
+ <imagedata fileref="install/disklabel-root1"/>
</imageobject>
</mediaobject>
</figure>
@@ -2158,7 +2158,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-root2.png" format="PNG"/>
+ <imagedata fileref="install/disklabel-root2"/>
</imageobject>
</mediaobject>
</figure>
@@ -2176,7 +2176,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-fs.png" format="PNG"/>
+ <imagedata fileref="install/disklabel-fs"/>
</imageobject>
</mediaobject>
</figure>
@@ -2194,7 +2194,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-root3.png" format="PNG"/>
+ <imagedata fileref="install/disklabel-root3"/>
</imageobject>
</mediaobject>
</figure>
@@ -2217,7 +2217,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-ed2.png" format="PNG"/>
+ <imagedata fileref="install/disklabel-ed2"/>
</imageobject>
</mediaobject>
</figure>
@@ -2272,7 +2272,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/dist-set.png" format="PNG"/>
+ <imagedata fileref="install/dist-set"/>
</imageobject>
</mediaobject>
</figure>
@@ -2327,7 +2327,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/dist-set2.png" format="PNG"/>
+ <imagedata fileref="install/dist-set2"/>
</imageobject>
</mediaobject>
</figure>
@@ -2359,7 +2359,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/media.png" format="PNG"/>
+ <imagedata fileref="install/media"/>
</imageobject>
</mediaobject>
</figure>
@@ -2563,7 +2563,7 @@ installation menus to retry whichever operations have failed.
<mediaobject>
<imageobject>
- <imagedata fileref="install/ed0-conf.png" format="PNG"/>
+ <imagedata fileref="install/ed0-conf"/>
</imageobject>
</mediaobject>
</figure>
@@ -2608,7 +2608,7 @@ installation menus to retry whichever operations have failed.
<mediaobject>
<imageobject>
- <imagedata fileref="install/ed0-conf2.png" format="PNG"/>
+ <imagedata fileref="install/ed0-conf2"/>
</imageobject>
</mediaobject>
</figure>
@@ -2784,7 +2784,7 @@ use the current settings.
<mediaobject>
<imageobject>
- <imagedata fileref="install/edit-inetd-conf.png" format="PNG"/>
+ <imagedata fileref="install/edit-inetd-conf"/>
</imageobject>
</mediaobject>
</figure>
@@ -2881,7 +2881,7 @@ Do you wish to continue configuring anonymous FTP?
<mediaobject>
<imageobject>
- <imagedata fileref="install/ftp-anon1.png" format="PNG"/>
+ <imagedata fileref="install/ftp-anon1"/>
</imageobject>
</mediaobject>
</figure>
@@ -2961,7 +2961,7 @@ Do you wish to continue configuring anonymous FTP?
<mediaobject>
<imageobject>
- <imagedata fileref="install/ftp-anon2.png" format="PNG"/>
+ <imagedata fileref="install/ftp-anon2"/>
</imageobject>
</mediaobject>
</figure>
@@ -3020,7 +3020,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/nfs-server-edit.png" format="PNG"/>
+ <imagedata fileref="install/nfs-server-edit"/>
</imageobject>
</mediaobject>
</figure>
@@ -3071,7 +3071,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/console-saver1.png" format="PNG"/>
+ <imagedata fileref="install/console-saver1"/>
</imageobject>
</mediaobject>
</figure>
@@ -3085,7 +3085,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/console-saver2.png" format="PNG"/>
+ <imagedata fileref="install/console-saver2"/>
</imageobject>
</mediaobject>
</figure>
@@ -3106,7 +3106,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/console-saver3.png" format="PNG"/>
+ <imagedata fileref="install/console-saver3"/>
</imageobject>
</mediaobject>
</figure>
@@ -3120,7 +3120,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/console-saver4.png" format="PNG"/>
+ <imagedata fileref="install/console-saver4"/>
</imageobject>
</mediaobject>
</figure>
@@ -3165,7 +3165,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/timezone1.png" format="PNG"/>
+ <imagedata fileref="install/timezone1"/>
</imageobject>
</mediaobject>
</figure>
@@ -3178,7 +3178,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/timezone2.png" format="PNG"/>
+ <imagedata fileref="install/timezone2"/>
</imageobject>
</mediaobject>
</figure>
@@ -3191,7 +3191,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/timezone3.png" format="PNG"/>
+ <imagedata fileref="install/timezone3"/>
</imageobject>
</mediaobject>
</figure>
@@ -3259,7 +3259,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse1.png" format="PNG"/>
+ <imagedata fileref="install/mouse1"/>
</imageobject>
</mediaobject>
</figure>
@@ -3273,7 +3273,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse2.png" format="PNG"/>
+ <imagedata fileref="install/mouse2"/>
</imageobject>
</mediaobject>
</figure>
@@ -3290,7 +3290,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse3.png" format="PNG"/>
+ <imagedata fileref="install/mouse3"/>
</imageobject>
</mediaobject>
</figure>
@@ -3304,7 +3304,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse4.png" format="PNG"/>
+ <imagedata fileref="install/mouse4"/>
</imageobject>
</mediaobject>
</figure>
@@ -3319,7 +3319,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse5.png" format="PNG"/>
+ <imagedata fileref="install/mouse5"/>
</imageobject>
</mediaobject>
</figure>
@@ -3334,7 +3334,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse6.png" format="PNG"/>
+ <imagedata fileref="install/mouse6"/>
</imageobject>
</mediaobject>
</figure>
@@ -3377,7 +3377,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/pkg-cat.png" format="PNG"/>
+ <imagedata fileref="install/pkg-cat"/>
</imageobject>
</mediaobject>
</figure>
@@ -3400,7 +3400,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/pkg-sel.png" format="PNG"/>
+ <imagedata fileref="install/pkg-sel"/>
</imageobject>
</mediaobject>
</figure>
@@ -3430,7 +3430,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/pkg-install.png" format="PNG"/>
+ <imagedata fileref="install/pkg-install"/>
</imageobject>
</mediaobject>
</figure>
@@ -3445,7 +3445,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/pkg-confirm.png" format="PNG"/>
+ <imagedata fileref="install/pkg-confirm"/>
</imageobject>
</mediaobject>
</figure>
@@ -3488,7 +3488,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/adduser1.png" format="PNG"/>
+ <imagedata fileref="install/adduser1"/>
</imageobject>
</mediaobject>
</figure>
@@ -3501,7 +3501,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/adduser2.png" format="PNG"/>
+ <imagedata fileref="install/adduser2"/>
</imageobject>
</mediaobject>
</figure>
@@ -3607,7 +3607,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/adduser3.png" format="PNG"/>
+ <imagedata fileref="install/adduser3"/>
</imageobject>
</mediaobject>
</figure>
@@ -3675,7 +3675,7 @@ Retype new password :</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/mainexit.png" format="PNG"/>
+ <imagedata fileref="install/mainexit"/>
</imageobject>
</mediaobject>
</figure>
@@ -3752,7 +3752,7 @@ Retype new password :</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/net-config-menu1.png" format="PNG"/>
+ <imagedata fileref="install/net-config-menu1"/>
</imageobject>
</mediaobject>
</figure>
@@ -3824,7 +3824,7 @@ Retype new password :</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/mta-main.png" format="PNG"/>
+ <imagedata fileref="install/mta-main"/>
</imageobject>
</mediaobject>
</figure>
@@ -3882,7 +3882,7 @@ Retype new password :</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/ntp-config.png" format="PNG"/>
+ <imagedata fileref="install/ntp-config"/>
</imageobject>
</mediaobject>
</figure>
@@ -3909,7 +3909,7 @@ Retype new password :</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/net-config-menu2.png" format="PNG"/>
+ <imagedata fileref="install/net-config-menu2"/>
</imageobject>
</mediaobject>
</figure>
diff --git a/nl_NL.ISO8859-1/books/handbook/mail/chapter.xml b/nl_NL.ISO8859-1/books/handbook/mail/chapter.xml
index 90f5ea8932..cfb397a143 100644
--- a/nl_NL.ISO8859-1/books/handbook/mail/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/mail/chapter.xml
@@ -1940,7 +1940,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/mutt1.png" format="PNG"/>
+ <imagedata fileref="mail/mutt1"/>
</imageobject>
</mediaobject>
@@ -1950,7 +1950,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/mutt2.png" format="PNG"/>
+ <imagedata fileref="mail/mutt2"/>
</imageobject>
</mediaobject>
@@ -1986,7 +1986,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/mutt3.png" format="PNG"/>
+ <imagedata fileref="mail/mutt3"/>
</imageobject>
</mediaobject>
@@ -2038,7 +2038,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine1.png" format="PNG"/>
+ <imagedata fileref="mail/pine1"/>
</imageobject>
</mediaobject>
@@ -2057,7 +2057,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine2.png" format="PNG"/>
+ <imagedata fileref="mail/pine2"/>
</imageobject>
</mediaobject>
@@ -2068,7 +2068,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine3.png" format="PNG"/>
+ <imagedata fileref="mail/pine3"/>
</imageobject>
</mediaobject>
@@ -2081,7 +2081,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine4.png" format="PNG"/>
+ <imagedata fileref="mail/pine4"/>
</imageobject>
</mediaobject>
@@ -2100,7 +2100,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine5.png" format="PNG"/>
+ <imagedata fileref="mail/pine5"/>
</imageobject>
</mediaobject>
diff --git a/nl_NL.ISO8859-1/books/handbook/vinum/chapter.xml b/nl_NL.ISO8859-1/books/handbook/vinum/chapter.xml
index b1a6926140..c5bb64c310 100644
--- a/nl_NL.ISO8859-1/books/handbook/vinum/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/vinum/chapter.xml
@@ -199,7 +199,7 @@
<figure id="vinum-concat">
<title>Aaneengeschakeld georganiseerd</title>
- <graphic fileref="vinum/vinum-concat.pic"/>
+ <graphic fileref="vinum/vinum-concat"/>
</figure></para>
<indexterm>
@@ -242,7 +242,7 @@
<figure id="vinum-striped">
<title>Verdeeld georganiseerd</title>
- <graphic fileref="vinum/vinum-striped.pic"/>
+ <graphic fileref="vinum/vinum-striped"/>
</figure></para>
</sect1>
@@ -319,7 +319,7 @@
<figure id="vinum-raid5-org">
<title>RAID-5 georganiseerd</title>
- <graphic fileref="vinum/vinum-raid5-org.pic"/>
+ <graphic fileref="vinum/vinum-raid5-org"/>
</figure></para>
<para>Vergeleken met spiegelen heeft <acronym>RAID-5</acronym> het
@@ -626,7 +626,7 @@
<figure id="vinum-simple-vol">
<title>Een eenvoudig Vinum volume</title>
- <graphic fileref="vinum/vinum-simple-vol.pic"/>
+ <graphic fileref="vinum/vinum-simple-vol"/>
</figure></para>
<para>Deze en de volgende figuren stellen een volume voor dat
@@ -693,7 +693,7 @@
<figure id="vinum-mirrored-vol">
<title>Een gespiegeld Vinum volume</title>
- <graphic fileref="vinum/vinum-mirrored-vol.pic"/>
+ <graphic fileref="vinum/vinum-mirrored-vol"/>
</figure></para>
<para>In dit voorbeeld bevat iedere samenstelling de volledige 512
@@ -762,7 +762,7 @@
<figure id="vinum-striped-vol">
<title>Een verdeeld Vinum volume</title>
- <graphic fileref="vinum/vinum-striped-vol.pic"/>
+ <graphic fileref="vinum/vinum-striped-vol"/>
</figure></para>
<para>Dit volume wordt weergegeven in
@@ -807,7 +807,7 @@
<figure id="vinum-raid10-vol">
<title>Een gespiegeld en verdeeld Vinum volume</title>
- <graphic fileref="vinum/vinum-raid10-vol.pic"/>
+ <graphic fileref="vinum/vinum-raid10-vol"/>
</figure></para>
</sect2>
</sect1>
diff --git a/nl_NL.ISO8859-1/books/handbook/virtualization/chapter.xml b/nl_NL.ISO8859-1/books/handbook/virtualization/chapter.xml
index cd75b8e22a..5cfe99dc0a 100644
--- a/nl_NL.ISO8859-1/books/handbook/virtualization/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/virtualization/chapter.xml
@@ -123,7 +123,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd1.png"/>
+ <imagedata fileref="virtualization/parallels-freebsd1"/>
</imageobject>
</mediaobject>
@@ -135,25 +135,25 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd2.png"/>
+ <imagedata fileref="virtualization/parallels-freebsd2"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd3.png"/>
+ <imagedata fileref="virtualization/parallels-freebsd3"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd4.png"/>
+ <imagedata fileref="virtualization/parallels-freebsd4"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd5.png"/>
+ <imagedata fileref="virtualization/parallels-freebsd5"/>
</imageobject>
</mediaobject>
@@ -161,13 +161,13 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd6.png"/>
+ <imagedata fileref="virtualization/parallels-freebsd6"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd7.png"/>
+ <imagedata fileref="virtualization/parallels-freebsd7"/>
</imageobject>
</mediaobject>
@@ -175,13 +175,13 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd8.png"/>
+ <imagedata fileref="virtualization/parallels-freebsd8"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd9.png"/>
+ <imagedata fileref="virtualization/parallels-freebsd9"/>
</imageobject>
</mediaobject>
@@ -199,7 +199,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd11.png"/>
+ <imagedata fileref="virtualization/parallels-freebsd11"/>
</imageobject>
</mediaobject>
@@ -212,7 +212,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd10.png"/>
+ <imagedata fileref="virtualization/parallels-freebsd10"/>
</imageobject>
</mediaobject>
@@ -224,7 +224,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd12.png"/>
+ <imagedata fileref="virtualization/parallels-freebsd12"/>
</imageobject>
</mediaobject>
@@ -233,7 +233,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd13.png"/>
+ <imagedata fileref="virtualization/parallels-freebsd13"/>
</imageobject>
</mediaobject>
</sect3>
@@ -625,13 +625,13 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd1.png"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd1"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd2.png"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd2"/>
</imageobject>
</mediaobject>
@@ -641,7 +641,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd3.png"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd3"/>
</imageobject>
</mediaobject>
@@ -653,13 +653,13 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd4.png"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd4"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd5.png"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd5"/>
</imageobject>
</mediaobject>
@@ -667,7 +667,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd6.png"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd6"/>
</imageobject>
</mediaobject>
@@ -677,13 +677,13 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd7.png"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd7"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd8.png"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd8"/>
</imageobject>
</mediaobject>
@@ -702,13 +702,13 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd9.png"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd9"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd10.png"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd10"/>
</imageobject>
</mediaobject>
@@ -721,7 +721,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd11.png"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd11"/>
</imageobject>
</mediaobject>
@@ -733,7 +733,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd12.png"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd12"/>
</imageobject>
</mediaobject>
@@ -743,7 +743,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd13.png"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd13"/>
</imageobject>
</mediaobject>
</sect3>
@@ -823,7 +823,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd01.png"/>
+ <imagedata fileref="virtualization/vmware-freebsd01"/>
</imageobject>
</mediaobject>
@@ -832,7 +832,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd02.png"/>
+ <imagedata fileref="virtualization/vmware-freebsd02"/>
</imageobject>
</mediaobject>
@@ -845,7 +845,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd03.png"/>
+ <imagedata fileref="virtualization/vmware-freebsd03"/>
</imageobject>
</mediaobject>
@@ -854,7 +854,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd04.png"/>
+ <imagedata fileref="virtualization/vmware-freebsd04"/>
</imageobject>
</mediaobject>
@@ -862,7 +862,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd05.png"/>
+ <imagedata fileref="virtualization/vmware-freebsd05"/>
</imageobject>
</mediaobject>
@@ -871,7 +871,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd06.png"/>
+ <imagedata fileref="virtualization/vmware-freebsd06"/>
</imageobject>
</mediaobject>
@@ -879,7 +879,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd07.png"/>
+ <imagedata fileref="virtualization/vmware-freebsd07"/>
</imageobject>
</mediaobject>
@@ -888,7 +888,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd08.png"/>
+ <imagedata fileref="virtualization/vmware-freebsd08"/>
</imageobject>
</mediaobject>
@@ -902,7 +902,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd09.png"/>
+ <imagedata fileref="virtualization/vmware-freebsd09"/>
</imageobject>
</mediaobject>
@@ -910,7 +910,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd10.png"/>
+ <imagedata fileref="virtualization/vmware-freebsd10"/>
</imageobject>
</mediaobject>
@@ -920,7 +920,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd11.png"/>
+ <imagedata fileref="virtualization/vmware-freebsd11"/>
</imageobject>
</mediaobject>
@@ -936,7 +936,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd12.png"/>
+ <imagedata fileref="virtualization/vmware-freebsd12"/>
</imageobject>
</mediaobject>
diff --git a/no_NO.ISO8859-1/books/handbook/basics/chapter.xml b/no_NO.ISO8859-1/books/handbook/basics/chapter.xml
index 1e0514c1d5..358ea75876 100644
--- a/no_NO.ISO8859-1/books/handbook/basics/chapter.xml
+++ b/no_NO.ISO8859-1/books/handbook/basics/chapter.xml
@@ -1246,7 +1246,7 @@ total 530
<mediaobject>
<imageobject>
- <imagedata fileref="install/disk-layout.eps" format="EPS">
+ <imagedata fileref="install/disk-layout">
</imageobject>
<textobject>
diff --git a/no_NO.ISO8859-1/books/handbook/install/chapter.xml b/no_NO.ISO8859-1/books/handbook/install/chapter.xml
index 0c8446dd10..1526c41475 100644
--- a/no_NO.ISO8859-1/books/handbook/install/chapter.xml
+++ b/no_NO.ISO8859-1/books/handbook/install/chapter.xml
@@ -825,7 +825,7 @@ Booting [kernel] in 9 seconds... _</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/userconfig.png" format="PNG">
+ <imagedata fileref="install/userconfig">
</imageobject>
</mediaobject>
</figure>
@@ -865,7 +865,7 @@ Booting [kernel] in 9 seconds... _</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/userconfig2.png" format="PNG">
+ <imagedata fileref="install/userconfig2">
</imageobject>
</mediaobject>
</figure>
@@ -892,7 +892,7 @@ Booting [kernel] in 9 seconds... _</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/hdwrconf.png" format="PNG">
+ <imagedata fileref="install/hdwrconf">
</imageobject>
</mediaobject>
</figure>
@@ -961,7 +961,7 @@ Booting [kernel] in 9 seconds... _</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/probstart.png" format="PNG">
+ <imagedata fileref="install/probstart">
</imageobject>
</mediaobject>
</figure>
@@ -986,7 +986,7 @@ Booting [kernel] in 9 seconds... _</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/main1.png" format="PNG">
+ <imagedata fileref="install/main1">
</imageobject>
</mediaobject>
</figure>
@@ -1090,7 +1090,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/sysinstall-exit.png" format="PNG">
+ <imagedata fileref="install/sysinstall-exit">
</imageobject>
</mediaobject>
</figure>
@@ -1141,7 +1141,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main1.png" format="PNG">
+ <imagedata fileref="install/main1">
</imageobject>
</mediaobject>
</figure>
@@ -1157,7 +1157,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main-doc.png" format="PNG">
+ <imagedata fileref="install/main-doc">
</imageobject>
</mediaobject>
</figure>
@@ -1169,7 +1169,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/docmenu1.png" format="PNG">
+ <imagedata fileref="install/docmenu1">
</imageobject>
</mediaobject>
</figure>
@@ -1198,7 +1198,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main-keymap.png" format="PNG">
+ <imagedata fileref="install/main-keymap">
</imageobject>
</mediaobject>
</figure>
@@ -1218,7 +1218,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/keymap.png" format="PNG">
+ <imagedata fileref="install/keymap">
</imageobject>
</mediaobject>
</figure>
@@ -1236,7 +1236,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main-options.png" format="PNG">
+ <imagedata fileref="install/main-options">
</imageobject>
</mediaobject>
</figure>
@@ -1246,7 +1246,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/options.png" format="PNG">
+ <imagedata fileref="install/options">
</imageobject>
</mediaobject>
</figure>
@@ -1278,7 +1278,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main-std.png" format="PNG">
+ <imagedata fileref="install/main-std">
</imageobject>
</mediaobject>
</figure>
@@ -1802,7 +1802,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disk-layout.eps" format="EPS">
+ <imagedata fileref="install/disk-layout">
</imageobject>
<textobject>
@@ -1877,7 +1877,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/fdisk-drive1.png" format="PNG">
+ <imagedata fileref="install/fdisk-drive1">
</imageobject>
</mediaobject>
</figure>
@@ -1939,7 +1939,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/fdisk-edit1.png" format="PNG">
+ <imagedata fileref="install/fdisk-edit1">
</imageobject>
</mediaobject>
</figure>
@@ -1977,7 +1977,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/fdisk-edit2.png" format="PNG">
+ <imagedata fileref="install/fdisk-edit2">
</imageobject>
</mediaobject>
</figure>
@@ -2013,7 +2013,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/boot-mgr.png" format="PNG">
+ <imagedata fileref="install/boot-mgr">
</imageobject>
</mediaobject>
</figure>
@@ -2037,7 +2037,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/fdisk-drive2.png" format="PNG">
+ <imagedata fileref="install/fdisk-drive2">
</imageobject>
</mediaobject>
</figure>
@@ -2261,7 +2261,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-ed1.png" format="PNG">
+ <imagedata fileref="install/disklabel-ed1">
</imageobject>
</mediaobject>
</figure>
@@ -2287,7 +2287,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-auto.png" format="PNG">
+ <imagedata fileref="install/disklabel-auto">
</imageobject>
</mediaobject>
</figure>
@@ -2311,7 +2311,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-root1.png" format="PNG">
+ <imagedata fileref="install/disklabel-root1">
</imageobject>
</mediaobject>
</figure>
@@ -2329,7 +2329,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-root2.png" format="PNG">
+ <imagedata fileref="install/disklabel-root2">
</imageobject>
</mediaobject>
</figure>
@@ -2346,7 +2346,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-fs.png" format="PNG">
+ <imagedata fileref="install/disklabel-fs">
</imageobject>
</mediaobject>
</figure>
@@ -2362,7 +2362,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-root3.png" format="PNG">
+ <imagedata fileref="install/disklabel-root3">
</imageobject>
</mediaobject>
</figure>
@@ -2383,7 +2383,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-ed2.png" format="PNG">
+ <imagedata fileref="install/disklabel-ed2">
</imageobject>
</mediaobject>
</figure>
@@ -2442,7 +2442,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/dist-set.png" format="PNG">
+ <imagedata fileref="install/dist-set">
</imageobject>
</mediaobject>
</figure>
@@ -2491,7 +2491,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/dist-set2.png" format="PNG">
+ <imagedata fileref="install/dist-set2">
</imageobject>
</mediaobject>
</figure>
@@ -2524,7 +2524,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/media.png" format="PNG">
+ <imagedata fileref="install/media">
</imageobject>
</mediaobject>
</figure>
@@ -2717,7 +2717,7 @@ installation menus to try and retry whichever operations have failed.
<mediaobject>
<imageobject>
- <imagedata fileref="install/ed0-conf.png" format="PNG">
+ <imagedata fileref="install/ed0-conf">
</imageobject>
</mediaobject>
</figure>
@@ -2761,7 +2761,7 @@ installation menus to try and retry whichever operations have failed.
<mediaobject>
<imageobject>
- <imagedata fileref="install/ed0-conf2.png" format="PNG">
+ <imagedata fileref="install/ed0-conf2">
</imageobject>
</mediaobject>
</figure>
@@ -2922,7 +2922,7 @@ use the current settings.
<mediaobject>
<imageobject>
- <imagedata fileref="install/edit-inetd-conf.png" format="PNG">
+ <imagedata fileref="install/edit-inetd-conf">
</imageobject>
</mediaobject>
</figure>
@@ -2966,7 +2966,7 @@ use the current settings.
<mediaobject>
<imageobject>
- <imagedata fileref="install/ftp-anon1.png" format="PNG">
+ <imagedata fileref="install/ftp-anon1">
</imageobject>
</mediaobject>
</figure>
@@ -3016,7 +3016,7 @@ Upload subdirectory:
<mediaobject>
<imageobject>
- <imagedata fileref="install/ftp-anon2.png" format="PNG">
+ <imagedata fileref="install/ftp-anon2">
</imageobject>
</mediaobject>
</figure>
@@ -3071,7 +3071,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/nfs-server-edit.png" format="PNG">
+ <imagedata fileref="install/nfs-server-edit">
</imageobject>
</mediaobject>
</figure>
@@ -3215,7 +3215,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/security.png" format="PNG">
+ <imagedata fileref="install/security">
</imageobject>
</mediaobject>
</figure>
@@ -3295,7 +3295,7 @@ To change any of these settings later, edit /etc/rc.conf
<title>Systemets konsollopsjoner</title>
<mediaobject>
<imageobject>
- <imagedata fileref="install/console-saver1.png" format="PNG">
+ <imagedata fileref="install/console-saver1">
</imageobject>
</mediaobject>
</figure>
@@ -3309,7 +3309,7 @@ To change any of these settings later, edit /etc/rc.conf
<mediaobject>
<imageobject>
- <imagedata fileref="install/console-saver2.png" format="PNG">
+ <imagedata fileref="install/console-saver2">
</imageobject>
</mediaobject>
</figure>
@@ -3329,7 +3329,7 @@ To change any of these settings later, edit /etc/rc.conf
<mediaobject>
<imageobject>
- <imagedata fileref="install/console-saver3.png" format="PNG">
+ <imagedata fileref="install/console-saver3">
</imageobject>
</mediaobject>
</figure>
@@ -3343,7 +3343,7 @@ To change any of these settings later, edit /etc/rc.conf
<mediaobject>
<imageobject>
- <imagedata fileref="install/console-saver4.png" format="PNG">
+ <imagedata fileref="install/console-saver4">
</imageobject>
</mediaobject>
</figure>
@@ -3385,7 +3385,7 @@ To change any of these settings later, edit /etc/rc.conf
<mediaobject>
<imageobject>
- <imagedata fileref="install/timezone1.png" format="PNG">
+ <imagedata fileref="install/timezone1">
</imageobject>
</mediaobject>
</figure>
@@ -3398,7 +3398,7 @@ To change any of these settings later, edit /etc/rc.conf
<mediaobject>
<imageobject>
- <imagedata fileref="install/timezone2.png" format="PNG">
+ <imagedata fileref="install/timezone2">
</imageobject>
</mediaobject>
</figure>
@@ -3411,7 +3411,7 @@ To change any of these settings later, edit /etc/rc.conf
<mediaobject>
<imageobject>
- <imagedata fileref="install/timezone3.png" format="PNG">
+ <imagedata fileref="install/timezone3">
</imageobject>
</mediaobject>
</figure>
@@ -3476,7 +3476,7 @@ To change any of these settings later, edit /etc/rc.conf
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse1.png" format="PNG">
+ <imagedata fileref="install/mouse1">
</imageobject>
</mediaobject>
</figure>
@@ -3489,7 +3489,7 @@ To change any of these settings later, edit /etc/rc.conf
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse2.png" format="PNG">
+ <imagedata fileref="install/mouse2">
</imageobject>
</mediaobject>
</figure>
@@ -3504,7 +3504,7 @@ To change any of these settings later, edit /etc/rc.conf
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse3.png" format="PNG">
+ <imagedata fileref="install/mouse3">
</imageobject>
</mediaobject>
</figure>
@@ -3517,7 +3517,7 @@ To change any of these settings later, edit /etc/rc.conf
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse4.png" format="PNG">
+ <imagedata fileref="install/mouse4">
</imageobject>
</mediaobject>
</figure>
@@ -3531,7 +3531,7 @@ To change any of these settings later, edit /etc/rc.conf
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse5.png" format="PNG">
+ <imagedata fileref="install/mouse5">
</imageobject>
</mediaobject>
</figure>
@@ -3543,7 +3543,7 @@ To change any of these settings later, edit /etc/rc.conf
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse6.png" format="PNG">
+ <imagedata fileref="install/mouse6">
</imageobject>
</mediaobject>
</figure>
@@ -3598,7 +3598,7 @@ To change any of these settings later, edit /etc/rc.conf
<mediaobject>
<imageobject>
- <imagedata fileref="install/xf86setup.png" format="PNG">
+ <imagedata fileref="install/xf86setup">
</imageobject>
</mediaobject>
</figure>
@@ -4109,7 +4109,7 @@ failed. Would you like to try again?
<mediaobject>
<imageobject>
- <imagedata fileref="install/desktop.png" format="PNG">
+ <imagedata fileref="install/desktop">
</imageobject>
</mediaobject>
</figure>
@@ -4146,7 +4146,7 @@ failed. Would you like to try again?
<mediaobject>
<imageobject>
- <imagedata fileref="install/pkg-cat.png" format="PNG">
+ <imagedata fileref="install/pkg-cat">
</imageobject>
</mediaobject>
</figure>
@@ -4170,7 +4170,7 @@ failed. Would you like to try again?
<mediaobject>
<imageobject>
- <imagedata fileref="install/pkg-sel.png" format="PNG">
+ <imagedata fileref="install/pkg-sel">
</imageobject>
</mediaobject>
</figure>
@@ -4197,7 +4197,7 @@ failed. Would you like to try again?
<mediaobject>
<imageobject>
- <imagedata fileref="install/pkg-install.png" format="PNG">
+ <imagedata fileref="install/pkg-install">
</imageobject>
</mediaobject>
</figure>
@@ -4211,7 +4211,7 @@ failed. Would you like to try again?
<mediaobject>
<imageobject>
- <imagedata fileref="install/pkg-confirm.png" format="PNG">
+ <imagedata fileref="install/pkg-confirm">
</imageobject>
</mediaobject>
</figure>
@@ -4249,7 +4249,7 @@ failed. Would you like to try again?
<mediaobject>
<imageobject>
- <imagedata fileref="install/adduser1.png" format="PNG">
+ <imagedata fileref="install/adduser1">
</imageobject>
</mediaobject>
</figure>
@@ -4262,7 +4262,7 @@ failed. Would you like to try again?
<mediaobject>
<imageobject>
- <imagedata fileref="install/adduser2.png" format="PNG">
+ <imagedata fileref="install/adduser2">
</imageobject>
</mediaobject>
</figure>
@@ -4360,7 +4360,7 @@ failed. Would you like to try again?
<mediaobject>
<imageobject>
- <imagedata fileref="install/adduser3.png" format="PNG">
+ <imagedata fileref="install/adduser3">
</imageobject>
</mediaobject>
</figure>
@@ -4422,7 +4422,7 @@ failed. Would you like to try again?
<mediaobject>
<imageobject>
- <imagedata fileref="install/mainexit.png" format="PNG">
+ <imagedata fileref="install/mainexit">
</imageobject>
</mediaobject>
</figure>
diff --git a/pl_PL.ISO8859-2/books/handbook/advanced-networking/chapter.xml b/pl_PL.ISO8859-2/books/handbook/advanced-networking/chapter.xml
index 24811ff299..c23d4afc19 100644
--- a/pl_PL.ISO8859-2/books/handbook/advanced-networking/chapter.xml
+++ b/pl_PL.ISO8859-2/books/handbook/advanced-networking/chapter.xml
@@ -278,7 +278,7 @@ host2.example.com link#1 UC 0 0
<mediaobject>
<imageobject>
- <imagedata fileref="advanced-networking/net-routing.pic"/>
+ <imagedata fileref="advanced-networking/net-routing"/>
</imageobject>
<textobject>
@@ -464,7 +464,7 @@ host2.example.com link#1 UC 0 0
<mediaobject>
<imageobject>
- <imagedata fileref="advanced-networking/static-routes.pic"/>
+ <imagedata fileref="advanced-networking/static-routes"/>
</imageobject>
<textobject>
@@ -3455,7 +3455,7 @@ cd /usr/src/etc; make distribution</programlisting>
<mediaobject>
<imageobject>
- <imagedata fileref="advanced-networking/isdn-bus.eps"/>
+ <imagedata fileref="advanced-networking/isdn-bus"/>
</imageobject>
<textobject>
@@ -3489,7 +3489,7 @@ ISDN BRI line</literallayout>
<mediaobject>
<imageobject>
- <imagedata fileref="advanced-networking/isdn-twisted-pair.eps"/>
+ <imagedata fileref="advanced-networking/isdn-twisted-pair"/>
</imageobject>
<textobject>
@@ -3592,7 +3592,7 @@ ISDN BRI line</literallayout>
<mediaobject>
<imageobject>
- <imagedata fileref="advanced-networking/natd.eps"/>
+ <imagedata fileref="advanced-networking/natd"/>
</imageobject>
<textobject>
diff --git a/pl_PL.ISO8859-2/books/handbook/basics/chapter.xml b/pl_PL.ISO8859-2/books/handbook/basics/chapter.xml
index 96bcb23408..c42ab01bea 100644
--- a/pl_PL.ISO8859-2/books/handbook/basics/chapter.xml
+++ b/pl_PL.ISO8859-2/books/handbook/basics/chapter.xml
@@ -987,7 +987,7 @@ total 530
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir1.eps" format="EPS"/>
+ <imagedata fileref="install/example-dir1"/>
</imageobject>
<textobject>
@@ -1007,7 +1007,7 @@ total 530
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir2.eps" format="EPS"/>
+ <imagedata fileref="install/example-dir2"/>
</imageobject>
<textobject>
@@ -1036,7 +1036,7 @@ total 530
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir3.eps" format="EPS"/>
+ <imagedata fileref="install/example-dir3"/>
</imageobject>
<textobject>
@@ -1062,7 +1062,7 @@ total 530
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir4.eps" format="EPS"/>
+ <imagedata fileref="install/example-dir4"/>
</imageobject>
<textobject>
@@ -1088,7 +1088,7 @@ total 530
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir5.eps" format="EPS"/>
+ <imagedata fileref="install/example-dir5"/>
</imageobject>
<textobject>
@@ -1400,7 +1400,7 @@ total 530
<mediaobject>
<imageobject>
- <imagedata fileref="install/disk-layout.eps" format="EPS"/>
+ <imagedata fileref="install/disk-layout"/>
</imageobject>
<textobject>
diff --git a/pl_PL.ISO8859-2/books/handbook/geom/chapter.xml b/pl_PL.ISO8859-2/books/handbook/geom/chapter.xml
index 662fc56e84..2026d043cc 100644
--- a/pl_PL.ISO8859-2/books/handbook/geom/chapter.xml
+++ b/pl_PL.ISO8859-2/books/handbook/geom/chapter.xml
@@ -137,7 +137,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="geom/striping.pic" align="center"/>
+ <imagedata fileref="geom/striping" align="center"/>
</imageobject>
<textobject>
diff --git a/pl_PL.ISO8859-2/books/handbook/install/chapter.xml b/pl_PL.ISO8859-2/books/handbook/install/chapter.xml
index a7cb41476d..d3bac689a7 100644
--- a/pl_PL.ISO8859-2/books/handbook/install/chapter.xml
+++ b/pl_PL.ISO8859-2/books/handbook/install/chapter.xml
@@ -1014,7 +1014,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/sysinstall-exit.png" format="PNG"/>
+ <imagedata fileref="install/sysinstall-exit"/>
</imageobject>
</mediaobject>
</figure>
@@ -1071,7 +1071,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main1.png" format="PNG"/>
+ <imagedata fileref="install/main1"/>
</imageobject>
</mediaobject>
</figure>
@@ -1087,7 +1087,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main-doc.png" format="PNG"/>
+ <imagedata fileref="install/main-doc"/>
</imageobject>
</mediaobject>
</figure>
@@ -1099,7 +1099,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/docmenu1.png" format="PNG"/>
+ <imagedata fileref="install/docmenu1"/>
</imageobject>
</mediaobject>
</figure>
@@ -1130,7 +1130,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main-keymap.png" format="PNG"/>
+ <imagedata fileref="install/main-keymap"/>
</imageobject>
</mediaobject>
</figure>
@@ -1151,7 +1151,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/keymap.png" format="PNG"/>
+ <imagedata fileref="install/keymap"/>
</imageobject>
</mediaobject>
</figure>
@@ -1169,7 +1169,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main-options.png" format="PNG"/>
+ <imagedata fileref="install/main-options"/>
</imageobject>
</mediaobject>
</figure>
@@ -1179,7 +1179,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/options.png" format="PNG"/>
+ <imagedata fileref="install/options"/>
</imageobject>
</mediaobject>
</figure>
@@ -1213,7 +1213,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main-std.png" format="PNG"/>
+ <imagedata fileref="install/main-std"/>
</imageobject>
</mediaobject>
</figure>
@@ -1372,7 +1372,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/fdisk-drive1.png" format="PNG"/>
+ <imagedata fileref="install/fdisk-drive1"/>
</imageobject>
</mediaobject>
</figure>
@@ -1439,7 +1439,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/fdisk-edit1.png" format="PNG"/>
+ <imagedata fileref="install/fdisk-edit1"/>
</imageobject>
</mediaobject>
</figure>
@@ -1486,7 +1486,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/fdisk-edit2.png" format="PNG"/>
+ <imagedata fileref="install/fdisk-edit2"/>
</imageobject>
</mediaobject>
</figure>
@@ -1531,7 +1531,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/boot-mgr.png" format="PNG"/>
+ <imagedata fileref="install/boot-mgr"/>
</imageobject>
</mediaobject>
</figure>
@@ -1562,7 +1562,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/fdisk-drive2.png" format="PNG"/>
+ <imagedata fileref="install/fdisk-drive2"/>
</imageobject>
</mediaobject>
</figure>
@@ -1800,7 +1800,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-ed1.png" format="PNG"/>
+ <imagedata fileref="install/disklabel-ed1"/>
</imageobject>
</mediaobject>
</figure>
@@ -1825,7 +1825,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-auto.png" format="PNG"/>
+ <imagedata fileref="install/disklabel-auto"/>
</imageobject>
</mediaobject>
</figure>
@@ -1859,7 +1859,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-root1.png" format="PNG"/>
+ <imagedata fileref="install/disklabel-root1"/>
</imageobject>
</mediaobject>
</figure>
@@ -1877,7 +1877,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-root2.png" format="PNG"/>
+ <imagedata fileref="install/disklabel-root2"/>
</imageobject>
</mediaobject>
</figure>
@@ -1893,7 +1893,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-fs.png" format="PNG"/>
+ <imagedata fileref="install/disklabel-fs"/>
</imageobject>
</mediaobject>
</figure>
@@ -1910,7 +1910,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-root3.png" format="PNG"/>
+ <imagedata fileref="install/disklabel-root3"/>
</imageobject>
</mediaobject>
</figure>
@@ -1933,7 +1933,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-ed2.png" format="PNG"/>
+ <imagedata fileref="install/disklabel-ed2"/>
</imageobject>
</mediaobject>
</figure>
@@ -1990,7 +1990,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/dist-set.png" format="PNG"/>
+ <imagedata fileref="install/dist-set"/>
</imageobject>
</mediaobject>
</figure>
@@ -2042,7 +2042,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/dist-set2.png" format="PNG"/>
+ <imagedata fileref="install/dist-set2"/>
</imageobject>
</mediaobject>
</figure>
@@ -2077,7 +2077,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/media.png" format="PNG"/>
+ <imagedata fileref="install/media"/>
</imageobject>
</mediaobject>
</figure>
@@ -2279,7 +2279,7 @@ installation menus to retry whichever operations have failed.
<mediaobject>
<imageobject>
- <imagedata fileref="install/ed0-conf.png" format="PNG"/>
+ <imagedata fileref="install/ed0-conf"/>
</imageobject>
</mediaobject>
</figure>
@@ -2323,7 +2323,7 @@ installation menus to retry whichever operations have failed.
<mediaobject>
<imageobject>
- <imagedata fileref="install/ed0-conf2.png" format="PNG"/>
+ <imagedata fileref="install/ed0-conf2"/>
</imageobject>
</mediaobject>
</figure>
@@ -2492,7 +2492,7 @@ use the current settings.
<mediaobject>
<imageobject>
- <imagedata fileref="install/edit-inetd-conf.png" format="PNG"/>
+ <imagedata fileref="install/edit-inetd-conf"/>
</imageobject>
</mediaobject>
</figure>
@@ -2542,7 +2542,7 @@ use the current settings.
<mediaobject>
<imageobject>
- <imagedata fileref="install/ftp-anon1.png" format="PNG"/>
+ <imagedata fileref="install/ftp-anon1"/>
</imageobject>
</mediaobject>
</figure>
@@ -2595,7 +2595,7 @@ Upload subdirectory:
<mediaobject>
<imageobject>
- <imagedata fileref="install/ftp-anon2.png" format="PNG"/>
+ <imagedata fileref="install/ftp-anon2"/>
</imageobject>
</mediaobject>
</figure>
@@ -2656,7 +2656,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/nfs-server-edit.png" format="PNG"/>
+ <imagedata fileref="install/nfs-server-edit"/>
</imageobject>
</mediaobject>
</figure>
@@ -2806,7 +2806,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/security.png" format="PNG"/>
+ <imagedata fileref="install/security"/>
</imageobject>
</mediaobject>
</figure>
@@ -2887,7 +2887,7 @@ To change any of these settings later, edit /etc/rc.conf
<mediaobject>
<imageobject>
- <imagedata fileref="install/console-saver1.png" format="PNG"/>
+ <imagedata fileref="install/console-saver1"/>
</imageobject>
</mediaobject>
</figure>
@@ -2901,7 +2901,7 @@ To change any of these settings later, edit /etc/rc.conf
<mediaobject>
<imageobject>
- <imagedata fileref="install/console-saver2.png" format="PNG"/>
+ <imagedata fileref="install/console-saver2"/>
</imageobject>
</mediaobject>
</figure>
@@ -2921,7 +2921,7 @@ To change any of these settings later, edit /etc/rc.conf
<mediaobject>
<imageobject>
- <imagedata fileref="install/console-saver3.png" format="PNG"/>
+ <imagedata fileref="install/console-saver3"/>
</imageobject>
</mediaobject>
</figure>
@@ -2935,7 +2935,7 @@ To change any of these settings later, edit /etc/rc.conf
<mediaobject>
<imageobject>
- <imagedata fileref="install/console-saver4.png" format="PNG"/>
+ <imagedata fileref="install/console-saver4"/>
</imageobject>
</mediaobject>
</figure>
@@ -2981,7 +2981,7 @@ To change any of these settings later, edit /etc/rc.conf
<mediaobject>
<imageobject>
- <imagedata fileref="install/timezone1.png" format="PNG"/>
+ <imagedata fileref="install/timezone1"/>
</imageobject>
</mediaobject>
</figure>
@@ -2994,7 +2994,7 @@ To change any of these settings later, edit /etc/rc.conf
<mediaobject>
<imageobject>
- <imagedata fileref="install/timezone2.png" format="PNG"/>
+ <imagedata fileref="install/timezone2"/>
</imageobject>
</mediaobject>
</figure>
@@ -3007,7 +3007,7 @@ To change any of these settings later, edit /etc/rc.conf
<mediaobject>
<imageobject>
- <imagedata fileref="install/timezone3.png" format="PNG"/>
+ <imagedata fileref="install/timezone3"/>
</imageobject>
</mediaobject>
</figure>
@@ -3070,7 +3070,7 @@ To change any of these settings later, edit /etc/rc.conf
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse1.png" format="PNG"/>
+ <imagedata fileref="install/mouse1"/>
</imageobject>
</mediaobject>
</figure>
@@ -3083,7 +3083,7 @@ To change any of these settings later, edit /etc/rc.conf
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse2.png" format="PNG"/>
+ <imagedata fileref="install/mouse2"/>
</imageobject>
</mediaobject>
</figure>
@@ -3099,7 +3099,7 @@ To change any of these settings later, edit /etc/rc.conf
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse3.png" format="PNG"/>
+ <imagedata fileref="install/mouse3"/>
</imageobject>
</mediaobject>
</figure>
@@ -3112,7 +3112,7 @@ To change any of these settings later, edit /etc/rc.conf
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse4.png" format="PNG"/>
+ <imagedata fileref="install/mouse4"/>
</imageobject>
</mediaobject>
</figure>
@@ -3127,7 +3127,7 @@ To change any of these settings later, edit /etc/rc.conf
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse5.png" format="PNG"/>
+ <imagedata fileref="install/mouse5"/>
</imageobject>
</mediaobject>
</figure>
@@ -3142,7 +3142,7 @@ To change any of these settings later, edit /etc/rc.conf
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse6.png" format="PNG"/>
+ <imagedata fileref="install/mouse6"/>
</imageobject>
</mediaobject>
</figure>
@@ -3202,7 +3202,7 @@ To change any of these settings later, edit /etc/rc.conf
<mediaobject>
<imageobject>
- <imagedata fileref="install/net-config-menu1.png" format="PNG"/>
+ <imagedata fileref="install/net-config-menu1"/>
</imageobject>
</mediaobject>
</figure>
@@ -3266,7 +3266,7 @@ To change any of these settings later, edit /etc/rc.conf
<mediaobject>
<imageobject>
- <imagedata fileref="install/mta-main.png" format="PNG"/>
+ <imagedata fileref="install/mta-main"/>
</imageobject>
</mediaobject>
</figure>
@@ -3316,7 +3316,7 @@ To change any of these settings later, edit /etc/rc.conf
<mediaobject>
<imageobject>
- <imagedata fileref="install/ntp-config.png" format="PNG"/>
+ <imagedata fileref="install/ntp-config"/>
</imageobject>
</mediaobject>
</figure>
@@ -3337,7 +3337,7 @@ To change any of these settings later, edit /etc/rc.conf
<mediaobject>
<imageobject>
- <imagedata fileref="install/net-config-menu2.png" format="PNG"/>
+ <imagedata fileref="install/net-config-menu2"/>
</imageobject>
</mediaobject>
</figure>
@@ -3442,7 +3442,7 @@ To change any of these settings later, edit /etc/rc.conf
<mediaobject>
<imageobject>
- <imagedata fileref="install/xf86setup.png" format="PNG"/>
+ <imagedata fileref="install/xf86setup"/>
</imageobject>
</mediaobject>
</figure>
@@ -3959,7 +3959,7 @@ failed. Would you like to try again?
<mediaobject>
<imageobject>
- <imagedata fileref="install/desktop.png" format="PNG"/>
+ <imagedata fileref="install/desktop"/>
</imageobject>
</mediaobject>
</figure>
@@ -3995,7 +3995,7 @@ failed. Would you like to try again?
<mediaobject>
<imageobject>
- <imagedata fileref="install/pkg-cat.png" format="PNG"/>
+ <imagedata fileref="install/pkg-cat"/>
</imageobject>
</mediaobject>
</figure>
@@ -4015,7 +4015,7 @@ failed. Would you like to try again?
<mediaobject>
<imageobject>
- <imagedata fileref="install/pkg-sel.png" format="PNG"/>
+ <imagedata fileref="install/pkg-sel"/>
</imageobject>
</mediaobject>
</figure>
@@ -4041,7 +4041,7 @@ failed. Would you like to try again?
<mediaobject>
<imageobject>
- <imagedata fileref="install/pkg-install.png" format="PNG"/>
+ <imagedata fileref="install/pkg-install"/>
</imageobject>
</mediaobject>
</figure>
@@ -4055,7 +4055,7 @@ failed. Would you like to try again?
<mediaobject>
<imageobject>
- <imagedata fileref="install/pkg-confirm.png" format="PNG"/>
+ <imagedata fileref="install/pkg-confirm"/>
</imageobject>
</mediaobject>
</figure>
@@ -4095,7 +4095,7 @@ failed. Would you like to try again?
<mediaobject>
<imageobject>
- <imagedata fileref="install/adduser1.png" format="PNG"/>
+ <imagedata fileref="install/adduser1"/>
</imageobject>
</mediaobject>
</figure>
@@ -4108,7 +4108,7 @@ failed. Would you like to try again?
<mediaobject>
<imageobject>
- <imagedata fileref="install/adduser2.png" format="PNG"/>
+ <imagedata fileref="install/adduser2"/>
</imageobject>
</mediaobject>
</figure>
@@ -4206,7 +4206,7 @@ failed. Would you like to try again?
<mediaobject>
<imageobject>
- <imagedata fileref="install/adduser3.png" format="PNG"/>
+ <imagedata fileref="install/adduser3"/>
</imageobject>
</mediaobject>
</figure>
@@ -4272,7 +4272,7 @@ Retype new password :</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/mainexit.png" format="PNG"/>
+ <imagedata fileref="install/mainexit"/>
</imageobject>
</mediaobject>
</figure>
diff --git a/pl_PL.ISO8859-2/books/handbook/mail/chapter.xml b/pl_PL.ISO8859-2/books/handbook/mail/chapter.xml
index 1d6906bf50..7edc1659c9 100644
--- a/pl_PL.ISO8859-2/books/handbook/mail/chapter.xml
+++ b/pl_PL.ISO8859-2/books/handbook/mail/chapter.xml
@@ -1968,7 +1968,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/mutt1.png" format="PNG"/>
+ <imagedata fileref="mail/mutt1"/>
</imageobject>
</mediaobject>
@@ -1979,7 +1979,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/mutt2.png" format="PNG"/>
+ <imagedata fileref="mail/mutt2"/>
</imageobject>
</mediaobject>
@@ -2011,7 +2011,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/mutt3.png" format="PNG"/>
+ <imagedata fileref="mail/mutt3"/>
</imageobject>
</mediaobject>
@@ -2059,7 +2059,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine1.png" format="PNG"/>
+ <imagedata fileref="mail/pine1"/>
</imageobject>
</mediaobject>
@@ -2077,7 +2077,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine2.png" format="PNG"/>
+ <imagedata fileref="mail/pine2"/>
</imageobject>
</mediaobject>
@@ -2088,7 +2088,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine3.png" format="PNG"/>
+ <imagedata fileref="mail/pine3"/>
</imageobject>
</mediaobject>
@@ -2101,7 +2101,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine4.png" format="PNG"/>
+ <imagedata fileref="mail/pine4"/>
</imageobject>
</mediaobject>
@@ -2118,7 +2118,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine5.png" format="PNG"/>
+ <imagedata fileref="mail/pine5"/>
</imageobject>
</mediaobject>
diff --git a/pl_PL.ISO8859-2/books/handbook/security/chapter.xml b/pl_PL.ISO8859-2/books/handbook/security/chapter.xml
index 5e3d21ece0..3da3d06fc4 100644
--- a/pl_PL.ISO8859-2/books/handbook/security/chapter.xml
+++ b/pl_PL.ISO8859-2/books/handbook/security/chapter.xml
@@ -3276,7 +3276,7 @@ options IPSEC_DEBUG #debug for IP security
<mediaobject>
<imageobject>
- <imagedata fileref="security/ipsec-network.pic" align="center"/>
+ <imagedata fileref="security/ipsec-network" align="center"/>
</imageobject>
<textobject>
@@ -3770,7 +3770,7 @@ ipfw add 1 allow udp from W.X.Y.Z to A.B.C.D isakmp
<mediaobject>
<imageobject>
- <imagedata fileref="security/ipsec-out-pkt.pic" align="center"/>
+ <imagedata fileref="security/ipsec-out-pkt" align="center"/>
</imageobject>
<textobject>
@@ -3790,7 +3790,7 @@ ipfw add 1 allow udp from W.X.Y.Z to A.B.C.D isakmp
<mediaobject>
<imageobject>
- <imagedata fileref="security/ipsec-encap-pkt.pic" align="center"/>
+ <imagedata fileref="security/ipsec-encap-pkt" align="center"/>
</imageobject>
<textobject>
@@ -3924,7 +3924,7 @@ ipfw add 1 allow ipencap from W.X.Y.Z to A.B.C.D
<mediaobject>
<imageobject>
- <imagedata fileref="security/ipsec-crypt-pkt.pic" align="center"/>
+ <imagedata fileref="security/ipsec-crypt-pkt" align="center"/>
</imageobject>
<textobject>
diff --git a/pl_PL.ISO8859-2/books/handbook/vinum/chapter.xml b/pl_PL.ISO8859-2/books/handbook/vinum/chapter.xml
index 2b5c2abba2..f25d496c46 100644
--- a/pl_PL.ISO8859-2/books/handbook/vinum/chapter.xml
+++ b/pl_PL.ISO8859-2/books/handbook/vinum/chapter.xml
@@ -175,7 +175,7 @@ disk storage, and an introduction to the Vinum Volume Manager.</para>
<para>
<figure id="vinum-concat">
<title>Concatenated Organization</title>
- <graphic fileref="vinum/vinum-concat.pic"/>
+ <graphic fileref="vinum/vinum-concat"/>
</figure>
</para>
@@ -214,7 +214,7 @@ disk storage, and an introduction to the Vinum Volume Manager.</para>
<para>
<figure id="vinum-striped">
<title>Striped Organization</title>
- <graphic fileref="vinum/vinum-striped.pic"/>
+ <graphic fileref="vinum/vinum-striped"/>
</figure>
</para>
</sect1>
@@ -284,7 +284,7 @@ disk storage, and an introduction to the Vinum Volume Manager.</para>
<para>
<figure id="vinum-raid5-org">
<title>RAID-5 Organization</title>
- <graphic fileref="vinum/vinum-raid5-org.pic"/>
+ <graphic fileref="vinum/vinum-raid5-org"/>
</figure>
</para>
@@ -560,7 +560,7 @@ disk storage, and an introduction to the Vinum Volume Manager.</para>
<para>
<figure id="vinum-simple-vol">
<title>A Simple Vinum Volume</title>
- <graphic fileref="vinum/vinum-simple-vol.pic"/>
+ <graphic fileref="vinum/vinum-simple-vol"/>
</figure>
</para>
@@ -628,7 +628,7 @@ disk storage, and an introduction to the Vinum Volume Manager.</para>
<para>
<figure id="vinum-mirrored-vol">
<title>A Mirrored Vinum Volume</title>
- <graphic fileref="vinum/vinum-mirrored-vol.pic"/>
+ <graphic fileref="vinum/vinum-mirrored-vol"/>
</figure>
</para>
@@ -695,7 +695,7 @@ disk storage, and an introduction to the Vinum Volume Manager.</para>
<para>
<figure id="vinum-striped-vol">
<title>A Striped Vinum Volume</title>
- <graphic fileref="vinum/vinum-striped-vol.pic"/>
+ <graphic fileref="vinum/vinum-striped-vol"/>
</figure>
</para>
@@ -739,7 +739,7 @@ disk storage, and an introduction to the Vinum Volume Manager.</para>
<para>
<figure id="vinum-raid10-vol">
<title>A Mirrored, Striped Vinum Volume</title>
- <graphic fileref="vinum/vinum-raid10-vol.pic"/>
+ <graphic fileref="vinum/vinum-raid10-vol"/>
</figure>
</para>
</sect2>
diff --git a/pt_BR.ISO8859-1/articles/building-products/article.xml b/pt_BR.ISO8859-1/articles/building-products/article.xml
index b5bfbed8e2..c0b954bcfe 100644
--- a/pt_BR.ISO8859-1/articles/building-products/article.xml
+++ b/pt_BR.ISO8859-1/articles/building-products/article.xml
@@ -451,7 +451,7 @@
<title>Organiza��o do FreeBSD</title>
<mediaobject>
<imageobject>
- <imagedata fileref="freebsd-organization.pic" format="PIC"/>
+ <imagedata fileref="freebsd-organization"/>
</imageobject>
</mediaobject>
</figure>
@@ -510,7 +510,7 @@
<title>Ramos de vers�es do FreeBSD</title>
<mediaobject>
<imageobject>
- <imagedata fileref="freebsd-branches.eps" format="EPS"/>
+ <imagedata fileref="freebsd-branches"/>
</imageobject>
</mediaobject>
</figure>
diff --git a/pt_BR.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml b/pt_BR.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml
index 7c524df1c7..b623738add 100644
--- a/pt_BR.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml
+++ b/pt_BR.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml
@@ -2673,7 +2673,7 @@ bom valor para <replaceable>n</replaceable>.</para>
<programlisting><mediaobject>
<imageobject>
- <imagedata fileref="fig1.png"> <co id="co-image-ext"/>
+ <imagedata fileref="fig1"> <co id="co-image-ext"/>
</imageobject>
<textobject>
@@ -2792,7 +2792,7 @@ IMAGES+= fig3.png
<programlisting><mediaobject>
<imageobject>
- <imagedata fileref="chapter1/fig1.png"> <co id="co-image-dir"/>
+ <imagedata fileref="chapter1/fig1"> <co id="co-image-dir"/>
</imageobject>
…
diff --git a/ru_RU.KOI8-R/articles/console-server/article.xml b/ru_RU.KOI8-R/articles/console-server/article.xml
index 3a8b8bb845..c34796f78f 100644
--- a/ru_RU.KOI8-R/articles/console-server/article.xml
+++ b/ru_RU.KOI8-R/articles/console-server/article.xml
@@ -851,7 +851,7 @@ exit 0</programlisting>
<mediaobject>
<imageobject>
- <imagedata fileref="tk0231-9-1.png"/>
+ <imagedata fileref="tk0231-9-1"/>
</imageobject>
<textobject>
diff --git a/ru_RU.KOI8-R/articles/gjournal-desktop/article.xml b/ru_RU.KOI8-R/articles/gjournal-desktop/article.xml
index 18ca8654cb..7db8724ea9 100644
--- a/ru_RU.KOI8-R/articles/gjournal-desktop/article.xml
+++ b/ru_RU.KOI8-R/articles/gjournal-desktop/article.xml
@@ -253,7 +253,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="disklabel1.png"/>
+ <imagedata fileref="disklabel1"/>
</imageobject>
</mediaobject>
@@ -315,7 +315,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="disklabel2.png"/>
+ <imagedata fileref="disklabel2"/>
</imageobject>
</mediaobject>
diff --git a/ru_RU.KOI8-R/articles/releng/article.xml b/ru_RU.KOI8-R/articles/releng/article.xml
index 946b5feb94..d7b388de0b 100644
--- a/ru_RU.KOI8-R/articles/releng/article.xml
+++ b/ru_RU.KOI8-R/articles/releng/article.xml
@@ -302,7 +302,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="branches-head.pic" align="center"/>
+ <imagedata fileref="branches-head" align="center"/>
</imageobject>
<textobject>
@@ -312,7 +312,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="branches-releng3.pic" align="center"/>
+ <imagedata fileref="branches-releng3" align="center"/>
</imageobject>
<textobject>
@@ -322,7 +322,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="branches-releng4.pic" align="center"/>
+ <imagedata fileref="branches-releng4" align="center"/>
</imageobject>
<textobject>
@@ -332,7 +332,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="branches-releng5.pic" align="center"/>
+ <imagedata fileref="branches-releng5" align="center"/>
</imageobject>
<textobject>
@@ -342,7 +342,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="branches-releng6.pic" align="center"/>
+ <imagedata fileref="branches-releng6" align="center"/>
</imageobject>
<textobject>
@@ -352,7 +352,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="branches-releng7.pic" align="center"/>
+ <imagedata fileref="branches-releng7" align="center"/>
</imageobject>
<textobject>
@@ -362,7 +362,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="branches-releng8.pic" align="center"/>
+ <imagedata fileref="branches-releng8" align="center"/>
</imageobject>
<textobject>
@@ -372,7 +372,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="branches-releng9.pic" align="center"/>
+ <imagedata fileref="branches-releng9" align="center"/>
</imageobject>
<textobject>
diff --git a/ru_RU.KOI8-R/articles/vm-design/article.xml b/ru_RU.KOI8-R/articles/vm-design/article.xml
index ad438a04c7..319b4d2ce6 100644
--- a/ru_RU.KOI8-R/articles/vm-design/article.xml
+++ b/ru_RU.KOI8-R/articles/vm-design/article.xml
@@ -207,7 +207,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="fig1.eps" format="EPS"/>
+ <imagedata fileref="fig1"/>
</imageobject>
<textobject>
@@ -230,7 +230,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="fig2.eps" format="EPS"/>
+ <imagedata fileref="fig2"/>
</imageobject>
<textobject>
@@ -251,7 +251,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="fig3.eps" format="EPS"/>
+ <imagedata fileref="fig3"/>
</imageobject>
<textobject>
@@ -283,7 +283,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="fig4.eps" format="EPS"/>
+ <imagedata fileref="fig4"/>
</imageobject>
<textobject>
diff --git a/ru_RU.KOI8-R/books/design-44bsd/book.xml b/ru_RU.KOI8-R/books/design-44bsd/book.xml
index 26e4264480..c165b07f77 100644
--- a/ru_RU.KOI8-R/books/design-44bsd/book.xml
+++ b/ru_RU.KOI8-R/books/design-44bsd/book.xml
@@ -600,7 +600,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="fig1.eps" format="EPS">
+ <imagedata fileref="fig1">
</imageobject>
<textobject>
@@ -1375,7 +1375,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="fig2.eps" format="EPS">
+ <imagedata fileref="fig2">
</imageobject>
<textobject>
diff --git a/ru_RU.KOI8-R/books/fdp-primer/sgml-markup/chapter.xml b/ru_RU.KOI8-R/books/fdp-primer/sgml-markup/chapter.xml
index 1109c9007b..9b10080ff7 100644
--- a/ru_RU.KOI8-R/books/fdp-primer/sgml-markup/chapter.xml
+++ b/ru_RU.KOI8-R/books/fdp-primer/sgml-markup/chapter.xml
@@ -2416,7 +2416,7 @@ tion</replaceable>;</literal>
<programlisting><mediaobject>
<imageobject>
- <imagedata fileref="fig1.png"> <co id="co-image-ext">
+ <imagedata fileref="fig1"> <co id="co-image-ext">
</imageobject>
<textobject>
@@ -2522,7 +2522,7 @@ IMAGES+= fig3.png
<programlisting><mediaobject>
<imageobject>
- <imagedata fileref="chapter1/fig1.png"> <co id="co-image-dir">
+ <imagedata fileref="chapter1/fig1"> <co id="co-image-dir">
</imageobject>
…
diff --git a/ru_RU.KOI8-R/books/handbook/advanced-networking/chapter.xml b/ru_RU.KOI8-R/books/handbook/advanced-networking/chapter.xml
index bac2e30479..8daf304fa4 100644
--- a/ru_RU.KOI8-R/books/handbook/advanced-networking/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/advanced-networking/chapter.xml
@@ -298,7 +298,7 @@ host2.example.com link#1 UC 0 0
<mediaobject>
<imageobject>
- <imagedata fileref="advanced-networking/net-routing.pic"/>
+ <imagedata fileref="advanced-networking/net-routing"/>
</imageobject>
<textobject>
@@ -491,7 +491,7 @@ host2.example.com link#1 UC 0 0
<mediaobject>
<imageobject>
- <imagedata fileref="advanced-networking/static-routes.pic"/>
+ <imagedata fileref="advanced-networking/static-routes"/>
</imageobject>
<textobject>
@@ -3060,7 +3060,7 @@ cd /usr/src/etc; make distribution</programlisting>
<mediaobject>
<imageobject>
- <imagedata fileref="advanced-networking/isdn-bus.eps"/>
+ <imagedata fileref="advanced-networking/isdn-bus"/>
</imageobject>
<textobject>
@@ -3094,7 +3094,7 @@ cd /usr/src/etc; make distribution</programlisting>
<mediaobject>
<imageobject>
- <imagedata fileref="advanced-networking/isdn-twisted-pair.eps"/>
+ <imagedata fileref="advanced-networking/isdn-twisted-pair"/>
</imageobject>
<textobject>
@@ -3212,7 +3212,7 @@ cd /usr/src/etc; make distribution</programlisting>
<mediaobject>
<imageobject>
- <imagedata fileref="advanced-networking/natd.eps"/>
+ <imagedata fileref="advanced-networking/natd"/>
</imageobject>
<textobject>
diff --git a/ru_RU.KOI8-R/books/handbook/basics/chapter.xml b/ru_RU.KOI8-R/books/handbook/basics/chapter.xml
index f94809e0eb..aa7b3d870e 100644
--- a/ru_RU.KOI8-R/books/handbook/basics/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/basics/chapter.xml
@@ -1166,7 +1166,7 @@ root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01 passwd</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir1.eps" format="EPS"/>
+ <imagedata fileref="install/example-dir1"/>
</imageobject>
<textobject>
@@ -1186,7 +1186,7 @@ root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01 passwd</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir2.eps" format="EPS"/>
+ <imagedata fileref="install/example-dir2"/>
</imageobject>
<textobject>
@@ -1214,7 +1214,7 @@ root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01 passwd</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir3.eps" format="EPS"/>
+ <imagedata fileref="install/example-dir3"/>
</imageobject>
<textobject>
@@ -1240,7 +1240,7 @@ root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01 passwd</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir4.eps" format="EPS"/>
+ <imagedata fileref="install/example-dir4"/>
</imageobject>
<textobject>
@@ -1266,7 +1266,7 @@ root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01 passwd</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir5.eps" format="EPS"/>
+ <imagedata fileref="install/example-dir5"/>
</imageobject>
<textobject>
@@ -1580,7 +1580,7 @@ root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01 passwd</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/disk-layout.eps" format="EPS"/>
+ <imagedata fileref="install/disk-layout"/>
</imageobject>
<textobject>
diff --git a/ru_RU.KOI8-R/books/handbook/bsdinstall/chapter.xml b/ru_RU.KOI8-R/books/handbook/bsdinstall/chapter.xml
index 058f84cd2d..e7aa56b42e 100644
--- a/ru_RU.KOI8-R/books/handbook/bsdinstall/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/bsdinstall/chapter.xml
@@ -669,8 +669,8 @@ Loading /boot/defaults/loader.conf
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-boot-loader-menu.png"
- format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-boot-loader-menu"
+ />
</imageobject>
</mediaobject>
</figure>
@@ -957,8 +957,8 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-choose-mode.png"
- format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-choose-mode"
+ />
</imageobject>
</mediaobject>
</figure>
@@ -1001,8 +1001,8 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-keymap-select-default.png"
- format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-keymap-select-default"
+ />
</imageobject>
</mediaobject>
</figure>
@@ -1017,8 +1017,8 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-config-keymap.png"
- format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-config-keymap"
+ />
</imageobject>
</mediaobject>
</figure>
@@ -1047,8 +1047,8 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-config-hostname.png"
- format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-config-hostname"
+ />
</imageobject>
</mediaobject>
</figure>
@@ -1068,8 +1068,8 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-config-components.png"
- format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-config-components"
+ />
</imageobject>
</mediaobject>
</figure>
@@ -1155,8 +1155,8 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-netinstall-files.png"
- format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-netinstall-files"
+ />
</imageobject>
</mediaobject>
</figure>
@@ -1174,8 +1174,8 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-netinstall-mirrorselect.png"
- format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-netinstall-mirrorselect"
+ />
</imageobject>
</mediaobject>
</figure>
@@ -1201,8 +1201,8 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-part-guided-manual.png"
- format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-part-guided-manual"
+ />
</imageobject>
</mediaobject>
</figure>
@@ -1218,8 +1218,8 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-part-guided-disk.png"
- format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-part-guided-disk"
+ />
</imageobject>
</mediaobject>
</figure>
@@ -1235,8 +1235,8 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-part-entire-part.png"
- format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-part-entire-part"
+ />
</imageobject>
</mediaobject>
</figure>
@@ -1256,8 +1256,8 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-part-review.png"
- format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-part-review"
+ />
</imageobject>
</mediaobject>
</figure>
@@ -1273,8 +1273,8 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-part-manual-create.png"
- format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-part-manual-create"
+ />
</imageobject>
</mediaobject>
</figure>
@@ -1289,8 +1289,8 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-part-manual-partscheme.png"
- format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-part-manual-partscheme"
+ />
</imageobject>
</mediaobject>
</figure>
@@ -1374,8 +1374,8 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-part-manual-addpart.png"
- format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-part-manual-addpart"
+ />
</imageobject>
</mediaobject>
</figure>
@@ -1547,8 +1547,8 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-final-confirmation.png"
- format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-final-confirmation"
+ />
</imageobject>
</mediaobject>
</figure>
@@ -1577,8 +1577,8 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-distfile-fetching.png"
- format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-distfile-fetching"
+ />
</imageobject>
</mediaobject>
</figure>
@@ -1592,8 +1592,8 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-distfile-verifying.png"
- format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-distfile-verifying"
+ />
</imageobject>
</mediaobject>
</figure>
@@ -1605,8 +1605,8 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-distfile-extracting.png"
- format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-distfile-extracting"
+ />
</imageobject>
</mediaobject>
</figure>
@@ -1638,8 +1638,8 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-post-root-passwd.png"
- format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-post-root-passwd"
+ />
</imageobject>
</mediaobject>
</figure>
@@ -1665,8 +1665,8 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-configure-network-interface.png"
- format="PNG"/>
+ fileref="bsdinstall/bsdinstall-configure-network-interface"
+ />
</imageobject>
</mediaobject>
</figure>
@@ -1699,8 +1699,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-configure-wireless-scan.png"
- format="PNG"/>
+ fileref="bsdinstall/bsdinstall-configure-wireless-scan"/>
</imageobject>
</mediaobject>
</figure>
@@ -1721,8 +1720,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-configure-wireless-accesspoints.png"
- format="PNG"/>
+ fileref="bsdinstall/bsdinstall-configure-wireless-accesspoints"/>
</imageobject>
</mediaobject>
</figure>
@@ -1741,8 +1739,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-configure-wireless-wpa2setup.png"
- format="PNG"/>
+ fileref="bsdinstall/bsdinstall-configure-wireless-wpa2setup"/>
</imageobject>
</mediaobject>
</figure>
@@ -1762,8 +1759,8 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-ipv4.png"
- format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-ipv4"
+ />
</imageobject>
</mediaobject>
</figure>
@@ -1795,8 +1792,8 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-ipv4-dhcp.png"
- format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-ipv4-dhcp"
+ />
</imageobject>
</mediaobject>
</figure>
@@ -1814,8 +1811,8 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-ipv4-static.png"
- format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-ipv4-static"
+ />
</imageobject>
</mediaobject>
</figure>
@@ -1858,8 +1855,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-ipv6.png"
- format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-ipv6"/>
</imageobject>
</mediaobject>
</figure>
@@ -1884,8 +1880,8 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-slaac.png"
- format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-slaac"
+ />
</imageobject>
</mediaobject>
</figure>
@@ -1903,8 +1899,8 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-ipv6-static.png"
- format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-ipv6-static"
+ />
</imageobject>
</mediaobject>
</figure>
@@ -1949,8 +1945,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-configure-network-ipv4-dns.png"
- format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-configure-network-ipv4-dns"/>
</imageobject>
</mediaobject>
</figure>
@@ -1973,8 +1968,8 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-set-clock-local-utc.png"
- format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-set-clock-local-utc"
+ />
</imageobject>
</mediaobject>
</figure>
@@ -1992,8 +1987,8 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-timezone-region.png"
- format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-timezone-region"
+ />
</imageobject>
</mediaobject>
</figure>
@@ -2006,8 +2001,8 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-timezone-country.png"
- format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-timezone-country"
+ />
</imageobject>
</mediaobject>
</figure>
@@ -2020,8 +2015,8 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-timezone-zone.png"
- format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-timezone-zone"
+ />
</imageobject>
</mediaobject>
</figure>
@@ -2034,8 +2029,8 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-timezone-confirm.png"
- format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-timezone-confirm"
+ />
</imageobject>
</mediaobject>
</figure>
@@ -2058,8 +2053,8 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-config-services.png"
- format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-config-services"
+ />
</imageobject>
</mediaobject>
</figure>
@@ -2108,8 +2103,8 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-config-crashdump.png"
- format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-config-crashdump"
+ />
</imageobject>
</mediaobject>
</figure>
@@ -2133,7 +2128,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-adduser1.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-adduser1"/>
</imageobject>
</mediaobject>
</figure>
@@ -2145,7 +2140,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-adduser2.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-adduser2"/>
</imageobject>
</mediaobject>
</figure>
@@ -2248,7 +2243,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-adduser3.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-adduser3"/>
</imageobject>
</mediaobject>
</figure>
@@ -2274,8 +2269,8 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-finalconfiguration.png"
- format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-finalconfiguration"
+ />
</imageobject>
</mediaobject>
</figure>
@@ -2331,8 +2326,8 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-final-modification-shell.png"
- format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-final-modification-shell"
+ />
</imageobject>
</mediaobject>
</figure>
@@ -2349,7 +2344,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-mainexit.png" format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-mainexit"/>
</imageobject>
</mediaobject>
</figure>
diff --git a/ru_RU.KOI8-R/books/handbook/geom/chapter.xml b/ru_RU.KOI8-R/books/handbook/geom/chapter.xml
index c9fcebfc43..7e6939a30b 100644
--- a/ru_RU.KOI8-R/books/handbook/geom/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/geom/chapter.xml
@@ -148,7 +148,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="geom/striping.pic" align="center"/>
+ <imagedata fileref="geom/striping" align="center"/>
</imageobject>
<textobject>
diff --git a/ru_RU.KOI8-R/books/handbook/install/chapter.xml b/ru_RU.KOI8-R/books/handbook/install/chapter.xml
index 9eff9fcd72..84775284ee 100644
--- a/ru_RU.KOI8-R/books/handbook/install/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/install/chapter.xml
@@ -1022,7 +1022,7 @@ Insert disk labelled "Kernel floppy 1" and press any key...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/boot-loader-menu.png" format="PNG"/>
+ <imagedata fileref="install/boot-loader-menu"/>
</imageobject>
</mediaobject>
</figure>
@@ -1179,7 +1179,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/config-country.png" format="PNG"/>
+ <imagedata fileref="install/config-country"/>
</imageobject>
</mediaobject>
</figure>
@@ -1195,7 +1195,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/config-keymap.png" format="PNG"/>
+ <imagedata fileref="install/config-keymap"/>
</imageobject>
</mediaobject>
</figure>
@@ -1232,7 +1232,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main1.png" format="PNG"/>
+ <imagedata fileref="install/main1"/>
</imageobject>
</mediaobject>
</figure>
@@ -1248,7 +1248,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main-doc.png" format="PNG"/>
+ <imagedata fileref="install/main-doc"/>
</imageobject>
</mediaobject>
</figure>
@@ -1260,7 +1260,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/docmenu1.png" format="PNG"/>
+ <imagedata fileref="install/docmenu1"/>
</imageobject>
</mediaobject>
</figure>
@@ -1290,7 +1290,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main-keymap.png" format="PNG"/>
+ <imagedata fileref="install/main-keymap"/>
</imageobject>
</mediaobject>
</figure>
@@ -1311,7 +1311,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/keymap.png" format="PNG"/>
+ <imagedata fileref="install/keymap"/>
</imageobject>
</mediaobject>
</figure>
@@ -1329,7 +1329,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main-options.png" format="PNG"/>
+ <imagedata fileref="install/main-options"/>
</imageobject>
</mediaobject>
</figure>
@@ -1339,7 +1339,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/options.png" format="PNG"/>
+ <imagedata fileref="install/options"/>
</imageobject>
</mediaobject>
</figure>
@@ -1375,7 +1375,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main-std.png" format="PNG"/>
+ <imagedata fileref="install/main-std"/>
</imageobject>
</mediaobject>
</figure>
@@ -1553,7 +1553,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/fdisk-drive1.png" format="PNG"/>
+ <imagedata fileref="install/fdisk-drive1"/>
</imageobject>
</mediaobject>
</figure>
@@ -1621,7 +1621,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/fdisk-edit1.png" format="PNG"/>
+ <imagedata fileref="install/fdisk-edit1"/>
</imageobject>
</mediaobject>
</figure>
@@ -1666,7 +1666,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/fdisk-edit2.png" format="PNG"/>
+ <imagedata fileref="install/fdisk-edit2"/>
</imageobject>
</mediaobject>
</figure>
@@ -1709,7 +1709,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/boot-mgr.png" format="PNG"/>
+ <imagedata fileref="install/boot-mgr"/>
</imageobject>
</mediaobject>
</figure>
@@ -1739,7 +1739,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/fdisk-drive2.png" format="PNG"/>
+ <imagedata fileref="install/fdisk-drive2"/>
</imageobject>
</mediaobject>
</figure>
@@ -1988,7 +1988,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-ed1.png" format="PNG"/>
+ <imagedata fileref="install/disklabel-ed1"/>
</imageobject>
</mediaobject>
</figure>
@@ -2016,7 +2016,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-auto.png" format="PNG"/>
+ <imagedata fileref="install/disklabel-auto"/>
</imageobject>
</mediaobject>
</figure>
@@ -2042,7 +2042,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-root1.png" format="PNG"/>
+ <imagedata fileref="install/disklabel-root1"/>
</imageobject>
</mediaobject>
</figure>
@@ -2059,7 +2059,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-root2.png" format="PNG"/>
+ <imagedata fileref="install/disklabel-root2"/>
</imageobject>
</mediaobject>
</figure>
@@ -2076,7 +2076,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-fs.png" format="PNG"/>
+ <imagedata fileref="install/disklabel-fs"/>
</imageobject>
</mediaobject>
</figure>
@@ -2093,7 +2093,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-root3.png" format="PNG"/>
+ <imagedata fileref="install/disklabel-root3"/>
</imageobject>
</mediaobject>
</figure>
@@ -2115,7 +2115,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-ed2.png" format="PNG"/>
+ <imagedata fileref="install/disklabel-ed2"/>
</imageobject>
</mediaobject>
</figure>
@@ -2165,7 +2165,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/dist-set.png" format="PNG"/>
+ <imagedata fileref="install/dist-set"/>
</imageobject>
</mediaobject>
</figure>
@@ -2218,7 +2218,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/dist-set2.png" format="PNG"/>
+ <imagedata fileref="install/dist-set2"/>
</imageobject>
</mediaobject>
</figure>
@@ -2251,7 +2251,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/media.png" format="PNG"/>
+ <imagedata fileref="install/media"/>
</imageobject>
</mediaobject>
</figure>
@@ -2441,7 +2441,7 @@ installation menus to retry whichever operations have failed.
<mediaobject>
<imageobject>
- <imagedata fileref="install/ed0-conf.png" format="PNG"/>
+ <imagedata fileref="install/ed0-conf"/>
</imageobject>
</mediaobject>
</figure>
@@ -2487,7 +2487,7 @@ installation menus to retry whichever operations have failed.
<mediaobject>
<imageobject>
- <imagedata fileref="install/ed0-conf2.png" format="PNG"/>
+ <imagedata fileref="install/ed0-conf2"/>
</imageobject>
</mediaobject>
</figure>
@@ -2658,7 +2658,7 @@ use the current settings.
<mediaobject>
<imageobject>
- <imagedata fileref="install/edit-inetd-conf.png" format="PNG"/>
+ <imagedata fileref="install/edit-inetd-conf"/>
</imageobject>
</mediaobject>
</figure>
@@ -2752,7 +2752,7 @@ use the current settings.
<mediaobject>
<imageobject>
- <imagedata fileref="install/ftp-anon1.png" format="PNG"/>
+ <imagedata fileref="install/ftp-anon1"/>
</imageobject>
</mediaobject>
</figure>
@@ -2831,7 +2831,7 @@ use the current settings.
<mediaobject>
<imageobject>
- <imagedata fileref="install/ftp-anon2.png" format="PNG"/>
+ <imagedata fileref="install/ftp-anon2"/>
</imageobject>
</mediaobject>
</figure>
@@ -2890,7 +2890,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/nfs-server-edit.png" format="PNG"/>
+ <imagedata fileref="install/nfs-server-edit"/>
</imageobject>
</mediaobject>
</figure>
@@ -2940,7 +2940,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/console-saver1.png" format="PNG"/>
+ <imagedata fileref="install/console-saver1"/>
</imageobject>
</mediaobject>
</figure>
@@ -2955,7 +2955,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/console-saver2.png" format="PNG"/>
+ <imagedata fileref="install/console-saver2"/>
</imageobject>
</mediaobject>
</figure>
@@ -2975,7 +2975,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/console-saver3.png" format="PNG"/>
+ <imagedata fileref="install/console-saver3"/>
</imageobject>
</mediaobject>
</figure>
@@ -2989,7 +2989,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/console-saver4.png" format="PNG"/>
+ <imagedata fileref="install/console-saver4"/>
</imageobject>
</mediaobject>
</figure>
@@ -3033,7 +3033,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/timezone1.png" format="PNG"/>
+ <imagedata fileref="install/timezone1"/>
</imageobject>
</mediaobject>
</figure>
@@ -3046,7 +3046,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/timezone2.png" format="PNG"/>
+ <imagedata fileref="install/timezone2"/>
</imageobject>
</mediaobject>
</figure>
@@ -3059,7 +3059,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/timezone3.png" format="PNG"/>
+ <imagedata fileref="install/timezone3"/>
</imageobject>
</mediaobject>
</figure>
@@ -3127,7 +3127,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse1.png" format="PNG"/>
+ <imagedata fileref="install/mouse1"/>
</imageobject>
</mediaobject>
</figure>
@@ -3141,7 +3141,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse2.png" format="PNG"/>
+ <imagedata fileref="install/mouse2"/>
</imageobject>
</mediaobject>
</figure>
@@ -3157,7 +3157,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse3.png" format="PNG"/>
+ <imagedata fileref="install/mouse3"/>
</imageobject>
</mediaobject>
</figure>
@@ -3171,7 +3171,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse4.png" format="PNG"/>
+ <imagedata fileref="install/mouse4"/>
</imageobject>
</mediaobject>
</figure>
@@ -3185,7 +3185,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse5.png" format="PNG"/>
+ <imagedata fileref="install/mouse5"/>
</imageobject>
</mediaobject>
</figure>
@@ -3200,7 +3200,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse6.png" format="PNG"/>
+ <imagedata fileref="install/mouse6"/>
</imageobject>
</mediaobject>
</figure>
@@ -3244,7 +3244,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/pkg-cat.png" format="PNG"/>
+ <imagedata fileref="install/pkg-cat"/>
</imageobject>
</mediaobject>
</figure>
@@ -3265,7 +3265,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/pkg-sel.png" format="PNG"/>
+ <imagedata fileref="install/pkg-sel"/>
</imageobject>
</mediaobject>
</figure>
@@ -3293,7 +3293,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/pkg-install.png" format="PNG"/>
+ <imagedata fileref="install/pkg-install"/>
</imageobject>
</mediaobject>
</figure>
@@ -3307,7 +3307,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/pkg-confirm.png" format="PNG"/>
+ <imagedata fileref="install/pkg-confirm"/>
</imageobject>
</mediaobject>
</figure>
@@ -3348,7 +3348,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/adduser1.png" format="PNG"/>
+ <imagedata fileref="install/adduser1"/>
</imageobject>
</mediaobject>
</figure>
@@ -3361,7 +3361,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/adduser2.png" format="PNG"/>
+ <imagedata fileref="install/adduser2"/>
</imageobject>
</mediaobject>
</figure>
@@ -3463,7 +3463,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/adduser3.png" format="PNG"/>
+ <imagedata fileref="install/adduser3"/>
</imageobject>
</mediaobject>
</figure>
@@ -3525,7 +3525,7 @@ Retype new password :</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/mainexit.png" format="PNG"/>
+ <imagedata fileref="install/mainexit"/>
</imageobject>
</mediaobject>
</figure>
@@ -3602,7 +3602,7 @@ Retype new password :</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/net-config-menu1.png" format="PNG"/>
+ <imagedata fileref="install/net-config-menu1"/>
</imageobject>
</mediaobject>
</figure>
@@ -3672,7 +3672,7 @@ Retype new password :</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/mta-main.png" format="PNG"/>
+ <imagedata fileref="install/mta-main"/>
</imageobject>
</mediaobject>
</figure>
@@ -3726,7 +3726,7 @@ Retype new password :</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/ntp-config.png" format="PNG"/>
+ <imagedata fileref="install/ntp-config"/>
</imageobject>
</mediaobject>
</figure>
@@ -3752,7 +3752,7 @@ Retype new password :</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/net-config-menu2.png" format="PNG"/>
+ <imagedata fileref="install/net-config-menu2"/>
</imageobject>
</mediaobject>
</figure>
diff --git a/ru_RU.KOI8-R/books/handbook/mail/chapter.xml b/ru_RU.KOI8-R/books/handbook/mail/chapter.xml
index 1145dda277..4e0a56613e 100644
--- a/ru_RU.KOI8-R/books/handbook/mail/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/mail/chapter.xml
@@ -2008,7 +2008,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/mutt1.png" format="PNG"/>
+ <imagedata fileref="mail/mutt1"/>
</imageobject>
</mediaobject>
@@ -2019,7 +2019,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/mutt2.png" format="PNG"/>
+ <imagedata fileref="mail/mutt2"/>
</imageobject>
</mediaobject>
@@ -2052,7 +2052,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/mutt3.png" format="PNG"/>
+ <imagedata fileref="mail/mutt3"/>
</imageobject>
</mediaobject>
@@ -2102,7 +2102,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine1.png" format="PNG"/>
+ <imagedata fileref="mail/pine1"/>
</imageobject>
</mediaobject>
@@ -2120,7 +2120,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine2.png" format="PNG"/>
+ <imagedata fileref="mail/pine2"/>
</imageobject>
</mediaobject>
@@ -2130,7 +2130,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine3.png" format="PNG"/>
+ <imagedata fileref="mail/pine3"/>
</imageobject>
</mediaobject>
@@ -2142,7 +2142,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine4.png" format="PNG"/>
+ <imagedata fileref="mail/pine4"/>
</imageobject>
</mediaobject>
@@ -2158,7 +2158,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine5.png" format="PNG"/>
+ <imagedata fileref="mail/pine5"/>
</imageobject>
</mediaobject>
diff --git a/ru_RU.KOI8-R/books/handbook/security/chapter.xml b/ru_RU.KOI8-R/books/handbook/security/chapter.xml
index 65c360dcd9..59d47db0f4 100644
--- a/ru_RU.KOI8-R/books/handbook/security/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/security/chapter.xml
@@ -3266,7 +3266,7 @@ options IPSEC_DEBUG #debug for IP security
<mediaobject>
<imageobject>
- <imagedata fileref="security/ipsec-network.pic" align="center"/>
+ <imagedata fileref="security/ipsec-network" align="center"/>
</imageobject>
<textobject>
@@ -3755,7 +3755,7 @@ ipfw add 1 allow udp from W.X.Y.Z to A.B.C.D isakmp
<mediaobject>
<imageobject>
- <imagedata fileref="security/ipsec-out-pkt.pic" align="center"/>
+ <imagedata fileref="security/ipsec-out-pkt" align="center"/>
</imageobject>
<textobject>
@@ -3775,7 +3775,7 @@ ipfw add 1 allow udp from W.X.Y.Z to A.B.C.D isakmp
<mediaobject>
<imageobject>
- <imagedata fileref="security/ipsec-encap-pkt.pic" align="center"/>
+ <imagedata fileref="security/ipsec-encap-pkt" align="center"/>
</imageobject>
<textobject>
@@ -3911,7 +3911,7 @@ ipfw add 1 allow ipencap from W.X.Y.Z to A.B.C.D
<mediaobject>
<imageobject>
- <imagedata fileref="security/ipsec-crypt-pkt.pic" align="center"/>
+ <imagedata fileref="security/ipsec-crypt-pkt" align="center"/>
</imageobject>
<textobject>
diff --git a/ru_RU.KOI8-R/books/handbook/vinum/chapter.xml b/ru_RU.KOI8-R/books/handbook/vinum/chapter.xml
index 2215cf59de..a15938582d 100644
--- a/ru_RU.KOI8-R/books/handbook/vinum/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/vinum/chapter.xml
@@ -188,7 +188,7 @@
<para>
<figure id="vinum-concat">
<title>����������� ���������� ������</title>
- <graphic fileref="vinum/vinum-concat.pic"/>
+ <graphic fileref="vinum/vinum-concat"/>
</figure>
</para>
@@ -231,7 +231,7 @@
<para>
<figure id="vinum-striped">
<title>����������� � ������������</title>
- <graphic fileref="vinum/vinum-striped.pic"/>
+ <graphic fileref="vinum/vinum-striped"/>
</figure>
</para>
</sect1>
@@ -297,7 +297,7 @@
<para>
<figure id="vinum-raid5-org">
<title>����������� RAID-5</title>
- <graphic fileref="vinum/vinum-raid5-org.pic"/>
+ <graphic fileref="vinum/vinum-raid5-org"/>
</figure>
</para>
@@ -568,7 +568,7 @@
<para>
<figure id="vinum-simple-vol">
<title>������� ��� Vinum</title>
- <graphic fileref="vinum/vinum-simple-vol.pic"/>
+ <graphic fileref="vinum/vinum-simple-vol"/>
</figure>
</para>
@@ -633,7 +633,7 @@
<para>
<figure id="vinum-mirrored-vol">
<title>��������������� ��� Vinum</title>
- <graphic fileref="vinum/vinum-mirrored-vol.pic"/>
+ <graphic fileref="vinum/vinum-mirrored-vol"/>
</figure>
</para>
@@ -699,7 +699,7 @@
<para>
<figure id="vinum-striped-vol">
<title>��� � ������������</title>
- <graphic fileref="vinum/vinum-striped-vol.pic"/>
+ <graphic fileref="vinum/vinum-striped-vol"/>
</figure>
</para>
@@ -744,7 +744,7 @@
<para>
<figure id="vinum-raid10-vol">
<title>��������������� ��� � ������������</title>
- <graphic fileref="vinum/vinum-raid10-vol.pic"/>
+ <graphic fileref="vinum/vinum-raid10-vol"/>
</figure>
</para>
</sect2>
diff --git a/share/xml/freebsd.sch b/share/xml/freebsd.sch
index d4e203cd93..96280fe675 100644
--- a/share/xml/freebsd.sch
+++ b/share/xml/freebsd.sch
@@ -4,8 +4,9 @@
<schema xmlns="http://purl.oclc.org/dsdl/schematron">
<pattern name="Check file reference validity">
- <rule context="//*/@fileref">
- <assert test="contains(., '.')">File reference does not have an extension.</assert>
+ <rule context="//imagedata|//graphic">
+ <report test="contains(@fileref, '.')">Image references cannot have an extension; the proper format is inferred by the output type to generate.</report>
+ <report test="@format">Image format must not be specified; it is inferred by the output type to generate.</report>
</rule>
</pattern>
diff --git a/zh_CN.GB2312/books/handbook/advanced-networking/chapter.xml b/zh_CN.GB2312/books/handbook/advanced-networking/chapter.xml
index 5dbfa119d6..c4b8385eb2 100644
--- a/zh_CN.GB2312/books/handbook/advanced-networking/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/advanced-networking/chapter.xml
@@ -279,7 +279,7 @@ host2.example.com link#1 UC 0 0
<mediaobject>
<imageobject>
- <imagedata fileref="advanced-networking/net-routing.pic"/>
+ <imagedata fileref="advanced-networking/net-routing"/>
</imageobject>
<textobject>
@@ -462,7 +462,7 @@ host2.example.com link#1 UC 0 0
<mediaobject>
<imageobject>
- <imagedata fileref="advanced-networking/static-routes.pic"/>
+ <imagedata fileref="advanced-networking/static-routes"/>
</imageobject>
<textobject>
@@ -4354,7 +4354,7 @@ Received 264951 bytes in 0.1 seconds</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="advanced-networking/isdn-bus.eps"/>
+ <imagedata fileref="advanced-networking/isdn-bus"/>
</imageobject>
<textobject>
@@ -4385,7 +4385,7 @@ ISDN BRI line</literallayout>
<mediaobject>
<imageobject>
- <imagedata fileref="advanced-networking/isdn-twisted-pair.eps"/>
+ <imagedata fileref="advanced-networking/isdn-twisted-pair"/>
</imageobject>
<textobject>
@@ -4492,7 +4492,7 @@ ISDN BRI line</literallayout>
<mediaobject>
<imageobject>
- <imagedata fileref="advanced-networking/natd.eps"/>
+ <imagedata fileref="advanced-networking/natd"/>
</imageobject>
<textobject>
<literallayout class="monospaced"> _______ __________ ________
diff --git a/zh_CN.GB2312/books/handbook/basics/chapter.xml b/zh_CN.GB2312/books/handbook/basics/chapter.xml
index c4a8c9988c..455095761c 100644
--- a/zh_CN.GB2312/books/handbook/basics/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/basics/chapter.xml
@@ -1049,7 +1049,7 @@ root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01 passwd</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir1.eps" format="EPS"/>
+ <imagedata fileref="install/example-dir1"/>
</imageobject>
<textobject>
@@ -1069,7 +1069,7 @@ root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01 passwd</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir2.eps" format="EPS"/>
+ <imagedata fileref="install/example-dir2"/>
</imageobject>
<textobject>
@@ -1102,7 +1102,7 @@ root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01 passwd</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir3.eps" format="EPS"/>
+ <imagedata fileref="install/example-dir3"/>
</imageobject>
<textobject>
@@ -1128,7 +1128,7 @@ root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01 passwd</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir4.eps" format="EPS"/>
+ <imagedata fileref="install/example-dir4"/>
</imageobject>
<textobject>
@@ -1153,7 +1153,7 @@ root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01 passwd</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir5.eps" format="EPS"/>
+ <imagedata fileref="install/example-dir5"/>
</imageobject>
<textobject>
@@ -1445,7 +1445,7 @@ root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01 passwd</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/disk-layout.eps" format="EPS"/>
+ <imagedata fileref="install/disk-layout"/>
</imageobject>
<textobject>
diff --git a/zh_CN.GB2312/books/handbook/bsdinstall/chapter.xml b/zh_CN.GB2312/books/handbook/bsdinstall/chapter.xml
index 92fed93a45..5798715c08 100644
--- a/zh_CN.GB2312/books/handbook/bsdinstall/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/bsdinstall/chapter.xml
@@ -582,8 +582,8 @@ Loading /boot/defaults/loader.conf
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-boot-loader-menu.png"
- format="PNG"/>
+ fileref="bsdinstall/bsdinstall-boot-loader-menu"
+ />
</imageobject>
</mediaobject>
</figure>
@@ -848,8 +848,8 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>ѡ��װ���ʵ�ʹ�÷�ʽ</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-choose-mode.png"
- format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-choose-mode"
+ />
</imageobject>
</mediaobject>
</figure>
@@ -892,8 +892,8 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-keymap-select-default.png"
- format="PNG"/>
+ fileref="bsdinstall/bsdinstall-keymap-select-default"
+ />
</imageobject>
</mediaobject>
</figure>
@@ -905,8 +905,8 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>����ѡ��˵�</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-config-keymap.png"
- format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-config-keymap"
+ />
</imageobject>
</mediaobject>
</figure>
@@ -932,8 +932,8 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>����������</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-config-hostname.png"
- format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-config-hostname"
+ />
</imageobject>
</mediaobject>
</figure>
@@ -954,8 +954,8 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-config-components.png"
- format="PNG"/>
+ fileref="bsdinstall/bsdinstall-config-components"
+ />
</imageobject>
</mediaobject>
</figure>
@@ -1027,8 +1027,8 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-netinstall-files.png"
- format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-netinstall-files"
+ />
</imageobject>
</mediaobject>
</figure>
@@ -1044,8 +1044,8 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-netinstall-mirrorselect.png"
- format="PNG"/>
+ fileref="bsdinstall/bsdinstall-netinstall-mirrorselect"
+ />
</imageobject>
</mediaobject>
</figure>
@@ -1069,8 +1069,8 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-part-guided-manual.png"
- format="PNG"/>
+ fileref="bsdinstall/bsdinstall-part-guided-manual"
+ />
</imageobject>
</mediaobject>
</figure>
@@ -1085,8 +1085,8 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-part-guided-disk.png"
- format="PNG"/>
+ fileref="bsdinstall/bsdinstall-part-guided-disk"
+ />
</imageobject>
</mediaobject>
</figure>
@@ -1104,8 +1104,8 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-part-entire-part.png"
- format="PNG"/>
+ fileref="bsdinstall/bsdinstall-part-entire-part"
+ />
</imageobject>
</mediaobject>
</figure>
@@ -1122,8 +1122,8 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<title>����Ѵ�������</title>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-part-review.png"
- format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-part-review"
+ />
</imageobject>
</mediaobject>
</figure>
@@ -1140,8 +1140,8 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-part-manual-create.png"
- format="PNG"/>
+ fileref="bsdinstall/bsdinstall-part-manual-create"
+ />
</imageobject>
</mediaobject>
</figure>
@@ -1156,8 +1156,8 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-part-manual-partscheme.png"
- format="PNG"/>
+ fileref="bsdinstall/bsdinstall-part-manual-partscheme"
+ />
</imageobject>
</mediaobject>
</figure>
@@ -1237,8 +1237,8 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-part-manual-addpart.png"
- format="PNG"/>
+ fileref="bsdinstall/bsdinstall-part-manual-addpart"
+ />
</imageobject>
</mediaobject>
</figure>
@@ -1391,8 +1391,8 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-final-confirmation.png"
- format="PNG"/>
+ fileref="bsdinstall/bsdinstall-final-confirmation"
+ />
</imageobject>
</mediaobject>
</figure>
@@ -1419,8 +1419,8 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-distfile-fetching.png"
- format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-distfile-fetching"
+ />
</imageobject>
</mediaobject>
</figure>
@@ -1434,8 +1434,8 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-distfile-verifying.png"
- format="PNG"/>
+ fileref="bsdinstall/bsdinstall-distfile-verifying"
+ />
</imageobject>
</mediaobject>
</figure>
@@ -1448,8 +1448,8 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-distfile-extracting.png"
- format="PNG"/>
+ fileref="bsdinstall/bsdinstall-distfile-extracting"
+ />
</imageobject>
</mediaobject>
</figure>
@@ -1478,8 +1478,8 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-post-root-passwd.png"
- format="PNG"/>
+ fileref="bsdinstall/bsdinstall-post-root-passwd"
+ />
</imageobject>
</mediaobject>
</figure>
@@ -1504,8 +1504,8 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-configure-network-interface.png"
- format="PNG"/>
+ fileref="bsdinstall/bsdinstall-configure-network-interface"
+ />
</imageobject>
</mediaobject>
</figure>
@@ -1537,8 +1537,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-configure-wireless-scan.png"
- format="PNG"/>
+ fileref="bsdinstall/bsdinstall-configure-wireless-scan"/>
</imageobject>
</mediaobject>
</figure>
@@ -1558,8 +1557,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-configure-wireless-accesspoints.png"
- format="PNG"/>
+ fileref="bsdinstall/bsdinstall-configure-wireless-accesspoints"/>
</imageobject>
</mediaobject>
</figure>
@@ -1577,8 +1575,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-configure-wireless-wpa2setup.png"
- format="PNG"/>
+ fileref="bsdinstall/bsdinstall-configure-wireless-wpa2setup"/>
</imageobject>
</mediaobject>
</figure>
@@ -1598,8 +1595,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-configure-network-interface-ipv4.png"
- format="PNG"/>
+ fileref="bsdinstall/bsdinstall-configure-network-interface-ipv4"/>
</imageobject>
</mediaobject>
</figure>
@@ -1629,8 +1625,8 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-configure-network-interface-ipv4-dhcp.png"
- format="PNG"/>
+ fileref="bsdinstall/bsdinstall-configure-network-interface-ipv4-dhcp"
+ />
</imageobject>
</mediaobject>
</figure>
@@ -1647,8 +1643,8 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-configure-network-interface-ipv4-static.png"
- format="PNG"/>
+ fileref="bsdinstall/bsdinstall-configure-network-interface-ipv4-static"
+ />
</imageobject>
</mediaobject>
</figure>
@@ -1689,8 +1685,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-configure-network-interface-ipv6.png"
- format="PNG"/>
+ fileref="bsdinstall/bsdinstall-configure-network-interface-ipv6"/>
</imageobject>
</mediaobject>
</figure>
@@ -1716,8 +1711,8 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-configure-network-interface-slaac.png"
- format="PNG"/>
+ fileref="bsdinstall/bsdinstall-configure-network-interface-slaac"
+ />
</imageobject>
</mediaobject>
</figure>
@@ -1734,8 +1729,8 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-configure-network-interface-ipv6-static.png"
- format="PNG"/>
+ fileref="bsdinstall/bsdinstall-configure-network-interface-ipv6-static"
+ />
</imageobject>
</mediaobject>
</figure>
@@ -1778,8 +1773,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-configure-network-ipv4-dns.png"
- format="PNG"/>
+ fileref="bsdinstall/bsdinstall-configure-network-ipv4-dns"/>
</imageobject>
</mediaobject>
</figure>
@@ -1801,8 +1795,8 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-set-clock-local-utc.png"
- format="PNG"/>
+ fileref="bsdinstall/bsdinstall-set-clock-local-utc"
+ />
</imageobject>
</mediaobject>
</figure>
@@ -1818,8 +1812,8 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-timezone-region.png"
- format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-timezone-region"
+ />
</imageobject>
</mediaobject>
</figure>
@@ -1832,8 +1826,8 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-timezone-country.png"
- format="PNG"/>
+ fileref="bsdinstall/bsdinstall-timezone-country"
+ />
</imageobject>
</mediaobject>
</figure>
@@ -1845,8 +1839,8 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-timezone-zone.png"
- format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-timezone-zone"
+ />
</imageobject>
</mediaobject>
</figure>
@@ -1859,8 +1853,8 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-timezone-confirm.png"
- format="PNG"/>
+ fileref="bsdinstall/bsdinstall-timezone-confirm"
+ />
</imageobject>
</mediaobject>
</figure>
@@ -1880,8 +1874,8 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-config-services.png"
- format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-config-services"
+ />
</imageobject>
</mediaobject>
</figure>
@@ -1927,8 +1921,8 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-config-crashdump.png"
- format="PNG"/>
+ fileref="bsdinstall/bsdinstall-config-crashdump"
+ />
</imageobject>
</mediaobject>
</figure>
@@ -1950,8 +1944,8 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-adduser1.png"
- format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-adduser1"
+ />
</imageobject>
</mediaobject>
</figure>
@@ -1963,8 +1957,8 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-adduser2.png"
- format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-adduser2"
+ />
</imageobject>
</mediaobject>
</figure>
@@ -2056,8 +2050,8 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-adduser3.png"
- format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-adduser3"
+ />
</imageobject>
</mediaobject>
</figure>
@@ -2080,8 +2074,8 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-finalconfiguration.png"
- format="PNG"/>
+ fileref="bsdinstall/bsdinstall-finalconfiguration"
+ />
</imageobject>
</mediaobject>
</figure>
@@ -2136,8 +2130,8 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
<imagedata
- fileref="bsdinstall/bsdinstall-final-modification-shell.png"
- format="PNG"/>
+ fileref="bsdinstall/bsdinstall-final-modification-shell"
+ />
</imageobject>
</mediaobject>
</figure>
@@ -2153,8 +2147,8 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="bsdinstall/bsdinstall-mainexit.png"
- format="PNG"/>
+ <imagedata fileref="bsdinstall/bsdinstall-mainexit"
+ />
</imageobject>
</mediaobject>
</figure>
diff --git a/zh_CN.GB2312/books/handbook/geom/chapter.xml b/zh_CN.GB2312/books/handbook/geom/chapter.xml
index 92156cacaf..cbf6ca6033 100644
--- a/zh_CN.GB2312/books/handbook/geom/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/geom/chapter.xml
@@ -128,7 +128,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="geom/striping.pic" align="center"/>
+ <imagedata fileref="geom/striping" align="center"/>
</imageobject>
<textobject>
diff --git a/zh_CN.GB2312/books/handbook/install/chapter.xml b/zh_CN.GB2312/books/handbook/install/chapter.xml
index 8de343e445..ae349ee96d 100644
--- a/zh_CN.GB2312/books/handbook/install/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/install/chapter.xml
@@ -863,7 +863,7 @@ Insert disk labelled "Kernel floppy 1" and press any key...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/boot-loader-menu.png" format="PNG"/>
+ <imagedata fileref="install/boot-loader-menu"/>
</imageobject>
</mediaobject>
</figure>
@@ -1021,7 +1021,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/config-country.png" format="PNG"/>
+ <imagedata fileref="install/config-country"/>
</imageobject>
</mediaobject>
</figure>
@@ -1036,7 +1036,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/config-keymap.png" format="PNG"/>
+ <imagedata fileref="install/config-keymap"/>
</imageobject>
</mediaobject>
</figure>
@@ -1046,7 +1046,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/sysinstall-exit.png" format="PNG"/>
+ <imagedata fileref="install/sysinstall-exit"/>
</imageobject>
</mediaobject>
</figure>
@@ -1092,7 +1092,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main1.png" format="PNG"/>
+ <imagedata fileref="install/main1"/>
</imageobject>
</mediaobject>
</figure>
@@ -1108,7 +1108,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main-doc.png" format="PNG"/>
+ <imagedata fileref="install/main-doc"/>
</imageobject>
</mediaobject>
</figure>
@@ -1120,7 +1120,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/docmenu1.png" format="PNG"/>
+ <imagedata fileref="install/docmenu1"/>
</imageobject>
</mediaobject>
</figure>
@@ -1148,7 +1148,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main-keymap.png" format="PNG"/>
+ <imagedata fileref="install/main-keymap"/>
</imageobject>
</mediaobject>
</figure>
@@ -1167,7 +1167,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/keymap.png" format="PNG"/>
+ <imagedata fileref="install/keymap"/>
</imageobject>
</mediaobject>
</figure>
@@ -1185,7 +1185,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main-options.png" format="PNG"/>
+ <imagedata fileref="install/main-options"/>
</imageobject>
</mediaobject>
</figure>
@@ -1195,7 +1195,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/options.png" format="PNG"/>
+ <imagedata fileref="install/options"/>
</imageobject>
</mediaobject>
</figure>
@@ -1226,7 +1226,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main-std.png" format="PNG"/>
+ <imagedata fileref="install/main-std"/>
</imageobject>
</mediaobject>
</figure>
@@ -1364,7 +1364,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/fdisk-drive1.png" format="PNG"/>
+ <imagedata fileref="install/fdisk-drive1"/>
</imageobject>
</mediaobject>
</figure>
@@ -1421,7 +1421,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/fdisk-edit1.png" format="PNG"/>
+ <imagedata fileref="install/fdisk-edit1"/>
</imageobject>
</mediaobject>
</figure>
@@ -1459,7 +1459,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/fdisk-edit2.png" format="PNG"/>
+ <imagedata fileref="install/fdisk-edit2"/>
</imageobject>
</mediaobject>
</figure>
@@ -1500,7 +1500,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/boot-mgr.png" format="PNG"/>
+ <imagedata fileref="install/boot-mgr"/>
</imageobject>
</mediaobject>
</figure>
@@ -1527,7 +1527,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/fdisk-drive2.png" format="PNG"/>
+ <imagedata fileref="install/fdisk-drive2"/>
</imageobject>
</mediaobject>
</figure>
@@ -1753,7 +1753,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-ed1.png" format="PNG"/>
+ <imagedata fileref="install/disklabel-ed1"/>
</imageobject>
</mediaobject>
</figure>
@@ -1778,7 +1778,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-auto.png" format="PNG"/>
+ <imagedata fileref="install/disklabel-auto"/>
</imageobject>
</mediaobject>
</figure>
@@ -1803,7 +1803,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-root1.png" format="PNG"/>
+ <imagedata fileref="install/disklabel-root1"/>
</imageobject>
</mediaobject>
</figure>
@@ -1820,7 +1820,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-root2.png" format="PNG"/>
+ <imagedata fileref="install/disklabel-root2"/>
</imageobject>
</mediaobject>
</figure>
@@ -1835,7 +1835,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-fs.png" format="PNG"/>
+ <imagedata fileref="install/disklabel-fs"/>
</imageobject>
</mediaobject>
</figure>
@@ -1851,7 +1851,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-root3.png" format="PNG"/>
+ <imagedata fileref="install/disklabel-root3"/>
</imageobject>
</mediaobject>
</figure>
@@ -1871,7 +1871,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-ed2.png" format="PNG"/>
+ <imagedata fileref="install/disklabel-ed2"/>
</imageobject>
</mediaobject>
</figure>
@@ -1915,7 +1915,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/dist-set.png" format="PNG"/>
+ <imagedata fileref="install/dist-set"/>
</imageobject>
</mediaobject>
</figure>
@@ -1964,7 +1964,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/dist-set2.png" format="PNG"/>
+ <imagedata fileref="install/dist-set2"/>
</imageobject>
</mediaobject>
</figure>
@@ -1994,7 +1994,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/media.png" format="PNG"/>
+ <imagedata fileref="install/media"/>
</imageobject>
</mediaobject>
</figure>
@@ -2167,7 +2167,7 @@ installation menus to retry whichever operations have failed.
<mediaobject>
<imageobject>
- <imagedata fileref="install/ed0-conf.png" format="PNG"/>
+ <imagedata fileref="install/ed0-conf"/>
</imageobject>
</mediaobject>
</figure>
@@ -2206,7 +2206,7 @@ installation menus to retry whichever operations have failed.
<mediaobject>
<imageobject>
- <imagedata fileref="install/ed0-conf2.png" format="PNG"/>
+ <imagedata fileref="install/ed0-conf2"/>
</imageobject>
</mediaobject>
</figure>
@@ -2369,7 +2369,7 @@ use the current settings.
<mediaobject>
<imageobject>
- <imagedata fileref="install/edit-inetd-conf.png" format="PNG"/>
+ <imagedata fileref="install/edit-inetd-conf"/>
</imageobject>
</mediaobject>
</figure>
@@ -2461,7 +2461,7 @@ use the current settings.
<mediaobject>
<imageobject>
- <imagedata fileref="install/ftp-anon1.png" format="PNG"/>
+ <imagedata fileref="install/ftp-anon1"/>
</imageobject>
</mediaobject>
</figure>
@@ -2536,7 +2536,7 @@ use the current settings.
<mediaobject>
<imageobject>
- <imagedata fileref="install/ftp-anon2.png" format="PNG"/>
+ <imagedata fileref="install/ftp-anon2"/>
</imageobject>
</mediaobject>
</figure>
@@ -2588,7 +2588,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/nfs-server-edit.png" format="PNG"/>
+ <imagedata fileref="install/nfs-server-edit"/>
</imageobject>
</mediaobject>
</figure>
@@ -2634,7 +2634,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/console-saver1.png" format="PNG"/>
+ <imagedata fileref="install/console-saver1"/>
</imageobject>
</mediaobject>
</figure>
@@ -2648,7 +2648,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/console-saver2.png" format="PNG"/>
+ <imagedata fileref="install/console-saver2"/>
</imageobject>
</mediaobject>
</figure>
@@ -2666,7 +2666,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/console-saver3.png" format="PNG"/>
+ <imagedata fileref="install/console-saver3"/>
</imageobject>
</mediaobject>
</figure>
@@ -2679,7 +2679,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/console-saver4.png" format="PNG"/>
+ <imagedata fileref="install/console-saver4"/>
</imageobject>
</mediaobject>
</figure>
@@ -2719,7 +2719,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/timezone1.png" format="PNG"/>
+ <imagedata fileref="install/timezone1"/>
</imageobject>
</mediaobject>
</figure>
@@ -2731,7 +2731,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/timezone2.png" format="PNG"/>
+ <imagedata fileref="install/timezone2"/>
</imageobject>
</mediaobject>
</figure>
@@ -2743,7 +2743,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/timezone3.png" format="PNG"/>
+ <imagedata fileref="install/timezone3"/>
</imageobject>
</mediaobject>
</figure>
@@ -2805,7 +2805,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse1.png" format="PNG"/>
+ <imagedata fileref="install/mouse1"/>
</imageobject>
</mediaobject>
</figure>
@@ -2818,7 +2818,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse2.png" format="PNG"/>
+ <imagedata fileref="install/mouse2"/>
</imageobject>
</mediaobject>
</figure>
@@ -2833,7 +2833,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse3.png" format="PNG"/>
+ <imagedata fileref="install/mouse3"/>
</imageobject>
</mediaobject>
</figure>
@@ -2846,7 +2846,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse4.png" format="PNG"/>
+ <imagedata fileref="install/mouse4"/>
</imageobject>
</mediaobject>
</figure>
@@ -2860,7 +2860,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse5.png" format="PNG"/>
+ <imagedata fileref="install/mouse5"/>
</imageobject>
</mediaobject>
</figure>
@@ -2874,7 +2874,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse6.png" format="PNG"/>
+ <imagedata fileref="install/mouse6"/>
</imageobject>
</mediaobject>
</figure>
@@ -2914,7 +2914,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/pkg-cat.png" format="PNG"/>
+ <imagedata fileref="install/pkg-cat"/>
</imageobject>
</mediaobject>
</figure>
@@ -2933,7 +2933,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/pkg-sel.png" format="PNG"/>
+ <imagedata fileref="install/pkg-sel"/>
</imageobject>
</mediaobject>
</figure>
@@ -2959,7 +2959,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/pkg-install.png" format="PNG"/>
+ <imagedata fileref="install/pkg-install"/>
</imageobject>
</mediaobject>
</figure>
@@ -2974,7 +2974,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/pkg-confirm.png" format="PNG"/>
+ <imagedata fileref="install/pkg-confirm"/>
</imageobject>
</mediaobject>
</figure>
@@ -3013,7 +3013,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/adduser1.png" format="PNG"/>
+ <imagedata fileref="install/adduser1"/>
</imageobject>
</mediaobject>
</figure>
@@ -3026,7 +3026,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/adduser2.png" format="PNG"/>
+ <imagedata fileref="install/adduser2"/>
</imageobject>
</mediaobject>
</figure>
@@ -3118,7 +3118,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/adduser3.png" format="PNG"/>
+ <imagedata fileref="install/adduser3"/>
</imageobject>
</mediaobject>
</figure>
@@ -3178,7 +3178,7 @@ Retype new password :</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/mainexit.png" format="PNG"/>
+ <imagedata fileref="install/mainexit"/>
</imageobject>
</mediaobject>
</figure>
@@ -3245,7 +3245,7 @@ Retype new password :</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/net-config-menu1.png" format="PNG"/>
+ <imagedata fileref="install/net-config-menu1"/>
</imageobject>
</mediaobject>
</figure>
@@ -3307,7 +3307,7 @@ Retype new password :</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/mta-main.png" format="PNG"/>
+ <imagedata fileref="install/mta-main"/>
</imageobject>
</mediaobject>
</figure>
@@ -3355,7 +3355,7 @@ Retype new password :</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/ntp-config.png" format="PNG"/>
+ <imagedata fileref="install/ntp-config"/>
</imageobject>
</mediaobject>
</figure>
@@ -3377,7 +3377,7 @@ Retype new password :</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/net-config-menu2.png" format="PNG"/>
+ <imagedata fileref="install/net-config-menu2"/>
</imageobject>
</mediaobject>
</figure>
diff --git a/zh_CN.GB2312/books/handbook/mail/chapter.xml b/zh_CN.GB2312/books/handbook/mail/chapter.xml
index 2a692321cf..ad7284ae93 100644
--- a/zh_CN.GB2312/books/handbook/mail/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/mail/chapter.xml
@@ -1713,7 +1713,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/mutt1.png" format="PNG"/>
+ <imagedata fileref="mail/mutt1"/>
</imageobject>
</mediaobject>
@@ -1723,7 +1723,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/mutt2.png" format="PNG"/>
+ <imagedata fileref="mail/mutt2"/>
</imageobject>
</mediaobject>
@@ -1756,7 +1756,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/mutt3.png" format="PNG"/>
+ <imagedata fileref="mail/mutt3"/>
</imageobject>
</mediaobject>
@@ -1801,7 +1801,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine1.png" format="PNG"/>
+ <imagedata fileref="mail/pine1"/>
</imageobject>
</mediaobject>
@@ -1819,7 +1819,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine2.png" format="PNG"/>
+ <imagedata fileref="mail/pine2"/>
</imageobject>
</mediaobject>
@@ -1829,7 +1829,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine3.png" format="PNG"/>
+ <imagedata fileref="mail/pine3"/>
</imageobject>
</mediaobject>
@@ -1840,7 +1840,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine4.png" format="PNG"/>
+ <imagedata fileref="mail/pine4"/>
</imageobject>
</mediaobject>
@@ -1856,7 +1856,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine5.png" format="PNG"/>
+ <imagedata fileref="mail/pine5"/>
</imageobject>
</mediaobject>
diff --git a/zh_CN.GB2312/books/handbook/vinum/chapter.xml b/zh_CN.GB2312/books/handbook/vinum/chapter.xml
index fccac5066a..9accce3d03 100644
--- a/zh_CN.GB2312/books/handbook/vinum/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/vinum/chapter.xml
@@ -148,7 +148,7 @@
<para>
<figure id="vinum-concat">
<title>������֯</title>
- <graphic fileref="vinum/vinum-concat.pic"/>
+ <graphic fileref="vinum/vinum-concat"/>
</figure>
</para>
@@ -182,7 +182,7 @@
<para>
<figure id="vinum-striped">
<title>�ֶ���֯</title>
- <graphic fileref="vinum/vinum-striped.pic"/>
+ <graphic fileref="vinum/vinum-striped"/>
</figure>
</para>
</sect1>
@@ -246,7 +246,7 @@
<para>
<figure id="vinum-raid5-org">
<title>RAID-5 ����֯</title>
- <graphic fileref="vinum/vinum-raid5-org.pic"/>
+ <graphic fileref="vinum/vinum-raid5-org"/>
</figure>
</para>
@@ -490,7 +490,7 @@
<para>
<figure id="vinum-simple-vol">
<title>һ����Vinum ��</title>
- <graphic fileref="vinum/vinum-simple-vol.pic"/>
+ <graphic fileref="vinum/vinum-simple-vol"/>
</figure>
</para>
@@ -550,7 +550,7 @@
<para>
<figure id="vinum-mirrored-vol">
<title>���� Vinum ��</title>
- <graphic fileref="vinum/vinum-mirrored-vol.pic"/>
+ <graphic fileref="vinum/vinum-mirrored-vol"/>
</figure>
</para>
@@ -612,7 +612,7 @@
<para>
<figure id="vinum-striped-vol">
<title>�������� Vinum ��</title>
- <graphic fileref="vinum/vinum-striped-vol.pic"/>
+ <graphic fileref="vinum/vinum-striped-vol"/>
</figure>
</para>
@@ -654,7 +654,7 @@
<para>
<figure id="vinum-raid10-vol">
<title>������������ Vinum ��</title>
- <graphic fileref="vinum/vinum-raid10-vol.pic"/>
+ <graphic fileref="vinum/vinum-raid10-vol"/>
</figure>
</para>
</sect2>
diff --git a/zh_CN.GB2312/books/handbook/virtualization/chapter.xml b/zh_CN.GB2312/books/handbook/virtualization/chapter.xml
index 9a0e7a3025..8565f6db12 100644
--- a/zh_CN.GB2312/books/handbook/virtualization/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/virtualization/chapter.xml
@@ -102,7 +102,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd1.png"/>
+ <imagedata fileref="virtualization/parallels-freebsd1"/>
</imageobject>
</mediaobject>
@@ -111,25 +111,25 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd2.png"/>
+ <imagedata fileref="virtualization/parallels-freebsd2"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd3.png"/>
+ <imagedata fileref="virtualization/parallels-freebsd3"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd4.png"/>
+ <imagedata fileref="virtualization/parallels-freebsd4"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd5.png"/>
+ <imagedata fileref="virtualization/parallels-freebsd5"/>
</imageobject>
</mediaobject>
@@ -137,13 +137,13 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd6.png"/>
+ <imagedata fileref="virtualization/parallels-freebsd6"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd7.png"/>
+ <imagedata fileref="virtualization/parallels-freebsd7"/>
</imageobject>
</mediaobject>
@@ -151,13 +151,13 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd8.png"/>
+ <imagedata fileref="virtualization/parallels-freebsd8"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd9.png"/>
+ <imagedata fileref="virtualization/parallels-freebsd9"/>
</imageobject>
</mediaobject>
@@ -171,7 +171,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd11.png"/>
+ <imagedata fileref="virtualization/parallels-freebsd11"/>
</imageobject>
</mediaobject>
@@ -182,7 +182,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd10.png"/>
+ <imagedata fileref="virtualization/parallels-freebsd10"/>
</imageobject>
</mediaobject>
@@ -191,7 +191,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd12.png"/>
+ <imagedata fileref="virtualization/parallels-freebsd12"/>
</imageobject>
</mediaobject>
@@ -200,7 +200,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd13.png"/>
+ <imagedata fileref="virtualization/parallels-freebsd13"/>
</imageobject>
</mediaobject>
</sect3>
@@ -567,13 +567,13 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd1.png"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd1"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd2.png"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd2"/>
</imageobject>
</mediaobject>
@@ -582,7 +582,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd3.png"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd3"/>
</imageobject>
</mediaobject>
@@ -592,13 +592,13 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd4.png"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd4"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd5.png"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd5"/>
</imageobject>
</mediaobject>
@@ -606,7 +606,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd6.png"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd6"/>
</imageobject>
</mediaobject>
@@ -615,13 +615,13 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd7.png"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd7"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd8.png"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd8"/>
</imageobject>
</mediaobject>
@@ -636,13 +636,13 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd9.png"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd9"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd10.png"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd10"/>
</imageobject>
</mediaobject>
@@ -653,7 +653,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd11.png"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd11"/>
</imageobject>
</mediaobject>
@@ -664,7 +664,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd12.png"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd12"/>
</imageobject>
</mediaobject>
@@ -673,7 +673,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd13.png"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd13"/>
</imageobject>
</mediaobject>
</sect3>
@@ -747,7 +747,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd01.png"/>
+ <imagedata fileref="virtualization/vmware-freebsd01"/>
</imageobject>
</mediaobject>
@@ -756,7 +756,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd02.png"/>
+ <imagedata fileref="virtualization/vmware-freebsd02"/>
</imageobject>
</mediaobject>
@@ -767,7 +767,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd03.png"/>
+ <imagedata fileref="virtualization/vmware-freebsd03"/>
</imageobject>
</mediaobject>
@@ -775,7 +775,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd04.png"/>
+ <imagedata fileref="virtualization/vmware-freebsd04"/>
</imageobject>
</mediaobject>
@@ -783,7 +783,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd05.png"/>
+ <imagedata fileref="virtualization/vmware-freebsd05"/>
</imageobject>
</mediaobject>
@@ -791,7 +791,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd06.png"/>
+ <imagedata fileref="virtualization/vmware-freebsd06"/>
</imageobject>
</mediaobject>
@@ -799,7 +799,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd07.png"/>
+ <imagedata fileref="virtualization/vmware-freebsd07"/>
</imageobject>
</mediaobject>
@@ -808,7 +808,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd08.png"/>
+ <imagedata fileref="virtualization/vmware-freebsd08"/>
</imageobject>
</mediaobject>
@@ -820,7 +820,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd09.png"/>
+ <imagedata fileref="virtualization/vmware-freebsd09"/>
</imageobject>
</mediaobject>
@@ -828,7 +828,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd10.png"/>
+ <imagedata fileref="virtualization/vmware-freebsd10"/>
</imageobject>
</mediaobject>
@@ -837,7 +837,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd11.png"/>
+ <imagedata fileref="virtualization/vmware-freebsd11"/>
</imageobject>
</mediaobject>
@@ -850,7 +850,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd12.png"/>
+ <imagedata fileref="virtualization/vmware-freebsd12"/>
</imageobject>
</mediaobject>
diff --git a/zh_TW.Big5/books/developers-handbook/sockets/chapter.xml b/zh_TW.Big5/books/developers-handbook/sockets/chapter.xml
index c5a233f753..aa2eed2c9f 100644
--- a/zh_TW.Big5/books/developers-handbook/sockets/chapter.xml
+++ b/zh_TW.Big5/books/developers-handbook/sockets/chapter.xml
@@ -111,7 +111,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="sockets/layers.eps"/>
+ <imagedata fileref="sockets/layers"/>
</imageobject>
<textobject>
@@ -288,7 +288,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="sockets/slayers.eps"/>
+ <imagedata fileref="sockets/slayers"/>
</imageobject>
<textobject>
@@ -561,7 +561,7 @@ struct sockaddr_in {
<mediaobject>
<imageobject>
- <imagedata fileref="sockets/sain.eps"/>
+ <imagedata fileref="sockets/sain"/>
</imageobject>
<textobject>
@@ -605,7 +605,7 @@ struct sockaddr_in {
<mediaobject>
<imageobject>
- <imagedata fileref="sockets/sainfill.eps"/>
+ <imagedata fileref="sockets/sainfill"/>
</imageobject>
<textobject>
@@ -669,7 +669,7 @@ struct in_addr {
<mediaobject>
<imageobject>
- <imagedata fileref="sockets/sainlsb.eps"/>
+ <imagedata fileref="sockets/sainlsb"/>
</imageobject>
<textobject>
@@ -695,7 +695,7 @@ struct in_addr {
<mediaobject>
<imageobject>
- <imagedata fileref="sockets/sainmsb.eps"/>
+ <imagedata fileref="sockets/sainmsb"/>
</imageobject>
<textobject>
@@ -789,7 +789,7 @@ struct in_addr {
<mediaobject>
<imageobject>
- <imagedata fileref="sockets/sainlsb.eps"/>
+ <imagedata fileref="sockets/sainlsb"/>
</imageobject>
<textobject>
@@ -816,7 +816,7 @@ struct in_addr {
<mediaobject>
<imageobject>
- <imagedata fileref="sockets/sainmsb.eps"/>
+ <imagedata fileref="sockets/sainmsb"/>
</imageobject>
<textobject>
@@ -1072,7 +1072,7 @@ int bind(int s, const struct sockaddr *addr, socklen_t addrlen);
<mediaobject>
<imageobject>
- <imagedata fileref="sockets/sainserv.eps"/>
+ <imagedata fileref="sockets/sainserv"/>
</imageobject>
<textobject>
@@ -1334,7 +1334,7 @@ int main() {
<mediaobject>
<imageobject>
- <imagedata fileref="sockets/serv.eps"/>
+ <imagedata fileref="sockets/serv"/>
</imageobject>
<textobject>
@@ -1691,7 +1691,7 @@ struct servent * getservbyname(const char *name, const char *proto);
<mediaobject>
<imageobject>
- <imagedata fileref="sockets/serv2.eps"/>
+ <imagedata fileref="sockets/serv2"/>
</imageobject>
<textobject>
diff --git a/zh_TW.Big5/books/fdp-primer/sgml-markup/chapter.xml b/zh_TW.Big5/books/fdp-primer/sgml-markup/chapter.xml
index 6fbb9cac85..fa33335ce8 100644
--- a/zh_TW.Big5/books/fdp-primer/sgml-markup/chapter.xml
+++ b/zh_TW.Big5/books/fdp-primer/sgml-markup/chapter.xml
@@ -2377,7 +2377,7 @@ This is the file called 'foo2'</screen>
<programlisting><mediaobject>
<imageobject>
- <imagedata fileref="fig1.png"> <co id="co-image-ext"/>
+ <imagedata fileref="fig1"> <co id="co-image-ext"/>
</imageobject>
<textobject>
@@ -2483,7 +2483,7 @@ IMAGES+= fig3.png
<programlisting><mediaobject>
<imageobject>
- <imagedata fileref="chapter1/fig1.png"> <co id="co-image-dir"/>
+ <imagedata fileref="chapter1/fig1"> <co id="co-image-dir"/>
</imageobject>
…
diff --git a/zh_TW.Big5/books/handbook/advanced-networking/chapter.xml b/zh_TW.Big5/books/handbook/advanced-networking/chapter.xml
index 5e89d1dc37..ad4e269ce1 100644
--- a/zh_TW.Big5/books/handbook/advanced-networking/chapter.xml
+++ b/zh_TW.Big5/books/handbook/advanced-networking/chapter.xml
@@ -280,7 +280,7 @@ host2.example.com link#1 UC 0 0
<mediaobject>
<imageobject>
- <imagedata fileref="advanced-networking/net-routing.pic"/>
+ <imagedata fileref="advanced-networking/net-routing"/>
</imageobject>
<textobject>
@@ -466,7 +466,7 @@ host2.example.com link#1 UC 0 0
<mediaobject>
<imageobject>
- <imagedata fileref="advanced-networking/static-routes.pic"/>
+ <imagedata fileref="advanced-networking/static-routes"/>
</imageobject>
<textobject>
@@ -4225,7 +4225,7 @@ cd /usr/src/etc; make distribution</programlisting>
<mediaobject>
<imageobject>
- <imagedata fileref="advanced-networking/isdn-bus.eps"/>
+ <imagedata fileref="advanced-networking/isdn-bus"/>
</imageobject>
<textobject>
@@ -4259,7 +4259,7 @@ ISDN BRI line</literallayout>
<mediaobject>
<imageobject>
- <imagedata fileref="advanced-networking/isdn-twisted-pair.eps"/>
+ <imagedata fileref="advanced-networking/isdn-twisted-pair"/>
</imageobject>
<textobject>
@@ -4362,7 +4362,7 @@ ISDN BRI line</literallayout>
<mediaobject>
<imageobject>
- <imagedata fileref="advanced-networking/natd.eps"/>
+ <imagedata fileref="advanced-networking/natd"/>
</imageobject>
<textobject>
diff --git a/zh_TW.Big5/books/handbook/basics/chapter.xml b/zh_TW.Big5/books/handbook/basics/chapter.xml
index 09bd98f966..1237319f9d 100644
--- a/zh_TW.Big5/books/handbook/basics/chapter.xml
+++ b/zh_TW.Big5/books/handbook/basics/chapter.xml
@@ -906,7 +906,7 @@ total 530
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir1.eps" format="EPS"/>
+ <imagedata fileref="install/example-dir1"/>
</imageobject>
<textobject>
@@ -926,7 +926,7 @@ total 530
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir2.eps" format="EPS"/>
+ <imagedata fileref="install/example-dir2"/>
</imageobject>
<textobject>
@@ -954,7 +954,7 @@ total 530
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir3.eps" format="EPS"/>
+ <imagedata fileref="install/example-dir3"/>
</imageobject>
<textobject>
@@ -980,7 +980,7 @@ total 530
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir4.eps" format="EPS"/>
+ <imagedata fileref="install/example-dir4"/>
</imageobject>
<textobject>
@@ -1005,7 +1005,7 @@ total 530
<mediaobject>
<imageobject>
- <imagedata fileref="install/example-dir5.eps" format="EPS"/>
+ <imagedata fileref="install/example-dir5"/>
</imageobject>
<textobject>
@@ -1292,7 +1292,7 @@ total 530
<mediaobject>
<imageobject>
- <imagedata fileref="install/disk-layout.eps" format="EPS"/>
+ <imagedata fileref="install/disk-layout"/>
</imageobject>
<textobject>
diff --git a/zh_TW.Big5/books/handbook/geom/chapter.xml b/zh_TW.Big5/books/handbook/geom/chapter.xml
index af676b6e24..a5dcddefe2 100644
--- a/zh_TW.Big5/books/handbook/geom/chapter.xml
+++ b/zh_TW.Big5/books/handbook/geom/chapter.xml
@@ -124,7 +124,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="geom/striping.pic" align="center"/>
+ <imagedata fileref="geom/striping" align="center"/>
</imageobject>
<textobject>
diff --git a/zh_TW.Big5/books/handbook/install/chapter.xml b/zh_TW.Big5/books/handbook/install/chapter.xml
index 6881e76ff3..431f1f1215 100644
--- a/zh_TW.Big5/books/handbook/install/chapter.xml
+++ b/zh_TW.Big5/books/handbook/install/chapter.xml
@@ -864,7 +864,7 @@ Insert disk labelled "Kernel floppy 1" and press any key...</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/boot-loader-menu.png" format="PNG"/>
+ <imagedata fileref="install/boot-loader-menu"/>
</imageobject>
</mediaobject>
</figure>
@@ -1072,7 +1072,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/config-country.png" format="PNG"/>
+ <imagedata fileref="install/config-country"/>
</imageobject>
</mediaobject>
</figure>
@@ -1082,7 +1082,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/sysinstall-exit.png" format="PNG"/>
+ <imagedata fileref="install/sysinstall-exit"/>
</imageobject>
</mediaobject>
</figure>
@@ -1131,7 +1131,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main1.png" format="PNG"/>
+ <imagedata fileref="install/main1"/>
</imageobject>
</mediaobject>
</figure>
@@ -1147,7 +1147,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main-doc.png" format="PNG"/>
+ <imagedata fileref="install/main-doc"/>
</imageobject>
</mediaobject>
</figure>
@@ -1159,7 +1159,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/docmenu1.png" format="PNG"/>
+ <imagedata fileref="install/docmenu1"/>
</imageobject>
</mediaobject>
</figure>
@@ -1188,7 +1188,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main-keymap.png" format="PNG"/>
+ <imagedata fileref="install/main-keymap"/>
</imageobject>
</mediaobject>
</figure>
@@ -1208,7 +1208,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/keymap.png" format="PNG"/>
+ <imagedata fileref="install/keymap"/>
</imageobject>
</mediaobject>
</figure>
@@ -1226,7 +1226,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main-options.png" format="PNG"/>
+ <imagedata fileref="install/main-options"/>
</imageobject>
</mediaobject>
</figure>
@@ -1236,7 +1236,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/options.png" format="PNG"/>
+ <imagedata fileref="install/options"/>
</imageobject>
</mediaobject>
</figure>
@@ -1266,7 +1266,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/main-std.png" format="PNG"/>
+ <imagedata fileref="install/main-std"/>
</imageobject>
</mediaobject>
</figure>
@@ -1410,7 +1410,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/fdisk-drive1.png" format="PNG"/>
+ <imagedata fileref="install/fdisk-drive1"/>
</imageobject>
</mediaobject>
</figure>
@@ -1467,7 +1467,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/fdisk-edit1.png" format="PNG"/>
+ <imagedata fileref="install/fdisk-edit1"/>
</imageobject>
</mediaobject>
</figure>
@@ -1502,7 +1502,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/fdisk-edit2.png" format="PNG"/>
+ <imagedata fileref="install/fdisk-edit2"/>
</imageobject>
</mediaobject>
</figure>
@@ -1541,7 +1541,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/boot-mgr.png" format="PNG"/>
+ <imagedata fileref="install/boot-mgr"/>
</imageobject>
</mediaobject>
</figure>
@@ -1568,7 +1568,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/fdisk-drive2.png" format="PNG"/>
+ <imagedata fileref="install/fdisk-drive2"/>
</imageobject>
</mediaobject>
</figure>
@@ -1786,7 +1786,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-ed1.png" format="PNG"/>
+ <imagedata fileref="install/disklabel-ed1"/>
</imageobject>
</mediaobject>
</figure>
@@ -1808,7 +1808,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-auto.png" format="PNG"/>
+ <imagedata fileref="install/disklabel-auto"/>
</imageobject>
</mediaobject>
</figure>
@@ -1841,7 +1841,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-root1.png" format="PNG"/>
+ <imagedata fileref="install/disklabel-root1"/>
</imageobject>
</mediaobject>
</figure>
@@ -1857,7 +1857,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-root2.png" format="PNG"/>
+ <imagedata fileref="install/disklabel-root2"/>
</imageobject>
</mediaobject>
</figure>
@@ -1872,7 +1872,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-fs.png" format="PNG"/>
+ <imagedata fileref="install/disklabel-fs"/>
</imageobject>
</mediaobject>
</figure>
@@ -1888,7 +1888,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-root3.png" format="PNG"/>
+ <imagedata fileref="install/disklabel-root3"/>
</imageobject>
</mediaobject>
</figure>
@@ -1907,7 +1907,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/disklabel-ed2.png" format="PNG"/>
+ <imagedata fileref="install/disklabel-ed2"/>
</imageobject>
</mediaobject>
</figure>
@@ -1950,7 +1950,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/dist-set.png" format="PNG"/>
+ <imagedata fileref="install/dist-set"/>
</imageobject>
</mediaobject>
</figure>
@@ -1997,7 +1997,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/dist-set2.png" format="PNG"/>
+ <imagedata fileref="install/dist-set2"/>
</imageobject>
</mediaobject>
</figure>
@@ -2027,7 +2027,7 @@ Mounting root from ufs:/dev/md0c
<mediaobject>
<imageobject>
- <imagedata fileref="install/media.png" format="PNG"/>
+ <imagedata fileref="install/media"/>
</imageobject>
</mediaobject>
</figure>
@@ -2200,7 +2200,7 @@ installation menus to retry whichever operations have failed.
<mediaobject>
<imageobject>
- <imagedata fileref="install/ed0-conf.png" format="PNG"/>
+ <imagedata fileref="install/ed0-conf"/>
</imageobject>
</mediaobject>
</figure>
@@ -2242,7 +2242,7 @@ installation menus to retry whichever operations have failed.
<mediaobject>
<imageobject>
- <imagedata fileref="install/ed0-conf2.png" format="PNG"/>
+ <imagedata fileref="install/ed0-conf2"/>
</imageobject>
</mediaobject>
</figure>
@@ -2414,7 +2414,7 @@ use the current settings.
<mediaobject>
<imageobject>
- <imagedata fileref="install/edit-inetd-conf.png" format="PNG"/>
+ <imagedata fileref="install/edit-inetd-conf"/>
</imageobject>
</mediaobject>
</figure>
@@ -2482,7 +2482,7 @@ use the current settings.
<mediaobject>
<imageobject>
- <imagedata fileref="install/ftp-anon1.png" format="PNG"/>
+ <imagedata fileref="install/ftp-anon1"/>
</imageobject>
</mediaobject>
</figure>
@@ -2532,7 +2532,7 @@ Upload subdirectory:
<mediaobject>
<imageobject>
- <imagedata fileref="install/ftp-anon2.png" format="PNG"/>
+ <imagedata fileref="install/ftp-anon2"/>
</imageobject>
</mediaobject>
</figure>
@@ -2589,7 +2589,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/nfs-server-edit.png" format="PNG"/>
+ <imagedata fileref="install/nfs-server-edit"/>
</imageobject>
</mediaobject>
</figure>
@@ -2639,7 +2639,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/console-saver1.png" format="PNG"/>
+ <imagedata fileref="install/console-saver1"/>
</imageobject>
</mediaobject>
</figure>
@@ -2653,7 +2653,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/console-saver2.png" format="PNG"/>
+ <imagedata fileref="install/console-saver2"/>
</imageobject>
</mediaobject>
</figure>
@@ -2673,7 +2673,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/console-saver3.png" format="PNG"/>
+ <imagedata fileref="install/console-saver3"/>
</imageobject>
</mediaobject>
</figure>
@@ -2687,7 +2687,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/console-saver4.png" format="PNG"/>
+ <imagedata fileref="install/console-saver4"/>
</imageobject>
</mediaobject>
</figure>
@@ -2731,7 +2731,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/timezone1.png" format="PNG"/>
+ <imagedata fileref="install/timezone1"/>
</imageobject>
</mediaobject>
</figure>
@@ -2744,7 +2744,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/timezone2.png" format="PNG"/>
+ <imagedata fileref="install/timezone2"/>
</imageobject>
</mediaobject>
</figure>
@@ -2757,7 +2757,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/timezone3.png" format="PNG"/>
+ <imagedata fileref="install/timezone3"/>
</imageobject>
</mediaobject>
</figure>
@@ -2817,7 +2817,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse1.png" format="PNG"/>
+ <imagedata fileref="install/mouse1"/>
</imageobject>
</mediaobject>
</figure>
@@ -2830,7 +2830,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse2.png" format="PNG"/>
+ <imagedata fileref="install/mouse2"/>
</imageobject>
</mediaobject>
</figure>
@@ -2845,7 +2845,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse3.png" format="PNG"/>
+ <imagedata fileref="install/mouse3"/>
</imageobject>
</mediaobject>
</figure>
@@ -2858,7 +2858,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse4.png" format="PNG"/>
+ <imagedata fileref="install/mouse4"/>
</imageobject>
</mediaobject>
</figure>
@@ -2872,7 +2872,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse5.png" format="PNG"/>
+ <imagedata fileref="install/mouse5"/>
</imageobject>
</mediaobject>
</figure>
@@ -2888,7 +2888,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/mouse6.png" format="PNG"/>
+ <imagedata fileref="install/mouse6"/>
</imageobject>
</mediaobject>
</figure>
@@ -2933,7 +2933,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/pkg-cat.png" format="PNG"/>
+ <imagedata fileref="install/pkg-cat"/>
</imageobject>
</mediaobject>
</figure>
@@ -2954,7 +2954,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/pkg-sel.png" format="PNG"/>
+ <imagedata fileref="install/pkg-sel"/>
</imageobject>
</mediaobject>
</figure>
@@ -2981,7 +2981,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/pkg-install.png" format="PNG"/>
+ <imagedata fileref="install/pkg-install"/>
</imageobject>
</mediaobject>
</figure>
@@ -2995,7 +2995,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/pkg-confirm.png" format="PNG"/>
+ <imagedata fileref="install/pkg-confirm"/>
</imageobject>
</mediaobject>
</figure>
@@ -3035,7 +3035,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/adduser1.png" format="PNG"/>
+ <imagedata fileref="install/adduser1"/>
</imageobject>
</mediaobject>
</figure>
@@ -3048,7 +3048,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/adduser2.png" format="PNG"/>
+ <imagedata fileref="install/adduser2"/>
</imageobject>
</mediaobject>
</figure>
@@ -3148,7 +3148,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<mediaobject>
<imageobject>
- <imagedata fileref="install/adduser3.png" format="PNG"/>
+ <imagedata fileref="install/adduser3"/>
</imageobject>
</mediaobject>
</figure>
@@ -3214,7 +3214,7 @@ Retype new password :</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/mainexit.png" format="PNG"/>
+ <imagedata fileref="install/mainexit"/>
</imageobject>
</mediaobject>
</figure>
@@ -3281,7 +3281,7 @@ Retype new password :</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/net-config-menu1.png" format="PNG"/>
+ <imagedata fileref="install/net-config-menu1"/>
</imageobject>
</mediaobject>
</figure>
@@ -3348,7 +3348,7 @@ Retype new password :</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/mta-main.png" format="PNG"/>
+ <imagedata fileref="install/mta-main"/>
</imageobject>
</mediaobject>
</figure>
@@ -3402,7 +3402,7 @@ Retype new password :</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/ntp-config.png" format="PNG"/>
+ <imagedata fileref="install/ntp-config"/>
</imageobject>
</mediaobject>
</figure>
@@ -3428,7 +3428,7 @@ Retype new password :</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="install/net-config-menu2.png" format="PNG"/>
+ <imagedata fileref="install/net-config-menu2"/>
</imageobject>
</mediaobject>
</figure>
diff --git a/zh_TW.Big5/books/handbook/mail/chapter.xml b/zh_TW.Big5/books/handbook/mail/chapter.xml
index 706fb1cb7a..5fba76a507 100644
--- a/zh_TW.Big5/books/handbook/mail/chapter.xml
+++ b/zh_TW.Big5/books/handbook/mail/chapter.xml
@@ -1956,7 +1956,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/mutt1.png" format="PNG"/>
+ <imagedata fileref="mail/mutt1"/>
</imageobject>
</mediaobject>
@@ -1967,7 +1967,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/mutt2.png" format="PNG"/>
+ <imagedata fileref="mail/mutt2"/>
</imageobject>
</mediaobject>
@@ -2003,7 +2003,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/mutt3.png" format="PNG"/>
+ <imagedata fileref="mail/mutt3"/>
</imageobject>
</mediaobject>
@@ -2052,7 +2052,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine1.png" format="PNG"/>
+ <imagedata fileref="mail/pine1"/>
</imageobject>
</mediaobject>
@@ -2070,7 +2070,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine2.png" format="PNG"/>
+ <imagedata fileref="mail/pine2"/>
</imageobject>
</mediaobject>
@@ -2081,7 +2081,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine3.png" format="PNG"/>
+ <imagedata fileref="mail/pine3"/>
</imageobject>
</mediaobject>
@@ -2094,7 +2094,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine4.png" format="PNG"/>
+ <imagedata fileref="mail/pine4"/>
</imageobject>
</mediaobject>
@@ -2111,7 +2111,7 @@ EOT</screen>
<mediaobject>
<imageobject>
- <imagedata fileref="mail/pine5.png" format="PNG"/>
+ <imagedata fileref="mail/pine5"/>
</imageobject>
</mediaobject>
diff --git a/zh_TW.Big5/books/handbook/security/chapter.xml b/zh_TW.Big5/books/handbook/security/chapter.xml
index e69dd616da..bc48598f6d 100644
--- a/zh_TW.Big5/books/handbook/security/chapter.xml
+++ b/zh_TW.Big5/books/handbook/security/chapter.xml
@@ -3373,7 +3373,7 @@ options IPSEC_DEBUG #debug for IP security
<mediaobject>
<imageobject>
- <imagedata fileref="security/ipsec-network.pic" align="center"/>
+ <imagedata fileref="security/ipsec-network" align="center"/>
</imageobject>
<textobject>
@@ -3873,7 +3873,7 @@ ipfw add 1 allow udp from W.X.Y.Z to A.B.C.D isakmp
<mediaobject>
<imageobject>
- <imagedata fileref="security/ipsec-out-pkt.pic" align="center"/>
+ <imagedata fileref="security/ipsec-out-pkt" align="center"/>
</imageobject>
<textobject>
@@ -3893,7 +3893,7 @@ ipfw add 1 allow udp from W.X.Y.Z to A.B.C.D isakmp
<mediaobject>
<imageobject>
- <imagedata fileref="security/ipsec-encap-pkt.pic" align="center"/>
+ <imagedata fileref="security/ipsec-encap-pkt" align="center"/>
</imageobject>
<textobject>
@@ -4027,7 +4027,7 @@ ipfw add 1 allow ipencap from W.X.Y.Z to A.B.C.D
<mediaobject>
<imageobject>
- <imagedata fileref="security/ipsec-crypt-pkt.pic" align="center"/>
+ <imagedata fileref="security/ipsec-crypt-pkt" align="center"/>
</imageobject>
<textobject>
diff --git a/zh_TW.Big5/books/handbook/vinum/chapter.xml b/zh_TW.Big5/books/handbook/vinum/chapter.xml
index 1538781c3f..1e8a1cc888 100644
--- a/zh_TW.Big5/books/handbook/vinum/chapter.xml
+++ b/zh_TW.Big5/books/handbook/vinum/chapter.xml
@@ -160,7 +160,7 @@ disk storage, and an introduction to the Vinum Volume Manager.</para>
<para>
<figure id="vinum-concat">
<title>Concatenated Organization</title>
- <graphic fileref="vinum/vinum-concat.pic"/>
+ <graphic fileref="vinum/vinum-concat"/>
</figure>
</para>
@@ -199,7 +199,7 @@ disk storage, and an introduction to the Vinum Volume Manager.</para>
<para>
<figure id="vinum-striped">
<title>Striped Organization</title>
- <graphic fileref="vinum/vinum-striped.pic"/>
+ <graphic fileref="vinum/vinum-striped"/>
</figure>
</para>
</sect1>
@@ -269,7 +269,7 @@ disk storage, and an introduction to the Vinum Volume Manager.</para>
<para>
<figure id="vinum-raid5-org">
<title>RAID-5 Organization</title>
- <graphic fileref="vinum/vinum-raid5-org.pic"/>
+ <graphic fileref="vinum/vinum-raid5-org"/>
</figure>
</para>
@@ -545,7 +545,7 @@ disk storage, and an introduction to the Vinum Volume Manager.</para>
<para>
<figure id="vinum-simple-vol">
<title>A Simple Vinum Volume</title>
- <graphic fileref="vinum/vinum-simple-vol.pic"/>
+ <graphic fileref="vinum/vinum-simple-vol"/>
</figure>
</para>
@@ -613,7 +613,7 @@ disk storage, and an introduction to the Vinum Volume Manager.</para>
<para>
<figure id="vinum-mirrored-vol">
<title>A Mirrored Vinum Volume</title>
- <graphic fileref="vinum/vinum-mirrored-vol.pic"/>
+ <graphic fileref="vinum/vinum-mirrored-vol"/>
</figure>
</para>
@@ -680,7 +680,7 @@ disk storage, and an introduction to the Vinum Volume Manager.</para>
<para>
<figure id="vinum-striped-vol">
<title>A Striped Vinum Volume</title>
- <graphic fileref="vinum/vinum-striped-vol.pic"/>
+ <graphic fileref="vinum/vinum-striped-vol"/>
</figure>
</para>
@@ -724,7 +724,7 @@ disk storage, and an introduction to the Vinum Volume Manager.</para>
<para>
<figure id="vinum-raid10-vol">
<title>A Mirrored, Striped Vinum Volume</title>
- <graphic fileref="vinum/vinum-raid10-vol.pic"/>
+ <graphic fileref="vinum/vinum-raid10-vol"/>
</figure>
</para>
</sect2>
diff --git a/zh_TW.Big5/books/handbook/virtualization/chapter.xml b/zh_TW.Big5/books/handbook/virtualization/chapter.xml
index 80e62ae3d3..5601b4b410 100644
--- a/zh_TW.Big5/books/handbook/virtualization/chapter.xml
+++ b/zh_TW.Big5/books/handbook/virtualization/chapter.xml
@@ -100,7 +100,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd1.png"/>
+ <imagedata fileref="virtualization/parallels-freebsd1"/>
</imageobject>
</mediaobject>
@@ -110,25 +110,25 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd2.png"/>
+ <imagedata fileref="virtualization/parallels-freebsd2"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd3.png"/>
+ <imagedata fileref="virtualization/parallels-freebsd3"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd4.png"/>
+ <imagedata fileref="virtualization/parallels-freebsd4"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd5.png"/>
+ <imagedata fileref="virtualization/parallels-freebsd5"/>
</imageobject>
</mediaobject>
@@ -136,13 +136,13 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd6.png"/>
+ <imagedata fileref="virtualization/parallels-freebsd6"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd7.png"/>
+ <imagedata fileref="virtualization/parallels-freebsd7"/>
</imageobject>
</mediaobject>
@@ -150,13 +150,13 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd8.png"/>
+ <imagedata fileref="virtualization/parallels-freebsd8"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd9.png"/>
+ <imagedata fileref="virtualization/parallels-freebsd9"/>
</imageobject>
</mediaobject>
@@ -170,7 +170,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd11.png"/>
+ <imagedata fileref="virtualization/parallels-freebsd11"/>
</imageobject>
</mediaobject>
@@ -180,7 +180,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd10.png"/>
+ <imagedata fileref="virtualization/parallels-freebsd10"/>
</imageobject>
</mediaobject>
@@ -191,7 +191,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd12.png"/>
+ <imagedata fileref="virtualization/parallels-freebsd12"/>
</imageobject>
</mediaobject>
@@ -199,7 +199,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/parallels-freebsd13.png"/>
+ <imagedata fileref="virtualization/parallels-freebsd13"/>
</imageobject>
</mediaobject>
</sect3>
@@ -560,13 +560,13 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd1.png"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd1"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd2.png"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd2"/>
</imageobject>
</mediaobject>
@@ -575,7 +575,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd3.png"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd3"/>
</imageobject>
</mediaobject>
@@ -585,13 +585,13 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd4.png"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd4"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd5.png"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd5"/>
</imageobject>
</mediaobject>
@@ -599,7 +599,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd6.png"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd6"/>
</imageobject>
</mediaobject>
@@ -608,13 +608,13 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd7.png"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd7"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd8.png"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd8"/>
</imageobject>
</mediaobject>
@@ -630,13 +630,13 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd9.png"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd9"/>
</imageobject>
</mediaobject>
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd10.png"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd10"/>
</imageobject>
</mediaobject>
@@ -647,7 +647,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd11.png"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd11"/>
</imageobject>
</mediaobject>
@@ -657,7 +657,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd12.png"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd12"/>
</imageobject>
</mediaobject>
@@ -666,7 +666,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/virtualpc-freebsd13.png"/>
+ <imagedata fileref="virtualization/virtualpc-freebsd13"/>
</imageobject>
</mediaobject>
</sect3>
@@ -736,7 +736,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd01.png"/>
+ <imagedata fileref="virtualization/vmware-freebsd01"/>
</imageobject>
</mediaobject>
@@ -745,7 +745,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd02.png"/>
+ <imagedata fileref="virtualization/vmware-freebsd02"/>
</imageobject>
</mediaobject>
@@ -758,7 +758,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd03.png"/>
+ <imagedata fileref="virtualization/vmware-freebsd03"/>
</imageobject>
</mediaobject>
@@ -766,7 +766,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd04.png"/>
+ <imagedata fileref="virtualization/vmware-freebsd04"/>
</imageobject>
</mediaobject>
@@ -774,7 +774,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd05.png"/>
+ <imagedata fileref="virtualization/vmware-freebsd05"/>
</imageobject>
</mediaobject>
@@ -782,7 +782,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd06.png"/>
+ <imagedata fileref="virtualization/vmware-freebsd06"/>
</imageobject>
</mediaobject>
@@ -790,7 +790,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd07.png"/>
+ <imagedata fileref="virtualization/vmware-freebsd07"/>
</imageobject>
</mediaobject>
@@ -799,7 +799,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd08.png"/>
+ <imagedata fileref="virtualization/vmware-freebsd08"/>
</imageobject>
</mediaobject>
@@ -811,7 +811,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd09.png"/>
+ <imagedata fileref="virtualization/vmware-freebsd09"/>
</imageobject>
</mediaobject>
@@ -819,7 +819,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd10.png"/>
+ <imagedata fileref="virtualization/vmware-freebsd10"/>
</imageobject>
</mediaobject>
@@ -827,7 +827,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd11.png"/>
+ <imagedata fileref="virtualization/vmware-freebsd11"/>
</imageobject>
</mediaobject>
@@ -839,7 +839,7 @@ xenbr1 8000.feffffffffff no vif0.1
<mediaobject>
<imageobject>
- <imagedata fileref="virtualization/vmware-freebsd12.png"/>
+ <imagedata fileref="virtualization/vmware-freebsd12"/>
</imageobject>
</mediaobject>
From ffd8fc666ffb19b4a8da20f4ce677c57bd997580 Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Wed, 3 Apr 2013 10:56:14 +0000
Subject: [PATCH 094/121] - Allow foreign elements in Schematron - Add some
embedded XSLT to improve the input of validation failures
---
share/mk/doc.docbook.mk | 2 +-
share/xml/freebsd.sch | 16 +++++++++++-----
2 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/share/mk/doc.docbook.mk b/share/mk/doc.docbook.mk
index bb90244dea..b75acc5388 100644
--- a/share/mk/doc.docbook.mk
+++ b/share/mk/doc.docbook.mk
@@ -338,7 +338,7 @@ NO_RTF= yes
schxslts+= ${sch}.xsl
${sch}.xsl: ${sch}
- ${XSLTPROC} ${XSLSCH} ${.ALLSRC} > ${.TARGET}
+ ${XSLTPROC} --param allow-foreign "true" ${XSLSCH} ${.ALLSRC} > ${.TARGET}
.endfor
.endif
diff --git a/share/xml/freebsd.sch b/share/xml/freebsd.sch
index 96280fe675..4072cd66b8 100644
--- a/share/xml/freebsd.sch
+++ b/share/xml/freebsd.sch
@@ -2,11 +2,17 @@
<!-- $FreeBSD$ -->
-<schema xmlns="http://purl.oclc.org/dsdl/schematron">
+<schema xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
<pattern name="Check file reference validity">
<rule context="//imagedata|//graphic">
- <report test="contains(@fileref, '.')">Image references cannot have an extension; the proper format is inferred by the output type to generate.</report>
- <report test="@format">Image format must not be specified; it is inferred by the output type to generate.</report>
+ <report test="contains(@fileref, '.')">Image reference (<xsl:value-of select="@fileref"/>) cannot have an extension; the proper format is inferred by the output type to generate.</report>
+ <report test="@format">Image reference (<xsl:value-of select="@fileref"/>) format must not be specified; it is inferred by the output type to generate.</report>
+ </rule>
+ </pattern>
+
+ <pattern name="Check cross-reference validity">
+ <rule context="//link">
+ <assert test="* or normalize-space()">Link (<xsl:value-of select="@linkend"/>) element must have a content; or use xref to auto-generate the linking text.</assert>
</rule>
</pattern>
@@ -20,10 +26,10 @@
<pattern name="Check profiling attributes">
<rule context="//*/@edition">
- <assert test="(. = 'online') or (. = 'print')">The edition attribute can only be set to 'online' or "print".</assert>
+ <assert test="(. = 'online') or (. = 'print')">Invalid edition value (<xsl:value-of select="."/>); must be either 'online' or "print".</assert>
</rule>
<rule context="//*/@os">
- <assert test="(. = 'freebsd8') or (. = 'freebsd9') or (. = 'freebsd10')">The os attribute can only be set to 'freebsd8', 'freebsd9' or 'freebsd10'.</assert>
+ <assert test="(. = 'freebsd8') or (. = 'freebsd9') or (. = 'freebsd10')">Invalid os value (<xsl:value-of select="."/>); must be either 'freebsd8', 'freebsd9' or 'freebsd10'.</assert>
</rule>
</pattern>
</schema>
From 68645226ea6af7958cee77bafd97cd27c7a4016f Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Wed, 3 Apr 2013 11:33:18 +0000
Subject: [PATCH 095/121] - Replace misused (empty) link elements with xref
---
.../books/handbook/disks/chapter.xml | 4 +--
en_US.ISO8859-1/articles/pam/article.xml | 15 ++++-------
.../books/handbook/desktop/chapter.xml | 8 +++---
.../books/handbook/disks/chapter.xml | 22 ++++++++--------
.../books/handbook/firewalls/chapter.xml | 4 +--
.../books/handbook/kernelconfig/chapter.xml | 6 ++---
.../books/handbook/l10n/chapter.xml | 2 +-
.../books/handbook/linuxemu/chapter.xml | 6 ++---
.../books/handbook/serialcomms/chapter.xml | 22 ++++++++--------
.../books/handbook/users/chapter.xml | 6 ++---
.../books/handbook/vinum/chapter.xml | 26 +++++++++----------
.../books/handbook/virtualization/chapter.xml | 12 ++++-----
fr_FR.ISO8859-1/articles/pam/article.xml | 17 +++++-------
.../books/handbook/desktop/chapter.xml | 4 +--
.../books/handbook/serialcomms/chapter.xml | 12 ++++-----
mn_MN.UTF-8/books/handbook/users/chapter.xml | 6 ++---
.../books/handbook/virtualization/chapter.xml | 8 +++---
ru_RU.KOI8-R/articles/pam/article.xml | 15 +++++------
18 files changed, 93 insertions(+), 102 deletions(-)
diff --git a/de_DE.ISO8859-1/books/handbook/disks/chapter.xml b/de_DE.ISO8859-1/books/handbook/disks/chapter.xml
index eadbfe69ee..8974b76820 100644
--- a/de_DE.ISO8859-1/books/handbook/disks/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/disks/chapter.xml
@@ -1078,8 +1078,8 @@ umass0: detached</screen>
<para>Welches Tool Sie zum Brennen von CDs benutzen, h�ngt davon
ab, ob Ihr CD-Brenner ein ATAPI-Ger�t ist oder nicht.
- Mit ATAPI-CD-Brennern wird <command><link linkend="burncd">
- </link>burncd</command> benutzt, das Teil des Basissystems ist.
+ Mit ATAPI-CD-Brennern wird <command>burncd</command> benutzt,
+ das Teil des Basissystems ist.
SCSI- und USB-CD-Brenner werden mit <command><link linkend="cdrecord">
cdrecord</link></command> aus <filename
role="package">sysutils/cdrtools</filename> benutzt.
diff --git a/en_US.ISO8859-1/articles/pam/article.xml b/en_US.ISO8859-1/articles/pam/article.xml
index 0bf1ea2848..deba48a499 100644
--- a/en_US.ISO8859-1/articles/pam/article.xml
+++ b/en_US.ISO8859-1/articles/pam/article.xml
@@ -834,8 +834,7 @@ sshd password required pam_permit.so</programlisting>
<title id="pam-config-breakdown.title">Breakdown of a
configuration line</title>
- <para>As explained in the <link linkend="pam-config-file"
- endterm="pam-config-file.title"></link> section, each line in
+ <para>As explained in <xref linkend="pam-config-file"/>, each line in
<filename>/etc/pam.conf</filename> consists of four or more
fields: the service name, the facility name, the control flag,
the module name, and zero or more module arguments.</para>
@@ -852,13 +851,10 @@ sshd password required pam_permit.so</programlisting>
facility name.</para>
<para>The facility is one of the four facility keywords
- described in the <link linkend="pam-facilities-primitives"
- endterm="pam-facilities-primitives.title"></link>
- section.</para>
+ described in <xref linkend="pam-facilities-primitives"/>.</para>
<para>Likewise, the control flag is one of the four keywords
- described in the <link linkend="pam-chains-policies"
- endterm="pam-chains-policies.title"></link> section,
+ described in <xref linkend="pam-chains-policies"/>,
describing how to interpret the return code from the module.
Linux-PAM supports an alternate syntax that lets you specify
the action to associate with each possible return code, but
@@ -1228,9 +1224,8 @@ sshd password required pam_permit.so</programlisting>
build this application on a system with a different PAM library,
you will have to provide your own conversation function. A
robust conversation function is surprisingly difficult to
- implement; the one presented in the <link
- linkend="pam-sample-conv"
- endterm="pam-sample-conv.title"></link> appendix is a good
+ implement; the one presented in <xref
+ linkend="pam-sample-conv"/> is a good
starting point, but should not be used in real-world
applications.</para>
diff --git a/en_US.ISO8859-1/books/handbook/desktop/chapter.xml b/en_US.ISO8859-1/books/handbook/desktop/chapter.xml
index fdbff70c96..cd599f7917 100644
--- a/en_US.ISO8859-1/books/handbook/desktop/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/desktop/chapter.xml
@@ -200,9 +200,9 @@
</itemizedlist>
<para>For information on how to configure a multimedia
- environment, refer to <link linkend="multimedia"></link>. For
+ environment, refer to <xref linkend="multimedia"/>. For
information on how to set up and use electronic mail, refer to
- <link linkend="mail"></link>.</para>
+ <xref linkend="mail"/>.</para>
</sect1>
<sect1 id="desktop-browsers">
@@ -222,7 +222,7 @@
<para>The <application>KDE</application> and
<application>GNOME</application> desktop environments include
- their own HTML browser. Refer to <link linkend="x11-wm"></link>
+ their own HTML browser. Refer to <xref linkend="x11-wm"/>
for more information on how to set up these complete
desktops.</para>
@@ -572,7 +572,7 @@
</note>
<para>To install &java; plugin support, follow the instructions
- in <link linkend="moz-java-plugin"></link>.</para>
+ in <xref linkend="moz-java-plugin"/>.</para>
<para>Once &java; support is installed, start
<application>Chromium</application>, and enter
diff --git a/en_US.ISO8859-1/books/handbook/disks/chapter.xml b/en_US.ISO8859-1/books/handbook/disks/chapter.xml
index 3042f6b3b8..65a7b3f721 100644
--- a/en_US.ISO8859-1/books/handbook/disks/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/disks/chapter.xml
@@ -613,7 +613,7 @@ bsdlabel -e ad3</programlisting>
storage. &man.vinum.4; implements the RAID-0, RAID-1 and
RAID-5 models, both individually and in combination.</para>
- <para>Refer to <link linkend="vinum-vinum"></link> for more
+ <para>Refer to <xref linkend="vinum-vinum"/> for more
information about &man.vinum.4;.</para>
</sect3>
</sect2>
@@ -824,7 +824,7 @@ da0: 126MB (258048 512 byte sectors: 64H 32S/T 126C)</screen>
<Generic Traveling Disk 1.11> at scbus0 target 0 lun 0 (da0,pass0)</screen>
<para>If the drive comes with a file system, it can be mounted.
- Refer to <link linkend="disks-adding"></link> for
+ Refer to <xref linkend="disks-adding"/> for
instructions on how to format and create partitions on the USB
drive.</para>
@@ -1201,8 +1201,8 @@ scsibus1:
<screen>&prompt.user; <userinput>cdrecord -v dev=<replaceable>2,0</replaceable> -dao -useinfo *.wav</userinput></screen>
<para>Make sure that <replaceable>2,0</replaceable> is set
- appropriately, as described in <link
- linkend="cdrecord"></link>.</para>
+ appropriately, as described in <xref
+ linkend="cdrecord"/>.</para>
</step>
</procedure>
@@ -1503,7 +1503,7 @@ cd0: Attempt to query device size failed: NOT READY, Medium not present - tray c
as a removable hard drive. However, this media is not
compatible with most DVD-ROM drives and DVD-Video players
as only a few DVD writers support the DVD-RAM format.
- Refer to <link linkend="creating-dvd-ram"></link> for more
+ Refer to <xref linkend="creating-dvd-ram"/> for more
information on DVD-RAM use.</para>
</listitem>
@@ -1547,7 +1547,7 @@ cd0: Attempt to query device size failed: NOT READY, Medium not present - tray c
therefore <link linkend="atapicam">ATAPI/CAM support</link>
must be loaded or statically compiled into the kernel. This
support is not needed if the burner uses the USB interface.
- Refer to <link linkend="usb-disks"></link> for more details
+ Refer to <xref linkend="usb-disks"/> for more details
on USB device configuration.</para>
<para>DMA access must also be enabled for ATAPI devices, by
@@ -3035,8 +3035,8 @@ Filesystem 1K-blocks Used Avail Capacity Mounted on
<para>The <filename>GENERIC</filename> kernel does not
have this enabled by default, so a custom kernel must be
- compiled in order to use disk quotas. Refer to <link
- linkend="kernelconfig"></link> for more information on
+ compiled in order to use disk quotas. Refer to <xref
+ linkend="kernelconfig"/> for more information on
kernel configuration.</para>
<para>Next, enable disk quotas in
@@ -3338,7 +3338,7 @@ Password:</screen>
<title>Add the New Hard Drive</title>
<para>Install the new drive to the system as explained in
- <link linkend="disks-adding"></link>. For the purposes
+ <xref linkend="disks-adding"/>. For the purposes
of this example, a new hard drive partition has been
added as <devicename>/dev/ad4s1c</devicename> and
<devicename>/dev/ad0s1<replaceable>*</replaceable></devicename>
@@ -4298,7 +4298,7 @@ Device 1K-blocks Used Avail Capacity
other, and both are configured as primary nodes, the
condition is called <literal>split-brain</literal>. To
troubleshoot this situation, follow the steps described in
- <link linkend="disks-hast-sb"></link>.</para>
+ <xref linkend="disks-hast-sb"/>.</para>
</caution>
<para>Verify the result by running &man.hastctl.8; on each
@@ -4354,7 +4354,7 @@ Device 1K-blocks Used Avail Capacity
same network segment to share an IP address. Set up
<acronym>CARP</acronym> on both nodes of the cluster
according to the documentation available in
- <link linkend="carp"></link>. After setup, each node will
+ <xref linkend="carp"/>. After setup, each node will
have its own <devicename>carp0</devicename> interface with a
shared IP address of
<replaceable>172.16.0.254</replaceable>. The primary
diff --git a/en_US.ISO8859-1/books/handbook/firewalls/chapter.xml b/en_US.ISO8859-1/books/handbook/firewalls/chapter.xml
index 0a08053a70..1a1981fa35 100644
--- a/en_US.ISO8859-1/books/handbook/firewalls/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/firewalls/chapter.xml
@@ -660,7 +660,7 @@ ipnat_rules="/etc/ipnat.rules" # rules definition file for ipnat</programlist
<para>There is a way to build IPF rules that utilize the power
of script symbolic substitution. For more information, see
- <link linkend="firewalls-ipf-rules-script"></link>.</para>
+ <xref linkend="firewalls-ipf-rules-script"/>.</para>
</sect2>
<sect2>
@@ -2194,7 +2194,7 @@ ipfw add deny out</programlisting>
<para>If the machine is acting as a gateway providing
<acronym>NAT</acronym> using &man.natd.8;,
- refer to <link linkend="network-natd"></link> for information
+ refer to <xref linkend="network-natd"/> for information
regarding the required <filename>/etc/rc.conf</filename>
options.</para>
</sect2>
diff --git a/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.xml b/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.xml
index 6916d30bfc..f163e5cb07 100644
--- a/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.xml
@@ -291,8 +291,8 @@ following line in &man.loader.conf.5;:
<para>If <filename class="directory">/usr/src/</filename> does
not exist or it is empty, source has not been installed. The
easiest way to install source is to use
- <application>svn</application> as described in <link
- linkend="svn"></link>. One should also create a symlink to
+ <application>svn</application> as described in <xref
+ linkend="svn"/>. One should also create a symlink to
<filename class="directory">/usr/src/sys/</filename>:</para>
<screen>&prompt.root; <userinput>ln -s /usr/src/sys /sys</userinput></screen>
@@ -614,7 +614,7 @@ cpu I686_CPU</programlisting>
<para>This option enables kernel support for access control lists
(<acronym>ACL</acronym>s). This relies on the use of extended
attributes and <acronym>UFS2</acronym>, and the feature is
- described in detail in <link linkend="fs-acl"></link>.
+ described in detail in <xref linkend="fs-acl"/>.
<acronym>ACL</acronym>s are enabled by default and should not be
disabled in the kernel if they have been used previously on a
file system, as this will remove the ACLs, changing the way
diff --git a/en_US.ISO8859-1/books/handbook/l10n/chapter.xml b/en_US.ISO8859-1/books/handbook/l10n/chapter.xml
index 3af373fc6c..1fbe10fc99 100644
--- a/en_US.ISO8859-1/books/handbook/l10n/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/l10n/chapter.xml
@@ -638,7 +638,7 @@ keychange="<replaceable>fkey_number sequence</replaceable>"</programlisting>
<para>Although <application>Xorg</application> is not installed
with &os;, it can be installed from the Ports Collection.
- Refer to <link linkend="x11"></link> for more information on
+ Refer to <xref linkend="x11"/> for more information on
how to do this. This section discusses how to localize
<application>Xorg</application> once it is installed.</para>
diff --git a/en_US.ISO8859-1/books/handbook/linuxemu/chapter.xml b/en_US.ISO8859-1/books/handbook/linuxemu/chapter.xml
index a2a1fa0f94..f1de8f6b06 100644
--- a/en_US.ISO8859-1/books/handbook/linuxemu/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/linuxemu/chapter.xml
@@ -134,8 +134,8 @@ Id Refs Address Size Name
<para>Users who prefer to statically link &linux; binary
compatibility into the kernel should add <literal>options
COMPAT_LINUX</literal> to the custom kernel configuration
- file. Compile and install the new kernel as described in <link
- linkend="kernelconfig"></link>.</para>
+ file. Compile and install the new kernel as described in <xref
+ linkend="kernelconfig"/>.</para>
<sect2 id="linuxemu-libs-manually">
<title>Installing Libraries Manually</title>
@@ -686,7 +686,7 @@ FEATURE Maple maplelmg 2000.0831 permanent 1 XXXXXXXXXXXX \
6.5</application> onto a &os; system. It works quite well,
with the exception of the
<application>&java.virtual.machine;</application> which is
- described further in <link linkend="matlab-jre"></link>.</para>
+ described further in <xref linkend="matlab-jre"/>.</para>
<para>The &linux; version of <application>&matlab;</application>
can be purchased and licensed from <ulink
diff --git a/en_US.ISO8859-1/books/handbook/serialcomms/chapter.xml b/en_US.ISO8859-1/books/handbook/serialcomms/chapter.xml
index 53d1e21e03..86436fe80a 100644
--- a/en_US.ISO8859-1/books/handbook/serialcomms/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/serialcomms/chapter.xml
@@ -1420,7 +1420,7 @@ vq|VH57600|Very High Speed Modem at 57600,8-bit:\
</indexterm>
<para>Configuration of <filename>/etc/ttys</filename>
- is covered in <link linkend="ex-etc-ttys"></link>.
+ is covered in <xref linkend="ex-etc-ttys"/>.
Configuration for modems is similar, but a different
argument is passed to <command>getty</command> and a
different terminal type is specified. The general format
@@ -2103,7 +2103,7 @@ raisechar=^^</programlisting>
developers who want to debug the kernel or device
drivers.</para>
- <para>As described in <link linkend="boot"></link>, &os; employs
+ <para>As described in <xref linkend="boot"/>, &os; employs
a three stage bootstrap. The first two stages are in the boot
block code which is stored at the beginning of the &os;
slice on the boot disk. The boot block then loads and runs
@@ -2166,8 +2166,8 @@ raisechar=^^</programlisting>
<indexterm><primary>null-modem cable</primary></indexterm>
<para>Use either a null-modem cable or a standard serial
- cable and a null-modem adapter. See <link
- linkend="serial-cables-ports"></link> for a discussion
+ cable and a null-modem adapter. See <xref
+ linkend="serial-cables-ports"/> for a discussion
on serial cables.</para>
</step>
@@ -2482,7 +2482,7 @@ boot:</screen>
<para>During the third stage of the boot process, one can still
switch between the internal console and the serial console by
setting appropriate environment variables in the boot loader.
- See <link linkend="serialconsole-loader"></link> for more
+ See <xref linkend="serialconsole-loader"/> for more
information.</para>
</sect2>
@@ -2635,8 +2635,8 @@ boot:</screen>
<listitem>
<para>Recompile the boot blocks with
<makevar>BOOT_COMCONSOLE_SPEED</makevar> set to the
- new console speed. See <link
- linkend="serialconsole-com2"></link> for detailed
+ new console speed. See <xref
+ linkend="serialconsole-com2"/> for detailed
instructions about building and installing new boot
blocks.</para>
@@ -2686,8 +2686,8 @@ console="comconsole,vidconsole"</programlisting>
<procedure>
<step>
- <para>Get the kernel source as described in <link
- linkend="updating-upgrading"></link>.</para>
+ <para>Get the kernel source as described in <xref
+ linkend="updating-upgrading"/>.</para>
</step>
<step>
@@ -2844,8 +2844,8 @@ ttyu3 "/usr/libexec/getty std.9600" unknown off secure</programlisting>
<para>The boot loader needs to be compiled in order to use a
serial port other than <devicename>sio0</devicename> for the
- serial console. Follow the procedure described in <link
- linkend="serialconsole-com2"></link>.</para>
+ serial console. Follow the procedure described in <xref
+ linkend="serialconsole-com2"/>.</para>
</sect3>
</sect2>
diff --git a/en_US.ISO8859-1/books/handbook/users/chapter.xml b/en_US.ISO8859-1/books/handbook/users/chapter.xml
index 2a3cfbcfe4..c6be01a81e 100644
--- a/en_US.ISO8859-1/books/handbook/users/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/users/chapter.xml
@@ -594,7 +594,7 @@ Other information:</screen>
&man.ypchsh.1;. <acronym>NIS</acronym> support is
automatic, so specifying the <literal>yp</literal> before
the command is not necessary. How to configure NIS is
- covered in <link linkend="network-servers"></link>.</para>
+ covered in <xref linkend="network-servers"/>.</para>
</note>
</sect2>
<sect2 id="users-passwd">
@@ -685,8 +685,8 @@ passwd: done</screen>
<indexterm><primary>disk quotas</primary></indexterm>
<para>Disk quotas limit the amount of disk space available to
users and provide a way to quickly check that usage without
- calculating it every time. Quotas are discussed in <link
- linkend="quotas"></link>.</para>
+ calculating it every time. Quotas are discussed in <xref
+ linkend="quotas"/>.</para>
<para>The other resource limits include ways to limit the amount
of CPU, memory, and other resources a user may consume. These
diff --git a/en_US.ISO8859-1/books/handbook/vinum/chapter.xml b/en_US.ISO8859-1/books/handbook/vinum/chapter.xml
index e3dc800c4a..0b0dc34114 100644
--- a/en_US.ISO8859-1/books/handbook/vinum/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/vinum/chapter.xml
@@ -142,7 +142,7 @@
relationships. It works well when the access to the virtual
disk is spread evenly about its address space. When access is
concentrated on a smaller area, the improvement is less marked.
- <link linkend="vinum-concat"></link> illustrates the sequence in
+ <xref linkend="vinum-concat"/> illustrates the sequence in
which storage units are allocated in a concatenated
organization.</para>
@@ -179,7 +179,7 @@
somewhat more effort to locate the data, and it can cause
additional I/O load where a transfer is spread over multiple
disks, but it can also provide a more constant load across the
- disks. <link linkend="vinum-striped"></link> illustrates the
+ disks. <xref linkend="vinum-striped"/> illustrates the
sequence in which storage units are allocated in a striped
organization.</para>
@@ -379,7 +379,7 @@
</listitem>
</itemizedlist>
- <para><link linkend="vinum-comparison"></link> summarizes the
+ <para><xref linkend="vinum-comparison"/> summarizes the
advantages and disadvantages of each plex organization.</para>
<table id="vinum-comparison" frame="none">
@@ -512,8 +512,8 @@
S myvol.p0.s0 State: up PO: 0 B Size: 512 MB</programlisting>
<para>This output shows the brief listing format of
- &man.gvinum.8;. It is represented graphically in <link
- linkend="vinum-simple-vol"></link>.</para>
+ &man.gvinum.8;. It is represented graphically in <xref
+ linkend="vinum-simple-vol"/>.</para>
<para>
<figure id="vinum-simple-vol">
@@ -579,7 +579,7 @@
S mirror.p0.s0 State: up PO: 0 B Size: 512 MB
S mirror.p1.s0 State: empty PO: 0 B Size: 512 MB</programlisting>
- <para><link linkend="vinum-mirrored-vol"></link> shows the
+ <para><xref linkend="vinum-mirrored-vol"/> shows the
structure graphically.</para>
<para>
@@ -658,8 +658,8 @@
<graphic fileref="vinum/vinum-striped-vol"/>
</figure></para>
- <para>This volume is represented in <link
- linkend="vinum-striped-vol"></link>. The darkness of the
+ <para>This volume is represented in <xref
+ linkend="vinum-striped-vol"/>. The darkness of the
stripes indicates the position within the plex address space,
where the lightest stripes come first and the darkest
last.</para>
@@ -693,7 +693,7 @@
writes do not go to the same subdisks even if a transfer goes
over two drives.</para>
- <para><link linkend="vinum-raid10-vol"></link> represents the
+ <para><xref linkend="vinum-raid10-vol"/> represents the
structure of this volume.</para>
<para>
@@ -1134,8 +1134,8 @@ Subdisk root.p1.s0:
within the <devicename>vinum</devicename> partition
<literal>h</literal>, and the offset of this partition
within the device or slice. This is a typical setup that is
- necessary to avoid the problem described in <link
- linkend="vinum-root-panic"></link>. The entire
+ necessary to avoid the problem described in <xref
+ linkend="vinum-root-panic"/>. The entire
<literal>a</literal> partition is completely within the
<literal>h</literal> partition containing all the
<devicename>vinum</devicename> data for this device.</para>
@@ -1232,8 +1232,8 @@ Subdisk root.p1.s0:
<para>Similarly, if the above situation has been recovered,
by booting from a <quote>Fixit</quote> media, and the
bootstrap has been re-installed using
- <command>bsdlabel -B</command> as described in <link
- linkend="boot-boot1"></link>, the bootstrap will trash the
+ <command>bsdlabel -B</command> as described in <xref
+ linkend="boot-boot1"/>, the bootstrap will trash the
<devicename>vinum</devicename> header, and
<devicename>vinum</devicename> will no longer find its
disk(s). Though no actual <devicename>vinum</devicename>
diff --git a/en_US.ISO8859-1/books/handbook/virtualization/chapter.xml b/en_US.ISO8859-1/books/handbook/virtualization/chapter.xml
index fffefbac57..10cf700741 100644
--- a/en_US.ISO8859-1/books/handbook/virtualization/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/virtualization/chapter.xml
@@ -270,8 +270,8 @@
the host &mac;. This can be accomplished by adding
<literal>ifconfig_ed0="DHCP"</literal> to
<filename>/etc/rc.conf</filename>. More advanced
- networking setups are described in <link
- linkend="advanced-networking"></link>.</para>
+ networking setups are described in <xref
+ linkend="advanced-networking"/>.</para>
</step>
</procedure>
</sect3>
@@ -780,8 +780,8 @@ xenbr1 8000.feffffffffff no vif0.1
the µsoft.windows; host. This can be accomplished
by adding <literal>ifconfig_de0="DHCP"</literal> to
<filename>/etc/rc.conf</filename>. More advanced
- networking setups are described in <link
- linkend="advanced-networking"></link>.</para>
+ networking setups are described in <xref
+ linkend="advanced-networking"/>.</para>
</step>
</procedure>
</sect3>
@@ -983,8 +983,8 @@ xenbr1 8000.feffffffffff no vif0.1
the host &mac;. This can be accomplished by adding
<literal>ifconfig_em0="DHCP"</literal> to
<filename>/etc/rc.conf</filename>. More advanced
- networking setups are described in <link
- linkend="advanced-networking"></link>.</para>
+ networking setups are described in <xref
+ linkend="advanced-networking"/>.</para>
</step>
</procedure>
</sect3>
diff --git a/fr_FR.ISO8859-1/articles/pam/article.xml b/fr_FR.ISO8859-1/articles/pam/article.xml
index f9459e0883..3e1d5fc4ea 100644
--- a/fr_FR.ISO8859-1/articles/pam/article.xml
+++ b/fr_FR.ISO8859-1/articles/pam/article.xml
@@ -827,9 +827,8 @@ sshd password required pam_permit.so</programlisting>
<title id="pam-config-breakdown.title">Breakdown of a
configuration line</title>
- <para>Comme expliqu� dans la section <link
- linkend="pam-config-file-locations"
- endterm="pam-config-file-locations.title"></link>, chaque ligne de
+ <para>Comme expliqu� dans <xref
+ linkend="pam-config-file-locations"/>, chaque ligne de
<filename>pam.conf</filename> consiste en quatre champs ou plus: le
nom de service, le nom du m�canisme, le drapeau de contr�le, le nom
du module et la pr�sence ou non d'arguments pour le module.</para>
@@ -848,13 +847,11 @@ sshd password required pam_permit.so</programlisting>
commencent par le nom du m�canisme.</para>
- <para>Le m�canisme est l'un des quatre mots clef d�crit dans la
- section <link linkend="pam-facilities-primitives"
- endterm="pam-facilities-primitives.title"></link></para>
+ <para>Le m�canisme est l'un des quatre mots clef d�crit dans
+ <xref linkend="pam-facilities-primitives"/>.</para>
<para>De m�me, le drapeau de contr�le est l'un des quatre mots
- clef d�crits dans la section <link linkend="pam-chains-policies"
- endterm="pam-chains-policies.title"></link> et d�crit comment
+ clef d�crits dans <xref linkend="pam-chains-policies"/> et d�crit comment
le module doit interpr�ter le code de retour du
module. Linux-PAM supporte une syntaxe alternative qui vous
laisse sp�cifier l'action à associer à chaque code de retour
@@ -1212,8 +1209,8 @@ sshd password required pam_permit.so</programlisting>
biblioth�que PAM diff�rente vous devrez fournir votre propre
fonction de conversation. Une fonction de conversation robuste est
�tonnamment difficile à impl�menter; celle pr�sent�e dans
- l'appendice<link linkend="pam-sample-conv"
- endterm="pam-sample-conv.title"></link> est un bon point de
+ <xref linkend="pam-sample-conv"/>
+ est un bon point de
d�part, mais ne devrait pas �tre utilis�e dans des applications
r�elles.</para>
diff --git a/ja_JP.eucJP/books/handbook/desktop/chapter.xml b/ja_JP.eucJP/books/handbook/desktop/chapter.xml
index 3d92a21015..efb8258b30 100644
--- a/ja_JP.eucJP/books/handbook/desktop/chapter.xml
+++ b/ja_JP.eucJP/books/handbook/desktop/chapter.xml
@@ -234,7 +234,7 @@
<application>GNOME</application> �ǥ����ȥå״Ķ��ˤϡ�
���줾�� HTML �֥饦�����Ѱդ���Ƥ��ޤ���
�����Υǥ����ȥå״Ķ������ꤹ�뤿��ξ���ˤĤ��Ƥ�
- <link linkend="x11-wm"></link> �Ȥ��Ƥ���������</para>
+ <xref linkend="x11-wm"/> �Ȥ��Ƥ���������</para>
<para>���̤ʥ֥饦���Ȥ��Ƥϡ�
<filename role="package">www/dillo2</filename>,
@@ -591,7 +591,7 @@
</note>
<para>&java; �ץ饰����ȡ��뤹��ˤϡ�
- <link linkend="moz-java-plugin"></link>
+ <xref linkend="moz-java-plugin"/>
�˽�Ƥ�����˽��äƤ���������</para>
<para>&java; �Υ��ݡ��Ȥȡ��뤷���顢
diff --git a/mn_MN.UTF-8/books/handbook/serialcomms/chapter.xml b/mn_MN.UTF-8/books/handbook/serialcomms/chapter.xml
index 57df2bb515..60227c8080 100644
--- a/mn_MN.UTF-8/books/handbook/serialcomms/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/serialcomms/chapter.xml
@@ -1349,7 +1349,7 @@ vq|VH57600|Very High Speed Modem at 57600,8-bit:\
</indexterm>
<para><filename>/etc/ttys</filename> файлын тохиргоо
- <link linkend="ex-etc-ttys"></link> хэсэгт яригдсан байгаа.
+ <xref linkend="ex-etc-ttys"/> хэсэгт яригдсан байгаа.
Модемуудын тохиргоо төстэй боловч бид өөр терминалын төрлийг заахын тулд
<command>getty</command> уруу өөр нэмэлт өгөгдлүүдийг дамжуулах ёстой.
Түгжигдсэн хурдтай болон таарах хурдтай тохиргоонуудын ерөнхий хэлбэр нь
@@ -1999,7 +1999,7 @@ raisechar=^^</programlisting>
хүссэн системийн администраторууд болон цөм эсвэл төхөөрөмжийн драйверуудыг
дибаг хийхийг хүссэн хөгжүүлэгчид юм.</para>
- <para><link linkend="boot"></link>-т тайлбарласнаар &os; нь гурван шаттай эхлүүлэгчийг
+ <para><xref linkend="boot"/>-т тайлбарласнаар &os; нь гурван шаттай эхлүүлэгчийг
хэрэглэдэг. Эхний хоёр шат нь ачаалах диск дээрх &os;-ийн зүсмэлийн эхлэл дээр
хадгалагддаг ачаалах блокийн кодод байдаг. Ачаалах блок нь ачаалагч дуудагчийг
(<filename>/boot/loader</filename>) гурав дахь шатны код болгон дуудаж
@@ -2059,7 +2059,7 @@ raisechar=^^</programlisting>
<para>Танд null-модем кабель эсвэл стандарт цуваа кабель болон null-модем
хувиргагч хэрэгтэй болно. Цуваа кабелиудын тухай хэлэлцүүлгийг
- <link linkend="serial-cables-ports"></link> хэсгээс үзнэ үү.</para>
+ <xref linkend="serial-cables-ports"/> хэсгээс үзнэ үү.</para>
</step>
<step>
@@ -2347,7 +2347,7 @@ boot:</screen>
<para>Ачаалагч дуудагч дуудагдсаны дараа та ачаалах процессийн гурав дахь
шатанд байгаа бол ачаалагч дуудагчид зохих орчны хувьсагчуудыг тохируулж
дотоод консол болон цуваа консолын хооронд та шилжиж чадсан хэвээр байх
- болно. <link linkend="serialconsole-loader"></link>-г үзнэ үү.</para>
+ болно. <xref linkend="serialconsole-loader"/>-г үзнэ үү.</para>
</sect2>
<sect2 id="serialconsole-summary">
@@ -2500,7 +2500,7 @@ boot:</screen>
<para>Ачаалах блокуудыг консолын шинэ хурд заагдсан
<makevar>BOOT_COMCONSOLE_SPEED</makevar> хувьсагчтай цуг
дахин эмхэтгэнэ. Шинэ ачаалах блокуудыг бүтээж суулгах талаар
- дэлгэрэнгүй заавруудыг <link linkend="serialconsole-com2"></link>-с
+ дэлгэрэнгүй заавруудыг <xref linkend="serialconsole-com2"/>-с
үзнэ үү.</para>
<para>Хэрэв цуваа консол нь <option>-h</option> тохируулгатайгаар
@@ -2552,7 +2552,7 @@ console="comconsole,vidconsole"</programlisting>
<procedure>
<step>
- <para>Цөмийн эхийг авна. (<link linkend="updating-upgrading"></link> бүлгийг үзнэ үү)</para>
+ <para>Цөмийн эхийг авна. (<xref linkend="updating-upgrading"/> бүлгийг үзнэ үү)</para>
</step>
<step>
diff --git a/mn_MN.UTF-8/books/handbook/users/chapter.xml b/mn_MN.UTF-8/books/handbook/users/chapter.xml
index 5fb93fff51..b1171818c7 100644
--- a/mn_MN.UTF-8/books/handbook/users/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/users/chapter.xml
@@ -570,7 +570,7 @@ Other information:</screen>
&man.ypchfn.1;, болон &man.ypchsh.1; нартай ижилхэн холбоос.
NIS дэмжлэг автоматаар хийгдсэн байгаа. Тийм болохоор тушаалын
урд нь <literal>yp</literal> угтвар залгах шаардлагагүй.
- NIS хэрхэн тохируулах талаар <link linkend="network-servers"></link>
+ NIS хэрхэн тохируулах талаар <xref linkend="network-servers"/>
хэсэгт тайлбарлагдах болно.</para>
</note>
</sect2>
@@ -659,8 +659,8 @@ passwd: done</screen>
<indexterm><primary>дискний хуваарилалт</primary></indexterm>
<para>Дискийн хуваарилалт нь хэрэглэгчийн диск хэрэглэх хэмжээг
зааглаж өгдөг бөгөөд тухай бүрд уг хэмжээг тооцож бодолгүй
- шуурхай шалгах боломж өгдөг. Хуваарилалт нь <link
- linkend="quotas"></link> бүлэгт авч хэлэлцэгдсэн.</para>
+ шуурхай шалгах боломж өгдөг. Хуваарилалт нь <xref
+ linkend="quotas"/> бүлэгт авч хэлэлцэгдсэн.</para>
<para>Бусад нөөцийн хязгаарлалтуудад Процессор,
санах ойн хэмжээ болон бусад хэрэглэгчийн хэрэглэх нөөцүүд
diff --git a/mn_MN.UTF-8/books/handbook/virtualization/chapter.xml b/mn_MN.UTF-8/books/handbook/virtualization/chapter.xml
index af962f3378..09895c5d96 100644
--- a/mn_MN.UTF-8/books/handbook/virtualization/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/virtualization/chapter.xml
@@ -270,8 +270,8 @@
ижил локал сүлжээнд виртуал машиныг холбохын тулд DHCP-г
ашиглах явдал юм. Үүнийг <filename>/etc/rc.conf</filename>
файлд <literal>ifconfig_ed0="DHCP"</literal> гэж
- нэмэн хийж болно. Сүлжээний илүү нарийн тохиргоонууд <link
- linkend="advanced-networking"></link>-д тайлбарлагдсан
+ нэмэн хийж болно. Сүлжээний илүү нарийн тохиргоонууд <xref
+ linkend="advanced-networking"/>-д тайлбарлагдсан
байгаа.</para>
</step>
</procedure>
@@ -765,7 +765,7 @@ xenbr1 8000.feffffffffff no vif0.1
DHCP-ийг ашиглах явдал юм. <literal>ifconfig_de0="DHCP"</literal>
мөрийг <filename>/etc/rc.conf</filename> файлд нэмж
үүнийг хийнэ. Сүлжээний илүү нарийн тохиргоонуудын
- талаар <link linkend="advanced-networking"></link> дээр
+ талаар <xref linkend="advanced-networking"/> дээр
тайлбарласан байгаа болно.</para>
</step>
</procedure>
@@ -963,7 +963,7 @@ xenbr1 8000.feffffffffff no vif0.1
юм. <filename>/etc/rc.conf</filename> файлд
<literal>ifconfig_em0="DHCP"</literal> мөрийг нэмснээр
үүнийг хийж болно. Сүлжээний илүү дэлгэрэнгүй тохиргоонуудын
- талаар <link linkend="advanced-networking"></link>-д тайлбарласан
+ талаар <xref linkend="advanced-networking"/>-д тайлбарласан
байгаа.</para>
</step>
</procedure>
diff --git a/ru_RU.KOI8-R/articles/pam/article.xml b/ru_RU.KOI8-R/articles/pam/article.xml
index d10d4b116b..718427da2b 100644
--- a/ru_RU.KOI8-R/articles/pam/article.xml
+++ b/ru_RU.KOI8-R/articles/pam/article.xml
@@ -849,8 +849,8 @@ sshd password required pam_permit.so</programlisting>
<section id="pam-config-breakdown">
<title id="pam-config-breakdown.title">��������� ������ ���������</title>
- <para>��� ��� ��������� � ������� <link linkend="pam-config-file"
- endterm="pam-config-file.title"></link>, ������ ������ �����
+ <para>��� ��� ��������� � <xref linkend="pam-config-file"/>,
+ ������ ������ �����
<filename>/etc/pam.conf</filename> ������� �� ����ң� ��� ��������
���������� �����: ����� �������, ����� ����������, ������������ �����,
����� ������ � �������������� ���������� ������, ������� �����
@@ -867,12 +867,11 @@ sshd password required pam_permit.so</programlisting>
������ ���������� � �������� ����������.</para>
<para>��� ���������� ������������ ����� ���� �� ����ң� �������� ����,
- ��������� � ����� <link linkend="pam-facilities-primitives"
- endterm="pam-facilities-primitives.title"></link>.</para>
+ ��������� � <xref linkend="pam-facilities-primitives"/>.</para>
<para>����� ����� ����������� ���� �������� ����� �� ����ң� ��������
- ����, ��������� � ������� <link linkend="pam-chains-policies"
- endterm="pam-chains-policies.title"></link>, � ������� ����������, ���
+ ����, ��������� � <xref linkend="pam-chains-policies"/>,
+ � ������� ����������, ���
���������������� ������������ �� ������ ���. � Linux-PAM
�������������� �������������� ���������, ������� ��������� �������
��������, ��������� � ������ ��������� ����� ��������, �� �����
@@ -1268,8 +1267,8 @@ sshd password required pam_permit.so</programlisting>
���� �� ����������� ������� ��� ���������� � ������� � ������
����������� PAM, ��� ���������� ����� ������� ����������� �������
��������������. ��ģ���� ������� �������������� ���������� ������
- ��������; ��, ��� ��������� � ���������� <link linkend="pam-sample-conv"
- endterm="pam-sample-conv.title"></link>, ������ � �������� ���������
+ ��������; ��, ��� ��������� � <xref linkend="pam-sample-conv"/>,
+ ������ � �������� ���������
�����, �� � �������� ����������� �������������� �� �����.</para>
<programlisting>
From 843e63283ce72f1d48c25874b5efff8def89e051 Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Thu, 4 Apr 2013 11:39:28 +0000
Subject: [PATCH 096/121] - sectX author rendering needs the same customization
as used for chapter authors
---
share/xsl/freebsd-xhtml-common.xsl | 20 +++++++++++--
share/xsl/freebsd-xhtml-titlepage.xsl | 42 ++++++++++++++++++---------
share/xsl/titlepage.templates.xml | 28 +++++++++---------
3 files changed, 60 insertions(+), 30 deletions(-)
diff --git a/share/xsl/freebsd-xhtml-common.xsl b/share/xsl/freebsd-xhtml-common.xsl
index 9fe99f2fc9..48b034a034 100644
--- a/share/xsl/freebsd-xhtml-common.xsl
+++ b/share/xsl/freebsd-xhtml-common.xsl
@@ -75,7 +75,7 @@
</div>
</xsl:template>
- <xsl:template name="chapter.authorgroup">
+ <xsl:template name="freebsd.authorgroup">
<span class="authorgroup">
<!-- XXX: our docs use a quirky semantics for this -->
@@ -108,11 +108,27 @@
<xsl:apply-templates/>
</xsl:template>
- <xsl:template name="chapter.author">
+ <xsl:template name="freebsd.author">
<xsl:if test="contrib">
<xsl:apply-templates select="contrib"/>
<xsl:text> </xsl:text>
</xsl:if>
<xsl:apply-templates select="*[not(self::contrib)]"/>
</xsl:template>
+
+ <xsl:template name="chapter.authorgroup">
+ <xsl:call-template name="freebsd.authorgroup"/>
+ </xsl:template>
+
+ <xsl:template name="section.authorgroup">
+ <xsl:call-template name="freebsd.authorgroup"/>
+ </xsl:template>
+
+ <xsl:template name="chapter.author">
+ <xsl:call-template name="freebsd.author"/>
+ </xsl:template>
+
+ <xsl:template name="section.author">
+ <xsl:call-template name="freebsd.author"/>
+ </xsl:template>
</xsl:stylesheet>
diff --git a/share/xsl/freebsd-xhtml-titlepage.xsl b/share/xsl/freebsd-xhtml-titlepage.xsl
index 1b64c37f8e..fb54a93c6a 100644
--- a/share/xsl/freebsd-xhtml-titlepage.xsl
+++ b/share/xsl/freebsd-xhtml-titlepage.xsl
@@ -2159,13 +2159,15 @@
<xsl:template match="authorgroup" mode="section.titlepage.recto.auto.mode">
<div xsl:use-attribute-sets="section.titlepage.recto.style">
-<xsl:apply-templates select="." mode="section.titlepage.recto.mode"/>
+<xsl:call-template name="section.authorgroup">
+</xsl:call-template>
</div>
</xsl:template>
<xsl:template match="author" mode="section.titlepage.recto.auto.mode">
<div xsl:use-attribute-sets="section.titlepage.recto.style">
-<xsl:apply-templates select="." mode="section.titlepage.recto.mode"/>
+<xsl:call-template name="section.author">
+</xsl:call-template>
</div>
</xsl:template>
@@ -2346,13 +2348,15 @@
<xsl:template match="authorgroup" mode="sect1.titlepage.recto.auto.mode">
<div xsl:use-attribute-sets="sect1.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/>
+<xsl:call-template name="section.authorgroup">
+</xsl:call-template>
</div>
</xsl:template>
<xsl:template match="author" mode="sect1.titlepage.recto.auto.mode">
<div xsl:use-attribute-sets="sect1.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/>
+<xsl:call-template name="section.author">
+</xsl:call-template>
</div>
</xsl:template>
@@ -2533,13 +2537,15 @@
<xsl:template match="authorgroup" mode="sect2.titlepage.recto.auto.mode">
<div xsl:use-attribute-sets="sect2.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/>
+<xsl:call-template name="section.authorgroup">
+</xsl:call-template>
</div>
</xsl:template>
<xsl:template match="author" mode="sect2.titlepage.recto.auto.mode">
<div xsl:use-attribute-sets="sect2.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/>
+<xsl:call-template name="section.author">
+</xsl:call-template>
</div>
</xsl:template>
@@ -2720,13 +2726,15 @@
<xsl:template match="authorgroup" mode="sect3.titlepage.recto.auto.mode">
<div xsl:use-attribute-sets="sect3.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/>
+<xsl:call-template name="section.authorgroup">
+</xsl:call-template>
</div>
</xsl:template>
<xsl:template match="author" mode="sect3.titlepage.recto.auto.mode">
<div xsl:use-attribute-sets="sect3.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/>
+<xsl:call-template name="section.author">
+</xsl:call-template>
</div>
</xsl:template>
@@ -2907,13 +2915,15 @@
<xsl:template match="authorgroup" mode="sect4.titlepage.recto.auto.mode">
<div xsl:use-attribute-sets="sect4.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/>
+<xsl:call-template name="section.authorgroup">
+</xsl:call-template>
</div>
</xsl:template>
<xsl:template match="author" mode="sect4.titlepage.recto.auto.mode">
<div xsl:use-attribute-sets="sect4.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/>
+<xsl:call-template name="section.author">
+</xsl:call-template>
</div>
</xsl:template>
@@ -3094,13 +3104,15 @@
<xsl:template match="authorgroup" mode="sect5.titlepage.recto.auto.mode">
<div xsl:use-attribute-sets="sect5.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/>
+<xsl:call-template name="section.authorgroup">
+</xsl:call-template>
</div>
</xsl:template>
<xsl:template match="author" mode="sect5.titlepage.recto.auto.mode">
<div xsl:use-attribute-sets="sect5.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/>
+<xsl:call-template name="section.author">
+</xsl:call-template>
</div>
</xsl:template>
@@ -3298,13 +3310,15 @@
<xsl:template match="authorgroup" mode="simplesect.titlepage.recto.auto.mode">
<div xsl:use-attribute-sets="simplesect.titlepage.recto.style">
-<xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/>
+<xsl:call-template name="section.authorgroup">
+</xsl:call-template>
</div>
</xsl:template>
<xsl:template match="author" mode="simplesect.titlepage.recto.auto.mode">
<div xsl:use-attribute-sets="simplesect.titlepage.recto.style">
-<xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/>
+<xsl:call-template name="section.author">
+</xsl:call-template>
</div>
</xsl:template>
diff --git a/share/xsl/titlepage.templates.xml b/share/xsl/titlepage.templates.xml
index 4aea970113..f1f05644f3 100644
--- a/share/xsl/titlepage.templates.xml
+++ b/share/xsl/titlepage.templates.xml
@@ -383,8 +383,8 @@
<title/>
<subtitle/>
<corpauthor/>
- <authorgroup/>
- <author/>
+ <authorgroup t:named-template="section.authorgroup"/>
+ <author t:named-template="section.author"/>
<othercredit/>
<releaseinfo/>
<copyright/>
@@ -414,8 +414,8 @@
<title/>
<subtitle/>
<corpauthor/>
- <authorgroup/>
- <author/>
+ <authorgroup t:named-template="section.authorgroup"/>
+ <author t:named-template="section.author"/>
<othercredit/>
<releaseinfo/>
<copyright/>
@@ -445,8 +445,8 @@
<title/>
<subtitle/>
<corpauthor/>
- <authorgroup/>
- <author/>
+ <authorgroup t:named-template="section.authorgroup"/>
+ <author t:named-template="section.author"/>
<othercredit/>
<releaseinfo/>
<copyright/>
@@ -476,8 +476,8 @@
<title/>
<subtitle/>
<corpauthor/>
- <authorgroup/>
- <author/>
+ <authorgroup t:named-template="section.authorgroup"/>
+ <author t:named-template="section.author"/>
<othercredit/>
<releaseinfo/>
<copyright/>
@@ -507,8 +507,8 @@
<title/>
<subtitle/>
<corpauthor/>
- <authorgroup/>
- <author/>
+ <authorgroup t:named-template="section.authorgroup"/>
+ <author t:named-template="section.author"/>
<othercredit/>
<releaseinfo/>
<copyright/>
@@ -538,8 +538,8 @@
<title/>
<subtitle/>
<corpauthor/>
- <authorgroup/>
- <author/>
+ <authorgroup t:named-template="section.authorgroup"/>
+ <author t:named-template="section.author"/>
<othercredit/>
<releaseinfo/>
<copyright/>
@@ -569,8 +569,8 @@
<title/>
<subtitle/>
<corpauthor/>
- <authorgroup/>
- <author/>
+ <authorgroup t:named-template="section.authorgroup"/>
+ <author t:named-template="section.author"/>
<othercredit/>
<releaseinfo/>
<copyright/>
From a6684b43062403c9583d50fde9835bdceb1826a1 Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Thu, 4 Apr 2013 11:40:58 +0000
Subject: [PATCH 097/121] - Reduce the misuse of role attribute;
role="directory" should actually be class="directory" - Add constraint to
enforce this
---
.../books/handbook/geom/chapter.xml | 4 +-
.../books/handbook/printing/chapter.xml | 2 +-
.../handbook/advanced-networking/chapter.xml | 2 +-
.../books/handbook/audit/chapter.xml | 2 +-
.../books/handbook/disks/chapter.xml | 4 +-
.../books/handbook/eresources/chapter.xml | 2 +-
.../handbook/network-servers/chapter.xml | 16 ++++----
.../books/handbook/ports/chapter.xml | 2 +-
.../books/handbook/security/chapter.xml | 2 +-
.../articles/portbuild/article.xml | 6 +--
.../books/handbook/eresources/chapter.xml | 2 +-
.../books/handbook/mirrors/chapter.xml | 2 +-
es_ES.ISO8859-1/articles/nanobsd/article.xml | 26 ++++++-------
.../articles/p4-primer/article.xml | 12 +++---
.../handbook/advanced-networking/chapter.xml | 4 +-
.../books/handbook/geom/chapter.xml | 12 +++---
.../books/handbook/install/chapter.xml | 2 +-
.../books/handbook/jails/chapter.xml | 38 +++++++++----------
.../books/handbook/mail/chapter.xml | 6 +--
.../books/handbook/security/chapter.xml | 2 +-
fr_FR.ISO8859-1/articles/nanobsd/article.xml | 24 ++++++------
.../handbook/advanced-networking/chapter.xml | 24 ++++++------
.../books/handbook/geom/chapter.xml | 14 +++----
.../books/handbook/install/chapter.xml | 2 +-
.../books/handbook/jails/chapter.xml | 10 ++---
.../books/handbook/kernelconfig/chapter.xml | 2 +-
.../books/handbook/mail/chapter.xml | 14 +++----
.../books/handbook/mirrors/chapter.xml | 20 +++++-----
.../books/handbook/ppp-and-slip/chapter.xml | 10 ++---
.../books/handbook/security/chapter.xml | 2 +-
.../books/handbook/x11/chapter.xml | 8 ++--
.../books/handbook/firewalls/chapter.xml | 2 +-
.../articles/committers-guide/article.xml | 8 ++--
.../books/handbook/geom/chapter.xml | 12 +++---
.../books/handbook/install/chapter.xml | 6 +--
.../books/handbook/jails/chapter.xml | 38 +++++++++----------
.../books/handbook/kernelconfig/chapter.xml | 2 +-
.../books/handbook/linuxemu/chapter.xml | 2 +-
.../books/handbook/mirrors/chapter.xml | 2 +-
.../handbook/network-servers/chapter.xml | 14 +++----
.../books/handbook/eresources/chapter.xml | 4 +-
.../books/handbook/mirrors/chapter.xml | 2 +-
.../books/handbook/eresources/chapter.xml | 2 +-
.../books/handbook/mirrors/chapter.xml | 2 +-
.../books/handbook/eresources/chapter.xml | 2 +-
.../books/handbook/jails/chapter.xml | 38 +++++++++----------
.../handbook/advanced-networking/chapter.xml | 2 +-
.../books/handbook/audit/chapter.xml | 8 ++--
.../books/handbook/disks/chapter.xml | 4 +-
.../books/handbook/geom/chapter.xml | 14 +++----
.../books/handbook/linuxemu/chapter.xml | 2 +-
.../books/handbook/mirrors/chapter.xml | 2 +-
.../handbook/network-servers/chapter.xml | 16 ++++----
.../books/handbook/ports/chapter.xml | 12 +++---
.../articles/committers-guide/article.xml | 10 ++---
.../books/fdp-primer/the-website/chapter.xml | 2 +-
.../handbook/advanced-networking/chapter.xml | 2 +-
ru_RU.KOI8-R/books/handbook/audit/chapter.xml | 6 +--
.../books/handbook/linuxemu/chapter.xml | 2 +-
.../books/handbook/mirrors/chapter.xml | 2 +-
share/xml/freebsd.sch | 6 +++
zh_CN.GB2312/books/handbook/audit/chapter.xml | 2 +-
zh_TW.Big5/articles/cvs-freebsd/article.xml | 24 ++++++------
zh_TW.Big5/articles/nanobsd/article.xml | 26 ++++++-------
.../articles/remote-install/article.xml | 22 +++++------
.../books/fdp-primer/the-website/chapter.xml | 2 +-
.../handbook/advanced-networking/chapter.xml | 2 +-
zh_TW.Big5/books/handbook/audit/chapter.xml | 8 ++--
zh_TW.Big5/books/handbook/disks/chapter.xml | 4 +-
zh_TW.Big5/books/handbook/geom/chapter.xml | 16 ++++----
zh_TW.Big5/books/handbook/jails/chapter.xml | 38 +++++++++----------
.../books/handbook/kernelconfig/chapter.xml | 2 +-
.../books/handbook/linuxemu/chapter.xml | 2 +-
zh_TW.Big5/books/handbook/mirrors/chapter.xml | 2 +-
zh_TW.Big5/books/handbook/ports/chapter.xml | 14 +++----
75 files changed, 337 insertions(+), 331 deletions(-)
diff --git a/de_DE.ISO8859-1/books/handbook/geom/chapter.xml b/de_DE.ISO8859-1/books/handbook/geom/chapter.xml
index 13ee15d505..db8ac567d2 100644
--- a/de_DE.ISO8859-1/books/handbook/geom/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/geom/chapter.xml
@@ -108,7 +108,7 @@
— Master Boot Records, <acronym>BSD</acronym>-Label usw.
— durch die Nutzung von Datentr�gern (Providern) oder
den besonderen Dateien in <filename
- role="directory">/dev</filename>. Verschiedene Software
+ class="directory">/dev</filename>. Verschiedene Software
<acronym>RAID</acronym>-Konfigurationen unterst�tzend, wird
GEOM Ihnen transparenten Zugriff auf das Betriebssystem und
System-Dienstprogramme gew�hren.</para>
@@ -187,7 +187,7 @@
existiert. Falls dieser Datentr�ger eine Root-Partition
werden soll, dann nutzen Sie zeitweise einen anderen
Mount-Punkt, beispielsweise <filename
- role="directory">/mnt</filename>:</para>
+ class="directory">/mnt</filename>:</para>
<screen>&prompt.root; <userinput>mkdir /mnt</userinput></screen>
</step>
diff --git a/de_DE.ISO8859-1/books/handbook/printing/chapter.xml b/de_DE.ISO8859-1/books/handbook/printing/chapter.xml
index bf1e7185e1..f5d20e2454 100644
--- a/de_DE.ISO8859-1/books/handbook/printing/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/printing/chapter.xml
@@ -1313,7 +1313,7 @@ bamboo|ps|PS|S|panasonic|Panasonic KX-P4455 PostScript v51.4:\
identifiziert und angelegt haben, m�ssen Sie dem
<application>LPD</application>-System mitteilen, welche
Ger�tedatei im Verzeichnis <filename
- role="directory">/dev</filename> es f�r die
+ class="directory">/dev</filename> es f�r die
Daten�bertragung zum Drucker verwenden soll.</para>
<para>Geben Sie die Ger�tedatei durch das Attribut
diff --git a/el_GR.ISO8859-7/books/handbook/advanced-networking/chapter.xml b/el_GR.ISO8859-7/books/handbook/advanced-networking/chapter.xml
index 81538410ca..8c187c5e69 100644
--- a/el_GR.ISO8859-7/books/handbook/advanced-networking/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/advanced-networking/chapter.xml
@@ -2908,7 +2908,7 @@ subnet 192.168.4.0 netmask 255.255.255.0 {
<filename>pxeboot</filename>, not the kernel. There are other
interesting possibilities, like loading
<filename>pxeboot</filename> from a &os; CD-ROM
- <filename role="directory">/boot</filename> directory (as
+ <filename class="directory">/boot</filename> directory (as
&man.pxeboot.8; can load a <filename>GENERIC</filename> kernel,
this makes it possible to use <acronym>PXE</acronym> to boot
from a remote CD-ROM).</para>
diff --git a/el_GR.ISO8859-7/books/handbook/audit/chapter.xml b/el_GR.ISO8859-7/books/handbook/audit/chapter.xml
index 8fc903b178..e76ff9fa67 100644
--- a/el_GR.ISO8859-7/books/handbook/audit/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/audit/chapter.xml
@@ -232,7 +232,7 @@
<title>Audit Configuration</title>
<para>All configuration files for security audit are found in
- <filename role="directory">/etc/security</filename>. The following
+ <filename class="directory">/etc/security</filename>. The following
files must be present before the audit daemon is started:</para>
<itemizedlist>
diff --git a/el_GR.ISO8859-7/books/handbook/disks/chapter.xml b/el_GR.ISO8859-7/books/handbook/disks/chapter.xml
index 59427fc440..05a30a92d1 100644
--- a/el_GR.ISO8859-7/books/handbook/disks/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/disks/chapter.xml
@@ -3898,7 +3898,7 @@ device crypto</screen>
<para>The following example will describe how to generate a
key file, which will be used as part of the Master Key for
the encrypted provider mounted under
- <filename role="directory">/private</filename>. The key
+ <filename class="directory">/private</filename>. The key
file will provide some random data used to encrypt the
Master Key. The Master Key will be protected by a
passphrase as well. Provider's sector size will be 4kB big.
@@ -3970,7 +3970,7 @@ Filesystem Size Used Avail Capacity Mounted on
<title>Unmounting and Detaching the Provider</title>
<para>Once the work on the encrypted partition is done, and
- the <filename role="directory">/private</filename> partition
+ the <filename class="directory">/private</filename> partition
is no longer needed, it is prudent to consider unmounting
and detaching the <command>geli</command> encrypted
partition from the kernel.</para>
diff --git a/el_GR.ISO8859-7/books/handbook/eresources/chapter.xml b/el_GR.ISO8859-7/books/handbook/eresources/chapter.xml
index 3146e779cd..5bfedf526b 100644
--- a/el_GR.ISO8859-7/books/handbook/eresources/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/eresources/chapter.xml
@@ -1585,7 +1585,7 @@
<para>���������� �������� �������� �� ���
<quote>������� ��� Ports</quote> (<filename
- role="directory">/usr/ports</filename>) ��� ������������ ��
+ class="directory">/usr/ports</filename>) ��� ������������ ��
����� ����������� � ���������� ��������� ��� &os; ���� ��� �����
�������� �������. ��������������� �������� �������� ��
������� ���� ������������� ��� ��� �������, ���� �����������
diff --git a/el_GR.ISO8859-7/books/handbook/network-servers/chapter.xml b/el_GR.ISO8859-7/books/handbook/network-servers/chapter.xml
index 824db9b047..ec5b7daf26 100644
--- a/el_GR.ISO8859-7/books/handbook/network-servers/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/network-servers/chapter.xml
@@ -3104,7 +3104,7 @@ dhcpd_ifaces="dc0"</programlisting>
<hostid>org.</hostid>, as <hostid>org.</hostid> is more specific
than the root zone. The layout of each part of a hostname is
much like a file system: the
- <filename role="directory">/dev</filename> directory falls
+ <filename class="directory">/dev</filename> directory falls
within the root, and so on.</para>
</sect2>
@@ -3188,7 +3188,7 @@ dhcpd_ifaces="dc0"</programlisting>
</row>
<row>
- <entry><filename role="directory">/etc/namedb</filename></entry>
+ <entry><filename class="directory">/etc/namedb</filename></entry>
<entry>Directory where BIND zone information resides.</entry>
</row>
@@ -3202,10 +3202,10 @@ dhcpd_ifaces="dc0"</programlisting>
<para>Depending on how a given zone is configured on the server,
the files related to that zone can be found in the <filename
- role="directory">master</filename>, <filename
- role="directory">slave</filename>, or <filename
- role="directory">dynamic</filename> subdirectories of the
- <filename role="directory">/etc/namedb</filename> directory.
+ class="directory">master</filename>, <filename
+ class="directory">slave</filename>, or <filename
+ class="directory">dynamic</filename> subdirectories of the
+ <filename class="directory">/etc/namedb</filename> directory.
These files contain the <acronym>DNS</acronym> information that
will be given out by the name server in response to queries.</para>
</sect2>
@@ -3253,7 +3253,7 @@ dhcpd_ifaces="dc0"</programlisting>
<para>Configuration files for <application>named</application>
currently reside in
- <filename role="directory">/etc/namedb</filename> directory and
+ <filename class="directory">/etc/namedb</filename> directory and
will need modification before use, unless all that is needed is
a simple resolver. This is where most of the configuration will
be performed.</para>
@@ -3262,7 +3262,7 @@ dhcpd_ifaces="dc0"</programlisting>
<title>Using <command>make-localhost</command></title>
<para>To configure a master zone for the localhost visit the
- <filename role="directory">/etc/namedb</filename> directory
+ <filename class="directory">/etc/namedb</filename> directory
and run the following command:</para>
<screen>&prompt.root; <userinput>sh make-localhost</userinput></screen>
diff --git a/el_GR.ISO8859-7/books/handbook/ports/chapter.xml b/el_GR.ISO8859-7/books/handbook/ports/chapter.xml
index c63420e884..9fba5ed3c1 100644
--- a/el_GR.ISO8859-7/books/handbook/ports/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/ports/chapter.xml
@@ -679,7 +679,7 @@ docbook =
</note>
<para>������������� ��� ��
- <filename role="directory">/usr/ports</filename>
+ <filename class="directory">/usr/ports</filename>
����� ����� ���� ���������� �� <application>csup</application> ���
����� ����! ��� ����� ��� ��������� �� ������� ��� Ports ����
������� ����� �����, �� <application>csup</application>
diff --git a/el_GR.ISO8859-7/books/handbook/security/chapter.xml b/el_GR.ISO8859-7/books/handbook/security/chapter.xml
index 4a0eaae769..e1e9ee4368 100644
--- a/el_GR.ISO8859-7/books/handbook/security/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/security/chapter.xml
@@ -2693,7 +2693,7 @@ kadmind5_server_enable="YES"</programlisting>
<para>This is done because the applications for
<acronym>MIT</acronym> kerberos installs binaries in the
- <filename role="directory">/usr/local</filename>
+ <filename class="directory">/usr/local</filename>
hierarchy.</para>
</sect2>
diff --git a/en_US.ISO8859-1/articles/portbuild/article.xml b/en_US.ISO8859-1/articles/portbuild/article.xml
index dc635b1f72..8076215730 100644
--- a/en_US.ISO8859-1/articles/portbuild/article.xml
+++ b/en_US.ISO8859-1/articles/portbuild/article.xml
@@ -79,11 +79,11 @@
</note>
<para>The scripts that control all of this live in either
- <filename role="directory">/a/portbuild/scripts/</filename> or.
- <filename role="directory">/a/portbuild/admin/scripts/</filename>.
+ <filename class="directory">/a/portbuild/scripts/</filename> or.
+ <filename class="directory">/a/portbuild/admin/scripts/</filename>.
These are the checked-out copies from the Subversion repository at
<ulink url="http://svnweb.freebsd.org/base/projects/portbuild/">
- <filename role="directory">base/projects/portbuild/</filename>
+ <filename class="directory">base/projects/portbuild/</filename>
</ulink>.</para>
<para>Typically, incremental builds are done that use previous
diff --git a/en_US.ISO8859-1/books/handbook/eresources/chapter.xml b/en_US.ISO8859-1/books/handbook/eresources/chapter.xml
index 781d5a065c..b4003d0fee 100644
--- a/en_US.ISO8859-1/books/handbook/eresources/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/eresources/chapter.xml
@@ -1613,7 +1613,7 @@
<para>Important news for developers, porters, and users
of the <quote>Ports Collection</quote> (<filename
- role="directory">/usr/ports</filename>), including
+ class="directory">/usr/ports</filename>), including
architecture/infrastructure changes, new capabilities,
critical upgrade instructions, and release engineering
information. This is a low-volume mailing list,
diff --git a/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml b/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml
index 24db837db4..afa565509c 100644
--- a/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml
@@ -806,7 +806,7 @@ Certificate information:
the server, and the verification step will be repeated on the
next connection. Accepting the certificate permanently will
store the authentication credentials in
- <filename role="directory">~/.subversion/auth/</filename> and
+ <filename class="directory">~/.subversion/auth/</filename> and
the user will not be asked to verify the fingerprint again until
the certificate expires.</para>
diff --git a/es_ES.ISO8859-1/articles/nanobsd/article.xml b/es_ES.ISO8859-1/articles/nanobsd/article.xml
index 5bca3b3ecc..61890e630e 100644
--- a/es_ES.ISO8859-1/articles/nanobsd/article.xml
+++ b/es_ES.ISO8859-1/articles/nanobsd/article.xml
@@ -120,7 +120,7 @@
<listitem>
<para>La partici�n que contiene los ficheros de
configuraci�n, que puede montarse bajo
- <filename role="directory">/cfg</filename> durante el
+ <filename class="directory">/cfg</filename> durante el
funcionamiento del sistema.</para>
</listitem>
</itemizedlist>
@@ -128,20 +128,20 @@
<para>Estas particiones se montan normalmente en modo de
s�lo lectura.</para>
- <para>Los directorios <filename role="directory">/etc</filename>
- y <filename role="directory">/var</filename> son discos
+ <para>Los directorios <filename class="directory">/etc</filename>
+ y <filename class="directory">/var</filename> son discos
&man.md.4; (malloc).</para>
<para>La partici�n de los ficheros de configuraci�n
permanece bajo el
- directorio <filename role="directory">/cfg</filename>. Este
+ directorio <filename class="directory">/cfg</filename>. Este
directorio contiene ficheros que usa el
- directorio <filename role="directory">/etc</filename> y se
+ directorio <filename class="directory">/etc</filename> y se
monta en modo de s�lo lectura inmediatamente
despu�s del arranque; por lo tanto, es necesario que
los ficheros que se modifiquen
- en <filename role="directory">/etc</filename> se copien
- en <filename role="directory">/cfg</filename> si se desea que
+ en <filename class="directory">/etc</filename> se copien
+ en <filename class="directory">/cfg</filename> si se desea que
los cambios perduren despu�s del reinicio del
sistema.</para>
@@ -158,13 +158,13 @@
<note>
<para>La partici�n que contiene el
- directorio <filename role="directory">/cfg</filename>
+ directorio <filename class="directory">/cfg</filename>
deber�a montarse �nicamente en el arranque y
mientras se sobreescriben los ficheros de
configuraci�n.</para>
<para>No es buena idea montar siempre el
- directorio <filename role="directory">/cfg</filename>,
+ directorio <filename class="directory">/cfg</filename>,
especialmente si el
sistema <application>NanoBSD</application> se ejecuta en un
dispositivo de almacenamiento masivo que pueda verse
@@ -181,7 +181,7 @@
<para>Una imagen de <application>NanoBSD</application> se genera
usando el sencillo script de
shell <filename>nanobsd.sh</filename>, ubicado en el
- directorio <filename role="directory"><replaceable>/usr</replaceable>/src/tools/tools/nanobsd</filename>.
+ directorio <filename class="directory"><replaceable>/usr</replaceable>/src/tools/tools/nanobsd</filename>.
El script crea una imagen que se deber� copiar al medio
de almacenamiento mediante la utilidad &man.dd.1;.</para>
@@ -327,7 +327,7 @@ customize_cmd cust_foo</programlisting>
<para>A continuaci�n vemos un ejemplo m�s �til
de funci�n personalizada, que cambia el tama�o por
omisi�n del directorio
- <filename role="directory">/etc</filename> de 5MB a 30MB:</para>
+ <filename class="directory">/etc</filename> de 5MB a 30MB:</para>
<programlisting>cust_etc_size () (
cd ${NANO_WORLDDIR}/conf
@@ -357,7 +357,7 @@ customize_cmd cust_etc_size</programlisting>
<listitem>
<para><literal>cust_install_files</literal> : Instala ficheros
de configuraci�n desde el
- directorio <filename role="directory">nanobsd/files</filename>,
+ directorio <filename class="directory">nanobsd/files</filename>,
que contiene scripts �tiles para la
administraci�n del sistema.</para>
</listitem>
@@ -494,7 +494,7 @@ customize_cmd cust_nobeastie</programlisting>
nueva en su sistema <application>NanoBSD</application> en
funcionamiento dispone de los scripts <filename>updatep1</filename>
y <filename>updatep2</filename>, ubicados en el directorio
- <filename role="directory">/root</filename>. La
+ <filename class="directory">/root</filename>. La
elecci�n de uno u otro script depende de qu�
partici�n est� ejecutando el sistema,
la primera o la segunda.</para>
diff --git a/es_ES.ISO8859-1/articles/p4-primer/article.xml b/es_ES.ISO8859-1/articles/p4-primer/article.xml
index 85a6a05314..593feebfd9 100644
--- a/es_ES.ISO8859-1/articles/p4-primer/article.xml
+++ b/es_ES.ISO8859-1/articles/p4-primer/article.xml
@@ -250,7 +250,7 @@
<para>Esto asociar� por completo el repositorio
<application>Perforce</application> al directorio
- <filename role="directory">Root</filename>
+ <filename class="directory">Root</filename>
del cliente. <emphasis>NO USE ESTE VALOR POR DEFECTO</emphasis>.
El repositorio de &os; es enorme e intentar asociarlo y
sincronizarse con dicho repositorio tardar� much�simo y
@@ -258,7 +258,7 @@
s�lamente la secci�n del repositorio en la que va a
trabajar. Por ejemplo, hay un �rbol para el proyecto
smpng en <filename
- role="directory">//depot/projects/smpng</filename>. Una
+ class="directory">//depot/projects/smpng</filename>. Una
asociaci�n en ese caso ser�a algo as�:</para>
<programlisting>//depot/projects/smpng/... //<replaceable>cliente</replaceable>/...</programlisting>
@@ -355,7 +355,7 @@
<para>Puede sincronizarse parte del �rbol o del cliente
especificando una ruta relativa a la orden <quote>sync</quote>.
Por ejemplo, para sincronizar s�lo el directorio
- <filename role="directory">ufs</filename>
+ <filename class="directory">ufs</filename>
del proyecto <literal>smpng</literal> ejecute lo
siguiente:</para>
@@ -393,7 +393,7 @@
es un �nico �rbol plano. Se accede a cada fichero a
trav�s de una
sencilla ruta bajo el directorio <filename
- role="directory">//depot</filename>, tanto si se trata de un
+ class="directory">//depot</filename>, tanto si se trata de un
fichero de nueva creaci�n como si proviene de una
ramificaci�n.
Esto supone una gran diferencia con respecto a sistemas como CVS,
@@ -912,7 +912,7 @@
servidor de CVS sobre cambios realizados en la rama HEAD, y dichos
cambios se entregan a <application>Perforce</application> dentro del
�rbol <filename
- role="directory">//depot/vendor/freebsd/...</filename>.
+ class="directory">//depot/vendor/freebsd/...</filename>.
De este modo este �rbol permite la ramificaci�n y
la integraci�n de proyectos derivados. Cualquier proyecto
que implique la modificaci�n del c�digo fuente de
@@ -969,7 +969,7 @@
<para>La mayor�a de los proyectos de &os; dentro del programa
<quote>Google Summer of Code</quote> est�n en
<filename
- role="directory">//depot/projects/soc2005/<replaceable>nombre_del_proyecto</replaceable>/...</filename>
+ class="directory">//depot/projects/soc2005/<replaceable>nombre_del_proyecto</replaceable>/...</filename>
en el servidor &os; de <application>Perforce</application>.</para>
<para>Entre las responsabilidades del mentor del proyecto
diff --git a/es_ES.ISO8859-1/books/handbook/advanced-networking/chapter.xml b/es_ES.ISO8859-1/books/handbook/advanced-networking/chapter.xml
index 6dacb31790..e2620b2db5 100755
--- a/es_ES.ISO8859-1/books/handbook/advanced-networking/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/advanced-networking/chapter.xml
@@ -3172,7 +3172,7 @@ subnet 192.168.4.0 netmask 255.255.255.0 {
n�cleo, lo hace <filename>pxeboot</filename>.
Existen otras posibilidades interesantes, como cargar
<filename>pxeboot</filename> desde el directorio
- <filename role="directory">/boot</filename>
+ <filename class="directory">/boot</filename>
de una unidad de CD-ROM de &os; (ya que &man.pxeboot.8; puede
cargar un n�cleo
<filename>GENERIC</filename> surge la posibilidad de utilizar
@@ -3522,7 +3522,7 @@ options BOOTP_NFSROOT # NFS mount root filesystem using BOOTP info
m�todo de configuraci�n distinto del que se
utiliza en <filename>clone_root</filename> y en los <quote>
scripts</quote> del sistema de <filename
- role="directory">/etc</filename>, que resultan ser un tanto
+ class="directory">/etc</filename>, que resultan ser un tanto
confusos. No obstante se pueden utilizar a modo de referencia,
excepto si se prefiere utilizar el m�todo que se describe
en ellos, en cuyo caso se necesitar� modificar y
diff --git a/es_ES.ISO8859-1/books/handbook/geom/chapter.xml b/es_ES.ISO8859-1/books/handbook/geom/chapter.xml
index fa47c57455..ab2b653812 100644
--- a/es_ES.ISO8859-1/books/handbook/geom/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/geom/chapter.xml
@@ -100,7 +100,7 @@
<para>GEOM permite el acceso y control de clases —sectores de
arranque maestros (MBR), etiquetas <acronym>BSD</acronym>, etc— por
medio del uso de proveedores, o de los ficheros especiales de
- <filename role="directory">/dev</filename>.
+ <filename class="directory">/dev</filename>.
Capaz de trabajar con varias configuraciones de <acronym>RAID</acronym>
por software, GEOM proporcionar� transparentemente acceso al
sistema operativo y las utilidades del mismo.</para>
@@ -171,7 +171,7 @@
<step><para>Aseg�rese de que existe un punto de montaje adecuado.
Si este volumen se convertir� en una partici�n ra�z,
utilice temporalmente otro punto de montaje, como <filename
- role="directory">/mnt</filename>.</para>
+ class="directory">/mnt</filename>.</para>
<screen>&prompt.root; <userinput>mkdir /mnt</userinput></screen>
</step>
@@ -209,7 +209,7 @@ XXX: What message? Put it inside the screen output above.
<step><para>Aadem�s del dispositivo <filename>st0</filename>,
este proceso deber�a haber creado otros dos
dispositivos en el directorio
- <filename role="directory">/dev/stripe</filename>, incluyendo
+ <filename class="directory">/dev/stripe</filename>, incluyendo
<filename>st0a</filename> y <filename>st0c</filename>.
Ahora se debe crear un sistema de ficheros en el dispositivo
<filename>st0a</filename> usando la siguiente orden
@@ -273,7 +273,7 @@ XXX: What message? Put it inside the screen output above.
particiones. Una deber�a ser una partici�n de intercambio,
de dos veces el tama�o de la <acronym>RAM</acronym>, y todo el
espacio restante se dedicar� al sistema de ficheros ra�z
- (<filename role="directory">/</filename>).
+ (<filename class="directory">/</filename>).
Es posible tener particiones aparte para otros puntos de montajes; sin
embargo, esto multiplicar� por diez el nivel de dificultad, debido
a la alteraci�n manual de las opciones de &man.bsdlabel.8; y
@@ -300,7 +300,7 @@ Done.</screen>
<note>
<para>Esta orden deber�a haber creado en el directorio
- <filename role="directory">/dev/mirror</filename> los nodos de
+ <filename class="directory">/dev/mirror</filename> los nodos de
dispositivo <filename>gm0</filename>, <filename>gm0s1</filename>,
<filename>gm0s1a</filename>, y <filename>gm0s1c</filename>.</para>
</note>
@@ -332,7 +332,7 @@ Done.</screen>
informaci�n y un pu�ado de n�meros. Esto es bueno.
Examine la pantalla por si hay alg�n mensaje de error y monte el
dispositivo en el punto de montaje
- <filename role="directory">/mnt</filename>:</para>
+ <filename class="directory">/mnt</filename>:</para>
<screen>&prompt.root; <userinput>mount /dev/mirror/gm0s1a /mnt</userinput></screen>
diff --git a/es_ES.ISO8859-1/books/handbook/install/chapter.xml b/es_ES.ISO8859-1/books/handbook/install/chapter.xml
index 8e7762ee27..d2676e4993 100755
--- a/es_ES.ISO8859-1/books/handbook/install/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/install/chapter.xml
@@ -4901,7 +4901,7 @@ Please press any key to reboot.</screen>
<screen>&prompt.root; <userinput>mount /dev/fd0 /mnt</userinput></screen>
<para>Una vez montado el disquete entre en el directorio
- <filename role="directory">/mnt</filename> :</para>
+ <filename class="directory">/mnt</filename> :</para>
<screen>&prompt.root; <userinput>cd /mnt</userinput></screen>
diff --git a/es_ES.ISO8859-1/books/handbook/jails/chapter.xml b/es_ES.ISO8859-1/books/handbook/jails/chapter.xml
index f5ec23d124..43ce34e3bf 100644
--- a/es_ES.ISO8859-1/books/handbook/jails/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/jails/chapter.xml
@@ -281,11 +281,11 @@ no es necesario en &os; 6.0 y versiones posteriores.</para></footnote>
<para>El mejor punto de partida es la elecci�n del punto
del sistema de ficheros del servidor donde estar�
f�sicamente ubicada la jaula. <filename
- role="directory">/usr/jail/<replaceable>nombredelajaula</replaceable></filename>
+ class="directory">/usr/jail/<replaceable>nombredelajaula</replaceable></filename>
es un buen sitio. <replaceable>nombredelajaula</replaceable>
es el nombre de m�quina que identifica a la jaula. El
sistema de ficheros <filename
- role="directory">/usr/</filename> suele tener espacio
+ class="directory">/usr/</filename> suele tener espacio
suficiente para albergar el sistema de ficheros de la jaula que,
cuando se trata de jaulas <quote>completas</quote>, es
esencialmente lo necesario para alojar todos y cada uno de
@@ -308,10 +308,10 @@ no es necesario en &os; 6.0 y versiones posteriores.</para></footnote>
<application>make</application> se instalan todos los ficheros
de configuraci�n necesarios. En pocas palabras,
instala cada fichero instalable que haya en
- <filename role="directory">/usr/src/etc/</filename> en el
- directorio <filename role="directory">/etc</filename> de la
+ <filename class="directory">/usr/src/etc/</filename> en el
+ directorio <filename class="directory">/etc</filename> de la
jaula, es decir, en
- <filename role="directory">$D/etc/</filename>.</para>
+ <filename class="directory">$D/etc/</filename>.</para>
</callout>
<callout arearefs="jaildevfs">
@@ -661,10 +661,10 @@ jail_<replaceable>www</replaceable>_devfs_ruleset="<replaceable>www_ruleset</rep
<itemizedlist>
<listitem>
<para>Cada jaula se montar� bajo <filename
- role="directory">/home/j</filename>.</para>
+ class="directory">/home/j</filename>.</para>
</listitem>
<listitem>
- <para><filename role="directory">/home/j/mroot</filename>
+ <para><filename class="directory">/home/j/mroot</filename>
ser� la plantilla para cada jaula y la
partici�n de s�lo lectura para todas las
jaulas.</para>
@@ -672,29 +672,29 @@ jail_<replaceable>www</replaceable>_devfs_ruleset="<replaceable>www_ruleset</rep
<listitem>
<para>Se crear� un directorio vac�o para
cada jaula bajo el directorio <filename
- role="directory">/home/j</filename>.</para>
+ class="directory">/home/j</filename>.</para>
</listitem>
<listitem>
<para>Cada jaula tendr� un directorio <filename
- role="directory">/s</filename> que estar� enlazado
+ class="directory">/s</filename> que estar� enlazado
con la parte de lectura-escritura del sistema.</para>
</listitem>
<listitem>
<para>Cada jaula tendr� su propio sistema en modo
lectura-escritura basado en <filename
- role="directory">/home/j/skel</filename>.</para>
+ class="directory">/home/j/skel</filename>.</para>
</listitem>
<listitem>
<para>Cada parte de lectura-escritura correspondiente a cada
jaula se crear� en <filename
- role="directory">/home/js</filename>.</para>
+ class="directory">/home/js</filename>.</para>
</listitem>
</itemizedlist>
<note>
<para>Se asume que las jaulas se instalar�n bajo
la partici�n <filename
- role="directory">/home</filename>. Por supuesto esto no
+ class="directory">/home</filename>. Por supuesto esto no
es en absoluto obligatorio, pero hay que tener en cuenta que
debe hacerse el mismo cambio en cada uno de los ejemplos que
se muestran m�s adelante.</para>
@@ -775,7 +775,7 @@ jail_<replaceable>www</replaceable>_devfs_ruleset="<replaceable>www_ruleset</rep
ficheros de s�lo lectura. Por favor,
aseg�rese de que los enlaces simb�licos
se crean en las ubicaciones correctas: <filename
- role="directory">s/</filename>. Si se usan directorios
+ class="directory">s/</filename>. Si se usan directorios
reales o directorios err�neos la instalaci�n
no funcionar�.</para>
@@ -871,12 +871,12 @@ jail_www_devfs_enable="YES"</programlisting>
<para>: La raz�n por la que
<varname>jail_<replaceable>nombre</replaceable>_rootdir</varname>
contiene <filename
- role="directory">/usr/home</filename> y no
- <filename role="directory">/home</filename> es que la ruta
+ class="directory">/usr/home</filename> y no
+ <filename class="directory">/home</filename> es que la ruta
f�sica del directorio<filename
- role="directory">/home</filename> en una instalaci�n
+ class="directory">/home</filename> en una instalaci�n
de &os; por omisi�n es <filename
- role="directory">/usr/home</filename>. La variable
+ class="directory">/usr/home</filename>. La variable
<varname>jail_<replaceable>nombre</replaceable>_rootdir</varname>
<emphasis>no</emphasis> debe apuntar a una ruta que
contenga un enlace simb�lico porque ser�a
@@ -959,7 +959,7 @@ jail_www_devfs_enable="YES"</programlisting>
<para>El primer paso es actualizar el servidor que aloja
las jaulas de la forma habitual. Despu�s creamos
una plantilla de s�lo lectura temporal en <filename
- role="directory">/home/j/mroot2</filename>.</para>
+ class="directory">/home/j/mroot2</filename>.</para>
<screen>&prompt.root; <userinput>mkdir /home/j/mroot2</userinput>
&prompt.root; <userinput>cd /usr/src</userinput>
@@ -1008,7 +1008,7 @@ jail_www_devfs_enable="YES"</programlisting>
<note>
<para>Los sistemas de ficheros de lectura-escritura
cuelgan del sistema de s�lo lectura <filename
- role="directory">/s</filename> y por tanto deben
+ class="directory">/s</filename> y por tanto deben
desmontarse antes.</para>
</note>
</step>
diff --git a/es_ES.ISO8859-1/books/handbook/mail/chapter.xml b/es_ES.ISO8859-1/books/handbook/mail/chapter.xml
index d045d6c9ac..50590ba2e0 100755
--- a/es_ES.ISO8859-1/books/handbook/mail/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/mail/chapter.xml
@@ -2031,7 +2031,7 @@ sasl_pwcheck_program="/usr/local/sbin/pwcheck"</programlisting>
<screen>&prompt.user; <userinput>mail</userinput></screen>
<para>El contenido de la carpeta de usuario en el directorio
- <filename role="directory">/var/mail</filename> se leen
+ <filename class="directory">/var/mail</filename> se leen
autom�ticamente.
Si la carpeta se encuentra vac�a la aplicaci�n termina
su ejecuci�n con un mensaje que indica que no ha podido
@@ -2179,7 +2179,7 @@ EOT</screen>
<para><application>mutt</application> lee autom�ticamente el
contenido de la carpeta de correo del usuario dentro del directorio
- <filename role="directory">/var/mail</filename> y muestra por pantalla
+ <filename class="directory">/var/mail</filename> y muestra por pantalla
su contenido. Si el directorio est� vac�o
<application>mutt</application>
quedar� a la espera de los comandos que pueda pasarle el
@@ -2302,7 +2302,7 @@ EOT</screen>
<para>El directorio por defecto que <application>pine</application>
intenta abrir es <filename
- role="directory">inbox</filename>. Para ver el �ndice de
+ class="directory">inbox</filename>. Para ver el �ndice de
todos los mensajes recibidos pulse la tecla
<keycap>I</keycap> o seleccione la opci�n de men�
denominada
diff --git a/es_ES.ISO8859-1/books/handbook/security/chapter.xml b/es_ES.ISO8859-1/books/handbook/security/chapter.xml
index 6de38d9e3d..c13f55ec23 100755
--- a/es_ES.ISO8859-1/books/handbook/security/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/security/chapter.xml
@@ -5333,7 +5333,7 @@ drwxr-xr-x 2 robert robert 512 Nov 10 11:54 public_html</programlisting>
<para>Despu�s de la instalaci�n un administrador debe
actualizar la base de datos alojada en local en
- <filename role="directory">/var/db/portaudit</filename>
+ <filename class="directory">/var/db/portaudit</filename>
mediante:</para>
<screen>&prompt.root; <userinput>portaudit -F</userinput></screen>
diff --git a/fr_FR.ISO8859-1/articles/nanobsd/article.xml b/fr_FR.ISO8859-1/articles/nanobsd/article.xml
index 402bc17dc5..ebd7d3df8a 100644
--- a/fr_FR.ISO8859-1/articles/nanobsd/article.xml
+++ b/fr_FR.ISO8859-1/articles/nanobsd/article.xml
@@ -143,19 +143,19 @@
seule.</para>
<para>Les r�pertoires <filename
- role="directory">/etc</filename> et <filename
- role="directory">/var</filename> sont des disques &man.md.4;
+ class="directory">/etc</filename> et <filename
+ class="directory">/var</filename> sont des disques &man.md.4;
(malloc).</para>
<para>La partition de configuration est mont�e sur le
- r�pertoire <filename role="directory">/cfg</filename>.
+ r�pertoire <filename class="directory">/cfg</filename>.
Elle contient les fichiers du r�pertoire <filename
- role="directory">/etc</filename> et est bri�vement
+ class="directory">/etc</filename> et est bri�vement
mont�e en lecture seule juste apr�s le
d�marrage du syst�me, par cons�quent il
est n�cessaire de recopier les fichiers modifi�s
- de <filename role="directory">/etc</filename> vers le
- r�pertoire <filename role="directory">/cfg</filename>
+ de <filename class="directory">/etc</filename> vers le
+ r�pertoire <filename class="directory">/cfg</filename>
si l'on souhaite que les changements soient encore effectifs
apr�s le red�marrage du syst�me.</para>
@@ -172,11 +172,11 @@
<note>
<para>La partition qui abrite <filename
- role="directory">/cfg</filename> doit �tre
+ class="directory">/cfg</filename> doit �tre
mont�e uniquement au d�marrage et lors de la
copie des fichiers de configuration.</para>
- <para>Garder <filename role="directory">/cfg</filename>
+ <para>Garder <filename class="directory">/cfg</filename>
mont� en permanence n'est pas une bonne id�e,
en particulier si le syst�me
<application>NanoBSD</application> tourne sur un
@@ -195,7 +195,7 @@
cr��e à l'aide d'une simple
proc�dure <filename>nanobsd.sh</filename>, qui peut
�tre trouv�e dans le r�pertoire <filename
- role="directory"><replaceable>/usr</replaceable>/src/tools/tools/nanobsd</filename>.
+ class="directory"><replaceable>/usr</replaceable>/src/tools/tools/nanobsd</filename>.
Ce programme cr�e une image, qui peut �tre
copi�e sur le support de stockage à l'aide de
&man.dd.1;.</para>
@@ -352,7 +352,7 @@ customize_cmd cust_foo</programlisting>
<para>Un exemple plus utile de fonction de personnalisation
est le suivant, qui change la taille par d�faut du
- r�pertoire <filename role="directory">/etc</filename>
+ r�pertoire <filename class="directory">/etc</filename>
de 5Mo à 30Mo:</para>
<programlisting>cust_etc_size () (
@@ -384,7 +384,7 @@ customize_cmd cust_etc_size</programlisting>
<listitem>
<para><literal>cust_install_files</literal> —
Installe les fichiers du r�pertoire <filename
- role="directory">nanobsd/Files</filename>, qui contient
+ class="directory">nanobsd/Files</filename>, qui contient
des programmes utiles pour l'administration
syst�me.</para>
</listitem>
@@ -508,7 +508,7 @@ customize_cmd cust_nobeastie</programlisting>
possible d'utiliser la proc�dure
<filename>updatep1</filename> ou <filename>updatep2</filename>
situ�e dans le r�pertoire <filename
- role="directory">/root</filename>, en fonction de la partition
+ class="directory">/root</filename>, en fonction de la partition
qui est en cours d'utilisation sur le syst�me.</para>
<para>En fonction des services disponibles sur la machine qui
diff --git a/fr_FR.ISO8859-1/books/handbook/advanced-networking/chapter.xml b/fr_FR.ISO8859-1/books/handbook/advanced-networking/chapter.xml
index 271dcc3991..bb183ec3d2 100644
--- a/fr_FR.ISO8859-1/books/handbook/advanced-networking/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/advanced-networking/chapter.xml
@@ -2131,7 +2131,7 @@ Success, response: OK, Success (0x20)</screen>
les objets entrant seront stock�s doit �tre
cr��. Le chemin d'acc�s par
d�faut du r�pertoire racine est <filename
- role="directory">/var/spool/obex</filename>. Le serveur OBEX
+ class="directory">/var/spool/obex</filename>. Le serveur OBEX
enregistrera automatiquement le service OBEX Object Push
aupr�s du “daemon” SDP local. L'exemple
ci-dessous montre comment d�marrer le serveur
@@ -2508,7 +2508,7 @@ net.link.ether.bridge_ipfw=1</programlisting>
<listitem>
<para>Des fichiers de d�marrage du syst�me
existent dans le r�pertoire <filename
- role="directory">/etc</filename> pour d�tecter et
+ class="directory">/etc</filename> pour d�tecter et
supporter le d�marrage d'un syst�me sans disque
dur.</para>
</listitem>
@@ -2811,7 +2811,7 @@ subnet 192.168.4.0 netmask 255.255.255.0 {
int�ressantes, comme le chargement de
<filename>pxeboot</filename> à partir du
r�pertoire <filename
- role="directory">/boot</filename> d'un CD-ROM &os;
+ class="directory">/boot</filename> d'un CD-ROM &os;
(comme &man.pxeboot.8; peut charger un noyau
<filename>GENERIC</filename> cela rend possible
l'utilisation de <acronym>PXE</acronym> pour
@@ -2909,7 +2909,7 @@ margaux:ha=0123456789ab:tc=.def100
o� vous avez install�
<application>Etherboot</application>, puis rendez-vous dans
le r�pertoire <filename
- role="directory">src</filename> de l'arborescence
+ class="directory">src</filename> de l'arborescence
<application>Etherboot</application> et tapez:</para>
<screen>
@@ -2977,7 +2977,7 @@ margaux:ha=0123456789ab:tc=.def100
<para>Cr�ez un r�pertoire à partir
duquel <application>tftpd</application> proposera les
fichiers, e.g. <filename
- role="directory">/tftpboot</filename>.</para>
+ class="directory">/tftpboot</filename>.</para>
</step>
<step>
@@ -3004,7 +3004,7 @@ margaux:ha=0123456789ab:tc=.def100
</procedure>
<para>Le r�pertoire <filename
- role="directory">tftpboot</filename> peut �tre
+ class="directory">tftpboot</filename> peut �tre
plac� n'importe o� sur le serveur.
Assurez-vous que son emplacement est d�fini dans les
fichiers <filename>inetd.conf</filename> et
@@ -3161,14 +3161,14 @@ options BOOTP_NFSROOT # NFS mount root filesystem using BOOTP info
<para>Les fichiers <filename>README</filename> dans le
r�pertoire <filename
- role="directory">/usr/share/examples/diskless</filename>
+ class="directory">/usr/share/examples/diskless</filename>
contiennent beaucoup d'information de fond, mais, avec les
autres exemples du r�pertoire <filename
- role="directory">diskless</filename>, ils documentent une
+ class="directory">diskless</filename>, ils documentent une
m�thode de configuration qui est distincte de celle
utilis�e par <filename>clone_root</filename> et les
proc�dures de d�marrage du syst�me de
- <filename role="directory">/etc</filename>, ce qui est un
+ <filename class="directory">/etc</filename>, ce qui est un
peu à l'origine de confusions. Utilisez-les comme
r�f�rence uniquement, à moins que
vous pr�f�riez la m�thode qu'ils
@@ -3337,7 +3337,7 @@ host margaux {
configur�e pour ex�cuter X, you devrez
ajuster le fichier de configuration de
<application>XDM</application>, qui envoie le journal
- d'erreurs sur <filename role="directory">/usr</filename>
+ d'erreurs sur <filename class="directory">/usr</filename>
par d�faut.</para>
</sect4>
@@ -3353,7 +3353,7 @@ host margaux {
<para>Dans cette situation, il y a parfois des
probl�mes avec les fichiers sp�ciaux de
p�riph�riques dans <filename
- role="directory">/dev</filename>, en raison de
+ class="directory">/dev</filename>, en raison de
diff�rences de taille sur les entiers. Une
solution à ce probl�me est d'exporter un
r�pertoire à partir du serveur non-&os;, de
@@ -3478,7 +3478,7 @@ host margaux {
<para>Pour de la documentation sur
<application>isdn4bsd</application>, consultez le
r�pertoire <filename
- role="directory">/usr/share/examples/isdn/</filename> sur
+ class="directory">/usr/share/examples/isdn/</filename> sur
votre syst�me &os; ou sur la <ulink
url="http://www.freebsd-support.de/i4b/">page web
d'isdn4bsd</ulink> qui propose �galement des astuces,
diff --git a/fr_FR.ISO8859-1/books/handbook/geom/chapter.xml b/fr_FR.ISO8859-1/books/handbook/geom/chapter.xml
index a322c2a23a..f5d3459f02 100644
--- a/fr_FR.ISO8859-1/books/handbook/geom/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/geom/chapter.xml
@@ -96,7 +96,7 @@
Boot Records</quote>), labels <acronym>BSD</acronym>, etc.
— par l'interm�diaire d'interfaces, ou de fichiers
sp�ciaux du r�pertoire <filename
- role="directory">/dev</filename>. En supportant plusieurs
+ class="directory">/dev</filename>. En supportant plusieurs
configurations <acronym>RAID</acronym> logicielles, GEOM offrira
un acc�s transparent au syst�me d'exploitation et
à ses utilitaires.</para>
@@ -176,7 +176,7 @@
<para>Assurez-vous de l'existence d'un point de montage. Si
ce volume doit devenir une partition racine, utilisez alors un
autre point de montage comme <filename
- role="directory">/mnt</filename>.</para>
+ class="directory">/mnt</filename>.</para>
<screen>&prompt.root; <userinput>mkdir /mnt</userinput></screen>
</step>
@@ -212,7 +212,7 @@ XXX: What message? Put it inside the screen output above.
<para>Cette op�ration doit avoir cr��
deux autres p�riph�riques dans le
r�pertoire <filename
- role="directory">/dev/stripe</filename> en plus du
+ class="directory">/dev/stripe</filename> en plus du
p�riph�rique <devicename>st0</devicename>:
<devicename>st0a</devicename> et
<devicename>st0c</devicename>. A ce stade, un syst�me de fichiers
@@ -285,7 +285,7 @@ XXX: What message? Put it inside the screen output above.
partitions. Une partition sera la partition de pagination d'une
taille double à celle de la <acronym>RAM</acronym> et
l'espace restant sera allou� au syst�me de
- fichiers racine (<filename role="directory">/</filename>). Il
+ fichiers racine (<filename class="directory">/</filename>). Il
est possible d'avoir des partitions s�par�es pour
les autres points de montage, cependant cela augmentera
�norm�ment le niveau de difficult� en
@@ -317,7 +317,7 @@ Done.</screen>
<para>Cette commande devrait cr�er le fichier
sp�cial de p�riph�rique
<devicename>gm0</devicename> sous le r�pertoire
- <filename role="directory">/dev/mirror</filename>.</para>
+ <filename class="directory">/dev/mirror</filename>.</para>
</note>
<para>Installez un label <command>fdisk</command> et un code de
@@ -350,7 +350,7 @@ Done.</screen>
d'informations et de nombres. C'est bon signe. Contr�lez
l'affichage à la recherche de messages d'erreur et montez
le p�riph�rique sur le point de montage <filename
- role="directory">/mnt</filename>:</para>
+ class="directory">/mnt</filename>:</para>
<screen>&prompt.root; <userinput>mount /dev/mirror/gm0s1a /mnt</userinput></screen>
@@ -513,7 +513,7 @@ ggate0
<para>A partir d'ici, on peut acc�der au
p�riph�rique par l'interm�diaire du point
- de montage <filename role="directory">/mnt</filename>.</para>
+ de montage <filename class="directory">/mnt</filename>.</para>
<note>
<para>Il est à noter que toutes ces op�rations
diff --git a/fr_FR.ISO8859-1/books/handbook/install/chapter.xml b/fr_FR.ISO8859-1/books/handbook/install/chapter.xml
index 64b3f810ba..af90cbfd80 100644
--- a/fr_FR.ISO8859-1/books/handbook/install/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/install/chapter.xml
@@ -799,7 +799,7 @@ pqb0.0.1.4.0 PQB0 PCI EIDE</screen>
sur votre m�dia d'installation dans le r�pertoire
<filename>floppies/</filename> et peuvent �galement �tre
t�l�charg�es par FTP depuis le
- r�pertoire <filename role="directory">floppies</filename>,
+ r�pertoire <filename class="directory">floppies</filename>,
<literal>ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/<replaceable><arch></replaceable>/<replaceable><version></replaceable>-RELEASE/floppies/</literal>.
Remplacez <replaceable><arch></replaceable> et
<replaceable><version></replaceable> avec
diff --git a/fr_FR.ISO8859-1/books/handbook/jails/chapter.xml b/fr_FR.ISO8859-1/books/handbook/jails/chapter.xml
index bb2af7c138..34cfca80f3 100644
--- a/fr_FR.ISO8859-1/books/handbook/jails/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/jails/chapter.xml
@@ -328,10 +328,10 @@
o� l'environnement jail se trouvera dans le
syst�me de fichiers de la machine h�te. Un bon
choix peut �tre <filename
- role="directory">/usr/jail/<replaceable>jailname</replaceable></filename>,
+ class="directory">/usr/jail/<replaceable>jailname</replaceable></filename>,
o� <replaceable>jailname</replaceable> est le nom de
machine identifiant l'environnement jail. Le syst�me
- de fichiers <filename role="directory">/usr/</filename>
+ de fichiers <filename class="directory">/usr/</filename>
dispose g�n�ralement de suffisamment d'espace
pour le syst�me de fichiers de l'environnement jail,
qui est pour les environnements <quote>complets</quote>,
@@ -356,10 +356,10 @@
configuration n�cessaires. Ou pour faire simple, cette
commande installe tous les fichiers installables du
r�pertoire <filename
- role="directory">/usr/src/etc/</filename> vers le
- r�pertoire <filename role="directory">/etc</filename>
+ class="directory">/usr/src/etc/</filename> vers le
+ r�pertoire <filename class="directory">/etc</filename>
de l'environnement jail: <filename
- role="directory">$D/etc/</filename>.</para>
+ class="directory">$D/etc/</filename>.</para>
</callout>
<callout arearefs="jaildevfs">
diff --git a/fr_FR.ISO8859-1/books/handbook/kernelconfig/chapter.xml b/fr_FR.ISO8859-1/books/handbook/kernelconfig/chapter.xml
index d1ce15fee1..13212ccb99 100755
--- a/fr_FR.ISO8859-1/books/handbook/kernelconfig/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/kernelconfig/chapter.xml
@@ -352,7 +352,7 @@
</indexterm>
<para>Le nouveau noyau sera copi� dans le r�pertoire
- <filename role="directory">/boot/kernel</filename> avec le nom
+ <filename class="directory">/boot/kernel</filename> avec le nom
<filename>/boot/kernel/kernel</filename> et l'ancien noyau sera renomm� en
<filename>/boot/kernel.old/kernel</filename>. Maintenant, arr�tez
le syst�me et red�marrez pour utiliser votre
diff --git a/fr_FR.ISO8859-1/books/handbook/mail/chapter.xml b/fr_FR.ISO8859-1/books/handbook/mail/chapter.xml
index aa2d3b96b1..470cc45db8 100644
--- a/fr_FR.ISO8859-1/books/handbook/mail/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/mail/chapter.xml
@@ -1507,7 +1507,7 @@ freefall MX 20 who.cdrom.com</programlisting>
la configuration se fait à un haut niveau d'abstraction.
Les fichiers de configuration &man.m4.1; se trouvent dans le
r�pertoire <filename
- role="directory">/usr/src/usr.sbin/sendmail/cf</filename>.</para>
+ class="directory">/usr/src/usr.sbin/sendmail/cf</filename>.</para>
<para>Si vous n'avez pas install� toutes les sources du
syst�me, l'ensemble des fichiers de configuration de
@@ -1521,7 +1521,7 @@ freefall MX 20 who.cdrom.com</programlisting>
<para>Cette extraction ne donne lieu qu'à une centaine de
kilo-octets. Le fichier <filename>README</filename> dans le
- r�pertoire <filename role="directory">cf</filename>
+ r�pertoire <filename class="directory">cf</filename>
pourra faire office d'une introduction à la configuration
&man.m4.1;.</para>
@@ -1534,7 +1534,7 @@ freefall MX 20 who.cdrom.com</programlisting>
<para>Tout d'abord, vous devez cr�er votre fichier
<filename>.mc</filename>. Le r�pertoire <filename
- role="directory">/usr/src/usr.sbin/sendmail/cf/cf</filename>
+ class="directory">/usr/src/usr.sbin/sendmail/cf/cf</filename>
contient quelques exemples. En supposant que vous avez
appel� votre fichier <filename>foo.mc</filename>, tout ce
dont vous avez besoin de faire pour le convertir en un fichier
@@ -1738,7 +1738,7 @@ hostname=_HOSTNAME_</programlisting>
<para><filename role="package">mail/ssmtp</filename> dispose
d'autres options. Consultez le fichier de configuration
d'exemple dans le r�pertoire <filename
- role="directory">/usr/local/etc/ssmtp</filename> ou la page de
+ class="directory">/usr/local/etc/ssmtp</filename> ou la page de
manuel de <application>ssmtp</application> pour quelques
exemples et plus d'informations.</para>
@@ -2084,7 +2084,7 @@ sasl_pwcheck_program="/usr/local/sbin/pwcheck"</programlisting>
<screen>&prompt.user; <userinput>mail</userinput></screen>
<para>Le contenu de la bo�te aux lettres de l'utilisateur
- dans <filename role="directory">/var/mail</filename> est
+ dans <filename class="directory">/var/mail</filename> est
automatiquement lu par l'utilitaire <command>mail</command>.
Si la bo�te est vide, l'utilitaire rend la main avec un
message indiquant qu'aucun courrier �lectronique ne
@@ -2241,7 +2241,7 @@ EOT</screen>
<para><application>mutt</application> lira automatiquement le
contenu de la bo�te aux lettres de l'utilisateur dans
- <filename role="directory">/var/mail</filename> et en affiche
+ <filename class="directory">/var/mail</filename> et en affiche
le contenu le cas �ch�ant. Si aucun message
n'est trouv� dans cette bo�te, alors
<application>mutt</application> attendra une commande de
@@ -2381,7 +2381,7 @@ EOT</screen>
<para>Le r�pertoire ouvert par d�faut par
<application>pine</application> est <filename
- role="directory">inbox</filename>. Pour afficher l'index des
+ class="directory">inbox</filename>. Pour afficher l'index des
messages, appuyez sur <keycap>I</keycap>, ou
s�lectionnez l'option <guimenuitem>MESSAGE
INDEX</guimenuitem> comme montr� ci-dessous:</para>
diff --git a/fr_FR.ISO8859-1/books/handbook/mirrors/chapter.xml b/fr_FR.ISO8859-1/books/handbook/mirrors/chapter.xml
index e179c71c3b..3e1181a492 100644
--- a/fr_FR.ISO8859-1/books/handbook/mirrors/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/mirrors/chapter.xml
@@ -2691,11 +2691,11 @@ doc/zh_*</screen>
<application>Portsnap</application> ne met pas à jour
le catalogue des logiciels port�s directement dans le
r�pertoire <filename
- role="directory">/usr/ports</filename>; le logiciel travaille
+ class="directory">/usr/ports</filename>; le logiciel travaille
plut�t par d�faut sur une version
compress�e de l'arborescence des logiciels
port�s dans le r�pertoire <filename
- role="directory">/var/db/portsnap</filename>. Cette copie
+ class="directory">/var/db/portsnap</filename>. Cette copie
compress�e est ensuite utilis�e pour mettre
à jour le catalogue des logiciels port�s.</para>
@@ -2704,8 +2704,8 @@ doc/zh_*</screen>
install� à partir du catalogue des logiciels
port�s de &os;, alors l'emplacement par d�faut
pour son instantan� compress� sera <filename
- role="directory">/usr/local/portsnap</filename> au lieu de
- <filename role="directory">/var/db/portsnap</filename>.</para>
+ class="directory">/usr/local/portsnap</filename> au lieu de
+ <filename class="directory">/var/db/portsnap</filename>.</para>
</note>
</sect2>
@@ -2754,8 +2754,8 @@ doc/zh_*</screen>
instantan� compress� de
l'int�gralit� de l'arborescence des logiciels
port�s dans <filename
- role="directory">/var/db/portsnap</filename> (ou <filename
- role="directory">/usr/local/portsnap</filename> si
+ class="directory">/var/db/portsnap</filename> (ou <filename
+ class="directory">/usr/local/portsnap</filename> si
<application>Portsnap</application> a �t�
install� à partir du catalogue des logiciels
port�s). Au d�but de l'ann�e 2006, cela
@@ -2768,7 +2768,7 @@ doc/zh_*</screen>
�t� r�cup�r�, une copie
utilisable de l'arborescence des logiciels port�s peut
�tre extraite dans le r�pertoire <filename
- role="directory">/usr/ports</filename>. Cela est
+ class="directory">/usr/ports</filename>. Cela est
n�cessaire m�me si une arborescence a
d�jà �t� cr��e dans
ce r�pertoire (par exemple en utilisant
@@ -2782,7 +2782,7 @@ doc/zh_*</screen>
<note>
<para>Dans l'installation par d�faut de &os; <filename
- role="directory">/usr/ports</filename> n'est pas
+ class="directory">/usr/ports</filename> n'est pas
cr��. Si vous utilisez &os; 6.0-RELEASE,
ce r�pertoire doit �tre cr�� avant
d'utiliser la commande <command>portsnap</command>. Sur les
@@ -2802,7 +2802,7 @@ doc/zh_*</screen>
des logiciels port�s ait �t�
r�cup�r� puis d�compress�
dans le r�pertoire <filename
- role="directory">/usr/ports</filename>, la mise à jour
+ class="directory">/usr/ports</filename>, la mise à jour
du catalogue se divise en deux �tapes: la
r�cup�ration (<emphasis>fetch</emphasis>) des
mises à jour de l'instantan�, et leur
@@ -2860,7 +2860,7 @@ doc/zh_*</screen>
<command>portsnap</command> de mettre à jour son
instantan� compress� et les fichiers
<filename>INDEX</filename> du r�pertoire <filename
- role="directory">/usr/ports</filename>, et enverra un courrier
+ class="directory">/usr/ports</filename>, et enverra un courrier
�lectronique si un logiciel port�
install� n'est pas à jour:</para>
diff --git a/fr_FR.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml b/fr_FR.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml
index a5f3ddaa3c..d13b6c1846 100644
--- a/fr_FR.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml
@@ -144,9 +144,9 @@
<para>Avant de configurer PPP sur votre machine, v�rifiez
que <command>pppd</command> est bien dans le r�pertoire
- <filename role="directory">/usr/sbin</filename> et que le
+ <filename class="directory">/usr/sbin</filename> et que le
r�pertoire <filename
- role="directory">/etc/ppp</filename> existe.</para>
+ class="directory">/etc/ppp</filename> existe.</para>
<para>La commande <command>pppd</command> peut fonctionner selon
deux modes:</para>
@@ -886,17 +886,17 @@ ppp_profile="adsl"</programlisting>
logiciel port� place un ensemble de fichiers de
configuration tr�s bien comment�s dans le
r�pertoire <filename
- role="directory"><replaceable>PREFIX</replaceable>/etc/mpd/</filename>.
+ class="directory"><replaceable>PREFIX</replaceable>/etc/mpd/</filename>.
Notez qu'ici <replaceable>PREFIX</replaceable>
repr�sente le r�pertoire dans lequel les
logiciels port�s sont install�s, par
d�faut le r�pertoire <filename
- role="directory">/usr/local/</filename>. Un guide complet
+ class="directory">/usr/local/</filename>. Un guide complet
pour la configuration de <application>mpd</application> est
disponible dans le format HTML, une fois que le logiciel a
�t� install�. Il se trouve dans le
r�pertoire <filename
- role="directory"><replaceable>PREFIX</replaceable>/share/doc/mpd/</filename>.
+ class="directory"><replaceable>PREFIX</replaceable>/share/doc/mpd/</filename>.
Voici un exemple de configuration pour se connecter à
un service ADSL à l'aide de
<application>mpd</application>. La configuration est
diff --git a/fr_FR.ISO8859-1/books/handbook/security/chapter.xml b/fr_FR.ISO8859-1/books/handbook/security/chapter.xml
index 55e0abff1b..ccbbc6c883 100755
--- a/fr_FR.ISO8859-1/books/handbook/security/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/security/chapter.xml
@@ -3330,7 +3330,7 @@ VII. References<co id="co-ref"/></programlisting>
aidera à d�terminer la r�vision. Pour
les logiciels port�s, le num�ro de version est
list� apr�s le nom du logiciel dans <filename
- role="directory">/var/db/pkg</filename>. Si le
+ class="directory">/var/db/pkg</filename>. Si le
syst�me ne se synchronise pas avec le
r�f�rentiel <acronym>CVS</acronym> &os; et ne
recompile pas les sources quotidiennement, il y a des
diff --git a/fr_FR.ISO8859-1/books/handbook/x11/chapter.xml b/fr_FR.ISO8859-1/books/handbook/x11/chapter.xml
index c504fae19b..6a49b82196 100644
--- a/fr_FR.ISO8859-1/books/handbook/x11/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/x11/chapter.xml
@@ -969,8 +969,8 @@ EndSection</programlisting>
d'<application>&xfree86;</application> 4.3.0. Depuis
<application>&xfree86;</application> 4.3.0, toutes les polices
sous X11 se trouvant dans les r�pertoires <filename
- role="directory">/usr/local/lib/X11/fonts/</filename> et
- <filename role="directory">~/.fonts/</filename> sont
+ class="directory">/usr/local/lib/X11/fonts/</filename> et
+ <filename class="directory">~/.fonts/</filename> sont
automatiquement disponibles pour l'anticr�nelage avec
les applications compatibles Xft. Toutes les applications ne
sont pas compatibles Xft, mais de nombreuses ont
@@ -1014,9 +1014,9 @@ EndSection</programlisting>
<para>Comme pr�cis� pr�c�demment,
l'ensemble des polices de caract�res du
r�pertoire <filename
- role="directory">/usr/local/lib/X11/fonts/</filename> comme du
+ class="directory">/usr/local/lib/X11/fonts/</filename> comme du
r�pertoire <filename
- role="directory">~/.fonts/</filename> sont disponibles pour
+ class="directory">~/.fonts/</filename> sont disponibles pour
les applications compatibles Xft. Si vous d�sirez
ajouter un autre r�pertoire en dehors des ces deux
là, ajoutez une ligne similaire à la suivante au
diff --git a/hu_HU.ISO8859-2/books/handbook/firewalls/chapter.xml b/hu_HU.ISO8859-2/books/handbook/firewalls/chapter.xml
index b1929ab607..ec1793e84a 100644
--- a/hu_HU.ISO8859-2/books/handbook/firewalls/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/firewalls/chapter.xml
@@ -358,7 +358,7 @@
kiad�sokban alap�rtelmez�s szerint
tal�lhat� egy <filename>pf.conf</filename>
�llom�ny az <filename
- role="directory">/etc</filename>
+ class="directory">/etc</filename>
k�nyvt�rban.</para>
</note>
diff --git a/it_IT.ISO8859-15/articles/committers-guide/article.xml b/it_IT.ISO8859-15/articles/committers-guide/article.xml
index 7f1d560ea9..c6c12cc153 100644
--- a/it_IT.ISO8859-15/articles/committers-guide/article.xml
+++ b/it_IT.ISO8859-15/articles/committers-guide/article.xml
@@ -280,25 +280,25 @@
<itemizedlist>
<listitem>
<para>ncvs@ - a proposito di <filename
- role="directory">/home/ncvs</filename>, il repository dei
+ class="directory">/home/ncvs</filename>, il repository dei
src</para>
</listitem>
<listitem>
<para>pcvs@ - a proposito di <filename
- role="directory">/home/pcvs</filename>, il repository dei
+ class="directory">/home/pcvs</filename>, il repository dei
port</para>
</listitem>
<listitem>
<para>dcvs@ - a proposito di <filename
- role="directory">/home/dcvs</filename>, il repository dei
+ class="directory">/home/dcvs</filename>, il repository dei
doc</para>
</listitem>
<listitem>
<para>projcvs@ - a proposito di <filename
- role="directory">/home/projcvs</filename>, il repository dei
+ class="directory">/home/projcvs</filename>, il repository dei
progetti di terze parti</para>
</listitem>
</itemizedlist>
diff --git a/it_IT.ISO8859-15/books/handbook/geom/chapter.xml b/it_IT.ISO8859-15/books/handbook/geom/chapter.xml
index c01e0fb637..b4f7a63e45 100644
--- a/it_IT.ISO8859-15/books/handbook/geom/chapter.xml
+++ b/it_IT.ISO8859-15/books/handbook/geom/chapter.xml
@@ -91,7 +91,7 @@
<para>GEOM permette l'accesso e il controllo alle classi — Master Boot
Records, <acronym>BSD</acronym> labels, ecc — attraverso l'uso
di forniture o di di files speciali in <filename
- role="directory">/dev</filename>. Mediante il supporto di vari
+ class="directory">/dev</filename>. Mediante il supporto di vari
software di configurazione<acronym>RAID</acronym> , GEOM fornisce un
accesso "trasparente" al sistema operativo
e alle utilit� di sistema.</para>
@@ -167,7 +167,7 @@
<para>Assicurati che esiste una appropriato mount point. Se il volume
in questione diventer� una partizione di root, allora usa
temporaneamente un mount point diverso,ad esempio <filename
- role="directory">/mnt</filename>:</para>
+ class="directory">/mnt</filename>:</para>
<screen>&prompt.root; <userinput>mkdir /mnt</userinput></screen>
</step>
@@ -199,7 +199,7 @@
<step>
<para>Questa procedura dovrebbe aver creato altri due device in
- <filename role="directory">/dev/stripe</filename> in aggiunta a
+ <filename class="directory">/dev/stripe</filename> in aggiunta a
<devicename>st0</devicename>. Nella fattispecie
<devicename>st0a</devicename> e <devicename>st0c</devicename>.
Ora bisogna creare un filesystem nel device
@@ -261,7 +261,7 @@
<para>Comincia installando &os; sul primo disco creando solamente due
partizioni. Una dovrebbe essere una partizione di swap, pari al doppio
della <acronym>RAM</acronym> presente nel sistema e il resto dello spazio
- dedicato al filesystem di root (<filename role="directory">/</filename>).
+ dedicato al filesystem di root (<filename class="directory">/</filename>).
� possibile creare partizioni separate per gli altri mount points,
aumentando parecchio la difficolt� di realizzazione del progetto;
questo � dovuto alla necessit� di alterare manualmente i
@@ -290,7 +290,7 @@ Done.</screen>
<para>Questo comando dovrebbe ora avere creato i nodi di
device<devicename>gm0</devicename>,<devicename>gm0s1</devicename>,
<devicename>gm0s1a</devicename> e <devicename>gm0s1c</devicename> nella
- directory <filename role="directory">/dev/mirror</filename>.</para>
+ directory <filename class="directory">/dev/mirror</filename>.</para>
</note>
<para>Crea una label generica e un codice di boot nel device
@@ -319,7 +319,7 @@ Done.</screen>
<para>Questo dovrebbe causare la visualizzazione di un bel p� di
numeri e informazioni varie da parte del sistema. � corretto.
Esamina bene lo schermo per vedere se ci sono messaggi di errore e monta
- il device in <filename role="directory">/mnt</filename>:</para>
+ il device in <filename class="directory">/mnt</filename>:</para>
<screen>&prompt.root; <userinput>mount /dev/mirror/gm0s1a /mnt</userinput></screen>
diff --git a/it_IT.ISO8859-15/books/handbook/install/chapter.xml b/it_IT.ISO8859-15/books/handbook/install/chapter.xml
index 1f8ad96141..3fdb9b38d6 100644
--- a/it_IT.ISO8859-15/books/handbook/install/chapter.xml
+++ b/it_IT.ISO8859-15/books/handbook/install/chapter.xml
@@ -3261,9 +3261,9 @@ To change any of these settings later, edit /etc/rc.conf
specifica il file di <filename>log</filename>; di default; comunque,
quando viene usato <literal>syslogd</literal> tutte le attivit�
di log saranno inviate al demone di log del sistema. La directory
- <filename role="directory">/host</filename> � usata per
+ <filename class="directory">/host</filename> � usata per
montare un filesystem esportato da un host remoto, mentre
- la directory <filename role="directory">/net</filename> �
+ la directory <filename class="directory">/net</filename> �
usata per montare un filesystem esportato da un indirizzo
<acronym>IP</acronym>. Il file <filename>/etc/amd.map</filename>
definisce le opzioni di default per le esportazioni
@@ -4916,7 +4916,7 @@ Please press any key to reboot.</screen>
<screen>&prompt.root; <userinput>mount /dev/fd0 /mnt</userinput></screen>
<para>Adesso che hai il tuo floppy montato, portati nella directory
- <filename role="directory">/mnt</filename>:</para>
+ <filename class="directory">/mnt</filename>:</para>
<screen>&prompt.root; <userinput>cd /mnt</userinput></screen>
diff --git a/it_IT.ISO8859-15/books/handbook/jails/chapter.xml b/it_IT.ISO8859-15/books/handbook/jails/chapter.xml
index 4b3bb7fd23..10885db33d 100644
--- a/it_IT.ISO8859-15/books/handbook/jails/chapter.xml
+++ b/it_IT.ISO8859-15/books/handbook/jails/chapter.xml
@@ -267,10 +267,10 @@
il miglior punto in cui iniziare. Questo sar� il punto
in cui la jail risieder� fisicamente nel file system del
sistema host. Una buona scelta pu� essere
- <filename role="directory">/usr/jail/<replaceable>nomejail</replaceable></filename>,
+ <filename class="directory">/usr/jail/<replaceable>nomejail</replaceable></filename>,
dove <replaceable>nomejail</replaceable> � il nome host
che identifica la jail. Il file system
- <filename role="directory">/usr/</filename> in genere ha abbastanza
+ <filename class="directory">/usr/</filename> in genere ha abbastanza
spazio vuoto per il file system delle jail, che per una
jail <quote>completa</quote> �, in pratica, una replica di
ogni file presente in una installazione base di &os;</para>
@@ -290,10 +290,10 @@
<application>make</application> installa ogni file di
configuazione richiesto. In parole povere, installa ogni
file di
- <filename role="directory">/usr/src/etc/</filename> nella
- directory <filename role="directory">/etc</filename>
+ <filename class="directory">/usr/src/etc/</filename> nella
+ directory <filename class="directory">/etc</filename>
dell'ambiente jail:
- <filename role="directory">$D/etc/</filename>.</para>
+ <filename class="directory">$D/etc/</filename>.</para>
</callout>
<callout arearefs="jaildevfs">
@@ -613,41 +613,41 @@ jail_<replaceable>www</replaceable>_devfs_ruleset="<replaceable>www_ruleset</rep
<itemizedlist>
<listitem>
<para>Ogni jail sar� montata sotto la directory
- <filename role="directory">/home/j</filename>.</para>
+ <filename class="directory">/home/j</filename>.</para>
</listitem>
<listitem>
- <para><filename role="directory">/home/j/mroot</filename> �
+ <para><filename class="directory">/home/j/mroot</filename> �
il template per ogni jail e la partizione in sola lettura per
tutte le jail.</para>
</listitem>
<listitem>
<para>Una directory vuota sar� creata per ogni jail sotto
- la directory <filename role="directory">/home/j</filename>.</para>
+ la directory <filename class="directory">/home/j</filename>.</para>
</listitem>
<listitem>
<para>Ogni jail avr� una directory <filename
- role="directory">/s</filename>, che sar� linkata
+ class="directory">/s</filename>, che sar� linkata
alla porzione del sistema in lettura e scrittura.</para>
</listitem>
<listitem>
<para>Ogni jail ha il suo sistema in lettura e scrittura in
- <filename role="directory">/home/j/skel</filename>.</para>
+ <filename class="directory">/home/j/skel</filename>.</para>
</listitem>
<listitem>
<para>Ogni spazio di jail (la porzione in lettura e scrittura di
ogni jail) sar� creato in <filename
- role="directory">/home/js</filename>.</para>
+ class="directory">/home/js</filename>.</para>
</listitem>
</itemizedlist>
<note>
<para>Si assume che le jail siano posizionate sotto la partizione
- <filename role="directory">/home</filename>. Di sicuro, questo
+ <filename class="directory">/home</filename>. Di sicuro, questo
pu� essere modificato con qualcosa di diverso, ma questo
cambiamento dovr� essere tenuto in considerazione
negli esempi pi� avanti.</para>
@@ -725,7 +725,7 @@ jail_<replaceable>www</replaceable>_devfs_ruleset="<replaceable>www_ruleset</rep
<para>Ora, linkiamo in modo simbolico il file system in lettura
e scrittura nel file system di sola lettura. Assicuriamoci
che i link simbolici siano creati nelle posizioni corrette in
- <filename role="directory">s/</filename>. La creazione di
+ <filename class="directory">s/</filename>. La creazione di
directory in posti sbagliati causer� un fallimento
durante l'installazione.</para>
@@ -821,12 +821,12 @@ jail_www_devfs_enable="YES"</programlisting>
<para>La ragione del perch� la variabile
<varname>jail_<replaceable>nome</replaceable>_rootdir</varname>
� settata a <filename
- role="directory">/usr/home</filename> invece di
- <filename role="directory">/home</filename> � che
+ class="directory">/usr/home</filename> invece di
+ <filename class="directory">/home</filename> � che
il percorso reale della directory <filename
- role="directory">/home</filename> in una installazione
+ class="directory">/home</filename> in una installazione
standard di &os; � <filename
- role="directory">/usr/home</filename>. La variabile
+ class="directory">/usr/home</filename>. La variabile
<varname>jail_<replaceable>nome</replaceable>_rootdir</varname>
<emphasis>non</emphasis> deve essere settata a un percorso
che include link simbolici, altrimenti la jail
@@ -906,7 +906,7 @@ jail_www_devfs_enable="YES"</programlisting>
<para>Il primo passo � aggiornare il sistema host nella
maniera usuale. Quindi creiamo un template temporaneo
in sola lettura in <filename
- role="directory">/home/j/mroot2</filename>.</para>
+ class="directory">/home/j/mroot2</filename>.</para>
<screen>&prompt.root; <userinput>mkdir /home/j/mroot2</userinput>
&prompt.root; <userinput>cd /usr/src</userinput>
@@ -955,7 +955,7 @@ jail_www_devfs_enable="YES"</programlisting>
<note>
<para>I sistemi in lettura e scrittura sono attaccati al
sistema in sola lettura
- (<filename role="directory">/s</filename>) e devono essere
+ (<filename class="directory">/s</filename>) e devono essere
smontati.</para>
</note>
</step>
diff --git a/it_IT.ISO8859-15/books/handbook/kernelconfig/chapter.xml b/it_IT.ISO8859-15/books/handbook/kernelconfig/chapter.xml
index 71d5a0e450..16f898a54c 100644
--- a/it_IT.ISO8859-15/books/handbook/kernelconfig/chapter.xml
+++ b/it_IT.ISO8859-15/books/handbook/kernelconfig/chapter.xml
@@ -290,7 +290,7 @@
<step>
<para>Entra nella directory <filename
- role="directory">/usr/src</filename>:</para>
+ class="directory">/usr/src</filename>:</para>
<screen>&prompt.root; <userinput>cd /usr/src</userinput></screen>
</step>
diff --git a/it_IT.ISO8859-15/books/handbook/linuxemu/chapter.xml b/it_IT.ISO8859-15/books/handbook/linuxemu/chapter.xml
index b7066c731a..e24f49e4bd 100644
--- a/it_IT.ISO8859-15/books/handbook/linuxemu/chapter.xml
+++ b/it_IT.ISO8859-15/books/handbook/linuxemu/chapter.xml
@@ -443,7 +443,7 @@ multi on</programlisting>
poterli usare. Se hai scelto di mettere gli
eseguibili di <application>&mathematica;</application>
nella directory
- <filename role="directory">/usr/local/bin</filename>,
+ <filename class="directory">/usr/local/bin</filename>,
troverai in questa directory dei link simbolici chiamati
<filename>math</filename>, <filename>mathematica</filename>,
<filename>Mathematica</filename>, e
diff --git a/it_IT.ISO8859-15/books/handbook/mirrors/chapter.xml b/it_IT.ISO8859-15/books/handbook/mirrors/chapter.xml
index 4ce9c0f6bf..f07ac6435a 100644
--- a/it_IT.ISO8859-15/books/handbook/mirrors/chapter.xml
+++ b/it_IT.ISO8859-15/books/handbook/mirrors/chapter.xml
@@ -2400,7 +2400,7 @@ doc/zh_*</screen>
<note>
<para>Nell'installazione di default la directory
- <filename role="directory">/usr/ports</filename>
+ <filename class="directory">/usr/ports</filename>
non viene creata. Se usi &os; 6.0-RELEASE,
la directory dovrebbe essere creata prima di
usare <command>portsnap</command>. Su versioni
diff --git a/it_IT.ISO8859-15/books/handbook/network-servers/chapter.xml b/it_IT.ISO8859-15/books/handbook/network-servers/chapter.xml
index 6086fb74c9..ff690571d4 100644
--- a/it_IT.ISO8859-15/books/handbook/network-servers/chapter.xml
+++ b/it_IT.ISO8859-15/books/handbook/network-servers/chapter.xml
@@ -3715,7 +3715,7 @@ dhcpd_ifaces="dc0"</programlisting>
</row>
<row>
- <entry><filename role="directory">/etc/namedb</filename></entry>
+ <entry><filename class="directory">/etc/namedb</filename></entry>
<entry>Directory dove risiedono le
informazioni di zona di BIND.</entry>
@@ -3734,10 +3734,10 @@ dhcpd_ifaces="dc0"</programlisting>
A seconda di come certe zone sono configurate
sul server, i file relativi a quelle zone possono essere
trovate nelle sottodirectory <filename
- role="directory">master</filename>, <filename
- role="directory">slave</filename>, or <filename
- role="directory">dynamic</filename> della directory
- <filename role="directory">/etc/namedb</filename>.
+ class="directory">master</filename>, <filename
+ class="directory">slave</filename>, or <filename
+ class="directory">dynamic</filename> della directory
+ <filename class="directory">/etc/namedb</filename>.
Questi file contengono le informazioni <acronym>DNS</acronym>
che saranno distribuite dal name server in risposta alle query.</para>
</sect2>
@@ -3786,7 +3786,7 @@ dhcpd_ifaces="dc0"</programlisting>
</indexterm>
<para>I file di configurazione per <application>named</application>
- al corrente risiedono nella directory <filename role="directory">
+ al corrente risiedono nella directory <filename class="directory">
/etc/named</filename> e necessiteranno di modifiche prima
dell'uso, a meno che non si voglia un semplice resolver.
Qui � dove la maggior pare della configurazione viene
@@ -3796,7 +3796,7 @@ dhcpd_ifaces="dc0"</programlisting>
<title>Usando <command>make-localhost</command></title>
<para>Per configurare una zona master per il localhost
- visita la directory <filename role="directory">/etc/namedb</filename>
+ visita la directory <filename class="directory">/etc/namedb</filename>
ed esegui il seguente comando:</para>
<screen>&prompt.root; <userinput>sh make-localhost</userinput></screen>
diff --git a/ja_JP.eucJP/books/handbook/eresources/chapter.xml b/ja_JP.eucJP/books/handbook/eresources/chapter.xml
index 387b561afb..938b61cdcb 100644
--- a/ja_JP.eucJP/books/handbook/eresources/chapter.xml
+++ b/ja_JP.eucJP/books/handbook/eresources/chapter.xml
@@ -1250,7 +1250,7 @@
�˴ؤ�����פʥ˥塼���Ȱ���</emphasis></para>
<para><quote>Ports Collection</quote> (<filename
- role="directory">/usr/ports</filename>) �γ�ȯ�ԡ�
+ class="directory">/usr/ports</filename>) �γ�ȯ�ԡ�
�����Ԥ���ӥ桼���ؤν��פʥ˥塼����
�������ƥ�����/����ե饹�ȥ饯������ѹ�����������ǽ��
���פʥ��åץ��졼�ɤΰ��⡢
@@ -1268,7 +1268,7 @@
�ΥХ��˴ؤ������</emphasis></para>
<para><quote>Ports Collection</quote> (<filename
- role="directory">/usr/ports</filename>) �ξ㳲����
+ class="directory">/usr/ports</filename>) �ξ㳲����
������ ports ���ѹ��ˤĤ��Ƥ���ƤˤĤ��Ƥε�����
����ϵ���Ū�ʥ��ꥹ�ȤʤΤǡ�
��̩�˵���Ū�����ƤΤߤ������ޤ���</para>
diff --git a/ja_JP.eucJP/books/handbook/mirrors/chapter.xml b/ja_JP.eucJP/books/handbook/mirrors/chapter.xml
index ec69e39ef2..15cd330bcb 100644
--- a/ja_JP.eucJP/books/handbook/mirrors/chapter.xml
+++ b/ja_JP.eucJP/books/handbook/mirrors/chapter.xml
@@ -811,7 +811,7 @@ Certificate information:
���Ū��ǧ�ڤǤ���С������ФȤΰ��Υ��å�����ͭ�����¤��ڤ�뤿�ᡢ
�������³���ˤϤ⤦���ٸ��ڤ��Ԥ��ޤ���
����Ū��ǧ�ڤ���������ˤϡ�ǧ�ڤΤ���ξ�����
- <filename role="directory">~/.subversion/auth/</filename> ����¸���졢
+ <filename class="directory">~/.subversion/auth/</filename> ����¸���졢
ͭ�����¤��ڤ��ޤǤϡ��ե����ץ��Ȥγ�ǧ�ϵ����ޤ���</para>
<para>�ե�������������ޤ���¾������Τ��ᡢ<acronym>HTTPS</acronym>
diff --git a/mn_MN.UTF-8/books/handbook/eresources/chapter.xml b/mn_MN.UTF-8/books/handbook/eresources/chapter.xml
index 0e7de5ff85..334b5d7c3c 100644
--- a/mn_MN.UTF-8/books/handbook/eresources/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/eresources/chapter.xml
@@ -1514,7 +1514,7 @@
тухай чухал мэдээнүүд болон зааврууд</emphasis></para>
<para><quote>Портын цуглуулгын</quote> (<filename
- role="directory">/usr/ports</filename>) хөгжүүлэгчид, порт хийгчид
+ class="directory">/usr/ports</filename>) хөгжүүлэгчид, порт хийгчид
болон хэрэглэгчдэд зориулсан архитектур/дэд бүтцийн өөрчлөлтүүд,
шинэ боломжууд, маш чухал шинэчлэх зааврууд болон хувилбар
инженерчлэлийн мэдээлэл зэрэг чухал мэдээнүүд. Энэ нь бага
diff --git a/mn_MN.UTF-8/books/handbook/mirrors/chapter.xml b/mn_MN.UTF-8/books/handbook/mirrors/chapter.xml
index 31c4f99e33..a46999b6ea 100644
--- a/mn_MN.UTF-8/books/handbook/mirrors/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/mirrors/chapter.xml
@@ -757,7 +757,7 @@ Certificate information:
Түр зуурын сертификат нь сервертэй хийх нэг удаагийн
сессээр дуусгавар болох бөгөөд дараагийн удаа шалгах
алхам дахин хийгдэх болно. Сертификатыг бүрмөсөн зөвшөөрснөөр
- нэвтрэх эрхийг <filename role="directory">~/.subversion/auth/</filename>
+ нэвтрэх эрхийг <filename class="directory">~/.subversion/auth/</filename>
санд хадгалж сертификатын хугацаа дуустал хэрэглэгчээс
хурууны хээг дахин шалгахыг асуудаггүй.</para>
diff --git a/nl_NL.ISO8859-1/books/handbook/eresources/chapter.xml b/nl_NL.ISO8859-1/books/handbook/eresources/chapter.xml
index c275f3e0b7..b8afdd9e58 100644
--- a/nl_NL.ISO8859-1/books/handbook/eresources/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/eresources/chapter.xml
@@ -1761,7 +1761,7 @@
<para>Belangrijk nieuws voor ontwikkelaars, porters en gebruikers
van de <quote>Portscollectie</quote> (<filename
- role="directory">/usr/ports</filename>), waaronder veranderingen
+ class="directory">/usr/ports</filename>), waaronder veranderingen
aan de architectuur/infrastructuur, nieuwe mogelijkheden,
kritische opwaardeerinstructies, en uitgave-informatie. Dit is
een mailinglijst met een laag volume, bedoeld voor
diff --git a/nl_NL.ISO8859-1/books/handbook/jails/chapter.xml b/nl_NL.ISO8859-1/books/handbook/jails/chapter.xml
index f705266e10..7b7d5805c2 100644
--- a/nl_NL.ISO8859-1/books/handbook/jails/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/jails/chapter.xml
@@ -294,9 +294,9 @@
beginpunt. Hier zal de jail fysiek te vinden zijn binnen
het bestandssysteem van het host systeem. Een goede keuze
kan <filename
- role="directory">/usr/jail<replaceable>jailnaam</replaceable></filename>
+ class="directory">/usr/jail<replaceable>jailnaam</replaceable></filename>
zijn, waar <replaceable>jailnaam</replaceable> de naam is van de
- jail. Het <filename role="directory">/usr</filename>
+ jail. Het <filename class="directory">/usr</filename>
bestandssysteem heeft meestal genoeg ruimte voor het jail
bestandssysteem, wat voor een <quote>complete</quote> jail
betekend dat het eigenlijk een replica is van elk bestand
@@ -321,10 +321,10 @@
<application>make</application> installeert elk benodigd
configuratie bestand. In simpelere termen, het installeert
alle installeerbare bestanden in
- <filename role="directory">/usr/src/etc</filename> naar de
- <filename role="directory">/etc</filename> directory van
+ <filename class="directory">/usr/src/etc</filename> naar de
+ <filename class="directory">/etc</filename> directory van
de jail omgeving:
- <filename role="directory">$D/etc</filename>.</para>
+ <filename class="directory">$D/etc</filename>.</para>
</callout>
<callout arearefs="jaildevfs">
@@ -672,11 +672,11 @@ jail_<replaceable>www</replaceable>_devfs_ruleset="<replaceable>www_ruleset</rep
<itemizedlist>
<listitem>
<para>Elke jail zal gekopeld worden onder de <filename
- role="directory">/home/j</filename> directory.</para>
+ class="directory">/home/j</filename> directory.</para>
</listitem>
<listitem>
- <para><filename role="directory">/home/j/mroot</filename> is
+ <para><filename class="directory">/home/j/mroot</filename> is
de template voor elke jail en tevens de alleen-lezen
partitie voor elke jail.</para>
</listitem>
@@ -684,12 +684,12 @@ jail_<replaceable>www</replaceable>_devfs_ruleset="<replaceable>www_ruleset</rep
<listitem>
<para>Voor elke jail zal een lege directory structuur
gemaakt worden, welke valt onder de <filename
- role="directory">/home/j</filename> directory.</para>
+ class="directory">/home/j</filename> directory.</para>
</listitem>
<listitem>
<para>Elke jail heeft een <filename
- role="directory">/s</filename> directory, welke
+ class="directory">/s</filename> directory, welke
gekoppeld zal worden aan het beschrijfbare gedeelte van
het systeem.</para>
</listitem>
@@ -697,20 +697,20 @@ jail_<replaceable>www</replaceable>_devfs_ruleset="<replaceable>www_ruleset</rep
<listitem>
<para>Elke jail zal zijn eigen beschrijfbaar systeem hebben
welke gebaseerd is op <filename
- role="directory">/home/j/skel</filename>.</para>
+ class="directory">/home/j/skel</filename>.</para>
</listitem>
<listitem>
<para>Elke jail ruimte (het beschrijfbare gedeelte van de
jail), wordt gecree�rd in de <filename
- role="directory">/home/js</filename> directory.</para>
+ class="directory">/home/js</filename> directory.</para>
</listitem>
</itemizedlist>
<note>
<para>De voorbeelden gaan er vanuit dat de jails geplaatst
worden in <filename
- role="directory">/home</filename> partitie. Dit kan
+ class="directory">/home</filename> partitie. Dit kan
uiteraard aangepast worden, maar dan moeten de
voorbeelden hieronder ook worden aangepast naar de plek
die gebruikt zal worden.</para>
@@ -793,7 +793,7 @@ jail_<replaceable>www</replaceable>_devfs_ruleset="<replaceable>www_ruleset</rep
<para>Nu moet er een symbolische link gemaakt worden tussen
het beschrijfbare bestandssysteem en het alleen-lezen
bestandssysteem, zorg ervoor dat de links gemaakt worden
- in de juiste <filename role="directory">/s</filename>
+ in de juiste <filename class="directory">/s</filename>
directory. Als hier echte directories worden gemaakt
of de directories worden op de verkeerde plak aangemaakt
zal dit resulteren in een mislukte installatie:</para>
@@ -891,13 +891,13 @@ jail_www_devfs_enable="YES"</programlisting>
<para>De reden dat de
<varname>jail_<replaceable>name</replaceable>_rootdir</varname>
variabele verwijst naar de <filename
- role="directory">/usr/home</filename> directory in
+ class="directory">/usr/home</filename> directory in
plaats van naar <filename
- role="directory">/home</filename> komt doordat het
+ class="directory">/home</filename> komt doordat het
fysieke pad van de <filename
- role="directory">/home</filename> directory op een
+ class="directory">/home</filename> directory op een
standaard &os; installatie verwijst naar <filename
- role="directory">/usr/home</filename>. De
+ class="directory">/usr/home</filename>. De
<varname>jail_<replaceable>name</replaceable>_rootdir</varname>
variabele mag <emphasis>niet</emphasis> ingesteld
worden op een symbolische link, omdat dan de jail
@@ -980,7 +980,7 @@ jail_www_devfs_enable="YES"</programlisting>
<para>De eerste stap is het upgraden van het host systeem
zelf, waarna een nieuwe alleen-lezen template gemaakt
wordt in <filename
- role="directory">/home/j/mroot2</filename>.</para>
+ class="directory">/home/j/mroot2</filename>.</para>
<screen>&prompt.root; <userinput>mkdir /home/j/mroot2</userinput>
&prompt.root; <userinput>cd /usr/src</userinput>
@@ -1030,7 +1030,7 @@ jail_www_devfs_enable="YES"</programlisting>
<note>
<para>Het beschrijfbare gedeelte van de jail is
gekoppeld aan het alleen-lezen gedeelte
- (<filename role="directory">/s</filename>) en moet
+ (<filename class="directory">/s</filename>) en moet
derhalve eerst ontkoppeld worden.</para>
</note>
</step>
diff --git a/pl_PL.ISO8859-2/books/handbook/advanced-networking/chapter.xml b/pl_PL.ISO8859-2/books/handbook/advanced-networking/chapter.xml
index c23d4afc19..f175f2669e 100644
--- a/pl_PL.ISO8859-2/books/handbook/advanced-networking/chapter.xml
+++ b/pl_PL.ISO8859-2/books/handbook/advanced-networking/chapter.xml
@@ -2877,7 +2877,7 @@ subnet 192.168.4.0 netmask 255.255.255.0 {
<filename>pxeboot</filename>, not the kernel. There are other
interesting possibilities, like loading
<filename>pxeboot</filename> from a &os; CD-ROM
- <filename role="directory">/boot</filename> directory (as
+ <filename class="directory">/boot</filename> directory (as
&man.pxeboot.8; can load a <filename>GENERIC</filename> kernel,
this makes it possible to use <acronym>PXE</acronym> to boot
from a remote CD-ROM).</para>
diff --git a/pl_PL.ISO8859-2/books/handbook/audit/chapter.xml b/pl_PL.ISO8859-2/books/handbook/audit/chapter.xml
index 13aa55147a..d7ccb51e3f 100644
--- a/pl_PL.ISO8859-2/books/handbook/audit/chapter.xml
+++ b/pl_PL.ISO8859-2/books/handbook/audit/chapter.xml
@@ -167,7 +167,7 @@ requirements. -->
<para>Support for Event Auditing is installed with
the normal <maketarget>installworld</maketarget> process. An
administrator may confirm this by viewing the contents
- of <filename role="directory">/etc/security</filename>. Files
+ of <filename class="directory">/etc/security</filename>. Files
beginning with the word <emphasis>audit</emphasis> should be present.
For example, <filename>audit_event</filename>.</para>
@@ -194,7 +194,7 @@ requirements. -->
<title>Audit Configuration</title>
<para>All configuration files for security audit are found in
- <filename role="directory">/etc/security</filename>. The following
+ <filename class="directory">/etc/security</filename>. The following
files must be present before the audit daemon is started:</para>
<itemizedlist>
@@ -451,10 +451,10 @@ naflags:lo</programlisting>
percentage of free space for audit file systems. This
relates to the file system where audit logs are stored.
For example, if the <option>dir</option> specifies
- <filename role="directory">/var/audit</filename> and
+ <filename class="directory">/var/audit</filename> and
<option>minfree</option> is set to twenty (20), warning
messages will be generated when the
- <filename role="directory">/var</filename> file system grows
+ <filename class="directory">/var</filename> file system grows
to eighty (80) percent full.</para>
<para>The <option>naflags</option> option specifies audit
diff --git a/pl_PL.ISO8859-2/books/handbook/disks/chapter.xml b/pl_PL.ISO8859-2/books/handbook/disks/chapter.xml
index 041ae3ebb2..cad085f1cd 100644
--- a/pl_PL.ISO8859-2/books/handbook/disks/chapter.xml
+++ b/pl_PL.ISO8859-2/books/handbook/disks/chapter.xml
@@ -3798,7 +3798,7 @@ device crypto</screen>
<para>The following example will describe how to generate a
key file, which will be used as part of the Master Key for
the encrypted provider mounted under
- <filename role="directory">/private</filename>. The key
+ <filename class="directory">/private</filename>. The key
file will provide some random data used to encrypt the
Master Key. The Master Key will be protected by a
passphrase as well. Provider's sector size will be 4kB big.
@@ -3870,7 +3870,7 @@ Filesystem Size Used Avail Capacity Mounted on
<title>Unmounting and Detaching the Provider</title>
<para>Once the work on the encrypted partition is done, and
- the <filename role="directory">/private</filename> partition
+ the <filename class="directory">/private</filename> partition
is no longer needed, it is prudent to consider unmounting
and detaching the <command>geli</command> encrypted
partition from the kernel.</para>
diff --git a/pl_PL.ISO8859-2/books/handbook/geom/chapter.xml b/pl_PL.ISO8859-2/books/handbook/geom/chapter.xml
index 2026d043cc..49ab5b61f6 100644
--- a/pl_PL.ISO8859-2/books/handbook/geom/chapter.xml
+++ b/pl_PL.ISO8859-2/books/handbook/geom/chapter.xml
@@ -87,7 +87,7 @@
<para>GEOM permits access and control to classes — Master Boot
Records, <acronym>BSD</acronym> labels, etc — through the
use of providers, or the special files in
- <filename role="directory">/dev</filename>. Supporting various
+ <filename class="directory">/dev</filename>. Supporting various
software <acronym>RAID</acronym> configurations, GEOM will
transparently provide access to the operating system and
operating system utilities.</para>
@@ -157,7 +157,7 @@
<step><para>Ensure that a suitable mount point exists. If this
volume will become a root partition, then temporarily use
another mount point such as <filename
- role="directory">/mnt</filename>:</para>
+ class="directory">/mnt</filename>:</para>
<screen>&prompt.root; <userinput>mkdir /mnt</userinput></screen>
</step>
@@ -186,7 +186,7 @@ XXX: What message? Put it inside the screen output above.
</step>
<step><para>This process should have created two other devices
- in the <filename role="directory">/dev/stripe</filename>
+ in the <filename class="directory">/dev/stripe</filename>
directory in addition to the <devicename>st0</devicename> device.
Those include <devicename>st0a</devicename> and
<devicename>st0c</devicename>. A file system must now be created
@@ -248,7 +248,7 @@ XXX: What message? Put it inside the screen output above.
<para>Begin by installing &os; on the first disk with only two
partitions. One should be a swap partition, double the
<acronym>RAM</acronym> size and all remaining space devoted to
- the root (<filename role="directory">/</filename>) file system.
+ the root (<filename class="directory">/</filename>) file system.
It is possible to have separate partitions for other mount points;
however, this will increase the difficulty level ten fold due to
manual alteration of the &man.bsdlabel.8; and &man.fdisk.8;
@@ -277,7 +277,7 @@ Done.</screen>
<note>
<para>This command should have created the
<devicename>gm0</devicename>, device node under the
- <filename role="directory">/dev/mirror</filename>
+ <filename class="directory">/dev/mirror</filename>
directory.</para>
</note>
@@ -305,7 +305,7 @@ Done.</screen>
<para>This should have caused the system to spit out some
information and a bunch of numbers. This is good. Examine the
screen for any error messages and mount the device to the
- <filename role="directory">/mnt</filename> mount point:</para>
+ <filename class="directory">/mnt</filename> mount point:</para>
<screen>&prompt.root; <userinput>mount /dev/mirror/gm0s1a /mnt</userinput></screen>
@@ -443,7 +443,7 @@ OK? <userinput>boot</userinput></screen>
<screen>&prompt.root; <userinput>mount /dev/ggate0 /mnt</userinput></screen>
<para>From here on, the device may be accessed through the
- <filename role="directory">/mnt</filename> mount point.</para>
+ <filename class="directory">/mnt</filename> mount point.</para>
<note>
<para>It should be pointed out that this will fail if the device
diff --git a/pl_PL.ISO8859-2/books/handbook/linuxemu/chapter.xml b/pl_PL.ISO8859-2/books/handbook/linuxemu/chapter.xml
index 9dd6a53a67..4114d79a0a 100644
--- a/pl_PL.ISO8859-2/books/handbook/linuxemu/chapter.xml
+++ b/pl_PL.ISO8859-2/books/handbook/linuxemu/chapter.xml
@@ -410,7 +410,7 @@ multi on</programlisting>
<para>The shell scripts that
<application>&mathematica;</application> created during
installation have to be modified before you can use them. If
- you chose <filename role="directory">/usr/local/bin</filename>
+ you chose <filename class="directory">/usr/local/bin</filename>
as the directory to place the
<application>&mathematica;</application> executables in, you
will find symlinks in this directory to files called
diff --git a/pl_PL.ISO8859-2/books/handbook/mirrors/chapter.xml b/pl_PL.ISO8859-2/books/handbook/mirrors/chapter.xml
index 6bdc9ae856..552ef66f88 100644
--- a/pl_PL.ISO8859-2/books/handbook/mirrors/chapter.xml
+++ b/pl_PL.ISO8859-2/books/handbook/mirrors/chapter.xml
@@ -2433,7 +2433,7 @@ doc/zh_*</screen>
<note>
<para>In the default installation
- <filename role="directory">/usr/ports</filename> is not
+ <filename class="directory">/usr/ports</filename> is not
created. If you run &os; 6.0-RELEASE, it should be created before
<command>portsnap</command> is used. On more recent
versions of &os; or <application>Portsnap</application>,
diff --git a/pl_PL.ISO8859-2/books/handbook/network-servers/chapter.xml b/pl_PL.ISO8859-2/books/handbook/network-servers/chapter.xml
index c73e199a9b..af7d1a0fa7 100644
--- a/pl_PL.ISO8859-2/books/handbook/network-servers/chapter.xml
+++ b/pl_PL.ISO8859-2/books/handbook/network-servers/chapter.xml
@@ -3080,7 +3080,7 @@ dhcpd_ifaces="dc0"</programlisting>
<hostid>org.</hostid>, as <hostid>org.</hostid> is more specific
than the root zone. The layout of each part of a hostname is
much like a file system: the
- <filename role="directory">/dev</filename> directory falls
+ <filename class="directory">/dev</filename> directory falls
within the root, and so on.</para>
</sect2>
@@ -3164,7 +3164,7 @@ dhcpd_ifaces="dc0"</programlisting>
</row>
<row>
- <entry><filename role="directory">/etc/namedb</filename></entry>
+ <entry><filename class="directory">/etc/namedb</filename></entry>
<entry>Directory where BIND zone information resides.</entry>
</row>
@@ -3178,10 +3178,10 @@ dhcpd_ifaces="dc0"</programlisting>
<para>Depending on how a given zone is configured on the server,
the files related to that zone can be found in the <filename
- role="directory">master</filename>, <filename
- role="directory">slave</filename>, or <filename
- role="directory">dynamic</filename> subdirectories of the
- <filename role="directory">/etc/namedb</filename> directory.
+ class="directory">master</filename>, <filename
+ class="directory">slave</filename>, or <filename
+ class="directory">dynamic</filename> subdirectories of the
+ <filename class="directory">/etc/namedb</filename> directory.
These files contain the <acronym>DNS</acronym> information that
will be given out by the name server in response to queries.</para>
</sect2>
@@ -3229,7 +3229,7 @@ dhcpd_ifaces="dc0"</programlisting>
<para>Configuration files for <application>named</application>
currently reside in
- <filename role="directory">/etc/namedb</filename> directory and
+ <filename class="directory">/etc/namedb</filename> directory and
will need modification before use, unless all that is needed is
a simple resolver. This is where most of the configuration will
be performed.</para>
@@ -3238,7 +3238,7 @@ dhcpd_ifaces="dc0"</programlisting>
<title>Using <command>make-localhost</command></title>
<para>To configure a master zone for the localhost visit the
- <filename role="directory">/etc/namedb</filename> directory
+ <filename class="directory">/etc/namedb</filename> directory
and run the following command:</para>
<screen>&prompt.root; <userinput>sh make-localhost</userinput></screen>
diff --git a/pl_PL.ISO8859-2/books/handbook/ports/chapter.xml b/pl_PL.ISO8859-2/books/handbook/ports/chapter.xml
index 89624bf757..86bc19dbe9 100644
--- a/pl_PL.ISO8859-2/books/handbook/ports/chapter.xml
+++ b/pl_PL.ISO8859-2/books/handbook/ports/chapter.xml
@@ -624,7 +624,7 @@ docbook =
CVSup</link>.</para>
<para>Bardzo wa�nym jest, aby upewni� si�, �e katalog
- <filename role="directory">/usr/ports</filename> jest pusty
+ <filename class="directory">/usr/ports</filename> jest pusty
nim po raz pierwszy uruchomimy <application>CVSup</application>!
Je�li posiadamy ju� kolekcj� port�w pozyskan� z innego �r�d�a
<application>CVSup</application> nie usunie nieu�ywanych
@@ -717,7 +717,7 @@ docbook =
b�d� najnowsz� wersj� programu <application>Portsnap</application>.
Przy pierwszym uruchomieniu programu &man.portsnap.8; zostanie
automatycznie utworzony katalog <filename
- role="directory">/usr/ports</filename>. W starszych wersjach programu
+ class="directory">/usr/ports</filename>. W starszych wersjach programu
wymagane jest w�asnor�czne utworzenie katalogu:</para>
<screen>&prompt.root; <userinput>mkdir /usr/ports</userinput></screen>
@@ -725,7 +725,7 @@ docbook =
<step>
<para>Pobierz skompresowan� migawk� kolekcji port�w do katalogu
- <filename role="directory">/var/db/portsnap</filename>. Mo�na nast�pnie
+ <filename class="directory">/var/db/portsnap</filename>. Mo�na nast�pnie
zako�czy� po��czenie z Internetem, je�li jest taka potrzeba.</para>
<screen>&prompt.root; <userinput>portsnap fetch</userinput></screen>
@@ -734,13 +734,13 @@ docbook =
<step>
<para>Je�li uruchamiany <application>Portsnap</application> po raz
pierwszy nale�y rozpakowa� migawk� do katalogu
- <filename role="directory">/usr/ports</filename>:
+ <filename class="directory">/usr/ports</filename>:
</para>
<screen>&prompt.root; <userinput>portsnap extract</userinput></screen>
<para>Je�li posiadamy ju� kolekcj� port�w w <filename
- role="directory">/usr/ports</filename> i jedynie j� aktualizujemy,
+ class="directory">/usr/ports</filename> i jedynie j� aktualizujemy,
wpisujemy polecenie:</para>
<screen>&prompt.root; <userinput>portsnap update</userinput></screen>
@@ -1250,7 +1250,7 @@ ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/distfiles/ fetch</userinput></screen>
port�w jest <application>Portmanager</application>, dost�pny z portu
<filename role="package">sysutils/portmanager</filename>:</para>
- <screen>&prompt.root; <userinput>cd <filename role="directory">/usr/ports/sysutils/portmanager</filename></userinput>
+ <screen>&prompt.root; <userinput>cd <filename class="directory">/usr/ports/sysutils/portmanager</filename></userinput>
&prompt.root; <userinput>make install clean</userinput></screen>
<para>Wszystkie zainstalowane porty mog� zosta� zaktualizowane
diff --git a/ru_RU.KOI8-R/articles/committers-guide/article.xml b/ru_RU.KOI8-R/articles/committers-guide/article.xml
index f0f83afa3e..1ffa2e5984 100644
--- a/ru_RU.KOI8-R/articles/committers-guide/article.xml
+++ b/ru_RU.KOI8-R/articles/committers-guide/article.xml
@@ -254,17 +254,17 @@
�����������, ������� ��������� ���������:</para>
<itemizedlist>
- <listitem><para>ncvs@ - ����������� <filename role="directory">
+ <listitem><para>ncvs@ - ����������� <filename class="directory">
/home/ncvs</filename>, �������� �������� ������
</para></listitem>
- <listitem><para>pcvs@ - ����������� <filename role="directory">
+ <listitem><para>pcvs@ - ����������� <filename class="directory">
/home/pcvs</filename>, �����</para></listitem>
- <listitem><para>dcvs@ - ����������� <filename role="directory">
+ <listitem><para>dcvs@ - ����������� <filename class="directory">
/home/dcvs</filename>, ������������</para></listitem>
- <listitem><para>projcvs@ - ����������� <filename role="directory">
+ <listitem><para>projcvs@ - ����������� <filename class="directory">
/home/projcvs</filename>, ������ �������</para></listitem>
</itemizedlist>
</note>
@@ -2450,7 +2450,7 @@ docs:Documentation Bug:freebsd-doc:</programlisting>
</itemizedlist>
<para>�� ������ ��������������� �������� <command>rmport</command>
- �� �������� <filename role="directory">ports/Tools/scripts</filename>.
+ �� �������� <filename class="directory">ports/Tools/scripts</filename>.
���� ������ ������� &a.vd;, � �� �� ��� ������������, ��� ���
�������, ����������� � ��������� �� ������ <command>rmport</command>
������� �������� ��������������� ���.</para>
diff --git a/ru_RU.KOI8-R/books/fdp-primer/the-website/chapter.xml b/ru_RU.KOI8-R/books/fdp-primer/the-website/chapter.xml
index 683549158b..2f9e8f3157 100644
--- a/ru_RU.KOI8-R/books/fdp-primer/the-website/chapter.xml
+++ b/ru_RU.KOI8-R/books/fdp-primer/the-website/chapter.xml
@@ -98,7 +98,7 @@
</step>
<step>
- <para>��������� � ������� <filename role="directory">www/en</filename>
+ <para>��������� � ������� <filename class="directory">www/en</filename>
� ��������� ������� &man.make.1; <maketarget>all</maketarget> ���
�������� Web-�������.</para>
diff --git a/ru_RU.KOI8-R/books/handbook/advanced-networking/chapter.xml b/ru_RU.KOI8-R/books/handbook/advanced-networking/chapter.xml
index 8daf304fa4..90f2d7d972 100644
--- a/ru_RU.KOI8-R/books/handbook/advanced-networking/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/advanced-networking/chapter.xml
@@ -2444,7 +2444,7 @@ subnet 192.168.4.0 netmask 255.255.255.0 {
<filename>pxeboot</filename>, � �� ����. ���������� ������
���������� �����������, ����� ��� ��������
<filename>pxeboot</filename> �� ��������
- <filename role="directory">/boot</filename> &os; CD-ROM
+ <filename class="directory">/boot</filename> &os; CD-ROM
(��������� &man.pxeboot.8; ����� ���������
<filename>GENERIC</filename> ����, ��� ������ ���������
�������� � ���������� CD-ROM).</para>
diff --git a/ru_RU.KOI8-R/books/handbook/audit/chapter.xml b/ru_RU.KOI8-R/books/handbook/audit/chapter.xml
index 96a138068f..cacc58bdbf 100644
--- a/ru_RU.KOI8-R/books/handbook/audit/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/audit/chapter.xml
@@ -237,7 +237,7 @@ requirements. -->
<para>��� ���������������� ����� ������� ������ ��������� � ��������
- <filename role="directory">/etc/security</filename>. ����� ��������
+ <filename class="directory">/etc/security</filename>. ����� ��������
������ ������ ��� ������ ���������� ��������� �����:</para>
<itemizedlist>
@@ -518,10 +518,10 @@ naflags:lo</programlisting>
�������� ���������� ��������� ������������ �� �������, �
������� ����������� ����� �������� ������. ��������, ����
�������� ��������� <option>dir</option> ����������� �
- <filename role="directory">/var/audit</filename>, � ��������
+ <filename class="directory">/var/audit</filename>, � ��������
<option>minfree</option> ����� �������� (20), �� ���������������
��������� ����� ������, ����� ������ <filename
- role="directory">/var</filename> ����� �������� ��
+ class="directory">/var</filename> ����� �������� ��
����������� (80%) ���������.</para>
<para>�������� <option>naflags</option> ���������� ������
diff --git a/ru_RU.KOI8-R/books/handbook/linuxemu/chapter.xml b/ru_RU.KOI8-R/books/handbook/linuxemu/chapter.xml
index f7aab0ecb2..647d255b93 100644
--- a/ru_RU.KOI8-R/books/handbook/linuxemu/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/linuxemu/chapter.xml
@@ -444,7 +444,7 @@ multi on</programlisting>
<application>&mathematica;</application> ������� ��
����� ���������, ������ ���� �������� ����� ���, ���
�� ������� ������������ ��. ���� �� �������
- <filename role="directory">/usr/local/bin</filename> �
+ <filename class="directory">/usr/local/bin</filename> �
�������� ���������� ��� ��������� ����������� ������
<application>&mathematica;</application>, �� �� ����������
� ���� �������� ������ �� ����� <filename>math</filename>,
diff --git a/ru_RU.KOI8-R/books/handbook/mirrors/chapter.xml b/ru_RU.KOI8-R/books/handbook/mirrors/chapter.xml
index dba5c4a9fe..bfdd56ed9e 100644
--- a/ru_RU.KOI8-R/books/handbook/mirrors/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/mirrors/chapter.xml
@@ -2413,7 +2413,7 @@ doc/zh_*</screen>
<note>
<para>� ������������ ��������� �� ��������� �������
- <filename role="directory">/usr/ports</filename> �� ������.
+ <filename class="directory">/usr/ports</filename> �� ������.
���� �� ����������� &os; 6.0-RELEASE,
�������� ��� �������������� ����� ������ ��������
������� <command>portsnap</command>.
diff --git a/share/xml/freebsd.sch b/share/xml/freebsd.sch
index 4072cd66b8..b7978bf8fe 100644
--- a/share/xml/freebsd.sch
+++ b/share/xml/freebsd.sch
@@ -10,6 +10,12 @@
</rule>
</pattern>
+ <pattern name="Check filenames">
+ <rule context="//filename">
+ <report test="@role = 'directory'">Filename (<xsl:value-of select="."/>) has role="directory"; use class="directory"</report>
+ </rule>
+ </pattern>
+
<pattern name="Check cross-reference validity">
<rule context="//link">
<assert test="* or normalize-space()">Link (<xsl:value-of select="@linkend"/>) element must have a content; or use xref to auto-generate the linking text.</assert>
diff --git a/zh_CN.GB2312/books/handbook/audit/chapter.xml b/zh_CN.GB2312/books/handbook/audit/chapter.xml
index 750d0fd77b..f175d4267d 100644
--- a/zh_CN.GB2312/books/handbook/audit/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/audit/chapter.xml
@@ -163,7 +163,7 @@ requirements. -->
<para>�����¼���Ƶ�֧�֣� �Ѿ������ <maketarget>installworld</maketarget>
������ɡ� ����Ա����ͨ���鿴
- <filename role="directory">/etc/security</filename> ��������ȷ����һ�㡣
+ <filename class="directory">/etc/security</filename> ��������ȷ����һ�㡣
��Ӧ�ܿ���һЩ������ <emphasis>audit</emphasis> ��ͷ���ļ���
���� <filename>audit_event</filename>��</para>
diff --git a/zh_TW.Big5/articles/cvs-freebsd/article.xml b/zh_TW.Big5/articles/cvs-freebsd/article.xml
index 487122f35b..6fb33d3a2f 100644
--- a/zh_TW.Big5/articles/cvs-freebsd/article.xml
+++ b/zh_TW.Big5/articles/cvs-freebsd/article.xml
@@ -78,7 +78,7 @@
<screen>&prompt.user; <userinput>cvs -d <replaceable>path-to-repository</replaceable> init</userinput></screen>
<para>�o�R�O�i�D <application>CVS</application> �إ�
- <filename role="directory">CVSROOT</filename> ���ؿ��A�o�ӥؿ��̩�m�F�Ҧ����պA�ɡC</para>
+ <filename class="directory">CVSROOT</filename> ���ؿ��A�o�ӥؿ��̩�m�F�Ҧ����պA�ɡC</para>
</sect2>
<sect2>
@@ -100,27 +100,27 @@
<sect2>
<title>���^��l�ɮ�</title>
- <para>�{�b�A�ݭn�q FreeBSD �x�s�w�����^ <filename role="directory">CVSROOT</filename> �ؿ��A
+ <para>�{�b�A�ݭn�q FreeBSD �x�s�w�����^ <filename class="directory">CVSROOT</filename> �ؿ��A
�q FreeBSD �ΦW�� CVS �M�g���Ө��^�|�O��²�檺��k�C�Ьd�\ <ulink
url="&url.books.handbook;/anoncvs.html">�b handbook �����������`</ulink>��
��o��h��T�C�ڭ̰��]���^���ɮצs��b�ۦP�ؿ��U��
- <filename role="directory">CVSROOT-freebsd</filename> �ؿ����C</para>
+ <filename class="directory">CVSROOT-freebsd</filename> �ؿ����C</para>
</sect2>
<sect2>
<title>�ƻs FreeBSD ���R�O�Z</title>
- <para>���U�ӧڭ̭n�ƻs FreeBSD <filename role="directory">CVSROOT</filename> �̪��ɮר�A
+ <para>���U�ӧڭ̭n�ƻs FreeBSD <filename class="directory">CVSROOT</filename> �̪��ɮר�A
���x�s�w���C�p�G�A�O�E�x�� <application>CVS</application>�A�A�]�\�|�Q�A
�i�H�����פJ�o�ǩR�O�Z�A�չϧ�e�����P�ɩM��s�������P�B�F���L�A�ƹ�O
<application>CVS</application> �b�o�ӳ��������I�G���פJ�ɮר�
- <filename role="directory">CVSROOT</filename> �ɡA���ä��|��s�պA�ɡC���F�n�{�X�o���ɮ�
+ <filename class="directory">CVSROOT</filename> �ɡA���ä��|��s�պA�ɡC���F�n�{�X�o���ɮ�
�A�A�ٻݭn�b�פJ���̫�@�@���s����A�o�N���h�F
<literal>cvs import</literal> �����ȡC�]���A��ij����k�O�Ƚƻs�o�ǩR�O
�Z�L�h�C</para>
<para>�Y�W�z���e��A�S���N�q�O�����n��—�]���̫᪺���G���O�@�˪��C
- �����ץX�A�� <filename role="directory">CVSROOT</filename>�A�M��ƻs�����^�� FreeBSD
+ �����ץX�A�� <filename class="directory">CVSROOT</filename>�A�M��ƻs�����^�� FreeBSD
�ɮר쥻�a���ؿ����]�|���ܰʹL�^�G</para>
<screen>&prompt.user; <userinput>cvs -d <replaceable>path-to-your-repository</replaceable> checkout CVSROOT</userinput>
@@ -240,7 +240,7 @@
�A�]���O $FreeBSD$�^�C�b���ɮפ��Ҧ��ŦX�@��@�Ӫ���
�צW�ٱN���|�Q�ˬd�C�A�i�H�b���ɮפ������ݭn�ץ������Y���ɮs�W�@
�ӥ��W�B�⦡�C���F�w�˳o�ǩR�O�Z�A�̦n����k�O�ư�
- <filename role="directory">CVSROOT/</filename> �|������Y���ˬd�C</para>
+ <filename class="directory">CVSROOT/</filename> �|������Y���ˬd�C</para>
</listitem>
<listitem>
@@ -389,7 +389,7 @@
<listitem>
<para><literal>@LOG_FILE_MAP</literal> - �H�A�һݭn���ӭק�o��
�}�C�A�C�ӳ]�w�����ӲŦX�Q���檺�ؿ��A�Ӵ��檺��x�T���|�H
- <filename role="directory">commitlogs</filename> ���W���x�s�b�C�ӳQ�]�w���ؿ��U�C</para>
+ <filename class="directory">commitlogs</filename> ���W���x�s�b�C�ӳQ�]�w���ؿ��U�C</para>
</listitem>
<listitem>
@@ -413,7 +413,7 @@
�z�]�p�H <literal>^ports/</literal> ���}�Y���C�@�浥�^�C���~�A����
���H <literal>^CVSROOT/</literal> ���}�Y����C�A�M��s�W�@��u��
<literal>^CVSROOT/</literal>�C��������r�i�}���R�O�Z�w�˦n��A�A�i
- �H�b <filename role="directory">CVSROOT</filename> �ؿ������ɮ̥[�W���Y�A�M��A��
+ �H�b <filename class="directory">CVSROOT</filename> �ؿ������ɮ̥[�W���Y�A�M��A��
�_�����Ѫ���C�A���b�A�٨S������e�h�u�O���o�ˡC</para>
</step>
@@ -454,7 +454,7 @@
</procedure>
<para>�{�b�A�b�Ӥߪ��˵��L��A�A�i�H����A���ק�F�C�T�w�A���e���b
- <filename>avail</filename> �����\�A�ۤv�s�� <filename role="directory">CVSROOT</filename>
+ <filename>avail</filename> �����\�A�ۤv�s�� <filename class="directory">CVSROOT</filename>
�ؿ��A�]���p�G�S���o�˰����ܧA�|��A�ۤv��b�~���C����T�{�L��а���U
�C�R�O�G</para>
@@ -479,7 +479,7 @@
<title>FreeBSD ���S���]�w</title>
<para>FreeBSD �M�צۤv�ϥΤ@�Ӧ��I���P���]�w�A���N�O�P�ɤ]�ϥ� FreeBSD
- <filename role="directory">CVSROOT</filename> ���� <filename>freebsd</filename> �l�ؿ��C�]
+ <filename class="directory">CVSROOT</filename> ���� <filename>freebsd</filename> �l�ؿ��C�]
���j�q������̥����b�ۦP���s�դ��A�]���M�g�F�@��²�檺 wrapper �ӽT�{��
��̥i�H���T������A�ó]�w�x�s�w���s�զW�١C</para>
@@ -537,7 +537,7 @@
<step>
<para>���U�ӬO�إ� wrapper �ӽT�{�A�b����ɬO�b���T���s�դ��C
- �b�A�� <filename role="directory">CVSROOT</filename> ����
+ �b�A�� <filename class="directory">CVSROOT</filename> ����
<filename>cvswrap.c</filename> �n����ϥΡC</para>
<para>�b�A�����s��å[�J���T�����|��ڭ̭n�ӽsĶ��l�X�G</para>
diff --git a/zh_TW.Big5/articles/nanobsd/article.xml b/zh_TW.Big5/articles/nanobsd/article.xml
index 0223df0a6e..15ee953eea 100644
--- a/zh_TW.Big5/articles/nanobsd/article.xml
+++ b/zh_TW.Big5/articles/nanobsd/article.xml
@@ -102,22 +102,22 @@
<listitem>
<para>�@�ӳ]�w�ɤ��ΰϡA�b�B�����Ҥ��A
- �i�H�N�䱾��(mount)�� <filename role="directory">/cfg</filename> �ؿ��U�C</para>
+ �i�H�N�䱾��(mount)�� <filename class="directory">/cfg</filename> �ؿ��U�C</para>
</listitem>
</itemizedlist>
<para>�o�Ǥ��ΰϡA�b�w�]���p�U�O�H��Ū�覡�����C</para>
- <para><filename role="directory">/etc</filename> �M
- <filename role="directory">/var</filename> �ؿ�����
+ <para><filename class="directory">/etc</filename> �M
+ <filename class="directory">/var</filename> �ؿ�����
&man.md.4;(malloc)�ϺСC</para>
<para>�]�w�ɪ����ΰϫh�O�b
- <filename role="directory">/cfg</filename> �ؿ��C
- ���]�t�F�� <filename role="directory">/etc</filename>
+ <filename class="directory">/cfg</filename> �ؿ��C
+ ���]�t�F�� <filename class="directory">/etc</filename>
�ؿ����ɮסA�b�Ұʤ���ȮɥH��Ū�覡�����C �]���A�Y�Q�n���}���O�d�s���]�w�A
- ����n�O�o�q <filename role="directory">/etc</filename> ���L���ɮƻs�^
- <filename role="directory">/cfg</filename> �ؿ��~��C</para>
+ ����n�O�o�q <filename class="directory">/etc</filename> ���L���ɮƻs�^
+ <filename class="directory">/cfg</filename> �ؿ��~��C</para>
<example>
<title>��ק�L <filename>/etc/resolv.conf</filename> �]�w�O�s�_��</title>
@@ -131,9 +131,9 @@
<note>
<para>�u���b�t�αҰʹL�{���A�H�λݭn�ק�]�w�ɪ��ɭԡA�~�ݭn�����t��
- <filename role="directory">/cfg</filename> �����Ӥ��ΰϡC</para>
+ <filename class="directory">/cfg</filename> �����Ӥ��ΰϡC</para>
- <para>�@�������� <filename role="directory">/cfg</filename>
+ <para>�@�������� <filename class="directory">/cfg</filename>
���O�@�Ӧn�D�N�A�S�O�O���z�� <application>NanoBSD</application>
��b���A�X�i��j�q�g�J�ʧ@�����ΰϮ�
(��p�G�ѩ��ɮרt�Ϊ��P�B�Ʒ|�w���b�t�κФ��g�J���)�C</para>
@@ -145,7 +145,7 @@
<para><application>NanoBSD</application> �M���ɬO�z�L�ϥΫD�`²�檺
<filename>nanobsd.sh</filename> shell script �ӥ��y���A�o�� script �i�H�b
- <filename role="directory"><replaceable>/usr</replaceable>/src/tools/tools/nanobsd</filename>
+ <filename class="directory"><replaceable>/usr</replaceable>/src/tools/tools/nanobsd</filename>
�ؿ������C �o�� script �إߪ��M���ɡA�i�H�� &man.dd.1; �u��ӽƻs���H���ФW�C</para>
<para>���y
@@ -262,7 +262,7 @@
customize_cmd cust_foo</programlisting>
<para>�U���|�����I���Ҥl�A���|��w�]��
- <filename role="directory">/etc</filename> �ؿ��j�p�A�q 5MB �վ㬰 30MB�G</para>
+ <filename class="directory">/etc</filename> �ؿ��j�p�A�q 5MB �վ㬰 30MB�G</para>
<programlisting>cust_etc_size()(
cd ${NANO_WORLDDIR}/conf
@@ -285,7 +285,7 @@ customize_cmd cust_etc_size</programlisting>
<listitem>
<para><literal>cust_install_files</literal> —
- �q <filename role="directory">nanobsd/Files</filename>
+ �q <filename class="directory">nanobsd/Files</filename>
�ؿ����w���ɮסA�o�]�t�@�ǹ�Ϊ��t�κz script �C</para>
</listitem>
</itemizedlist>
@@ -385,7 +385,7 @@ customize_cmd cust_nobeastie</programlisting>
<para>�n�b���b�B�檺
<application>NanoBSD</application> �t�Τ��w�˷s���M���ɡA�i�H�ϥΦ��
- <filename role="directory">/root</filename> �ؿ���
+ <filename class="directory">/root</filename> �ؿ���
<filename>updatep1</filename> ��
<filename>updatep2</filename> script �A
��ڤW�n�έ��@�� script�A�h���M�b�B�檺�t�άO�����Ӥ��ΰϦөw�C</para>
diff --git a/zh_TW.Big5/articles/remote-install/article.xml b/zh_TW.Big5/articles/remote-install/article.xml
index cc163f7771..d52b23f939 100644
--- a/zh_TW.Big5/articles/remote-install/article.xml
+++ b/zh_TW.Big5/articles/remote-install/article.xml
@@ -201,10 +201,10 @@ ifconfig_re0="inet 192.168.0.2 netmask 255.255.255.0"</programlisting>
image �ɪ��L�{�۷�²��C</para>
<para>�����O�� &os; �w�˥��ЩΪ̦w�˥Ϊ� <acronym>ISO</acronym> image
- �ɥ�� <filename role="directory">/cdrom</filename>�C
+ �ɥ�� <filename class="directory">/cdrom</filename>�C
�������Ҧ��Ҥl���@�P�A���尲�]���O�� &os; 7.0-RELEASE
<acronym>ISO</acronym>�C �ӧ� ISO image �ɱ����� <filename
- role="directory">/cdrom</filename> �ؿ��۷�²��A
+ class="directory">/cdrom</filename> �ؿ��۷�²��A
�N�O�� &man.mdconfig.8;�G</para>
<screen>&prompt.root; <userinput>mdconfig -a -t vnode -u 10 -f <replaceable>7.0-RELEASE-amd64-disc1.iso</replaceable></userinput>
@@ -218,7 +218,7 @@ ifconfig_re0="inet 192.168.0.2 netmask 255.255.255.0"</programlisting>
<note>
<para>�W�z�� <command>make</command> ���O�n�b
<application>mfsBSD</application> ���̤W�h�ؿ�����A��軡 <filename
- role="directory">~/mfsbsd-1.0-beta1/</filename>�C</para>
+ class="directory">~/mfsbsd-1.0-beta1/</filename>�C</para>
</note>
</sect2>
@@ -276,9 +276,9 @@ ifconfig_re0="inet 192.168.0.2 netmask 255.255.255.0"</programlisting>
&os;</ulink> ���`���۷��Ժɪ����СA�ҥH�o��D�n�n���Ъ��O�p��إ�
RAID-1 �t�ΥH�� <application>ZFS</application>�C
�o��|���ЫإߥH &man.gmirror.8; �������p�� mirrored �ɮרt�ΡG
- <filename role="directory">/</filename> (�ڥؿ�), <filename
- role="directory">/usr</filename> �H�� <filename
- role="directory">/var</filename>�A�ӵw�Ъ���l�Ѿl�Ŷ��h�q�q�H
+ <filename class="directory">/</filename> (�ڥؿ�), <filename
+ class="directory">/usr</filename> �H�� <filename
+ class="directory">/var</filename>�A�ӵw�Ъ���l�Ѿl�Ŷ��h�q�q�H
&man.zpool.8; ���� <application>ZFS</application> �� mirrored �ɮרt��
�C �Ъ`�N�G�����n���� &os; �@�~�t�θ˦n�ö}������A�~��i��]�w
<application>ZFS</application> �ɮרt�ΡC</para>
@@ -315,10 +315,10 @@ ifconfig_re0="inet 192.168.0.2 netmask 255.255.255.0"</programlisting>
<para>�{�b��ʭק�ӵw�Ъ� label�A�ܩ�p��إߤ��ΰ�(partitions)
�аѾ\ &man.bsdlabel.8; �����C
���ΰϤ��O�إߡG<literal>a</literal> �O�� <filename
- role="directory">/</filename> (�ڥؿ�)�A
+ class="directory">/</filename> (�ڥؿ�)�A
<literal>b</literal> �� swap�A
- <literal>d</literal> �� <filename role="directory">/var</filename>�A
- <literal>e</literal> �� <filename role="directory">/usr</filename>�A
+ <literal>d</literal> �� <filename class="directory">/var</filename>�A
+ <literal>e</literal> �� <filename class="directory">/usr</filename>�A
�̫�A�|�b�y��B�J�� <literal>f</literal> ��
<application>ZFS</application> �ϥΡC</para>
</callout>
@@ -363,7 +363,7 @@ ifconfig_re0="inet 192.168.0.2 netmask 255.255.255.0"</programlisting>
<guimenuitem>Options</guimenuitem> �� <keycap>Enter</keycap>�C
�M��H��V�䲾�ʨ� <literal>Install Root</literal> �B�A��
<keycap>Space</keycap> ��M��אּ <filename
- role="directory">/mnt</filename>�A�A�� <keycap>Enter</keycap>
+ class="directory">/mnt</filename>�A�A�� <keycap>Enter</keycap>
��H�N�ק�Ȧs�_�ӡA�M��� <keycap>q</keycap> ��Y�i���}�o��
<guimenuitem>Options</guimenuitem> �e���C</para>
@@ -409,7 +409,7 @@ ifconfig_re0="inet 192.168.0.2 netmask 255.255.255.0"</programlisting>
<itemizedlist>
<listitem>
<para>�� <literal>GENERIC</literal> kernel �ƻs��
- <filename role="directory">/boot/kernel</filename>
+ <filename class="directory">/boot/kernel</filename>
�ؿ��G</para>
<screen>&prompt.root; <userinput>cp -Rp /boot/GENERIC/* /boot/kernel</userinput></screen>
diff --git a/zh_TW.Big5/books/fdp-primer/the-website/chapter.xml b/zh_TW.Big5/books/fdp-primer/the-website/chapter.xml
index 85801201ec..d0b27f568b 100644
--- a/zh_TW.Big5/books/fdp-primer/the-website/chapter.xml
+++ b/zh_TW.Big5/books/fdp-primer/the-website/chapter.xml
@@ -85,7 +85,7 @@
</step>
<step>
- <para>���� <filename role="directory">www/en</filename> �ؿ��A�M�ᥴ
+ <para>���� <filename class="directory">www/en</filename> �ؿ��A�M�ᥴ
&man.make.1; <maketarget>all</maketarget> �Ӳ��ͺ����C</para>
<screen>&prompt.root; <userinput>cd en</userinput>
diff --git a/zh_TW.Big5/books/handbook/advanced-networking/chapter.xml b/zh_TW.Big5/books/handbook/advanced-networking/chapter.xml
index ad4e269ce1..8b16140908 100644
--- a/zh_TW.Big5/books/handbook/advanced-networking/chapter.xml
+++ b/zh_TW.Big5/books/handbook/advanced-networking/chapter.xml
@@ -3647,7 +3647,7 @@ subnet 192.168.4.0 netmask 255.255.255.0 {
<filename>pxeboot</filename>, not the kernel. There are other
interesting possibilities, like loading
<filename>pxeboot</filename> from a &os; CD-ROM
- <filename role="directory">/boot</filename> directory (as
+ <filename class="directory">/boot</filename> directory (as
&man.pxeboot.8; can load a <filename>GENERIC</filename> kernel,
this makes it possible to use <acronym>PXE</acronym> to boot
from a remote CD-ROM).</para>
diff --git a/zh_TW.Big5/books/handbook/audit/chapter.xml b/zh_TW.Big5/books/handbook/audit/chapter.xml
index 3a431cfb20..24ef97a465 100644
--- a/zh_TW.Big5/books/handbook/audit/chapter.xml
+++ b/zh_TW.Big5/books/handbook/audit/chapter.xml
@@ -168,7 +168,7 @@ requirements. -->
<para>Support for Event Auditing is installed with
the normal <maketarget>installworld</maketarget> process. An
administrator may confirm this by viewing the contents
- of <filename role="directory">/etc/security</filename>. Files
+ of <filename class="directory">/etc/security</filename>. Files
beginning with the word <emphasis>audit</emphasis> should be present.
For example, <filename>audit_event</filename>.</para>
@@ -195,7 +195,7 @@ requirements. -->
<title>Audit Configuration</title>
<para>All configuration files for security audit are found in
- <filename role="directory">/etc/security</filename>. The following
+ <filename class="directory">/etc/security</filename>. The following
files must be present before the audit daemon is started:</para>
<itemizedlist>
@@ -452,10 +452,10 @@ naflags:lo</programlisting>
percentage of free space for audit file systems. This
relates to the file system where audit logs are stored.
For example, if the <option>dir</option> specifies
- <filename role="directory">/var/audit</filename> and
+ <filename class="directory">/var/audit</filename> and
<option>minfree</option> is set to twenty (20), warning
messages will be generated when the
- <filename role="directory">/var</filename> file system grows
+ <filename class="directory">/var</filename> file system grows
to eighty (80) percent full.</para>
<para>The <option>naflags</option> option specifies audit
diff --git a/zh_TW.Big5/books/handbook/disks/chapter.xml b/zh_TW.Big5/books/handbook/disks/chapter.xml
index c5708b1ab8..97816e5541 100644
--- a/zh_TW.Big5/books/handbook/disks/chapter.xml
+++ b/zh_TW.Big5/books/handbook/disks/chapter.xml
@@ -3683,7 +3683,7 @@ device crypto</screen>
<para>The following example will describe how to generate a
key file, which will be used as part of the Master Key for
the encrypted provider mounted under
- <filename role="directory">/private</filename>. The key
+ <filename class="directory">/private</filename>. The key
file will provide some random data used to encrypt the
Master Key. The Master Key will be protected by a
passphrase as well. Provider's sector size will be 4kB big.
@@ -3755,7 +3755,7 @@ Filesystem Size Used Avail Capacity Mounted on
<title>Unmounting and Detaching the Provider</title>
<para>Once the work on the encrypted partition is done, and
- the <filename role="directory">/private</filename> partition
+ the <filename class="directory">/private</filename> partition
is no longer needed, it is prudent to consider unmounting
and detaching the <command>geli</command> encrypted
partition from the kernel.</para>
diff --git a/zh_TW.Big5/books/handbook/geom/chapter.xml b/zh_TW.Big5/books/handbook/geom/chapter.xml
index a5dcddefe2..d9acaa869d 100644
--- a/zh_TW.Big5/books/handbook/geom/chapter.xml
+++ b/zh_TW.Big5/books/handbook/geom/chapter.xml
@@ -78,7 +78,7 @@
<sect1 id="GEOM-intro">
<title>GEOM �ɽ�</title>
- <para>GEOM �z�L privoder(�Y <filename role="directory">/dev/</filename>
+ <para>GEOM �z�L privoder(�Y <filename class="directory">/dev/</filename>
�U���S���˸m�ɮ�) �Ӿޱ� classes(�p Master Boot Records�B
<acronym>BSD</acronym> labels ��) �CGEOM �䴩�h�سn��
<acronym>RAID</acronym> �t�m�A�z�L GEOM �s���ɡA
@@ -142,9 +142,9 @@
</step>
<step><para>�T�w�����I(mount point)�s�b�C
- �p�G�Q�Τ����s��(striping)���Ŷ������ڥؿ�(root partition�A�Y <filename role="directory">/</filename> )�A
+ �p�G�Q�Τ����s��(striping)���Ŷ������ڥؿ�(root partition�A�Y <filename class="directory">/</filename> )�A
�h���έӼȮɪ������I�A�p
- <filename role="directory">/mnt</filename>�G</para>
+ <filename class="directory">/mnt</filename>�G</para>
<screen>&prompt.root; <userinput>mkdir /mnt</userinput></screen>
</step>
@@ -173,7 +173,7 @@ XXX: What message? Put it inside the screen output above.
</step>
<step><para>���F���e�إߪ� <devicename>st0</devicename> �A�o�ӨB�J�ٷ|�b
- <filename role="directory">/dev/stripe</filename> �U�s�W��Ӹ˸m�G
+ <filename class="directory">/dev/stripe</filename> �U�s�W��Ӹ˸m�G
<devicename>st0a</devicename> �M <devicename>st0c</devicename>�C
�Q�� <command>newfs</command> ���O�i�H�b
<devicename>st0a</devicename> �إ��ɮרt�ΡG</para>
@@ -224,7 +224,7 @@ XXX: What message? Put it inside the screen output above.
<para>�����ڭ̰��] &os; �w�˦b�Ĥ@�ӺϺФW�A�B�u����Ӥ��ΰ�(partition)�C
�䤤�@�ӬO�洫���ΰ�(swap partition�A�j�p�� <acronym>RAM</acronym>
- ���⭿)�A�ӳѤU�����Ω�ڥؿ�(�Y <filename role="directory">/</filename>�A
+ ���⭿)�A�ӳѤU�����Ω�ڥؿ�(�Y <filename class="directory">/</filename>�A
root file system)�C���M�n�b���P�����I(mount point) ���X��h���ΰ�
(partition) �]�i�H�A���L���|�j�T���ɡA�]��������ʾާ@ &man.bsdlabel.8;
�M &man.fdisk.8; �u��C</para>
@@ -248,7 +248,7 @@ Done.</screen>
<screen>&prompt.root; <userinput>gmirror load</userinput></screen>
<note>
- <para>�o�ʧ@���ӷ|�b <filename role="directory">/dev/mirror</filename>
+ <para>�o�ʧ@���ӷ|�b <filename class="directory">/dev/mirror</filename>
�U�إ� <devicename>gm0</devicename> �˸m���I(device node)�C</para>
</note>
@@ -274,12 +274,12 @@ Done.</screen>
<para>�t�η|�L�X�\�h��T�M�@�j��Ʀr�A�o�O���`���C
�T�{�O�_���{����~�A���۴N�i�H�N�o�Ӹ˸m������
- <filename role="directory">/mnt</filename> �����I(mount mount)�G</para>
+ <filename class="directory">/mnt</filename> �����I(mount mount)�G</para>
<screen>&prompt.root; <userinput>mount /dev/mirror/gm0s1a /mnt</userinput></screen>
<para>���۱N�쥻�}���ϺЪ���Ʒh����s���ɮרt��
- (<filename role="directory">/mnt</filename>)�C�d�ҬO��
+ (<filename class="directory">/mnt</filename>)�C�d�ҬO��
&man.dump.8; �M &man.restore.8; �A���L�� &man.dd.1; �]�i�H�C</para>
<screen>&prompt.root; <userinput>dump -L -0 -f- / |(cd /mnt && restore -r -v -f-)</userinput></screen>
diff --git a/zh_TW.Big5/books/handbook/jails/chapter.xml b/zh_TW.Big5/books/handbook/jails/chapter.xml
index be2d18f77f..65c05c16f8 100644
--- a/zh_TW.Big5/books/handbook/jails/chapter.xml
+++ b/zh_TW.Big5/books/handbook/jails/chapter.xml
@@ -217,9 +217,9 @@
<callout arearefs="jailpath">
<para>�����N�O���� jail ��Ӯa�C �Ӹ��|�O�b host �t�Τ��� jail
�����m�C �ߺD�O��b <filename
- role="directory">/usr/jail/<replaceable>jailname</replaceable></filename>�A
+ class="directory">/usr/jail/<replaceable>jailname</replaceable></filename>�A
<replaceable>jailname</replaceable> ������� jail �� hostname
- �H�K��O�C �q�` <filename role="directory">/usr</filename>
+ �H�K��O�C �q�` <filename class="directory">/usr</filename>
�|�������Ŷ��Ӧs�� jail �ɮרt�ΡA��� <quote>complete</quote> jail
�Ө��A���q�`�]�A�F &os; �w�]�w�� base system �Ҧ��ɮת������ɡC</para>
</callout>
@@ -234,9 +234,9 @@
<para>�ϥ� <maketarget>distribution</maketarget> �o��
<application>make</application> target �Ӹ˩Ҧ��|�Ψ쪺�]�w�ɡC
²��ӻ��Ӱʧ@�N�O�� <filename
- role="directory">/usr/src/etc/</filename> �ƻs�� jail ���Ҥ���
- <filename role="directory">/etc</filename>�A�]�N�O
- <filename role="directory">$D/etc/</filename>�C</para>
+ class="directory">/usr/src/etc/</filename> �ƻs�� jail ���Ҥ���
+ <filename class="directory">/etc</filename>�A�]�N�O
+ <filename class="directory">$D/etc/</filename>�C</para>
</callout>
<callout arearefs="jaildevfs">
@@ -497,35 +497,35 @@ jail_<replaceable>www</replaceable>_devfs_ruleset="<replaceable>www_ruleset</rep
<itemizedlist>
<listitem>
<para>�C�� jail ���|������ <filename
- role="directory">/home/j</filename> ���U���䤤�@�ӥؿ��C</para>
+ class="directory">/home/j</filename> ���U���䤤�@�ӥؿ��C</para>
</listitem>
<listitem>
- <para><filename role="directory">/home/j/mroot</filename> �h�O�C��
+ <para><filename class="directory">/home/j/mroot</filename> �h�O�C��
jail �@�Ϊ��Ҫ��A�ù��Ҧ� jail �Ө����O��Ū�C</para>
</listitem>
<listitem>
- <para>�C�� jail �b <filename role="directory">/home/j</filename>
+ <para>�C�� jail �b <filename class="directory">/home/j</filename>
���U�����@�Ӭ۹������ťؿ��C</para>
</listitem>
<listitem>
<para>�C�� jail ���|�� <filename
- role="directory">/s</filename> �ؿ��A
+ class="directory">/s</filename> �ؿ��A
�ӥؿ��|�s��t�Ϊ��iŪ�g�����C</para>
</listitem>
<listitem>
<para>�C�� jail ���|�b <filename
- role="directory">/home/j/skel</filename> �ؿ��إߦ��ݪ��iŪ�g�Ŷ�
+ class="directory">/home/j/skel</filename> �ؿ��إߦ��ݪ��iŪ�g�Ŷ�
�C</para>
</listitem>
<listitem>
<para>�C�� jailspace (�U jail �iŪ�g������) ���ئb <filename
- role="directory">/home/js</filename>>�C</para>
+ class="directory">/home/js</filename>>�C</para>
</listitem>
</itemizedlist>
<note>
<para>�o�䰲�]�Ҧ� jail ����b
- <filename role="directory">/home</filename> ���ΰϡC ���M�A
+ <filename class="directory">/home</filename> ���ΰϡC ���M�A
�]�i�H�̦ۨ��ݨD���A�����U�Ӫ��Ҥl���A
�]�n�O�o�ק�۹������a��C</para>
</note>
@@ -588,7 +588,7 @@ jail_<replaceable>www</replaceable>_devfs_ruleset="<replaceable>www_ruleset</rep
<step>
<para>�{�b��iŪ�g���ɮרt�ΥH symlink �覡�s���Ū���ɮרt�ΡC
�нT�{ symbolic link �O�_�����T�s�� <filename
- role="directory">s/</filename> �ؿ��A�Y�ؿ��إߤ覡����A
+ class="directory">s/</filename> �ؿ��A�Y�ؿ��إߤ覡����A
�Ϋ��V��m����A�i��|�ɭP�w�˥��ѡC</para>
<screen>&prompt.root; <userinput>cd /home/j/mroot</userinput>
@@ -671,11 +671,11 @@ jail_www_devfs_enable="YES"</programlisting>
<warning>
<para>���ҥH�n��
<varname>jail_<replaceable>name</replaceable>_rootdir</varname>
- �q <filename role="directory">/home</filename> �אּ <filename
- role="directory">/usr/home</filename> ����]�b�� &os;
+ �q <filename class="directory">/home</filename> �אּ <filename
+ class="directory">/usr/home</filename> ����]�b�� &os;
�w�]�w�˪� <filename
- role="directory">/home</filename> �ؿ����u�O���V <filename
- role="directory">/usr/home</filename> �� symbolic link�C ��
+ class="directory">/home</filename> �ؿ����u�O���V <filename
+ class="directory">/usr/home</filename> �� symbolic link�C ��
<varname>jail_<replaceable>name</replaceable>_rootdir</varname>
�ܼƶ��� <emphasis>����ؿ�</emphasis> �ӫD symbolic link�A
�_�h jail �|�ڵ��ҰʡC �i�H�� &man.realpath.1;
@@ -740,7 +740,7 @@ jail_www_devfs_enable="YES"</programlisting>
<procedure>
<step>
<para>�����O�Ӥ@��覡�Ӥɯ� host system�A�A�s�W�{�ɪ���Ū�Ҫ�
- <filename role="directory">/home/j/mroot2</filename>�G</para>
+ <filename class="directory">/home/j/mroot2</filename>�G</para>
<screen>&prompt.root; <userinput>mkdir /home/j/mroot2</userinput>
&prompt.root; <userinput>cd /usr/src</userinput>
@@ -785,7 +785,7 @@ jail_www_devfs_enable="YES"</programlisting>
&prompt.root; <userinput>umount /home/j/www</userinput></screen>
<note>
- <para>�iŪ�g�Ŷ�(<filename role="directory">/s</filename>)
+ <para>�iŪ�g�Ŷ�(<filename class="directory">/s</filename>)
�O�����b��Ū�ɮרt�Ω��U�A�G�n�������C</para>
</note>
</step>
diff --git a/zh_TW.Big5/books/handbook/kernelconfig/chapter.xml b/zh_TW.Big5/books/handbook/kernelconfig/chapter.xml
index f0f37d3eec..d53d51a270 100644
--- a/zh_TW.Big5/books/handbook/kernelconfig/chapter.xml
+++ b/zh_TW.Big5/books/handbook/kernelconfig/chapter.xml
@@ -306,7 +306,7 @@ ath_hal(4) - Atheros Hardware Access Layer (HAL)</programlisting>
<step>
<para>������ <filename
- role="directory">/usr/src</filename> �ؿ��G</para>
+ class="directory">/usr/src</filename> �ؿ��G</para>
<screen>&prompt.root; <userinput>cd /usr/src</userinput></screen>
</step>
diff --git a/zh_TW.Big5/books/handbook/linuxemu/chapter.xml b/zh_TW.Big5/books/handbook/linuxemu/chapter.xml
index 57786fced7..ace2aea85b 100644
--- a/zh_TW.Big5/books/handbook/linuxemu/chapter.xml
+++ b/zh_TW.Big5/books/handbook/linuxemu/chapter.xml
@@ -395,7 +395,7 @@ multi on</programlisting>
<para>The shell scripts that
<application>&mathematica;</application> created during
installation have to be modified before you can use them. If
- you chose <filename role="directory">/usr/local/bin</filename>
+ you chose <filename class="directory">/usr/local/bin</filename>
as the directory to place the
<application>&mathematica;</application> executables in, you
will find symlinks in this directory to files called
diff --git a/zh_TW.Big5/books/handbook/mirrors/chapter.xml b/zh_TW.Big5/books/handbook/mirrors/chapter.xml
index 355ba68d8c..18b1f0e0ce 100644
--- a/zh_TW.Big5/books/handbook/mirrors/chapter.xml
+++ b/zh_TW.Big5/books/handbook/mirrors/chapter.xml
@@ -2430,7 +2430,7 @@ doc/zh_*</screen>
<note>
<para>In the default installation
- <filename role="directory">/usr/ports</filename> is not
+ <filename class="directory">/usr/ports</filename> is not
created. If you run &os; 6.0-RELEASE, it should be created before
<command>portsnap</command> is used. On more recent
versions of &os; or <application>Portsnap</application>,
diff --git a/zh_TW.Big5/books/handbook/ports/chapter.xml b/zh_TW.Big5/books/handbook/ports/chapter.xml
index fa6bb9e6be..f803f44cf6 100644
--- a/zh_TW.Big5/books/handbook/ports/chapter.xml
+++ b/zh_TW.Big5/books/handbook/ports/chapter.xml
@@ -267,7 +267,7 @@ lsof: /usr/ports/sysutils/lsof</screen>
<screen>&prompt.root; <userinput>echo /usr/ports/*/*lsof*</userinput>
/usr/ports/sysutils/lsof</screen>
- <para>�Ъ`�N�A�o�]�|��� <filename role="directory">/usr/ports/distfiles</filename> �ؿ������ŦX�ɦW���ɮסC</para>
+ <para>�Ъ`�N�A�o�]�|��� <filename class="directory">/usr/ports/distfiles</filename> �ؿ������ŦX�ɦW���ɮסC</para>
</listitem>
<listitem>
@@ -559,7 +559,7 @@ docbook =
</note>
<para>�Ĥ@���] <application>CVSup</application> ���e�A�Х��T�{
- <filename role="directory">/usr/ports</filename>
+ <filename class="directory">/usr/ports</filename>
�O���b���I �Y�A�w�g�ˤF Ports Collection �A���S�ۦ�[�W��L patch
�ɡA���� <application>CVSup</application>
�ä��|�R���A�ۦ�[�W�� patch �ɡA�o�˥i��|�ɭP�n�w�ˬY�dzn��ɡA
@@ -643,7 +643,7 @@ docbook =
<step>
<para>�Y <filename
- role="directory">/usr/ports</filename> �ؿ����s�b���ܡA
+ class="directory">/usr/ports</filename> �ؿ����s�b���ܡA
�N�إߤ@�U�a�G</para>
<screen>&prompt.root; <userinput>mkdir /usr/ports</userinput></screen>
@@ -651,7 +651,7 @@ docbook =
<step>
<para>���U�ӡA�U�����Y�� Ports Collection �w����s�ɨ�
- <filename role="directory">/var/db/portsnap</filename> �ؿ��C
+ <filename class="directory">/var/db/portsnap</filename> �ؿ��C
�����U����A�n�_�u�P�_���i�H�C</para>
<screen>&prompt.root; <userinput>portsnap fetch</userinput></screen>
@@ -659,13 +659,13 @@ docbook =
<step>
<para>�Y�O�Ĥ@���] <application>Portsnap</application> ���ܡA
- �h�ݭn�������� <filename role="directory">/usr/ports</filename>�G
+ �h�ݭn�������� <filename class="directory">/usr/ports</filename>�G
</para>
<screen>&prompt.root; <userinput>portsnap extract</userinput></screen>
<para>�Y�w�� <filename
- role="directory">/usr/ports</filename> �ӥB�u�O�Q��s�Ӥw�A
+ class="directory">/usr/ports</filename> �ӥB�u�O�Q��s�Ӥw�A
����N�ӤU���@�G</para>
<screen>&prompt.root; <userinput>portsnap update</userinput></screen>
@@ -1133,7 +1133,7 @@ ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/distfiles/ fetch</userinput></screen>
�]�i�H�Ψӻ��P�ɯŤw�˪��n��C �Ӥu��i�q <filename
role="package">ports-mgmt/portmanager</filename> port �w�ˡG</para>
- <screen>&prompt.root; <userinput>cd <filename role="directory">/usr/ports/ports-mgmt/portmanager</filename></userinput>
+ <screen>&prompt.root; <userinput>cd <filename class="directory">/usr/ports/ports-mgmt/portmanager</filename></userinput>
&prompt.root; <userinput>make install clean</userinput></screen>
<para>�Ҧ��w�˪��n��A���i�H���P�������U�C���O�ӤɯšG</para>
From bcd21d65e9f81f609bf34e25bafad11166f28178 Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Thu, 4 Apr 2013 12:10:48 +0000
Subject: [PATCH 098/121] - Reduce the misuse of role attribute;
role="directory" should actually be class="directory"
---
.../books/handbook/cutting-edge/chapter.xml | 4 +-
.../books/handbook/l10n/chapter.xml | 4 +-
.../books/handbook/linuxemu/chapter.xml | 38 +++++++++----------
3 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/fr_FR.ISO8859-1/books/handbook/cutting-edge/chapter.xml b/fr_FR.ISO8859-1/books/handbook/cutting-edge/chapter.xml
index b3b2c95f49..89bc6c7eb8 100644
--- a/fr_FR.ISO8859-1/books/handbook/cutting-edge/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/cutting-edge/chapter.xml
@@ -1034,7 +1034,7 @@ Fetching 133 new ports or files... done.</screen>
avec le fichier <filename>supfile</filename>
nomm� <filename>standard-supfile</filename>
disponible dans le r�pertoire <filename
- role='directory'>/usr/share/examples/cvsup</filename>.
+ class='directory'>/usr/share/examples/cvsup</filename>.
C'est la m�thode recommand�e, puisqu'elle
permet de r�cup�rer la totalit�
des sources la premi�re fois et par la suite
@@ -1292,7 +1292,7 @@ Fetching 133 new ports or files... done.</screen>
avec le fichier <filename>supfile</filename>
nomm� <filename>stable-supfile</filename>
disponible dans le r�pertoire <filename
- role='directory'>/usr/share/examples/cvsup</filename>.
+ class='directory'>/usr/share/examples/cvsup</filename>.
C'est la m�thode recommand�e, puisqu'elle
permet de r�cup�rer la totalit�
des sources la premi�re fois et par la suite
diff --git a/fr_FR.ISO8859-1/books/handbook/l10n/chapter.xml b/fr_FR.ISO8859-1/books/handbook/l10n/chapter.xml
index 075a004055..4b59247fa6 100644
--- a/fr_FR.ISO8859-1/books/handbook/l10n/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/l10n/chapter.xml
@@ -900,10 +900,10 @@ font8x8="cp866-8x8"</programlisting>
utilis�e, et <option>-W</option> fixe la table de
conversion de caract�res. Pour utiliser l'option
<option>-W</option> assurez-vous de monter <filename
- role='directory'>/usr</filename> avant la partition &ms-dos;,
+ class='directory'>/usr</filename> avant la partition &ms-dos;,
car en effet les tables de conversion sont situ�es
dans le r�pertoire <filename
- role='directory'>/usr/libdata/msdosfs</filename>. Pour plus
+ class='directory'>/usr/libdata/msdosfs</filename>. Pour plus
d'informations, consultez la page de manuel
&man.mount.msdosfs.8;.</para>
</sect3>
diff --git a/fr_FR.ISO8859-1/books/handbook/linuxemu/chapter.xml b/fr_FR.ISO8859-1/books/handbook/linuxemu/chapter.xml
index d69586216a..bd1175712e 100644
--- a/fr_FR.ISO8859-1/books/handbook/linuxemu/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/linuxemu/chapter.xml
@@ -1829,7 +1829,7 @@ export PATH</programlisting>
<entry><filename>/dev/da0s1a</filename></entry>
<entry>1.016.303</entry>
<entry>1</entry>
- <entry><filename role='directory'>/</filename></entry>
+ <entry><filename class='directory'>/</filename></entry>
</row>
<row>
@@ -1843,35 +1843,35 @@ export PATH</programlisting>
<entry><filename>/dev/da0s1e</filename></entry>
<entry>2.032.623</entry>
<entry>2</entry>
- <entry><filename role='directory'>/var</filename></entry>
+ <entry><filename class='directory'>/var</filename></entry>
</row>
<row>
<entry><filename>/dev/da0s1f</filename></entry>
<entry>8.205.339</entry>
<entry>8</entry>
- <entry><filename role='directory'>/usr</filename></entry>
+ <entry><filename class='directory'>/usr</filename></entry>
</row>
<row>
<entry><filename>/dev/da1s1e</filename></entry>
<entry>45.734.361</entry>
<entry>45</entry>
- <entry><filename role='directory'>/compat/linux/oracle</filename></entry>
+ <entry><filename class='directory'>/compat/linux/oracle</filename></entry>
</row>
<row>
<entry><filename>/dev/da1s1f</filename></entry>
<entry>2.032.623</entry>
<entry>2</entry>
- <entry><filename role='directory'>/compat/linux/sapmnt</filename></entry>
+ <entry><filename class='directory'>/compat/linux/sapmnt</filename></entry>
</row>
<row>
<entry><filename>/dev/da1s1g</filename></entry>
<entry>2.032.623</entry>
<entry>2</entry>
- <entry><filename role='directory'>/compat/linux/usr/sap</filename></entry>
+ <entry><filename class='directory'>/compat/linux/usr/sap</filename></entry>
</row>
</tbody>
</tgroup>
@@ -2014,17 +2014,17 @@ pam-0.68-7.i386.rpm</userinput></screen>
</thead>
<tbody>
<row>
- <entry><filename role='directory'>/compat/linux/oracle</filename></entry>
+ <entry><filename class='directory'>/compat/linux/oracle</filename></entry>
<entry>45 Go</entry>
</row>
<row>
- <entry><filename role='directory'>/compat/linux/sapmnt</filename></entry>
+ <entry><filename class='directory'>/compat/linux/sapmnt</filename></entry>
<entry>2 Go</entry>
</row>
<row>
- <entry><filename role='directory'>/compat/linux/usr/sap</filename></entry>
+ <entry><filename class='directory'>/compat/linux/usr/sap</filename></entry>
<entry>2 Go</entry>
</row>
</tbody>
@@ -2216,7 +2216,7 @@ Shell: bash (/compat/linux/bin/bash)</programlisting>
qu'utilisateur
<username>ora<replaceable>sid</replaceable></username>. Ce
seront tous les r�pertoires du type
- <filename role='directory'>/oracle/<replaceable>SID</replaceable></filename>:</para>
+ <filename class='directory'>/oracle/<replaceable>SID</replaceable></filename>:</para>
<screen>&prompt.root; <userinput>su - ora<replaceable>sid</replaceable></userinput>
&prompt.root; <userinput>cd /oracle/<replaceable>SID</replaceable></userinput>
@@ -2239,7 +2239,7 @@ Shell: bash (/compat/linux/bin/bash)</programlisting>
&prompt.root; <userinput>mkdir 817_32</userinput></screen>
<note><para>Le r�pertoire <filename
- role='directory'>client/80x_32</filename> est
+ class='directory'>client/80x_32</filename> est
cr�� tel quel. Ne remplacez pas le
<emphasis>x</emphasis> par quelque chose
d'autre.</para></note>
@@ -2422,7 +2422,7 @@ options SEMUME=100 #number of UNDO keys</programlisting>
<title>Ex�cuter la proc�dure d'installation</title>
<para>Tout d'abord, vous devez pr�parer un r�pertoire
- <filename role='directory'>install</filename>:</para>
+ <filename class='directory'>install</filename>:</para>
<screen>&prompt.root; <userinput>cd /oracle/<replaceable>SID</replaceable>/sapreorg</userinput>
&prompt.root; <userinput>mkdir install</userinput>
@@ -2431,7 +2431,7 @@ options SEMUME=100 #number of UNDO keys</programlisting>
<para>Ensuite la proc�dure d'installation est
lanc�e, qui copiera tous fichiers correspondant dans
le r�pertoire <filename
- role='directory'>install</filename>:</para>
+ class='directory'>install</filename>:</para>
<screen>&prompt.root; <userinput>/oracle/<replaceable>SID</replaceable>/sapreorg/KERNEL/UNIX/INSTTOOL.SH</userinput></screen>
@@ -2447,7 +2447,7 @@ options SEMUME=100 #number of UNDO keys</programlisting>
IDES, on doit donc copier le fichier
<filename>CENTRDB.R3S</filename> correspondant du
r�pertoire <filename
- role='directory'>EXPORT1</filename>, sinon
+ class='directory'>EXPORT1</filename>, sinon
<command>R3SETUP</command> ne demandera que trois CDs
EXPORT.</para>
@@ -2958,7 +2958,7 @@ options SEMUME=100 #number of UNDO keys</programlisting>
avez produite à partir du r�pertoire
d'installation sur un syst�me Linux, et
d�sarchivez-la dans le r�pertoire <filename
- role='directory'>/oracle/<replaceable>SID</replaceable>/817_32/</filename>.</para>
+ class='directory'>/oracle/<replaceable>SID</replaceable>/817_32/</filename>.</para>
</sect2>
<sect2 id="continuewithsapr4installation">
@@ -3713,7 +3713,7 @@ drwxrwxr-x 11 idsadm sapsys 512 May 4 14:20 trans</screen>
consultez les fichiers journaux correspondants qui peuvent
�tre trouv�s dans le r�pertoire
<filename
- role='directory'>/usr/sap/<replaceable>SID</replaceable>/DVEBMGS<replaceable>nr</replaceable>/work/</filename>.
+ class='directory'>/usr/sap/<replaceable>SID</replaceable>/DVEBMGS<replaceable>nr</replaceable>/work/</filename>.
Les fichiers à consulter sont
<filename>dev_ms</filename> et
<filename>dev_disp</filename>.</para>
@@ -3865,11 +3865,11 @@ options SHMMAXPGS=393216
<literal>unionfs</literal>!) de montage des syst�mes de
fichiers. Tout d'abord, une tentative est faite pour
rechercher le fichier dans le r�pertoire <filename
- role='directory'>/compat/linux/<replaceable>chemin-origine</replaceable></filename>,
+ class='directory'>/compat/linux/<replaceable>chemin-origine</replaceable></filename>,
<emphasis>puis</emphasis> uniquement si cela �choue, la
recherche est effectu�e dans le r�pertoire
<filename
- role='directory'>/<replaceable>chemin-origine</replaceable></filename>.
+ class='directory'>/<replaceable>chemin-origine</replaceable></filename>.
Cela permet de s'assurer que les binaires n�cessitant
d'autres binaires puissent s'ex�cuter (par exemple,
l'ensemble des outils Linux peuvent tourner sous l'ABI Linux).
@@ -3877,7 +3877,7 @@ options SHMMAXPGS=393216
charger et ex�cuter les binaires &os;, s'il n'y a pas
de binaires Linux correspondant pr�sents, et vous
pourriez placer une commande &man.uname.1; dans l'arborescence
- <filename role='directory'>/compat/linux</filename> pour vous
+ <filename class='directory'>/compat/linux</filename> pour vous
assurer que les binaires Linux ne puissent pas dire qu'ils ne
tournent pas sous Linux.</para>
From 1ed4fc6cb74053d8fc57492b01a18c32fb2a2b81 Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Thu, 4 Apr 2013 12:11:43 +0000
Subject: [PATCH 099/121] - Backport some constraints from DocBook 5.0; this
will help keeping things consistent and facilitate a future technology
upgrade
---
share/xml/freebsd.sch | 169 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 169 insertions(+)
diff --git a/share/xml/freebsd.sch b/share/xml/freebsd.sch
index b7978bf8fe..5c5cd0075a 100644
--- a/share/xml/freebsd.sch
+++ b/share/xml/freebsd.sch
@@ -38,4 +38,173 @@
<assert test="(. = 'freebsd8') or (. = 'freebsd9') or (. = 'freebsd10')">Invalid os value (<xsl:value-of select="."/>); must be either 'freebsd8', 'freebsd9' or 'freebsd10'.</assert>
</rule>
</pattern>
+
+<!--
+ Backported constraints from DocBook 5.0
+-->
+
+ <pattern name="Glossary 'firstterm' type constraint">
+ <rule context="firstterm[@linkend]">
+ <assert test="name(//*[@id=current()/@linkend]) = 'glossentry'">@linkend on firstterm must point to a glossentry.</assert>
+ </rule>
+ </pattern>
+
+ <pattern name="Footnote reference type constraint">
+ <rule context="footnoteref">
+ <assert test="name(//*[@id=current()/@linkend]) = 'footnote'">@linkend on footnoteref must point to a footnote.</assert>
+ </rule>
+ </pattern>
+
+ <pattern name="Glossary 'glossterm' type constraint">
+ <rule context="glossterm[@linkend]">
+ <assert test="name(//*[@id=current()/@linkend]) = 'glossentry'">@linkend on glossterm must point to a glossentry.</assert>
+ </rule>
+ </pattern>
+
+ <pattern name="Synopsis fragment type constraint">
+ <rule context="synopfragmentref">
+ <assert test="name(//*[@id=current()/@linkend]) = 'synopfragment'">@linkend on synopfragmentref must point to a synopfragment.</assert>
+ </rule>
+ </pattern>
+
+ <pattern name="Glosssary 'see' type constraint">
+ <rule context="glosssee[@otherterm]">
+ <assert test="name(//*[@id=current()/@otherterm]) = 'glossentry'">@otherterm on glosssee must point to a glossentry.</assert>
+ </rule>
+ </pattern>
+
+ <pattern name="Glossary 'seealso' type constraint">
+ <rule context="glossseealso[@otherterm]">
+ <assert test="name(//*[@id=current()/@otherterm]) = 'glossentry'">@otherterm on glossseealso must point to a glossentry.</assert>
+ </rule>
+ </pattern>
+
+ <pattern name="Glossary term definition constraint">
+ <rule context="termdef">
+ <assert test="count(firstterm) = 1">A termdef must contain exactly one firstterm</assert>
+ </rule>
+ </pattern>
+
+ <pattern name="Cardinality of segments and titles">
+ <rule context="seglistitem">
+ <assert test="count(seg) = count(../segtitle)">The number of seg elements must be the same as the number of segtitle elements in the parent segmentedlist</assert>
+ </rule>
+ </pattern>
+
+ <pattern name="Element exclusion">
+ <rule context="annotation">
+ <assert test="not(.//annotation)">annotation must not occur in the descendants of annotation</assert>
+ </rule>
+ <rule context="caution">
+ <assert test="not(.//caution)">caution must not occur in the descendants of caution</assert>
+ <assert test="not(.//important)">important must not occur in the descendants of caution</assert>
+ <assert test="not(.//note)">note must not occur in the descendants of caution</assert>
+ <assert test="not(.//tip)">tip must not occur in the descendants of caution</assert>
+ <assert test="not(.//warning)">warning must not occur in the descendants of caution</assert>
+ </rule>
+ <rule context="important">
+ <assert test="not(.//caution)">caution must not occur in the descendants of important</assert>
+ <assert test="not(.//important)">important must not occur in the descendants of important</assert>
+ <assert test="not(.//note)">note must not occur in the descendants of important</assert>
+ <assert test="not(.//tip)">tip must not occur in the descendants of important</assert>
+ <assert test="not(.//warning)">warning must not occur in the descendants of important</assert>
+ </rule>
+ <rule context="note">
+ <assert test="not(.//caution)">caution must not occur in the descendants of note</assert>
+ <assert test="not(.//important)">important must not occur in the descendants of note</assert>
+ <assert test="not(.//note)">note must not occur in the descendants of note</assert>
+ <assert test="not(.//tip)">tip must not occur in the descendants of note</assert>
+ <assert test="not(.//warning)">warning must not occur in the descendants of note</assert>
+ </rule>
+ <rule context="tip">
+ <assert test="not(.//caution)">caution must not occur in the descendants of tip</assert>
+ <assert test="not(.//important)">important must not occur in the descendants of tip</assert>
+ <assert test="not(.//note)">note must not occur in the descendants of tip</assert>
+ <assert test="not(.//tip)">tip must not occur in the descendants of tip</assert>
+ <assert test="not(.//warning)">warning must not occur in the descendants of tip</assert>
+ </rule>
+ <rule context="warning">
+ <assert test="not(.//caution)">caution must not occur in the descendants of warning</assert>
+ <assert test="not(.//important)">important must not occur in the descendants of warning</assert>
+ <assert test="not(.//note)">note must not occur in the descendants of warning</assert>
+ <assert test="not(.//tip)">tip must not occur in the descendants of warning</assert>
+ <assert test="not(.//warning)">warning must not occur in the descendants of warning</assert>
+ </rule>
+ <rule context="caption">
+ <assert test="not(.//caution)">caution must not occur in the descendants of caption</assert>
+ <assert test="not(.//equation)">equation must not occur in the descendants of caption</assert>
+ <assert test="not(.//example)">example must not occur in the descendants of caption</assert>
+ <assert test="not(.//figure)">figure must not occur in the descendants of caption</assert>
+ <assert test="not(.//important)">important must not occur in the descendants of caption</assert>
+ <assert test="not(.//note)">note must not occur in the descendants of caption</assert>
+ <assert test="not(.//sidebar)">sidebar must not occur in the descendants of caption</assert>
+ <assert test="not(.//table)">table must not occur in the descendants of caption</assert>
+ <assert test="not(.//task)">task must not occur in the descendants of caption</assert>
+ <assert test="not(.//tip)">tip must not occur in the descendants of caption</assert>
+ <assert test="not(.//warning)">warning must not occur in the descendants of caption</assert>
+ </rule>
+ <rule context="equation">
+ <assert test="not(.//caution)">caution must not occur in the descendants of equation</assert>
+ <assert test="not(.//equation)">equation must not occur in the descendants of equation</assert>
+ <assert test="not(.//example)">example must not occur in the descendants of equation</assert>
+ <assert test="not(.//figure)">figure must not occur in the descendants of equation</assert>
+ <assert test="not(.//important)">important must not occur in the descendants of equation</assert>
+ <assert test="not(.//note)">note must not occur in the descendants of equation</assert>
+ <assert test="not(.//table)">table must not occur in the descendants of equation</assert>
+ <assert test="not(.//tip)">tip must not occur in the descendants of equation</assert>
+ <assert test="not(.//warning)">warning must not occur in the descendants of equation</assert>
+ </rule>
+ <rule context="example">
+ <assert test="not(.//caution)">caution must not occur in the descendants of example</assert>
+ <assert test="not(.//equation)">equation must not occur in the descendants of example</assert>
+ <assert test="not(.//example)">example must not occur in the descendants of example</assert>
+ <assert test="not(.//figure)">figure must not occur in the descendants of example</assert>
+ <assert test="not(.//important)">important must not occur in the descendants of example</assert>
+ <assert test="not(.//note)">note must not occur in the descendants of example</assert>
+ <assert test="not(.//table)">table must not occur in the descendants of example</assert>
+ <assert test="not(.//tip)">tip must not occur in the descendants of example</assert>
+ <assert test="not(.//warning)">warning must not occur in the descendants of example</assert>
+ </rule>
+ <rule context="figure">
+ <assert test="not(.//caution)">caution must not occur in the descendants of figure</assert>
+ <assert test="not(.//equation)">equation must not occur in the descendants of figure</assert>
+ <assert test="not(.//example)">example must not occur in the descendants of figure</assert>
+ <assert test="not(.//figure)">figure must not occur in the descendants of figure</assert>
+ <assert test="not(.//important)">important must not occur in the descendants of figure</assert>
+ <assert test="not(.//note)">note must not occur in the descendants of figure</assert>
+ <assert test="not(.//table)">table must not occur in the descendants of figure</assert>
+ <assert test="not(.//tip)">tip must not occur in the descendants of figure</assert>
+ <assert test="not(.//warning)">warning must not occur in the descendants of figure</assert>
+ </rule>
+ <rule context="table">
+ <assert test="not(.//caution)">caution must not occur in the descendants of table</assert>
+ <assert test="not(.//equation)">equation must not occur in the descendants of table</assert>
+ <assert test="not(.//example)">example must not occur in the descendants of table</assert>
+ <assert test="not(.//figure)">figure must not occur in the descendants of table</assert>
+ <assert test="not(.//important)">important must not occur in the descendants of table</assert>
+ <assert test="not(.//informaltable)">informaltable must not occur in the descendants of table</assert>
+ <assert test="not(.//note)">note must not occur in the descendants of table</assert>
+ <assert test="not(.//tip)">tip must not occur in the descendants of table</assert>
+ <assert test="not(.//warning)">warning must not occur in the descendants of table</assert>
+ </rule>
+ <rule context="footnote">
+ <assert test="not(.//caution)">caution must not occur in the descendants of footnote</assert>
+ <assert test="not(.//epigraph)">epigraph must not occur in the descendants of footnote</assert>
+ <assert test="not(.//equation)">equation must not occur in the descendants of footnote</assert>
+ <assert test="not(.//example)">example must not occur in the descendants of footnote</assert>
+ <assert test="not(.//figure)">figure must not occur in the descendants of footnote</assert>
+ <assert test="not(.//footnote)">footnote must not occur in the descendants of footnote</assert>
+ <assert test="not(.//important)">important must not occur in the descendants of footnote</assert>
+ <assert test="not(.//indexterm)">indexterm must not occur in the descendants of footnote</assert>
+ <assert test="not(.//note)">note must not occur in the descendants of footnote</assert>
+ <assert test="not(.//sidebar)">sidebar must not occur in the descendants of footnote</assert>
+ <assert test="not(.//table)">table must not occur in the descendants of footnote</assert>
+ <assert test="not(.//task)">task must not occur in the descendants of footnote</assert>
+ <assert test="not(.//tip)">tip must not occur in the descendants of footnote</assert>
+ <assert test="not(.//warning)">warning must not occur in the descendants of footnote</assert>
+ </rule>
+ <rule context="sidebar">
+ <assert test="not(.//sidebar)">sidebar must not occur in the descendants of sidebar</assert>
+ </rule>
+ </pattern>
</schema>
From d518220b5898c12cff1bd74e93538c8b3ba48021 Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Fri, 5 Apr 2013 13:11:11 +0000
Subject: [PATCH 100/121] - Use more human-friendly pubdate and releaseinfo
renderings - Merge copyright years into intervals - Try to produce cleaner
XHTML
---
en_US.ISO8859-1/books/handbook/book.xml | 2 +-
share/xsl/freebsd-common.xsl | 8 ++-
share/xsl/freebsd-xhtml-common.xsl | 49 +++++++++++--
share/xsl/freebsd-xhtml-titlepage.xsl | 96 ++++++++++++++++---------
share/xsl/titlepage.templates.xml | 64 ++++++++---------
5 files changed, 149 insertions(+), 70 deletions(-)
diff --git a/en_US.ISO8859-1/books/handbook/book.xml b/en_US.ISO8859-1/books/handbook/book.xml
index ff17092fe3..31559d5a4a 100644
--- a/en_US.ISO8859-1/books/handbook/book.xml
+++ b/en_US.ISO8859-1/books/handbook/book.xml
@@ -19,7 +19,7 @@
<corpauthor>The FreeBSD Documentation Project</corpauthor>
- <pubdate>February 1999</pubdate>
+ <pubdate>$FreeBSD$</pubdate>
<releaseinfo>$FreeBSD$</releaseinfo>
diff --git a/share/xsl/freebsd-common.xsl b/share/xsl/freebsd-common.xsl
index e98abb2e70..5fb46c8491 100644
--- a/share/xsl/freebsd-common.xsl
+++ b/share/xsl/freebsd-common.xsl
@@ -12,7 +12,13 @@
<xsl:call-template name="inline.monoseq"/>
</xsl:template>
- <xsl:template match="pubdate"/>
+ <xsl:template name="svnweb.link">
+ <xsl:param name="repo" select="'base'"/>
+ <xsl:param name="rev"/>
+
+ <xsl:value-of select="concat('http://svnweb.freebsd.org/', $repo,
+ '?view=revision&revision=', $rev)"/>
+ </xsl:template>
<xsl:param name="toc.section.depth" select="1"/>
<xsl:param name="section.autolabel" select="1"/>
diff --git a/share/xsl/freebsd-xhtml-common.xsl b/share/xsl/freebsd-xhtml-common.xsl
index 48b034a034..d1261946bb 100644
--- a/share/xsl/freebsd-xhtml-common.xsl
+++ b/share/xsl/freebsd-xhtml-common.xsl
@@ -5,6 +5,8 @@
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
version='1.0'
xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ xmlns:str="http://exslt.org/strings"
+ extension-element-prefixes="str"
exclude-result-prefixes="#default">
<!-- Include the common customizations -->
@@ -21,6 +23,11 @@
<xsl:param name="callout.graphics.path" select="'./imagelib/callouts/'"/>
<xsl:param name="citerefentry.link" select="1"/>
<xsl:param name="admon.style"/>
+ <xsl:param name="make.year.ranges" select="1"/>
+ <xsl:param name="make.single.year.ranges" select="1"/>
+
+ <xsl:param name="make.valid.html" select="1"/>
+ <xsl:param name="html.cleanup" select="1"/>
<xsl:template name="user.footer.navigation">
<p align="center"><small>This, and other documents, can be downloaded
@@ -32,19 +39,28 @@
For questions about this documentation, e-mail <<a href="mailto:doc@FreeBSD.org">doc@FreeBSD.org</a>>.</small></p>
</xsl:template>
- <xsl:template match="svnref">
+ <xsl:template name="svnref.genlink">
+ <xsl:param name="rev" select="."/>
+ <xsl:param name="repo" select="'base'"/>
+
<a>
<xsl:attribute name="href">
- <xsl:text>http://svnweb.freebsd.org/base?view=revision&revision=</xsl:text>
- <xsl:value-of select="."/>
+ <xsl:call-template name="svnweb.link">
+ <xsl:with-param name="repo" select="$repo"/>
+ <xsl:with-param name="rev" select="$rev"/>
+ </xsl:call-template>
</xsl:attribute>
<span class="svnref">
- <xsl:value-of select="."/>
+ <xsl:value-of select="$rev"/>
</span>
</a>
</xsl:template>
+ <xsl:template match="svnref">
+ <xsl:call-template name="svnref.genlink"/>
+ </xsl:template>
+
<xsl:template name="generate.citerefentry.link">
<xsl:text>http://www.FreeBSD.org/cgi/man.cgi?query=</xsl:text>
<xsl:value-of select="refentrytitle"/>
@@ -131,4 +147,29 @@
<xsl:template name="section.author">
<xsl:call-template name="freebsd.author"/>
</xsl:template>
+
+ <xsl:template name="titlepage.releaseinfo">
+ <xsl:variable name="rev" select="str:split(., ' ')[3]"/>
+
+ Current Revision:
+ <xsl:call-template name="svnref.genlink">
+ <xsl:with-param name="repo" select="'doc'"/>
+ <xsl:with-param name="rev" select="$rev"/>
+ </xsl:call-template>
+ </xsl:template>
+
+ <xsl:template name="titlepage.pubdate">
+ <xsl:variable name="pubdate">
+ <xsl:choose>
+ <xsl:when test="contains(., '$FreeBSD')">
+ <xsl:value-of select="str:split(., ' ')[4]"/> by <xsl:value-of select="str:split(., ' ')[6]"/>
+ </xsl:when>
+
+ <xsl:otherwise>
+ <xsl:value-of select="."/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+ Last modified on <xsl:value-of select="$pubdate"/>.
+ </xsl:template>
</xsl:stylesheet>
diff --git a/share/xsl/freebsd-xhtml-titlepage.xsl b/share/xsl/freebsd-xhtml-titlepage.xsl
index fb54a93c6a..9b8446a50e 100644
--- a/share/xsl/freebsd-xhtml-titlepage.xsl
+++ b/share/xsl/freebsd-xhtml-titlepage.xsl
@@ -168,7 +168,8 @@
<xsl:template match="releaseinfo" mode="article.titlepage.recto.auto.mode">
<div xsl:use-attribute-sets="article.titlepage.recto.style">
-<xsl:apply-templates select="." mode="article.titlepage.recto.mode"/>
+<xsl:call-template name="titlepage.releaseinfo">
+</xsl:call-template>
</div>
</xsl:template>
@@ -186,7 +187,8 @@
<xsl:template match="pubdate" mode="article.titlepage.recto.auto.mode">
<div xsl:use-attribute-sets="article.titlepage.recto.style">
-<xsl:apply-templates select="." mode="article.titlepage.recto.mode"/>
+<xsl:call-template name="titlepage.pubdate">
+</xsl:call-template>
</div>
</xsl:template>
@@ -355,7 +357,8 @@
<xsl:template match="releaseinfo" mode="set.titlepage.recto.auto.mode">
<div xsl:use-attribute-sets="set.titlepage.recto.style">
-<xsl:apply-templates select="." mode="set.titlepage.recto.mode"/>
+<xsl:call-template name="titlepage.releaseinfo">
+</xsl:call-template>
</div>
</xsl:template>
@@ -373,7 +376,8 @@
<xsl:template match="pubdate" mode="set.titlepage.recto.auto.mode">
<div xsl:use-attribute-sets="set.titlepage.recto.style">
-<xsl:apply-templates select="." mode="set.titlepage.recto.mode"/>
+<xsl:call-template name="titlepage.pubdate">
+</xsl:call-template>
</div>
</xsl:template>
@@ -542,7 +546,8 @@
<xsl:template match="releaseinfo" mode="book.titlepage.recto.auto.mode">
<div xsl:use-attribute-sets="book.titlepage.recto.style">
-<xsl:apply-templates select="." mode="book.titlepage.recto.mode"/>
+<xsl:call-template name="titlepage.releaseinfo">
+</xsl:call-template>
</div>
</xsl:template>
@@ -560,7 +565,8 @@
<xsl:template match="pubdate" mode="book.titlepage.recto.auto.mode">
<div xsl:use-attribute-sets="book.titlepage.recto.style">
-<xsl:apply-templates select="." mode="book.titlepage.recto.mode"/>
+<xsl:call-template name="titlepage.pubdate">
+</xsl:call-template>
</div>
</xsl:template>
@@ -729,7 +735,8 @@
<xsl:template match="releaseinfo" mode="part.titlepage.recto.auto.mode">
<div xsl:use-attribute-sets="part.titlepage.recto.style">
-<xsl:apply-templates select="." mode="part.titlepage.recto.mode"/>
+<xsl:call-template name="titlepage.releaseinfo">
+</xsl:call-template>
</div>
</xsl:template>
@@ -747,7 +754,8 @@
<xsl:template match="pubdate" mode="part.titlepage.recto.auto.mode">
<div xsl:use-attribute-sets="part.titlepage.recto.style">
-<xsl:apply-templates select="." mode="part.titlepage.recto.mode"/>
+<xsl:call-template name="titlepage.pubdate">
+</xsl:call-template>
</div>
</xsl:template>
@@ -933,7 +941,8 @@
<xsl:template match="releaseinfo" mode="partintro.titlepage.recto.auto.mode">
<div xsl:use-attribute-sets="partintro.titlepage.recto.style">
-<xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/>
+<xsl:call-template name="titlepage.releaseinfo">
+</xsl:call-template>
</div>
</xsl:template>
@@ -951,7 +960,8 @@
<xsl:template match="pubdate" mode="partintro.titlepage.recto.auto.mode">
<div xsl:use-attribute-sets="partintro.titlepage.recto.style">
-<xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/>
+<xsl:call-template name="titlepage.pubdate">
+</xsl:call-template>
</div>
</xsl:template>
@@ -1137,7 +1147,8 @@
<xsl:template match="releaseinfo" mode="reference.titlepage.recto.auto.mode">
<div xsl:use-attribute-sets="reference.titlepage.recto.style">
-<xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/>
+<xsl:call-template name="titlepage.releaseinfo">
+</xsl:call-template>
</div>
</xsl:template>
@@ -1155,7 +1166,8 @@
<xsl:template match="pubdate" mode="reference.titlepage.recto.auto.mode">
<div xsl:use-attribute-sets="reference.titlepage.recto.style">
-<xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/>
+<xsl:call-template name="titlepage.pubdate">
+</xsl:call-template>
</div>
</xsl:template>
@@ -1580,7 +1592,8 @@
<xsl:template match="releaseinfo" mode="preface.titlepage.recto.auto.mode">
<div xsl:use-attribute-sets="preface.titlepage.recto.style">
-<xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/>
+<xsl:call-template name="titlepage.releaseinfo">
+</xsl:call-template>
</div>
</xsl:template>
@@ -1598,7 +1611,8 @@
<xsl:template match="pubdate" mode="preface.titlepage.recto.auto.mode">
<div xsl:use-attribute-sets="preface.titlepage.recto.style">
-<xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/>
+<xsl:call-template name="titlepage.pubdate">
+</xsl:call-template>
</div>
</xsl:template>
@@ -1786,7 +1800,8 @@
<xsl:template match="releaseinfo" mode="chapter.titlepage.recto.auto.mode">
<div xsl:use-attribute-sets="chapter.titlepage.recto.style">
-<xsl:apply-templates select="." mode="chapter.titlepage.recto.mode"/>
+<xsl:call-template name="titlepage.releaseinfo">
+</xsl:call-template>
</div>
</xsl:template>
@@ -1804,7 +1819,8 @@
<xsl:template match="pubdate" mode="chapter.titlepage.recto.auto.mode">
<div xsl:use-attribute-sets="chapter.titlepage.recto.style">
-<xsl:apply-templates select="." mode="chapter.titlepage.recto.mode"/>
+<xsl:call-template name="titlepage.pubdate">
+</xsl:call-template>
</div>
</xsl:template>
@@ -1990,7 +2006,8 @@
<xsl:template match="releaseinfo" mode="appendix.titlepage.recto.auto.mode">
<div xsl:use-attribute-sets="appendix.titlepage.recto.style">
-<xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/>
+<xsl:call-template name="titlepage.releaseinfo">
+</xsl:call-template>
</div>
</xsl:template>
@@ -2008,7 +2025,8 @@
<xsl:template match="pubdate" mode="appendix.titlepage.recto.auto.mode">
<div xsl:use-attribute-sets="appendix.titlepage.recto.style">
-<xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/>
+<xsl:call-template name="titlepage.pubdate">
+</xsl:call-template>
</div>
</xsl:template>
@@ -2179,7 +2197,8 @@
<xsl:template match="releaseinfo" mode="section.titlepage.recto.auto.mode">
<div xsl:use-attribute-sets="section.titlepage.recto.style">
-<xsl:apply-templates select="." mode="section.titlepage.recto.mode"/>
+<xsl:call-template name="titlepage.releaseinfo">
+</xsl:call-template>
</div>
</xsl:template>
@@ -2197,7 +2216,8 @@
<xsl:template match="pubdate" mode="section.titlepage.recto.auto.mode">
<div xsl:use-attribute-sets="section.titlepage.recto.style">
-<xsl:apply-templates select="." mode="section.titlepage.recto.mode"/>
+<xsl:call-template name="titlepage.pubdate">
+</xsl:call-template>
</div>
</xsl:template>
@@ -2368,7 +2388,8 @@
<xsl:template match="releaseinfo" mode="sect1.titlepage.recto.auto.mode">
<div xsl:use-attribute-sets="sect1.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/>
+<xsl:call-template name="titlepage.releaseinfo">
+</xsl:call-template>
</div>
</xsl:template>
@@ -2386,7 +2407,8 @@
<xsl:template match="pubdate" mode="sect1.titlepage.recto.auto.mode">
<div xsl:use-attribute-sets="sect1.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/>
+<xsl:call-template name="titlepage.pubdate">
+</xsl:call-template>
</div>
</xsl:template>
@@ -2557,7 +2579,8 @@
<xsl:template match="releaseinfo" mode="sect2.titlepage.recto.auto.mode">
<div xsl:use-attribute-sets="sect2.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/>
+<xsl:call-template name="titlepage.releaseinfo">
+</xsl:call-template>
</div>
</xsl:template>
@@ -2575,7 +2598,8 @@
<xsl:template match="pubdate" mode="sect2.titlepage.recto.auto.mode">
<div xsl:use-attribute-sets="sect2.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/>
+<xsl:call-template name="titlepage.pubdate">
+</xsl:call-template>
</div>
</xsl:template>
@@ -2746,7 +2770,8 @@
<xsl:template match="releaseinfo" mode="sect3.titlepage.recto.auto.mode">
<div xsl:use-attribute-sets="sect3.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/>
+<xsl:call-template name="titlepage.releaseinfo">
+</xsl:call-template>
</div>
</xsl:template>
@@ -2764,7 +2789,8 @@
<xsl:template match="pubdate" mode="sect3.titlepage.recto.auto.mode">
<div xsl:use-attribute-sets="sect3.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/>
+<xsl:call-template name="titlepage.pubdate">
+</xsl:call-template>
</div>
</xsl:template>
@@ -2935,7 +2961,8 @@
<xsl:template match="releaseinfo" mode="sect4.titlepage.recto.auto.mode">
<div xsl:use-attribute-sets="sect4.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/>
+<xsl:call-template name="titlepage.releaseinfo">
+</xsl:call-template>
</div>
</xsl:template>
@@ -2953,7 +2980,8 @@
<xsl:template match="pubdate" mode="sect4.titlepage.recto.auto.mode">
<div xsl:use-attribute-sets="sect4.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/>
+<xsl:call-template name="titlepage.pubdate">
+</xsl:call-template>
</div>
</xsl:template>
@@ -3124,7 +3152,8 @@
<xsl:template match="releaseinfo" mode="sect5.titlepage.recto.auto.mode">
<div xsl:use-attribute-sets="sect5.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/>
+<xsl:call-template name="titlepage.releaseinfo">
+</xsl:call-template>
</div>
</xsl:template>
@@ -3142,7 +3171,8 @@
<xsl:template match="pubdate" mode="sect5.titlepage.recto.auto.mode">
<div xsl:use-attribute-sets="sect5.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/>
+<xsl:call-template name="titlepage.pubdate">
+</xsl:call-template>
</div>
</xsl:template>
@@ -3330,7 +3360,8 @@
<xsl:template match="releaseinfo" mode="simplesect.titlepage.recto.auto.mode">
<div xsl:use-attribute-sets="simplesect.titlepage.recto.style">
-<xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/>
+<xsl:call-template name="titlepage.releaseinfo">
+</xsl:call-template>
</div>
</xsl:template>
@@ -3348,7 +3379,8 @@
<xsl:template match="pubdate" mode="simplesect.titlepage.recto.auto.mode">
<div xsl:use-attribute-sets="simplesect.titlepage.recto.style">
-<xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/>
+<xsl:call-template name="titlepage.pubdate">
+</xsl:call-template>
</div>
</xsl:template>
diff --git a/share/xsl/titlepage.templates.xml b/share/xsl/titlepage.templates.xml
index f1f05644f3..af592b0552 100644
--- a/share/xsl/titlepage.templates.xml
+++ b/share/xsl/titlepage.templates.xml
@@ -22,10 +22,10 @@
<authorgroup/>
<author/>
<othercredit/>
- <releaseinfo/>
+ <releaseinfo t:named-template="titlepage.releaseinfo"/>
<copyright/>
<legalnotice/>
- <pubdate/>
+ <pubdate t:named-template="titlepage.pubdate"/>
<revision/>
<revhistory/>
<abstract/>
@@ -55,10 +55,10 @@
<authorgroup/>
<author/>
<othercredit/>
- <releaseinfo/>
+ <releaseinfo t:named-template="titlepage.releaseinfo"/>
<copyright/>
<legalnotice/>
- <pubdate/>
+ <pubdate t:named-template="titlepage.pubdate"/>
<revision/>
<revhistory/>
<abstract/>
@@ -88,10 +88,10 @@
<authorgroup/>
<author/>
<othercredit/>
- <releaseinfo/>
+ <releaseinfo t:named-template="titlepage.releaseinfo"/>
<copyright/>
<legalnotice/>
- <pubdate/>
+ <pubdate t:named-template="titlepage.pubdate"/>
<revision/>
<revhistory/>
<abstract/>
@@ -124,10 +124,10 @@
<authorgroup/>
<author/>
<othercredit/>
- <releaseinfo/>
+ <releaseinfo t:named-template="titlepage.releaseinfo"/>
<copyright/>
<legalnotice/>
- <pubdate/>
+ <pubdate t:named-template="titlepage.pubdate"/>
<revision/>
<revhistory/>
<abstract/>
@@ -154,10 +154,10 @@
<authorgroup/>
<author/>
<othercredit/>
- <releaseinfo/>
+ <releaseinfo t:named-template="titlepage.releaseinfo"/>
<copyright/>
<legalnotice/>
- <pubdate/>
+ <pubdate t:named-template="titlepage.pubdate"/>
<revision/>
<revhistory/>
<abstract/>
@@ -186,10 +186,10 @@
<authorgroup/>
<author/>
<othercredit/>
- <releaseinfo/>
+ <releaseinfo t:named-template="titlepage.releaseinfo"/>
<copyright/>
<legalnotice/>
- <pubdate/>
+ <pubdate t:named-template="titlepage.pubdate"/>
<revision/>
<revhistory/>
<abstract/>
@@ -290,10 +290,10 @@
<authorgroup/>
<author/>
<othercredit/>
- <releaseinfo/>
+ <releaseinfo t:named-template="titlepage.releaseinfo"/>
<copyright/>
<legalnotice/>
- <pubdate/>
+ <pubdate t:named-template="titlepage.pubdate"/>
<revision/>
<revhistory/>
<abstract/>
@@ -322,10 +322,10 @@
<authorgroup t:named-template="chapter.authorgroup"/>
<author t:named-template="chapter.author"/>
<othercredit/>
- <releaseinfo/>
+ <releaseinfo t:named-template="titlepage.releaseinfo"/>
<copyright/>
<legalnotice/>
- <pubdate/>
+ <pubdate t:named-template="titlepage.pubdate"/>
<revision/>
<revhistory/>
<abstract/>
@@ -354,10 +354,10 @@
<authorgroup/>
<author/>
<othercredit/>
- <releaseinfo/>
+ <releaseinfo t:named-template="titlepage.releaseinfo"/>
<copyright/>
<legalnotice/>
- <pubdate/>
+ <pubdate t:named-template="titlepage.pubdate"/>
<revision/>
<revhistory/>
<abstract/>
@@ -386,10 +386,10 @@
<authorgroup t:named-template="section.authorgroup"/>
<author t:named-template="section.author"/>
<othercredit/>
- <releaseinfo/>
+ <releaseinfo t:named-template="titlepage.releaseinfo"/>
<copyright/>
<legalnotice/>
- <pubdate/>
+ <pubdate t:named-template="titlepage.pubdate"/>
<revision/>
<revhistory/>
<abstract/>
@@ -417,10 +417,10 @@
<authorgroup t:named-template="section.authorgroup"/>
<author t:named-template="section.author"/>
<othercredit/>
- <releaseinfo/>
+ <releaseinfo t:named-template="titlepage.releaseinfo"/>
<copyright/>
<legalnotice/>
- <pubdate/>
+ <pubdate t:named-template="titlepage.pubdate"/>
<revision/>
<revhistory/>
<abstract/>
@@ -448,10 +448,10 @@
<authorgroup t:named-template="section.authorgroup"/>
<author t:named-template="section.author"/>
<othercredit/>
- <releaseinfo/>
+ <releaseinfo t:named-template="titlepage.releaseinfo"/>
<copyright/>
<legalnotice/>
- <pubdate/>
+ <pubdate t:named-template="titlepage.pubdate"/>
<revision/>
<revhistory/>
<abstract/>
@@ -479,10 +479,10 @@
<authorgroup t:named-template="section.authorgroup"/>
<author t:named-template="section.author"/>
<othercredit/>
- <releaseinfo/>
+ <releaseinfo t:named-template="titlepage.releaseinfo"/>
<copyright/>
<legalnotice/>
- <pubdate/>
+ <pubdate t:named-template="titlepage.pubdate"/>
<revision/>
<revhistory/>
<abstract/>
@@ -510,10 +510,10 @@
<authorgroup t:named-template="section.authorgroup"/>
<author t:named-template="section.author"/>
<othercredit/>
- <releaseinfo/>
+ <releaseinfo t:named-template="titlepage.releaseinfo"/>
<copyright/>
<legalnotice/>
- <pubdate/>
+ <pubdate t:named-template="titlepage.pubdate"/>
<revision/>
<revhistory/>
<abstract/>
@@ -541,10 +541,10 @@
<authorgroup t:named-template="section.authorgroup"/>
<author t:named-template="section.author"/>
<othercredit/>
- <releaseinfo/>
+ <releaseinfo t:named-template="titlepage.releaseinfo"/>
<copyright/>
<legalnotice/>
- <pubdate/>
+ <pubdate t:named-template="titlepage.pubdate"/>
<revision/>
<revhistory/>
<abstract/>
@@ -572,10 +572,10 @@
<authorgroup t:named-template="section.authorgroup"/>
<author t:named-template="section.author"/>
<othercredit/>
- <releaseinfo/>
+ <releaseinfo t:named-template="titlepage.releaseinfo"/>
<copyright/>
<legalnotice/>
- <pubdate/>
+ <pubdate t:named-template="titlepage.pubdate"/>
<revision/>
<revhistory/>
<abstract/>
From 61d924c5e2580ad44aaa17bc83bf4a752f886303 Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Fri, 5 Apr 2013 20:14:52 +0000
Subject: [PATCH 101/121] - Better support I18N
---
share/xsl/freebsd-xhtml-common.xsl | 42 +++++++++++++++++++++++++++---
1 file changed, 39 insertions(+), 3 deletions(-)
diff --git a/share/xsl/freebsd-xhtml-common.xsl b/share/xsl/freebsd-xhtml-common.xsl
index d1261946bb..6009a3a022 100644
--- a/share/xsl/freebsd-xhtml-common.xsl
+++ b/share/xsl/freebsd-xhtml-common.xsl
@@ -29,6 +29,14 @@
<xsl:param name="make.valid.html" select="1"/>
<xsl:param name="html.cleanup" select="1"/>
+ <xsl:param name="local.l10n.xml" select="document('')"/>
+ <i18n xmlns="http://docbook.sourceforge.net/xmlns/l10n/1.0">
+ <l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="en">
+ <l:gentext key="Lastmodified" text="Last modified"/>
+ <l:gentext key="on" text="on"/>
+ </l:l10n>
+ </i18n>
+
<xsl:template name="user.footer.navigation">
<p align="center"><small>This, and other documents, can be downloaded
from <a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/">ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/</a></small></p>
@@ -151,7 +159,11 @@
<xsl:template name="titlepage.releaseinfo">
<xsl:variable name="rev" select="str:split(., ' ')[3]"/>
- Current Revision:
+ <xsl:call-template name="gentext">
+ <xsl:with-param name="key" select="'Revision'"/>
+ </xsl:call-template>
+ <xsl:text>:</xsl:text>
+ <xsl:call-template name="gentext.space"/>
<xsl:call-template name="svnref.genlink">
<xsl:with-param name="repo" select="'doc'"/>
<xsl:with-param name="rev" select="$rev"/>
@@ -162,7 +174,7 @@
<xsl:variable name="pubdate">
<xsl:choose>
<xsl:when test="contains(., '$FreeBSD')">
- <xsl:value-of select="str:split(., ' ')[4]"/> by <xsl:value-of select="str:split(., ' ')[6]"/>
+ <xsl:value-of select="str:split(., ' ')[4]"/>
</xsl:when>
<xsl:otherwise>
@@ -170,6 +182,30 @@
</xsl:otherwise>
</xsl:choose>
</xsl:variable>
- Last modified on <xsl:value-of select="$pubdate"/>.
+
+ <xsl:variable name="committer">
+ <xsl:if test="contains(., '$FreeBSD')">
+ <xsl:value-of select="str:split(., ' ')[6]"/>
+ </xsl:if>
+ </xsl:variable>
+
+ <xsl:call-template name="gentext">
+ <xsl:with-param name="key" select="'Lastmodified'"/>
+ </xsl:call-template>
+ <xsl:call-template name="gentext.space"/>
+ <xsl:call-template name="gentext">
+ <xsl:with-param name="key" select="'on'"/>
+ </xsl:call-template>
+ <xsl:call-template name="gentext.space"/>
+ Last modified on <xsl:value-of select="$pubdate"/>
+ <xsl:if test="$committer">
+ <xsl:call-template name="gentext.space"/>
+ <xsl:value-of select="$committer"/>
+ <xsl:call-template name="gentext.space"/>
+ <xsl:call-template name="gentext">
+ <xsl:with-param name="key" select="'by'"/>
+ </xsl:call-template>
+ </xsl:if>
+ <xsl:text>.</xsl:text>
</xsl:template>
</xsl:stylesheet>
From c6fd9b9e1c815b15740da7ae766f1c7f55bf2ddd Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Sat, 6 Apr 2013 16:40:32 +0000
Subject: [PATCH 102/121] - Make bridgehead actually render as specified in the
renderas attribute
---
share/xsl/freebsd-xhtml-common.xsl | 66 ++++++++++++++++++++++++++++++
1 file changed, 66 insertions(+)
diff --git a/share/xsl/freebsd-xhtml-common.xsl b/share/xsl/freebsd-xhtml-common.xsl
index 6009a3a022..047236968c 100644
--- a/share/xsl/freebsd-xhtml-common.xsl
+++ b/share/xsl/freebsd-xhtml-common.xsl
@@ -47,6 +47,72 @@
For questions about this documentation, e-mail <<a href="mailto:doc@FreeBSD.org">doc@FreeBSD.org</a>>.</small></p>
</xsl:template>
+ <!-- Add title class to emitted hX -->
+ <xsl:template match="bridgehead">
+ <xsl:variable name="container" select="(ancestor::appendix|ancestor::article|ancestor::bibliography|
+ ancestor::chapter|ancestor::glossary|ancestor::glossdiv|ancestor::index|ancestor::partintro|
+ ancestor::preface|ancestor::refsect1|ancestor::refsect2|ancestor::refsect3|ancestor::sect1|
+ ancestor::sect2|ancestor::sect3|ancestor::sect4|ancestor::sect5|ancestor::section|ancestor::setindex|
+ ancestor::simplesect)[last()]"/>
+
+ <xsl:variable name="clevel">
+ <xsl:choose>
+ <xsl:when test="local-name($container) = 'appendix'
+ or local-name($container) = 'chapter'
+ or local-name($container) = 'article'
+ or local-name($container) = 'bibliography'
+ or local-name($container) = 'glossary'
+ or local-name($container) = 'index'
+ or local-name($container) = 'partintro'
+ or local-name($container) = 'preface'
+ or local-name($container) = 'setindex'">1</xsl:when>
+ <xsl:when test="local-name($container) = 'glossdiv'">
+ <xsl:value-of select="count(ancestor::glossdiv)+1"/>
+ </xsl:when>
+ <xsl:when test="local-name($container) = 'sect1'
+ or local-name($container) = 'sect2'
+ or local-name($container) = 'sect3'
+ or local-name($container) = 'sect4'
+ or local-name($container) = 'sect5'
+ or local-name($container) = 'refsect1'
+ or local-name($container) = 'refsect2'
+ or local-name($container) = 'refsect3'
+ or local-name($container) = 'section'
+ or local-name($container) = 'simplesect'">
+ <xsl:variable name="slevel">
+ <xsl:call-template name="section.level">
+ <xsl:with-param name="node" select="$container"/>
+ </xsl:call-template>
+ </xsl:variable>
+ <xsl:value-of select="$slevel + 1"/>
+ </xsl:when>
+ <xsl:otherwise>1</xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+
+ <!-- HTML H level is one higher than section level -->
+ <xsl:variable name="hlevel">
+ <xsl:choose>
+ <xsl:when test="@renderas = 'sect1'">2</xsl:when>
+ <xsl:when test="@renderas = 'sect2'">3</xsl:when>
+ <xsl:when test="@renderas = 'sect3'">4</xsl:when>
+ <xsl:when test="@renderas = 'sect4'">5</xsl:when>
+ <xsl:when test="@renderas = 'sect5'">6</xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="$clevel + 1"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+
+ <xsl:element name="h{$hlevel}" namespace="http://www.w3.org/1999/xhtml">
+ <xsl:attribute name="class">title</xsl:attribute>
+ <xsl:call-template name="anchor">
+ <xsl:with-param name="conditional" select="0"/>
+ </xsl:call-template>
+ <xsl:apply-templates/>
+ </xsl:element>
+ </xsl:template>
+
<xsl:template name="svnref.genlink">
<xsl:param name="rev" select="."/>
<xsl:param name="repo" select="'base'"/>
From e1acf87eadc0997e9f8518386d30c334bf37a577 Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Sat, 6 Apr 2013 16:41:29 +0000
Subject: [PATCH 103/121] - Render corpauthor in the same way as author - Use
more consistent styling for Table of Contents, and List of Foobar headers
---
share/misc/docbook.css | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/share/misc/docbook.css b/share/misc/docbook.css
index b4186ccebf..8b1701e809 100644
--- a/share/misc/docbook.css
+++ b/share/misc/docbook.css
@@ -72,7 +72,11 @@ div.procedure p b {
}
h1.title, h2.title, h3.title, h4.title, h5.title, h6.title,
-h3.author {
+h3.author, .corpauthor, .abstract p.title,
+div.toc p:first-child,
+div.list-of-figures p:first-child,
+div.list-of-tables p:first-child,
+div.list-of-examples p:first-child {
line-height: 1.3;
margin-left: 0;
color: #990000;
From 581bb4d8502a7544185c515d2ecde99f72558952 Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Thu, 11 Apr 2013 06:35:51 +0000
Subject: [PATCH 104/121] - Create cleaner XHTML and exclusively use CSS for
formatting
---
share/misc/docbook.css | 81 +++++++++++++++++++++++++++++-
share/xsl/freebsd-xhtml-common.xsl | 1 +
2 files changed, 80 insertions(+), 2 deletions(-)
diff --git a/share/misc/docbook.css b/share/misc/docbook.css
index 8b1701e809..e982575fbd 100644
--- a/share/misc/docbook.css
+++ b/share/misc/docbook.css
@@ -26,6 +26,79 @@
* $FreeBSD$
*/
+/*
+ * General DocBook styles from the DocBook XSL distribution
+ */
+
+.formalpara-title {
+ font-weight: bold;
+}
+
+div.blockquote-title {
+ font-weight: bold;
+ margin-top: 1em;
+ margin-bottom: 1em;
+}
+
+span.msgmain-title {
+ font-weight: bold;
+}
+
+span.msgsub-title {
+ font-weight: bold;
+}
+
+span.msgrel-title {
+ font-weight: bold;
+}
+
+div.msglevel, div.msgorig, div.msgaud {
+ margin-top: 1em;
+ margin-bottom: 1em;
+}
+
+span.msglevel-title, span.msgorig-title, span.msgaud-title {
+ font-weight: bold;
+}
+
+div.msgexplan {
+ margin-top: 1em;
+ margin-bottom: 1em;
+}
+
+span.msgexplan-title {
+ font-weight: bold;
+}
+
+div.figure-title {
+ font-weight: bold;
+}
+
+div.example-title {
+ font-weight: bold;
+}
+
+div.equation-title {
+ font-weight: bold;
+}
+
+div.table-title {
+ font-weight: bold;
+}
+
+div.sidebar-title {
+ font-weight: bold;
+}
+
+div.synopsis {
+ white-space: pre;
+ font-family: monospace;
+}
+
+/*
+ * FreeBSD-specific formatting
+ */
+
body address {
line-height: 1.3;
margin: .6em 0;
@@ -158,11 +231,15 @@ html {
text-decoration: underline;
}
-.screen {
+div.screen {
+ white-space: pre;
+ font-family: monospace;
padding: 1ex;
}
-.programlisting {
+div.programlisting {
+ white-space: pre;
+ font-family: monospace;
padding: 1ex;
background-color: #eee;
border: 1px solid #ccc;
diff --git a/share/xsl/freebsd-xhtml-common.xsl b/share/xsl/freebsd-xhtml-common.xsl
index 047236968c..d90ed92bb2 100644
--- a/share/xsl/freebsd-xhtml-common.xsl
+++ b/share/xsl/freebsd-xhtml-common.xsl
@@ -28,6 +28,7 @@
<xsl:param name="make.valid.html" select="1"/>
<xsl:param name="html.cleanup" select="1"/>
+ <xsl:param name="make.clean.html" select="1"/>
<xsl:param name="local.l10n.xml" select="document('')"/>
<i18n xmlns="http://docbook.sourceforge.net/xmlns/l10n/1.0">
From 1c039cc17e8a3ac6e90eb44b299e07785c46d4d8 Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Thu, 11 Apr 2013 09:29:52 +0000
Subject: [PATCH 105/121] - Fix rendering of titles in the toc, which contain a
man page reference
---
share/xsl/freebsd-xhtml-common.xsl | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/share/xsl/freebsd-xhtml-common.xsl b/share/xsl/freebsd-xhtml-common.xsl
index d90ed92bb2..320d64c447 100644
--- a/share/xsl/freebsd-xhtml-common.xsl
+++ b/share/xsl/freebsd-xhtml-common.xsl
@@ -48,6 +48,14 @@
For questions about this documentation, e-mail <<a href="mailto:doc@FreeBSD.org">doc@FreeBSD.org</a>>.</small></p>
</xsl:template>
+ <xsl:template match="citerefentry" mode="no.anchor.mode">
+ <xsl:apply-templates select="*" mode="no.anchor.mode"/>
+ </xsl:template>
+
+ <xsl:template match="refentrytitle" mode="no.anchor.mode">
+ <xsl:value-of select="."/>
+ </xsl:template>
+
<!-- Add title class to emitted hX -->
<xsl:template match="bridgehead">
<xsl:variable name="container" select="(ancestor::appendix|ancestor::article|ancestor::bibliography|
From 03a4531673f550f5cc936fddfe4ebe75d273dd45 Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Tue, 7 May 2013 10:02:48 +0000
Subject: [PATCH 106/121] - Work around overflowing images
---
share/mk/doc.docbook.mk | 3 +++
1 file changed, 3 insertions(+)
diff --git a/share/mk/doc.docbook.mk b/share/mk/doc.docbook.mk
index b75acc5388..30a38db86e 100644
--- a/share/mk/doc.docbook.mk
+++ b/share/mk/doc.docbook.mk
@@ -453,6 +453,9 @@ ${DOC}.tex: ${SRCS} ${LOCAL_IMAGES_EPS} ${PRINT_INDEX} \
${DOC}.parsed.xml
${JADE} -V tex-backend ${PRINTOPTS} \
${JADEOPTS} -t tex -o ${.TARGET} ${XMLDECL} ${DOC}.parsed.xml
+ ${SED} -i '' -e 's|{1}\\def\\ScaleY%|{0.5}\\def\\ScaleY%|g' \
+ -e 's|{1}\\def\\EntitySystemId%|{0.5}\\def\\EntitySystemId%|g' \
+ ${.TARGET}
.if !target(${DOC}.dvi)
${DOC}.dvi: ${DOC}.tex ${LOCAL_IMAGES_EPS}
From 7292289d38842527aa0cd9239635976ba5e0399b Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Tue, 7 May 2013 10:20:20 +0000
Subject: [PATCH 107/121] - MFH
---
de_DE.ISO8859-1/share/xml/news.xml | 25 +-
en_US.ISO8859-1/articles/Makefile | 1 -
.../articles/committers-guide/article.xml | 71 +++-
.../articles/cvsup-advanced/Makefile | 17 -
.../articles/cvsup-advanced/article.xml | 271 --------------
.../articles/p4-primer/article.xml | 2 +-
.../articles/portbuild/article.xml | 4 +-
.../developers-handbook/testing/chapter.xml | 4 +-
en_US.ISO8859-1/books/faq/book.xml | 2 +-
.../books/handbook/geom/chapter.xml | 2 +-
.../books/handbook/mirrors/chapter.xml | 2 +-
.../books/handbook/printing/chapter.xml | 6 +-
.../books/porters-handbook/book.xml | 10 +
en_US.ISO8859-1/htdocs/cgi/man.cgi | 5 +-
en_US.ISO8859-1/htdocs/cgi/monthly.cgi | 10 +-
.../htdocs/community/mailinglists.xml | 6 +-
en_US.ISO8859-1/htdocs/java/index.xml | 2 +-
en_US.ISO8859-1/htdocs/java/news.xml | 4 +-
.../htdocs/news/2012-compromise.xml | 31 +-
en_US.ISO8859-1/htdocs/releases/index.xml | 2 +-
en_US.ISO8859-1/htdocs/security/reporting.xml | 4 +-
en_US.ISO8859-1/share/xml/mailing-lists.ent | 4 -
fr_FR.ISO8859-1/articles/Makefile | 1 -
.../articles/cvsup-advanced/Makefile | 21 --
.../articles/cvsup-advanced/article.xml | 338 ------------------
ja_JP.eucJP/htdocs/releases/index.xml | 4 +-
ja_JP.eucJP/htdocs/security/reporting.xml | 6 +-
ja_JP.eucJP/share/xml/news.xml | 19 +-
mn_MN.UTF-8/books/handbook/geom/chapter.xml | 149 ++++----
ru_RU.KOI8-R/articles/Makefile | 1 -
ru_RU.KOI8-R/articles/cvsup-advanced/Makefile | 22 --
.../articles/cvsup-advanced/article.xml | 277 --------------
share/pgpkeys/itetcu.key | 117 +++---
share/xml/events2013.xml | 4 +-
34 files changed, 307 insertions(+), 1137 deletions(-)
delete mode 100644 en_US.ISO8859-1/articles/cvsup-advanced/Makefile
delete mode 100644 en_US.ISO8859-1/articles/cvsup-advanced/article.xml
delete mode 100644 fr_FR.ISO8859-1/articles/cvsup-advanced/Makefile
delete mode 100644 fr_FR.ISO8859-1/articles/cvsup-advanced/article.xml
delete mode 100644 ru_RU.KOI8-R/articles/cvsup-advanced/Makefile
delete mode 100644 ru_RU.KOI8-R/articles/cvsup-advanced/article.xml
diff --git a/de_DE.ISO8859-1/share/xml/news.xml b/de_DE.ISO8859-1/share/xml/news.xml
index fbf0c2af5a..5ed7c9e3e2 100644
--- a/de_DE.ISO8859-1/share/xml/news.xml
+++ b/de_DE.ISO8859-1/share/xml/news.xml
@@ -4,7 +4,7 @@
<!--
$FreeBSD$
$FreeBSDde$
- basiert auf: r41484
+ basiert auf: r41524
-->
<!-- Simple schema for FreeBSD Project news.
@@ -41,9 +41,32 @@
<month>
<name>4</name>
+ <day>
+ <name>29</name>
+
+ <event>
+ <title>Neuer technischer Mitarbeiter f�r die &os; Foundation:
+ Edward Tomasz Napierała</title>
+
+ <p>Die &os; Foundation freut sich, bekanntgeben zu d�rfen,
+ dass mit Edward Tomasz Napierała ein weiterer
+ technischer Mitarbeiter in Vollzeit f�r die Foundation t�tig
+ sein wird. Damit setzt die Foundation die f�r 2013 geplanten
+ Investitionen in Personal fort.</p>
+
+ <p>Weitere Informationen hierzu finden Sie <a
+ href="http://freebsdfoundation.blogspot.com/2013/04/freebsd-foundation-announces-second.html">hier</a>.</p>
+ </event>
+ </day>
+
<day>
<name>24</name>
+ <event>
+ <p>Neuer Committer: <a
+ href="mailto:asomers@FreeBSD.org">Alan Somers</a> (src)</p>
+ </event>
+
<event>
<title>Das FreeBSD Project nimmt am Google Summer of
Code 2013 teil</title>
diff --git a/en_US.ISO8859-1/articles/Makefile b/en_US.ISO8859-1/articles/Makefile
index e1caf23579..8dbe01d594 100644
--- a/en_US.ISO8859-1/articles/Makefile
+++ b/en_US.ISO8859-1/articles/Makefile
@@ -13,7 +13,6 @@ SUBDIR+= contributors
SUBDIR+= cups
SUBDIR+= custom-gcc
SUBDIR+= cvs-freebsd
-SUBDIR+= cvsup-advanced
SUBDIR+= explaining-bsd
SUBDIR+= fbsd-from-scratch
SUBDIR+= filtering-bridges
diff --git a/en_US.ISO8859-1/articles/committers-guide/article.xml b/en_US.ISO8859-1/articles/committers-guide/article.xml
index 643f4ea8ad..0ddf939687 100644
--- a/en_US.ISO8859-1/articles/committers-guide/article.xml
+++ b/en_US.ISO8859-1/articles/committers-guide/article.xml
@@ -1,6 +1,8 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
- "../../../share/xml/freebsd45.dtd">
+ "../../../share/xml/freebsd45.dtd" [
+<!ENTITY ga "Google Analytics">
+]>
<article lang='en'>
<articleinfo>
@@ -4149,6 +4151,73 @@ bak/packages packages from last complete <major_version> run on <arch&
</sect1>
+ <sect1 id="google-analytics">
+ <title>Information about &ga;</title>
+
+ <para>As of December 12, 2012, &ga; was enabled on the
+ &os; Project website to collect anonymized usage statistics
+ regarding usage of the site. The information collected is
+ valuable to the &os; Documentation Project, in order to
+ identify various problems on the &os; website.</para>
+
+ <sect2 id="google-analytics-policy">
+ <title>&ga; General Policy</title>
+
+ <para>The &os; Project takes visitor privacy very
+ seriously. As such, the &os; Project website honors the
+ <quote>Do Not Track</quote> header <emphasis>before</emphasis>
+ fetching the tracking code from Google. For more information,
+ please see the <ulink
+ url="http://www.FreeBSD.org/privacy.html">&os; Privacy
+ Policy</ulink>.</para>
+
+ <para>&ga; access is <emphasis>not</emphasis> arbitrarily
+ allowed — access must be requested, voted on by the
+ &a.doceng;, and explicitly granted.</para>
+
+ <para>Requests for &ga; data must include a specific purpose.
+ For example, a valid reason for requesting access would be
+ <quote>to see the most frequently used web browsers when
+ viewing &os; web pages to ensure page rendering speeds are
+ acceptable.</quote></para>
+
+ <para>Conversely, <quote>to see what web browsers are most
+ frequently used</quote> (without stating
+ <emphasis>why</emphasis>) would be rejected.</para>
+
+ <para>All requests must include the timeframe for which the data
+ would be required. For example, it must be explicitly stated
+ if the requested data would be needed for a timeframe covering
+ a span of 3 weeks, or if the request would be one-time
+ only.</para>
+
+ <para>Any request for &ga; data without a clear, reasonable
+ reason beneficial to the &os; Project will be
+ rejected.</para>
+ </sect2>
+
+ <sect2 id="google-analytics-data">
+ <title>Data Available Through &ga;</title>
+
+ <para>A few examples of the types of &ga; data available
+ include:</para>
+
+ <itemizedlist>
+ <listitem>
+ <para>Commonly used web browsers</para>
+ </listitem>
+
+ <listitem>
+ <para>Page load times</para>
+ </listitem>
+
+ <listitem>
+ <para>Site access by language</para>
+ </listitem>
+ </itemizedlist>
+ </sect2>
+ </sect1>
+
<sect1 id="perks">
<title>Perks of the Job</title>
diff --git a/en_US.ISO8859-1/articles/cvsup-advanced/Makefile b/en_US.ISO8859-1/articles/cvsup-advanced/Makefile
deleted file mode 100644
index 808a32ab38..0000000000
--- a/en_US.ISO8859-1/articles/cvsup-advanced/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# $FreeBSD$
-#
-# Article: CVSup Advanced Points
-
-DOC?= article
-
-FORMATS?= html
-WITH_ARTICLE_TOC?= YES
-
-INSTALL_COMPRESSED?=gz
-INSTALL_ONLY_COMPRESSED?=
-
-SRCS= article.xml
-
-DOC_PREFIX?= ${.CURDIR}/../../..
-.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/en_US.ISO8859-1/articles/cvsup-advanced/article.xml b/en_US.ISO8859-1/articles/cvsup-advanced/article.xml
deleted file mode 100644
index c8128e0106..0000000000
--- a/en_US.ISO8859-1/articles/cvsup-advanced/article.xml
+++ /dev/null
@@ -1,271 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
- "../../../share/xml/freebsd45.dtd">
-
-<article lang='en'>
- <articleinfo>
- <title>CVSup Advanced Points</title>
-
- <authorgroup>
- <author>
- <firstname>Salvo</firstname>
- <surname>Bartolotta</surname>
-
- <affiliation>
- <address><email>bartequi@neomedia.it</email></address>
- </affiliation>
- </author>
- </authorgroup>
-
- <legalnotice id="trademarks" role="trademarks">
- &tm-attrib.freebsd;
- &tm-attrib.cvsup;
- &tm-attrib.general;
- </legalnotice>
-
- <pubdate>$FreeBSD$</pubdate>
-
- <releaseinfo>$FreeBSD$</releaseinfo>
-
- <abstract>
- <para>The present article assumes a basic understanding of <application>CVSup</application>
- operation. It documents several delicate issues connected with
- source synchronization via <application>CVSup</application>, viz. effective solutions to
- the problem of stale files as well as special source updating
- cases; which issues are likely to cause apparently inexplicable
- troubles.</para>
- </abstract>
- </articleinfo>
-
- <sect1 id="preface">
- <title>Preface</title>
-
- <para>This document is the fruit of the author's attempts to
- fully understand the niceties of <application>CVSup</application> & source updating. :-)
- While the author has made every effort to make these pages
- as informative and correct as possible, he is only human and
- may have made all sorts of typos, mistakes, etc. He will be
- very grateful for any comments and/or suggestions you send to
- his e-mail address, <email>bartequi@neomedia.it</email>.</para>
- </sect1>
-
-
- <sect1 id="introduction">
- <title>Introduction</title>
-
- <para>If you have visited
- <ulink url="http://www.polstra.com/">John Polstra's site</ulink>
- and read
- <ulink url="http://www.polstra.com/projects/freeware/CVSup/faq.html">his
-FAQ</ulink>,
- you may have noticed Question 12 & 13.</para>
-
- <para>When updating any collection of sources (eg
- <filename>/usr/ports</filename>), &man.cvsup.1; makes use of
- the related checkouts file in order to perform the updating
- process in the most efficient and correct way. In this example
- (<filename>/usr/ports</filename>), the related checkouts file
- is <filename>/usr/sup/ports-all/checkouts.cvs:.</filename> if
- your base is <filename>/usr</filename>.</para>
-
- <para>A checkouts file contains information on the current status
- of your sources—in a way, a sort of <quote>photograph</quote>. This
- significant information enables <command>cvsup</command> to retrieve updates most
- effectively. Further, and maybe more important, it enables <command>cvsup</command>
- to correctly manage your sources by locally deleting any files
- no longer present in the repository, thus leaving no stale files
- on your system. In fact, without a checkouts file, <command>cvsup</command> would
- <emphasis>not</emphasis> know which files your collection was composed of (cf
- &man.cvsup.1; and the fallback method for details); as a result,
- it could not delete on your system those files no longer present
- in the repository. They would remain on your system (stale
- files), and might cause you subtle build failures or other
- trouble. For example, this problem is likely to occur if you
- first update your ports collection several weeks after you
- got your installation CD-ROMs.</para>
-
- <para>It is therefore recommended that you adopt the two-step procedure
- outlined in the <application>CVSup</application> FAQ (cf Q12, Q13); in subsequent sections, you
- will be given interesting and instructive concrete examples.</para>
- </sect1>
-
- <sect1 id="script">
- <title>A useful python script: <command>cvsupchk</command></title>
-
- <para>Alternatively, in order to examine your sources for
- inconsistencies, you may wish to utilize the <command>cvsupchk</command> python
- script; which script is currently found in
- <filename>/usr/ports/net/cvsup/work/cvsup-16.1/contrib/cvsupchk</filename>,
- together with a nice <filename>README</filename>. Prerequisites:</para>
-
- <orderedlist>
- <listitem>
- <para><literal>/usr/ports/net/cvsup</literal> &prompt.root;
-<userinput> make extract</userinput></para>
- </listitem>
-
- <listitem>
- <para>python (also found in the ports collection :-))</para>
- </listitem>
-
- <listitem>
- <para>a checkouts file for your collection of sources.</para>
- </listitem>
- </orderedlist>
-
- <para>If you are updating your sources for the very first time,
- of course you do not have a checkouts file. After installing
- python and updating your sources (eg <filename>/usr/ports</filename>),
- you can check them thus:</para>
-
- <screen>&prompt.user; <filename>/path/to/</filename><userinput>cvsupchk -d /usr -c /usr/sup/ports-all/checkouts.cvs:. | more</userinput></screen>
-
- <para>If you want to check your RELENG_4 sources:</para>
-
- <screen>&prompt.user; <filename>/path/to/</filename><userinput>cvsupchk -d /usr -c /usr/sup/src-all/checkouts.cvs:RELENG_4 | more</userinput></screen>
-
- <para>In each case, <command>cvsupchk</command> will inspect your sources for
- inconsistencies by utilizing the information contained in the
- related checkouts file. Such anomalies as deleted files being
- present (aka stale files), missing checked-out files, extra RCS
- files, and dead directories will be printed to standard output.</para>
-
- <para>In the next section, we will provide important, typical
- examples of source updating; which examples will show you the
- role of checkouts files and the dangers of negligent source
- management.</para>
- </sect1>
-
- <sect1 id="examples">
- <title>Examples of more advanced source management</title>
-
- <sect2>
- <title>How to safely change tags when updating
-<literal>src-all</literal></title>
-
- <para>If you specify eg <literal>tag=A</literal> in your <filename>supfile</filename>, <command>cvsup</command> will create
- a checkouts file called <filename>checkouts.cvs:A</filename>:
- for instance, if <literal>tag=RELENG_4</literal>, a checkouts file called
- <filename>checkouts.cvs:RELENG_4</filename> is generated.
- This file will be used to retrieve and/or store information
- identifying your 4-STABLE sources.</para>
-
- <para>When tracking <literal>src-all</literal>, if you wish to
- pass from <literal>tag=A</literal> to <literal>tag=B</literal> (A less/greater than B not making
- any difference) and if your checkouts file is
- <filename>checkouts.cvs:A</filename>, the following actions
- should be performed:</para>
-
- <orderedlist>
- <listitem>
- <para>&prompt.root; <userinput>mv checkouts.cvs:A
-checkouts.cvs:B</userinput>
- (This provides the subsequent step with the appropriate
- checkouts file)</para>
- </listitem>
-
- <listitem>
- <para>write a <filename>supfile</filename> whose collection line reads:</para>
- <programlisting>src-all tag=B</programlisting>
- </listitem>
-
- <listitem>
- <para>cvsup your sources using the new <filename>supfile</filename>.</para>
- </listitem>
- </orderedlist>
-
- <para>The <command>cvsup</command> utility will look for <filename>checkouts.cvs:B</filename>—in
- that the target is B; that is, <command>cvsup</command> will make use of
- the information contained therein to correctly manage your
- sources.</para>
-
- <para>The benefits:</para>
-
- <itemizedlist>
- <listitem>
- <para>the sources are dealt with correctly (in particular,
- no stale files)</para>
- </listitem>
-
- <listitem>
- <para>less load is placed on the server, in that <command>cvsup</command>
- operates in the most efficient way.</para>
- </listitem>
- </itemizedlist>
-
-
- <para>For example, <literal>A=RELENG_4</literal>, <literal>B=.</literal>. The period in <literal>B=.</literal> means
- -CURRENT. This is a rather typical update, from 4-STABLE
- to -CURRENT. While it is straightforward to <quote>downgrade</quote> your
- sources (e.g., from -CURRENT to -STABLE), downgrading a system
- is quite another matter. You are STRONGLY advised not to
- attempt such an operation, unless you know exactly what you
- are doing.</para>
- </sect2>
-
- <sect2>
- <title>Updating to the same tag as of a different date</title>
-
- <para>If you wish to switch from <literal>tag=A</literal> to <literal>tag=A</literal> as of a
- different GMT date (say, <literal>date=D</literal>), you will execute the
- following:</para>
-
- <orderedlist>
- <listitem>
- <para>write a <filename>supfile</filename> whose collection line reads:</para>
- <programlisting>src-all tag=A date=D</programlisting>
- </listitem>
-
- <listitem>
- <para>update your sources using the new <filename>supfile</filename></para>
- </listitem>
- </orderedlist>
-
- <para>Whether the new date precedes that of the last sync
- operation with <literal>tag=A</literal> or not, it is immaterial. For example,
- in order to specify the date <quote>August 27, 2000, 10:00:00 GMT</quote>
- you write the line:</para>
-
-
- <programlisting>src-all tag=RELENG_4 date=2000.08.27.10.00.00</programlisting>
-
- <note><para>The format of a date is rigid. You have to specify
- all the components of the date: century (<quote>20</quote>, i.e., the 21st
- century, must be supplied whereas <quote>19</quote>, the past century, can
- be omitted), year, month, day, hour, minutes, seconds—as
- shown in the above example. For more information, please
- see &man.cvsup.1;.</para></note>
-
- <para>Whether or not a date is specified, the checkouts file
- is called <filename>checkouts.cvs:A</filename> (e.g.,
- <filename>checkouts.cvs:RELENG_4</filename>). As a result,
- no particular action is needed in order to revert to the
- previous state: you have to modify the date in the <filename>supfile</filename>,
- and run <command>csvup</command> again.</para>
- </sect2>
-
-
- <sect2>
- <title>Updating your ports collection for the first time</title>
-
- <para>If you want to <quote>sync</quote> your ports tree for
- the first time you should use a tag that matches your &os;
- installation. E.g., if you have installed the Ports
- Collection during the installation of &os; 5.3-RELEASE the
- following should be used:
- <programlisting>ports-all tag=RELEASE_5_3_0</programlisting>
- The <command>cvsup</command> program will create a ports
- checkout file, which is precisely the goal of the first
- special sync operation. Now we can use the <quote>.</quote>
- tag to update the tree whenever we feel it should be updated:
- <programlisting>ports-all tag=.</programlisting>
- All subsequent updates will be carried out smoothly.</para>
-
- <para>If you have been reading the apparently nit-picking
- remarks in these sections, you will probably have recognized
- the potential for trouble in a source updating process.
- A number of people have actually run into problems. You have
- been warned. :-)</para>
- </sect2>
- </sect1>
-</article>
diff --git a/en_US.ISO8859-1/articles/p4-primer/article.xml b/en_US.ISO8859-1/articles/p4-primer/article.xml
index 06f11f62c6..d93580c45b 100644
--- a/en_US.ISO8859-1/articles/p4-primer/article.xml
+++ b/en_US.ISO8859-1/articles/p4-primer/article.xml
@@ -331,7 +331,7 @@
with &os;. Frequent submits of changes to the server are also
encouraged.</para>
- <para>sSimilar to <application>Subversion</application>, the
+ <para>Similar to <application>Subversion</application>, the
<application>Perforce</application> repository (the
<quote>depot</quote>) is a single flat tree. Every file, whether
a unique creation or a derivative from a branch, is accessible via
diff --git a/en_US.ISO8859-1/articles/portbuild/article.xml b/en_US.ISO8859-1/articles/portbuild/article.xml
index 02effad991..d882a2ed29 100644
--- a/en_US.ISO8859-1/articles/portbuild/article.xml
+++ b/en_US.ISO8859-1/articles/portbuild/article.xml
@@ -69,7 +69,7 @@
to specify the build branch (e.g., 7, 7-exp, 8, 8-exp, 9, 9-exp, 10, 10-exp).
The set of branches that <username>portmgr</username> currently
supports is the same as those that the &os;
- <ulink url="http://www.freebsd.org/security/index.html#supported-branches">security team</ulink>
+ <ulink url="http://www.freebsd.org/security/index.html#sup">security team</ulink>
supports.
</para>
@@ -2338,7 +2338,7 @@ zfs destroy -r a/snap/src-<replaceable>old-branch</replaceable></screen>
<literal>packages-8-stable</literal> should be built from 8.1.</para>
<para>As releases go End-Of-Life (see
- <ulink url="http://www.freebsd.org/security/index.html#supported-branches">chart</ulink>),
+ <ulink url="http://www.freebsd.org/security/index.html#sup">chart</ulink>),
a full (not incremental!) package build should be done and uploaded.</para>
<para>The procedure is as follows:</para>
diff --git a/en_US.ISO8859-1/books/developers-handbook/testing/chapter.xml b/en_US.ISO8859-1/books/developers-handbook/testing/chapter.xml
index 1d0293d5bf..080ed93b10 100644
--- a/en_US.ISO8859-1/books/developers-handbook/testing/chapter.xml
+++ b/en_US.ISO8859-1/books/developers-handbook/testing/chapter.xml
@@ -318,7 +318,7 @@
<itemizedlist>
<listitem>
<para>Call <function>success()</function> to
- detemine the outcome of the build.</para>
+ determine the outcome of the build.</para>
</listitem>
<listitem>
<para>Output the modification size.</para>
@@ -376,7 +376,7 @@
</listitem>
</itemizedlist>
- <para>Tthis means that <literal>HEAD</literal> always ranks
+ <para>This means that <literal>HEAD</literal> always ranks
highest, and <literal>RELENG</literal> branches are ranked in
numerical order, with each <literal>STABLE</literal> branch
ranking higher than the release branches forked off of it.
diff --git a/en_US.ISO8859-1/books/faq/book.xml b/en_US.ISO8859-1/books/faq/book.xml
index fb6bc89e00..8154261be0 100644
--- a/en_US.ISO8859-1/books/faq/book.xml
+++ b/en_US.ISO8859-1/books/faq/book.xml
@@ -3262,7 +3262,7 @@ kern.sched.name: ULE</screen>
<listitem>
<para>&os; supports <literal>ext2fs</literal> and
<literal>ext3fs</literal> partitions. See
- &man.mount.ext2fs.8; for more information.</para>
+ &man.ext2fs.5; for more information.</para>
</listitem>
</varlistentry>
diff --git a/en_US.ISO8859-1/books/handbook/geom/chapter.xml b/en_US.ISO8859-1/books/handbook/geom/chapter.xml
index 603e7f00b4..72654b37c6 100644
--- a/en_US.ISO8859-1/books/handbook/geom/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/geom/chapter.xml
@@ -1310,7 +1310,7 @@ ufsid/486b6fc16926168e N/A ad4s1f</screen>
<screen>&prompt.root; <userinput>newfs -O 2 -J /dev/da4.journal</userinput></screen>
- <para>This command will creates a <acronym>UFS</acronym>2 file
+ <para>This command will create a <acronym>UFS</acronym>2 file
system on the journaled device.</para>
<para><command>mount</command> the device at the desired point
diff --git a/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml b/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml
index 409c4ce7cf..2b147a8b91 100644
--- a/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml
@@ -235,7 +235,7 @@
<para>Subscribe to one of the
<application>CTM</application> distribution lists.
- &a.ctm-cvs-cur.name; supports the entire CVS tree.
+ &a.ctm-src-cur.name; supports the entire Subversion tree.
&a.ctm-src-cur.name; supports the head of the development
branch. &a.ctm-src-9.name; supports the 9.X release branch,
etc.. (If you do not know how to subscribe yourself to a
diff --git a/en_US.ISO8859-1/books/handbook/printing/chapter.xml b/en_US.ISO8859-1/books/handbook/printing/chapter.xml
index 287b8a454e..a368f5ad9a 100644
--- a/en_US.ISO8859-1/books/handbook/printing/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/printing/chapter.xml
@@ -40,7 +40,7 @@
<para>&os; can also be configured to act as a print server on a
network; in this capacity &os; can receive print jobs from a
- varietyof other computers, including other &os; computers,
+ variety of other computers, including other &os; computers,
&windows; and &macos; hosts. &os; will ensure that one job
at a time is printed, and can keep statistics on which users
and machines are doing the most printing, produce
@@ -4879,11 +4879,11 @@ cfA013rose dequeued</screen>
<variablelist>
<varlistentry>
- <term>It worked, after awhile; or, it did not eject a full
+ <term>It worked, after a while; or, it did not eject a full
sheet.</term>
<listitem>
- <para>The printer printed the above, but it sat for awhile
+ <para>The printer printed the above, but it sat for a while
and did nothing. In fact, you might have needed to press
a PRINT REMAINING or FORM FEED button on the printer to
get any results to appear.</para>
diff --git a/en_US.ISO8859-1/books/porters-handbook/book.xml b/en_US.ISO8859-1/books/porters-handbook/book.xml
index c9617f3c9e..45f14f80ae 100644
--- a/en_US.ISO8859-1/books/porters-handbook/book.xml
+++ b/en_US.ISO8859-1/books/porters-handbook/book.xml
@@ -6295,6 +6295,16 @@ USE_XORG= x11 xpm</programlisting>
files.</para>
</sect3>
+ <sect3 id="updating-desktop-database">
+ <title>Updating desktop database</title>
+
+ <para>If a port has a MimeType entry in its
+ <filename><replaceable>portname</replaceable>.desktop</filename>,
+ the desktop database must
+ be updated after install and deinstall. To do this,
+ define <makevar>USES</makevar>= desktop-file-utils.</para>
+ </sect3>
+
<sect3 id="desktop-entries-macro">
<title>Creating Desktop Entries with the
<makevar>DESKTOP_ENTRIES</makevar> Macro</title>
diff --git a/en_US.ISO8859-1/htdocs/cgi/man.cgi b/en_US.ISO8859-1/htdocs/cgi/man.cgi
index 72cac7c3b3..58436c727f 100755
--- a/en_US.ISO8859-1/htdocs/cgi/man.cgi
+++ b/en_US.ISO8859-1/htdocs/cgi/man.cgi
@@ -147,6 +147,7 @@ $sectionpath = {
'OpenBSD 5.0' => { 'path' => '1:2:3:3p:4:5:6:7:8:9', },
'OpenBSD 5.1' => { 'path' => '1:2:3:3p:4:5:6:7:8:9', },
'OpenBSD 5.2' => { 'path' => '1:2:3:3p:4:5:6:7:8:9', },
+ 'OpenBSD 5.3' => { 'path' => '1:2:3:3p:4:5:6:7:8:9', },
'CentOS Linux/i386 3.9' => { 'path' => '1:2:3:3p:4:5:6:7:8:9:n', },
'CentOS Linux/i386 4.8' => { 'path' => '1:1p:2:3:3p:4:5:6:7:8:9:n:0p', },
@@ -381,6 +382,7 @@ $manPathDefault = 'FreeBSD 9.1-RELEASE';
'OpenBSD 5.0', "$manLocalDir/OpenBSD-5.0",
'OpenBSD 5.1', "$manLocalDir/OpenBSD-5.1",
'OpenBSD 5.2', "$manLocalDir/OpenBSD-5.2",
+ 'OpenBSD 5.3', "$manLocalDir/OpenBSD-5.3",
#'NetBSD 0.9', "$manLocalDir/NetBSD-0.9",
'NetBSD 1.0', "$manLocalDir/NetBSD-1.0",
@@ -594,6 +596,7 @@ my %arch = (
'OpenBSD 5.0' => { 'arch' => [qw/alpha amd64 armish aviion hp300 hppa hppa64 i386 landisk loongson luna88k mac68k macppc mvme68k mvme88k mvmeppc palm sgi socppc sparc sparc64 vax zaurus/] },
'OpenBSD 5.1' => { 'arch' => [qw/alpha amd64 armish aviion hp300 hppa hppa64 i386 landisk loongson luna88k mac68k macppc mvme68k mvme88k mvmeppc palm sgi socppc sparc sparc64 vax zaurus/] },
'OpenBSD 5.2' => { 'arch' => [qw/alpha amd64 armish aviion hp300 hppa hppa64 i386 landisk loongson luna88k mac68k macppc mvme68k mvme88k mvmeppc palm sgi socppc sparc sparc64 vax zaurus/] },
+'OpenBSD 5.3' => { 'arch' => [qw/alpha amd64 armish aviion hp300 hppa hppa64 i386 landisk loongson luna88k mac68k macppc mvme68k mvme88k mvmeppc palm sgi socppc sparc sparc64 vax zaurus/] },
);
# delete not existing releases
@@ -636,7 +639,7 @@ while ( ( $key, $val ) = each %manPath ) {
'macosx', 'Darwin 8.0.1/ppc',
'netbsd', 'NetBSD 6.0',
- 'openbsd', 'OpenBSD 5.2',
+ 'openbsd', 'OpenBSD 5.3',
'v7', 'Unix Seventh Edition',
'v7man', 'Unix Seventh Edition',
'x11', 'X11R7.4',
diff --git a/en_US.ISO8859-1/htdocs/cgi/monthly.cgi b/en_US.ISO8859-1/htdocs/cgi/monthly.cgi
index 74f8266f40..03c411327a 100755
--- a/en_US.ISO8859-1/htdocs/cgi/monthly.cgi
+++ b/en_US.ISO8859-1/htdocs/cgi/monthly.cgi
@@ -1,4 +1,5 @@
#!/usr/bin/perl -w
+# $FreeBSD$
require "./cgi-style.pl";
@@ -23,11 +24,11 @@ sub xml
my($Tag, $Etc) = split(' ', $TagEtc, 2);
- my $Spaces = " " x ($Indent*3);
+ my $Spaces = " " x ($Indent*2);
if (!@Text)
{
# No text in the tag
- return ("$Spaces<$TagEtc >\n");
+ return ("$Spaces<$TagEtc />\n");
}
elsif (@Text == 1)
{
@@ -137,6 +138,7 @@ if ($Submit)
my @info = split("\n", $info);
my $title = "FreeBSD project submission output";
+ my $tasks = xml(1, "help", "", @tasks) if @tasks;
my @contents = xml(0, "project cat=\'$Category\'",
xml(1, "title", $Project),
@@ -148,11 +150,11 @@ if ($Submit)
xml(1, "body",
xml(2, "p", "", xmltext(3, @info))),
"\n",
- xml(1, "help", "", @tasks),
+ $tasks,
);
my $contents = join('', @contents);
- $contents = "<!-- Mail to: monthly\@freebsd.org -->\n$contents";
+ $contents = "<!-- Mail as an attachment to: monthly\@freebsd.org -->\n$contents";
if (!$errors)
{
diff --git a/en_US.ISO8859-1/htdocs/community/mailinglists.xml b/en_US.ISO8859-1/htdocs/community/mailinglists.xml
index afc5d241c0..2d7b581ee6 100644
--- a/en_US.ISO8859-1/htdocs/community/mailinglists.xml
+++ b/en_US.ISO8859-1/htdocs/community/mailinglists.xml
@@ -58,9 +58,9 @@
or <a href="http://www.FreeBSD-fr.org/">WWW</a>.</li>
<li><strong>Hungarian</strong> -- <a
- href="mailto:bsd@hu.FreeBSD.org">bsd@hu.FreeBSD.org</a>, <a
- href="https://lists.hu.FreeBSD.org/mailman/listinfo/bsd/">Administration</a>
- or <a href="http://lists.hu.FreeBSD.org/pipermail/bsd/">Search</a>.</li>
+ href="mailto:bsd@lista.bsd.hu">bsd@lista.bsd.hu</a>, <a
+ href="http://lista.bsd.hu/">Administration</a>
+ or <a href="http://datacast.hu/pipermail/bsd/">Search</a>.</li>
<li><strong>Indonesian</strong> -- <a
href="mailto:id-freebsd-subscribe@egroups.com">id-freebsd-subscribe@egroups.com</a></li>
diff --git a/en_US.ISO8859-1/htdocs/java/index.xml b/en_US.ISO8859-1/htdocs/java/index.xml
index 36c2a15ac7..df6711a52f 100644
--- a/en_US.ISO8859-1/htdocs/java/index.xml
+++ b/en_US.ISO8859-1/htdocs/java/index.xml
@@ -31,7 +31,7 @@
<p>Further information about downloading the unsupported binaries is
available from the
- <a href="http://www.FreeBSDFoundation.org/downloads/java.shtml">FreeBSD
+ <a href="http://www.FreeBSDFoundation.org/java">FreeBSD
Foundation &java; Downloads</a> page.</p>
<h2>News</h2>
diff --git a/en_US.ISO8859-1/htdocs/java/news.xml b/en_US.ISO8859-1/htdocs/java/news.xml
index cd55dc0fc2..08d236ffa0 100644
--- a/en_US.ISO8859-1/htdocs/java/news.xml
+++ b/en_US.ISO8859-1/htdocs/java/news.xml
@@ -280,7 +280,7 @@
1.6 and JRE 1.6. For more details, see the <a
href="http://www.freebsdfoundation.org/press/2008Jul-newsletter.shtml">
Foundation newsletter</a> and the <a
- href="http://www.freebsdfoundation.org/downloads/java.shtml">download
+ href="http://www.freebsdfoundation.org/java">download
page</a>.</p>
</event>
</day>
@@ -473,7 +473,7 @@
1.5 and JRE 1.5. For more details, see the <a
href="http://www.freebsdfoundation.org/press/20060405-PRrelease.shtml">press
release</a> and <a
- href="http://www.freebsdfoundation.org/downloads/java.shtml">download
+ href="http://www.freebsdfoundation.org/java">download
page</a>.</p>
</event>
</day>
diff --git a/en_US.ISO8859-1/htdocs/news/2012-compromise.xml b/en_US.ISO8859-1/htdocs/news/2012-compromise.xml
index f593509d68..6c23d4abf1 100644
--- a/en_US.ISO8859-1/htdocs/news/2012-compromise.xml
+++ b/en_US.ISO8859-1/htdocs/news/2012-compromise.xml
@@ -62,6 +62,7 @@
<ul>
<li><a href="#announce">Announcement</a></li>
+ <li><a href="#update20130430">Update: 30th April 2013</a></li>
<li><a href="#update20130323">Update: 23rd March 2013</a></li>
<li><a href="#update20130303">Update: 3rd March 2013</a></li>
<li><a href="#update20121229">Update: 29th December 2012</a></li>
@@ -74,6 +75,30 @@
<li><a href="#recommend">Recommendations</a></li>
</ul>
+ <h1><a name="update20130430">Update: April 30th, 2013</a></h1>
+
+ <p>Port managers and cluster administrators have completed the
+ restoration of binary package building in the last few weeks.
+ This has brought us back the continuous updates for the old-style
+ binary packages on the 8.x and 9.x -STABLE branches. Note that,
+ as beneficial consequences, Release Candidate builds for the 8.4
+ release cycle can now include binary packages on the install
+ media, and the Project was able to add the missing binary packages
+ retroactively for 9.1-RELEASE on i386 and amd64 platforms.</p>
+
+ <p>Port managers are currently working on introducing new-style (as
+ known as <q>pkgng</q>) binary packages in the coming months,
+ please check the <a
+ href="http://lists.freebsd.org/mailman/listinfo/freebsd-ports-announce/">
+ &os; ports announcements list</a> for further gradual status
+ updates.</p>
+
+ <p>This is planned to be the last status update to this page. An
+ official announcement will be sent to the <a
+ href="http://lists.freebsd.org/mailman/listinfo/freebsd-announce/">
+ &os; announcements mailing list</a> with the further details
+ soon.</p>
+
<h1><a name="update20130323">Update: March 23rd, 2013</a></h1>
<p>Port managers have successfully restored some of the Project's
@@ -85,12 +110,6 @@
preparations required for providing binary packages for the
upcoming 8.4 and further releases.</p>
- <p>Unless there are any other major changes, this is planned to be
- the last status update to this page. An email will be sent to
- the <a href="http://lists.freebsd.org/mailman/listinfo/freebsd-announce">
- FreeBSD announcements mailing list</a> when the package build
- infrastructure is online and packages are once again available.</p>
-
<h1><a name="update20130302">Update: March 3rd, 2013</a></h1>
<p>Redports underwent a full security audit, and as a result could
diff --git a/en_US.ISO8859-1/htdocs/releases/index.xml b/en_US.ISO8859-1/htdocs/releases/index.xml
index 279e63126a..d3f3576aa9 100644
--- a/en_US.ISO8859-1/htdocs/releases/index.xml
+++ b/en_US.ISO8859-1/htdocs/releases/index.xml
@@ -97,7 +97,7 @@
<p>Complete historical information about the release date, the
classification type, and the effective End-Of-Life (EOL) for
these releases may be found on the <a
- href="&base;/security/security.html#unsup">Unsupported
+ href="&base;/security/unsupported.html">Unsupported
Releases</a> section of the <a
href="&base;/security/security.html">FreeBSD Security
Information</a> page.</p>
diff --git a/en_US.ISO8859-1/htdocs/security/reporting.xml b/en_US.ISO8859-1/htdocs/security/reporting.xml
index ee2114548e..b7c16bc779 100644
--- a/en_US.ISO8859-1/htdocs/security/reporting.xml
+++ b/en_US.ISO8859-1/htdocs/security/reporting.xml
@@ -20,8 +20,8 @@
<li><a href="#how">How and where to report a FreeBSD security issue</a></li>
<li><a href="#sec">Information about the FreeBSD Security Officer</a></li>
<li><a href="#pol">Information handling policies</a></li>
- <li><a href="#sup">Supported FreeBSD Releases</a></li>
- <li><a href="#unsup">Unsupported FreeBSD Releases</a></li>
+ <li><a href="security.html#sup">Supported FreeBSD Releases</a></li>
+ <li><a href="unsupported.html">Unsupported FreeBSD Releases</a></li>
</ul>
<a name="how"></a>
diff --git a/en_US.ISO8859-1/share/xml/mailing-lists.ent b/en_US.ISO8859-1/share/xml/mailing-lists.ent
index 3b11fd2671..5e304ce9dd 100644
--- a/en_US.ISO8859-1/share/xml/mailing-lists.ent
+++ b/en_US.ISO8859-1/share/xml/mailing-lists.ent
@@ -86,10 +86,6 @@
<!ENTITY a.ctm-announce "<ulink url='&a.ctm-announce.url;'>CTM announcements</ulink>">
<!ENTITY a.ctm-announce.name "<ulink url='&a.ctm-announce.url;'>ctm-announce</ulink>">
-<!ENTITY a.ctm-cvs-cur.url "&a.mailman.listinfo;/ctm-cvs-cur">
-<!ENTITY a.ctm-cvs-cur "<ulink url='&a.ctm-cvs-cur.url;'>CTM distribution of CVS files</ulink>">
-<!ENTITY a.ctm-cvs-cur.name "<ulink url='&a.ctm-cvs-cur.url;'>ctm-cvs-cur</ulink>">
-
<!ENTITY a.ctm-src-4.url "&a.mailman.listinfo;/ctm-src-4">
<!ENTITY a.ctm-src-4 "<ulink url='&a.ctm-src-4.url;'>CTM 4-STABLE src branch distribution mailing list</ulink>">
<!ENTITY a.ctm-src-4.name "<ulink url='&a.ctm-src-4.url;'>ctm-src-4</ulink>">
diff --git a/fr_FR.ISO8859-1/articles/Makefile b/fr_FR.ISO8859-1/articles/Makefile
index 0751f33064..4b38c9a750 100644
--- a/fr_FR.ISO8859-1/articles/Makefile
+++ b/fr_FR.ISO8859-1/articles/Makefile
@@ -11,7 +11,6 @@ SUBDIR+= committers-guide
SUBDIR+= contributing
SUBDIR+= contributing-ports
SUBDIR+= contributors
-SUBDIR+= cvsup-advanced
SUBDIR+= explaining-bsd
SUBDIR+= filtering-bridges
SUBDIR+= fonts
diff --git a/fr_FR.ISO8859-1/articles/cvsup-advanced/Makefile b/fr_FR.ISO8859-1/articles/cvsup-advanced/Makefile
deleted file mode 100644
index 8103cb4794..0000000000
--- a/fr_FR.ISO8859-1/articles/cvsup-advanced/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# The FreeBSD Documentation Project
-# The FreeBSD French Documentation Project
-#
-# $FreeBSD$
-# Original revision: 1.1
-
-DOC?= article
-
-FORMATS?= html
-
-INSTALL_COMPRESSED?=gz
-INSTALL_ONLY_COMPRESSED?=
-
-JADEFLAGS+= -V %generate-article-toc%
-
-SRCS= article.xml
-
-DOC_PREFIX?= ${.CURDIR}/../../..
-
-.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/fr_FR.ISO8859-1/articles/cvsup-advanced/article.xml b/fr_FR.ISO8859-1/articles/cvsup-advanced/article.xml
deleted file mode 100644
index f2a7cd79d0..0000000000
--- a/fr_FR.ISO8859-1/articles/cvsup-advanced/article.xml
+++ /dev/null
@@ -1,338 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
- "../../../share/xml/freebsd45.dtd">
-
-<!--
- The FreeBSD Documentation Project
- The FreeBSD French Documentation Project
-
- $FreeBSD$
- $Id: article.xml,v 1.7 2007-01-20 13:34:48 blackend Exp $
- Original revision: 1.12
--->
-
-<article lang="fr">
- <articleinfo>
- <title>Utilisation avanc�e de cvsup</title>
-
- <authorgroup>
- <author>
- <firstname>Salvo</firstname>
- <surname>Bartolotta</surname>
-
- <affiliation>
- <address><email>bartequi@neomedia.it</email></address>
- </affiliation>
- </author>
- </authorgroup>
-
- <pubdate>$FreeBSD$</pubdate>
-
- <releaseinfo>$FreeBSD$</releaseinfo>
-
- <legalnotice id="trademarks" role="trademarks">
- &tm-attrib.freebsd;
- &tm-attrib.cvsup;
- &tm-attrib.general;
- </legalnotice>
-
- <abstract>
- <para>Le pr�sent article suppose une compr�hension
- de base de l'utilisation de <application>CVSup</application>.
- Il expose plusieurs probl�mes d�licats
- li�s à la synchronisation des sources à
- l'aide de <application>CVSup</application>, c'est à
- dire des solutions efficaces aux probl�mes des fichiers
- obsol�tes aussi bien qu'aux cas sp�ciaux de mise
- à jour des sources, ces probl�mes sont susceptibles
- de causer des d�sagr�ments apparemment
- inexplicables.</para>
-
- &trans.a.fonvieille;
- </abstract>
- </articleinfo>
-
- <sect1 id="preface">
- <title>Pr�face</title>
-
- <para>Ce document est le fruit des tentatives de l'auteur de
- comprendre les finesses de <application>CVSup</application> et
- de la mise à jour des sources. :-)
- Bien que l'auteur ait fait de nombreux efforts pour
- rendre ces pages aussi instructives et correctes que possible,
- il n'est qu'un �tre humain et a pu avoir commis toutes sortes
- de coquilles, d'erreurs, etc... Il sera vraiment reconnaissant
- pour tous les commentaires et/ou suggestions que vous enverrez
- à son adresse �lectronique
- <email>bartequi@neomedia.it</email>.</para>
- </sect1>
-
-
- <sect1 id="introduction">
- <title>Introduction</title>
-
- <para>Si vous avez consult� le <ulink
- url="http://www.polstra.com/">site de John Polstra</ulink> et lu
- sa <ulink
- url="http://www.polstra.com/projects/freeware/CVSup/faq.html">FAQ</ulink>,
- vous avez pu avoir remarqu� les questions 12 et 13.</para>
-
- <para>En mettant à jour n'importe quelle “catalogue”
- - collection de sources (e.g. <filename>/usr/ports</filename>),
- &man.cvsup.1; se sert des fichiers de “checkouts”
- relatifs afin d'effectuer le processus de mise à jour de la
- mani�re la plus efficace et la plus correcte possible. Dans cet
- exemple (<filename>/usr/ports</filename>), le fichiers de
- “checkouts” relatif est
- <filename>/usr/sup/ports-all/checkouts.cvs:.</filename> si votre
- r�pertoire de base est <filename>/usr</filename>.</para>
-
- <para>Un fichier “checkouts” contient l'information
- sur l'�tat actuel de vos sources -- d'une certaine
- mani�re, une sorte de “photographie”. Cette
- information permet à <application>cvsup</application> de
- rechercher les mises à jour le plus efficacement. De
- plus, et c'est peut-�tre plus important, il permet
- à <application>cvsup</application> de g�rer
- correctement vos sources en effa�ant localement tout
- fichier qui n'est plus pr�sent sur l'archive centrale,
- et de ce fait ne pas laisser de fichiers obsol�tes sur
- votre syst�me. En fait, sans un fichier
- “checkouts”, <application>cvsup</application> ne
- saurait PAS de quels fichiers votre catalogue est compos�
- (Cf &man.cvsup.1; pour plus de d�tails), et en
- cons�quence, il ne pourrait PAS effacer de votre
- syst�me ces fichiers qui ne sont plus pr�sents sur
- l'archive centrale. Ils resteraient sur votre syst�me
- (les fichiers obsol�tes), et pourraient vous causer de
- subtiles �checs de compilation ou tout autre
- d�sagr�ment. Par exemple, ce probl�me est
- susceptible de se produire si vous mettez à jour votre
- catalogue de logiciels port�s plusieurs semaines
- apr�s que vous ayez eu vos CDROMs d'installation.</para>
-
- <para>Il est donc recommand� que vous adoptiez la
- proc�dure en deux temps d�crite dans la FAQ de
- <application>CVSup</application> (Cf Q12, Q13); dans les
- sections suivantes, on vous pr�sentera des exemples
- concrets int�ressant et instructifs.</para>
- </sect1>
-
- <sect1 id="script">
- <title>Une proc�dure python utile: cvsupchk</title>
-
- <para>Alternativement, afin d'examiner les sources pour les
- inconsistences, vous pouvez souhaiter utiliser la proc�dure
- python <command>cvsupchk</command>, proc�dure qui se
- trouve actuellement dans
- <filename>/usr/ports/net/cvsup/work/cvsup-16.1/contrib/cvsupchk</filename>,
- avec un sympathique <filename>README</filename>.
- Pr�requis:</para>
-
- <orderedlist>
- <listitem>
- <para><literal>/usr/ports/net/cvsup</literal> &prompt.root;
-<userinput> make extract</userinput></para>
- </listitem>
-
- <listitem>
- <para>python (que l'on trouve �galement dans le catalogue
- des logiciels port�s :-)).</para>
- </listitem>
-
- <listitem>
- <para>Un fichier “checkouts” pour votre
- catalogue des sources.</para>
- </listitem>
- </orderedlist>
-
- <para>Si vous mettez à jour vos sources pour la toute
- premi�re fois, naturellement vous n'avez pas de fichier
- “checkouts”. Apr�s l'installation de python
- et la mise à jour de vos sources (e.g.
- <filename>/usr/ports</filename>), vous pouvez les v�rifier
- ainsi:</para>
-
- <screen>&prompt.user; <filename>/path/to/</filename><userinput>cvsupchk -d /usr -c /usr/sup/ports-all/checkouts.cvs:. | more</userinput></screen>
-
- <para>Si vous d�sirez v�rifier vos sources RELENG_4:</para>
-
- <screen>&prompt.user; <filename>/path/to/</filename><userinput>cvsupchk -d /usr -c /usr/sup/src-all/checkouts.cvs:RELENG_4 | more</userinput></screen>
-
- <para>Dans chaque cas, <command>cvsupchk</command>
- inspectera vos sources à la
- recherche d'inconsistances en utilisant les informations
- contenues dans le fichier de “checkouts” relatif.
- Des anomalies comme des fichiers effac�s, encore
- pr�sents (aka fichiers obsol�tes), fichiers
- r�cup�r�s absents, fichiers RCS
- suppl�mentaires, et r�pertoires vides seront
- affich�s sur la sortie standard.</para>
-
- <para>Dans la section suivante, nous pr�senterons des exemples
- typiques de la mise à jour de source, exemples qui vous
- montreront le r�le des fichiers de “checkouts”
- et les dangers d'une gestion n�glig�e des sources.</para>
- </sect1>
-
- <sect1 id="examples">
- <title>Exemples avanc�s de gestion des sources</title>
-
- <sect2>
- <title>Comment modifier sans risques le champ tag quand vous
- mettez à jour <literal>src-all</literal></title>
-
- <para>Si vous sp�cifiez par exemple <literal>tag=A</literal>
- dans votre fichier <filename>supfile</filename>,
- <application>cvsup</application> cr�era
- un fichier “checkouts” appel�
- <filename>checkouts.cvs:A</filename>, par exemple avec le
- champ <literal>tag=RELENG_4</literal>, un fichier de
- “checkouts”
- <filename>checkouts.cvs:RELENG_4</filename> est
- g�n�r�. Ce fichier sera utilis�
- pour r�cup�rer et/ou stocker
- l'information identifiant vos sources 4-STABLE.</para>
-
- <para>En suivant le catalogue <literal>src-all</literal>, si
- vous souhaitez passer de <literal>tag=A</literal> à
- <literal>tag=B</literal> (A inf�rieur/sup�rieur
- à B important peu) et si votre fichier
- “checkouts” est
- <filename>checkouts.cvs:A</filename>, les op�rations
- suivantes devront �tre effectu�es:</para>
-
- <orderedlist>
- <listitem>
- <para>&prompt.root; <userinput>mv checkouts.cvs:A
-checkouts.cvs:B</userinput>
- (ceci fournit à l'�tape suivante le fichier
- “checkouts” appropri�)</para>
- </listitem>
-
- <listitem>
- <para>Ecrivez un fichier <filename>supfile</filename>
- dont la ligne d�signant le catalogue est:</para>
- <programlisting>src-all tag=B</programlisting>
- </listitem>
-
- <listitem>
- <para>Cvsupez vos sources en utilisant le nouveau
- <filename>supfile</filename>.</para>
- </listitem>
- </orderedlist>
-
- <para><application>Cvsup</application> recherchera <filename>checkouts.cvs:B</filename>
- -- dans ce cas la cible est B, c'est à dire que
- <application>cvsup</application> se
- servira des informations contenues dans ce fichier pour g�rer
- correctement vos sources.</para>
-
- <para>Les avantages:</para>
-
- <itemizedlist>
- <listitem>
- <para>Les sources sont trait�es correctement (en
- particulier aucun fichier obsol�te).</para>
- </listitem>
-
- <listitem>
- <para>Moins de charge sur le serveur, dans ce cas
- <application>CVSup</application>
- agit de la mani�re la plus efficace.</para>
- </listitem>
- </itemizedlist>
-
-
- <para>Par exemple, <literal>A=RELENG_4</literal>,
- <literal>B=.</literal>, le point dans <literal>B=.</literal>
- signifie -CURRENT. C'est une mise à jour plut�t
- typique de la branche 4-STABLE vers la branche -CURRENT.
- Alors qu'il est simple de revenir à une ancienne
- version de sources (e.g. -CURRENT vers -STABLE), il n'en va
- pas de m�me avec le syst�me. Vous �tes
- FORTEMENT d�conseill� de tenter une telle
- op�ration, à moins que vous ne sachiez
- exactement ce que vous faites.</para>
- </sect2>
-
- <sect2>
- <title>Mettre à jour en conservant le m�me champ
- tag mais pour une date diff�rente</title>
-
- <para>Si vous souhaitez basculer du champ <literal>tag=A</literal>
- au champ <literal>tag=A</literal> avec une date GMT
- diff�rente (disons <literal>date=D</literal>) vous
- ex�cuterez ce qui suit:</para>
-
- <orderedlist>
- <listitem>
- <para>Ecrivez un <filename>supfile</filename> dont la
- ligne d�signant le catalogue est:</para>
- <programlisting>src-all tag=A date=D</programlisting>
- </listitem>
-
- <listitem>
- <para>Mettez à jour vos sources en utilisant le nouveau
- <filename>supfile</filename>.</para>
- </listitem>
- </orderedlist>
-
- <para>Que la nouvelle date pr�c�de ou non celle
- de la derni�re synchronisation avec le champ
- <literal>tag=A</literal> est peu important. Par exemple,
- afin d'indiquer la date du “27 Ao�t 2000 à
- 10h00s00 GMT” vous �crirez la ligne:</para>
-
-
- <programlisting>src-all tag=RELENG_4 date=2000.08.27.10.00.00</programlisting>
-
- <note><para>Le format de la date est rigide. Vous devez
- indiquer toutes les composantes de la date: le si�cle
- (<quote>20</quote>, i.e. le vingti�me si�cle, doit �tre
- fourni tandis que <quote>19</quote>, le si�cle pass� peut
- �tre omis), l'ann�e, le mois, le jour, l'heure,
- les minutes et les secondes — comme montr� dans
- l'exemple ci-dessus. Pour plus d'information, veuillez
- consulter la page de manuel &man.cvsup.1;.</para></note>
-
- <para>Qu'une date soit sp�cifi�e ou non, le fichier
- “checkouts” est appel�
- <filename>checkouts.cvs:A</filename> (e.g.
- <filename>checkouts.cvs:RELENG_4</filename>). Comme
- cons�quence, aucune action particuli�re n'est
- n�cessaire afin de retourner à l'�tat
- pr�c�dent: vous devez modifier la date
- dans le <filename>supfile</filename> et remettre à
- jour à nouveau.</para>
- </sect2>
-
-
- <sect2>
- <title>Mise à jour de votre catalogue des logiciels
- port�s pour la premi�re fois</title>
-
- <para>Comme les logiciels port�s sont
- �tiquet�s “.” (i.e. -CURRENT),
- vous pouvez correctement les synchroniser en
- ajoutant le mot-cl� <literal>date</literal> (Cf
- &man.cvsup.1; pour le format exact), vous devriez
- sp�cifier une date aussi proche que possible que celle
- de “l'exp�dition” de votre catalogue de
- logiciel port�. Apr�s que <application>CVSup</application> ait
- cr�� le fichier “checkouts” du catalogue des
- logiciels port�s, qui est pr�cis�ment le
- but de cette premi�re op�ration de synchronisation,
- le champ <literal>date</literal> doit �tre retir�,
- toutes les mises à jour suivantes seront faites en
- douceur.</para>
-
- <para>Si vous avez voulu chercher la petite b�te dans ce texte,
- vous vous �tes probablement aper�u des
- probl�mes potentiels du processus de mise à jour des
- sources. Un certain nombre de personnes ont eu r�ellement
- des probl�mes. Vous avez �t�
- avertis. :-)</para>
- </sect2>
- </sect1>
-</article>
diff --git a/ja_JP.eucJP/htdocs/releases/index.xml b/ja_JP.eucJP/htdocs/releases/index.xml
index 8da66d89fd..58678f8bc0 100644
--- a/ja_JP.eucJP/htdocs/releases/index.xml
+++ b/ja_JP.eucJP/htdocs/releases/index.xml
@@ -5,7 +5,7 @@
]>
<!-- $FreeBSD$ -->
<!-- The FreeBSD Japanese Documentation Project -->
-<!-- Original revision: r41117 -->
+<!-- Original revision: r41543 -->
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
@@ -97,7 +97,7 @@
<p>����ޤǤΥ����Υ�������ʬ�ࡢ�ݼ齪λ�� (End-Of-Life (EOL))
�δ����ʾ���ϡ�<a href="&base;/security/security.html">FreeBSD
�������ƥ�����</a> ��
- <a href="&base;/security/security.html#unsup">���ݡ��Ȥ���λ��������</a>
+ <a href="&base;/security/unsupported.html">���ݡ��Ȥ���λ��������</a>
�ˤޤȤ���Ƥ��ޤ���</p>
<ul>
diff --git a/ja_JP.eucJP/htdocs/security/reporting.xml b/ja_JP.eucJP/htdocs/security/reporting.xml
index e6f2b1769b..e4de2c60ce 100644
--- a/ja_JP.eucJP/htdocs/security/reporting.xml
+++ b/ja_JP.eucJP/htdocs/security/reporting.xml
@@ -4,6 +4,8 @@
<!ENTITY title "FreeBSD �������ƥ��ȼ��������˴ؤ������">
]>
<!-- $FreeBSD$ -->
+<!-- The FreeBSD Japanese Documentation Project -->
+<!-- Original revision: r41455 -->
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
@@ -20,8 +22,8 @@
<li><a href="#how">FreeBSD �������ƥ�����������ˡ��Ϣ����ˤĤ���</a></li>
<li><a href="#sec">FreeBSD �������ƥ����ե����ˤĤ���</a></li>
<li><a href="#pol">����μ�갷���˴ؤ�������</a></li>
- <li><a href="#sup">���ݡ��Ȥ���Ƥ��� FreeBSD �Υ���</a></li>
- <li><a href="#unsup">���ݡ��Ȥ���λ���� FreeBSD ����</a></li>
+ <li><a href="security.html#sup">���ݡ��Ȥ���Ƥ��� FreeBSD �Υ���</a></li>
+ <li><a href="unsupported.html">���ݡ��Ȥ���λ���� FreeBSD ����</a></li>
</ul>
<a name="how"></a>
diff --git a/ja_JP.eucJP/share/xml/news.xml b/ja_JP.eucJP/share/xml/news.xml
index 7348034235..cd8a8442eb 100644
--- a/ja_JP.eucJP/share/xml/news.xml
+++ b/ja_JP.eucJP/share/xml/news.xml
@@ -20,7 +20,7 @@
the contents of <title> will be preferred over <p>.
$FreeBSD$
- Original revision: r41495
+ Original revision: r41524
-->
<news>
<cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
@@ -33,6 +33,23 @@
<month>
<name>4</name>
+ <day>
+ <name>29</name>
+
+ <event>
+ <title>�� &os; Foundation �ƥ��˥��륹���å�: Edward
+ Tomasz Napierała</title>
+
+ <p>The &os; Foundation �ϡ�
+ Edward Tomasz Napierała ������ܤΥƥ��˥��륹���åդ˲ä�ä����Ȥ��Τ餻���ޤ���
+ ����ϡ�2013 ǯ�� Foundation
+ ����³���ƹԤäƤ��륹���åդؤ����ˤ���ΤǤ���</p>
+
+ <p><a
+ href="http://freebsdfoundation.blogspot.com/2013/04/freebsd-foundation-announces-second.html">³�����ɤ�</a></p>
+ </event>
+ </day>
+
<day>
<name>24</name>
diff --git a/mn_MN.UTF-8/books/handbook/geom/chapter.xml b/mn_MN.UTF-8/books/handbook/geom/chapter.xml
index 66bb464ee9..350a9763bf 100644
--- a/mn_MN.UTF-8/books/handbook/geom/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/geom/chapter.xml
@@ -2,7 +2,7 @@
<!--
The FreeBSD Mongolian Documentation Project
- Original revision 39988
+ Original revision 40951
$FreeBSD$
-->
@@ -44,10 +44,10 @@
role="Redundant Array of Inexpensive Disks">RAID</acronym>
хянагч хэрэгслүүдийг багтаадаг. Энэ бүлэг нь I/O, доор нь байгаа дэд
систем, эсвэл кодыг GEOM хэрхэн зохицуулж эсвэл хянадаг талаар гүнзгий
- хэлэлцэхгүй. Энэхүү мэдээлэл нь &man.geom.4; гарын авлагын хуудас болон
- төрөл бүрийн SEE ALSO баримтуудын тусламжтай хангагддаг. Бас энэ бүлэг нь
- <acronym>RAID</acronym> тохиргоонуудын дэлгэрэнгүй заавар биш юм.
- Зөвхөн GEOM-дэмжигдсэн <acronym>RAID</acronym> ангиллуудын талаар
+ хэлэлцэхгүй. Энэхүү мэдээлэл нь &man.geom.4; болон
+ төрөл бүрийн <literal>SEE ALSO</literal> баримтуудын тусламжтай хангагддаг. Бас энэ бүлэг нь
+ <acronym>RAID</acronym> тохиргоонуудын дэлгэрэнгүй заавар биш бөгөөд
+ зөвхөн GEOM-дэмжигдсэн <acronym>RAID</acronym> ангиллуудын талаар
хэлэлцэх болно.</para>
<para>Энэ бүлгийг уншсаны дараа, та дараах зүйлсийг мэдэх болно:</para>
@@ -77,13 +77,13 @@
<itemizedlist>
<listitem>
- <para>&os; диск төхөөрөмжүүдийг хэрхэн үздэг талаар ойлгох
- (<xref linkend="disks"/>).</para>
+ <para>&os; <link linkend="disks">диск төхөөрөмжүүдийг</link>
+ хэрхэн үздэг талаар ойлгох.</para>
</listitem>
<listitem>
- <para>Шинэ &os; цөм хэрхэн тохируулж суулгах талаар мэдэх
- (<xref linkend="kernelconfig"/>).</para>
+ <para>Шинэ <link linkend="kernelconfig">&os; цөм</link>
+ хэрхэн тохируулж суулгах талаар мэдэх.</para>
</listitem>
</itemizedlist>
</sect1>
@@ -132,7 +132,7 @@
<primary>Судал үүсгэх</primary>
</indexterm>
- <para>Судал үүсгэх нь хэд хэдэн дискнүүдийг нэг эзлэхүүн болгодог арга юм.
+ <para>Судал үүсгэх нь хэд хэдэн дискнүүдийг нэгтгэж нэг эзлэхүүн болгодог.
Олон тохиолдолд энэ нь тоног төхөөрөмжийн хянагчуудыг ашиглан хийгддэг.
GEOM дэд систем нь диск судал үүсгэх гэж бас нэрлэгддэг
<acronym>RAID</acronym>0-д зориулсан програмыг хангаж өгдөг.</para>
@@ -211,9 +211,8 @@ Done.</screen>
<para>Энэ судал үүсгэсэн файлын системдээ ачаалах үед автоматаар холболт хийхийн
тулд эзлэхүүний мэдээллийг <filename>/etc/fstab</filename> файлд
- хийгээрэй. For this purpose, a permanent mount
- point, named <filename class="directory">stripe</filename>, is
- created:</para>
+ хийгээрэй. Энэ жишээн дээр <filename class="directory">stripe</filename>
+ гэсэн байнгын холбох цэгийг үүсгэж байна:</para>
<screen>&prompt.root; <userinput>mkdir /stripe</userinput>
&prompt.root; <userinput>echo "/dev/stripe/st0a /stripe ufs rw 2 2" \</userinput>
@@ -388,7 +387,7 @@ Done.</screen>
&prompt.root; <userinput>newfs -U /dev/mirror/gm0s1e</userinput>
&prompt.root; <userinput>newfs -U /dev/mirror/gm0s1f</userinput></screen>
- <para>Эх диск (<devicename>ada0</devicename>) дээрх файлын
+ <para>Эх диск <devicename>ada0</devicename> дээрх файлын
системийг толин тусгал руу &man.dump.8; ба &man.restore.8;
тушаалыг ашиглан хуулж болно.</para>
@@ -508,7 +507,7 @@ Done.</screen>
засварлах хэрэгтэй. Уг процедурыг дараа тайлбарлах болно.</para>
<para>Аль ч тохиолдолд анхдагч диск дээрх хуваалтын
- хүснэгтүүдийг эхэлж хуулах хэрэгтэй. Үүнийг &man.gpart.8;
+ хүснэгтүүдийг эхэлж хуулах хэрэгтэй бөгөөд &man.gpart.8;
<command>backup</command> ба <command>restore</command> дэд тушаалуудыг
ашиглан гүйцэтгэнэ.</para>
@@ -533,9 +532,9 @@ BSD 8
6 freebsd-ufs 130023424 838860800
7 freebsd-ufs 968884224 984640881</screen>
- <para>Хэрэв &man.gpart.8; <command>show</command> тушаалын
- гаралтад бүтэн диск ашиглагдаж байгаа бол эдгээр хуваалтын
- хүснэгтүүд дээрх багтаамжийг нэг сектороор багасгах хэрэгтэй.
+ <para>Хэрэв <command>gpart show</command> тушаал дискний төгсгөлд
+ зай байхгүй байгааг харуулж байгаа бол зүсмэл болон сүүлийн хуваалтыг
+ нэг сектороор багасгах хэрэгтэй.
Зүсмэл болон сүүлийн хуваалтын зайг нэгээр багасган хоёр
файлыг засварлах хэрэгтэй. Эдгээр нь жагсаалт бүрийн сүүлийн
тоонууд юм.</para>
@@ -557,12 +556,12 @@ BSD 8
байгаа бол эдгээр хоёр файлыг засварлалгүйгээр ашиглаж болно.</para>
<para>Одоо хуваалтын хүснэгтийг
- <devicename>mirror/gm0</devicename> руу сэргээнэ.</para>
+ <devicename>mirror/gm0</devicename> руу сэргээнэ:</para>
<screen>&prompt.root; <userinput>gpart restore mirror/gm0 < table.ada0</userinput>
&prompt.root; <userinput>gpart restore mirror/gm0s1 < table.ada0s1</userinput></screen>
- <para>&man.gpart.8; <command>show</command> тушаалаар
+ <para><command>gpart show</command> тушаалаар
хуваалтын хүснэгтийг шалгана. Энэ жишээ нь
<devicename>gm0s1a</devicename>-г <filename>/</filename>,
<devicename>gm0s1d</devicename>-г <filename>/var</filename>,
@@ -717,9 +716,9 @@ mirror/gm0 COMPLETE ada1 (ACTIVE)
<para>BIOS тохиргоог шинээр толин тусгал болгосон
дискнүүдийн аль нэгнээс ачаалахаар болгож тохируулах
- хэрэгтэй байж магадгүй юм. Аль ч дискийг ачаалахад
- ашиглаж болно. Толин тусгалын нэг хэсэг учраас тэдгээр нь
- ижил өгөгдөлтэй байдаг.</para>
+ хэрэгтэй байж магадгүй юм. Толин тусгалын нэг хэсэг учраас тэдгээр нь
+ ижил өгөгдөлтэй байдаг бөгөөд аль ч дискийг ачаалахад
+ ашиглаж болно.</para>
</sect4>
<sect4>
@@ -753,7 +752,7 @@ mountroot></screen>
<para><filename>geom_mirror</filename> модулийг
<filename>/boot/loader.conf</filename>-т оруулж дуудахаа
мартсан бол энэ асуудал гарна. Үүнийг засахын тулд
- &os;-9 эсвэл түүнээс хойшхи хувилбарын CD эсвэл USB дискнээс
+ &os; 9.0 эсвэл түүнээс хойшхи хувилбарын CD эсвэл USB дискнээс
ачаалаад эхний асуулт дээр <literal>Shell</literal>-г
сонгох хэрэгтэй. Дараа нь толин тусгалын модулийг дуудаж
толин тусгал төхөөрөмжийг холбох хэрэгтэй:</para>
@@ -771,7 +770,7 @@ mountroot></screen>
<para><literal>error 19</literal> гаргаж байгаа
бусад асуудлуудыг засварлахад илүү хүч зарах
- шаардлагатай. Асууж лавлах дэлгэц дээр
+ шаардлагатай. Ачаалах үеийн асууж лавлах дэлгэц дээр
<literal>ufs:/dev/ada0s1a</literal> гэж оруулж өгнө.
Систем хэдийгээр <devicename>ada0</devicename>-с
ачаалах ёстой боловч бүрхүүл сонгох асууж лавлах дэлгэц
@@ -793,13 +792,10 @@ mountroot></screen>
<sect2>
<title>Диск ажиллахаа болиход сэргээх</title>
- <para>Толин тусгалын гайхамшигтай тал бол аль нэг диск ажиллахаа
+ <para>Толин тусгалын ашигтай тал бол аль нэг диск ажиллахаа
байхад толин тусгал дээрх өгөгдөл алдагддаггүй явдал
- юм.</para>
-
- <para><devicename>ada0</devicename> нь дээрх жишээн дээр толин тусгал
- үүсгэж байгаа дискнүүдийн нэг юм. Хэрэв <devicename>ada0</devicename>
- ажиллахаа боливол нөгөө ажиллаж байгаа диск болох <devicename>ada1</devicename>-с
+ юм. Дээрх жишээн дээр <devicename>ada0</devicename> ажиллахаа
+ болиход ажиллаж байгаа диск болох <devicename>ada1</devicename>-с
өгөгдлөө өгөн толин тусгал ажилласан хэвээр байх болно.</para>
<para>Ажиллахаа больсон дискийг солихын тулд компьютерыг
@@ -962,10 +958,6 @@ Done.</screen>
<para>Дэлгэц дээгүүр олон тоо урсах бөгөөд
хэсэг хугацааны дараа процесс дуусах болно. Эзлэхүүн
үүсч холбох боломжтой болно.</para>
- </step>
-
- <step>
- <para>Сүүлийн алхам бол файлын системийг холбох явдал юм:</para>
<screen>&prompt.root; <userinput>mount /dev/raid3/gr0p1 /multimedia/</userinput></screen>
@@ -1004,7 +996,7 @@ Done.</screen>
<title>GEOM Хаалга Сүлжээний Төхөөрөмжүүд</title>
<para>GEOM нь хаалга хэрэгслүүдийг ашиглан дискнүүд, CD-ROM-ууд,
- файлууд гэх мэт төхөөрөмжүүдийг алсаас ашиглахыг дэмждэг.
+ файлуудыг алсаас ашиглахыг дэмждэг.
Энэ нь <acronym>NFS</acronym>-тэй адил юм.</para>
<para>Экспортын файл эхэлж үүсгэх шаардлагатай. Энэ файл нь
@@ -1025,14 +1017,14 @@ Done.</screen>
<screen>&prompt.root; <userinput>ggated</userinput></screen>
- <para>Хэрэглэх машинаас уг экспортлогдсон төхөөрөмжид <command>холболт</command> хийхдээ
+ <para>Хэрэглэх машинаас уг экспортлогдсон төхөөрөмжид <command>mount</command> хийхдээ
дараах тушаалыг өгнө үү:</para>
<screen>&prompt.root; <userinput>ggatec create -o rw 192.168.1.1 /dev/da0s4d</userinput>
ggate0
&prompt.root; <userinput>mount /dev/ggate0 /mnt</userinput></screen>
- <para>Эндээс эхлэн төхөөрөмжид <filename class="directory">/mnt</filename>
+ <para>Одоо төхөөрөмжид <filename class="directory">/mnt</filename>
холболтын цэгийг ашиглан хандаж болно.</para>
<note>
@@ -1060,12 +1052,12 @@ ggate0
нэмэгдсэн бол яах вэ? Флэш төхөөрөмжид <devicename>da0</devicename> гэсэн
төхөөрөмжийн нэр өгөгдөж хуучин байсан <devicename>da0</devicename> нь
<devicename>da1</devicename> болж өөрчлөгдөх болов уу. Энэ нь хэрэв
- файлын системүүд <filename>/etc/fstab</filename>-д жагсаагдсан
+ файлын системүүд <filename>/etc/fstab</filename>-д орсон
бол тэдгээрийг холбоход асуудал гаргах бөгөөд бүр системийг ачаалахгүй
байдалд хүргэж болох юм.</para>
- <para>Энэ асуудлын нэг шийдэл нь <acronym>SCSI</acronym> карт руу нэмэгдсэн
- шинэ төхөөрөмжид төхөөрөмжийн ашиглагдаагүй дугаарууд өгөгдөхөөр болгож
+ <para>Нэг шийдэл нь <acronym>SCSI</acronym> карт руу нэмэгдсэн
+ шинэ төхөөрөмжид төхөөрөмжийн ашиглагдаагүй дугаарууд өгч
<acronym>SCSI</acronym> төхөөрөмжүүдийг гинжин цуваа болгох явдал юм.
Гэхдээ анхдагч <acronym>SCSI</acronym> дискийг сольж болзошгүй
<acronym>USB</acronym> төхөөрөмжүүдийн хувьд яах вэ? Яагаад гэвэл <acronym>USB</acronym>
@@ -1076,8 +1068,8 @@ ggate0
<filename>/etc/fstab</filename> файлд хэзээ ч жагсаахгүй байх тийм
шийдэл байж болох юм.</para>
- <para>Илүү сайн шийдэл байдаг. <command>glabel</command> хэрэгсэл ашиглан
- администратор эсвэл хэрэглэгч өөрсдийн дискний төхөөрөмжүүдийг хаяглаж эдгээр
+ <para>Илүү сайн шийдэл нь <command>glabel</command> хэрэгсэл ашиглан
+ дискний төхөөрөмжүүдийг хаяглаж эдгээр
хаяг/шошгонуудыг <filename>/etc/fstab</filename> файлд ашиглаж болох
юм. <command>glabel</command> нь өгөгдсөн үзүүлэгчийн сүүлийн секторт
хаяг/шошгыг хадгалдаг болохоор хаяг/шошго нь дахин ачаалахад хэвээр байх
@@ -1086,9 +1078,9 @@ ggate0
юм.</para>
<note>
- <para>Хаяг/шошгыг байнгын болгохыг энд дурдсангүй. <command>glabel</command>
- хэрэгсэл нь түр зуурын болон байнгын хаяг/шошгыг үүсгэхэд ашиглагдаж болно.
- Зөвхөн байнгын хаяг/шошго нь дахин ачаалахад хэвээр үлдэх болно. Хаяг/шошгонуудын
+ <para><command>glabel</command>
+ хэрэгсэл нь түр зуурын болон байнгын хаяг/шошгыг үүсгэж чадна.
+ Хаяг/шошгонуудын
ялгаануудын тухай дэлгэрэнгүй мэдээллийг &man.glabel.8; гарын авлагын хуудаснаас
үзнэ үү.</para>
</note>
@@ -1096,22 +1088,21 @@ ggate0
<sect2>
<title>Хаяг/шошгоны төрлүүд болон жишээнүүд</title>
- <para>Ерөнхий ба файлын системийн гэсэн хоёр төрлийн хаяг/шошго байдаг.
- Хаяг, шошгонууд нь байнгын эсвэл түр зуурын байж болно. Байнгын хаягийг
+ <para>Байнгын хаяг нь ердийн ба файлын системийн гэсэн хоёр төрлийн байдаг.
+ Файлын системийн байнгын хаягийг
&man.tunefs.8; эсвэл &man.newfs.8; тушаалаар үүсгэж болно. Эдгээр
- хаяг/шошгонуудад тэдгээрийн файлын системийн төрөл дээр суурилсан нэр
- бүхий тусгай сан <filename class="directory">/dev</filename>
- сан дотор үүсгэгддэг. Жишээ нь <acronym>UFS</acronym>2 файлын системийн
+ хаяг/шошгонуудын төрлүүд <filename class="directory">/dev</filename> сангийн
+ дэд санд үүсгэгддэг бөгөөд файлын системийн төрлийн дагуу нэртэй байна.
+ Жишээ нь <acronym>UFS</acronym>2 файлын системийн
хаяг/шошгонууд <filename class="directory">/dev/ufs</filename> санд
- үүсгэгддэг. Байнгын хаягийг бас <command>glabel label</command> тушаалаар
+ үүсгэгддэг. Ердийн хаягийг <command>glabel label</command> тушаалаар
үүсгэж болдог. Эдгээр нь файлын системтэй хамааралгүй бөгөөд <filename
class="directory">/dev/label</filename> санд үүсгэгдэх болно.</para>
<para>Түр зуурын хаяг/шошго нь дараагийн удаа ачаалахад арилдаг. Эдгээр хаяг/шошгонууд
нь <filename class="directory">/dev/label</filename> санд үүсгэгдэх
- бөгөөд туршилтад сайн тохирсон байдаг. Түр зуурын хаягийг <command>glabel create</command>
- тушаалаар үүсгэж болно. Дэлгэрэнгүй мэдээллийг &man.glabel.8;-ийн гарын авлагын
- хуудаснаас уншина уу.</para>
+ бөгөөд туршилтад тохирсон байдаг. Түр зуурын хаягийг <command>glabel create</command>
+ тушаалаар үүсгэж болно.</para>
<!-- XXXTR: How do you create a file system label without running newfs
or when there is no newfs (e.g.: cd9660)? -->
@@ -1123,9 +1114,7 @@ ggate0
<warning>
<para>Хэрэв файлын систем дүүрэн бол энэ нь өгөгдлийн эвдрэлд хүргэж
- болох юм; гэхдээ хэрэв файлын систем дүүрэн бол гол зорилго нь
- хуучирсан файлуудыг устгаж хаяг/шошгонуудыг нэмэхгүй байх
- явдал юм.</para>
+ болох юм.</para>
</warning>
<para>Хаяг/шошго одоо <filename class="directory">/dev/ufs</filename> санд
@@ -1139,7 +1128,7 @@ ggate0
холбох ёсгүй.</para>
</note>
- <para>Одоо файлын системийг ердийнхөөрөө холбож болно:</para>
+ <para>Одоо файлын системийг холбож болно:</para>
<screen>&prompt.root; <userinput>mount /home</userinput></screen>
@@ -1151,7 +1140,7 @@ ggate0
<para>Файлын систем нь <command>newfs</command> тушаалд
өгөгдсөн <option>-L</option> тугны тусламжтайгаар анхдагч хаяг/шошготой
- үүсгэгдэж бас болно. Дэлгэрэнгүй мэдээллийг &man.newfs.8; гарын авлагын хуудаснаас
+ үүсгэгдэж бас болно. Дэлгэрэнгүй мэдээллийг &man.newfs.8;-с
үзнэ үү.</para>
<para>Доор дурдсан тушаалыг хаяг/шошгыг устгахдаа ашиглаж болно:</para>
@@ -1172,7 +1161,7 @@ ggate0
Бас <filename class="directory">/</filename>,
<filename class="directory">/var</filename>,
<filename class="directory">/usr</filename> ба
- <filename class="directory">/tmp</filename> файлын системүүд
+ <filename class="directory">/tmp</filename>
болон swap хуваалттай &os;-ийн стандарт хуваалтын хэлбэрийг
ашиглаж байгаа болно.</para>
@@ -1263,17 +1252,17 @@ ufsid/486b6fc16926168e N/A ad4s1f</screen>
<primary>Journaling</primary>
</indexterm>
- <para>&os; 7.0 хувилбар гарснаар удаан хүсэн хүлээсэн
- journals буюу тэмдэглэлийн боломж бүрдсэн билээ.
- Энэхүү шийдэл нь өөрөө <acronym>GEOM</acronym> дэд системийн
+ <para>&os; 7.0 хувилбараас эхлээд UFS journals буюу
+ тэмдэглэлийн боломж бүрдсэн билээ.
+ Энэхүү шийдэл нь <acronym>GEOM</acronym> дэд системийн
тусламжтайгаар хийгдсэн бөгөөд &man.gjournal.8; хэрэгслийн
тусламжтай хялбар тохируулж болдог.</para>
- <para>Journaling буюу тэмдэглэл гэж юу вэ? Тэмдэглэх чадвар
- нь файлын системийн шилжүүлгүүдийн бүртгэлийг хадгалдаг, өөрөөр
- хэлбэл мета өгөгдөл болон файлын бичилтүүд дискэнд зөвөөр хийгдэхээс
- өмнө дискний бүрэн гүйцэд бичих үйлдлийг бүтээдэг өөрчлөлтүүдийн
- бүртгэлийг хадгалдаг. Файлын системийн бүрэн бус байдлаас
+ <para>Journaling буюу тэмдэглэх чадвар нь мета өгөгдөл болон
+ файлын бичилтүүд дискэнд зөвөөр хийгдэхээс өмнө дискний
+ бүрэн гүйцэд бичих үйлдлийг бүтээдэг өөрчлөлтүүдийн
+ бүртгэл зэрэг файлын системийн шилжүүлгүүдийн бүртгэлийг
+ хадгалдаг. Файлын системийн бүрэн бус байдлаас
хамгаалахын тулд файлын системийн шилжүүлгүүдийг дахин гүйцэтгэхийн
тулд энэхүү шилжүүлгүүдийн бүртгэлийг дараа нь дахин
ажиллуулж болдог.</para>
@@ -1287,8 +1276,8 @@ ufsid/486b6fc16926168e N/A ad4s1f</screen>
<para>Өөр бусад файлын системийн тэмдэглэлийн шийдлүүдээс ялгаатай нь
<command>gjournal</command> арга нь блок дээр тулгуурласан бөгөөд
- файлын системийн хэсэг болж хийгдээгүй, зөвхөн <acronym>GEOM</acronym>
- өргөтгөлийн хүрээнд хийгдсэн.</para>
+ файлын системийн хэсэг болж хийгдээгүй. Энэ нь <acronym>GEOM</acronym>
+ өргөтгөл юм.</para>
<para><command>gjournal</command>-д зориулсан дэмжлэгийг идэвхжүүлэхийн
тулд &os; цөм нь 7.0 болон түүнээс хойшхи системүүд дээр анхдагчаар байдаг доор дурдсан
@@ -1308,10 +1297,10 @@ ufsid/486b6fc16926168e N/A ad4s1f</screen>
<programlisting>options GEOM_JOURNAL</programlisting>
- <para><devicename>da4</devicename> нь шинэ <acronym>SCSI</acronym> диск
- гэж тооцвол чөлөөтэй файлын систем дээр тэмдэглэл үүсгэхийн тулд
+ <para>Чөлөөтэй файлын систем дээр тэмдэглэл үүсгэхийн тулд
одоо доор дурдсан алхмуудыг ашиглан хийж
- болно:</para>
+ болно. Энэ жишээн дээр <devicename>da4</devicename> нь шинэ <acronym>SCSI</acronym> диск
+ байна:</para>
<screen>&prompt.root; <userinput>gjournal load</userinput>
&prompt.root; <userinput>gjournal label /dev/da4</userinput></screen>
@@ -1323,8 +1312,8 @@ ufsid/486b6fc16926168e N/A ad4s1f</screen>
<screen>&prompt.root; <userinput>newfs -O 2 -J /dev/da4.journal</userinput></screen>
- <para>Өмнө ажиллуулсан тушаал <acronym>UFS</acronym>2
- файлын системийг тэмдэгдэл идэвхжсэн төхөөрөмж дээр үүсгэх
+ <para>Энэ тушаал <acronym>UFS</acronym>2
+ файлын системийг тэмдэглэл идэвхжсэн төхөөрөмж дээр үүсгэх
болно.</para>
<para>Төхөөрөмжийг хүссэн цэгтээ доор дурдсан тушаалаар
@@ -1339,13 +1328,13 @@ ufsid/486b6fc16926168e N/A ad4s1f</screen>
<devicename>ad4s1.journal</devicename> болон <devicename>ad4s2.journal</devicename> үүсгэх болно.</para>
</note>
- <para>Хурдан ажиллагаатай байхын тулд тэмдэглэлийг өөр диск дээр байлгах нь
- зүйтэй байдаг. Энэ тохиолдолд тэмдэглэл хангагч эсвэл
+ <para>Хурдан ажиллагаатай байхын тулд тэмдэглэлийг өөр диск дээр
+ байлгаж болно. Энэ тохиолдолд тэмдэглэл хангагч эсвэл
хадгалалтын төхөөрөмж нь тэмдэглэлийг идэвхжүүлэхийн тулд
уг төхөөрөмжийнхөө дараа жагсаагдах ёстой. <command>tunefs</command>
тушаал ашиглан тухайн байгаа файлын систем дээр тэмдэглэлийг
- идэвхжүүлж болдог; гэхдээ файлын системийг өөрчлөхөөсөө өмнө
- нөөц үргэлж хийж байх хэрэгтэй. Ихэнх тохиолдолд
+ идэвхжүүлж болдог. Гэхдээ файлын системийг өөрчлөхөөсөө өмнө
+ нөөц <emphasis>үргэлж</emphasis> хийж байх хэрэгтэй. Ихэнх тохиолдолд
<command>gjournal</command> нь яг тэмдэглэлийг үүсгэж
чадаагүй бол амжилтгүй болох бөгөөд гэхдээ энэ нь
<command>tunefs</command>-ийг буруугаар ашигласнаас болоод
diff --git a/ru_RU.KOI8-R/articles/Makefile b/ru_RU.KOI8-R/articles/Makefile
index ede82a5c3f..2adddc56b1 100644
--- a/ru_RU.KOI8-R/articles/Makefile
+++ b/ru_RU.KOI8-R/articles/Makefile
@@ -15,7 +15,6 @@ SUBDIR+= contributing
SUBDIR+= cups
SUBDIR+= custom-gcc
SUBDIR+= cvs-freebsd
-SUBDIR+= cvsup-advanced
SUBDIR+= explaining-bsd
SUBDIR+= fbsd-from-scratch
#SUBDIR+= filtering-bridges
diff --git a/ru_RU.KOI8-R/articles/cvsup-advanced/Makefile b/ru_RU.KOI8-R/articles/cvsup-advanced/Makefile
deleted file mode 100644
index dc019ba55c..0000000000
--- a/ru_RU.KOI8-R/articles/cvsup-advanced/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# The FreeBSD Russian Documentation Project
-#
-# $FreeBSD$
-# $FreeBSDru: frdp/doc/ru_RU.KOI8-R/articles/cvsup-advanced/Makefile,v 1.3 2005/06/12 05:19:07 gad Exp $
-#
-# Original revision: r20561
-#
-# Article: CVSup Advanced Points
-
-DOC?= article
-
-FORMATS?= html
-WITH_ARTICLE_TOC?=YES
-
-INSTALL_COMPRESSED?=gz
-INSTALL_ONLY_COMPRESSED?=
-
-SRCS= article.xml
-
-DOC_PREFIX?= ${.CURDIR}/../../..
-.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/ru_RU.KOI8-R/articles/cvsup-advanced/article.xml b/ru_RU.KOI8-R/articles/cvsup-advanced/article.xml
deleted file mode 100644
index 9a6f2e7ffb..0000000000
--- a/ru_RU.KOI8-R/articles/cvsup-advanced/article.xml
+++ /dev/null
@@ -1,277 +0,0 @@
-<?xml version="1.0" encoding="koi8-r"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
- "../../../share/xml/freebsd45.dtd">
-
-<!--
- The FreeBSD Russian Documentation Project
-
- $FreeBSDru: frdp/doc/ru_RU.KOI8-R/articles/cvsup-advanced/article.xml,v 1.5 2005/06/12 05:18:06 gad Exp $
-
- Original revision: r23909
--->
-
-<article lang="ru">
- <articleinfo>
- <title>������ ������� ������ CVSup</title>
-
- <authorgroup>
- <author>
- <firstname>Salvo</firstname>
- <surname>Bartolotta</surname>
-
- <affiliation>
- <address><email>bartequi@neomedia.it</email></address>
- </affiliation>
- </author>
- </authorgroup>
-
- <legalnotice id="trademarks" role="trademarks">
- &tm-attrib.freebsd;
- &tm-attrib.cvsup;
- &tm-attrib.general;
- </legalnotice>
-
- <pubdate>$FreeBSD$</pubdate>
-
- <releaseinfo>$FreeBSD$</releaseinfo>
-
- <abstract>
- <para>� ���� ������ �������������� ��������� �����
- ������ <application>CVSup</application>. � ��� ����������� ���������
- ������ �������, ��������� � �������������� �������� ������� ��� ������
- <application>CVSup</application>, ������� ����������� ������� ��� ��������
- ���������� ������, � ����� ������ ������ ���������� �������� �������; �������,
- �������, ������ �����, �������� ���������� ����������� ��������.</para>
- </abstract>
- </articleinfo>
-
- <sect1 id="preface">
- <title>�����</title>
-
- <para>���� �������� �������� ������ ������� ������ ��������� ������
- ������������ <application>CVSup</application> & ����������
- ��������� ����. :-) ���� ����� �������� ��� ������, ����� �������
- ��� �������� ����������� �������������� � �����������, �� ����� ����
- ������� � ��� ������� ��� ���� ��������, ������ � ��� �����. �� �����
- ����� ����������� �� ����� ����������� �/��� ���������, ������� �� ��������
- ��� �� ����������� ����� �� ����� <email>bartequi@neomedia.it</email>.</para>
- </sect1>
-
- <sect1 id="introduction">
- <title>��������</title>
-
- <para>���� �� �������� <ulink url="http://www.polstra.com/">���� �����
- �������</ulink> (John Polstra) � ������ <ulink
- url="http://www.polstra.com/projects/freeware/CVSup/faq.html">���
- FAQ</ulink>, �� �� ����� �������� ������� 12 & 13.</para>
-
- <para>��� ���������� ������ ������ �������� ������� (��������,
- <filename>/usr/ports</filename>), &man.cvsup.1; ����������
- ��������������� ���� ���������� ��� ����, ����� ��������� �������
- ���������� ����� ���������� � ����������� ��������. � ���� �������
- (<filename>/usr/ports</filename>), ��������������� ������ ����������
- �������� <filename>/usr/sup/ports-all/checkouts.cvs:.</filename> ����
- �������� ��������� �������� <filename>/usr</filename>.</para>
-
- <para>���� ���������� �������� ���������� � ������� ��������� �����
- �������� ������� — ����� ����� <quote>����������</quote>. ���
- �������� ���������� ��������� <command>cvsup</command> ��������
- ���������� �������� ����������. � ���� ��, �, ����� ����, �����
- ����� ��, ��� ��� ��������� <command>cvsup</command> ���������
- ��������� ������ ��������� ��������, ������ ��������� �����, �������
- ������ ��� � ���������, ����� ������� �� �������� ���������� � �����
- ������� ������� ������. �������������, ��� �����
- ���������� <command>cvsup</command> <emphasis>��</emphasis>
- ����� �����, �� ����� ������ ������� ��� ����� (����������� �������� �
- ���������� ������� �� &man.cvsup.1; ������������ ������ �������); �
- ���������� �� �� ����� ������� � ����� ������� �� �����, ������� ������
- ��� � ���������. ��� (��������� �����) ����� ���������� � �������, �
- ����� ������� ��������� ������ ��� ���������� ��� ������ ��������. �
- �������, ��������� ���� �������� ������ ��������, ���� �� ������ ���
- �������� ��� ����� ������ ����� ��������� ������ ����� ��������� �����
- ������������ �������-������.</para>
-
- <para>�� ���� ������� �������������, ��� �� ���������� �����������
- ���������, ��������� � <application>CVSup</application> FAQ (�������� Q12, Q13); �
- ����������� �������� ��� ����� ���� ���������� �������, ���������� �
- ������������.</para>
- </sect1>
-
- <sect1 id="script">
- <title>�������� ������ �� ����� python: <command>cvsupchk</command></title>
-
- <para>��� ������������ ��� �������� ����������� ����� �������� ������� ��
- ������ ������������ ������ <command>cvsupchk</command>, ���������� �� �����
- python; ���� ������ � ��������� ����� ��������� �
- <filename>/usr/ports/net/cvsup/work/cvsup-16.1/contrib/cvsupchk</filename>,
- ������ � ������� <filename>README</filename>. ���������������
- ����������:</para>
-
- <orderedlist>
- <listitem>
- <para><literal>/usr/ports/net/cvsup</literal> &prompt.root;
- <userinput> make extract</userinput></para>
- </listitem>
-
- <listitem>
- <para>python (����� ��������� � ��������� ������ :-))</para>
- </listitem>
-
- <listitem>
- <para>���� ���������� ��� ������ ������ �������� �������.</para>
- </listitem>
- </orderedlist>
-
- <para>���� �� ���������� ���� �������� ������ ����� ������ ���, ������� ��,
- � ��� ��� ����� ����������. ����� ��������� python � ���������� �����
- �������� ������� (� �������, <filename>/usr/ports</filename>), �� ������
- ��������� �� ���:</para>
-
- <screen>&prompt.user; <filename>/path/to/</filename><userinput>cvsupchk -d /usr -c /usr/sup/ports-all/checkouts.cvs:. | more</userinput></screen>
-
- <para>���� �� ������ ��������� ���� �������� ������ RELENG_4:</para>
-
- <screen>&prompt.user; <filename>/path/to/</filename><userinput>cvsupchk -d /usr -c /usr/sup/src-all/checkouts.cvs:RELENG_4 | more</userinput></screen>
-
- <para>� ������ ������ <command>cvsupchk</command> ����� ��������� ���� ��������
- ������ �� �����������, ��������� ����������, ����������� � ��������������� �����
- ����������. ��������� � ����� ���������, ��� ����������� ���������
- ������ (��� ���������� ������� ������), ���������� ����������� ������,
- ������� ������ ������ RCS � ������� ��������� ����� ���������� ��
- ����������� �����.</para>
-
- <para>� ��������� ������� �� ����� ������, ������� ������� ����������
- �������� �������; ��� ������� ������� ��� ���� ������ ���������� �
- ��������� ���������� ���������� ��������� ��������.</para>
- </sect1>
-
- <sect1 id="examples">
- <title>������� ����� ������� ���������� ��������� ��������</title>
-
- <sect2>
- <title>��� ��������� �������� ���� ��� ����������
-<literal>src-all</literal></title>
-
- <para>���� � ����� <filename>sup-�����</filename> �� ������, �
- �������, <literal>tag=A</literal>, �� <command>cvsup</command>
- ������� ���� ���������� � ������ <filename>checkouts.cvs:A</filename>:
- ��������, ���� <literal>tag=RELENG_4</literal>, �� ����������� ����
- ���������� ���������� <filename>checkouts.cvs:RELENG_4</filename>. ���� ����
- ����� �������������� ��� ��������� �/��� ���������� ����������,
- ���������������� ���� �������� ������ 4-STABLE.</para>
-
- <para>��� ������������ <literal>src-all</literal>, ���� �� ������ �������
- �� <literal>tag=A</literal> � <literal>tag=B</literal> (�� �����
- ��������, ������ ��� ������ A, ��� B), � ��� ���� ����������
- ���������� <filename>checkouts.cvs:A</filename>, ��
- ������ ���� ��������� ��������� ��������:</para>
-
- <orderedlist>
- <listitem>
- <para>&prompt.root; <userinput>mv checkouts.cvs:A
- checkouts.cvs:B</userinput>
- (��� ���� �� ����������� ���� ���������� ���� ����������)</para>
- </listitem>
-
- <listitem>
- <para>�������� <filename>sup-����</filename>, �� ������� �������, ������� ��������:</para>
- <programlisting>src-all tag=B</programlisting>
- </listitem>
-
- <listitem>
- <para>��� ������ cvsup ��������� ���������� ����� �������� �������
- � ����� <filename>sup-������</filename>.</para>
- </listitem>
- </orderedlist>
-
- <para><command>cvsup</command> ����� ������ <filename>checkouts.cvs:B</filename> — ���
- ��� ����� �������� B, �� <command>cvsup</command> ��� ����������� ����������
- ������ ��������� �������� ����� ������������ ����������, ������������
- �����.</para>
-
- <para>��������:</para>
-
- <itemizedlist>
- <listitem>
- <para>� ��������� �������� ������ ������������ ��������� (�
- ���������, �� �������� ������� ������)</para>
- </listitem>
-
- <listitem>
- <para>�� ������ ������� ������� ��������, ��� ��� <command>cvsup</command> ��������
- ����� ����������� �������.</para>
- </listitem>
- </itemizedlist>
-
- <para>� �������, <literal>A=RELENG_4</literal>, <literal>B=.</literal> �����
- � <literal>B=.</literal> �������� -CURRENT. ��� ������ �������� ����������, ��
- 4-STABLE � -CURRENT. ���� �������, ���
- <quote>���������</quote> ���� �������� ������ (� �������, �� -CURRENT � -STABLE),
- ��������� ������ ������� �������� ������ ������ ��������. ���
- ������������ �� ������������� ��������� ����� ��������, ���� ������ ��
- ����� �� ���������, ��� �������.</para>
- </sect2>
-
- <sect2>
- <title>���������� � ����� � ��� �� ����� � ������� ������</title>
-
- <para>���� �� ������ ������� �� <literal>tag=A</literal> �
- <literal>tag=A</literal> � ������������
- GMT-����� (������, <literal>date=D</literal>), �� ���������� ���������:</para>
-
- <orderedlist>
- <listitem>
- <para>�������� <filename>sup-����</filename> � ����� �������, ������������ �����:</para>
- <programlisting>src-all tag=A date=D</programlisting>
- </listitem>
-
- <listitem>
- <para>�������� ���� �������� ������ � ������� ������ <filename>sup-�����</filename></para>
- </listitem>
- </orderedlist>
-
- <para>�� ����� ��������, ������������ �� ����� ���� ������� ���������
- �������� ������������� � <literal>tag=A</literal>, ��� ���. ��������, ���
- ����, ����� ������ ���� <quote>August 27, 2000, 10:00:00 GMT</quote>, �� ������
- ������:</para>
-
- <programlisting>src-all tag=RELENG_4 date=2000.08.27.10.00.00</programlisting>
-
- <note>
- <para>������ ���� �����. �� ������� ��� ���������� ����: �������� (<quote>20</quote>,
- �� ���� 21 ���. ������ ���� ������, ����� ��� <quote>19</quote>,
- ������� ��������, ����� ���� �������), ���, �����, ����, ���, ������,
- ������� — ��� �������� � ������� ����. �� �������������� �����������
- ���������� � �������� ���������� ������� �� &man.cvsup.1;.</para>
- </note>
-
- <para>��� ����������� �� ����, ������ ��� ��� ����, ���� ����������
- ���������� <filename>checkouts.cvs:A</filename> (��������,
- <filename>checkouts.cvs:RELENG_4</filename>). � ����� �� �����
- �����-�� �������� ��� �������� � ����������� ���������: �� ���������
- ���� � <filename>sup-�����</filename>, � ����������
- <command>cvsup</command> �����.</para>
- </sect2>
-
- <sect2>
- <title>���������� ����� ��������� ������ ����� ������ ���</title>
-
- <para>���� �� ������ <quote>����������������</quote> ���� ������
- ������ � ������ ���, �� ������ ������������ ���, ����������� �
- ����� ������������� ������� &os;. ��������, ���� �� ����������
- ��������� ������ �� ����� ��������� &os; 5.3-RELEASE, ��
- ������� ������������ ��������� ������:
- <programlisting>ports-all tag=RELEASE_5_3_0</programlisting>
- <command>cvsup</command> ������� ���� ���������� ��� ���������
- ������. ������ �� ����� ������������ ��� <quote>.</quote> ���
- ������������ ���������� ������ ������:
- <programlisting>ports-all tag=.</programlisting>
- ��� ����������� ���������� ����� �������������� ������.</para>
-
- <para>���� �� ������ ������ ��������� � ���� ��������, ��, ��������, ��
- �������� ������������� �������� � �������� ���������� ��������
- �������. ������ ������������� ������������ � ����������. ���
- ������������. :-)</para>
- </sect2>
- </sect1>
-</article>
diff --git a/share/pgpkeys/itetcu.key b/share/pgpkeys/itetcu.key
index f4d1628a0c..0775b7bd46 100644
--- a/share/pgpkeys/itetcu.key
+++ b/share/pgpkeys/itetcu.key
@@ -1,74 +1,63 @@
<!-- $FreeBSD$ -->
<!--
-sh addkey.sh itetcu F0808380;
+sh addkey.sh itetcu 29597D20;
-->
<programlisting role="pgpfingerprint"><![CDATA[
-pub 4096R/F0808380 2012-11-19 [expires: 2014-11-19]
- Key fingerprint = BAEC BFED 67D8 7529 5B53 C636 C922 F9F4 F080 8380
-uid Ion-Mihai "IOnut" Tetcu <itetcu@FreeBSD.org>
-sub 4096R/54B3FFA0 2012-11-19 [expires: 2014-11-19]
+pub 4096R/29597D20 2013-05-02
+ Key fingerprint = AB6F 39B6 605D E6B7 0D54 ED3D BCA2 129A 2959 7D20
+uid Ion-Mihai Tetcu (FreeBSD Committer key) <itetcu@FreeBSD.org>
+sub 4096R/EC9E17E3 2013-05-02
]]></programlisting>
<programlisting role="pgpkey"><![CDATA[
-----BEGIN PGP PUBLIC KEY BLOCK-----
-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
-=o4Z4
+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
+/as7XDPGqpDTGynLpsYRRxnfBp6Hirr8MKme
+=RYSt
-----END PGP PUBLIC KEY BLOCK-----
]]></programlisting>
diff --git a/share/xml/events2013.xml b/share/xml/events2013.xml
index 61346fa220..aa5fd7651c 100644
--- a/share/xml/events2013.xml
+++ b/share/xml/events2013.xml
@@ -114,8 +114,8 @@
</enddate>
<location>
<country code="MT">Malta</country>
- <city>TBA</city>
- <site>St. Julians's area</site>
+ <city>St. Julian's</city>
+ <site>Hilton Conference Centre</site>
</location>
<description>We are happy to announce that the EuroBSDcon 2013
will be held on Saturday 28th and Sunday 29th of September 2013
From fd27f6900bff61a433cc25b5a2cc6fc680227279 Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Tue, 7 May 2013 14:33:38 +0000
Subject: [PATCH 108/121] - Use absolute URLs in printed formats
---
share/mk/doc.docbook.mk | 10 ++++++----
share/xml/urls.ent | 5 +----
2 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/share/mk/doc.docbook.mk b/share/mk/doc.docbook.mk
index 30a38db86e..a0d8571214 100644
--- a/share/mk/doc.docbook.mk
+++ b/share/mk/doc.docbook.mk
@@ -204,7 +204,7 @@ LOCAL_CSS_SHEET= ${.OBJDIR}/${CSS_SHEET:T}
LOCAL_CSS_SHEET= ${CSS_SHEET:T}
.endif
-CLEANFILES+= ${DOC}.parsed.xml
+CLEANFILES+= ${DOC}.parsed.xml ${DOC}.parsed.print.xml
.for _curformat in ${FORMATS}
_cf=${_curformat}
@@ -360,6 +360,8 @@ ${DOC}.parsed.xml: ${SRCS}
${RM} ${.TARGET}.tmp
.else
${MV} ${.TARGET}.tmp ${.TARGET}
+ ${SED} 's|@@URL_RELPREFIX@@|http://www.FreeBSD.org|g' < ${.TARGET} > ${DOC}.parsed.print.xml
+ ${SED} -i '' 's|@@URL_RELPREFIX@@|../../../..|g' ${.TARGET}
.endif
# XHTML -------------------------------------------------------------
@@ -452,7 +454,7 @@ ${DOC}.tex: ${SRCS} ${LOCAL_IMAGES_EPS} ${PRINT_INDEX} \
${LOCAL_IMAGES_TXT} ${LOCAL_IMAGES_EN} \
${DOC}.parsed.xml
${JADE} -V tex-backend ${PRINTOPTS} \
- ${JADEOPTS} -t tex -o ${.TARGET} ${XMLDECL} ${DOC}.parsed.xml
+ ${JADEOPTS} -t tex -o ${.TARGET} ${XMLDECL} ${DOC}.parsed.print.xml
${SED} -i '' -e 's|{1}\\def\\ScaleY%|{0.5}\\def\\ScaleY%|g' \
-e 's|{1}\\def\\EntitySystemId%|{0.5}\\def\\EntitySystemId%|g' \
${.TARGET}
@@ -489,8 +491,8 @@ ${DOC}.pdf:
.endif
.elif ${RENDERENGINE} == "fop"
-${DOC}.fo: ${DOC}.xml ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG}
- ${XSLTPROC} ${XSLTPROCOPTS} ${XSLFO} ${DOC}.parsed.xml > ${.TARGET}
+${DOC}.fo: ${DOC}.xml ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG} ${DOC}.parsed.xml
+ ${XSLTPROC} ${XSLTPROCOPTS} ${XSLFO} ${DOC}.parsed.print.xml > ${.TARGET}
${DOC}.pdf: ${DOC}.fo ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG}
${FOP} ${FOPOPTS} ${DOC}.fo ${.TARGET}
diff --git a/share/xml/urls.ent b/share/xml/urls.ent
index c92568bde9..5887fe6c55 100644
--- a/share/xml/urls.ent
+++ b/share/xml/urls.ent
@@ -6,10 +6,7 @@
<!ENTITY url.relprefix "../../../..">
-<![ %freebsd.urls.absolute; [
-<!ENTITY url.base "http://www.FreeBSD.org">
-]]>
-<!ENTITY url.base "&url.relprefix;">
+<!ENTITY url.base "@@URL_RELPREFIX@@">
<!-- XXX: This will be removed soon -->
<!ENTITY url.main "&url.base;">
From a1f23ecf64648c915d456b04c6e30b715e7fab0d Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Tue, 7 May 2013 18:39:50 +0000
Subject: [PATCH 109/121] - Fix build
---
ja_JP.eucJP/articles/fbsd-from-scratch/article.xml | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/ja_JP.eucJP/articles/fbsd-from-scratch/article.xml b/ja_JP.eucJP/articles/fbsd-from-scratch/article.xml
index e25c4e9760..33288da154 100644
--- a/ja_JP.eucJP/articles/fbsd-from-scratch/article.xml
+++ b/ja_JP.eucJP/articles/fbsd-from-scratch/article.xml
@@ -431,7 +431,7 @@ Do you wish to delete what is left of /var/tmp/temproot.stage1? [no] <userinput>
</warning>
<programlisting>
-<xi:include href="stage_1.conf.default" parse="text"/>
+<xi:include href="stage_1.conf.default" parse="text" encoding="euc-jp"/>
</programlisting>
<para>�����������: <ulink
@@ -539,7 +539,7 @@ news inn-stable CONFIGURE_ARGS="--enable-uucp-rnews --enable-setgid-inews" make
�Ȥ���̾���Υ����ե����뤬��������ޤ���</para>
<programlisting>
-<xi:include href="stage_2.conf.default" parse="text"/>
+<xi:include href="stage_2.conf.default" parse="text" encoding="euc-jp"/>
</programlisting>
<para>�����������: <ulink
@@ -677,7 +677,7 @@ fi
������ץȤǤ������Ƥ��ѹ�����ɬ�פϤʤ��Ǥ��礦��</para>
<programlisting>
-<xi:include href="stage_1.sh" parse="text"/>
+<xi:include href="stage_1.sh" parse="text" encoding="euc-jp"/>
</programlisting>
<para>�����������: <ulink
@@ -688,7 +688,7 @@ fi
������ץȤǤ����ǽ����ʬ�ˤ����ѿ����ѹ����ޤ��礦��</para>
<programlisting>
-<xi:include href="stage_2.sh" parse="text"/>
+<xi:include href="stage_2.sh" parse="text" encoding="euc-jp"/>
</programlisting>
<para>�����������: <ulink
@@ -699,7 +699,7 @@ fi
�����ưŪ�ˤ����ʤ�����μ�����������ޤ���</para>
<programlisting>
-<xi:include href="stage_3.mk" parse="text"/>
+<xi:include href="stage_3.mk" parse="text" encoding="euc-jp"/>
</programlisting>
<para>�����������: <ulink
From fdac88b190249651245e480b4eb2fcb5fb282d4e Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Wed, 8 May 2013 09:27:58 +0000
Subject: [PATCH 110/121] - Fix rendering of the last modified text. - We have
our own complete CSS file so do not generate one with XSLT
---
share/xsl/freebsd-xhtml-common.xsl | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/share/xsl/freebsd-xhtml-common.xsl b/share/xsl/freebsd-xhtml-common.xsl
index 320d64c447..3dfad00553 100644
--- a/share/xsl/freebsd-xhtml-common.xsl
+++ b/share/xsl/freebsd-xhtml-common.xsl
@@ -25,6 +25,7 @@
<xsl:param name="admon.style"/>
<xsl:param name="make.year.ranges" select="1"/>
<xsl:param name="make.single.year.ranges" select="1"/>
+ <xsl:param name="docbook.css.source" select="''"/>
<xsl:param name="make.valid.html" select="1"/>
<xsl:param name="html.cleanup" select="1"/>
@@ -272,14 +273,13 @@
<xsl:with-param name="key" select="'on'"/>
</xsl:call-template>
<xsl:call-template name="gentext.space"/>
- Last modified on <xsl:value-of select="$pubdate"/>
+ <xsl:value-of select="$pubdate"/>
<xsl:if test="$committer">
- <xsl:call-template name="gentext.space"/>
- <xsl:value-of select="$committer"/>
<xsl:call-template name="gentext.space"/>
<xsl:call-template name="gentext">
<xsl:with-param name="key" select="'by'"/>
</xsl:call-template>
+ <xsl:value-of select="$committer"/>
</xsl:if>
<xsl:text>.</xsl:text>
</xsl:template>
From 4f41586556e701f69e28442c0b6eceba72f79260 Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Wed, 8 May 2013 12:10:29 +0000
Subject: [PATCH 111/121] - Add a missing space.
---
share/xsl/freebsd-xhtml-common.xsl | 1 +
1 file changed, 1 insertion(+)
diff --git a/share/xsl/freebsd-xhtml-common.xsl b/share/xsl/freebsd-xhtml-common.xsl
index 3dfad00553..6dd1f6495f 100644
--- a/share/xsl/freebsd-xhtml-common.xsl
+++ b/share/xsl/freebsd-xhtml-common.xsl
@@ -279,6 +279,7 @@
<xsl:call-template name="gentext">
<xsl:with-param name="key" select="'by'"/>
</xsl:call-template>
+ <xsl:call-template name="gentext.space"/>
<xsl:value-of select="$committer"/>
</xsl:if>
<xsl:text>.</xsl:text>
From 478de03cac11c51f0d9684aca6d75a0201d47d77 Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Sun, 12 May 2013 17:36:00 +0000
Subject: [PATCH 112/121] - Readjust styling for some recent changes
---
share/misc/docbook.css | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/share/misc/docbook.css b/share/misc/docbook.css
index e982575fbd..4e5990b058 100644
--- a/share/misc/docbook.css
+++ b/share/misc/docbook.css
@@ -145,12 +145,15 @@ div.procedure p b {
}
h1.title, h2.title, h3.title, h4.title, h5.title, h6.title,
-h3.author, .corpauthor, .abstract p.title,
-div.toc p:first-child,
-div.list-of-figures p:first-child,
-div.list-of-tables p:first-child,
-div.list-of-examples p:first-child {
+h3.author, .corpauthor,
+div.abstract div.abstract-title,
+div.toc div.toc-title,
+div.list-of-figures div.toc-title,
+div.list-of-tables div.toc-title,
+div.list-of-examples div.toc-title {
+ font-weight: bold;
line-height: 1.3;
+ margin-top: 1em;
margin-left: 0;
color: #990000;
}
From 6cc555440469675541a7c362cfb8d8f450156c13 Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Sun, 12 May 2013 17:36:38 +0000
Subject: [PATCH 113/121] - Add title to legalnotices, which changes the link
name pointing to them
---
share/xml/trademarks.ent | 3 +++
1 file changed, 3 insertions(+)
diff --git a/share/xml/trademarks.ent b/share/xml/trademarks.ent
index 5de65f0371..e35f5843c9 100644
--- a/share/xml/trademarks.ent
+++ b/share/xml/trademarks.ent
@@ -426,6 +426,8 @@ Coverity, Inc.</para>">
<!ENTITY legalnotice '
<legalnotice id="legalnotice">
+ <title>Copyright</title>
+
<para>Redistribution and use in source (XML DocBook) and 'compiled'
forms (XML, HTML, PDF, PostScript, RTF and so forth) with or without
modification, are permitted provided that the following conditions are
@@ -466,6 +468,7 @@ Coverity, Inc.</para>">
<!ENTITY trademarks '
<legalnotice id="trademarks" role="trademarks">
+ <title>Legal Notice</title>
<para>FreeBSD is a registered trademark of The FreeBSD Foundation.</para>
From 0438408178e1f3ebbd35c22b3cc2633712214608 Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Sun, 12 May 2013 17:37:10 +0000
Subject: [PATCH 114/121] - Do not render userinput with bold
---
share/xsl/freebsd-common.xsl | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/share/xsl/freebsd-common.xsl b/share/xsl/freebsd-common.xsl
index 5fb46c8491..ed97e30cf1 100644
--- a/share/xsl/freebsd-common.xsl
+++ b/share/xsl/freebsd-common.xsl
@@ -12,6 +12,10 @@
<xsl:call-template name="inline.monoseq"/>
</xsl:template>
+ <xsl:template match="userinput">
+ <xsl:call-template name="inline.monoseq"/>
+ </xsl:template>
+
<xsl:template name="svnweb.link">
<xsl:param name="repo" select="'base'"/>
<xsl:param name="rev"/>
From d8e60c9b381b5f178ddb4d3eb5bfa3fae91eac93 Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Sun, 12 May 2013 17:37:57 +0000
Subject: [PATCH 115/121] - Add a doc format navigation at the end of the
titlepage as we used to have
---
share/xsl/freebsd-xhtml-common.xsl | 25 +++++++++++++++++++++++--
1 file changed, 23 insertions(+), 2 deletions(-)
diff --git a/share/xsl/freebsd-xhtml-common.xsl b/share/xsl/freebsd-xhtml-common.xsl
index 6dd1f6495f..fb8b9bc866 100644
--- a/share/xsl/freebsd-xhtml-common.xsl
+++ b/share/xsl/freebsd-xhtml-common.xsl
@@ -10,10 +10,10 @@
exclude-result-prefixes="#default">
<!-- Include the common customizations -->
- <xsl:include href="freebsd-common.xsl"/>
+ <xsl:import href="freebsd-common.xsl"/>
<!-- Include customized XHTML titlepage -->
- <xsl:include href="freebsd-xhtml-titlepage.xsl"/>
+ <xsl:import href="freebsd-xhtml-titlepage.xsl"/>
<!-- Redefine variables, and replace templates as necessary here -->
@@ -49,6 +49,20 @@
For questions about this documentation, e-mail <<a href="mailto:doc@FreeBSD.org">doc@FreeBSD.org</a>>.</small></p>
</xsl:template>
+ <xsl:template name="docformatnav">
+ <xsl:variable name="single.fname">
+ <xsl:choose>
+ <xsl:when test="/book">book.html</xsl:when>
+ <xsl:when test="/article">article.html</xsl:when>
+ </xsl:choose>
+ </xsl:variable>
+
+ <div class="docformatnavi">
+ [ <a href="index.html">Split HTML</a> /
+ <a href="{$single.fname}">Single HTML</a> ]
+ </div>
+ </xsl:template>
+
<xsl:template match="citerefentry" mode="no.anchor.mode">
<xsl:apply-templates select="*" mode="no.anchor.mode"/>
</xsl:template>
@@ -284,4 +298,11 @@
</xsl:if>
<xsl:text>.</xsl:text>
</xsl:template>
+
+ <!-- Hook in format navigation at the end of the titlepage -->
+ <xsl:template name="book.titlepage.separator">
+ <xsl:call-template name="docformatnav"/>
+
+ <hr/>
+ </xsl:template>
</xsl:stylesheet>
From f4f6d84a74fc9e1f5c0c95baace2b989537979ca Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Mon, 13 May 2013 16:51:51 +0000
Subject: [PATCH 116/121] - Add a boxed formatting for procedure descriptions
---
share/misc/docbook.css | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/share/misc/docbook.css b/share/misc/docbook.css
index 4e5990b058..8c1bf85571 100644
--- a/share/misc/docbook.css
+++ b/share/misc/docbook.css
@@ -259,14 +259,14 @@ div.programlisting {
text-align: left;
}
-.note, .tip, .important, .warning, .caution, .example {
+.note, .tip, .important, .warning, .caution, .example, div.procedure {
border-radius: 6px;
padding: 2ex 2ex;
margin: .75em 3em .75em 3em;
line-height: 1.3;
}
-.note {
+.note, div.procedure {
color: #222;
background: #eee;
border: 1px solid #ccc;
@@ -314,6 +314,12 @@ div.programlisting {
margin-right: 0;
}
+.procedure-title {
+ font-weight: bold;
+ line-height: 1;
+ margin-right: 0;
+}
+
.note p, .tip p, .important p, .warning p, .caution p, .example p {
display: inline;
}
@@ -331,6 +337,10 @@ div.programlisting {
font-weight: bold;
}
+.userinput {
+ font-weight: normal;
+}
+
pre.screen strong {
font-weight: normal;
}
From 4c135ee021c711a9c51961d246ee37fd25bf9178 Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Mon, 13 May 2013 16:52:32 +0000
Subject: [PATCH 117/121] - Do not render commands in bold - Merge two patterns
---
share/xsl/freebsd-common.xsl | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/share/xsl/freebsd-common.xsl b/share/xsl/freebsd-common.xsl
index ed97e30cf1..94fce635d8 100644
--- a/share/xsl/freebsd-common.xsl
+++ b/share/xsl/freebsd-common.xsl
@@ -8,11 +8,7 @@
<!-- Global customisation -->
<!-- Redefine variables, and replace templates as necessary here -->
- <xsl:template match="hostid|username|groupname|devicename|maketarget|makevar">
- <xsl:call-template name="inline.monoseq"/>
- </xsl:template>
-
- <xsl:template match="userinput">
+ <xsl:template match="hostid|username|groupname|devicename|maketarget|makevar|userinput|command">
<xsl:call-template name="inline.monoseq"/>
</xsl:template>
From 518b16d8e72d5d89d14f0b2a17243219ec04aafd Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Wed, 15 May 2013 13:40:06 +0000
Subject: [PATCH 118/121] - The old LANGCODE detection was bogus and did not
work properly with release notes. Use a different approach that works.
---
share/mk/doc.common.mk | 16 ++--------------
1 file changed, 2 insertions(+), 14 deletions(-)
diff --git a/share/mk/doc.common.mk b/share/mk/doc.common.mk
index 5785078b24..a5c0723111 100644
--- a/share/mk/doc.common.mk
+++ b/share/mk/doc.common.mk
@@ -20,20 +20,8 @@ DOC_PREFIX_NAME?= head
.endif
.if (!defined(LANGCODE) || empty(LANGCODE))
-# Calculate _LANGCODE.
-_LANGCODE:= ${.CURDIR}
-. for _ in 1 2 3 4 5 6 7 8 9 10
-. if !(${_LANGCODE:H:T} == ${DOC_PREFIX_NAME})
-_LANGCODE:= ${_LANGCODE:H}
-. endif
-. endfor
-_LANGCODE:= ${_LANGCODE:T}
-.else # (!defined(LANGCODE) || empty(LANGCODE))
-# when LANGCODE is defined, use the value.
-_LANGCODE?= ${LANGCODE}
-.endif # (!defined(LANGCODE) || empty(LANGCODE))
-
-LANGCODE?= ${_LANGCODE}
+LANGCODE!= echo ${.CURDIR} | grep -o '[a-z]*_[A-Z]*\.[-A-Za-z0-9]*' || true
+.endif
# normalize DOC_PREFIX
DOC_PREFIX!= ${REALPATH} ${DOC_PREFIX}
From 73674733ad39f816cef41387179845058ad7e720 Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Wed, 15 May 2013 13:40:51 +0000
Subject: [PATCH 119/121] - Properly support EXTRA_CATALOGS (they are now XML
catalogs)
---
share/mk/doc.xml.mk | 3 +++
1 file changed, 3 insertions(+)
diff --git a/share/mk/doc.xml.mk b/share/mk/doc.xml.mk
index 14b2c8dd8c..67a79a64a9 100644
--- a/share/mk/doc.xml.mk
+++ b/share/mk/doc.xml.mk
@@ -6,6 +6,9 @@ XML_CATALOG_FILES= file://${.OBJDIR}/catalog-cwd.xml \
file://${DOC_PREFIX}/share/xml/catalog.xml \
file://${DOC_PREFIX}/share/xml/catalog-common.xml \
file://${LOCALBASE}/share/xml/catalog
+.if defined(EXTRA_CATALOGS)
+XML_CATALOG_FILES+= ${EXTRA_CATALOGS}
+.endif
.if exists(${DOC_PREFIX}/share/xml/catalog-cwd.xml)
XML_CATALOG_CWD= ${DOC_PREFIX}/share/xml/catalog-cwd.xml
From faf9dd01522eab47f2b185ec488325e52300bfe0 Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Wed, 15 May 2013 13:42:25 +0000
Subject: [PATCH 120/121] - Add a releasetype profiling attribute that will be
used in the release notes to avoid the ugly workaround of that parameter
entities can only be used in DTD subset now.
---
share/xml/freebsd45.dtd | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/share/xml/freebsd45.dtd b/share/xml/freebsd45.dtd
index 61f8e571ba..4261864bac 100644
--- a/share/xml/freebsd45.dtd
+++ b/share/xml/freebsd45.dtd
@@ -32,7 +32,11 @@
<!ENTITY % edition.attrib
"edition CDATA #IMPLIED">
-<!ENTITY % local.effectivity.attrib "%edition.attrib;">
+<!ENTITY % releasetype.attrib
+ "releasetype CDATA #IMPLIED">
+
+<!ENTITY % local.effectivity.attrib "%edition.attrib;
+ %releasetype.attrib;">
<!ELEMENT xi:include (xi:fallback?)>
From e8f02ce7e1fd3d3cdcd338f9eceb426dc5f33bfc Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Fri, 17 May 2013 18:05:43 +0000
Subject: [PATCH 121/121] - MFH
---
en_US.ISO8859-1/books/faq/book.xml | 3 +-
.../fdp-primer/writing-style/chapter.xml | 4 +
.../news/status/report-2013-01-2013-03.xml | 10 +-
share/pgpkeys/philip.key | 5133 ++++++++++-------
share/xml/header.ent | 1 +
share/xml/navibar.ent | 1 +
6 files changed, 3005 insertions(+), 2147 deletions(-)
diff --git a/en_US.ISO8859-1/books/faq/book.xml b/en_US.ISO8859-1/books/faq/book.xml
index a11873adf5..d652c37f09 100644
--- a/en_US.ISO8859-1/books/faq/book.xml
+++ b/en_US.ISO8859-1/books/faq/book.xml
@@ -1732,8 +1732,7 @@
</question>
<answer>
- <para>&os; supports SCSI and QIC-36 (with a QIC-02
- interface).</para>
+ <para>&os; supports all standard SCSI tape interfaces.</para>
</answer>
</qandaentry>
diff --git a/en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.xml b/en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.xml
index ba151b3cc8..44f4b217f9 100644
--- a/en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.xml
+++ b/en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.xml
@@ -478,6 +478,10 @@ GB. Hardware compression …</literallayout>
<para>null-modem</para>
</listitem>
+ <listitem>
+ <para>read-only</para>
+ </listitem>
+
<listitem>
<para>web server</para>
</listitem>
diff --git a/en_US.ISO8859-1/htdocs/news/status/report-2013-01-2013-03.xml b/en_US.ISO8859-1/htdocs/news/status/report-2013-01-2013-03.xml
index f39d13e467..cd6b0a72f8 100644
--- a/en_US.ISO8859-1/htdocs/news/status/report-2013-01-2013-03.xml
+++ b/en_US.ISO8859-1/htdocs/news/status/report-2013-01-2013-03.xml
@@ -620,7 +620,7 @@
</body>
<help>
- <task>Evaluating if it is worth to migrate any of the other
+ <task>Evaluating if it is worthwhile to migrate any of the other
callout(9) consumers to the new interface.</task>
<task>Move callout consumers still using the legacy
timeout()/untimeout() interface to callout_*() in order to get
@@ -1096,7 +1096,7 @@
<p>The project progressed well since February:</p>
<ul>
- <li>Konstantin committed is TTM port to 10-CURRENT.</li>
+ <li>Konstantin committed his TTM port to 10-CURRENT.</li>
<li>With the help of John Baldwin (jhb) and Andriy Gapon (avg),
the Video BIOS situation greatly improved: the
@@ -1121,17 +1121,17 @@
the VM folks.</li>
</ul>
- <p><a href="http://www.yakaz.com/">Yakaz</a> lended
+ <p><a href="http://www.yakaz.com/">Yakaz</a> loaned
Jean-Sébastien a computer which allows him to test a
RV630-based discrete card and, in the future, other PCIe cards.
Several users already kindly tested the driver. Big thanks to
all those contributors!</p>
- <p>In its current state, the driver allows to have a simple X
+ <p>In its current state, the driver allows a simple X
session (no OpenGL), run common applications, watch movies,
change the resolution and enable additional monitors with
<tt>xrandr(1)</tt>. The most blocking issue now is the OpenGL
- deadlock which prevents to run modern compositors/desktop
+ deadlock which prevents running modern compositors/desktop
environment, games and WebGL demos. We are not ready for a
"Call For Testers" yet.</p>
</body>
diff --git a/share/pgpkeys/philip.key b/share/pgpkeys/philip.key
index d0dab6886a..428e6a9433 100644
--- a/share/pgpkeys/philip.key
+++ b/share/pgpkeys/philip.key
@@ -10,8 +10,8 @@ uid Philip Paeps <philip@nixsys.be>
uid Philip Paeps <philip@fosdem.org>
uid Philip Paeps <philip@freebsd.org>
uid Philip Paeps <philip@pub.telenet.be>
-sub 1024D/035EFC58 2006-10-22 [expires: 2010-10-13]
-sub 2048g/6E5FD7D6 2006-10-22 [expires: 2010-10-14]
+sub 1024D/035EFC58 2006-10-22
+sub 2048g/6E5FD7D6 2006-10-22
]]></programlisting>
<programlisting role="pgpkey"><![CDATA[
-----BEGIN PGP PUBLIC KEY BLOCK-----
@@ -550,2146 +550,2999 @@ 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
-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
-7+GIRgQTEQIABgUCReNPuQAKCRCMJe4PDcC31mALAKC6vjgCJiOi08bYlK6wJIuB
-Ob1I+wCbBTIQK/GoP4pP/WQElaspEI9uJl6IRgQTEQIABgUCRerf2wAKCRBB3ByQ
-ckSXC5QqAJ9ic1QAEQxO4Us8nb7XDma0mgpc0gCgpug02QF2GHfWZcd1uRPyytIE
-CaqISgQQEQIACgUCRVSzOgMFA3gACgkQXyyEoT62BG3o2QCeP3ANQeCZqkeYOY76
-KBkmb8mvJYgAn282Syns2QBXaRdh32CSowOjVUK2iI0EEBECAE0FAkXxgyVGFIAA
-AAAADgAvIGZhbGNvQG00eC5vcmdodHRwOi8vZmFsY2FsLm5ldC9ncGcvMHgwMjFD
-NUJEMi0weEM1RDM0RDA1LmFzYwAKCRCnfEveAhxb0gWyAJ9Dvb+0THnTnzjpujK4
-6qx3w4GjbgCgk7+1sjtvEacRzzsFXpRB1GtRNmWIvAQQAQIABgUCRe++kgAKCRDt
-oh6UtWVxbx41BP9qnNahfVcdoIUx+SW0qgniCvpkqJe+MEZkW+Uctmc1MHMd0Isf
-mvLwsNJLVSKvbsnWhroGpHKas+L+IQ4/c/InfQ+2cgU2lYueqfJNQeL5KXVWvfuw
-8TsLDO89WNWRaxqPAmh8zmq0g3SMvZeYGHfUoTamCbGIFdP6JTtD/7Jr5u0A/VQ1
-NtHFOnKnyQeLxKiUE6VcqkCrHwZDU0+kNc3RiPUEEBECALUFAkU+WgyHFIAAAAAA
-EABuc2lnbm90ZXNAZ3JlcC5iZSJodHRwOi8vd3d3LmdyZXAuYmUvZ3BnLzQyNjcx
-MDEzRjk0QTBBQkVCNENFOUI2RDNERkMyQzYyQUY3OUQyOUUvMzU2QkFFMDI0NzYz
-RjczOTJGQTJFNDM4MjY0OUU2MjhDNUQzNEQwNS5hc2MiJhpodHRwOi8vd3d3Lmdy
-ZXAuYmUvZ3BnL2NlcnQtcG9saWN5LXYyAAoJED38LGKvedKe8vgAoJUZ/vyqJjh9
-O9J8v3WCn8OuBvUfAJsGpOOA7zm+c1tUK/ThAJ1LA6YPH4kBHAQQAQIABgUCRTy8
-LAAKCRCC0vbqxLuen3zTCACCuWXUoJQqS+pX4CX6gflKWf9Z4aHfHojtaJlo7tPQ
-re3dO2YB+5UpByiYIVNggrk8Im0nHnL4Cwt5OEmWBl1Ux766NH1IuWQWg4wwBOMt
-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
-Y29AbTR4Lm9yZ2h0dHA6Ly9mYWxjYWwubmV0L2dwZy8weDAyMUM1QkQyLTB4QzVE
-MzREMDUuYXNjAAoJEKd8S94CHFvSjMwAoJKRUhYm3g3GQc7Ax5Mvie9Mos/cAKCJ
-Ht3BGEU4sXrZQcq46mb8/z/p4Ij1BBARAgC1BQJFPloMhxSAAAAAABAAbnNpZ25v
-dGVzQGdyZXAuYmUiaHR0cDovL3d3dy5ncmVwLmJlL2dwZy80MjY3MTAxM0Y5NEEw
-QUJFQjRDRTlCNkQzREZDMkM2MkFGNzlEMjlFLzM1NkJBRTAyNDc2M0Y3MzkyRkEy
-RTQzODI2NDlFNjI4QzVEMzREMDUuYXNjIiYaaHR0cDovL3d3dy5ncmVwLmJlL2dw
-Zy9jZXJ0LXBvbGljeS12MgAKCRA9/Cxir3nSnia6AJ9WPIdOlKIIwOeSCBx0uYlM
-UM2tQACfQKbqhzbKM8RyO3QXO4XE3CybJ8aJARwEEAECAAYFAkU8vCwACgkQgtL2
-6sS7np+53Af/RSNZhaUC0B+D06crMIfkqfA2c2K6EJatcm9c7mXH5VLXKkkqjH7x
-80wOtDi3GKzZLOwCkwlk6d88eISpx9dBMipxUUlJqYC+a9FMWMaZgcLd7EPuDTuq
-kHfCHQLpPkMDXFIj+XP8T4pt3pdG1a+eoGUdz00KypSz2Fk64ylznd1XHEdexlW/
-I4E1ZAlWEmcLENobjarXiIHzcvJJj9GQXLCxO+b6H9Mew0OBLxcJZJzrurclo7Nh
-Nwh0JSEwkoB7xS6jerfSndbeKg6mJ1fGmmhkyvhe08/zv4ZyzP3rtArBqJq4sPJ3
-zCX/gqqkfm6Q4OMD8scaCCs59x6fdubPT4kBHAQQAQIABgUCRVdNPAAKCRAu1F1m
-YaBz6WyGB/9TroL46iD2Ya35k+/eQVEJzpRtNXZZ6BkSismkWY11psNGiYFyTJuK
-B72s8g+BAij8XmXnywrZYukz7IdHwWa0avkMGQ7kne5ATn2629UTbvQy9/ceStTZ
-mWjqTP1+g2ERDMmXM834cSimbFJBCW1SZllRBqchTBBtSrBLRomBOquEha+wffpe
-mMRG7F7d3ARGFsXG4oWgOV3BiKs+J+PV8ajolC1jDq7Tnrdy+FbOZJunkwdGmvKH
-GU1QnjzZV69+g0dzOif3gKi1gsrirce3YMQTpayINt3DZKdZw9ki3DCrizqTJU5h
-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
-XG6ofB7hL+4abYhGBBMRAgAGBQJFZgjJAAoJEEIUTAYlN20+tIMAoI1sQr27vJjE
-xoiQGwS674X/MwP5AJ0Zj12bSG+EBxCgMCFtvx5C7EEyuIhGBBMRAgAGBQJF40+5
-AAoJEIwl7g8NwLfWE6YAoMPz6GU0qjr+TKlYphjlJKZtHcaKAKCNNgXR/3sHhcc0
-G8z0awGUymF8mohGBBMRAgAGBQJF6t/bAAoJEEHcHJByRJcLjTQAn17ykf+m0+RB
-N2/Uj1UW4M2yL6g3AJ4/hfu8brIfsJ0HMxpeKEtVRvQedohKBBARAgAKBQJFVLM6
-AwUDeAAKCRBfLIShPrYEbaNVAJ9dCSUkmKdSi88RxPKDhen9M1CBYQCdFRhJlyA6
-+pCx6sKas7bv6ZleLAuIjQQQEQIATQUCRfGDJUYUgAAAAAAOAC8gZmFsY29AbTR4
-Lm9yZ2h0dHA6Ly9mYWxjYWwubmV0L2dwZy8weDAyMUM1QkQyLTB4QzVEMzREMDUu
-YXNjAAoJEKd8S94CHFvSVUYAn1VOGjali5cGBQBcO2OXXepNIS10AKCckhrCG4Aa
-BGfhoWdJJuXSEpTCfYicBBABAgAGBQJFVcyrAAoJEB9/qQgDWPy9kLgD/RICpKsH
-41qM1mt6XZeO66AZXjo0O1yB9Nl5XSBPiE+Rs5wDfLMheFbbgAOwhfTvwM4g7eBi
-Lb0U77DP5uCK/8rvsIowhJYmwJaaQrc4SzQuiIHqe22ybUOOcP68NBRozASuecg2
-3hlmcNNvHz0I6ImX5Ql0QpgT5RYSxupejuoPiLwEEAECAAYFAkXvvpMACgkQ7aIe
-lLVlcW9PAgT/cYFUQ3RsdPPpidzqp03htsyx4Rj91ugKmMSQ3uciUKmOdpJfAr9P
-jE4eQEMg/q1KHOxLGlOHjpYdlNgGOsEZHXIGyNFbKdCy6iPb3/uhfEWXcKVMEkr2
-uKN9bgQ3xMHR3LnmqIwr8/f72yYXx0MXYN5TfsDdG2gnlfCAjmWeZDhdoBRwOnEd
-C2I6Eh2QKClbgGSu53V/SSskplrypMn/voj1BBARAgC1BQJFPloMhxSAAAAAABAA
-bnNpZ25vdGVzQGdyZXAuYmUiaHR0cDovL3d3dy5ncmVwLmJlL2dwZy80MjY3MTAx
-M0Y5NEEwQUJFQjRDRTlCNkQzREZDMkM2MkFGNzlEMjlFLzM1NkJBRTAyNDc2M0Y3
-MzkyRkEyRTQzODI2NDlFNjI4QzVEMzREMDUuYXNjIiYaaHR0cDovL3d3dy5ncmVw
-LmJlL2dwZy9jZXJ0LXBvbGljeS12MgAKCRA9/Cxir3nSnp05AJ90DnV5DBT3yYYg
-ZuIv6IV6juBdqQCeJ+83BlaSULAG73i2GN3PvLcnjVCJARwEEAECAAYFAkU8vCwA
-CgkQgtL26sS7np8BtwgAmD4NZDrgIXFnHzFLrbFm2WXEJDRpHtyLD/ZQsg5a/KZP
-3prYPo8E6LKxhWa9d7Jo3XCnOZx6rzU+yYDXO8bPaejE40nZbWE/KLlS4JfZR+NG
-y/9/hsY9NUecAcaaMolYO9kItVEor7uvN8bBoAuq62Cjk061nVJ9C99PNe/HxT6A
-UriLRSmBfwGSPhS3XovIJhKIKOnD/uENCt5z+1xPsmBKf6HdkWHJ7lR6h3Adw/cd
-BR7m0J0NIzGWWDpqHlxTtVnCG+/U2/A5sOrFXXpJ9+6P7X6RRWLfa6I+kbTBjMQ5
-P1MIuNVXULaztJYxH8UGFHhQKvPVJfGg39dQtrD3K4kBHAQQAQIABgUCRVdNPAAK
-CRAu1F1mYaBz6fogB/9Iv+ufc/AzqqgEU3ZeZk/ygdKQ2MaDTLHtygs3uoNU2pqP
-ISBF1mN8YMz8llW01vDiPe/71X1ruak5suiQbt1JnP/zaZoTViVp73BusCwXB9vH
-jicQBPVX5redxfvOywZxRwWEAUruSDQrL5XV7wZTb6DzR0AnJ3sDEpLeekkstLP0
-qVjIba5HM6W7QA0GXd8LgIWsiZDjORIwFtXfWPqjSW5wbOi5iFIIKJfvrnAErGNW
-aU176Uz2Hof6j7pAvpS6qw6Eh7dfhmcKENoF3TSkP6W+NkaWKWfOwvfPZ3KukN5h
-18SVoF2nuVpq6X7FbyARgAB5Xla1Q5SmTGgHC6OZiQEcBBABAgAGBQJF40fZAAoJ
-EOjgYvYNywQx8pYH/joj//2ZL8gACYnzMoioKi/A7nziggo9CjE3NqHjLyBnP8QW
-XtV1uPZ+05moiLyIJPwDoG12mycXxd3bQWyABVkYh17ERysxAYNzy4xu9FBF1xio
-Xc9M+HTPzY7l+lwbjXsgpRvdrxpgiQkB43BLsN+ADV9Q/BLPJzCSYsiKdGU/XNeM
-feJdnzyw748y40cbp3LHT5AQNEccx4jYD0N4u53MXSF2vcaBIKBJxcrmA9w8HXX0
-ZAGM24+fuIKMpEL4u2Q75KMNajfypYQANk0ZI3SJv0rMrp0VN6JcyROmDqoviwlx
-L+7QJf5xWZdQ1QNSdeVvJ+Q+eKzqkfTYgEH4lLeJAhwEEAECAAYFAkVErk0ACgkQ
-V5MNqwuGsGeWrg/8DGUc+xnaV/Dvr/xzZZgMr66j/2sbLNajSbB85KDKsnlchK5D
-KiYazFYl/RsAT5ZgnhCnDkF6WpApIpsebcwZmD1svmm85geieKlh+RjiXMpHPQxi
-a0cQd/n0+5AWshr1vzFtL4Ddm1PQ3qu3FzoAh5VuRFyviYoJFbfs2rPnfmdqDoE9
-BMOniCN68Y4aDskCV3ahWVWEZXLndpYjUH3UxQlLT+DXMfaBbbzDRRERqUcNxDSr
-LFUvO6qyUF3DbjlJUNgxE0OefXJScjvIHB1PeJM/DjPlhDRsAexgxW6vhiTZiX+L
-MZL3Ru8RCJ6Pps6GhpL+dZt5aInwgkiQb2T8IfumCDRmsc06iGdLPBXY2bE+IX7b
-p1GlCTHP6WKy+HdilU0i5UXGj6wE76zoW99MB32vnEWCTTGRyqjtdfHJXkKjkV9c
-Zf7M5hGsvqWpSnNsvdlF5GwaHUV71O1g2DAKx2r6YmwhhEcr9nZrex1QfImMj6Sr
-Ejajh4jbDHxvhunlmgcQoZC0HF6tJhslKhrH5T1Kk0VLPX0Z5RZgayzwJCVGRMAn
-cWx5Cizd2dTD8uIKeBDGkFYusquIQYKJku1ZD3swoReaIMoofNKMJ9FRJ1vnaI5B
-M21WOLGkYsqFDUotIk5MWWB2+ZjMfFS2tMLPYMEYJbIr8TpwJ1KECwvwAYeJAhwE
-EAECAAYFAkVFGsMACgkQ8nHgrm5wPZV4SBAAkFMzI0wnaHv72BuhbncE/CA/tTeP
-WclRV7jPx42OcjjBdKyMSzhjHm9KznAymW4Iiy1AilxrsGnCum1CT9XWgWThy1J2
-mCVxJW5xRypl+rSWM8Qxt8naW+p6mb574lZmKsUGv6Rs7RjCFJMbkT7TqAbGiMyF
-+omppyFsVo9pbmDpPIgl5PuskCpD8tS2SMom5XdnjGYfRsT4DPK/9x2IYMIgmJCW
-IcG43gNVY103DiaLTL35H/MTDtRCLi/a6YiuMjAB2Cz5E3Afnc5s+HxO+f4hT/Ow
-M2JSJLcQLkVA9innEVAWSPfPornRpSSm2hQqnWUu47L98bLoFct5VBV6uqcDvFT4
-oUIhfLtqqaUsLJDwOQ/98i3hJnyqJDAL/hLhbiPmTrsHr+KRDZ9deLl2mqUOf4dE
-rPpn4m1jhi0aEvnhlNDBNRUofk3U9F2nEgBYjfS34J0d9p/JQnkf19OdbiAK4bgW
-Pw9wcY8jztPsjTJd74rylwwRf1AibRGmklcRTE8sZDX55+oMou5NqQ9kaTzE29gN
-Msw/t92Iv+h7TFkhTWEU1sHYBgQ/9N9nsoK3395/kyf3mzgRQchdntb9T7pcK1Il
-6HBUJCWyoMSrjg28lhzDD6lDsA2hfKG94M0mmrB+CDXW0RUshtmmSE4oACaRlBbt
-IcqPrAd8Z9agefmJAhwEEAECAAYFAkXixEQACgkQUiJTw9cnOYFirhAAkDukyfJy
-t8SmCpx+fG0AZp95tMQl/bcMdwLNEEv4r8sySVYEDxOJZkGAa8tKzWjNyr/4AsMJ
-tLfG6psKVU5cSpCwyTGA/x7Q1jufP3YofMJcNwi7dPQbC2jq7IPhtlsQUxbmdnbv
-OlhhG51lTl/kFiaJ4OxB6KGmUXJ9OX0UxONAjJ1dTEvbDAMmp0GyR6YqhhM3IrnZ
-mMJ8WePBMjc5tiaFpKUOUqa2B1YJKYEcllN6zweIzawnKnffs72C3ku9lBttLiKk
-XvAioHf3Lx6qEipbMRgGIYC2qojYSXzWgfYLH7Yma1ju/sLTyUPOhyRSKCdwZVm5
-flqayJI79c7o6elCFzSQHiYxb35q1s7uKFNwAtwVHi827+ud4RIq+6z2LAucG4RM
-PmMRdrqEVUbLnh6xd9MDBHnPnTQu43Y8vNuTA5ZUQZwfX/MILGdOLXWYUa71dbwl
-ablu9pe9HXwv/CFY0NZqCxRvlGuKZyNEsyjnZnkaZPC3+g2zPLNnmzVfWlXERkDA
-3r3tLWWbLeAr9BjWICItQJaRT98Dssy/CLhPjsdEv/RCAOZ4Vz2KpIN2G5Br7L6r
-1gR2zEl7IvQk32Y+hG2mZ56QSLuxfol5diQ0zqIjOpevjtCX/x6ktnQcesBkh2Cd
-jjVOTn3vu5wRB56C9z0odjHRVMCBBRQry1yJAhwEEAECAAYFAkXi/JUACgkQM5YV
-iOHCGEUtuQ//Qz3kevPkg+C0lV1g3DezCIApQv0ilzOgP60RWW320ssydWDtKGam
-vPjiOFE4G14i61jZOI9rKZNhkSUf6enRtMyZc3Rg22LJdvfvwwL7EznOJpEd+RvU
-wiqsuBwKsLwANedfUgefzRSKXnm7dOGtxFaxGgvD2I3whCGmzKr/0v5p3+Nfn6CN
-Jjly4m3uOMtkV5/SAQy7O+sGK6hM4tbCZWLebmGuCZKjWJoFW3gmsu/pSqbK7lBh
-mAV332rE75cDtO8vcLDc205ncB+qCMrCLWjgGnvFXvpZeBZcqQvq8rkabqp5iLcJ
-yapynYxnLRUpoNzh4ppsTmFJexcAtcKaJlKsDHUb9foINLjAl6ckpc6BdBqpjAwr
-gsAUebJxaLhy7hjYevZYKTpdyRapQy1pycXeKEnpHtqjDWuT1RAC+0dZxVeuuKuU
-EkVsPUzzrpPX53n5Mu2Hmj/1TNYZWW8PGNo6WKXVccfujFsudkz+LoojvLt6gvaK
-7Nj+MWV/9KMpEFlsyrPLh/MZHCoh+L+zdsA4KpER14CT/J0LJeag7ywyICRXnXcg
-FyX9I+CxsymxR8Y0ABXF94vZ1uey7twox9M8+qiLk94IrqYl1YuyuI9qZTA59F5k
-cnL8YNjQqIB6EcbW8Eq5rPsilE+3naB7nZvc/s2X1HgOBojnnJlkjwWJAjcEEwEC
-ACECGwMCHgECF4AFAkrVjSAFCwkIBwMFFQoJCAsFFgIDAQAACgkQJknmKMXTTQVc
-zQ/+J9DXrL1/MkgLp0Pgb3yKO+jlNVQKhhdA9Sf5kpJpZV4U/8R/vi9uOvNZTIEN
-StGGVkav7hCEPzcoOuDdY/K04vNBp5CXLrNo9Ymob4fnzJ3OVfe4IaRWgyXkFslY
-ZXXxjhbrwffjwvi97CY2sEwxbCWPrXnOj12vSxvL5zEKLUwPuhCL2Kty8rEeJlvL
-deLqxiVpJK2eZcOXKxhkhAaJVoBYqhfUWMw71c6bDkHe/KtYcJK2Y43hmpECciVT
-XEG+Me8CGnniTEj9nEW+cWUpL1YVGFfHgrJ2CHoJ5tk53gEdkfSVtr+2JpoOb42K
-vVB51wkRSsLYVC17vLa9rh184wn6oM98sqhAbfjed4TfN/rXJubQUO2BJOJWj9ho
-UHlVkPDdZDnNoQYHbbHwMrPoLJHrQh/k8miiylDM5G4CRJHkC5wB/Nnhnlw76ri6
-KzX1nirHdbs5TfrO1vght0zf2quxD01xwjc6s/sNMnXvPMWe78s3l0nluYwCLxzY
-fNp6y34cTIFDTyUDYJ9AigU/HDkUIkBh5a7/9wYBDv37H+ZnD3cUJivTr7ir9OhA
-oCtEPVEmQrJPaigsjecVhsnI4ekWC2wu4tIjU7WiVLDQTtAiqfRlSdT+f5CTi46w
-rFRnmBgmQcHN7ugUw9WIwA0MoE5fW2Wn9mRwvggwcfVzJr2JAkAEEwECACoFAkXt
-t6ojGmh0dHA6Ly93d3cuZWxoby5uZXQvY3J5cHRvL3BvbGljeS8ACgkQlXlS1880
-Aam0AxAAjrm7SIWMjCKicS46cVxiov/xDHK0Et6XXZp6TSgJl7lOclAYjaCKDL8W
-zGs/j1rYg300aylENhWp/1/YI7ovN8gPCDDuhuEmfENpF55hG/VtICKIkRFvAaPf
-nMKoeLjGPPZx3QF9dUgIt9js1pppH55F4J1gmShWKHQsqSJQvqz9IinCiD0SMKds
-0joFlnhcWg/bMAbeJdDZbN1FzAT3wKY1xmV5tyd8r3H81KcScsge+R/JQf97WoJr
-DbRruphDq1RtuqYF0IfvPRoxYptjIJSCi+hXW95jBZGAI9LZkMQkXGPd0AZl4dEk
-cyjdDDkDH7cocl8hpvlGMiRasA3XbdNNLJ/rVI/IEw3/FCul4wLnm6E3JSQHXYa7
-5LIBq7/wBcsCwguSJoucPnQcSLcHSjP2S7fklPBuEFV0Ry3Y34n1PNCkLvCmx3BK
-ixNeEWKgzA3PfviBeFmqgCGfI5Jq7wSjUIaIKUJ7mEgLm9eAutfnmGFqFKMUsNJe
-kOp2mUgddVWoPWsqHgSQxJeg/ZApK5BybVwAMvlwO6lRTxI5oqe9cSB3IJV7cONM
-WuShI/mZBoMLO4L2TZKOafwURMeSWnZLoGtNjxXRQBdmRBBXxiv5IrMVem2PIje7
-iHMPMNbWOmSLPbIyPG6L1ILbsl69Sm3DREgEpTNX8d6cukvTg+WIRgQQEQIABgUC
-RlL7mgAKCRAiGMgejnwD/6zYAJ9KHaWvJu1NegIQJg7FUiE0Ovph+ACePrBkV12n
-IAW6TGkZ/3TxY0lhpsaIRgQQEQIABgUCRm6AxwAKCRCPqYpv7u1w8204AJ0VR31P
-QFzFKQE0zoZZAmRjJ33XzQCgoSVk/+V5Axm8hbj7AUDevlZ2JrWIRgQQEQIABgUC
-RpH24wAKCRCptvcwuD12HDBRAKCthMbk3YBkVI9y0YRLejs1iRB6GQCgmq5JRGqD
-62YKwhq9Uyqk8C+7gPeIRgQTEQIABgUCRp7w9QAKCRCYYg1FtYEYLP4jAJ9fQfit
-DtZjpW0lgOdD0wDEWgcSsgCeKBuOehsBY/7DsokMGyylCIn022WIRgQQEQIABgUC
-RqSyNwAKCRCYtF5mZjk0FanJAKCkzAua7vE9RoB1Tl1yDcdS3cRvRgCeKx0p6igm
-puEYtlAbMh/p3h0XTYCIRgQQEQIABgUCRqSyTgAKCRCizvCpOtm9p4iNAJ9Bznsn
-3ESsFARVFReQQxcsNQWkkACfaV46TbSa9qnwocGrVxfmyYtMs3mIRgQSEQIABgUC
-RtGrcgAKCRBJUOEqsnKR8gUCAJ4/l2a9DW6Pfh5n3BDCkjIriPrkCQCfcBakTzAT
-iHoD/kUUNGpsElSld6GIRgQSEQIABgUCRtV71wAKCRD2yOmcZ2gdPHEKAKCoNWao
-WMcVJQIgQzCOV2aPMaGEJwCfZEU+I74WBjUCa1MNl/UGjFR6MGeIRgQSEQIABgUC
-R4JwTAAKCRDeeq9ulMCcfxjyAJ9aSLr4+0lusMJ5ZbsaFzNGa/Yj/ACgrdJgXErC
-HDtUp6MJ5YzrexVyCC6JARwEEAECAAYFAkfBzLQACgkQVxpiqGY/iCt5Lgf/bJ7v
-SXGKpVcJduX3a25SOxjhM2hPW+zucoD9sW+Vt454kNlrHcnMVI9lMzafnqNoXZRY
-FTnxUptb2dAdY9kDvqpntc5hb49Gdwvc9B0zQ9BdYbZmci94ezL6CrfhH6pCJip5
-5uwI4ivjse/FextMvANejfTqultxwMo+0YNvw18kNjzHBNz/JbYcumi9FgOqydSG
-nWpukM99+ir7QEHqXZy6dgx2DmbmhNyuJ54InZzF7eyWzaUEA9sjkzpgzv0MFS6W
-IKLKpcVX6tk6bEOYHn1c+jasXpEgMhunZU3dj1KPWpzia2eWjOrfS0t2yWU8yAwM
-EO76usDaupu4v1K/qohGBBIRAgAGBQJHwatNAAoJEBv+MzI42ihHSJcAn3E3lq6g
-y+zq3fp88fVxJH9cH0jjAKCg4a5XPtyhRihUtLe4ekFgA0BobohGBBARAgAGBQJH
-waAeAAoJEGzGmsJoaPQfjOwAn0dsHtF7v0ygtLsEZJtqnxy31z1vAJ0a4eoUXTFk
-+OKY/m22iRsxPx1A54hGBBARAgAGBQJHwpSBAAoJEO1YHCZDCyZXCzcAnRlSS9yD
-k+CNwcPxdxLnB6C0bYE1AJ9IBnTlzwbJ4u1edBPoZvC5ZtbCDYhGBBARAgAGBQJH
-whQ8AAoJEM7kDqBiSLoS9JwAn1W6LZV9El3d9BcPrBmKU4+AEUqAAJoDj38M9uur
-dCS7LW9yggXJlw3rQIhGBBMRAgAGBQJHwqrsAAoJEDu/z3e9iwUNP1kAoLJAreRj
-uH0OuqXGSFBY/QH7VN1iAKCm5CwyTd8kuF+agwkd0gIItzk+94hGBBARAgAGBQJH
-wq9TAAoJEHg1W9Skgu4kJpUAn3usjgwYzR1vftEiNt7aMynBuruiAJ0WPrvy79pb
-G84VRZTSDV8GTsiXcIhGBBARAgAGBQJHwqXjAAoJEMN2qNrxvNtz+vwAnidpjMk6
-KhbpNqUocrLm+5yllop3AJ9zNDbXWXwt/uqS6Rhg1/+TmVVDaYhGBBARAgAGBQJH
-wsIuAAoJEGnCMbmapWptAPwAn3J7UDY6ymLEQsaOCfK+KTMjnhInAKClvzF8Obxp
-pjUT4X14Di8PVMpXwYh9BBMRAgA9BQJHwuoIMhpodHRwOi8vd3d3Lm5pYy1uYWMt
-cHJvamVjdC5vcmcvfmJsYWFwL3BvbGljeS5odG1sAwUBeAAKCRBy1N/41MPxl6k6
-AKCJnjUcxK/AYZKYWS+3MxeVKPkVJACZAa5Tltwav8sPb+UGynNsbZ10DmeIRgQQ
-EQIABgUCR8LYgAAKCRCfN6X6TafFRmHwAJ9zegOcyHUMvD/M+E85B+4A6PzmOQCf
-fHW616mqElCESnwaU7U9ecLJ0fKIRgQQEQIABgUCR8L1tgAKCRBpwjgtBN70RR9t
-AJ9f2E/YtwLOD3Zbmmjxeb7eUv3k/wCgrTxS9Ac+k0hKuWdN2EG8CYSdAH2IRgQQ
-EQIABgUCR8HpWgAKCRBQRn0OEbAO6AVsAJ91xMYNsYbVj3uDxN3CymYhLPfPUQCe
-MtTlVJT/7IWomgINU1m4w817YyOIRgQQEQIABgUCR8Mx3QAKCRAmmKcO9CFDS/b9
-AJ0TrpQmTwpdGJVeGtJqwmbLYS3BDQCfdrVe350mVc3wr0jqXY6+u9hQ9WqIRgQQ
-EQIABgUCReIyOAAKCRCcy9oWAfqLSidHAJ9MRwFdumavVeYhgCcp6MaJ94HkNwCg
-j7OrjrSTMPSVvZIW54Na+sPwlZyIRgQQEQIABgUCR8O4CQAKCRBhSmkFKfFqGFW1
-AJ9ujVYGBXBIISujESAJHAs3y6lNmQCfUl5EIGQ1239T5RYz4Aob+JWDAEqIRgQQ
-EQIABgUCR8NBNgAKCRAyTe73O4xorSDMAKCGHbIqxBS7pFMnbRIo/lQztggnVgCe
-NWBg3WmZ78daoAMSo+b5E2zB2AaIRgQQEQIABgUCR8M62QAKCRAmKQ0lIDJ5/y0P
-AKDLhosCiaZ7QhLslDWAd/jcDXUkWgCfWtzseYLl0tpbG5PuPHgjJLJ3FmmIRgQQ
-EQIABgUCR8PsBQAKCRA+oPhreU+dfKYVAJ9DjbCOfggPxexKGoRQ5GR/JUbdOgCd
-EBJIlgN1UwYDDDgp7GWgYZTo6FaIRgQQEQIABgUCR8QJewAKCRDn/y5bY0+aIOLD
-AJ0Yvyws6vyXgSLU+OUcq+5jAuu/5ACgmiiJHqc9JzRDeo6stXAPExibOxWIRgQQ
-EQIABgUCR8SFdAAKCRAvGtBzKTwF/Ui7AJ4/kiGXhSBXPkwpwR1pOC0TIKkfsQCg
-ipq3wHoZDdxeTn+n/mUAqoWRImWIRgQQEQIABgUCR8SUAgAKCRCKJ+is0voF7I8r
-AJ9ilHruvluEaBXa0h306kQAYxXo4QCgnrnrDw2tqHkhHwN9V+mzhtWc9JKIRgQQ
-EQIABgUCR8ScBAAKCRAytTNJkeFTxZYEAJ9hxcwJLGSMuq3Rh4tykPZ3a/dUlgCf
-Wi/1AdUIZQ0QMU5sDNe2K5VIIl2IRgQQEQIABgUCR8S2dAAKCRA+4Ff/qiCNnk73
-AJ44mdvGa/pVA87yJ5XJS4wFFKhw4wCfbyE7E0hOHfh8GLcuq7oX7llkZJSIRgQQ
-EQIABgUCR8S2dQAKCRDcA7qj00kqKlewAJoCC3rgsmwEK4u2/k/66b/sKp01wgCf
-eto3a4CrlbxI5PUJej0XGQbB74OIRgQQEQIABgUCR8HggQAKCRBv0T3c183p5phH
-AJ9Qajibu0wTHAbHvHtK6jhEkGb+uQCfcmP/5yDn3Wa99HYXQBoMTNDBpNKIRgQQ
-EQIABgUCR8XO8QAKCRCpad1zbqleZw3WAKCV6d2WEcFNpCrggwL+27U3H+x58ACf
-WmCd9gq8K1379WKdttvZtCySSk6IRgQQEQIABgUCR8XUHQAKCRAkYsQbWOtgyJQM
-AKCTRpumrjYIU6QxQ7z0SzPPt7AVUgCfdcGigrbHjM5K3dTnQ7NrDVltrMKIegQT
-EQIAOgUCR8Z83jMaaHR0cDovL3d3dy5zYy1kZWxwaGluLWVzY2h3ZWlsZXIuZGUv
-cGdwL2luZGV4Lmh0bWwACgkQtHXiB7q1gikdFwCgmZwxkmZlYMxO3HTJUQomUDAJ
-+tsAoN/qhgg3KTyScNnXvsTViUTF94AKiHoEExECADoFAkfGfOIzGmh0dHA6Ly93
-d3cuc2MtZGVscGhpbi1lc2Nod2VpbGVyLmRlL3BncC9pbmRleC5odG1sAAoJEJSP
-1qDhD1Au2+gAoNpTUJViDdPp8XP8uamUOOcQz+ktAKCZchyzmqZgF1kFvodaHr8J
-YV+5EYhGBBARAgAGBQJHxm6gAAoJEAYPKHb84D2qyRwAoIAtk8cWu+A9EeDjf5Nb
-QuRjw2a1AJ9GViwE17o8bUT4umpIS4a4X6Eo8YhGBBMRAgAGBQJHwmvbAAoJEO6B
-kqbkQ9bYOW4An0ynogoRYRLFhUtJQruoaocljCCMAKCg5fWJhrYrl5m16aWPda0B
-TOBD1IhGBBARAgAGBQJHxq7ZAAoJEKl1mHsfn6fueJIAoMh+sxaKN8jeFISIT2+W
-znabHnm3AJ4+LHQnxbE0+kEgEcFzPcgOP5N9h4hGBBARAgAGBQJHxxoaAAoJEIwe
-srv9C+3lOfEAnjbXpwZzFpL6RX/I2m0dm0I+3v9LAJ9bZ+cl0r5mKl51ePjC5jRo
-oNJVyIhGBBARAgAGBQJHyELuAAoJEEIN8DDqKyKPOxUAoIqt1Z3Ax0FSF2ugdctG
-recpAZRjAJ0buqJNcRntJWV5ZtIXlaH1CDX+bYhGBBARAgAGBQJHyN6LAAoJECCZ
-tky/FUkLfWoAoLT+0CILgdOZbtOrYMo0uO/KNCeJAKDxqY6fSV6OrksWxonGUS0E
-TH6z2YhGBBARAgAGBQJHysAaAAoJEKGFT53laztOtzsAnRXCme1DQzE2EGUXH2Oa
-rT5hSb5qAJ0ZgN0pFhxohF0b22sQK1MiYoSSx4hGBBARAgAGBQJHytZtAAoJEKTi
-iAOJv34r9dYAnAp/4n3JZgKzWeaUCpcL+25KIEqJAJ0VcJlc0YzCw1fBxxsJEjTk
-i311LYhGBBARAgAGBQJHzxKIAAoJEE2lKq2uZCGGSLwAoK5Mbv3gEQb6MeGrMWlE
-ISTaDHyRAJ9mn1p5ln2MJbXj+p1EvlxhhlS1fohGBBARAgAGBQJHzxF2AAoJEIIB
-S0bEePB0HhcAn1krXJhL3gETfvrsNzPHe3LIT/CTAJ9mIE522ICTnLCEilU+f35g
-yPvGsohGBBARAgAGBQJH0X6cAAoJEB6KMFMhJ/haZ8gAn2P7vri2wV2daDXNGFQ9
-NUvdtf7+AJ4u+NtOBAe1gNYkLP2hUsjiS1BFgohGBBARAgAGBQJH0x8/AAoJEGMW
-tjA1gDLh2gUAoLVE/DxMCK/3vHjRRlOuXfFZwm8UAJ9tiQCDIINpT4Iv5wu7YbMc
-g+E0eohGBBARAgAGBQJH1V9GAAoJEEFLhCNv7M3gzTEAnAxZM3FNwMXBz0o+TQ60
-0xVknv31AJ4lDTu1Mvrb43Uetj7xFWZLsuRlKIhGBBARAgAGBQJH2QUGAAoJEGHU
-mAeJCxWyDNAAn0fJbKjKN2Sf4DYLvy5HFrvnXojwAJ9ZTfNl28ozjn0mHITtvOjT
-xFOhOYhGBBMRAgAGBQJH7uUHAAoJED7VcfToBI0IwCkAoKdJ3WuGe6Zj4PeSf5GY
-ErZ3BLBvAKCubHAFH7XLC4MpBi7GtpiNklTEy4hGBBMRAgAGBQJH7ueJAAoJELn3
-yIZpF8O5K8sAoIi6MH5oTbavmI9V4BjWXi3K7ycbAJ0fHYIC/d9G/+tb8rJVAbDM
-OT6VCYhGBBARAgAGBQJIC8wDAAoJELdRFAn8FdvsyW4An1USJ2vaZlh74qmAnc5l
-IwA9bK3JAKChkX1nLzDnA9DX2wa+BrndkyfTOIhGBBARAgAGBQJIJ0aVAAoJECCs
-s75RXCONfikAmgK/tpNUga/Iyhfs7tCW26LP2QAPAJ9G0C3VHX3LufH8VoxKJtil
-GwiMD4hGBBARAgAGBQJIO8WLAAoJELs9VLZH6oS0ofoAnR1jRBnQDYtDRROmkJU9
-ulS9b5DRAJ9SzI034g6ztySJrGCv9wsuRE/e8YhGBBARAgAGBQJIPALAAAoJEJYs
-2vc7xAgf5gIAmwa0kCYv+K7HdcliGz8UeRaGIcubAJ428QknjKFe+4YlwmHCliWt
-7xZrnohGBBARAgAGBQJITanNAAoJEM6KedeYAW3HUJcAoITszNA7tsyiYWlmbmlD
-/tdjvxG2AJ9B3OgO7laZFHbjTt/8NJG4l9Zp34hGBBARAgAGBQJIU5nhAAoJEDxN
-6MDktIxIcqQAn2Bmfx21ssZmsSTFZhULzGIucwvrAJ43CaiiDTHuTo9hsafL0uEf
-A7wNbohrBBARAgArBQJI86p+BYMB4oUAHhpodHRwOi8vd3d3LmNhY2VydC5vcmcv
-Y3BzLnBocAAKCRDSuw0BZdD9WPe6AJ4t3gIZ0p2kT3iqnoQaucR5RrY89wCghdeP
-9pwAxbg5xzZxlYs4nX/CIbyInAQQAQIABgUCSPmwjgAKCRBNVigheQUMEdHhA/9q
-NAqhCdjEivMg//FcyHGQ2dIEnUG1TnnilR6BKbwsgCZjI3NDDOrdfZfvuTxSEGeC
-O68rCwE8iZDsQmdIChbLOs78fbhUrRg/ys2bSoa60KgVTjORj2aw4fQODqQUencA
-Oe2AOU5RkHVucrwDyo4poPpB7ftq5So8nJhkzHnJbYhGBBARAgAGBQJJXmPIAAoJ
-EM7tH5zitbiovfwAoLk2m1VxupZuZCzu9MVSQYTyvbXuAKCAHQgsC2mNFRiOIxvK
-ZaZ2hK75lYhGBBMRAgAGBQJJYUCdAAoJEA0SKW5juNd9eAYAnikiHG6QYNk859g3
-Sw+gNLWib5CQAJ4gUrgtdD/d0Ip9bp46cY6HQZdnJ4hGBBARAgAGBQJJj5c7AAoJ
-EL7jPaOCb3f/2JwAnjEHcvPnhVWlC4keZj+IAbjxl1z6AJ4gW2noMqEov4IwhO4j
-ND+aNBbSOIhGBBARAgAGBQJJj1Y7AAoJECx/azoYo3D+DFIAn1TPR6/CuEM94D5a
-jGtspuoKYev6AJ4jMwrL2N671NG95SSTOsKxFU/cYYhGBBMRAgAGBQJJjzuOAAoJ
-EA0HLpMqmrnDID0An0TxlZKxd8pkL8zWvB5u86wTMHrSAKCTY2fJcs0EBfnH7pKY
-Zp8UaeLHBYhGBBARAgAGBQJJj/+3AAoJEIqjYq/pcjLN+PgAn3F5Ih5XJo29XCdT
-OX1iOJOQftZIAJ4lJbSzES/88nVow31VPJavQOCWJIhGBBARAgAGBQJJj//AAAoJ
-EKffWHJw1EwjLcsAoIfkml4NO9sA+bJDawCtLR7f5Ss8AKCMGdAGJMjG7dSklaTq
-fkY6Q9R4tohGBBARAgAGBQJJj//MAAoJEOIBHCeUhBl+vLcAnjdCT8N4WNcmKyyo
-zPWfYj7GjHe9AKCfC80WGFAfb09udMGi3GGku2AiSYhGBBARAgAGBQJJkACCAAoJ
-EC+VFQiq5gIu9gwAnjh4jhY9rmzqEwmaMtIrhr2fl5GsAJ978F7gXhtEfsmtjpy5
-td7axhhC3YhGBBARAgAGBQJJkB6iAAoJEAMS6MNdjNp7kHkAmwY0aZFAvbQTW80P
-GsoAm6O9SgBMAKCP0pA2FbC7ttHss/AEK5C/USfAE4hGBBARAgAGBQJJkEoSAAoJ
-EAdl1W4aDNCCx3EAoMqZNARW6DGi5B2THGgKiYYkDeU2AJwMVxfaOtxQbKnCLyf9
-tBZM0/NUbohGBBARAgAGBQJJkFqnAAoJEIE/6Dp0l0gkEvoAnjdd2VWiw2aSCqId
-OntbCLgpvtnOAKC8cOElUgME2Nwi6xUdYHS9tAlKXohGBBARAgAGBQJJkFfpAAoJ
-EDQvtTmq0gO1b1cAoIgFLs1qqW0IFkG9NXi44qF1n3unAKCKt4P2/DFBUpQp48vu
-b6cmEPXhi4kBHAQQAQIABgUCSZBVjgAKCRCLHlBfQgkwtDd0B/9O58lvJVgkXzxr
-cuJuvqHQIVMB0YU11//oi9GFITv/ZWYPEXa6dvABWC91w/S3xPn1APZDmvmtVksi
-/5CFH8s4gK+dgkybdoHYTl1j1z/bKTMZIY3tgJYvFZ4emKvq6k3tpJvklq464u9+
-fLaGCFWyeyLylkHZBrpeAPtrly8B6lkHIWWV4iWFxjuosok2yUiOAaniFkIqi+2N
-1XPOXCZ+OnbNnetBCG11bsmw/aN0RCIGJCwnJPAFUIB6ydN0rKEX2tTNyWh9AvXj
-I6/lkkh9iXyeez7i6ZXNV8dutUz5LwfbQNSQVOinXddCJF7xWp7wjXCkJh2chHnw
-q2fZ2NapiQIcBBABAgAGBQJJkFWlAAoJEJ0qdiGtR7WDsEsP/iW65Pc/DsWOaXo5
-bS+Ba6Tv2U1HCX7Av7NgXQiTkGJatFBcdNbN3AJZBk7c8+KA981aSa07z8fBEN1Q
-2nEQS7umZyPul8bkGU19PKOCwKZP6fKm58Zk/g/FTF7S0ZG5qcnbVwGeo4C10KMO
-WvXyPG3Fg/eQIGnlfY5jZya7Skc6DkxZE6IUxaOsy8HD7qzZVw/VHp67D3/+Gg3S
-iPCP4lHFBLTvRFldaNWy2RfFz3DHxxZEP+rn67OPDqNa+QfrDSb86NEtVjCCkGSL
-ciYyjJcrXgpDi0VJxhCcvhAF9ZaqosBMZ/RPcb9SwGQMxY0MrZWtrbkm5u9rKQ8o
-x29ficwSdyryZi70V5vWXHLzjRzHa6SMjQCRYWxhlJQn7Q1A2KouLF3/Wj6k3H6w
-3MFlIrk8jVQcBN+ulHvaTQQKt1J2ygFghNRI6FmNpVNdGQW/siKysdVNmsqw1nOl
-xOwen+JQb3EpevTaEU8yjHvBnijPQPHboDv9imyxRAjCw3awMcuafZcOwju21F9Z
-FMOzs6m56kOwUPge5Ftvuo4USFcithiSFdI/q0DEGnFi1FH4F+erSc6A16GBrX+h
-My5wYqnkygOeoYMq3Efjp9pngJzrjzKuUiQF+7SXS0dvtbCFK2GPuOQaCsZKsh4g
-5f2xJKaKDA48Df6HhEAy+9PgFu2MiQIcBBABAgAGBQJJkFXPAAoJEBCB2c3BM6C2
-GqkP/3IDSSutj0xd+l1KaP88/SKLWISH6G0ZMhqQNUhkbDf8BZOcaY6+n8KpntcS
-mBY2mtKwWrUIUEMt0CDK0kD1ZP3ul+KrGHtR9y/KO/3g37CtFuIaTRIzLm5r0g4h
-hIbedO1+NoZix3cRjMh/3U7lvgYgTTxvkCGbbIfYLclBP/7/McyXOU21zlWtDSmU
-D9wvQgE1C0ytElBIwQV4JC2DU6QBIcd9B7ER1IaHJg1Umlt8f8AN0v/D+Jp03DXQ
-zusr2uOWJMxIJDndJcIwuFgKh9LkVNyHxHZDNAJqsmFJwXHqZgrtjtayZFxNT4ha
-O1Qxyf1h3ep2CnzidWXjTvwo4CMOhsEQf9bhjvAyMiox+BWQCDAeCG2qFNvaDkIz
-Fq/vCvp9Fd5l2poK/rXsTUlUmkg31K4HnnElpxJQ+CUNxRTsu53bAsZzDx4pavEH
-Xfwc6X1SvfshLM1Zcg3I903c2koULoIcmjoBXlCQ9+zX8+U8dsur45kjrod9Ud6Z
-Pe6W7+N9V2kAsRgUekV7c3py2mr04zx3iTNNdO+VYITWZjb5iATUmL2CsDmwjAME
-LJZb8rvM7bUO0fGJnzDE4plGslGrlvDfiw29SytsYC1UIeUNiD3VaENgYO2zNEcV
-r8PGfxJjNZJhvpPpux3QUN77gJXq2vJPvOYZeStOXAHwgcwoiHwEEAECAAYFAkmQ
-dIsACgkQO8MYrvoYpjmNQwL9EDT4K8P1VOo5+LPExv3ITzQde6f+WyO2t39v9kDO
-gNWMdEeXWGBiZqe7RxUwt85Ch0EYIvuO1C2DzmKnNdHMpIQTeObsvwEfiTvPBDJa
-7tI2X1/1ccjy0RmoFrEY5APqiQEcBBABAgAGBQJJkHSPAAoJEMt3MT+S71QlE3sI
-AMlBVSj8zk4OC5S/rIfHqhevL1vVPHzy1hcDtujph0ctpieKX8W9fEEW/9QSPOvR
-DIi7+leTbuMCGHGg6/4Tu9wDQ8aaXdcbokpK6Bj0x5/qezS/Uh+nHnVJuJyYyLc+
-xTYYLaMRyaCZ9y+trEUT1cqCBJ+bRiUUJMLNopN4/3oxa44QTgupQ4kkHpUHKRwm
-MLRmlUbDsdlBAviSGqmLKZq2I3foFXV+abcGsLiCjHC6ZcrMwqEEyPTvWKR6HlL0
-g74k6FPFuRneXGK6iMgQOjbdxiLTa71NQas/CT8yFvmvjBHIRQZrBE55yjOZtdkl
-yZG8bI/Dy0u+X9VCrVIGnguIRgQQEQIABgUCSZB0kgAKCRDgBF1y++rZFy02AKCs
-DSactqSe86x6xKOsIGRGo3rCPQCfbpWxAOLvm+9xzMjG41ZkoWpzoRiIRgQQEQIA
-BgUCSZB9pAAKCRAI7PbU1UsWZ/VfAJ96NALwiajYq1j+GSW7HuZRBA/l6ACfasdy
-rbKB8KIIanj/cmM424ID7j6IRgQQEQIABgUCSZCe4QAKCRA7MpidAPPP5M9xAJ9F
-q43Mz1dsKWI8RRefq5AZh3WXKACeMucLMXW5WDgw1BS+YM7Nmli/mxCIRgQQEQIA
-BgUCSZDB1AAKCRDAnh2JlZMO3vhoAJ9sCk4U/EpiGluyEBdrnSJUZf2/XwCfUBx/
-tTR7rWUx9MitG9dyhD7exMGIRgQQEQIABgUCSZDB8AAKCRAEBGuFSi4WK6EtAJsE
-/nIj9bvxS966NQsBJrAd3WkO2gCgiFgGPWnmRjUWNX92fRr6tVjJPTaJAhwEEAEC
-AAYFAkmQsfIACgkQ3vkUKEBF0Zu/LQ//XJjsVyjX/Xomp4/KxNW+ytZJNL3Hx/J/
-NFjfrCU90ScjnHd2UtsHtWneXeLN+PUkr4N3JWVMBu2mkpU1lT/Sv980pvL8gkzh
-+gs0N/h0jPM1AbBvY9V4y7EctPCLQt2CUXN5fppwvMq0nFPDkmrl9yUvG3g2QXTw
-hi6+lZGsQJqt/qIjZjHxXkth6VUgNJyyRwJ/ocpQ3iSBsQB9zzFWmCQzINNxRSMK
-PNLU8BW1MUR+V3qI5nnfbkZOH3t0JfzsOutX44M+T0nNeTq03K2ty2eJdyfIsPPq
-mNuGlrWCEyBzG8CiEfCcC48SXo74sgodKMWJ+O+z3z2Ds8ekTW9Jq+Hb/0ufwirI
-4XZNFi2vUxAKE5FwJ3mattj596uu5sWC3n53vCc/EK54L2O2yLRO35VVzLGE7Mxz
-3BSwr75vKq5vHo0v4/rx2Ei67tuoElASum4XHzWUNtVi6tlt2dS4XSigGaOvhKdK
-IV+wvJSZh4Mbk2gOQ+r81u7mmOzBWb522ko2BQnkLeGeXisUHiPT/g9PTNswV2ak
-7L2zd/uedOA4vBxVZBUIGeoOFIQdr1EYAS0IlJHtfNFozXR4LI7lEXktaa0p4Zq0
-wUIPTG/Y9hN0EFDjM+PwHcjDBJW9OAFZnIQAQuTEeJFNB3xb43dRgTAg1WlPLZI5
-YMjqYKaqPryJAhwEEAECAAYFAkmQsfUACgkQ3d85xsX+besWGw//aH/PuiDwcUPR
-BJ4wljmCGOhydfWQ4IwHIa++zShIQRfRL84b8DNS2laV4OK3bGeW4sb+ytWomEZT
-Gmm5Ko9nH7Cdiak74GPXCdApfV6cT3j0XSUQavPx8S0vhS3AK3/j1UP16X4EL7p1
-QhfoZk2+4MaW/Pph+RaUn4tND9nJrp7FAG6ckZd6+Sh29/0qfa4Z20uW51rLJ53A
-W5UAREZ9aU+MFNoTjaNns4CbhWOAt34r6r3ZOCdQpQK15/kRCMcmF/8ukXPkeA/F
-V2frZAQwhUtxxN0mvn+wmyEW81XN603nWUB1K+iOHWb6CA/ncQCGKs3YJ0JjTh4P
-lp1aWOLwoivm//AfRzc3RIBgRdVgDvgKP8O9GZrmTCMwyIZZXiVh+g2v+iE3LAYL
-bv7kVfzMuFKqRZv8kCDRc9gAZW1VxirX21CD/vyISIlq/Kd092C5y/c72dXWvz/5
-VujYVq5FiC8w34I9UHtP0Bkk2XDekLyexNPyxNzC63y0xuxyLzAMI56DqVXVXTyO
-aMivKWAVxLGSFfB2zkjcVxt6MXGFlZXD2lv8uLlmZ1G6dm2Qh2nsy3Sbvi+7bv4j
-7OY/DIM3r4uF/yXK/ULrAdROoF+6JyhsF9cxRxWGsHZvatU/IXB6Lg8SxLD3PC9r
-uMI6ym94knSoebiM9AR3AKXkkxz9/8yIRgQQEQIABgUCSZE8+gAKCRDIJlPztMU+
-6BrNAKC4yd7N3REt0BgMIjXA8VdO6JNHdACfaSmcsljbgQr4L+6WAQFHQq8ZBFeI
-RgQQEQIABgUCSZFtIQAKCRB89UdI2hQGpoRvAKC5TElrQzUeTjjs7HecpSInN6Ol
-AQCfUQjWYWBamp/D3DCzi7XBUjmIEnKIRgQQEQIABgUCSZFpqwAKCRCIjOHkLi/0
-HHLeAKCAZDfu0nrifrfeKYVKQt6Iquu7/gCfQzoh7zbPlcuiEsaj/n9ms3ufASWJ
-AhwEEAECAAYFAkmSA0kACgkQ54LM8oA/JoWQuQ//dCy4EkM+qHP9FCFO/d1VGzjY
-zUj55DYWR5pEdwebqbixsjcXCkkSSA4ONwx2WOiRSXxU5R7+ylpP3UZ7yhnP0oOe
-SWdb51n9oFt5AIEjqBRXShKJG8x4uNdJ002dNSZZrh+rT8JJZG8uVuq5KMz5Lj5v
-j5HWXOjqOKz99nZpEJQiQ867C4IM3K1y6lPmKXNmKvGQinkudheZK72gFFTX/46R
-bbZuPOd+I3bGbms5LzOl55AFcI4j7hjGlYeWTsI4EprfCaj6AeNRv+i6ea8ujnZc
-4U/BfrybPSvhRN948JAtOzr6o2XOKxxDba1UnAMMI8fQraXe1q5u+9/GjbkLqQE7
-P9h5aL7kZYHrEHjVMvYijvomGCl6tGzQd84ihm5Vet/pbMAgnCnx++20X2T51U5H
-rgTFVENlAs9RfMJaAl8yvqx5Sl+pxdx1CfQ+wCykR4oaeiQsdLxbWZsH35K5ThOY
-dieQdkq8VhM394KI/z0Q5+ao/jSVVJ66JPcXczRzd1JPbvaNQ2eRmvL7pdI2u01C
-neMnY72MvgC44yVs8pdjcKL+TuXXGvyAaAC+xBEZsVYhIkJklW8HfHJOQZrks5l5
-buV5WNI+YbT0PcYKGkoxFKxzfcojGwUCC1fWkEiBFuGx/Nu0TCQZeZXQm6cS0zyN
-D+maUmcu4qXEb6KQYCKIRgQQEQIABgUCSZH/vgAKCRDEI9ctMx5c16BqAKCiMFpu
-g2uunDk9gpUAPXQdR1ZNmwCggrnizaOMTMgZvilG2bSaGRC2qCqIRgQQEQIABgUC
-SZHJswAKCRBpPYMMe2KFtxzAAJ0bY2ICEpaH3naCT5aM2x0cjkRNCQCgmuujHQw4
-11RXEnRq+o8fmBp8q8CIRgQQEQIABgUCSZKZGwAKCRD7E+LdXKjpJ4ksAJsGt7tT
-SXNupCtE+uXh5UfpC4WdGgCeJT9ra93KKlOUmwnMbvucB91SzoeIRgQQEQIABgUC
-SZNWnwAKCRDt8d9C8zEouZm7AJ4iiaeY/oI5m94uJe7PXo8vAtwKswCfeiaT8OX7
-KWwf5wUMlsxzaqBvHIaIRgQQEQIABgUCSZbM6gAKCRDVybdRxGUyJ30FAJ0RtB6C
-+iRV5/bwY1enr2O2EfbdhgCeOAB8fF+wZl0163pSwf63Kx+DVbOIRgQQEQIABgUC
-SZhy2AAKCRAJ4s1JRObLzQzhAJ94pjOBAs3INEKltp9Bj9hZrFrnKACcCLQZDs+D
-ea2QDDN2P5fNexsliIqIRgQTEQIABgUCSZapQgAKCRBYgr49723CGjImAKCHOGhU
-+N1wOTBU7s/iSbT2dmqHbQCgy+wFoFyglknK6Em6cCV9XyMqCWqIlAQSEQIAVAUC
-SZfb0SaaaHR0cDovL3BpbmRhcm90cy54czRhbGwubmwvcG9saWN5LnR4dCYaaHR0
-cDovL3BpbmRhcm90cy54czRhbGwubmwvcG9saWN5LnR4dAAKCRA61vgRgwDMAqYJ
-AKCUe9AkTOK+4n85grnkhkliFYpWRgCdFk/sA4D3La/mQQF+22b0us/93LuIRgQQ
-EQIABgUCSZdNeAAKCRB5tCnAg1ZjWSBeAJ96VEru8vbBK0wu9a6zDlpRdHFZXwCg
-0SP89HegT2PqvO+MGg+u/Q35KqSIRgQQEQIABgUCSZg6jwAKCRDVybdRxGUyJ4al
-AJ9ujFGF+jKHnzotfS/TpJ4DE47qIACaAxj1CMWVK8uBqNsRSpdnBjcCFNCIRgQQ
-EQIABgUCSZnEPQAKCRAtzj8oNtTk9db3AKCAopptnFQ4azphEhFA3jicMwzRZgCf
-epstTTM0FT4DJ1sqM4aQTaNx3d2IRgQQEQIABgUCSZsgJgAKCRAJgdtm+JTkyMEZ
-AJ4tgMWJOK4vxJzR3khy4X23yz/YMgCg3TK+6c4Q3LtrnDkIRoHT1XR5K8KIRgQQ
-EQIABgUCSZsyzwAKCRBK2x+Ia4hUQ02fAKDCCWICugRtfV00EetrGd7sm2B+hQCZ
-Afv46BTUaTA5xEbj4ZXztHtrTvGIRgQQEQIABgUCSZ3C2gAKCRC8dDys1l6elO7D
-AJ99gIp5Pk0j8/hAWz7sYXJuQ+bzHQCdGfAEk0FckcLBbHaabPKTyNk6aiKIRgQQ
-EQIABgUCSZSa2gAKCRCQNcN/cCQH95pUAKDHR7tfF9Ne1eVkRYB36kkNoC4d5ACd
-H+y4zpF5cM3GNfeoxoQpOFMnYF+IRgQQEQIABgUCSZ8yxAAKCRCB59WGOBmFTgRL
-AJ4tcnL5xEJbB4GHqqwOS4ZFOVmE0gCfdZ5gN24aPFkJJkfhyaury/XbWPOJAlcE
+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
+3f5qAJ0bxM+TfSmz8eS4MRWQeSUmidfHQ4hGBBMRAgAGBQJFZgjJAAoJEEIUTAYl
+N20+ESMAoKD3f3VAttEfuI1fYEkU7ucnP/LmAKCDNJaUcrhvO12AbT8dEKzLDJ3v
+4YhGBBMRAgAGBQJF40+5AAoJEIwl7g8NwLfWYAsAoLq+OAImI6LTxtiUrrAki4E5
+vUj7AJsFMhAr8ag/ik/9ZASVqykQj24mXohGBBMRAgAGBQJF6t/bAAoJEEHcHJBy
+RJcLlCoAn2JzVAARDE7hSzydvtcOZrSaClzSAKCm6DTZAXYYd9Zlx3W5E/LK0gQJ
+qohKBBARAgAKBQJFVLM6AwUDeAAKCRBfLIShPrYEbejZAJ4/cA1B4JmqR5g5jvoo
+GSZvya8liACfbzZLKezZAFdpF2HfYJKjA6NVQraIjQQQEQIATQUCRfGDJUYUgAAA
+AAAOAC8gZmFsY29AbTR4Lm9yZ2h0dHA6Ly9mYWxjYWwubmV0L2dwZy8weDAyMUM1
+QkQyLTB4QzVEMzREMDUuYXNjAAoJEKd8S94CHFvSBbIAn0O9v7RMedOfOOm6Mrjq
+rHfDgaNuAKCTv7WyO28RpxHPOwVelEHUa1E2ZYi8BBABAgAGBQJF776SAAoJEO2i
+HpS1ZXFvHjUE/2qc1qF9Vx2ghTH5JbSqCeIK+mSol74wRmRb5Ry2ZzUwcx3Qix+a
+8vCw0ktVIq9uydaGugakcpqz4v4hDj9z8id9D7ZyBTaVi56p8k1B4vkpdVa9+7Dx
+OwsM7z1Y1ZFrGo8CaHzOarSDdIy9l5gYd9ShNqYJsYgV0/olO0P/smvm7QD9VDU2
+0cU6cqfJB4vEqJQTpVyqQKsfBkNTT6Q1zdGI9QQQEQIAtQUCRT5aDIcUgAAAAAAQ
+AG5zaWdub3Rlc0BncmVwLmJlImh0dHA6Ly93d3cuZ3JlcC5iZS9ncGcvNDI2NzEw
+MTNGOTRBMEFCRUI0Q0U5QjZEM0RGQzJDNjJBRjc5RDI5RS8zNTZCQUUwMjQ3NjNG
+NzM5MkZBMkU0MzgyNjQ5RTYyOEM1RDM0RDA1LmFzYyImGmh0dHA6Ly93d3cuZ3Jl
+cC5iZS9ncGcvY2VydC1wb2xpY3ktdjIACgkQPfwsYq950p7y+ACglRn+/KomOH07
+0ny/dYKfw64G9R8Amwak44DvOb5zW1Qr9OEAnUsDpg8fiQEcBBABAgAGBQJFPLws
+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
-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
-AgAKBQJFVLM6AwUDeAAKCRBfLIShPrYEbXH6AJ9ig0i2ffCooj/teQH4+CU/s+Nx
-kgCfQlAfDOKsNZ0t8mDO1n6yuUAKcCSIjQQQEQIATQUCRfGDJUYUgAAAAAAOAC8g
-ZmFsY29AbTR4Lm9yZ2h0dHA6Ly9mYWxjYWwubmV0L2dwZy8weDAyMUM1QkQyLTB4
-QzVEMzREMDUuYXNjAAoJEKd8S94CHFvSXnsAn1x4MXGs5pvzaojpcqE5pdvG5neN
-AKCB6f/sWrWfVcm8PDNNB6mayvVw94i8BBABAgAGBQJF776TAAoJEO2iHpS1ZXFv
-EHME/2id8ZhcpQQ8Go/P5Wu1gWV8cyvPQ+AT2e3Bzqd9tbkH+hSMIt9ubVl3IyQW
-diZzZzVQaUapMirKxFdiQmo+JkrOEs/mcUUVq6XnDy8lJdxCQOz8ZFenUkGQaovN
-uHRQAVvd1GQppK35T7x00lRwu4jhdgiF4GJ2dyV7T8NTN7O2ADEDnXClHyCGB6EW
-y2QsdOtKMckN16UxC4sajo5/VRqI9QQQEQIAtQUCRT5aDIcUgAAAAAAQAG5zaWdu
-b3Rlc0BncmVwLmJlImh0dHA6Ly93d3cuZ3JlcC5iZS9ncGcvNDI2NzEwMTNGOTRB
-MEFCRUI0Q0U5QjZEM0RGQzJDNjJBRjc5RDI5RS8zNTZCQUUwMjQ3NjNGNzM5MkZB
-MkU0MzgyNjQ5RTYyOEM1RDM0RDA1LmFzYyImGmh0dHA6Ly93d3cuZ3JlcC5iZS9n
-cGcvY2VydC1wb2xpY3ktdjIACgkQPfwsYq950p52xgCfXZth5pnHae2J5+Kc2Eoh
-MYzW7X8AniUizIhcHb3zAim3F9zYAj3tGxQXiQEcBBABAgAGBQJFPLwsAAoJEILS
-9urEu56fmYYH/i0vpRRvs0U4yC6mjQTCYCnRRK0F3WXaQaPQpd2qI45KpMnVS23B
-ko/OUPSwlgSIkBkvAaep53EpAMNqbzDjrxYvungQdG5yckxVsuJPCfg/bEW8Eq5u
-J2T+2u8x+Xns5keaEWJVe1MqOtyxe1v4r/gZkyowe3rHAS54/rZZH/KJTA5KWW0R
-3XqRJdWmybPmwdUqdA8DotHthF98sJ6gpNeJcVYYjB/yJEexji1EbiTX8HJJ/+dk
-rKg4m7SUzIOgF7pW4JmK0u/CE1Ds9QT4mjocNQIMIXGmZE+0p95+5V8H1xRRS5RU
-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
+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
+GIi2AJ4nV8fBPHINqhVM82SNyklU6caZCohGBBMRAgAGBQJFRc7/AAoJEFYhzLq4
+BaQWGpYAn2qqV8iu3oijHdByz+KFGk4X6Q4ZAJ4gnEIJXXPvvuXuiDXJYl/ye8u1
+U4hGBBMRAgAGBQJFSmQcAAoJEKHH3ME0tyRf0U4AnjumF/dDS9aJlPMGduIFhstX
+c6WbAJ9Mpku6Pfafvo88dEQOvixA1VbpiYhGBBMRAgAGBQJFV02UAAoJECHFCRYO
+Snh1VrAAnRCL978Am+utl9smwLeORHUp+38ZAJ9LNtUwB1d1Dg1DBCbfNWF8rSed
+oIhGBBMRAgAGBQJFWZnQAAoJEHu7RcYqQ9NMdisAoMzsqxfE0qTVdwP/rQfSF4e3
+I63vAKClPEShqbzPvsUENVWdYdL7vCnW1YhGBBMRAgAGBQJFZgjJAAoJEEIUTAYl
+N20+28YAoJxT4tVQ+kVDIMS3XfFa4ZqsqILIAJ4ucGk3wguAbQjHcDgI9fXdNQIy
+i4hGBBMRAgAGBQJF40+5AAoJEIwl7g8NwLfWgtEAoI3j5Qv5s1t7OYxZiI33+HWd
+9HmlAKCnV3+o/xCxpgFeBDUjZllEXq+cl4hGBBMRAgAGBQJF6t/bAAoJEEHcHJBy
+RJcLsqIAmwbZXr8wBbZvQgmBWux5kHt4PDhvAKCPum9E6jApG6LECojx86ooATSV
+r4hKBBARAgAKBQJFVLM6AwUDeAAKCRBfLIShPrYEbTP/AJ9TPQ2RQd1AUAHKDRnm
+V3mqxlcLXACfTX9rjT4+p5gs2WkJJtr2YPzyws2IjQQQEQIATQUCRfGDJUYUgAAA
+AAAOAC8gZmFsY29AbTR4Lm9yZ2h0dHA6Ly9mYWxjYWwubmV0L2dwZy8weDAyMUM1
+QkQyLTB4QzVEMzREMDUuYXNjAAoJEKd8S94CHFvSjMwAoJKRUhYm3g3GQc7Ax5Mv
+ie9Mos/cAKCJHt3BGEU4sXrZQcq46mb8/z/p4Ij1BBARAgC1BQJFPloMhxSAAAAA
+ABAAbnNpZ25vdGVzQGdyZXAuYmUiaHR0cDovL3d3dy5ncmVwLmJlL2dwZy80MjY3
+MTAxM0Y5NEEwQUJFQjRDRTlCNkQzREZDMkM2MkFGNzlEMjlFLzM1NkJBRTAyNDc2
+M0Y3MzkyRkEyRTQzODI2NDlFNjI4QzVEMzREMDUuYXNjIiYaaHR0cDovL3d3dy5n
+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
+MjFDNUJEMi0weEM1RDM0RDA1LmFzYwAKCRCnfEveAhxb0lVGAJ9VTho2pYuXBgUA
+XDtjl13qTSEtdACgnJIawhuAGgRn4aFnSSbl0hKUwn2InAQQAQIABgUCRVXMqwAK
+CRAff6kIA1j8vZC4A/0SAqSrB+NajNZrel2XjuugGV46NDtcgfTZeV0gT4hPkbOc
+A3yzIXhW24ADsIX078DOIO3gYi29FO+wz+bgiv/K77CKMISWJsCWmkK3OEs0LoiB
+6nttsm1DjnD+vDQUaMwErnnINt4ZZnDTbx89COiJl+UJdEKYE+UWEsbqXo7qD4i8
+BBABAgAGBQJF776TAAoJEO2iHpS1ZXFvTwIE/3GBVEN0bHTz6Ync6qdN4bbMseEY
+/dboCpjEkN7nIlCpjnaSXwK/T4xOHkBDIP6tShzsSxpTh46WHZTYBjrBGR1yBsjR
+WynQsuoj29/7oXxFl3ClTBJK9rijfW4EN8TB0dy55qiMK/P3+9smF8dDF2DeU37A
+3RtoJ5XwgI5lnmQ4XaAUcDpxHQtiOhIdkCgpW4Bkrud1f0krJKZa8qTJ/76I9QQQ
+EQIAtQUCRT5aDIcUgAAAAAAQAG5zaWdub3Rlc0BncmVwLmJlImh0dHA6Ly93d3cu
+Z3JlcC5iZS9ncGcvNDI2NzEwMTNGOTRBMEFCRUI0Q0U5QjZEM0RGQzJDNjJBRjc5
+RDI5RS8zNTZCQUUwMjQ3NjNGNzM5MkZBMkU0MzgyNjQ5RTYyOEM1RDM0RDA1LmFz
+YyImGmh0dHA6Ly93d3cuZ3JlcC5iZS9ncGcvY2VydC1wb2xpY3ktdjIACgkQPfws
+Yq950p6dOQCfdA51eQwU98mGIGbiL+iFeo7gXakAnifvNwZWklCwBu94thjdz7y3
+J41QiQEcBBABAgAGBQJFPLwsAAoJEILS9urEu56fAbcIAJg+DWQ64CFxZx8xS62x
+ZtllxCQ0aR7ciw/2ULIOWvymT96a2D6PBOiysYVmvXeyaN1wpzmceq81PsmA1zvG
+z2noxONJ2W1hPyi5UuCX2UfjRsv/f4bGPTVHnAHGmjKJWDvZCLVRKK+7rzfGwaAL
+qutgo5NOtZ1SfQvfTzXvx8U+gFK4i0UpgX8Bkj4Ut16LyCYSiCjpw/7hDQrec/tc
+T7JgSn+h3ZFhye5UeodwHcP3HQUe5tCdDSMxllg6ah5cU7VZwhvv1NvwObDqxV16
+Sffuj+1+kUVi32uiPpG0wYzEOT9TCLjVV1C2s7SWMR/FBhR4UCrz1SXxoN/XULaw
+9yuJARwEEAECAAYFAkVXTTwACgkQLtRdZmGgc+n6IAf/SL/rn3PwM6qoBFN2XmZP
+8oHSkNjGg0yx7coLN7qDVNqajyEgRdZjfGDM/JZVtNbw4j3v+9V9a7mpObLokG7d
+SZz/82maE1Ylae9wbrAsFwfbx44nEAT1V+a3ncX7zssGcUcFhAFK7kg0Ky+V1e8G
+U2+g80dAJyd7AxKS3npJLLSz9KlYyG2uRzOlu0ANBl3fC4CFrImQ4zkSMBbV31j6
+o0lucGzouYhSCCiX765wBKxjVmlNe+lM9h6H+o+6QL6UuqsOhIe3X4ZnChDaBd00
+pD+lvjZGlilnzsL3z2dyrpDeYdfElaBdp7laaul+xW8gEYAAeV5WtUOUpkxoBwuj
+mYkBHAQQAQIABgUCReNH2QAKCRDo4GL2DcsEMfKWB/46I//9mS/IAAmJ8zKIqCov
+wO584oIKPQoxNzah4y8gZz/EFl7Vdbj2ftOZqIi8iCT8A6BtdpsnF8Xd20FsgAVZ
+GIdexEcrMQGDc8uMbvRQRdcYqF3PTPh0z82O5fpcG417IKUb3a8aYIkJAeNwS7Df
+gA1fUPwSzycwkmLIinRlP1zXjH3iXZ88sO+PMuNHG6dyx0+QEDRHHMeI2A9DeLud
+zF0hdr3GgSCgScXK5gPcPB119GQBjNuPn7iCjKRC+LtkO+SjDWo38qWEADZNGSN0
+ib9KzK6dFTeiXMkTpg6qL4sJcS/u0CX+cVmXUNUDUnXlbyfkPnis6pH02IBB+JS3
+iQIcBBABAgAGBQJFRK5NAAoJEFeTDasLhrBnlq4P/AxlHPsZ2lfw76/8c2WYDK+u
+o/9rGyzWo0mwfOSgyrJ5XISuQyomGsxWJf0bAE+WYJ4Qpw5BelqQKSKbHm3MGZg9
+bL5pvOYHonipYfkY4lzKRz0MYmtHEHf59PuQFrIa9b8xbS+A3ZtT0N6rtxc6AIeV
+bkRcr4mKCRW37Nqz535nag6BPQTDp4gjevGOGg7JAld2oVlVhGVy53aWI1B91MUJ
+S0/g1zH2gW28w0UREalHDcQ0qyxVLzuqslBdw245SVDYMRNDnn1yUnI7yBwdT3iT
+Pw4z5YQ0bAHsYMVur4Yk2Yl/izGS90bvEQiej6bOhoaS/nWbeWiJ8IJIkG9k/CH7
+pgg0ZrHNOohnSzwV2NmxPiF+26dRpQkxz+lisvh3YpVNIuVFxo+sBO+s6FvfTAd9
+r5xFgk0xkcqo7XXxyV5Co5FfXGX+zOYRrL6lqUpzbL3ZReRsGh1Fe9TtYNgwCsdq
++mJsIYRHK/Z2a3sdUHyJjI+kqxI2o4eI2wx8b4bp5ZoHEKGQtBxerSYbJSoax+U9
+SpNFSz19GeUWYGss8CQlRkTAJ3FseQos3dnUw/LiCngQxpBWLrKriEGCiZLtWQ97
+MKEXmiDKKHzSjCfRUSdb52iOQTNtVjixpGLKhQ1KLSJOTFlgdvmYzHxUtrTCz2DB
+GCWyK/E6cCdShAsL8AGHiQIcBBABAgAGBQJFRRrDAAoJEPJx4K5ucD2VeEgQAJBT
+MyNMJ2h7+9gboW53BPwgP7U3j1nJUVe4z8eNjnI4wXSsjEs4Yx5vSs5wMpluCIst
+QIpca7BpwrptQk/V1oFk4ctSdpglcSVucUcqZfq0ljPEMbfJ2lvqepm+e+JWZirF
+Br+kbO0YwhSTG5E+06gGxojMhfqJqachbFaPaW5g6TyIJeT7rJAqQ/LUtkjKJuV3
+Z4xmH0bE+Azyv/cdiGDCIJiQliHBuN4DVWNdNw4mi0y9+R/zEw7UQi4v2umIrjIw
+Adgs+RNwH53ObPh8Tvn+IU/zsDNiUiS3EC5FQPYp5xFQFkj3z6K50aUkptoUKp1l
+LuOy/fGy6BXLeVQVerqnA7xU+KFCIXy7aqmlLCyQ8DkP/fIt4SZ8qiQwC/4S4W4j
+5k67B6/ikQ2fXXi5dpqlDn+HRKz6Z+JtY4YtGhL54ZTQwTUVKH5N1PRdpxIAWI30
+t+CdHfafyUJ5H9fTnW4gCuG4Fj8PcHGPI87T7I0yXe+K8pcMEX9QIm0RppJXEUxP
+LGQ1+efqDKLuTakPZGk8xNvYDTLMP7fdiL/oe0xZIU1hFNbB2AYEP/TfZ7KCt9/e
+f5Mn95s4EUHIXZ7W/U+6XCtSJehwVCQlsqDEq44NvJYcww+pQ7ANoXyhveDNJpqw
+fgg11tEVLIbZpkhOKAAmkZQW7SHKj6wHfGfWoHn5iQIcBBABAgAGBQJF4sREAAoJ
+EFIiU8PXJzmBYq4QAJA7pMnycrfEpgqcfnxtAGafebTEJf23DHcCzRBL+K/LMklW
+BA8TiWZBgGvLSs1ozcq/+ALDCbS3xuqbClVOXEqQsMkxgP8e0NY7nz92KHzCXDcI
+u3T0Gwto6uyD4bZbEFMW5nZ27zpYYRudZU5f5BYmieDsQeihplFyfTl9FMTjQIyd
+XUxL2wwDJqdBskemKoYTNyK52ZjCfFnjwTI3ObYmhaSlDlKmtgdWCSmBHJZTes8H
+iM2sJyp337O9gt5LvZQbbS4ipF7wIqB39y8eqhIqWzEYBiGAtqqI2El81oH2Cx+2
+JmtY7v7C08lDzockUigncGVZuX5amsiSO/XO6OnpQhc0kB4mMW9+atbO7ihTcALc
+FR4vNu/rneESKvus9iwLnBuETD5jEXa6hFVGy54esXfTAwR5z500LuN2PLzbkwOW
+VEGcH1/zCCxnTi11mFGu9XW8JWm5bvaXvR18L/whWNDWagsUb5RrimcjRLMo52Z5
+GmTwt/oNszyzZ5s1X1pVxEZAwN697S1lmy3gK/QY1iAiLUCWkU/fA7LMvwi4T47H
+RL/0QgDmeFc9iqSDdhuQa+y+q9YEdsxJeyL0JN9mPoRtpmeekEi7sX6JeXYkNM6i
+IzqXr47Ql/8epLZ0HHrAZIdgnY41Tk5977ucEQeegvc9KHYx0VTAgQUUK8tciQIc
+BBABAgAGBQJF4vyVAAoJEDOWFYjhwhhFLbkP/0M95Hrz5IPgtJVdYNw3swiAKUL9
+IpczoD+tEVlt9tLLMnVg7Shmprz44jhROBteIutY2TiPaymTYZElH+np0bTMmXN0
+YNtiyXb378MC+xM5ziaRHfkb1MIqrLgcCrC8ADXnX1IHn80Uil55u3ThrcRWsRoL
+w9iN8IQhpsyq/9L+ad/jX5+gjSY5cuJt7jjLZFef0gEMuzvrBiuoTOLWwmVi3m5h
+rgmSo1iaBVt4JrLv6Uqmyu5QYZgFd99qxO+XA7TvL3Cw3NtOZ3AfqgjKwi1o4Bp7
+xV76WXgWXKkL6vK5Gm6qeYi3Ccmqcp2MZy0VKaDc4eKabE5hSXsXALXCmiZSrAx1
+G/X6CDS4wJenJKXOgXQaqYwMK4LAFHmycWi4cu4Y2Hr2WCk6XckWqUMtacnF3ihJ
+6R7aow1rk9UQAvtHWcVXrrirlBJFbD1M866T1+d5+TLth5o/9UzWGVlvDxjaOlil
+1XHH7oxbLnZM/i6KI7y7eoL2iuzY/jFlf/SjKRBZbMqzy4fzGRwqIfi/s3bAOCqR
+EdeAk/ydCyXmoO8sMiAkV513IBcl/SPgsbMpsUfGNAAVxfeL2dbnsu7cKMfTPPqo
+i5PeCK6mJdWLsriPamUwOfReZHJy/GDY0KiAehHG1vBKuaz7IpRPt52ge52b3P7N
+l9R4DgaI55yZZI8FiQI3BBMBAgAhAhsDAh4BAheABQJK1Y0gBQsJCAcDBRUKCQgL
+BRYCAwEAAAoJECZJ5ijF000FXM0P/ifQ16y9fzJIC6dD4G98ijvo5TVUCoYXQPUn
++ZKSaWVeFP/Ef74vbjrzWUyBDUrRhlZGr+4QhD83KDrg3WPytOLzQaeQly6zaPWJ
+qG+H58ydzlX3uCGkVoMl5BbJWGV18Y4W68H348L4vewmNrBMMWwlj615zo9dr0sb
+y+cxCi1MD7oQi9ircvKxHiZby3Xi6sYlaSStnmXDlysYZIQGiVaAWKoX1FjMO9XO
+mw5B3vyrWHCStmON4ZqRAnIlU1xBvjHvAhp54kxI/ZxFvnFlKS9WFRhXx4Kydgh6
+CebZOd4BHZH0lba/tiaaDm+Nir1QedcJEUrC2FQte7y2va4dfOMJ+qDPfLKoQG34
+3neE3zf61ybm0FDtgSTiVo/YaFB5VZDw3WQ5zaEGB22x8DKz6CyR60If5PJoospQ
+zORuAkSR5AucAfzZ4Z5cO+q4uis19Z4qx3W7OU36ztb4IbdM39qrsQ9NccI3OrP7
+DTJ17zzFnu/LN5dJ5bmMAi8c2Hzaest+HEyBQ08lA2CfQIoFPxw5FCJAYeWu//cG
+AQ79+x/mZw93FCYr06+4q/ToQKArRD1RJkKyT2ooLI3nFYbJyOHpFgtsLuLSI1O1
+olSw0E7QIqn0ZUnU/n+Qk4uOsKxUZ5gYJkHBze7oFMPViMANDKBOX1tlp/ZkcL4I
+MHH1cya9iQJABBMBAgAqBQJF7beqIxpodHRwOi8vd3d3LmVsaG8ubmV0L2NyeXB0
+by9wb2xpY3kvAAoJEJV5UtfPNAGptAMQAI65u0iFjIwionEuOnFcYqL/8QxytBLe
+l12aek0oCZe5TnJQGI2gigy/FsxrP49a2IN9NGspRDYVqf9f2CO6LzfIDwgw7obh
+JnxDaReeYRv1bSAiiJERbwGj35zCqHi4xjz2cd0BfXVICLfY7NaaaR+eReCdYJko
+Vih0LKkiUL6s/SIpwog9EjCnbNI6BZZ4XFoP2zAG3iXQ2WzdRcwE98CmNcZlebcn
+fK9x/NSnEnLIHvkfyUH/e1qCaw20a7qYQ6tUbbqmBdCH7z0aMWKbYyCUgovoV1ve
+YwWRgCPS2ZDEJFxj3dAGZeHRJHMo3Qw5Ax+3KHJfIab5RjIkWrAN123TTSyf61SP
+yBMN/xQrpeMC55uhNyUkB12Gu+SyAau/8AXLAsILkiaLnD50HEi3B0oz9ku35JTw
+bhBVdEct2N+J9TzQpC7wpsdwSosTXhFioMwNz374gXhZqoAhnyOSau8Eo1CGiClC
+e5hIC5vXgLrX55hhahSjFLDSXpDqdplIHXVVqD1rKh4EkMSXoP2QKSuQcm1cADL5
+cDupUU8SOaKnvXEgdyCVe3DjTFrkoSP5mQaDCzuC9k2Sjmn8FETHklp2S6BrTY8V
+0UAXZkQQV8Yr+SKzFXptjyI3u4hzDzDW1jpkiz2yMjxui9SC27JevUptw0RIBKUz
+V/HenLpL04PliEYEEBECAAYFAkZS+5oACgkQIhjIHo58A/+s2ACfSh2lrybtTXoC
+ECYOxVIhNDr6YfgAnj6wZFddpyAFukxpGf908WNJYabGiEYEEBECAAYFAkZugMcA
+CgkQj6mKb+7tcPNtOACdFUd9T0BcxSkBNM6GWQJkYyd9180AoKElZP/leQMZvIW4
++wFA3r5Wdia1iEYEEBECAAYFAkaR9uMACgkQqbb3MLg9dhwwUQCgrYTG5N2AZFSP
+ctGES3o7NYkQehkAoJquSURqg+tmCsIavVMqpPAvu4D3iEYEExECAAYFAkae8PUA
+CgkQmGINRbWBGCz+IwCfX0H4rQ7WY6VtJYDnQ9MAxFoHErIAnigbjnobAWP+w7KJ
+DBsspQiJ9NtliEYEEBECAAYFAkaksjcACgkQmLReZmY5NBWpyQCgpMwLmu7xPUaA
+dU5dcg3HUt3Eb0YAnisdKeooJqbhGLZQGzIf6d4dF02AiEYEEBECAAYFAkaksk4A
+CgkQos7wqTrZvaeIjQCfQc57J9xErBQEVRUXkEMXLDUFpJAAn2leOk20mvap8KHB
+q1cX5smLTLN5iEYEEhECAAYFAkbRq3IACgkQSVDhKrJykfIFAgCeP5dmvQ1uj34e
+Z9wQwpIyK4j65AkAn3AWpE8wE4h6A/5FFDRqbBJUpXehiEYEEhECAAYFAkbVe9cA
+CgkQ9sjpnGdoHTxxCgCgqDVmqFjHFSUCIEMwjldmjzGhhCcAn2RFPiO+FgY1AmtT
+DZf1BoxUejBniEYEEhECAAYFAkeCcEwACgkQ3nqvbpTAnH8Y8gCfWki6+PtJbrDC
+eWW7GhczRmv2I/wAoK3SYFxKwhw7VKejCeWM63sVcgguiQEcBBABAgAGBQJHwcy0
+AAoJEFcaYqhmP4greS4H/2ye70lxiqVXCXbl92tuUjsY4TNoT1vs7nKA/bFvlbeO
+eJDZax3JzFSPZTM2n56jaF2UWBU58VKbW9nQHWPZA76qZ7XOYW+PRncL3PQdM0PQ
+XWG2ZnIveHsy+gq34R+qQiYqeebsCOIr47HvxXsbTLwDXo306rpbccDKPtGDb8Nf
+JDY8xwTc/yW2HLpovRYDqsnUhp1qbpDPffoq+0BB6l2cunYMdg5m5oTcrieeCJ2c
+xe3sls2lBAPbI5M6YM79DBUuliCiyqXFV+rZOmxDmB59XPo2rF6RIDIbp2VN3Y9S
+j1qc4mtnlozq30tLdsllPMgMDBDu+rrA2rqbuL9Sv6qIRgQSEQIABgUCR8GrTQAK
+CRAb/jMyONooR0iXAJ9xN5auoMvs6t36fPH1cSR/XB9I4wCgoOGuVz7coUYoVLS3
+uHpBYANAaG6IRgQQEQIABgUCR8GgHgAKCRBsxprCaGj0H4zsAJ9HbB7Re79MoLS7
+BGSbap8ct9c9bwCdGuHqFF0xZPjimP5ttokbMT8dQOeIRgQQEQIABgUCR8KUgQAK
+CRDtWBwmQwsmVws3AJ0ZUkvcg5PgjcHD8XcS5wegtG2BNQCfSAZ05c8GyeLtXnQT
+6GbwuWbWwg2IRgQQEQIABgUCR8IUPAAKCRDO5A6gYki6EvScAJ9Vui2VfRJd3fQX
+D6wZilOPgBFKgACaA49/DPbrq3Qkuy1vcoIFyZcN60CIRgQTEQIABgUCR8Kq7AAK
+CRA7v893vYsFDT9ZAKCyQK3kY7h9DrqlxkhQWP0B+1TdYgCgpuQsMk3fJLhfmoMJ
+HdICCLc5PveIRgQQEQIABgUCR8KvUwAKCRB4NVvUpILuJCaVAJ97rI4MGM0db37R
+Ijbe2jMpwbq7ogCdFj678u/aWxvOFUWU0g1fBk7Il3CIRgQQEQIABgUCR8Kl4wAK
+CRDDdqja8bzbc/r8AJ4naYzJOioW6TalKHKy5vucpZaKdwCfczQ211l8Lf7qkukY
+YNf/k5lVQ2mIRgQQEQIABgUCR8LCLgAKCRBpwjG5mqVqbQD8AJ9ye1A2OspixELG
+jgnyvikzI54SJwCgpb8xfDm8aaY1E+F9eA4vD1TKV8GIfQQTEQIAPQUCR8LqCDIa
aHR0cDovL3d3dy5uaWMtbmFjLXByb2plY3Qub3JnL35ibGFhcC9wb2xpY3kuaHRt
-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
+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
-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
-=srgn
+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
+=goYd
-----END PGP PUBLIC KEY BLOCK-----
]]></programlisting>
diff --git a/share/xml/header.ent b/share/xml/header.ent
index 0854b9ba81..3e1bd1c36c 100644
--- a/share/xml/header.ent
+++ b/share/xml/header.ent
@@ -105,6 +105,7 @@
<li><a href="http://forums.freebsd.org">Forums</a></li>
<li><a href="&base;/usergroups.html">User Groups</a></li>
<li><a href="&base;/events/events.html">Events</a></li>
+ <li><a href="http://serverfault.com/questions/tagged/freebsd">Q&A (external)</a></li>
</ul>
</li>
</ul>
diff --git a/share/xml/navibar.ent b/share/xml/navibar.ent
index 812621905e..29f45db266 100644
--- a/share/xml/navibar.ent
+++ b/share/xml/navibar.ent
@@ -38,6 +38,7 @@
<li><a href="&base;/events/events.html">Events</a></li>
<li><a href="&base;/community/webresources.html">Web Resources</a></li>
<li><a href="&base;/community/social.html">Social Networks</a></li>
+ <li><a href="http://serverfault.com/questions/tagged/freebsd">Q&A (external)</a></li>
</ul>
</div> <!-- SIDENAV -->'>