svn commit: r49771 - in head/ja_JP.eucJP/htdocs: commercial community ports

[Ryusuke SUZUKI]

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"