Updated Branches: refs/heads/master d07700eb6 -> ab280d913
New main book file with corrections for latest chapter structure, plus one missing file. Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/ab280d91 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/ab280d91 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/ab280d91 Branch: refs/heads/master Commit: ab280d9136b9e7848f282625170adf030c419fa6 Parents: d07700e Author: Jessica Tomechak <jessica.tomec...@gmail.com> Authored: Wed Oct 3 10:43:57 2012 -0700 Committer: Jessica Tomechak <jessica.tomec...@gmail.com> Committed: Wed Oct 3 11:39:07 2012 -0700 ---------------------------------------------------------------------- docs/en-US/api-overview.xml | 34 ++++++++++++++++ docs/en-US/cloudstack.xml | 79 +++++++++++++++++++------------------ 2 files changed, 75 insertions(+), 38 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/ab280d91/docs/en-US/api-overview.xml ---------------------------------------------------------------------- diff --git a/docs/en-US/api-overview.xml b/docs/en-US/api-overview.xml new file mode 100644 index 0000000..86eed23 --- /dev/null +++ b/docs/en-US/api-overview.xml @@ -0,0 +1,34 @@ +<?xml version='1.0' encoding='utf-8' ?> +<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"; [ +<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent"> +%BOOK_ENTITIES; +]> + +<!-- 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. +--> + +<chapter id="api-overview"> + <title>&PRODUCT; API</title> + <para>The &PRODUCT; API is a low level API that has been used to implement the &PRODUCT; web UIs. It is also a good basis for implementing other popular APIs such as EC2/S3 and emerging DMTF standards.</para> + <para>Many &PRODUCT; API calls are asynchronous. These will return a Job ID immediately when called. This Job ID can be used to query the status of the job later. Also, status calls on impacted resources will provide some indication of their state.</para> + <para>The API has a REST-like query basis and returns results in XML or JSON.</para> + <para>See <ulink url="http://docs.cloudstack.org/CloudStack_Documentation/Developer's_Guide%3A_CloudStack">the Developerâs Guide</ulink> and <ulink url="http://docs.cloudstack.org/CloudStack_Documentation/API_Reference%3A_CloudStack";>the API Reference</ulink>.</para> + <xi:include href="provisioning-auth-api.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> + <xi:include href="allocators.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> + <xi:include href="user-data-and-meta-data.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> +</chapter> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/ab280d91/docs/en-US/cloudstack.xml ---------------------------------------------------------------------- diff --git a/docs/en-US/cloudstack.xml b/docs/en-US/cloudstack.xml index 1e2b6c8..906eadc 100644 --- a/docs/en-US/cloudstack.xml +++ b/docs/en-US/cloudstack.xml @@ -1,53 +1,56 @@ <?xml version='1.0' encoding='utf-8' ?> -<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"; [ +<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"; [ <!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent"> %BOOK_ENTITIES; ]> <!-- 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. + 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. --> <book> - <bookinfo> - <title>CloudStack Guide</title> - <subtitle>Revised September 18, 2012 10:48 am Pacific</subtitle> - <productname>Apache CloudStack (incubating)</productname> - <productnumber>3.0</productnumber> - <edition>1</edition> - <pubsnumber></pubsnumber> - <abstract> - <para>Complete technical documentation for Apache CloudStack.</para> - </abstract> - <corpauthor> - <inlinemediaobject> - <imageobject> - <imagedata fileref="Common_Content/images/title_logo.svg" format="SVG" /> - </imageobject> - </inlinemediaobject> - </corpauthor> - <xi:include href="Common_Content/Legal_Notice.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> - <xi:include href="Author_Group.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> - </bookinfo> + <xi:include href="Book_Info_Build_All.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> <xi:include href="concepts.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> + <xi:include href="accounts.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> + <xi:include href="user-services-overview.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> <xi:include href="installation.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> <xi:include href="ui.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> <xi:include href="cloud-infrastructure-concepts.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> <xi:include href="provisioning-steps.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> - <xi:include href="admin-guide.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> + <xi:include href="set-up-network-for-users.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> + <xi:include href="offerings.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> + <xi:include href="xenserver-install.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> + <xi:include href="kvm-install.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> + <xi:include href="vmware-install.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> + <xi:include href="projects.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> + <xi:include href="virtual-machines.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> + <xi:include href="working-with-hosts.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> + <xi:include href="working-with-templates.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> + <xi:include href="storage.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> + <xi:include href="work-with-usage.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> + <xi:include href="networks.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> + <xi:include href="working-with-system-vm.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> + <xi:include href="sys-reliability-and-ha.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> + <xi:include href="manage-cloud.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> + <xi:include href="api-overview.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> + <xi:include href="tuning.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> + <xi:include href="troubleshooting.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> <xi:include href="developer-guide.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> -</book> + <xi:include href="time-zones.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> + <xi:include href="event-types.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> + <xi:include href="alerts.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> +</book> \ No newline at end of file
