From 0a0179a92f68b342a348b70ef4aa20cf35dc01f7 Mon Sep 17 00:00:00 2001
From: Michael Koch <konqueror@gmx.de>
Date: Tue, 19 Apr 2005 19:07:13 +0000
Subject: [PATCH] 2005-04-19  Michael Koch  <konqueror@gmx.de>

	* java/net/InetAddress.java
	(InetAddress): Fixed javadoc comment.
	(aton): Likewise.
	(lookup): Added javadoc.
	(getFamily): Likewise.
	* java/net/ServerSocket.java
	(getChannel): Improved javadoc comment.

From-SVN: r98419
---
 libjava/ChangeLog                  | 10 ++++++++++
 libjava/java/net/InetAddress.java  | 28 +++++++++++++++++++++++-----
 libjava/java/net/ServerSocket.java |  6 +++---
 3 files changed, 36 insertions(+), 8 deletions(-)

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 47d5f4f..5c5ca3f 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,13 @@
+2005-04-19  Michael Koch  <konqueror@gmx.de>
+
+	* java/net/InetAddress.java
+	(InetAddress): Fixed javadoc comment.
+	(aton): Likewise.
+	(lookup): Added javadoc.
+	(getFamily): Likewise.
+	* java/net/ServerSocket.java
+	(getChannel): Improved javadoc comment.
+
 2005-04-19  Andrew John Hughes  <gnu_andrew@member.fsf.org>
 
 	* gnu/xml/dom/html2/DomHTMLParser.java:
diff --git a/libjava/java/net/InetAddress.java b/libjava/java/net/InetAddress.java
index 5a3ec47..9e4d02f 100644
--- a/libjava/java/net/InetAddress.java
+++ b/libjava/java/net/InetAddress.java
@@ -115,7 +115,7 @@ public class InetAddress implements Serializable
 
   /**
    * Initializes this object's addr instance variable from the passed in
-   * int array.  Note that this constructor is protected and is called
+   * byte array.  Note that this constructor is protected and is called
    * only by static methods in this class.
    *
    * @param ipaddr The IP number of this address as an array of bytes
@@ -541,15 +541,33 @@ public class InetAddress implements Serializable
   }
 
   /**
-   * If host is a valid numeric IP address, return the numeric address.
+   * If hostname  is a valid numeric IP address, return the numeric address.
    * Otherwise, return null.
+   *
+   * @param hostname the name of the host
    */
-  private static native byte[] aton (String host);
+  private static native byte[] aton(String hostname);
 
+  /**
+   * Looks up all addresses of a given host.
+   *
+   * @param hostname the host to lookup
+   * @param ipaddr FIXME
+   * @param all FIXME
+   *
+   * @return an array with all found addresses
+   */
   private static native InetAddress[] lookup (String hostname,
-		                              InetAddress addr, boolean all);
+		                              InetAddress ipaddr, boolean all);
 
-  private static native int getFamily (byte[] address);
+  /**
+   * Returns tha family type of an IP address.
+   *
+   * @param addr the IP address
+   *
+   * @return the family
+   */
+  private static native int getFamily (byte[] ipaddr);
 
   /**
    * Returns an InetAddress object representing the IP address of the given
diff --git a/libjava/java/net/ServerSocket.java b/libjava/java/net/ServerSocket.java
index b0576bf..50ea0be 100644
--- a/libjava/java/net/ServerSocket.java
+++ b/libjava/java/net/ServerSocket.java
@@ -399,11 +399,11 @@ public class ServerSocket
   }
 
   /**
-   * Returns the unique ServerSocketChannel object
+   * Returns the unique <code>ServerSocketChannel</code> object
    * associated with this socket, if any.
    *
-   * The socket only has a ServerSocketChannel if its created
-   * by ServerSocketChannel.open.
+   * <p>The socket only has a <code>ServerSocketChannel</code> if its created
+   * by <code>ServerSocketChannel.open()</code>.</p>
    *
    * @return the associated socket channel, null if none exists
    * 
-- 
2.7.4