svn commit: r1389541 - in /incubator/ambari/trunk: CHANGES.txt docs/src/site/apt/privacy-policy.apt docs/src/site/site.xml

[yu...@apache.org]

Author: yusaku
Date: Mon Sep 24 19:55:15 2012
New Revision: 1389541

URL: http://svn.apache.org/viewvc?rev=1389541&view=rev
Log:
AMBARI-766. Add privacy policy in web site. (Olivier Lamy via yusaku)

Added:
    incubator/ambari/trunk/docs/src/site/apt/privacy-policy.apt
Modified:
    incubator/ambari/trunk/CHANGES.txt
    incubator/ambari/trunk/docs/src/site/site.xml

Modified: incubator/ambari/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1389541&r1=1389540&r2=1389541&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Mon Sep 24 19:55:15 2012
@@ -12,6 +12,8 @@ Trunk (unreleased changes)
 
   NEW FEATURES
 
+    AMBARI-766. Add privacy policy in web site. (Olivier Lamy via yusaku)
+
     AMBARI-765. Update project site documentation to point to the 0.9
     release. Also update the style. (yusaku) 
 

Added: incubator/ambari/trunk/docs/src/site/apt/privacy-policy.apt
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/docs/src/site/apt/privacy-policy.apt?rev=1389541&view=auto
==============================================================================
--- incubator/ambari/trunk/docs/src/site/apt/privacy-policy.apt (added)
+++ incubator/ambari/trunk/docs/src/site/apt/privacy-policy.apt Mon Sep 24 19:55:15 2012
@@ -0,0 +1,55 @@
+ ----
+ Privacy Policy
+ -----
+ Olivier Lamy
+ -----
+ 2012-06-18
+ -----
+
+~~ 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.
+
+~~ NOTE: For help with the syntax of this file, see:
+~~ http://maven.apache.org/doxia/references/apt-format.html
+
+Privacy Policy
+
+  Information about your use of this website is collected using server access logs and a tracking cookie. The
+  collected information consists of the following:
+
+  [[1]] The IP address from which you access the website;
+
+  [[2]] The type of browser and operating system you use to access our site;
+
+  [[3]] The date and time you access our site;
+
+  [[4]] The pages you visit; and
+
+  [[5]] The addresses of pages from where you followed a link to our site.
+
+  []
+
+  Part of this information is gathered using a tracking cookie set by the
+  {{{http://www.google.com/analytics/}Google Analytics}} service and handled by Google as described in their
+  {{{http://www.google.com/privacy.html}privacy policy}}. See your browser documentation for instructions on how to
+  disable the cookie if you prefer not to share this data with Google.
+
+  We use the gathered information to help us make our site more useful to visitors and to better understand how and
+  when our site is used. We do not track or collect personally identifiable information or associate gathered data
+  with any personally identifying information from other sources.
+
+  By using this website, you consent to the collection of this data in the manner and for the purpose described above.
\ No newline at end of file

Modified: incubator/ambari/trunk/docs/src/site/site.xml
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/docs/src/site/site.xml?rev=1389541&r1=1389540&r2=1389541&view=diff
==============================================================================
--- incubator/ambari/trunk/docs/src/site/site.xml (original)
+++ incubator/ambari/trunk/docs/src/site/site.xml Mon Sep 24 19:55:15 2012
@@ -89,5 +89,16 @@
         <item name="Install Guide for trunk" href="install.html"/>
     </menu>
 
+    <footer>
+      <div class="row span12">
+        Apache Ambari, Apache, the Apache feather logo, and the Apache Ambari project logos are trademarks
+        of The Apache Software Foundation.
+        All other marks mentioned may be trademarks or registered trademarks of their respective owners.
+      </div>
+      <div class="row span12">
+        <a href="${project.url}/privacy-policy.html">Privacy Policy</a>
+      </div>
+    </footer>
+
   </body>
 </project>