From b0d609af38dc1f64fddaa30599dd95b6e640a0c3 Mon Sep 17 00:00:00 2001
From: Brian Moss <kallimachos@gmail.com>
Date: Fri, 24 Mar 2017 10:51:48 +1000
Subject: [PATCH] Master is now Pike

stable/ocata branch exists; configure master to build properly

* Stop copying content to /ocata for versioned guides.
* Change watermark to Pike for draft guides.

Change-Id: Ieef7f3a5b3158f915e03f55fd3bebf1cb8bb90db
Depends-On: I0f92f2bf6c563e9ca71fdfba5e00da73d3a98fc7
---
 doc/config-reference/source/conf.py      | 2 +-
 doc/install-guide-debconf/source/conf.py | 2 +-
 doc/install-guide/source/conf.py         | 2 +-
 doc/networking-guide/source/conf.py      | 2 +-
 tools/publishdocs.sh                     | 8 ++++----
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/doc/config-reference/source/conf.py b/doc/config-reference/source/conf.py
index 7501b1afc8..2656c8cbfd 100644
--- a/doc/config-reference/source/conf.py
+++ b/doc/config-reference/source/conf.py
@@ -312,4 +312,4 @@ locale_dirs = ['locale/']
 sphinxmark_enable = True
 sphinxmark_div = 'docs-body'
 sphinxmark_image = 'text'
-sphinxmark_text = 'Ocata'
+sphinxmark_text = 'Pike'
diff --git a/doc/install-guide-debconf/source/conf.py b/doc/install-guide-debconf/source/conf.py
index 54964b014f..4b699d6437 100644
--- a/doc/install-guide-debconf/source/conf.py
+++ b/doc/install-guide-debconf/source/conf.py
@@ -324,4 +324,4 @@ pdf_documents = [
 sphinxmark_enable = True
 sphinxmark_div = 'docs-body'
 sphinxmark_image = 'text'
-sphinxmark_text = 'Ocata'
+sphinxmark_text = 'Pike'
diff --git a/doc/install-guide/source/conf.py b/doc/install-guide/source/conf.py
index abc3fc934d..bb1290e8e0 100644
--- a/doc/install-guide/source/conf.py
+++ b/doc/install-guide/source/conf.py
@@ -324,4 +324,4 @@ pdf_documents = [
 sphinxmark_enable = True
 sphinxmark_div = 'docs-body'
 sphinxmark_image = 'text'
-sphinxmark_text = 'Ocata'
+sphinxmark_text = 'Pike'
diff --git a/doc/networking-guide/source/conf.py b/doc/networking-guide/source/conf.py
index 251b4831e3..9cf3c52314 100644
--- a/doc/networking-guide/source/conf.py
+++ b/doc/networking-guide/source/conf.py
@@ -305,4 +305,4 @@ locale_dirs = ['locale/']
 sphinxmark_enable = True
 sphinxmark_div = 'docs-body'
 sphinxmark_image = 'text'
-sphinxmark_text = 'Ocata'
+sphinxmark_text = 'Pike'
diff --git a/tools/publishdocs.sh b/tools/publishdocs.sh
index 8cc140761e..f17c99fc27 100755
--- a/tools/publishdocs.sh
+++ b/tools/publishdocs.sh
@@ -68,10 +68,10 @@ if [ "$PUBLISH" = "publish" ] ; then
 fi
 
 # For publishing to both /draft and /BRANCH
-if [ "$PUBLISH" = "publish" ] ; then
-    # For publishing to both /draft and /BRANCH
-    copy_to_branch ocata
-fi
+#if [ "$PUBLISH" = "publish" ] ; then
+#    # For publishing to both /draft and /BRANCH
+#    copy_to_branch ocata
+#fi
 
 if [ "$PUBLISH" = "build" ] ; then
     # Create index page for viewing