aboutsummaryrefslogtreecommitdiffstats
path: root/README.md
diff options
context:
space:
mode:
authorMagnus Lidén <[email protected]>2014-02-24 09:23:29 +0100
committerMagnus Lidén <[email protected]>2014-04-02 16:11:32 +0200
commit107b27ef809e4356ea258cbd820967ffb8fa0875 (patch)
tree3e30cc0e08fb1001b004c2e62cc2e0f45d6b0945 /README.md
parentdc99e212fd346c1f2bb19a63b5f447e7169ff30b (diff)
downloadotp-107b27ef809e4356ea258cbd820967ffb8fa0875.tar.gz
otp-107b27ef809e4356ea258cbd820967ffb8fa0875.tar.bz2
otp-107b27ef809e4356ea258cbd820967ffb8fa0875.zip
Correct and clean up documentation
The build and install documentation was not complete and needed some restructuring.
Diffstat (limited to 'README.md')
-rw-r--r--README.md11
1 files changed, 10 insertions, 1 deletions
diff --git a/README.md b/README.md
index a6a4f11be8..bf80b6391b 100644
--- a/README.md
+++ b/README.md
@@ -12,6 +12,15 @@ middle-ware to develop these systems. It includes its own distributed
database, applications to interface towards other languages, debugging
and release handling tools.
+ERTS and BEAM
+-------------
+**BEAM** is the name of the virtual machine where all Erlang code is executed.
+Every compiled Erlang file has the suffix .beam. The virtual machine
+is sometimes referred to as the emulator.
+
+**ERTS** is the Erlang Runtime System where the BEAM, kernel and
+standard libraries amongst others are included.
+
More information can be found at [erlang.org] [1].
Building and Installing
@@ -57,7 +66,7 @@ Copyright and License
> %CopyrightBegin%
>
-> Copyright Ericsson AB 2010-2012. All Rights Reserved.
+> Copyright Ericsson AB 2010-2014. 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