You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@cloudstack.apache.org by Chip Childers <ch...@sungard.com> on 2012/10/02 22:23:59 UTC
Re: git commit: Updated files for Admin Guide.
Jessica,
Can you please add the ASF license header to the following files:
docs/en-US/cloudstack_admin.ent
docs/en-US/configuring-projects.xml
It's causing the license verification build to fail:
http://jenkins.cloudstack.org/view/master/job/verify-licensing-master/121/
Thanks!
On Tue, Oct 2, 2012 at 3:54 PM, <jt...@apache.org> wrote:
> Updated Branches:
> refs/heads/master f11a16379 -> 8d158c951
>
>
> Updated files for Admin Guide.
>
> cloudstack_admin and Book_Info_Admin: new book files;
> publican-adminguide.cfg: added condition tag;
> projects: promoted to chapter;
> projects-overview: was projects;
> provisioning-steps: removed "Changing root password" as this is already included in ui.xml;
> ui: added sshkeys section;
> user-services-overview: moved 2 sections into accounts.xml;
> and various other updates.
>
>
> Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
> Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/8d158c95
> Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/8d158c95
> Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/8d158c95
>
> Branch: refs/heads/master
> Commit: 8d158c95162eb436d50193e3f11ae071d2ba7850
> Parents: f11a163
> Author: Jessica Tomechak <je...@gmail.com>
> Authored: Fri Sep 28 12:01:04 2012 -0700
> Committer: Jessica Tomechak <je...@gmail.com>
> Committed: Tue Oct 2 12:50:11 2012 -0700
>
> ----------------------------------------------------------------------
> docs/en-US/Book_Info_Admin.xml | 46 ++++++
> docs/en-US/add-members-to-projects.xml | 2 +
> docs/en-US/cloudstack_admin.ent | 22 +---
> docs/en-US/compute-disk-service-offerings.xml | 40 +++---
> docs/en-US/configuring-projects.xml | 28 +---
> docs/en-US/creating-compute-offerings.xml | 74 ++++++----
> docs/en-US/projects-overview.xml | 31 ++++
> docs/en-US/projects.xml | 48 ++++---
> docs/en-US/provisioning-steps.xml | 1 -
> docs/en-US/set-global-project-resource-limits.xml | 28 ++++
> docs/en-US/set-per-project-resource-limits.xml | 28 ++++
> docs/en-US/set-resource-limits-for-projects.xml | 4 +-
> docs/en-US/suspend-project.xml | 14 ++-
> docs/en-US/system-service-offerings.xml | 2 +-
> docs/en-US/ui.xml | 35 +++---
> docs/en-US/user-services-overview.xml | 119 ++++------------
> docs/publican-adminguide.cfg | 1 +
> 17 files changed, 299 insertions(+), 224 deletions(-)
> ----------------------------------------------------------------------
>
>
> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8d158c95/docs/en-US/Book_Info_Admin.xml
> ----------------------------------------------------------------------
> diff --git a/docs/en-US/Book_Info_Admin.xml b/docs/en-US/Book_Info_Admin.xml
> new file mode 100644
> index 0000000..6bf89b3
> --- /dev/null
> +++ b/docs/en-US/Book_Info_Admin.xml
> @@ -0,0 +1,46 @@
> +<?xml version='1.0' encoding='utf-8' ?>
> +<!DOCTYPE section 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.
> +-->
> +
> +<bookinfo id="book-cloudstack-admin">
> + <title> Apache CloudStack 4.0
> + Administrator's Guide</title>
> + <subtitle>Revised September 11, 2012 01:32 am Pacific</subtitle>
> + <productname></productname>
> + <productnumber></productnumber>
> + <pubsnumber></pubsnumber>
> + <abstract>
> + <para>If you have already installed &PRODUCT; or you want to learn more about the ongoing
> + operation and maintenance of a &PRODUCT;-powered cloud, read this documentation. It
> + will help you start using, configuring, and managing the ongoing operation of your cloud.</para>
> + </abstract>
> + <corpauthor>
> + <inlinemediaobject>
> + <imageobject>
> + <imagedata fileref="Common_Content/images/title_logo.png" format="PNG" />
> + </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>
>
> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8d158c95/docs/en-US/add-members-to-projects.xml
> ----------------------------------------------------------------------
> diff --git a/docs/en-US/add-members-to-projects.xml b/docs/en-US/add-members-to-projects.xml
> index a51726e..39c3edf 100644
> --- a/docs/en-US/add-members-to-projects.xml
> +++ b/docs/en-US/add-members-to-projects.xml
> @@ -29,5 +29,7 @@
> <listitem><para>If invitations have been enabled, you can send invitations to new members.</para></listitem>
> <listitem><para>If invitations are not enabled, you can add members directly through the UI.</para></listitem>
> </itemizedlist>
> + <xi:include href="send-projects-membership-invitation.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
> + <xi:include href="add-projects-members-from-ui.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
> </section>
>
>
> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8d158c95/docs/en-US/cloudstack_admin.ent
> ----------------------------------------------------------------------
> diff --git a/docs/en-US/cloudstack_admin.ent b/docs/en-US/cloudstack_admin.ent
> index abb1885..c52e105 100644
> --- a/docs/en-US/cloudstack_admin.ent
> +++ b/docs/en-US/cloudstack_admin.ent
> @@ -1,22 +1,4 @@
> -<!-- 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 PRODUCT "CloudPlatform">
> <!ENTITY BOOKID "Technical Documentation">
> <!ENTITY YEAR "2012">
> -<!ENTITY HOLDER "Apache Software Foundation">
> +<!ENTITY HOLDER "Citrix">
>
> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8d158c95/docs/en-US/compute-disk-service-offerings.xml
> ----------------------------------------------------------------------
> diff --git a/docs/en-US/compute-disk-service-offerings.xml b/docs/en-US/compute-disk-service-offerings.xml
> index 2469dfe..1fd2a91 100644
> --- a/docs/en-US/compute-disk-service-offerings.xml
> +++ b/docs/en-US/compute-disk-service-offerings.xml
> @@ -5,33 +5,32 @@
> ]>
>
> <!-- 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.
> -->
> -
> <section id="compute-disk-service-offerings">
> <title>Compute and Disk Service Offerings</title>
> - <para>A service offering is a set of virtual hardware features such as CPU core count and speed, memory, and disk size. The CloudPlatform administrator can set up various offerings, and then end users choose from the available offerings when they create a new VM. A service offering includes the following elements:</para>
> + <para>A service offering is a set of virtual hardware features such as CPU core count and speed, memory, and disk size. The &PRODUCT; administrator can set up various offerings, and then end users choose from the available offerings when they create a new VM. A service offering includes the following elements:</para>
> <itemizedlist>
> <listitem><para>CPU, memory, and network resource guarantees</para></listitem>
> <listitem><para>How resources are metered</para></listitem>
> <listitem><para>How the resource usage is charged</para></listitem>
> <listitem><para>How often the charges are generated</para></listitem>
> </itemizedlist>
> - <para>For example, one service offering might allow users to create a virtual machine instance that is equivalent to a 1 GHz Intel Core 2 CPU, with 1 GB memory at $0.20/hour, with network traffic metered at $0.10/GB. Based on the user’s selected offering, CloudPlatform emits usage records that can be integrated with billing systems. CloudPlatform separates service offerings into compute offerings and disk offerings. The computing service offering specifies:</para>
> + <para>For example, one service offering might allow users to create a virtual machine instance that is equivalent to a 1 GHz Intel® Core™ 2 CPU, with 1 GB memory at $0.20/hour, with network traffic metered at $0.10/GB. Based on the user’s selected offering, &PRODUCT; emits usage records that can be integrated with billing systems. &PRODUCT; separates service offerings into compute offerings and disk offerings. The computing service offering specifies:</para>
> <itemizedlist>
> <listitem><para>Guest CPU</para></listitem>
> <listitem><para>Guest RAM</para></listitem>
> @@ -43,4 +42,9 @@
> <listitem><para>Disk size (optional). An offering without a disk size will allow users to pick their own</para></listitem>
> <listitem><para>Tags on the data disk</para></listitem>
> </itemizedlist>
> + <xi:include href="creating-compute-offerings.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
> + <xi:include href="creating-disk-offerings.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
> + <xi:include href="modify-delete-service-offerings.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
> </section>
> +
> +
>
> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8d158c95/docs/en-US/configuring-projects.xml
> ----------------------------------------------------------------------
> diff --git a/docs/en-US/configuring-projects.xml b/docs/en-US/configuring-projects.xml
> index e18843d..db0a8b1 100644
> --- a/docs/en-US/configuring-projects.xml
> +++ b/docs/en-US/configuring-projects.xml
> @@ -1,29 +1,15 @@
> <?xml version='1.0' encoding='utf-8' ?>
> -<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
> +<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "file:///C:/Program%20Files%20(x86)/Publican/DocBook_DTD/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.
> --->
> -
> <section id="configuring-projects">
> <title>Configuring Projects</title>
> - <para>Before &PRODUCT; users start using projects, the &PRODUCT; administrator must set up various systems to support them, including membership invitations, limits on project resources, and controls on who can create projects</para>
> + <para>Before CloudPlatform users start using projects, the CloudPlatform administrator must set
> + up various systems to support them, including membership invitations, limits on project
> + resources, and controls on who can create projects.</para>
> + <xi:include href="set-up-invitations.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
> + <xi:include href="set-resource-limits-for-projects.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
> + <xi:include href="set-projects-creator-permissions.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
> </section>
>
>
> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8d158c95/docs/en-US/creating-compute-offerings.xml
> ----------------------------------------------------------------------
> diff --git a/docs/en-US/creating-compute-offerings.xml b/docs/en-US/creating-compute-offerings.xml
> index 56679a4..31f9741 100644
> --- a/docs/en-US/creating-compute-offerings.xml
> +++ b/docs/en-US/creating-compute-offerings.xml
> @@ -5,23 +5,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.
> --->
> -
> + 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.
> +-->
> <section id="creating-compute-offerings">
> <title>Creating a New Compute Offering</title>
> <para>To create a new compute offering:</para>
> @@ -32,19 +31,36 @@
> <listitem><para>Click Add Compute Offering.</para></listitem>
> <listitem><para>In the dialog, make the following choices:</para>
> <itemizedlist>
> - <listitem><para>Name. Any desired name for the service offering.</para></listitem>
> - <listitem><para>Description. A short description of the offering that can be displayed to users</para></listitem>
> - <listitem><para>Storage type. The type of disk that should be allocated. Local allocates from storage attached directly to the host where the system VM is running. Shared allocates from storage accessible via NFS.</para></listitem>
> - <listitem><para># of CPU cores. The number of cores which should be allocated to a system VM with this offering</para></listitem>
> - <listitem><para>CPU (in MHz). The CPU speed of the cores that the system VM is allocated. For example, "2000" would provide for a 2 GHz clock.</para></listitem>
> - <listitem><para>Memory (in MB). The amount of memory in megabytes that the system VM should be allocated. For example, "2048" would provide for a 2 GB RAM allocation.</para></listitem>
> - <listitem><para>Network Rate. Allowed data transfer rate in MB per second.</para></listitem>
> - <listitem><para>Offer HA. If yes, the administrator can choose to have the system VM be monitored and as highly available as possible.</para></listitem>
> - <listitem><para>Storage Tags. The tags that should be associated with the primary storage used by the system VM.</para></listitem>
> - <listitem><para>Host Tags. (Optional) Any tags that you use to organize your hosts</para></listitem>
> - <listitem><para>CPU cap. Whether to limit the level of CPU usage even if spare capacity is available.</para></listitem>
> - <listitem><para>Public. Indicate whether the service offering should be available all domains or only some domains. Choose Yes to make it available to all domains. Choose No to limit the scope to a subdomain; &PRODUCT; will then prompt for the subdomain's name.</para></listitem>
> + <listitem><para><emphasis role="bold">Name</emphasis>: Any desired name for the service offering.</para></listitem>
> + <listitem><para><emphasis role="bold">Description</emphasis>: A short description of the offering that can be
> + displayed to users</para></listitem>
> + <listitem><para><emphasis role="bold">Storage type</emphasis>: The type of disk that should be allocated.
> + Local allocates from storage attached directly to the host where the system
> + VM is running. Shared allocates from storage accessible via NFS.</para></listitem>
> + <listitem><para><emphasis role="bold"># of CPU cores</emphasis>: The number of cores which should be allocated
> + to a system VM with this offering</para></listitem>
> + <listitem><para><emphasis role="bold">CPU (in MHz)</emphasis>: The CPU speed of the cores that the system VM
> + is allocated. For example, “2000†would provide for a 2 GHz clock.</para></listitem>
> + <listitem><para><emphasis role="bold">Memory (in MB)</emphasis>: The amount of memory in megabytes that the
> + system VM should be allocated. For example, “2048†would provide for a 2 GB
> + RAM allocation.</para></listitem>
> + <listitem><para><emphasis role="bold">Network Rate</emphasis>: Allowed data transfer rate in MB per
> + second.</para></listitem>
> + <listitem><para><emphasis role="bold">Offer HA</emphasis>: If yes, the administrator can choose to have the
> + system VM be monitored and as highly available as possible.</para></listitem>
> + <listitem><para><emphasis role="bold">Storage Tags</emphasis>: The tags that should be associated with the
> + primary storage used by the system VM.</para></listitem>
> + <listitem><para><emphasis role="bold">Host Tags</emphasis>: (Optional) Any tags that you use to organize your
> + hosts</para></listitem>
> + <listitem><para><emphasis role="bold">CPU cap</emphasis>: Whether to limit the level of CPU usage even if
> + spare capacity is available.</para></listitem>
> + <listitem><para><emphasis role="bold">Public</emphasis>: Indicate whether the service offering should be
> + available all domains or only some domains. Choose Yes to make it available
> + to all domains. Choose No to limit the scope to a subdomain; &PRODUCT;
> + will then prompt for the subdomain's name.</para></listitem>
> </itemizedlist></listitem>
> <listitem><para>Click Add.</para></listitem>
> </orderedlist>
> +
> +
> </section>
>
> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8d158c95/docs/en-US/projects-overview.xml
> ----------------------------------------------------------------------
> diff --git a/docs/en-US/projects-overview.xml b/docs/en-US/projects-overview.xml
> new file mode 100644
> index 0000000..4f9a833
> --- /dev/null
> +++ b/docs/en-US/projects-overview.xml
> @@ -0,0 +1,31 @@
> +<?xml version='1.0' encoding='utf-8' ?>
> +<!DOCTYPE section 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.
> +-->
> +<section id="projects-overview">
> + <title>Overview of Projects</title>
> + <para>Projects are used to organize people and resources. &PRODUCT; users within a single domain can group themselves into project teams so they can collaborate and share virtual resources such as VMs, snapshots, templates, data disks, and IP addresses. &PRODUCT; tracks resource usage per project as well as per user, so the usage can be billed to either a user account or a project. For example, a private cloud within a software company might have all members of the QA department assigned to one project, so the company can track the resources used in testing while the project members can more easily isolate their efforts from other users of the same cloud</para>
> + <para>You can configure &PRODUCT; to allow any user to create a new project, or you can restrict that ability to just &PRODUCT; administrators. Once you have created a project, you become that project’s administrator, and you can add others within your domain to the project. &PRODUCT; can be set up either so that you can add people directly to a project, or so that you have to send an invitation which the recipient must accept. Project members can view and manage all virtual resources created by anyone in the project (for example, share VMs). A user can be a member of any number of projects and can switch views in the &PRODUCT; UI to show only project-related information, such as project VMs, fellow project members, project-related alerts, and so on.</para>
> + <para>The project administrator can pass on the role to another project member. The project administrator can also add more members, remove members from the project, set new resource limits (as long as they are below the global defaults set by the &PRODUCT; administrator), and delete the project. When the administrator removes a member from the project, resources created by that user, such as VM instances, remain with the project. This brings us to the subject of resource ownership and which resources can be used by a project.</para>
> + <para>Resources created within a project are owned by the project, not by any particular &PRODUCT; account, and they can be used only within the project. A user who belongs to one or more projects can still create resources outside of those projects, and those resources belong to the user’s account; they will not be counted against the project’s usage or resource limits. You can create project-level networks to isolate traffic within the project and provide network services such as port forwarding, load balancing, VPN, and static NAT. A project can also make use of certain types of resources from outside the project, if those resources are shared. For example, a shared network or public template is available to any project in the domain. A project can get access to a private template if the template’s owner will grant permission. A project can use any service offering or disk offering available in its domain; however, you can not create private service and disk offerings a
> t the project level..</para>
> +</section>
> +
>
> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8d158c95/docs/en-US/projects.xml
> ----------------------------------------------------------------------
> diff --git a/docs/en-US/projects.xml b/docs/en-US/projects.xml
> index 0390f52..39ce96b 100644
> --- a/docs/en-US/projects.xml
> +++ b/docs/en-US/projects.xml
> @@ -5,27 +5,31 @@
> ]>
>
> <!-- 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.
> -->
>
> -<section id="projects">
> - <title>Projects</title>
> - <para>Projects are used to organize people and resources. &PRODUCT; users within a single domain can group themselves into project teams so they can collaborate and share virtual resources such as VMs, snapshots, templates, data disks, and IP addresses. &PRODUCT; tracks resource usage per project as well as per user, so the usage can be billed to either a user account or a project. For example, a private cloud within a software company might have all members of the QA department assigned to one project, so the company can track the resources used in testing while the project members can more easily isolate their efforts from other users of the same cloud</para>
> - <para>You can configure &PRODUCT; to allow any user to create a new project, or you can restrict that ability to just &PRODUCT; administrators. Once you have created a project, you become that project’s administrator, and you can add others within your domain to the project. &PRODUCT; can be set up either so that you can add people directly to a project, or so that you have to send an invitation which the recipient must accept. Project members can view and manage all virtual resources created by anyone in the project (for example, share VMs). A user can be a member of any number of projects and can switch views in the &PRODUCT; UI to show only project-related information, such as project VMs, fellow project members, project-related alerts, and so on.</para>
> - <para>The project administrator can pass on the role to another project member. The project administrator can also add more members, remove members from the project, set new resource limits (as long as they are below the global defaults set by the &PRODUCT; administrator), and delete the project. When the administrator removes a member from the project, resources created by that user, such as VM instances, remain with the project. This brings us to the subject of resource ownership and which resources can be used by a project.</para>
> - <para>Resources created within a project are owned by the project, not by any particular &PRODUCT; account, and they can be used only within the project. A user who belongs to one or more projects can still create resources outside of those projects, and those resources belong to the user’s account; they will not be counted against the project’s usage or resource limits. You can create project-level networks to isolate traffic within the project and provide network services such as port forwarding, load balancing, VPN, and static NAT. A project can also make use of certain types of resources from outside the project, if those resources are shared. For example, a shared network or public template is available to any project in the domain. A project can get access to a private template if the template’s owner will grant permission. A project can use any service offering or disk offering available in its domain; however, you can not create private service and disk offerings a
> t the project level..</para>
> -</section>
> +<chapter id="projects">
> + <title>Using Projects to Organize Users and Resources</title>
> + <xi:include href="projects-overview.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
> + <xi:include href="configuring-projects.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
> + <xi:include href="create-new-projects.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
> + <xi:include href="add-members-to-projects.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
> + <xi:include href="accept-membership-invite.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
> + <xi:include href="suspend-project.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
> + <xi:include href="use-project-view.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
> +</chapter>
> +
>
> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8d158c95/docs/en-US/provisioning-steps.xml
> ----------------------------------------------------------------------
> diff --git a/docs/en-US/provisioning-steps.xml b/docs/en-US/provisioning-steps.xml
> index 3febc81..9871743 100644
> --- a/docs/en-US/provisioning-steps.xml
> +++ b/docs/en-US/provisioning-steps.xml
> @@ -26,7 +26,6 @@
> <title>Steps to Provisioning Your Cloud Infrastructure</title>
> <para>This section tells how to add zones, pods, clusters, hosts, storage, and networks to your cloud. If you are unfamiliar with these entities, please begin by looking through <xref linkend="cloud-infrastructure-concepts" />.</para>
> <xi:include href="provisioning-steps-overview.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
> - <xi:include href="changing-root-password.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
> <xi:include href="zone-add.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
> <xi:include href="pod-add.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
> <xi:include href="cluster-add.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
>
> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8d158c95/docs/en-US/set-global-project-resource-limits.xml
> ----------------------------------------------------------------------
> diff --git a/docs/en-US/set-global-project-resource-limits.xml b/docs/en-US/set-global-project-resource-limits.xml
> new file mode 100644
> index 0000000..e2b08cc
> --- /dev/null
> +++ b/docs/en-US/set-global-project-resource-limits.xml
> @@ -0,0 +1,28 @@
> +<?xml version='1.0' encoding='utf-8' ?>
> +<!DOCTYPE section 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.
> +-->
> +
> +<section id="set-global-project-resource-limits">
> + <title>Setting the Global Project Resource Limits</title>
> + <para>TODO</para>
> +</section>
>
> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8d158c95/docs/en-US/set-per-project-resource-limits.xml
> ----------------------------------------------------------------------
> diff --git a/docs/en-US/set-per-project-resource-limits.xml b/docs/en-US/set-per-project-resource-limits.xml
> new file mode 100644
> index 0000000..682b92c
> --- /dev/null
> +++ b/docs/en-US/set-per-project-resource-limits.xml
> @@ -0,0 +1,28 @@
> +<?xml version='1.0' encoding='utf-8' ?>
> +<!DOCTYPE section 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.
> +-->
> +
> +<section id="set-per-project-resource-limits">
> + <title>Setting Per-Project Resource Limits</title>
> + <para>TODO</para>
> +</section>
>
> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8d158c95/docs/en-US/set-resource-limits-for-projects.xml
> ----------------------------------------------------------------------
> diff --git a/docs/en-US/set-resource-limits-for-projects.xml b/docs/en-US/set-resource-limits-for-projects.xml
> index 2c331ac..52083d2 100644
> --- a/docs/en-US/set-resource-limits-for-projects.xml
> +++ b/docs/en-US/set-resource-limits-for-projects.xml
> @@ -24,5 +24,7 @@
>
> <section id="set-resource-limits-for-projects">
> <title>Setting Resource Limits for Projects</title>
> - <para>The &PRODUCT; administrator can set global default limits to control the amount of resources that can be owned by each project in the cloud. This serves to prevent uncontrolled usage of resources such as snapshots, IP addresses, and virtual machine instances. Domain administrators can override these resource limits for individual projects with their domains, as long as the new limits are below the global defaults set by the &PRODUCT; root administrator. The root administrator can also set lower resource limits for any project in the cloud</para>
> + <para>The &PRODUCT; administrator can set global default limits to control the amount of resources that can be owned by each project in the cloud. This serves to prevent uncontrolled usage of resources such as snapshots, IP addresses, and virtual machine instances. Domain administrators can override these resource limits for individual projects with their domains, as long as the new limits are below the global defaults set by the &PRODUCT; root administrator. The root administrator can also set lower resource limits for any project in the cloud.</para>
> + <xi:include href="set-global-project-resource-limits.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
> + <xi:include href="set-per-project-resource-limits.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
> </section>
>
> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8d158c95/docs/en-US/suspend-project.xml
> ----------------------------------------------------------------------
> diff --git a/docs/en-US/suspend-project.xml b/docs/en-US/suspend-project.xml
> index bfaa12a..b4f821b 100644
> --- a/docs/en-US/suspend-project.xml
> +++ b/docs/en-US/suspend-project.xml
> @@ -32,17 +32,21 @@
> <listitem><para>In the left navigation, click Projects.</para></listitem>
> <listitem><para>In Select View, choose Projects.</para></listitem>
> <listitem><para>Click the name of the project.</para></listitem>
> - <listitem><para>Click one of the buttons:<inlinemediaobject>
> + <listitem><para>Click one of the buttons:</para><para>To delete, use <inlinemediaobject>
> <imageobject>
> <imagedata fileref="./images/delete-button.png" />
> </imageobject>
> - <textobject><phrase>deletebutton.png: Removes a member</phrase></textobject>
> - </inlinemediaobject></para>
> - <para><inlinemediaobject>
> + <textobject>
> + <phrase>deletebutton.png: Removes a project</phrase>
> + </textobject>
> + </inlinemediaobject></para>
> + <para>To suspend, use<inlinemediaobject>
> <imageobject>
> <imagedata fileref="./images/suspend-icon.png" />
> </imageobject>
> - <textobject><phrase>deletebutton.png: Removes a member</phrase></textobject>
> + <textobject>
> + <phrase>deletebutton.png: suspends a project</phrase>
> + </textobject>
> </inlinemediaobject></para></listitem>
> </orderedlist>
> </section>
>
> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8d158c95/docs/en-US/system-service-offerings.xml
> ----------------------------------------------------------------------
> diff --git a/docs/en-US/system-service-offerings.xml b/docs/en-US/system-service-offerings.xml
> index 75aa128..c41aa2e 100644
> --- a/docs/en-US/system-service-offerings.xml
> +++ b/docs/en-US/system-service-offerings.xml
> @@ -26,4 +26,4 @@
> <title>System Service Offerings</title>
> <para>System service offerings provide a choice of CPU speed, number of CPUs, tags, and RAM size, just as other service offerings do. But rather than being used for virtual machine instances and exposed to users, system service offerings are used to change the default properties of virtual routers, console proxies, and other system VMs. System service offerings are visible only to the &PRODUCT; root administrator. &PRODUCT; provides default system service offerings. The &PRODUCT; root administrator can create additional custom system service offerings.</para>
> <para>When &PRODUCT; creates a virtual router for a guest network, it uses default settings which are defined in the system service offering associated with the network offering. You can upgrade the capabilities of the virtual router by applying a new network offering that contains a different system service offering. All virtual routers in that network will begin using the settings from the new service offering.</para>
> - </section>
> +</section>
>
> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8d158c95/docs/en-US/ui.xml
> ----------------------------------------------------------------------
> diff --git a/docs/en-US/ui.xml b/docs/en-US/ui.xml
> index 4f7f327..94ea4ea 100644
> --- a/docs/en-US/ui.xml
> +++ b/docs/en-US/ui.xml
> @@ -5,24 +5,25 @@
> ]>
>
> <!-- 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.
> -->
>
> <chapter id="ui">
> - <title>User Interface</title>
> - <xi:include href="log-in.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
> + <title>User Interface</title>
> + <xi:include href="log-in.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
> + <xi:include href="using-sshkeys.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
> </chapter>
>
> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8d158c95/docs/en-US/user-services-overview.xml
> ----------------------------------------------------------------------
> diff --git a/docs/en-US/user-services-overview.xml b/docs/en-US/user-services-overview.xml
> index f9e38c0..9576121 100644
> --- a/docs/en-US/user-services-overview.xml
> +++ b/docs/en-US/user-services-overview.xml
> @@ -5,94 +5,35 @@
> ]>
>
> <!-- 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.
> -->
>
> -<section id="user-services-overview">
> - <title>User Services Overview</title>
> - <para>In addition to the physical and logical infrastructure of your cloud, and the &PRODUCT; software and servers, you also need a layer of user services so that people can actually make use of the cloud. This means not just a user UI, but a set of options and resources that users can choose from, such as templates for creating virtual machines, disk storage, and more. If you are running a commercial service, you will be keeping track of what services and resources users are consuming and charging them for that usage. Even if you do not charge anything for people to use your cloud – say, if the users are strictly internal to your organization, or just friends who are sharing your cloud – you can still keep track of what services they use and how much of them.</para>
> - <section id="offerings-and-templates">
> - <title>Service Offerings, Disk Offerings, Network Offerings, and Templates</title>
> - <para>A user creating a new instance can make a variety of choices about its characteristics and capabilities. &PRODUCT; provides several ways to present users with choices when creating a new instance:</para>
> - <itemizedlist>
> - <listitem><para>Service Offerings, defined by the &PRODUCT; administrator, provide a choice of CPU speed, number of CPUs, RAM size, tags on the root disk, and other choices. See Creating a New Compute Offering.</para></listitem>
> - <listitem><para>Disk Offerings, defined by the &PRODUCT; administrator, provide a choice of disk size for primary data storage. See Creating a New Disk Offering.</para></listitem>
> - <listitem><para>Network Offerings, defined by the &PRODUCT; administrator, describe the feature set that is available to end users from the virtual router or external networking devices on a given guest network. See Network Offerings.</para></listitem>
> - <listitem><para>Templates, defined by the &PRODUCT; administrator or by any &PRODUCT; user, are the base OS images that the user can choose from when creating a new instance. For example, &PRODUCT; includes CentOS as a template. See Working with Templates.</para></listitem>
> - </itemizedlist>
> - <para>In addition to these choices that are provided for users, there is another type of service offering which is available only to the &PRODUCT; root administrator, and is used for configuring virtual infrastructure resources. For more information, see Upgrading a Virtual Router with System Service Offerings.</para>
> - </section>
> - <section id="accounts-users-domains">
> - <title>Accounts, Users, and Domains</title>
> - <para>An account typically represents a customer of the service provider or a department in a large organization. Multiple users can exist in an account. Users are like aliases in the account. Users in the same account are not isolated from each other, but they are isolated from users in other accounts. Most installations need not surface the notion of users; they just have one user per account.</para>
> - <para>Accounts are grouped by domains. Domains usually contain accounts that have some logical relationship to each other and a set of delegated administrators with some authority over the domain and its subdomains. For example, a service provider with several resellers could create a domain for each reseller.</para>
> - <para>Administrators are accounts with special privileges in the system. There may be multiple administrators in the system. Administrators can create or delete other administrators, and change the password for any user in the system. Root administrators have complete access to the system, including managing templates, service offerings, customer care administrators, and domains. Domain administrators can perform administrative operations for users who belong to that domain. Domain administrators do not have visibility into physical servers or other domains.</para>
> - </section>
> - <section id="using-ldap-server">
> - <title>Using an LDAP Server for User Authentication</title>
> - <para>You can use an external LDAP server such as Microsoft Active Directory or ApacheDS to authenticate &PRODUCT; end-users. Just map &PRODUCT; accounts to the corresponding LDAP accounts using a query filter. The query filter is written using the query syntax of the particular LDAP server, and can include special wildcard characters provided by &PRODUCT; for matching common values such as the user’s email address and name. &PRODUCT; will search the external LDAP directory tree starting at a specified base directory and return the distinguished name (DN) and password of the matching user. This information along with the given password is used to authenticate the user.</para>
> - <para>To set up LDAP authentication in &PRODUCT;, call the &PRODUCT; API command ldapConfig and provide the following:</para>
> - <itemizedlist>
> - <listitem><para>Hostname or IP address and listening port of the LDAP server</para></listitem>
> - <listitem><para>Base directory and query filter</para></listitem>
> - <listitem><para>Search user DN credentials, which give &PRODUCT; permission to search on the LDAP server</para></listitem>
> - <listitem><para>SSL keystore and password, if SSL is used</para></listitem>
> - </itemizedlist>
> - <section id="example-ldap-commands">
> - <title>Example LDAP Configuration Commands</title>
> - <para>To understand the examples in this section, you need to know the basic concepts behind calling the &PRODUCT; API, which are explained in the Developer’s Guide.</para>
> - <para>The following shows an example invocation of ldapConfig with an ApacheDS LDAP server.</para>
> - <programlisting>http://127.0.0.1:8080/client/api?command=ldapConfig&hostname=127.0.0.1&searchbase=ou%3Dtesting%2Co%3Dproject&queryfilter=%28%26%28uid%3D%25u%29%29&binddn=cn%3DJohn+Singh%2Cou%3Dtesting%2Co%project&bindpass=secret&port=10389&ssl=true&truststore=C%3A%2Fcompany%2Finfo%2Ftrusted.ks&truststorepass=secret&response=json&apiKey=YourAPIKey&signature=YourSignatureHash
> - </programlisting>
> - <para>The command must be URL-encoded. Here is the same example without the URL encoding:</para>
> - <programlisting>
> -http://127.0.0.1:8080/client/api?command=ldapConfig
> -&hostname=127.0.0.1
> -&searchbase=ou=testing,o=project
> -&queryfilter=(&(%uid=%u))
> -&binddn=cn=John+Singh,ou=testing,o=project
> -&bindpass=secret
> -&port=10389
> -&ssl=true
> -&truststore=C:/company/info/trusted.ks
> -&truststorepass=secret
> -&response=json
> -&apiKey=YourAPIKey
> -&signature=YourSignatureHash
> - </programlisting>
> - <para>The following shows a similar command for Active Directory. Here, the search base is the testing group within a company, and the users are matched up based on email address.</para>
> - <programlisting>http://10.147.29.101:8080/client/api?command=ldapConfig&hostname=10.147.28.250&searchbase=OU%3Dtesting%2CDC%3Dcompany&queryfilter=%28%26%28mail%3D%25e%29%29&binddn=CN%3DAdministrator%2COU%3Dtesting%2CDC%3Dcompany&bindpass=1111_aaaa&port=389&response=json&apiKey=YourAPIKey&signature=YourSignatureHash</programlisting>
> - <para>The next few sections explain some of the concepts you will need to know when filling out the ldapConfig parameters.</para>
> - </section>
> - <section id="search-base">
> - <title>Search Base</title>
> - <para>Coming soon: TODO</para>
> - </section>
> - <section id="query-filter">
> - <title>Query Filter</title>
> - <para>Coming soon: TODO</para>
> - </section>
> - <section id="search-user-bind-dn">
> - <title>Search User Bind DN</title>
> - <para>Coming soon: TODO</para>
> - </section>
> - <section id="ssl-keystore-path-and-password">
> - <title>SSL Keystore Path and Password</title>
> - <para>Coming soon: TODO</para>
> - </section>
> - </section>
> -</section>
> +<chapter id="user-services-overview">
> + <title>User Services Overview</title>
> + <para>In addition to the physical and logical infrastructure of your cloud, and the &PRODUCT; software and servers, you also need a layer of user services so that people can actually make use of the cloud. This means not just a user UI, but a set of options and resources that users can choose from, such as templates for creating virtual machines, disk storage, and more. If you are running a commercial service, you will be keeping track of what services and resources users are consuming and charging them for that usage. Even if you do not charge anything for people to use your cloud – say, if the users are strictly internal to your organization, or just friends who are sharing your cloud – you can still keep track of what services they use and how much of them.</para>
> + <section id="offerings-and-templates">
> + <title>Service Offerings, Disk Offerings, Network Offerings, and Templates</title>
> + <para>A user creating a new instance can make a variety of choices about its characteristics and capabilities. &PRODUCT; provides several ways to present users with choices when creating a new instance:</para>
> + <itemizedlist>
> + <listitem><para>Service Offerings, defined by the &PRODUCT; administrator, provide a choice of CPU speed, number of CPUs, RAM size, tags on the root disk, and other choices. See Creating a New Compute Offering.</para></listitem>
> + <listitem><para>Disk Offerings, defined by the &PRODUCT; administrator, provide a choice of disk size for primary data storage. See Creating a New Disk Offering.</para></listitem>
> + <listitem><para>Network Offerings, defined by the &PRODUCT; administrator, describe the feature set that is available to end users from the virtual router or external networking devices on a given guest network. See Network Offerings.</para></listitem>
> + <listitem><para>Templates, defined by the &PRODUCT; administrator or by any &PRODUCT; user, are the base OS images that the user can choose from when creating a new instance. For example, &PRODUCT; includes CentOS as a template. See Working with Templates.</para></listitem>
> + </itemizedlist>
> + <para>In addition to these choices that are provided for users, there is another type of service offering which is available only to the &PRODUCT; root administrator, and is used for configuring virtual infrastructure resources. For more information, see Upgrading a Virtual Router with System Service Offerings.</para>
> + </section>
> +</chapter>
> \ No newline at end of file
>
> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8d158c95/docs/publican-adminguide.cfg
> ----------------------------------------------------------------------
> diff --git a/docs/publican-adminguide.cfg b/docs/publican-adminguide.cfg
> index a599782..c8a109f 100644
> --- a/docs/publican-adminguide.cfg
> +++ b/docs/publican-adminguide.cfg
> @@ -24,6 +24,7 @@ docname: cloudstack_admin
> brand: cloudstack
> chunk_first: 1
> chunk_section_depth: 1
> +condition: admin
>
>
>
>
>