aboutsummaryrefslogtreecommitdiffstats
path: root/system/doc/reference_manual/introduction.xml
diff options
context:
space:
mode:
authorHans Bolinder <[email protected]>2015-03-12 15:35:13 +0100
committerBjörn Gustavsson <[email protected]>2015-03-12 17:42:20 +0100
commit9fe8adf35c16ab5d4566b03f3b36863c90b5b6dd (patch)
tree270f6981da41809e5085f6aec6c7a8b6675caa85 /system/doc/reference_manual/introduction.xml
parentb61ee25ee7e922b36bb4ae6d505a5f6cbe5b23e6 (diff)
downloadotp-9fe8adf35c16ab5d4566b03f3b36863c90b5b6dd.tar.gz
otp-9fe8adf35c16ab5d4566b03f3b36863c90b5b6dd.tar.bz2
otp-9fe8adf35c16ab5d4566b03f3b36863c90b5b6dd.zip
Update Erlang Reference Manual
Language cleaned up by the technical writers xsipewe and tmanevik from Combitech. Proofreading and corrections by Hans Bolinder.
Diffstat (limited to 'system/doc/reference_manual/introduction.xml')
-rw-r--r--system/doc/reference_manual/introduction.xml53
1 files changed, 36 insertions, 17 deletions
diff --git a/system/doc/reference_manual/introduction.xml b/system/doc/reference_manual/introduction.xml
index 36bec17825..ee8b82e60f 100644
--- a/system/doc/reference_manual/introduction.xml
+++ b/system/doc/reference_manual/introduction.xml
@@ -4,7 +4,7 @@
<chapter>
<header>
<copyright>
- <year>2003</year><year>2014</year>
+ <year>2003</year><year>2015</year>
<holder>Ericsson AB. All Rights Reserved.</holder>
</copyright>
<legalnotice>
@@ -28,20 +28,38 @@
<rev></rev>
<file>introduction.xml</file>
</header>
+ <marker id="erlang ref manual"></marker>
+
+ <p>This section is the Erlang reference manual. It describes the
+ Erlang programming language. </p>
<section>
<title>Purpose</title>
- <p>This reference manual describes the Erlang programming
- language. The focus is on the language itself, not
- the implementation. The language constructs are described in
- text and with examples rather than formally specified, with
- the intention to make the manual more readable.
- The manual is not intended as a tutorial.</p>
- <p>Information about this implementation of Erlang can be found, for
- example, in <em>System Principles</em> (starting and stopping,
- boot scripts, code loading, error logging, creating target
- systems), <em>Efficiency Guide</em> (memory consumption, system
- limits) and <em>ERTS User's Guide</em> (crash dumps, drivers).</p>
+ <p>The focus of the Erlang reference manual is on the language itself,
+ not the implementation of it. The language constructs are described in
+ text and with examples rather than formally specified. This is
+ to make the manual more readable.
+ The Erlang reference manual is not intended as a tutorial.</p>
+ <p>Information about implementation of Erlang can, for example, be found,
+ in the following:</p>
+ <list type="bulleted">
+ <item><p><seealso marker="doc/system_principles:system_principles">
+ System Principles</seealso></p>
+ <p>Starting and stopping, boot scripts, code loading,
+ <seealso marker="doc/system_principles:error_logging">
+ error logging</seealso>,
+ <seealso marker="doc/system_principles:create_target">
+ creating target systems</seealso></p>
+ </item>
+ <item><p><seealso marker="doc/efficiency_guide:advanced">
+ Efficiency Guide</seealso></p>
+ <p>Memory consumption, system limits</p>
+ </item>
+ <item><p>ERTS User's Guide</p>
+ <p><seealso marker="erts:crash_dump">Crash dumps</seealso>,
+ <seealso marker="erts:driver">drivers</seealso></p>
+ </item>
+ </list>
</section>
<section>
@@ -53,13 +71,13 @@
<section>
<title>Document Conventions</title>
- <p>In the document, the following terminology is used:</p>
+ <p>In this section, the following terminology is used:</p>
<list type="bulleted">
<item>A <em>sequence</em> is one or more items. For example, a
clause body consists of a sequence of expressions. This
means that there must be at least one expression.</item>
<item>A <em>list</em> is any number of items. For example,
- an argument list can consist of zero, one or more arguments.</item>
+ an argument list can consist of zero, one, or more arguments.</item>
</list>
<p>If a feature has been added recently, in Erlang 5.0/OTP R7 or
later, this is mentioned in the text.</p>
@@ -68,15 +86,16 @@
<section>
<title>Complete List of BIFs</title>
<p>For a complete list of BIFs, their arguments and return values,
- refer to <c>erlang(3)</c>.</p>
+ see <seealso marker="erts:erlang#process_flag/2">erlang(3)</seealso>
+ manual page in ERTS.</p>
</section>
<section>
<title>Reserved Words</title>
<p>The following are reserved words in Erlang:</p>
- <p>after and andalso band begin bnot bor bsl bsr bxor case catch
+ <p><c>after and andalso band begin bnot bor bsl bsr bxor case catch
cond div end fun if let not of or orelse receive rem try
- when xor</p>
+ when xor</c></p>
</section>
</chapter>