Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
authorlana
Thu, 08 Jun 2017 23:11:43 +0000
changeset 45549 6ab502c6ffb1
parent 45502 a2f322b21d7a (current diff)
parent 45548 7db465d26194 (diff)
child 45550 94680c6d60ec
child 45600 6589d4088eaa
Merge
--- a/langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/package-info.java	Thu Jun 08 16:32:57 2017 +0000
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/package-info.java	Thu Jun 08 23:11:43 2017 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,8 @@
  *
  * @author Jonathan Gibbons
  * @since 1.8
- * @see <a href="http://docs.oracle.com/javase/8/docs/technotes/tools/unix/javadoc.html#CHDJGIJB">http://docs.oracle.com/javase/8/docs/technotes/tools/unix/javadoc.html#CHDJGIJB</a>
+ *
+ * @see <a href="{@docRoot}/../specs/doc-comment-spec.html">
+ *      Documentation Comment Specification for the Standard Doclet</a>
  */
 package com.sun.source.doctree;
--- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/doclet/StandardDoclet.java	Thu Jun 08 16:32:57 2017 +0000
+++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/doclet/StandardDoclet.java	Thu Jun 08 23:11:43 2017 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,7 +33,11 @@
 import jdk.javadoc.internal.doclets.formats.html.HtmlDoclet;
 
 /**
- * This doclet generates HTML-formatted documentation for the specified modules, packages and types.
+ * This doclet generates HTML-formatted documentation for the specified modules,
+ * packages and types.
+ *
+ * @see <a href="{@docRoot}/../specs/doc-comment-spec.html">
+ *      Documentation Comment Specification for the Standard Doclet</a>
  */
 public class StandardDoclet implements Doclet {
 
--- a/langtools/src/jdk.javadoc/share/classes/module-info.java	Thu Jun 08 16:32:57 2017 +0000
+++ b/langtools/src/jdk.javadoc/share/classes/module-info.java	Thu Jun 08 23:11:43 2017 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,9 @@
  *  {@link javax.tools.ToolProvider#getSystemDocumentationTool system documentation tool}
  *  and its command line equivalent, <em>javadoc</em>.
  *
+ *  @see <a href="{@docRoot}/../specs/doc-comment-spec.html">
+ *      Documentation Comment Specification for the Standard Doclet</a>
+ *
  *  @moduleGraph
  *  @since 9
  */
jdk-sandbox