openstack/openstack-manuals
Code Issues Proposed changes

Merge "Move RST Glossary to common-rst"

Browse Source
This commit is contained in:
Jenkins 2015-05-13 17:24:23 +00:00 committed by Gerrit Code Review
commit 906d494628
6 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/networking-guide/source/index.rst
View File

@ -31,7 +31,7 @@ Contents
common/app_support.rst common/app_support.rst
glossary.rst common/glossary.rst
Search in this guide Search in this guide
~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~

2
doc/user-guides/source/index-admin.rst
View File

@ -28,7 +28,7 @@ Contents
common/app_support.rst common/app_support.rst
glossary.rst common/glossary.rst
Search in this guide Search in this guide
~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~

2
doc/user-guides/source/index.rst
View File

@ -31,7 +31,7 @@ Contents
common/app_support.rst common/app_support.rst
glossary.rst common/glossary.rst
Search in this guide Search in this guide
~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~

2
tools/build-rst.sh
View File

@ -56,7 +56,7 @@ done
if [ "$GLOSSARY" -eq "1" ] ; then if [ "$GLOSSARY" -eq "1" ] ; then
echo "Generating Glossary" echo "Generating Glossary"
tools/glossary2rst.py $DIRECTORY/source/glossary.rst tools/glossary2rst.py doc/common-rst/glossary.rst
fi fi
if [ -z "BUILD" ] ; then if [ -z "BUILD" ] ; then

2
tools/generatepot-rst.sh
View File

@ -31,7 +31,7 @@ if [ "$DOCNAME" = "user-guides" ] ; then
fi fi
# Build Glossary # Build Glossary
tools/glossary2rst.py > doc/user-guides/source/glossary.rst tools/glossary2rst.py doc/common-rst/glossary.rst
# First remove the old pot file, otherwise the new file will contain # First remove the old pot file, otherwise the new file will contain
# old references # old references
rm -f doc/$DOCNAME/source/locale/$DOCNAME.pot rm -f doc/$DOCNAME/source/locale/$DOCNAME.pot

5
tox.ini
View File

@ -54,7 +54,6 @@ commands =
mkdir -p publish-docs/user-guide-admin/ mkdir -p publish-docs/user-guide-admin/
rsync -a doc/user-guides/build-admin/html/ publish-docs/user-guide-admin/ rsync -a doc/user-guides/build-admin/html/ publish-docs/user-guide-admin/
# Build RST networking guide # Build RST networking guide
{toxinidir}/tools/glossary2rst.py doc/networking-guide/source/glossary.rst
sphinx-build -E -W doc/networking-guide/source doc/networking-guide/build/html sphinx-build -E -W doc/networking-guide/source doc/networking-guide/build/html
mkdir -p publish-docs/networking-guide/ mkdir -p publish-docs/networking-guide/
rsync -a doc/networking-guide/build/html/ publish-docs/networking-guide/ rsync -a doc/networking-guide/build/html/ publish-docs/networking-guide/
@ -64,12 +63,11 @@ commands =
[testenv:docs] [testenv:docs]
commands = commands =
{toxinidir}/tools/build-user-guides.sh {toxinidir}/tools/build-user-guides.sh
{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
[testenv:network] [testenv:network]
commands = commands =
{toxinidir}/tools/glossary2rst.py doc/networking-guide/source/glossary.rst {toxinidir}/tools/glossary2rst.py doc/common-rst/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
[testenv:publishdocs] [testenv:publishdocs]
@ -101,7 +99,6 @@ commands =
mkdir -p publish-docs/user-guide-admin/ mkdir -p publish-docs/user-guide-admin/
rsync -a doc/user-guides/build-admin/html/ publish-docs/user-guide-admin/ rsync -a doc/user-guides/build-admin/html/ publish-docs/user-guide-admin/
# Build RST Networking Guide # Build RST Networking Guide
{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 # Copy RST Networking Guide
mkdir -p publish-docs/networking-guide/ mkdir -p publish-docs/networking-guide/