From c73e1c2d88ff6532395dafd6e874d91104798f8f Mon Sep 17 00:00:00 2001
From: Hiroki Sato <hrs@FreeBSD.org>
Date: Sat, 24 Nov 2001 21:21:57 +0000
Subject: [PATCH] Merge the following from the English version:

	1.18  -> 1.22 	Makefile
	1.3   -> 1.4  	Makefile.inc
---
 ja_JP.eucJP/articles/Makefile     | 13 +++++++++----
 ja_JP.eucJP/articles/Makefile.inc |  4 ++--
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/ja_JP.eucJP/articles/Makefile b/ja_JP.eucJP/articles/Makefile
index 14103f608c..516e414b10 100644
--- a/ja_JP.eucJP/articles/Makefile
+++ b/ja_JP.eucJP/articles/Makefile
@@ -1,26 +1,31 @@
 # $FreeBSD$
-# Original revision: 1.18
+# Original revision: 1.22
 
-#SUBDIR = committers-guide
+SUBDIR =
+#SUBDIR+= committers-guide
 #SUBDIR+= console-server
-SUBDIR = contributors
+SUBDIR+= contributing
+SUBDIR+= contributors
+#SUBDIR+= cvsup-advanced
 SUBDIR+= dialup-firewall
 SUBDIR+= diskless-x
 #SUBDIR+= explaining-bsd
 #SUBDIR+= filtering-bridges
-#SUBDIR+= freebsd-questions
 SUBDIR+= fonts
 #SUBDIR+= formatting-media
+#SUBDIR+= freebsd-questions
 SUBDIR+= ipsec-must
 #SUBDIR+= laptop
 #SUBDIR+= mh
 SUBDIR+= multi-os
 #SUBDIR+= new-users
+#SUBDIR+= problem-reports
 #SUBDIR+= programming-tools
 #SUBDIR+= pxe
 #SUBDIR+= serial-uart
 #SUBDIR+= solid-state
 #SUBDIR+= storage-devices
+#SUBDIR+= vinum
 #SUBDIR+= vm-design
 SUBDIR+= zip-drive
 
diff --git a/ja_JP.eucJP/articles/Makefile.inc b/ja_JP.eucJP/articles/Makefile.inc
index a9df44cd97..e0577d837b 100644
--- a/ja_JP.eucJP/articles/Makefile.inc
+++ b/ja_JP.eucJP/articles/Makefile.inc
@@ -1,7 +1,7 @@
 # 
-# $FreeBSD: doc/ja_JP.eucJP/articles/Makefile.inc,v 1.1.1.1 2000/01/06 07:22:40 kuriyama Exp $
+# $FreeBSD$
 #
-# Original revision: 1.3
+# Original revision: 1.4
 
 TIDYFLAGS=      -raw