Updated Branches: refs/heads/master e125cd3bb -> 03b2f9bfd
fixes namespaces and entities Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/03b2f9bf Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/03b2f9bf Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/03b2f9bf Branch: refs/heads/master Commit: 03b2f9bfd1b143c2972709ff0a95182e157e5fb2 Parents: e125cd3 Author: Hugo Trippaers <[email protected]> Authored: Wed Oct 3 10:52:30 2012 -0700 Committer: Hugo Trippaers <[email protected]> Committed: Wed Oct 3 10:52:30 2012 -0700 ---------------------------------------------------------------------- docs/en-US/cloudstack_plugin_niciranvp.ent | 22 ++++++++++ docs/en-US/plugin-niciranvp-about.xml | 2 +- docs/en-US/plugin-niciranvp-introduction.xml | 39 ------------------ docs/en-US/plugin-niciranvp-troubleshooting.xml | 8 ++-- docs/en-US/plugin-niciranvp-usage.xml | 2 +- 5 files changed, 28 insertions(+), 45 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/03b2f9bf/docs/en-US/cloudstack_plugin_niciranvp.ent ---------------------------------------------------------------------- diff --git a/docs/en-US/cloudstack_plugin_niciranvp.ent b/docs/en-US/cloudstack_plugin_niciranvp.ent new file mode 100644 index 0000000..abb1885 --- /dev/null +++ b/docs/en-US/cloudstack_plugin_niciranvp.ent @@ -0,0 +1,22 @@ +<!-- Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. +--> + +<!ENTITY PRODUCT "CloudStack"> +<!ENTITY BOOKID "Technical Documentation"> +<!ENTITY YEAR "2012"> +<!ENTITY HOLDER "Apache Software Foundation"> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/03b2f9bf/docs/en-US/plugin-niciranvp-about.xml ---------------------------------------------------------------------- diff --git a/docs/en-US/plugin-niciranvp-about.xml b/docs/en-US/plugin-niciranvp-about.xml index 4f7d070..a0b6928 100644 --- a/docs/en-US/plugin-niciranvp-about.xml +++ b/docs/en-US/plugin-niciranvp-about.xml @@ -20,7 +20,7 @@ specific language governing permissions and limitations under the License. --> -<chapter id="About-the-Nicira-NVP-Plugin"> +<chapter id="About-the-Nicira-NVP-Plugin" xmlns:xi="http://www.w3.org/2001/XInclude";> <title>The Nicira NVP Plugin</title> <xi:include href="plugin-niciranvp-introduction.xml"></xi:include> <xi:include href="plugin-niciranvp-features.xml"></xi:include> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/03b2f9bf/docs/en-US/plugin-niciranvp-introduction.xml ---------------------------------------------------------------------- diff --git a/docs/en-US/plugin-niciranvp-introduction.xml b/docs/en-US/plugin-niciranvp-introduction.xml index 259fd51..9c1d42d 100644 --- a/docs/en-US/plugin-niciranvp-introduction.xml +++ b/docs/en-US/plugin-niciranvp-introduction.xml @@ -23,43 +23,4 @@ <section id="Introduction-to-the-Nicira-NVP-Plugin"> <title>Introduction to the Nicira NVP Plugin</title> <para>The Nicira NVP plugin allows CloudStack to use the Nicira solution for virtualized network as a provider for CloudStack networks and services.</para> - <!-- - <para>Always use &PRODUCT; rather than typing CloudStack or CloudPlatform.</para> - <para>Indent with 4 spaces, not with tab characters.</para> - <para>To hyperlink to a URL outside this document: <ulink url="http://external URL here">Display text of the link here</ulink></para> - <para>To hyperlink to another section in this document: <xref linkend="SECTION-ID-OF-THE-OTHER-SECTION-GOES-HERE." /> - The publication tools will automatically insert the display text of the link for you.</para> - <note><para>Use this for all tips and asides. Don't use other tags such as tip. - Our publication tool (publican) prefers the note tag. The tool will - automatically insert the text NOTE: for you, so please don't type it.</para></note> - <warning><para>Use this for anything that is vital to avoid runtime errors. Don't use - other tags such as caution. Our publication tool (publican) prefers the warning tag. The tool will - automatically insert the text WARNING: for you, so please don't type it.</para></warning> - <para>Here's how to do a bulleted list:</para> - <itemizedlist> - <listitem><para>Bulleted list item text.</para></listitem> - </itemizedlist> - <para>Here's how to do a numbered list. These are used for step by step instructions - or to describe a sequence of events in time. For everything else, use a bulleted list.</para> - <orderedlist> - <listitem><para>Text of the step</para></listitem> - <listitem><para>You might also want a sub-list within one of the list items. Like this:</para> - <orderedlist numeration="loweralpha"> - <listitem><para>Inner list item text.</para></listitem> - </orderedlist> - </listitem> - </orderedlist> - <para>Here's how to insert an image. Put the graphic file in /images, a subdirectory of the directory where this XML file is. - Refer to it using this tag. The tag is admittedly complex, but it's the one we need to use with publican:</para> - <mediaobject> - <imageobject> - <imagedata fileref="./images/YOUR_FILENAME_HERE.png" /> - </imageobject> - <textobject><phrase>YOUR_FILENAME_HERE.png: Alt text describing this image, such as - âstructure of a zone.â Required for accessibility.</phrase></textobject> - </mediaobject> - <para>A section can contain sub-sections. Please make each sub-section a separate file to enable reuse. - Then include the sub-section like this:</para> - <xi:include href="SUBSECTION_FILE_NAME.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> - --> </section> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/03b2f9bf/docs/en-US/plugin-niciranvp-troubleshooting.xml ---------------------------------------------------------------------- diff --git a/docs/en-US/plugin-niciranvp-troubleshooting.xml b/docs/en-US/plugin-niciranvp-troubleshooting.xml index 0e86e5d..615b80a 100644 --- a/docs/en-US/plugin-niciranvp-troubleshooting.xml +++ b/docs/en-US/plugin-niciranvp-troubleshooting.xml @@ -20,9 +20,9 @@ specific language governing permissions and limitations under the License. --> -<chapter id="Troubleshooting-the-Nicira-NVP-Plugin"> +<chapter id="Troubleshooting-the-Nicira-NVP-Plugin" xmlns:xi="http://www.w3.org/2001/XInclude";> <title>Troubleshooting the Nicira NVP Plugin</title> - <xi:include href="plugin-niciranvp-uuidreferences.xml"></xi:include> - <xi:include href="plugin-niciranvp-tables.xml"></xi:include> -</chapter> \ No newline at end of file + <xi:include href="plugin-niciranvp-uuidreferences.xml" ></xi:include> + <xi:include href="plugin-niciranvp-tables.xml" ></xi:include> +</chapter> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/03b2f9bf/docs/en-US/plugin-niciranvp-usage.xml ---------------------------------------------------------------------- diff --git a/docs/en-US/plugin-niciranvp-usage.xml b/docs/en-US/plugin-niciranvp-usage.xml index 041e10e..2dcc3e7 100644 --- a/docs/en-US/plugin-niciranvp-usage.xml +++ b/docs/en-US/plugin-niciranvp-usage.xml @@ -20,7 +20,7 @@ specific language governing permissions and limitations under the License. --> -<chapter id="Using-the-Nicira-NVP-Plugin"> +<chapter id="Using-the-Nicira-NVP-Plugin" xmlns:xi="http://www.w3.org/2001/XInclude";> <title>Using the Nicira NVP Plugin</title> <xi:include href="plugin-niciranvp-preparations.xml"></xi:include>
