Merge branch 'master' of ssh://gerrit.onlab.us:29418/onos-next
diff --git a/cli/src/main/javadoc/org/onlab/onos/cli/net/package.html b/cli/src/main/javadoc/org/onlab/onos/cli/net/package.html
new file mode 100644
index 0000000..f939275
--- /dev/null
+++ b/cli/src/main/javadoc/org/onlab/onos/cli/net/package.html
@@ -0,0 +1,4 @@
+<body>
+Administrative console command-line extensions for interacting with the
+network model & services.
+</body>
diff --git a/core/api/src/main/java/org/onlab/onos/net/host/HostProvider.java b/core/api/src/main/java/org/onlab/onos/net/host/HostProvider.java
index 8b92883..72264dc 100644
--- a/core/api/src/main/java/org/onlab/onos/net/host/HostProvider.java
+++ b/core/api/src/main/java/org/onlab/onos/net/host/HostProvider.java
@@ -8,13 +8,11 @@
*/
public interface HostProvider extends Provider {
- // TODO: consider how dirty the triggerProbe gets; if it costs too much, let's drop it
-
/**
* Triggers an asynchronous probe of the specified host, intended to
* determine whether the host is present or not. An indirect result of this
- * should be invocation of {@link org.onlab.onos.net.host.HostProviderService#hostDetected(HostDescription)} or
- * {@link org.onlab.onos.net.host.HostProviderService#hostVanished(HostDescription)}
+ * should be invocation of {@link org.onlab.onos.net.host.HostProviderService#hostDetected}
+ * or {@link org.onlab.onos.net.host.HostProviderService#hostVanished}
* at some later point in time.
*
* @param host host to probe
diff --git a/utils/misc/src/main/javadoc/org/onlab/packet/package.html b/utils/misc/src/main/javadoc/org/onlab/packet/package.html
new file mode 100644
index 0000000..78ce3e6
--- /dev/null
+++ b/utils/misc/src/main/javadoc/org/onlab/packet/package.html
@@ -0,0 +1,4 @@
+<body>
+Utilities for decoding and encoding packets of various network protocols
+and encapsulations.
+</body>