From owner-freebsd-doc Sun Dec 1 23:10:15 2002
Delivered-To: freebsd-doc@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
by hub.freebsd.org (Postfix) with ESMTP id 03F3437B404
for ; Sun, 1 Dec 2002 23:10:06 -0800 (PST)
Received: from mail.ruhr.de (in-ruhr4.ruhr.de [212.23.134.2])
by mx1.FreeBSD.org (Postfix) with SMTP id C5F1343EBE
for ; Sun, 1 Dec 2002 23:10:03 -0800 (PST)
(envelope-from ue@nathan.ruhr.de)
Received: (qmail 9974 invoked by uid 10); 2 Dec 2002 07:10:02 -0000
Received: from nathan.internal (localhost [127.0.0.1])
by nathan.internal (8.12.6/8.12.6) with ESMTP id gB2716GM047291;
Mon, 2 Dec 2002 08:01:06 +0100 (CET)
(envelope-from ue@nathan.internal)
Received: (from ue@localhost)
by nathan.internal (8.12.6/8.12.6/Submit) id gB2716Ej047290;
Mon, 2 Dec 2002 08:01:06 +0100 (CET)
Date: Mon, 2 Dec 2002 08:01:05 +0100
From: Udo Erdelhoff
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>
Reply-To: freebsd-doc@freebsd.org
Mail-Followup-To: freebsd-doc@freebsd.org, freebsd-www@freebsd.org
Mime-Version: 1.0
Content-Type: multipart/mixed; boundary="xHFwDpU9dbj6ez1V"
Content-Disposition: inline
User-Agent: Mutt/1.4i
Sender: owner-freebsd-doc@FreeBSD.ORG
Precedence: bulk
List-ID:
List-Archive: (Web Archive)
List-Help: (List Instructions)
List-Subscribe:
List-Unsubscribe:
X-Loop: FreeBSD.org
--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 @@
-
+
%includes;
]>
@@ -28,7 +28,7 @@
Bitte werfen Sie einen Blick auf den Teil des Handbuch, der
die
unterstützten
+ href="doc/de_DE.ISO8859-1/books/handbook/install-hw.html">unterstützten
Konfigurationen beschreibt.
@@ -44,10 +44,10 @@
Für weitere Informationen werfen Sie bitte einen Blick
in das Handbuch.
Im Handbuch finden Sie außerdem ein Kapitel,
+ href="doc/de_DE.ISO8859-1/books/handbook/install.html">Kapitel,
daß sich weiterführend mit der Installation von
FreeBSD beschäftigt.
'>
&author; &date;'>
-
-'>
-'>
+
+
+
+
+
+
+
+
+
+
@@ -73,6 +98,9 @@
+
+
+
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 @@
+
+
+
+ Der FAQ ist umgezogen
+
+
+
+
Das Handbuch ist nicht mehr unter dieser URL verfügbar. Bitte
+ wechseln Sie zu ../doc/de_DE.ISO8859-1/books/handbook/index.html,
+ 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.
+
+
+
+
--xHFwDpU9dbj6ez1V--
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-doc" in the body of the message