From owner-svn-doc-head@FreeBSD.ORG  Sat Jul 13 09:29:01 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 554E7BA5;
 Sat, 13 Jul 2013 09:29:01 +0000 (UTC)
 (envelope-from ryusuke@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 47C4C1874;
 Sat, 13 Jul 2013 09:29:01 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6D9T1FZ066481;
 Sat, 13 Jul 2013 09:29:01 GMT (envelope-from ryusuke@svn.freebsd.org)
Received: (from ryusuke@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6D9T17M066479;
 Sat, 13 Jul 2013 09:29:01 GMT (envelope-from ryusuke@svn.freebsd.org)
Message-Id: <201307130929.r6D9T17M066479@svn.freebsd.org>
From: Ryusuke SUZUKI <ryusuke@FreeBSD.org>
Date: Sat, 13 Jul 2013 09:29:01 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r42270 - head/ja_JP.eucJP/articles
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 13 Jul 2013 09:29:01 -0000

Author: ryusuke
Date: Sat Jul 13 09:29:00 2013
New Revision: 42270
URL: http://svnweb.freebsd.org/changeset/doc/42270

Log:
  - Merge the following from the English version:
  
  	r26047 -> r41535	head/ja_JP.eucJP/articles/Makefile

Modified:
  head/ja_JP.eucJP/articles/Makefile

Modified: head/ja_JP.eucJP/articles/Makefile
==============================================================================
--- head/ja_JP.eucJP/articles/Makefile	Sat Jul 13 07:39:52 2013	(r42269)
+++ head/ja_JP.eucJP/articles/Makefile	Sat Jul 13 09:29:00 2013	(r42270)
@@ -1,42 +1,51 @@
 # $FreeBSD$
-# Original revision: 1.47
+# Original revision: r41535
 
 SUBDIR =
 #SUBDIR+= bsdl-gpl
+#SUBDIR+= building-products
 #SUBDIR+= casestudy-argentina.com
 #SUBDIR+= committers-guide
+#SUBDIR+= compiz-fusion
 #SUBDIR+= console-server
 SUBDIR+= contributing
 #SUBDIR+= contributing-ports
 SUBDIR+= contributors
+#SUBDIR+= cups
+#SUBDIR+= custom-gcc
 #SUBDIR+= cvs-freebsd
-#SUBDIR+= cvsup-advanced
 #SUBDIR+= explaining-bsd
 SUBDIR+= fbsd-from-scratch
 #SUBDIR+= filtering-bridges
 SUBDIR+= fonts
 #SUBDIR+= freebsd-questions
+#SUBDIR+= freebsd-update-server
 #SUBDIR+= geom-class
-#SUBDIR+= hats
+#SUBDIR+= gjournal-desktop
 #SUBDIR+= hubs
 SUBDIR+= ipsec-must
-#SUBDIR+= java-tomcat
 #SUBDIR+= laptop
+#SUBDIR+= ldap-auth
 #SUBDIR+= linux-comparison
+#SUBDIR+= linux-emulation
+#SUBDIR+= linux-users
 #SUBDIR+= mailing-list-faq
 #SUBDIR+= mh
+#SUBDIR+= nanobsd
 #SUBDIR+= new-users
+#SUBDIR+= p4-primer
 #SUBDIR+= pam
+#SUBDIR+= port-mentor-guidelines
 #SUBDIR+= portbuild
 #SUBDIR+= pr-guidelines
 SUBDIR+= problem-reports
-#SUBDIR+= pxe
+#SUBDIR+= rc-scripting
 #SUBDIR+= relaydelay
 #SUBDIR+= releng
 #SUBDIR+= releng-packages
+#SUBDIR+= remote-install
 #SUBDIR+= serial-uart
 #SUBDIR+= solid-state
-#SUBDIR+= vinum
 #SUBDIR+= vm-design
 
 # ROOT_SYMLINKS+= new-users