diff --git a/data/Makefile b/data/Makefile index 9bac096af4..2818943420 100644 --- a/data/Makefile +++ b/data/Makefile @@ -1,45 +1,45 @@ -# $Id: Makefile,v 1.4 1996-09-28 23:51:36 jfieber Exp $ +# $Id: Makefile,v 1.5 1996-11-06 07:30:40 jkh Exp $ # These are turned into validated, normalized HTML files. -DOCS= about.sgml commercial.sgml daemon.sgml docproj.sgml docs.sgml -DOCS+= gallery.sgml index-site.sgml index.sgml license.sgml +DOCS= about.sgml branch.sgml commercial.sgml daemon.sgml docproj.sgml +DOCS+= docs.sgml gallery.sgml index-site.sgml index.sgml license.sgml DOCS+= mailto.sgml newsflash.sgml searchhints.sgml support.sgml DOCS+= welcome.sgml where.sgml search.sgml send-pr.sgml DOCS+= internet.sgml features.sgml applications.sgml availability.sgml # These will be directly installed. DATA= COPYING COPYING.LIB README.mirror robots.txt # Files or targets listed here are defined in this file. LOCAL= stats.html stats-img.html stats.html: /home/www/server/logs/access_log (cd /usr/local/www/server/logs;zcat access_log.*.gz;cat access_log) | \ egrep -iv '\.(gif|jpg|jpeg|au) ' | \ /usr/local/www/bin/analog +i0 +R500 -o > ${.TARGET} stats-img.html: /home/www/server/logs/access_log (cd /usr/local/www/server/logs;zcat access_log.*.gz;cat access_log) | \ /usr/local/www/bin/analog +i0 +R500 -o > ${.TARGET} # Subdirectories SUBDIR= cgi gifs ports releases tutorials # Subdirectories that have linuxdoc docs and makefiles that use # . DOCSUBDIR= FAQ handbook # Directories that need to be checked out from the # CVS repository. CVSDIR= FAQ handbook WEBDIR= data .include "web.mk" diff --git a/data/branch.sgml b/data/branch.sgml new file mode 100644 index 0000000000..c877ee73ed --- /dev/null +++ b/data/branch.sgml @@ -0,0 +1,112 @@ + + + %includes; +]> + +&header; + +From jkh, November 4th: + +

FreeBSD's development stream has, as of today, branched into the +2.2-RELEASE and 3.0-CURRENT +development streams. The 2.1-STABLE +branch is also still alive, soon to terminate (for real, this time) +with the impending release of FreeBSD-2.1.6.

+ +

This branch has occurred so that 2.2 may be readied for release +without impacting significant new developments, like SMP support, in the +mainstream -current branch. + +

Modulo any of our usual two-week slips here and there, here is +our release schedule for 96/97:

+ +

December 1996

+ +

January 1997

+ +

Spring 1997

+ + +

This is also probably as good a time as any to announce that new +XFree86 +3.2 binaries, with early Matrox +support, are available.

+ +

Thanks to The XFree86 project +for the timely binaries, which will be distributed with 2.2-RELEASE +(2.1.6 binaries are still pending but should be available before that +release).

+ +

Lest there be any confusion about the 2.1.6 and 2.2 releases +coming so close together, let me also just explain that the two branches of +development had really very little to do with one another, and the fact +that both branches came to release status around the same time was +simply how the scheduling worked out. When engineering is allowed +to do the scheduling, it rarely employs traditional marketing +strategems. :)

+ +

In summary:

+ + +

As always, *all* branches of FreeBSD development are available +from a single CVS repository which may be freely replicated +to your own machine (see the handbook) or +browsed via +the WEB. + +

Please don't hesitate to use this valuable resource!

+ +

+Note for CDROM customers: + +

If you are a regular FreeBSD +subscription customer +of Walnut Creek CDROM, you will receive +both 2.1.6 and 2.2 releases. Making each release a full CD +distribution was the only way of ensuring that each would meet the quality +expectations of each customer base, and any customer who feels they would +have preferred to receive only one release may contact the +the orders department at Walnut +Creek CDROM at any time for a full refund or credit towards the next +subscription issue.

+ +&footer; + + diff --git a/data/newsflash.sgml b/data/newsflash.sgml index c1a388b055..824da97e0b 100644 --- a/data/newsflash.sgml +++ b/data/newsflash.sgml @@ -1,592 +1,600 @@ + %includes; ]> - + &header;

FreeBSD is a is a rapidly developing operating system. Keeping up on the latest developments can be a chore! To keep on top of things, be sure and check this page periodically. Also, you may wish to subscribe to the freebsd-announce mailing list.

+

November 1996

+ +

October 1996

August 1996

July 1996

June 1996

May 1996

April 1996

March 1996

November 1995

October 1995

September 1995

August 1995

July 1995

June 1995

May 1995

April 1995

March 1995

February 1995

January 1995

December 1994

&footer; diff --git a/en/Makefile b/en/Makefile index 9bac096af4..2818943420 100644 --- a/en/Makefile +++ b/en/Makefile @@ -1,45 +1,45 @@ -# $Id: Makefile,v 1.4 1996-09-28 23:51:36 jfieber Exp $ +# $Id: Makefile,v 1.5 1996-11-06 07:30:40 jkh Exp $ # These are turned into validated, normalized HTML files. -DOCS= about.sgml commercial.sgml daemon.sgml docproj.sgml docs.sgml -DOCS+= gallery.sgml index-site.sgml index.sgml license.sgml +DOCS= about.sgml branch.sgml commercial.sgml daemon.sgml docproj.sgml +DOCS+= docs.sgml gallery.sgml index-site.sgml index.sgml license.sgml DOCS+= mailto.sgml newsflash.sgml searchhints.sgml support.sgml DOCS+= welcome.sgml where.sgml search.sgml send-pr.sgml DOCS+= internet.sgml features.sgml applications.sgml availability.sgml # These will be directly installed. DATA= COPYING COPYING.LIB README.mirror robots.txt # Files or targets listed here are defined in this file. LOCAL= stats.html stats-img.html stats.html: /home/www/server/logs/access_log (cd /usr/local/www/server/logs;zcat access_log.*.gz;cat access_log) | \ egrep -iv '\.(gif|jpg|jpeg|au) ' | \ /usr/local/www/bin/analog +i0 +R500 -o > ${.TARGET} stats-img.html: /home/www/server/logs/access_log (cd /usr/local/www/server/logs;zcat access_log.*.gz;cat access_log) | \ /usr/local/www/bin/analog +i0 +R500 -o > ${.TARGET} # Subdirectories SUBDIR= cgi gifs ports releases tutorials # Subdirectories that have linuxdoc docs and makefiles that use # . DOCSUBDIR= FAQ handbook # Directories that need to be checked out from the # CVS repository. CVSDIR= FAQ handbook WEBDIR= data .include "web.mk" diff --git a/en/branch.sgml b/en/branch.sgml new file mode 100644 index 0000000000..c877ee73ed --- /dev/null +++ b/en/branch.sgml @@ -0,0 +1,112 @@ + + + %includes; +]> + +&header; + +From jkh, November 4th: + +

FreeBSD's development stream has, as of today, branched into the +2.2-RELEASE and 3.0-CURRENT +development streams. The 2.1-STABLE +branch is also still alive, soon to terminate (for real, this time) +with the impending release of FreeBSD-2.1.6.

+ +

This branch has occurred so that 2.2 may be readied for release +without impacting significant new developments, like SMP support, in the +mainstream -current branch. + +

Modulo any of our usual two-week slips here and there, here is +our release schedule for 96/97:

+ +

December 1996

+ +

January 1997

+ +

Spring 1997

+ + +

This is also probably as good a time as any to announce that new +XFree86 +3.2 binaries, with early Matrox +support, are available.

+ +

Thanks to The XFree86 project +for the timely binaries, which will be distributed with 2.2-RELEASE +(2.1.6 binaries are still pending but should be available before that +release).

+ +

Lest there be any confusion about the 2.1.6 and 2.2 releases +coming so close together, let me also just explain that the two branches of +development had really very little to do with one another, and the fact +that both branches came to release status around the same time was +simply how the scheduling worked out. When engineering is allowed +to do the scheduling, it rarely employs traditional marketing +strategems. :)

+ +

In summary:

+ + +

As always, *all* branches of FreeBSD development are available +from a single CVS repository which may be freely replicated +to your own machine (see the handbook) or +browsed via +the WEB. + +

Please don't hesitate to use this valuable resource!

+ +

+Note for CDROM customers: + +

If you are a regular FreeBSD +subscription customer +of Walnut Creek CDROM, you will receive +both 2.1.6 and 2.2 releases. Making each release a full CD +distribution was the only way of ensuring that each would meet the quality +expectations of each customer base, and any customer who feels they would +have preferred to receive only one release may contact the +the orders department at Walnut +Creek CDROM at any time for a full refund or credit towards the next +subscription issue.

+ +&footer; + + diff --git a/en/news/newsflash.sgml b/en/news/newsflash.sgml index c1a388b055..824da97e0b 100644 --- a/en/news/newsflash.sgml +++ b/en/news/newsflash.sgml @@ -1,592 +1,600 @@ + %includes; ]> - + &header;

FreeBSD is a is a rapidly developing operating system. Keeping up on the latest developments can be a chore! To keep on top of things, be sure and check this page periodically. Also, you may wish to subscribe to the freebsd-announce mailing list.

+

November 1996

+ +

October 1996

August 1996

July 1996

June 1996

May 1996

April 1996

March 1996

November 1995

October 1995

September 1995

August 1995

July 1995

June 1995

May 1995

April 1995

March 1995

February 1995

January 1995

December 1994

&footer;