--- old/make/src/classes/build/tools/taglet/ExtLink.java	Thu May 11 13:41:06 2017
+++ new/make/src/classes/build/tools/taglet/ExtLink.java	Thu May 11 13:41:06 2017
@@ -37,17 +37,23 @@
 import jdk.javadoc.doclet.Taglet;
 
 import static com.sun.source.doctree.DocTree.Kind.*;
-import static jdk.javadoc.doclet.Taglet.Location.*;
 
 /**
  * An inline tag to conveniently insert an external link.
  * The tag can be used as follows:
- * {@extLink name description}, for example
+ * {@extLink name description}.
  * <p>
+ * Using the tag as follows:
+ * <br>
  * {@code Please see {@extLink Borealis a spectacular} sight.}
- * <p>
- * will produce the following html
- * <p>
+ * <br>
+ * the taglet will produce the following html:
+ * <br><br>
+ * {@code Please see <cite>a spectacular</cite> sight.}
+ * <br><br>
+ * If the property {@code build.tools.taglet.ExtLink.LINK} is set, using
+ * the above example, the taglet will produce the following html:
+ * <br><br>
  * {@code
  * Please see <a href="https://www.oracle.com/pls/topic/lookup?ctx=javase9&id=Borealis">a spectacular</a> sight.
  * }
@@ -60,6 +66,8 @@
 
     static final Pattern TAG_PATTERN = Pattern.compile("(\\s*)(?<name>\\w+)(\\s+)(?<desc>.*)");
 
+    static final boolean LINK = Boolean.getBoolean("build.tools.taglet.ExtLink.LINK");
+
     /**
      * Returns the set of locations in which the tag may be used.
      */
@@ -97,13 +105,19 @@
         if (!m.find())
             return "";
 
-        StringBuilder sb = new StringBuilder("<a href=\"");
-        sb.append(URL)
-          .append(m.group("name"))
-          .append("\">")
-          .append(m.group("desc"))
-          .append("</a>");
-
+        StringBuilder sb = new StringBuilder();
+        if (LINK) {
+            sb.append("<a href=\"")
+              .append(URL)
+              .append(m.group("name"))
+              .append("\">")
+              .append(m.group("desc"))
+              .append("</a>");
+        } else {
+            sb.append("<cite>")
+              .append(m.group("desc"))
+              .append("</cite>");
+        }
         return sb.toString();
     }
 }