openstack/openstack-manuals
Code Issues Proposed changes

Merge "Publish for Kilo"

Browse Source
This commit is contained in:
Jenkins 2015-04-29 08:25:56 +00:00 committed by Gerrit Code Review
commit ad843c07b8
3 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/config-reference/bk-config-ref.xml
View File

@ -3,8 +3,10 @@
xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:xi="http://www.w3.org/2001/XInclude"
xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xlink="http://www.w3.org/1999/xlink"
version="5.0" version="5.0"
xml:id="bk-openstack-config-reference" xml:id="bk-openstack-config-reference">
<!--- TODO(jaegerandi) Add back to the above once Kilo has branched:
status="draft"> status="draft">
-->
<title>OpenStack Configuration Reference</title> <title>OpenStack Configuration Reference</title>
<?rax <?rax
status.bar.text.font.size="40px" status.bar.text.font.size="40px"

4
doc/install-guide/bk-openstack-install-guide.xml
View File

@ -3,8 +3,10 @@
xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:xi="http://www.w3.org/2001/XInclude"
xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xlink="http://www.w3.org/1999/xlink"
version="5.0" version="5.0"
xml:id="openstack-install-manual" xml:id="openstack-install-manual">
<!-- TODO(jaegerandi) Add back to the above once Kilo has branched:
status="draft"> status="draft">
-->
<title>OpenStack Installation Guide for <title>OpenStack Installation Guide for
<phrase os="rhel;centos;fedora">Red Hat Enterprise Linux 7, CentOS 7, and Fedora 21</phrase> <phrase os="rhel;centos;fedora">Red Hat Enterprise Linux 7, CentOS 7, and Fedora 21</phrase>
<phrase os="ubuntu">Ubuntu 14.04</phrase> <phrase os="ubuntu">Ubuntu 14.04</phrase>

14
tox.ini
View File

@ -86,6 +86,14 @@ commands =
# We only publish changed manuals. # We only publish changed manuals.
# Do not publish DocBook XML Networking Guide # Do not publish DocBook XML Networking Guide
openstack-doc-test --check-build --ignore-book networking-guide --publish openstack-doc-test --check-build --ignore-book networking-guide --publish
# TODO(jaegerandi): Remove the following lines before we branch off
# a kilo branch.
# Publish install-guide and config-reference to /kilo
cp -a publish-docs/draft publish-docs/kilo
# Replace links to /draft with links to /kilo/
# This needs bash so that tox does not interpret the *
bash -c "sed -i -e 's|/draft/|/kilo/|g' publish-docs/kilo/*/atom.xml publish-docs/kilo/*/*/*/atom.xml publish-docs/kilo/*/*.html publish-docs/kilo/*/*/*/*/*.html publish-docs/kilo/*/*/*/*.html publish-docs/kilo/*/*/*.html publish-docs/kilo/*/*.html"
# END Kilo duplication.
# Build both RST User Guides # Build both RST User Guides
{toxinidir}/tools/build-user-guides.sh {toxinidir}/tools/build-user-guides.sh
# Copy RST user-guide # Copy RST user-guide
@ -97,9 +105,9 @@ commands =
# Build RST Networking Guide # Build RST Networking Guide
{toxinidir}/tools/glossary2rst.py doc/networking-guide/source/glossary.rst {toxinidir}/tools/glossary2rst.py doc/networking-guide/source/glossary.rst
sphinx-build -W doc/networking-guide/source doc/networking-guide/build/html sphinx-build -W doc/networking-guide/source doc/networking-guide/build/html
# Copy RST Networking Guide as draft # Copy RST Networking Guide
mkdir -p publish-docs/draft/networking-guide/ mkdir -p publish-docs/networking-guide/
rsync -a doc/networking-guide/build/html/ publish-docs/draft/networking-guide/ rsync -a doc/networking-guide/build/html/ publish-docs/networking-guide/
# Now publish www as well, we cannot do this from # Now publish www as well, we cannot do this from
# openstack-doc-test. Use rsync so that .htaccess gets also # openstack-doc-test. Use rsync so that .htaccess gets also
# copied. # copied.