aboutsummaryrefslogtreecommitdiffstats
path: root/system/doc/reference_manual
diff options
context:
space:
mode:
authorHans Bolinder <[email protected]>2013-09-12 13:12:06 +0200
committerHans Bolinder <[email protected]>2013-09-12 13:12:06 +0200
commit2c19557ef4a09278c2bc448db1524a39e686c9e7 (patch)
tree2ac291a8fe3f138efbcf47f6f81e2dd85b9bb5d0 /system/doc/reference_manual
parent11522f343c082ac9e3ff0210f2d0f0a023a8048c (diff)
parentb15d3c7cc568abfb2c7cf48cd76f1d8d503b2736 (diff)
downloadotp-2c19557ef4a09278c2bc448db1524a39e686c9e7.tar.gz
otp-2c19557ef4a09278c2bc448db1524a39e686c9e7.tar.bz2
otp-2c19557ef4a09278c2bc448db1524a39e686c9e7.zip
Merge branch 'maint'
* maint: Correct documentation of predefined types crypto: Add ticket for 5d8a13bb6a180e0a
Diffstat (limited to 'system/doc/reference_manual')
-rw-r--r--system/doc/reference_manual/typespec.xml8
1 files changed, 3 insertions, 5 deletions
diff --git a/system/doc/reference_manual/typespec.xml b/system/doc/reference_manual/typespec.xml
index 3c91f1686d..635476737d 100644
--- a/system/doc/reference_manual/typespec.xml
+++ b/system/doc/reference_manual/typespec.xml
@@ -160,7 +160,7 @@
<p>
For convenience, the following types are also built-in.
They can be thought as predefined aliases for the type unions also shown in
- the table. (Some type unions below slightly abuse the syntax of types.)
+ the table.
</p>
<table>
<row>
@@ -170,10 +170,10 @@
<cell><c>term()</c></cell><cell><c>any()</c></cell>
</row>
<row>
- <cell><c>binary()</c></cell><cell><c>&lt;&lt;_:*8&gt;&gt;</c></cell>
+ <cell><c>binary()</c></cell><cell><c>&lt;&lt;_:_*8&gt;&gt;</c></cell>
</row>
<row>
- <cell><c>bitstring()</c></cell><cell><c>&lt;&lt;_:*1&gt;&gt;</c></cell>
+ <cell><c>bitstring()</c></cell><cell><c>&lt;&lt;_:_*1&gt;&gt;</c></cell>
</row>
<row>
<cell><c>boolean()</c></cell><cell><c>'false' | 'true'</c></cell>
@@ -251,8 +251,6 @@
Users are not allowed to define types with the same names as the
predefined or built-in ones. This is checked by the compiler and
its violation results in a compilation error.
- (For bootstrapping purposes, it can also result to just a warning
- if this involves a built-in type which has just been introduced.)
</p>
<note>
The following built-in list types also exist,