Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 21 Dec 2012 02:09:27 -0500
From:      Eitan Adler <lists@eitanadler.com>
To:        freebsd-doc@freebsd.org
Subject:   committing entity changes to translations
Message-ID:  <CAF6rxgk_h8uqxXQob8n%2BzpcbbMo3hC-gvsRvTLS2VHW0=dS%2Bng@mail.gmail.com>

next in thread | raw e-mail | index | archive | help
How do I commit something like the following:

The patch touches the de_DE.ISO8859-1 as I am removing a non-existent
man.ipnat.1 entity [note: other translations may require this too. I
am asking about the general process requirements].
Should I commit the English language version first and wait for the
translations to catch up before removing the entity?

commit e0daf9d65b7b0cb9b93216077593c88a77909e56
Author: Eitan Adler <lists@eitanadler.com>
Date:   Fri Dec 21 02:04:57 2012 -0500

    ipnat does not have an entry in section 1, the author likely meant to
    refer to the page in section 8.

    PR:		docs/174599
    Submitted by:	brian haug <brian.r.haug@gmail.com>
    Approved by:	??? (mentor)

diff --git a/de_DE.ISO8859-1/books/handbook/firewalls/chapter.xml
b/de_DE.ISO8859-1/books/handbook/firewalls/chapter.xml
index f77ee1b..21d8714 100644
--- a/de_DE.ISO8859-1/books/handbook/firewalls/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/firewalls/chapter.xml
@@ -565,7 +565,7 @@ options         ALTQ_NOPCC      # Wird von SMP ben
       betreut und gesteuert werden kann.  Die Regeln der Firewall werden
       mit dem Programm &man.ipf.8; gesetzt oder gel=EF=BF=BDt.  F=EF=BF=BD=
    die
Manipulation der <acronym>NAT</acronym> Regeln verwendet man
-      &man.ipnat.1;.  Mit &man.ipfstat.8; werden Laufzeitstatistiken der
+      &man.ipnat.8;.  Mit &man.ipfstat.8; werden Laufzeitstatistiken der
       kernelseitigen Anteile von IPFILTER aufgelistet.  Und mit dem
       Programm &man.ipmon.8; kann man die Aktionen von IPFILTER in die
       Protokolldateien des Systems speichern.</para>
@@ -1884,7 +1884,7 @@ block in log first quick on dc0 all
       <para><acronym>NAT</acronym> rules are loaded by using the
 	<command>ipnat</command> command.  Typically the
 	<acronym>NAT</acronym> rules are stored in
-	<filename>/etc/ipnat.rules</filename>.  See &man.ipnat.1; for
+	<filename>/etc/ipnat.rules</filename>.  See &man.ipnat.8; for
 	details.</para>

       <para>When changing the <acronym>NAT</acronym> rules after
diff --git a/en_US.ISO8859-1/books/handbook/firewalls/chapter.xml
b/en_US.ISO8859-1/books/handbook/firewalls/chapter.xml
index f84d9aa..8c5bbfa 100644
--- a/en_US.ISO8859-1/books/handbook/firewalls/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/firewalls/chapter.xml
@@ -512,7 +512,7 @@ options         ALTQ_NOPCC      # Required for SMP
build</programlisting>
       monitored by userland interface programs.  The firewall rules can
       be set or deleted with the &man.ipf.8; utility.  The
       <acronym>NAT</acronym> rules can be set or deleted with the
-      &man.ipnat.1; utility.  The &man.ipfstat.8; utility can print
+      &man.ipnat.8; utility.  The &man.ipfstat.8; utility can print
       run-time statistics for the kernel parts of IPFILTER.  The
       &man.ipmon.8; program can log IPFILTER actions to the system log
       files.</para>
@@ -1793,7 +1793,7 @@ block in log first quick on dc0 all
       <para><acronym>NAT</acronym> rules are loaded by using the
 	<command>ipnat</command> command.  Typically the
 	<acronym>NAT</acronym> rules are stored in
-	<filename>/etc/ipnat.rules</filename>.  See &man.ipnat.1; for
+	<filename>/etc/ipnat.rules</filename>.  See &man.ipnat.8; for
 	details.</para>

       <para>When changing the <acronym>NAT</acronym> rules after
diff --git a/share/xml/man-refs.ent b/share/xml/man-refs.ent
index 64ac869..12baaea 100644
--- a/share/xml/man-refs.ent
+++ b/share/xml/man-refs.ent
@@ -281,7 +281,6 @@
 <!ENTITY man.ipcrm.1
"<citerefentry><refentrytitle>ipcrm</refentrytitle><manvolnum>1</manvolnum>=
</citerefentry>">
 <!ENTITY man.ipcs.1
"<citerefentry><refentrytitle>ipcs</refentrytitle><manvolnum>1</manvolnum><=
/citerefentry>">
 <!ENTITY man.ipftest.1
"<citerefentry><refentrytitle>ipftest</refentrytitle><manvolnum>1</manvolnu=
m></citerefentry>">
-<!ENTITY man.ipnat.1
"<citerefentry><refentrytitle>ipnat</refentrytitle><manvolnum>1</manvolnum>=
</citerefentry>">
 <!ENTITY man.ipresend.1
"<citerefentry><refentrytitle>ipresend</refentrytitle><manvolnum>1</manvoln=
um></citerefentry>">
 <!ENTITY man.ipsend.1
"<citerefentry><refentrytitle>ipsend</refentrytitle><manvolnum>1</manvolnum=
></citerefentry>">
 <!ENTITY man.iptest.1
"<citerefentry><refentrytitle>iptest</refentrytitle><manvolnum>1</manvolnum=
></citerefentry>">

--=20
Eitan Adler



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAF6rxgk_h8uqxXQob8n%2BzpcbbMo3hC-gvsRvTLS2VHW0=dS%2Bng>