Updated Branches:
refs/heads/4.0 6ed291404 -> 6355965dc
fixing some formatting
Conflicts:
docs/en-US/user-services-overview.xml
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit:
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/6355965d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/6355965d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/6355965d
Branch: refs/heads/4.0
Commit: 6355965dcd956811dd471a9d03c73dadcf68f480
Parents: 5aae00b
Author: David Nalley <da...@gnsa.us>
Authored: Mon Oct 8 23:36:33 2012 -0400
Committer: Chip Childers <chip.child...@gmail.com>
Committed: Mon Oct 22 11:19:29 2012 -0400
----------------------------------------------------------------------
docs/en-US/user-services-overview.xml | 30 ++++++++++++++--------------
1 files changed, 15 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6355965d/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 5541b46..12504e6 100644
--- a/docs/en-US/user-services-overview.xml
+++ b/docs/en-US/user-services-overview.xml
@@ -5,21 +5,21 @@
]>
<!-- 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="user-services-overview">
