diff --git a/src/jdk.compiler/share/classes/com/sun/source/doctree/package-info.java b/src/jdk.compiler/share/classes/com/sun/source/doctree/package-info.java
index 25947058df8..16f04afbfcb 100644
--- a/src/jdk.compiler/share/classes/com/sun/source/doctree/package-info.java
+++ b/src/jdk.compiler/share/classes/com/sun/source/doctree/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2018, 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
@@ -30,7 +30,7 @@
  * @author Jonathan Gibbons
  * @since 1.8
  *
- * @see <a href="{@docRoot}/../specs/doc-comment-spec.html">
+ * @see <a href="{@docRootParent}/specs/doc-comment-spec.html">
  *      Documentation Comment Specification for the Standard Doclet</a>
  */
 package com.sun.source.doctree;
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/Main.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/Main.java
index 91b242684ec..47a2e954e52 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/Main.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/Main.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2018, 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
@@ -30,7 +30,7 @@ import java.io.PrintWriter;
 /**
  * A legacy programmatic interface for the Java Programming Language
  * compiler, javac.
- * See the <a href="{@docRoot}/jdk.compiler-summary.html">{@code jdk.compiler}</a>
+ * See the <a href="{@docRoot}/jdk.compiler/module-summary.html">{@code jdk.compiler}</a>
  * module for details on replacement APIs.
  */
 public class Main {
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/package-info.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/package-info.java
index 125c1915b92..fb2483cd726 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/package-info.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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
@@ -25,7 +25,7 @@
 
 /**
  * This package provides a legacy entry point for the <em>javac</em> tool.
- * See the <a href="{@docRoot}/jdk.compiler-summary.html">{@code jdk.compiler}</a>
+ * See the <a href="{@docRoot}/jdk.compiler/module-summary.html">{@code jdk.compiler}</a>
  * module for details on replacement APIs.
  */
 package com.sun.tools.javac;
diff --git a/src/jdk.javadoc/share/classes/com/sun/javadoc/ClassDoc.java b/src/jdk.javadoc/share/classes/com/sun/javadoc/ClassDoc.java
index 9bf664893a0..2550d2ac7ac 100644
--- a/src/jdk.javadoc/share/classes/com/sun/javadoc/ClassDoc.java
+++ b/src/jdk.javadoc/share/classes/com/sun/javadoc/ClassDoc.java
@@ -201,7 +201,7 @@ public interface ClassDoc extends ProgramElementDoc, Type {
 
     /**
      * Return
-     * <a href="{@docRoot}/com/sun/javadoc/package-summary.html#included">included</a>
+     * <a href="{@docRoot}/jdk.javadoc/com/sun/javadoc/package-summary.html#included">included</a>
      * fields in this class or interface.
      * Excludes enum constants if this is an enum type.
      *
@@ -212,7 +212,7 @@ public interface ClassDoc extends ProgramElementDoc, Type {
 
     /**
      * Return fields in this class or interface, filtered to the specified
-     * <a href="{@docRoot}/com/sun/javadoc/package-summary.html#included">access
+     * <a href="{@docRoot}/jdk.javadoc/com/sun/javadoc/package-summary.html#included">access
      * modifier option</a>.
      * Excludes enum constants if this is an enum type.
      *
@@ -236,7 +236,7 @@ public interface ClassDoc extends ProgramElementDoc, Type {
 
     /**
      * Return
-     * <a href="{@docRoot}/com/sun/javadoc/package-summary.html#included">included</a>
+     * <a href="{@docRoot}/jdk.javadoc/com/sun/javadoc/package-summary.html#included">included</a>
      * methods in this class or interface.
      * Same as {@code methods(true)}.
      *
@@ -248,7 +248,7 @@ public interface ClassDoc extends ProgramElementDoc, Type {
 
     /**
      * Return methods in this class or interface, filtered to the specified
-     * <a href="{@docRoot}/com/sun/javadoc/package-summary.html#included">access
+     * <a href="{@docRoot}/jdk.javadoc/com/sun/javadoc/package-summary.html#included">access
      * modifier option</a>.  Does not include constructors or annotation
      *          type elements.
      *
@@ -264,7 +264,7 @@ public interface ClassDoc extends ProgramElementDoc, Type {
 
     /**
      * Return
-     * <a href="{@docRoot}/com/sun/javadoc/package-summary.html#included">included</a>
+     * <a href="{@docRoot}/jdk.javadoc/com/sun/javadoc/package-summary.html#included">included</a>
      * constructors in this class.  An array containing the default
      * no-arg constructor is returned if no other constructors exist.
      * Return empty array if this is an interface.
@@ -276,7 +276,7 @@ public interface ClassDoc extends ProgramElementDoc, Type {
 
     /**
      * Return constructors in this class, filtered to the specified
-     * <a href="{@docRoot}/com/sun/javadoc/package-summary.html#included">access
+     * <a href="{@docRoot}/jdk.javadoc/com/sun/javadoc/package-summary.html#included">access
      * modifier option</a>.  Return an array containing the default
      * no-arg constructor if no other constructors exist.
      *
@@ -292,7 +292,7 @@ public interface ClassDoc extends ProgramElementDoc, Type {
 
     /**
      * Return
-     * <a href="{@docRoot}/com/sun/javadoc/package-summary.html#included">included</a>
+     * <a href="{@docRoot}/jdk.javadoc/com/sun/javadoc/package-summary.html#included">included</a>
      * nested classes and interfaces within this class or interface.
      * This includes both static and non-static nested classes.
      * (This method should have been named {@code nestedClasses()},
@@ -307,7 +307,7 @@ public interface ClassDoc extends ProgramElementDoc, Type {
     /**
      * Return nested classes and interfaces within this class or interface
      * filtered to the specified
-     * <a href="{@docRoot}/com/sun/javadoc/package-summary.html#included">access
+     * <a href="{@docRoot}/jdk.javadoc/com/sun/javadoc/package-summary.html#included">access
      * modifier option</a>.
      * This includes both static and non-static nested classes.
      * Anonymous and local classes are not included.
diff --git a/src/jdk.javadoc/share/classes/com/sun/javadoc/Doc.java b/src/jdk.javadoc/share/classes/com/sun/javadoc/Doc.java
index 70b74cdadd6..34310015fba 100644
--- a/src/jdk.javadoc/share/classes/com/sun/javadoc/Doc.java
+++ b/src/jdk.javadoc/share/classes/com/sun/javadoc/Doc.java
@@ -241,7 +241,7 @@ public interface Doc extends Comparable<Object> {
 
     /**
      * Is this Doc item an
-     * <a href="{@docRoot}/com/sun/javadoc/package-summary.html#class">ordinary
+     * <a href="{@docRoot}/jdk.javadoc/com/sun/javadoc/package-summary.html#class">ordinary
      * class</a>?
      * (i.e. not an interface, annotation type, enum, exception, or error)?
      *
@@ -251,7 +251,7 @@ public interface Doc extends Comparable<Object> {
 
     /**
      * Is this Doc item a
-     * <a href="{@docRoot}/com/sun/javadoc/package-summary.html#class">class</a>
+     * <a href="{@docRoot}/jdk.javadoc/com/sun/javadoc/package-summary.html#class">class</a>
      * (and not an interface or annotation type)?
      * This includes ordinary classes, enums, errors and exceptions.
      *
@@ -261,11 +261,11 @@ public interface Doc extends Comparable<Object> {
 
     /**
      * Return true if this Doc item is
-     * <a href="{@docRoot}/com/sun/javadoc/package-summary.html#included">included</a>
+     * <a href="{@docRoot}/jdk.javadoc/com/sun/javadoc/package-summary.html#included">included</a>
      * in the result set.
      *
      * @return true if this Doc item is
-     *         <a href="{@docRoot}/com/sun/javadoc/package-summary.html#included">included</a>
+     *         <a href="{@docRoot}/jdk.javadoc/com/sun/javadoc/package-summary.html#included">included</a>
      *         in the result set.
      */
     boolean isIncluded();
diff --git a/src/jdk.javadoc/share/classes/com/sun/javadoc/PackageDoc.java b/src/jdk.javadoc/share/classes/com/sun/javadoc/PackageDoc.java
index 4f1f1e46255..24e0828d1c8 100644
--- a/src/jdk.javadoc/share/classes/com/sun/javadoc/PackageDoc.java
+++ b/src/jdk.javadoc/share/classes/com/sun/javadoc/PackageDoc.java
@@ -48,7 +48,7 @@ public interface PackageDoc extends Doc {
 
     /**
      * Get all classes and interfaces in the package, filtered to the specified
-     * <a href="{@docRoot}/com/sun/javadoc/package-summary.html#included">access
+     * <a href="{@docRoot}/jdk.javadoc/com/sun/javadoc/package-summary.html#included">access
      * modifier option</a>.
      *
      * @return       filtered classes and interfaces in this package
@@ -62,7 +62,7 @@ public interface PackageDoc extends Doc {
 
     /**
      * Get all
-     * <a href="{@docRoot}/com/sun/javadoc/package-summary.html#included">included</a>
+     * <a href="{@docRoot}/jdk.javadoc/com/sun/javadoc/package-summary.html#included">included</a>
      * classes and interfaces in the package.  Same as allClasses(true).
      *
      * @return all included classes and interfaces in this package.
@@ -71,7 +71,7 @@ public interface PackageDoc extends Doc {
 
     /**
      * Get included
-     * <a href="{@docRoot}/com/sun/javadoc/package-summary.html#class">ordinary</a>
+     * <a href="{@docRoot}/jdk.javadoc/com/sun/javadoc/package-summary.html#class">ordinary</a>
      * classes (that is, exclude exceptions, errors, enums, interfaces, and
      * annotation types)
      * in this package.
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/doclet/StandardDoclet.java b/src/jdk.javadoc/share/classes/jdk/javadoc/doclet/StandardDoclet.java
index 1de02a6f3ef..418a4d9664e 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/doclet/StandardDoclet.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/doclet/StandardDoclet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2018, 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
@@ -36,7 +36,7 @@ import jdk.javadoc.internal.doclets.formats.html.HtmlDoclet;
  * This doclet generates HTML-formatted documentation for the specified modules,
  * packages and types.
  *
- * @see <a href="{@docRoot}/../specs/doc-comment-spec.html">
+ * @see <a href="{@docRootParent}/specs/doc-comment-spec.html">
  *      Documentation Comment Specification for the Standard Doclet</a>
  */
 public class StandardDoclet implements Doclet {
diff --git a/src/jdk.javadoc/share/classes/module-info.java b/src/jdk.javadoc/share/classes/module-info.java
index a6029cdc5c8..74ed415689a 100644
--- a/src/jdk.javadoc/share/classes/module-info.java
+++ b/src/jdk.javadoc/share/classes/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2018, 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
@@ -51,7 +51,7 @@
  * @provides javax.tools.DocumentationTool
  * @provides javax.tools.Tool
  *
- * @see <a href="{@docRoot}/../specs/doc-comment-spec.html">
+ * @see <a href="{@docRootParent}/specs/doc-comment-spec.html">
  *      Documentation Comment Specification for the Standard Doclet</a>
  *
  * @moduleGraph