Update links to OSGi Javadocs to R6 (bug 510679)
diff --git a/bundles/org.eclipse.jdt.doc.isv/jdtOptions.txt b/bundles/org.eclipse.jdt.doc.isv/jdtOptions.txt
index 53d8d10..1c42f2b 100644
--- a/bundles/org.eclipse.jdt.doc.isv/jdtOptions.txt
+++ b/bundles/org.eclipse.jdt.doc.isv/jdtOptions.txt
@@ -112,7 +112,7 @@
;org.eclipse.jdt.junit.*"
-link https://docs.oracle.com/javase/8/docs/api/
-link https://osgi.org/javadoc/r6/core/
--link https://osgi.org/javadoc/r5/enterprise/
+-link https://osgi.org/javadoc/r6/enterprise/
-linkoffline ./../../../org.eclipse.platform.doc.isv/reference/api ../org.eclipse.platform.doc.isv/reference/api
-tag 'noimplement:a:Restriction:'
-tag 'noextend:a:Restriction:'
diff --git a/bundles/org.eclipse.pde.doc.user/pdeOptions.txt b/bundles/org.eclipse.pde.doc.user/pdeOptions.txt
index f167f47..56a8823 100644
--- a/bundles/org.eclipse.pde.doc.user/pdeOptions.txt
+++ b/bundles/org.eclipse.pde.doc.user/pdeOptions.txt
@@ -81,7 +81,7 @@
-bottom "<br><span style='font-size:small;float:right'>Copyright (c) 2000, 2017 Eclipse Contributors and others. All rights reserved.</span><span style='font-size:small'><a href='{@docRoot}/../misc/api-usage-rules.html'>Guidelines for using Eclipse APIs.</a></span>"
-link https://docs.oracle.com/javase/8/docs/api/
-link https://osgi.org/javadoc/r6/core/
--link https://osgi.org/javadoc/r5/enterprise/
+-link https://osgi.org/javadoc/r6/enterprise/
-linkoffline ./../../../org.eclipse.platform.doc.isv/reference/api ../org.eclipse.platform.doc.isv/reference/api
-linkoffline ./../../../org.eclipse.jdt.doc.isv/reference/api ../org.eclipse.jdt.doc.isv/reference/api
-tag 'noimplement:a:Restriction:'
diff --git a/bundles/org.eclipse.platform.doc.isv/platformOptions.txt b/bundles/org.eclipse.platform.doc.isv/platformOptions.txt
index bf6034a..43e5968 100644
--- a/bundles/org.eclipse.platform.doc.isv/platformOptions.txt
+++ b/bundles/org.eclipse.platform.doc.isv/platformOptions.txt
@@ -185,8 +185,8 @@
-link https://docs.oracle.com/javase/8/docs/api/
-link https://docs.oracle.com/javase/8/docs/jre/api/plugin/dom/
-link https://osgi.org/javadoc/r6/core/
--link https://osgi.org/javadoc/r5/cmpn/
--link https://osgi.org/javadoc/r5/enterprise/
+-link https://osgi.org/javadoc/r6/cmpn/
+-link https://osgi.org/javadoc/r6/enterprise/
-tag 'noimplement:a:Restriction:'
-tag 'noextend:a:Restriction:'
-tag 'noreference:a:Restriction:'
