diff options
Diffstat (limited to 'lib/ic')
-rw-r--r-- | lib/ic/doc/src/Makefile | 14 | ||||
-rw-r--r-- | lib/ic/doc/src/ic.xml | 32 | ||||
-rw-r--r-- | lib/ic/doc/src/notes.xml | 14 | ||||
-rw-r--r-- | lib/ic/vsn.mk | 6 |
4 files changed, 42 insertions, 24 deletions
diff --git a/lib/ic/doc/src/Makefile b/lib/ic/doc/src/Makefile index fff930d745..f00bba2c71 100644 --- a/lib/ic/doc/src/Makefile +++ b/lib/ic/doc/src/Makefile @@ -169,6 +169,7 @@ JD_GIF_FILES = \ PACK_DIR = com/ericsson/otp/ic JAVA_SOURCE_DIR = ../../java_src/$(PACK_DIR) +JAVA_OUT_DIR = ../html/java JD_PACK_HTML_FILES = \ package-frame.html \ @@ -176,10 +177,10 @@ JD_PACK_HTML_FILES = \ package-tree.html JAVADOC_PACK_HTML_FILES = \ - $(JAVA_SOURCE_FILES:%.java=../html/java/$(PACK_DIR)/%.html) \ - $(JD_PACK_HTML_FILES:%=../html/java/$(PACK_DIR)/%) + $(JAVA_SOURCE_FILES:%.java=$(JAVA_OUT_DIR)/$(PACK_DIR)/%.html) \ + $(JD_PACK_HTML_FILES:%=$(JAVA_OUT_DIR)/$(PACK_DIR)/%) -JAVADOC_INDEX_HTML_FILES = $(JD_INDEX_HTML_FILES:%=../html/java/%) +JAVADOC_INDEX_HTML_FILES = $(JD_INDEX_HTML_FILES:%=$(JAVA_OUT_DIR)/%) JAVADOC_GENERATED_FILES = $(JAVADOC_PACK_HTML_FILES) $(JAVADOC_INDEX_HTML_FILES) @@ -244,11 +245,14 @@ clean clean_docs clean_tex: rm -f $(HTML_FILES) $(MAN3_FILES) rm -f $(TOP_PDF_FILE) $(TOP_PS_FILE) rm -f errs core *~ *xmls_output *xmls_errs $(LATEX_CLEAN) - rm -rf ../html/java/* + rm -rf $(JAVA_OUT_DIR) endif -$(JAVADOC_GENERATED_FILES): +$(JAVA_OUT_DIR): + mkdir $(JAVA_OUT_DIR) + +$(JAVADOC_GENERATED_FILES): $(JAVA_OUT_DIR) @(cd ../../java_src; $(JAVADOC) $(JAVADOCFLAGS) com.ericsson.otp.ic) man: $(MAN3_FILES) diff --git a/lib/ic/doc/src/ic.xml b/lib/ic/doc/src/ic.xml index 9f48229425..b743736a66 100644 --- a/lib/ic/doc/src/ic.xml +++ b/lib/ic/doc/src/ic.xml @@ -4,23 +4,21 @@ <erlref> <header> <copyright> - <year>1997</year> - <year>2007</year> - <holder>Ericsson AB, All Rights Reserved</holder> + <year>1997</year><year>2009</year> + <holder>Ericsson AB. All Rights Reserved.</holder> </copyright> <legalnotice> - 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 - compliance with the License. You should have received a copy of the - Erlang Public License along with this software. If not, it can be - retrieved online at http://www.erlang.org/. - - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See - the License for the specific language governing rights and limitations - under the License. - - The Initial Developer of the Original Code is Ericsson AB. + 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 + compliance with the License. You should have received a copy of the + Erlang Public License along with this software. If not, it can be + retrieved online at http://www.erlang.org/. + + Software distributed under the License is distributed on an "AS IS" + basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See + the License for the specific language governing rights and limitations + under the License. + </legalnotice> <title>ic</title> @@ -64,7 +62,7 @@ <v>timeout | {timeout, String()} | {{timeout, String()}, bool()} |</v> <v>{scoped_op_calls, bool()} | {scl, bool()} |</v> <v>{user_protocol, Prefix} |</v> - <v>{c_timeout, SendTimeout, RecvTimeout} |</v> + <v>{c_timeout, {SendTimeout, RecvTimeout}} |</v> <v>{c_report, bool()} |</v> <v>{precond, {atom(), atom()}} | {{precond, String()} {atom(), atom()}} |</v> <v>{postcond, {atom(), atom()}} | {{postcond, String()} {atom(), atom()}}</v> @@ -264,7 +262,7 @@ The option <p>Makes sends and receives to have timeouts (C back-ends only). These timeouts are specified in milliseconds. </p> <p>Example options: - <c>[{be,c_client},{c_timeout, 10000, 20000}])</c> produces + <c>[{be,c_client},{c_timeout, {10000, 20000}}])</c> produces client stubs which use a 10 seconds send timeout, and a 20 seconds receive timeout.</p> </item> diff --git a/lib/ic/doc/src/notes.xml b/lib/ic/doc/src/notes.xml index c4314d8cc1..021a1e058f 100644 --- a/lib/ic/doc/src/notes.xml +++ b/lib/ic/doc/src/notes.xml @@ -31,6 +31,20 @@ </header> <section> + <title>IC 4.2.24</title> + + <section> + <title>Fixed Bugs and Malfunctions</title> + <list type="bulleted"> + <item> + <p>The option c_timeout was not correctly documented.</p> + <p>Own id: OTP-8307 Aux Id: seq11390</p> + </item> + </list> + </section> + </section> + + <section> <title>IC 4.2.23</title> <section> diff --git a/lib/ic/vsn.mk b/lib/ic/vsn.mk index 6f973e3db4..ec4bb7c3a6 100644 --- a/lib/ic/vsn.mk +++ b/lib/ic/vsn.mk @@ -1,6 +1,8 @@ -IC_VSN = 4.2.23 +IC_VSN = 4.2.24 -TICKETS = OTP-8201 +TICKETS = OTP-8307 + +TICKETS_4.2.23 = OTP-8201 TICKETS_4.2.22 = OTP-8088 |