--- a/src/jdk.incubator.jpackage/share/classes/module-info.java	Tue Nov 19 18:45:08 2019 -0500
+++ b/src/jdk.incubator.jpackage/share/classes/module-info.java	Wed Nov 20 10:17:37 2019 -0500
@@ -28,6 +28,20 @@
  *
  * <p>jpackage is a tool for generating self-contained application bundles.
  *
+ * <p> This module provides the equivalent of command-line access to <em>jpackage</em>
+ * via the {@link java.util.spi.ToolProvider ToolProvider} SPI.
+ * Instances of the tool can be obtained by calling
+ * {@link java.util.spi.ToolProvider#findFirst ToolProvider.findFirst}
+ * or the {@link java.util.ServiceLoader service loader} with the name
+ * {@code "jpackage"}.
+ *
+ * @implNote The {@code jpackage} tool is not thread-safe. An application
+ * should not call either of the
+ * {@link java.util.spi.ToolProvider ToolProvider} {@code run} methods
+ * concurrently, even with separate {@code "jpackage"} {@code ToolProvider}
+ * instances, or undefined behavior may result.
+ *
+ *
  * @moduleGraph
  * @since 14
  */
@@ -43,14 +57,6 @@
     provides jdk.incubator.jpackage.internal.Bundlers with
         jdk.incubator.jpackage.internal.BasicBundlers;
 
-/*
- * while jpackage is incubating, do not provide ToolProvider directly, but
- * instead export jdk.incubator.jpackage.ToolProviderFactory
- *
- *    provides java.util.spi.ToolProvider
- *        with jdk.incubator.jpackage.internal.JPackageToolProvider;
- */
-    exports jdk.incubator.jpackage;
-
-
+    provides java.util.spi.ToolProvider
+        with jdk.incubator.jpackage.internal.JPackageToolProvider;
 }