[Systeminfo] - upgrade of API Reference and Programming Guide

Change-Id: Ice4cedfc95841b7f6b6d786669eb0269833c2162
Signed-off-by: Andrzej Popowski <a.popowski@samsung.com>

diff --git a/org.tizen.guides/html/web/tizen/system/system_info_w.htm b/org.tizen.guides/html/web/tizen/system/system_info_w.htm
index 12a41b7..d6b4256 100644 (file)
--- a/org.tizen.guides/html/web/tizen/system/system_info_w.htm
+++ b/org.tizen.guides/html/web/tizen/system/system_info_w.htm
@@ -171,6 +171,16 @@ tr.images td {
      <td>Provides information about the cellular network. With this property, you can, for example, retrieve the network details that allow your application to access the network.</td>
     </tr>
     <tr>
+      <td><span style="font-family: Courier New,Courier,monospace">SystemInfoEthernetNetwork</span> (in <a href="../../../../../org.tizen.web.apireference/html/device_api/mobile/tizen/systeminfo.html#SystemInfoEthernetNetwork">mobile</a> applications)</td>
+      <td><span style="font-family: Courier New,Courier,monospace">ETHERNET_NETWORK</span></td>
+      <td>Provides information about the ethernet network. With this property, you can, for example, retrieve the network details that allow your application to access the network.</td>
+    </tr>
+    <tr>
+      <td><span style="font-family: Courier New,Courier,monospace">SystemInfoNetProxyNetwork</span> (in <a href="../../../../../org.tizen.web.apireference/html/device_api/mobile/tizen/systeminfo.html#SystemInfoNetProxyNetwork">mobile</a> and <a href="../../../../../org.tizen.web.apireference/html/device_api/wearable/tizen/systeminfo.html#SystemInfoCellularNetwork">wearable</a> applications)</td>
+      <td><span style="font-family: Courier New,Courier,monospace">NET_PROXY_NETWORK</span></td>
+      <td>Provides information about the proxy type network. With this property, you can, for example, retrieve the network details that allow your application to access the network.</td>
+    </tr>
+    <tr>
      <td><span style="font-family: Courier New,Courier,monospace">SystemInfoSIM</span> (in <a href="../../../../../org.tizen.web.apireference/html/device_api/mobile/tizen/systeminfo.html#SystemInfoSIM">mobile</a> and <a href="../../../../../org.tizen.web.apireference/html/device_api/wearable/tizen/systeminfo.html#SystemInfoSIM">wearable</a> applications)</td>
      <td><span style="font-family: Courier New,Courier,monospace">SIM</span></td>
      <td>Provides information about the device SIM card, such as the operator name and the mobile country code (MCC).</td>
@@ -225,4 +235,4 @@ var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga
 </script>
 
 </body>
-</html>
\ No newline at end of file
+</html>

diff --git a/org.tizen.web.apireference/html/device_api/mobile/tizen/systeminfo.html b/org.tizen.web.apireference/html/device_api/mobile/tizen/systeminfo.html
index 852eecd..23c6aab 100644 (file)
--- a/org.tizen.web.apireference/html/device_api/mobile/tizen/systeminfo.html
+++ b/org.tizen.web.apireference/html/device_api/mobile/tizen/systeminfo.html
@@ -49,6 +49,8 @@ SIM          </li>
           <li>
 STORAGE          </li>
           <li>
+NET_PROXY_NETWORK (<b>Since</b>: 3.0) </li>
+          <li>
 WIFI_NETWORK          </li>
         </ul>
         <p>
@@ -68,6 +70,9 @@ Not all above properties may be available on every Tizen device. For instance, a
           <li>
  SIM              - tizen.systeminfo.getCapability(<em>"http://tizen.org/feature/network.telephony"</em>)          </li>
           <li>
+NET_PROXY_NETWORK - tizen.systeminfo.getCapability(<em>"http://tizen.org/feature/network.net_proxy"
+</em>) </li>
+<li>
  WIFI_NETWORK     - tizen.systeminfo.getCapability(<em>"http://tizen.org/feature/network.wifi"</em>)          </li>
         </ul>
         <p>
@@ -134,13 +139,15 @@ For more information on the SystemInfo features, see <a href="../../../../../org
 </li>
 <li>2.19. <a href="#SystemInfoCellularNetwork">SystemInfoCellularNetwork</a>
 </li>
-<li>2.20. <a href="#SystemInfoSIM">SystemInfoSIM</a>
+<li>2.20. <a href="#SystemInfoNetProxyNetwork">SystemInfoNetProxyNetwork</a>
+</li>
+<li>2.21. <a href="#SystemInfoSIM">SystemInfoSIM</a>
 </li>
-<li>2.21. <a href="#SystemInfoPeripheral">SystemInfoPeripheral</a>
+<li>2.22. <a href="#SystemInfoPeripheral">SystemInfoPeripheral</a>
 </li>
-<li>2.22. <a href="#SystemInfoMemory">SystemInfoMemory</a>
+<li>2.23. <a href="#SystemInfoMemory">SystemInfoMemory</a>
 </li>
-<li>2.23. <a href="#SystemInfoCameraFlash">SystemInfoCameraFlash</a>
+<li>2.24. <a href="#SystemInfoCameraFlash">SystemInfoCameraFlash</a>
 </li>
 </ul>
 </li>
@@ -247,6 +254,10 @@ For more information on the SystemInfo features, see <a href="../../../../../org
 <td></td>
 </tr>
 <tr>
+<td><a href="#SystemInfoNetProxyNetwork">SystemInfoNetProxyNetwork</a></td>
+<td></td>
+</tr>
+<tr>
 <td><a href="#SystemInfoPeripheral">SystemInfoPeripheral</a></td>
 <td></td>
 </tr>
@@ -267,7 +278,7 @@ For more information on the SystemInfo features, see <a href="../../../../../org
 <div class="brief">
  The device property identifier.
           </div>
-<pre class="webidl prettyprint">  enum SystemInfoPropertyId { "BATTERY", "CPU", "STORAGE", "DISPLAY", "DEVICE_ORIENTATION", "BUILD", "LOCALE", "NETWORK", "WIFI_NETWORK", "ETHERNET_NETWORK", "CELLULAR_NETWORK", "SIM", "PERIPHERAL", "MEMORY", "CAMERA_FLASH" };</pre>
+<pre class="webidl prettyprint">  enum SystemInfoPropertyId { "BATTERY", "CPU", "STORAGE", "DISPLAY", "DEVICE_ORIENTATION", "BUILD", "LOCALE", "NETWORK", "WIFI_NETWORK", "ETHERNET_NETWORK", "CELLULAR_NETWORK", "NET_PROXY_NETWORK", "SIM", "PERIPHERAL", "MEMORY", "CAMERA_FLASH" };</pre>
 <p><span class="version">
             Since: </span>
  2.0
@@ -284,17 +295,23 @@ For more information on the SystemInfo features, see <a href="../../../../../org
 <p><span class="remark"> Remark : </span>
  <em>MEMORY</em> is supported since Tizen 2.3
           </p>
+<p><span class="remark"> Remark : </span>
+  <em>NET_PROXY_NETWORK</em> is supported since Tizen 3.0
+</p>
 </div>
 <div class="enum" id="SystemInfoNetworkType">
 <a class="backward-compatibility-anchor" name="::SystemInfo::SystemInfoNetworkType"></a><h3>1.2. SystemInfoNetworkType</h3>
 <div class="brief">
  Data Network Type.
           </div>
-<pre class="webidl prettyprint">  enum SystemInfoNetworkType { "NONE", "2G", "2.5G", "3G", "4G", "WIFI", "ETHERNET", "UNKNOWN" };</pre>
+<pre class="webidl prettyprint">  enum SystemInfoNetworkType { "NONE", "2G", "2.5G", "3G", "4G", "WIFI", "ETHERNET", "NET_PROXY", "UNKNOWN" };</pre>
 <p><span class="version">
             Since: </span>
  2.0
-          </p>
+</p>
+<p><span class="remark"> Remark : </span>
+<em>NET_PROXY</em> is supported since Tizen 3.0
+</p>
 </div>
 <div class="enum" id="SystemInfoDeviceOrientationStatus">
 <a class="backward-compatibility-anchor" name="::SystemInfo::SystemInfoDeviceOrientationStatus"></a><h3>1.3. SystemInfoDeviceOrientationStatus</h3>
@@ -372,9 +389,9 @@ upside down, in other words rotated 180 degrees              </td>
 <div class="brief">
  Device Profile.
           </div>
-<div class="deprecated"><p><font color="red"><i><b>Deprecated.</b>
+<p class="deprecated"><b>Deprecated.</b>
  <em>"MOBILE_FULL"</em> and <em>"MOBILE_WEB"</em> are deprecated since 2.3. Beginning with Tizen 2.3, <em>"MOBILE"</em> is returned instead of <em>"MOBILE_FULL"</em>.
-          </i></font></p></div>
+          </p>
 <pre class="webidl prettyprint">  enum SystemInfoProfile { "MOBILE_FULL", "MOBILE_WEB", "MOBILE", "WEARABLE" };</pre>
 <p><span class="version">
             Since: </span>
@@ -530,9 +547,9 @@ and for subscribing notifications of system information changes.
 <div class="brief">
  Gets the capabilities of the device.
             </div>
-<div class="deprecated"><p><font color="red"><i><b>Deprecated.</b>
+<p class="deprecated"><b>Deprecated.</b>
  Deprecated since 2.3. Instead, use getCapability().
-            </i></font></p></div>
+            </p>
 <div class="synopsis"><pre class="signature prettyprint"><a href="#SystemInfoDeviceCapability">SystemInfoDeviceCapability</a> getCapabilities();
              </pre></div>
 <p><span class="version">
@@ -930,7 +947,7 @@ NotSupportedError - If the given <var>property</var> is not supported. (since Ti
                 </li>
           <li class="param">
 <span class="name">options</span><span class="optional"> [optional]</span><span class="optional"> [nullable]</span>: 
- An object containing the various options for fetching the properties requested. See <a href="#SystemInfoOptions">details</a>.
+ An object containing the various options for fetching the properties requested. See <a href="./systeminfo.html#::SystemInfo::SystemInfoOptions">details</a>.
                 </li>
           <li class="param">
 <span class="name">errorCallback</span><span class="optional"> [optional]</span><span class="optional"> [nullable]</span>: 
@@ -1119,9 +1136,9 @@ parameters contain an invalid value.
 <div class="brief">
  SystemInfoDeviceCapability object.
           </div>
-<div class="deprecated"><p><font color="red"><i><b>Deprecated.</b>
+<p class="deprecated"><b>Deprecated.</b>
  Deprecated since 2.3. Instead, use getCapability() to query device capabilities.
-          </i></font></p></div>
+          </p>
 <pre class="webidl prettyprint">  [NoInterfaceObject] interface SystemInfoDeviceCapability {
     readonly attribute boolean bluetooth;
 
@@ -2385,9 +2402,9 @@ The following values are supported:
 </span><span class="type">boolean </span><span class="name">isRemoveable</span></span><div class="brief">
  true if this unit can be removed from the system (such as an sdcard unplugged), false otherwise.
             </div>
-<div class="deprecated"><p><font color="red"><i><b>Deprecated.</b>
+<p class="deprecated"><b>Deprecated.</b>
  Deprecated since 2.1. Instead, use isRemovable.
-            </i></font></p></div>
+            </p>
 <p><span class="version">
             Since: </span>
  1.0
@@ -3010,8 +3027,34 @@ identify a mobile phone operator/carrier using the GSM, CDMA, iDEN, TETRA and UM
 </ul>
 </div>
 </div>
+<div class="interface" id="SystemInfoNetProxyNetwork">
+<a class="backward-compatibility-anchor" name="::SystemInfo::SystemInfoNetProxyNetwork"></a><h3>2.20. SystemInfoNetProxyNetwork</h3>
+<div class="brief">
+This property reflects the information of the net_proxy network in this system.
+</div>
+<pre class="webidl prettyprint"> [NoInterfaceObject] interface SystemInfoNetProxyNetwork : <a href="#SystemInfoProperty">SystemInfoProperty</a> {
+readonly attribute DOMString status;
+};</pre>
+<p><span class="version">
+Since: </span>
+3.0
+</p>
+<div class="attributes">
+<h4>Attributes</h4>
+<ul><li class="attribute" id="SystemInfoNetProxyNetwork::status">
+<span class="attrName"><span class="readonly"> readonly
+</span><span class="type">DOMString </span><span class="name">status</span></span><div class="brief">
+Represents the status (ON or OFF) of the net_proxy network.
+</div>
+<p><span class="version">
+Since: </span>
+3.0
+</p>
+</li></ul>
+</div>
+</div>
 <div class="interface" id="SystemInfoSIM">
-<a class="backward-compatibility-anchor" name="::SystemInfo::SystemInfoSIM"></a><h3>2.20. SystemInfoSIM</h3>
+<a class="backward-compatibility-anchor" name="::SystemInfo::SystemInfoSIM"></a><h3>2.21. SystemInfoSIM</h3>
 <div class="brief">
  This property reflects the information of the SIM card information.
           </div>
@@ -3250,7 +3293,7 @@ identify a mobile phone operator/carrier using the GSM, CDMA, iDEN, TETRA and UM
 </div>
 </div>
 <div class="interface" id="SystemInfoPeripheral">
-<a class="backward-compatibility-anchor" name="::SystemInfo::SystemInfoPeripheral"></a><h3>2.21. SystemInfoPeripheral</h3>
+<a class="backward-compatibility-anchor" name="::SystemInfo::SystemInfoPeripheral"></a><h3>2.22. SystemInfoPeripheral</h3>
 <div class="brief">
  This property reflects the peripheral information of the current device.
           </div>
@@ -3277,7 +3320,7 @@ identify a mobile phone operator/carrier using the GSM, CDMA, iDEN, TETRA and UM
 </div>
 </div>
 <div class="interface" id="SystemInfoMemory">
-<a class="backward-compatibility-anchor" name="::SystemInfo::SystemInfoMemory"></a><h3>2.22. SystemInfoMemory</h3>
+<a class="backward-compatibility-anchor" name="::SystemInfo::SystemInfoMemory"></a><h3>2.23. SystemInfoMemory</h3>
 <div class="brief">
  This property represents information about the memory state on the device system.
           </div>
@@ -3305,7 +3348,7 @@ identify a mobile phone operator/carrier using the GSM, CDMA, iDEN, TETRA and UM
 </div>
 </div>
 <div class="interface" id="SystemInfoCameraFlash">
-<a class="backward-compatibility-anchor" name="::SystemInfo::SystemInfoCameraFlash"></a><h3>2.23. SystemInfoCameraFlash</h3>
+<a class="backward-compatibility-anchor" name="::SystemInfo::SystemInfoCameraFlash"></a><h3>2.24. SystemInfoCameraFlash</h3>
 <div class="brief">
  The SystemInfoCameraFlash provides the way to control the attached the camera flash.
           </div>
@@ -3512,15 +3555,23 @@ To guarantee the running of the application on a device which supports Wi-Fi, de
            </div></p>
 <li class="feature">http://tizen.org/feature/network.wifi</li>
 </div>
+<div class="def-api-feature">
+<p><div class="description">
+<p>
+To guarantee the running of the application on a device which supports network proxy for internet connection, declare the following feature requirements in the config file:
+</p>
+</div></p>
+<li class="feature">http://tizen.org/feature/network.net_proxy</li>
+</div>
 <p></p>
-                    For more information, see <a href="../../../../../org.tizen.gettingstarted/html/web/details/app_filtering_w.htm">Application Filtering</a>.
+                    For more information, see <a href="../../../../../org.tizen.gettingstarted/html/web/details/app_filtering_w.htm">Application Filtering.</a>.
 </div>
 <h2 id="full-webidl">4. Full WebIDL</h2>
 <pre class="webidl prettyprint">module SystemInfo {
 
-  enum SystemInfoPropertyId { "BATTERY", "CPU", "STORAGE", "DISPLAY", "DEVICE_ORIENTATION", "BUILD", "LOCALE", "NETWORK", "WIFI_NETWORK", "ETHERNET_NETWORK", "CELLULAR_NETWORK", "SIM", "PERIPHERAL", "MEMORY", "CAMERA_FLASH" };
+  enum SystemInfoPropertyId { "BATTERY", "CPU", "STORAGE", "DISPLAY", "DEVICE_ORIENTATION", "BUILD", "LOCALE", "NETWORK", "WIFI_NETWORK", "ETHERNET_NETWORK", "CELLULAR_NETWORK", "NET_PROXY_NETWORK", "SIM", "PERIPHERAL", "MEMORY", "CAMERA_FLASH" };
 
-  enum SystemInfoNetworkType { "NONE", "2G", "2.5G", "3G", "4G", "WIFI", "ETHERNET", "UNKNOWN" };
+  enum SystemInfoNetworkType { "NONE", "2G", "2.5G", "3G", "4G", "WIFI", "ETHERNET", "NET_PROXY", "UNKNOWN" };
 
   enum SystemInfoDeviceOrientationStatus { "PORTRAIT_PRIMARY", "PORTRAIT_SECONDARY", "LANDSCAPE_PRIMARY", "LANDSCAPE_SECONDARY" };
 
@@ -3841,6 +3892,10 @@ To guarantee the running of the application on a device which supports Wi-Fi, de
     readonly attribute DOMString imei raises(<a href="tizen.html#WebAPIException">WebAPIException</a>);
   };
 
+  [NoInterfaceObject] interface SystemInfoNetProxyNetwork : <a href="#SystemInfoProperty">SystemInfoProperty</a> {
+    readonly attribute DOMString status;
+  };
+
   [NoInterfaceObject] interface SystemInfoSIM : <a href="#SystemInfoProperty">SystemInfoProperty</a> {
     readonly attribute <a href="#SystemInfoSimState">SystemInfoSimState</a> state raises(<a href="tizen.html#WebAPIException">WebAPIException</a>);
 

diff --git a/org.tizen.web.apireference/html/device_api/wearable/tizen/systeminfo.html b/org.tizen.web.apireference/html/device_api/wearable/tizen/systeminfo.html
index a227461..441d7cc 100644 (file)
--- a/org.tizen.web.apireference/html/device_api/wearable/tizen/systeminfo.html
+++ b/org.tizen.web.apireference/html/device_api/wearable/tizen/systeminfo.html
@@ -17,7 +17,7 @@
 This API also provides interfaces and methods that can retrieve statuses of hardware devices, get the value of selected properties, and subscribe to asynchronous notifications of changes for selected values.
         </p>
         <p>
-The following provides an overview of the tree data structure:
+Web applications can use this API to access the following system properties:
         </p>
         <ul>
           <li>
@@ -43,6 +43,8 @@ ETHERNET_NETWORK (<b>Since</b>: 2.4)          </li>
           <li>
 CELLULAR_NETWORK          </li>
           <li>
+NET_PROXY_NETWORK (<b>Since</b>: 3.0) </li>
+                       <li>
 SIM          </li>
           <li>
 PERIPHERAL          </li>
@@ -62,6 +64,8 @@ Not all above properties may be available on every Tizen device. For instance, a
           <li>
  CELLULAR_NETWORK - tizen.systeminfo.getCapability(<em>"http://tizen.org/feature/network.telephony"</em>)          </li>
           <li>
+ NET_PROXY_NETWORK - tizen.systeminfo.getCapability(<em>"http://tizen.org/feature/network.net_proxy"</em>) </li>
+          <li>
  SIM              - tizen.systeminfo.getCapability(<em>"http://tizen.org/feature/network.telephony"</em>)          </li>
         </ul>
         <p>
@@ -128,11 +132,13 @@ For more information on the SystemInfo features, see <a href="../../../../../org
 </li>
 <li>2.19. <a href="#SystemInfoCellularNetwork">SystemInfoCellularNetwork</a>
 </li>
-<li>2.20. <a href="#SystemInfoSIM">SystemInfoSIM</a>
+<li>2.20. <a href="#SystemInfoNetProxyNetwork">SystemInfoNetProxyNetwork</a>
+</li>
+<li>2.21. <a href="#SystemInfoSIM">SystemInfoSIM</a>
 </li>
-<li>2.21. <a href="#SystemInfoPeripheral">SystemInfoPeripheral</a>
+<li>2.22. <a href="#SystemInfoPeripheral">SystemInfoPeripheral</a>
 </li>
-<li>2.22. <a href="#SystemInfoMemory">SystemInfoMemory</a>
+<li>2.23. <a href="#SystemInfoMemory">SystemInfoMemory</a>
 </li>
 </ul>
 </li>
@@ -235,6 +241,10 @@ For more information on the SystemInfo features, see <a href="../../../../../org
 <td></td>
 </tr>
 <tr>
+<td><a href="#SystemInfoNetProxyNetwork">SystemInfoNetProxyNetwork</a></td>
+<td></td>
+</tr>
+<tr>
 <td><a href="#SystemInfoSIM">SystemInfoSIM</a></td>
 <td></td>
 </tr>
@@ -255,7 +265,7 @@ For more information on the SystemInfo features, see <a href="../../../../../org
 <div class="brief">
  The device property identifier.
           </div>
-<pre class="webidl prettyprint">  enum SystemInfoPropertyId { "BATTERY" , "CPU", "STORAGE", "DISPLAY", "DEVICE_ORIENTATION", "BUILD", "LOCALE", "NETWORK", "WIFI_NETWORK", "ETHERNET_NETWORK", "CELLULAR_NETWORK", "SIM", "PERIPHERAL", "MEMORY" };</pre>
+<pre class="webidl prettyprint">  enum SystemInfoPropertyId { "BATTERY" , "CPU", "STORAGE", "DISPLAY", "DEVICE_ORIENTATION", "BUILD", "LOCALE", "NETWORK", "WIFI_NETWORK", "ETHERNET_NETWORK", "CELLULAR_NETWORK", "NET_PROXY_NETWORK", "SIM", "PERIPHERAL", "MEMORY" };</pre>
 <p><span class="version">
             Since: </span>
  2.0
@@ -269,16 +279,22 @@ For more information on the SystemInfo features, see <a href="../../../../../org
 <p><span class="remark"> Remark : </span>
  <em>ETHERNET_NETWORK</em> is supported since Tizen 2.4
           </p>
+<p><span class="remark"> Remark : </span>
+ <em>NET_PROXY_NETWORK</em> is supported since Tizen 3.0
+          </p>
 </div>
 <div class="enum" id="SystemInfoNetworkType">
 <a class="backward-compatibility-anchor" name="::SystemInfo::SystemInfoNetworkType"></a><h3>1.2. SystemInfoNetworkType</h3>
 <div class="brief">
  Data Network Type.
           </div>
-<pre class="webidl prettyprint">  enum SystemInfoNetworkType { "NONE", "2G", "2.5G", "3G", "4G", "WIFI", "ETHERNET", "UNKNOWN" };</pre>
+<pre class="webidl prettyprint">  enum SystemInfoNetworkType { "NONE", "2G", "2.5G", "3G", "4G", "WIFI", "ETHERNET", "NET_PROXY", "UNKNOWN" };</pre>
 <p><span class="version">
             Since: </span>
  2.0
+</p>
+<p><span class="remark"> Remark : </span>
+<em>NET_PROXY</em> is supported since Tizen 3.0
           </p>
 </div>
 <div class="enum" id="SystemInfoDeviceOrientationStatus">
@@ -357,9 +373,9 @@ upside down, in other words rotated 180 degrees              </td>
 <div class="brief">
  Device Profile.
           </div>
-<div class="deprecated"><p><font color="red"><i><b>Deprecated.</b>
+<p class="deprecated"><b>Deprecated.</b>
  <em>"MOBILE_FULL"</em> and <em>"MOBILE_WEB"</em> are deprecated since 2.3. Beginning with Tizen 2.3, <em>"MOBILE"</em> is returned instead of <em>"MOBILE_FULL"</em>.
-          </i></font></p></div>
+          </p>
 <pre class="webidl prettyprint">  enum SystemInfoProfile { "MOBILE_FULL", "MOBILE_WEB", "MOBILE", "WEARABLE" };</pre>
 <p><span class="version">
             Since: </span>
@@ -515,9 +531,9 @@ and for subscribing notifications of system information changes.
 <div class="brief">
  Gets the capabilities of the device.
             </div>
-<div class="deprecated"><p><font color="red"><i><b>Deprecated.</b>
+<p class="deprecated"><b>Deprecated.</b>
  Deprecated since 2.3. Instead, use getCapability().
-            </i></font></p></div>
+            </p>
 <div class="synopsis"><pre class="signature prettyprint"><a href="#SystemInfoDeviceCapability">SystemInfoDeviceCapability</a> getCapabilities();
              </pre></div>
 <p><span class="version">
@@ -1046,9 +1062,9 @@ parameters contain an invalid value.
 <div class="brief">
  SystemInfoDeviceCapability object.
           </div>
-<div class="deprecated"><p><font color="red"><i><b>Deprecated.</b>
+<p class="deprecated"><b>Deprecated.</b>
  Deprecated since 2.3. Instead, use getCapability() to query device capabilities.
-          </i></font></p></div>
+          </p>
 <pre class="webidl prettyprint">  [NoInterfaceObject] interface SystemInfoDeviceCapability {
     readonly attribute boolean bluetooth;
 
@@ -2312,9 +2328,9 @@ The following values are supported:
 </span><span class="type">boolean </span><span class="name">isRemoveable</span></span><div class="brief">
  true if this unit can be removed from the system (such as an sdcard unplugged), false otherwise.
             </div>
-<div class="deprecated"><p><font color="red"><i><b>Deprecated.</b>
+<p class="deprecated"><b>Deprecated.</b>
  Deprecated since 2.1. Instead, use isRemovable.
-            </i></font></p></div>
+            </p>
 <p><span class="version">
             Since: </span>
  1.0
@@ -2937,8 +2953,34 @@ identify a mobile phone operator/carrier using the GSM, CDMA, iDEN, TETRA and UM
 </ul>
 </div>
 </div>
+<div class="interface" id="SystemInfoNetProxyNetwork">
+<a class="backward-compatibility-anchor" name="::SystemInfo::SystemInfoNetProxyNetwork"></a><h3>2.20. SystemInfoNetProxyNetwork</h3>
+<div class="brief">
+This property reflects the information of the net_proxy network in this system.
+</div>
+<pre class="webidl prettyprint"> [NoInterfaceObject] interface SystemInfoNetProxyNetwork : <a href="#SystemInfoProperty">SystemInfoProperty</a> {
+  readonly attribute DOMString status;
+};</pre>
+<p><span class="version">
+Since: </span>
+3.0
+</p>
+<div class="attributes">
+<h4>Attributes</h4>
+<ul><li class="attribute" id="SystemInfoNetProxyNetwork::status">
+<span class="attrName"><span class="readonly"> readonly
+</span><span class="type">DOMString </span><span class="name">status</span></span><div class="brief">
+Represents the status (ON or OFF) of the net_proxy network.
+</div>
+<p><span class="version">
+Since: </span>
+3.0
+</p>
+</li></ul>
+</div>
+</div>
 <div class="interface" id="SystemInfoSIM">
-<a class="backward-compatibility-anchor" name="::SystemInfo::SystemInfoSIM"></a><h3>2.20. SystemInfoSIM</h3>
+<a class="backward-compatibility-anchor" name="::SystemInfo::SystemInfoSIM"></a><h3>2.21. SystemInfoSIM</h3>
 <div class="brief">
  This property reflects the information of the SIM card information.
           </div>
@@ -3177,7 +3219,7 @@ identify a mobile phone operator/carrier using the GSM, CDMA, iDEN, TETRA and UM
 </div>
 </div>
 <div class="interface" id="SystemInfoPeripheral">
-<a class="backward-compatibility-anchor" name="::SystemInfo::SystemInfoPeripheral"></a><h3>2.21. SystemInfoPeripheral</h3>
+<a class="backward-compatibility-anchor" name="::SystemInfo::SystemInfoPeripheral"></a><h3>2.22. SystemInfoPeripheral</h3>
 <div class="brief">
  This property reflects the peripheral information of the current device.
           </div>
@@ -3204,7 +3246,7 @@ identify a mobile phone operator/carrier using the GSM, CDMA, iDEN, TETRA and UM
 </div>
 </div>
 <div class="interface" id="SystemInfoMemory">
-<a class="backward-compatibility-anchor" name="::SystemInfo::SystemInfoMemory"></a><h3>2.22. SystemInfoMemory</h3>
+<a class="backward-compatibility-anchor" name="::SystemInfo::SystemInfoMemory"></a><h3>2.23. SystemInfoMemory</h3>
 <div class="brief">
  This property represents information about the memory state on the device system.
           </div>
@@ -3251,15 +3293,23 @@ To guarantee the running of this application on a device which supports telephon
            </div></p>
 <li class="feature">http://tizen.org/feature/network.telephony</li>
 </div>
+<div class="def-api-feature">
+<p><div class="description">
+            <p>
+To guarantee the running of this application on a device which supports net_proxy feature, declare the following feature requirements in the config file:
+            </p>
+           </div></p>
+<li class="feature">http://tizen.org/feature/network.net_proxy</li>
+</div>
 <p></p>
                     For more information, see <a href="https://developer.tizen.org/development/getting-started/web-application/understanding-tizen-programming/application-filtering">Application Filtering</a>.
 </div>
 <h2 id="full-webidl">4. Full WebIDL</h2>
 <pre class="webidl prettyprint">module SystemInfo {
 
-  enum SystemInfoPropertyId { "BATTERY" , "CPU", "STORAGE", "DISPLAY", "DEVICE_ORIENTATION", "BUILD", "LOCALE", "NETWORK", "WIFI_NETWORK", "ETHERNET_NETWORK", "CELLULAR_NETWORK", "SIM", "PERIPHERAL", "MEMORY" };
+  enum SystemInfoPropertyId { "BATTERY" , "CPU", "STORAGE", "DISPLAY", "DEVICE_ORIENTATION", "BUILD", "LOCALE", "NETWORK", "WIFI_NETWORK", "ETHERNET_NETWORK", "CELLULAR_NETWORK", "NET_PROXY_NETWORK", "SIM", "PERIPHERAL", "MEMORY" };
 
-  enum SystemInfoNetworkType { "NONE", "2G", "2.5G", "3G", "4G", "WIFI", "ETHERNET", "UNKNOWN" };
+  enum SystemInfoNetworkType { "NONE", "2G", "2.5G", "3G", "4G", "WIFI", "ETHERNET", "NET_PROXY", "UNKNOWN" };
 
   enum SystemInfoDeviceOrientationStatus { "PORTRAIT_PRIMARY", "PORTRAIT_SECONDARY", "LANDSCAPE_PRIMARY", "LANDSCAPE_SECONDARY" };
 
@@ -3580,6 +3630,10 @@ To guarantee the running of this application on a device which supports telephon
     readonly attribute DOMString imei raises(<a href="tizen.html#WebAPIException">WebAPIException</a>);
   };
 
+  [NoInterfaceObject] interface SystemInfoNetProxyNetwork : <a href="#SystemInfoProperty">SystemInfoProperty</a> {
+    readonly attribute DOMString status;
+  };
+
   [NoInterfaceObject] interface SystemInfoSIM : <a href="#SystemInfoProperty">SystemInfoProperty</a> {
     readonly attribute <a href="#SystemInfoSimState">SystemInfoSimState</a> state raises(<a href="tizen.html#WebAPIException">WebAPIException</a>);