diff --git a/en/FAQ/Makefile b/en/FAQ/Makefile index 9762af2c5d..6d435b2ce5 100644 --- a/en/FAQ/Makefile +++ b/en/FAQ/Makefile @@ -1,27 +1,12 @@ -# -# $FreeBSD: www/en/FAQ/Makefile,v 1.6 2001/06/11 02:38:58 ache Exp $ -# -# Build the FreeBSD FAQ *outside* of the www tree, and install it -# in to the right place as necessary. +# $FreeBSD: www/en/docproj/Makefile,v 1.9 2001/07/31 00:24:23 murray Exp $ .if exists(../Makefile.conf) .include "../Makefile.conf" .endif .if exists(../Makefile.inc) .include "../Makefile.inc" .endif -# At build time, we have to link to the doc/ directory at the same level -# as the www/ tree. -all: - ${LN} -fs ${.OBJDIR}/../../../doc/en_US.ISO8859-1/books/faq/* . - -# At install time the www/en/doc/ directory has been populated, so we can -# link in to there instead. -install: - [ -d ${DOCINSTALLDIR} ] || ${MKDIR} ${DOCINSTALLDIR} - cd ${DOCINSTALLDIR}; \ - ${LN} -fs ../doc/en_US.ISO8859-1/books/faq/* ${DOCINSTALLDIR} +DATA= index.html .include "${WEB_PREFIX}/share/mk/web.site.mk" - diff --git a/en/FAQ/index.html b/en/FAQ/index.html new file mode 100644 index 0000000000..d55873b41c --- /dev/null +++ b/en/FAQ/index.html @@ -0,0 +1,14 @@ + + + + The FAQ has moved + + + +

The FAQ is no longer accessible at this location. Please use + ../doc/en_US.ISO8859-1/books/faq/index.html + to reach it. You should be automatically redirected there in a few + seconds. If not, please follow the link, and update your bookmarks. + We apologise for the inconvenience.

+ + diff --git a/en/Makefile b/en/Makefile index 860210da5b..3d4eb969e4 100644 --- a/en/Makefile +++ b/en/Makefile @@ -1,128 +1,110 @@ -# $FreeBSD: www/en/Makefile,v 1.82 2002/04/04 21:51:28 trhodes Exp $ +# $FreeBSD: www/en/Makefile,v 1.83 2002/05/09 13:07:12 mwlucas Exp $ .if exists(Makefile.conf) .include "Makefile.conf" .endif .if exists(../Makefile.inc) .include "../Makefile.inc" .endif # These are turned into validated, normalized HTML files. DOCS= applications.sgml DOCS+= auditors.sgml DOCS+= availability.sgml DOCS+= docs.sgml DOCS+= features.sgml DOCS+= register.sgml DOCS+= internet.sgml DOCS+= mailto.sgml DOCS+= publish.sgml DOCS+= relnotes.sgml DOCS+= send-pr.sgml DOCS+= support.sgml DOCS+= where.sgml DOCS+= y2kbug.sgml # These will be directly installed. DATA= favicon.ico DATA+= robots.txt DATA+= freebsd.css # Subdirectories # SGML SUBDIR= security SUBDIR+= commercial SUBDIR+= docproj SUBDIR+= news SUBDIR+= advocacy SUBDIR+= events +SUBDIR+= FAQ +SUBDIR+= handbook SUBDIR+= internal SUBDIR+= java SUBDIR+= copyright SUBDIR+= search SUBDIR+= gallery SUBDIR+= projects SUBDIR+= prstats SUBDIR+= platforms SUBDIR+= releases SUBDIR+= releng SUBDIR+= smp SUBDIR+= conspectus SUBDIR+= gnome SUBDIR+= donations .if !defined(WEB_ONLY) || empty(WEB_ONLY) SUBDIR+= ports SUBDIR+= doc .endif .if defined(BUILD_RELNOTES) SUBDIR+= relnotes .endif # These *must* be listed after the "doc" subdir, as they create symlinks # in to it. .if !defined(WEB_ONLY) || empty(WEB_ONLY) SUBDIR+= tutorials .endif # Non-SGML SUBDIR+= gifs SUBDIR+= cgi WEB_LANG?= ja es ru zh de COOKIE= FAQ handbook # Non-English .if !defined(ENGLISH_ONLY) || empty(ENGLISH_ONLY) .for DIR in ${WEB_LANG} SUBDIR+= ../${DIR} .endfor .endif WEBDIR= data # index.html is special, and generated from index.xsl and news/news.xml DATA+= index.html CLEANFILES+= index.html index.html: index.xsl news/news.xml news/press.xml includes.xsl news/includes.xsl ${XSLTPROC} ${XSLTPROCOPTS} -o index.html \ ${.CURDIR}/index.xsl ${.CURDIR}/news/news.xml .if !defined(NO_TIDY) -${TIDY} ${TIDYOPTS} index.html .endif -# Handle the FAQ/ and handbook/ directories specially. -FAQ: - ${LN} -fs ${.OBJDIR}/../../doc/en_US.ISO8859-1/books/faq FAQ - -handbook: - ${LN} -fs ${.OBJDIR}/../../doc/en_US.ISO8859-1/books/handbook handbook - -# In "make obj" case FAQ and handbook are symlinks and have to be removed -# at "make clean" -.if ${.OBJDIR} != ${.CURDIR} -CLEANFILES+= FAQ -CLEANFILES+= handbook -.endif - -afterinstall: - cd ${DOCINSTALLDIR}; \ - ${LN} -fs doc/en_US.ISO8859-1/books/faq ${DOCINSTALLDIR}/FAQ - cd ${DOCINSTALLDIR}; \ - ${LN} -fs doc/en_US.ISO8859-1/books/handbook ${DOCINSTALLDIR}/handbook - LINBOT?= ${PREFIX}/bin/linbot LINBOTOPTS?= -ab LINBOTDIR?= /linbot LINBOTINSTALLDIR?= ${DESTDIR}${LINBOTDIR} LINBOTURL?= http://www.FreeBSD.org/ linbot: @[ -d ${LINBOTINSTALLDIR} ] || ${MKDIR} ${LINBOTINSTALLDIR} ${LINBOT} ${LINBOTOPTS} -o ${LINBOTINSTALLDIR} ${LINBOTURL} .include "${WEB_PREFIX}/share/mk/web.site.mk" diff --git a/en/handbook/Makefile b/en/handbook/Makefile index f0905b4585..6d435b2ce5 100644 --- a/en/handbook/Makefile +++ b/en/handbook/Makefile @@ -1,26 +1,12 @@ -# -# $FreeBSD: www/en/handbook/Makefile,v 1.7 2001/06/11 02:39:00 ache Exp $ -# +# $FreeBSD: www/en/docproj/Makefile,v 1.9 2001/07/31 00:24:23 murray Exp $ .if exists(../Makefile.conf) .include "../Makefile.conf" .endif .if exists(../Makefile.inc) .include "../Makefile.inc" .endif -# At build time, we have to link to the doc/ directory at the same level -# as the www/ tree. -all: - ${LN} -fs ${.OBJDIR}/../../../doc/en_US.ISO8859-1/books/handbook/* . - -# At install time the ../doc/ directory has been populated, so we can -# link in to there instead. -install: - [ -d ${DOCINSTALLDIR} ] || ${MKDIR} ${DOCINSTALLDIR} - cd ${DOCINSTALLDIR}; \ - ${LN} -fs ../doc/en_US.ISO8859-1/books/handbook/* \ - ${DOCINSTALLDIR} +DATA= index.html .include "${WEB_PREFIX}/share/mk/web.site.mk" - diff --git a/en/handbook/index.html b/en/handbook/index.html new file mode 100644 index 0000000000..add51e86b9 --- /dev/null +++ b/en/handbook/index.html @@ -0,0 +1,14 @@ + + + + The Handbook has moved + + + +

The Handbook is no longer accessible at this location. Please use + ../doc/en_US.ISO8859-1/books/handbook/index.html + to reach it. You should be automatically redirected there in a few + seconds. If not, please follow the link, and update your bookmarks. + We apologise for the inconvenience.

+ +