Date: Mon, 2 Dec 2002 08:01:05 +0100 From: Udo Erdelhoff <ue@nathan.ruhr.de> To: freebsd-doc@freebsd.org Cc: freebsd-www@freebsd.org Subject: [REVIEW]: Unstalling the de part of www.freebsd.org Message-ID: <20021202070105.GE214@nathan.ruhr.de>
next in thread | raw e-mail | index | archive | help
--xHFwDpU9dbj6ez1V
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Hi all,
www.freebsd.org/de has been rotting along for some time. I want to
change that and have at least the FAQ, handbook and release notes
up-to-date and in an up-to-date framework before 5.0-RELEASE. The
first part along this rocky road is to update the framework to
match the english version after Nik's no-more-symlinks change of
June 2002 (FAQ/Makefile, handbook/Makefile revsision 1.8, and all
the introduction of /usr/www/en/doc).
The attached patch does just that for the DE version, along with some
additional updates to the existing .sgml files required to keep the
stuff building when I add the release notes. The stuff builds just
fine on my local box, but I prefer to have it looked at by a larger
audience before I screw up www.freebsd.org.
/s/Udo
--
I came; I saw; I fucked up
--xHFwDpU9dbj6ez1V
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename=de-www-ng
Index: Makefile
===================================================================
RCS file: /home/ncvs/www/de/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- Makefile 12 Dec 2001 11:57:36 -0000 1.2
+++ Makefile 2 Dec 2002 05:08:39 -0000
@@ -24,16 +24,18 @@
# Subdirectories
# SGML
-#.if !defined(WEB_ONLY) || empty(WEB_ONLY)
-#SUBDIR+= ports
-#.endif
+SUBIDR= FAQ
+SUBIDR+= handbook
+.if !defined(WEB_ONLY) || empty(WEB_ONLY)
+SUBDIR+= doc
+.endif
+# These *must* be listed after the "doc" subdir, as they create symlinks
+# in to it.
.if !defined(WEB_ONLY) || empty(WEB_ONLY)
-# Extern
#SUBDIR+= tutorials
-
-DOCSUBDIR= FAQ handbook
.endif
+
SGMLFLAGS+= -links -hdr ${.CURDIR}/doc.hdr -ftr ${.CURDIR}/doc.ftr
WEBDIR= data/de
Index: availability.sgml
===================================================================
RCS file: /home/ncvs/www/de/availability.sgml,v
retrieving revision 1.2
diff -u -r1.2 availability.sgml
--- availability.sgml 26 Feb 2001 13:46:38 -0000 1.2
+++ availability.sgml 2 Dec 2002 06:42:33 -0000
@@ -1,12 +1,12 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN" [
-<!ENTITY date "$FreeBSD: www/de/availability.sgml,v 1.2 2001/02/26 13:46:38 alex Exp $">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
+<!ENTITY date "$FreeBSD$">
<!ENTITY title "About FreeBSD's availability">
<!ENTITY % includes SYSTEM "includes.sgml"> %includes;
]>
<!--
$FreeBSDde: de-www/availability.sgml,v 1.3 2001/02/26 13:44:47 alex Exp $
- $FreeBSD: www/de/availability.sgml,v 1.2 2001/02/26 13:46:38 alex Exp $
- Original version: 1.27
+ $FreeBSD$
+ Original version: 1.32
-->
<html>
@@ -28,7 +28,7 @@
Bitte werfen Sie einen Blick auf den Teil des Handbuch, der
die
<a
- href="&base;/../handbook/install-hw.html">unterstützten
+ href="doc/de_DE.ISO8859-1/books/handbook/install-hw.html">unterstützten
Konfigurationen</a> beschreibt.</p>
</blockquote>
@@ -44,10 +44,10 @@
<p>Für weitere Informationen werfen Sie bitte einen Blick
in das <a
- href="&base;/../handbook/mirrors.html">Handbuch</a>.</p>
+ href="doc/de_DE.ISO8859-1/books/handbook/mirrors.html">Handbuch</a>.</p>
<p>Im Handbuch finden Sie außerdem ein <a
- href="&base;/../handbook/install.html">Kapitel</a>,
+ href="doc/de_DE.ISO8859-1/books/handbook/install.html">Kapitel</a>,
daß sich weiterführend mit der Installation von
FreeBSD beschäftigt.</p>
</blockquote>
@@ -59,17 +59,17 @@
<p>FreeBSD wird entwickelt und betreut von einem weltweiten Team
aus Programmierern. <a href="mailto:jkh@FreeBSD.ORG">Jordan
Hubbard,</a>, einer der Gründer des Projektes, hat kurz
- die <a href="&base/../handbook/history.html">Geschichte</a>
+ die <a href="doc/de_DE.ISO8859-1/books/handbook/history.html">Geschichte</a>
des Projekts beschrieben. <a
- href="&base/handbook/staff-who.html">Wer für was
+ href="doc/de_DE.ISO8859-1/books/handbook/staff-who.html">Wer für was
verantwortlich ist</a>, gibt es auch zum Nachlesen. Für
Neugierige gibt es auch <a
href="http://www.FreeBSD.org/~jhs/freebsd/people.html">Bilder</a>;
von einigen Mitgliedern des Teams. Eine <a
- href="&base/handbook/contrib.html">vollständigere
+ href="doc/de_DE.ISO8859-1/books/handbook/contrib.html">vollständigere
Liste</a> von Leuten, die dem Projekt Ideen und Arbeit
beigesteuert haben, ist im <a
- href="&base/handbook/index.html">FreeBSD Handbuch</a> zu
+ href="doc/de_DE.ISO8859-1/books/handbook/index.html">FreeBSD Handbuch</a> zu
finden. FreeBSD ist ein offenes Projekt und heißt die
Hilfe von Leuten, die die Zeit und Fähigkeiten haben,
gerne willkommen.</p>
Index: includes.sgml
===================================================================
RCS file: /home/ncvs/www/de/includes.sgml,v
retrieving revision 1.3
diff -u -r1.3 includes.sgml
--- includes.sgml 28 Feb 2001 17:48:15 -0000 1.3
+++ includes.sgml 1 Dec 2002 22:40:22 -0000
@@ -1,7 +1,7 @@
<!--
- $FreeBSDde: de-www/includes.sgml,v 1.4 2001/02/26 11:43:46 alex Exp $
- $FreeBSD: www/de/includes.sgml,v 1.3 2001/02/28 17:48:15 wosch Exp $
- Original version: 1.36
+ $FreeBSDde: de-www/includes.sgml,v 1.7 2002/12/01 21:58:38 ue Exp $
+ $FreeBSD$
+ Original version: 1.53
-->
<!--
Base is the absolute URL for the given page, minus the actual page
@@ -10,8 +10,8 @@
<em>before</em> including this file if the page does not live at the
default location below.
- When making a link, use <a href="&base/mypage.html">foo</a> and
- &base will be expanded appropriately. Base is also used in the
+ When making a link, use <a href="&base;/mypage.html">foo</a> and
+ &base; will be expanded appropriately. Base is also used in the
definition of standard boilerplate entities in this file, so be sure
base is correct!
-->
@@ -20,47 +20,72 @@
<!ENTITY debase CDATA "http://www.de.FreeBSD.org/de">;
<!-- Images -->
-<!ENTITY i.daemon '<img src="&base/../gifs/daemon.gif" alt="" align="left" width="80" height="76">'>
-<!ENTITY i.new '<img src="&base/../gifs/new.gif" alt="[New!]" width="28" height="11">'>
+<!ENTITY i.daemon '<img src="&base;/../gifs/daemon.gif" alt="" align="left" width="80" height="76">'>
+<!ENTITY i.new '<img src="&base;/../gifs/new.gif" alt="[New!]" width="28" height="11">'>
<!-- Components making up the standard headers and footers. -->
<!-- Override in the prolog <em>before</em> including this -->
<!-- file if necessary. -->
-<!ENTITY copyright 'Copyright © 1995-2001 Das FreeBSD Projekt.
+<!ENTITY copyright 'Copyright © 1995-2002 Das FreeBSD Projekt.
Alle Rechte vorbehalten.'>
<!ENTITY email 'freebsd-questions'>
-<!ENTITY author '<a href="&base/../mailto.html">&email@FreeBSD.ORG</a><br>
+<!ENTITY author '<a href="&base;/../mailto.html">&email@FreeBSD.ORG</a><br>
©right;'>
<!ENTITY date ''>
-<!ENTITY home '<a href="&base/"><img src="&base/../gifs/home.gif"
+<!ENTITY home '<a href="&base;/index.html"><img src="&base;/../gifs/home.gif"
alt="FreeBSD Home Page" border="0" align="right" width="101" height="33"></a>'>
+<!ENTITY stylesheet '&base;/../freebsd.css'>
<!-- Standard headers and footers -->
-<!ENTITY header '<head><title>&title;</title></head><body
+<!ENTITY header '<head><title>&title;</title>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta name="MSSmartTagsPreventParsing" content="TRUE">
+<link rel="stylesheet" type="text/css" href="&stylesheet;"></head><body
text="#000000" bgcolor="#FFFFFF" alink="#FFCC33"><img
-src="&base/../gifs/bar.gif" alt="Navigation Bar" width="565" height="33" border="0" usemap="#bar">
+src="&base;/../gifs/bar.gif" alt="Navigation Bar" width="565" height="33" border="0" usemap="#bar">
<h1 align="left"><font color="#660000">&title;</font></h1><br clear="all">
<map name="bar">
-<area shape="rect" coords="1,1,111,31" href="&base/index.html" alt="Top">
-<area shape="rect" coords="112,11,196,31" href="&base/../ports/index.html" alt="Applications">
-<area shape="rect" coords="196,12,257,33" href="&base/../support.html" alt="Support">
-<area shape="rect" coords="256,12,365,33" href="&base/../docs.html" alt="Documentation">
-<area shape="rect" coords="366,13,424,32" href="&base/../commercial/commercial.html" alt="Vendors">
-<area shape="rect" coords="425,16,475,32" href="&base/../search/search.html" alt="Search">
-<area shape="rect" coords="477,16,516,33" href="&base/../search/index-site.html" alt="Index">
-<area shape="rect" coords="516,15,562,33" href="&base/index.html" alt="Top">
-<area shape="rect" href="&base/index.html" coords="0,0,564,32" alt="Top">
+<area shape="rect" coords="1,1,111,31" href="&base;/index.html" alt="Top">
+<area shape="rect" coords="112,11,196,31" href="&base;/../ports/index.html" alt="Applications">
+<area shape="rect" coords="196,12,257,33" href="&base;/../support.html" alt="Support">
+<area shape="rect" coords="256,12,365,33" href="&base;/../docs.html" alt="Documentation">
+<area shape="rect" coords="366,13,424,32" href="&base;/../commercial/commercial.html" alt="Vendors">
+<area shape="rect" coords="425,16,475,32" href="&base;/../search/search.html" alt="Search">
+<area shape="rect" coords="477,16,516,33" href="&base;/../search/index-site.html" alt="Index">
+<area shape="rect" coords="516,15,562,33" href="&base;/index.html" alt="Top">
+<area shape="rect" href="&base;/index.html" coords="0,0,564,32" alt="Top">
</map>'>
<!ENTITY footer '<HR NOSHADE>
<address>&author;<br>&date;</address>'>
-<!-- Short names for various anchor points -->
-<!ENTITY a.latest.not '<a href="&base/../releases/3.4R/notes.html">'>
-<!ENTITY a.latest.ann '<a href="&base/../releases/3.4R/announce.html">'>
+<!-- XXX rel.current and u.rel.* should be available in doc/ -->
+<!-- The currently released version of FreeBSD. This value is used to
+ create some links on web sites and such, so do NOT change it until
+ it's really release time. When you update this, you should also
+ update (at least) the following:
+
+ - similar entity in the Handbook
+ - similar entity in the Relnotes
+ - releases/index.sgml has the date of the current release
+ - the FAQ has links to the release FTP url
+ - "versions supported" in security.sgml
+
+ (If you're the release engineer, feel free to update this list with
+ other doc-related things you had to do. It'll save you time and
+ trouble the next time around :-).)
+-->
+<!ENTITY rel.current '4.7'>
+<!ENTITY rel.current.date 'October, 2002'>
+
+<!-- URLs to information on the latest release -->
+<!ENTITY u.rel.notes '&base;/releases/&rel.current;R/relnotes.html'>
+<!ENTITY u.rel.announce '&base;/releases/&rel.current;R/announce.html'>
+<!ENTITY u.rel.errata '&base;/releases/&rel.current;R/errata.html'>
+<!ENTITY u.rel.hardware '&base;/releases/&rel.current;R/hardware.html'>
<!-- macro for webbuild paper -->
@@ -73,6 +98,9 @@
<!ENTITY copy SDATA "[copy ]">
<!ENTITY reg SDATA "[reg ]">
<!ENTITY deg SDATA "[deg ]">
+<!ENTITY middot SDATA "[middot ]">
+<!ENTITY raquo SDATA "[raquo ]">
+<!ENTITY laquo SDATA "[laquo ]">
<!--
Local Variables:
Index: FAQ/Makefile
===================================================================
RCS file: /home/ncvs/www/de/FAQ/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- FAQ/Makefile 11 Jun 2001 02:38:51 -0000 1.2
+++ FAQ/Makefile 1 Dec 2002 23:02:28 -0000
@@ -1,13 +1,17 @@
#
# $FreeBSDde: de-www/FAQ/Makefile,v 1.1 2001/02/24 17:00:25 alex Exp $
-# $FreeBSD: www/de/FAQ/Makefile,v 1.2 2001/06/11 02:38:51 ache Exp $
-# Original revision: 1.4
+# $FreeBSD$
+# Original revision: 1.8
#
-# Build the FreeBSD FAQ *outside* of the www tree, and install it
-# in to the right place as necessary.
-all install clean:
- (cd ../../../doc/de_DE.ISO8859-1/books/faq && ${MAKE} 'FORMATS=html-split html' DESTDIR=${DESTDIR}/data/de/FAQ ${.TARGET})
-.if make(install)
- (cd ${DESTDIR}/data/de/FAQ; ln -sf index.html FAQ.html)
+.if exists(../Makefile.conf)
+.include "../Makefile.conf"
.endif
+.if exists(../Makefile.inc)
+.include "../Makefile.inc"
+.endif
+
+DATA= index.html
+
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
+
Index: FAQ/index.html
===================================================================
RCS file: FAQ/index.html
diff -N FAQ/index.html
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ FAQ/index.html 1 Dec 2002 22:50:30 -0000
@@ -0,0 +1,25 @@
+<html>
+ <head>
+ <meta http-equiv="refresh" content="5;url=../doc/de_DE.ISO8859-1/books/faq/index.html">
+ <title>Der FAQ ist umgezogen</title>
+ </head>
+
+ <body bgcolor="#ffffff">
+ <p>Der FAQ ist nicht mehr unter dieser URL verfügbar. Bitte
+ wechseln Sie zu <a
+ href="../doc/de_DE.ISO8859-1/books/faq/index.html">../doc/de_DE.ISO8859-1/books/faq/index.html</a>,
+ um ihn zu erreichen. Sie sollten innerhalb der nächsten
+ Sekunden automatisch dorthin weitergeleitet werden. Falls dies
+ nicht geschieht, aktualisieren Sie bitte ihre Lesezeichen und
+ folgen Sie dem Link. Wir möchten uns für alle
+ eventuell entstandenen Probleme entschuldigen.</p>
+ </body>
+</html>
+
+<!--
+ The FreeBSD Documentation Project
+ The FreeBSD German Documentation Project
+ $FreeBSDde$
+ $FreeBSD$
+ basiert auf: 1.1
+-->
Index: handbook/Makefile
===================================================================
RCS file: /home/ncvs/www/de/handbook/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- handbook/Makefile 11 Jun 2001 02:38:56 -0000 1.2
+++ handbook/Makefile 1 Dec 2002 23:12:56 -0000
@@ -1,20 +1,15 @@
#
# $FreeBSDde: de-www/handbook/Makefile,v 1.1 2001/02/24 17:00:26 alex Exp $
-# $FreeBSD: www/de/handbook/Makefile,v 1.2 2001/06/11 02:38:56 ache Exp $
-# Original revision: 1.5
-#
-# Build the FreeBSD Handbook *outside* of the www tree, and install it
-# in to the right place as necessary.
-#
-# The Handbook is no longer completely self contained in
-# doc/de_DE.ISO8859-1/books/handbook, (it requires support files outside of
-# this directory) and it is much simpler to build it outside the web tree
-# than it is to make a nest of symlinks to try and build it inside the tree.
-#
-# This assumes that you have the www/ and doc/ trees checked out beside
-# one another -- this was always the case anyway, so there are no extra
-# requirements here.
-#
+# $FreeBSD$
+# basiert auf: 1.9
-all install clean:
- (cd ../../../doc/de_DE.ISO8859-1/books/handbook && ${MAKE} FORMATS=html-split DESTDIR=${DESTDIR}/data/de/handbook ${.TARGET})
+.if exists(../Makefile.conf)
+.include "../Makefile.conf"
+.endif
+.if exists(../Makefile.inc)
+.include "../Makefile.inc"
+.endif
+
+DATA= index.html
+
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
Index: handbook/index.html
===================================================================
RCS file: handbook/index.html
diff -N handbook/index.html
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ handbook/index.html 1 Dec 2002 22:50:37 -0000
@@ -0,0 +1,25 @@
+<html>
+ <head>
+ <meta http-equiv="refresh" content="5;url=../doc/de_DE.ISO8859-1/books/handbook/index.html">
+ <title>Der FAQ ist umgezogen</title>
+ </head>
+
+ <body bgcolor="#ffffff">
+ <p>Das Handbuch ist nicht mehr unter dieser URL verfügbar. Bitte
+ wechseln Sie zu <a
+ href="../doc/de_DE.ISO8859-1/books/handbook/index.html">../doc/de_DE.ISO8859-1/books/handbook/index.html</a>,
+ um ihn zu erreichen. Sie sollten innerhalb der nächsten
+ Sekunden automatisch dorthin weitergeleitet werden. Falls dies
+ nicht geschieht, aktualisieren Sie bitte ihre Lesezeichen und
+ folgen Sie dem Link. Wir möchten uns für alle
+ eventuell entstandenen Probleme entschuldigen.</p>
+ </body>
+</html>
+
+<!--
+ The FreeBSD Documentation Project
+ The FreeBSD German Documentation Project
+ $FreeBSDde$
+ $FreeBSD$
+ basiert auf: 1.1
+-->
--xHFwDpU9dbj6ez1V--
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-doc" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20021202070105.GE214>