Stop creating symlinks to the /FAQ and /handbook directories from the

actual directories under /doc.  This broke inter-document links if
you started at http://www.freebsd.org/{FAQ,handbook}, instead of the
longer .../doc/en_US.ISO8859-1/books/{faq,handbook}, and has caused a
steady stream of complaints to -doc.

Instead, have a static index.html in both those directories with a
http-equiv="refresh" that points people to the right place.

Adjust the build process to take account of this.
This commit is contained in:
Nik Clayton 2002-06-27 19:55:40 +00:00
parent dcc2333cdf
commit a93c90cca5
Notes: svn2git 2020-12-08 03:00:23 +00:00
svn path=/www/; revision=13499
5 changed files with 35 additions and 54 deletions

View file

@ -1,8 +1,4 @@
#
# $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"
@ -11,17 +7,6 @@
.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"

14
en/FAQ/index.html Normal file
View file

@ -0,0 +1,14 @@
<html>
<head>
<meta http-equiv="refresh" content="5;url=../doc/en_US.ISO8859-1/books/faq/index.html">
<title>The FAQ has moved</title>
</head>
<body bgcolor="#ffffff">
<p>The FAQ is no longer accessible at this location. Please use
<a href="../doc/en_US.ISO8859-1/books/faq/index.html">../doc/en_US.ISO8859-1/books/faq/index.html</a>
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.</p>
</body>
</html>

View file

@ -1,4 +1,4 @@
# $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
@ -38,6 +38,8 @@ SUBDIR+= news
SUBDIR+= advocacy
SUBDIR+= events
SUBDIR+= FAQ
SUBDIR+= handbook
SUBDIR+= internal
SUBDIR+= java
SUBDIR+= copyright
@ -95,26 +97,6 @@ index.html: index.xsl news/news.xml news/press.xml includes.xsl news/includes.xs
-${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

View file

@ -1,6 +1,4 @@
#
# $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"
@ -9,18 +7,6 @@
.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"

14
en/handbook/index.html Normal file
View file

@ -0,0 +1,14 @@
<html>
<head>
<meta http-equiv="refresh" content="5;url=../doc/en_US.ISO8859-1/books/handbook/index.html">
<title>The Handbook has moved</title>
</head>
<body bgcolor="#ffffff">
<p>The Handbook is no longer accessible at this location. Please use
<a href="../doc/en_US.ISO8859-1/books/handbook/index.html">../doc/en_US.ISO8859-1/books/handbook/index.html</a>
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.</p>
</body>
</html>