aboutsummaryrefslogtreecommitdiffstats
path: root/README.md
diff options
context:
space:
mode:
authorMagnus Lidén <[email protected]>2014-04-02 16:41:43 +0200
committerMagnus Lidén <[email protected]>2014-04-02 16:41:43 +0200
commitac79481c9bd9894616213a5b7eccf6d5f94cbed8 (patch)
treec734c294f4ef799e8364ddde6379da36f2257544 /README.md
parenteba291a52d4a78c128c5802775fa1bff187e0604 (diff)
parent1e8884134d7fbfee1e5aa546727bd5f3beed4921 (diff)
downloadotp-ac79481c9bd9894616213a5b7eccf6d5f94cbed8.tar.gz
otp-ac79481c9bd9894616213a5b7eccf6d5f94cbed8.tar.bz2
otp-ac79481c9bd9894616213a5b7eccf6d5f94cbed8.zip
Merge branch 'mange/update_source_build_doc/OTP-10269'
* mange/update_source_build_doc/OTP-10269: Add link to app resource file reference Correct and clean up documentation Delete obsolete verification doc Remove installation instruction for unix binary and reorder chapters
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