Merge "fixed directory structure"

This commit is contained in:
Jenkins 2013-09-10 19:25:35 +00:00 committed by Gerrit Code Review
commit 738fc722e1
4 changed files with 6 additions and 6 deletions

View File

@ -15,6 +15,6 @@
<?rax revhistory?> <?rax revhistory?>
<para><link xlink:href="https://blueprints.launchpad.net/openstack-manuals/+filebug" xlink:show="new">Submit a bug. Enter the summary as "Training, " with a few words. Be descriptive as possible in the description field. Open the tag pull-down and enter training-manuals.</link></para> <para><link xlink:href="https://blueprints.launchpad.net/openstack-manuals/+filebug" xlink:show="new">Submit a bug. Enter the summary as "Training, " with a few words. Be descriptive as possible in the description field. Open the tag pull-down and enter training-manuals.</link></para>
</section> </section>
<!-- <xi:include href="https://raw.github.com/openstack/operations-guide/master/doc/src/docbkx/openstack-ops/src/preface_ops.xml" parse="xml" xpointer="chapter_gk2_jpr_lj"/> --> <!-- <xi:include href="https://raw.github.com/openstack/operations-guide/master/doc/openstack-ops/src/preface_ops.xml" parse="xml" xpointer="chapter_gk2_jpr_lj"/> -->
</preface> </preface>
</book> </book>

View File

@ -6,4 +6,4 @@
<title>OpenStack Operator, General Material To Learn</title> <title>OpenStack Operator, General Material To Learn</title>
<para>User Stories are referenced here</para> <para>User Stories are referenced here</para>
<xi:include href="operator-editing-code.xml"/> <xi:include href="operator-editing-code.xml"/>
</chapter> </chapter>

View File

@ -168,7 +168,7 @@ $ git config --global user.email "your_email@youremail.com" </userinput></screen
</step> </step>
<step> <step>
<para>Using oXygen, open the <para>Using oXygen, open the
/Users/&lt;username>/code/openstack-manuals/doc/src/docbkx/openstack-compute-admin/bk_compute_adminguide.xml /Users/&lt;username>/code/openstack-manuals/doc/admin-guide-cloud/bk-admin-guide-cloud.xml
master page for this example. It links together the rest master page for this example. It links together the rest
of the material. Find the page with the bug. Open the page of the material. Find the page with the bug. Open the page
that is referenced in the bug description by selecting the that is referenced in the bug description by selecting the
@ -178,7 +178,7 @@ $ git config --global user.email "your_email@youremail.com" </userinput></screen
</step> </step>
<step> <step>
<para>In the shell,</para> <para>In the shell,</para>
<screen><prompt>$</prompt><userinput>cd /Users/&lt;username>/code/openstack-manuals/doc/src/docbkx/openstack-compute-admin/</userinput></screen> <screen><prompt>$</prompt><userinput>cd /Users/&lt;username>/code/openstack-manuals/doc/admin-guide-cloud/</userinput></screen>
</step> </step>
<step> <step>
<para>Verify that you are on master with</para> <para>Verify that you are on master with</para>

View File

@ -29,7 +29,7 @@
the section above. Short description for the bug summary. Paragraph for the description and the section above. Short description for the bug summary. Paragraph for the description and
then tag with training-manuals.</link></para> then tag with training-manuals.</link></para>
<!-- this maps to user story "blah blah" --> <!-- this maps to user story "blah blah" -->
<xi:include href="https://raw.github.com/openstack/openstack-manuals/master/doc/src/docbkx/openstack-install/ch_installing-openstack-overview.xml" xpointer="xmlns(db=http://docbook.org/ns/docbook) xpath(//*[@xml:id = 'scripted-dev-installation'])"> <xi:include href="https://raw.github.com/openstack/openstack-manuals/master/doc/install-guide/ch_installing-openstack-overview.xml" xpointer="xmlns(db=http://docbook.org/ns/docbook) xpath(//*[@xml:id = 'scripted-dev-installation'])">
<xi:fallback> <xi:fallback>
<para> <para>
<mediaobject> <mediaobject>