Merge the following from the English version:

(new) -> 1.42 articles/Makefile
   1.25 -> 1.26 books/handbook/vinum/chapter.sgml

Submitted by:	Dmitry Morozovsky <marck@rinet.ru>
Obtained from:	The FreeBSD Russian Documentation Project

ru_RU.KOI8-R/articles/Makefile

@@ -1,8 +1,11 @@
 #
+# The FreeBSD Russian Documentation Project
+#
 # $FreeBSD$
-# $FreeBSDru: frdp/doc/ru_RU.KOI8-R/articles/Makefile,v 1.7 2001/07/25 10:26:26 phantom Exp $
+# $FreeBSDru: frdp/doc/ru_RU.KOI8-R/articles/Makefile,v 1.27 2004/07/10 10:06:24 marck Exp $
+#
+# Original revision: 1.42
 #
-# Original revision: 1.9
 
 SUBDIR =
 SUBDIR+= 5-roadmap
@@ -26,14 +29,17 @@ SUBDIR+= freebsd-questions
 SUBDIR+= hubs
 SUBDIR+= ipsec-must
 SUBDIR+= java-tomcat
+#SUBDIR+= laptop
+#SUBDIR+= mailing-list-faq
 SUBDIR+= mh
 #SUBDIR+= multi-os
 SUBDIR+= new-users
 SUBDIR+= pam
+SUBDIR+= portbuild
 SUBDIR+= pr-guidelines
 SUBDIR+= problem-reports
-#SUBDIR+= programming-tools
 SUBDIR+= pxe
+#SUBDIR+= relaydelay
 SUBDIR+= releng
 #SUBDIR+= releng-packages
 #SUBDIR+= serial-uart

ru_RU.KOI8-R/books/handbook/vinum/chapter.sgml

@@ -2,9 +2,9 @@
 	The FreeBSD Russian Documentation Project
 
 	$FreeBSD$
-	$FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/handbook/vinum/chapter.sgml,v 1.4 2004/03/24 13:48:37 den Exp $
+	$FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/handbook/vinum/chapter.sgml,v 1.5 2004/07/09 15:00:31 marck Exp $
 
-	Original revision: 1.25
+	Original revision: 1.26
 -->
 <!--
 	The Vinum Volume Manager
@@ -502,7 +502,7 @@
       <para>÷ ÒÅÚÕÌØÔÁÔÅ ÏÂÒÁÂÏÔËÉ ÔÁËÏÇÏ ËÏÎÆÉÇÕÒÁÃÉÏÎÎÏÇÏ ÆÁÊÌÁ &man.vinum.8;
 	×ÙÄÁÓÔ ÎÁÍ ÓÌÅÄÕÀÝÅÅ:</para>
 
-      <programlisting>
+      <programlisting width="97">
       &prompt.root; vinum -&gt; <command>create config1</command>
       Configuration summary
       Drives:         1 (4 configured)
@@ -564,7 +564,7 @@
 	ÓËÏÎÆÉÇÕÒÉÒÏ×ÁÎÎÙÈ ÏÂßÅËÔÏ×.  ðÏÓÌÅ ÏÂÒÁÂÏÔËÉ ÜÔÉÈ ÏÐÒÅÄÅÌÅÎÉÊ
 	ËÏÎÆÉÇÕÒÁÃÉÑ ÂÕÄÅÔ ×ÙÇÌÑÄÅÔØ ÔÁË:</para>
 
-      <programlisting>
+      <programlisting width="97">
 	Drives:         2 (4 configured)
 	Volumes:        2 (4 configured)
 	Plexes:         3 (8 configured)
@@ -625,7 +625,7 @@
 	ÓËÏÎÆÉÇÕÒÉÒÏ×ÁÎÎÙÅ ÐÒÉ×ÏÄÙ.  ïÂÝÉÊ ×ÉÄ ÂÁÚÙ ËÏÎÆÉÇÕÒÁÃÉÉ Vinum ÐÏÓÌÅ
 	ÓÏÚÄÁÎÉÑ ÎÏ×ÏÇÏ ÔÏÍÁ ÂÕÄÅÔ ÔÁËÉÍ:</para>
 
-      <programlisting>
+      <programlisting width="92">
 	Drives:         4 (4 configured)
 	Volumes:        3 (4 configured)
 	Plexes:         4 (8 configured)
@@ -917,7 +917,7 @@ newfs: /dev/vinum/concat: can't figure out file system partition</screen>
 	ÒÁÚÒÅÛÅÎÎÙÅ × ÆÁÊÌÁÈ ËÏÎÆÉÇÕÒÁÃÉÉ.  îÁÐÒÉÍÅÒ, ÈÒÁÎÉÍÁÑ ÎÁ ÄÉÓËÅ ÂÁÚÁ
 	ÍÏÖÅÔ ×ÙÇÌÑÄÅÔØ ÔÁË:</para>
 
-	<programlisting>volume myvol state up
+	<programlisting width="119">volume myvol state up
 volume bigraid state down
 plex name myvol.p0 state up org concat vol myvol
 plex name myvol.p1 state up org concat vol myvol