Merge "Add Device Manager to Studio" into tizen

diff --cc org.tizen.studio/html/index.htm
index 78b5543,f2b9e85..4db38bc
--- 1/org.tizen.studio/html/index.htm
--- 2/org.tizen.studio/html/index.htm
+++ b/org.tizen.studio/html/index.htm
@@@ -73,9 -72,10 +73,10 @@@
                                        <li><a href="native_tools/project_wizard_n.htm" target="content">Project Creation Wizard</a></li>
                                        <li><a href="native_tools/project_explorer_view_n.htm" target="content">Project Explorer View</a></li>
                                        <li><a href="common_tools/certificate_registration.htm" target="content">Certificate Registration</a></li>
+                                       <li><a href="common_tools/device_manager.htm" target="content">Device Manager</a></li>
                                </ul>
                        </li>
 -                      <li><a href="native_tools/cover_code_n.htm" target="content">Writing and Editing Codes</a>
 +                      <li><a href="native_tools/cover_code_n.htm" target="content">Writing and Editing Code</a>
                                <ul>
                                        <li><a href="native_tools/content_assist_n.htm" target="content">Content Assist</a></li>
                                        <li><a href="native_tools/api_checker_n.htm" target="content">API and Privilege Checker</a></li>
@@@ -158,9 -159,10 +159,10 @@@
                                        <li><a href="web_tools/project_wizard_w.htm" target="content">Project Creation Wizard</a></li>
                                        <li><a href="web_tools/project_explorer_view_w.htm" target="content">Project Explorer View</a></li>
                                        <li><a href="common_tools/certificate_registration.htm" target="content">Certificate Registration</a></li>
+                                       <li><a href="common_tools/device_manager.htm" target="content">Device Manager</a></li>
                                </ul>
                        </li>
 -                      <li><a href="web_tools/cover_code_w.htm" target="content">Writing and Editing Codes</a>
 +                      <li><a href="web_tools/cover_code_w.htm" target="content">Writing and Editing Code</a>
                                <ul>
                                        <li><a href="web_tools/web_editor_w.htm" target="content">Web Editor</a></li>
                                        <li><a href="web_tools/live_editing_w.htm" target="content">Live Editing</a></li>

diff --cc org.tizen.studio/html/native_tools/cover_native_n.htm
index 979c302,f5408b0..faa8c09
--- 1/org.tizen.studio/html/native_tools/cover_native_n.htm
--- 2/org.tizen.studio/html/native_tools/cover_native_n.htm
+++ b/org.tizen.studio/html/native_tools/cover_native_n.htm
@@@ -38,9 -38,9 +38,9 @@@
  
  <ul>
        <li><a href="cover_project_mgmt_n.htm">Managing Projects</a>
-       <p>You can create new application projects with the Project Wizard, and manage the existing applications in the <strong>Project Explorer</strong> view in the Tizen Studio. You can also register certificates for your applications to allow them to be published in the application stores.</p></li>
+       <p>You can create new application projects with the Project Wizard, and manage the existing applications in the <strong>Project Explorer</strong> view in the Tizen Studio. You can also manage connected devices, and register certificates for your applications to allow them to be published in the application stores.</p></li>
  
 -      <li><a href="cover_code_n.htm">Writing and Editing Codes</a>
 +      <li><a href="cover_code_n.htm">Writing and Editing Code</a>
        <p>You can use the content assist and API and privilege checker tools to speed up the code writing and verification task. In addition, you can design the application UI by arranging UI components with the visual UI Builder tool, or by defining the components and layout with the EDC script, using the EDC script editor or a graphical Component Designer.</p></li>
  
        <li><a href="cover_configure_n.htm">Configuring Your Application</a>
@@@ -79,4 -79,4 +79,4 @@@ var s = document.getElementsByTagName('
  </script>
  
  </body>
--</html>
++</html>

diff --cc org.tizen.studio/html/web_tools/cover_web_w.htm
index 871ef4d,6682d45..57abd9f
--- 1/org.tizen.studio/html/web_tools/cover_web_w.htm
--- 2/org.tizen.studio/html/web_tools/cover_web_w.htm
+++ b/org.tizen.studio/html/web_tools/cover_web_w.htm
@@@ -43,11 -38,11 +43,11 @@@
  
  <ul>
        <li><a href="cover_project_mgmt_w.htm">Managing Projects</a>
-       <p>You can create new application projects with the Project Wizard, and manage the existing applications in the <strong>Project Explorer</strong> view in the Tizen Studio. You can also register certificates for your applications to allow them to be published in the application stores.</p></li>
+       <p>You can create new application projects with the Project Wizard, and manage the existing applications in the <strong>Project Explorer</strong> view in the Tizen Studio. You can also manage connected devices, and register certificates for your applications to allow them to be published in the application stores.</p></li>
  
 -      <li><a href="cover_code_w.htm">Writing and Editing Codes</a>
 +      <li><a href="cover_code_w.htm">Writing and Editing Code</a>
        <p>You can edit HTML, JS, and CSS files in specific editors, and preview how the changing code affects the application screen. You can also use the live editing feature to modify the application while it is running.</p>
 -      <p>You can use the content assist, privilege checker, and code productivity tools to speed up the code writing and verification task. With the REST Viewer tool, you can emulate interaction with a Web service. In addition, you can modify various Tizen Studio preferences to ensure that the code editing environment suits your needs.</p></li>
 +      <p>You can use the content assist, privilege checker, and code cleaning tools to speed up the code writing and verification tasks. With the REST Viewer tool, you can emulate interaction with a Web service. In addition, you can modify various Tizen Studio preferences to ensure that the code editing environment suits your needs.</p></li>
  
        <li><a href="cover_configure_w.htm">Configuring Your Application</a>
        <p>You can manage various application functionalities and features through the application configuration file, which you can easily configure with a test or form editor. In addition, you can localize your application to use various languages and locale-specific resources by using the <strong>Web Localization</strong> view in the Tizen Studio.</p></li>
@@@ -88,4 -83,4 +88,4 @@@ var s = document.getElementsByTagName('
  </script>
  
  </body>
--</html>
++</html>

diff --cc org.tizen.studio/index.xml
index 97feb12,4cb8790..c3ab2a1
--- 1/org.tizen.studio/index.xml
--- 2/org.tizen.studio/index.xml
+++ b/org.tizen.studio/index.xml
@@@ -27,8 -26,9 +27,9 @@@
                        <topic href="html/native_tools/project_wizard_n.htm" label="Project Creation Wizard"></topic>
                        <topic href="html/native_tools/project_explorer_view_n.htm" label="Project Explorer View"></topic>
                        <topic href="html/common_tools/certificate_registration.htm" label="Certificate Registration"></topic>
+                       <topic href="html/common_tools/device_manager.htm" label="Device Manager"></topic>
                </topic>
 -              <topic href="html/native_tools/cover_code_n.htm" label="Writing and Editing Codes">
 +              <topic href="html/native_tools/cover_code_n.htm" label="Writing and Editing Code">
                        <topic href="html/native_tools/content_assist_n.htm" label="Content Assist"></topic>
                        <topic href="html/native_tools/api_checker_n.htm" label="API and Privilege Checker"></topic>
                        <topic href="html/native_tools/ui_builder_n.htm" label="UI Builder">
@@@ -88,8 -89,9 +89,9 @@@
                        <topic href="html/web_tools/project_wizard_w.htm" label="Project Creation Wizard"></topic>
                        <topic href="html/web_tools/project_explorer_view_w.htm" label="Project Explorer View"></topic>
                        <topic href="html/common_tools/certificate_registration.htm" label="Certificate Registration"></topic>
+                       <topic href="html/common_tools/device_manager.htm" label="Device Manager"></topic>
                </topic>
 -              <topic href="html/web_tools/cover_code_w.htm" label="Writing and Editing Codes">
 +              <topic href="html/web_tools/cover_code_w.htm" label="Writing and Editing Code">
                        <topic href="html/web_tools/web_editor_w.htm" label="Web Editor"></topic>
                        <topic href="html/web_tools/live_editing_w.htm" label="Live Editing"></topic>
                        <topic href="html/web_tools/content_assist_w.htm" label="Content Assist"></topic>