Merge remote-tracking branch 'entgra/master' into entgra-master

components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.type-view/type-view.hbs

@@ -41,7 +41,7 @@
     <a href="#" class="download-link btn-operations"><i class="fw fw-mobile fw-inverse fw-lg add-margin-1x"></i> Enroll Device</a>
     <a href="{{hostName}}{{@unit.publicUri}}/asset/androidsense.apk" class="btn-operations"><i class="fw fw-download fw-inverse fw-lg add-margin-1x"></i> Download APK</a>
     <a href="javascript:toggleEmailInvite()" class="btn-operations"><i class="fw fw-mail fw-inverse fw-lg add-margin-1x"></i> Invite by Email</a>
-    <p class="doc-link">Click <a href="https://docs.wso2.com/display/IoTS320/Android+Sense"
+    <p class="doc-link">Click <a href="https://entgra.atlassian.net/wiki/spaces/IoTS340/pages/28278874/Android+Sense"
                                  target="_blank">[ here ]</a> for latest instructions and
         troubleshooting.</p>
 

components/device-types/arduino-plugin/org.wso2.carbon.device.mgt.iot.arduino.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.arduino.type-view/type-view.hbs

@@ -64,7 +64,7 @@
     <a href="#" class="download-link btn-operations">
         <i class="fw fw-download add-margin-1x"></i>Download Sketch
     </a>
-    <p class="doc-link">Click <a href="https://docs.wso2.com/display/IoTS320/Arduino"
+    <p class="doc-link">Click <a href="https://entgra.atlassian.net/wiki/spaces/IoTS340/pages/28278828/Arduino"
                                  target="_blank">here</a> for latest instructions and
         troubleshooting.</p>
     <div id="download-device-modal-content" class="hide">

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.type-view/type-view.hbs

@@ -63,9 +63,9 @@
     {{else}}
         <p class="doc-link text-center">Need help? Read <a
             {{#if isVirtual}}
-                href="https://docs.wso2.com/display/IoTS320/Android+Virtual+Device"
+                href="https://entgra.atlassian.net/wiki/spaces/IoTS340/pages/28278950/Android+Virtual+Device"
             {{else}}
-                href="https://docs.wso2.com/display/IoTS320/Android"
+                href="https://entgra.atlassian.net/wiki/spaces/IoTS340/pages/28278906/Android"
             {{/if}}
              target="_blank">Entgra IoT Server documentation.</a></p>
     {{/if}}