diff --git a/en/FAQ/Makefile b/en/FAQ/Makefile index 35bd3e6fa3..7305464eb4 100644 --- a/en/FAQ/Makefile +++ b/en/FAQ/Makefile @@ -1,11 +1,26 @@ # -# $FreeBSD: www/en/FAQ/Makefile,v 1.3 1999/09/06 07:02:39 peter Exp $ +# $FreeBSD: www/en/FAQ/Makefile,v 1.4 1999/09/15 20:37:03 wosch Exp $ # # Build the FreeBSD FAQ *outside* of the www tree, and install it # in to the right place as necessary. -all install clean: - (cd ../../../doc/en_US.ISO_8859-1/books/faq && ${MAKE} 'FORMATS=html-split html' DESTDIR=${DESTDIR}/data/FAQ ${.TARGET}) -.if make(install) - (cd ${DESTDIR}/data/FAQ; ln -sf index.html FAQ.html) +.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 ${.CURDIR}/../../../doc/en_US.ISO_8859-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.ISO_8859-1/books/faq/* ${DOCINSTALLDIR}) + +.include "${WEB_PREFIX}/share/mk/web.site.mk" + diff --git a/en/Makefile b/en/Makefile index 4d6a0d1c6d..31da9ae988 100644 --- a/en/Makefile +++ b/en/Makefile @@ -1,75 +1,76 @@ -# $FreeBSD: www/en/Makefile,v 1.60 2001/02/24 10:31:28 wosch Exp $ +# $FreeBSD: www/en/Makefile,v 1.61 2001/02/25 12:00:49 alex 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+= index.sgml DOCS+= internet.sgml DOCS+= mailto.sgml DOCS+= publish.sgml DOCS+= send-pr.sgml DOCS+= support.sgml DOCS+= where.sgml DOCS+= y2kbug.sgml # These will be directly installed. DATA= robots.txt # Subdirectories # SGML SUBDIR= security SUBDIR+= commercial +SUBDIR+= doc SUBDIR+= docproj SUBDIR+= news SUBDIR+= alpha SUBDIR+= internal SUBDIR+= java SUBDIR+= copyright SUBDIR+= search SUBDIR+= gallery SUBDIR+= projects SUBDIR+= platforms SUBDIR+= releases SUBDIR+= smp SUBDIR+= conspectus .if !defined(WEB_ONLY) || empty(WEB_ONLY) SUBDIR+= ports .endif +# These *must* be listed after the "doc" subdir, as they create symlinks +# in to it. +SUBDIR+= FAQ +SUBDIR+= handbook +SUBDIR+= tutorials + # Non-SGML SUBDIR+= gifs SUBDIR+= cgi WEB_LANG?= ja es ru zh de # Non-English .if !defined(ENGLISH_ONLY) || empty(ENGLISH_ONLY) .for DIR in ${WEB_LANG} -SUBDIR+= ../${DIR} +#SUBDIR+= ../${DIR} .endfor .endif -.if !defined(WEB_ONLY) || empty(WEB_ONLY) -# Extern -SUBDIR+= tutorials - -DOCSUBDIR= FAQ handbook -.endif SGMLOPTS+= -links -hdr ${.CURDIR}/doc.hdr -ftr ${.CURDIR}/doc.ftr WEBDIR= data .include "${WEB_PREFIX}/share/mk/web.site.mk" diff --git a/en/docs/Makefile b/en/doc/Makefile similarity index 60% rename from en/docs/Makefile rename to en/doc/Makefile index 1e2e0d3d19..6c43caf2f1 100644 --- a/en/docs/Makefile +++ b/en/doc/Makefile @@ -1,13 +1,13 @@ # -# $FreeBSD: www/en/docs/Makefile,v 1.2 2001/02/23 10:13:49 nik Exp $i +# $FreeBSD: www/en/docs/Makefile,v 1.3 2001/02/24 18:04:10 nik Exp $i # # Build the FreeBSD documentation *outside* of the www tree, and install it # in to the right place as necessary. # # 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. # all install clean: - (cd ../../../doc/en_US.ISO_8859-1 && unset DESTDIR || ${MAKE} FORMATS=html-split DOCDIR=${DESTDIR}/data/docs ${.TARGET}) + (unset DESTDIR || true; cd ${.CURDIR}/../../../doc/en_US.ISO_8859-1 && ${MAKE} FORMATS=html-split DOCDIR=${DESTDIR}/data/doc ${.TARGET}) diff --git a/en/docs.sgml b/en/docs.sgml index 152c719041..4c0c41cae8 100644 --- a/en/docs.sgml +++ b/en/docs.sgml @@ -1,347 +1,353 @@ + %includes; ]> - + &header;

A wide variety of documentation is available for FreeBSD, on this web site, on other web sites, and available over the counter.

On this site

All the documentation on this site can be downloaded in a variety of different formats (HTML, Postscript, PDF, and more) and compression schemes (GZip, BZip2, Zip) from the FreeBSD FTP site.

This documentation is provided and maintained by the FreeBSD Documentation Project, and we are always looking for people to contribute new documentation and maintain existing documentation.

Books

-

The FreeBSD FAQ
+

The FreeBSD + FAQ
Frequently Asked Questions, and answers, covering all aspects of FreeBSD.

-

The FreeBSD Handbook
+

The FreeBSD + Handbook
A constantly evolving, comprehensive resource for FreeBSD users.

-

Chapter 2 of "The - Design and Implementation of the 4.4BSD Operating System"
+

Chapter 2 + of "The Design and Implementation of the 4.4BSD Operating + System"
Donated by Addison-Wesley, provides a design overview of 4.4BSD, from which FreeBSD was originally derived.

-

The Pedantic PPP - Primer
+

The Pedantic + PPP Primer
Everything you need to know about configuring PPP on FreeBSD.

-

The Porter's Handbook
+

The Porter's + Handbook
Essential reading if you plan on providing a port of a third party piece of software.

-

The FreeBSD Documentation Project - Primer for New Contributors
+

The FreeBSD + Documentation Project Primer for New Contributors
Everything you need to know in order to start contributing to the FreeBSD Documentation Project.

Articles

-

The Committer's - Guide
+

The + Committer's Guide
Introductory information for FreeBSD committers.

-

Dialup +

Dialup firewalling with FreeBSD
How to set up a firewall using PPP and ipfw over a dialup link with dynamically assigned IP addresses.

-

Creating a diskless X - server
+

Creating + a diskless X server
How to create a diskless X server.

-

Fonts and FreeBSD
+

Fonts and + FreeBSD
A description of the various font technologies in FreeBSD, and how to use them with different programs.

-

Formatting media - on FreeBSD
+

Formatting + media on FreeBSD
How to slice, partition, and format fixed and removable media on FreeBSD.

-

How to get the - best results from the FreeBSD-questions mailing list
+

How + to get the best results from the FreeBSD-questions mailing list
Tips and tricks to help you maximise the chances of getting useful information from the -questions mailing list.

-

An MH Primer
+

An MH + Primer
An introduction to using the MH mail reader on FreeBSD.

-

Using FreeBSD with other - operating systems
+

Using + FreeBSD with other operating systems
How to install FreeBSD alongside one or more different operating systems on the same computer.

-

FreeBSD First - Steps
+

FreeBSD + First Steps
For people coming to FreeBSD and Unix for the first time.

-

Programming +

Programming Tools on FreeBSD
A user's guide to the various tools for software development on FreeBSD.

-

Zip-drives and - FreeBSD
+

Zip-drives + and FreeBSD
How to format, mount, and use an Iomega Zip (SCSI, IDE, or parallel) Drive on FreeBSD.

Manual pages

FreeBSD
For release: 1.0, 1.1, 1.1.5.1, 2.0, 2.0.5, 2.1.0, 2.1.5, 2.1.6.1, 2.1.7.1, 2.2.1, 2.2.2, 2.2.5, 2.2.6, 2.2.7, 2.2.8, 3.0, 3.1, 3.2, 3.3, 3.4, 3.5.1, 4.0, 4.1, 4.2, 5.0-current, Ports.
Other Systems
Unix Seventh Edition (V7), 2.8BSD, 2.9.1BSD, 2.10BSD, 2.11BSD, 4.3BSD Reno, NET/2, 386BSD 0.1, 4.4BSD Lite2, Linux, NetBSD, OpenBSD, Plan 9, SunOS 4.x, SunOS 5.x, ULTRIX 4.2, and XFree86.

Other documentation

4.4BSD Documents: This is a hypertext version of the 4.4BSD documents from /usr/share/doc, where you will find the documents on a FreeBSD machine (if you install the doc distribution).

Info Documents: This is a hypertext version of the Info documents from /usr/share/info, where you will find the Info documents on a FreeBSD machine (if you install the info distribution).

On other web sites

Various independent efforts have also produced a great deal of useful information about FreeBSD.

Books

Articles

Links

In the real world...

FreeBSD in the Press

Articles in the press about FreeBSD.

Additional resources

Year 2000 Compatibility

The FreeBSD project's current statement about its Year 2000 compatibility.

FreeBSD Real-Quick (TM) Newsletter (RQN)

A monthly (sometimes bi-weekly) newsletter announcing recent developments in the FreeBSD arena. Subscribe to freebsd-announce to receive this newsletter via e-mail.

The Source Code

If you like digging your fingers into source code, here is a hypertext version of the FreeBSD kernel source. This is brought to you courtesy of Warren Toomey.

Daemon News

The industry leader in BSD news.

The FreeBSD 'zine

A monthly collection of easy to read (we hope) articles written by FreeBSD users and administrators just like you.

Like FreeBSD itself, this documentation is the product of a volunteer effort. The goals of the project are outlined here, as are the procedures for submitting corrections and new material.

The FreeBSD Diary

The FreeBSD Diary is a collection of how-to entries aimed at UNIX novices. The aim is to provide a set of step-by-step guides to installing and configuring various ports.

&footer; diff --git a/en/handbook/Makefile b/en/handbook/Makefile index 4ba2e70d7c..4a99aa7be5 100644 --- a/en/handbook/Makefile +++ b/en/handbook/Makefile @@ -1,18 +1,24 @@ # -# $FreeBSD: www/en/handbook/Makefile,v 1.4 1999/09/06 07:02:45 peter Exp $ -# -# 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/en_US.ISO_8859-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: www/en/FAQ/Makefile,v 1.4 1999/09/15 20:37:03 wosch Exp $ # -all install clean: - (cd ../../../doc/en_US.ISO_8859-1/books/handbook && ${MAKE} FORMATS=html-split DESTDIR=${DESTDIR}/data/handbook ${.TARGET}) +.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 ${.CURDIR}/../../../doc/en_US.ISO_8859-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.ISO_8859-1/books/handbook/* ${DOCINSTALLDIR}) + +.include "${WEB_PREFIX}/share/mk/web.site.mk" +