Merge pull request #4339 from vespa-engine/bratseth/link-22

Fix links

Author: bratseth

en/applications/bundles.html

@@ -181,7 +181,7 @@ <h3 id="add-jni-code-to-global-classpath">Add JNI code to the global classpath</
 </p>
 <p>
   Add the following configuration in the top level <em>services</em>
-  element in <a href="../reference/services/applications/container.html">services.xml</a>:
+  element in <a href="../reference/applications/services/container.html">services.xml</a>:
 </p>
 <pre>{% highlight xml %}
 <services version="1.0">

en/applications/chaining.html

@@ -34,7 +34,7 @@
   what it should be placed after and what itself provides,
   may be either defined using Java annotations directly on the component class,
   or it may be added specifically to the component declarations
-  in <a href="../reference/services/applications/container.html">services.xml</a>.
+  in <a href="../reference/applications/services/container.html">services.xml</a>.
   In general, the implementation should have as many of the necessary annotations as practical,
   leaving the application specific configuration clean and simple to work with.
 </p>
@@ -86,7 +86,7 @@ <h2 id="ordering-components">Ordering Components</h2>
 "B"})</code>.
 </p><p>
 Annotations which do not belong in the code may be added in the
-<a href="../reference/services/applications/container.html">configuration</a>:
+<a href="../reference/applications/services/container.html">configuration</a>:
 </p>
 <pre>
 &lt;container version="1.0"&gt;
@@ -264,7 +264,7 @@ <h2 id="example-configuration">Example: Configuration</h2>
 &lt;/container&gt;
 </pre>
 <p>
-  And for <a href="../reference/services/applications/docproc.html">document processor chains</a>, it becomes:
+  And for <a href="../reference/applications/services/docproc.html">document processor chains</a>, it becomes:
 </p>
 <pre>
 &lt;container version="1.0"&gt;

en/applications/components.html

@@ -67,7 +67,7 @@ <h2 id="resource-management">Resource management</h2>
 <p>
   Note that it is always advisable to call the super-method first.
   Also see <a href="https://github.com/vespa-engine/vespa/blob/master/jdisc_core/src/main/java/com/yahoo/jdisc/SharedResource.java">
-  SharedResource.java</a> for how to configure <a href="../reference/services/applications/container.html#jvm">debug options</a>
+  SharedResource.java</a> for how to configure <a href="../reference/applications/services/container.html#jvm">debug options</a>
   for use in tools like YourKit.
   This can be used to track component lifetime / (de)construction issues, e.g.:
 </p>
@@ -164,7 +164,7 @@ <h3 id="adding-component-to-application-package">Adding the Plugin to the Vespa
 <ul>
   <li>put <code>com.yahoo.search.example.SimpleSearcher-1.0-deploy.jar</code>
     in the <code>components/</code> directory under the application package root</li>
-  <li>modify <a href="../reference/services/applications/services.html">services.xml</a> to include the Searcher</li>
+  <li>modify <a href="../reference/applications/services/services.html">services.xml</a> to include the Searcher</li>
 </ul>
 <p>
   To include the searcher, define a search chain and add the searcher to it. Example:

en/applications/containers.html

@@ -110,7 +110,7 @@ <h2 id="developing-components">Developing Components</h2>
 
 <h2 id="reference-documentation">Reference documentation</h2>
 <ul>
-  <li><a href="../reference/services/applications/container.html">services.xml</a></li>
+  <li><a href="../reference/applications/services/container.html">services.xml</a></li>
 </ul>
 
 

en/applications/dependency-injection.html

@@ -146,7 +146,7 @@ <h2 id="depending-on-all-components-of-a-specific-type">Depending on all compone
 declares a dependency on the set of all components registered in <code>services.xml</code>
 that are instances of the class <code>Strategy</code> (including subclasses).
 The <code>ComponentRegistry</code> class provides accessors for components based
-on their <a href="../reference/services/applications/container.html#component">component id</a>.
+on their <a href="../reference/applications/services/container.html#component">component id</a>.
 </p>
 
 

en/applications/developer-guide.html

@@ -49,7 +49,7 @@ <h3 id="availability">Availability</h3>
 <h2 id="performance-testing">Performance testing</h2>
 <p>
   For performance testing, to avoid auto downsizing,
-  lock the <a href="../reference/services/applications/services.html">resources</a> using <code>deploy:environment="dev"</code>:
+  lock the <a href="../reference/applications/services/services.html">resources</a> using <code>deploy:environment="dev"</code>:
 </p>
 <pre>{% highlight xml %}
 <nodes deploy:environment="dev" count="1">
@@ -188,7 +188,7 @@ <h2 id="debugging-components">Debugging Components</h2>
   <li>Select the "Remote JVM Debug" option in the left-most pane.</li>
   <li>Set hostname to the host running the container, change the port if needed.</li>
   <li>
-    Set the container's <a href="../reference/services/applications/container.html#jvm">jvm options</a>
+    Set the container's <a href="../reference/applications/services/container.html#jvm">jvm options</a>
     to the value in "Command line arguments for remote JVM":
 <pre>
 &lt;container id="default" version="1.0"&gt;

en/applications/document-processors.html

@@ -30,7 +30,7 @@
   As document processors are chained components just like Searchers,
   read <a href="searchers.html">Searcher Development</a>.
   For reference, see the   <a href="https://javadoc.io/doc/com.yahoo.vespa/docproc">Javadoc</a>,
-  and <a href="../reference/services/applications/docproc.html">services.xml</a>.
+  and <a href="../reference/applications/services/docproc.html">services.xml</a>.
 </p>
 <img src="/assets/img/vespa-overview-docproc.svg" width="810px" height="auto"
      alt="Document Processing component in Vespa overview">
@@ -43,7 +43,7 @@ <h2 id="deploying-a-document-processor">Deploying a Document Processor</h2>
   album-recommendation-docproc</a> to get started,
   <a href="https://github.com/vespa-engine/sample-apps/blob/master/examples/document-processing/src/main/java/ai/vespa/example/album/LyricsDocumentProcessor.java">
   LyricsDocumentProcessor.java</a> is a document processor example.
-  Add the document processor in <a href="../reference/services/applications/docproc.html">services.xml</a>,
+  Add the document processor in <a href="../reference/applications/services/docproc.html">services.xml</a>,
   and then add it to a <a href="#chains">chain</a>.
   The type of processing done by the processor dictates what chain it should be part of:
 <ul>

en/applications/http-servers-and-filters.html

@@ -70,8 +70,8 @@ <h3 id="configure-the-http-server">Configure the HTTP Server</h3>
 
 <h3 id="tls">TLS</h3>
 <p>
-  TLS can be configured using either the <a href="../reference/services/applications/http.html#ssl">ssl</a>
-  or the <a href="../reference/services/applications/http.html#ssl-provider">ssl-provider</a> element.
+  TLS can be configured using either the <a href="../reference/applications/services/http.html#ssl">ssl</a>
+  or the <a href="../reference/applications/services/http.html#ssl-provider">ssl-provider</a> element.
 </p>
 <pre>{% highlight xml %}
 <container version="1.0">
@@ -122,7 +122,7 @@ <h3 id="using-filter-chains">Using Filter Chains</h3>
 <p>
   Filter chains are set up by using the <code>request-chain</code> and
   <code>response-chain</code> elements inside the
-  <a href="../reference/services/applications/http.html#filtering">filtering</a> element.
+  <a href="../reference/applications/services/http.html#filtering">filtering</a> element.
   Example setting up two request filter chains, and one response filter chain:
 </p>
 <pre>{% highlight xml %}
@@ -152,7 +152,7 @@ <h3 id="using-filter-chains">Using Filter Chains</h3>
   as shown with <code>request-filter1</code> in the example above.
 </p>
 <p>
-  To actually use a filter chain, add one or more URI <a href="../reference/services/applications/http.html#binding">bindings</a>:
+  To actually use a filter chain, add one or more URI <a href="../reference/applications/services/http.html#binding">bindings</a>:
 </p>
 <pre>{% highlight xml %}
 <http>
@@ -194,15 +194,15 @@ <h3 id="using-filter-chains">Using Filter Chains</h3>
 
 <p>
     A request must match a filter chain if any filter is configured. A 403 response is returned for non-matching request.
-    This semantic can be disabled - see <a href="../reference/services/applications/http.html#filtering">strict-mode</a>.
+    This semantic can be disabled - see <a href="../reference/applications/services/http.html#filtering">strict-mode</a>.
 </p>
 
 <h4 id="excluding-filters-from-an-inherited-chain">Excluding Filters from an Inherited Chain</h4>
 <p>
   Say you have a request filter chain that you are binding to most of your URIs.
   Now, you want to run almost the same chain on another URI, but you need to exclude one of the filters.
   This is done by adding <code>excludes</code>, which takes a space separated list of filter ids,
-  to the <a href="../reference/services/applications/http.html#chain">chain element</a>.
+  to the <a href="../reference/applications/services/http.html#chain">chain element</a>.
   Example where a security filter is excluded from an inherited chain for <em>status.html</em>:
 </p>
 <pre>{% highlight xml %}

en/applications/processing.html

@@ -97,9 +97,9 @@ <h2 id="chaining-processors">Chaining Processors</h2>
 In most cases it is more convenient to configure chains and processor
 instances using external configuration. Chains of processors may be
 specified in
-a <a href="../reference/services/applications/processing.html">processing</a>
+a <a href="../reference/applications/services/processing.html">processing</a>
 element in
-the <em><a href="../reference/services/applications/services.html">services.xml</a></em>
+the <em><a href="../reference/applications/services/services.html">services.xml</a></em>
 file in the application package.  The compiled processors are added to
 the application package as
 <a href="components.html">OSGi components</a>. Chain
@@ -160,7 +160,7 @@ <h2 id="response-rendering">Response Rendering</h2>
 Processors are
 regular <a href="components.html">components</a> which are
 added to the application package in
-the <a href="../reference/services/applications/processing.html#renderer">renderer
+the <a href="../reference/applications/services/processing.html#renderer">renderer
 section</a> of the <em>services.xml</em> file. A renderer is selected
 in the request by setting the <code>format</code> parameter in the request
 to the renderer id.

en/applications/request-handlers.html

@@ -71,7 +71,7 @@ <h3 id="example-request-handler-implementations">Example request handler impleme
 <h2 id="deploying-a-request-handler">Deploying a request handler</h2>
 <p>
   To deploy a request handler in an application,
-  use the <a href="../reference/services/applications/container.html#handler">handler</a> element in <em>services.xml</em>:
+  use the <a href="../reference/applications/services/container.html#handler">handler</a> element in <em>services.xml</em>:
 </p>
 <pre>
 &lt;container id="default" version="1.0"&gt;
@@ -81,5 +81,5 @@ <h2 id="deploying-a-request-handler">Deploying a request handler</h2>
 </pre>
 <p>
   A request handler may be bound to zero or more URI patterns by adding a
-  <a href="../reference/services/applications/container.html#binding">binding</a> element for each pattern.
+  <a href="../reference/applications/services/container.html#binding">binding</a> element for each pattern.
 </p>