From 7af63522f2e92b42100915e8c3731068e0a389cf Mon Sep 17 00:00:00 2001
From: Rasika Perera <info.rasika@gmail.com>
Date: Fri, 6 Jan 2017 16:14:24 +0530
Subject: [PATCH 1/2] Fixed quick startup guide doc url

---
 .../app/units/cdmf.unit.device.types.listing/listing.hbs        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.types.listing/listing.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.types.listing/listing.hbs
index 5069d083d4..977bc73610 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.types.listing/listing.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.types.listing/listing.hbs
@@ -43,7 +43,7 @@
                 <i class="fw fw-mobile fw-3x"></i>
             </h3>
             <h3 class="text-muted">No device type is available to be displayed.</h3>
-            <a href="https://docs.wso2.com/display/IoTS100/Quick+Start+Guide" target="_blank"
+            <a href="https://docs.wso2.com/display/IoTS300/Quick+Start+Guide" target="_blank"
                class="btn-operations btn-default">
                 <span class="fw-stack">
                     <i class="fw fw-ring fw-stack-2x"></i>

From e501724c3c6c8a7d6547e6f7303e2ed52a92b28e 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 2/2] Replaced [EMM] with [IoT Server]

---
 .../app/pages/cdmf.page.certificate.create/create.hbs         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.certificate.create/create.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.certificate.create/create.hbs
index 46e213d374..230d57d161 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.certificate.create/create.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.certificate.create/create.hbs
@@ -73,9 +73,9 @@
                         click
                         <b>"View Certificate List"</b> to complete the process and go back to the certificate list.
                         <hr/>
-                        <button class="wr-btn" onclick="window.location.href='/emm/certificates'">View Certificate List
+                        <button class="wr-btn" onclick="window.location.href='{{@app.context}}/certificates'">View Certificate List
                         </button>
-                        <a href="/emm/certificates/add" class="cu-btn-inner">
+                        <a href="{{@app.context}}/certificates/add" class="cu-btn-inner">
                         <span class="fw-stack">
                             <i class="fw fw-ring fw-stack-2x"></i>
                             <i class="fw fw-add fw-stack-1x"></i>