Merge branch 'bjorn/asn1/doc'

* bjorn/asn1/doc:
  asn1_spec: Correct obsolete details about compiler options
  Update asn1 documentation

1 files changed, 13 insertions, 13 deletions

diff --git a/lib/asn1/doc/src/asn1rt.xml b/lib/asn1/doc/src/asn1rt.xml
index 3cf56b01ca..f5c334c2ac 100644
--- a/lib/asn1/doc/src/asn1rt.xml
+++ b/lib/asn1/doc/src/asn1rt.xml
@@ -46,7 +46,7 @@
 
     <func>
       <name>decode(Module,Type,Bytes) -> {ok,Value}|{error,Reason}</name>
-      <fsummary>Decode from bytes into an ASN.1 value.</fsummary>
+      <fsummary>Decodes from Bytes into an ASN.1 value.</fsummary>
       <type>
         <v>Module = Type = atom()</v>
         <v>Value = Reason = term()</v>
@@ -61,7 +61,7 @@
 
     <func>
       <name>encode(Module,Type,Value)-> {ok,Bytes} | {error,Reason}</name>
-      <fsummary>Encode an ASN.1 value.</fsummary>
+      <fsummary>Encodes an ASN.1 value.</fsummary>
       <type>
         <v>Module = Type = atom()</v>
         <v>Value = term()</v>
@@ -69,12 +69,12 @@
         <v>Reason = term()</v>
       </type>
       <desc>
-        <p>Encodes <c>Value</c> of <c>Type</c> defined in the ASN.1
+        <p>Encodes <c>Value</c> of <c>Type</c> defined in the <c>ASN.1</c>
         module <c>Module</c>. Returns a binary if successful. To get
-        as fast execution as possible the encode function only
-        performs rudimentary tests that the input <c>Value</c> is a
-        correct instance of <c>Type</c>. The length of strings is, for
-        example, not always checked. </p>
+        as fast execution as possible, the encode function performs
+        only the rudimentary test that input <c>Value</c> is a correct
+        instance of <c>Type</c>. For example, the length of strings is
+        not always checked.</p>
 	<p>Use <c>Module:encode(Type, Value)</c> instead of this function.</p>
       </desc>
     </func>
@@ -88,23 +88,23 @@
         <v>Reason = term()</v>
       </type>
       <desc>
-        <p><c>info/1</c> returns the version of the asn1 compiler that was
+        <p>Returns the version of the <c>ASN.1</c> compiler that was
           used to compile the module. It also returns the compiler options
-          that was used.</p>
+          that were used.</p>
 	<p>Use <c>Module:info()</c> instead of this function.</p>
       </desc>
     </func>
 
     <func>
       <name>utf8_binary_to_list(UTF8Binary) ->  {ok,UnicodeList} | {error,Reason}</name>
-      <fsummary>Transforms an utf8 encoded binary to a unicode list.</fsummary>
+      <fsummary>Transforms an UTF8 encoded binary to a unicode list.</fsummary>
       <type>
         <v>UTF8Binary = binary()</v>
         <v>UnicodeList = [integer()]</v>
         <v>Reason = term()</v>
       </type>
       <desc>
-        <p><c>utf8_binary_to_list/1</c> Transforms a UTF8 encoded binary
+        <p>Transforms a UTF8 encoded binary
           to a list of integers, where each integer represents one
           character as its unicode value. The function fails if the binary
           is not a properly encoded UTF8 string.</p>
@@ -114,14 +114,14 @@
 
     <func>
       <name>utf8_list_to_binary(UnicodeList) ->  {ok,UTF8Binary} | {error,Reason}</name>
-      <fsummary>Transforms an unicode list ot an utf8 binary.</fsummary>
+      <fsummary>Transforms an unicode list to a UTF8 binary.</fsummary>
       <type>
         <v>UnicodeList = [integer()]</v>
         <v>UTF8Binary = binary()</v>
         <v>Reason = term()</v>
       </type>
       <desc>
-        <p><c>utf8_list_to_binary/1</c> Transforms a list of integers,
+        <p>Transforms a list of integers,
           where each integer represents one character as its unicode
           value, to a UTF8 encoded binary.</p>
 	<p>Use <seealso marker="stdlib:unicode#characters_to_binary-1">unicode:characters_to_binary/1</seealso> instead of this function.</p>