aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2019-06-12 14:55:33 +0200
committerBjörn Gustavsson <[email protected]>2019-06-12 14:55:33 +0200
commit1fd0c567f14f67c681c7cc54950232e82001f0f5 (patch)
treeb0f6c81a5bde1f396193ff22c3e97ca1749ab3e3
parentc04646e4110029cd49534ed592454e3814812244 (diff)
parent898b9b35f2cad1e925ea658d2dc381c5bde01829 (diff)
downloadotp-1fd0c567f14f67c681c7cc54950232e82001f0f5.tar.gz
otp-1fd0c567f14f67c681c7cc54950232e82001f0f5.tar.bz2
otp-1fd0c567f14f67c681c7cc54950232e82001f0f5.zip
Merge branch 'maint'
* maint: Fix some documentation typos Fix duplicated word "to" on Common Caveats doc
-rw-r--r--erts/doc/src/crash_dump.xml2
-rw-r--r--erts/doc/src/driver.xml2
-rw-r--r--erts/doc/src/erl_ext_dist.xml4
-rw-r--r--erts/doc/src/zlib.xml2
-rw-r--r--system/doc/efficiency_guide/commoncaveats.xml2
5 files changed, 6 insertions, 6 deletions
diff --git a/erts/doc/src/crash_dump.xml b/erts/doc/src/crash_dump.xml
index 33d0903622..876834307a 100644
--- a/erts/doc/src/crash_dump.xml
+++ b/erts/doc/src/crash_dump.xml
@@ -289,7 +289,7 @@ Slogan: &lt;reason&gt;</pre>
<marker id="memory"></marker>
<title>Memory Information</title>
<p>Under the tag <em>=memory</em> is shown information similar
- to what can be obtainted on a living node with
+ to what can be obtained on a living node with
<seealso marker="erts:erlang#memory/0">
<c>erlang:memory()</c></seealso>.</p>
</section>
diff --git a/erts/doc/src/driver.xml b/erts/doc/src/driver.xml
index 8f31df4cad..a873bf9931 100644
--- a/erts/doc/src/driver.xml
+++ b/erts/doc/src/driver.xml
@@ -391,7 +391,7 @@ void encode_result(ei_x_buff* x, PGresult* res, PGconn* conn)
<p>Before a driver can be called from Erlang, it must be
loaded and opened. Loading is done using the <c><![CDATA[erl_ddll]]></c>
module (the <c><![CDATA[erl_ddll]]></c> driver that loads dynamic
- driver is actually a driver itself). If loading is successfull,
+ driver is actually a driver itself). If loading is successful,
the port can be opened with <c><![CDATA[open_port/2]]></c>. The port
name must match the name of the shared library and
the name in the driver entry structure.</p>
diff --git a/erts/doc/src/erl_ext_dist.xml b/erts/doc/src/erl_ext_dist.xml
index 3730f0e8ac..2ba5994557 100644
--- a/erts/doc/src/erl_ext_dist.xml
+++ b/erts/doc/src/erl_ext_dist.xml
@@ -128,7 +128,7 @@
are deprecated and are only kept for backward
compatibility when decoding terms encoded by older nodes.</p>
<p>Support for UTF-8 encoded atoms in the external format has been
- available since ERTS 5.10 (OTP R16). This abillity allows such old nodes
+ available since ERTS 5.10 (OTP R16). This ability allows such old nodes
to decode, store and encode any Unicode atoms received from a new OTP 20
node.</p>
<p>The maximum number of allowed characters in an atom is 255. In the
@@ -913,7 +913,7 @@
<tcaption>SMALL_BIG_EXT</tcaption></table>
<p>
Bignums are stored in unary form with a <c>Sign</c> byte,
- that is, 0 if the binum is positive and 1 if it is negative. The
+ that is, 0 if the bignum is positive and 1 if it is negative. The
digits are stored with the least significant byte stored first. To
calculate the integer, the following formula can be used:
</p>
diff --git a/erts/doc/src/zlib.xml b/erts/doc/src/zlib.xml
index 38229456c9..8a580c8d7b 100644
--- a/erts/doc/src/zlib.xml
+++ b/erts/doc/src/zlib.xml
@@ -411,7 +411,7 @@ list_to_binary([B1,B2])</pre>
<func>
<name name="deflateParams" arity="3" since=""/>
- <fsummary>Dynamicly update deflate parameters.</fsummary>
+ <fsummary>Dynamically update deflate parameters.</fsummary>
<desc>
<p>Dynamically updates the compression level and compression
strategy. The interpretation of <c><anno>Level</anno></c> and
diff --git a/system/doc/efficiency_guide/commoncaveats.xml b/system/doc/efficiency_guide/commoncaveats.xml
index 7b2128d888..7b00fa5d63 100644
--- a/system/doc/efficiency_guide/commoncaveats.xml
+++ b/system/doc/efficiency_guide/commoncaveats.xml
@@ -62,7 +62,7 @@
dangerous in a system that runs continuously.
If only certain well-defined atoms are allowed as input,
<seealso marker="erts:erlang#list_to_existing_atom/1">list_to_existing_atom/1</seealso>
- can be used to
+ can be used
to guard against a denial-of-service attack. (All atoms that are allowed
must have been created earlier, for example, by simply using all of them
in a module and loading that module.)</p>