PERFORCE change 155274 for review
Rene Ladan
rene at FreeBSD.org
Thu Dec 25 03:54:53 PST 2008
http://perforce.freebsd.org/chv.cgi?CH=155274
Change 155274 by rene at rene_self on 2008/12/25 11:54:03
IFC
Affected files ...
.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/linux-users/article.sgml#3 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/faq/book.sgml#12 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#6 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/disks/chapter.sgml#5 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/firewalls/chapter.sgml#5 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/install/chapter.sgml#4 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml#9 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/Makefile#7 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/problem-reports/Makefile#3 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/problem-reports/article.sgml#9 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#24 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/basics/chapter.sgml#11 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/geom/chapter.sgml#10 integrate
.. //depot/projects/docproj_nl/share/sgml/catalog#2 integrate
.. //depot/projects/docproj_nl/share/sgml/default.dsl#2 integrate
.. //depot/projects/docproj_nl/share/sgml/freebsd-common.dsl#1 branch
.. //depot/projects/docproj_nl/share/sgml/freebsd-html.dsl#1 branch
.. //depot/projects/docproj_nl/share/sgml/freebsd-print.dsl#1 branch
.. //depot/projects/docproj_nl/share/sgml/freebsd.dsl#3 integrate
.. //depot/projects/docproj_nl/share/sgml/man-refs.ent#11 integrate
Differences ...
==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/linux-users/article.sgml#3 (text+ko) ====
@@ -19,7 +19,7 @@
<holder>The FreeBSD Documentation Project</holder>
</copyright>
- <releaseinfo>$FreeBSD: doc/en_US.ISO8859-1/articles/linux-users/article.sgml,v 1.6 2008/05/26 16:44:05 gabor Exp $</releaseinfo>
+ <releaseinfo>$FreeBSD: doc/en_US.ISO8859-1/articles/linux-users/article.sgml,v 1.7 2008/12/24 10:43:29 pgj Exp $</releaseinfo>
<legalnotice id="trademarks" role="trademarks">
&tm-attrib.freebsd;
@@ -410,8 +410,8 @@
<application>CVS</application> (Concurrent Versioning System) servers.
Once the local source code is up to date you can build new versions of
the kernel and userland. For more information on source updates see
- <ulink url="&url.base;/doc/en_US.ISO8859-1/books/handbook/cutting-edge.html">chapter 23</ulink>
- of the &os; Handbook.</para>
+ <ulink url="&url.base;/doc/en_US.ISO8859-1/books/handbook/updating-upgrading.html">the chapter on updating</ulink>
+ in the &os; Handbook.</para>
<para>Binary updates are similar to using <command>yum</command> or
<command>apt-get</command> to update a &linux; system. The command
==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/faq/book.sgml#12 (text+ko) ====
@@ -12,7 +12,7 @@
<corpauthor>The &os; Documentation Project</corpauthor>
- <pubdate>$FreeBSD: doc/en_US.ISO8859-1/books/faq/book.sgml,v 1.1103 2008/12/07 20:44:01 pgj Exp $</pubdate>
+ <pubdate>$FreeBSD: doc/en_US.ISO8859-1/books/faq/book.sgml,v 1.1104 2008/12/24 10:32:40 pgj Exp $</pubdate>
<copyright>
<year>1995</year>
@@ -354,12 +354,12 @@
<answer>
<para><ulink
- url="&url.books.handbook;/cutting-edge.html#CURRENT">&os.current;</ulink>
+ url="&url.books.handbook;/current-stable.html#CURRENT">&os.current;</ulink>
is the development version of the operating system, which
will in due course become the new &os.stable; branch. As
such, it is really only of interest to developers working on
the system and die-hard hobbyists. See the <ulink
- url="&url.books.handbook;/cutting-edge.html#CURRENT">relevant section</ulink>
+ url="&url.books.handbook;/current-stable.html#CURRENT">relevant section</ulink>
in the <ulink
url="&url.books.handbook;/index.html">Handbook</ulink> for
details on running <emphasis>-CURRENT</emphasis>.</para>
==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#6 (text+ko) ====
@@ -1,7 +1,7 @@
<!--
The FreeBSD Documentation Project
- $FreeBSD: doc/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml,v 1.232 2008/12/23 18:48:21 trhodes Exp $
+ $FreeBSD: doc/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml,v 1.233 2008/12/24 21:47:59 manolis Exp $
-->
<chapter id="updating-upgrading">
@@ -229,7 +229,7 @@
are either accepted, open an editor, or
<command>freebsd-update</command> will abort. When in doubt,
backup <filename class="directory">/etc</filename> and just
- accept the merges. See <xref linkend="updating-upgrading"> for more
+ accept the merges. See <xref linkend="mergemaster"> for more
information about the <command>mergemaster</command>
command.</para>
==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/disks/chapter.sgml#5 (text+ko) ====
@@ -1,7 +1,7 @@
<!--
The FreeBSD Documentation Project
- $FreeBSD: doc/en_US.ISO8859-1/books/handbook/disks/chapter.sgml,v 1.288 2008/10/07 17:57:41 blackend Exp $
+ $FreeBSD: doc/en_US.ISO8859-1/books/handbook/disks/chapter.sgml,v 1.290 2008/12/24 13:30:35 hrs Exp $
-->
<chapter id="disks">
@@ -2381,12 +2381,19 @@
<command>dump</command> and <command>restore</command>. They
operate on the drive as a collection of disk blocks, below the
abstractions of files, links and directories that are created by
- the file systems. <command>dump</command> backs up an entire
+ the file systems. Unlike other backup software,
+ <command>dump</command> backs up an entire
file system on a device. It is unable to backup only part of a
file system or a directory tree that spans more than one
- file system. <command>dump</command> does not write files and
+ file system. The <command>dump</command> command does not write files and
directories to tape, but rather writes the raw data blocks that
- comprise files and directories.</para>
+ comprise files and directories. When being used to extract
+ data, <command>restore</command> stores temporary files
+ in <filename>/tmp/</filename> by default — if you are
+ operating from a recovery disk with a small
+ <filename>/tmp</filename> directory, you may need to set the
+ <envar>TMPDIR</envar> environment variable to a directory
+ with more free space for the restore to be successful.</para>
<note><para>If you use <command>dump</command> on your root directory, you
would not back up <filename>/home</filename>,
==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/firewalls/chapter.sgml#5 (text+ko) ====
@@ -1,7 +1,7 @@
<!--
The FreeBSD Documentation Project
- $FreeBSD: doc/en_US.ISO8859-1/books/handbook/firewalls/chapter.sgml,v 1.85 2008/08/06 22:03:49 pgj Exp $
+ $FreeBSD: doc/en_US.ISO8859-1/books/handbook/firewalls/chapter.sgml,v 1.86 2008/12/24 01:33:40 danger Exp $
-->
<chapter id="firewalls">
@@ -2124,11 +2124,6 @@
<secondary>IPFW</secondary>
</indexterm>
- <note>
- <para>This section is work in progress. The contents might
- not be accurate at all times.</para>
- </note>
-
<para>The IPFIREWALL (IPFW) is a &os; sponsored firewall software
application authored and maintained by &os; volunteer staff
members. It uses the legacy stateless rules and a legacy rule
@@ -2136,7 +2131,8 @@
Stateful logic.</para>
<para>The IPFW sample rule set (found in
- <filename>/etc/rc.firewall</filename>) in the standard &os;
+ <filename>/etc/rc.firewall</filename> and
+ <filename>/etc/rc.firewall6</filename>) in the standard &os;
install is rather simple and it is not expected that it used
directly without modifications. The example does not use
stateful filtering, which is beneficial in most setups, so it
@@ -2159,7 +2155,8 @@
rule which triggers the <acronym>NAT</acronym> facility, and the
advanced special purpose facilities, the dummynet traffic shaper
facilities, the 'fwd rule' forward facility, the bridge
- facility, and the ipstealth facility.</para>
+ facility, and the ipstealth facility. IPFW supports both IPv4
+ and IPv6.</para>
<sect2 id="firewalls-ipfw-enable">
<title>Enabling IPFW</title>
@@ -2256,15 +2253,6 @@
firewall by default, which is a good idea when you are first
setting up your firewall.</para>
- <programlisting>options IPV6FIREWALL
-options IPV6FIREWALL_VERBOSE
-options IPV6FIREWALL_VERBOSE_LIMIT
-options IPV6FIREWALL_DEFAULT_TO_ACCEPT</programlisting>
-
- <para>These options are exactly the same as the IPv4 options but
- they are for IPv6. If you do not use IPv6 you might want to
- use IPV6FIREWALL without any rules to block all IPv6</para>
-
<indexterm>
<primary>kernel options</primary>
==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/install/chapter.sgml#4 (text+ko) ====
@@ -1,7 +1,7 @@
<!--
The FreeBSD Documentation Project
- $FreeBSD: doc/en_US.ISO8859-1/books/handbook/install/chapter.sgml,v 1.391 2008/12/15 01:25:50 murray Exp $
+ $FreeBSD: doc/en_US.ISO8859-1/books/handbook/install/chapter.sgml,v 1.392 2008/12/24 13:44:02 blackend Exp $
-->
<chapter id="install">
@@ -4301,14 +4301,14 @@
</indexterm>
<question>
<para>When <application>sysinstall</application> is used
- in an xterm, the yellow font is difficult to read
+ in an X11 terminal, the yellow font is difficult to read
against the light gray background. Is there a way to
provide higher contrast for this application?</para>
</question>
<answer>
<para>If you already have X11 installed and the default
colors chosen by <application>sysinstall</application>
- make text illegible while using xterm or rxvt, add the
+ make text illegible while using &man.xterm.1; or &man.rxvt.1;, add the
following to your <filename>~/.Xdefaults</filename> to
get a darker background gray: <literal>XTerm*color7:
#c0c0c0</literal></para>
==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml#9 (text+ko) ====
@@ -1,7 +1,7 @@
<!--
The FreeBSD Documentation Project
- $FreeBSD: doc/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml,v 1.111 2008/12/18 09:34:23 maxim Exp $
+ $FreeBSD: doc/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml,v 1.112 2008/12/24 23:16:16 trhodes Exp $
-->
<chapter id="network-servers">
@@ -71,6 +71,12 @@
time server, with the NTP protocol.</para>
</listitem>
+ <listitem>
+ <para>How to configure the standard logging daemon,
+ <command>syslogd</command>, to accept logs from remote
+ hosts.</para>
+ </listitem>
+
</itemizedlist>
<para>Before reading this chapter, you should:</para>
@@ -4948,6 +4954,280 @@
</sect2>
</sect1>
+ <sect1 id="network-syslogd">
+ <sect1info>
+ <authorgroup>
+ <author>
+ <firstname>Tom</firstname>
+ <surname>Rhodes</surname>
+ <contrib>Contributed by </contrib>
+ </author>
+ </authorgroup>
+ </sect1info>
+
+ <title>Remote Host Logging with <command>syslogd</command></title>
+
+ <para>Interacting with system logs is a crucial aspect of both
+ security and system administration. Monitoring the log files of
+ multiple hosts can get very unwieldy when these hosts are
+ distributed across medium or large networks, or when they are
+ parts of various different types of networks. In these cases,
+ configuring remote logging may make the whole process a lot more
+ comfortable.</para>
+
+ <para>Centralized logging to a specific logging host can reduce
+ some of the administrative burden of log file administration. Log
+ file aggregation, merging and rotation can be configured in one
+ location, using the native tools of &os;, such as &man.syslogd.8;
+ and &man.newsyslog.8;. In the
+ following example configuration, host <hostid>A</hostid>, named
+ <hostid role="fqdn">logserv.example.com</hostid>, will collect
+ logging information for the local network.
+ Host <hostid>B</hostid>, named
+ <hostid role="fqdn">logclient.example.com</hostid> will pass
+ logging information to the server system. In live
+ configurations, both hosts require proper forward and reverse
+ <acronym>DNS</acronym> or entries in
+ <filename>/etc/hosts</filename>. Otherwise, data will be
+ rejected by the server.</para>
+
+ <sect2>
+ <title>Log Server Configuration</title>
+
+ <para>Log servers are machines configured to accept logging
+ information from remote hosts. In most cases this is to ease
+ configuration, in other cases it may just be a better
+ administration move. Regardless of reason, there are a few
+ requirements before continuing.</para>
+
+ <para>A properly configured logging server has met the following
+ minimal requirements:</para>
+
+ <itemizedlist>
+ <listitem>
+ <para>The firewall ruleset allows for <acronym>UDP</acronym>
+ to be passed on port 514 on both the client and
+ server;</para>
+ </listitem>
+
+ <listitem>
+ <para>syslogd has been configured to accept remote messages
+ from client machines;</para>
+ </listitem>
+
+ <listitem>
+ <para>The syslogd server and all client machines must have
+ valid entries for both forward and reverse
+ <acronym>DNS</acronym>, or be properly configured in
+ <filename>/etc/hosts</filename>.</para>
+ </listitem>
+ </itemizedlist>
+
+ <para>To configure the log server, the client must be listed
+ in <filename>/etc/syslog.conf</filename>, and the logging
+ facility must be specified:</para>
+
+ <programlisting>+logclient.example.com
+*.* /var/log/logclient.log</programlisting>
+
+ <note>
+ <para>More information on various supported and available
+ <emphasis>facilities</emphasis> may be found in the
+ &man.syslog.conf.5; manual page.</para>
+ </note>
+
+ <para>Once added, all <literal>facility</literal> messages will
+ be logged to the file specified previously,
+ <filename>/var/log/logclient.log</filename>.</para>
+
+ <para>Finally, the log file should be created. The method used
+ does not matter, but &man.touch.1; works great for situations
+ such as this:</para>
+
+ <screen>&prompt.root; <userinput>touch <filename>/var/log/logclient.log</filename></userinput></screen>
+
+ <para>At this point, the <command>syslogd</command> daemon should
+ be restarted and verified:</para>
+
+ <screen>&prompt.root; <userinput>/etc/rc.d/syslogd restart</userinput>
+&prompt.root; <userinput>pgrep syslog</userinput></screen>
+
+ <para>If a <acronym>PID</acronym> is returned, the server has been
+ restarted successfully, and client configuration may begin. If
+ the server has not restarted, consult the
+ <filename>/var/log/messages</filename> log for any
+ output.</para>
+ </sect2>
+
+ <sect2>
+ <title>Log Client Configuration</title>
+
+ <para>A logging client is a machine which sends log information
+ to a logging server in addition to keeping local copies.</para>
+
+ <para>Similar to log servers, clients must also meet a few minimum
+ requirements.</para>
+
+ <itemizedlist>
+ <listitem>
+ <para>&man.syslogd.8; must be configured to send messages of
+ specific types to a log server, which must accept
+ them;</para>
+ </listitem>
+
+ <listitem>
+ <para>The firewall must allow <acronym>UDP</acronym> packets
+ through on port 512;</para>
+ </listitem>
+
+ <listitem>
+ <para>Both forward and reverse <acronym>DNS</acronym> must
+ be configured or have proper entries in the
+ <filename>/etc/hosts</filename>.</para>
+ </listitem>
+ </itemizedlist>
+
+ <para>Client configuration is a bit more relaxed when compared
+ to that of the servers. The client machine must also have the
+ following listing placed inside
+ <filename>/etc/rc.conf</filename>:</para>
+
+ <programlisting>syslogd_enable="YES"
+syslogd_flags="-a logclient.example.com -vv"</programlisting>
+
+ <para>The first option will enable the <command>syslogd</command>
+ daemon on boot up, and the second line allows data from the
+ client to be accepted on this server. The latter part, using
+ <option>-vv</option>, will increase the verbosity of logged
+ messages. This is extremely useful for tweaking facilities as
+ administrators are able to see what type of messages are being
+ logged under which facility.</para>
+
+ <para>Facilities describe the system part for which a message
+ is generated. For an example, <acronym>ftp</acronym> and
+ <acronym>ipfw</acronym> are both facilities. When log messages
+ are generated for those two services, they will normally include
+ those two utilities in any log messages. Facilities are
+ accompanied with a priority or level, which is used to mark how
+ important a log message is. The most common will be the
+ <literal>warning</literal> and <literal>info</literal>. Please
+ refer to the &man.syslog.3; manual page for a full list of
+ available facilities and priorities.</para>
+
+ <para>The logging server must be defined in the client's
+ <filename>/etc/syslog.conf</filename>. In this instance,
+ the <literal>@</literal> symbol is used to send logging
+ data to a remote server and would look similar to the
+ following entry:</para>
+
+ <programlisting>*.* @logserv.example.com</programlisting>
+
+ <para>Once added, <command>syslogd</command> must be restarted
+ for the changes to take effect:</para>
+
+ <screen>&prompt.root; <userinput>/etc/rc.d/syslogd restart</userinput></screen>
+
+ <para>To test that log messages are being sent across the network,
+ use &man.logger.1; to send a message to
+ <command>syslogd</command>:</para>
+
+ <screen>&prompt.root; <userinput>logger "Test message from logclient"</userinput></screen>
+
+ <para>This message should now exist in
+ <filename>/var/log/messages</filename> on both the client
+ and the server.</para>
+ </sect2>
+
+ <sect2>
+ <title>Debugging Log Servers</title>
+
+ <para>In certain cases, debugging may be required if messages are
+ not being received on the log server. There are several reasons
+ this may occur; however, the most common two are network
+ connection issues and <acronym>DNS</acronym> issues. To test
+ these cases, ensure both hosts are able to reach other
+ using the hostname specified in
+ <filename>/etc/rc.conf</filename>. If this appears to be
+ working properly, an alternation to the
+ <literal>syslogd_flags</literal> option in
+ <filename>/etc/rc.conf</filename> will be required.</para>
+
+ <para>In the following example,
+ <filename>/var/log/logclient.log</filename> is empty, and the
+ <filename>/var/log/messages</filename> files indicate no reason
+ for the failure. To increase debugging output, change the
+ <literal>syslogd_flags</literal> option to look like the
+ following example, and issue a restart:</para>
+
+ <programlisting>syslogd_flags="-d -a logclien.example.com -vv"</programlisting>
+
+ <screen>&prompt.root; <userinput>/etc/rc.d/syslogd restart</userinput></screen>
+
+ <para>Debugging data similar to the following will flash on the
+ screen immediately after the restart:</para>
+
+ <screen>logmsg: pri 56, flags 4, from logserv.example.com, msg syslogd: restart
+syslogd: restarted
+logmsg: pri 6, flags 4, from logserv.example.com, msg syslogd: kernel boot file is /boot/kernel/kernel
+Logging to FILE /var/log/messages
+syslogd: kernel boot file is /boot/kernel/kernel
+cvthname(192.168.1.10)
+validate: dgram from IP 192.168.1.10, port 514, name logclient.example.com;
+rejected in rule 0 due to name mismatch.</screen>
+
+ <para>It appears obvious the messages are being rejected due
+ to a name mismatch. After reviewing the configuration bit
+ by bit, it appears a typo in the following
+ <filename>/etc/rc.conf</filename> line has an issue:</para>
+
+ <programlisting>syslogd_flags="-d -a logclien.example.com -vv"</programlisting>
+
+ <para>The line should contain <literal>logclient</literal>, not
+ <literal>logclien</literal>. After the proper alterations
+ are made, a restart is issued with expected results:</para>
+
+ <screen>&prompt.root; <userinput>/etc/rc.d/syslogd restart</userinput>
+logmsg: pri 56, flags 4, from logserv.example.com, msg syslogd: restart
+syslogd: restarted
+logmsg: pri 6, flags 4, from logserv.example.com, msg syslogd: kernel boot file is /boot/kernel/kernel
+syslogd: kernel boot file is /boot/kernel/kernel
+logmsg: pri 166, flags 17, from logserv.example.com,
+msg Dec 10 20:55:02 <syslog.err> logserv.example.com syslogd: exiting on signal 2
+cvthname(192.168.1.10)
+validate: dgram from IP 192.168.1.10, port 514, name logclient.example.com;
+accepted in rule 0.
+logmsg: pri 15, flags 0, from logclient.example.com, msg Dec 11 02:01:28 trhodes: Test message 2
+Logging to FILE /var/log/logclient.log
+Logging to FILE /var/log/messages</screen>
+
+ <para>At this point, the messages are being properly received
+ and placed in the correct file.</para>
+ </sect2>
+
+ <sect2>
+ <title>Security Considerations</title>
+
+ <para>As with any network service, security requirements should
+ be considered before implementing this configuration. At times,
+ log files may contain sensitive data about services enabled on
+ the local host, user accounts, and configuration data. Network
+ data sent from the client to the server will not be encrypted
+ nor password protected. If a need for encryption exists, it
+ might be possible to use
+ <filename role="package">security/stunnel</filename>, which
+ will transmit data over an encrypted tunnel.</para>
+
+ <para>Local security is also an issue. Log files are not
+ encrypted during use or after log rotation. Local users may
+ access these files to gain additional insight on system
+ configuration. In those cases, setting proper permissions
+ on these files will be critical. The &man.newsyslog.8;
+ utility supports setting permissions on newly created and
+ rotated log files. Setting log files to mode
+ <literal>600</literal> should prevent any unwanted snooping
+ by local users.</para>
+ </sect2>
+ </sect1>
</chapter>
<!--
==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/Makefile#7 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: doc/nl_NL.ISO8859-1/articles/Makefile,v 1.2 2008/12/09 21:38:35 rene Exp $
+# $FreeBSD: doc/nl_NL.ISO8859-1/articles/Makefile,v 1.3 2008/12/24 14:14:36 rene Exp $
# %SOURCE% en_US.ISO8859-1/articles/Makefile
# %SRCID% 1.60
==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/problem-reports/Makefile#3 (text+ko) ====
==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/problem-reports/article.sgml#9 (text+ko) ====
==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#24 (text+ko) ====
@@ -1,7 +1,7 @@
<!--
The FreeBSD Dutch Documentation Project
- $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.sgml,v 1.8 2008/12/21 12:18:55 rene Exp $
+ $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.sgml,v 1.9 2008/12/23 23:07:32 rene Exp $
%SOURCE% en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml
%SRCID% 1.419
==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/basics/chapter.sgml#11 (text+ko) ====
@@ -1,7 +1,7 @@
<!--
The FreeBSD Dutch Documentation Project
- $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/basics/chapter.sgml,v 1.19 2008/12/21 12:18:55 rene Exp $
+ $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/basics/chapter.sgml,v 1.20 2008/12/23 23:17:30 rene Exp $
%SOURCE% en_US.ISO8859-1/books/handbook/basics/chapter.sgml
%SRCID% 1.156
==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/geom/chapter.sgml#10 (text+ko) ====
@@ -1,7 +1,7 @@
<!--
The FreeBSD Dutch Documentation Project
- $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/geom/chapter.sgml,v 1.9 2008/11/30 21:06:25 rene Exp $
+ $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/geom/chapter.sgml,v 1.10 2008/12/23 23:27:53 rene Exp $
$FreeBSDnl: doc/nl_NL.ISO8859-1/books/handbook/geom/chapter.sgml,v 1.13 2006/01/05 21:13:21 siebrand Exp $
%SOURCE% en_US.ISO8859-1/books/handbook/geom/chapter.sgml
==== //depot/projects/docproj_nl/share/sgml/catalog#2 (text+ko) ====
@@ -1,7 +1,7 @@
-- ...................................................................... --
-- FreeBSD SGML Public Identifiers ...................................... --
- -- $FreeBSD: doc/share/sgml/catalog,v 1.31 2004/08/08 13:44:01 hrs Exp $
+ -- $FreeBSD: doc/share/sgml/catalog,v 1.32 2008/12/24 17:06:07 hrs Exp $
--
-- ...................................................................... --
@@ -23,6 +23,24 @@
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"
+
+PUBLIC "-//FreeBSD//DOCUMENT DocBook Print Lanugage Neutral Stylesheet//EN"
+ "freebsd-print.dsl"
+
+PUBLIC "-//FreeBSD//DOCUMENT DocBook Common Stylesheet//EN"
+ "freebsd-common.dsl"
+
+PUBLIC "-//FreeBSD//DOCUMENT DocBook Common Lanugage Neutral Stylesheet//EN"
+ "freebsd-common.dsl"
+
PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN"
"articles.ent"
==== //depot/projects/docproj_nl/share/sgml/default.dsl#2 (text+ko) ====
@@ -1,14 +1,14 @@
-<!-- $FreeBSD: doc/share/sgml/default.dsl,v 1.1 2000/09/28 23:29:48 nbm Exp $ -->
+<!-- $FreeBSD: doc/share/sgml/default.dsl,v 1.2 2008/12/24 17:06:07 hrs Exp $ -->
<!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 use="freebsd">
<style-specification-body>
</style-specification-body>
</style-specification>
- <external-specification id="docbook" document="freebsd.dsl">
+ <external-specification id="freebsd" document="freebsd.dsl">
</style-sheet>
==== //depot/projects/docproj_nl/share/sgml/freebsd.dsl#3 (text+ko) ====
@@ -1,13 +1,8 @@
-<!-- $FreeBSD: doc/share/sgml/freebsd.dsl,v 1.94 2008/05/24 16:16:20 blackend Exp $ -->
+<!-- $FreeBSD: doc/share/sgml/freebsd.dsl,v 1.95 2008/12/24 17:06:07 hrs Exp $ -->
<!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
<!ENTITY % output.html "IGNORE">
-<!ENTITY % output.html.images "IGNORE">
-<!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 % freebsd.l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN">
%freebsd.l10n;
@@ -16,1099 +11,27 @@
<![ %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>
]>
<style-sheet>
- <style-specification use="docbook">
+ <style-specification use="freebsd freebsd-common docbook">
<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 -->
-
- (define %html-header-tags% '(("META" ("HTTP-EQUIV" "Content-Type")
- ("CONTENT" "text/html; charset=&doc.html.charset;"))))
-
- (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)))
- ;; FIXME: html4 only
- (let ((title (attribute-string (normalize "role") (current-node))))
- (if title
- (make element gi: "ACRONYM"
- attributes: (list
- (list "TITLE" title)
- (list "CLASS" (gi)))
- sosofo)
- (make element gi: "ACRONYM"
- attributes: (list
- (list "CLASS" (gi)))
- 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
- #f)
-
- <!-- 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+8-current"))
- (("xfree86") (string-append u "&" "amp;" "manpath=XFree86+4.5.0"))
- (("xorg") (string-append u "&" "amp;" "manpath=X11R7.2"))
- (("netbsd") (string-append u "&" "amp;" "manpath=NetBSD+3.0"))
- (("openbsd") (string-append u "&" "amp;" "manpath=OpenBSD+4.1"))
- (("ports") (string-append u "&" "amp;" "manpath=FreeBSD+7.0-RELEASE+and+Ports"))
- (else u))))
-
- (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://www.FreeBSD.org/cgi/url.cgi")
- (href (string-append urlurl "?ports/"
- (data (current-node))
- "/pkg-descr")))
- (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
- 15)
-
- (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
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list