Merge the following from the English version:

1.84 -> 1.90 Makefile
   1.147 -> 1.150 book.sgml
   1.26 -> 1.27 chapters.ent
   1.323 -> 1.324 advanced-networking/chapter.sgml
   (new) -> 1.1 network-servers/Makefile
   (new) -> 1.5 network-servers/chapter.sgml

Obtained from:	The FreeBSD Russian Documentation Project

ru_RU.KOI8-R/books/handbook/Makefile

@@ -4,7 +4,7 @@
 # $FreeBSD$
 # $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/handbook/Makefile,v 1.37 2004/07/08 12:12:43 den Exp $
 #
-# Original revision: 1.84
+# Original revision: 1.90
 # 
 # Build the FreeBSD Handbook.
 #
@@ -29,6 +29,8 @@
 #
 # ------------------------------------------------------------------------
 
+.PATH: ${.CURDIR}/../../share/sgml/glossary
+
 MAINTAINER=phantom@FreeBSD.org
 
 DOC?= book
@@ -36,7 +38,6 @@ DOC?= book
 FORMATS?= html-split
 
 HAS_INDEX= true
-WITH_GLOSSARY?=
 
 INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=
@@ -45,6 +46,7 @@ IMAGES_EN = advanced-networking/isdn-bus.eps
 IMAGES_EN+= advanced-networking/isdn-twisted-pair.eps
 IMAGES_EN+= advanced-networking/natd.eps
 IMAGES_EN+= advanced-networking/net-routing.pic
+IMAGES_EN+= advanced-networking/static-routes.pic
 IMAGES_EN+= install/adduser1.scr
 IMAGES_EN+= install/adduser2.scr
 IMAGES_EN+= install/adduser3.scr
@@ -154,13 +156,16 @@ IMAGES_LIB+= callouts/10.png
 #
 
 # SGML content
-SRCS=	book.sgml
+SRCS+=	book.sgml
+SRCS+=	colophon.sgml
+SRCS+=	freebsd-glossary.sgml
 SRCS+=	advanced-networking/chapter.sgml
 SRCS+=	basics/chapter.sgml
 SRCS+=	bibliography/chapter.sgml
 SRCS+=	boot/chapter.sgml
 SRCS+=	config/chapter.sgml
 SRCS+=	cutting-edge/chapter.sgml
+SRCS+=	desktop/chapter.sgml
 SRCS+=	disks/chapter.sgml
 SRCS+=	eresources/chapter.sgml
 SRCS+=	install/chapter.sgml
@@ -172,20 +177,17 @@ SRCS+=	mac/chapter.sgml
 SRCS+=	mail/chapter.sgml
 SRCS+=	mirrors/chapter.sgml
 SRCS+=	multimedia/chapter.sgml
-SRCS+=	desktop/chapter.sgml
+SRCS+=	network-servers/chapter.sgml
 SRCS+=	pgpkeys/chapter.sgml
-SRCS+=	preface/preface.sgml
-SRCS+=	colophon.sgml
+SRCS+=	ports/chapter.sgml
 SRCS+=	ppp-and-slip/chapter.sgml
+SRCS+=	preface/preface.sgml
 SRCS+=	printing/chapter.sgml
 SRCS+=	security/chapter.sgml
 SRCS+=	serialcomms/chapter.sgml
 SRCS+=	users/chapter.sgml
 SRCS+=	vinum/chapter.sgml
 SRCS+=	x11/chapter.sgml
-SRCS+=	ports/chapter.sgml
-SRCS+=	preface/preface.sgml
-SRCS+=	colophon.sgml
 
 # Entities
 SRCS+=	chapters.ent 
@@ -196,9 +198,7 @@ SYMLINKS=	${DESTDIR} index.html handbook.html
 CHAPTERS?=	${SRCS:M*chapter.sgml}
 
 SGMLFLAGS+=	${CHAPTERS:S/\/chapter.sgml//:S/^/-i chap./}
-.if defined(WITH_GLOSSARY) && !empty(WITH_GLOSSARY)
 SGMLFLAGS+=	-i chap.freebsd-glossary
-.endif
 
 # XXX The Handbook build currently overflows some internal, hardcoded 
 # limits in pdftex.  Until we split the Handbook up, build the PDF 
@@ -215,8 +215,6 @@ book.pdf: book.ps
 pgpkeyring: pgpkeys/chapter.sgml
 	@${JADE} -V nochunks ${OTHERFLAGS} ${JADEOPTS} -d ${DSLPGP} -t sgml ${MASTERDOC}
 
-DOC_PREFIX?= ${.CURDIR}/../../..
-
 #
 # Handbook-specific variables
 #

ru_RU.KOI8-R/books/handbook/book.sgml

@@ -3,7 +3,7 @@
 
      $FreeBSD$
      $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/handbook/book.sgml,v 1.48 2004/07/01 10:55:54 den Exp $
-     Original revision: 1.147
+     Original revision: 1.150
 
      TODO: review ENTITY'es
            review and compare to real state chap.*
@@ -67,6 +67,7 @@
 <!ENTITY % chap.serialcomms "IGNORE">
 <!ENTITY % chap.ppp-and-slip "IGNORE">
 <!ENTITY % chap.advanced-networking "IGNORE">
+<!ENTITY % chap.network-servers "IGNORE">
 <!ENTITY % chap.mail "IGNORE">
 <!ENTITY % chap.cutting-edge "IGNORE">
 <!ENTITY % chap.linuxemu "IGNORE">
@@ -178,7 +179,7 @@
       ÎÁÐÅÞÁÔÁÎÎÙÊ (ÁÎÇÌÉÊÓËÉÊ) ×ÁÒÉÁÎÔ òÕËÏ×ÏÄÓÔ×Á, ÔÏ ÍÏÖÅÔÅ ÐÒÉÏÂÒÅÓÔÉ
       ÅÇÏ ÎÁ <ulink url="http://www.freebsdmall.com/">FreeBSD Mall</ulink>.
       ÷Ù ÔÁËÖÅ ÍÏÖÅÔÅ ×ÏÓÐÏÌØÚÏ×ÁÔØÓÑ <ulink
-      URL="&url.main;/ru/search/index.html">ðÏÉÓËÏÍ × òÕËÏ×ÏÄÓÔ×Å
+      URL="&url.base;/ru/search/index.html">ðÏÉÓËÏÍ × òÕËÏ×ÏÄÓÔ×Å
       FreeBSD</ulink>.</para>
     </abstract>
   </bookinfo>
@@ -259,6 +260,7 @@
     <![ %chap.serialcomms;              [ &chap.serialcomms;          ]]>
     <![ %chap.ppp-and-slip;             [ &chap.ppp-and-slip;         ]]>
     <![ %chap.advanced-networking;      [ &chap.advanced-networking;  ]]>
+    <![ %chap.network-servers;          [ &chap.network-servers;      ]]>
     <![ %chap.mail;                     [ &chap.mail;                 ]]>
     <![ %chap.cutting-edge;             [ &chap.cutting-edge;         ]]>
     <![ %chap.linuxemu;                 [ &chap.linuxemu;             ]]>
@@ -273,7 +275,7 @@
     <![ %chap.pgpkeys;                  [ &chap.pgpkeys;              ]]>
 
   </part>
-  <![ %chap.freebsd-glossary;           [ &chap.freebsd-glossary;     ]]>
+  <![ %chap.freebsd-glossary;           [ &bookinfo.freebsd-glossary;     ]]>
   <![ %chap.index;                      [ &chap.index;                ]]>
   &chap.colophon;
 </book>

ru_RU.KOI8-R/books/handbook/chapters.ent

@@ -4,7 +4,7 @@
      $FreeBSD$
      $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/handbook/chapters.ent,v 1.16 2004/07/01 10:55:54 den Exp $
 
-     Original revision: 1.26
+     Original revision: 1.27
 -->
 <!--
      óÏÚÄÁÎÉÅ ÓÕÝÎÏÓÔÅÊ ÄÌÑ ËÁÖÄÏÇÏ ÒÁÚÄÅÌÁ òÕËÏ×ÏÄÓÔ×Á. ëÁÖÄÁÑ ÓÕÝÎÏÓÔØ
@@ -40,6 +40,7 @@
 <!ENTITY chap.serialcomms		SYSTEM "serialcomms/chapter.sgml">
 <!ENTITY chap.ppp-and-slip		SYSTEM "ppp-and-slip/chapter.sgml">
 <!ENTITY chap.advanced-networking	SYSTEM "advanced-networking/chapter.sgml">
+<!ENTITY chap.network-servers		SYSTEM "network-servers/chapter.sgml">
 <!ENTITY chap.mail			SYSTEM "mail/chapter.sgml">
 <!ENTITY chap.cutting-edge		SYSTEM "cutting-edge/chapter.sgml">
 <!ENTITY chap.linuxemu			SYSTEM "linuxemu/chapter.sgml">

ru_RU.KOI8-R/books/handbook/network-servers/Makefile

@@ -0,0 +1,17 @@
+#
+# Build the Handbook with just the content from this chapter.
+#
+# $FreeBSD$
+# $FreeBSDru$
+#
+# Original revision: 1.1
+
+CHAPTERS= 	network-servers/chapter.sgml
+
+VPATH=		..
+
+MASTERDOC=	${.CURDIR}/../${DOC}.${DOCBOOKSUFFIX}
+
+DOC_PREFIX?= 	${.CURDIR}/../../../..
+
+.include "../Makefile"