From 2c9c02dc00b392205460a42fe2bf95c1a90825e7 Mon Sep 17 00:00:00 2001
From: Rasika Perera <info.rasika@gmail.com>
Date: Fri, 6 Jan 2017 16:26:59 +0530
Subject: [PATCH] Replaced [EMM] with [IoT Server]

---
 .../download-agent.hbs                                        | 4 ++--
 .../configuration.hbs                                         | 4 ++--
 .../public/templates/android-policy-edit.hbs                  | 2 +-
 .../public/templates/android-policy-view.hbs                  | 2 +-
 .../public/templates/android-policy-operations.hbs            | 2 +-
 .../configuration.hbs                                         | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/android-web-agent/app/pages/mdm.page.enrollments.android.download-agent/download-agent.hbs b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/android-web-agent/app/pages/mdm.page.enrollments.android.download-agent/download-agent.hbs
index 26f32fefb6..8173c413a7 100755
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/android-web-agent/app/pages/mdm.page.enrollments.android.download-agent/download-agent.hbs
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/android-web-agent/app/pages/mdm.page.enrollments.android.download-agent/download-agent.hbs
@@ -38,9 +38,9 @@ under the License. --}}
     <div class="row">
         <div class="col-md-4 wr-text">
             If you have not already enrolled this device with {{companyName}},
-            Download and install following EMM Agent to continue.
+            Download and install following IoT Server Agent to continue.
             <div class="wr-buttons">
-                <a href="{{agentDownloadURL}}" class="btn-download-agent">Download EMM Agent</a>
+                <a href="{{agentDownloadURL}}" class="btn-download-agent">Download IoT Server Agent</a>
             </div>
         </div>
     </div>
diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.platform.configuration/configuration.hbs b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.platform.configuration/configuration.hbs
index 7e3708ed9d..5ace32cb31 100644
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.platform.configuration/configuration.hbs
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.platform.configuration/configuration.hbs
@@ -28,7 +28,7 @@
         <div class="wr-input-control">
             <label class="wr-input-label" for="android-config-notifier">
                 Type of Communication
-                <span class="helper" title="Communication method of android agent to contact EMM server">
+                <span class="helper" title="Communication method of android agent to contact IoT Server">
                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                 </span>
             </label>
@@ -42,7 +42,7 @@
             <div class="wr-input-control">
                 <label class="wr-input-label" for="android-config-notifier-frequency">
                     Polling Interval*
-                    <span class="helper" title="Time interval after which Android agent will contact EMM server each time to fetch data">
+                    <span class="helper" title="Time interval after which Android agent will contact IoT Server each time to fetch data">
                         <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                     </span>
                     <br>
diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.policy-edit/public/templates/android-policy-edit.hbs b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.policy-edit/public/templates/android-policy-edit.hbs
index d1854284c3..d99897ea72 100644
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.policy-edit/public/templates/android-policy-edit.hbs
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.policy-edit/public/templates/android-policy-edit.hbs
@@ -1137,7 +1137,7 @@
                     <div class="wr-input-control">
                         <label class="wr-input-label" for="work-profile-policy-max-passcode-age-in-days">
                             Profile Name
-                            <span class="helper" title="Name of the Work-Profile created by EMM Agent">
+                            <span class="helper" title="Name of the Work-Profile created by IoT Server Agent">
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                             <br>
diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.policy-view/public/templates/android-policy-view.hbs b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.policy-view/public/templates/android-policy-view.hbs
index 3cca932a87..984bc21af3 100644
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.policy-view/public/templates/android-policy-view.hbs
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.policy-view/public/templates/android-policy-view.hbs
@@ -1243,7 +1243,7 @@
                     <div class="wr-input-control">
                         <label class="wr-input-label" for="work-profile-policy-max-passcode-age-in-days">
                             Profile Name
-                            <span class="helper" title="Name of the Work-Profile created by EMM Agent">
+                            <span class="helper" title="Name of the Work-Profile created by IoT Server Agent">
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                             <br>
diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.policy-wizard/public/templates/android-policy-operations.hbs b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.policy-wizard/public/templates/android-policy-operations.hbs
index 61c3519544..00fdac102e 100644
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.policy-wizard/public/templates/android-policy-operations.hbs
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.policy-wizard/public/templates/android-policy-operations.hbs
@@ -1137,7 +1137,7 @@
                     <div class="wr-input-control">
                         <label class="wr-input-label" for="work-profile-policy-max-passcode-age-in-days">
                             Profile Name
-                            <span class="helper" title="Name of the Work-Profile created by EMM Agent">
+                            <span class="helper" title="Name of the Work-Profile created by IoT Server Agent">
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                             <br>
diff --git a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.platform.configuration/configuration.hbs b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.platform.configuration/configuration.hbs
index 3ca1c1dca5..fe54ae3671 100644
--- a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.platform.configuration/configuration.hbs
+++ b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.platform.configuration/configuration.hbs
@@ -29,7 +29,7 @@
             <div class="wr-input-control">
                 <label class="wr-input-label" for="windows-config-notifier-frequency">
                     Polling Interval*
-                                                <span class="helper" title="Time interval after which windows agent will contact EMM server each time to fetch data">
+                                                <span class="helper" title="Time interval after which windows agent will contact IoT Server each time to fetch data">
                                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                                 </span>
                     <br>