aboutsummaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
authorHans Bolinder <[email protected]>2015-03-18 09:45:30 +0100
committerHans Bolinder <[email protected]>2015-03-18 09:45:30 +0100
commit0a6d665ebc5d90f81162923d22c967990be8eefb (patch)
tree473b1e1489f91300ec24bf24a2b6337d370d1dd2 /system
parent6f47d0e0c0b070ea7cf001553707d93d388d083e (diff)
parent61238a7e295a55f7c3dfe047b689e76452ce8c52 (diff)
downloadotp-0a6d665ebc5d90f81162923d22c967990be8eefb.tar.gz
otp-0a6d665ebc5d90f81162923d22c967990be8eefb.tar.bz2
otp-0a6d665ebc5d90f81162923d22c967990be8eefb.zip
Merge branch 'hb/doc/fix_links'
* hb/doc/fix_links: Correct links in the system documentation
Diffstat (limited to 'system')
-rw-r--r--system/doc/programming_examples/bit_syntax.xml5
-rw-r--r--system/doc/reference_manual/processes.xml3
-rw-r--r--system/doc/reference_manual/records.xml4
-rw-r--r--system/doc/system_principles/system_principles.xml8
4 files changed, 11 insertions, 9 deletions
diff --git a/system/doc/programming_examples/bit_syntax.xml b/system/doc/programming_examples/bit_syntax.xml
index 7ede5b71f9..f97f171a69 100644
--- a/system/doc/programming_examples/bit_syntax.xml
+++ b/system/doc/programming_examples/bit_syntax.xml
@@ -4,7 +4,7 @@
<chapter>
<header>
<copyright>
- <year>2003</year><year>2013</year>
+ <year>2003</year><year>2015</year>
<holder>Ericsson AB. All Rights Reserved.</holder>
</copyright>
<legalnotice>
@@ -331,7 +331,8 @@ triples_to_bin([], Acc) ->
<p>In previous releases, this function was highly inefficient, because
the binary constructed so far (<c>Acc</c>) was copied in each recursion step.
That is no longer the case. For more information, see
- <seealso marker="doc/efficiency_guide">Efficiency Guide</seealso>.</p>
+ <seealso marker="doc/efficiency_guide:introduction">
+ Efficiency Guide</seealso>.</p>
</section>
</chapter>
diff --git a/system/doc/reference_manual/processes.xml b/system/doc/reference_manual/processes.xml
index 32af6d4480..d8474c163c 100644
--- a/system/doc/reference_manual/processes.xml
+++ b/system/doc/reference_manual/processes.xml
@@ -145,7 +145,8 @@ spawn(Module, Name, Args) -> pid()
program structures where some processes are supervising other
processes, for example, restarting them if they terminate
abnormally.</p>
- <p>See <seealso marker="doc/design_principles">
+ <p>See <seealso marker=
+ "doc/design_principles:des_princ#otp design principles">
OTP Design Principles</seealso> for more information about
OTP supervision trees, which use this feature.</p>
diff --git a/system/doc/reference_manual/records.xml b/system/doc/reference_manual/records.xml
index 3294255af9..72c56b693d 100644
--- a/system/doc/reference_manual/records.xml
+++ b/system/doc/reference_manual/records.xml
@@ -4,7 +4,7 @@
<chapter>
<header>
<copyright>
- <year>2003</year><year>2013</year>
+ <year>2003</year><year>2015</year>
<holder>Ericsson AB. All Rights Reserved.</holder>
</copyright>
<legalnotice>
@@ -36,7 +36,7 @@
<seealso marker="stdlib:shell">shell(3)</seealso>
manual page in STDLIB.</p>
<p>More examples are provided in
- <seealso marker="doc/programming_examples">
+ <seealso marker="doc/programming_examples:records">
Programming Examples</seealso>.</p>
<section>
diff --git a/system/doc/system_principles/system_principles.xml b/system/doc/system_principles/system_principles.xml
index 5718e8a3f6..70bb3cd441 100644
--- a/system/doc/system_principles/system_principles.xml
+++ b/system/doc/system_principles/system_principles.xml
@@ -4,7 +4,7 @@
<chapter>
<header>
<copyright>
- <year>1996</year><year>2014</year>
+ <year>1996</year><year>2015</year>
<holder>Ericsson AB. All Rights Reserved.</holder>
</copyright>
<legalnotice>
@@ -137,7 +137,7 @@ init:stop()</pre>
principles. (The program does not have to be started in terms of
OTP applications, but can be plain Erlang).</p>
<p>For more information about <c>.rel</c> files, see
- <seealso marker="otp design principles">
+ <seealso marker="doc/design_principles:release_handling">
OTP Design Principles</seealso> and the
<seealso marker="sasl:rel">rel(4)</seealso> manual page in
SASL.</p>
@@ -199,14 +199,14 @@ init:stop()</pre>
<cell align="left" valign="middle">Module</cell>
<cell align="left" valign="middle"><c>.erl</c></cell>
<cell align="left" valign="middle">
- <seealso marker="erlang ref manual">
+ <seealso marker="doc/reference_manual:modules">
Erlang Reference Manual</seealso></cell>
</row>
<row>
<cell align="left" valign="middle">Include file</cell>
<cell align="left" valign="middle"><c>.hrl</c></cell>
<cell align="left" valign="middle">
- <seealso marker="erlang ref manual">
+ <seealso marker="doc/reference_manual:modules">
Erlang Reference Manual</seealso></cell>
</row>
<row>