Merge branch 'anders/make/comma_in_generated_date/OTP-10871'

* anders/make/comma_in_generated_date/OTP-10871:
  Fix comma usage in generated documentation date

3 files changed, 16 insertions, 16 deletions

diff --git a/make/otp.mk.in b/make/otp.mk.in
index 91e2d8a95e..785926b997 100644
--- a/make/otp.mk.in
+++ b/make/otp.mk.in
@@ -270,44 +270,44 @@ $(SPECDIR)/specs_%.xml: $(SPECS_ESRC)/%.erl
 
 
 $(MAN1DIR)/%.1: %.xml
-	date=`date +"%B %e %Y"`; \
+	date=`date +"%B %e, %Y"`; \
 	xsltproc --output "$@" --stringparam company "Ericsson AB" --stringparam docgen "$(DOCGEN)" --stringparam gendate "$$date" --stringparam appname "$(APPLICATION)" --stringparam appver "$(VSN)" --xinclude -path $(DOCGEN)/priv/dtd  -path $(DOCGEN)/priv/dtd_man_entities $(DOCGEN)/priv/xsl/db_man.xsl $<
 
 $(MAN2DIR)/%.2: %.xml
-	date=`date +"%B %e %Y"`; \
+	date=`date +"%B %e, %Y"`; \
 	xsltproc --output "$@" --stringparam company "Ericsson AB" --stringparam docgen "$(DOCGEN)" --stringparam gendate "$$date" --stringparam appname "$(APPLICATION)" --stringparam appver "$(VSN)" --xinclude -path $(DOCGEN)/priv/dtd  -path $(DOCGEN)/priv/dtd_man_entities $(DOCGEN)/priv/xsl/db_man.xsl $<
 
 ifneq ($(wildcard $(SPECDIR)),)
 $(MAN3DIR)/%.3: %.xml $(SPECDIR)/specs_%.xml
-	date=`date +"%B %e %Y"`; \
+	date=`date +"%B %e, %Y"`; \
 	specs_file=`pwd`/$(SPECDIR)/specs_$*.xml; \
 	xsltproc --output "$@" --stringparam company "Ericsson AB" --stringparam docgen "$(DOCGEN)" --stringparam gendate "$$date" --stringparam appname "$(APPLICATION)" --stringparam appver "$(VSN)" --stringparam specs_file "$$specs_file" --xinclude -path $(DOCGEN)/priv/dtd  -path $(DOCGEN)/priv/dtd_man_entities $(DOCGEN)/priv/xsl/db_man.xsl $<
 else
 $(MAN3DIR)/%.3: %.xml
-	date=`date +"%B %e %Y"`; \
+	date=`date +"%B %e, %Y"`; \
 	xsltproc --output "$@" --stringparam company "Ericsson AB" --stringparam docgen "$(DOCGEN)" --stringparam gendate "$$date" --stringparam appname "$(APPLICATION)" --stringparam appver "$(VSN)" --xinclude -path $(DOCGEN)/priv/dtd  -path $(DOCGEN)/priv/dtd_man_entities $(DOCGEN)/priv/xsl/db_man.xsl $<
 endif
 
 # left for compatibility
 $(MAN4DIR)/%.4: %.xml
-	date=`date +"%B %e %Y"`; \
+	date=`date +"%B %e, %Y"`; \
 	xsltproc --output "$@" --stringparam company "Ericsson AB" --stringparam docgen "$(DOCGEN)" --stringparam gendate "$$date" --stringparam appname "$(APPLICATION)" --stringparam appver "$(VSN)" --xinclude -path $(DOCGEN)/priv/dtd  -path $(DOCGEN)/priv/dtd_man_entities $(DOCGEN)/priv/xsl/db_man.xsl $<
 
 $(MAN4DIR)/%.5: %.xml
-	date=`date +"%B %e %Y"`; \
+	date=`date +"%B %e, %Y"`; \
 	xsltproc --output "$@" --stringparam company "Ericsson AB" --stringparam docgen "$(DOCGEN)" --stringparam gendate "$$date" --stringparam appname "$(APPLICATION)" --stringparam appver "$(VSN)" --xinclude -path $(DOCGEN)/priv/dtd  -path $(DOCGEN)/priv/dtd_man_entities $(DOCGEN)/priv/xsl/db_man.xsl $<
 
 # left for compatibility
 $(MAN6DIR)/%.6: %_app.xml
-	date=`date +"%B %e %Y"`; \
+	date=`date +"%B %e, %Y"`; \
 	xsltproc --output "$@" --stringparam company "Ericsson AB" --stringparam docgen "$(DOCGEN)" --stringparam gendate "$$date" --stringparam appname "$(APPLICATION)" --stringparam appver "$(VSN)" --xinclude -path $(DOCGEN)/priv/dtd  -path $(DOCGEN)/priv/dtd_man_entities $(DOCGEN)/priv/xsl/db_man.xsl $<
 
 $(MAN6DIR)/%.7: %_app.xml
-	date=`date +"%B %e %Y"`; \
+	date=`date +"%B %e, %Y"`; \
 	xsltproc --output "$@" --stringparam company "Ericsson AB" --stringparam docgen "$(DOCGEN)" --stringparam gendate "$$date" --stringparam appname "$(APPLICATION)" --stringparam appver "$(VSN)" --xinclude -path $(DOCGEN)/priv/dtd  -path $(DOCGEN)/priv/dtd_man_entities $(DOCGEN)/priv/xsl/db_man.xsl $<
 
 $(MAN9DIR)/%.9: %.xml
-	date=`date +"%B %e %Y"`; \
+	date=`date +"%B %e, %Y"`; \
 	xsltproc --output "$@" --stringparam company "Ericsson AB" --stringparam docgen "$(DOCGEN)" --stringparam gendate "$$date" --stringparam appname "$(APPLICATION)" --stringparam appver "$(VSN)" --xinclude -path $(DOCGEN)/priv/dtd  -path $(DOCGEN)/priv/dtd_man_entities $(DOCGEN)/priv/xsl/db_man.xsl $<
 
 
diff --git a/make/otp_release_targets.mk b/make/otp_release_targets.mk
index 998e25a436..b6afcd1c8b 100644
--- a/make/otp_release_targets.mk
+++ b/make/otp_release_targets.mk
@@ -32,7 +32,7 @@ endif
 
 ifeq ($(TOPDOC),)
 $(HTMLDIR)/index.html: $(XML_FILES) $(SPECS_FILES)
-	date=`date +"%B %e %Y"`; \
+	date=`date +"%B %e, %Y"`; \
 	$(XSLTPROC) --noout \
           --stringparam outdir $(HTMLDIR) \
           --stringparam docgen "$(DOCGEN)" \
@@ -53,7 +53,7 @@ $(HTMLDIR)/index.html: $(XML_FILES) $(SPECS_FILES)
 endif
 
 $(HTMLDIR)/users_guide.html: $(XML_FILES)
-	date=`date +"%B %e %Y"`; \
+	date=`date +"%B %e, %Y"`; \
 	$(XSLTPROC) --noout  \
 		--stringparam outdir  $(HTMLDIR)  \
 		--stringparam docgen "$(DOCGEN)"  \
@@ -72,7 +72,7 @@ $(HTMLDIR)/users_guide.html: $(XML_FILES)
 	        $(DOCGEN)/priv/xsl/db_html.xsl book.xml
 
 %.fo: $(XML_FILES) $(SPECS_FILES)
-	date=`date +"%B %e %Y"`; \
+	date=`date +"%B %e, %Y"`; \
 	$(XSLTPROC) \
          --stringparam docgen "$(DOCGEN)" \
          --stringparam gendate "$$date" \
@@ -94,7 +94,7 @@ ifneq ($(XML_FILES),)
 # Generation of application index data
 # ----------------------------------------------------
 $(HTMLDIR)/$(APPLICATION).eix: $(XML_FILES) $(SPECS_FILES)
-	date=`date +"%B %e %Y"`; \
+	date=`date +"%B %e, %Y"`; \
 	$(XSLTPROC) --stringparam docgen "$(DOCGEN)" \
 		--stringparam gendate "$$date" \
 	        --stringparam appname "$(APPLICATION)" \
diff --git a/system/doc/top/Makefile b/system/doc/top/Makefile
index 673ba44c94..37466fa2d9 100644
--- a/system/doc/top/Makefile
+++ b/system/doc/top/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 1999-2012. All Rights Reserved.
+# Copyright Ericsson AB 1999-2013. All Rights Reserved.
 #
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -162,7 +162,7 @@ $(MAN_INDEX): $(MAN_INDEX_SCRIPT)
 #--------------------------------------------------------------------------
 
 $(HTMLDIR)/highlights.html:  highlights.xml
-	date=`date +"%B %e %Y"`; \
+	date=`date +"%B %e, %Y"`; \
 	$(XSLTPROC) --output $(@) \
 		--stringparam docgen "$(DOCGEN)" \
 		--stringparam topdocdir "$(TOPDOCDIR)" \
@@ -179,7 +179,7 @@ $(HTMLDIR)/highlights.html:  highlights.xml
 
 
 $(HTMLDIR)/incompatible.html:  incompatible.xml
-	date=`date +"%B %e %Y"`; \
+	date=`date +"%B %e, %Y"`; \
 	$(XSLTPROC) --output $(@) --stringparam docgen "$(DOCGEN)" \
 		--stringparam topdocdir "$(TOPDOCDIR)" \
 		--stringparam pdfdir "$(PDFREFDIR)"  \