Merge branch 'ia/pr/public_key-typos' into maint

* ia/pr/public_key-typos:
  Fix public_key documentation typos

To correct version of public_key doc in maint, due to a missed push
of maint but a push of the maint to master merge, some confusion was caused.
Also the original branch (ia/pr/typo-fixes) included ssl typo fixes
that where cherry picked and merged from another branch to add to the confusion.

2 files changed, 8 insertions, 8 deletions

diff --git a/lib/public_key/doc/src/public_key.xml b/lib/public_key/doc/src/public_key.xml
index 258e7cd1b9..16a7497a22 100644
--- a/lib/public_key/doc/src/public_key.xml
+++ b/lib/public_key/doc/src/public_key.xml
@@ -114,8 +114,8 @@
       </item>
 
       <tag><c>pem_entry () =</c></tag>
-      <item><p><c>{pki_asn1_type(), binary(), %% DER or encrypted DER not_encrypted</c></p>
-      <p><c>| cipher_info()}</c></p></item>
+      <item><p><c>{pki_asn1_type(), binary(), %% DER or encrypted DER</c></p>
+      <p><c> not_encrypted | cipher_info()}</c></p></item>
       
       <tag><c>cipher_info() = </c></tag>
       <item><p><c>{"RC2-CBC" | "DES-CBC" | "DES-EDE3-CBC", crypto:rand_bytes(8)</c></p>
@@ -786,13 +786,13 @@ fun(#'DistributionPoint'{}, #'CertificateList'{},
     <fsummary>Decodes an SSH file-binary.</fsummary>
     <type>
       <v>SshBin = binary()</v>
-      <d>Example {ok, SshBin} = file:read_file("known_hosts").</d>
+      <d>Example <c>{ok, SshBin} = file:read_file("known_hosts")</c>.</d>
       <v>Type = public_key | ssh_file()</v>
       <d>If <c>Type</c> is <c>public_key</c> the binary can be either
       an RFC4716 public key or an OpenSSH public key.</d>
     </type>
   <desc>
-    <p>Decodes an SSH file-binary. In the case of <c>know_hosts</c> or
+    <p>Decodes an SSH file-binary. In the case of <c>known_hosts</c> or
     <c>auth_keys</c>, the binary can include one or more lines of the
     file. Returns a list of public keys and their attributes, possible
     attribute values depends on the file type represented by the
@@ -842,7 +842,7 @@ fun(#'DistributionPoint'{}, #'CertificateList'{},
       <v>Key = rsa_public_key() | dsa_public_key() | ec_public_key()</v>
   </type>
   <desc>
-    <p>Veryfies a digital signature.</p>
+    <p>Verifies a digital signature.</p>
   </desc> 
   </func>
   
diff --git a/lib/public_key/doc/src/public_key_records.xml b/lib/public_key/doc/src/public_key_records.xml
index fb03da3150..d34f3ed9a3 100644
--- a/lib/public_key/doc/src/public_key_records.xml
+++ b/lib/public_key/doc/src/public_key_records.xml
@@ -57,9 +57,9 @@
     
     <taglist>
       <tag><c>time() =</c></tag>
-      <item><p><c>uct_time() | general_time()</c></p></item>
+      <item><p><c>utc_time() | general_time()</c></p></item>
 
-      <tag><c>uct_time() =</c></tag>
+      <tag><c>utc_time() =</c></tag>
       <item><p><c>{utcTime, "YYMMDDHHMMSSZ"}</c></p></item>
 
       <tag><c>general_time() =</c></tag>
@@ -144,7 +144,7 @@
 
   <section>
     <title>DSA</title>
-     <p>Erlang representation of <url href="http://www.ietf.org/rfc/rfc6979.txt">Digigital Signature Algorithm (DSA)</url> keys</p>
+     <p>Erlang representation of <url href="http://www.ietf.org/rfc/rfc6979.txt">Digital Signature Algorithm (DSA)</url> keys</p>
     <code>	 
 #'DSAPrivateKey',{
 	  version,      % integer()