Merge the following changes in the English version:

news/Makefile  : 1.9 -> 1.12
    news/news.sgml : 1.6 -> 1.9
This commit is contained in:
Motoyuki Konno 1999-02-02 16:52:54 +00:00
parent f8f15fe702
commit 1cc3045b3b
Notes: svn2git 2020-12-08 03:00:23 +00:00
svn path=/www/; revision=4178
2 changed files with 18 additions and 6 deletions

View file

@ -1,6 +1,6 @@
# $Id: Makefile,v 1.9 1998-11-10 19:02:24 motoyuki Exp $ # $Id: Makefile,v 1.10 1999-02-02 16:52:54 motoyuki Exp $
# The FreeBSD Japanese Documentation Project # The FreeBSD Japanese Documentation Project
# Original revision: 1.9 # Original revision: 1.12
.if exists(../Makefile.conf) .if exists(../Makefile.conf)
.include "../Makefile.conf" .include "../Makefile.conf"
@ -14,11 +14,15 @@ DOCS+= qnewsletter-1-3.sgml
DOCS+= qnewsletter-1-4.sgml DOCS+= qnewsletter-1-4.sgml
DOCS+= qnewsletter-1-5.sgml DOCS+= qnewsletter-1-5.sgml
DOCS+= qnewsletter-1-6.sgml DOCS+= qnewsletter-1-6.sgml
#DOCS+= qnewsletter-1-7.sgml
DOCS+= press.sgml DOCS+= press.sgml
DOCS+= newsflash.sgml DOCS+= newsflash.sgml
DOCS+= news.sgml DOCS+= news.sgml
DOCS+= webchanges.sgml
# The yearly State of the Union address
#DOCS+= sou1999.sgml
INDEXLINK= news.html INDEXLINK= news.html

View file

@ -1,13 +1,13 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN" [ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN" [
<!ENTITY base CDATA ".."> <!ENTITY base CDATA "..">
<!ENTITY date "$Date: 1998-12-13 23:19:28 $"> <!ENTITY date "$Date: 1999-02-02 16:52:54 $">
<!ENTITY title "FreeBSD News"> <!ENTITY title "FreeBSD News">
<!ENTITY % includes SYSTEM "../includes.sgml"> %includes; <!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
<!ENTITY % newsincludes SYSTEM "includes.sgml"> %newsincludes; <!ENTITY % newsincludes SYSTEM "includes.sgml"> %newsincludes;
]> ]>
<!-- $Id: news.sgml,v 1.7 1998-12-13 23:19:28 steve Exp $ --> <!-- $Id: news.sgml,v 1.8 1999-02-02 16:52:54 motoyuki Exp $ -->
<!-- The FreeBSD Japanese Documentation Project --> <!-- The FreeBSD Japanese Documentation Project -->
<!-- Original revision: 1.6 --> <!-- Original revision: 1.9 -->
<html> <html>
&header; &header;
@ -26,9 +26,17 @@ FreeBSD Really-Quick(TM)
<h2><A HREF="../publish.html#newsletter">ニュースレター</A></h2> <h2><A HREF="../publish.html#newsletter">ニュースレター</A></h2>
<p>FreeBSD ニュースレター.</p> <p>FreeBSD ニュースレター.</p>
<h2><a href="webchanges.html">FreeBSD Web サーバーの変更点</a></h2>
<p></p>
<h2><a href="http://www.daemonnews.org/">デーモンニュース</a></h2> <h2><a href="http://www.daemonnews.org/">デーモンニュース</a></h2>
<p>BSD ニュースのリーダー.</p> <p>BSD ニュースのリーダー.</p>
<h2><a href="http://www.freebsdzine.org/">FreeBSD ezine</a></h2>
<p>FreeBSD 'zine は月刊で, FreeBSD ユーザや管理者のために書かれた読みやすい
記事を集めています.
</p>
&footer; &footer;
</body> </body>
</html> </html>