From owner-svn-doc-all@freebsd.org Wed Dec 28 14:30:25 2016 Return-Path: Delivered-To: svn-doc-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5DDB8C94427; Wed, 28 Dec 2016 14:30:25 +0000 (UTC) (envelope-from ryusuke@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 12F101C0F; Wed, 28 Dec 2016 14:30:25 +0000 (UTC) (envelope-from ryusuke@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uBSEUOiZ037435; Wed, 28 Dec 2016 14:30:24 GMT (envelope-from ryusuke@FreeBSD.org) Received: (from ryusuke@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uBSEUOH5037432; Wed, 28 Dec 2016 14:30:24 GMT (envelope-from ryusuke@FreeBSD.org) Message-Id: <201612281430.uBSEUOH5037432@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ryusuke set sender to ryusuke@FreeBSD.org using -f From: Ryusuke SUZUKI Date: Wed, 28 Dec 2016 14:30:24 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r49771 - in head/ja_JP.eucJP/htdocs: commercial community ports X-SVN-Group: doc-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire doc trees \(except for " user" , " projects" , and " translations" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Dec 2016 14:30:25 -0000 Author: ryusuke Date: Wed Dec 28 14:30:23 2016 New Revision: 49771 URL: https://svnweb.freebsd.org/changeset/doc/49771 Log: - Merge the following from the English version: r28473 -> r45410 head/ja_JP.eucJP/htdocs/commercial/Makefile r32391 -> r42980 head/ja_JP.eucJP/htdocs/community/Makefile r39545 -> r47265 head/ja_JP.eucJP/htdocs/ports/Makefile Modified: head/ja_JP.eucJP/htdocs/commercial/Makefile head/ja_JP.eucJP/htdocs/community/Makefile head/ja_JP.eucJP/htdocs/ports/Makefile Modified: head/ja_JP.eucJP/htdocs/commercial/Makefile ============================================================================== --- head/ja_JP.eucJP/htdocs/commercial/Makefile Tue Dec 27 13:10:09 2016 (r49770) +++ head/ja_JP.eucJP/htdocs/commercial/Makefile Wed Dec 28 14:30:23 2016 (r49771) @@ -1,6 +1,6 @@ # $FreeBSD$ # The FreeBSD Japanese Documentation Project -# Original revision: 1.18 +# Original revision: r45410 .if exists(../Makefile.conf) .include "../Makefile.conf" @@ -16,8 +16,7 @@ XSLT.DEFAULT= ${XSL_ENTRIES} DEPENDSET.DEFAULT= commercial XMLDOCS= consult::${XML_COMMERCIAL_CONSULT}: -PARAMS.consult= --param pagename "'Consulting Services'" \ - --param basename "'consult.html'" +PARAMS.consult= --param pagename "'Consulting Services'" XMLDOCS+= consult_bycat::${XML_COMMERCIAL_CONSULT}: PARAMS.consult_bycat=\ Modified: head/ja_JP.eucJP/htdocs/community/Makefile ============================================================================== --- head/ja_JP.eucJP/htdocs/community/Makefile Tue Dec 27 13:10:09 2016 (r49770) +++ head/ja_JP.eucJP/htdocs/community/Makefile Wed Dec 28 14:30:23 2016 (r49771) @@ -1,5 +1,5 @@ # $FreeBSD$ -# Original Revision: 1.2 +# Original Revision: r42980 .if exists(../Makefile.conf) .include "../Makefile.conf" @@ -10,6 +10,4 @@ DOCS= irc.xml mailinglists.xml newsgroups.xml webresources.xml -#XMLDOCS+= social::${XML_EVENTS_EVENTS}: - .include "${DOC_PREFIX}/share/mk/web.site.mk" Modified: head/ja_JP.eucJP/htdocs/ports/Makefile ============================================================================== --- head/ja_JP.eucJP/htdocs/ports/Makefile Tue Dec 27 13:10:09 2016 (r49770) +++ head/ja_JP.eucJP/htdocs/ports/Makefile Wed Dec 28 14:30:23 2016 (r49771) @@ -1,6 +1,6 @@ # $FreeBSD$ # The FreeBSD Japanese Documentation Project -# Original revision: r39545 +# Original revision: r47265 .if exists(../Makefile.conf) .include "../Makefile.conf"