Update references to OSGi core javadoc to R6.

4 files changed, 14 insertions, 14 deletions

diff --git a/bundles/org.eclipse.platform.doc.isv/guide/runtime_model_bundles.htm b/bundles/org.eclipse.platform.doc.isv/guide/runtime_model_bundles.htm
index fce90af7e..e62900a8f 100644
--- a/bundles/org.eclipse.platform.doc.isv/guide/runtime_model_bundles.htm
+++ b/bundles/org.eclipse.platform.doc.isv/guide/runtime_model_bundles.htm
@@ -26,7 +26,7 @@ The <b><a href="../reference/api/org/eclipse/core/runtime/Plugin.html">Plugin</a
 is running in the platform.  It is a convenient place to centralize the life-cycle aspects and overall 
 semantics of a plug-in.  A plug-in can implement specialized functionality for the <b>start</b> and <b>stop</b>
 aspects of its life-cycle.  Each life-cycle method includes a reference to a  
-<b><a href="http://www.osgi.org/javadoc/r5/core/org/osgi/framework/BundleContext.html">BundleContext</a></b> which can supply
+<b><a href="http://www.osgi.org/javadoc/r6/core/org/osgi/framework/BundleContext.html">BundleContext</a></b> which can supply
 additional information.</p>
 <p>
 The <b>start</b> portion of the life-cycle is worth particular discussion.  We've seen already that information 
@@ -55,45 +55,45 @@ in the start-up code.  This ensures that large data structures are not built unt
 <h4>Bundle Context</h4>
 <p>
 Life-cycle management is where the OSGi &quot;bundle&quot; terminology and the platform's 
-&quot;plug-in&quot; terminology meet.  When your plug-in is started, it is given a reference to a <b><a href="http://www.osgi.org/javadoc/r5/core/org/osgi/framework/BundleContext.html">
+&quot;plug-in&quot; terminology meet.  When your plug-in is started, it is given a reference to a <b><a href="http://www.osgi.org/javadoc/r6/core/org/osgi/framework/BundleContext.html">
 BundleContext</a></b> from which it can obtain information related to the plug-in.  The
-<b><a href="http://www.osgi.org/javadoc/r5/core/org/osgi/framework/BundleContext.html">BundleContext</a></b>
+<b><a href="http://www.osgi.org/javadoc/r6/core/org/osgi/framework/BundleContext.html">BundleContext</a></b>
 can also be used to find out about other bundles/plug-ins in the system.  
 </p>
 <p>
 <b>BundleContext.getBundles()</b> can be used to obtain an array of all bundles in the system.  Listeners for
 <b>BundleEvent</b> can be registered so that your plug-in is aware when another bundle has a change
 in its life-cycle status.  See the javadoc for 
-<b><a href="http://www.osgi.org/javadoc/r5/core/org/osgi/framework/BundleContext.html">BundleContext</a></b> and
-<b><a href="http://www.osgi.org/javadoc/r5/core/org/osgi/framework/BundleEvent.html">BundleEvent</a></b> for more information.
+<b><a href="http://www.osgi.org/javadoc/r6/core/org/osgi/framework/BundleContext.html">BundleContext</a></b> and
+<b><a href="http://www.osgi.org/javadoc/r6/core/org/osgi/framework/BundleEvent.html">BundleEvent</a></b> for more information.
 </p>
 <blockquote><i>
 Prior to 3.0, a plug-in registry (<b>IPluginRegistry</b>) was provided to supply similar information.  For example,
 it could be queried for the plug-in descriptors of all plug-ins in the system.  This registry is now deprecated and
-<b><a href="http://www.osgi.org/javadoc/r5/core/org/osgi/framework/BundleContext.html">BundleContext</a></b> should be
+<b><a href="http://www.osgi.org/javadoc/r6/core/org/osgi/framework/BundleContext.html">BundleContext</a></b> should be
 used for this purpose.  The platform registry is now used exclusively for information about extensions 
 and extension points.
 </i></blockquote>
 <h4>Bundle Activator</h4>
 <p>
-The <b><a href="http://www.osgi.org/javadoc/r5/core/org/osgi/framework/BundleActivator.html">BundleActivator</a></b> interface defines
+The <b><a href="http://www.osgi.org/javadoc/r6/core/org/osgi/framework/BundleActivator.html">BundleActivator</a></b> interface defines
 the start and stop behavior implemented in 
 <b><a href="../reference/api/org/eclipse/core/runtime/Plugin.html">Plugin</a></b>.  Although the
 <b><a href="../reference/api/org/eclipse/core/runtime/Plugin.html">Plugin</a></b> class is a convenient place
 to implement this function, a plug-in developer has complete freedom to implement the interface for
-<b><a href="http://www.osgi.org/javadoc/r5/core/org/osgi/framework/BundleActivator.html">BundleActivator</a></b> in any class
+<b><a href="http://www.osgi.org/javadoc/r6/core/org/osgi/framework/BundleActivator.html">BundleActivator</a></b> in any class
 appropriate for the plug-in's design.  In fact, your plug-in need not implement this interface at all if it
 does not have specific life-cycle management needs.  </p>
 <h4>Bundles</h4>
 <p>
 Underneath every plug-in lies an OSGi bundle managed by the framework.
-The <b><a href="http://www.osgi.org/javadoc/r5/core/org/osgi/framework/Bundle.html">Bundle</a></b> is the OSGi unit of modularity.  Fundamentally, a 
+The <b><a href="http://www.osgi.org/javadoc/r6/core/org/osgi/framework/Bundle.html">Bundle</a></b> is the OSGi unit of modularity.  Fundamentally, a 
 bundle is just a collection of files (resources and code) installed in the 
 platform.  Each bundle has its own Java
 class loader, and includes protocol for starting, stopping, and uninstalling itself.  From the Eclipse platform 
-point of view, <b><a href="http://www.osgi.org/javadoc/r5/core/org/osgi/framework/Bundle.html">Bundle</a></b> is merely an implementation 
+point of view, <b><a href="http://www.osgi.org/javadoc/r6/core/org/osgi/framework/Bundle.html">Bundle</a></b> is merely an implementation 
 class.   Plug-in developers do not extend the bundle class, but use <b><a href="../reference/api/org/eclipse/core/runtime/Plugin.html">Plugin</a></b>
-or other <b><a href="http://www.osgi.org/javadoc/r5/core/org/osgi/framework/BundleActivator.html">BundleActivator</a></b> implementations
+or other <b><a href="http://www.osgi.org/javadoc/r6/core/org/osgi/framework/BundleActivator.html">BundleActivator</a></b> implementations
 to represent the plug-in.</p>
 
 
diff --git a/bundles/org.eclipse.platform.doc.isv/guide/workbench_cmd_expressions.htm b/bundles/org.eclipse.platform.doc.isv/guide/workbench_cmd_expressions.htm
index 724daf510..4be14fe19 100644
--- a/bundles/org.eclipse.platform.doc.isv/guide/workbench_cmd_expressions.htm
+++ b/bundles/org.eclipse.platform.doc.isv/guide/workbench_cmd_expressions.htm
@@ -596,7 +596,7 @@ and property name.  For example, to test an IResource name the property would be
 </td>
 <td colspan="2">
 
-<p>Test the state of the bundle in the running environment.  Use the 'args' attribute to pass in the bundle ID and the 'value' attribute to pass the state as defined in <a href="http://www.osgi.org/javadoc/r5/core/org/osgi/framework/Bundle.html">Bundle</a>, e.g. "ACTIVE".
+<p>Test the state of the bundle in the running environment.  Use the 'args' attribute to pass in the bundle ID and the 'value' attribute to pass the state as defined in <a href="http://www.osgi.org/javadoc/r6/core/org/osgi/framework/Bundle.html">Bundle</a>, e.g. "ACTIVE".
 </p>
 </td>
 </tr>
diff --git a/bundles/org.eclipse.platform.doc.isv/platformOptions.txt b/bundles/org.eclipse.platform.doc.isv/platformOptions.txt
index d0f3266f1..42c9d3413 100644
--- a/bundles/org.eclipse.platform.doc.isv/platformOptions.txt
+++ b/bundles/org.eclipse.platform.doc.isv/platformOptions.txt
@@ -189,7 +189,7 @@
 -header "<span style='font-size:small'><b>Eclipse Platform</b><br>Luna (4.4)</span>"
 -bottom "<br><span style='font-size:small;float:right'>Copyright (c) 2000, 2013 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 http://download.oracle.com/javase/7/docs/api
--link http://www.osgi.org/javadoc/r5/core
+-link http://www.osgi.org/javadoc/r6/core
 -link http://www.osgi.org/javadoc/r5/enterprise
 
 org.eclipse.ant.core
diff --git a/bundles/org.eclipse.platform.doc.isv/topics_Reference.xml b/bundles/org.eclipse.platform.doc.isv/topics_Reference.xml
index 7c743bae2..062808b1d 100644
--- a/bundles/org.eclipse.platform.doc.isv/topics_Reference.xml
+++ b/bundles/org.eclipse.platform.doc.isv/topics_Reference.xml
@@ -504,7 +504,7 @@
        <topic label="org.eclipse.ui.workingSets" href="reference/extension-points/org_eclipse_ui_workingSets.html"/>
     </topic>
 
-	<topic label="OSGi API Reference" href="http://www.osgi.org/javadoc/r5/core"/>
+	<topic label="OSGi API Reference" href="http://www.osgi.org/javadoc/r6/core"/>
 
 	<topic label="Other reference information" href="reference/misc/index.html">
       	<topic label="Runtime options" href="reference/misc/runtime-options.html"/>