https does not work with custom domains

14 files changed, 19 insertions, 19 deletions

diff --git a/README.md b/README.md
index 16beeff7132..dbdec72d7ed 100644
--- a/README.md
+++ b/README.md
@@ -4,8 +4,8 @@ It stores and indexes your data such that queries, selection and processing over
 data can be performed at serving time.
 
 This README describes how to build and develop the Vespa engine. To get started, read the
-[quick start](https://docs.vespa.ai/documentation/vespa-quick-start.html), or find the full
-documentation at https://docs.vespa.ai/.
+[quick start](http://docs.vespa.ai/documentation/vespa-quick-start.html), or find the full
+documentation at http://docs.vespa.ai/.
 
 Code licensed under the Apache 2.0 license. See [LICENSE](LICENSE) for terms.
 
@@ -54,7 +54,7 @@ Java modules can be built on any environment having Java and Maven:
 
 ## Run Vespa on a local machine
 A basic, single-node install is found in the 
-[quick start](https://docs.vespa.ai/documentation/vespa-quick-start.html).
+[quick start](http://docs.vespa.ai/documentation/vespa-quick-start.html).
 For multi-node and using Node Admin, read [node-admin/README.md](node-admin/README.md).
 
 ## Write documentation
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/http/xml/JettyConnectorBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/container/http/xml/JettyConnectorBuilder.java
index 60dd8982dec..6271ff817bb 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/http/xml/JettyConnectorBuilder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/http/xml/JettyConnectorBuilder.java
@@ -28,7 +28,7 @@ public class JettyConnectorBuilder extends VespaDomBuilder.DomConfigProducerBuil
             String configName = legacyServerConfig.getAttribute("name");
             if (configName.equals("container.jdisc.config.http-server")) {
                 ancestor.deployLogger().log(Level.WARNING, "The config 'container.jdisc.config.http-server' is deprecated and will be removed in a later version of Vespa."
-                        + " Please use 'jdisc.http.connector' instead, see https://docs.vespa.ai/documentation/jdisc/http-server-and-filters.html#configuring-jetty-server");
+                        + " Please use 'jdisc.http.connector' instead, see http://docs.vespa.ai/documentation/jdisc/http-server-and-filters.html#configuring-jetty-server");
             } else {
                 legacyServerConfig = null;
             }
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 5cd9bffaceb..b9b273d691f 100644
--- a/document/src/main/java/com/yahoo/document/json/DocumentUpdateJsonSerializer.java
+++ b/document/src/main/java/com/yahoo/document/json/DocumentUpdateJsonSerializer.java
@@ -56,7 +56,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="http://docs.vespa.ai/documentation/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/sample-apps/README.md b/sample-apps/README.md
index 65752d2a10d..67902f03feb 100644
--- a/sample-apps/README.md
+++ b/sample-apps/README.md
@@ -2,10 +2,10 @@
 
 This is a set of applications that showcase different Vespa features.
 Please refer to the
-[vespa quick start guide](https://docs.vespa.ai/documentation/vespa-quick-start.html)
+[vespa quick start guide](http://docs.vespa.ai/documentation/vespa-quick-start.html)
 to get started.
 
 Note: The applications that contain a pom.xml file must be built before being deployed.
 Please refer to
-[developing applications](https://docs.vespa.ai/documentation/jdisc/developing-applications.html#deploy)
+[developing applications](http://docs.vespa.ai/documentation/jdisc/developing-applications.html#deploy)
 for more information.
diff --git a/sample-apps/basic-search-java/README.md b/sample-apps/basic-search-java/README.md
index adaff02f476..5434027a449 100644
--- a/sample-apps/basic-search-java/README.md
+++ b/sample-apps/basic-search-java/README.md
@@ -4,6 +4,6 @@ A simple stateless Vespa application with no data, to demonstrate how to build
 plugins for the Vespa JDisc container.
 
 Please refer to
-[developing applications](https://docs.vespa.ai/documentation/jdisc/developing-applications.html)
+[developing applications](http://docs.vespa.ai/documentation/jdisc/developing-applications.html)
 for more information.
 
diff --git a/sample-apps/basic-search-tensor/README.md b/sample-apps/basic-search-tensor/README.md
index 1312d14ac6e..b59a4fd7b5a 100644
--- a/sample-apps/basic-search-tensor/README.md
+++ b/sample-apps/basic-search-tensor/README.md
@@ -8,8 +8,8 @@ Also includes the rank expression playground used to visualize rank operations.
     http://<host>:8080/playground/index.html
 
 Please refer to the
-[tensor intro](https://docs.vespa.ai/documentation/tensor-intro.html)
+[tensor intro](http://docs.vespa.ai/documentation/tensor-intro.html)
 and
-[tensor user guide](https://docs.vespa.ai/documentation/tensor-user-guide.html)
+[tensor user guide](http://docs.vespa.ai/documentation/tensor-user-guide.html)
 for more information.
 
diff --git a/sample-apps/basic-search/README.md b/sample-apps/basic-search/README.md
index efb2f53db6a..c83e386cde8 100644
--- a/sample-apps/basic-search/README.md
+++ b/sample-apps/basic-search/README.md
@@ -4,6 +4,6 @@ A simple Vespa application which can be deployed on one node, which supports
 feeding and running simple queries.
 
 Please refer to the
-[vespa quick start guide](https://docs.vespa.ai/documentation/vespa-quick-start.html)
+[vespa quick start guide](http://docs.vespa.ai/documentation/vespa-quick-start.html)
 for more information.
 
diff --git a/sample-apps/blog-recommendation/README.md b/sample-apps/blog-recommendation/README.md
index 9cd5e113502..fe04b869172 100644
--- a/sample-apps/blog-recommendation/README.md
+++ b/sample-apps/blog-recommendation/README.md
@@ -3,7 +3,7 @@
 This sample application contains the code for the blog recommendation tutorial.
 
 Please refer to
-[Vespa tutorial pt.2 - Blog recommendation](https://docs.vespa.ai/documentation/tutorials/blog-recommendation.html)
+[Vespa tutorial pt.2 - Blog recommendation](http://docs.vespa.ai/documentation/tutorials/blog-recommendation.html)
 for more information.
 
 
diff --git a/sample-apps/blog-search/README.md b/sample-apps/blog-search/README.md
index 2e71977e376..3e133729754 100644
--- a/sample-apps/blog-search/README.md
+++ b/sample-apps/blog-search/README.md
@@ -3,7 +3,7 @@
 This sample application contains the code for the blog search tutorial.
 
 Please refer to
-[Vespa tutorial pt.1 - Blog searching](https://docs.vespa.ai/documentation/tutorials/blog-search.html)
+[Vespa tutorial pt.1 - Blog searching](http://docs.vespa.ai/documentation/tutorials/blog-search.html)
 for more information.
 
 
diff --git a/sample-apps/blog-tutorial-shared/README.md b/sample-apps/blog-tutorial-shared/README.md
index 97b3247a7cd..5d4d15ed1ed 100644
--- a/sample-apps/blog-tutorial-shared/README.md
+++ b/sample-apps/blog-tutorial-shared/README.md
@@ -8,11 +8,11 @@ This directory contains utility code for the blog-search and blog-recommendation
 
     $ python parse.py trainPosts.json > somefile.json
 
-Parses JSON from the file trainPosts.json downloaded from Kaggle during the [blog search tutorial](https://docs.vespa.ai/documentation/tutorials/blog-search.html) and format it according to Vespa Document JSON format.
+Parses JSON from the file trainPosts.json downloaded from Kaggle during the [blog search tutorial](http://docs.vespa.ai/documentation/tutorials/blog-search.html) and format it according to Vespa Document JSON format.
 
     $ python parse.py -p trainPosts.json > somefile.json
 
-Give it the flag "-p" or "--popularity", and the script also calculates and adds the field `popularity`, as introduced [in the tutorial](https://docs.vespa.ai/documentation/tutorials/blog-search.html#blog-popularity-signal).
+Give it the flag "-p" or "--popularity", and the script also calculates and adds the field `popularity`, as introduced [in the tutorial](http://docs.vespa.ai/documentation/tutorials/blog-search.html#blog-popularity-signal).
 
 ## Vespa Tutorial pt. 2
 
diff --git a/sample-apps/boolean-search/README.md b/sample-apps/boolean-search/README.md
index 4e34c67fcf7..f7a0abd2f74 100644
--- a/sample-apps/boolean-search/README.md
+++ b/sample-apps/boolean-search/README.md
@@ -2,7 +2,7 @@ Boolean Search
 ==================
 
 Boolean Search and how to feed and query is described in 
-[boolean search](https://docs.vespa.ai/documentation/boolean-search.html).
+[boolean search](http://docs.vespa.ai/documentation/boolean-search.html).
 
 Adding boolean search to an application is easy. Just add a field of
 type predicate to the .sd-file. (Remember to set the arity parameter.)
diff --git a/sample-apps/http-api-using-request-handlers-and-processors/README.md b/sample-apps/http-api-using-request-handlers-and-processors/README.md
index 8168ad6c786..c74bf0cd4a6 100644
--- a/sample-apps/http-api-using-request-handlers-and-processors/README.md
+++ b/sample-apps/http-api-using-request-handlers-and-processors/README.md
@@ -1,6 +1,6 @@
 # Vespa sample applications - Building a HTTP API using request handlers and processors
 
 Please refer to
-[building a HTTP API using request handlers and processors](https://docs.vespa.ai/documentation/jdisc/http-api-tutorial.html)
+[building a HTTP API using request handlers and processors](http://docs.vespa.ai/documentation/jdisc/http-api-tutorial.html)
 for more information.
 
diff --git a/sample-apps/http-api-using-searcher/README.md b/sample-apps/http-api-using-searcher/README.md
index e82784d67c2..f5a8217bc08 100644
--- a/sample-apps/http-api-using-searcher/README.md
+++ b/sample-apps/http-api-using-searcher/README.md
@@ -1,7 +1,7 @@
 # Vespa sample applications - Building a HTTP API using a searcher
 
 Please refer to
-[HTTP API use-case](https://docs.vespa.ai/documentation/search/handler-tutorial.html)
+[HTTP API use-case](http://docs.vespa.ai/documentation/search/handler-tutorial.html)
 for more information.
 
 
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 5c264925253..51138db8d00 100644
--- a/vespaclient-java/src/main/java/com/yahoo/vespaget/CommandLineOptions.java
+++ b/vespaclient-java/src/main/java/com/yahoo/vespaget/CommandLineOptions.java
@@ -72,7 +72,7 @@ public class CommandLineOptions {
 
         options.addOption(Option.builder("f")
                 .hasArg(true)
-                .desc("Retrieve the specified fields only (see https://docs.vespa.ai/documentation/reference/fieldsets.html) (default '[all]')")
+                .desc("Retrieve the specified fields only (see http://docs.vespa.ai/documentation/reference/fieldsets.html) (default '[all]')")
                 .longOpt(FIELDSET_OPTION)
                 .argName("fieldset").build());