Updated Branches: refs/heads/master 97fe053e2 -> ba61d7e02
Patch from Joe Brockmeier: Add Apache license to last of the files under doc Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/ba61d7e0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/ba61d7e0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/ba61d7e0 Branch: refs/heads/master Commit: ba61d7e02744ba3f45ba3de0057b55b8b4ea0cc1 Parents: 97fe053 Author: Chip Childers <[email protected]> Authored: Mon Aug 13 11:35:51 2012 -0400 Committer: Chip Childers <[email protected]> Committed: Mon Aug 13 11:35:51 2012 -0400 ---------------------------------------------------------------------- docs/en-US/Preface.xml | 22 ++++++++++++++++- docs/en-US/SSL-keystore-path-and-password.xml | 24 +++++++++++++++++-- docs/en-US/provisioning.xml | 19 +++++++++++++++ 3 files changed, 60 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/ba61d7e0/docs/en-US/Preface.xml ---------------------------------------------------------------------- diff --git a/docs/en-US/Preface.xml b/docs/en-US/Preface.xml index b33d62e..3f5cdc6 100644 --- a/docs/en-US/Preface.xml +++ b/docs/en-US/Preface.xml @@ -1,8 +1,27 @@ <?xml version='1.0' encoding='utf-8' ?> -<!DOCTYPE preface PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "file:///C:/Program%20Files%20(x86)/Publican/DocBook_DTD/docbookx.dtd" [ +<!DOCTYPE preface 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. +--> + <preface id="pref-cloudstack-Preface"> <title>Preface</title> <xi:include href="Common_Content/Conventions.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> @@ -10,4 +29,3 @@ </xi:fallback> </xi:include> </preface> - http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/ba61d7e0/docs/en-US/SSL-keystore-path-and-password.xml ---------------------------------------------------------------------- diff --git a/docs/en-US/SSL-keystore-path-and-password.xml b/docs/en-US/SSL-keystore-path-and-password.xml index e75c3d0..f7b7426 100644 --- a/docs/en-US/SSL-keystore-path-and-password.xml +++ b/docs/en-US/SSL-keystore-path-and-password.xml @@ -1,10 +1,28 @@ <?xml version='1.0' encoding='utf-8' ?> -<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "file:///C:/Program%20Files%20(x86)/Publican/DocBook_DTD/docbookx.dtd" [ +<!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="SSL-keystore-path-and-password"> <title>SSL Keystore Path and Password</title> <para>If the LDAP server requires SSL, you need to enable it in the ldapConfig command by setting the parameters ssl, truststore, and truststorepass. Before enabling SSL for ldapConfig, you need to get the certificate which the LDAP server is using and add it to a trusted keystore. You will need to know the path to the keystore and the password.</para> - - </section> +</section> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/ba61d7e0/docs/en-US/provisioning.xml ---------------------------------------------------------------------- diff --git a/docs/en-US/provisioning.xml b/docs/en-US/provisioning.xml index 07758ef..8a5b44a 100644 --- a/docs/en-US/provisioning.xml +++ b/docs/en-US/provisioning.xml @@ -3,6 +3,25 @@ <!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="provisioning"> <title>Provisioning Your Cloud Infrastructure</title> <xi:include href="cloud-infrastructure-concepts.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
