openstack
/
openstack-manuals
Code Issues Proposed changes

Merge "Master is now Pike"

This commit is contained in:
Jenkins 2017-03-24 11:46:27 +00:00 committed by Gerrit Code Review
parent e32d413f74 b0d609af38
commit a41328fc99
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/config-reference/source/conf.py
View File

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

2
doc/install-guide-debconf/source/conf.py
View File

@ -328,4 +328,4 @@ pdf_documents = [
sphinxmark_enable = True
sphinxmark_div = 'docs-body'
sphinxmark_image = 'text'
sphinxmark_text = 'Ocata'
sphinxmark_text = 'Pike'

2
doc/install-guide/source/conf.py
View File

@ -328,4 +328,4 @@ pdf_documents = [
sphinxmark_enable = True
sphinxmark_div = 'docs-body'
sphinxmark_image = 'text'
sphinxmark_text = 'Ocata'
sphinxmark_text = 'Pike'

2
doc/networking-guide/source/conf.py
View File

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

8
tools/publishdocs.sh
View File

@ -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