[WebDeviceAPI] Fix wrong links

Change-Id: I7fe14913962339cdbc047980b200db135edb71d2
Signed-off-by: taekeun.kang <taekeun.kang@samsung.com>

diff --git a/org.tizen.guides/html/index.htm b/org.tizen.guides/html/index.htm
index 2774d6e..811be71 100644 (file)
--- a/org.tizen.guides/html/index.htm
+++ b/org.tizen.guides/html/index.htm
@@ -34,6 +34,7 @@
                                                <li><a href="web/tizen/base/tizen_w.htm">Tizen</a>
                                        </ul>
                                </li>
+                               <li><a href="web/tizen/account/account_guide_w.htm">Account</a></li>
                                <li><a href="web/tizen/application/app_guide_w.htm">Application Framework</a>
                                        <ul>
                                                <li><a href="web/tizen/application/alarm_w.htm">Alarm</a></li>
@@ -44,32 +45,31 @@
                                                </li>
                                                <li><a href="web/tizen/application/appgroup_w.htm">Application Group</a></li>
                                                <li><a href="web/tizen/application/badge_w.htm">Badge</a></li>
+                                               <li><a href="web/tizen/application/data_w.htm">Data Control</a></li>
+                                               <li><a href="web/tizen/application/inputdevice_w.htm">Input Device</a></li>
                                                <li><a href="web/tizen/application/message_port_w.htm">Message Port</a></li>
                                                <li><a href="web/tizen/application/noti_w.htm">Notification</a></li>
                                                <li><a href="web/tizen/application/package_w.htm">Package</a></li>
-                                               <li><a href="web/tizen/application/data_w.htm">Data Control</a></li>
-                                               <li><a href="web/tizen/application/inputdevice_w.htm">Input Device</a></li>                                             
                                        </ul>
-                               </li>                           
+                               </li>
                                <li><a href="web/tizen/content/content_guide_w.htm">Content</a>
                                        <ul>
                                                <li><a href="web/tizen/content/content_w.htm">Content</a></li>
                                                <li><a href="web/tizen/content/download_w.htm">Download</a></li>
                                        </ul>
                                </li>
-                               <li><a href="web/tizen/messaging/messaging_guide_w.htm">Messaging</a>                           
+                               <li><a href="web/tizen/messaging/messaging_guide_w.htm">Messaging</a>
                                        <ul>
-                                               <li><a href="web/tizen/messaging/push_w.htm">Push</a></li>                                      
                                                <li><a href="web/tizen/messaging/messaging_w.htm">Messaging</a></li>
+                                               <li><a href="web/tizen/messaging/push_w.htm">Push</a></li>
                                        </ul>
                                </li>
                                <li><a href="web/tizen/multimedia/multimedia_guide_w.htm">Multimedia</a>
                                        <ul>
-                                               <li><a href="web/tizen/multimedia/exif_w.htm">Exif</a></li>                                             
-                                               <li><a href="web/tizen/multimedia/media_key_w.htm">Media Key</a></li>
-                                               <li><a href="web/tizen/multimedia/sound_w.htm">Sound</a></li>                                           
+                                               <li><a href="web/tizen/multimedia/exif_w.htm">Exif</a></li>
                                                <li><a href="web/tizen/multimedia/fm_radio_w.htm">FM Radio</a></li>
-                                               <li><a href="web/tizen/multimedia/media_controller_w.htm">Media Controller</a></li>                                     
+                                               <li><a href="web/tizen/multimedia/media_controller_w.htm">Media Controller</a></li>
+                                               <li><a href="web/tizen/multimedia/sound_w.htm">Sound</a></li>
                                        </ul>
                                </li>   
                                <li><a href="web/tizen/network/network_guide_w.htm">Network</a>
@@ -79,9 +79,19 @@
                                                <li><a href="web/tizen/network/secure_element_w.htm">Secure Element</a></li>
                                        </ul>
                                </li>
+                               <li><a href="web/tizen/social/social_guide_w.htm">Social</a>
+                                       <ul>
+                                               <li><a href="web/tizen/social/bookmark_w.htm">Bookmark</a></li>
+                                               <li><a href="web/tizen/social/calendar_w.htm">Calendar</a></li>
+                                               <li><a href="web/tizen/social/call_history_w.htm">Call History</a></li>
+                                               <li><a href="web/tizen/social/contact_w.htm">Contact</a></li>
+                                               <li><a href="web/tizen/social/data_sync_w.htm">Data Synchronization</a></li>
+                                       </ul>
+                               </li>                           
                                <li><a href="web/tizen/system/system_guide_w.htm">System</a>
                                        <ul>
                                                <li><a href="web/tizen/system/ham_w.htm">Human Activity Monitor</a></li>
+                                               <li><a href="web/tizen/system/media_key_w.htm">Media Key</a></li>
                                                <li><a href="web/tizen/system/power_w.htm">Power</a></li>
                                                <li><a href="web/tizen/system/sensor_w.htm">Sensor</a></li>
                                                <li><a href="web/tizen/system/system_info_w.htm">System Information</a></li>
@@ -90,20 +100,10 @@
                                                <li><a href="web/tizen/system/web_setting_w.htm">Web Setting</a></li>
                                        </ul>
                                </li>
-                               <li><a href="web/tizen/account/account_guide_w.htm">Account</a></li>
-                               <li><a href="web/tizen/social/social_guide_w.htm">Social</a>
-                                       <ul>
-                                               <li><a href="web/tizen/social/bookmark_w.htm">Bookmark</a></li>
-                                               <li><a href="web/tizen/social/calendar_w.htm">Calendar</a></li>
-                                               <li><a href="web/tizen/social/call_history_w.htm">Call History</a></li>
-                                               <li><a href="web/tizen/social/contact_w.htm">Contact</a></li>
-                                               <li><a href="web/tizen/social/data_sync_w.htm">Data Synchronization</a></li>
-                                       </ul>
-                               </li>                           
                                <li><a href="web/tizen/localization/localization_w.htm">Localization</a></li>
                                <li><a href="web/tizen/service/service_w.htm">Service Application</a></li>
                                <li><a href="web/tizen/ime/ime_w.htm">IME Application</a></li>                          
-            </ul>              
+            </ul>
                </li>
                <li><a href="web/w3c/guides_w3c_w.htm">W3C/HTML5/Supplementary Features</a>
                        <ul>

diff --git a/org.tizen.guides/html/web/tizen/multimedia/media_controller_w.htm b/org.tizen.guides/html/web/tizen/multimedia/media_controller_w.htm
index 9626314..e03fb94 100644 (file)
--- a/org.tizen.guides/html/web/tizen/multimedia/media_controller_w.htm
+++ b/org.tizen.guides/html/web/tizen/multimedia/media_controller_w.htm
@@ -16,7 +16,7 @@
 
  <div id="toc-navigation">
     <div id="profile">
-        <p><img alt="Mobile Web" src="../../../images/mobile_s_w.png"/></p>
+        <p><img alt="Mobile Web" src="../../../images/mobile_s_w.png"/> <img alt="Wearable Web" src="../../../images/wearable_s_w.png"/></p>
     </div>
 
     <div id="toc_border"><div id="toc">
@@ -24,6 +24,7 @@
         <ul class="toc">
             <li><a href="../../../../../org.tizen.tutorials/html/web/tizen/multimedia/media_controller_tutorial_w.htm">Media Controller Tutorial</a></li>
             <li><a href="../../../../../org.tizen.web.apireference/html/device_api/mobile/tizen/mediacontroller.html">Media Controller API for Mobile Web</a></li>
+            <li><a href="../../../../../org.tizen.web.apireference/html/device_api/wearable/tizen/mediacontroller.html">Media Controller API for Wearable Web</a></li>
         </ul>
     </div></div>
 </div>

diff --git a/org.tizen.guides/html/web/tizen/multimedia/multimedia_guide_w.htm b/org.tizen.guides/html/web/tizen/multimedia/multimedia_guide_w.htm
index b6dd38c..1f2e807 100644 (file)
--- a/org.tizen.guides/html/web/tizen/multimedia/multimedia_guide_w.htm
+++ b/org.tizen.guides/html/web/tizen/multimedia/multimedia_guide_w.htm
@@ -31,18 +31,17 @@
 \r
 <div id="container"><div id="contents"><div class="content">\r
   <h1>Multimedia</h1>\r
-  <p>Multimedia features include managing the EXIF information, media keys, device sound volume, FM radio, and media controller.</p>\r
+  <p>Multimedia features include managing the EXIF information, device sound volume, FM radio, and media controller.</p>\r
   <p>The main multimedia features are:</p>\r
   <ul>\r
-  <li><a href="exif_w.htm">Exif</a> <p>Enables you to access and modify EXIF information in a JPEG file.</p></li>    \r
-  <li><a href="media_key_w.htm">Media Key</a> <p>Enables you to handle media keys in your application.</p></li>\r
+  <li><a href="exif_w.htm">Exif</a> <p>Enables you to access and modify EXIF information in a JPEG file.</p></li>\r
+  <li><a href="media_controller_w.htm">Media Controller</a> <p>Enables you to communicate between the media controller server and client.</p></li>\r
   <li><a href="sound_w.htm">Sound</a> <p>Enables you to control the volume level of several sound types and get information about the current sound mode and the state of the current sound devices.</p></li>  \r
   </ul>\r
   \r
 <p>The following guides apply in <strong>mobile applications only</strong>:</p>\r
 <ul>\r
   <li><a href="fm_radio_w.htm">FM Radio</a> <p>Enables you to access and control the device FM radio.</p></li>  \r
-  <li><a href="media_controller_w.htm">Media Controller</a> <p>Enables you to communicate between the media controller server and client.</p></li>\r
 </ul>\r
 \r
  \r

diff --git a/org.tizen.guides/html/web/tizen/multimedia/media_key_w.htm b/org.tizen.guides/html/web/tizen/system/media_key_w.htm
similarity index 100%
rename from org.tizen.guides/html/web/tizen/multimedia/media_key_w.htm
rename to org.tizen.guides/html/web/tizen/system/media_key_w.htm

diff --git a/org.tizen.guides/html/web/tizen/system/system_guide_w.htm b/org.tizen.guides/html/web/tizen/system/system_guide_w.htm
index d00e9ca..3cd82a3 100644 (file)
--- a/org.tizen.guides/html/web/tizen/system/system_guide_w.htm
+++ b/org.tizen.guides/html/web/tizen/system/system_guide_w.htm
@@ -36,7 +36,8 @@
   <p>The main system features are:</p>
   <ul>
        <li><a href="ham_w.htm">Human Activity Monitor</a> <p>Enables you to access the human activity data from various sensors on the device.</p></li>
-    <li><a href="power_w.htm">Power</a> <p>Enables you to access the state of the device power resource.</p></li>
+  <li><a href="media_key_w.htm">Media Key</a> <p>Enables you to handle media keys in your application.</p></li>
+  <li><a href="power_w.htm">Power</a> <p>Enables you to access the state of the device power resource.</p></li>
        <li><a href="sensor_w.htm">Sensor</a> <p>Enables you to manage sensor data from various sensors on the device.</p></li>
        <li><a href="system_info_w.htm">System Information</a> <p>Enables you to access and monitor various device details, such as battery level, available device storage, version number, model name, and the cellular network being used.</p></li>  
        <li><a href="system_setting_w.htm">System Setting</a> <p>Enables you to access the device wallpaper settings, such as the home screen and lock screen wallpaper image, incoming call ringtone, and email notification tone.</p></li>

diff --git a/org.tizen.guides/index.xml b/org.tizen.guides/index.xml
index 2e733b1..42fbc42 100644 (file)
--- a/org.tizen.guides/index.xml
+++ b/org.tizen.guides/index.xml
@@ -11,6 +11,7 @@
                        <topic href="html/web/tizen/base/filesystem_w.htm" label="Filesystem"></topic>
                        <topic href="html/web/tizen/base/tizen_w.htm" label="Tizen"></topic>
                </topic>
+               <topic href="html/web/tizen/account/account_guide_w.htm" label="Account"></topic>
                <topic href="html/web/tizen/application/app_guide_w.htm" label="Application Framework">                         
                        <topic href="html/web/tizen/application/alarm_w.htm" label="Alarm"></topic>
                        <topic href="html/web/tizen/application/application_w.htm" label="Application">
@@ -18,34 +19,41 @@
                        </topic>
                        <topic href="html/web/tizen/application/appgroup_w.htm" label="Application Group"></topic>
                        <topic href="html/web/tizen/application/badge_w.htm" label="Badge"></topic>
+                       <topic href="html/web/tizen/application/data_w.htm" label="Data Control"></topic>
+                       <topic href="html/web/tizen/application/inputdevice_w.htm" label="Input Device"></topic>
                        <topic href="html/web/tizen/application/message_port_w.htm" label="Message Port"></topic>
                        <topic href="html/web/tizen/application/noti_w.htm" label="Notification"></topic>
                        <topic href="html/web/tizen/application/package_w.htm" label="Package"></topic>
-                       <topic href="html/web/tizen/application/data_w.htm" label="Data Control"></topic>
-                       <topic href="html/web/tizen/application/inputdevice_w.htm" label="Input Device"></topic>                        
-               </topic>                
+               </topic>
                <topic href="html/web/tizen/content/content_guide_w.htm" label="Content">
                        <topic href="html/web/tizen/content/content_w.htm" label="Content"></topic>
                        <topic href="html/web/tizen/content/download_w.htm" label="Download"></topic>
                </topic>
                <topic href="html/web/tizen/messaging/messaging_guide_w.htm" label="Messaging">
-                       <topic href="html/web/tizen/messaging/push_w.htm" label="Push"></topic>         
-                       <topic href="html/web/tizen/messaging/messaging_w.htm" label="Messaging"></topic>                       
+                       <topic href="html/web/tizen/messaging/messaging_w.htm" label="Messaging"></topic>
+                       <topic href="html/web/tizen/messaging/push_w.htm" label="Push"></topic>
                </topic>
                <topic href="html/web/tizen/multimedia/multimedia_guide_w.htm" label="Multimedia">
-                       <topic href="html/web/tizen/multimedia/exif_w.htm" label="Exif"></topic>                
-                       <topic href="html/web/tizen/multimedia/media_key_w.htm" label="Media Key"></topic>
-                       <topic href="html/web/tizen/multimedia/sound_w.htm" label="Sound"></topic>
+                       <topic href="html/web/tizen/multimedia/exif_w.htm" label="Exif"></topic>
                        <topic href="html/web/tizen/multimedia/fm_radio_w.htm" label="FM Radio"></topic>
                        <topic href="html/web/tizen/multimedia/media_controller_w.htm" label="Media Controller"></topic>
+                       <topic href="html/web/tizen/multimedia/sound_w.htm" label="Sound"></topic>
                </topic>
                <topic href="html/web/tizen/network/network_guide_w.htm" label="Network">
                        <topic href="html/web/tizen/network/bluetooth_w.htm" label="Bluetooth"></topic>
                        <topic href="html/web/tizen/network/nfc_w.htm" label="NFC"></topic>
                        <topic href="html/web/tizen/network/secure_element_w.htm" label="Secure Element"></topic>
-               </topic>                                                
+               </topic>
+               <topic href="html/web/tizen/social/social_guide_w.htm" label="Social">
+                       <topic href="html/web/tizen/social/bookmark_w.htm" label="Bookmark"></topic>
+                       <topic href="html/web/tizen/social/calendar_w.htm" label="Calendar"></topic>
+                       <topic href="html/web/tizen/social/call_history_w.htm" label="Call History"></topic>
+                       <topic href="html/web/tizen/social/contact_w.htm" label="Contact"></topic>
+                       <topic href="html/web/tizen/social/data_sync_w.htm" label="Data Synchronization"></topic>
+               </topic>
                <topic href="html/web/tizen/system/system_guide_w.htm" label="System">                                  
                        <topic href="html/web/tizen/system/ham_w.htm" label="Human Activity Monitor"></topic>
+                       <topic href="html/web/tizen/system/media_key_w.htm" label="Media Key"></topic>
                        <topic href="html/web/tizen/system/power_w.htm" label="Power"></topic>
                        <topic href="html/web/tizen/system/sensor_w.htm" label="Sensor"></topic>
                        <topic href="html/web/tizen/system/system_info_w.htm" label="System Information"></topic>
@@ -53,14 +61,6 @@
                        <topic href="html/web/tizen/system/time_w.htm" label="Time"></topic>                                                            
                        <topic href="html/web/tizen/system/web_setting_w.htm" label="Web Setting"></topic>                              
                </topic>
-               <topic href="html/web/tizen/account/account_guide_w.htm" label="Account"></topic>
-               <topic href="html/web/tizen/social/social_guide_w.htm" label="Social">                                  
-                       <topic href="html/web/tizen/social/bookmark_w.htm" label="Bookmark"></topic>
-                       <topic href="html/web/tizen/social/calendar_w.htm" label="Calendar"></topic>
-                       <topic href="html/web/tizen/social/call_history_w.htm" label="Call History"></topic>
-                       <topic href="html/web/tizen/social/contact_w.htm" label="Contact"></topic>
-                       <topic href="html/web/tizen/social/data_sync_w.htm" label="Data Synchronization"></topic>
-               </topic>                
                <topic href="html/web/tizen/localization/localization_w.htm" label="Localization"></topic>
                <topic href="html/web/tizen/service/service_w.htm" label= "Service Application"></topic>
                <topic href="html/web/tizen/ime/ime_w.htm" label= "IME Application"></topic>            

diff --git a/org.tizen.tutorials/html/index.htm b/org.tizen.tutorials/html/index.htm
index f0aebbe..a9dce99 100644 (file)
--- a/org.tizen.tutorials/html/index.htm
+++ b/org.tizen.tutorials/html/index.htm
@@ -37,19 +37,20 @@
                                <li><a href="web/tizen/base/tizen_tutorial_w.htm">Tizen</a></li>
                        </ul>
                </li>
+               <li><a href="web/tizen/account/account_tutorial_w.htm">Account</a></li>
                <li><a href="web/tizen/application/app_tutorials_w.htm">Application Framework</a>
                        <ul>
                                <li><a href="web/tizen/application/alarm_tutorial_w.htm">Alarm</a></li>
                                <li><a href="web/tizen/application/application_tutorial_w.htm">Application</a></li>
                                <li><a href="web/tizen/application/appgroup_tutorial_w.htm">Application Group</a></li>
                                <li><a href="web/tizen/application/badge_tutorial_w.htm">Badge</a></li>
+                               <li><a href="web/tizen/application/data_tutorial_w.htm">Data Control</a></li>
+                               <li><a href="web/tizen/application/inputdevice_tutorial_w.htm">Input Device</a></li>
                                <li><a href="web/tizen/application/message_port_tutorial_w.htm">Message Port</a></li>
                                <li><a href="web/tizen/application/noti_tutorial_w.htm">Notification</a></li>
                                <li><a href="web/tizen/application/package_tutorial_w.htm">Package</a></li>
-                               <li><a href="web/tizen/application/data_tutorial_w.htm">Data Control</a></li>
-                <li><a href="web/tizen/application/inputdevice_tutorial_w.htm">Input Device</a></li>                           
                        </ul>
-               </li>           
+               </li>
                <li><a href="web/tizen/content/content_tutorials_w.htm">Content</a>
                        <ul>
                                <li><a href="web/tizen/content/content_tutorial_w.htm">Content</a>
@@ -66,21 +67,20 @@
                </li>
                <li><a href="web/tizen/messaging/messaging_tutorials_w.htm">Messaging</a>
                        <ul>
-                               <li><a href="web/tizen/messaging/push_tutorial_w.htm">Push</a></li>                     
-                               <li><a href="web/tizen/messaging/messaging_tutorial_w.htm">Messaging</a>        
+                               <li><a href="web/tizen/messaging/messaging_tutorial_w.htm">Messaging</a>
                                        <ul>
                                                <li><a href="web/tizen/messaging/task_chatter_w.htm">Task: Chatter</a></li>
-                                       </ul>   
-                               </li>   
+                                       </ul>
+                               </li>
+                               <li><a href="web/tizen/messaging/push_tutorial_w.htm">Push</a></li>
                        </ul>
                </li>           
                <li><a href="web/tizen/multimedia/multimedia_tutorials_w.htm">Multimedia</a>
                        <ul>
-                               <li><a href="web/tizen/multimedia/exif_tutorial_w.htm">Exif</a></li>                            
-                               <li><a href="web/tizen/multimedia/media_key_tutorial_w.htm">Media Key</a></li>
-                               <li><a href="web/tizen/multimedia/sound_tutorial_w.htm">Sound</a></li>                  
+                               <li><a href="web/tizen/multimedia/exif_tutorial_w.htm">Exif</a></li>
                                <li><a href="web/tizen/multimedia/fm_radio_tutorial_w.htm">FM Radio</a></li>
-                               <li><a href="web/tizen/multimedia/media_controller_tutorial_w.htm">Media Controller</a></li>                            
+                               <li><a href="web/tizen/multimedia/media_controller_tutorial_w.htm">Media Controller</a></li>
+                               <li><a href="web/tizen/multimedia/sound_tutorial_w.htm">Sound</a></li>
                        </ul>
                </li>
                <li><a href="web/tizen/network/network_tutorials_w.htm">Network</a>
@@ -89,7 +89,7 @@
                                        <ul>
                                                <li><a href="web/tizen/network/task_bluetoothchat_w.htm">Task: Bluetooth Chat</a></li>
                                        </ul>
-                               </li>                           
+                               </li>
                                <li><a href="web/tizen/network/nfc_tutorial_w.htm">NFC</a>
                                        <ul>
                                                <li><a href="web/tizen/network/task_contactsexchanger_w.htm">Task: Contacts Exchanger</a></li>
@@ -98,9 +98,27 @@
                                <li><a href="web/tizen/network/secure_element_tutorial_w.htm">Secure Element</a></li>
                        </ul>
                </li>
+               <li><a href="web/tizen/social/social_tutorials_w.htm">Social</a>
+                       <ul>
+                               <li><a href="web/tizen/social/bookmark_tutorial_w.htm">Bookmark</a></li>
+                               <li><a href="web/tizen/social/calendar_tutorial_w.htm">Calendar</a>
+                                       <ul>
+                                               <li><a href="web/tizen/social/task_eventmanager_w.htm">Task: Event Manager</a></li>
+                                       </ul>
+                               </li>                           
+                               <li><a href="web/tizen/social/call_history_tutorial_w.htm">Call History</a>
+                                       <ul>
+                                               <li><a href="web/tizen/social/task_calllog_w.htm">Task: Call Log</a></li>
+                                       </ul>
+                               </li>
+                               <li><a href="web/tizen/social/contact_tutorial_w.htm">Contact</a></li>
+                               <li><a href="web/tizen/social/data_sync_tutorial_w.htm">Data Synchronization</a></li>
+                       </ul>
+               </li>
                <li><a href="web/tizen/system/system_tutorials_w.htm">System</a>
                        <ul>
                                <li><a href="web/tizen/system/ham_tutorial_w.htm">Human Activity Monitor</a></li>
+                               <li><a href="web/tizen/system/media_key_tutorial_w.htm">Media Key</a></li>
                                <li><a href="web/tizen/system/power_tutorial_w.htm">Power</a></li>
                                <li><a href="web/tizen/system/sensor_tutorial_w.htm">Sensor</a>
                                        <ul>
@@ -117,24 +135,6 @@
                                <li><a href="web/tizen/system/web_setting_tutorial_w.htm">Web Setting</a></li>
                        </ul>
                </li>
-               <li><a href="web/tizen/account/account_tutorial_w.htm">Account</a></li>
-               <li><a href="web/tizen/social/social_tutorials_w.htm">Social</a>
-                       <ul>
-                               <li><a href="web/tizen/social/bookmark_tutorial_w.htm">Bookmark</a></li>
-                               <li><a href="web/tizen/social/calendar_tutorial_w.htm">Calendar</a>
-                                       <ul>
-                                               <li><a href="web/tizen/social/task_eventmanager_w.htm">Task: Event Manager</a></li>
-                                       </ul>
-                               </li>                           
-                               <li><a href="web/tizen/social/call_history_tutorial_w.htm">Call History</a>
-                                       <ul>
-                                               <li><a href="web/tizen/social/task_calllog_w.htm">Task: Call Log</a></li>
-                                       </ul>
-                               </li>
-                               <li><a href="web/tizen/social/contact_tutorial_w.htm">Contact</a></li>
-                               <li><a href="web/tizen/social/data_sync_tutorial_w.htm">Data Synchronization</a></li>
-                       </ul>
-               </li>           
                <li><a href="web/tizen/service/service_tutorial_w.htm">Service Application</a></li>             
        </ul>
        </li>

diff --git a/org.tizen.tutorials/html/web/tizen/multimedia/media_controller_tutorial_w.htm b/org.tizen.tutorials/html/web/tizen/multimedia/media_controller_tutorial_w.htm
index fc96b62..d9122ca 100644 (file)
--- a/org.tizen.tutorials/html/web/tizen/multimedia/media_controller_tutorial_w.htm
+++ b/org.tizen.tutorials/html/web/tizen/multimedia/media_controller_tutorial_w.htm
@@ -18,7 +18,7 @@
 
 <div id="toc-navigation">
     <div id="profile">
-        <p><img alt="Mobile Web" src="../../../images/mobile_s_w.png"/></p>
+        <p><img alt="Mobile Web" src="../../../images/mobile_s_w.png"/> <img alt="Wearable Web" src="../../../images/wearable_s_w.png"/></p>
     </div>
     <div id="toc_border"><div id="toc">
         <p class="toc-title">Content</p>
@@ -32,6 +32,7 @@
         <ul class="toc">
             <li><a href="../../../../../org.tizen.guides/html/web/tizen/multimedia/media_controller_w.htm">Media Controller Guide</a></li>
             <li><a href="../../../../../org.tizen.web.apireference/html/device_api/mobile/tizen/mediacontroller.html">Media Controller API for Mobile Web</a></li>
+            <li><a href="../../../../../org.tizen.web.apireference/html/device_api/wearable/tizen/mediacontroller.html">Media Controller API for Wearable Web</a></li>
         </ul>
     </div></div>
 </div>

diff --git a/org.tizen.tutorials/html/web/tizen/multimedia/multimedia_tutorials_w.htm b/org.tizen.tutorials/html/web/tizen/multimedia/multimedia_tutorials_w.htm
index 128b0f7..0992d0f 100644 (file)
--- a/org.tizen.tutorials/html/web/tizen/multimedia/multimedia_tutorials_w.htm
+++ b/org.tizen.tutorials/html/web/tizen/multimedia/multimedia_tutorials_w.htm
@@ -35,15 +35,14 @@
 
     <p>The multimedia tutorials demonstrate how to use the following features in creating Tizen Web applications:</p>
   <ul>
-   <li><a href="exif_tutorial_w.htm">Exif: Manipulating EXIF Data from JPEG Files</a> <p>Demonstrates how you can use EXIF (exchangeable image format) information stored in JPEG files.</p></li>         
-   <li><a href="media_key_tutorial_w.htm">Media Key: Controlling Multimedia Playback</a> <p>Demonstrates how you can control multimedia playback.</p></li>  
+   <li><a href="exif_tutorial_w.htm">Exif: Manipulating EXIF Data from JPEG Files</a> <p>Demonstrates how you can use EXIF (exchangeable image format) information stored in JPEG files.</p></li>
+   <li><a href="media_controller_tutorial_w.htm">Media Controller: Communicating Between the Media Controller Server and Client</a> <p>Demonstrates how you can communicate between the media controller server and client.</p></li>
    <li><a href="sound_tutorial_w.htm">Sound: Controlling the Sound Volume Level and the Sound Devices</a> <p>Demonstrates how you can manage the device volume levels and the sound devices.</p></li>
   </ul>
 
-  <p>The following tutorials apply in <strong>mobile applications only</strong>:</p>   
+  <p>The following tutorials apply in <strong>mobile applications only</strong>:</p>
 <ul>
    <li><a href="fm_radio_tutorial_w.htm">FM Radio: Listening to the FM Radio</a> <p>Demonstrates how you can manage the FM radio on the device.</p></li>
-   <li><a href="media_controller_tutorial_w.htm">Media Controller: Communicating Between the Media Controller Server and Client</a> <p>Demonstrates how you can communicate between the media controller server and client.</p></li>
    
 </ul>  
   

diff --git a/org.tizen.tutorials/html/web/tizen/multimedia/media_key_tutorial_w.htm b/org.tizen.tutorials/html/web/tizen/system/media_key_tutorial_w.htm
similarity index 100%
rename from org.tizen.tutorials/html/web/tizen/multimedia/media_key_tutorial_w.htm
rename to org.tizen.tutorials/html/web/tizen/system/media_key_tutorial_w.htm

diff --git a/org.tizen.tutorials/html/web/tizen/system/system_tutorials_w.htm b/org.tizen.tutorials/html/web/tizen/system/system_tutorials_w.htm
index 54f5d14..6815944 100644 (file)
--- a/org.tizen.tutorials/html/web/tizen/system/system_tutorials_w.htm
+++ b/org.tizen.tutorials/html/web/tizen/system/system_tutorials_w.htm
@@ -35,7 +35,8 @@
 
   <p>The system tutorials demonstrate how to use the following features in creating Tizen Web applications:</p>
   <ul>  
-   <li><a href="ham_tutorial_w.htm">Human Activity Monitor: Retrieving User Activity Data from the Various Device Sensors</a> <p>Demonstrates how you can monitor user activity.</p></li> 
+   <li><a href="ham_tutorial_w.htm">Human Activity Monitor: Retrieving User Activity Data from the Various Device Sensors</a> <p>Demonstrates how you can monitor user activity.</p></li>
+   <li><a href="media_key_tutorial_w.htm">Media Key: Controlling Multimedia Playback</a> <p>Demonstrates how you can control multimedia playback.</p></li>
    <li><a href="power_tutorial_w.htm">Power: Controlling Power Resources</a> <p>Demonstrates how you can manage the minimum power state of a power resource.</p></li>
    <li><a href="sensor_tutorial_w.htm">Sensor: Getting Sensor Data from the Various Device Sensors</a> <p>Demonstrates how you can use the data from the device sensors.</p></li>
    <li><a href="system_info_tutorial_w.htm">System Information: Providing Information about the Device Display, Network, Storage, and Other Capabilities</a> <p>Demonstrates how you can retrieve and monitor device information and state.</p></li>

diff --git a/org.tizen.tutorials/index.xml b/org.tizen.tutorials/index.xml
index a5fc38c..0e34829 100644 (file)
--- a/org.tizen.tutorials/index.xml
+++ b/org.tizen.tutorials/index.xml
@@ -12,6 +12,7 @@
                        </topic>
                        <topic href="html/web/tizen/base/tizen_tutorial_w.htm" label="Tizen"></topic>                   
                </topic>
+               <topic href="html/web/tizen/account/account_tutorial_w.htm" label="Account"></topic>
                <topic href="html/web/tizen/application/app_tutorials_w.htm" label="Application Framework">                     
                        <topic href="html/web/tizen/application/alarm_tutorial_w.htm" label="Alarm"></topic>
                        <topic href="html/web/tizen/application/application_tutorial_w.htm" label="Application"></topic>
@@ -32,17 +33,16 @@
                        </topic>                
                </topic>
                <topic href="html/web/tizen/messaging/messaging_tutorials_w.htm" label="Messaging">
-                       <topic href="html/web/tizen/messaging/push_tutorial_w.htm" label="Push"></topic>                
                        <topic href="html/web/tizen/messaging/messaging_tutorial_w.htm" label="Messaging">                              
                                <topic href="html/web/tizen/messaging/task_chatter_w.htm" label="Task: Chatter"></topic>
                        </topic>
+                       <topic href="html/web/tizen/messaging/push_tutorial_w.htm" label="Push"></topic>
                </topic>
                <topic href="html/web/tizen/multimedia/multimedia_tutorials_w.htm" label="Multimedia">
                        <topic href="html/web/tizen/multimedia/exif_tutorial_w.htm" label="Exif"></topic>                       
-                       <topic href="html/web/tizen/multimedia/media_key_tutorial_w.htm" label="Media Key"></topic>
-                       <topic href="html/web/tizen/multimedia/sound_tutorial_w.htm" label="Sound"></topic>             
                        <topic href="html/web/tizen/multimedia/fm_radio_tutorial_w.htm" label="FM Radio"></topic>
                        <topic href="html/web/tizen/multimedia/media_controller_tutorial_w.htm" label="Media Controller"></topic>
+                       <topic href="html/web/tizen/multimedia/sound_tutorial_w.htm" label="Sound"></topic>
                </topic>
                <topic href="html/web/tizen/network/network_tutorials_w.htm" label="Network">
                        <topic href="html/web/tizen/network/bluetooth_tutorial_w.htm" label="Bluetooth">
@@ -53,20 +53,6 @@
                        </topic>
                        <topic href="html/web/tizen/network/secure_element_tutorial_w.htm" label="Secure Element"></topic>
                </topic>
-               <topic href="html/web/tizen/system/system_tutorials_w.htm" label="System">                      
-                       <topic href="html/web/tizen/system/ham_tutorial_w.htm" label="Human Activity Monitor"></topic>
-                       <topic href="html/web/tizen/system/power_tutorial_w.htm" label="Power"></topic>
-                       <topic href="html/web/tizen/system/sensor_tutorial_w.htm" label="Sensor">
-                               <topic href="html/web/tizen/system/task_sensorball_w.htm" label="Task: Sensor Ball"></topic>    
-                       </topic>        
-                       <topic href="html/web/tizen/system/system_info_tutorial_w.htm" label="System Information">                                      
-                               <topic href="html/web/tizen/system/task_systeminfo_w.htm" label="Task: System Information"></topic>                     
-                       </topic>
-                       <topic href="html/web/tizen/system/system_setting_tutorial_w.htm" label="System Setting"></topic>
-                       <topic href="html/web/tizen/system/time_tutorial_w.htm" label="Time"></topic>                   
-                       <topic href="html/web/tizen/system/web_setting_tutorial_w.htm" label="Web Setting"></topic>
-               </topic>
-               <topic href="html/web/tizen/account/account_tutorial_w.htm" label="Account"></topic>            
                <topic href="html/web/tizen/social/social_tutorials_w.htm" label="Social">                      
                        <topic href="html/web/tizen/social/bookmark_tutorial_w.htm" label="Bookmark"></topic>
                        <topic href="html/web/tizen/social/calendar_tutorial_w.htm" label="Calendar">                                   
@@ -78,6 +64,20 @@
                        <topic href="html/web/tizen/social/contact_tutorial_w.htm" label="Contact"></topic>
                        <topic href="html/web/tizen/social/data_sync_tutorial_w.htm" label="Data Synchronization"></topic>                      
                </topic>                
+               <topic href="html/web/tizen/system/system_tutorials_w.htm" label="System">
+                       <topic href="html/web/tizen/system/ham_tutorial_w.htm" label="Human Activity Monitor"></topic>
+                       <topic href="html/web/tizen/multimedia/media_key_tutorial_w.htm" label="Media Key"></topic>
+                       <topic href="html/web/tizen/system/power_tutorial_w.htm" label="Power"></topic>
+                       <topic href="html/web/tizen/system/sensor_tutorial_w.htm" label="Sensor">
+                               <topic href="html/web/tizen/system/task_sensorball_w.htm" label="Task: Sensor Ball"></topic>
+                       </topic>
+                       <topic href="html/web/tizen/system/system_info_tutorial_w.htm" label="System Information">
+                               <topic href="html/web/tizen/system/task_systeminfo_w.htm" label="Task: System Information"></topic>
+                       </topic>
+                       <topic href="html/web/tizen/system/system_setting_tutorial_w.htm" label="System Setting"></topic>
+                       <topic href="html/web/tizen/system/time_tutorial_w.htm" label="Time"></topic>
+                       <topic href="html/web/tizen/system/web_setting_tutorial_w.htm" label="Web Setting"></topic>
+               </topic>
                <topic href="html/web/tizen/service/service_tutorial_w.htm" label="Service Application"></topic>                
        </topic>
        <topic href="html/web/w3c/tutorials_w3c_w.htm" label="W3C/HTML5/Supplementary Features">        

diff --git a/org.tizen.web.apireference/html/device_api/mobile/index.html b/org.tizen.web.apireference/html/device_api/mobile/index.html
index 325bc04..1e6092b 100644 (file)
--- a/org.tizen.web.apireference/html/device_api/mobile/index.html
+++ b/org.tizen.web.apireference/html/device_api/mobile/index.html
@@ -160,7 +160,7 @@
                 <td>This API provides interfaces and methods for manipulating Exif data from JPEG file.</td>
                 <td>2.3</td>
                 <td>Mandatory</td>
-                <td>Yes</td>                  
+                <td>Yes</td>
 
                 <tr><td><a href="tizen/fmradio.html" data-origin="tizen" data-domain="system" data-category="core" data-status="D" data-version="">
                         FM Radio</a></td>
@@ -177,13 +177,6 @@
                 <td>Mandatory</td>
                 <td>Yes</td>
 
-                </tr><tr><td><a href="tizen/mediakey.html" data-origin="tizen" data-domain="media" data-category="core" data-status="S" data-version="">
-                        Media Key</a></td>
-                <td>This API provides a way to get notified when a media key has been pressed or released.</td>
-                <td>2.3</td>
-                <td>Optional</td>
-                <td>No</td>
-
                 </tr><tr><td><a href="tizen/sound.html" data-origin="tizen" data-domain="media" data-category="core" data-status="S" data-version="">
                         Sound</a></td>
                 <td>This API provides a way to control the volume level for several sound types and to check whether a specified sound device type is connected. </td>
@@ -271,6 +264,13 @@
                 <td>Optional</td>
                 <td>Yes<div class="partial-support">Only HRM</div></td>
 
+                </tr><tr><td><a href="tizen/mediakey.html" data-origin="tizen" data-domain="media" data-category="core" data-status="S" data-version="">
+                        Media Key</a></td>
+                <td>This API provides a way to get notified when a media key has been pressed or released.</td>
+                <td>2.3</td>
+                <td>Optional</td>
+                <td>No</td>
+
                 </tr><tr><td><a href="tizen/power.html" data-origin="tizen" data-domain="system" data-category="core" data-status="D" data-version="">
                         Power</a></td>
                 <td>This API provides interfaces and methods for controlling power resources.</td>

diff --git a/org.tizen.web.apireference/html/device_api/wearable/index.html b/org.tizen.web.apireference/html/device_api/wearable/index.html
index 516c280..26281d2 100644 (file)
--- a/org.tizen.web.apireference/html/device_api/wearable/index.html
+++ b/org.tizen.web.apireference/html/device_api/wearable/index.html
@@ -133,9 +133,9 @@
                         Exif</a></td>
                 <td>This API provides interfaces and methods for manipulating Exif data from JPEG file.</td>
                 <td>2.3.1</td>
-
                 <td>Mandatory</td>
                 <td>Yes</td>
+
                 </tr><tr><td><a href="tizen/mediacontroller.html" data-origin="tizen" data-domain="media" data-category="core" data-status="S" data-version="">
                         Media Controller</a></td>
                 <td>This API provides functions for communication between the media controller server and the media controller client. </td>
@@ -144,15 +144,7 @@
                 <td>Yes</td>
 
                 </tr>
-                <tr><td><a href="tizen/mediakey.html" data-origin="tizen" data-domain="media" data-category="core" data-status="S" data-version="">
-                        Media Key</a></td>
-                <td>This API provides a way to get notified when a media key has been pressed or released.</td>
-                <td>2.3</td>
-
-                <td>Optional</td>
-                <td>No</td>
-                </tr>
-                               <tr><td><a href="tizen/sound.html" data-origin="tizen" data-domain="media" data-category="core" data-status="S" data-version="">
+                <tr><td><a href="tizen/sound.html" data-origin="tizen" data-domain="media" data-category="core" data-status="S" data-version="">
                         Sound</a></td>
                 <td>This API provides a way to control the volume level for several sound types and to check whether a specified sound device type is connected. </td>
                 <td>2.3</td>
@@ -192,7 +184,15 @@
 
                 <td>Optional</td>
                 <td>Yes<div class="partial-support">Only HRM</div></td>
-                               <tr><td><a href="tizen/power.html" data-origin="tizen" data-domain="system" data-category="core" data-status="D" data-version="">
+                <tr><td><a href="tizen/mediakey.html" data-origin="tizen" data-domain="media" data-category="core" data-status="S" data-version="">
+                        Media Key</a></td>
+                <td>This API provides a way to get notified when a media key has been pressed or released.</td>
+                <td>2.3</td>
+
+                <td>Optional</td>
+                <td>No</td>
+                </tr>
+                <tr><td><a href="tizen/power.html" data-origin="tizen" data-domain="system" data-category="core" data-status="D" data-version="">
                         Power</a></td>
                 <td>This API provides interfaces and methods for controlling power resources.</td>
                 <td>2.0</td>

diff --git a/org.tizen.web.apireference/html/index.htm b/org.tizen.web.apireference/html/index.htm
index 5a337da..16ae5c5 100644 (file)
--- a/org.tizen.web.apireference/html/index.htm
+++ b/org.tizen.web.apireference/html/index.htm
@@ -45,7 +45,7 @@
                                                                <li><a href="device_api/mobile/tizen/application.html">Application</a></li>
                                                                <li><a href="device_api/mobile/tizen/badge.html">Badge</a></li>
                                                                <li><a href="device_api/mobile/tizen/datacontrol.html">Data Control</a></li>
-                                <li><a href="device_api/mobile/tizen/inputdevice.html">Input Device</a></li>                             
+                                                               <li><a href="device_api/mobile/tizen/inputdevice.html">Input Device</a></li>
                                                                <li><a href="device_api/mobile/tizen/messageport.html">Message Port</a></li>
                                                                <li><a href="device_api/mobile/tizen/notification.html">Notification</a></li>
                                                                <li><a href="device_api/mobile/tizen/package.html">Package</a></li>
@@ -76,7 +76,6 @@
                                                                <li><a href="device_api/mobile/tizen/exif.html">Exif</a></li>
                                                                <li><a href="device_api/mobile/tizen/fmradio.html">FM Radio</a></li>
                                                                <li><a href="device_api/mobile/tizen/mediacontroller.html">Media Controller</a></li>
-                                                               <li><a href="device_api/mobile/tizen/mediakey.html">Media Key</a></li>
                                                                <li><a href="device_api/mobile/tizen/sound.html">Sound</a></li>
                                                        </ul>
                                                </li>
@@ -92,6 +91,7 @@
                                                <li><a href="device_api/mobile/index.html#System">System</a>
                                                        <ul>
                                                                <li><a href="device_api/mobile/tizen/humanactivitymonitor.html">Human Activity Monitor</a></li>
+                                                               <li><a href="device_api/mobile/tizen/mediakey.html">Media Key</a></li>
                                                                <li><a href="device_api/mobile/tizen/power.html">Power</a></li>
                                                                <li><a href="device_api/mobile/tizen/sensor.html">Sensor</a></li>
                                                                <li><a href="device_api/mobile/tizen/systeminfo.html">System Information</a></li>
@@ -109,14 +109,16 @@
                                                                <li><a href="device_api/wearable/tizen/archive.html">Archive</a></li>
                                                                <li><a href="device_api/wearable/tizen/filesystem.html">Filesystem</a></li>
                                                                <li><a href="device_api/wearable/tizen/tizen.html">Tizen</a></li>
-                              </ul>
+                                                       </ul>
                                                </li>
                                                <li><a href="device_api/wearable/index.html#Application">Application Framework</a>
                                                        <ul>
                                                                <li><a href="device_api/wearable/tizen/alarm.html">Alarm</a></li>
                                                                <li><a href="device_api/wearable/tizen/application.html">Application</a></li>
                                                                <li><a href="device_api/wearable/tizen/badge.html">Badge</a></li>
+                                                               <li><a href="device_api/wearable/tizen/inputdevice.html">Input Device</a></li>
                                                                <li><a href="device_api/wearable/tizen/messageport.html">Message Port</a></li>
+                                                               <li><a href="device_api/wearable/tizen/notification.html">Notification</a></li>
                                                                <li><a href="device_api/wearable/tizen/package.html">Package</a></li>
                                                        </ul>
                                                </li>
@@ -128,14 +130,13 @@
                                                </li>
                                                <li><a href="device_api/wearable/index.html#Messaging">Messaging</a>
                                                        <ul>
-                                <li><a href="device_api/wearable/tizen/push.html">Push</a></li>
+                                                               <li><a href="device_api/wearable/tizen/push.html">Push</a></li>
                                                        </ul>
                                                </li>
                                                <li><a href="device_api/wearable/index.html#Multimedia">Multimedia</a>
                                                        <ul>
                                                                <li><a href="device_api/wearable/tizen/exif.html">Exif</a></li>
                                                                <li><a href="device_api/wearable/tizen/mediacontroller.html">Media Controller</a></li>
-                                                               <li><a href="device_api/wearable/tizen/mediakey.html">Media Key</a></li>
                                                                <li><a href="device_api/wearable/tizen/sound.html">Sound</a></li>
                                                        </ul>
                                                </li>
@@ -149,6 +150,7 @@
                                                <li><a href="device_api/wearable/index.html#System">System</a>
                                                        <ul>
                                                                <li><a href="device_api/wearable/tizen/humanactivitymonitor.html">Human Activity Monitor</a></li>
+                                                               <li><a href="device_api/wearable/tizen/mediakey.html">Media Key</a></li>
                                                                <li><a href="device_api/wearable/tizen/power.html">Power</a></li>
                                                                <li><a href="device_api/wearable/tizen/sensor.html">Sensor</a></li>
                                                                <li><a href="device_api/wearable/tizen/systeminfo.html">System Information</a></li>

diff --git a/org.tizen.web.apireference/index.xml b/org.tizen.web.apireference/index.xml
index 767af78..6366bda 100644 (file)
--- a/org.tizen.web.apireference/index.xml
+++ b/org.tizen.web.apireference/index.xml
@@ -39,10 +39,9 @@
                                </topic>
 
                                <topic href="html/device_api/mobile/index.html#Multimedia" label="Multimedia">
-                                       <topic href="html/device_api/mobile/tizen/exif.html" label="Exif" ></topic>
                                        <topic href="html/device_api/mobile/tizen/fmradio.html" label="FM Radio" ></topic>
+                                       <topic href="html/device_api/mobile/tizen/exif.html" label="Exif" ></topic>
                                        <topic href="html/device_api/mobile/tizen/mediacontroller.html" label="Media Controller" ></topic>
-                                       <topic href="html/device_api/mobile/tizen/mediakey.html" label="Media Key" ></topic>
                                        <topic href="html/device_api/mobile/tizen/sound.html" label="Sound" ></topic>
                                </topic>
 
@@ -63,6 +62,7 @@
 
                                <topic href="html/device_api/mobile/index.html#System" label="System">
                                        <topic href="html/device_api/mobile/tizen/humanactivitymonitor.html" label="Human Activity Monitor" ></topic>
+                                       <topic href="html/device_api/mobile/tizen/mediakey.html" label="Media Key" ></topic>
                                        <topic href="html/device_api/mobile/tizen/power.html" label="Power" ></topic>
                                        <topic href="html/device_api/mobile/tizen/sensor.html" label="Sensor" ></topic>
                                        <topic href="html/device_api/mobile/tizen/systeminfo.html" label="System Information" ></topic>
@@ -102,7 +102,6 @@
                                <topic href="html/device_api/wearable/index.html#Multimedia" label="Multimedia">
                                        <topic href="html/device_api/wearable/tizen/exif.html" label="Exif" ></topic>
                                        <topic href="html/device_api/wearable/tizen/mediacontroller.html" label="Media Controller" ></topic>
-                                       <topic href="html/device_api/wearable/tizen/mediakey.html" label="Media Key" ></topic>
                                        <topic href="html/device_api/wearable/tizen/sound.html" label="Sound" ></topic>
                                </topic>
 
@@ -114,6 +113,7 @@
 
                                <topic href="html/device_api/wearable/index.html#System" label="System">
                                        <topic href="html/device_api/wearable/tizen/humanactivitymonitor.html" label="Human Activity Monitor" ></topic>
+                                       <topic href="html/device_api/wearable/tizen/mediakey.html" label="Media Key" ></topic>
                                        <topic href="html/device_api/wearable/tizen/power.html" label="Power" ></topic>
                                        <topic href="html/device_api/wearable/tizen/sensor.html" label="Sensor" ></topic>
                                        <topic href="html/device_api/wearable/tizen/systeminfo.html" label="System Information" ></topic>