Merge "Fix the developer info"

3 files changed, 13 insertions, 12 deletions

diff --git a/docs/developer_info/developer_information.rst b/docs/developer_info/developer_information.rst
index 8613f2605c..61be8f006f 100644
--- a/docs/developer_info/developer_information.rst
+++ b/docs/developer_info/developer_information.rst
@@ -8,13 +8,13 @@ SO Developer Information
 .. toctree::
    :maxdepth: 1
    
-.. developer_info/developer_info_Project_Structure.rst
-   developer_info/Camunda_Modeler.rst
-.. developer_info/developer_info_Main_Process_Flows.rst
-.. developer_info/developer_info_Subprocess_Process_Flows.rst
-.. developer_info/developer_info_Project_Deployment_Strategy.rst
-   developer_info/Building_SO.rst
-   developer_info/Working_with_SO_Docker.rst
-   developer_info/Camunda_Cockpit_Community_Edition.rst
-   developer_info/Camunda_Cockpit_Enterprise_Edition.rst
+.. developer_info_Project_Structure.rst
+   Camunda_Modeler.rst
+.. developer_info_Main_Process_Flows.rst
+.. developer_info_Subprocess_Process_Flows.rst
+.. developer_info_Project_Deployment_Strategy.rst
+   Building_SO.rst
+   Working_with_SO_Docker.rst
+   Camunda_Cockpit_Community_Edition.rst
+   Camunda_Cockpit_Enterprise_Edition.rst
    
\ No newline at end of file
diff --git a/docs/release_notes/release-notes.rst b/docs/release_notes/release-notes.rst
index d3448497cf..f9c7002e8a 100644
--- a/docs/release_notes/release-notes.rst
+++ b/docs/release_notes/release-notes.rst
@@ -19,7 +19,7 @@ Temp release for Casablanca at M4.
 * Support PNF resource type.
 * Extend the support of homing to vFW, VDNS usecases.
 * Workflow Designer Integration.
-* Monitoring BPMN worflow capabiliities through UI.
+* Monitoring BPMN worflow capabilities through UI.
 * Support to the CCVPN Usecase.
 * SO internal architecture improvements 
 
@@ -35,7 +35,7 @@ The Beijing release is the second release of the Service Orchestrator (SO) proje
 
 * Enhance Platform maturity by improving SO maturity matrix see `Wiki <https://wiki.onap.org/display/DW/Beijing+Release+Platform+Maturity>`_.
 * Manual scaling of network services and VNFs.
-* Homing and placement capabiliities through OOF interaction. 
+* Homing and placement capabilities through OOF interaction. 
 * Ability to perform change management.
 * Integrated to APPC
 * Integrated to OOF 
@@ -102,7 +102,7 @@ It executes end-to-end service activities by processing workflows and business l
 The orchestration engine is a reusable service. Any component of the architecture can execute SO orchestration capabilities. 
 
 * Orchestration services will process workflows based on defined models and recipe. 
-* The service model maintains consistency and reusability across all orchestration activities and ensures consistent methods, structure and version of the workflow execution environment.
+* The service model maintains consistency and re-usability across all orchestration activities and ensures consistent methods, structure and version of the workflow execution environment.
 * Orchestration processes interact with other platform components or external systems via standard and well-defined APIs.
 
 
diff --git a/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/montoring/configuration/rest/RestTemplateConfigration.java b/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/montoring/configuration/rest/RestTemplateConfigration.java
index 914e5d676e..a30628b1d5 100644
--- a/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/montoring/configuration/rest/RestTemplateConfigration.java
+++ b/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/montoring/configuration/rest/RestTemplateConfigration.java
@@ -17,6 +17,7 @@
  * SPDX-License-Identifier: Apache-2.0
  * ============LICENSE_END=========================================================
  */
+ 
 package org.onap.so.montoring.configuration.rest;
 
 import java.util.concurrent.TimeUnit;