You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bf...@apache.org on 2013/04/25 21:24:40 UTC

[31/50] [abbrv] git commit: updated refs/heads/ui-add-remove-nics to e6d9e81

CLOUDSTACK-1567


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/96837eda
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/96837eda
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/96837eda

Branch: refs/heads/ui-add-remove-nics
Commit: 96837eda0f869859058f977b7e8b9e8918b597ce
Parents: 33006ff
Author: Radhika PC <ra...@citrix.com>
Authored: Thu Apr 25 11:16:44 2013 +0530
Committer: Radhika PC <ra...@citrix.com>
Committed: Thu Apr 25 11:18:00 2013 +0530

----------------------------------------------------------------------
 docs/en-US/delete-event-alerts.xml |   47 +++++++++++++++++++++++++++++++
 docs/en-US/events.xml              |    3 +-
 2 files changed, 48 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/96837eda/docs/en-US/delete-event-alerts.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/delete-event-alerts.xml b/docs/en-US/delete-event-alerts.xml
new file mode 100644
index 0000000..3eebcb7
--- /dev/null
+++ b/docs/en-US/delete-event-alerts.xml
@@ -0,0 +1,47 @@
+<?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="delete-event-alerts">
+  <title>Deleting and Archiving Events and Alerts</title>
+  <para>&PRODUCT; provides you the ability to delete or archive the existing alerts and events that
+    you no longer want to implement. You can regularly delete or archive any alerts or events that
+    you cannot, or do not want to resolve from the database.</para>
+  <para>You can delete or archive individual alerts or events either directly by using the Quickview
+    or by using the Details page. If you want to delete multiple alerts or events at the same time,
+    you can use the respective context menu. You can delete alerts or events by category for a time
+    period.</para>
+  <note>
+    <para>Archived alerts or events cannot be viewed in the UI, or by using the API. They are
+      maintained in the database for auditing or compliance purposes.</para>
+  </note>
+  <formalpara>
+    <title>Permissions</title>
+    <para>Consider the following:</para>
+  </formalpara>
+  <itemizedlist>
+    <listitem>
+      <para>The root admin can delete or archive one or multiple alerts or events.</para>
+    </listitem>
+    <listitem>
+      <para>The domain admin or end user can delete or archive one or multiple events.</para>
+    </listitem>
+  </itemizedlist>
+</section>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/96837eda/docs/en-US/events.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/events.xml b/docs/en-US/events.xml
index 49ef86e..4a14458 100644
--- a/docs/en-US/events.xml
+++ b/docs/en-US/events.xml
@@ -11,9 +11,7 @@
     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
@@ -34,4 +32,5 @@
   <xi:include href="standard-events.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
   <xi:include href="long-running-job-events.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
   <xi:include href="event-log-queries.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include href="delete-event-alerts.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 </section>