Resolve conflicts.
This commit is contained in:
Masafumi Max NAKANE
parent
66649b6140
commit
abe0ecc722
Notes:
svn2git
2020-12-08 03:00:23 +00:00
svn path=/www/; revision=2201
8 changed files with 138 additions and 38 deletions
|
|
@ -1,10 +1,50 @@
|
|||
# $Id: Makefile,v 1.2 1997-11-21 18:32:52 jfieber Exp $
|
||||
# $Id: Makefile,v 1.3 1997-11-23 22:55:06 max Exp $
|
||||
# The FreeBSD Japanese Documentation Project
|
||||
# Original revision: 1.19
|
||||
|
||||
#CVSDIR= jp-handbook
|
||||
DOCSUBDIR= handbook FAQ
|
||||
.if exists(Makefile.conf)
|
||||
.include "Makefile.conf"
|
||||
.endif
|
||||
|
||||
# These are turned into validated, normalized HTML files.
|
||||
|
||||
DOCS= about.sgml applications.sgml auditors.sgml availability.sgml branch.sgml
|
||||
DOCS+= commercial.sgml daemon.sgml docproj.sgml docs.sgml
|
||||
DOCS+= features.sgml gallery.sgml index-site.sgml register.sgml
|
||||
DOCS+= internet.sgml license.sgml mailto.sgml mirror.sgml newsflash.sgml
|
||||
DOCS+= publish.sgml search.sgml searchhints.sgml
|
||||
DOCS+= send-pr.sgml security.sgml support.sgml where.sgml resignation.sgml
|
||||
DOCS+= jabout.sgml
|
||||
#DOCS+= cgallery.sgml npgallery.sgml pgallery.sgml
|
||||
|
||||
CLEANFILES+=atoz.sgml
|
||||
|
||||
# These will be directly installed.
|
||||
|
||||
DATA= index.html
|
||||
|
||||
# Files or targets listed here are defined in this file.
|
||||
|
||||
index-site.sgml: atoz.sgml
|
||||
atoz.sgml: web.atoz
|
||||
sort -fu web.atoz | perl ../atoz.pl > ${.TARGET}
|
||||
|
||||
# Subdirectories
|
||||
|
||||
#SUBDIR= cgi commercial gifs ports releases tutorials
|
||||
SUBDIR= ports releases
|
||||
|
||||
# Subdirectories that have linuxdoc docs and makefiles that use
|
||||
# <bsd.sgml.mk>.
|
||||
|
||||
DOCSUBDIR= FAQ handbook
|
||||
|
||||
# Directories that need to be checked out from the
|
||||
# CVS repository.
|
||||
|
||||
#CVSDIR= FAQ handbook
|
||||
|
||||
WEBDIR= data/ja_JP.EUC
|
||||
|
||||
.include "../web.mk"
|
||||
|
||||
# Override the defaults of generating all formats.
|
||||
|
||||
FORMATS=html
|
||||
|
|
|
|||
|
|
@ -1,4 +1,6 @@
|
|||
# $Id: Makefile.inc,v 1.2 1997-01-20 12:48:55 jfieber Exp $
|
||||
# $Id: Makefile.inc,v 1.3 1997-11-23 22:55:07 max Exp $
|
||||
# The FreeBSD Japanese Documentation Project
|
||||
# Original revision: 1.5
|
||||
|
||||
WEBBASE?= /data/ja_JP.EUC
|
||||
SGMLOPTS+= -hdr ${.CURDIR}/../doc.hdr -ftr ${.CURDIR}/../doc.ftr
|
||||
SGMLOPTS+= -links -hdr ${.CURDIR}/../doc.hdr -ftr ${.CURDIR}/../doc.ftr
|
||||
|
|
|
|||
|
|
@ -1,5 +1,10 @@
|
|||
<!-- $Id: doc.ftr,v 1.3 1997-11-23 22:55:09 max Exp $ -->
|
||||
<!-- The FreeBSD Japanese Documentation Project -->
|
||||
<!-- Original revision: 1.3 -->
|
||||
|
||||
<hr>
|
||||
<address>
|
||||
<a href="../../mailto.html">www@freebsd.org</a>
|
||||
<a href="../mailto.html">www@freebsd.org</a><br>
|
||||
@@UPDATE@@
|
||||
</address>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,14 +1,17 @@
|
|||
<!-- $Id: doc.hdr,v 1.4 1997-11-23 22:55:10 max Exp $ -->
|
||||
<!-- The FreeBSD Japanese Documentation Project -->
|
||||
<!-- Original revision: 1.5 -->
|
||||
|
||||
<IMG SRC="../../gifs/bar.gif" ALT="" WIDTH="565" HEIGHT="33" BORDER=0 usemap="#bar">
|
||||
<map name="bar">
|
||||
<area shape="rect" coords="1,1,111,31" href="../../index.html" ALT="">
|
||||
<area shape="rect" coords="112,11,196,31" href="../../ports/index.html" ALT="">
|
||||
<area shape="rect" coords="196,12,257,33" href="../../support.html" ALT="">
|
||||
<area shape="rect" coords="256,12,365,33" href="../../docs.html" ALT="">
|
||||
<area shape="rect" coords="366,13,424,32" href="../../commercial.html" ALT="">
|
||||
<area shape="rect" coords="425,16,475,32" href="../../search.html" ALT="">
|
||||
<area shape="rect" coords="477,16,516,33" href="../../index-site.html" ALT="">
|
||||
<area shape="rect" coords="516,15,562,33" href="../../index.html" ALT="">
|
||||
<area shape="rect" href="../../index.html" coords="0,0,564,32" ALT="">
|
||||
<area shape="rect" coords="1,1,111,31" href="../index.html" ALT="">
|
||||
<area shape="rect" coords="112,11,196,31" href="../ports/index.html" ALT="">
|
||||
<area shape="rect" coords="196,12,257,33" href="../support.html" ALT="">
|
||||
<area shape="rect" coords="256,12,365,33" href="../docs.html" ALT="">
|
||||
<area shape="rect" coords="366,13,424,32" href="../commercial.html" ALT="">
|
||||
<area shape="rect" coords="425,16,475,32" href="../search.html" ALT="">
|
||||
<area shape="rect" coords="477,16,516,33" href="../index-site.html" ALT="">
|
||||
<area shape="rect" coords="516,15,562,33" href="../index.html" ALT="">
|
||||
<area shape="rect" href="../index.html" coords="0,0,564,32" ALT="">
|
||||
</map>
|
||||
|
||||
<br clear=all>
|
||||
|
|
|
|||
52
ja/Makefile
52
ja/Makefile
|
|
@ -1,10 +1,50 @@
|
|||
# $Id: Makefile,v 1.2 1997-11-21 18:32:52 jfieber Exp $
|
||||
# $Id: Makefile,v 1.3 1997-11-23 22:55:06 max Exp $
|
||||
# The FreeBSD Japanese Documentation Project
|
||||
# Original revision: 1.19
|
||||
|
||||
#CVSDIR= jp-handbook
|
||||
DOCSUBDIR= handbook FAQ
|
||||
.if exists(Makefile.conf)
|
||||
.include "Makefile.conf"
|
||||
.endif
|
||||
|
||||
# These are turned into validated, normalized HTML files.
|
||||
|
||||
DOCS= about.sgml applications.sgml auditors.sgml availability.sgml branch.sgml
|
||||
DOCS+= commercial.sgml daemon.sgml docproj.sgml docs.sgml
|
||||
DOCS+= features.sgml gallery.sgml index-site.sgml register.sgml
|
||||
DOCS+= internet.sgml license.sgml mailto.sgml mirror.sgml newsflash.sgml
|
||||
DOCS+= publish.sgml search.sgml searchhints.sgml
|
||||
DOCS+= send-pr.sgml security.sgml support.sgml where.sgml resignation.sgml
|
||||
DOCS+= jabout.sgml
|
||||
#DOCS+= cgallery.sgml npgallery.sgml pgallery.sgml
|
||||
|
||||
CLEANFILES+=atoz.sgml
|
||||
|
||||
# These will be directly installed.
|
||||
|
||||
DATA= index.html
|
||||
|
||||
# Files or targets listed here are defined in this file.
|
||||
|
||||
index-site.sgml: atoz.sgml
|
||||
atoz.sgml: web.atoz
|
||||
sort -fu web.atoz | perl ../atoz.pl > ${.TARGET}
|
||||
|
||||
# Subdirectories
|
||||
|
||||
#SUBDIR= cgi commercial gifs ports releases tutorials
|
||||
SUBDIR= ports releases
|
||||
|
||||
# Subdirectories that have linuxdoc docs and makefiles that use
|
||||
# <bsd.sgml.mk>.
|
||||
|
||||
DOCSUBDIR= FAQ handbook
|
||||
|
||||
# Directories that need to be checked out from the
|
||||
# CVS repository.
|
||||
|
||||
#CVSDIR= FAQ handbook
|
||||
|
||||
WEBDIR= data/ja_JP.EUC
|
||||
|
||||
.include "../web.mk"
|
||||
|
||||
# Override the defaults of generating all formats.
|
||||
|
||||
FORMATS=html
|
||||
|
|
|
|||
|
|
@ -1,4 +1,6 @@
|
|||
# $Id: Makefile.inc,v 1.2 1997-01-20 12:48:55 jfieber Exp $
|
||||
# $Id: Makefile.inc,v 1.3 1997-11-23 22:55:07 max Exp $
|
||||
# The FreeBSD Japanese Documentation Project
|
||||
# Original revision: 1.5
|
||||
|
||||
WEBBASE?= /data/ja_JP.EUC
|
||||
SGMLOPTS+= -hdr ${.CURDIR}/../doc.hdr -ftr ${.CURDIR}/../doc.ftr
|
||||
SGMLOPTS+= -links -hdr ${.CURDIR}/../doc.hdr -ftr ${.CURDIR}/../doc.ftr
|
||||
|
|
|
|||
|
|
@ -1,5 +1,10 @@
|
|||
<!-- $Id: doc.ftr,v 1.3 1997-11-23 22:55:09 max Exp $ -->
|
||||
<!-- The FreeBSD Japanese Documentation Project -->
|
||||
<!-- Original revision: 1.3 -->
|
||||
|
||||
<hr>
|
||||
<address>
|
||||
<a href="../../mailto.html">www@freebsd.org</a>
|
||||
<a href="../mailto.html">www@freebsd.org</a><br>
|
||||
@@UPDATE@@
|
||||
</address>
|
||||
|
||||
|
|
|
|||
23
ja/doc.hdr
23
ja/doc.hdr
|
|
@ -1,14 +1,17 @@
|
|||
<!-- $Id: doc.hdr,v 1.4 1997-11-23 22:55:10 max Exp $ -->
|
||||
<!-- The FreeBSD Japanese Documentation Project -->
|
||||
<!-- Original revision: 1.5 -->
|
||||
|
||||
<IMG SRC="../../gifs/bar.gif" ALT="" WIDTH="565" HEIGHT="33" BORDER=0 usemap="#bar">
|
||||
<map name="bar">
|
||||
<area shape="rect" coords="1,1,111,31" href="../../index.html" ALT="">
|
||||
<area shape="rect" coords="112,11,196,31" href="../../ports/index.html" ALT="">
|
||||
<area shape="rect" coords="196,12,257,33" href="../../support.html" ALT="">
|
||||
<area shape="rect" coords="256,12,365,33" href="../../docs.html" ALT="">
|
||||
<area shape="rect" coords="366,13,424,32" href="../../commercial.html" ALT="">
|
||||
<area shape="rect" coords="425,16,475,32" href="../../search.html" ALT="">
|
||||
<area shape="rect" coords="477,16,516,33" href="../../index-site.html" ALT="">
|
||||
<area shape="rect" coords="516,15,562,33" href="../../index.html" ALT="">
|
||||
<area shape="rect" href="../../index.html" coords="0,0,564,32" ALT="">
|
||||
<area shape="rect" coords="1,1,111,31" href="../index.html" ALT="">
|
||||
<area shape="rect" coords="112,11,196,31" href="../ports/index.html" ALT="">
|
||||
<area shape="rect" coords="196,12,257,33" href="../support.html" ALT="">
|
||||
<area shape="rect" coords="256,12,365,33" href="../docs.html" ALT="">
|
||||
<area shape="rect" coords="366,13,424,32" href="../commercial.html" ALT="">
|
||||
<area shape="rect" coords="425,16,475,32" href="../search.html" ALT="">
|
||||
<area shape="rect" coords="477,16,516,33" href="../index-site.html" ALT="">
|
||||
<area shape="rect" coords="516,15,562,33" href="../index.html" ALT="">
|
||||
<area shape="rect" href="../index.html" coords="0,0,564,32" ALT="">
|
||||
</map>
|
||||
|
||||
<br clear=all>
|
||||
|
|
|
|||
Loading…
Reference in a new issue