Merge "[Feedback] Add API reference, dev guide and tutorial" into tizen_3.0

diff --cc org.tizen.web.apireference/html/device_api/mobile/index.html
Simple merge

diff --cc org.tizen.web.apireference/html/device_api/wearable/index.html
index d61750b,27af30b..82ab479
--- 1/org.tizen.web.apireference/html/device_api/wearable/index.html
--- 2/org.tizen.web.apireference/html/device_api/wearable/index.html
+++ b/org.tizen.web.apireference/html/device_api/wearable/index.html
@@@ -182,17 -174,19 +182,27 @@@
  
                  <td>Optional</td>
                  <td>No</td>
 +                </tr></tbody></table><h4 id="Security">Security</h4>
 +             <table class="api-list"><thead><tr><th>API</th><th>Description</th><th>Version (Since)</th><th>Wearable</th><th>Supported on<br>Wearable Emulator</th></tr>
 +       </thead><tbody><tr><td><a href="tizen/keymanager.html" data-origin="tizen" data-domain="pim" data-category="core" data-status="S" data-version="">
 +                        Keymanager</a></td>
 +                <td>This API provides interfaces and methods for a secure repository for storing, retrieving and removing the sensitive data of users and their applications </td>
 +                <td>3.0</td>
 +                <td>Mandatory</td>
 +                <td>Yes</td>
                  </tr></tbody></table><h4 id="System">System</h4>
               <table class="api-list"><thead><tr><th>API</th><th>Description</th><th>Version (Since)</th><th>Wearable</th><th>Supported on<br>Wearable Emulator</th></tr>
-        </thead><tbody><tr><td><a href="tizen/humanactivitymonitor.html" data-origin="tizen" data-domain="system" data-category="core" data-status="D" data-version="">
+                </thead><tbody>
+                 <tr>
+                 <td><a href="tizen/feedback.html" data-origin="tizen" data-domain="system" data-category="core" data-status="D" data-version="">
+                         Feedback</a></td>
+                     <td>This API provides  functions to play sound or vibration associated with action.</td>
+                     <td>3.0</td>
+                     <td>Optional</td>
+                     <td>Yes</td>
+                 </tr>
+                 <tr>
+                 <td><a href="tizen/humanactivitymonitor.html" data-origin="tizen" data-domain="system" data-category="core" data-status="D" data-version="">
                          Human Activity Monitor</a></td>
                  <td>This API provides interfaces and methods for retrieving human activity data from the various sensors on the device.</td>
                  <td>2.3</td>

diff --cc org.tizen.web.apireference/html/index.htm
index a6b1a38,d083792..770b9b3
--- 1/org.tizen.web.apireference/html/index.htm
--- 2/org.tizen.web.apireference/html/index.htm
+++ b/org.tizen.web.apireference/html/index.htm
@@@ -95,9 -90,10 +95,10 @@@
                                                </li>
                                                <li><a href="device_api/mobile/index.html#System">System</a>
                                                        <ul>
+                                                               <li><a href="device_api/mobile/tizen/feedback.html">Feedback</a></li>
                                                                <li><a href="device_api/mobile/tizen/humanactivitymonitor.html">Human Activity Monitor</a></li>
 -                                                              <li><a href="device_api/mobile/tizen/power.html">Power</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>
                                                                <li><a href="device_api/mobile/tizen/systemsetting.html">System Setting</a></li>
@@@ -152,14 -145,10 +153,15 @@@
                                                                <li><a href="device_api/wearable/tizen/nfc.html">NFC</a></li>
                                                                <li><a href="device_api/wearable/tizen/se.html">Secure Element</a></li>
                                                        </ul>
 -                                      </li>                                           
 +                                              </li>
 +                                              <li><a href="device_api/wearable/index.html#Security">Security</a>
 +                                                      <ul>
 +                                                              <li><a href="device_api/wearable/tizen/keymanager.html">Key Manager</a>
 +                                                      </ul>
 +                                              </li>
                                                <li><a href="device_api/wearable/index.html#System">System</a>
                                                        <ul>
+                                                               <li><a href="device_api/wearable/tizen/feedback.html">Feedback</a></li>
                                                                <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>