Merge "Master is now Pike"
This commit is contained in:
commit
a41328fc99
@ -312,4 +312,4 @@ locale_dirs = ['locale/']
|
||||
sphinxmark_enable = True
|
||||
sphinxmark_div = 'docs-body'
|
||||
sphinxmark_image = 'text'
|
||||
sphinxmark_text = 'Ocata'
|
||||
sphinxmark_text = 'Pike'
|
||||
|
@ -328,4 +328,4 @@ pdf_documents = [
|
||||
sphinxmark_enable = True
|
||||
sphinxmark_div = 'docs-body'
|
||||
sphinxmark_image = 'text'
|
||||
sphinxmark_text = 'Ocata'
|
||||
sphinxmark_text = 'Pike'
|
||||
|
@ -328,4 +328,4 @@ pdf_documents = [
|
||||
sphinxmark_enable = True
|
||||
sphinxmark_div = 'docs-body'
|
||||
sphinxmark_image = 'text'
|
||||
sphinxmark_text = 'Ocata'
|
||||
sphinxmark_text = 'Pike'
|
||||
|
@ -309,4 +309,4 @@ locale_dirs = ['locale/']
|
||||
sphinxmark_enable = True
|
||||
sphinxmark_div = 'docs-body'
|
||||
sphinxmark_image = 'text'
|
||||
sphinxmark_text = 'Ocata'
|
||||
sphinxmark_text = 'Pike'
|
||||
|
@ -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
|
||||
|
Loading…
x
Reference in New Issue
Block a user