aboutsummaryrefslogtreecommitdiff
path: root/ru_RU.KOI8-R
diff options
context:
space:
mode:
authorHiroki Sato <hrs@FreeBSD.org>2012-05-17 03:23:15 +0000
committerHiroki Sato <hrs@FreeBSD.org>2012-05-17 03:23:15 +0000
commit4fe414e55f71a98004350e582bfeb852f5758769 (patch)
treecef8e8b44236eea349b9f90e1eebcc80c56017c1 /ru_RU.KOI8-R
parent282a032540622ef194d646326406f3349c379554 (diff)
downloaddoc-4fe414e55f71a98004350e582bfeb852f5758769.tar.gz
doc-4fe414e55f71a98004350e582bfeb852f5758769.zip
- Move developers.sgml to the language-independent directory.
- Move files under <lang>/htdocs/share to <lang>/share. - s/WEB_PREFIX/DOC_PREFIX/ - Update the webupdate script to use the SVN repository. Approved by: doceng (implicit)
Notes
Notes: svn path=/head/; revision=38822
Diffstat (limited to 'ru_RU.KOI8-R')
-rw-r--r--ru_RU.KOI8-R/Makefile.inc3
-rw-r--r--ru_RU.KOI8-R/htdocs/FAQ/Makefile2
-rw-r--r--ru_RU.KOI8-R/htdocs/Makefile2
-rw-r--r--ru_RU.KOI8-R/htdocs/Makefile.inc2
-rw-r--r--ru_RU.KOI8-R/htdocs/art.sgml2
-rw-r--r--ru_RU.KOI8-R/htdocs/commercial/Makefile2
-rw-r--r--ru_RU.KOI8-R/htdocs/community/Makefile2
-rw-r--r--ru_RU.KOI8-R/htdocs/copyright/Makefile2
-rw-r--r--ru_RU.KOI8-R/htdocs/developers/Makefile2
-rw-r--r--ru_RU.KOI8-R/htdocs/doc/Makefile21
-rw-r--r--ru_RU.KOI8-R/htdocs/docproj/Makefile2
-rw-r--r--ru_RU.KOI8-R/htdocs/docproj/current.sgml2
-rw-r--r--ru_RU.KOI8-R/htdocs/docproj/handbook3.sgml2
-rw-r--r--ru_RU.KOI8-R/htdocs/docs/Makefile2
-rw-r--r--ru_RU.KOI8-R/htdocs/donations/Makefile2
-rw-r--r--ru_RU.KOI8-R/htdocs/donations/donors.sgml2
-rw-r--r--ru_RU.KOI8-R/htdocs/events/2003/Makefile2
-rw-r--r--ru_RU.KOI8-R/htdocs/events/2003/bsdcon-devsummit.sgml2
-rw-r--r--ru_RU.KOI8-R/htdocs/events/Makefile4
-rw-r--r--ru_RU.KOI8-R/htdocs/events/Makefile.inc2
-rw-r--r--ru_RU.KOI8-R/htdocs/gnome/Makefile2
-rw-r--r--ru_RU.KOI8-R/htdocs/gnome/Makefile.inc2
-rw-r--r--ru_RU.KOI8-R/htdocs/gnome/docs/Makefile2
-rw-r--r--ru_RU.KOI8-R/htdocs/handbook/Makefile2
-rw-r--r--ru_RU.KOI8-R/htdocs/internal/Makefile6
-rw-r--r--ru_RU.KOI8-R/htdocs/internal/doceng.sgml2
-rw-r--r--ru_RU.KOI8-R/htdocs/java/Makefile2
-rw-r--r--ru_RU.KOI8-R/htdocs/java/Makefile.inc2
-rw-r--r--ru_RU.KOI8-R/htdocs/java/dists/Makefile2
-rw-r--r--ru_RU.KOI8-R/htdocs/java/docs/Makefile2
-rw-r--r--ru_RU.KOI8-R/htdocs/java/links/Makefile2
-rw-r--r--ru_RU.KOI8-R/htdocs/kse/Makefile2
-rw-r--r--ru_RU.KOI8-R/htdocs/kse/index.sgml2
-rw-r--r--ru_RU.KOI8-R/htdocs/logo.sgml2
-rw-r--r--ru_RU.KOI8-R/htdocs/marketing/Makefile2
-rw-r--r--ru_RU.KOI8-R/htdocs/marketing/os-comparison.sgml4
-rw-r--r--ru_RU.KOI8-R/htdocs/news/1996/Makefile2
-rw-r--r--ru_RU.KOI8-R/htdocs/news/1997/Makefile2
-rw-r--r--ru_RU.KOI8-R/htdocs/news/1998/Makefile2
-rw-r--r--ru_RU.KOI8-R/htdocs/news/1999/Makefile2
-rw-r--r--ru_RU.KOI8-R/htdocs/news/2000/Makefile2
-rw-r--r--ru_RU.KOI8-R/htdocs/news/2001/Makefile2
-rw-r--r--ru_RU.KOI8-R/htdocs/news/2002/Makefile2
-rw-r--r--ru_RU.KOI8-R/htdocs/news/2003/Makefile2
-rw-r--r--ru_RU.KOI8-R/htdocs/news/Makefile2
-rw-r--r--ru_RU.KOI8-R/htdocs/news/Makefile.inc2
-rw-r--r--ru_RU.KOI8-R/htdocs/news/status/Makefile2
-rw-r--r--ru_RU.KOI8-R/htdocs/platforms/Makefile2
-rw-r--r--ru_RU.KOI8-R/htdocs/platforms/Makefile.inc2
-rw-r--r--ru_RU.KOI8-R/htdocs/platforms/amd64/Makefile2
-rw-r--r--ru_RU.KOI8-R/htdocs/platforms/arm.sgml2
-rw-r--r--ru_RU.KOI8-R/htdocs/platforms/ia64/Makefile2
-rw-r--r--ru_RU.KOI8-R/htdocs/platforms/sparc.sgml2
-rw-r--r--ru_RU.KOI8-R/htdocs/platforms/xbox.sgml2
-rw-r--r--ru_RU.KOI8-R/htdocs/portmgr/Makefile2
-rw-r--r--ru_RU.KOI8-R/htdocs/portmgr/index.sgml2
-rw-r--r--ru_RU.KOI8-R/htdocs/ports/Makefile14
-rw-r--r--ru_RU.KOI8-R/htdocs/ports/Makefile.inc02
-rw-r--r--ru_RU.KOI8-R/htdocs/projects/Makefile2
-rw-r--r--ru_RU.KOI8-R/htdocs/projects/Makefile.inc2
-rw-r--r--ru_RU.KOI8-R/htdocs/projects/busdma/Makefile2
-rw-r--r--ru_RU.KOI8-R/htdocs/projects/busdma/index.sgml2
-rw-r--r--ru_RU.KOI8-R/htdocs/projects/cvsweb.sgml2
-rw-r--r--ru_RU.KOI8-R/htdocs/projects/summerofcode.sgml2
-rw-r--r--ru_RU.KOI8-R/htdocs/prstats/Makefile2
-rw-r--r--ru_RU.KOI8-R/htdocs/releases/5.3R/Makefile2
-rw-r--r--ru_RU.KOI8-R/htdocs/releases/5.4R/Makefile2
-rw-r--r--ru_RU.KOI8-R/htdocs/releases/Makefile2
-rw-r--r--ru_RU.KOI8-R/htdocs/releases/Makefile.inc2
-rw-r--r--ru_RU.KOI8-R/htdocs/releng/Makefile2
-rw-r--r--ru_RU.KOI8-R/htdocs/releng/index.sgml2
-rw-r--r--ru_RU.KOI8-R/htdocs/search/Makefile6
-rw-r--r--ru_RU.KOI8-R/htdocs/security/Makefile2
-rw-r--r--ru_RU.KOI8-R/htdocs/security/advisories.sgml2
-rw-r--r--ru_RU.KOI8-R/htdocs/security/notices.sgml2
-rw-r--r--ru_RU.KOI8-R/htdocs/security/security.sgml2
-rw-r--r--ru_RU.KOI8-R/htdocs/share/sgml/catalog12
-rw-r--r--ru_RU.KOI8-R/htdocs/share/sgml/l10n.ent61
-rw-r--r--ru_RU.KOI8-R/htdocs/smp/Makefile2
-rw-r--r--ru_RU.KOI8-R/htdocs/smp/index.sgml2
-rw-r--r--ru_RU.KOI8-R/htdocs/snapshots/Makefile2
-rw-r--r--ru_RU.KOI8-R/htdocs/snapshots/Makefile.inc2
-rw-r--r--ru_RU.KOI8-R/htdocs/support/Makefile2
-rw-r--r--ru_RU.KOI8-R/htdocs/tutorials/Makefile2
-rw-r--r--ru_RU.KOI8-R/share/sgml/catalog12
-rw-r--r--ru_RU.KOI8-R/share/sgml/catalog.xml (renamed from ru_RU.KOI8-R/htdocs/share/sgml/catalog.xml)0
-rw-r--r--ru_RU.KOI8-R/share/sgml/events.xml (renamed from ru_RU.KOI8-R/htdocs/share/sgml/events.xml)0
-rw-r--r--ru_RU.KOI8-R/share/sgml/events2003.xml (renamed from ru_RU.KOI8-R/htdocs/share/sgml/events2003.xml)0
-rw-r--r--ru_RU.KOI8-R/share/sgml/events2004.xml (renamed from ru_RU.KOI8-R/htdocs/share/sgml/events2004.xml)0
-rw-r--r--ru_RU.KOI8-R/share/sgml/events2005.xml (renamed from ru_RU.KOI8-R/htdocs/share/sgml/events2005.xml)0
-rw-r--r--ru_RU.KOI8-R/share/sgml/events2006.xml (renamed from ru_RU.KOI8-R/htdocs/share/sgml/events2006.xml)0
-rw-r--r--ru_RU.KOI8-R/share/sgml/events2007.xml (renamed from ru_RU.KOI8-R/htdocs/share/sgml/events2007.xml)0
-rw-r--r--ru_RU.KOI8-R/share/sgml/events2008.xml (renamed from ru_RU.KOI8-R/htdocs/share/sgml/events2008.xml)0
-rw-r--r--ru_RU.KOI8-R/share/sgml/events2009.xml (renamed from ru_RU.KOI8-R/htdocs/share/sgml/events2009.xml)0
-rw-r--r--ru_RU.KOI8-R/share/sgml/events2010.xml (renamed from ru_RU.KOI8-R/htdocs/share/sgml/events2010.xml)0
-rw-r--r--ru_RU.KOI8-R/share/sgml/events2011.xml (renamed from ru_RU.KOI8-R/htdocs/share/sgml/events2011.xml)0
-rw-r--r--ru_RU.KOI8-R/share/sgml/events2012.xml (renamed from ru_RU.KOI8-R/htdocs/share/sgml/events2012.xml)0
-rw-r--r--ru_RU.KOI8-R/share/sgml/events2013.xml (renamed from ru_RU.KOI8-R/htdocs/share/sgml/events2013.xml)0
-rw-r--r--ru_RU.KOI8-R/share/sgml/header.l10n.ent (renamed from ru_RU.KOI8-R/htdocs/share/sgml/header.l10n.ent)0
-rw-r--r--ru_RU.KOI8-R/share/sgml/l10n.ent42
-rw-r--r--ru_RU.KOI8-R/share/sgml/libcommon.xsl (renamed from ru_RU.KOI8-R/htdocs/share/sgml/libcommon.xsl)0
-rw-r--r--ru_RU.KOI8-R/share/sgml/navibar.l10n.ent (renamed from ru_RU.KOI8-R/htdocs/share/sgml/navibar.l10n.ent)0
-rw-r--r--ru_RU.KOI8-R/share/sgml/news.xml (renamed from ru_RU.KOI8-R/htdocs/share/sgml/news.xml)0
-rw-r--r--ru_RU.KOI8-R/share/sgml/press.xml (renamed from ru_RU.KOI8-R/htdocs/share/sgml/press.xml)0
-rw-r--r--ru_RU.KOI8-R/share/sgml/templates.events.xsl (renamed from ru_RU.KOI8-R/htdocs/share/sgml/templates.events.xsl)0
-rw-r--r--ru_RU.KOI8-R/share/sgml/templates.usergroups.xsl (renamed from ru_RU.KOI8-R/htdocs/share/sgml/templates.usergroups.xsl)0
106 files changed, 162 insertions, 173 deletions
diff --git a/ru_RU.KOI8-R/Makefile.inc b/ru_RU.KOI8-R/Makefile.inc
new file mode 100644
index 0000000000..453700a49b
--- /dev/null
+++ b/ru_RU.KOI8-R/Makefile.inc
@@ -0,0 +1,3 @@
+# $FreeBSD$
+
+DOC_PREFIX?= ${.CURDIR}/../..
diff --git a/ru_RU.KOI8-R/htdocs/FAQ/Makefile b/ru_RU.KOI8-R/htdocs/FAQ/Makefile
index e60743afe9..963daf651c 100644
--- a/ru_RU.KOI8-R/htdocs/FAQ/Makefile
+++ b/ru_RU.KOI8-R/htdocs/FAQ/Makefile
@@ -16,4 +16,4 @@
DATA= index.html
-.include "${WEB_PREFIX}/share/mk/web.site.mk"
+.include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/ru_RU.KOI8-R/htdocs/Makefile b/ru_RU.KOI8-R/htdocs/Makefile
index 26027b17c1..13f529d068 100644
--- a/ru_RU.KOI8-R/htdocs/Makefile
+++ b/ru_RU.KOI8-R/htdocs/Makefile
@@ -98,4 +98,4 @@ SUBDIR+= ports
WEBDIR?= data/ru
-.include "${WEB_PREFIX}/share/mk/web.site.mk"
+.include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/ru_RU.KOI8-R/htdocs/Makefile.inc b/ru_RU.KOI8-R/htdocs/Makefile.inc
index 40cf4664bb..cc0d076d26 100644
--- a/ru_RU.KOI8-R/htdocs/Makefile.inc
+++ b/ru_RU.KOI8-R/htdocs/Makefile.inc
@@ -3,4 +3,4 @@
# Original revision: 1.8
WEBBASE?= /data/ru
-WEB_PREFIX?= ${.CURDIR}/../..
+DOC_PREFIX?= ${.CURDIR}/../../..
diff --git a/ru_RU.KOI8-R/htdocs/art.sgml b/ru_RU.KOI8-R/htdocs/art.sgml
index 1d032eebfd..1ed811afaa 100644
--- a/ru_RU.KOI8-R/htdocs/art.sgml
+++ b/ru_RU.KOI8-R/htdocs/art.sgml
@@ -10,7 +10,7 @@
<!ENTITY date "$FreeBSD: www/ru/art.sgml,v 1.4 2006/06/10 11:22:40 bvs Exp $">
<!ENTITY title "Изображения FreeBSD">
<!ENTITY % navinclude.about "INCLUDE">
-<!ENTITY % developers SYSTEM "developers.sgml"> %developers;
+<!ENTITY % developers PUBLIC "-//FreeBSD//ENTITIES FreeBSD Developers Entities//EN"> %developers;
]>
<html>
diff --git a/ru_RU.KOI8-R/htdocs/commercial/Makefile b/ru_RU.KOI8-R/htdocs/commercial/Makefile
index 8b436f77ee..5359f56463 100644
--- a/ru_RU.KOI8-R/htdocs/commercial/Makefile
+++ b/ru_RU.KOI8-R/htdocs/commercial/Makefile
@@ -21,4 +21,4 @@ DOCS = commercial.sgml
INDEXLINK=commercial.html
-.include "${WEB_PREFIX}/share/mk/web.site.mk"
+.include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/ru_RU.KOI8-R/htdocs/community/Makefile b/ru_RU.KOI8-R/htdocs/community/Makefile
index 1f0ff250f1..7298689ca5 100644
--- a/ru_RU.KOI8-R/htdocs/community/Makefile
+++ b/ru_RU.KOI8-R/htdocs/community/Makefile
@@ -16,4 +16,4 @@ DOCS= irc.sgml mailinglists.sgml newsgroups.sgml webresources.sgml
XMLDOCS+= social::${XML_EVENTS_EVENTS}:
-.include "${WEB_PREFIX}/share/mk/web.site.mk"
+.include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/ru_RU.KOI8-R/htdocs/copyright/Makefile b/ru_RU.KOI8-R/htdocs/copyright/Makefile
index ea278b4ba0..9004957eca 100644
--- a/ru_RU.KOI8-R/htdocs/copyright/Makefile
+++ b/ru_RU.KOI8-R/htdocs/copyright/Makefile
@@ -40,4 +40,4 @@ CVS_OPT+= -R
# ${CVS} ${CVS_OPT} co -p ${LEGAL_FILE} > ${.TARGET}
#.endif
-.include "${WEB_PREFIX}/share/mk/web.site.mk"
+.include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/ru_RU.KOI8-R/htdocs/developers/Makefile b/ru_RU.KOI8-R/htdocs/developers/Makefile
index a0bc614999..a3221c221c 100644
--- a/ru_RU.KOI8-R/htdocs/developers/Makefile
+++ b/ru_RU.KOI8-R/htdocs/developers/Makefile
@@ -12,4 +12,4 @@
DOCS= cvs.sgml
-.include "${WEB_PREFIX}/share/mk/web.site.mk"
+.include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/ru_RU.KOI8-R/htdocs/doc/Makefile b/ru_RU.KOI8-R/htdocs/doc/Makefile
index e3964625c9..28a27f2a26 100644
--- a/ru_RU.KOI8-R/htdocs/doc/Makefile
+++ b/ru_RU.KOI8-R/htdocs/doc/Makefile
@@ -6,7 +6,12 @@
#
# Original revision: 1.8
#
-
+.if exists(Makefile.conf)
+.include "Makefile.conf"
+.endif
+.if exists(../Makefile.inc)
+.include "../Makefile.inc"
+.endif
#
# Build the FreeBSD documentation *outside* of the www tree, and install it
# in to the right place as necessary.
@@ -21,28 +26,28 @@ all: all-all all-install
all-all:
@unset DESTDIR || true; \
- cd ${.CURDIR}/../../../doc/ru_RU.KOI8-R; \
+ cd ${DOC_PREFIX}/${LANGCODE}; \
${MAKE} FORMATS="html-split html" \
INSTALL_COMPRESSED= all
all-install:
@unset DESTDIR || true; \
- cd ${.CURDIR}/../../../doc/ru_RU.KOI8-R; \
+ cd ${DOC_PREFIX}/${LANGCODE}; \
${MAKE} FORMATS="html-split html" DOCDIR=${.OBJDIR} \
INSTALL_COMPRESSED= install
all-pgpkeyring:
@unset DESTDIR || true; \
- cd ${.CURDIR}/../../../doc/ru_RU.KOI8-R/books/handbook; \
+ cd ${DOC_PREFIX}/${LANGCODE}/books/handbook; \
${MAKE} \
pgpkeyring > ${.OBJDIR}/pgpkeyring.txt
install clean:
@unset DESTDIR || true; \
- cd ${.CURDIR}/../../../doc/ru_RU.KOI8-R; \
+ cd ${DOC_PREFIX}/${LANGCODE}; \
${MAKE} FORMATS="html-split html" DOCDIR=${DESTDIR}/data/doc \
INSTALL_COMPRESSED= ${.TARGET}
#.if make(install)
# @unset DESTDIR || true; \
-# cd ${.CURDIR}/../../../doc/ru_RU.KOI8-R/books/handbook; \
+# cd ${DOC_PREFIX}/${LANGCODE}/books/handbook; \
# ${MAKE} \
# pgpkeyring > ${DESTDIR}/data/doc/pgpkeyring.txt
#.endif
@@ -50,11 +55,11 @@ install clean:
${RM} -rf ru* handbook faq
.endif
-.include "${.CURDIR}/../../share/mk/web.site.mk"
+.include "${DOC_PREFIX}/share/mk/web.site.mk"
obj: _OBJUSE
_OBJUSE: .USE
@unset DESTDIR || true; \
- cd ${.CURDIR}/../../../doc/ru_RU.KOI8-R; \
+ cd ${DOC_PREFIX}/${LANGCODE}; \
${MAKE} ${.TARGET}
diff --git a/ru_RU.KOI8-R/htdocs/docproj/Makefile b/ru_RU.KOI8-R/htdocs/docproj/Makefile
index 0b91d368da..e3b7b52047 100644
--- a/ru_RU.KOI8-R/htdocs/docproj/Makefile
+++ b/ru_RU.KOI8-R/htdocs/docproj/Makefile
@@ -27,4 +27,4 @@ DOCS+= docproj.sgml
INDEXLINK= docproj.html
-.include "${WEB_PREFIX}/share/mk/web.site.mk"
+.include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/ru_RU.KOI8-R/htdocs/docproj/current.sgml b/ru_RU.KOI8-R/htdocs/docproj/current.sgml
index 0b592731bc..561bc12174 100644
--- a/ru_RU.KOI8-R/htdocs/docproj/current.sgml
+++ b/ru_RU.KOI8-R/htdocs/docproj/current.sgml
@@ -11,7 +11,7 @@
<!ENTITY date "$FreeBSD: www/ru/docproj/current.sgml,v 1.18 2006/06/10 10:30:17 bvs Exp $">
<!ENTITY title "Проект Документирования FreeBSD: Текущие проекты">
<!ENTITY % navinclude.docs "INCLUDE">
-<!ENTITY % developers SYSTEM "../developers.sgml"> %developers;
+<!ENTITY % developers PUBLIC "-//FreeBSD//ENTITIES FreeBSD Developers Entities//EN"> %developers;
<!ENTITY imagebase "&enbase;/gifs">
diff --git a/ru_RU.KOI8-R/htdocs/docproj/handbook3.sgml b/ru_RU.KOI8-R/htdocs/docproj/handbook3.sgml
index 379416cbe4..46d77e3282 100644
--- a/ru_RU.KOI8-R/htdocs/docproj/handbook3.sgml
+++ b/ru_RU.KOI8-R/htdocs/docproj/handbook3.sgml
@@ -11,7 +11,7 @@
<!ENTITY date "$FreeBSD: www/ru/docproj/handbook3.sgml,v 1.6 2005/10/05 20:59:52 simon Exp $">
<!ENTITY title "Проект документирования FreeBSD: 3-е издание Руководства">
<!ENTITY % navinclude.docs "INCLUDE">
-<!ENTITY % developers SYSTEM "../developers.sgml"> %developers;
+<!ENTITY % developers PUBLIC "-//FreeBSD//ENTITIES FreeBSD Developers Entities//EN"> %developers;
<!ENTITY done "<font color='green'>Выполнено</font>">
<!ENTITY inprogress "<font color='blue'>Выполняется</font>">
diff --git a/ru_RU.KOI8-R/htdocs/docs/Makefile b/ru_RU.KOI8-R/htdocs/docs/Makefile
index 36f4856a48..89f6bc0c1a 100644
--- a/ru_RU.KOI8-R/htdocs/docs/Makefile
+++ b/ru_RU.KOI8-R/htdocs/docs/Makefile
@@ -12,4 +12,4 @@
DOCS= books.sgml man.sgml webresources.sgml
-.include "${WEB_PREFIX}/share/mk/web.site.mk"
+.include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/ru_RU.KOI8-R/htdocs/donations/Makefile b/ru_RU.KOI8-R/htdocs/donations/Makefile
index 64c83d5ac3..20b7937f40 100644
--- a/ru_RU.KOI8-R/htdocs/donations/Makefile
+++ b/ru_RU.KOI8-R/htdocs/donations/Makefile
@@ -11,4 +11,4 @@
DOCS= index.sgml wantlist.sgml donors.sgml
-.include "${WEB_PREFIX}/share/mk/web.site.mk"
+.include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/ru_RU.KOI8-R/htdocs/donations/donors.sgml b/ru_RU.KOI8-R/htdocs/donations/donors.sgml
index b4e3b5a537..83f2f38ba7 100644
--- a/ru_RU.KOI8-R/htdocs/donations/donors.sgml
+++ b/ru_RU.KOI8-R/htdocs/donations/donors.sgml
@@ -11,7 +11,7 @@
<!ENTITY date "$FreeBSD: www/ru/donations/donors.sgml,v 1.9 2006/05/22 07:01:46 andy Exp $">
<!ENTITY title "Страница пожертвований оборудования">
<!ENTITY % navinclude.about "INCLUDE">
-<!ENTITY % developers SYSTEM "../developers.sgml"> %developers;
+<!ENTITY % developers PUBLIC "-//FreeBSD//ENTITIES FreeBSD Developers Entities//EN"> %developers;
]>
<html>
diff --git a/ru_RU.KOI8-R/htdocs/events/2003/Makefile b/ru_RU.KOI8-R/htdocs/events/2003/Makefile
index 255dbfae9d..7693dfc918 100644
--- a/ru_RU.KOI8-R/htdocs/events/2003/Makefile
+++ b/ru_RU.KOI8-R/htdocs/events/2003/Makefile
@@ -16,4 +16,4 @@
DOCS?= bsdcon-devsummit.sgml
-.include "${WEB_PREFIX}/share/mk/web.site.mk"
+.include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/ru_RU.KOI8-R/htdocs/events/2003/bsdcon-devsummit.sgml b/ru_RU.KOI8-R/htdocs/events/2003/bsdcon-devsummit.sgml
index 2d7e024bca..7bd3dac5ab 100644
--- a/ru_RU.KOI8-R/htdocs/events/2003/bsdcon-devsummit.sgml
+++ b/ru_RU.KOI8-R/htdocs/events/2003/bsdcon-devsummit.sgml
@@ -12,7 +12,7 @@
<!ENTITY email 'hackers'>
<!ENTITY title "Встреча Разработчиков FreeBSD на BSDCon 2003">
<!ENTITY % navinclude.about "INCLUDE">
-<!ENTITY % developers SYSTEM "../../developers.sgml"> %developers;
+<!ENTITY % developers PUBLIC "-//FreeBSD//ENTITIES FreeBSD Developers Entities//EN"> %developers;
]>
<html>
diff --git a/ru_RU.KOI8-R/htdocs/events/Makefile b/ru_RU.KOI8-R/htdocs/events/Makefile
index 53efbc8269..067f1da5f8 100644
--- a/ru_RU.KOI8-R/htdocs/events/Makefile
+++ b/ru_RU.KOI8-R/htdocs/events/Makefile
@@ -25,7 +25,7 @@ PASTYEARS= 2010 2009 2008 2007 2006 2005 2004 2003
DATA= events.css
INDEXLINK= events.html
-XMLDOCS+= events:../share/sgml/templates.events.xsl:${XML_EVENTS_EVENTS}:
+XMLDOCS+= events:${DOC_PREFIX}/${LANGCODE}/share/sgml/templates.events.xsl:${XML_EVENTS_EVENTS}:
PARAMS.events= --param startyear ${YEARSTART}
PARAMS.events+= --stringparam pastyears '${PASTYEARS}'
DEPENDSET.events= events
@@ -42,4 +42,4 @@ DEPENDSET.events_ics= events
XMLDOCS+= events_rss:rss.xsl:${XML_EVENTS_EVENTS}:rss.xml
-.include "${WEB_PREFIX}/share/mk/web.site.mk"
+.include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/ru_RU.KOI8-R/htdocs/events/Makefile.inc b/ru_RU.KOI8-R/htdocs/events/Makefile.inc
index dbf2e2b123..68f581caad 100644
--- a/ru_RU.KOI8-R/htdocs/events/Makefile.inc
+++ b/ru_RU.KOI8-R/htdocs/events/Makefile.inc
@@ -7,5 +7,5 @@
# Original revision: 1.2
#
-WEB_PREFIX?= ${.CURDIR}/../../..
+DOC_PREFIX?= ${.CURDIR}/../../../..
WEBBASE?= /data/ru/events
diff --git a/ru_RU.KOI8-R/htdocs/gnome/Makefile b/ru_RU.KOI8-R/htdocs/gnome/Makefile
index 95d910ea35..c5f1791742 100644
--- a/ru_RU.KOI8-R/htdocs/gnome/Makefile
+++ b/ru_RU.KOI8-R/htdocs/gnome/Makefile
@@ -45,4 +45,4 @@ newsflash.html: newsflash.xsl news.xml includes.xsl ../includes.xsl
-${TIDY} ${TIDYOPTS} ${.TARGET}
.endif
-.include "${WEB_PREFIX}/share/mk/web.site.mk"
+.include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/ru_RU.KOI8-R/htdocs/gnome/Makefile.inc b/ru_RU.KOI8-R/htdocs/gnome/Makefile.inc
index 936086621d..df8aebb64f 100644
--- a/ru_RU.KOI8-R/htdocs/gnome/Makefile.inc
+++ b/ru_RU.KOI8-R/htdocs/gnome/Makefile.inc
@@ -6,4 +6,4 @@
# Original revision: 1.1
WEBBASE?= /data/ru/gnome
-WEB_PREFIX?= ${.CURDIR}/../../..
+DOC_PREFIX?= ${.CURDIR}/../../..
diff --git a/ru_RU.KOI8-R/htdocs/gnome/docs/Makefile b/ru_RU.KOI8-R/htdocs/gnome/docs/Makefile
index 44df669beb..2fdeb2d98f 100644
--- a/ru_RU.KOI8-R/htdocs/gnome/docs/Makefile
+++ b/ru_RU.KOI8-R/htdocs/gnome/docs/Makefile
@@ -25,4 +25,4 @@ DOCS+= knownissues.sgml
DOCS+= develfaq.sgml
DOCS+= example-Makefile.sgml
-.include "${WEB_PREFIX}/share/mk/web.site.mk"
+.include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/ru_RU.KOI8-R/htdocs/handbook/Makefile b/ru_RU.KOI8-R/htdocs/handbook/Makefile
index 069fa756b0..efc4759257 100644
--- a/ru_RU.KOI8-R/htdocs/handbook/Makefile
+++ b/ru_RU.KOI8-R/htdocs/handbook/Makefile
@@ -11,4 +11,4 @@
DOCS = index.sgml
-.include "${WEB_PREFIX}/share/mk/web.site.mk"
+.include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/ru_RU.KOI8-R/htdocs/internal/Makefile b/ru_RU.KOI8-R/htdocs/internal/Makefile
index 07ab09b184..96fb6274c5 100644
--- a/ru_RU.KOI8-R/htdocs/internal/Makefile
+++ b/ru_RU.KOI8-R/htdocs/internal/Makefile
@@ -42,8 +42,8 @@ DOCS+= homepage.sgml
.if !make(install)
.PHONY: homepage.inc
.endif
-homepage.inc: ${WEB_PREFIX}/en/internal/homepage.pl
- ${PERL} ${WEB_PREFIX}/en/internal/homepage.pl > ${.TARGET}
+homepage.inc: ${DOC_PREFIX}/en/internal/homepage.pl
+ ${PERL} ${DOC_PREFIX}/en/internal/homepage.pl > ${.TARGET}
homepage.html: homepage.inc
CLEANFILES+= homepage.inc
@@ -51,4 +51,4 @@ CLEANFILES+= homepage.inc
DATA+= README.mirror
-.include "${WEB_PREFIX}/share/mk/web.site.mk"
+.include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/ru_RU.KOI8-R/htdocs/internal/doceng.sgml b/ru_RU.KOI8-R/htdocs/internal/doceng.sgml
index 8f79570d99..33e6e02b7c 100644
--- a/ru_RU.KOI8-R/htdocs/internal/doceng.sgml
+++ b/ru_RU.KOI8-R/htdocs/internal/doceng.sgml
@@ -11,7 +11,7 @@
<!ENTITY date "$FreeBSD: www/ru/internal/doceng.sgml,v 1.8 2006/02/10 13:15:25 marck Exp $">
<!ENTITY title "Обязанности группы FreeBSD Doceng Team">
<!ENTITY % navinclude.docs "INCLUDE">
-<!ENTITY % developers SYSTEM "../developers.sgml"> %developers;
+<!ENTITY % developers PUBLIC "-//FreeBSD//ENTITIES FreeBSD Developers Entities//EN"> %developers;
]>
<html>
&header;
diff --git a/ru_RU.KOI8-R/htdocs/java/Makefile b/ru_RU.KOI8-R/htdocs/java/Makefile
index 98b5bd584a..446f7dbef3 100644
--- a/ru_RU.KOI8-R/htdocs/java/Makefile
+++ b/ru_RU.KOI8-R/htdocs/java/Makefile
@@ -24,4 +24,4 @@ DOCS+= press.sgml
#DATA= j2j.gif
-.include "${WEB_PREFIX}/share/mk/web.site.mk"
+.include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/ru_RU.KOI8-R/htdocs/java/Makefile.inc b/ru_RU.KOI8-R/htdocs/java/Makefile.inc
index 9de7aec172..76f39eb262 100644
--- a/ru_RU.KOI8-R/htdocs/java/Makefile.inc
+++ b/ru_RU.KOI8-R/htdocs/java/Makefile.inc
@@ -4,4 +4,4 @@
# Original revision: 1.2
WEBBASE?= /data/ru/java
-WEB_PREFIX?= ${.CURDIR}/../../..
+DOC_PREFIX?= ${.CURDIR}/../../../..
diff --git a/ru_RU.KOI8-R/htdocs/java/dists/Makefile b/ru_RU.KOI8-R/htdocs/java/dists/Makefile
index e58c2c8c97..39fa88134e 100644
--- a/ru_RU.KOI8-R/htdocs/java/dists/Makefile
+++ b/ru_RU.KOI8-R/htdocs/java/dists/Makefile
@@ -18,4 +18,4 @@ DOCS+= 13.sgml
DOCS+= 14.sgml
DOCS+= index.sgml
-.include "${WEB_PREFIX}/share/mk/web.site.mk"
+.include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/ru_RU.KOI8-R/htdocs/java/docs/Makefile b/ru_RU.KOI8-R/htdocs/java/docs/Makefile
index 5bbe30b851..27da618421 100644
--- a/ru_RU.KOI8-R/htdocs/java/docs/Makefile
+++ b/ru_RU.KOI8-R/htdocs/java/docs/Makefile
@@ -17,4 +17,4 @@ DOCS+= newbies.sgml
DOCS+= performance.sgml
DOCS+= tutorials.sgml
-.include "${WEB_PREFIX}/share/mk/web.site.mk"
+.include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/ru_RU.KOI8-R/htdocs/java/links/Makefile b/ru_RU.KOI8-R/htdocs/java/links/Makefile
index b1cc23f59e..01707b4616 100644
--- a/ru_RU.KOI8-R/htdocs/java/links/Makefile
+++ b/ru_RU.KOI8-R/htdocs/java/links/Makefile
@@ -22,4 +22,4 @@ DOCS+= vendor.sgml
DOCS+= documentation.sgml
DOCS+= servlets.sgml
-.include "${WEB_PREFIX}/share/mk/web.site.mk"
+.include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/ru_RU.KOI8-R/htdocs/kse/Makefile b/ru_RU.KOI8-R/htdocs/kse/Makefile
index 6842154a2b..f8f2dcaf01 100644
--- a/ru_RU.KOI8-R/htdocs/kse/Makefile
+++ b/ru_RU.KOI8-R/htdocs/kse/Makefile
@@ -16,4 +16,4 @@
DOCS= index.sgml
-.include "${WEB_PREFIX}/share/mk/web.site.mk"
+.include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/ru_RU.KOI8-R/htdocs/kse/index.sgml b/ru_RU.KOI8-R/htdocs/kse/index.sgml
index 09a2ab93de..4c771c9844 100644
--- a/ru_RU.KOI8-R/htdocs/kse/index.sgml
+++ b/ru_RU.KOI8-R/htdocs/kse/index.sgml
@@ -24,7 +24,7 @@
<!-- The list of contributors was moved to a separate file so that it can
be used by other documents in the FreeBSD web site. -->
-<!ENTITY % developers SYSTEM "../developers.sgml"> %developers;
+<!ENTITY % developers PUBLIC "-//FreeBSD//ENTITIES FreeBSD Developers Entities//EN"> %developers;
]>
diff --git a/ru_RU.KOI8-R/htdocs/logo.sgml b/ru_RU.KOI8-R/htdocs/logo.sgml
index 3a3e82c6a4..4732b629bb 100644
--- a/ru_RU.KOI8-R/htdocs/logo.sgml
+++ b/ru_RU.KOI8-R/htdocs/logo.sgml
@@ -8,7 +8,7 @@
<!ENTITY date "$FreeBSD: www/en/logo.sgml,v 1.7 2006/08/19 21:20:30 hrs Exp $">
<!ENTITY title "Логотип FreeBSD">
<!ENTITY % navinclude.about "INCLUDE">
-<!ENTITY % developers SYSTEM "developers.sgml"> %developers;
+<!ENTITY % developers PUBLIC "-//FreeBSD//ENTITIES FreeBSD Developers Entities//EN"> %developers;
]>
<html>
diff --git a/ru_RU.KOI8-R/htdocs/marketing/Makefile b/ru_RU.KOI8-R/htdocs/marketing/Makefile
index 0abb69ed8a..a561a883d3 100644
--- a/ru_RU.KOI8-R/htdocs/marketing/Makefile
+++ b/ru_RU.KOI8-R/htdocs/marketing/Makefile
@@ -16,4 +16,4 @@
DOCS?= os-comparison.sgml
-.include "${WEB_PREFIX}/share/mk/web.site.mk"
+.include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/ru_RU.KOI8-R/htdocs/marketing/os-comparison.sgml b/ru_RU.KOI8-R/htdocs/marketing/os-comparison.sgml
index a8977294c5..15b95cac3b 100644
--- a/ru_RU.KOI8-R/htdocs/marketing/os-comparison.sgml
+++ b/ru_RU.KOI8-R/htdocs/marketing/os-comparison.sgml
@@ -12,7 +12,7 @@
<!ENTITY email 'marketing'>
<!ENTITY title "Сравнение FreeBSD с Linux и Windows 2000">
<!ENTITY % navinclude.about "INCLUDE">
-<!ENTITY % developers SYSTEM "../developers.sgml"> %developers;
+<!ENTITY % developers PUBLIC "-//FreeBSD//ENTITIES FreeBSD Developers Entities//EN"> %developers;
]>
<html>
@@ -627,4 +627,4 @@
&footer;
</body>
-</html> \ No newline at end of file
+</html>
diff --git a/ru_RU.KOI8-R/htdocs/news/1996/Makefile b/ru_RU.KOI8-R/htdocs/news/1996/Makefile
index 3a08377b8c..7b0c4a5336 100644
--- a/ru_RU.KOI8-R/htdocs/news/1996/Makefile
+++ b/ru_RU.KOI8-R/htdocs/news/1996/Makefile
@@ -13,4 +13,4 @@
DOCS= index.sgml
-.include "${WEB_PREFIX}/share/mk/web.site.mk"
+.include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/ru_RU.KOI8-R/htdocs/news/1997/Makefile b/ru_RU.KOI8-R/htdocs/news/1997/Makefile
index f6f3a54aed..33bf4e3b0c 100644
--- a/ru_RU.KOI8-R/htdocs/news/1997/Makefile
+++ b/ru_RU.KOI8-R/htdocs/news/1997/Makefile
@@ -13,4 +13,4 @@
DOCS= index.sgml
-.include "${WEB_PREFIX}/share/mk/web.site.mk"
+.include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/ru_RU.KOI8-R/htdocs/news/1998/Makefile b/ru_RU.KOI8-R/htdocs/news/1998/Makefile
index bfb0561155..228b387f78 100644
--- a/ru_RU.KOI8-R/htdocs/news/1998/Makefile
+++ b/ru_RU.KOI8-R/htdocs/news/1998/Makefile
@@ -16,4 +16,4 @@ DOCS= index.sgml
XMLDOCS+= press:${XSL_NEWS_PRESS_OLD}::
DEPENDSET.press=transtable press
-.include "${WEB_PREFIX}/share/mk/web.site.mk"
+.include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/ru_RU.KOI8-R/htdocs/news/1999/Makefile b/ru_RU.KOI8-R/htdocs/news/1999/Makefile
index 759fdc7955..8b7d2b1a2b 100644
--- a/ru_RU.KOI8-R/htdocs/news/1999/Makefile
+++ b/ru_RU.KOI8-R/htdocs/news/1999/Makefile
@@ -16,4 +16,4 @@ DOCS= index.sgml
XMLDOCS+= press:${XSL_NEWS_PRESS_OLD}::
DEPENDSET.press=transtable press
-.include "${WEB_PREFIX}/share/mk/web.site.mk"
+.include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/ru_RU.KOI8-R/htdocs/news/2000/Makefile b/ru_RU.KOI8-R/htdocs/news/2000/Makefile
index b7373d2371..8d8a1bdce1 100644
--- a/ru_RU.KOI8-R/htdocs/news/2000/Makefile
+++ b/ru_RU.KOI8-R/htdocs/news/2000/Makefile
@@ -16,4 +16,4 @@ DOCS= index.sgml
XMLDOCS+= press:${XSL_NEWS_PRESS_OLD}::
DEPENDSET.press=transtable press
-.include "${WEB_PREFIX}/share/mk/web.site.mk"
+.include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/ru_RU.KOI8-R/htdocs/news/2001/Makefile b/ru_RU.KOI8-R/htdocs/news/2001/Makefile
index f66a2b7a9f..ca0850b793 100644
--- a/ru_RU.KOI8-R/htdocs/news/2001/Makefile
+++ b/ru_RU.KOI8-R/htdocs/news/2001/Makefile
@@ -15,4 +15,4 @@ DEPENDSET.index=transtable news
XMLDOCS+= press:${XSL_NEWS_PRESS_OLD}::
DEPENDSET.press=transtable press
-.include "${WEB_PREFIX}/share/mk/web.site.mk"
+.include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/ru_RU.KOI8-R/htdocs/news/2002/Makefile b/ru_RU.KOI8-R/htdocs/news/2002/Makefile
index 60a2141907..5668951481 100644
--- a/ru_RU.KOI8-R/htdocs/news/2002/Makefile
+++ b/ru_RU.KOI8-R/htdocs/news/2002/Makefile
@@ -19,4 +19,4 @@ DEPENDSET.index=transtable news
XMLDOCS+= press:${XSL_NEWS_PRESS_OLD}::
DEPENDSET.press=transtable press
-.include "${WEB_PREFIX}/share/mk/web.site.mk"
+.include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/ru_RU.KOI8-R/htdocs/news/2003/Makefile b/ru_RU.KOI8-R/htdocs/news/2003/Makefile
index 265c94edee..07534e03df 100644
--- a/ru_RU.KOI8-R/htdocs/news/2003/Makefile
+++ b/ru_RU.KOI8-R/htdocs/news/2003/Makefile
@@ -20,4 +20,4 @@ DEPENDSET.index=transtable news
XMLDOCS+= press:${XSL_NEWS_PRESS_OLD}::
DEPENDSET.press=transtable press
-.include "${WEB_PREFIX}/share/mk/web.site.mk"
+.include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/ru_RU.KOI8-R/htdocs/news/Makefile b/ru_RU.KOI8-R/htdocs/news/Makefile
index d9a3d9ea9c..3f6829c648 100644
--- a/ru_RU.KOI8-R/htdocs/news/Makefile
+++ b/ru_RU.KOI8-R/htdocs/news/Makefile
@@ -44,4 +44,4 @@ SUBDIR+= 2002
SUBDIR+= 2003
SUBDIR+= status
-.include "${WEB_PREFIX}/share/mk/web.site.mk"
+.include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/ru_RU.KOI8-R/htdocs/news/Makefile.inc b/ru_RU.KOI8-R/htdocs/news/Makefile.inc
index 5564cbd4a1..a5b276fb17 100644
--- a/ru_RU.KOI8-R/htdocs/news/Makefile.inc
+++ b/ru_RU.KOI8-R/htdocs/news/Makefile.inc
@@ -4,4 +4,4 @@
# Original revision: 1.2
WEBBASE?= /data/ru/news
-WEB_PREFIX?= ${.CURDIR}/../../..
+DOC_PREFIX?= ${.CURDIR}/../../../..
diff --git a/ru_RU.KOI8-R/htdocs/news/status/Makefile b/ru_RU.KOI8-R/htdocs/news/status/Makefile
index 0356882458..ea2d62f1cc 100644
--- a/ru_RU.KOI8-R/htdocs/news/status/Makefile
+++ b/ru_RU.KOI8-R/htdocs/news/status/Makefile
@@ -14,4 +14,4 @@ DOCS= status.sgml
INDEXLINK= status.html
-.include "${WEB_PREFIX}/share/mk/web.site.mk"
+.include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/ru_RU.KOI8-R/htdocs/platforms/Makefile b/ru_RU.KOI8-R/htdocs/platforms/Makefile
index 903e69f4b3..10e1a57cf3 100644
--- a/ru_RU.KOI8-R/htdocs/platforms/Makefile
+++ b/ru_RU.KOI8-R/htdocs/platforms/Makefile
@@ -30,4 +30,4 @@ DOCS+= xbox.sgml
SUBDIR= amd64
SUBDIR+=ia64
-.include "${WEB_PREFIX}/share/mk/web.site.mk"
+.include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/ru_RU.KOI8-R/htdocs/platforms/Makefile.inc b/ru_RU.KOI8-R/htdocs/platforms/Makefile.inc
index 6eed206e46..d933ba243c 100644
--- a/ru_RU.KOI8-R/htdocs/platforms/Makefile.inc
+++ b/ru_RU.KOI8-R/htdocs/platforms/Makefile.inc
@@ -6,4 +6,4 @@
# Original revision: 1.1
WEBBASE?= /data/ru/platforms
-WEB_PREFIX?= ${.CURDIR}/../../..
+DOC_PREFIX?= ${.CURDIR}/../../../..
diff --git a/ru_RU.KOI8-R/htdocs/platforms/amd64/Makefile b/ru_RU.KOI8-R/htdocs/platforms/amd64/Makefile
index 6a1a30dcab..6250cb753e 100644
--- a/ru_RU.KOI8-R/htdocs/platforms/amd64/Makefile
+++ b/ru_RU.KOI8-R/htdocs/platforms/amd64/Makefile
@@ -16,4 +16,4 @@
DOCS= motherboards.sgml
-.include "${WEB_PREFIX}/share/mk/web.site.mk"
+.include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/ru_RU.KOI8-R/htdocs/platforms/arm.sgml b/ru_RU.KOI8-R/htdocs/platforms/arm.sgml
index e48d4200a2..e8e19714ef 100644
--- a/ru_RU.KOI8-R/htdocs/platforms/arm.sgml
+++ b/ru_RU.KOI8-R/htdocs/platforms/arm.sgml
@@ -12,7 +12,7 @@
<!ENTITY title "Проект FreeBSD/ARM">
<!ENTITY email 'freebsd-arm'>
<!ENTITY % navinclude.developers "INCLUDE">
-<!ENTITY % developers SYSTEM "../developers.sgml"> %developers;
+<!ENTITY % developers PUBLIC "-//FreeBSD//ENTITIES FreeBSD Developers Entities//EN"> %developers;
]>
<html>
diff --git a/ru_RU.KOI8-R/htdocs/platforms/ia64/Makefile b/ru_RU.KOI8-R/htdocs/platforms/ia64/Makefile
index 922f135674..b6c3d71c17 100644
--- a/ru_RU.KOI8-R/htdocs/platforms/ia64/Makefile
+++ b/ru_RU.KOI8-R/htdocs/platforms/ia64/Makefile
@@ -14,4 +14,4 @@
DOCS= index.sgml machines.sgml refs.sgml todo.sgml
-.include "${WEB_PREFIX}/share/mk/web.site.mk"
+.include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/ru_RU.KOI8-R/htdocs/platforms/sparc.sgml b/ru_RU.KOI8-R/htdocs/platforms/sparc.sgml
index 91ffcf27a4..b79cdc0be5 100644
--- a/ru_RU.KOI8-R/htdocs/platforms/sparc.sgml
+++ b/ru_RU.KOI8-R/htdocs/platforms/sparc.sgml
@@ -12,7 +12,7 @@
<!ENTITY title "Проект FreeBSD/sparc64">
<!ENTITY email 'freebsd-sparc64'>
<!ENTITY % navinclude.developers "INCLUDE">
-<!ENTITY % developers SYSTEM "../developers.sgml"> %developers;
+<!ENTITY % developers PUBLIC "-//FreeBSD//ENTITIES FreeBSD Developers Entities//EN"> %developers;
]>
<html>
diff --git a/ru_RU.KOI8-R/htdocs/platforms/xbox.sgml b/ru_RU.KOI8-R/htdocs/platforms/xbox.sgml
index 2ca6293c76..a18a583c0b 100644
--- a/ru_RU.KOI8-R/htdocs/platforms/xbox.sgml
+++ b/ru_RU.KOI8-R/htdocs/platforms/xbox.sgml
@@ -11,7 +11,7 @@
<!ENTITY date "$FreeBSD: www/ru/platforms/xbox.sgml,v 1.2 2006/06/05 16:06:05 bvs Exp $">
<!ENTITY title "Проект FreeBSD/xbox">
<!ENTITY % navinclude.developers "INCLUDE">
-<!ENTITY % developers SYSTEM "../developers.sgml"> %developers;
+<!ENTITY % developers PUBLIC "-//FreeBSD//ENTITIES FreeBSD Developers Entities//EN"> %developers;
]>
<html>
diff --git a/ru_RU.KOI8-R/htdocs/portmgr/Makefile b/ru_RU.KOI8-R/htdocs/portmgr/Makefile
index b58d2df889..85810fe527 100644
--- a/ru_RU.KOI8-R/htdocs/portmgr/Makefile
+++ b/ru_RU.KOI8-R/htdocs/portmgr/Makefile
@@ -16,4 +16,4 @@
DOCS?= index.sgml charter.sgml policies.sgml qa.sgml
-.include "${WEB_PREFIX}/share/mk/web.site.mk"
+.include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/ru_RU.KOI8-R/htdocs/portmgr/index.sgml b/ru_RU.KOI8-R/htdocs/portmgr/index.sgml
index 0a5f29cc44..49d52a5c09 100644
--- a/ru_RU.KOI8-R/htdocs/portmgr/index.sgml
+++ b/ru_RU.KOI8-R/htdocs/portmgr/index.sgml
@@ -12,7 +12,7 @@
<!ENTITY email 'portmgr'>
<!ENTITY title "Группа управления портами">
<!ENTITY % navinclude.developers "INCLUDE">
-<!ENTITY % developers SYSTEM "../developers.sgml"> %developers;
+<!ENTITY % developers PUBLIC "-//FreeBSD//ENTITIES FreeBSD Developers Entities//EN"> %developers;
<!ENTITY contact.re '<a href="mailto:re@FreeBSD.org">re@FreeBSD.org</a>'>
<!ENTITY contact.so '<a href="mailto:security-officer@FreeBSD.org">security-officer@FreeBSD.org</a>'>
<!ENTITY contact.portmgr '<a href="mailto:portmgr@FreeBSD.org">portmgr@FreeBSD.org</a>'>
diff --git a/ru_RU.KOI8-R/htdocs/ports/Makefile b/ru_RU.KOI8-R/htdocs/ports/Makefile
index 9ff76615d5..0629001872 100644
--- a/ru_RU.KOI8-R/htdocs/ports/Makefile
+++ b/ru_RU.KOI8-R/htdocs/ports/Makefile
@@ -13,8 +13,8 @@
.if exists(../Makefile.inc)
.include "../Makefile.inc"
.endif
-.if exists(Makefile.inc)
-.include "Makefile.inc"
+.if exists(${DOC_PREFIX}/en_US.ISO8859-1/htdocs/ports/Makefile.inc)
+.include "${DOC_PREFIX}/en_US.ISO8859-1/htdocs/ports/Makefile.inc"
.endif
FETCH_OPT?= -am
@@ -48,10 +48,10 @@ hostname= ${NO_PACKAGES_LINK}
packages.exists:
.if ${hostname} == "hub.freebsd.org" || ${hostname} == "freefall.freebsd.org" || ${hostname} == "www.freebsd.org"
-.if exists(${.CURDIR}/../../en/ports/packages.exists)
- ${CP} ${.CURDIR}/../../en/ports/${.TARGET} ${.CURDIR}
+.if exists(${DOC_PREFIX}/en_US.ISO8859-1/htdocs/ports/packages.exists)
+ ${CP} ${DOC_PREFIX}/en_US.ISO8859-1/htdocs/ports/${.TARGET} ${.CURDIR}
.else
- @if ${SH} ${.CURDIR}/../../en/ports/packages > ${.TARGET}.temp; then \
+ @if ${SH} ${DOC_PREFIX}/en_US.ISO8859-1/htdocs/ports/packages > ${.TARGET}.temp; then \
${MV} ${.TARGET}.temp ${.TARGET}; \
else \
${RM} ${.TARGET}.temp; ${TOUCH} ${.TARGET}; \
@@ -82,7 +82,7 @@ index.sgml: ${INDEX} categories packages.exists portindex ports.inc .NOTMAIN
# this builds: categories-alpha.sgml, categories-grouped.sgml,
# master-index.sgml, statistics.ent, <category>.sgml
-CATEGORYLIST=`grep "^[a-z]" ../../en/ports/categories | sed -e s"/,.*//"`
+CATEGORYLIST=`grep "^[a-z]" ${DOC_PREFIX}/en_US.ISO8859-1/htdocs/ports/categories | sed -e s"/,.*//"`
install: all beforeinstall
@@ -98,4 +98,4 @@ beforeinstall:
${PERL} -pi -e 's/href=\"growth/href=\"http:\/\/www.FreeBSD.org\/ports\/growth/' index.html
#.endif
-.include "${WEB_PREFIX}/share/mk/web.site.mk"
+.include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/ru_RU.KOI8-R/htdocs/ports/Makefile.inc0 b/ru_RU.KOI8-R/htdocs/ports/Makefile.inc0
index 27ce22bd50..c2f8ab43d6 100644
--- a/ru_RU.KOI8-R/htdocs/ports/Makefile.inc0
+++ b/ru_RU.KOI8-R/htdocs/ports/Makefile.inc0
@@ -19,4 +19,4 @@
.include "Makefile.gen"
.endif
-.include "${WEB_PREFIX}/share/mk/web.site.mk"
+.include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/ru_RU.KOI8-R/htdocs/projects/Makefile b/ru_RU.KOI8-R/htdocs/projects/Makefile
index 7cd398aa06..7afc58b3d1 100644
--- a/ru_RU.KOI8-R/htdocs/projects/Makefile
+++ b/ru_RU.KOI8-R/htdocs/projects/Makefile
@@ -23,4 +23,4 @@ INDEXLINK= projects.html
SUBDIR= busdma
-.include "${WEB_PREFIX}/share/mk/web.site.mk"
+.include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/ru_RU.KOI8-R/htdocs/projects/Makefile.inc b/ru_RU.KOI8-R/htdocs/projects/Makefile.inc
index 1a848938a3..0cbbc5feb9 100644
--- a/ru_RU.KOI8-R/htdocs/projects/Makefile.inc
+++ b/ru_RU.KOI8-R/htdocs/projects/Makefile.inc
@@ -8,4 +8,4 @@
#
WEBBASE?= /data/ru/projects
-WEB_PREFIX?= ${.CURDIR}/../../..
+DOC_PREFIX?= ${.CURDIR}/../../../..
diff --git a/ru_RU.KOI8-R/htdocs/projects/busdma/Makefile b/ru_RU.KOI8-R/htdocs/projects/busdma/Makefile
index 51866f234b..82492c2398 100644
--- a/ru_RU.KOI8-R/htdocs/projects/busdma/Makefile
+++ b/ru_RU.KOI8-R/htdocs/projects/busdma/Makefile
@@ -21,4 +21,4 @@ MAINTAINER= rwatson
DOCS= index.sgml
DATA= style.css
-.include "${WEB_PREFIX}/share/mk/web.site.mk"
+.include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/ru_RU.KOI8-R/htdocs/projects/busdma/index.sgml b/ru_RU.KOI8-R/htdocs/projects/busdma/index.sgml
index 5569e5e90a..1d34a14f16 100644
--- a/ru_RU.KOI8-R/htdocs/projects/busdma/index.sgml
+++ b/ru_RU.KOI8-R/htdocs/projects/busdma/index.sgml
@@ -24,7 +24,7 @@
<!-- The list of contributors was moved to a separate file so that it can
be used by other documents in the FreeBSD web site. -->
-<!ENTITY % developers SYSTEM "../../developers.sgml"> %developers;
+<!ENTITY % developers PUBLIC "-//FreeBSD//ENTITIES FreeBSD Developers Entities//EN"> %developers;
]>
diff --git a/ru_RU.KOI8-R/htdocs/projects/cvsweb.sgml b/ru_RU.KOI8-R/htdocs/projects/cvsweb.sgml
index 8cb0a94202..63fa11753c 100644
--- a/ru_RU.KOI8-R/htdocs/projects/cvsweb.sgml
+++ b/ru_RU.KOI8-R/htdocs/projects/cvsweb.sgml
@@ -12,7 +12,7 @@
<!ENTITY title 'Проект FreeBSD CVSweb'>
<!ENTITY email 'freebsd-cvsweb'>
<!ENTITY % navinclude.developers "INCLUDE">
-<!ENTITY % developers SYSTEM "../developers.sgml"> %developers;
+<!ENTITY % developers PUBLIC "-//FreeBSD//ENTITIES FreeBSD Developers Entities//EN"> %developers;
]>
<html>
diff --git a/ru_RU.KOI8-R/htdocs/projects/summerofcode.sgml b/ru_RU.KOI8-R/htdocs/projects/summerofcode.sgml
index 1b7890f364..7cee776980 100644
--- a/ru_RU.KOI8-R/htdocs/projects/summerofcode.sgml
+++ b/ru_RU.KOI8-R/htdocs/projects/summerofcode.sgml
@@ -11,7 +11,7 @@
<!ENTITY date "$FreeBSD: www/ru/projects/summerofcode.sgml,v 1.3 2005/10/05 20:59:56 simon Exp $">
<!ENTITY title "Проекты FreeBSD на лето">
<!ENTITY % navinclude.developers "INCLUDE">
-<!ENTITY % developers SYSTEM "../developers.sgml"> %developers;
+<!ENTITY % developers PUBLIC "-//FreeBSD//ENTITIES FreeBSD Developers Entities//EN"> %developers;
]>
<html>
diff --git a/ru_RU.KOI8-R/htdocs/prstats/Makefile b/ru_RU.KOI8-R/htdocs/prstats/Makefile
index 387a9e9a94..c29bd64f06 100644
--- a/ru_RU.KOI8-R/htdocs/prstats/Makefile
+++ b/ru_RU.KOI8-R/htdocs/prstats/Makefile
@@ -10,4 +10,4 @@
DOCS= index.sgml
-.include "${WEB_PREFIX}/share/mk/web.site.mk"
+.include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/ru_RU.KOI8-R/htdocs/releases/5.3R/Makefile b/ru_RU.KOI8-R/htdocs/releases/5.3R/Makefile
index 04cefd8400..29aa3c5049 100644
--- a/ru_RU.KOI8-R/htdocs/releases/5.3R/Makefile
+++ b/ru_RU.KOI8-R/htdocs/releases/5.3R/Makefile
@@ -42,4 +42,4 @@ DATA+= relnotes-i386.html
DATA+= relnotes-pc98.html
DATA+= relnotes-sparc64.html
-.include "${WEB_PREFIX}/share/mk/web.site.mk"
+.include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/ru_RU.KOI8-R/htdocs/releases/5.4R/Makefile b/ru_RU.KOI8-R/htdocs/releases/5.4R/Makefile
index ff46d6694b..22ba22dd86 100644
--- a/ru_RU.KOI8-R/htdocs/releases/5.4R/Makefile
+++ b/ru_RU.KOI8-R/htdocs/releases/5.4R/Makefile
@@ -43,4 +43,4 @@ DATA+= relnotes-i386.html
DATA+= relnotes-pc98.html
DATA+= relnotes-sparc64.html
-.include "${WEB_PREFIX}/share/mk/web.site.mk"
+.include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/ru_RU.KOI8-R/htdocs/releases/Makefile b/ru_RU.KOI8-R/htdocs/releases/Makefile
index 6a7bdebc83..0be0b9fab0 100644
--- a/ru_RU.KOI8-R/htdocs/releases/Makefile
+++ b/ru_RU.KOI8-R/htdocs/releases/Makefile
@@ -22,4 +22,4 @@ SUBDIR= 5.3R 5.4R
SUBDIR=
.endif
-.include "${WEB_PREFIX}/share/mk/web.site.mk"
+.include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/ru_RU.KOI8-R/htdocs/releases/Makefile.inc b/ru_RU.KOI8-R/htdocs/releases/Makefile.inc
index 381b7325b2..416b2d010c 100644
--- a/ru_RU.KOI8-R/htdocs/releases/Makefile.inc
+++ b/ru_RU.KOI8-R/htdocs/releases/Makefile.inc
@@ -4,4 +4,4 @@
# Original version: 1.5
WEBBASE?= /data/ru/releases
-WEB_PREFIX?= ${.CURDIR}/../../..
+DOC_PREFIX?= ${.CURDIR}/../../../..
diff --git a/ru_RU.KOI8-R/htdocs/releng/Makefile b/ru_RU.KOI8-R/htdocs/releng/Makefile
index 41fbe21086..e5fb58d269 100644
--- a/ru_RU.KOI8-R/htdocs/releng/Makefile
+++ b/ru_RU.KOI8-R/htdocs/releng/Makefile
@@ -15,4 +15,4 @@
DOCS?= index.sgml charter.sgml
-.include "${WEB_PREFIX}/share/mk/web.site.mk"
+.include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/ru_RU.KOI8-R/htdocs/releng/index.sgml b/ru_RU.KOI8-R/htdocs/releng/index.sgml
index 2b5353f184..85b1321b4b 100644
--- a/ru_RU.KOI8-R/htdocs/releng/index.sgml
+++ b/ru_RU.KOI8-R/htdocs/releng/index.sgml
@@ -12,7 +12,7 @@
<!ENTITY email 're'>
<!ENTITY title "Информация о подготовке релизов">
<!ENTITY % navinclude.developers "INCLUDE">
-<!ENTITY % developers SYSTEM "../../en/developers.sgml"> %developers;
+<!ENTITY % developers PUBLIC "-//FreeBSD//ENTITIES FreeBSD Developers Entities//EN"> %developers;
<!ENTITY contact.re '<a href="mailto:re@FreeBSD.org">re@FreeBSD.org</a>'>
<!ENTITY contact.so '<a href="mailto:security-officer@FreeBSD.org">security-officer@FreeBSD.org</a>'>
<!ENTITY contact.portmgr '<a href="mailto:portmgr@FreeBSD.org">portmgr@FreeBSD.org</a>'>
diff --git a/ru_RU.KOI8-R/htdocs/search/Makefile b/ru_RU.KOI8-R/htdocs/search/Makefile
index d112866086..f02cd0036d 100644
--- a/ru_RU.KOI8-R/htdocs/search/Makefile
+++ b/ru_RU.KOI8-R/htdocs/search/Makefile
@@ -22,9 +22,9 @@ CLEANFILES+=atoz.sgml site.sgml
index-site.html: atoz.sgml site.sgml
atoz.sgml: web.atoz
- ${SORT} -fu ${.ALLSRC} | ${PERL} ${.CURDIR}/../../en/search/atoz.pl > ${.TARGET}
+ ${SORT} -fu ${.ALLSRC} | ${PERL} ${DOC_PREFIX}/en_US.ISO8859-1/htdocs/search/atoz.pl > ${.TARGET}
site.sgml: site.map
- ${PERL} ${.CURDIR}/../../en/search/site.pl < ${.ALLSRC} > ${.TARGET}
+ ${PERL} ${DOC_PREFIX}/en_US.ISO8859-1/htdocs/search/site.pl < ${.ALLSRC} > ${.TARGET}
-.include "${WEB_PREFIX}/share/mk/web.site.mk"
+.include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/ru_RU.KOI8-R/htdocs/security/Makefile b/ru_RU.KOI8-R/htdocs/security/Makefile
index 62095d6738..b7f6a80d45 100644
--- a/ru_RU.KOI8-R/htdocs/security/Makefile
+++ b/ru_RU.KOI8-R/htdocs/security/Makefile
@@ -45,4 +45,4 @@ XMLDOCS+= advisories-rdf:security-rdf.xsl::advisories.rdf
XMLDOCS+= advisories-rss:security-rss.xsl::rss.xml
XMLDOCS+= errata-rss:errata-rss.xsl::errata.xml
-.include "${WEB_PREFIX}/share/mk/web.site.mk"
+.include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/ru_RU.KOI8-R/htdocs/security/advisories.sgml b/ru_RU.KOI8-R/htdocs/security/advisories.sgml
index 51f66940ea..d08861edbb 100644
--- a/ru_RU.KOI8-R/htdocs/security/advisories.sgml
+++ b/ru_RU.KOI8-R/htdocs/security/advisories.sgml
@@ -11,7 +11,7 @@
<!ENTITY date "$FreeBSD$">
<!ENTITY title "Бюллетени безопасности FreeBSD">
<!ENTITY % navinclude.support "INCLUDE">
-<!ENTITY % developers SYSTEM "../developers.sgml"> %developers;
+<!ENTITY % developers PUBLIC "-//FreeBSD//ENTITIES FreeBSD Developers Entities//EN"> %developers;
<!ENTITY advisories.html.inc SYSTEM "advisories.html.inc">
]>
diff --git a/ru_RU.KOI8-R/htdocs/security/notices.sgml b/ru_RU.KOI8-R/htdocs/security/notices.sgml
index a6e1c6335c..701f54022d 100644
--- a/ru_RU.KOI8-R/htdocs/security/notices.sgml
+++ b/ru_RU.KOI8-R/htdocs/security/notices.sgml
@@ -11,7 +11,7 @@
<!ENTITY date "$FreeBSD$">
<!ENTITY title "Уведомления об исправлениях FreeBSD">
<!ENTITY % navinclude.support "INCLUDE">
-<!ENTITY % developers SYSTEM "../developers.sgml"> %developers;
+<!ENTITY % developers PUBLIC "-//FreeBSD//ENTITIES FreeBSD Developers Entities//EN"> %developers;
<!ENTITY notices.html.inc SYSTEM "notices.html.inc">
]>
diff --git a/ru_RU.KOI8-R/htdocs/security/security.sgml b/ru_RU.KOI8-R/htdocs/security/security.sgml
index b0539691c4..f233fa5e08 100644
--- a/ru_RU.KOI8-R/htdocs/security/security.sgml
+++ b/ru_RU.KOI8-R/htdocs/security/security.sgml
@@ -12,7 +12,7 @@
<!ENTITY date "$FreeBSD: www/ru/security/security.sgml,v 1.26 2011/03/02 08:07:26 pluknet Exp $">
<!ENTITY title "Информационная безопасность FreeBSD">
<!ENTITY % navinclude.support "INCLUDE">
-<!ENTITY % developers SYSTEM "../../en/developers.sgml"> %developers;
+<!ENTITY % developers PUBLIC "-//FreeBSD//ENTITIES FreeBSD Developers Entities//EN"> %developers;
]>
<html>
diff --git a/ru_RU.KOI8-R/htdocs/share/sgml/catalog b/ru_RU.KOI8-R/htdocs/share/sgml/catalog
deleted file mode 100644
index bae3bb06c0..0000000000
--- a/ru_RU.KOI8-R/htdocs/share/sgml/catalog
+++ /dev/null
@@ -1,12 +0,0 @@
---
- $FreeBSD$
---
-
-PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
- "l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Header L10N Entities//EN"
- "header.l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Navigation Bar L10N Entities//EN"
- "navibar.l10n.ent"
diff --git a/ru_RU.KOI8-R/htdocs/share/sgml/l10n.ent b/ru_RU.KOI8-R/htdocs/share/sgml/l10n.ent
deleted file mode 100644
index 1a63f8a3e4..0000000000
--- a/ru_RU.KOI8-R/htdocs/share/sgml/l10n.ent
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="koi8-r"?>
-<!--
- The FreeBSD Russian Documentation Project
-
- $FreeBSD: www/ru/share/sgml/l10n.ent,v 1.3 2012/01/11 14:02:59 pluknet Exp $
- $FreeBSDru: frdp/www/ru/includes.sgml,v 1.27 2006/06/10 18:40:56 gad Exp $
-
- from: share/sgml/release.ent
-
- Original revision: 1.67
--->
-
-<!ENTITY url.doc.langcode 'ru_RU.KOI8-R'>
-<!ENTITY xml.encoding 'koi8-r'>
-
-<!ENTITY rel.current.date 'Январь 2012'>
-
-<!-- URLs to information on the latest release -->
-<!ENTITY u.rel.notes '&enbase;/releases/&rel.current;R/relnotes.html'>
-<!ENTITY u.rel.announce '&enbase;/releases/&rel.current;R/announce.html'>
-<!ENTITY u.rel.errata '&enbase;/releases/&rel.current;R/errata.html'>
-<!ENTITY u.rel.hardware '&enbase;/releases/&rel.current;R/hardware.html'>
-<!ENTITY u.rel.installation '&enbase;/releases/&rel.current;R/installation.html'>
-<!ENTITY u.rel.readme '&enbase;/releases/&rel.current;R/readme.html'>
-
-<!ENTITY u.betarel.schedule '&enbase;/releases/&betarel.current;R/schedule.html'>
-
-<!-- Secondary "current release" entities -->
-
-<!ENTITY u.betarel2.schedule '&enbase;/releases/&betarel2.current;R/schedule.html'>
-
-<!ENTITY rel2.current.date 'Февраль 2011'>
-
-<!-- URLs to information on the latest release -->
-<!ENTITY u.rel2.notes '&enbase;/releases/&rel2.current;R/relnotes.html'>
-<!ENTITY u.rel2.announce '&enbase;/releases/&rel2.current;R/announce.html'>
-<!ENTITY u.rel2.errata '&enbase;/releases/&rel2.current;R/errata.html'>
-<!ENTITY u.rel2.hardware '&enbase;/releases/&rel2.current;R/hardware.html'>
-<!ENTITY u.rel2.installation '&enbase;/releases/&rel2.current;R/installation.html'>
-<!ENTITY u.rel2.readme '&enbase;/releases/&rel2.current;R/readme.html'>
-
-<!-- Tertiary "current release" entities -->
-
-<!ENTITY rel3.current.date 'Февраль 2011'>
-
-<!-- URLs to information on the latest release -->
-<!ENTITY u.rel3.notes '&enbase;/releases/&rel3.current;R/relnotes.html'>
-<!ENTITY u.rel3.announce '&enbase;/releases/&rel3.current;R/announce.html'>
-<!ENTITY u.rel3.errata '&enbase;/releases/&rel3.current;R/errata.html'>
-<!ENTITY u.rel3.hardware '&enbase;/releases/&rel3.current;R/hardware.html'>
-<!ENTITY u.rel3.installation '&enbase;/releases/&rel3.current;R/installation.html'>
-<!ENTITY u.rel3.readme '&enbase;/releases/&rel3.current;R/readme.html'>
-
-<!--
- Local Variables:
- mode: sgml
- sgml-indent-data: t
- sgml-omittag: nil
- sgml-always-quote-attributes: t
- End:
--->
diff --git a/ru_RU.KOI8-R/htdocs/smp/Makefile b/ru_RU.KOI8-R/htdocs/smp/Makefile
index 95ebaf279f..72ee858d8d 100644
--- a/ru_RU.KOI8-R/htdocs/smp/Makefile
+++ b/ru_RU.KOI8-R/htdocs/smp/Makefile
@@ -13,4 +13,4 @@
DOCS= index.sgml
-.include "${WEB_PREFIX}/share/mk/web.site.mk"
+.include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/ru_RU.KOI8-R/htdocs/smp/index.sgml b/ru_RU.KOI8-R/htdocs/smp/index.sgml
index 92903f48c4..6a6a78380e 100644
--- a/ru_RU.KOI8-R/htdocs/smp/index.sgml
+++ b/ru_RU.KOI8-R/htdocs/smp/index.sgml
@@ -24,7 +24,7 @@
<!-- The list of contributors was moved to a separate file so that it can
be used by other documents in the FreeBSD web site. -->
-<!ENTITY % developers SYSTEM "../developers.sgml"> %developers;
+<!ENTITY % developers PUBLIC "-//FreeBSD//ENTITIES FreeBSD Developers Entities//EN"> %developers;
]>
diff --git a/ru_RU.KOI8-R/htdocs/snapshots/Makefile b/ru_RU.KOI8-R/htdocs/snapshots/Makefile
index f5495c9455..f390637858 100644
--- a/ru_RU.KOI8-R/htdocs/snapshots/Makefile
+++ b/ru_RU.KOI8-R/htdocs/snapshots/Makefile
@@ -16,4 +16,4 @@
DOCS?= index.sgml
-.include "${WEB_PREFIX}/share/mk/web.site.mk"
+.include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/ru_RU.KOI8-R/htdocs/snapshots/Makefile.inc b/ru_RU.KOI8-R/htdocs/snapshots/Makefile.inc
index eee70af8bf..925c6a1ae0 100644
--- a/ru_RU.KOI8-R/htdocs/snapshots/Makefile.inc
+++ b/ru_RU.KOI8-R/htdocs/snapshots/Makefile.inc
@@ -8,4 +8,4 @@
#
WEBBASE?= /data/ru/snapshots
-WEB_PREFIX?= ${.CURDIR}/../../..
+DOC_PREFIX?= ${.CURDIR}/../../..
diff --git a/ru_RU.KOI8-R/htdocs/support/Makefile b/ru_RU.KOI8-R/htdocs/support/Makefile
index 5194532f8b..1bf4f6597e 100644
--- a/ru_RU.KOI8-R/htdocs/support/Makefile
+++ b/ru_RU.KOI8-R/htdocs/support/Makefile
@@ -11,4 +11,4 @@
DOCS= bugreports.sgml webresources.sgml
-.include "${WEB_PREFIX}/share/mk/web.site.mk"
+.include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/ru_RU.KOI8-R/htdocs/tutorials/Makefile b/ru_RU.KOI8-R/htdocs/tutorials/Makefile
index f28daab859..fa0121c6e2 100644
--- a/ru_RU.KOI8-R/htdocs/tutorials/Makefile
+++ b/ru_RU.KOI8-R/htdocs/tutorials/Makefile
@@ -18,4 +18,4 @@
DOCS = index.sgml
-.include "${WEB_PREFIX}/share/mk/web.site.mk"
+.include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/ru_RU.KOI8-R/share/sgml/catalog b/ru_RU.KOI8-R/share/sgml/catalog
index d28874e5a9..8d9d674dcd 100644
--- a/ru_RU.KOI8-R/share/sgml/catalog
+++ b/ru_RU.KOI8-R/share/sgml/catalog
@@ -45,3 +45,15 @@ PUBLIC "-//FreeBSD//ENTITIES DocBook Russian Translators Entities//RU"
PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//RU"
"urls.ent"
+
+ -- ...................................................................... --
+ -- HTML docs ............................................................ --
+
+PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
+ "l10n.ent"
+
+PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Header L10N Entities//EN"
+ "header.l10n.ent"
+
+PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Navigation Bar L10N Entities//EN"
+ "navibar.l10n.ent"
diff --git a/ru_RU.KOI8-R/htdocs/share/sgml/catalog.xml b/ru_RU.KOI8-R/share/sgml/catalog.xml
index 12c0f02504..12c0f02504 100644
--- a/ru_RU.KOI8-R/htdocs/share/sgml/catalog.xml
+++ b/ru_RU.KOI8-R/share/sgml/catalog.xml
diff --git a/ru_RU.KOI8-R/htdocs/share/sgml/events.xml b/ru_RU.KOI8-R/share/sgml/events.xml
index 62676c253f..62676c253f 100644
--- a/ru_RU.KOI8-R/htdocs/share/sgml/events.xml
+++ b/ru_RU.KOI8-R/share/sgml/events.xml
diff --git a/ru_RU.KOI8-R/htdocs/share/sgml/events2003.xml b/ru_RU.KOI8-R/share/sgml/events2003.xml
index 4a9aee4b7c..4a9aee4b7c 100644
--- a/ru_RU.KOI8-R/htdocs/share/sgml/events2003.xml
+++ b/ru_RU.KOI8-R/share/sgml/events2003.xml
diff --git a/ru_RU.KOI8-R/htdocs/share/sgml/events2004.xml b/ru_RU.KOI8-R/share/sgml/events2004.xml
index 216aaf566d..216aaf566d 100644
--- a/ru_RU.KOI8-R/htdocs/share/sgml/events2004.xml
+++ b/ru_RU.KOI8-R/share/sgml/events2004.xml
diff --git a/ru_RU.KOI8-R/htdocs/share/sgml/events2005.xml b/ru_RU.KOI8-R/share/sgml/events2005.xml
index 7cfd772128..7cfd772128 100644
--- a/ru_RU.KOI8-R/htdocs/share/sgml/events2005.xml
+++ b/ru_RU.KOI8-R/share/sgml/events2005.xml
diff --git a/ru_RU.KOI8-R/htdocs/share/sgml/events2006.xml b/ru_RU.KOI8-R/share/sgml/events2006.xml
index 7c588005dc..7c588005dc 100644
--- a/ru_RU.KOI8-R/htdocs/share/sgml/events2006.xml
+++ b/ru_RU.KOI8-R/share/sgml/events2006.xml
diff --git a/ru_RU.KOI8-R/htdocs/share/sgml/events2007.xml b/ru_RU.KOI8-R/share/sgml/events2007.xml
index 60fbe2c3ef..60fbe2c3ef 100644
--- a/ru_RU.KOI8-R/htdocs/share/sgml/events2007.xml
+++ b/ru_RU.KOI8-R/share/sgml/events2007.xml
diff --git a/ru_RU.KOI8-R/htdocs/share/sgml/events2008.xml b/ru_RU.KOI8-R/share/sgml/events2008.xml
index 56d3a22d38..56d3a22d38 100644
--- a/ru_RU.KOI8-R/htdocs/share/sgml/events2008.xml
+++ b/ru_RU.KOI8-R/share/sgml/events2008.xml
diff --git a/ru_RU.KOI8-R/htdocs/share/sgml/events2009.xml b/ru_RU.KOI8-R/share/sgml/events2009.xml
index 0ace9f0b29..0ace9f0b29 100644
--- a/ru_RU.KOI8-R/htdocs/share/sgml/events2009.xml
+++ b/ru_RU.KOI8-R/share/sgml/events2009.xml
diff --git a/ru_RU.KOI8-R/htdocs/share/sgml/events2010.xml b/ru_RU.KOI8-R/share/sgml/events2010.xml
index 3af8137bd0..3af8137bd0 100644
--- a/ru_RU.KOI8-R/htdocs/share/sgml/events2010.xml
+++ b/ru_RU.KOI8-R/share/sgml/events2010.xml
diff --git a/ru_RU.KOI8-R/htdocs/share/sgml/events2011.xml b/ru_RU.KOI8-R/share/sgml/events2011.xml
index 1ec922e979..1ec922e979 100644
--- a/ru_RU.KOI8-R/htdocs/share/sgml/events2011.xml
+++ b/ru_RU.KOI8-R/share/sgml/events2011.xml
diff --git a/ru_RU.KOI8-R/htdocs/share/sgml/events2012.xml b/ru_RU.KOI8-R/share/sgml/events2012.xml
index 7bdb32da2b..7bdb32da2b 100644
--- a/ru_RU.KOI8-R/htdocs/share/sgml/events2012.xml
+++ b/ru_RU.KOI8-R/share/sgml/events2012.xml
diff --git a/ru_RU.KOI8-R/htdocs/share/sgml/events2013.xml b/ru_RU.KOI8-R/share/sgml/events2013.xml
index 8e55b93ced..8e55b93ced 100644
--- a/ru_RU.KOI8-R/htdocs/share/sgml/events2013.xml
+++ b/ru_RU.KOI8-R/share/sgml/events2013.xml
diff --git a/ru_RU.KOI8-R/htdocs/share/sgml/header.l10n.ent b/ru_RU.KOI8-R/share/sgml/header.l10n.ent
index 04372fb1ad..04372fb1ad 100644
--- a/ru_RU.KOI8-R/htdocs/share/sgml/header.l10n.ent
+++ b/ru_RU.KOI8-R/share/sgml/header.l10n.ent
diff --git a/ru_RU.KOI8-R/share/sgml/l10n.ent b/ru_RU.KOI8-R/share/sgml/l10n.ent
index 41274efd1f..6231d65773 100644
--- a/ru_RU.KOI8-R/share/sgml/l10n.ent
+++ b/ru_RU.KOI8-R/share/sgml/l10n.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="koi8-r"?>
<!--
The FreeBSD Russian Documentation Project
@@ -20,3 +21,44 @@
<!-- charset for HTML output -->
<!ENTITY doc.html.charset "koi8-r">
+
+<!ENTITY url.doc.langcode 'ru_RU.KOI8-R'>
+<!ENTITY xml.encoding 'koi8-r'>
+
+<!ENTITY rel.current.date 'Январь 2012'>
+
+<!-- URLs to information on the latest release -->
+<!ENTITY u.rel.notes '&enbase;/releases/&rel.current;R/relnotes.html'>
+<!ENTITY u.rel.announce '&enbase;/releases/&rel.current;R/announce.html'>
+<!ENTITY u.rel.errata '&enbase;/releases/&rel.current;R/errata.html'>
+<!ENTITY u.rel.hardware '&enbase;/releases/&rel.current;R/hardware.html'>
+<!ENTITY u.rel.installation '&enbase;/releases/&rel.current;R/installation.html'>
+<!ENTITY u.rel.readme '&enbase;/releases/&rel.current;R/readme.html'>
+
+<!ENTITY u.betarel.schedule '&enbase;/releases/&betarel.current;R/schedule.html'>
+
+<!-- Secondary "current release" entities -->
+
+<!ENTITY u.betarel2.schedule '&enbase;/releases/&betarel2.current;R/schedule.html'>
+
+<!ENTITY rel2.current.date 'Февраль 2011'>
+
+<!-- URLs to information on the latest release -->
+<!ENTITY u.rel2.notes '&enbase;/releases/&rel2.current;R/relnotes.html'>
+<!ENTITY u.rel2.announce '&enbase;/releases/&rel2.current;R/announce.html'>
+<!ENTITY u.rel2.errata '&enbase;/releases/&rel2.current;R/errata.html'>
+<!ENTITY u.rel2.hardware '&enbase;/releases/&rel2.current;R/hardware.html'>
+<!ENTITY u.rel2.installation '&enbase;/releases/&rel2.current;R/installation.html'>
+<!ENTITY u.rel2.readme '&enbase;/releases/&rel2.current;R/readme.html'>
+
+<!-- Tertiary "current release" entities -->
+
+<!ENTITY rel3.current.date 'Февраль 2011'>
+
+<!-- URLs to information on the latest release -->
+<!ENTITY u.rel3.notes '&enbase;/releases/&rel3.current;R/relnotes.html'>
+<!ENTITY u.rel3.announce '&enbase;/releases/&rel3.current;R/announce.html'>
+<!ENTITY u.rel3.errata '&enbase;/releases/&rel3.current;R/errata.html'>
+<!ENTITY u.rel3.hardware '&enbase;/releases/&rel3.current;R/hardware.html'>
+<!ENTITY u.rel3.installation '&enbase;/releases/&rel3.current;R/installation.html'>
+<!ENTITY u.rel3.readme '&enbase;/releases/&rel3.current;R/readme.html'>
diff --git a/ru_RU.KOI8-R/htdocs/share/sgml/libcommon.xsl b/ru_RU.KOI8-R/share/sgml/libcommon.xsl
index ad324e21d4..ad324e21d4 100644
--- a/ru_RU.KOI8-R/htdocs/share/sgml/libcommon.xsl
+++ b/ru_RU.KOI8-R/share/sgml/libcommon.xsl
diff --git a/ru_RU.KOI8-R/htdocs/share/sgml/navibar.l10n.ent b/ru_RU.KOI8-R/share/sgml/navibar.l10n.ent
index e542af7214..e542af7214 100644
--- a/ru_RU.KOI8-R/htdocs/share/sgml/navibar.l10n.ent
+++ b/ru_RU.KOI8-R/share/sgml/navibar.l10n.ent
diff --git a/ru_RU.KOI8-R/htdocs/share/sgml/news.xml b/ru_RU.KOI8-R/share/sgml/news.xml
index 908b0e474b..908b0e474b 100644
--- a/ru_RU.KOI8-R/htdocs/share/sgml/news.xml
+++ b/ru_RU.KOI8-R/share/sgml/news.xml
diff --git a/ru_RU.KOI8-R/htdocs/share/sgml/press.xml b/ru_RU.KOI8-R/share/sgml/press.xml
index b88c8dbe48..b88c8dbe48 100644
--- a/ru_RU.KOI8-R/htdocs/share/sgml/press.xml
+++ b/ru_RU.KOI8-R/share/sgml/press.xml
diff --git a/ru_RU.KOI8-R/htdocs/share/sgml/templates.events.xsl b/ru_RU.KOI8-R/share/sgml/templates.events.xsl
index 61dbaaee69..61dbaaee69 100644
--- a/ru_RU.KOI8-R/htdocs/share/sgml/templates.events.xsl
+++ b/ru_RU.KOI8-R/share/sgml/templates.events.xsl
diff --git a/ru_RU.KOI8-R/htdocs/share/sgml/templates.usergroups.xsl b/ru_RU.KOI8-R/share/sgml/templates.usergroups.xsl
index 45a3293e75..45a3293e75 100644
--- a/ru_RU.KOI8-R/htdocs/share/sgml/templates.usergroups.xsl
+++ b/ru_RU.KOI8-R/share/sgml/templates.usergroups.xsl