aboutsummaryrefslogtreecommitdiff
path: root/share
diff options
context:
space:
mode:
Diffstat (limited to 'share')
-rw-r--r--share/htdocs/mk/doc.xml.mk401
-rw-r--r--share/htdocs/sgml/catalog30
-rw-r--r--share/htdocs/sgml/l10n.ent6
-rw-r--r--share/htdocs/sgml/transtable-common.xsl50
-rw-r--r--share/mk/doc.common.mk92
-rw-r--r--share/mk/doc.xml.mk96
-rw-r--r--share/mk/web.site.mk (renamed from share/htdocs/mk/web.site.mk)42
-rw-r--r--share/sgml/advisories.xml (renamed from share/htdocs/sgml/advisories.xml)0
-rw-r--r--share/sgml/catalog34
-rw-r--r--share/sgml/catalog-cwd.xml (renamed from share/htdocs/sgml/catalog-cwd.xml)0
-rw-r--r--share/sgml/catalog.xml (renamed from share/htdocs/sgml/catalog.xml)0
-rw-r--r--share/sgml/commercial.consult.xml (renamed from share/htdocs/sgml/commercial.consult.xml)0
-rw-r--r--share/sgml/commercial.hardware.xml (renamed from share/htdocs/sgml/commercial.hardware.xml)0
-rw-r--r--share/sgml/commercial.isp.xml (renamed from share/htdocs/sgml/commercial.isp.xml)0
-rw-r--r--share/sgml/commercial.misc.xml (renamed from share/htdocs/sgml/commercial.misc.xml)0
-rw-r--r--share/sgml/commercial.software.xml (renamed from share/htdocs/sgml/commercial.software.xml)0
-rw-r--r--share/sgml/common.ent (renamed from share/htdocs/sgml/common.ent)0
-rw-r--r--share/sgml/developers.ent710
-rw-r--r--share/sgml/events.dtd (renamed from share/htdocs/sgml/events.dtd)0
-rw-r--r--share/sgml/events.xml (renamed from share/htdocs/sgml/events.xml)0
-rw-r--r--share/sgml/events2003.xml (renamed from share/htdocs/sgml/events2003.xml)0
-rw-r--r--share/sgml/events2004.xml (renamed from share/htdocs/sgml/events2004.xml)0
-rw-r--r--share/sgml/events2005.xml (renamed from share/htdocs/sgml/events2005.xml)0
-rw-r--r--share/sgml/events2006.xml (renamed from share/htdocs/sgml/events2006.xml)0
-rw-r--r--share/sgml/events2007.xml (renamed from share/htdocs/sgml/events2007.xml)0
-rw-r--r--share/sgml/events2008.xml (renamed from share/htdocs/sgml/events2008.xml)0
-rw-r--r--share/sgml/events2009.xml (renamed from share/htdocs/sgml/events2009.xml)0
-rw-r--r--share/sgml/events2010.xml (renamed from share/htdocs/sgml/events2010.xml)0
-rw-r--r--share/sgml/events2011.xml (renamed from share/htdocs/sgml/events2011.xml)0
-rw-r--r--share/sgml/events2012.xml (renamed from share/htdocs/sgml/events2012.xml)0
-rw-r--r--share/sgml/events2013.xml (renamed from share/htdocs/sgml/events2013.xml)0
-rw-r--r--share/sgml/gallery.dtd (renamed from share/htdocs/sgml/gallery.dtd)0
-rw-r--r--share/sgml/header.ent (renamed from share/htdocs/sgml/header.ent)0
-rw-r--r--share/sgml/header.l10n.ent (renamed from share/htdocs/sgml/header.l10n.ent)0
-rw-r--r--share/sgml/html401-freebsd.dtd (renamed from share/htdocs/sgml/html401-freebsd.dtd)0
-rw-r--r--share/sgml/ideas.dtd (renamed from share/htdocs/sgml/ideas.dtd)0
-rw-r--r--share/sgml/iso8879.ent (renamed from share/htdocs/sgml/iso8879.ent)0
-rw-r--r--share/sgml/libcommon.xsl (renamed from share/htdocs/sgml/libcommon.xsl)0
-rw-r--r--share/sgml/navibar.ent (renamed from share/htdocs/sgml/navibar.ent)0
-rw-r--r--share/sgml/navibar.l10n.ent (renamed from share/htdocs/sgml/navibar.l10n.ent)0
-rw-r--r--share/sgml/news.dtd (renamed from share/htdocs/sgml/news.dtd)0
-rw-r--r--share/sgml/news.xml (renamed from share/htdocs/sgml/news.xml)0
-rw-r--r--share/sgml/notices.xml (renamed from share/htdocs/sgml/notices.xml)0
-rw-r--r--share/sgml/press.dtd (renamed from share/htdocs/sgml/press.dtd)0
-rw-r--r--share/sgml/press.xml (renamed from share/htdocs/sgml/press.xml)0
-rw-r--r--share/sgml/release.ent (renamed from share/htdocs/sgml/release.ent)0
-rw-r--r--share/sgml/statusreport.dtd (renamed from share/htdocs/sgml/statusreport.dtd)0
-rw-r--r--share/sgml/templates.entries.xsl (renamed from share/htdocs/sgml/templates.entries.xsl)0
-rw-r--r--share/sgml/templates.events.xsl (renamed from share/htdocs/sgml/templates.events.xsl)0
-rw-r--r--share/sgml/templates.events2ics.xsl (renamed from share/htdocs/sgml/templates.events2ics.xsl)0
-rw-r--r--share/sgml/templates.news-rdf.xsl (renamed from share/htdocs/sgml/templates.news-rdf.xsl)0
-rw-r--r--share/sgml/templates.news-rss.xsl (renamed from share/htdocs/sgml/templates.news-rss.xsl)0
-rw-r--r--share/sgml/templates.newsflash.xsl (renamed from share/htdocs/sgml/templates.newsflash.xsl)0
-rw-r--r--share/sgml/templates.oldnewsflash.xsl (renamed from share/htdocs/sgml/templates.oldnewsflash.xsl)0
-rw-r--r--share/sgml/templates.oldpress.xsl (renamed from share/htdocs/sgml/templates.oldpress.xsl)0
-rw-r--r--share/sgml/templates.pastevents.xsl (renamed from share/htdocs/sgml/templates.pastevents.xsl)0
-rw-r--r--share/sgml/templates.press-rss.xsl (renamed from share/htdocs/sgml/templates.press-rss.xsl)0
-rw-r--r--share/sgml/templates.press.xsl (renamed from share/htdocs/sgml/templates.press.xsl)0
-rw-r--r--share/sgml/templates.usergroups.xsl (renamed from share/htdocs/sgml/templates.usergroups.xsl)0
-rw-r--r--share/sgml/usergroups.dtd (renamed from share/htdocs/sgml/usergroups.dtd)0
-rw-r--r--share/sgml/usergroups.xml (renamed from share/htdocs/sgml/usergroups.xml)0
-rw-r--r--share/sgml/xslt10-freebsd.dtd (renamed from share/htdocs/sgml/xslt10-freebsd.dtd)0
-rw-r--r--share/sgml/xslt10.dtd (renamed from share/htdocs/sgml/xslt10.dtd)0
-rw-r--r--share/tools/portsgrowth/Makefile12
-rw-r--r--share/tools/prstats/Makefile12
-rw-r--r--share/tools/webupdate22
66 files changed, 827 insertions, 680 deletions
diff --git a/share/htdocs/mk/doc.xml.mk b/share/htdocs/mk/doc.xml.mk
deleted file mode 100644
index 3600073f49..0000000000
--- a/share/htdocs/mk/doc.xml.mk
+++ /dev/null
@@ -1,401 +0,0 @@
-# doc.xml.mk
-# $FreeBSD: www/share/mk/doc.xml.mk,v 1.14 2008/06/22 23:14:33 murray Exp $
-
-XML_CATALOG_FILES= file://${.OBJDIR}/catalog-cwd.xml \
- file://${DOC_PREFIX}/${LANGCODE}/share/sgml/catalog.xml \
- file://${DOC_PREFIX}/${LANGCODE}/share/sgml/catalog.xml \
- file://${DOC_PREFIX}/share/sgml/catalog.xml \
- file://${DOC_PREFIX}/share/sgml/catalog-common.xml \
- file://${WEB_PREFIX}/${WWW_LANGCODE}/share/sgml/catalog.xml \
- file://${WEB_PREFIX}/share/sgml/catalog.xml \
- file://${WEB_PREFIX}/share/sgml/catalog-common.xml \
- file://${LOCALBASE}/share/xml/catalog
-
-.if exists(${WEB_PREFIX}/share/sgml/catalog-cwd.xml)
-XML_CATALOG_CWD= ${WEB_PREFIX}/share/sgml/catalog-cwd.xml
-.elif exists(${DOC_PREFIX}/share/sgml/catalog-cwd.xml)
-XML_CATALOG_CWD= ${DOC_PREFIX}/share/sgml/catalog-cwd.xml
-.endif
-
-# Variables used in DEPENDSET
-
-_DEPENDSET.all= wwwstd transtable mirrors usergroups commercial \
- news press events advisories notices
-
-# DEPENDSET: wwwstd .........................................................
-_DEPENDSET.wwwstd= ${XML_INCLUDES}
-_XML_INCLIST= libcommon.l10n.xsl \
- libcommon.xsl \
- navibar.l10n.ent \
- navibar.ent \
- common.ent \
- header.ent \
- header.l10n.ent \
- iso8879.ent \
- l10n.ent \
- release.ent
-.for F in ${_INCLIST}
-.if exists(${WEB_PREFIX}/${WWW_LANGCODE}/share/sgml/${F})
-XML_INCLUDES+= ${F}
-.endif
-.if exists(${WEB_PREFIX}/share/sgml/${F})
-XML_INCLUDES+= ${F}
-.endif
-.endfor
-
-.if defined(XML_CATALOG_CWD)
-XML_INCLUDES+= ${.OBJDIR}/catalog-cwd.xml
-CLEANFILES+= ${.OBJDIR}/catalog-cwd.xml
-${.OBJDIR}/catalog-cwd.xml: ${XML_CATALOG_CWD}
- ${INSTALL} ${.ALLSRC} ${.TARGET}
-.endif
-
-XML_INCLUDES+= ${.OBJDIR}/autogen.ent
-CLEANFILES+= ${.OBJDIR}/autogen.ent
-${.OBJDIR}/autogen.ent:
- ${ECHO_CMD} '<!ENTITY base "${WEB_PREFIX_REL}">' > ${.TARGET}
-
-DEPENDSET.DEFAULT+= wwwstd
-
-.if !defined(WEB_ONLY)
-# DEPENDSET: transtable ......................................................
-_DEPENDSET.transtable= ${XML_TRANSTABLE} ${XSL_TRANSTABLE} \
- ${XSL_TRANSTABLE_MASTER} ${XSL_TRANSTABLE_COMMON}
-_PARAMS.transtable= --param transtable.xml "'${XML_TRANSTABLE}'"
-XSL_TRANSTABLE_MASTER= ${DOC_PREFIX}/share/sgml/transtable-master.xsl
-XSL_TRANSTABLE_COMMON= ${DOC_PREFIX}/share/sgml/transtable-common.xsl
-
-.if exists(${DOC_PREFIX}/${LANGCODE}/share/sgml/transtable-local.xsl)
-XSL_TRANSTABLE= ${DOC_PREFIX}/${LANGCODE}/share/sgml/transtable-local.xsl
-.else
-XSL_TRANSTABLE= ${DOC_PREFIX}/share/sgml/transtable-local.xsl
-.endif
-
-.if exists(${DOC_PREFIX}/${LANGCODE}/share/sgml/transtable.xml)
-XML_TRANSTABLE= ${DOC_PREFIX}/${LANGCODE}/share/sgml/transtable.xml
-.else
-XML_TRANSTABLE= ${DOC_PREFIX}/share/sgml/transtable.xml
-.endif
-
-# DEPENDSET: mirrors .....................................................
-_DEPENDSET.mirrors= ${XSL_MIRRORS} ${XML_MIRRORS}
-_PARAMS.mirrors= --param mirrors.xml "'${XML_MIRRORS}'"
-XML_MIRRORS_MASTER= ${DOC_PREFIX}/share/sgml/mirrors.xml
-XML_MIRRORS= ${DOC_PREFIX}/${LANGCODE}/share/sgml/mirrors.xml
-XSL_MIRRORS_MASTER= ${DOC_PREFIX}/share/sgml/mirrors-master.xsl
-.if exists(${DOC_PREFIX}/${LANGCODE}/share/sgml/mirrors-local.xsl)
-XSL_MIRRORS= ${DOC_PREFIX}/${LANGCODE}/share/sgml/mirrors-local.xsl
-.else
-XSL_MIRRORS= ${DOC_PREFIX}/share/sgml/mirrors-local.xsl
-.endif
-${XSL_MIRRORS}: ${XSL_MIRRORS_MASTER} \
- ${XSL_TRANSTABLE_COMMON}
-
-${XML_MIRRORS}: ${XML_MIRRORS_MASTER} \
- ${XSL_TRANSTABLE} ${XSL_TRANSTABLE_MASTER} ${XSL_TRANSTABLE_COMMON}
- ${MKDIR} -p ${@:H}
- ${XSLTPROC} ${XSLTPROCOPTS} \
- --param 'transtable.xml' "'${XML_TRANSTABLE}'" \
- --param 'transtable-target-element' "'country'" \
- --param 'transtable-word-group' "'country'" \
- --param 'transtable-mode' "'sortkey'" \
- ${XSL_TRANSTABLE} ${XML_MIRRORS_MASTER} \
- | env -i LANG="${LANGCODE}" ${SORT} -f > $@.sort.tmp
- env -i ${GREP} "^<?xml" < $@.sort.tmp > $@.sort
- ${ECHO} "<sortkeys>" >> $@.sort
- env -i ${AWK} '/@sortkey@/ {sub(/@sortkey@/, ++line); print;}' < $@.sort.tmp >> $@.sort
- ${ECHO} '</sortkeys>' >> $@.sort
- ${XSLTPROC} ${XSLTPROCOPTS} -o $@ \
- --param 'transtable.xml' "'${XML_TRANSTABLE}'" \
- --param 'transtable-target-element' "'country'" \
- --param 'transtable-word-group' "'country'" \
- --param 'transtable-sortkey.xml' "'$@.sort'" \
- ${XSL_TRANSTABLE} ${XML_MIRRORS_MASTER}
- ${RM} -f $@.sort $@.sort.tmp
-.if ${LANGCODE} != .
-CLEANFILES+= ${XML_MIRRORS}
-CLEANFILES+= ${XML_MIRRORS}.sort
-CLEANFILES+= ${XML_MIRRORS}.sort.tmp
-.endif
-.endif # !defined(WEB_ONLY)
-
-# DEPENDSET: usergroups ......................................................
-_DEPENDSET.usergroups= ${XML_USERGROUPS} ${XML_USERGROUPS_LOCAL} \
- ${XSL_USERGROUPS_MASTER} ${XSL_USERGROUPS} \
- ${XML_INCLUDES}
-_PARAMS.usergroups= --param usergroups.xml "'${XML_USERGROUPS}'" \
- --param usergroups-local.xml "'${XML_USERGROUPS_LOCAL}'"
-XML_USERGROUPS= ${WEB_PREFIX}/share/sgml/usergroups.xml
-.if exists(${WEB_PREFIX}/${WWW_LANGCODE}/share/sgml/usergroups.xml)
-XML_USERGROUPS_LOCAL= ${WEB_PREFIX}/${WWW_LANGCODE}/share/sgml/usergroups.xml
-.else
-XML_USERGROUPS_LOCAL= ${WEB_PREFIX}/share/sgml/usergroups.xml
-.endif
-XSL_USERGROUPS_MASTER= ${WEB_PREFIX}/share/sgml/templates.usergroups.xsl
-.if exists(${WEB_PREFIX}/${WWW_LANGCODE}/share/sgml/templates.usergroups.xsl)
-XSL_USERGROUPS= ${WEB_PREFIX}/${WWW_LANGCODE}/share/sgml/templates.usergroups.xsl
-.else
-XSL_USERGROUPS= ${WEB_PREFIX}/share/sgml/templates.usergroups.xsl
-.endif
-
-# DEPENDSET: news ............................................................
-_DEPENDSET.news= ${XML_NEWS_NEWS_MASTER} ${XML_NEWS_NEWS} \
- ${XSL_NEWS_NEWSFLASH} \
- ${XSL_NEWS_NEWS_RDF} \
- ${XSL_NEWS_NEWS_RSS} \
- ${XML_INCLUDES}
-_PARAMS.news= --param news.project.xml-master "'${XML_NEWS_NEWS_MASTER}'" \
- --param news.project.xml "'${XML_NEWS_NEWS}'"
-XML_NEWS_NEWS_MASTER= ${WEB_PREFIX}/share/sgml/news.xml
-.if exists(${WEB_PREFIX}/${WWW_LANGCODE}/share/sgml/news.xml)
-XML_NEWS_NEWS= ${WEB_PREFIX}/${WWW_LANGCODE}/share/sgml/news.xml
-.else
-XML_NEWS_NEWS= ${WEB_PREFIX}/share/sgml/news.xml
-.endif
-
-XSL_NEWS_NEWSFLASH= ${WEB_PREFIX}/share/sgml/templates.newsflash.xsl
-XSL_NEWS_NEWSFLASH_OLD= ${WEB_PREFIX}/share/sgml/templates.oldnewsflash.xsl
-XSL_NEWS_NEWS_RDF= ${WEB_PREFIX}/share/sgml/templates.news-rdf.xsl
-XSL_NEWS_NEWS_RSS= ${WEB_PREFIX}/share/sgml/templates.news-rss.xsl
-
-# DEPENDSET: press ..........................................................
-_DEPENDSET.press= ${XML_NEWS_PRESS_MASTER} ${XML_NEWS_PRESS} \
- ${XSL_NEWS_PRESS} \
- ${XML_INCLUDES}
-_PARAMS.press= --param news.press.xml-master "'${XML_NEWS_PRESS_MASTER}'" \
- --param news.press.xml "'${XML_NEWS_PRESS}'"
-XML_NEWS_PRESS_MASTER= ${WEB_PREFIX}/share/sgml/press.xml
-.if exists(${WEB_PREFIX}/${WWW_LANGCODE}/share/sgml/press.xml)
-XML_NEWS_PRESS= ${WEB_PREFIX}/${WWW_LANGCODE}/share/sgml/press.xml
-.else
-XML_NEWS_PRESS= ${WEB_PREFIX}/share/sgml/press.xml
-.endif
-XSL_NEWS_PRESS= ${WEB_PREFIX}/share/sgml/templates.press.xsl
-XSL_NEWS_PRESS_RSS= ${WEB_PREFIX}/share/sgml/templates.press-rss.xsl
-XSL_NEWS_PRESS_OLD= ${WEB_PREFIX}/share/sgml/templates.oldpress.xsl
-
-# DEPENDSET: events ..........................................................
-_DEPENDSET.events= ${XML_EVENTS_EVENTS_MASTER} ${XML_EVENTS_EVENTS} \
- ${XML_EVENTS_EVENTS_MASTER_SUBFILES} \
- ${XML_EVENTS_EVENTS_SUBFILES} \
- ${XSL_EVENTS} \
- ${XSL_EVENTS_ICS} \
- ${XML_INCLUDES}
-_PARAMS.events= --param events.xml-master "'${XML_EVENTS_EVENTS_MASTER}'" \
- --param events.xml "'${XML_EVENTS_EVENTS}'"
-XML_EVENTS_EVENTS_MASTER=${WEB_PREFIX}/share/sgml/events.xml
-XML_EVENTS_EVENTS_MASTER_SUBFILES=
-.for Y in 2003 2004 2005 2006 2007 2008 2009 2010 2011 2012 2013
-XML_EVENTS_EVENTS_MASTER_SUBFILES+= ${WEB_PREFIX}/share/sgml/events${Y}.xml
-.endfor
-.if exists(${WEB_PREFIX}/${WWW_LANGCODE}/share/sgml/events.xml)
-XML_EVENTS_EVENTS= ${WEB_PREFIX}/${WWW_LANGCODE}/share/sgml/events.xml
-.else
-XML_EVENTS_EVENTS= ${XML_EVENTS_EVENTS_MASTER}
-.endif
-XML_EVENTS_EVENTS_SUBFILES=
-.for Y in 2003 2004 2005 2006 2007 2008 2009 2010 2011 2012 2013
-.if exists(${WEB_PREFIX}/${WWW_LANGCODE}/share/sgml/events${Y}.xml)
-XML_EVENTS_EVENTS_SUBFILES+= ${WEB_PREFIX}/${WWW_LANGCODE}/share/sgml/events${Y}.xml
-.endif
-.endfor
-XSL_EVENTS= ${WEB_PREFIX}/share/sgml/templates.events.xsl
-XSL_EVENTS_ICS= ${WEB_PREFIX}/share/sgml/templates.events2ics.xsl
-XSL_EVENTS_PAST= ${WEB_PREFIX}/share/sgml/templates.pastevents.xsl
-
-# DEPENDSET: commercial ........................................................
-_DEPENDSET.commercial= ${XML_COMMERCIAL_CONSULT} \
- ${XML_COMMERCIAL_HARDWARE} \
- ${XML_COMMERCIAL_ISP} \
- ${XML_COMMERCIAL_MISC} \
- ${XML_COMMERCIAL_SOFTWARE} \
- ${XSL_ENTRIES} \
- ${XML_INCLUDES}
-_PARAMS.commercial=
-XML_COMMERCIAL_CONSULT= ${WEB_PREFIX}/share/sgml/commercial.consult.xml
-XML_COMMERCIAL_HARDWARE=${WEB_PREFIX}/share/sgml/commercial.hardware.xml
-XML_COMMERCIAL_ISP= ${WEB_PREFIX}/share/sgml/commercial.isp.xml
-XML_COMMERCIAL_MISC= ${WEB_PREFIX}/share/sgml/commercial.misc.xml
-XML_COMMERCIAL_SOFTWARE=${WEB_PREFIX}/share/sgml/commercial.software.xml
-
-XSL_ENTRIES= ${WEB_PREFIX}/share/sgml/templates.entries.xsl
-
-# DEPENDSET: advisories .....................................................
-_DEPENDSET.advisories= ${XML_ADVISORIES} ${XML_INCLUDES}
-_PARAMS.advisories= --param advisories.xml "'${XML_ADVISORIES}'"
-XML_ADVISORIES= ${WEB_PREFIX}/share/sgml/advisories.xml
-
-# DEPENDSET: notices ........................................................
-_DEPENDSET.notices= ${XML_NOTICES} ${XML_INCLUDES}
-_PARAMS.notices= --param notices.xml "'${XML_NOTICES}'"
-XML_NOTICES= ${WEB_PREFIX}/share/sgml/notices.xml
-
-# ---
-# .xml -> .html rendering rule
-#
-# The following variables are available:
-#
-# XMLDOCS: (ex. XMLDOCS= doc1 doc2 doc3)
-# Target document identifier, which is usually the same as the
-# base part of the filenames. {XSLT,XML,TARGET}.<id> described below
-# can be specified in a short form like the following:
-# "docid:stylesheet:xml:target".
-#
-# TARGET.<id>: (ex. TARGET.doc1= doc1.html)
-# The target filename. This is optional and <id>.html is defined
-# by default.
-#
-# XSLT.<id>: (ex. XSLT.doc1= doc1.xsl)
-# Filename of the XSLT stylesheet. This is optional and <id>.xsl is
-# defined by default. The following keywords are interpreted specially:
-#
-# `xsl' - <id>.xsl
-#
-# XSLT.DEFAULT:
-# The default filename or keyword of XSLT stylesheet.
-# When XSLT.<id> and one in the quadruplet are not specified,
-# this value is used.
-#
-# XML.<id>: (ex. XML.doc1= doc1.xml data.xml)
-# Filename of the XML document. This is optional and /dev/null is
-# defined by default. XML.DEFAULT is XML document for all <id>s.
-#
-# SRCS.<id>: (ex. SRCS.doc1= includes.xsl)
-# Dependencies. SRCS.DEFAULT is dependencies for all <id>s.
-#
-# DEPENDSET.<id>: (ex. DEPENDSET.doc1= mirror)
-# Depencencies predefined as keywords listed in ${_DEPENDSET.all}.
-# DEPENDSET.DEFAULT is DEPENDSET for all <id>s.
-#
-# PARAMS.<id>: (ex. PARAMS.doc1= --params "foo" "'textproc/foo'")
-# Parameters passed to xsltproc(1).
-#
-# XSLTPROCOPTS.<id>: (ex. XSLTPROCOPTS.doc1= --nonet)
-# Parameters passed to xsltproc(1).
-#
-# NO_DATA.<id>
-# The ${TARGET.<id>} file will not be listed in $DATA if defined.
-# NO_DATA.DEFAULT is the setting for all <id>s.
-#
-# NO_TIDY.<id>
-# The ${TARGET.<id>} file will not be processed by tidy if defined.
-# NO_TIDY.DEFAULT is the setting for all <id>s.
-#
-XSLTPROC_ENV+= SGML_CATALOG_FILES=
-XSLTPROC_ENV+= XML_CATALOG_FILES="${XML_CATALOG_FILES}"
-
-XSLTPROCOPTS= ${XSLTPROCFLAGS}
-XSLTPROCOPTS+= --xinclude
-XSLTPROCOPTS+= --stringparam LOCALBASE ${LOCALBASE}
-XSLTPROCOPTS+= --stringparam WEB_PREFIX ${WEB_PREFIX}
-.if defined(XML_CATALOG_FILES) && !empty(XML_CATALOG_FILES)
-XSLTPROCOPTS+= --nonet --catalogs
-.endif
-XSLTPROC= env ${XSLTPROC_ENV} ${LOCALBASE}/bin/xsltproc
-
-XMLLINTOPTS= ${XMLLINTFLAGS}
-XMLLINTOPTS+= --xinclude --valid --noout
-.if defined(XML_CATALOG_FILES) && !empty(XML_CATALOG_FILES)
-XMLLINTOPTS+= --nonet --catalogs
-.endif
-XMLLINT= env ${XSLTPROC_ENV} ${PREFIX}/bin/xmllint
-
-.for D in ${XMLDOCS}
-# parse "docid:xslt:xml:target".
-# XXX: ${__ID} is used because ${A}=B does not work except
-# for the iterate variable in the .for statement.
-__ID=${D:C,:.*$,,}
-.for _ID in ${__ID}
-_tmpD= ${D:M*\:*}
-.if !empty(_tmpD)
-XSLT.${_ID}= ${D:C,^[^:]*,,:M*\:*:C,^:,,:C,:.*$,,}
-XML.${_ID}= ${D:C,^[^:]*,,:M*\:*:C,^:,,:C,^[^:]*,,:M*\:*:C,^:,,:C,:.*$,,}
-TARGET.${_ID}= ${D:C,^[^:]*,,:M*\:*:C,^:,,:C,^[^:]*,,:M*\:*:C,^:,,:C,^[^:]*,,:M*\:*:C,^:,,:C,:.*$,,}
-.endif
-
-# Use default value if parameter not specified.
-.if !defined(XSLT.${_ID}) || empty(XSLT.${_ID})
-.if defined(XSLT.DEFAULT)
-XSLT.${_ID}= ${XSLT.DEFAULT}
-.else
-XSLT.${_ID}= ${_ID}.xsl
-.endif
-.endif
-.if !defined(XML.${_ID}) || empty(XML.${_ID})
-.if defined(XML.DEFAULT)
-XML.${_ID}= ${XML.DEFAULT}
-.else
-XML.${_ID}= ${_ID}.xml
-.endif
-.endif
-.if !defined(TARGET.${_ID}) || empty(TARGET.${_ID})
-TARGET.${_ID}= ${_ID}.html
-.endif
-.if !defined(DEPENDSET.${_ID}) || empty(DEPENDSET.${_ID})
-.if defined(DEPENDSET.DEFAULT)
-DEPENDSET.${_ID}= ${DEPENDSET.DEFAULT}
-.else
-DEPENDSET.${_ID}=
-.endif
-.endif
-.if !defined(NO_TIDY.${_ID}) || empty(NO_TIDY.${_ID})
-.if defined(NO_TIDY.DEFAULT)
-NO_TIDY.${_ID}= ${NO_TIDY.DEFAULT}
-.else
-NO_TIDY.${_ID}=
-.endif
-.endif
-.if !defined(NO_DATA.${_ID}) || empty(NO_DATA.${_ID})
-.if defined(NO_DATA.DEFAULT)
-NO_DATA.${_ID}= ${NO_DATA.DEFAULT}
-.else
-NO_DATA.${_ID}=
-.endif
-.endif
-
-XSLTPROCOPTS.${_ID}?= ${XSLTPROCOPTS}
-GENDOCS+= ${TARGET.${_ID}}
-SRCS+= ${TARGET.${_ID}}
-.if !defined(NO_DATA.${_ID}) || empty(NO_DATA.${_ID})
-DATA+= ${TARGET.${_ID}}
-.endif
-CLEANFILES+= ${TARGET.${_ID}}
-
-.if ${XSLT.${_ID}} == xsl
-XSLT.${_ID}= ${_ID}.xsl
-DEPENDS.${_ID}+= ${XSLT.${_ID}}
-.elif ${XSLT.${_ID}:Mhttp\://*} != ""
-DEPENDS.${_ID}+= ${XSLT.${_ID}}
-.else
-DEPENDS.${_ID}+= ${XSLT.${_ID}}
-.endif
-
-.for S in ${_DEPENDSET.all}
-. if ${DEPENDSET.${_ID}:M${S}} != ""
-DEPENDS.${_ID}+=${_DEPENDSET.${S}}
-PARAMS.${_ID}+= ${_PARAMS.${S}}
-. endif
-.endfor
-
-.for S in ${SRCS.DEFAULT} ${SRCS.${_ID}}
-DEPENDS.${_ID}+= ${S}
-.endfor
-${TARGET.${_ID}}: ${XML.${_ID}} ${DEPENDS.${_ID}}
- ${XSLTPROC} ${XSLTPROCOPTS.${_ID}} \
- -o ${.TARGET} ${PARAMS.${_ID}} \
- ${XSLT.${_ID}} ${XML.${_ID}}
-. if !defined(NO_TIDY) || empty(NO_TIDY)
-. if !defined(NO_TIDY.${_ID}) || empty(NO_TIDY.${_ID})
- -${TIDY} ${TIDYOPTS} ${.TARGET}
-. endif
-. endif
-
-VALIDATE_DOCS+= VALIDATE.${_ID}
-VALIDATE.${_ID}:
- @${ECHO} "==>[xmllint] ${XML.${_ID}}"
- -@${XMLLINT} ${XMLLINTOPTS} ${XML.${_ID}} 2>&1 \
- | ${SED} -e 's/^/ | /'
-. endfor
-.endfor
-
-lint: ${VALIDATE_DOCS}
diff --git a/share/htdocs/sgml/catalog b/share/htdocs/sgml/catalog
deleted file mode 100644
index ba24f1f261..0000000000
--- a/share/htdocs/sgml/catalog
+++ /dev/null
@@ -1,30 +0,0 @@
---
- $FreeBSD$
---
-
-PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN"
- "html401-freebsd.dtd"
-
-PUBLIC "-//FreeBSD//ENTITIES ISO 8879:1986 Entity Set//EN"
- "iso8879.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
- "l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES FreeBSD Common Entities//EN"
- "common.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES FreeBSD Release Entities//EN"
- "release.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Header L10N Entities//EN"
- "header.l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Header Entities//EN"
- "header.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Navigation Bar L10N Entities//EN"
- "navibar.l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Navigation Bar Entities//EN"
- "navibar.ent"
diff --git a/share/htdocs/sgml/l10n.ent b/share/htdocs/sgml/l10n.ent
deleted file mode 100644
index 006c978694..0000000000
--- a/share/htdocs/sgml/l10n.ent
+++ /dev/null
@@ -1,6 +0,0 @@
-<!-- $FreeBSD$ -->
-
-<!-- FreeBSD L10N Entities -->
-<!-- PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN" -->
-
-<!-- l10n.ent in language neutral directory must be kept empty -->
diff --git a/share/htdocs/sgml/transtable-common.xsl b/share/htdocs/sgml/transtable-common.xsl
deleted file mode 100644
index 99555e4e4b..0000000000
--- a/share/htdocs/sgml/transtable-common.xsl
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $FreeBSD: www/share/sgml/transtable-common.xsl,v 1.3 2005/09/18 05:40:09 hrs Exp $ -->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-
- <!-- these params should be externally bound. The values
- here are not used actually -->
- <xsl:param name="transtable.xml" select="'./transtable.xml'" />
- <xsl:param name="transtable-sortkey.xml" select="'./transtable-sortkey.xml'" />
-
- <xsl:key name="transtable-lookup-key" match="word" use="orig" />
- <xsl:key name="transtable-lookup-group" match="group/word" use="../@id" />
- <xsl:key name="transtable-sortkey-lookup-key" match="word" use="@orig" />
-
- <xsl:template name="transtable-lookup">
- <xsl:param name="word" select="''"/>
- <xsl:param name="word-group" select="''"/>
-
- <xsl:for-each select="document($transtable.xml)">
- <xsl:choose>
- <!-- $p[count(.|$q) = count($q)] means product set of $p and $q-->
- <xsl:when test="
- key('transtable-lookup-group', string($word-group))
- [count(.|key('transtable-lookup-key', string($word)))
- = count(key('transtable-lookup-key', string($word)))]
- ">
- <xsl:value-of select="
- key('transtable-lookup-group', string($word-group))
- [count(.|key('transtable-lookup-key', string($word)))
- = count(key('transtable-lookup-key', string($word)))]/tran" />
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="$word" />
- </xsl:otherwise>
- </xsl:choose>
- </xsl:for-each>
- </xsl:template>
-
- <xsl:template name="transtable-sortkey-lookup">
- <xsl:param name="word" select="''"/>
-
- <xsl:for-each select="document($transtable-sortkey.xml)/sortkeys">
- <xsl:for-each select="key('transtable-sortkey-lookup-key', string($word))">
- <xsl:attribute name="sortkey">
- <xsl:value-of select="@sortkey" />
- </xsl:attribute>
- </xsl:for-each>
- </xsl:for-each>
- </xsl:template>
-</xsl:stylesheet>
diff --git a/share/mk/doc.common.mk b/share/mk/doc.common.mk
index 9dfa180d41..3404ab36f9 100644
--- a/share/mk/doc.common.mk
+++ b/share/mk/doc.common.mk
@@ -13,14 +13,6 @@ SED?= /usr/bin/sed
# replace them with &#09; before calling tidy
REINPLACE_TABS_CMD?= ${SED} -i "" -e 's/ /\&\#09;/g'
-.if defined(DOC_PREFIX) && !empty(DOC_PREFIX)
-WEB_PREFIX?= ${DOC_PREFIX}/../www
-.elif defined(WEB_PREFIX) && !empty(WEB_PREFIX)
-DOC_PREFIX?= ${WEB_PREFIX}/../doc
-.else
-.error "You must define either WEB_PREFIX or DOC_PREFIX!"
-.endif
-
# ------------------------------------------------------------------------
#
# Work out the language and encoding used for this document.
@@ -32,91 +24,27 @@ DOC_PREFIX?= ${WEB_PREFIX}/../doc
DOC_PREFIX_NAME!= ${REALPATH} ${DOC_PREFIX}
DOC_PREFIX_NAME:= ${DOC_PREFIX_NAME:T}
.else
-DOC_PREFIX_NAME?= doc
-.endif
-
-.if defined(WEB_PREFIX) && !empty(WEB_PREFIX)
-WWW_PREFIX_NAME!= ${REALPATH} ${WEB_PREFIX}
-WWW_PREFIX_NAME:= ${WWW_PREFIX_NAME:T}
-.else
-WWW_PREFIX_NAME?= www
+DOC_PREFIX_NAME?= head
.endif
-.if (!defined(LANGCODE) || empty(LANGCODE)) && (!defined(WWW_LANGCODE) || empty(WWW_LANGCODE))
+.if (!defined(LANGCODE) || empty(LANGCODE))
# Calculate _LANGCODE.
_LANGCODE:= ${.CURDIR}
-.for _ in 1 2 3 4 5 6 7 8 9 10
-.if !(${_LANGCODE:H:T} == ${DOC_PREFIX_NAME}) && !(${_LANGCODE:H:T} == ${WWW_PREFIX_NAME})
+. for _ in 1 2 3 4 5 6 7 8 9 10
+. if !(${_LANGCODE:H:T} == ${DOC_PREFIX_NAME})
_LANGCODE:= ${_LANGCODE:H}
-.endif
-.endfor
-.if (${_LANGCODE:H:T} == ${DOC_PREFIX_NAME})
-# We are in doc/.
+. endif
+. endfor
_LANGCODE:= ${_LANGCODE:T}
-_WWW_LANGCODE:= .
-.else
-# We are in www/.
-_WWW_LANGCODE:= ${_LANGCODE:T}
-_LANGCODE:= .
-.endif
-.else
-# when LANGCODE or WWW_LANGCODE is defined, use the value.
-.if defined(LANGCODE) && !empty(LANGCODE)
+.else # (!defined(LANGCODE) || empty(LANGCODE))
+# when LANGCODE is defined, use the value.
_LANGCODE?= ${LANGCODE}
-.else
-_LANGCODE?= .
-.endif
-.if defined(WWW_LANGCODE) && !empty(WWW_LANGCODE)
-_WWW_LANGCODE?= ${WWW_LANGCODE}
-.else
-_WWW_LANGCODE?= .
-.endif
-.endif
+.endif # (!defined(LANGCODE) || empty(LANGCODE))
-# fixup _LANGCODE
-.if (${_LANGCODE} == .)
-# We have a short name such as `en' in ${_WWW_LANGCODE} now.
-# Guess _LANGCODE using _WWW_LANGCODE.
-_LANGCODE:= ${_WWW_LANGCODE}
-.if (${_LANGCODE} != .)
-_LANGCODE!= ${ECHO} ${DOC_PREFIX}/${_WWW_LANGCODE}*
-.for _ in 1 2 3 4 5 6 7 8 9 10
-.if !(${_LANGCODE:H:T} == ${DOC_PREFIX_NAME})
-_LANGCODE:= ${_LANGCODE:H}
-.endif
-.endfor
-_LANGCODE:= ${_LANGCODE:T}
-.endif
-.endif
LANGCODE?= ${_LANGCODE}
-# fixup _WWW_LANGCODE
-.if (${_WWW_LANGCODE} == .)
-# We have a long name such as `en_US.ISO8859-1' in ${LANGCODE} now.
-# Guess _WWW_LANGCODE using _LANGCODE.
-_WWW_LANGCODE!= ${ECHO} ${WEB_PREFIX}/*
-_WWW2_LANGCODE!= ${ECHO} ${_WWW_LANGCODE:T} |\
- ${SED} -e 's,.*\(${LANGCODE:R:C,(..)_.*,\1,}[^. ]*\).*,\1,'
-.if ${_WWW_LANGCODE:T} == "*"
-_WWW_LANGCODE:= .
-.elif ${_WWW_LANGCODE:T} == ${_WWW2_LANGCODE}
-_WWW_LANGCODE:= .
-.else
-_WWW_LANGCODE:= ${_WWW2_LANGCODE}
-.endif
-.undef _WWW2_LANGCODE
-.endif
-WWW_LANGCODE?= ${_WWW_LANGCODE}
-
-# normalize DOC_PREFIX and WEB_PREFIX
+# normalize DOC_PREFIX
DOC_PREFIX!= ${REALPATH} ${DOC_PREFIX}
-WEB_PREFIX!= ${REALPATH} ${WEB_PREFIX}
-
-.if ${WWW_LANGCODE} == "en"
-WEB_PREFIX_REL= ${.CURDIR:S,^${WEB_PREFIX},,:C,/[^/]+,/..,g:S,^/..,,:S,^/,,:S,^$,.,:S,^/..,,}
-.else
-WEB_PREFIX_REL= ${.CURDIR:S,^${WEB_PREFIX},,:C,/[^/]+,/..,g:S,^/..,,:S,^/,,:S,^$,.,}
-.endif
.if !defined(URL_RELPREFIX)
URLS_ABSOLUTE= YES
diff --git a/share/mk/doc.xml.mk b/share/mk/doc.xml.mk
index 4bd0157a8a..33eba7821e 100644
--- a/share/mk/doc.xml.mk
+++ b/share/mk/doc.xml.mk
@@ -3,17 +3,11 @@
XML_CATALOG_FILES= file://${.OBJDIR}/catalog-cwd.xml \
file://${DOC_PREFIX}/${LANGCODE}/share/sgml/catalog.xml \
- file://${DOC_PREFIX}/${LANGCODE}/share/sgml/catalog.xml \
file://${DOC_PREFIX}/share/sgml/catalog.xml \
file://${DOC_PREFIX}/share/sgml/catalog-common.xml \
- file://${WEB_PREFIX}/${WWW_LANGCODE}/share/sgml/catalog.xml \
- file://${WEB_PREFIX}/share/sgml/catalog.xml \
- file://${WEB_PREFIX}/share/sgml/catalog-common.xml \
file://${LOCALBASE}/share/xml/catalog
-.if exists(${WEB_PREFIX}/share/sgml/catalog-cwd.xml)
-XML_CATALOG_CWD= ${WEB_PREFIX}/share/sgml/catalog-cwd.xml
-.elif exists(${DOC_PREFIX}/share/sgml/catalog-cwd.xml)
+.if exists(${DOC_PREFIX}/share/sgml/catalog-cwd.xml)
XML_CATALOG_CWD= ${DOC_PREFIX}/share/sgml/catalog-cwd.xml
.endif
@@ -35,10 +29,10 @@ _XML_INCLIST= libcommon.l10n.xsl \
l10n.ent \
release.ent
.for F in ${_INCLIST}
-.if exists(${WEB_PREFIX}/${WWW_LANGCODE}/share/sgml/${F})
+.if exists(${DOC_PREFIX}/${LANGCODE}/share/sgml/${F})
XML_INCLUDES+= ${F}
.endif
-.if exists(${WEB_PREFIX}/share/sgml/${F})
+.if exists(${DOC_PREFIX}/share/sgml/${F})
XML_INCLUDES+= ${F}
.endif
.endfor
@@ -53,7 +47,7 @@ ${.OBJDIR}/catalog-cwd.xml: ${XML_CATALOG_CWD}
XML_INCLUDES+= ${.OBJDIR}/autogen.ent
CLEANFILES+= ${.OBJDIR}/autogen.ent
${.OBJDIR}/autogen.ent:
- ${ECHO_CMD} '<!ENTITY base "${WEB_PREFIX_REL}">' > ${.TARGET}
+ ${ECHO_CMD} '<!ENTITY base "${DOC_PREFIX_REL}">' > ${.TARGET}
DEPENDSET.DEFAULT+= wwwstd
@@ -123,17 +117,17 @@ _DEPENDSET.usergroups= ${XML_USERGROUPS} ${XML_USERGROUPS_LOCAL} \
${XML_INCLUDES}
_PARAMS.usergroups= --param usergroups.xml "'${XML_USERGROUPS}'" \
--param usergroups-local.xml "'${XML_USERGROUPS_LOCAL}'"
-XML_USERGROUPS= ${WEB_PREFIX}/share/sgml/usergroups.xml
-.if exists(${WEB_PREFIX}/${WWW_LANGCODE}/share/sgml/usergroups.xml)
-XML_USERGROUPS_LOCAL= ${WEB_PREFIX}/${WWW_LANGCODE}/share/sgml/usergroups.xml
+XML_USERGROUPS= ${DOC_PREFIX}/share/sgml/usergroups.xml
+.if exists(${DOC_PREFIX}/${LANGCODE}/share/sgml/usergroups.xml)
+XML_USERGROUPS_LOCAL= ${DOC_PREFIX}/${LANGCODE}/share/sgml/usergroups.xml
.else
-XML_USERGROUPS_LOCAL= ${WEB_PREFIX}/share/sgml/usergroups.xml
+XML_USERGROUPS_LOCAL= ${DOC_PREFIX}/share/sgml/usergroups.xml
.endif
-XSL_USERGROUPS_MASTER= ${WEB_PREFIX}/share/sgml/templates.usergroups.xsl
-.if exists(${WEB_PREFIX}/${WWW_LANGCODE}/share/sgml/templates.usergroups.xsl)
-XSL_USERGROUPS= ${WEB_PREFIX}/${WWW_LANGCODE}/share/sgml/templates.usergroups.xsl
+XSL_USERGROUPS_MASTER= ${DOC_PREFIX}/share/sgml/templates.usergroups.xsl
+.if exists(${DOC_PREFIX}/${LANGCODE}/share/sgml/templates.usergroups.xsl)
+XSL_USERGROUPS= ${DOC_PREFIX}/${LANGCODE}/share/sgml/templates.usergroups.xsl
.else
-XSL_USERGROUPS= ${WEB_PREFIX}/share/sgml/templates.usergroups.xsl
+XSL_USERGROUPS= ${DOC_PREFIX}/share/sgml/templates.usergroups.xsl
.endif
# DEPENDSET: news ............................................................
@@ -144,17 +138,17 @@ _DEPENDSET.news= ${XML_NEWS_NEWS_MASTER} ${XML_NEWS_NEWS} \
${XML_INCLUDES}
_PARAMS.news= --param news.project.xml-master "'${XML_NEWS_NEWS_MASTER}'" \
--param news.project.xml "'${XML_NEWS_NEWS}'"
-XML_NEWS_NEWS_MASTER= ${WEB_PREFIX}/share/sgml/news.xml
-.if exists(${WEB_PREFIX}/${WWW_LANGCODE}/share/sgml/news.xml)
-XML_NEWS_NEWS= ${WEB_PREFIX}/${WWW_LANGCODE}/share/sgml/news.xml
+XML_NEWS_NEWS_MASTER= ${DOC_PREFIX}/share/sgml/news.xml
+.if exists(${DOC_PREFIX}/${LANGCODE}/share/sgml/news.xml)
+XML_NEWS_NEWS= ${DOC_PREFIX}/${WWW_LANGCODE}/share/sgml/news.xml
.else
-XML_NEWS_NEWS= ${WEB_PREFIX}/share/sgml/news.xml
+XML_NEWS_NEWS= ${DOC_PREFIX}/share/sgml/news.xml
.endif
-XSL_NEWS_NEWSFLASH= ${WEB_PREFIX}/share/sgml/templates.newsflash.xsl
-XSL_NEWS_NEWSFLASH_OLD= ${WEB_PREFIX}/share/sgml/templates.oldnewsflash.xsl
-XSL_NEWS_NEWS_RDF= ${WEB_PREFIX}/share/sgml/templates.news-rdf.xsl
-XSL_NEWS_NEWS_RSS= ${WEB_PREFIX}/share/sgml/templates.news-rss.xsl
+XSL_NEWS_NEWSFLASH= ${DOC_PREFIX}/share/sgml/templates.newsflash.xsl
+XSL_NEWS_NEWSFLASH_OLD= ${DOC_PREFIX}/share/sgml/templates.oldnewsflash.xsl
+XSL_NEWS_NEWS_RDF= ${DOC_PREFIX}/share/sgml/templates.news-rdf.xsl
+XSL_NEWS_NEWS_RSS= ${DOC_PREFIX}/share/sgml/templates.news-rss.xsl
# DEPENDSET: press ..........................................................
_DEPENDSET.press= ${XML_NEWS_PRESS_MASTER} ${XML_NEWS_PRESS} \
@@ -162,15 +156,15 @@ _DEPENDSET.press= ${XML_NEWS_PRESS_MASTER} ${XML_NEWS_PRESS} \
${XML_INCLUDES}
_PARAMS.press= --param news.press.xml-master "'${XML_NEWS_PRESS_MASTER}'" \
--param news.press.xml "'${XML_NEWS_PRESS}'"
-XML_NEWS_PRESS_MASTER= ${WEB_PREFIX}/share/sgml/press.xml
-.if exists(${WEB_PREFIX}/${WWW_LANGCODE}/share/sgml/press.xml)
-XML_NEWS_PRESS= ${WEB_PREFIX}/${WWW_LANGCODE}/share/sgml/press.xml
+XML_NEWS_PRESS_MASTER= ${DOC_PREFIX}/share/sgml/press.xml
+.if exists(${DOC_PREFIX}/${LANGCODE}/share/sgml/press.xml)
+XML_NEWS_PRESS= ${DOC_PREFIX}/${LANGCODE}/share/sgml/press.xml
.else
-XML_NEWS_PRESS= ${WEB_PREFIX}/share/sgml/press.xml
+XML_NEWS_PRESS= ${DOC_PREFIX}/share/sgml/press.xml
.endif
-XSL_NEWS_PRESS= ${WEB_PREFIX}/share/sgml/templates.press.xsl
-XSL_NEWS_PRESS_RSS= ${WEB_PREFIX}/share/sgml/templates.press-rss.xsl
-XSL_NEWS_PRESS_OLD= ${WEB_PREFIX}/share/sgml/templates.oldpress.xsl
+XSL_NEWS_PRESS= ${DOC_PREFIX}/share/sgml/templates.press.xsl
+XSL_NEWS_PRESS_RSS= ${DOC_PREFIX}/share/sgml/templates.press-rss.xsl
+XSL_NEWS_PRESS_OLD= ${DOC_PREFIX}/share/sgml/templates.oldpress.xsl
# DEPENDSET: events ..........................................................
_DEPENDSET.events= ${XML_EVENTS_EVENTS_MASTER} ${XML_EVENTS_EVENTS} \
@@ -181,25 +175,25 @@ _DEPENDSET.events= ${XML_EVENTS_EVENTS_MASTER} ${XML_EVENTS_EVENTS} \
${XML_INCLUDES}
_PARAMS.events= --param events.xml-master "'${XML_EVENTS_EVENTS_MASTER}'" \
--param events.xml "'${XML_EVENTS_EVENTS}'"
-XML_EVENTS_EVENTS_MASTER=${WEB_PREFIX}/share/sgml/events.xml
+XML_EVENTS_EVENTS_MASTER=${DOC_PREFIX}/share/sgml/events.xml
XML_EVENTS_EVENTS_MASTER_SUBFILES=
.for Y in 2003 2004 2005 2006 2007 2008 2009 2010 2011 2012 2013
-XML_EVENTS_EVENTS_MASTER_SUBFILES+= ${WEB_PREFIX}/share/sgml/events${Y}.xml
+XML_EVENTS_EVENTS_MASTER_SUBFILES+= ${DOC_PREFIX}/share/sgml/events${Y}.xml
.endfor
-.if exists(${WEB_PREFIX}/${WWW_LANGCODE}/share/sgml/events.xml)
-XML_EVENTS_EVENTS= ${WEB_PREFIX}/${WWW_LANGCODE}/share/sgml/events.xml
+.if exists(${DOC_PREFIX}/${LANGCODE}/share/sgml/events.xml)
+XML_EVENTS_EVENTS= ${DOC_PREFIX}/${LANGCODE}/share/sgml/events.xml
.else
XML_EVENTS_EVENTS= ${XML_EVENTS_EVENTS_MASTER}
.endif
XML_EVENTS_EVENTS_SUBFILES=
.for Y in 2003 2004 2005 2006 2007 2008 2009 2010 2011 2012 2013
-.if exists(${WEB_PREFIX}/${WWW_LANGCODE}/share/sgml/events${Y}.xml)
-XML_EVENTS_EVENTS_SUBFILES+= ${WEB_PREFIX}/${WWW_LANGCODE}/share/sgml/events${Y}.xml
+.if exists(${DOC_PREFIX}/${LANGCODE}/share/sgml/events${Y}.xml)
+XML_EVENTS_EVENTS_SUBFILES+= ${DOC_PREFIX}/${LANGCODE}/share/sgml/events${Y}.xml
.endif
.endfor
-XSL_EVENTS= ${WEB_PREFIX}/share/sgml/templates.events.xsl
-XSL_EVENTS_ICS= ${WEB_PREFIX}/share/sgml/templates.events2ics.xsl
-XSL_EVENTS_PAST= ${WEB_PREFIX}/share/sgml/templates.pastevents.xsl
+XSL_EVENTS= ${DOC_PREFIX}/share/sgml/templates.events.xsl
+XSL_EVENTS_ICS= ${DOC_PREFIX}/share/sgml/templates.events2ics.xsl
+XSL_EVENTS_PAST= ${DOC_PREFIX}/share/sgml/templates.pastevents.xsl
# DEPENDSET: commercial ........................................................
_DEPENDSET.commercial= ${XML_COMMERCIAL_CONSULT} \
@@ -210,23 +204,23 @@ _DEPENDSET.commercial= ${XML_COMMERCIAL_CONSULT} \
${XSL_ENTRIES} \
${XML_INCLUDES}
_PARAMS.commercial=
-XML_COMMERCIAL_CONSULT= ${WEB_PREFIX}/share/sgml/commercial.consult.xml
-XML_COMMERCIAL_HARDWARE=${WEB_PREFIX}/share/sgml/commercial.hardware.xml
-XML_COMMERCIAL_ISP= ${WEB_PREFIX}/share/sgml/commercial.isp.xml
-XML_COMMERCIAL_MISC= ${WEB_PREFIX}/share/sgml/commercial.misc.xml
-XML_COMMERCIAL_SOFTWARE=${WEB_PREFIX}/share/sgml/commercial.software.xml
+XML_COMMERCIAL_CONSULT= ${DOC_PREFIX}/share/sgml/commercial.consult.xml
+XML_COMMERCIAL_HARDWARE=${DOC_PREFIX}/share/sgml/commercial.hardware.xml
+XML_COMMERCIAL_ISP= ${DOC_PREFIX}/share/sgml/commercial.isp.xml
+XML_COMMERCIAL_MISC= ${DOC_PREFIX}/share/sgml/commercial.misc.xml
+XML_COMMERCIAL_SOFTWARE=${DOC_PREFIX}/share/sgml/commercial.software.xml
-XSL_ENTRIES= ${WEB_PREFIX}/share/sgml/templates.entries.xsl
+XSL_ENTRIES= ${DOC_PREFIX}/share/sgml/templates.entries.xsl
# DEPENDSET: advisories .....................................................
_DEPENDSET.advisories= ${XML_ADVISORIES} ${XML_INCLUDES}
_PARAMS.advisories= --param advisories.xml "'${XML_ADVISORIES}'"
-XML_ADVISORIES= ${WEB_PREFIX}/share/sgml/advisories.xml
+XML_ADVISORIES= ${DOC_PREFIX}/share/sgml/advisories.xml
# DEPENDSET: notices ........................................................
_DEPENDSET.notices= ${XML_NOTICES} ${XML_INCLUDES}
_PARAMS.notices= --param notices.xml "'${XML_NOTICES}'"
-XML_NOTICES= ${WEB_PREFIX}/share/sgml/notices.xml
+XML_NOTICES= ${DOC_PREFIX}/share/sgml/notices.xml
# ---
# .xml -> .html rendering rule
@@ -285,7 +279,7 @@ XSLTPROC_ENV+= XML_CATALOG_FILES="${XML_CATALOG_FILES}"
XSLTPROCOPTS= ${XSLTPROCFLAGS}
XSLTPROCOPTS+= --xinclude
XSLTPROCOPTS+= --stringparam LOCALBASE ${LOCALBASE}
-XSLTPROCOPTS+= --stringparam WEB_PREFIX ${WEB_PREFIX}
+XSLTPROCOPTS+= --stringparam DOC_PREFIX ${DOC_PREFIX}
.if defined(XML_CATALOG_FILES) && !empty(XML_CATALOG_FILES)
XSLTPROCOPTS+= --nonet --catalogs
.endif
diff --git a/share/htdocs/mk/web.site.mk b/share/mk/web.site.mk
index 4182b4af37..afbc870f17 100644
--- a/share/htdocs/mk/web.site.mk
+++ b/share/mk/web.site.mk
@@ -129,30 +129,8 @@ NO_SUBDIR= YES
#
# for dependency
#
-.if !defined(WITHOUT_DOC)
-#
-# When WITHOUT_DOC is not defined, we use doc.common.mk.
-#
-DOC_PREFIX?= ${WEB_PREFIX}/../doc
-.if exists(${DOC_PREFIX}/share/mk/doc.common.mk)
.include "${DOC_PREFIX}/share/mk/doc.common.mk"
.include "${DOC_PREFIX}/share/mk/doc.xml.mk"
-.else
-.error ${DOC_PREFIX}/share/mk/doc.common.mk not found.\
- Define $$WITHOUT_DOC and $$WEB_ONLY for performing a partial\
- build without the doc/ module.
-.endif
-.else # !defined(WITHOUT_DOC)
-#
-# When WITHOUT_DOC is defined, we should not use files in doc/ module at all.
-#
-.if !defined(WWW_LANGCODE) || empty(WWW_LANGCODE)
-_WEB_PREFIX!= realpath ${WEB_PREFIX}
-WWW_LANGCODE:= ${.CURDIR:S,^${_WEB_PREFIX}/,,:C,^([^/]+)/.*,\1,}
-.undef _WEB_PREFIX
-.include "${WEB_PREFIX}/share/mk/doc.xml.mk"
-.endif
-.endif # !defined(WITHOUT_DOC)
_INCLIST= navibar.ent \
navibar.l10n.ent \
@@ -165,20 +143,20 @@ _INCLIST= navibar.ent \
_SGML_INCLUDES= ${SGML_INCLUDES}
.for F in ${_INCLIST}
-.if exists(${WEB_PREFIX}/${WWW_LANGCODE}/share/sgml/${F})
-_SGML_INCLUDES+=${WEB_PREFIX}/${WWW_LANGCODE}/share/sgml/${F}
+.if exists(${DOC_PREFIX}/${LANGCODE}/share/sgml/${F})
+_SGML_INCLUDES+=${DOC_PREFIX}/${LANGCODE}/share/sgml/${F}
.endif
-.if exists(${WEB_PREFIX}/share/sgml/${F})
-_SGML_INCLUDES+=${WEB_PREFIX}/share/sgml/${F}
+.if exists(${DOC_PREFIX}/share/sgml/${F})
+_SGML_INCLUDES+=${DOC_PREFIX}/share/sgml/${F}
.endif
.endfor
CATALOG?= ${PREFIX}/share/sgml/html/catalog \
${PREFIX}/share/sgml/catalog
-.if exists(${WEB_PREFIX}/${WWW_LANGCODE}/share/sgml/catalog)
-CATALOG+= ${WEB_PREFIX}/${WWW_LANGCODE}/share/sgml/catalog
+.if exists(${DOC_PREFIX}/${LANGCODE}/share/sgml/catalog)
+CATALOG+= ${DOC_PREFIX}/${LANGCODE}/share/sgml/catalog
.endif
-CATALOG+= ${WEB_PREFIX}/share/sgml/catalog
+CATALOG+= ${DOC_PREFIX}/share/sgml/catalog
##################################################################
# Transformation rules
@@ -192,8 +170,8 @@ CATALOG+= ${WEB_PREFIX}/share/sgml/catalog
.SUFFIXES: .sgml .html
.if defined(REVCHECK)
-PREHTML?= ${WEB_PREFIX}/ja/prehtml
-CANONPREFIX0!= cd ${WEB_PREFIX}; ${ECHO_CMD} $${PWD};
+PREHTML?= ${DOC_PREFIX}/ja_JP.eucJP/htdocs/prehtml
+CANONPREFIX0!= cd ${DOC_PREFIX}; ${ECHO_CMD} $${PWD};
CANONPREFIX= ${PWD:S/^${CANONPREFIX0}//:S/^\///}
LOCALTOP!= ${ECHO_CMD} ${CANONPREFIX} | \
${PERL} -pe 's@[^/]+@..@g; $$_.="/." if($$_ eq".."); s@^\.\./@@;'
@@ -261,7 +239,7 @@ ECHODIR= ${TRUE}
# detect relative ${.CURDIR}
_CURDIR!= realpath ${.CURDIR}
-_PFXDIR!= realpath ${WEB_PREFIX}
+_PFXDIR!= realpath ${DOC_PREFIX}
CDIR= ${_CURDIR:S/${_PFXDIR}\///}
# populate missing directories list based on $SUBDIR
diff --git a/share/htdocs/sgml/advisories.xml b/share/sgml/advisories.xml
index b248a58bc1..b248a58bc1 100644
--- a/share/htdocs/sgml/advisories.xml
+++ b/share/sgml/advisories.xml
diff --git a/share/sgml/catalog b/share/sgml/catalog
index 313eea9b84..c9ac1d0750 100644
--- a/share/sgml/catalog
+++ b/share/sgml/catalog
@@ -64,6 +64,40 @@ PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN"
PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN"
"urls.ent"
+
+ -- ...................................................................... --
+ -- HTML docs ............................................................ --
+
+PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN"
+ "html401-freebsd.dtd"
+
+PUBLIC "-//FreeBSD//ENTITIES ISO 8879:1986 Entity Set//EN"
+ "iso8879.ent"
+
+PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
+ "l10n.ent"
+
+PUBLIC "-//FreeBSD//ENTITIES FreeBSD Common Entities//EN"
+ "common.ent"
+
+PUBLIC "-//FreeBSD//ENTITIES FreeBSD Developers Entities//EN"
+ "developers.ent"
+
+PUBLIC "-//FreeBSD//ENTITIES FreeBSD Release Entities//EN"
+ "release.ent"
+
+PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Header L10N Entities//EN"
+ "header.l10n.ent"
+
+PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Header Entities//EN"
+ "header.ent"
+
+PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Navigation Bar L10N Entities//EN"
+ "navibar.l10n.ent"
+
+PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Navigation Bar Entities//EN"
+ "navibar.ent"
+
-- ...................................................................... --
-- English specific ..................................................... --
diff --git a/share/htdocs/sgml/catalog-cwd.xml b/share/sgml/catalog-cwd.xml
index a69b310a55..a69b310a55 100644
--- a/share/htdocs/sgml/catalog-cwd.xml
+++ b/share/sgml/catalog-cwd.xml
diff --git a/share/htdocs/sgml/catalog.xml b/share/sgml/catalog.xml
index c8c64936a1..c8c64936a1 100644
--- a/share/htdocs/sgml/catalog.xml
+++ b/share/sgml/catalog.xml
diff --git a/share/htdocs/sgml/commercial.consult.xml b/share/sgml/commercial.consult.xml
index 32e63707fd..32e63707fd 100644
--- a/share/htdocs/sgml/commercial.consult.xml
+++ b/share/sgml/commercial.consult.xml
diff --git a/share/htdocs/sgml/commercial.hardware.xml b/share/sgml/commercial.hardware.xml
index 151082e1b6..151082e1b6 100644
--- a/share/htdocs/sgml/commercial.hardware.xml
+++ b/share/sgml/commercial.hardware.xml
diff --git a/share/htdocs/sgml/commercial.isp.xml b/share/sgml/commercial.isp.xml
index 39569cd626..39569cd626 100644
--- a/share/htdocs/sgml/commercial.isp.xml
+++ b/share/sgml/commercial.isp.xml
diff --git a/share/htdocs/sgml/commercial.misc.xml b/share/sgml/commercial.misc.xml
index 206d28e68d..206d28e68d 100644
--- a/share/htdocs/sgml/commercial.misc.xml
+++ b/share/sgml/commercial.misc.xml
diff --git a/share/htdocs/sgml/commercial.software.xml b/share/sgml/commercial.software.xml
index 07781dc550..07781dc550 100644
--- a/share/htdocs/sgml/commercial.software.xml
+++ b/share/sgml/commercial.software.xml
diff --git a/share/htdocs/sgml/common.ent b/share/sgml/common.ent
index 7d89332373..7d89332373 100644
--- a/share/htdocs/sgml/common.ent
+++ b/share/sgml/common.ent
diff --git a/share/sgml/developers.ent b/share/sgml/developers.ent
new file mode 100644
index 0000000000..50419730b3
--- /dev/null
+++ b/share/sgml/developers.ent
@@ -0,0 +1,710 @@
+<!--
+
+This document provides entities for developers listed by name on the
+FreeBSD web site. Keeping this information in a central location
+allows multiple documents to use the abbreviated entities, and allows
+us to update author names, or the representation of those names (such
+as adding email addresses), by just editing a single file.
+
+$FreeBSD: www/en/developers.sgml,v 1.319 2012/04/22 17:02:15 jlh Exp $
+
+-->
+
+<!-- FreeBSD Committers -->
+<!ENTITY a.aaron "Aaron Dalton">
+<!ENTITY a.abial "Andrzej Bialecki">
+<!ENTITY a.ache "Andrey A. Chernov">
+<!ENTITY a.acm "Jos&eacute; Alonso C&aacute;rdenas M&aacute;rquez">
+<!ENTITY a.adam "Adam David">
+<!ENTITY a.adamw "Adam Weinberger">
+<!ENTITY a.ade "Ade Lovett">
+<!ENTITY a.adrian "Adrian Chadd">
+<!ENTITY a.ae "Andrey V. Elsukov">
+<!ENTITY a.ahze "Michael Johnson">
+<!ENTITY a.ak "Alex Kozlov">
+<!ENTITY a.akiyama "Shunsuke Akiyama">
+<!ENTITY a.alane "Alan Eldridge">
+<!ENTITY a.alc "Alan L. Cox">
+<!ENTITY a.ale "Alex Dupre">
+<!ENTITY a.alepulver "Alejandro Pulver">
+<!ENTITY a.alex "Alexander Langer">
+<!ENTITY a.alexbl "Alexander Botero-Lowry">
+<!ENTITY a.alfred "Alfred Perlstein">
+<!ENTITY a.ambrisko "Doug Ambrisko">
+<!ENTITY a.amdmi3 "Dmitry Marakasov">
+<!ENTITY a.amorita "Akio Morita">
+<!ENTITY a.amurai "Atsushi Murai">
+<!ENTITY a.anchie "Ana Kukec">
+<!ENTITY a.anders "Anders Nordby">
+<!ENTITY a.andre "Andre Oppermann">
+<!ENTITY a.andreas "Andreas Klemm">
+<!ENTITY a.andreast "Andreas Tobler">
+<!ENTITY a.andrew "Andrew Turner">
+<!ENTITY a.andy "Andrey Zakhvatov">
+<!ENTITY a.anholt "Eric Anholt">
+<!ENTITY a.anray "Andrey Slusar">
+<!ENTITY a.antoine "Antoine Brodin">
+<!ENTITY a.araujo "Marcelo Araujo">
+<!ENTITY a.archie "Archie Cobbs">
+<!ENTITY a.ariff "Ariff Abdullah">
+<!ENTITY a.arr "Andrew R. Reiter">
+<!ENTITY a.art "Artem Belevich">
+<!ENTITY a.arun "Arun Sharma">
+<!ENTITY a.arved "Tilman Linneweh">
+<!ENTITY a.asami "Satoshi Asami">
+<!ENTITY a.ashish "Ashish SHUKLA">
+<!ENTITY a.asmodai "Jeroen Ruigrok/Asmodai">
+<!ENTITY a.assar "Assar Westerlund">
+<!ENTITY a.attilio "Attilio Rao">
+<!ENTITY a.avatar "Tai-hwa Liang">
+<!ENTITY a.avg "Andriy Gapon">
+<!ENTITY a.avilla "Alberto Villa">
+<!ENTITY a.avl "Alexander Logvinov">
+<!ENTITY a.awebster "Andrew Webster">
+<!ENTITY a.az "Andrej Zverev">
+<!ENTITY a.babkin "Sergey Babkin">
+<!ENTITY a.bakul "Bakul Shah">
+<!ENTITY a.bapt "Baptiste Daroussin">
+<!ENTITY a.barner "Simon Barner">
+<!ENTITY a.bbraun "Rob Braun">
+<!ENTITY a.bcr "Benedict Reuschling">
+<!ENTITY a.bde "Bruce Evans">
+<!ENTITY a.bean "Rebecca Visger">
+<!ENTITY a.beat "Beat G&auml;tzi">
+<!ENTITY a.ben "Ben Smithurst">
+<!ENTITY a.benjsc "Benjamin Close">
+<!ENTITY a.benl "Ben Laurie">
+<!ENTITY a.benno "Benno Rice">
+<!ENTITY a.bf "Brendan Fabeny">
+<!ENTITY a.bgray "Ben Gray">
+<!ENTITY a.billf "Bill Fumerola">
+<!ENTITY a.blackend "Marc Fonvieille">
+<!ENTITY a.bland "Alexander Nedotsukov">
+<!ENTITY a.bmah "Bruce A. Mah">
+<!ENTITY a.bmilekic "Bosko Milekic">
+<!ENTITY a.bms "Bruce M. Simpson">
+<!ENTITY a.bp "Boris Popov">
+<!ENTITY a.brd "Brad Davis">
+<!ENTITY a.brandon "Brandon Gillespie">
+<!ENTITY a.brian "Brian Somers">
+<!ENTITY a.brix "Henrik Brix Andersen">
+<!ENTITY a.brooks "Brooks Davis">
+<!ENTITY a.brucec "Bruce Cran">
+<!ENTITY a.brueffer "Christian Br&uuml;ffer">
+<!ENTITY a.bruno "Bruno Ducrot">
+<!ENTITY a.bsam "Boris Samorodov">
+<!ENTITY a.bschmidt "Bernhard Schmidt">
+<!ENTITY a.bsd "Brian S. Dean">
+<!ENTITY a.bushman "Michael Bushkov">
+<!ENTITY a.bvs "Vitaly Bogdanov">
+<!ENTITY a.bz "Bjoern A. Zeeb">
+<!ENTITY a.cawimm "Charles A. Wimmer">
+<!ENTITY a.carvay "J. Vicente Carrasco Vay&aacute;">
+<!ENTITY a.cel "Chuck Lever">
+<!ENTITY a.ceri "Ceri Davies">
+<!ENTITY a.cg "Cameron Grant">
+<!ENTITY a.charnier "Philippe Charnier">
+<!ENTITY a.chern "Chern Lee">
+<!ENTITY a.cherry "Cherry G. Mathew">
+<!ENTITY a.chinsan "Chin-San Huang">
+<!ENTITY a.chm "Christoph Herrmann">
+<!ENTITY a.chris "Chris Costello">
+<!ENTITY a.chuckr "Chuck Robey">
+<!ENTITY a.cjc "Crist J. Clark">
+<!ENTITY a.cjh "Junho CHOI">
+<!ENTITY a.clement "Clement Laforet">
+<!ENTITY a.clive "Clive Lin">
+<!ENTITY a.clsung "Cheng-Lung Sung">
+<!ENTITY a.cognet "Olivier Houchard">
+<!ENTITY a.cokane "Coleman Kane">
+<!ENTITY a.cp "Chuck Paterson">
+<!ENTITY a.cperciva "Colin Percival">
+<!ENTITY a.cpiazza "Chris Piazza">
+<!ENTITY a.cracauer "Martin Cracauer">
+<!ENTITY a.crees "Chris Rees">
+<!ENTITY a.cs "Carlo Strub">
+<!ENTITY a.csgr "Geoff Rehmet">
+<!ENTITY a.cshumway "Christopher Shumway">
+<!ENTITY a.csjp "Christian S.J. Peron">
+<!ENTITY a.culot "Frederic Culot">
+<!ENTITY a.cwt "Chris Timmons">
+<!ENTITY a.cy "Cy Schubert">
+<!ENTITY a.daichi "Daichi GOTO">
+<!ENTITY a.damien "Damien Bergamini">
+<!ENTITY a.dan "Dan Moschuk">
+<!ENTITY a.danfe "Alexey Dokuchaev">
+<!ENTITY a.danger "Daniel Ger&#382;o">
+<!ENTITY a.danny "Daniel O'Callaghan">
+<!ENTITY a.dannyboy "Daniel Harris">
+<!ENTITY a.darrenr "Darren Reed">
+<!ENTITY a.das "David Schultz">
+<!ENTITY a.davidc "Chad David">
+<!ENTITY a.davidn "David Nugent">
+<!ENTITY a.davide "Davide Italiano">
+<!ENTITY a.davidxu "David Xu">
+<!ENTITY a.db "Diane Bruce">
+<!ENTITY a.dbaker "Daniel Baker">
+<!ENTITY a.dburr "Donald Burr">
+<!ENTITY a.dchagin "Dmitry Chagin">
+<!ENTITY a.dcs "Daniel C. Sobral">
+<!ENTITY a.dd "Dima Dorfman">
+<!ENTITY a.dds "Diomidis D. Spinellis">
+<!ENTITY a.dec "David E. Cross">
+<!ENTITY a.decke "Bernhard Fr&ouml;hlich">
+<!ENTITY a.deischen "Daniel Eischen">
+<!ENTITY a.delphij "Xin Li">
+<!ENTITY a.demon "Dmitry Sivachenko">
+<!ENTITY a.den "Denis Peplin">
+<!ENTITY a.des "Dag-Erling C. Sm&oslash;rgrav">
+<!ENTITY a.dfr "Doug Rabson">
+<!ENTITY a.dg "David Greenman">
+<!ENTITY a.dhartmei "Daniel Hartmeier">
+<!ENTITY a.dhn "Dennis Herrmann">
+<!ENTITY a.dhw "David Wolfskill">
+<!ENTITY a.dick "Richard Seaman Jr.">
+<!ENTITY a.dillon "Matthew Dillon">
+<!ENTITY a.dim "Dimitry Andric">
+<!ENTITY a.dima "Dima Ruban">
+<!ENTITY a.dinoex "Dirk Meyer">
+<!ENTITY a.dirk "Dirk Fr&ouml;mberg">
+<!ENTITY a.dmarion "Damjan Marion">
+<!ENTITY a.dmlb "Duncan Barclay">
+<!ENTITY a.dougb "Doug Barton">
+<!ENTITY a.dryice "Dryice Liu">
+<!ENTITY a.dt "Dmitrij Tejblum">
+<!ENTITY a.dteske "Devin Teske">
+<!ENTITY a.dufault "Peter Dufault">
+<!ENTITY a.dumbbell "Jean-S&eacute;bastien P&eacute;dron">
+<!ENTITY a.dwcjr "David W. Chapman Jr.">
+<!ENTITY a.dwhite "Doug White">
+<!ENTITY a.dwmalone "David Malone">
+<!ENTITY a.eadler "Eitan Adler">
+<!ENTITY a.ed "Ed Schouten">
+<!ENTITY a.edwin "Edwin Groothuis">
+<!ENTITY a.ehaupt "Emanuel Haupt">
+<!ENTITY a.eik "Oliver Eikemeier">
+<!ENTITY a.eivind "Eivind Eklund">
+<!ENTITY a.ejc "Eric J. Chet">
+<!ENTITY a.emaste "Ed Maste">
+<!ENTITY a.emax "Maksim Yevmenkin">
+<!ENTITY a.emoore "Eric Moore">
+<!ENTITY a.eric "Eric Melville">
+<!ENTITY a.erich "Eric L. Hernes">
+<!ENTITY a.erik "Erik Cederstrand">
+<!ENTITY a.erwin "Erwin Lansing">
+<!ENTITY a.fabient "Fabien Thomas">
+<!ENTITY a.fanf "Tony Finch">
+<!ENTITY a.farrokhi "Babak Farrokhi">
+<!ENTITY a.fenner "Bill Fenner">
+<!ENTITY a.fjoe "Max Khon">
+<!ENTITY a.flathill "Seiichirou Hiraoka">
+<!ENTITY a.flo "Florian Smeets">
+<!ENTITY a.flz "Florent Thoumie">
+<!ENTITY a.foxfair "Howard F. Hu">
+<!ENTITY a.fsmp "Steve Passe">
+<!ENTITY a.furuta "Atsushi Furuta">
+<!ENTITY a.gabor "G&aacute;bor K&ouml;vesd&aacute;n">
+<!ENTITY a.gad "Garance A Drosehn">
+<!ENTITY a.gahr "Pietro Cerutti">
+<!ENTITY a.gallatin "Andrew Gallatin">
+<!ENTITY a.ganbold "Ganbold Tsagaankhuu">
+<!ENTITY a.garga "Renato Botelho">
+<!ENTITY a.garys "Gary W. Swearingen">
+<!ENTITY a.gavin "Gavin Atkinson">
+<!ENTITY a.gber "Grzegorz Bernacki">
+<!ENTITY a.gerald "Gerald Pfeifer">
+<!ENTITY a.ghelmer "Guy Helmer">
+<!ENTITY a.gibbs "Justin T. Gibbs">
+<!ENTITY a.gioria "Sebastien Gioria">
+<!ENTITY a.girgen "Palle Girgensohn">
+<!ENTITY a.gj "Gary Jennejohn">
+<!ENTITY a.gjb "Glen Barber">
+<!ENTITY a.glarkin "Greg Larkin">
+<!ENTITY a.gleb "Gleb Kurtsou">
+<!ENTITY a.glebius "Gleb Smirnoff">
+<!ENTITY a.glewis "Greg Lewis">
+<!ENTITY a.gnn "George V. Neville-Neil">
+<!ENTITY a.gonzo "Oleksandr Tymoshenko">
+<!ENTITY a.gordon "Gordon Tetlow">
+<!ENTITY a.gpalmer "Gary Palmer">
+<!ENTITY a.graichen "Thomas Graichen">
+<!ENTITY a.green "Brian F. Feldman">
+<!ENTITY a.grehan "Peter Grehan">
+<!ENTITY a.greid "George C. A. Reid">
+<!ENTITY a.grog "Greg Lehey">
+<!ENTITY a.groudier "Gerard Roudier">
+<!ENTITY a.gryphon "Coranth Gryphon">
+<!ENTITY a.gshapiro "Gregory Neil Shapiro">
+<!ENTITY a.gsutter "Gregory Sutter">
+<!ENTITY a.guido "Guido van Rooij">
+<!ENTITY a.hanai "Hiroyuki HANAI">
+<!ENTITY a.harti "Hartmut Brandt">
+<!ENTITY a.helbig "Wolfgang Helbig">
+<!ENTITY a.hm "Hellmuth Michaelis">
+<!ENTITY a.hmp "Hiten Pandya">
+<!ENTITY a.hoek "Tim Vanderhoek">
+<!ENTITY a.horikawa "Kazuo Horikawa">
+<!ENTITY a.hosokawa "Tatsumi Hosokawa">
+<!ENTITY a.hq "Herve Quiroz">
+<!ENTITY a.hrs "Hiroki Sato">
+<!ENTITY a.hselasky "Hans Petter Selasky">
+<!ENTITY a.hsu "Jeffrey Hsu">
+<!ENTITY a.iedowse "Ian Dowse">
+<!ENTITY a.ijliao "Ying-Chieh Liao">
+<!ENTITY a.ikob "Katsushi Kobayashi">
+<!ENTITY a.imp "Warner Losh">
+<!ENTITY a.imura "R. Imura">
+<!ENTITY a.issei "Issei Suzuki">
+<!ENTITY a.issyl0 "Isabell Long">
+<!ENTITY a.itetcu "Ion-Mihai Tetcu">
+<!ENTITY a.itojun "Jun-ichiro Itoh">
+<!ENTITY a.ivoras "Ivan Voras">
+<!ENTITY a.iwasaki "Mitsuru IWASAKI">
+<!ENTITY a.jacula "Giuseppe Pilichi">
+<!ENTITY a.jadawin "Philippe Audeoud">
+<!ENTITY a.jake "Jake Burkholder">
+<!ENTITY a.jamie "Jamie Gritton">
+<!ENTITY a.jasone "Jason Evans">
+<!ENTITY a.jayanth "Jayanth Vijayaraghavan">
+<!ENTITY a.jb "John Birrell">
+<!ENTITY a.jcamou "Jesus R. Camou">
+<!ENTITY a.jceel "Jakub Klama">
+<!ENTITY a.jchandra "Jayachandran C.">
+<!ENTITY a.jdp "John Polstra">
+<!ENTITY a.jedgar "Chris D. Faulhaber">
+<!ENTITY a.jeff "Jeff Roberson">
+<!ENTITY a.jeh "James Housley">
+<!ENTITY a.jehamby "Jake Hamby">
+<!ENTITY a.jennifer "Jennifer Yang">
+<!ENTITY a.jesper "Jesper Skriver">
+<!ENTITY a.jesusr "Jesus Rodriguez">
+<!ENTITY a.jfieber "John Fieber">
+<!ENTITY a.jfitz "James FitzGibbon">
+<!ENTITY a.jfv "Jack F. Vogel">
+<!ENTITY a.jgh "Jason Helfman">
+<!ENTITY a.jgreco "Joe Greco">
+<!ENTITY a.jh "Jaakko Heinonen">
+<!ENTITY a.jhay "John Hay">
+<!ENTITY a.jhb "John Baldwin">
+<!ENTITY a.jhibbits "Justin Hibbits">
+<!ENTITY a.jhs "Julian Stacey">
+<!ENTITY a.jilles "Jilles Tjoelker">
+<!ENTITY a.jim "Jim Mock">
+<!ENTITY a.jimharris "Jim Harris">
+<!ENTITY a.jkh "Jordan K. Hubbard">
+<!ENTITY a.jkim "Jung-uk Kim">
+<!ENTITY a.jkois "Johann Kois">
+<!ENTITY a.jkoshy "Joseph Koshy">
+<!ENTITY a.jinmei "JINMEI Tatuya">
+<!ENTITY a.jlaffaye "Julien Laffaye">
+<!ENTITY a.jlemon "Jonathan Lemon">
+<!ENTITY a.jlh "Jeremie Le Hen">
+<!ENTITY a.jlrobin "James L. Robinson">
+<!ENTITY a.jls "Jordan Sissel">
+<!ENTITY a.jmacd "Joshua Peck Macdonald">
+<!ENTITY a.jmallett "Juli Mallett">
+<!ENTITY a.jmas "Jose M. Alcaide">
+<!ENTITY a.jmb "Jonathan M. Bresler">
+<!ENTITY a.jmelo "Jean Milanez Melo">
+<!ENTITY a.jmg "John-Mark Gurney">
+<!ENTITY a.jmz "Jean-Marc Zucconi">
+<!ENTITY a.joe "Josef Karthauser">
+<!ENTITY a.joel "Joel Dahl">
+<!ENTITY a.joerg "J&ouml;rg Wunsch">
+<!ENTITY a.johan "Johan Karlsson">
+<!ENTITY a.johans "Johan van Selst">
+<!ENTITY a.john "John Cavanaugh">
+<!ENTITY a.jon "Jonathan Chen">
+<!ENTITY a.jonathan "Jonathan Anderson">
+<!ENTITY a.josef "Josef El-Rayes">
+<!ENTITY a.jpaetzel "Josh Paetzel">
+<!ENTITY a.jsa "Joseph S. Atkinson">
+<!ENTITY a.jseger "Justin Seger">
+<!ENTITY a.julian "Julian Elischer">
+<!ENTITY a.jvh "Johannes Helander">
+<!ENTITY a.jwd "John W. DeBoskey">
+<!ENTITY a.jylefort "Jean-Yves Lefort">
+<!ENTITY a.kaiw "Kai Wang">
+<!ENTITY a.kan "Alexander Kabaev">
+<!ENTITY a.kargl "Steven G. Kargl">
+<!ENTITY a.karl "Karl Strickland">
+<!ENTITY a.kato "Takenori KATO">
+<!ENTITY a.kbyanc "Kelly Yancey">
+<!ENTITY a.keichii "Michael C. Wu">
+<!ENTITY a.keith "Jing-Tang Keith Jang">
+<!ENTITY a.ken "Kenneth D. Merry">
+<!ENTITY a.kensmith "Ken Smith">
+<!ENTITY a.keramida "Giorgos Keramidas">
+<!ENTITY a.kevlo "Kevin Lo">
+<!ENTITY a.kib "Konstantin Belousov">
+<!ENTITY a.kientzle "Tim Kientzle">
+<!ENTITY a.kiri "Kazuhiko Kiriyama">
+<!ENTITY a.kjc "Kenjiro Cho">
+<!ENTITY a.kmacy "Kip Macy">
+<!ENTITY a.kmoore "Kris Moore">
+<!ENTITY a.knu "Akinori MUSHA">
+<!ENTITY a.koitsu "Jeremy Chadwick">
+<!ENTITY a.krion "Kirill Ponomarew">
+<!ENTITY a.kris "Kris Kennaway">
+<!ENTITY a.kuriyama "Jun Kuriyama">
+<!ENTITY a.kwm "Koop Mast">
+<!ENTITY a.lars "Lars Fredriksen">
+<!ENTITY a.laszlof "Frank J. Laszlo">
+<!ENTITY a.lawrance "Sam Lawrance">
+<!ENTITY a.lbr "Lars Balker Rasmussen">
+<!ENTITY a.le "Lukas Ertl">
+<!ENTITY a.leeym "Yen-Ming Lee">
+<!ENTITY a.lesi "Dejan Lesjak">
+<!ENTITY a.lev "Lev Serebryakov">
+<!ENTITY a.lile "Larry Lile">
+<!ENTITY a.linimon "Mark Linimon">
+<!ENTITY a.lioux "M&aacute;rio S&eacute;rgio Fujikawa Ferreira">
+<!ENTITY a.lippe "Felippe de Meirelles Motta">
+<!ENTITY a.ljo "L Jonas Olsson">
+<!ENTITY a.lkoeller "Lars Koeller">
+<!ENTITY a.lme "Lars Engels">
+<!ENTITY a.loader "Fukang Chen">
+<!ENTITY a.lofi "Michael Nottebrock">
+<!ENTITY a.logo "Valentino Vaschetto">
+<!ENTITY a.lstewart "Lawrence Stewart">
+<!ENTITY a.lth "Lars Thegler">
+<!ENTITY a.luigi "Luigi Rizzo">
+<!ENTITY a.lulf "Ulf Lilleengen">
+<!ENTITY a.luoqi "Luoqi Chen">
+<!ENTITY a.lwhsu "Li-Wen Hsu">
+<!ENTITY a.lx "David Thiel">
+<!ENTITY a.madpilot "Guido Falsi">
+<!ENTITY a.maho "Maho Nakata">
+<!ENTITY a.makc "Max Brazhnikov">
+<!ENTITY a.mandree "Matthias Andree">
+<!ENTITY a.manolis "Manolis Kiagias">
+<!ENTITY a.marcel "Marcel Moolenaar">
+<!ENTITY a.marck "Dmitry Morozovsky">
+<!ENTITY a.marcus "Joe Marcus Clarke">
+<!ENTITY a.marius "Marius Strobl">
+<!ENTITY a.markm "Mark Murray">
+<!ENTITY a.marko "Mark Ovens">
+<!ENTITY a.markp "Mark Pulford">
+<!ENTITY a.marks "Mark Santcroos">
+<!ENTITY a.markus "Markus Br&uuml;ffer">
+<!ENTITY a.martin "Martin Renters">
+<!ENTITY a.martymac "Ganael Laplanche">
+<!ENTITY a.mat "Mathieu Arnold">
+<!ENTITY a.matk "Mathew Kanner">
+<!ENTITY a.matteo "Matteo Riondato">
+<!ENTITY a.matthew "Matthew Seaman">
+<!ENTITY a.matusita "Makoto Matsushita">
+<!ENTITY a.mav "Alexander Motin">
+<!ENTITY a.max "Masafumi NAKANE">
+<!ENTITY a.maxim "Maxim Konovalov">
+<!ENTITY a.mb "Maxim Bolotin">
+<!ENTITY a.mbarkah "Ade Barkah">
+<!ENTITY a.mbr "Martin Blapp">
+<!ENTITY a.mckay "Stephen McKay">
+<!ENTITY a.mckusick "Kirk McKusick">
+<!ENTITY a.mdf "Matthew Fleming">
+<!ENTITY a.mdodd "Matthew N. Dodd">
+<!ENTITY a.melifaro "Alexander V. Chernikov">
+<!ENTITY a.metal "Koichi Suzuki">
+<!ENTITY a.mezz "Jeremy Messenger">
+<!ENTITY a.mharo "Michael Haro">
+<!ENTITY a.mheinen "Martin Heinen">
+<!ENTITY a.mi "Mikhail Teterin">
+<!ENTITY a.mich "Michael L. Hostbaek">
+<!ENTITY a.mike "Mike Barcroft">
+<!ENTITY a.mikeh "Mike Heffner">
+<!ENTITY a.mini "Jonathan Mini">
+<!ENTITY a.mita "Yoshio MITA">
+<!ENTITY a.miwi "Martin Wilke">
+<!ENTITY a.mjacob "Matthew Jacob">
+<!ENTITY a.mks "Mike Spengler">
+<!ENTITY a.mlaier "Max Laier">
+<!ENTITY a.mm "Martin Matuska">
+<!ENTITY a.mnag "Marcus Alves Grando">
+<!ENTITY a.mohans "Mohan Srinivasan">
+<!ENTITY a.monthadar "Monthadar Al Jaberi">
+<!ENTITY a.motoyuki "Motoyuki Konno">
+<!ENTITY a.mp "Mark Peek">
+<!ENTITY a.mph "Matthew Hunt">
+<!ENTITY a.mpp "Mike Pritchard">
+<!ENTITY a.mr "Michael Reifenberger">
+<!ENTITY a.msmith "Michael Smith">
+<!ENTITY a.mtaylor "Mark J. Taylor">
+<!ENTITY a.mtm "Mike Makonnen">
+<!ENTITY a.murray "Murray Stokely">
+<!ENTITY a.mux "Maxime Henrion">
+<!ENTITY a.mva "Marcus von Appen">
+<!ENTITY a.mwlucas "Michael W. Lucas">
+<!ENTITY a.naddy "Christian Weisgerber">
+<!ENTITY a.nakai "Yukihiro Nakai">
+<!ENTITY a.nate "Nate Williams">
+<!ENTITY a.nbm "Neil Blakey-Milner">
+<!ENTITY a.nectar "Jacques Vidrine">
+<!ENTITY a.neel "Neel Natu">
+<!ENTITY a.nemoliu "Tong Liu">
+<!ENTITY a.netchild "Alexander Leidinger">
+<!ENTITY a.newton "Mark Newton">
+<!ENTITY a.nhibma "Nick Hibma">
+<!ENTITY a.niels "Niels Heinen">
+<!ENTITY a.nik "Nik Clayton">
+<!ENTITY a.niklas "Niklas Saers">
+<!ENTITY a.nivit "Nicola Vitale">
+<!ENTITY a.njl "Nate Lawson">
+<!ENTITY a.nobutaka "Nobutaka MANTANI">
+<!ENTITY a.non "Noriaki Mitsunaga">
+<!ENTITY a.nork "Norikatsu Shigemura">
+<!ENTITY a.novel "Roman Bogorodskiy">
+<!ENTITY a.nox "Juergen Lock">
+<!ENTITY a.np "Navdeep Parhar">
+<!ENTITY a.nsayer "Nick Sayer">
+<!ENTITY a.nsouch "Nicolas Souchu">
+<!ENTITY a.nwhitehorn "Nathan Whitehorn">
+<!ENTITY a.nyan "Yoshihiro Takahashi">
+<!ENTITY a.obraun "Oliver Braun">
+<!ENTITY a.obrien "David O'Brien">
+<!ENTITY a.ohauer "Oliver Hauer">
+<!ENTITY a.okazaki "Tetsurou OKAZAKI">
+<!ENTITY a.oleg "Oleg Bulyzhin">
+<!ENTITY a.olgeni "Jimmy Olgeni">
+<!ENTITY a.oliver "Oliver Lehmann">
+<!ENTITY a.olli "Oliver Fromme">
+<!ENTITY a.onoe "Atsushi Onoe">
+<!ENTITY a.orion "Orion Hodson">
+<!ENTITY a.osa "Sergey A. Osokin">
+<!ENTITY a.pat "Patrick Li">
+<!ENTITY a.patrick "Patrick S. Gardella">
+<!ENTITY a.paul "Paul Richards">
+<!ENTITY a.pav "Pav Lucistnik">
+<!ENTITY a.pawel "Pawel Pekala">
+<!ENTITY a.pb "Pierre Beyssac">
+<!ENTITY a.pdeuskar "Prafulla S. Deuskar">
+<!ENTITY a.pds "Peter da Silva">
+<!ENTITY a.peadar "Peter Edwards">
+<!ENTITY a.perky "Hye-Shik Chang">
+<!ENTITY a.petef "Pete Fritchman">
+<!ENTITY a.peter "Peter Wemm">
+<!ENTITY a.pfg "Pedro Giffuni">
+<!ENTITY a.pgj "G&aacute;bor P&aacute;li">
+<!ENTITY a.pgollucci "Philip M. Gollucci">
+<!ENTITY a.phantom "Alexey Zelkin">
+<!ENTITY a.philip "Philip Paeps">
+<!ENTITY a.phk "Poul-Henning Kamp">
+<!ENTITY a.pho "Peter Holm">
+<!ENTITY a.piero "Piero Serini">
+<!ENTITY a.pirzyk "Jim Pirzyk">
+<!ENTITY a.piso "Paolo Pisati">
+<!ENTITY a.pjd "Pawel Jakub Dawidek">
+<!ENTITY a.pluknet "Sergey Kandaurov">
+<!ENTITY a.proven "Chris Provenzano">
+<!ENTITY a.ps "Paul Saab">
+<!ENTITY a.pst "Paul Traina">
+<!ENTITY a.qingli "Qing Li">
+<!ENTITY a.rafan "Rong-En Fan">
+<!ENTITY a.raj "Rafal Jaworowski">
+<!ENTITY a.rakuco "Raphael Kubo da Costa">
+<!ENTITY a.randi "Randi Harper">
+<!ENTITY a.ray "Aleksandr Rybalko">
+<!ENTITY a.rdivacky "Roman Divacky">
+<!ENTITY a.rea "Eygene Ryabinkin">
+<!ENTITY a.rees "Jim Rees">
+<!ENTITY a.reg "Jeremy Lea">
+<!ENTITY a.remko "Remko Lodder">
+<!ENTITY a.rene "Ren&eacute; Ladan">
+<!ENTITY a.rgrimes "Rodney Grimes">
+<!ENTITY a.ricardag "Ricardo AG">
+<!ENTITY a.rich "Rich Murphey">
+<!ENTITY a.rik "Roman Kurakin">
+<!ENTITY a.rink "Rink Springer">
+<!ENTITY a.rm "Ruslan Mahmatkhanov">
+<!ENTITY a.rmacklem "Rick Macklem">
+<!ENTITY a.rmh "Robert Millan">
+<!ENTITY a.rnoland "Robert Noland">
+<!ENTITY a.rnordier "Robert Nordier">
+<!ENTITY a.roam "Peter Pentchev">
+<!ENTITY a.robert "Robert Drehmel">
+<!ENTITY a.roberto "Ollivier Robert">
+<!ENTITY a.rodrigc "Craig Rodrigues">
+<!ENTITY a.roger "Roger Hardiman">
+<!ENTITY a.romain "Romain Tarti&egrave;re">
+<!ENTITY a.rpaulo "Rui Paulo">
+<!ENTITY a.rpratt "Randy Pratt">
+<!ENTITY a.rrs "Randall R. Stewart">
+<!ENTITY a.rse "Ralf S. Engelschall">
+<!ENTITY a.rsm "Scott Mitchell">
+<!ENTITY a.rstone "Ryan Stone">
+<!ENTITY a.ru "Ruslan Ermilov">
+<!ENTITY a.rushani "Hideyuki KURASHINA">
+<!ENTITY a.rv "Rajesh Vaidheeswarran">
+<!ENTITY a.rvb "Robert V. Baron">
+<!ENTITY a.rwatson "Robert Watson">
+<!ENTITY a.ryusuke "Ryusuke SUZUKI">
+<!ENTITY a.sada "SADA Kenji">
+<!ENTITY a.sah "Sam Hopkins">
+<!ENTITY a.sahil "Sahil Tandon">
+<!ENTITY a.sam "Sam Leffler">
+<!ENTITY a.sanpei "Yoshiro Sanpei MIHIRA">
+<!ENTITY a.sat "Andrew Pantyukhin">
+<!ENTITY a.sbz "Sofian Brabez">
+<!ENTITY a.scf "Sean C. Farley">
+<!ENTITY a.scheidell "Michael Scheidell">
+<!ENTITY a.schweikh "Jens Schweikhardt">
+<!ENTITY a.scop "Ville Skytt&auml;">
+<!ENTITY a.scottl "Scott Long">
+<!ENTITY a.scrappy "Marc G. Fournier">
+<!ENTITY a.se "Stefan Esser">
+<!ENTITY a.seanc "Sean Chittenden">
+<!ENTITY a.sef "Sean Eric Fagan">
+<!ENTITY a.sem "Sergey Matveychuk">
+<!ENTITY a.semenu "Semen Ustimenko">
+<!ENTITY a.sephe "Sepherosa Ziehau">
+<!ENTITY a.sepotvin "Stephane E. Potvin">
+<!ENTITY a.sergei "Sergei Kolobov">
+<!ENTITY a.sf "Satsuki FUJISHIMA">
+<!ENTITY a.shafeeq "Shafeeq Sinnamohideen">
+<!ENTITY a.shaun "Shaun Amott">
+<!ENTITY a.sheldonh "Sheldon Hearn">
+<!ENTITY a.shiba "Takeshi Shibagaki">
+<!ENTITY a.shige "Shigeyuki Fukushima">
+<!ENTITY a.shin "Yoshinobu Inoue">
+<!ENTITY a.silby "Mike Silbersack">
+<!ENTITY a.simokawa "Hidetoshi Shimokawa">
+<!ENTITY a.simon "Simon L. Nielsen">
+<!ENTITY a.skreuzer "Steven Kreuzer">
+<!ENTITY a.skv "Sergey Skvortsov">
+<!ENTITY a.smace "Scott Mace">
+<!ENTITY a.smkelly "Sean Kelly">
+<!ENTITY a.smpatel "Sujal Patel">
+<!ENTITY a.snb "Nick Barkas">
+<!ENTITY a.sobomax "Maxim Sobolev">
+<!ENTITY a.sos "S&oslash;ren Schmidt">
+<!ENTITY a.sperber "Armin Pirkovitsch">
+<!ENTITY a.sson "Stacey Son">
+<!ENTITY a.ssouhlal "Suleiman Souhlal">
+<!ENTITY a.stanislav "G. Adam Stanislav">
+<!ENTITY a.stark "Gene Stark">
+<!ENTITY a.stas "Stanislav Sedov">
+<!ENTITY a.stb "Stefan Bethke">
+<!ENTITY a.stefan "Stefan Walter">
+<!ENTITY a.stefanf "Stefan Farfeleder">
+<!ENTITY a.stephane "St&eacute;phane Legrand">
+<!ENTITY a.stephen "Stephen Montgomery-Smith">
+<!ENTITY a.steve "Steve Price">
+<!ENTITY a.sumikawa "Munechika Sumikawa">
+<!ENTITY a.sunpoet "Po-Chuan Hsieh">
+<!ENTITY a.suz "SUZUKI Shinsuke">
+<!ENTITY a.swallace "Steven Wallace">
+<!ENTITY a.swills "Steve Wills">
+<!ENTITY a.sylvio "Sylvio Cesar Teixeira">
+<!ENTITY a.syrinx "Shteryana Shopova">
+<!ENTITY a.tabthorpe "Thomas Abthorpe">
+<!ENTITY a.tackerman "Tony Ackerman">
+<!ENTITY a.takawata "Takanori Watanabe">
+<!ENTITY a.tanimura "Seigo Tanimura">
+<!ENTITY a.taoka "Satoshi Taoka">
+<!ENTITY a.taras "Taras Korenko">
+<!ENTITY a.tdb "Tim Bishop">
+<!ENTITY a.tedm "Ted Mittelstaedt">
+<!ENTITY a.tegge "Tor Egge">
+<!ENTITY a.tg "Thomas Gellekum">
+<!ENTITY a.thepish "Peter Hawkins">
+<!ENTITY a.theraven "David Chisnall">
+<!ENTITY a.thierry "Thierry Thomas">
+<!ENTITY a.thomas "Thomas Quinot">
+<!ENTITY a.thompsa "Andrew Thompson">
+<!ENTITY a.ticso "Bernd Walter">
+<!ENTITY a.tijl "Tijl Coosemans">
+<!ENTITY a.timur "Timur I. Bakeyev">
+<!ENTITY a.tjr "Tim J. Robbins">
+<!ENTITY a.tmclaugh "Tom McLaughlin">
+<!ENTITY a.tmm "Thomas M&ouml;stl">
+<!ENTITY a.tobez "Anton Berezin">
+<!ENTITY a.tom "Tom Hukins">
+<!ENTITY a.tomsoft "Thomas-Henning von Kamptz">
+<!ENTITY a.torstenb "Torsten Blum">
+<!ENTITY a.toshi "Toshihiko Arai">
+<!ENTITY a.tota "TAKATSU Tomonari">
+<!ENTITY a.trasz "Edward Tomasz Napierala">
+<!ENTITY a.trevor "Trevor Johnson">
+<!ENTITY a.trhodes "Tom Rhodes">
+<!ENTITY a.truckman "Don &ldquo;Truck&rdquo; Lewis">
+<!ENTITY a.tshiozak "Takuya SHIOZAKI">
+<!ENTITY a.tuexen "Michael Tuexen">
+<!ENTITY a.twinterg "Thomas Wintergerst">
+<!ENTITY a.uch "Yasushi UCHIYAMA">
+<!ENTITY a.ue "Udo Erdelhoff">
+<!ENTITY a.ugen "Ugen J.S.Antsilevich">
+<!ENTITY a.uhclem "Frank Durda IV">
+<!ENTITY a.ulf "Ulf Zimmermann">
+<!ENTITY a.ume "Hajimu UMEMOTO">
+<!ENTITY a.unfurl "Bill Swingle">
+<!ENTITY a.ups "Stephan Uphoff">
+<!ENTITY a.uqs "Ulrich Sp&ouml;rlein">
+<!ENTITY a.vanilla "Vanilla I. Shu">
+<!ENTITY a.versus "Konrad Jankowski">
+<!ENTITY a.vd "Vasil Dimov">
+<!ENTITY a.viny "Vincent Tougait">
+<!ENTITY a.vkashyap "Vinod Kashyap">
+<!ENTITY a.vs "Volker Stolz">
+<!ENTITY a.vsevolod "Vsevolod Stakhov">
+<!ENTITY a.wblock "Warren Block">
+<!ENTITY a.wen "Wen Heping">
+<!ENTITY a.weongyo "Weongyo Jeong">
+<!ENTITY a.wes "Wes Peters">
+<!ENTITY a.wxs "Wesley Shields">
+<!ENTITY a.whiteside "Don Whiteside">
+<!ENTITY a.wilko "Wilko Bulte">
+<!ENTITY a.will "Will Andrews">
+<!ENTITY a.wjv "Johann Visagie">
+<!ENTITY a.wkoszek "Wojciech A. Koszek">
+<!ENTITY a.wollman "Garrett Wollman">
+<!ENTITY a.wosch "Wolfram Schneider">
+<!ENTITY a.wpaul "Bill Paul">
+<!ENTITY a.wsalamon "Wayne Salamon">
+<!ENTITY a.wsanchez "Wilfredo S&aacute;nchez">
+<!ENTITY a.wylie "Wylie Stilwell">
+<!ENTITY a.yar "Yar Tikhiy">
+<!ENTITY a.yoichi "Yoichi NAKAYAMA">
+<!ENTITY a.yokota "Kazutaka YOKOTA">
+<!ENTITY a.yongari "Pyun YongHyeon">
+<!ENTITY a.yzlin "Yi-Jheng Lin">
+<!ENTITY a.xride "S&oslash;ren Straarup">
+<!ENTITY a.zack "Zack Kirsch">
+<!ENTITY a.zarzycki "Dave Zarzycki">
+<!ENTITY a.zec "Marko Zec">
+<!ENTITY a.zi "Ryan Steinmetz">
+<!ENTITY a.zml "Zachary Loafman">
+<!ENTITY a.znerd "Ernst de Haan">
+
+<!-- GNATS-only contributors -->
+<!ENTITY a.vwe "Volker Werth">
+
+<!-- Additional contributors -->
+<!ENTITY a.re "re@FreeBSD.org">
+<!ENTITY a.mkm "Kyle&nbsp;Martin">
+<!ENTITY a.joe.halpin "Joe&nbsp;Halpin">
+<!ENTITY a.pavalos "Peter&nbsp;Avalos">
+<!ENTITY a.jwojdacki "Justin&nbsp;Wojdacki">
+
+<!-- Below we list the various hats. This is used in internal/staff.sgml
+so that we may keep a list of hat owners and modify only this file. -->
+
+<!-- FreeBSD Bugmeister -->
+<!ENTITY a.bugmeister '&a.gavin;, &a.linimon;, &a.remko;, &a.vwe;'>
+
+<!-- FreeBSD Doc Engineering Team -->
+<!ENTITY a.doceng '&a.nik;, &a.keramida;, &a.hrs;, &a.blackend;'>
+
+<!-- FreeBSD Donations Liaison -->
+<!ENTITY a.donations '&a.gjb;, &a.wilko;, &a.gahr;, &a.pgollucci;, &a.skreuzer;, &a.obrien;, &a.trhodes;, Daniel Seuffert, &a.rwatson;'>
+
+<!-- FreeBSD Ports Manager Team -->
+<!ENTITY a.portmgr '&a.tabthorpe;, &a.marcus;, &a.bapt;, &a.beat;, &a.erwin;, &a.linimon;, &a.pav;, &a.itetcu;, &a.flz;, &a.miwi;'>
+
+<!-- FreeBSD Release Engineering Teams -->
+<!ENTITY a.re.members '&a.kib;, &a.blackend;, &a.jpaetzel;, &a.hrs;, &a.kensmith;, &a.rwatson;, &a.bz;'>
+<!ENTITY a.re-builders '&a.marcel;, &a.nyan;'>
+
+<!-- FreeBSD Security Officer -->
+<!ENTITY a.so '&a.cperciva;'>
+
+<!ENTITY a.so-team '&a.mnag;, &a.remko;, &a.gnn;, &a.simon;, &a.philip;, &a.cperciva;, &a.csjp;, &a.des;, &a.rwatson;, &a.bz;'>
diff --git a/share/htdocs/sgml/events.dtd b/share/sgml/events.dtd
index 9d0cdfd81f..9d0cdfd81f 100644
--- a/share/htdocs/sgml/events.dtd
+++ b/share/sgml/events.dtd
diff --git a/share/htdocs/sgml/events.xml b/share/sgml/events.xml
index 4a3e75848e..4a3e75848e 100644
--- a/share/htdocs/sgml/events.xml
+++ b/share/sgml/events.xml
diff --git a/share/htdocs/sgml/events2003.xml b/share/sgml/events2003.xml
index 32b4826b0a..32b4826b0a 100644
--- a/share/htdocs/sgml/events2003.xml
+++ b/share/sgml/events2003.xml
diff --git a/share/htdocs/sgml/events2004.xml b/share/sgml/events2004.xml
index bd8f4776aa..bd8f4776aa 100644
--- a/share/htdocs/sgml/events2004.xml
+++ b/share/sgml/events2004.xml
diff --git a/share/htdocs/sgml/events2005.xml b/share/sgml/events2005.xml
index ac117a40f1..ac117a40f1 100644
--- a/share/htdocs/sgml/events2005.xml
+++ b/share/sgml/events2005.xml
diff --git a/share/htdocs/sgml/events2006.xml b/share/sgml/events2006.xml
index e0f378c46e..e0f378c46e 100644
--- a/share/htdocs/sgml/events2006.xml
+++ b/share/sgml/events2006.xml
diff --git a/share/htdocs/sgml/events2007.xml b/share/sgml/events2007.xml
index 9d0b40fd71..9d0b40fd71 100644
--- a/share/htdocs/sgml/events2007.xml
+++ b/share/sgml/events2007.xml
diff --git a/share/htdocs/sgml/events2008.xml b/share/sgml/events2008.xml
index 1608cda34f..1608cda34f 100644
--- a/share/htdocs/sgml/events2008.xml
+++ b/share/sgml/events2008.xml
diff --git a/share/htdocs/sgml/events2009.xml b/share/sgml/events2009.xml
index c6671bcbf2..c6671bcbf2 100644
--- a/share/htdocs/sgml/events2009.xml
+++ b/share/sgml/events2009.xml
diff --git a/share/htdocs/sgml/events2010.xml b/share/sgml/events2010.xml
index b7e912fc03..b7e912fc03 100644
--- a/share/htdocs/sgml/events2010.xml
+++ b/share/sgml/events2010.xml
diff --git a/share/htdocs/sgml/events2011.xml b/share/sgml/events2011.xml
index 3106d71a51..3106d71a51 100644
--- a/share/htdocs/sgml/events2011.xml
+++ b/share/sgml/events2011.xml
diff --git a/share/htdocs/sgml/events2012.xml b/share/sgml/events2012.xml
index df491cc8a7..df491cc8a7 100644
--- a/share/htdocs/sgml/events2012.xml
+++ b/share/sgml/events2012.xml
diff --git a/share/htdocs/sgml/events2013.xml b/share/sgml/events2013.xml
index 19ee438ec4..19ee438ec4 100644
--- a/share/htdocs/sgml/events2013.xml
+++ b/share/sgml/events2013.xml
diff --git a/share/htdocs/sgml/gallery.dtd b/share/sgml/gallery.dtd
index 73e42f834c..73e42f834c 100644
--- a/share/htdocs/sgml/gallery.dtd
+++ b/share/sgml/gallery.dtd
diff --git a/share/htdocs/sgml/header.ent b/share/sgml/header.ent
index 94a1b02c27..94a1b02c27 100644
--- a/share/htdocs/sgml/header.ent
+++ b/share/sgml/header.ent
diff --git a/share/htdocs/sgml/header.l10n.ent b/share/sgml/header.l10n.ent
index ce4c20a141..ce4c20a141 100644
--- a/share/htdocs/sgml/header.l10n.ent
+++ b/share/sgml/header.l10n.ent
diff --git a/share/htdocs/sgml/html401-freebsd.dtd b/share/sgml/html401-freebsd.dtd
index dcf9282dc7..dcf9282dc7 100644
--- a/share/htdocs/sgml/html401-freebsd.dtd
+++ b/share/sgml/html401-freebsd.dtd
diff --git a/share/htdocs/sgml/ideas.dtd b/share/sgml/ideas.dtd
index 3a8d5c7016..3a8d5c7016 100644
--- a/share/htdocs/sgml/ideas.dtd
+++ b/share/sgml/ideas.dtd
diff --git a/share/htdocs/sgml/iso8879.ent b/share/sgml/iso8879.ent
index d2f04ad6e4..d2f04ad6e4 100644
--- a/share/htdocs/sgml/iso8879.ent
+++ b/share/sgml/iso8879.ent
diff --git a/share/htdocs/sgml/libcommon.xsl b/share/sgml/libcommon.xsl
index bdd6fe30c9..bdd6fe30c9 100644
--- a/share/htdocs/sgml/libcommon.xsl
+++ b/share/sgml/libcommon.xsl
diff --git a/share/htdocs/sgml/navibar.ent b/share/sgml/navibar.ent
index 8cce275b42..8cce275b42 100644
--- a/share/htdocs/sgml/navibar.ent
+++ b/share/sgml/navibar.ent
diff --git a/share/htdocs/sgml/navibar.l10n.ent b/share/sgml/navibar.l10n.ent
index 4471c66aa9..4471c66aa9 100644
--- a/share/htdocs/sgml/navibar.l10n.ent
+++ b/share/sgml/navibar.l10n.ent
diff --git a/share/htdocs/sgml/news.dtd b/share/sgml/news.dtd
index 037993b775..037993b775 100644
--- a/share/htdocs/sgml/news.dtd
+++ b/share/sgml/news.dtd
diff --git a/share/htdocs/sgml/news.xml b/share/sgml/news.xml
index 03b1ba3435..03b1ba3435 100644
--- a/share/htdocs/sgml/news.xml
+++ b/share/sgml/news.xml
diff --git a/share/htdocs/sgml/notices.xml b/share/sgml/notices.xml
index c5311f8c2a..c5311f8c2a 100644
--- a/share/htdocs/sgml/notices.xml
+++ b/share/sgml/notices.xml
diff --git a/share/htdocs/sgml/press.dtd b/share/sgml/press.dtd
index f14737d005..f14737d005 100644
--- a/share/htdocs/sgml/press.dtd
+++ b/share/sgml/press.dtd
diff --git a/share/htdocs/sgml/press.xml b/share/sgml/press.xml
index d8e4713b08..d8e4713b08 100644
--- a/share/htdocs/sgml/press.xml
+++ b/share/sgml/press.xml
diff --git a/share/htdocs/sgml/release.ent b/share/sgml/release.ent
index 32827f0a72..32827f0a72 100644
--- a/share/htdocs/sgml/release.ent
+++ b/share/sgml/release.ent
diff --git a/share/htdocs/sgml/statusreport.dtd b/share/sgml/statusreport.dtd
index 39d989b6e8..39d989b6e8 100644
--- a/share/htdocs/sgml/statusreport.dtd
+++ b/share/sgml/statusreport.dtd
diff --git a/share/htdocs/sgml/templates.entries.xsl b/share/sgml/templates.entries.xsl
index cd8a1021b4..cd8a1021b4 100644
--- a/share/htdocs/sgml/templates.entries.xsl
+++ b/share/sgml/templates.entries.xsl
diff --git a/share/htdocs/sgml/templates.events.xsl b/share/sgml/templates.events.xsl
index 236bfd7f5d..236bfd7f5d 100644
--- a/share/htdocs/sgml/templates.events.xsl
+++ b/share/sgml/templates.events.xsl
diff --git a/share/htdocs/sgml/templates.events2ics.xsl b/share/sgml/templates.events2ics.xsl
index 511b05bded..511b05bded 100644
--- a/share/htdocs/sgml/templates.events2ics.xsl
+++ b/share/sgml/templates.events2ics.xsl
diff --git a/share/htdocs/sgml/templates.news-rdf.xsl b/share/sgml/templates.news-rdf.xsl
index 9163f8ba87..9163f8ba87 100644
--- a/share/htdocs/sgml/templates.news-rdf.xsl
+++ b/share/sgml/templates.news-rdf.xsl
diff --git a/share/htdocs/sgml/templates.news-rss.xsl b/share/sgml/templates.news-rss.xsl
index f549540045..f549540045 100644
--- a/share/htdocs/sgml/templates.news-rss.xsl
+++ b/share/sgml/templates.news-rss.xsl
diff --git a/share/htdocs/sgml/templates.newsflash.xsl b/share/sgml/templates.newsflash.xsl
index aedbbd435d..aedbbd435d 100644
--- a/share/htdocs/sgml/templates.newsflash.xsl
+++ b/share/sgml/templates.newsflash.xsl
diff --git a/share/htdocs/sgml/templates.oldnewsflash.xsl b/share/sgml/templates.oldnewsflash.xsl
index 56d50f5d44..56d50f5d44 100644
--- a/share/htdocs/sgml/templates.oldnewsflash.xsl
+++ b/share/sgml/templates.oldnewsflash.xsl
diff --git a/share/htdocs/sgml/templates.oldpress.xsl b/share/sgml/templates.oldpress.xsl
index b5a83a9f21..b5a83a9f21 100644
--- a/share/htdocs/sgml/templates.oldpress.xsl
+++ b/share/sgml/templates.oldpress.xsl
diff --git a/share/htdocs/sgml/templates.pastevents.xsl b/share/sgml/templates.pastevents.xsl
index 1f672e77b0..1f672e77b0 100644
--- a/share/htdocs/sgml/templates.pastevents.xsl
+++ b/share/sgml/templates.pastevents.xsl
diff --git a/share/htdocs/sgml/templates.press-rss.xsl b/share/sgml/templates.press-rss.xsl
index 28a6a40ff8..28a6a40ff8 100644
--- a/share/htdocs/sgml/templates.press-rss.xsl
+++ b/share/sgml/templates.press-rss.xsl
diff --git a/share/htdocs/sgml/templates.press.xsl b/share/sgml/templates.press.xsl
index 0fe67c970f..0fe67c970f 100644
--- a/share/htdocs/sgml/templates.press.xsl
+++ b/share/sgml/templates.press.xsl
diff --git a/share/htdocs/sgml/templates.usergroups.xsl b/share/sgml/templates.usergroups.xsl
index 31122bb998..31122bb998 100644
--- a/share/htdocs/sgml/templates.usergroups.xsl
+++ b/share/sgml/templates.usergroups.xsl
diff --git a/share/htdocs/sgml/usergroups.dtd b/share/sgml/usergroups.dtd
index b45d751f6e..b45d751f6e 100644
--- a/share/htdocs/sgml/usergroups.dtd
+++ b/share/sgml/usergroups.dtd
diff --git a/share/htdocs/sgml/usergroups.xml b/share/sgml/usergroups.xml
index 52091b32be..52091b32be 100644
--- a/share/htdocs/sgml/usergroups.xml
+++ b/share/sgml/usergroups.xml
diff --git a/share/htdocs/sgml/xslt10-freebsd.dtd b/share/sgml/xslt10-freebsd.dtd
index 119d2034b7..119d2034b7 100644
--- a/share/htdocs/sgml/xslt10-freebsd.dtd
+++ b/share/sgml/xslt10-freebsd.dtd
diff --git a/share/htdocs/sgml/xslt10.dtd b/share/sgml/xslt10.dtd
index 93cff44c83..93cff44c83 100644
--- a/share/htdocs/sgml/xslt10.dtd
+++ b/share/sgml/xslt10.dtd
diff --git a/share/tools/portsgrowth/Makefile b/share/tools/portsgrowth/Makefile
index 33f5a6e168..e391ac82c2 100644
--- a/share/tools/portsgrowth/Makefile
+++ b/share/tools/portsgrowth/Makefile
@@ -1,13 +1,13 @@
# $FreeBSD: www/tools/portsgrowth/Makefile,v 1.1 2002/05/20 10:46:13 phantom Exp $
-.if exists(../../en/Makefile.conf)
-.include "../../en/Makefile.conf"
+.if exists(../../../en_US.ISO8859-1/Makefile.conf)
+.include "../../../en_US.ISO8859-1/Makefile.conf"
.endif
-.if exists(../../en/Makefile.inc)
-.include "../../en/Makefile.inc"
+.if exists(../../../en_US.ISO8859-1/Makefile.inc)
+.include "../../../en_US.ISO8859-1/Makefile.inc"
.endif
-WEB_PREFIX?= ${.CURDIR}/../..
+DOC_PREFIX?= ${.CURDIR}/../../..
PRGRAPHDIR?= ${DESTDIR}${WEBBASE}/ports/growth
GNUPLOT?= /usr/local/bin/gnuplot
PNGTOPNM?= /usr/local/bin/pngtopnm
@@ -37,4 +37,4 @@ install: ${IMG}
${INSTALL_WEB} ${IMG} ${PRGRAPHDIR}
.endif
-.include "${WEB_PREFIX}/share/mk/web.site.mk"
+.include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/share/tools/prstats/Makefile b/share/tools/prstats/Makefile
index c942f8c528..03aef78ed4 100644
--- a/share/tools/prstats/Makefile
+++ b/share/tools/prstats/Makefile
@@ -2,14 +2,14 @@
# $FreeBSD: www/tools/prstats/Makefile,v 1.2 2001/11/18 16:11:34 murray Exp $
#
-.if exists(../../en/Makefile.conf)
-.include "../../en/Makefile.conf"
+.if exists(../../../en_US.ISO8859-1/Makefile.conf)
+.include "../../../en_US.ISO8859-1/Makefile.conf"
.endif
-.if exists(../../en/Makefile.inc)
-.include "../../en/Makefile.inc"
+.if exists(../../../en_US.ISO8859-1/Makefile.inc)
+.include "../../../en_US.ISO8859-1/Makefile.inc"
.endif
-WEB_PREFIX?= ${.CURDIR}/../..
+DOC_PREFIX?= ${.CURDIR}/../../..
GNATSDIR?= /c/gnats
PRGRAPHDIR?= ${DESTDIR}${WEBBASE}/prstats
GNUPLOT?= /usr/local/bin/gnuplot
@@ -43,4 +43,4 @@ install: ${GRAPHS}
.endif
.endfor
-.include "${WEB_PREFIX}/share/mk/web.site.mk"
+.include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/share/tools/webupdate b/share/tools/webupdate
index 38ef7ee751..d85381c68f 100644
--- a/share/tools/webupdate
+++ b/share/tools/webupdate
@@ -45,6 +45,7 @@
#
DEFAULT_PATH=/bin:/usr/bin:/usr/local/bin;
DEFAULT_CVSROOT=/home/ncvs;
+DEFAULT_SVNROOT=svn://svn.FreeBSD.org/doc/head
DEFAULT_BUILDDIR=/usr/local/www/build;
DEFAULT_LOGDIR=/usr/local/www/build/log;
DEFAULT_DESTDIR=/usr/local/www;
@@ -58,6 +59,7 @@ DEFAULT_WEBMAILTO=freebsd-doc;
#
PATH=${PATH:-${DEFAULT_PATH}}; export PATH;
CVSROOT=${CVSROOT:-${DEFAULT_CVSROOT}}; export CVSROOT;
+SVNROOT=${SVNROOT:-${DEFAULT_SVNROOT}}; export SVNROOT;
BUILDDIR=${BUILDDIR:-${DEFAULT_BUILDDIR}};
LOGDIR=${LOGDIR:-${DEFAULT_LOGDIR}};
DESTDIR=${DESTDIR:-${DEFAULT_DESTDIR}}; export DESTDIR
@@ -81,7 +83,7 @@ WEBMAILTO=${WEBMAILTO:-${DEFAULT_WEBMAILTO}};
# assumes that the directory right below that is the language code.
# This works fine if all the languages are in a directory called
# 'doc', and not at all if they aren't.
-subtrees='www doc relnotes/doc relnotes/man4 relnotes6/doc relnotes6/man4 relnotes7/doc relnotes7/man4';
+subtrees='head relnotes/doc relnotes/man4';
#
# Update the checked out copies. Check out new copies every Sunday or
@@ -113,34 +115,22 @@ if [ $cond ]; then
rm -Rf $subtrees 2>/dev/null;
# Check out the new copies. This creates all the $subtrees.
- cvs -qR checkout -P www >> $LOGFILE 2>&1 || exit 2;
- cvs -qR checkout -P doc >> $LOGFILE 2>&1 || exit 2;
+ svn co $SVNROOT . >> $LOGFILE 2>&1 || exit 2;
test -d relnotes || mkdir relnotes;
cvs -qR checkout -Pd relnotes/doc src/release/doc >> \
$LOGFILE 2>&1 || exit 2;
cvs -qR checkout -Pd relnotes/man4 src/share/man/man4 >> \
$LOGFILE 2>&1 || exit 2;
-
- test -d relnotes7 || mkdir relnotes7;
- cvs -qR checkout -Pd relnotes7/doc -rRELENG_7 src/release/doc >> \
- $LOGFILE 2>&1 || exit 2;
- cvs -qR checkout -Pd relnotes7/man4 -rRELENG_7 src/share/man/man4 >> \
- $LOGFILE 2>&1 || exit 2;
-
- test -d relnotes6 || mkdir relnotes6;
- cvs -qR checkout -Pd relnotes6/doc -rRELENG_6 src/release/doc >> \
- $LOGFILE 2>&1 || exit 2;
- cvs -qR checkout -Pd relnotes6/man4 -rRELENG_6 src/share/man/man4 >> \
- $LOGFILE 2>&1 || exit 2;
else
+ svn update head >> $LOGFILE 2>&1 || exit 2;
cvs -qR update -dP $subtrees >> $LOGFILE 2>&1 || exit 2;
fi
#
# Build the web site.
#
-cd $BUILDDIR/www/en || exit 1;
+cd $BUILDDIR/head/en_US.ISO8859-1/htdocs || exit 1;
time make ${BUILDARGS} all >> $LOGFILE 2>&1 &&
time make ${INSTARGS} install >> $LOGFILE 2>&1 ||