Merge branch 'maint'

8 files changed, 26 insertions, 25 deletions

diff --git a/HOWTO/INSTALL-CROSS.md b/HOWTO/INSTALL-CROSS.md
index af4b38f292..7f852860c9 100644
--- a/HOWTO/INSTALL-CROSS.md
+++ b/HOWTO/INSTALL-CROSS.md
@@ -566,8 +566,8 @@ under the License.
 
 
    [$ERL_TOP/HOWTO/INSTALL.md]: INSTALL.md
-   [Building in Git]: INSTALL.md#How-to-Build-and-Install-ErlangOTP_Building-in-Git
-   [How to Build the Documentation]: INSTALL.md#The-ErlangOTP-Documentation_How-to-Build-the-Documentation
+   [Building in Git]: INSTALL.md#How-to-Build-and-Install-ErlangOTP
+   [How to Build the Documentation]: INSTALL.md#How-to-Build-and-Install-ErlangOTP_How-to-Build-the-Documentation
    [cross configuration variables]: #Currently-Used-Configuration-Variables
    [DESTDIR]: http://www.gnu.org/prep/standards/html_node/DESTDIR.html
    [?TOC]: true
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>
diff --git a/lib/compiler/doc/src/notes.xml b/lib/compiler/doc/src/notes.xml
index a0f2e617cb..7b2b60fb3d 100644
--- a/lib/compiler/doc/src/notes.xml
+++ b/lib/compiler/doc/src/notes.xml
@@ -211,10 +211,10 @@
 	    "hello"}, % add new associations</c></item> <item><c>#{
 	    "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>
+		<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>
diff --git a/lib/dialyzer/doc/src/notes.xml b/lib/dialyzer/doc/src/notes.xml
index 05baa93557..99ec0caddc 100644
--- a/lib/dialyzer/doc/src/notes.xml
+++ b/lib/dialyzer/doc/src/notes.xml
@@ -167,9 +167,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>
diff --git a/lib/hipe/doc/src/notes.xml b/lib/hipe/doc/src/notes.xml
index c7faf733c7..f133ab05e6 100644
--- a/lib/hipe/doc/src/notes.xml
+++ b/lib/hipe/doc/src/notes.xml
@@ -118,9 +118,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>
diff --git a/lib/stdlib/doc/src/notes.xml b/lib/stdlib/doc/src/notes.xml
index 15e6fdfa9f..6af38b3166 100644
--- a/lib/stdlib/doc/src/notes.xml
+++ b/lib/stdlib/doc/src/notes.xml
@@ -343,10 +343,10 @@
 	    "hello"}, % add new associations</c></item> <item><c>#{
 	    "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>
+        <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>
@@ -2193,7 +2193,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:
@@ -2211,7 +2211,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>
diff --git a/system/doc/reference_manual/data_types.xml b/system/doc/reference_manual/data_types.xml
index 0031664dfb..37c0db5ff7 100644
--- a/system/doc/reference_manual/data_types.xml
+++ b/system/doc/reference_manual/data_types.xml
@@ -215,7 +215,7 @@ adam
 0</pre>
     <p>A collection of maps processing functions can be found in
 	the STDLIB module <seealso marker="stdlib:maps"><c>maps</c></seealso>.</p>
-    <p>Read more about <seealso marker="maps">Maps</seealso>.</p>
+    <p>Read more about <seealso marker="expressions#map_expressions">Maps</seealso>.</p>
   <note>
 	  <p>Maps are considered experimental during OTP 17.</p>
   </note>
diff --git a/system/doc/reference_manual/expressions.xml b/system/doc/reference_manual/expressions.xml
index 0ca425da86..fa8f9b2e8f 100644
--- a/system/doc/reference_manual/expressions.xml
+++ b/system/doc/reference_manual/expressions.xml
@@ -792,6 +792,7 @@ Expr1 -- Expr2</pre>
    </section>
 
   <section>
+    <marker id="map_expressions"></marker>
 	<title>Map Expressions</title>
 	  <section>
 	  <title>Creating Maps</title>