diff options
Diffstat (limited to 'system')
| -rw-r--r-- | system/COPYRIGHT | 121 | ||||
| -rw-r--r-- | system/README | 10 | ||||
| -rw-r--r-- | system/README.unixware | 201 | ||||
| -rw-r--r-- | system/doc/efficiency_guide/advanced.xml | 11 | ||||
| -rw-r--r-- | system/doc/efficiency_guide/commoncaveats.xml | 8 | ||||
| -rw-r--r-- | system/doc/efficiency_guide/functions.xml | 10 | ||||
| -rw-r--r-- | system/doc/efficiency_guide/myths.xml | 4 | ||||
| -rw-r--r-- | system/doc/getting_started/robustness.xml | 8 | ||||
| -rw-r--r-- | system/doc/installation_guide/Makefile | 45 | ||||
| -rw-r--r-- | system/doc/installation_guide/install-binary.xml (renamed from system/doc/installation_guide/install.xml) | 24 | ||||
| -rw-r--r-- | system/doc/installation_guide/make.dep | 2 | ||||
| -rw-r--r-- | system/doc/installation_guide/part.xml | 11 | ||||
| -rw-r--r-- | system/doc/installation_guide/xmlfiles.mk | 17 | ||||
| -rw-r--r-- | system/doc/reference_manual/expressions.xml | 9 |
14 files changed, 190 insertions, 291 deletions
diff --git a/system/COPYRIGHT b/system/COPYRIGHT index 97c2010cb6..444efcd6f5 100644 --- a/system/COPYRIGHT +++ b/system/COPYRIGHT @@ -1,14 +1,96 @@ -Copyright Ericsson Telecom AB 1998 +This software is subject to the following Copyrights and Licenses: + +--------------------------------------------------------------------------- +[Erlang/OTP except parts stated below] + +%CopyrightBegin% + +Copyright Ericsson AB 1997-2010. 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 +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. + +%CopyrightEnd% + +--------------------------------------------------------------------------- +[PCRE] + +PCRE LICENCE +------------ + +PCRE is a library of functions to support regular expressions whose syntax +and semantics are as close as possible to those of the Perl 5 language. + +Release 7 of PCRE is distributed under the terms of the "BSD" licence, as +specified below. The documentation for PCRE, supplied in the "doc" +directory, is distributed under the same terms as the software itself. + +The basic library functions are written in C and are freestanding. Also +included in the distribution is a set of C++ wrapper functions. + + +THE BASIC LIBRARY FUNCTIONS +--------------------------- + +Written by: Philip Hazel +Email local part: ph10 +Email domain: cam.ac.uk + +University of Cambridge Computing Service, +Cambridge, England. + +Copyright (c) 1997-2008 University of Cambridge +All rights reserved. -The copyright to the computer program herein is the -property of Ericsson Telecom AB, Sweden. The program -may be used and/or copied only with the written permission -from Ericsson Telecom AB, or in accordance with the terms -and conditions stipulated in the agreement/contract under -which the program has been supplied. -Parts of this distribution was created using copyrighted material -with the copyright notices included below. +THE C++ WRAPPER FUNCTIONS +------------------------- + +Contributed by: Google Inc. + +Copyright (c) 2007-2008, Google Inc. +All rights reserved. + + +THE "BSD" LICENCE +----------------- + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + + * Neither the name of the University of Cambridge nor the name of Google + Inc. nor the names of their contributors may be used to endorse or + promote products derived from this software without specific prior + written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE +LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE. + +End --------------------------------------------------------------------------- [Tcl/Tk] @@ -75,19 +157,20 @@ terms specified in this license. --------------------------------------------------------------------------- [zlib] + /* zlib.h -- interface of the 'zlib' general purpose compression library - version 1.0.4, Jul 24th, 1996. + version 1.2.3, July 18th, 2005 + + Copyright (C) 1995-2005 Jean-loup Gailly and Mark Adler - Copyright (C) 1995-1996 Jean-loup Gailly and Mark Adler - This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. - + Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions: - + 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be @@ -95,13 +178,13 @@ terms specified in this license. 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. 3. This notice may not be removed or altered from any source distribution. - + Jean-loup Gailly Mark Adler - - + + The data format used by the zlib library is described by RFCs (Request for - Comments) 1950 to 1952 in the files ftp://ds.internic.net/rfc/rfc1950.txt + Comments) 1950 to 1952 in the files http://www.ietf.org/rfc/rfc1950.txt (zlib format), rfc1951.txt (deflate format) and rfc1952.txt (gzip format). */ diff --git a/system/README b/system/README index 29d86b8f47..15ccfd2f84 100644 --- a/system/README +++ b/system/README @@ -1,7 +1,7 @@ -Erlang/OTP March 18, 2009 +Erlang/OTP February 18, 2010 -LAST MINUTE INFORMATION -- Release of Erlang 5.7/OTP R13A +LAST MINUTE INFORMATION -- Release of Erlang 5.7.5/OTP R13B04 1. GENERAL @@ -11,7 +11,7 @@ LAST MINUTE INFORMATION -- Release of Erlang 5.7/OTP R13A The installation guide can be found in - <inst-root>/doc/installation_guide/part_frame.html + <inst-root>doc/installation_guide/users_guide.html 1.2 Java @@ -19,7 +19,7 @@ LAST MINUTE INFORMATION -- Release of Erlang 5.7/OTP R13A 1.3 Disk space - An installation of Erlang/OTP needs approximately 140 MB of + An installation of Erlang/OTP needs approximately 300 MB of disk space. 1.4 The package contains HTML documentation. You can also get this @@ -35,7 +35,7 @@ LAST MINUTE INFORMATION -- Release of Erlang 5.7/OTP R13A R11B-1). BEAM files from R10B or earlier are not supported. To get the best performance, you should recompile your - application code with the R13A compiler. + application code with the R13B04 compiler. 2. NOTES ABOUT THE SOLARIS VERSION diff --git a/system/README.unixware b/system/README.unixware deleted file mode 100644 index b9f9433723..0000000000 --- a/system/README.unixware +++ /dev/null @@ -1,201 +0,0 @@ - -OTP R4B b1 UnixWare Release Notes ------------------------------------- - -Kent Boortz - -This is an *unsupported* release of OTP to UnixWare 2.1.2. -In fact, it should not be considered a release or a product at all, -it is a demo what a real release could look like. - -Questions should be directed directly to - - Kent Boortz - -Changes or problems: - - * There is no documentation as part of this release. - Use the R5B documentation that comes with the - Solaris release. - - * To run older graphical tools based on 'pxw' like - 'xerl' and 'interpreter' you have to add - "/usr/X/lib" to your LD_LIBRARY_PATH. - - * The OTP test cases looks reasonable well considering the - short time I had to do the port. The tests of the base - system gives equal results than on Solaris. There are - some problems with the 'ic' application (CORBA) and there - may be some 'mnesia' problems (the tests where not completed - when I wrote this note) - - * OTP normally try to handle IP host name lookups - by itself, parsing /etc/hosts and other configuration - files. This is done because the normal calls like - gethostbyname() is blocking. In this UnixWare port - the normal gethostbyname() is used and if a reply - from the name server takes some time this may block - the OTP system from doing other tasks (it may be the - case that it doesn't block the whole system, it may - just keep other Erlang processes that do DNS lookups - waiting, I'm not sure). - - * The erl_interface library support varios types of threading - This is not supported in the OTP UnixWare release. - - * If you use gcc you compile and link dynamic drivers with - - gcc -fPIC -c foo.c - ld -G -t text -o foo.so foo.o - - With the UnixWare C compiler I belive it will be - - gcc -KPIC -c foo.c - ld -G -t text -o foo.so foo.o - - * The default shell limits was a problem when I was running - some large tests. These limits can be changed by building - a new kernel. To enable unlimited use of virtual memory - and data you do as root - - % /etc/conf/bin/idtune SDATLIM 0x7FFFFFFF - % /etc/conf/bin/idtune HDATLIM 0x7FFFFFFF - % /etc/conf/bin/idtune SVMMLIM 0x7FFFFFFF - % /etc/conf/bin/idtune HVMMLIM 0x7FFFFFFF - % /etc/conf/bin/idbuild - - When you reboot a new kernel will be built. - - * I didn't give the system enough swap space. You can add - swap on an ordinary file. To add about 100 MB more swap - you do as root - - % dd < /dev/zero > /moreswap bs=512 count=200000 - % swap -a /moreswap 0 200000 - - The first line will create a 100 MB file on the root partition - and the second line will add this file as swap space. Note that - the "swap" command is a bit buggy and may hang. Reboot UnixWare - and try again. - -Internel notes on build the release - - * If the network addresses are changed you enter single user - mode by hitting a key after the "Booting UnixWare..." and - the beep. At the prompt - - BOOT# Hit return only to clear line - BOOT# INITSTATE=S - BOOT# go - - This will put you into single user mode. Find out ip address, - default router and DNS server. At the shell prompt - - # /usr/local/bin/tcsh - # setenv TERM vt100 - # cd /etc - # vi resolv.conf - < edit and save with :x! > - # cd /etc/inet - # vi hosts - < edit and save with :x! > - # vi config - < edit and save with :x! > - # cd / - # shutdown now - - Now it should be possible to restart in single user mode. - It may still have long timeouts because the NIS information - is wrong. As root you do - - # ypinit -c - - and type in "arda" as NIS domain and "gandalf.du.uab.ericsson.se" - as NIS server. - - * Prebuilding the release. Create a view with the -ncaexported option. - See "http://otp/product/internal/test/doc/howto/export_view.html". - Build a solaris release (optionally using a boostrap compiler) - - # cd /clearcase/otp/erts/autoconf; cm -V; cd .. - # cm -V opt EMULATOR=jam BUILD_ALL=1 >& LOG.1 - - * Create the directories for mount points and mount the view on - the UnixWare machine. - - # mkdir -p /clearcase/otp; cd /clearcase/otp - # mkdir erts internal_tools libraries system tools - - Use s script like - - #!/bin/sh - HOST=$1 - VIEW=$2 - MOUNT=$HOST:/view/$VIEW/clearcase/otp - - mount -F nfs $MOUNT/erts $DIR/erts - mount -F nfs $MOUNT/libraries $DIR/libraries - mount -F nfs $MOUNT/tools $DIR/tools - mount -F nfs $MOUNT/internal_tools $DIR/internal_tools - mount -F nfs $MOUNT/system $DIR/system - - to mount the ClearCase VOBs. - - * Building the - * Building the - - "/usr/X/lib" to your LD_LIBRARY_PATH. - - Had to patch the file - - /usr/local/lib/g++-include/_G_config.h - - not to define _G_HAVE_SYS_CDEFS 1 - - Problems with pxw yacc - - yacc -dv -b i386-univel-sysv4.2MP/y parse.y - UX:yacc: ERROR: Illegal option -- b - UX:yacc: TO FIX: Usage: yacc [-wvVdlt] [-Q(y/n)] [-p driver_file] file - gmake[6]: *** [i386-univel-sysv4.2MP/y.tab.c] Error 1 - - Create some symbolic links (until got compiled libs for UnixWare) - - # cd crypt/src/ssleay - # ln -s elibcrypto.so.i386-pc-solaris2.5.1 elibcrypto.so.i386-univel-sysv4.2MP - # cd ssl/src/ssleay - # ln -s i386-pc-solaris2.5.1 i386-univel-sysv4.2MP - - Run - - # ntpdate super.du.uab.ericsson.se - - now and then to set the time on the machine. - - - Disabled HAVE_MULTICAST_SUPPORT from "drv/inet_drv.c", should be set in configure - - UnixWare want two arguments to 'ln' - - SkunkWare gcc, ln, tar, ..... required, make sure PATH points out them first - - The emulator has to be linked with "gcc -r -Wl,-Bexport " to be linkable - with dynamic libraries. - - Tcl/Tk was compiled from - - tcl7.6p2plus.tar.gz - tk4.2p2plus.tar.gz - - and the make-files where changed, see - - (not needed it seems, if not using gcc at least) - - - VILL HA "-ly -ll" BARA PA PXW ??????? - - You can view the limits of the Unix processes in - - /etc/conf/mtune.d/proc - diff --git a/system/doc/efficiency_guide/advanced.xml b/system/doc/efficiency_guide/advanced.xml index 0ec3afbd59..7898f925b9 100644 --- a/system/doc/efficiency_guide/advanced.xml +++ b/system/doc/efficiency_guide/advanced.xml @@ -4,7 +4,7 @@ <chapter> <header> <copyright> - <year>2001</year><year>2009</year> + <year>2001</year><year>2010</year> <holder>Ericsson AB. All Rights Reserved.</holder> </copyright> <legalnotice> @@ -13,12 +13,12 @@ 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>Advanced</title> @@ -154,7 +154,8 @@ On 64-bit architectures: 4 words for a reference from the current local node, an <item>255</item> <tag><em>Atoms </em></tag> <item> <marker id="atoms"></marker> -The maximum number of atoms is 1048576. </item> + By default, the maximum number of atoms is 1048576. + This limit can be raised or lowered using the <c>+t</c> option.</item> <tag><em>Ets-tables</em></tag> <item>The default is 1400, can be changed with the environment variable <c>ERL_MAX_ETS_TABLES</c>.</item> <tag><em>Elements in a tuple</em></tag> @@ -175,7 +176,7 @@ The maximum number of atoms is 1048576. </item> <tag><em>Total amount of data allocated by an Erlang node</em></tag> <item>The Erlang runtime system can use the complete 32 (or 64) bit address space, but the operating system often limits a single process to use less than that.</item> - <tag><em>length of a node name</em></tag> + <tag><em>Length of a node name</em></tag> <item>An Erlang node name has the form host@shortname or host@longname. The node name is used as an atom within the system so the maximum size of 255 holds for the node name too.</item> <tag><em>Open ports</em></tag> diff --git a/system/doc/efficiency_guide/commoncaveats.xml b/system/doc/efficiency_guide/commoncaveats.xml index e18e5aa510..61d13636c0 100644 --- a/system/doc/efficiency_guide/commoncaveats.xml +++ b/system/doc/efficiency_guide/commoncaveats.xml @@ -4,7 +4,7 @@ <chapter> <header> <copyright> - <year>2001</year><year>2009</year> + <year>2001</year><year>2010</year> <holder>Ericsson AB. All Rights Reserved.</holder> </copyright> <legalnotice> @@ -13,12 +13,12 @@ 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>Common Caveats</title> @@ -69,7 +69,7 @@ <p>Atoms are not garbage-collected. Once an atom is created, it will never be removed. The emulator will terminate if the limit for the number - of atoms (1048576) is reached.</p> + of atoms (1048576 by default) is reached.</p> <p>Therefore, converting arbitrary input strings to atoms could be dangerous in a system that will run continuously. diff --git a/system/doc/efficiency_guide/functions.xml b/system/doc/efficiency_guide/functions.xml index d55b60e39c..fe14a4f000 100644 --- a/system/doc/efficiency_guide/functions.xml +++ b/system/doc/efficiency_guide/functions.xml @@ -4,7 +4,7 @@ <chapter> <header> <copyright> - <year>2001</year><year>2009</year> + <year>2001</year><year>2010</year> <holder>Ericsson AB. All Rights Reserved.</holder> </copyright> <legalnotice> @@ -13,12 +13,12 @@ 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>Functions</title> @@ -179,7 +179,9 @@ explicit_map_pairs(Map, Xs0, Ys0) -> A "tuple fun", <c>{Module,Function}</c>, is not a fun. The cost for calling a "tuple fun" is similar to that of <c>apply/3</c> or worse. Using "tuple funs" is <em>strongly discouraged</em>, - as they may not be supported in a future release.</p></warning> + as they may not be supported in a future release, + and because there exists a superior alternative since the R10B + release, namely the <c>fun Module:Function/Arity</c> syntax.</p></warning> <p><c>apply/3</c> must look up the code for the function to execute in a hash table. Therefore, it will always be slower than a diff --git a/system/doc/efficiency_guide/myths.xml b/system/doc/efficiency_guide/myths.xml index 76a72368bb..65113c9372 100644 --- a/system/doc/efficiency_guide/myths.xml +++ b/system/doc/efficiency_guide/myths.xml @@ -168,8 +168,8 @@ vanilla_reverse([], Acc) -> <p>Actually, string handling could be slow if done improperly. In Erlang, you'll have to think a little more about how the strings are used and choose an appropriate representation and use - the <seealso marker="stdlib:re">re</seealso> instead of the obsolete - <c>regexp</c> module if you are going to use regualr expressions.</p> + the <seealso marker="stdlib:re">re</seealso> module instead of the obsolete + <c>regexp</c> module if you are going to use regular expressions.</p> </section> <section> diff --git a/system/doc/getting_started/robustness.xml b/system/doc/getting_started/robustness.xml index 227da4c027..c141530fe0 100644 --- a/system/doc/getting_started/robustness.xml +++ b/system/doc/getting_started/robustness.xml @@ -4,7 +4,7 @@ <chapter> <header> <copyright> - <year>2003</year><year>2009</year> + <year>2003</year><year>2010</year> <holder>Ericsson AB. All Rights Reserved.</holder> </copyright> <legalnotice> @@ -13,12 +13,12 @@ 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>Robustness</title> @@ -146,7 +146,7 @@ after pong_timeout() -></code> a process calls <seealso marker="erts:erlang#link/1">link(Other_Pid)</seealso> it sets up a bidirectional link between itself and the process - called <c>Other_Pid</c>. When a process terminates its sends + called <c>Other_Pid</c>. When a process terminates, it sends something called a <em>signal</em> to all the processes it has links to.</p> <p>The signal carries information about the pid it was sent from and diff --git a/system/doc/installation_guide/Makefile b/system/doc/installation_guide/Makefile index 53a02a1edf..a47d77604d 100644 --- a/system/doc/installation_guide/Makefile +++ b/system/doc/installation_guide/Makefile @@ -31,6 +31,7 @@ APPLICATION=otp-system-documentation # Release directory specification # ---------------------------------------------------- RELSYSDIR = $(RELEASE_PATH)/doc/installation_guide +REDIRECT_HTML_RELSYSDIR = $(RELSYSDIR)/source # ---------------------------------------------------- # Target Specs @@ -54,12 +55,10 @@ XML_FILES = \ $(XML_PART_FILES) # ---------------------------------------------------- -# Install readme files -# ---------------------------------------------------- -INSTALL_READMES = \ - $(ERL_TOP)/INSTALL.html \ - $(ERL_TOP)/INSTALL-CROSS.html \ - $(ERL_TOP)/INSTALL-WIN32.html +GENERATED_XML_FILES = \ + INSTALL.xml \ + INSTALL-CROSS.xml \ + INSTALL-WIN32.xml # ---------------------------------------------------- @@ -70,6 +69,12 @@ HTMLDIR = ../html/installation_guide HTML_UG_FILE = $(HTMLDIR)/users_guide.html +REDIRECT_HTML_DIR = $(HTMLDIR)/source +REDIRECT_HTML_FILES = \ + $(REDIRECT_HTML_DIR)/INSTALL.html \ + $(REDIRECT_HTML_DIR)/INSTALL-CROSS.html \ + $(REDIRECT_HTML_DIR)/INSTALL-WIN32.html + # ---------------------------------------------------- # FLAGS # ---------------------------------------------------- @@ -79,15 +84,32 @@ DVIPS_FLAGS += # ---------------------------------------------------- # Targets # ---------------------------------------------------- -docs: html + +%.xml: $(ERL_TOP)/%.md $(ERL_TOP)/make/emd2exml + $(ERL_TOP)/make/emd2exml $< $@ + +$(REDIRECT_HTML_DIR)/%.html: Makefile + test -d $(REDIRECT_HTML_DIR) || $(INSTALL_DIR) $(REDIRECT_HTML_DIR) + echo "<html><head><meta HTTP-EQUIV=\"REFRESH\"" > $@ + echo " content=\"5; url=../"$(notdir $@)"\">" >> $@ + echo "<title>This page has moved</title></head><body>" >> $@ + echo "<h1>This page has moved</h1>" >> $@ + echo "<p>You will be automatically redirected to its new" >> $@ + echo "location in 5 seconds." >> $@ + echo "This <a href=\"../"$(notdir $@)"\">link</a> will" >> $@ + echo "take you there immediately.</p></body></html>" >> $@ + +docs: $(GENERATED_XML_FILES) html local_docs: PDFDIR=../../pdf +local_docs: $(GENERATED_XML_FILES) -html: $(GIF_FILES) $(HTML_UG_FILE) +html: $(REDIRECT_HTML_FILES) $(GENERATED_XML_FILES) $(GIF_FILES) $(HTML_UG_FILE) -debug opt: +debug opt: clean clean_docs: + rm -f $(GENERATED_XML_FILES) rm -rf $(HTMLDIR) rm -f $(TOP_PDF_FILE) $(TOP_PDF_FILE:%.pdf=%.fo) rm -f errs core *~ @@ -100,8 +122,9 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_docs_spec: docs $(INSTALL_DIR) $(RELSYSDIR) - $(INSTALL_DATA) $(INSTALL_READMES) $(GIF_FILES) $(HTMLDIR)/*.html \ - $(RELSYSDIR) + $(INSTALL_DATA) $(GIF_FILES) $(HTMLDIR)/*.html $(RELSYSDIR) + $(INSTALL_DIR) $(REDIRECT_HTML_RELSYSDIR) + $(INSTALL_DATA) $(REDIRECT_HTML_FILES) $(REDIRECT_HTML_RELSYSDIR) release_spec: diff --git a/system/doc/installation_guide/install.xml b/system/doc/installation_guide/install-binary.xml index 027b3c49a0..ac4192586d 100644 --- a/system/doc/installation_guide/install.xml +++ b/system/doc/installation_guide/install-binary.xml @@ -21,7 +21,7 @@ </legalnotice> - <title>Installation</title> + <title>Installing the Binary Release</title> <prepared>Peter Högfeldt</prepared> <responsible>Peter Högfeldt</responsible> <docno></docno> @@ -29,27 +29,10 @@ <checked></checked> <date>1997-05-26</date> <rev>C</rev> - <file>install.xml</file> + <file>install-binary.xml</file> </header> <section> - <title>Source</title> - <p>This document describes installation procedures for - binary releases. Documentation of the build and installation - procedures for the source release can be found in the source - tree at the following locations:</p> - <taglist> - <tag>Building and Installing Erlang/OTP</tag> - <item><url href="INSTALL.html"><c>$ERL_TOP/INSTALL.md</c></url></item> - <tag>Cross Compiling Erlang/OTP</tag> - <item><url href="INSTALL-CROSS.html"><c>$ERL_TOP/INSTALL-CROSS.md</c></url></item> - <tag>How to Build Erlang/OTP on Windows</tag> - <item><url href="INSTALL-WIN32.html"><c>$ERL_TOP/INSTALL-WIN32.md</c></url></item> - </taglist> - <p>Where <c>$ERL_TOP</c> is the top directory in the source tree.</p> - </section> - - <section> <title>UNIX</title> <section> @@ -73,7 +56,7 @@ which is <c><![CDATA[<PREFIX>.tar.gz]]></c>, where <c><![CDATA[<PREFIX>]]></c> is a string denoting the particular Erlang/OTP release, e.g. <c>otp_LXA_11930_sunos5_R9B</c>.</p> - <p>Wherever the string <c><![CDATA[<PREFIX>]]></c> is used below, it should + <p>Wherever the string <c><![CDATA[<PREFIX>]]></c> is used below, it should be replaced by the actual name prefix of the compressed tar file.</p> <p>The tape archive file does not have one single directory in which all other files are rooted. Therefore the tape archive file must be @@ -162,4 +145,3 @@ ln -s /usr/local/erlang/otp_r7b/bin/erl /usr/local/bin/erl </pre> </section> </section> </chapter> - diff --git a/system/doc/installation_guide/make.dep b/system/doc/installation_guide/make.dep index 3d1477935d..3878f4ac9d 100644 --- a/system/doc/installation_guide/make.dep +++ b/system/doc/installation_guide/make.dep @@ -9,5 +9,5 @@ # TeX files that the DVI file depend on # ---------------------------------------------------- -book.dvi: book.tex install.tex part.tex verification.tex +book.dvi: book.tex install-binary.tex part.tex verification.tex diff --git a/system/doc/installation_guide/part.xml b/system/doc/installation_guide/part.xml index 3019d2e118..fceacdd8f6 100644 --- a/system/doc/installation_guide/part.xml +++ b/system/doc/installation_guide/part.xml @@ -4,7 +4,7 @@ <part xmlns:xi="http://www.w3.org/2001/XInclude"> <header> <copyright> - <year>2000</year><year>2009</year> + <year>2000</year><year>2010</year> <holder>Ericsson AB. All Rights Reserved.</holder> </copyright> <legalnotice> @@ -13,12 +13,12 @@ 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>Installation Guide</title> @@ -31,7 +31,10 @@ <description> <p>How to install Erlang/OTP on UNIX or Windows.</p> </description> - <xi:include href="install.xml"/> + <xi:include href="install-binary.xml"/> <xi:include href="verification.xml"/> + <xi:include href="INSTALL.xml"/> + <xi:include href="INSTALL-CROSS.xml"/> + <xi:include href="INSTALL-WIN32.xml"/> </part> diff --git a/system/doc/installation_guide/xmlfiles.mk b/system/doc/installation_guide/xmlfiles.mk index 7e1235b64d..dee67b3c70 100644 --- a/system/doc/installation_guide/xmlfiles.mk +++ b/system/doc/installation_guide/xmlfiles.mk @@ -1,21 +1,24 @@ # # %CopyrightBegin% -# -# Copyright Ericsson AB 2009. All Rights Reserved. -# +# +# Copyright Ericsson AB 2009-2010. 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 # 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. -# +# # %CopyrightEnd% # INST_GUIDE_CHAPTER_FILES = \ - install.xml \ - verification.xml + install-binary.xml \ + verification.xml \ + INSTALL.xml \ + INSTALL-CROSS.xml \ + INSTALL-WIN32.xml diff --git a/system/doc/reference_manual/expressions.xml b/system/doc/reference_manual/expressions.xml index fa7870d96c..b56b8acbf0 100644 --- a/system/doc/reference_manual/expressions.xml +++ b/system/doc/reference_manual/expressions.xml @@ -4,7 +4,7 @@ <chapter> <header> <copyright> - <year>2003</year><year>2009</year> + <year>2003</year><year>2010</year> <holder>Ericsson AB. All Rights Reserved.</holder> </copyright> <legalnotice> @@ -13,12 +13,12 @@ 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>Expressions</title> @@ -1257,6 +1257,9 @@ end</pre> <cell align="left" valign="middle"><c>is_bitstring/1</c></cell> </row> <row> + <cell align="left" valign="middle"><c>is_boolean/1</c></cell> + </row> + <row> <cell align="left" valign="middle"><c>is_float/1</c></cell> </row> <row> |