Date: Fri, 8 Sep 2017 14:20:55 +0000 (UTC) From: Warren Block <wblock@FreeBSD.org> To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r50808 - in head/en_US.ISO8859-1/books/handbook: config disks mail network-servers Message-ID: <201709081420.v88EKtnV065141@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: wblock Date: Fri Sep 8 14:20:54 2017 New Revision: 50808 URL: https://svnweb.freebsd.org/changeset/doc/50808 Log: Reduce the impact of example $FreeBSD$ version strings by enclosing them in <phrase> elements. The its:notranslate property can then be set on these individual lines rather than a whole <screen> or <programlisting>. Sponsored by: iXsystems Modified: head/en_US.ISO8859-1/books/handbook/config/chapter.xml head/en_US.ISO8859-1/books/handbook/disks/chapter.xml head/en_US.ISO8859-1/books/handbook/mail/chapter.xml head/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml Modified: head/en_US.ISO8859-1/books/handbook/config/chapter.xml ============================================================================== --- head/en_US.ISO8859-1/books/handbook/config/chapter.xml Fri Sep 8 00:26:09 2017 (r50807) +++ head/en_US.ISO8859-1/books/handbook/config/chapter.xml Fri Sep 8 14:20:54 2017 (r50808) @@ -262,9 +262,9 @@ run_rc_command "$1"</programlisting> <para>Here is a sample entry from the system crontab, <filename>/etc/crontab</filename>:</para> - <programlisting its:translate="no"># /etc/crontab - root's crontab for FreeBSD + <programlisting># /etc/crontab - root's crontab for FreeBSD # -# $FreeBSD$ +# <phrase its:translate="no">$FreeBSD$</phrase> # <co xml:id="co-comments"/> SHELL=/bin/sh PATH=/etc:/bin:/sbin:/usr/bin:/usr/sbin <co xml:id="co-env"/> @@ -1315,7 +1315,7 @@ ifconfig_fxp0_alias7="inet 202.0.75.20 netmask 255.255 remote log host. As an example, here is the default <filename>syslog.conf</filename> from &os;:</para> - <programlisting its:translate="no"># $&os;$ + <programlisting># <phrase its:translate="no">$&os;$</phrase> # # Spaces ARE valid field separators in this file. However, # other *nix-like systems still insist on using tabs as field @@ -1450,8 +1450,8 @@ cron.* /var/l and programs to signal when the log is rotated. Here is the default configuration in &os;:</para> - <programlisting its:translate="no"># configuration file for newsyslog -# $FreeBSD$ + <programlisting># configuration file for newsyslog +# <phrase its:translate="no">$FreeBSD$</phrase> # # Entries which do not specify the '/pid_file' field will cause the # syslogd process to be signalled when that log file is rotated. This @@ -1926,7 +1926,7 @@ nameserver 147.11.100.30</programlisting> external <acronym>DNS</acronym> servers for commonly accessed names.</para> - <programlisting its:translate="no"># $&os;$ + <programlisting># <phrase its:translate="no">$&os;$</phrase> # # # Host Database Modified: head/en_US.ISO8859-1/books/handbook/disks/chapter.xml ============================================================================== --- head/en_US.ISO8859-1/books/handbook/disks/chapter.xml Fri Sep 8 00:26:09 2017 (r50807) +++ head/en_US.ISO8859-1/books/handbook/disks/chapter.xml Fri Sep 8 14:20:54 2017 (r50808) @@ -2706,8 +2706,8 @@ Quotas for user test: <acronym>UFS</acronym> file system, set the sector_size to 2048:</para> - <screen its:translate="no">&prompt.root; <userinput>gbde init /dev/ad4s1c -i -L /etc/gbde/ad4s1c.lock</userinput> -# $FreeBSD: src/sbin/gbde/template.txt,v 1.1.36.1 2009/08/03 08:13:06 kensmith Exp $ + <screen>&prompt.root; <userinput>gbde init /dev/ad4s1c -i -L /etc/gbde/ad4s1c.lock</userinput> +# <phrase its:translate="no">$FreeBSD: src/sbin/gbde/template.txt,v 1.1.36.1 2009/08/03 08:13:06 kensmith Exp $</phrase> # # Sector size is the smallest unit of data which can be read or written. # Making it too small decreases performance and decreases available space. Modified: head/en_US.ISO8859-1/books/handbook/mail/chapter.xml ============================================================================== --- head/en_US.ISO8859-1/books/handbook/mail/chapter.xml Fri Sep 8 00:26:09 2017 (r50807) +++ head/en_US.ISO8859-1/books/handbook/mail/chapter.xml Fri Sep 8 14:20:54 2017 (r50808) @@ -364,7 +364,7 @@ FreeBSD.org mail is handled by 10 mx1.FreeBSD.org</scr addresses can be found in the &os; sample configuration, <filename>/etc/mail/access.sample</filename>:</para> - <programlisting its:translate="no"># $FreeBSD$ + <programlisting># <phrase its:translate="no">$FreeBSD$</phrase> # # Mail relay access control list. Default is to reject mail unless the # destination is local, or listed in /etc/mail/local-host-names @@ -705,7 +705,7 @@ daily_submit_queuerun="NO"</programlisting> <para>The default <filename>/etc/mail/mailer.conf</filename> looks like this:</para> - <programlisting its:translate="no"># $FreeBSD$ + <programlisting># <phrase its:translate="no">$FreeBSD$</phrase> # # Execute the "real" sendmail program, named /usr/libexec/sendmail/sendmail # Modified: head/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml ============================================================================== --- head/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml Fri Sep 8 00:26:09 2017 (r50807) +++ head/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml Fri Sep 8 14:20:54 2017 (r50808) @@ -3335,7 +3335,7 @@ freebsd.org. (A) <sect4> <title><filename>/etc/namedb/named.conf</filename></title> - <programlisting its:translate="no">// $FreeBSD$ + <programlisting>// <phrase its:translate="no">$FreeBSD$</phrase> // // Refer to the named.conf(5) and named(8) man pages, and the documentation // in /usr/share/doc/bind9 for more details.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201709081420.v88EKtnV065141>