Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 31 Aug 2017 02:36:49 +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: r50779 - in head/en_US.ISO8859-1/books/handbook: . config disks mail network-servers
Message-ID:  <201708310236.v7V2anV0067542@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: wblock
Date: Thu Aug 31 02:36:49 2017
New Revision: 50779
URL: https://svnweb.freebsd.org/changeset/doc/50779

Log:
  Add its:translate="no" properties to elements containing $FreeBSD$
  version strings.  This will prevent them from showing up in PO
  translations and causing difficulties.
  
  It has the unfortunate side effect that the entire element contents do
  not appear in PO files.  Most of these are elements are <programlisting>,
  which are probably not translated often yet. At least one is a <screen>,
  which might be more of a problem.
  
  At this point, this is a workaround to make it possible for PO translators
  to continue work without the ever- changing version strings creating
  conflicts.

Modified:
  head/en_US.ISO8859-1/books/handbook/book.xml
  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/book.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/book.xml	Thu Aug 31 02:24:58 2017	(r50778)
+++ head/en_US.ISO8859-1/books/handbook/book.xml	Thu Aug 31 02:36:49 2017	(r50779)
@@ -37,10 +37,9 @@
       <orgname>The FreeBSD Documentation Project</orgname>
     </author>
 
-    <!-- <pubdate>$FreeBSD$</pubdate> -->
-    <pubdate />
+    <pubdate its:translate="no">$FreeBSD$</pubdate>
 
-    <releaseinfo>$FreeBSD$</releaseinfo>
+    <releaseinfo its:translate="no">$FreeBSD$</releaseinfo>
 
     <copyright>
       <year>1995</year>

Modified: head/en_US.ISO8859-1/books/handbook/config/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/config/chapter.xml	Thu Aug 31 02:24:58 2017	(r50778)
+++ head/en_US.ISO8859-1/books/handbook/config/chapter.xml	Thu Aug 31 02:36:49 2017	(r50779)
@@ -262,7 +262,7 @@ run_rc_command "$1"</programlisting>
     <para>Here is a sample entry from the system crontab,
       <filename>/etc/crontab</filename>:</para>
 
-    <programlisting># /etc/crontab - root's crontab for FreeBSD
+    <programlisting its:translate="no"># /etc/crontab - root's crontab for FreeBSD
 #
 # &dollar;FreeBSD&dollar;
 # <co xml:id="co-comments"/>
@@ -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># &dollar;&os;&dollar;
+      <programlisting its:translate="no"># &dollar;&os;&dollar;
 #
 #       Spaces ARE valid field separators in this file. However,
 #       other *nix-like systems still insist on using tabs as field
@@ -1450,7 +1450,7 @@ cron.*                                          /var/l
 	and programs to signal when the log is rotated.  Here is the
 	default configuration in &os;:</para>
 
-      <programlisting># configuration file for newsyslog
+      <programlisting its:translate="no"># configuration file for newsyslog
 # &dollar;FreeBSD&dollar;
 #
 # Entries which do not specify the '/pid_file' field will cause the
@@ -1926,7 +1926,7 @@ nameserver 147.11.100.30</programlisting>
 	  external <acronym>DNS</acronym> servers for commonly
 	  accessed names.</para>
 
-	<programlisting># &dollar;&os;&dollar;
+	<programlisting its:translate="no"># &dollar;&os;&dollar;
 #
 #
 # Host Database

Modified: head/en_US.ISO8859-1/books/handbook/disks/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/disks/chapter.xml	Thu Aug 31 02:24:58 2017	(r50778)
+++ head/en_US.ISO8859-1/books/handbook/disks/chapter.xml	Thu Aug 31 02:36:49 2017	(r50779)
@@ -2706,7 +2706,7 @@ Quotas for user test:
 	    <acronym>UFS</acronym> file system, set the sector_size to
 	    2048:</para>
 
-	  <screen>&prompt.root; <userinput>gbde init /dev/ad4s1c -i -L /etc/gbde/ad4s1c.lock</userinput>
+	  <screen its:translate="no">&prompt.root; <userinput>gbde init /dev/ad4s1c -i -L /etc/gbde/ad4s1c.lock</userinput>
 # &dollar;FreeBSD: src/sbin/gbde/template.txt,v 1.1.36.1 2009/08/03 08:13:06 kensmith Exp $
 #
 # Sector size is the smallest unit of data which can be read or written.

Modified: head/en_US.ISO8859-1/books/handbook/mail/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/mail/chapter.xml	Thu Aug 31 02:24:58 2017	(r50778)
+++ head/en_US.ISO8859-1/books/handbook/mail/chapter.xml	Thu Aug 31 02:36:49 2017	(r50779)
@@ -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># &dollar;FreeBSD&dollar;
+	  <programlisting its:translate="no"># &dollar;FreeBSD&dollar;
 #
 # 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>&dollar;FreeBSD&dollar;
+      <programlisting its:translate="no">&dollar;FreeBSD&dollar;
 #
 # 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	Thu Aug 31 02:24:58 2017	(r50778)
+++ head/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml	Thu Aug 31 02:36:49 2017	(r50779)
@@ -3335,7 +3335,7 @@ freebsd.org. (A)
 	<sect4>
 	  <title><filename>/etc/namedb/named.conf</filename></title>
 
-	  <programlisting>// &dollar;FreeBSD&dollar;
+	  <programlisting its:translate="no">// &dollar;FreeBSD&dollar;
 //
 // 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?201708310236.v7V2anV0067542>