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

@@ -312,4 +312,4 @@ locale_dirs = ['locale/']
 sphinxmark_enable = True
 sphinxmark_div = 'docs-body'
 sphinxmark_image = 'text'
-sphinxmark_text = 'Ocata'
+sphinxmark_text = 'Pike'

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'

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'

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'

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