svn commit: r42418 - in head: pl_PL.ISO8859-2/books/handbook/boot pl_PL.ISO8859-2/books/handbook/cutting-edge pl_PL.ISO8859-2/books/handbook/l10n pl_PL.ISO8859-2/books/handbook/mail pl_PL.ISO8859-2...

Gabor Kovesdan gabor at FreeBSD.org
Wed Jul 24 15:53:17 UTC 2013


Author: gabor
Date: Wed Jul 24 15:53:14 2013
New Revision: 42418
URL: http://svnweb.freebsd.org/changeset/doc/42418

Log:
  - Fix misplaced indexterms

Modified:
  head/pl_PL.ISO8859-2/books/handbook/boot/chapter.xml
  head/pl_PL.ISO8859-2/books/handbook/cutting-edge/chapter.xml
  head/pl_PL.ISO8859-2/books/handbook/l10n/chapter.xml
  head/pl_PL.ISO8859-2/books/handbook/mail/chapter.xml
  head/pl_PL.ISO8859-2/books/handbook/network-servers/chapter.xml
  head/pl_PL.ISO8859-2/books/handbook/ppp-and-slip/chapter.xml
  head/ru_RU.KOI8-R/books/handbook/boot/chapter.xml
  head/ru_RU.KOI8-R/books/handbook/cutting-edge/chapter.xml
  head/ru_RU.KOI8-R/books/handbook/mail/chapter.xml
  head/ru_RU.KOI8-R/books/handbook/network-servers/chapter.xml

Modified: head/pl_PL.ISO8859-2/books/handbook/boot/chapter.xml
==============================================================================
--- head/pl_PL.ISO8859-2/books/handbook/boot/chapter.xml	Wed Jul 24 14:41:29 2013	(r42417)
+++ head/pl_PL.ISO8859-2/books/handbook/boot/chapter.xml	Wed Jul 24 15:53:14 2013	(r42418)
@@ -466,10 +466,9 @@ boot:</screen>
       <para>Here are some practical examples of loader usage:</para>
 
       <itemizedlist>
-	<indexterm><primary>single-user mode</primary></indexterm>
 	<listitem>
 	  <para>To simply boot your usual kernel, but in single-user
-	    mode:</para>
+	    mode:<indexterm><primary>single-user mode</primary></indexterm></para>
 
 	  <screen><userinput>boot -s</userinput></screen>
 	</listitem>
@@ -477,16 +476,12 @@ boot:</screen>
 	<listitem>
 	  <para>To unload your usual kernel and modules, and then
 	    load just your old (or another) kernel:</para>
-    <indexterm>
-      <primary><filename>kernel.old</filename></primary>
-    </indexterm>
-
 	  <screen><userinput>unload</userinput>
 <userinput>load <replaceable>kernel.old</replaceable></userinput></screen>
 
 	  <para>You can use <filename>kernel.GENERIC</filename> to
 	    refer to the generic kernel that comes on the install
-	    disk, or <filename>kernel.old</filename> to refer to
+	    disk, or <filename>kernel.old</filename><indexterm><primary><filename>kernel.old</filename></primary></indexterm> to refer to
 	    your previously installed kernel (when you have upgraded
 	    or configured your own kernel, for example).</para>
 

Modified: head/pl_PL.ISO8859-2/books/handbook/cutting-edge/chapter.xml
==============================================================================
--- head/pl_PL.ISO8859-2/books/handbook/cutting-edge/chapter.xml	Wed Jul 24 14:41:29 2013	(r42417)
+++ head/pl_PL.ISO8859-2/books/handbook/cutting-edge/chapter.xml	Wed Jul 24 15:53:14 2013	(r42418)
@@ -186,13 +186,9 @@
       <sect3>
 	<title>Using &os.current;</title>
 
-	<indexterm>
-	  <primary>-CURRENT</primary>
-	  <secondary>using</secondary>
-	</indexterm>
 	<orderedlist>
 	  <listitem>
-	    <para>Join the &a.current.name; and the &a.cvsall.name; lists.  This is not
+	    <para>Join the &a.current.name;<indexterm><primary>-CURRENT</primary><secondary>using</secondary></indexterm> and the &a.cvsall.name; lists.  This is not
 	      just a good idea, it is <emphasis>essential</emphasis>.  If
 	      you are not on the <emphasis>&a.current.name;</emphasis> list,
 	      you will not see the comments that people are
@@ -217,39 +213,23 @@
 	      site</link>.  You can do this in one of two ways:</para>
 
 	    <orderedlist>
-              <indexterm>
-                <primary><command>cvsup</command></primary>
-              </indexterm>
-              <indexterm>
-                <primary><command>cron</command></primary>
-              </indexterm>
-              <indexterm>
-	        <primary>-CURRENT</primary>
-		<secondary>Syncing with <application>CVSup</application></secondary>
-	      </indexterm>
-
 	      <listitem>
-		<para>Use the <link linkend="cvsup">cvsup</link> program
+		<para>Use the <link linkend="cvsup">cvsup</link><indexterm><primary><command>cvsup</command></primary></indexterm> program
                   with the <filename>supfile</filename> named <filename>standard-supfile</filename>
                   available from <filename>/usr/share/examples/cvsup</filename>.
 		  This is the most recommended
 		  method, since it allows you to grab the entire
 		  collection once and then only what has changed from then
 		  on.  Many people run <command>cvsup</command> from
-		  <command>cron</command> and keep their
+		  <command>cron</command><indexterm><primary><command>cron</command></primary></indexterm> and keep their
  		  sources up-to-date automatically.  You have to
  		  customize the sample <filename>supfile</filename> above, and configure
- 		  <link linkend="cvsup">cvsup</link> for your environment.</para>
+ 		  <link linkend="cvsup">cvsup</link><indexterm><primary>-CURRENT</primary><secondary>Syncing with <application>CVSup</application></secondary></indexterm> for your environment.</para>
 	      </listitem>
 
 	      <listitem>
-		<indexterm>
-		  <primary>-CURRENT</primary>
-		  <secondary>Syncing with CTM</secondary>
-		</indexterm>
-
 		<para>Use the <application><link
-		  linkend="ctm">CTM</link></application> facility.  If you
+		  linkend="ctm">CTM</link></application><indexterm><primary>-CURRENT</primary><secondary>Syncing with CTM</secondary></indexterm> facility.  If you
 		  have very bad connectivity (high price connections or
 		  only email access) <application>CTM</application> is an option.
 		  However, it is a lot of hassle and can give you broken files.
@@ -271,11 +251,7 @@
 	      to compile just a subset is almost guaranteed to get you
 	      into trouble.</para>
 
-	  <indexterm>
-	    <primary>-CURRENT</primary>
-	    <secondary>compiling</secondary>
-	  </indexterm>
-	    <para>Before compiling &os.current;, read the
+	    <para>Before compiling &os.current;<indexterm><primary>-CURRENT</primary><secondary>compiling</secondary></indexterm>, read the
 	      <filename>Makefile</filename> in <filename>/usr/src</filename>
 	      carefully.  You should at least <link
 	      linkend="makeworld">install a new kernel and rebuild the world</link> the first time through
@@ -360,12 +336,7 @@
 
 	<orderedlist>
 	  <listitem>
-	    <indexterm>
-	      <primary>-STABLE</primary>
-	      <secondary>using</secondary>
-	    </indexterm>
-
-	    <para>Join the &a.stable.name; list.  This will keep you informed of
+	    <para>Join the &a.stable.name;<indexterm><primary>-STABLE</primary><secondary>using</secondary></indexterm> list.  This will keep you informed of
 	      build-dependencies that may appear in &os.stable;
 	      or any other issues requiring
 	      special attention.  Developers will also make announcements
@@ -402,18 +373,7 @@
 
 	    <orderedlist>
 	      <listitem>
-	      <indexterm>
-		<primary><command>cvsup</command></primary>
-	      </indexterm>
-	      <indexterm>
-		<primary><command>cron</command></primary>
-	      </indexterm>
-	      <indexterm>
-	        <primary>-STABLE</primary>
-		<secondary>syncing with <application>CVSup</application></secondary>
-	      </indexterm>
-
-		<para>Use the <link linkend="cvsup">cvsup</link> program
+		<para>Use the <link linkend="cvsup">cvsup</link><indexterm><primary><command>cvsup</command></primary></indexterm> program
                   with the <filename>supfile</filename> named <filename>stable-supfile</filename>
                   from the directory
                   <filename>/usr/share/examples/cvsup</filename>.
@@ -421,21 +381,16 @@
 		  method, since it allows you to grab the entire
 		  collection once and then only what has changed from then
 		  on.  Many people run <command>cvsup</command> from
-		  <command>cron</command> to keep their
+		  <command>cron</command><indexterm><primary><command>cron</command></primary></indexterm> to keep their
 		  sources up-to-date automatically.  You have to
 		  customize the sample <filename>supfile</filename> above,
-		  and configure <link linkend="cvsup">cvsup</link> for your
+		  and configure <link linkend="cvsup">cvsup</link><indexterm><primary>-STABLE</primary><secondary>syncing with <application>CVSup</application></secondary></indexterm> for your
 		  environment.</para>
 	      </listitem>
 
 	      <listitem>
-		<indexterm>
-		  <primary>-STABLE</primary>
-		  <secondary>syncing with CTM</secondary>
-		</indexterm>
-
 		<para>Use the <application><link
-		  linkend="ctm">CTM</link></application> facility.  If
+		  linkend="ctm">CTM</link></application><indexterm><primary>-STABLE</primary><secondary>syncing with CTM</secondary></indexterm> facility.  If
 		  you do not have a fast and inexpensive connection to
 		  the Internet, this is the method you should consider
 		  using.
@@ -452,12 +407,7 @@
 	  </listitem>
 
 	  <listitem>
-	    <indexterm>
-	      <primary>-STABLE</primary>
-	      <secondary>compiling</secondary>
-	    </indexterm>
-
-	    <para>Before compiling &os.stable;, read the
+	    <para>Before compiling &os.stable;<indexterm><primary>-STABLE</primary><secondary>compiling</secondary></indexterm>, read the
 	    <filename>Makefile</filename> in <filename>/usr/src</filename>
 	    carefully.  You should at least <link
 	    linkend="makeworld">install a new kernel and rebuild the world</link> the first time through

Modified: head/pl_PL.ISO8859-2/books/handbook/l10n/chapter.xml
==============================================================================
--- head/pl_PL.ISO8859-2/books/handbook/l10n/chapter.xml	Wed Jul 24 14:41:29 2013	(r42417)
+++ head/pl_PL.ISO8859-2/books/handbook/l10n/chapter.xml	Wed Jul 24 15:53:14 2013	(r42418)
@@ -228,16 +228,13 @@
 	files:</para>
 
       <itemizedlist>
-        <indexterm><primary>POSIX</primary></indexterm>
         <listitem>
-	  <para><envar>LANG</envar> for &posix; &man.setlocale.3; family
+	  <para><envar>LANG</envar> for &posix;<indexterm><primary>POSIX</primary></indexterm> &man.setlocale.3; family
 	    functions</para>
 	</listitem>
 
 	<listitem>
-	  <indexterm><primary>MIME</primary></indexterm>
-
-	  <para><envar>MM_CHARSET</envar> for applications' MIME character
+	  <para><envar>MM_CHARSET</envar> for applications' MIME<indexterm><primary>MIME</primary></indexterm> character
 	    set</para>
 	</listitem>
       </itemizedlist>

Modified: head/pl_PL.ISO8859-2/books/handbook/mail/chapter.xml
==============================================================================
--- head/pl_PL.ISO8859-2/books/handbook/mail/chapter.xml	Wed Jul 24 14:41:29 2013	(r42417)
+++ head/pl_PL.ISO8859-2/books/handbook/mail/chapter.xml	Wed Jul 24 15:53:14 2013	(r42418)
@@ -1176,9 +1176,8 @@ www.example.org</programlisting>
         things:</para>
 
       <itemizedlist>
-        <indexterm><primary>MX record</primary></indexterm>
         <listitem>
-          <para>Make sure that the (lowest-numbered) MX record in your DNS points to your
+          <para>Make sure that the (lowest-numbered) MX record<indexterm><primary>MX record</primary></indexterm> in your DNS points to your
 	    host's IP address.</para>
         </listitem>
 

Modified: head/pl_PL.ISO8859-2/books/handbook/network-servers/chapter.xml
==============================================================================
--- head/pl_PL.ISO8859-2/books/handbook/network-servers/chapter.xml	Wed Jul 24 14:41:29 2013	(r42417)
+++ head/pl_PL.ISO8859-2/books/handbook/network-servers/chapter.xml	Wed Jul 24 15:53:14 2013	(r42418)
@@ -1248,12 +1248,8 @@ Exports list on foobar:
         <title>Machine Types</title>
 
         <itemizedlist>
-	  <indexterm>
-	    <primary>NIS</primary>
-	    <secondary>master server</secondary>
-	  </indexterm>
           <listitem>
-            <para>A <emphasis>NIS master server</emphasis>.  This
+            <para>A <emphasis>NIS master server</emphasis><indexterm><primary>NIS</primary><secondary>master server</secondary></indexterm>.  This
               server, analogous to a &windowsnt; primary domain
               controller, maintains the files used by all of the NIS
               clients.  The <filename>passwd</filename>,
@@ -1268,12 +1264,7 @@ Exports list on foobar:
           </listitem>
 
           <listitem>
-	    <indexterm>
-	      <primary>NIS</primary>
-	      <secondary>slave server</secondary>
-	    </indexterm>
-
-            <para><emphasis>NIS slave servers</emphasis>.  Similar to
+            <para><emphasis>NIS slave servers</emphasis><indexterm><primary>NIS</primary><secondary>slave server</secondary></indexterm>.  Similar to
               the &windowsnt; backup domain controllers, NIS slave
               servers maintain copies of the NIS master's data files.
               NIS slave servers provide the redundancy, which is
@@ -1284,12 +1275,7 @@ Exports list on foobar:
           </listitem>
 
           <listitem>
-	    <indexterm>
-	      <primary>NIS</primary>
-	      <secondary>client</secondary>
-	    </indexterm>
-
-            <para><emphasis>NIS clients</emphasis>.  NIS clients, like
+            <para><emphasis>NIS clients</emphasis><indexterm><primary>NIS</primary><secondary>client</secondary></indexterm>.  NIS clients, like
               most &windowsnt; workstations, authenticate against the
               NIS server (or the &windowsnt; domain controller in the
               &windowsnt; workstations case) to log on.</para>
@@ -4387,9 +4373,7 @@ DocumentRoot /www/someotherdomain.tld
 	    <term><literal>netbios name</literal></term>
 
 	    <listitem>
-	      <indexterm><primary>NetBIOS</primary></indexterm>
-
-	      <para>This sets the NetBIOS name by which a <application>Samba</application> server
+	      <para>This sets the NetBIOS<indexterm><primary>NetBIOS</primary></indexterm> name by which a <application>Samba</application> server
 		is known. By default it is the same as the first
 		component of the host's DNS name.</para>
 	    </listitem>
@@ -4443,13 +4427,9 @@ DocumentRoot /www/someotherdomain.tld
 	    <term><literal>passdb backend</literal></term>
 
 	    <listitem>
-	      <indexterm><primary>NIS+</primary></indexterm>
-	      <indexterm><primary>LDAP</primary></indexterm>
-	      <indexterm><primary>SQL database</primary></indexterm>
-
 	      <para><application>Samba</application> has several
 	        different backend authentication models.  You can
-	        authenticate clients with LDAP, NIS+, a SQL database,
+	        authenticate clients with LDAP<indexterm><primary>LDAP</primary></indexterm>, NIS+<indexterm><primary>NIS+</primary></indexterm>, a SQL database<indexterm><primary>SQL database</primary></indexterm>,
 	        or a modified password file.  The default
 	        authentication method is <literal>smbpasswd</literal>,
 	        and that is all that will be covered here.</para>

Modified: head/pl_PL.ISO8859-2/books/handbook/ppp-and-slip/chapter.xml
==============================================================================
--- head/pl_PL.ISO8859-2/books/handbook/ppp-and-slip/chapter.xml	Wed Jul 24 14:41:29 2013	(r42417)
+++ head/pl_PL.ISO8859-2/books/handbook/ppp-and-slip/chapter.xml	Wed Jul 24 15:53:14 2013	(r42418)
@@ -144,15 +144,9 @@
 	<para>This document assumes you have the following:</para>
 
 	<itemizedlist>
-	  <indexterm id="ppp-isp">
-	    <primary>ISP</primary>
-	  </indexterm>
-	  <indexterm id="ppp-ppp2">
-	    <primary>PPP</primary>
-	  </indexterm>
 	  <listitem>
-	    <para>An account with an Internet Service Provider (ISP) which
-	      you connect to using PPP.</para>
+	    <para>An account with an Internet Service Provider (ISP)<indexterm id="ppp-isp"><primary>ISP</primary></indexterm> which
+	      you connect to using PPP<indexterm id="ppp-ppp2"><primary>PPP</primary></indexterm>.</para>
 	  </listitem>
 
 	  <listitem>
@@ -166,32 +160,14 @@
 	  </listitem>
 
 	  <listitem>
-	  <indexterm id="ppp-pap">
-	    <primary>PAP</primary>
-	  </indexterm>
-	  <indexterm id="ppp-chap">
-	    <primary>CHAP</primary>
-	  </indexterm>
-	  <indexterm id="ppp-unix">
-	    <primary>UNIX</primary>
-	  </indexterm>
-	  <indexterm id="ppp-login">
-	    <primary>login name</primary>
-	  </indexterm>
-	  <indexterm id="ppp-password">
-	    <primary>password</primary>
-	  </indexterm>
-	    <para>Your login name and password. (Either a
-	      regular &unix; style login and password pair, or a PAP or CHAP
+	    <para>Your login name<indexterm id="ppp-login"><primary>login name</primary></indexterm> and password<indexterm id="ppp-password"><primary>password</primary></indexterm>. (Either a
+	      regular &unix;<indexterm id="ppp-unix"><primary>UNIX</primary></indexterm> style login and password pair, or a
+	      PAP<indexterm id="ppp-pap"><primary>PAP</primary></indexterm> or CHAP<indexterm id="ppp-chap"><primary>CHAP</primary></indexterm>
 	      login and password pair.)</para>
 	  </listitem>
 
 	  <listitem>
-	    <indexterm id="ppp-nameserver">
-	      <primary>nameserver</primary>
-	    </indexterm>
-
-	    <para>The IP address of one or more name servers.
+	    <para>The IP address of one or more name servers<indexterm id="ppp-nameserver"><primary>nameserver</primary></indexterm>.
 	      Normally, you will be given two IP addresses by your ISP to
 	      use for this.  If they have not given you at least one, then
 	      you can use the <command>enable dns</command> command in
@@ -225,11 +201,7 @@
 	  </listitem>
 
 	  <listitem>
-	    <indexterm id="ppp-static-ip">
-	      <primary>static IP address</primary>
-	    </indexterm>
-
-	    <para>If your ISP provides you with a static IP address and
+	    <para>If your ISP provides you with a static IP address<indexterm id="ppp-static-ip"><primary>static IP address</primary></indexterm> and
 	      hostname, you can enter it.  Otherwise, we simply let the
 	      peer assign whatever IP address it sees fit.</para>
 	  </listitem>
@@ -362,9 +334,7 @@
 	      <term>Line 6 & 7:</term>
 
 	      <listitem>
-		<indexterm><primary>PPP</primary><secondary>user PPP</secondary></indexterm>
-
-		<para>The dial string.  User PPP uses an expect-send
+		<para>The dial string.  User PPP<indexterm><primary>PPP</primary><secondary>user PPP</secondary></indexterm> uses an expect-send
 		  syntax similar to the &man.chat.8; program.  Refer to
 		  the manual page for information on the features of this
 		  language.</para>
@@ -455,11 +425,9 @@
 	      <term>Line 15:</term>
 
 	      <listitem>
-		<indexterm><primary>PAP</primary></indexterm>
-		<indexterm><primary>CHAP</primary></indexterm>
 		<para>If you are using PAP or CHAP, there will be no login
 		  at this point, and this line should be commented out or
-		  removed.  See <link linkend="userppp-PAPnCHAP">PAP and CHAP
+		  removed.  See <link linkend="userppp-PAPnCHAP">PAP<indexterm><primary>PAP</primary></indexterm> and CHAP<indexterm><primary>CHAP</primary></indexterm>
 		  authentication</link> for further details.</para>
 
                 <para>The login string is of the same chat-like syntax as
@@ -483,9 +451,7 @@ protocol: ppp</screen>
 	      <term>Line 16:</term>
 
 	      <listitem>
-		<indexterm><primary>timeout</primary></indexterm>
-
-		<para>Sets the default idle timeout (in seconds) for the
+		<para>Sets the default idle timeout<indexterm><primary>timeout</primary></indexterm> (in seconds) for the
 		  connection.  Here, the connection will be closed
 		  automatically after 300 seconds of inactivity.  If you
 		  never want to timeout, set this value to zero or use
@@ -496,14 +462,12 @@ protocol: ppp</screen>
 	    <varlistentry>
 	      <term>Line 17:</term>
 	      <listitem>
-		<indexterm><primary>ISP</primary></indexterm>
-
 		<para>Sets the interface addresses.  The string
 		  <replaceable>x.x.x.x</replaceable> should be
 		  replaced by the IP address that your provider has
 		  allocated to you.  The string
 		  <replaceable>y.y.y.y</replaceable> should be
-		  replaced by the IP address that your ISP indicated
+		  replaced by the IP address that your ISP<indexterm><primary>ISP</primary></indexterm> indicated
 		  for their gateway (the machine to which you
 		  connect).  If your ISP has not given you a gateway
 		  address, use <hostid
@@ -979,9 +943,7 @@ set nbns 203.14.100.5</programlisting>
 	    <varlistentry>
 	      <term>Line 14:</term>
 	      <listitem>
-		<indexterm><primary>password</primary></indexterm>
-
-		<para>This line specifies your PAP/CHAP password.  You
+		<para>This line specifies your PAP/CHAP password<indexterm><primary>password</primary></indexterm>.  You
 		  will need to insert the correct value for
 		  <replaceable>MyPassword</replaceable>.  You may want to
 		  add an additional line, such as:</para>
@@ -1288,11 +1250,9 @@ ifconfig_tun0=</programlisting>
 	</listitem>
 
 	<listitem>
-	  <indexterm><primary>PPP</primary><secondary>server</secondary></indexterm>
-
 	  <para>As a <quote>server</quote> — your machine is located on
 	    the network, and is used to connect other computers using
-	    PPP.</para>
+	    PPP<indexterm><primary>PPP</primary><secondary>server</secondary></indexterm>.</para>
 	</listitem>
       </orderedlist>
 
@@ -2486,9 +2446,7 @@ tun0: flags=8051<UP,POINTOPOINT,RUNNI
 	      </listitem>
 
 	      <listitem>
-		<indexterm><primary>default route</primary></indexterm>
-
-		<para>Designate the default router by changing the
+		<para>Designate the default router<indexterm><primary>default route</primary></indexterm> by changing the
 		  line:</para>
 
 		<programlisting>defaultrouter="NO"</programlisting>
@@ -2508,10 +2466,8 @@ tun0: flags=8051<UP,POINTOPOINT,RUNNI
 nameserver 128.32.136.9
 nameserver 128.32.136.12</programlisting>
 
-	    <indexterm><primary>nameserver</primary></indexterm>
-	    <indexterm><primary>domain name</primary></indexterm>
-	    <para>As you can see, these set up the nameserver hosts.  Of
-	      course, the actual domain names and addresses depend on your
+	    <para>As you can see, these set up the nameserver<indexterm><primary>nameserver</primary></indexterm> hosts.  Of
+	      course, the actual domain names<indexterm><primary>domain name</primary></indexterm> and addresses depend on your
 	      environment.</para>
 	  </step>
 

Modified: head/ru_RU.KOI8-R/books/handbook/boot/chapter.xml
==============================================================================
--- head/ru_RU.KOI8-R/books/handbook/boot/chapter.xml	Wed Jul 24 14:41:29 2013	(r42417)
+++ head/ru_RU.KOI8-R/books/handbook/boot/chapter.xml	Wed Jul 24 15:53:14 2013	(r42418)
@@ -500,10 +500,9 @@ boot:
 	  ÚÁÇÒÕÚÞÉËÁ:</para>
 
 	<itemizedlist>
-	  <indexterm><primary>ÏÄÎÏÐÏÌØÚÏ×ÁÔÅÌØÓËÉÊ ÒÅÖÉÍ</primary></indexterm>
 	  <listitem>
 	    <para>þÔÏÂÙ ÐÒÏÓÔÏ ÚÁÇÒÕÚÉÔØ ×ÁÛÅ ÑÄÒÏ ÏÂÙÞÎÙÍ ÏÂÒÁÚÏÍ, ÎÏ ×
-	      ÏÄÎÏÐÏÌØÚÏ×ÁÔÅÌØÓËÏÍ ÒÅÖÉÍÅ:</para>
+	      ÏÄÎÏÐÏÌØÚÏ×ÁÔÅÌØÓËÏÍ ÒÅÖÉÍÅ:<indexterm><primary>ÏÄÎÏÐÏÌØÚÏ×ÁÔÅÌØÓËÉÊ ÒÅÖÉÍ</primary></indexterm></para>
 
 	    <screen><userinput>boot -s</userinput></screen>
 	  </listitem>
@@ -511,16 +510,13 @@ boot:
 	  <listitem>
 	    <para>äÌÑ ×ÙÇÒÕÚËÉ ÏÂÙÞÎÙÈ ÑÄÒÁ É ÍÏÄÕÌÅÊ, Á ÐÏÔÏÍ ÐÒÏÓÔÏ ÚÁÇÒÕÚÉÔØ
 	      ×ÁÛÅ ÓÔÁÒÏÅ (ÉÌÉ ÄÒÕÇÏÅ) ÑÄÒÏ:</para>
-	    <indexterm>
-	      <primary><filename>kernel.old</filename></primary>
-	    </indexterm>
 
 	    <screen><userinput>unload</userinput>
 <userinput>load <replaceable>kernel.old</replaceable></userinput></screen>
 
 	    <para>÷Ù ÍÏÖÅÔÅ ÉÓÐÏÌØÚÏ×ÁÔØ <filename>kernel.GENERIC</filename>
 	      ÄÌÑ ÏÂÏÚÎÁÞÅÎÉÑ ÓÔÁÎÄÁÒÔÎÏÇÏ ÑÄÒÁ, ÐÏÓÔÁ×ÌÑÅÍÏÇÏ ÎÁ ÕÓÔÁÎÏ×ÏÞÎÏÍ
-	      ÄÉÓËÅ, ÉÌÉ <filename>kernel.old</filename> ÄÌÑ ÏÂÒÁÝÅÎÉÑ Ë ÒÁÎÅÅ
+	      ÄÉÓËÅ, ÉÌÉ <filename>kernel.old</filename><indexterm><primary><filename>kernel.old</filename></primary></indexterm> ÄÌÑ ÏÂÒÁÝÅÎÉÑ Ë ÒÁÎÅÅ
 	      ÕÓÔÁÎÏ×ÌÅÎÎÏÍÕ ÑÄÒÕ (ÐÏÓÌÅ ÔÏÇÏ, ËÁË, ÎÁÐÒÉÍÅÒ, ×Ù ÏÂÎÏ×ÉÌÉ ÉÌÉ
 	      ÏÔËÏÎÆÉÇÕÒÉÒÏ×ÁÌÉ ÎÏ×ÏÅ ÑÄÒÏ).</para>
 

Modified: head/ru_RU.KOI8-R/books/handbook/cutting-edge/chapter.xml
==============================================================================
--- head/ru_RU.KOI8-R/books/handbook/cutting-edge/chapter.xml	Wed Jul 24 14:41:29 2013	(r42417)
+++ head/ru_RU.KOI8-R/books/handbook/cutting-edge/chapter.xml	Wed Jul 24 15:53:14 2013	(r42418)
@@ -701,15 +701,9 @@ Fetching 133 new ports or files... done.
       <sect3>
 	<title>éÓÐÏÌØÚÏ×ÁÎÉÅ &os.current;</title>
 
-	<indexterm>
-	  <primary>-CURRENT</primary>
-
-	  <secondary>ÉÓÐÏÌØÚÏ×ÁÎÉÅ</secondary>
-	</indexterm>
-
 	<orderedlist>
 	  <listitem>
-	    <para>ðÏÄÐÉÛÉÔÅÓØ ÎÁ ÓÐÉÓËÉ ÒÁÓÓÙÌËÉ &a.current.name; É
+	    <para>ðÏÄÐÉÛÉÔÅÓØ ÎÁ ÓÐÉÓËÉ ÒÁÓÓÙÌËÉ &a.current.name;<indexterm><primary>-CURRENT</primary><secondary>ÉÓÐÏÌØÚÏ×ÁÎÉÅ</secondary></indexterm> É
 	      &a.svn-src-head.name;.  üÔÏ ÎÅ ÐÒÏÓÔÏ ÈÏÒÏÛÁÑ ÉÄÅÑ, ÜÔÏ
 	      <emphasis>ÎÅÏÂÈÏÄÉÍÏÓÔØ</emphasis>.  åÓÌÉ ×Ù ÎÅ Ñ×ÌÑÅÔÅÓØ
 	      ÕÞÁÓÔÎÉËÏÍ ÓÐÉÓËÁ ÒÁÓÓÙÌËÉ <emphasis>&a.current.name;</emphasis>,
@@ -738,23 +732,8 @@ Fetching 133 new ports or files... done.
 	      ÓÄÅÌÁÔØ ÜÔÏ ÏÄÎÉÍ ÉÚ ÓÌÅÄÕÀÝÉÈ Ä×ÕÈ ÓÐÏÓÏÂÏ×:</para>
 
 	    <orderedlist>
-	      <indexterm>
-		<primary><command>cvsup</command></primary>
-	      </indexterm>
-
-	      <indexterm>
-		<primary><command>cron</command></primary>
-	      </indexterm>
-
-	      <indexterm>
-		<primary>-CURRENT</primary>
-		<secondary>
-		  óÉÎÈÒÏÎÉÚÁÃÉÑ ÐÒÉ ÐÏÍÏÝÉ <application>CVSup</application>
-		</secondary>
-	      </indexterm>
-
 	      <listitem>
-		<para>ðÒÉ ÐÏÍÏÝÉ ÐÒÏÇÒÁÍÍÙ <link linkend="cvsup">cvsup</link>
+		<para>ðÒÉ ÐÏÍÏÝÉ ÐÒÏÇÒÁÍÍÙ <link linkend="cvsup">cvsup</link><indexterm><primary><command>cvsup</command></primary></indexterm>
 		  Ó <filename>sup</filename>-ÆÁÊÌÏÍ
 		  <filename>standard-supfile</filename>, ËÏÔÏÒÙÊ ÍÏÖÎÏ ÎÁÊÔÉ ×
 		  ËÁÔÁÌÏÇÅ <filename>/usr/share/examples/cvsup</filename>.  üÔÏ
@@ -763,10 +742,10 @@ Fetching 133 new ports or files... done.
 		  ÉÓÈÏÄÎÙÈ ÔÅËÓÔÏ× ÏÄÉÎ ÒÁÚ ÐÏÌÎÏÓÔØÀ, Á ÚÁÔÅÍ ÚÁÇÒÕÖÁÔØ ÔÏÌØËÏ
 		  ÐÒÏÉÚÏÛÅÄÛÉÅ ÉÚÍÅÎÅÎÉÑ.  íÎÏÇÉÅ ÚÁÐÕÓËÁÀÔ
 		  <command>cvsup</command> ÐÒÉ ÐÏÍÏÝÉ ÐÒÏÇÒÁÍÍÙ
-		  <command>cron</command> É ÐÏÌÕÞÁÀÔ ÓÁÍÙÅ Ó×ÅÖÉÅ ÉÓÈÏÄÎÙÅ
+		  <command>cron</command><indexterm><primary><command>cron</command></primary></indexterm> É ÐÏÌÕÞÁÀÔ ÓÁÍÙÅ Ó×ÅÖÉÅ ÉÓÈÏÄÎÙÅ
 		  ÔÅËÓÔÙ Á×ÔÏÍÁÔÉÞÅÓËÉ.  éÚÍÅÎÉÔÅ ÐÒÉÍÅÒÎÙÊ ÆÁÊÌ
 		  <filename>supfile</filename> ×ÙÛÅ É ÏÔËÏÎÆÉÇÕÒÉÒÕÊÔÅ <link
-		  linkend="cvsup">cvsup</link> ÄÌÑ ×ÁÛÅÇÏ ÏËÒÕÖÅÎÉÑ.</para>
+		  linkend="cvsup">cvsup</link><indexterm><primary>-CURRENT</primary><secondary>óÉÎÈÒÏÎÉÚÁÃÉÑ ÐÒÉ ÐÏÍÏÝÉ <application>CVSup</application></secondary></indexterm> ÄÌÑ ×ÁÛÅÇÏ ÏËÒÕÖÅÎÉÑ.</para>
 		<note>
 		  <para>ðÒÉÍÅÒÎÙÊ ÆÁÊÌ <filename>standard-supfile</filename>
 		    ÐÒÅÄÎÁÚÎÁÞÅÎ ÄÌÑ ÏÔÓÌÅÖÉ×ÁÎÉÑ ÓÐÅÃÉÁÌØÎÏÊ ×ÅÔËÉ
@@ -817,13 +796,7 @@ Fetching 133 new ports or files... done.
 	      ËÏÍÐÉÌÑÃÉÉ ÌÉÛØ ÎÅËÏÔÏÒÏÊ ÞÁÓÔÉ ÐÒÏÇÒÁÍÍ × ÜÔÏÍ ÓÌÕÞÁÅ
 	      ÇÁÒÁÎÔÉÒÏ×ÁÎÎÏ ×ÙÚÏ×ÅÔ ÐÒÏÂÌÅÍÙ.</para>
 
-	    <indexterm>
-	      <primary>-CURRENT</primary>
-
-	      <secondary>ËÏÍÐÉÌÑÃÉÑ</secondary>
-	    </indexterm>
-
-	    <para>ðÅÒÅÄ ÔÅÍ, ËÁË ËÏÍÐÉÌÉÒÏ×ÁÔØ &os.current;, ×ÎÉÍÁÔÅÌØÎÏ
+	    <para>ðÅÒÅÄ ÔÅÍ, ËÁË ËÏÍÐÉÌÉÒÏ×ÁÔØ &os.current;<indexterm><primary>-CURRENT</primary><secondary>ËÏÍÐÉÌÑÃÉÑ</secondary></indexterm>, ×ÎÉÍÁÔÅÌØÎÏ
 	      ÐÒÏÞÔÉÔÅ ÆÁÊÌ <filename>Makefile</filename> × ËÁÔÁÌÏÇÅ
 	      <filename>/usr/src</filename>.  ÷ ÐÒÏÃÅÓÓÅ ÏÂÎÏ×ÌÅÎÉÑ ×Ù
 	      ÐÏ ËÒÁÊÎÅÊ ÍÅÒÅ ÒÁÚ ÄÏÌÖÎÙ ÐÒÏÊÔÉ ÞÅÒÅÚ <link
@@ -910,13 +883,9 @@ Fetching 133 new ports or files... done.
       <sect3>
 	<title>éÓÐÏÌØÚÏ×ÁÎÉÅ &os.stable;</title>
 
-	<indexterm>
-	  <primary>-STABLE</primary>
-	  <secondary>ÉÓÐÏÌØÚÏ×ÁÎÉÅ</secondary>
-	</indexterm>
 	<orderedlist>
 	  <listitem>
-	    <para>ðÏÄÐÉÛÉÔÅÓØ ÎÁ ÓÐÉÓÏË ÒÁÓÓÙÌËÉ &a.stable.name;.  üÔÏ ÐÏÚ×ÏÌÉÔ
+	    <para>ðÏÄÐÉÛÉÔÅÓØ ÎÁ ÓÐÉÓÏË ÒÁÓÓÙÌËÉ &a.stable.name;<indexterm><primary>-STABLE</primary><secondary>ÉÓÐÏÌØÚÏ×ÁÎÉÅ</secondary></indexterm>.  üÔÏ ÐÏÚ×ÏÌÉÔ
 	      ×ÁÍ ÕÚÎÁ×ÁÔØ Ï ÚÁ×ÉÓÉÍÏÓÔÑÈ ÐÒÏÃÅÓÓÁ ËÏÍÐÉÌÑÃÉÉ,
 	      ËÏÔÏÒÙÅ ÍÏÇÕÔ ÐÏÑ×ÉÔØÓÑ × ×ÅÔËÅ &os.stable; ÉÌÉ
 	      ÌÀÂÙÈ ÄÒÕÇÉÈ ÐÒÏÂÌÅÍÁÈ, ÔÒÅÂÕÀÝÉÈ ÏÓÏÂÏÇÏ ×ÎÉÍÁÎÉÑ.  ÷ ÜÔÏÍ
@@ -959,23 +928,7 @@ Fetching 133 new ports or files... done.
 
 	    <orderedlist>
 	      <listitem>
-		<indexterm>
-		  <primary><command>cvsup</command></primary>
-		</indexterm>
-
-		<indexterm>
-		  <primary><command>cron</command></primary>
-		</indexterm>
-
-		<indexterm>
-		  <primary>-STABLE</primary>
-
-		  <secondary>
-		    óÉÎÈÒÏÎÉÚÁÃÉÑ ÐÒÉ ÐÏÍÏÝÉ <application>CVSup</application>
-		  </secondary>
-		</indexterm>
-
-		<para>ðÒÉ ÐÏÍÏÝÉ ÐÒÏÇÒÁÍÍÙ <link linkend="cvsup">cvsup</link>
+		<para>ðÒÉ ÐÏÍÏÝÉ ÐÒÏÇÒÁÍÍÙ <link linkend="cvsup">cvsup</link><indexterm><primary><command>cvsup</command></primary></indexterm>
 		  Ó <filename>sup</filename>-ÆÁÊÌÏÍ
 		  <filename>stable-supfile</filename> ÉÚ ËÁÔÁÌÏÇÁ
 		  <filename>/usr/share/examples/cvsup</filename>.
@@ -984,20 +937,15 @@ Fetching 133 new ports or files... done.
 		  ÔÅËÓÔÏ× ÏÄÉÎ ÒÁÚ ÐÏÌÎÏÓÔØÀ, Á ÚÁÔÅÍ ÚÁÇÒÕÖÁÔØ ÔÏÌØËÏ
 		  ÐÒÏÉÚÏÛÅÄÛÉÅ ÉÚÍÅÎÅÎÉÑ.  íÎÏÇÉÅ ÚÁÐÕÓËÁÀÔ
 		  <command>cvsup</command> ÐÒÉ ÐÏÍÏÝÉ ÐÒÏÇÒÁÍÍÙ
-		  <command>cron</command> É ÐÏÌÕÞÁÀÔ ÓÁÍÙÅ Ó×ÅÖÉÅ ÉÓÈÏÄÎÙÅ
+		  <command>cron</command><indexterm><primary><command>cron</command></primary></indexterm> É ÐÏÌÕÞÁÀÔ ÓÁÍÙÅ Ó×ÅÖÉÅ ÉÓÈÏÄÎÙÅ
 		  ÔÅËÓÔÙ Á×ÔÏÍÁÔÉÞÅÓËÉ.  éÚÍÅÎÉÔÅ ÐÒÉÍÅÒÎÙÊ ÆÁÊÌ
 		  <filename>supfile</filename> ×ÙÛÅ É ÏÔËÏÎÆÉÇÕÒÉÒÕÊÔÅ <link
-		  linkend="cvsup">cvsup</link> ÄÌÑ ×ÁÛÅÇÏ ÏËÒÕÖÅÎÉÑ.</para>
+		  linkend="cvsup">cvsup</link><indexterm><primary>-STABLE</primary><secondary>óÉÎÈÒÏÎÉÚÁÃÉÑ ÐÒÉ ÐÏÍÏÝÉ <application>CVSup</application></secondary></indexterm> ÄÌÑ ×ÁÛÅÇÏ ÏËÒÕÖÅÎÉÑ.</para>
 	      </listitem>
 
 	      <listitem>
-		<indexterm>
-		  <primary>-STABLE</primary>
-		  <secondary>ÓÉÎÈÒÏÎÉÚÁÃÉÑ ÐÒÉ ÐÏÍÏÝÉ CTM</secondary>
-		</indexterm>
-
 		<para>ðÒÉ ÐÏÍÏÝÉ <application><link
-		  linkend="ctm">CTM</link></application>.  åÓÌÉ Õ ×ÁÓ ÎÅÔ
+		  linkend="ctm">CTM</link></application><indexterm><primary>-STABLE</primary><secondary>ÓÉÎÈÒÏÎÉÚÁÃÉÑ ÐÒÉ ÐÏÍÏÝÉ CTM</secondary></indexterm>.  åÓÌÉ Õ ×ÁÓ ÎÅÔ
 		  ÂÙÓÔÒÏÇÏ É ÎÅÄÏÒÏÇÏÇÏ ÐÏÄËÌÀÞÅÎÉÑ Ë éÎÔÅÒÎÅÔ, ÔÏ ÜÔÏ ËÁË ÒÁÚ
 		  ÔÏÔ ÍÅÔÏÄ, ËÏÔÏÒÙÍ ×Ù ÄÏÌÖÎÙ ×ÏÓÐÏÌØÚÏ×ÁÔØÓÑ.</para>
 	      </listitem>
@@ -1013,12 +961,7 @@ Fetching 133 new ports or files... done.
 	  </listitem>
 
 	  <listitem>
-	    <indexterm>
-	      <primary>-STABLE</primary>
-	      <secondary>ËÏÍÐÉÌÑÃÉÑ</secondary>
-	    </indexterm>
-
-	    <para>ðÅÒÅÄ ÔÅÍ, ËÁË ËÏÍÐÉÌÉÒÏ×ÁÔØ &os.stable;, ×ÎÉÍÁÔÅÌØÎÏ
+	    <para>ðÅÒÅÄ ÔÅÍ, ËÁË ËÏÍÐÉÌÉÒÏ×ÁÔØ &os.stable;<indexterm><primary>-STABLE</primary><secondary>ËÏÍÐÉÌÑÃÉÑ</secondary></indexterm>, ×ÎÉÍÁÔÅÌØÎÏ
 	      ÐÒÏÞÔÉÔÅ ÆÁÊÌ <filename>Makefile</filename> × ËÁÔÁÌÏÇÅ
 	      <filename>/usr/src</filename>.  ÷ ÐÒÏÃÅÓÓÅ ÏÂÎÏ×ÌÅÎÉÑ ×Ù
 	      ÐÏ ËÒÁÊÎÅÊ ÍÅÒÅ ÒÁÚ ÄÏÌÖÎÙ ÐÒÏÊÔÉ ÞÅÒÅÚ <link

Modified: head/ru_RU.KOI8-R/books/handbook/mail/chapter.xml
==============================================================================
--- head/ru_RU.KOI8-R/books/handbook/mail/chapter.xml	Wed Jul 24 14:41:29 2013	(r42417)
+++ head/ru_RU.KOI8-R/books/handbook/mail/chapter.xml	Wed Jul 24 15:53:14 2013	(r42418)
@@ -1195,12 +1195,8 @@ www.example.org</programlisting>
 	ÈÏÓÔ, ÎÅÏÂÈÏÄÉÍÏ ÕÂÅÄÉÔØÓÑ × ÏÄÎÏÍ ÉÚ Ä×ÕÈ:</para>
 
       <itemizedlist>
-	<indexterm>
-	  <primary>MX record</primary>
-	</indexterm>
-
 	<listitem>
-	  <para>õÂÅÄÉÔÅÓØ, ÞÔÏ ÚÁÐÉÓØ (Ó ÎÁÉÍÅÎØÛÉÍ ÎÏÍÅÒÏÍ) MX ×
+	  <para>õÂÅÄÉÔÅÓØ, ÞÔÏ ÚÁÐÉÓØ (Ó ÎÁÉÍÅÎØÛÉÍ ÎÏÍÅÒÏÍ) MX ×<indexterm><primary>MX record</primary></indexterm>
 	    DNS ÓÏÏÔ×ÅÔÓÔ×ÕÅÔ IP ÁÄÒÅÓÕ ×ÁÛÅÇÏ ÈÏÓÔÁ.</para>
 	</listitem>
 

Modified: head/ru_RU.KOI8-R/books/handbook/network-servers/chapter.xml
==============================================================================
--- head/ru_RU.KOI8-R/books/handbook/network-servers/chapter.xml	Wed Jul 24 14:41:29 2013	(r42417)
+++ head/ru_RU.KOI8-R/books/handbook/network-servers/chapter.xml	Wed Jul 24 15:53:14 2013	(r42418)
@@ -1332,13 +1332,8 @@ Exports list on foobar:
       <title>ôÉÐÙ ÍÁÛÉÎ</title>
 
       <itemizedlist>
-	<indexterm>
-	  <primary>NIS</primary>
-	  <secondary>ÇÌÁ×ÎÙÊ ÓÅÒ×ÅÒ</secondary>
-	</indexterm>
-
 	<listitem>
-	  <para><emphasis>ïÓÎÏ×ÎÏÊ ÓÅÒ×ÅÒ NIS</emphasis>.
+	  <para><emphasis>ïÓÎÏ×ÎÏÊ ÓÅÒ×ÅÒ NIS</emphasis><indexterm><primary>NIS</primary><secondary>ÇÌÁ×ÎÙÊ ÓÅÒ×ÅÒ</secondary></indexterm>.
 	    ôÁËÏÊ ÓÅÒ×ÅÒ, ÐÏ ÁÎÁÌÏÇÉÉ Ó ÐÅÒ×ÉÞÎÙÍ ËÏÎÔÒÏÌÌÅÒÏÍ ÄÏÍÅÎÁ
 	    &windowsnt;, ÈÒÁÎÉÔ ÆÁÊÌÙ, ÉÓÐÏÌØÚÕÅÍÙÅ ×ÓÅÍÉ ËÌÉÅÎÔÁÍÉ NIS.  æÁÊÌÙ
 	    <filename>passwd</filename>, <filename>group</filename> É
@@ -1354,12 +1349,7 @@ Exports list on foobar:
 	</listitem>
 
 	<listitem>
-	  <indexterm>
-	    <primary>NIS</primary>
-	    <secondary>×ÔÏÒÉÞÎÙÊ ÓÅÒ×ÅÒ</secondary>
-	  </indexterm>
-
-	  <para><emphasis>÷ÔÏÒÉÞÎÙÅ ÓÅÒ×ÅÒÙ NIS</emphasis>.  ðÏÈÏÖÉÅ ÎÁ
+	  <para><emphasis>÷ÔÏÒÉÞÎÙÅ ÓÅÒ×ÅÒÙ NIS</emphasis><indexterm><primary>NIS</primary><secondary>×ÔÏÒÉÞÎÙÊ ÓÅÒ×ÅÒ</secondary></indexterm>.  ðÏÈÏÖÉÅ ÎÁ
 	    ×ÔÏÒÉÞÎÙÅ ËÏÎÔÒÏÌÌÅÒÙ ÄÏÍÅÎÏ× &windowsnt;, ×ÔÏÒÉÞÎÙÅ ÓÅÒ×ÅÒÙ
 	    NIS ÓÏÄÅÒÖÁÔ ËÏÐÉÉ ÏÒÉÇÉÎÁÌØÎÙÈ ÆÁÊÌÏ× ÄÁÎÎÙÈ NIS.	÷ÔÏÒÉÞÎÙÅ
 	    ÓÅÒ×ÅÒÙ NIS ÏÂÅÓÐÅÞÉ×ÁÀÔ ÉÚÂÙÔÏÞÎÏÓÔØ, ÞÔÏ ÎÕÖÎÏ × ËÒÉÔÉÞÎÙÈ
@@ -1370,12 +1360,7 @@ Exports list on foobar:
 	</listitem>
 
 	<listitem>
-	  <indexterm>
-	    <primary>NIS</primary>
-	    <secondary>ËÌÉÅÎÔ</secondary>
-	  </indexterm>
-
-	  <para><emphasis>ëÌÉÅÎÔÙ NIS</emphasis>.
+	  <para><emphasis>ëÌÉÅÎÔÙ NIS</emphasis><indexterm><primary>NIS</primary><secondary>ËÌÉÅÎÔ</secondary></indexterm>.
 	    ëÌÉÅÎÔÙ NIS, ËÁË É ÂÏÌØÛÉÎÓÔ×Ï ÒÁÂÏÞÉÈ ÓÔÁÎÃÉÊ &windowsnt;,
 	    ÁÕÔÅÎÔÉÆÉÃÉÒÕÀÔÓÑ ÎÁ ÓÅÒ×ÅÒÅ NIS (ÉÌÉ ÎÁ ËÏÎÔÒÏÌÌÅÒÅ ÄÏÍÅÎÁ
 	    &windowsnt; ÄÌÑ ÒÁÂÏÞÉÈ ÓÔÁÎÃÉÊ &windowsnt;) ×Ï ×ÒÅÍÑ


More information about the svn-doc-all mailing list