Fix links

40 files changed, 132 insertions, 128 deletions

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 50301066145..d5c611680dd 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -33,7 +33,7 @@ We only seek to accept code that you are authorized to contribute to the project
 
 ## Versioning
 Vespa uses semantic versioning - see
-[vespa versions](http://docs.vespa.ai/documentation/vespa-versions.html).
+[vespa versions](http://docs.vespa.ai/en/vespa-versions.html).
 Notice in particular that any Java API in a package having a @PublicAPI
 annotation in the package-info file cannot be changed in an incompatible way
 between major versions: Existing types and method signatures must be preserved
diff --git a/Code-map.md b/Code-map.md
index 6eae723f31d..3c54be35b9d 100644
--- a/Code-map.md
+++ b/Code-map.md
@@ -12,7 +12,7 @@ thing we haven't done is to create a module structure friendly to newcomers - th
 simply organized in a flat structure of about 150 modules. 
 
 This document aims to provide a map from the
-[functional elements](https://docs.vespa.ai/documentation/overview.html)
+[functional elements](https://docs.vespa.ai/en/overview.html)
 of Vespa to the most important modules in the flat module structure in the
 [code base on GitHub](https://github.com/vespa-engine/vespa).
 
diff --git a/ERRATA.md b/ERRATA.md
index 3107216f527..9278f3c39cf 100644
--- a/ERRATA.md
+++ b/ERRATA.md
@@ -31,7 +31,7 @@ This bug was introduced in Vespa-7.277.38, fixed in Vespa-7.292.82.
 The following needs to happen to trigger the bug:
 
 * visibility-delay is non-zero. Note that the default is zero, so for this to trigger,
-  [visibility-delay](https://docs.vespa.ai/documentation/reference/services-content.html#visibility-delay)
+  [visibility-delay](https://docs.vespa.ai/en/reference/services-content.html#visibility-delay)
   must have been set.
 * A new config change is deployed that contains changes to proton.
   This config snapshot is stored in the transaction log on the content node.
diff --git a/README.md b/README.md
index 3056f619982..280d3ae8ee8 100644
--- a/README.md
+++ b/README.md
@@ -33,18 +33,18 @@ Vespa per second.
 
 To get started using Vespa pick one of the quick start documents:
 
-- [Run on a Mac or Linux machine using Docker](https://docs.vespa.ai/documentation/vespa-quick-start.html)
-- [Run on a Windows machine using Docker](https://docs.vespa.ai/documentation/vespa-quick-start-windows.html)
-- [Run on a Mac or Linux machine using VirtualBox+Vagrant](https://docs.vespa.ai/documentation/vespa-quick-start-centos.html)
-- [Multinode install on AWS EC2](https://docs.vespa.ai/documentation/vespa-quick-start-multinode-aws.html)
-- [Multinode install on AWS ECS](https://docs.vespa.ai/documentation/vespa-quick-start-multinode-aws-ecs.html)
+- [Run on a Mac or Linux machine using Docker](https://docs.vespa.ai/en/vespa-quick-start.html)
+- [Run on a Windows machine using Docker](https://docs.vespa.ai/en/vespa-quick-start-windows.html)
+- [Run on a Mac or Linux machine using VirtualBox+Vagrant](https://docs.vespa.ai/en/vespa-quick-start-centos.html)
+- [Multinode install on AWS EC2](https://docs.vespa.ai/en/vespa-quick-start-multinode-aws.html)
+- [Multinode install on AWS ECS](https://docs.vespa.ai/en/vespa-quick-start-multinode-aws-ecs.html)
 
 ## Usage 
 
-- The application created in the quickstart is fully functional and production ready, but you may want to [add more nodes](https://docs.vespa.ai/documentation/multinode-systems.html) for redundancy.
-- Try the [Blog search and recommendation tutorial](https://docs.vespa.ai/documentation/tutorials/blog-search.html) to learn more about using Vespa
-- See [developing applications](https://docs.vespa.ai/documentation/jdisc/developing-applications.html) on adding your own Java components to your Vespa application.
-- [Vespa APIs](https://docs.vespa.ai/documentation/api.html) is useful to understand how to interface with Vespa
+- The application created in the quickstart is fully functional and production ready, but you may want to [add more nodes](https://docs.vespa.ai/en/multinode-systems.html) for redundancy.
+- Try the [Blog search and recommendation tutorial](https://docs.vespa.ai/en/tutorials/blog-search.html) to learn more about using Vespa
+- See [developing applications](https://docs.vespa.ai/en/jdisc/developing-applications.html) on adding your own Java components to your Vespa application.
+- [Vespa APIs](https://docs.vespa.ai/en/api.html) is useful to understand how to interface with Vespa
 - Explore the [sample applications](https://github.com/vespa-engine/sample-apps/tree/master)
 
 Full documentation is available on [https://docs.vespa.ai](https://docs.vespa.ai).
diff --git a/client/README.md b/client/README.md
index d08b19a1a12..39d9bd6b669 100644
--- a/client/README.md
+++ b/client/README.md
@@ -1,7 +1,7 @@
 # vespa_query_dsl
 This lib is used for composing vespa YQL queries
 
-Reference: https://docs.vespa.ai/documentation/reference/query-language-reference.html
+Reference: https://docs.vespa.ai/en/reference/query-language-reference.html
 
 # usage
 Please refer to the unit test:
@@ -9,7 +9,7 @@ Please refer to the unit test:
 https://github.com/vespa-engine/vespa/tree/master/client/src/test/groovy/ai/vespa/client/dsl/QTest.groovy
 
 # todos
-- [ ] support `predicate` (https://docs.vespa.ai/documentation/predicate-fields.html)
+- [ ] support `predicate` (https://docs.vespa.ai/en/predicate-fields.html)
 - [ ] support methods for checking positive/negative conditions for specific field
 - [X] support order by annotation
 - [X] support order by
diff --git a/client/src/main/java/ai/vespa/client/dsl/A.java b/client/src/main/java/ai/vespa/client/dsl/A.java
index a691d1288e8..c1f94a08d25 100644
--- a/client/src/main/java/ai/vespa/client/dsl/A.java
+++ b/client/src/main/java/ai/vespa/client/dsl/A.java
@@ -8,7 +8,7 @@ import java.util.stream.Stream;
 
 /**
  * Helper class for generating Annotation
- * https://docs.vespa.ai/documentation/reference/query-language-reference.html#annotations
+ * https://docs.vespa.ai/en/reference/query-language-reference.html#annotations
  */
 public final class A {
 
diff --git a/client/src/main/java/ai/vespa/client/dsl/EndQuery.java b/client/src/main/java/ai/vespa/client/dsl/EndQuery.java
index 2af1e0bb49d..d07d3536563 100644
--- a/client/src/main/java/ai/vespa/client/dsl/EndQuery.java
+++ b/client/src/main/java/ai/vespa/client/dsl/EndQuery.java
@@ -44,7 +44,7 @@ public class EndQuery {
 
     /**
      * Offset.
-     * https://docs.vespa.ai/documentation/reference/query-language-reference.html#limit-offset
+     * https://docs.vespa.ai/en/reference/query-language-reference.html#limit-offset
      *
      * @param offset the offset
      * @return the end query
@@ -55,7 +55,7 @@ public class EndQuery {
 
     /**
      * Timeout.
-     * https://docs.vespa.ai/documentation/reference/query-language-reference.html#timeout
+     * https://docs.vespa.ai/en/reference/query-language-reference.html#timeout
      *
      * @param timeout the timeout
      * @return the end query
@@ -66,7 +66,7 @@ public class EndQuery {
 
     /**
      * Limit.
-     * https://docs.vespa.ai/documentation/reference/query-language-reference.html#limit-offset
+     * https://docs.vespa.ai/en/reference/query-language-reference.html#limit-offset
      *
      * @param limit the limit
      * @return the end query
@@ -87,7 +87,7 @@ public class EndQuery {
 
     /**
      * Group.
-     * https://docs.vespa.ai/documentation/reference/query-language-reference.html#grouping
+     * https://docs.vespa.ai/en/reference/query-language-reference.html#grouping
      *
      * @param group the group
      * @return the end query
@@ -99,7 +99,7 @@ public class EndQuery {
 
     /**
      * Group.
-     * https://docs.vespa.ai/documentation/reference/query-language-reference.html#grouping
+     * https://docs.vespa.ai/en/reference/query-language-reference.html#grouping
      *
      * @param groupQueryStr the group str
      * @return the end query
@@ -111,7 +111,7 @@ public class EndQuery {
 
     /**
      * Order by asc.
-     * https://docs.vespa.ai/documentation/reference/query-language-reference.html#order-by
+     * https://docs.vespa.ai/en/reference/query-language-reference.html#order-by
      *
      * @param annotation the annotation
      * @param fieldName the field name
@@ -124,7 +124,7 @@ public class EndQuery {
 
     /**
      * Order by asc.
-     * https://docs.vespa.ai/documentation/reference/query-language-reference.html#order-by
+     * https://docs.vespa.ai/en/reference/query-language-reference.html#order-by
      *
      * @param fieldName the field name
      * @return the end query
@@ -136,7 +136,7 @@ public class EndQuery {
 
     /**
      * Order by desc.
-     * https://docs.vespa.ai/documentation/reference/query-language-reference.html#order-by
+     * https://docs.vespa.ai/en/reference/query-language-reference.html#order-by
      *
      * @param annotation the annotation
      * @param fieldName the field name
@@ -149,7 +149,7 @@ public class EndQuery {
 
     /**
      * Order by desc.
-     * https://docs.vespa.ai/documentation/reference/query-language-reference.html#order-by
+     * https://docs.vespa.ai/en/reference/query-language-reference.html#order-by
      *
      * @param fieldName the field name
      * @return the end query
diff --git a/client/src/main/java/ai/vespa/client/dsl/Field.java b/client/src/main/java/ai/vespa/client/dsl/Field.java
index 0cbe03a8fb9..b12ae51787d 100644
--- a/client/src/main/java/ai/vespa/client/dsl/Field.java
+++ b/client/src/main/java/ai/vespa/client/dsl/Field.java
@@ -27,7 +27,7 @@ public class Field extends QueryChain {
 
     /**
      * Contains query.
-     * https://docs.vespa.ai/documentation/reference/query-language-reference.html#contains
+     * https://docs.vespa.ai/en/reference/query-language-reference.html#contains
      *
      * @param value the value
      * @return the query
@@ -38,7 +38,7 @@ public class Field extends QueryChain {
 
     /**
      * Contains query.
-     * https://docs.vespa.ai/documentation/reference/query-language-reference.html#contains
+     * https://docs.vespa.ai/en/reference/query-language-reference.html#contains
      *
      * @param annotation the annotation
      * @param value      the value
@@ -50,7 +50,7 @@ public class Field extends QueryChain {
 
     /**
      * Contains phrase query.
-     * https://docs.vespa.ai/documentation/reference/query-language-reference.html#contains
+     * https://docs.vespa.ai/en/reference/query-language-reference.html#contains
      *
      * @param value  the value
      * @param others the others
@@ -62,7 +62,7 @@ public class Field extends QueryChain {
 
     /**
      * Contains phrase query.
-     * https://docs.vespa.ai/documentation/reference/query-language-reference.html#contains
+     * https://docs.vespa.ai/en/reference/query-language-reference.html#contains
      *
      * @param values the values
      * @return the query
@@ -77,7 +77,7 @@ public class Field extends QueryChain {
 
     /**
      * Contains near query.
-     * https://docs.vespa.ai/documentation/reference/query-language-reference.html#contains
+     * https://docs.vespa.ai/en/reference/query-language-reference.html#contains
      *
      * @param value  the value
      * @param others the others
@@ -89,7 +89,7 @@ public class Field extends QueryChain {
 
     /**
      * Contains near query.
-     * https://docs.vespa.ai/documentation/reference/query-language-reference.html#contains
+     * https://docs.vespa.ai/en/reference/query-language-reference.html#contains
      *
      * @param values the values
      * @return the query
@@ -104,7 +104,7 @@ public class Field extends QueryChain {
 
     /**
      * Contains near query.
-     * https://docs.vespa.ai/documentation/reference/query-language-reference.html#contains
+     * https://docs.vespa.ai/en/reference/query-language-reference.html#contains
      *
      * @param annotation the annotation
      * @param value      the value
@@ -117,7 +117,7 @@ public class Field extends QueryChain {
 
     /**
      * Contains near query.
-     * https://docs.vespa.ai/documentation/reference/query-language-reference.html#contains
+     * https://docs.vespa.ai/en/reference/query-language-reference.html#contains
      *
      * @param annotation the annotation
      * @param values     the values
@@ -133,7 +133,7 @@ public class Field extends QueryChain {
 
     /**
      * Contains onear query.
-     * https://docs.vespa.ai/documentation/reference/query-language-reference.html#contains
+     * https://docs.vespa.ai/en/reference/query-language-reference.html#contains
      *
      * @param value  the value
      * @param others the others
@@ -145,7 +145,7 @@ public class Field extends QueryChain {
 
     /**
      * Contains onear query.
-     * https://docs.vespa.ai/documentation/reference/query-language-reference.html#contains
+     * https://docs.vespa.ai/en/reference/query-language-reference.html#contains
      *
      * @param values the values
      * @return the query
@@ -160,7 +160,7 @@ public class Field extends QueryChain {
 
     /**
      * Contains onear query.
-     * https://docs.vespa.ai/documentation/reference/query-language-reference.html#contains
+     * https://docs.vespa.ai/en/reference/query-language-reference.html#contains
      *
      * @param annotation the annotation
      * @param value      the value
@@ -173,7 +173,7 @@ public class Field extends QueryChain {
 
     /**
      * Contains onear query.
-     * https://docs.vespa.ai/documentation/reference/query-language-reference.html#contains
+     * https://docs.vespa.ai/en/reference/query-language-reference.html#contains
      *
      * @param annotation the annotation
      * @param values     the values
@@ -189,7 +189,7 @@ public class Field extends QueryChain {
 
     /**
      * Contains same element query.
-     * https://docs.vespa.ai/documentation/reference/query-language-reference.html#contains
+     * https://docs.vespa.ai/en/reference/query-language-reference.html#contains
      *
      * @param andQuery the and query
      * @return the query
@@ -200,7 +200,7 @@ public class Field extends QueryChain {
 
     /**
      * Contains equiv query.
-     * https://docs.vespa.ai/documentation/reference/query-language-reference.html#contains
+     * https://docs.vespa.ai/en/reference/query-language-reference.html#contains
      *
      * @param value  the value
      * @param others the others
@@ -212,7 +212,7 @@ public class Field extends QueryChain {
 
     /**
      * Contains equiv query.
-     * https://docs.vespa.ai/documentation/reference/query-language-reference.html#contains
+     * https://docs.vespa.ai/en/reference/query-language-reference.html#contains
      *
      * @param values the values
      * @return the query
@@ -230,7 +230,7 @@ public class Field extends QueryChain {
 
     /**
      * Contains uri query.
-     * https://docs.vespa.ai/documentation/reference/query-language-reference.html#contains
+     * https://docs.vespa.ai/en/reference/query-language-reference.html#contains
      *
      * @param value the value
      * @return the query
@@ -241,7 +241,7 @@ public class Field extends QueryChain {
 
     /**
      * Contains uri query.
-     * https://docs.vespa.ai/documentation/reference/query-language-reference.html#contains
+     * https://docs.vespa.ai/en/reference/query-language-reference.html#contains
      *
      * @param annotation the annotation
      * @param value      the value
@@ -253,7 +253,7 @@ public class Field extends QueryChain {
 
     /**
      * Matches query.
-     * https://docs.vespa.ai/documentation/reference/query-language-reference.html#matches
+     * https://docs.vespa.ai/en/reference/query-language-reference.html#matches
      *
      * @param str the str
      * @return the query
@@ -264,7 +264,7 @@ public class Field extends QueryChain {
 
     /**
      * Equals query.
-     * https://docs.vespa.ai/documentation/reference/query-language-reference.html#numeric
+     * https://docs.vespa.ai/en/reference/query-language-reference.html#numeric
      *
      * @param t the t
      * @return the query
@@ -275,7 +275,7 @@ public class Field extends QueryChain {
 
     /**
      * Greater than or equal to query.
-     * https://docs.vespa.ai/documentation/reference/query-language-reference.html#numeric
+     * https://docs.vespa.ai/en/reference/query-language-reference.html#numeric
      *
      * @param t the t
      * @return the query
@@ -286,7 +286,7 @@ public class Field extends QueryChain {
 
     /**
      * Greater than query.
-     * https://docs.vespa.ai/documentation/reference/query-language-reference.html#numeric
+     * https://docs.vespa.ai/en/reference/query-language-reference.html#numeric
      *
      * @param t the t
      * @return the query
@@ -297,7 +297,7 @@ public class Field extends QueryChain {
 
     /**
      * Less than or equal to query.
-     * https://docs.vespa.ai/documentation/reference/query-language-reference.html#numeric
+     * https://docs.vespa.ai/en/reference/query-language-reference.html#numeric
      *
      * @param t the t
      * @return the query
@@ -308,7 +308,7 @@ public class Field extends QueryChain {
 
     /**
      * Less than query.
-     * https://docs.vespa.ai/documentation/reference/query-language-reference.html#numeric
+     * https://docs.vespa.ai/en/reference/query-language-reference.html#numeric
      *
      * @param t the t
      * @return the query
@@ -319,7 +319,7 @@ public class Field extends QueryChain {
 
     /**
      * In range query.
-     * https://docs.vespa.ai/documentation/reference/query-language-reference.html#numeric
+     * https://docs.vespa.ai/en/reference/query-language-reference.html#numeric
      *
      * @param l the l
      * @param m the m
@@ -331,7 +331,7 @@ public class Field extends QueryChain {
 
     /**
      * Equal to query.
-     * https://docs.vespa.ai/documentation/reference/query-language-reference.html#numeric
+     * https://docs.vespa.ai/en/reference/query-language-reference.html#numeric
      *
      * @param t the t
      * @return the query
@@ -342,7 +342,7 @@ public class Field extends QueryChain {
 
     /**
      * Greater than or equal to query.
-     * https://docs.vespa.ai/documentation/reference/query-language-reference.html#numeric
+     * https://docs.vespa.ai/en/reference/query-language-reference.html#numeric
      *
      * @param t the t
      * @return the query
@@ -353,7 +353,7 @@ public class Field extends QueryChain {
 
     /**
      * Greater than query.
-     * https://docs.vespa.ai/documentation/reference/query-language-reference.html#numeric
+     * https://docs.vespa.ai/en/reference/query-language-reference.html#numeric
      *
      * @param t the t
      * @return the query
@@ -364,7 +364,7 @@ public class Field extends QueryChain {
 
     /**
      * Less than or equal to query.
-     * https://docs.vespa.ai/documentation/reference/query-language-reference.html#numeric
+     * https://docs.vespa.ai/en/reference/query-language-reference.html#numeric
      *
      * @param t the t
      * @return the query
@@ -375,7 +375,7 @@ public class Field extends QueryChain {
 
     /**
      * Less than query.
-     * https://docs.vespa.ai/documentation/reference/query-language-reference.html#numeric
+     * https://docs.vespa.ai/en/reference/query-language-reference.html#numeric
      *
      * @param t the t
      * @return the query
@@ -386,7 +386,7 @@ public class Field extends QueryChain {
 
     /**
      * In range query.
-     * https://docs.vespa.ai/documentation/reference/query-language-reference.html#numeric
+     * https://docs.vespa.ai/en/reference/query-language-reference.html#numeric
      *
      * @param l the l
      * @param m the m
@@ -399,7 +399,7 @@ public class Field extends QueryChain {
 
     /**
      * Is true query.
-     * https://docs.vespa.ai/documentation/reference/query-language-reference.html#boolean
+     * https://docs.vespa.ai/en/reference/query-language-reference.html#boolean
      *
      * @return the query
      */
@@ -409,7 +409,7 @@ public class Field extends QueryChain {
 
     /**
      * Is false query.
-     * https://docs.vespa.ai/documentation/reference/query-language-reference.html#boolean
+     * https://docs.vespa.ai/en/reference/query-language-reference.html#boolean
      *
      * @return the query
      */
diff --git a/client/src/main/java/ai/vespa/client/dsl/FixedQuery.java b/client/src/main/java/ai/vespa/client/dsl/FixedQuery.java
index b41dd2c546b..94c571dba5a 100644
--- a/client/src/main/java/ai/vespa/client/dsl/FixedQuery.java
+++ b/client/src/main/java/ai/vespa/client/dsl/FixedQuery.java
@@ -12,7 +12,7 @@ import java.util.stream.Collectors;
 /**
  * FixedQuery contains a 'Query' which is terminated by a 'semicolon'
  * This object holds vespa or user defined parameters
- * https://docs.vespa.ai/documentation/reference/search-api-reference.html
+ * https://docs.vespa.ai/en/reference/search-api-reference.html
  */
 public class FixedQuery {
 
diff --git a/client/src/main/java/ai/vespa/client/dsl/G.java b/client/src/main/java/ai/vespa/client/dsl/G.java
index 4a82658d3e0..c65bc982a88 100644
--- a/client/src/main/java/ai/vespa/client/dsl/G.java
+++ b/client/src/main/java/ai/vespa/client/dsl/G.java
@@ -4,7 +4,7 @@ package ai.vespa.client.dsl;
 
 /**
  * Helper class for generating group syntax
- * https://docs.vespa.ai/documentation/reference/grouping-syntax.html
+ * https://docs.vespa.ai/en/reference/grouping-syntax.html
  *
  * basically the syntax is exactly the same as Vespa group syntax.
  * The only exception "max" in the Vespa group syntax which represents 'max returned documents',
diff --git a/client/src/main/java/ai/vespa/client/dsl/Q.java b/client/src/main/java/ai/vespa/client/dsl/Q.java
index 4048e6b8869..7637f76f095 100644
--- a/client/src/main/java/ai/vespa/client/dsl/Q.java
+++ b/client/src/main/java/ai/vespa/client/dsl/Q.java
@@ -8,7 +8,7 @@ import java.util.Map;
 
 /**
  * Helper class for generating Vespa search queries
- * https://docs.vespa.ai/documentation/reference/query-language-reference.html
+ * https://docs.vespa.ai/en/reference/query-language-reference.html
  */
 public final class Q {
 
@@ -54,7 +54,7 @@ public final class Q {
 
     /**
      * Rank rank.
-     * https://docs.vespa.ai/documentation/reference/query-language-reference.html#rank
+     * https://docs.vespa.ai/en/reference/query-language-reference.html#rank
      *
      * @param query the query
      * @param ranks the ranks
@@ -66,7 +66,7 @@ public final class Q {
 
     /**
      * UI represents "userInput".
-     * https://docs.vespa.ai/documentation/reference/query-language-reference.html#userinput
+     * https://docs.vespa.ai/en/reference/query-language-reference.html#userinput
      *
      * @param value the value
      * @return the user input query
@@ -77,7 +77,7 @@ public final class Q {
 
     /**
      * userInput with an annotation.
-     * https://docs.vespa.ai/documentation/reference/query-language-reference.html#userinput
+     * https://docs.vespa.ai/en/reference/query-language-reference.html#userinput
      *
      * @param a     the a
      * @param value the value
@@ -89,7 +89,7 @@ public final class Q {
 
     /**
      * A convenience method to generate userInput with default index annotation.
-     * https://docs.vespa.ai/documentation/reference/query-language-reference.html#userinput
+     * https://docs.vespa.ai/en/reference/query-language-reference.html#userinput
      *
      * @param index the index
      * @param value the value
@@ -101,7 +101,7 @@ public final class Q {
 
     /**
      * dotPdt represents "dotProduct".
-     * https://docs.vespa.ai/documentation/reference/query-language-reference.html#dotproduct
+     * https://docs.vespa.ai/en/reference/query-language-reference.html#dotproduct
      *
      * @param field       the field
      * @param weightedSet the weighted set
@@ -113,7 +113,7 @@ public final class Q {
 
     /**
      * wtdSet represents "weightedSet".
-     * https://docs.vespa.ai/documentation/reference/query-language-reference.html#weightedset
+     * https://docs.vespa.ai/en/reference/query-language-reference.html#weightedset
      *
      * @param field       the field
      * @param weightedSet the weighted set
@@ -125,7 +125,7 @@ public final class Q {
 
     /**
      * NonEmpty non empty.
-     * https://docs.vespa.ai/documentation/reference/query-language-reference.html#nonempty
+     * https://docs.vespa.ai/en/reference/query-language-reference.html#nonempty
      *
      * @param query the query
      * @return the non empty query
@@ -136,7 +136,7 @@ public final class Q {
 
     /**
      * Wand wand.
-     * https://docs.vespa.ai/documentation/reference/query-language-reference.html#wand
+     * https://docs.vespa.ai/en/reference/query-language-reference.html#wand
      *
      * @param field       the field
      * @param weightedSet the weighted set
@@ -148,7 +148,7 @@ public final class Q {
 
     /**
      * Wand wand.
-     * https://docs.vespa.ai/documentation/reference/query-language-reference.html#wand
+     * https://docs.vespa.ai/en/reference/query-language-reference.html#wand
      *
      * @param field        the field
      * @param numericRange the numeric range
@@ -160,7 +160,7 @@ public final class Q {
 
     /**
      * Weakand weak and.
-     * https://docs.vespa.ai/documentation/reference/query-language-reference.html#weakand
+     * https://docs.vespa.ai/en/reference/query-language-reference.html#weakand
      *
      * @param field the field
      * @param query the query
diff --git a/client/src/main/java/ai/vespa/client/dsl/Query.java b/client/src/main/java/ai/vespa/client/dsl/Query.java
index 62f92c51bee..9339733195a 100644
--- a/client/src/main/java/ai/vespa/client/dsl/Query.java
+++ b/client/src/main/java/ai/vespa/client/dsl/Query.java
@@ -90,7 +90,7 @@ public class Query extends QueryChain {
 
     /**
      * And.
-     * https://docs.vespa.ai/documentation/reference/query-language-reference.html#and
+     * https://docs.vespa.ai/en/reference/query-language-reference.html#and
      *
      * @param fieldName the field name
      * @return the field
@@ -105,7 +105,7 @@ public class Query extends QueryChain {
 
     /**
      * Andnot.
-     * https://docs.vespa.ai/documentation/reference/query-language-reference.html#andnot
+     * https://docs.vespa.ai/en/reference/query-language-reference.html#andnot
      *
      * @param fieldName the field name
      * @return the field
@@ -120,7 +120,7 @@ public class Query extends QueryChain {
 
     /**
      * Or.
-     * https://docs.vespa.ai/documentation/reference/query-language-reference.html#or
+     * https://docs.vespa.ai/en/reference/query-language-reference.html#or
      *
      * @param fieldName the field name
      * @return the field
@@ -135,7 +135,7 @@ public class Query extends QueryChain {
 
     /**
      * And.
-     * https://docs.vespa.ai/documentation/reference/query-language-reference.html#and
+     * https://docs.vespa.ai/en/reference/query-language-reference.html#and
      *
      * @param query the query
      * @return the query
@@ -149,7 +149,7 @@ public class Query extends QueryChain {
 
     /**
      * Andnot.
-     * https://docs.vespa.ai/documentation/reference/query-language-reference.html#andnot
+     * https://docs.vespa.ai/en/reference/query-language-reference.html#andnot
      *
      * @param query the query
      * @return the query
@@ -163,7 +163,7 @@ public class Query extends QueryChain {
 
     /**
      * Or.
-     * https://docs.vespa.ai/documentation/reference/query-language-reference.html#or
+     * https://docs.vespa.ai/en/reference/query-language-reference.html#or
      *
      * @param query the query
      * @return the query
@@ -177,7 +177,7 @@ public class Query extends QueryChain {
 
     /**
      * Annotate a query (sub-expression).
-     * https://docs.vespa.ai/documentation/reference/query-language-reference.html#annotations-of-sub-expressions
+     * https://docs.vespa.ai/en/reference/query-language-reference.html#annotations-of-sub-expressions
      *
      * @param annotation the annotation
      * @return the query
@@ -189,7 +189,7 @@ public class Query extends QueryChain {
 
     /**
      * Offset.
-     * https://docs.vespa.ai/documentation/reference/query-language-reference.html#limit-offset
+     * https://docs.vespa.ai/en/reference/query-language-reference.html#limit-offset
      *
      * @param offset the offset
      * @return the end query
@@ -200,7 +200,7 @@ public class Query extends QueryChain {
 
     /**
      * Limit.
-     * https://docs.vespa.ai/documentation/reference/query-language-reference.html#limit-offset
+     * https://docs.vespa.ai/en/reference/query-language-reference.html#limit-offset
      *
      * @param hits the hits
      * @return the end query
@@ -211,7 +211,7 @@ public class Query extends QueryChain {
 
     /**
      * Timeout.
-     * https://docs.vespa.ai/documentation/reference/query-language-reference.html#timeout
+     * https://docs.vespa.ai/en/reference/query-language-reference.html#timeout
      *
      * @param timeout the timeout
      * @return the end query
@@ -222,7 +222,7 @@ public class Query extends QueryChain {
 
     /**
      * Group.
-     * https://docs.vespa.ai/documentation/reference/query-language-reference.html#grouping
+     * https://docs.vespa.ai/en/reference/query-language-reference.html#grouping
      *
      * @param group the group
      * @return the end query
@@ -233,7 +233,7 @@ public class Query extends QueryChain {
 
     /**
      * Group.
-     * https://docs.vespa.ai/documentation/reference/query-language-reference.html#grouping
+     * https://docs.vespa.ai/en/reference/query-language-reference.html#grouping
      *
      * @param groupStr the group str
      * @return the end query
@@ -244,7 +244,7 @@ public class Query extends QueryChain {
 
     /**
      * Order by asc.
-     * https://docs.vespa.ai/documentation/reference/query-language-reference.html#order-by
+     * https://docs.vespa.ai/en/reference/query-language-reference.html#order-by
      *
      * @param fieldName the field name
      * @return the end query
@@ -255,7 +255,7 @@ public class Query extends QueryChain {
 
     /**
      * Order by asc.
-     * https://docs.vespa.ai/documentation/reference/query-language-reference.html#order-by
+     * https://docs.vespa.ai/en/reference/query-language-reference.html#order-by
      *
      * @param annotation the annotation
      * @param fieldName the field name
@@ -267,7 +267,7 @@ public class Query extends QueryChain {
 
     /**
      * Order by desc.
-     * https://docs.vespa.ai/documentation/reference/query-language-reference.html#order-by
+     * https://docs.vespa.ai/en/reference/query-language-reference.html#order-by
      *
      * @param fieldName the field name
      * @return the end query
@@ -279,7 +279,7 @@ public class Query extends QueryChain {
 
     /**
      * Order by desc.
-     * https://docs.vespa.ai/documentation/reference/query-language-reference.html#order-by
+     * https://docs.vespa.ai/en/reference/query-language-reference.html#order-by
      *
      * @param annotation the annotation
      * @param fieldName the field name
diff --git a/client/src/test/groovy/ai/vespa/client/dsl/QTest.groovy b/client/src/test/groovy/ai/vespa/client/dsl/QTest.groovy
index 19c87d6aecd..3353ef6f827 100644
--- a/client/src/test/groovy/ai/vespa/client/dsl/QTest.groovy
+++ b/client/src/test/groovy/ai/vespa/client/dsl/QTest.groovy
@@ -439,7 +439,7 @@ class QTest extends Specification {
     def "basic group syntax"() {
         /*
         example from vespa document:
-        https://docs.vespa.ai/documentation/grouping.html
+        https://docs.vespa.ai/en/grouping.html
         all( group(a) max(5) each(output(count())
             all(max(1) each(output(summary())))
             all(group(b) each(output(count())
@@ -470,7 +470,7 @@ class QTest extends Specification {
     def "set group syntax string directly"() {
         /*
         example from vespa document:
-        https://docs.vespa.ai/documentation/grouping.html
+        https://docs.vespa.ai/en/grouping.html
         all( group(a) max(5) each(output(count())
             all(max(1) each(output(summary())))
             all(group(b) each(output(count())
diff --git a/config-model-api/src/main/java/com/yahoo/config/application/api/ValidationOverrides.java b/config-model-api/src/main/java/com/yahoo/config/application/api/ValidationOverrides.java
index f22cf0d8c47..8845431c71b 100644
--- a/config-model-api/src/main/java/com/yahoo/config/application/api/ValidationOverrides.java
+++ b/config-model-api/src/main/java/com/yahoo/config/application/api/ValidationOverrides.java
@@ -87,7 +87,7 @@ public class ValidationOverrides {
 
     public static String toAllowMessage(ValidationId id) {
         return "To allow this add <allow until='yyyy-mm-dd'>" + id + "</allow> to validation-overrides.xml" +
-               ", see https://docs.vespa.ai/documentation/reference/validation-overrides.html";
+               ", see https://docs.vespa.ai/en/reference/validation-overrides.html";
     }
 
     /**
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/search/QueryProfiles.java b/config-model/src/main/java/com/yahoo/vespa/model/container/search/QueryProfiles.java
index 4736a207659..a001d66bc7b 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/search/QueryProfiles.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/search/QueryProfiles.java
@@ -70,7 +70,7 @@ public class QueryProfiles implements Serializable, QueryProfilesConfig.Producer
                                        ? ""
                                        : "In particular, the tensors (" + String.join(", ", tensorFields) +
                                          ") will be interpreted as strings, not tensors if sent in requests. ") +
-                                      "See https://docs.vespa.ai/documentation/query-profiles.html");
+                                      "See https://docs.vespa.ai/en/query-profiles.html");
         }
 
     }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java
index d9543c2e917..58fd5a77067 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java
@@ -387,7 +387,7 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> {
         if (deployState.endpointCertificateSecrets().isPresent()) {
             boolean authorizeClient = deployState.zone().system().isPublic();
             if (authorizeClient && deployState.tlsClientAuthority().isEmpty()) {
-                throw new RuntimeException("Client certificate authority security/clients.pem is missing - see: https://cloud.vespa.ai/security-model#data-plane");
+                throw new RuntimeException("Client certificate authority security/clients.pem is missing - see: https://cloud.vespa.ai/en/security-model#data-plane");
             }
             EndpointCertificateSecrets endpointCertificateSecrets = deployState.endpointCertificateSecrets().get();
 
@@ -725,7 +725,9 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> {
             var hosts = hostSystem.allocateHosts(clusterSpec, capacity, log);
             return createNodesFromHosts(log, hosts, cluster);
         }
-        return singleHostContainerCluster(cluster, hostSystem.getHost(Container.SINGLENODE_CONTAINER_SERVICESPEC), context);
+        else {
+            return singleHostContainerCluster(cluster, hostSystem.getHost(Container.SINGLENODE_CONTAINER_SERVICESPEC), context);
+        }
     }
 
     private List<ApplicationContainer> singleHostContainerCluster(ApplicationContainerCluster cluster, HostResource host, ConfigModelContext context) {
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/DispatchTuning.java b/config-model/src/main/java/com/yahoo/vespa/model/content/DispatchTuning.java
index 0f9eb5341ab..3b694f8986c 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/content/DispatchTuning.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/content/DispatchTuning.java
@@ -3,7 +3,7 @@ package com.yahoo.vespa.model.content;
 
 /**
  * Tuning of dispatching to content nodes, see the
- * <a href="https://docs.vespa.ai/documentation/reference/services-content.html#dispatch-tuning">dispatch tuning documentation</a>.
+ * <a href="https://docs.vespa.ai/en/reference/services-content.html#dispatch-tuning">dispatch tuning documentation</a>.
  *
  * @author Simon Thoresen Hult
  */
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/IndexingModeChangeValidatorTest.java b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/IndexingModeChangeValidatorTest.java
index ba9dfcdc388..d5c7fb78c89 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/IndexingModeChangeValidatorTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/IndexingModeChangeValidatorTest.java
@@ -37,7 +37,7 @@ public class IndexingModeChangeValidatorTest {
         catch (ValidationException e) {
             assertEquals("indexing-mode-change:\n" +
                          "\tDocument type 'music' in cluster 'default' changed indexing mode from 'indexed' to 'streaming'\n" +
-                         "To allow this add <allow until='yyyy-mm-dd'>indexing-mode-change</allow> to validation-overrides.xml, see https://docs.vespa.ai/documentation/reference/validation-overrides.html",
+                         "To allow this add <allow until='yyyy-mm-dd'>indexing-mode-change</allow> to validation-overrides.xml, see https://docs.vespa.ai/en/reference/validation-overrides.html",
                          e.getMessage());
         }
     }
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/search/test/QueryProfilesTestCase.java b/config-model/src/test/java/com/yahoo/vespa/model/container/search/test/QueryProfilesTestCase.java
index d1d32df5b56..fc6c5aeb387 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/search/test/QueryProfilesTestCase.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/search/test/QueryProfilesTestCase.java
@@ -151,7 +151,7 @@ public class QueryProfilesTestCase {
         assertEquals(1, logger.entries.size());
         assertEquals("This application define query profile types, but has no query profiles referencing them " +
                      "so they have no effect. " +
-                     "See https://docs.vespa.ai/documentation/query-profiles.html",
+                     "See https://docs.vespa.ai/en/query-profiles.html",
                      logger.entries.get(0).message);
     }
 
@@ -171,7 +171,7 @@ public class QueryProfilesTestCase {
         assertEquals("This application define query profile types, but has no query profiles referencing them " +
                      "so they have no effect. " +
                      "In particular, the tensors (vector, matrix) will be interpreted as strings, not tensors if sent in requests. " +
-                     "See https://docs.vespa.ai/documentation/query-profiles.html",
+                     "See https://docs.vespa.ai/en/query-profiles.html",
                      logger.entries.get(0).message);
     }
 
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java
index 35257686a5a..e0e4cbf19c0 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java
@@ -728,7 +728,8 @@ public class ContainerModelBuilderTest extends ContainerModelBuilderTestBase {
                     .build();
             createModel(root, state, null, clusterElem);
         } catch (RuntimeException e) {
-            assertEquals(e.getMessage(), "Client certificate authority security/clients.pem is missing - see: https://cloud.vespa.ai/security-model#data-plane");
+            assertEquals("Client certificate authority security/clients.pem is missing - see: https://cloud.vespa.ai/en/security-model#data-plane",
+                         e.getMessage());
             return;
         }
         fail();
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/provision/ProvisionerAdapter.java b/configserver/src/main/java/com/yahoo/vespa/config/server/provision/ProvisionerAdapter.java
index 79d70f1cb4e..9e232a6533f 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/provision/ProvisionerAdapter.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/provision/ProvisionerAdapter.java
@@ -33,9 +33,9 @@ public class ProvisionerAdapter implements HostProvisioner {
 
     @Override
     public HostSpec allocateHost(String alias) {
-        // Wow. Such mess. TODO: Actually support polymorphy or stop pretending to, see also ModelContextImpl.getHostProvisioner
+        // TODO: Remove this method since hosted/non-hosted needs different interfaces. See also ModelContextImpl.getHostProvisioner
         throw new UnsupportedOperationException("Allocating hosts using <node> tags is not supported in hosted environments, " +
-                                                "use <nodes count='N'> instead, see https://cloud.vespa.ai/reference/services");
+                                                "use <nodes count='N'> instead, see https://cloud.vespa.ai/en/reference/services");
     }
 
     @Override
diff --git a/container-search-gui/pom.xml b/container-search-gui/pom.xml
index 867f2464b8b..64c53a1f453 100644
--- a/container-search-gui/pom.xml
+++ b/container-search-gui/pom.xml
@@ -72,7 +72,7 @@
                             <goal>wget</goal>
                         </goals>
                         <configuration>
-                            <url>https://docs.vespa.ai/documentation/reference/search-api-reference.html</url>
+                            <url>https://docs.vespa.ai/en/reference/search-api-reference.html</url>
                             <outputFileName>search-api-reference.html</outputFileName>
                             <outputDirectory>${project.build.outputDirectory}/gui/_includes/</outputDirectory>
                         </configuration>
diff --git a/container-search-gui/src/main/resources/gui/_includes/index.html b/container-search-gui/src/main/resources/gui/_includes/index.html
index a441e302720..5eaa2b790d5 100644
--- a/container-search-gui/src/main/resources/gui/_includes/index.html
+++ b/container-search-gui/src/main/resources/gui/_includes/index.html
@@ -64,11 +64,11 @@
             <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
                 <ul class="nav navbar-nav navbar-right">
                     <li class="hidden"><a href="#page-top"></a>
-                    <li><a href="http://blog.vespa.ai/">Blog</a>
+                    <li><a href="https://blog.vespa.ai/">Blog</a>
                     <li><a href="https://twitter.com/vespaengine">Twitter</a>
-                    <li><a href="http://docs.vespa.ai">Docs</a>
+                    <li><a href="https://docs.vespa.ai">Docs</a>
                     <li><a href="https://github.com/vespa-engine">GitHub</a>
-                    <li><a href="http://docs.vespa.ai/documentation/vespa-quick-start.html">Get Started Now</a>
+                    <li><a href="https://docs.vespa.ai/en/vespa-quick-start.html">Get Started Now</a>
                 </ul>
             </div>
         </div>
@@ -128,7 +128,7 @@
                       <span> ○  Autocompletion of YQL-syntax</span> </br>
                       <span> ○  Drop-down lists of all valid parameters</span> </br>
                       <span> ○  Sending both POST and GET-requests to <i>Vespa</i></span> </br>
-                      <span> ○  Easy access to the <a href="https://docs.vespa.ai/documentation/reference/search-api-reference.html">documentation</a> of each parameter</span> </br>
+                      <span> ○  Easy access to the <a href="https://docs.vespa.ai/en/reference/search-api-reference.html">documentation</a> of each parameter</span> </br>
                       <span> ○  Conversion of POST- to GET-query</span> </br>
                       <span> ○  Pasting already built JSON-query</span> </br>
                       <span> ○  View and copy the response of queries</span> </br>
@@ -151,8 +151,8 @@
                   <div class="col-xs-2 quicklink-section">
                       <div class="footer-title">Resources</div>
                       <ul class="quicklinks">
-                          <li><a href="http://docs.vespa.ai/documentation/vespa-quick-start.html">Getting Started</a>
-                          <li><a href="http://docs.vespa.ai">Documentation</a>
+                          <li><a href="https://docs.vespa.ai/en/vespa-quick-start.html">Getting Started</a>
+                          <li><a href="https://docs.vespa.ai">Documentation</a>
                           <li><a href="https://github.com/vespa-engine/vespa">Open source</a>
                       </ul>
                   </div>
diff --git a/container-search/src/main/java/com/yahoo/prelude/fastsearch/FastHit.java b/container-search/src/main/java/com/yahoo/prelude/fastsearch/FastHit.java
index 663cb44215d..a639f2368a1 100644
--- a/container-search/src/main/java/com/yahoo/prelude/fastsearch/FastHit.java
+++ b/container-search/src/main/java/com/yahoo/prelude/fastsearch/FastHit.java
@@ -195,7 +195,7 @@ public class FastHit extends Hit {
 
     /**
      * Returns values for the features listed in
-     * <a href="https://docs.vespa.ai/documentation/reference/schema-reference.html#summary-features">summary-features</a>
+     * <a href="https://docs.vespa.ai/en/reference/schema-reference.html#summary-features">summary-features</a>
      * in the rank profile specified in the query producing this.
      */
     public FeatureData features() {
diff --git a/container-search/src/main/java/com/yahoo/search/query/Select.java b/container-search/src/main/java/com/yahoo/search/query/Select.java
index 53628978db3..d90550084eb 100644
--- a/container-search/src/main/java/com/yahoo/search/query/Select.java
+++ b/container-search/src/main/java/com/yahoo/search/query/Select.java
@@ -79,7 +79,7 @@ public class Select implements Cloneable {
      * Sets the document selection criterion of the query.
      *
      * @param where the documents to select as a JSON string on the format specified in
-     *        <a href="https://docs.vespa.ai/documentation/reference/select-reference.html">the select reference doc</a>
+     *        <a href="https://docs.vespa.ai/en/reference/select-reference.html">the select reference doc</a>
      */
     public void setWhereString(String where) {
         this.where = where;
@@ -96,7 +96,7 @@ public class Select implements Cloneable {
      * Sets the grouping operation of the query.
      *
      * @param grouping the grouping to perform as a JSON string on the format specified in
-     *        <a href="https://docs.vespa.ai/documentation/reference/select-reference.html">the select reference doc</a>
+     *        <a href="https://docs.vespa.ai/en/reference/select-reference.html">the select reference doc</a>
      */
     public void setGroupingString(String grouping) {
         groupingRequests.clear();
diff --git a/container-search/src/main/java/com/yahoo/search/querytransform/WeakAndReplacementSearcher.java b/container-search/src/main/java/com/yahoo/search/querytransform/WeakAndReplacementSearcher.java
index 058f6b93ae3..d40e1cfc4a6 100644
--- a/container-search/src/main/java/com/yahoo/search/querytransform/WeakAndReplacementSearcher.java
+++ b/container-search/src/main/java/com/yahoo/search/querytransform/WeakAndReplacementSearcher.java
@@ -41,7 +41,7 @@ public class WeakAndReplacementSearcher extends Searcher {
      * Recursively iterates over an Item to replace all instances of OrItems with WeakAndItems
      * @param item the current item in the replacement iteration
      * @param hits the wand.hits property from the request which is assigned to the N value of the new WeakAndItem
-     * @return The original item or a WeakAndItem replacement of an OrItem
+     * @return the original item or a WeakAndItem replacement of an OrItem
      */
     private Item replaceOrItems(Item item, int hits) {
         if (!(item instanceof CompositeItem)) {
@@ -63,4 +63,5 @@ public class WeakAndReplacementSearcher extends Searcher {
         }
         return compositeItem;
     }
+
 }
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java
index 63452f40dbb..07c0a6ca122 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java
@@ -930,7 +930,7 @@ public class ControllerTest {
                          "[endpoint 'default' (cluster foo) -> us-east-3, us-west-1] and add " +
                          "[endpoint 'default' (cluster bar) -> us-east-3, us-west-1]. To allow this add " +
                          "<allow until='yyyy-mm-dd'>global-endpoint-change</allow> to validation-overrides.xml, see " +
-                         "https://docs.vespa.ai/documentation/reference/validation-overrides.html", e.getMessage());
+                         "https://docs.vespa.ai/en/reference/validation-overrides.html", e.getMessage());
         }
 
         // Redeploy with override succeeds
diff --git a/document/src/main/java/com/yahoo/document/json/DocumentUpdateJsonSerializer.java b/document/src/main/java/com/yahoo/document/json/DocumentUpdateJsonSerializer.java
index 51ed93bb6ee..e2beafa66f2 100644
--- a/document/src/main/java/com/yahoo/document/json/DocumentUpdateJsonSerializer.java
+++ b/document/src/main/java/com/yahoo/document/json/DocumentUpdateJsonSerializer.java
@@ -60,7 +60,7 @@ import static com.yahoo.document.json.JsonSerializationHelper.*;
 
 /**
  * The DocumentUpdateJsonSerializer utility class is used to serialize a DocumentUpdate instance using the JSON format described in
- * <a href="https://docs.vespa.ai/documentation/reference/document-json-format.html#update">Document JSON Format: The Update Structure</a>
+ * <a href="https://docs.vespa.ai/en/reference/document-json-format.html#update">Document JSON Format: The Update Structure</a>
  *
  * @see #serialize(com.yahoo.document.DocumentUpdate)
  * @author Vegard Sjonfjell
diff --git a/document/src/main/java/com/yahoo/document/json/readers/TensorReader.java b/document/src/main/java/com/yahoo/document/json/readers/TensorReader.java
index ffc276fc94c..ad016a40fca 100644
--- a/document/src/main/java/com/yahoo/document/json/readers/TensorReader.java
+++ b/document/src/main/java/com/yahoo/document/json/readers/TensorReader.java
@@ -14,7 +14,7 @@ import static com.yahoo.document.json.readers.JsonParserHelpers.*;
 
 /**
  * Reads the tensor format defined at
- * See <a href="https://docs.vespa.ai/documentation/reference/document-json-format.html">https://docs.vespa.ai/documentation/reference/document-json-format.html</a>
+ * See <a href="https://docs.vespa.ai/en/reference/document-json-format.html">https://docs.vespa.ai/en/reference/document-json-format.html</a>
  *
  * @author geirst
  * @author bratseth
diff --git a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/systemstate/rule/NodeState.java b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/systemstate/rule/NodeState.java
index d23a0e580a0..0102d6cba36 100755
--- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/systemstate/rule/NodeState.java
+++ b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/systemstate/rule/NodeState.java
@@ -22,7 +22,7 @@ public class NodeState {
     /** A location string that expresses the use of THIS node. */
     public static final String NODE_CURRENT = ".";
 
-    private static Logger log = Logger.getLogger(NodeState.class.getName());
+    private static final Logger log = Logger.getLogger(NodeState.class.getName());
     private final Map<String, NodeState> children = new LinkedHashMap<String, NodeState>();
     private final Map<String, String> state = new LinkedHashMap<String, String>();
     private NodeState parent = null;
diff --git a/model-integration/src/main/java/ai/vespa/rankingexpression/importer/tensorflow/VariableConverter.java b/model-integration/src/main/java/ai/vespa/rankingexpression/importer/tensorflow/VariableConverter.java
index 31cb60b5509..c0db65c5c99 100644
--- a/model-integration/src/main/java/ai/vespa/rankingexpression/importer/tensorflow/VariableConverter.java
+++ b/model-integration/src/main/java/ai/vespa/rankingexpression/importer/tensorflow/VariableConverter.java
@@ -37,7 +37,7 @@ class VariableConverter {
         if ( args.length != 3) {
             System.out.println("Converts a TensorFlow variable into Vespa tensor document field value JSON:");
             System.out.println("A JSON map containing a 'cells' array, see");
-            System.out.println("http://docs.vespa.ai/documentation/reference/document-json-put-format.html#tensor)");
+            System.out.println("https://docs.vespa.ai/en/reference/document-json-put-format.html#tensor)");
             System.out.println("");
             System.out.println("Arguments: modelDirectory tensorFlowVariableName orderedTypeSpec");
             System.out.println(" - modelDirectory: The directory of the TensorFlow SavedModel");
diff --git a/tenant-cd-api/src/main/java/ai/vespa/hosted/cd/ProductionTest.java b/tenant-cd-api/src/main/java/ai/vespa/hosted/cd/ProductionTest.java
index b9054689b00..100626ee091 100644
--- a/tenant-cd-api/src/main/java/ai/vespa/hosted/cd/ProductionTest.java
+++ b/tenant-cd-api/src/main/java/ai/vespa/hosted/cd/ProductionTest.java
@@ -14,7 +14,7 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME;
  * Tests that verify the health of production deployments of Vespa applications.
  *
  * Test classes annotated with this annotation are run during declared production tests.
- * See <a href="https://cloud.vespa.ai/automated-deployments.html">Vespa cloud documentation</a>.
+ * See <a href="https://cloud.vespa.ai/en/automated-deployments">Vespa cloud documentation</a>.
  *
  * @author jonmv
  */
diff --git a/tenant-cd-api/src/main/java/ai/vespa/hosted/cd/StagingSetup.java b/tenant-cd-api/src/main/java/ai/vespa/hosted/cd/StagingSetup.java
index bef3eabcef6..e7000933b9e 100644
--- a/tenant-cd-api/src/main/java/ai/vespa/hosted/cd/StagingSetup.java
+++ b/tenant-cd-api/src/main/java/ai/vespa/hosted/cd/StagingSetup.java
@@ -15,7 +15,7 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME;
  *
  * Test classes annotated with this annotation are run in the first phase of automated staging tests,
  * to make the initial deployment similar to a production one.
- * See <a href="https://cloud.vespa.ai/automated-deployments.html">Vespa cloud documentation</a>.
+ * See <a href="https://cloud.vespa.ai/en/automated-deployments">Vespa cloud documentation</a>.
  *
  * @author jonmv
  */
diff --git a/tenant-cd-api/src/main/java/ai/vespa/hosted/cd/StagingTest.java b/tenant-cd-api/src/main/java/ai/vespa/hosted/cd/StagingTest.java
index 59360b2753c..711c95a12fb 100644
--- a/tenant-cd-api/src/main/java/ai/vespa/hosted/cd/StagingTest.java
+++ b/tenant-cd-api/src/main/java/ai/vespa/hosted/cd/StagingTest.java
@@ -16,7 +16,7 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME;
  *
  * Test classes annotated with this annotation are run in the second phase of automated staging tests,
  * to verify the upgraded deployment.
- * See <a href="https://cloud.vespa.ai/automated-deployments.html">Vespa cloud documentation</a>.
+ * See <a href="https://cloud.vespa.ai/en/automated-deployments">Vespa cloud documentation</a>.
  *
  * @author jonmv
  */
diff --git a/tenant-cd-api/src/main/java/ai/vespa/hosted/cd/SystemTest.java b/tenant-cd-api/src/main/java/ai/vespa/hosted/cd/SystemTest.java
index f01f2ca6c90..525771d2f55 100644
--- a/tenant-cd-api/src/main/java/ai/vespa/hosted/cd/SystemTest.java
+++ b/tenant-cd-api/src/main/java/ai/vespa/hosted/cd/SystemTest.java
@@ -17,7 +17,7 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME;
  * Tests that compare the behaviour of a Vespa application deployment against a fixed specification.
  *
  * Test classes annotated with this annotation are run against a fresh deployment during automated system tests.
- * See <a href="https://cloud.vespa.ai/automated-deployments.html">Vespa cloud documentation</a>.
+ * See <a href="https://cloud.vespa.ai/en/automated-deployments">Vespa cloud documentation</a>.
  *
  * @author jonmv
  */
diff --git a/vespaclient-java/src/main/java/com/yahoo/vespaget/CommandLineOptions.java b/vespaclient-java/src/main/java/com/yahoo/vespaget/CommandLineOptions.java
index b07c54399af..45fb4e54f0a 100644
--- a/vespaclient-java/src/main/java/com/yahoo/vespaget/CommandLineOptions.java
+++ b/vespaclient-java/src/main/java/com/yahoo/vespaget/CommandLineOptions.java
@@ -69,7 +69,7 @@ public class CommandLineOptions {
 
         options.addOption(Option.builder("f")
                 .hasArg(true)
-                .desc("Retrieve the specified fields only (see https://docs.vespa.ai/documentation/documents.html#fieldsets) (default '" + AllFields.NAME + "')")
+                .desc("Retrieve the specified fields only (see https://docs.vespa.ai/en/documents.html#fieldsets) (default '" + AllFields.NAME + "')")
                 .longOpt(FIELDSET_OPTION)
                 .argName("fieldset").build());
 
diff --git a/vespaclient-java/src/main/java/com/yahoo/vespavisit/VdsVisit.java b/vespaclient-java/src/main/java/com/yahoo/vespavisit/VdsVisit.java
index b1f91e44e5c..adfbb246a9e 100644
--- a/vespaclient-java/src/main/java/com/yahoo/vespavisit/VdsVisit.java
+++ b/vespaclient-java/src/main/java/com/yahoo/vespavisit/VdsVisit.java
@@ -194,7 +194,7 @@ public class VdsVisit {
                 .longOpt("fieldset")
                 .hasArg(true)
                 .argName("fieldset")
-                .desc("Retrieve the specified fields only (see https://docs.vespa.ai/documentation/documents.html#fieldsets). Default is [all].")
+                .desc("Retrieve the specified fields only (see https://docs.vespa.ai/en/documents.html#fieldsets). Default is [all].")
                 .build());
 
         options.addOption(Option.builder()
diff --git a/vespajlib/src/main/java/com/yahoo/tensor/Tensor.java b/vespajlib/src/main/java/com/yahoo/tensor/Tensor.java
index 0fba2ca4875..fbf5bc35129 100644
--- a/vespajlib/src/main/java/com/yahoo/tensor/Tensor.java
+++ b/vespajlib/src/main/java/com/yahoo/tensor/Tensor.java
@@ -297,7 +297,7 @@ public interface Tensor {
 
     /**
      * Returns this tensor on the
-     * <a href="https://docs.vespa.ai/documentation/reference/tensor.html#tensor-literal-form">tensor literal form</a>
+     * <a href="https://docs.vespa.ai/en/reference/tensor.html#tensor-literal-form">tensor literal form</a>
      * with type included.
      */
     @Override
@@ -305,7 +305,7 @@ public interface Tensor {
 
     /**
      * Call this from toString in implementations to return this tensor on the
-     * <a href="https://docs.vespa.ai/documentation/reference/tensor.html#tensor-literal-form">tensor literal form</a>.
+     * <a href="https://docs.vespa.ai/en/reference/tensor.html#tensor-literal-form">tensor literal form</a>.
      * (toString cannot be a default method because default methods cannot override super methods).
      *
      * @param tensor the tensor to return the standard string format of
@@ -377,7 +377,7 @@ public interface Tensor {
 
     /**
      * Returns a tensor instance containing the given data on the
-     * <a href="https://docs.vespa.ai/documentation/reference/tensor.html#tensor-literal-form">tensor literal form</a>.
+     * <a href="https://docs.vespa.ai/en/reference/tensor.html#tensor-literal-form">tensor literal form</a>.
      *
      * @param type the type of the tensor to return
      * @param tensorString the tensor on the standard tensor string format
@@ -388,7 +388,7 @@ public interface Tensor {
 
     /**
      * Returns a tensor instance containing the given data on the
-     * <a href="https://docs.vespa.ai/documentation/reference/tensor.html#tensor-literal-form">tensor literal form</a>.
+     * <a href="https://docs.vespa.ai/en/reference/tensor.html#tensor-literal-form">tensor literal form</a>.
      *
      * @param tensorType the type of the tensor to return, as a string on the tensor type format, given in
      *        {@link TensorType#fromSpec}
@@ -400,7 +400,7 @@ public interface Tensor {
 
     /**
      * Returns a tensor instance containing the given data on the
-     * <a href="https://docs.vespa.ai/documentation/reference/tensor.html#tensor-literal-form">tensor literal form</a>.
+     * <a href="https://docs.vespa.ai/en/reference/tensor.html#tensor-literal-form">tensor literal form</a>.
      */
     static Tensor from(String tensorString) {
         return TensorParser.tensorFrom(tensorString, Optional.empty());
diff --git a/vespajlib/src/main/java/com/yahoo/tensor/TensorType.java b/vespajlib/src/main/java/com/yahoo/tensor/TensorType.java
index 790743c745c..236e9d31c39 100644
--- a/vespajlib/src/main/java/com/yahoo/tensor/TensorType.java
+++ b/vespajlib/src/main/java/com/yahoo/tensor/TensorType.java
@@ -112,7 +112,7 @@ public class TensorType {
 
     /**
      * Returns a tensor type instance from a
-     * <a href="https://docs.vespa.ai/documentation/reference/tensor.html#tensor-type-spec">tensor type spec</a>:
+     * <a href="https://docs.vespa.ai/en/reference/tensor.html#tensor-type-spec">tensor type spec</a>:
      * <code>tensor(dimension1, dimension2, ...)</code>
      * where each dimension is either
      * <ul>
diff --git a/vespajlib/src/main/java/com/yahoo/tensor/serialization/JsonFormat.java b/vespajlib/src/main/java/com/yahoo/tensor/serialization/JsonFormat.java
index c78be98e11e..fa2094e9d2a 100644
--- a/vespajlib/src/main/java/com/yahoo/tensor/serialization/JsonFormat.java
+++ b/vespajlib/src/main/java/com/yahoo/tensor/serialization/JsonFormat.java
@@ -20,8 +20,8 @@ import java.util.Iterator;
 /**
  * Writes tensors on the JSON format used in Vespa tensor document fields:
  * A JSON map containing a 'cells' or 'values' array.
- * See <a href="https://docs.vespa.ai/documentation/reference/document-json-format.html">
- * https://docs.vespa.ai/documentation/reference/document-json-format.html</a>
+ * See <a href="https://docs.vespa.ai/en/reference/document-json-format.html">
+ * https://docs.vespa.ai/en/reference/document-json-format.html</a>
  *
  * @author bratseth
  */