Merge branch 'master' of https://[email protected]/repos/asf/incubator-cloudstack.git
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/7545fe48 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/7545fe48 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/7545fe48 Branch: refs/heads/regions Commit: 7545fe48ae8d0f5084bebe2ae04a81ad74a39f4d Parents: b71acbc 8d158c9 Author: Hugo Trippaers <[email protected]> Authored: Tue Oct 2 13:40:24 2012 -0700 Committer: Hugo Trippaers <[email protected]> Committed: Tue Oct 2 13:40:24 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(-) ----------------------------------------------------------------------
