Merge "Update Documentation"

1 files changed, 17 insertions, 20 deletions

diff --git a/docs/release-notes.rst b/docs/release-notes.rst
index a5b92804e..2e6fd4793 100644
--- a/docs/release-notes.rst
+++ b/docs/release-notes.rst
@@ -1,6 +1,6 @@
 .. This work is licensed under a Creative Commons Attribution 4.0 International License.
 .. http://creativecommons.org/licenses/by/4.0
-.. Copyright 2017 AT&T Intellectual Property.  All rights reserved.
+.. Copyright (c) 2017-2018 AT&T Intellectual Property.  All rights reserved.
 
 Release Notes
 =============
@@ -8,7 +8,7 @@ Release Notes
 Version: 2.0.0
 --------------
 
-:Release Date: 2018-03-28
+:Release Date: 2018-06-25
 
 **New Features**
 
@@ -16,19 +16,17 @@ The Beijing release is the second release of the Control Loop Automation Managem
 
 The main goal of the Beijing release was to:
 
-    - Enhance Platform maturity by improving CLAMP maturity matrix see `Wiki <https://wiki.onap.org/display/DW/Beijing+Release+Platform+Maturity>`_
+    - Enhance Platform maturity by improving CLAMP maturity matrix see `Wiki <https://wiki.onap.org/display/DW/Beijing+Release+Platform+Maturity>`_.
     - Focus CLAMP on Closed loop runtime operations and control - this is reflected by the move of the design part to DCAE-D.
     - Introduce CLAMP Dashboard for monitoring of active Closed Loops.
-    - CLAMP is integrated with MSB
-    - CLAMP has integrated SWAGGER
-    - CLAMP main Core has been reworked for improved flexibility
+    - CLAMP is integrated with MSB.
+    - CLAMP has integrated SWAGGER.
+    - CLAMP main Core has been reworked for improved flexibility.
 
 **Bug Fixes**
 
-	- The full list of implemented user stories and epics is available on `JIRA <https://jira.onap.org/projects/CLAMP/versions/10314>`_
-	  This is technically the first release of CLAMP, previous release was the seed code contribution.
-	  As such, the defects fixed in this release were raised during the course of the release.
-	  Anything not closed is captured below under Known Issues. If you want to review the defects fixed in the Amsterdam release, refer to Jira link above.
+	- The full list of implemented user stories and epics is available on `BEIJING RELEASE <https://jira.onap.org/projects/CLAMP/versions/10314>`_
+	  This includes the list of bugs that were fixed during the course of this release.
 
 **Known Issues**
 
@@ -38,27 +36,26 @@ The main goal of the Beijing release was to:
 
         Workaround:
 
-        You have to close the CL and reopen it again. In that case the Deploy action will do something
+        You have to close the CL and reopen it again. In that case the Deploy action will do something.
 
 
 **Security Issues**
-	CLAMP is following the CII Best Practices Badge Program, results including security assesment can be found on the
-	`project page <https://bestpractices.coreinfrastructure.org/projects/1197>`_
 
-    CLAMP Code is formally scanned during build time, the goal of Beijing Release was to ensure that all Critical items are closed
-    The remaining security issues and their workarounds are captured `here <https://wiki.onap.org/pages/viewpage.action?pageId=25440749>`_
+CLAMP is following the CII Best Practices Badge Program, results including security assesment can be found on the `project page <https://bestpractices.coreinfrastructure.org/projects/1197>`_.
+CLAMP Code is formally scanned during build time, the goal of Beijing Release was to ensure that all Critical items are closed.
+The remaining security issues and their workarounds are captured `here <https://wiki.onap.org/pages/viewpage.action?pageId=25440749>`_.
 
 **Upgrade Notes**
 
-    New Docker Containers are avaialble, an ELK stack is also now part of CLAMP deployments
+    New Docker Containers are avaialble, an ELK stack is also now part of CLAMP deployments.
 
 **Deprecation Notes**
 
-    The CLAMP Designer UI is now deprecated and unavailable, the design time is being onboarded into SDC - DCAE D
+    The CLAMP Designer UI is now deprecated and unavailable, the design time is being onboarded into SDC - DCAE D.
 
 **Other**
 
-    CLAMP Dashboard is now implemented, allows to monitor Closed Loops that are running by retrieving CL events on DMAAP
+    CLAMP Dashboard is now implemented, allows to monitor Closed Loops that are running by retrieving CL events on DMAAP.
 
 Version: 1.1.0
 --------------
@@ -77,7 +74,7 @@ The main goal of the Amsterdam release was to:
 
 **Bug Fixes**
 
-	- The full list of implemented user stories and epics is available on `JIRA <https://jira.onap.org/projects/CLAMP/versions/10313>`_
+	- The full list of implemented user stories and epics is available on `AMSTERDAM RELEASE <https://jira.onap.org/projects/CLAMP/versions/10313>`_
 	  This is technically the first release of CLAMP, previous release was the seed code contribution.
 	  As such, the defects fixed in this release were raised during the course of the release.
 	  Anything not closed is captured below under Known Issues. If you want to review the defects fixed in the Amsterdam release, refer to Jira link above.
@@ -90,7 +87,7 @@ The main goal of the Amsterdam release was to:
         Workaround:
 
         If you have multiple service available (if not create a dummy one on SDC), just click on another one and then click back on the first one in the list. The ResourceVF should be provisioned now.
-.
+
     - `CLAMP-69 <https://jira.onap.org/browse/CLAMP-69>`_ Deploy action does not always work.
 
         The "Deploy" action does not work directly after submitting it.