diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2014-06-18 16:02:26 +0200 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2014-06-18 16:02:26 +0200 |
| commit | b0e5e6daf3bb389018079f83535ba044e07749e5 (patch) | |
| tree | 84070b401c087a263bcbcbc736e6cfddfe6e9441 /erts/doc/src | |
| parent | fa71986a52c42af21a0865c382ded0334d05acd0 (diff) | |
| parent | 42ad82b3186b69fec93ab07ea686490bf2fe5840 (diff) | |
| download | otp-b0e5e6daf3bb389018079f83535ba044e07749e5.tar.gz otp-b0e5e6daf3bb389018079f83535ba044e07749e5.tar.bz2 otp-b0e5e6daf3bb389018079f83535ba044e07749e5.zip | |
Merge branch 'maint'
Diffstat (limited to 'erts/doc/src')
| -rw-r--r-- | erts/doc/src/notes.xml | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/erts/doc/src/notes.xml b/erts/doc/src/notes.xml index 68feaa027a..6b3e41c1f2 100644 --- a/erts/doc/src/notes.xml +++ b/erts/doc/src/notes.xml @@ -595,9 +595,9 @@ "hi" := V1, a := V2, b := V3} = M2. % match keys with values</c></item> </taglist></p> <p> - For information on how to use Maps please see the - <seealso marker="doc/reference_manual:maps">Reference - Manual</seealso>.</p> + For information on how to use Maps please see Map Expressions in the + <seealso marker="doc/reference_manual:expressions#map_expressions"> + Reference Manual</seealso>.</p> <p> The current implementation is without the following features: <taglist> <item>No variable keys</item> @@ -4854,7 +4854,7 @@ <item> <p> The <c>configure</c> command line argument <seealso - marker="doc/installation_guide:INSTALL#How-to-Build-and-Install-ErlangOTP_A-Closer-Look-at-the-individual-Steps_Configuring">--enable-ethread-pre-pentium4-compatibility</seealso> + marker="doc/installation_guide:INSTALL#Advanced-configuration-and-build-of-ErlangOTP">--enable-ethread-pre-pentium4-compatibility</seealso> had no effect. This option is now also automatically enabled if required on the build machine.</p> <p> @@ -5433,7 +5433,7 @@ platforms than before. If <c>configure</c> warns about no atomic implementation available, try using the <c>libatomic_ops</c> library. Use the <seealso - marker="doc/installation_guide:INSTALL#How-to-Build-and-Install-ErlangOTP_A-Closer-Look-at-the-individual-Steps_Configuring">--with-libatomic_ops=PATH</seealso> + marker="doc/installation_guide:INSTALL#Advanced-configuration-and-build-of-ErlangOTP">--with-libatomic_ops=PATH</seealso> <c>configure</c> command line argument when specifying where the <c>libatomic_ops</c> installation is located. The <c>libatomic_ops</c> library can be downloaded from: @@ -5451,7 +5451,7 @@ the pentium 4 processor. If you want the runtime system to be compatible with older processors (back to 486) you need to pass the <seealso - marker="doc/installation_guide:INSTALL#How-to-Build-and-Install-ErlangOTP_A-Closer-Look-at-the-individual-Steps_Configuring">--enable-ethread-pre-pentium4-compatibility</seealso> + marker="doc/installation_guide:INSTALL#Advanced-configuration-and-build-of-ErlangOTP">--enable-ethread-pre-pentium4-compatibility</seealso> <c>configure</c> command line argument when configuring the system.</p> <p> |