Merge "Improve native guide topics" into tizen

diff --cc org.tizen.guides/html/native/app_management/app_icons_n.htm
index 235f8b2,c870954..eeca4b4
--- 1/org.tizen.guides/html/native/app_management/app_icons_n.htm
--- 2/org.tizen.guides/html/native/app_management/app_icons_n.htm
+++ b/org.tizen.guides/html/native/app_management/app_icons_n.htm
@@@ -265,4 -265,4 +265,4 @@@ var s = document.getElementsByTagName('
  </script>
  
  </body>
--</html>
++</html>

diff --cc org.tizen.guides/html/native/app_management/app_management_cover_n.htm
Simple merge

diff --cc org.tizen.guides/html/native/app_management/applications_n.htm
index 1cc01ac,3a5dd07..83e476a
--- 1/org.tizen.guides/html/native/app_management/applications_n.htm
--- 2/org.tizen.guides/html/native/app_management/applications_n.htm
+++ b/org.tizen.guides/html/native/app_management/applications_n.htm
@@@ -69,10 -70,10 +70,10 @@@
  <p>When the application loses the focus status, the <code>app_pause_cb()</code> callback is invoked. The application can go into the pause state, which means that your application is not terminated but continues to run in the background, when:</p>
  
  <ul>
-   <li>A new application is launched from the request of your application.</li>
+   <li>A new application is launched by the request of your application.</li>
    <li>The user requests to go to the home screen.</li>
    <li>A system event (such as an incoming phone call) occurs and causes a resident application with a higher priority to become active and temporarily hide your application.</li>
 -  <li>An alarm is triggered for another application, which becomes the top-most window and hides your application.</li>
 +  <li>An alarm is triggered for another application, which becomes the topmost window and hides your application.</li>
  </ul>
  
  <p>Since Tizen 2.4, an application in the background goes into a suspended state. In the suspended state, the application process is executed with limited CPU resources. In other words, the platform does not allow the running of the background applications, except for some exceptional applications (such as Media and Download) that necessarily work in the background. In this case, the application can <a href="efl_ui_app_n.htm#allow_bg">designate their background category as an allowed category</a> to avoid going into the suspended state.</p>
@@@ -125,4 -126,4 +126,4 @@@ var s = document.getElementsByTagName('
  </script>
  
  </body>
--</html>
++</html>

diff --cc org.tizen.guides/html/native/app_management/widget_app_n.htm
index ac4134d,1cc6d9b..162d5cc
--- 1/org.tizen.guides/html/native/app_management/widget_app_n.htm
--- 2/org.tizen.guides/html/native/app_management/widget_app_n.htm
+++ b/org.tizen.guides/html/native/app_management/widget_app_n.htm
@@@ -550,13 -550,11 +550,11 @@@ widget_instance_update(widget_context_
  <ul>
  <li><p>You can set and get data in the <code>data</code> directory using the Preference API functions (in <a href="../../../../org.tizen.native.mobile.apireference/group__CAPI__PREFERENCE__MODULE.html">mobile</a> and <a href="../../../../org.tizen.native.wearable.apireference/group__CAPI__PREFERENCE__MODULE.html">wearable</a> applications). You can use the functions to <a href="app_preferences_n.htm">store and retrieve key-value data</a> in the <code>data</code> directory.</p></li>
  
 -<li><p>You can share the <code>data</code> directory content with Sqlite, by creating an Sqlite database file in the <code>data</code> directory.</p>
 -<p>The Sqlite database has an advantage to a direct use of a file in error handling, such as journaling. Consequently, if the application must handle complex data rather than primitive values, <a href="../data/sql_n.htm">use Sqlite to store and retrieve the data</a>.</p></li></ul>
 +<li><p>You can share the <code>data</code> directory content with SQLite, by creating an SQLite database file in the <code>data</code> directory.</p>
 +<p>The SQLite database has an advantage to the direct use of a file in error handling, such as journaling. Consequently, if the application must handle complex data rather than primitive values, <a href="../data/sql_n.htm">use SQLite to store and retrieve the data</a>.</p></li></ul>
  
  <p>If an application requires complex control over a widget, such as Music Player, it must implement a service application in the middle and use the Data Control API (in <a href="../../../../org.tizen.native.mobile.apireference/group__CAPI__DATA__CONTROL__MODULE.html">mobile</a> and <a href="../../../../org.tizen.native.wearable.apireference/group__CAPI__DATA__CONTROL__MODULE.html">wearable</a> applications).</p>
- <p>For example, a music-player-service service application is needed to control the audio device, process audio files, and handle play and stop signals. The music-player-ui and music-player-widget applications display the UI controls, title, album arts, and other content retrieved from the music-player-service service application. The service application can export its data using the Data Control to <a href="data_control_n.htm">provide data to the other applications</a> (widget and UI) simultaneously.</p>
- 
- <p>The following figure illustrates typical data control flows between the set of UI, service, and widget applications.</p>
+ <p>For example, a music-player-service service application is needed to control the audio device, process audio files, and handle play and stop signals. The music-player-ui and music-player-widget applications display the UI controls, title, album art, and other content retrieved from the music-player-service service application. The service application can export its data using the Data Control to <a href="data_control_n.htm">provide data to the other applications</a> (widget and UI) simultaneously. The following figure illustrates the typical data control flows between the set of UI, service, and widget applications.</p>
  
  <p align="center"><strong>Figure: Sharing through data control</strong></p>
  <p align="center"><img alt="Sharing through data control" src="../../images/widget_data_control_share.png" /></p>

diff --cc org.tizen.guides/html/native/graphics/vulkan_n.htm
Simple merge

diff --cc org.tizen.guides/html/native/internationalization/i18n_n.htm
index dfd1ae7,6952d03..42c7258
--- 1/org.tizen.guides/html/native/internationalization/i18n_n.htm
--- 2/org.tizen.guides/html/native/internationalization/i18n_n.htm
+++ b/org.tizen.guides/html/native/internationalization/i18n_n.htm
@@@ -100,43 -100,41 +100,41 @@@
  <h2 id="ucalendar" name="ucalendar">Calendar Dates with Ucalendar</h2>
  
  <p>The Ucalendar API (in <a href="../../../../org.tizen.native.mobile.apireference/group__CAPI__BASE__UTILS__I18N__UCALENDAR__MODULE.html">mobile</a> and <a href="../../../../org.tizen.native.wearable.apireference/group__CAPI__BASE__UTILS__I18N__UCALENDAR__MODULE.html">wearable</a> applications) is used for <a href="#dates">converting between a Udate object and a set of integer fields</a>, such as <code>I18N_UCALENDAR_YEAR</code>, <code>I18N_UCALENDAR_MONTH</code>, <code>I18N_UCALENDAR_DAY</code>, and <code>I18N_UCALENDAR_HOUR</code>. A <a href="#udate">Udate</a> object represents a specific instant in time with one millisecond precision.</p>
 -<p>The types of Ucalendar interpret a Udate according to the rules of a specific calendar system, such as the gregorian or traditional system.</p>
 +<p>The types of Ucalendar interpret a Udate according to the rules of a specific calendar system, such as the Gregorian or traditional system.</p>
  <p>A Ucalendar object can produce all the time field values needed to implement the date-time formatting for a particular language and calendar style (for example, Japanese-Gregorian, Japanese-Traditional).</p>
  
- <p>When computing a Udate from the time fields, 2 special circumstances can arise. The information can be insufficient to compute the Udate (you have only the year and the month, but not the day of the month), or the information can be inconsistent (such as "Tuesday, July 15, 1996" even though July 15, 1996 is actually a Monday).</p>
- <ul>
- <li><strong>Insufficient information</strong> <p>The calendar uses the default information to specify the missing fields. This can vary by calendar: for the Gregorian calendar, the default for a field is the same as that of the start of the epoch, such as <code>I18N_UCALENDAR_YEAR = 1970</code>, <code>I18N_UCALENDAR_MONTH = JANUARY</code>, <code>I18N_UCALENDAR_DATE = 1</code>.</p></li>
- <li><strong>Inconsistent information</strong> <p>If the fields conflict, the calendar prefers the most recently set fields. For example, when determining the day, the calendar looks for one of the following field combinations listed in the following table. The most recent combination, as determined by the most recently set single field, is used.</p></li>
- </ul>
-   <p align="center" class="Table"><strong>Table: Combinations of the calendar fields to determine the day</strong></p>
+   <p align="center" class="Table"><strong>Table: Available calendar field combinations</strong></p>
  <table>
-    <tbody>
+ <tbody>
      <tr>
-      <th>Combinations of the calendar fields</th>
-     </tr>
+               <th>Date information to be determined</th>
+               <th>Field combination</th>
+       </tr>
      <tr>
-      <td><code>I18N_UCALENDAR_MONTH + I18N_UCALENDAR_DAY_OF_MONTH</code>
- <p><code>I18N_UCALENDAR_MONTH + I18N_UCALENDAR_WEEK_OF_MONTH + I18N_UCALENDAR_DAY_OF_WEEK</code></p>
- <p><code>I18N_UCALENDAR_MONTH + I18N_UCALENDAR_DAY_OF_WEEK_IN_MONTH + I18N_UCALENDAR_DAY_OF_WEEK</code></p>
- <p><code>I18N_UCALENDAR_DAY_OF_YEAR</code></p>
- <p><code>I18N_UCALENDAR_DAY_OF_WEEK + I18N_UCALENDAR_WEEK_OF_YEAR</code></p></td>
- </tr>
-    </tbody>
-   </table>
- 
- <p>For the time of day:</p>
- <p align="center" class="Table"><strong>Table: Combinations of calendar fields to determine the time of the day</strong></p>
- <table>
-    <tbody>
-     <tr>
-      <th>Combinations of the calendar fields</th>
-     </tr>
-     <tr>
-      <td><code>I18N_UCALENDAR_HOUR_OF_DAY</code>
-        <p><code>I18N_UCALENDAR_AM_PM + I18N_UCALENDAR_HOUR</code></p></td>
-     </tr>
-    </tbody>
-   </table>
+               <td rowspan="5">Day</td>
+               <td><code>I18N_UCALENDAR_MONTH + I18N_UCALENDAR_DAY_OF_MONTH</code></td>
+       </tr>
+       <tr>
+               <td><code>I18N_UCALENDAR_MONTH + I18N_UCALENDAR_WEEK_OF_MONTH + I18N_UCALENDAR_DAY_OF_WEEK</code></td>
+       </tr>
+       <tr>
+               <td><code>I18N_UCALENDAR_MONTH + I18N_UCALENDAR_DAY_OF_WEEK_IN_MONTH + I18N_UCALENDAR_DAY_OF_WEEK</code></td>
+       </tr>
+       <tr>
+               <td><code>I18N_UCALENDAR_DAY_OF_YEAR</code></td>
+       </tr>
+       <tr>
+               <td><code>I18N_UCALENDAR_DAY_OF_WEEK + I18N_UCALENDAR_WEEK_OF_YEAR</code></td>
+       </tr>
+       <tr>
+               <td rowspan="2">Time of day</td>
+               <td><code>I18N_UCALENDAR_HOUR_OF_DAY</code></td>
+       </tr>
+       <tr>
+               <td><code>I18N_UCALENDAR_AM_PM + I18N_UCALENDAR_HOUR</code></td>
+       </tr>
+ </tbody>
+ </table>
  
            <div class="note">
          <strong>Note</strong>

diff --cc org.tizen.guides/html/native/location_sensors/device_sensors_n.htm
Simple merge

diff --cc org.tizen.guides/html/native/location_sensors/location_n.htm
Simple merge

diff --cc org.tizen.guides/html/native/media/media_content_n.htm
Simple merge

diff --cc org.tizen.guides/html/native/personal/account_n.htm
Simple merge

diff --cc org.tizen.guides/html/native/personal/calendar_n.htm
Simple merge

diff --cc org.tizen.guides/html/native/personal/contacts_n.htm
Simple merge