From e082a9bd5b08c5b8b95a3592c7bf2b449655bcb2 Mon Sep 17 00:00:00 2001
From: Fredrik Gustafsson <fredrik@erlang.org>
Date: Tue, 20 Nov 2012 10:07:11 +0100
Subject: Added specs and doc

---
 lib/kernel/doc/src/inet.xml | 43 ++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 42 insertions(+), 1 deletion(-)

(limited to 'lib/kernel/doc')

diff --git a/lib/kernel/doc/src/inet.xml b/lib/kernel/doc/src/inet.xml
index b727960d96..c6e9242a4f 100644
--- a/lib/kernel/doc/src/inet.xml
+++ b/lib/kernel/doc/src/inet.xml
@@ -371,7 +371,48 @@ fe80::204:acff:fe17:bf38
         </taglist>
       </desc>
     </func>
-
+    <func>
+      <name name="ipv4_address" arity="1" />
+      <fsummary>Parse an IPv4 address</fsummary>
+      <desc>
+	<p>Returns a ipv4 address tuple</p>
+      </desc>
+    </func>
+    <func>
+      <name name="ipv4strict_address" arity="1" />
+      <fsummary>Parse an IPv4 address strict.</fsummary>
+      <desc>
+	<p>Returns a ipv4 address tuple</p>
+      </desc>
+    </func>
+    <func>
+      <name name="ipv6_address" arity="1" />
+      <fsummary>Parse an IPv6 address</fsummary>
+      <desc>
+	<p>Returns a ipv6 address tuple</p>
+      </desc>
+    </func>
+    <func>
+      <name name="ipv6strict_address" arity="1" />
+      <fsummary>Parse an IPv6 address strict.</fsummary>
+      <desc>
+	<p>Returns a ipv4 address tuple</p>
+      </desc>
+    </func>
+    <func>
+      <name name="parse_address" arity="1" />
+      <fsummary>Parse an IPv4 or IPv6 address.</fsummary>
+      <desc>
+	<p>Returns a ipv4 or ipv6 address tuple</p>
+      </desc>
+    </func>
+    <func>
+      <name name="parse_strict_address" arity="1" />
+      <fsummary>Parse an IPv4 or IPv6 address strict.</fsummary>
+      <desc>
+	<p>Returns a ipv4 or ipv6 address tuple</p>
+      </desc>
+    </func>
     <func>
       <name name="peername" arity="1"/>
       <fsummary>Return the address and port for the other end of a connection</fsummary>
-- 
cgit v1.2.3


From 9f3141274edd21cffcf371cca553eef56a65df8d Mon Sep 17 00:00:00 2001
From: Fredrik Gustafsson <fredrik@erlang.org>
Date: Wed, 21 Nov 2012 17:13:29 +0100
Subject: Changes to function names, tests and docs of inet

---
 lib/kernel/doc/src/inet.xml | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

(limited to 'lib/kernel/doc')

diff --git a/lib/kernel/doc/src/inet.xml b/lib/kernel/doc/src/inet.xml
index c6e9242a4f..330a188ab8 100644
--- a/lib/kernel/doc/src/inet.xml
+++ b/lib/kernel/doc/src/inet.xml
@@ -372,45 +372,47 @@ fe80::204:acff:fe17:bf38
       </desc>
     </func>
     <func>
-      <name name="ipv4_address" arity="1" />
+      <name name="parse_ipv4_address" arity="1" />
       <fsummary>Parse an IPv4 address</fsummary>
       <desc>
 	<p>Returns a ipv4 address tuple</p>
       </desc>
     </func>
     <func>
-      <name name="ipv4strict_address" arity="1" />
+      <name name="parse_ipv4strict_address" arity="1" />
       <fsummary>Parse an IPv4 address strict.</fsummary>
       <desc>
-	<p>Returns a ipv4 address tuple</p>
+	<p>Parses an IPv4 address and returns a ipv4 address tuple. Must contain four fields.</p>
       </desc>
     </func>
     <func>
-      <name name="ipv6_address" arity="1" />
+      <name name="parse_ipv6_address" arity="1" />
       <fsummary>Parse an IPv6 address</fsummary>
       <desc>
-	<p>Returns a ipv6 address tuple</p>
+	<p>Parses an IPv6 address and returns a ipv6 address tuple.
+	 If an IPv4 address is passed, an IPv4-mapped IPv6 address is returned.</p>
       </desc>
     </func>
     <func>
-      <name name="ipv6strict_address" arity="1" />
+      <name name="parse_ipv6strict_address" arity="1" />
       <fsummary>Parse an IPv6 address strict.</fsummary>
       <desc>
-	<p>Returns a ipv4 address tuple</p>
+	<p>Parses an IPv6 address and returns a ipv6 address tuple. 
+	Does <b>not</b> accept IPv4 adresses.</p>
       </desc>
     </func>
     <func>
       <name name="parse_address" arity="1" />
       <fsummary>Parse an IPv4 or IPv6 address.</fsummary>
       <desc>
-	<p>Returns a ipv4 or ipv6 address tuple</p>
+	<p>Parses an IPv4 or IPv6 address and returns a ipv4 or ipv6 address tuple. Accepts a shortened IPv4 address.</p>
       </desc>
     </func>
     <func>
       <name name="parse_strict_address" arity="1" />
       <fsummary>Parse an IPv4 or IPv6 address strict.</fsummary>
       <desc>
-	<p>Returns a ipv4 or ipv6 address tuple</p>
+	<p>Parses an IPv4 or IPv6 address and returns a ipv4 or ipv6 address tuple. Does <b>not</b> accept a shortened IPv4 address.</p>
       </desc>
     </func>
     <func>
-- 
cgit v1.2.3


From 0c0146130522ae0ba5057394cedf76fa46a5d8bf Mon Sep 17 00:00:00 2001
From: Fredrik Gustafsson <fredrik@erlang.org>
Date: Thu, 22 Nov 2012 11:52:19 +0100
Subject: Documentation changes inet

---
 lib/kernel/doc/src/inet.xml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'lib/kernel/doc')

diff --git a/lib/kernel/doc/src/inet.xml b/lib/kernel/doc/src/inet.xml
index 330a188ab8..eff1d07735 100644
--- a/lib/kernel/doc/src/inet.xml
+++ b/lib/kernel/doc/src/inet.xml
@@ -375,29 +375,29 @@ fe80::204:acff:fe17:bf38
       <name name="parse_ipv4_address" arity="1" />
       <fsummary>Parse an IPv4 address</fsummary>
       <desc>
-	<p>Returns a ipv4 address tuple</p>
+	<p>Parses an IPv4 address string and returns an <a href="#type-ip4_address">ip4_address()</a>.</p>
       </desc>
     </func>
     <func>
       <name name="parse_ipv4strict_address" arity="1" />
       <fsummary>Parse an IPv4 address strict.</fsummary>
       <desc>
-	<p>Parses an IPv4 address and returns a ipv4 address tuple. Must contain four fields.</p>
+	<p>Parses an IPv4 address string containing four fields and returns a <a href="#type-ip4_adress">ip4_address()</a>.</p>
       </desc>
     </func>
     <func>
       <name name="parse_ipv6_address" arity="1" />
       <fsummary>Parse an IPv6 address</fsummary>
       <desc>
-	<p>Parses an IPv6 address and returns a ipv6 address tuple.
-	 If an IPv4 address is passed, an IPv4-mapped IPv6 address is returned.</p>
+	<p>Parses an IPv6 address string and returns a <a href="#type-ip6_address">ip6_address()</a>.
+	 If an IPv4 address string is passed, an IPv4-mapped IPv6 address is returned.</p>
       </desc>
     </func>
     <func>
       <name name="parse_ipv6strict_address" arity="1" />
       <fsummary>Parse an IPv6 address strict.</fsummary>
       <desc>
-	<p>Parses an IPv6 address and returns a ipv6 address tuple. 
+	<p>Parses an IPv6 address string and returns a <a href="#type-ip6_address">ip6_address()</a>. 
 	Does <b>not</b> accept IPv4 adresses.</p>
       </desc>
     </func>
@@ -405,14 +405,14 @@ fe80::204:acff:fe17:bf38
       <name name="parse_address" arity="1" />
       <fsummary>Parse an IPv4 or IPv6 address.</fsummary>
       <desc>
-	<p>Parses an IPv4 or IPv6 address and returns a ipv4 or ipv6 address tuple. Accepts a shortened IPv4 address.</p>
+	<p>Parses an IPv4 or IPv6 address string and returns a <a href="#type-ip4_address">ip4_address()</a> or <a href="#type-ip6_address">ip6_address()</a>. Accepts a shortened IPv4 address string.</p>
       </desc>
     </func>
     <func>
       <name name="parse_strict_address" arity="1" />
       <fsummary>Parse an IPv4 or IPv6 address strict.</fsummary>
       <desc>
-	<p>Parses an IPv4 or IPv6 address and returns a ipv4 or ipv6 address tuple. Does <b>not</b> accept a shortened IPv4 address.</p>
+	<p>Parses an IPv4 or IPv6 address string and returns an <a href="#type-ip4_address">ip4_address()</a> or <a href="#type-ip6_adress">ip6_address()</a>. Does <b>not</b> accept a shortened IPv4 address string.</p>
       </desc>
     </func>
     <func>
-- 
cgit v1.2.3


From dbe3c2c9a76c631b98be020b932150ecbe4dd074 Mon Sep 17 00:00:00 2001
From: Fredrik Gustafsson <fredrik@erlang.org>
Date: Fri, 23 Nov 2012 10:19:37 +0100
Subject: Inet doc clarifications

---
 lib/kernel/doc/src/inet.xml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'lib/kernel/doc')

diff --git a/lib/kernel/doc/src/inet.xml b/lib/kernel/doc/src/inet.xml
index eff1d07735..6e9e67b9c9 100644
--- a/lib/kernel/doc/src/inet.xml
+++ b/lib/kernel/doc/src/inet.xml
@@ -375,21 +375,22 @@ fe80::204:acff:fe17:bf38
       <name name="parse_ipv4_address" arity="1" />
       <fsummary>Parse an IPv4 address</fsummary>
       <desc>
-	<p>Parses an IPv4 address string and returns an <a href="#type-ip4_address">ip4_address()</a>.</p>
+	<p>Parses an IPv4 address string and returns an <a href="#type-ip4_address">ip4_address()</a>.
+	 Accepts a shortened IPv4 shortened address string.</p>
       </desc>
     </func>
     <func>
       <name name="parse_ipv4strict_address" arity="1" />
       <fsummary>Parse an IPv4 address strict.</fsummary>
       <desc>
-	<p>Parses an IPv4 address string containing four fields and returns a <a href="#type-ip4_adress">ip4_address()</a>.</p>
+	<p>Parses an IPv4 address string containing four fields, i.e <b>not</b> shortened, and returns an <a href="#type-ip4_adress">ip4_address()</a>.</p>
       </desc>
     </func>
     <func>
       <name name="parse_ipv6_address" arity="1" />
       <fsummary>Parse an IPv6 address</fsummary>
       <desc>
-	<p>Parses an IPv6 address string and returns a <a href="#type-ip6_address">ip6_address()</a>.
+	<p>Parses an IPv6 address string and returns an <a href="#type-ip6_address">ip6_address()</a>.
 	 If an IPv4 address string is passed, an IPv4-mapped IPv6 address is returned.</p>
       </desc>
     </func>
@@ -397,7 +398,7 @@ fe80::204:acff:fe17:bf38
       <name name="parse_ipv6strict_address" arity="1" />
       <fsummary>Parse an IPv6 address strict.</fsummary>
       <desc>
-	<p>Parses an IPv6 address string and returns a <a href="#type-ip6_address">ip6_address()</a>. 
+	<p>Parses an IPv6 address string and returns an <a href="#type-ip6_address">ip6_address()</a>. 
 	Does <b>not</b> accept IPv4 adresses.</p>
       </desc>
     </func>
@@ -405,7 +406,7 @@ fe80::204:acff:fe17:bf38
       <name name="parse_address" arity="1" />
       <fsummary>Parse an IPv4 or IPv6 address.</fsummary>
       <desc>
-	<p>Parses an IPv4 or IPv6 address string and returns a <a href="#type-ip4_address">ip4_address()</a> or <a href="#type-ip6_address">ip6_address()</a>. Accepts a shortened IPv4 address string.</p>
+	<p>Parses an IPv4 or IPv6 address string and returns an <a href="#type-ip4_address">ip4_address()</a> or <a href="#type-ip6_address">ip6_address()</a>. Accepts a shortened IPv4 address string.</p>
       </desc>
     </func>
     <func>
-- 
cgit v1.2.3