[emulator] add doc about bridge network setting

Change-Id: I8768374f1d029c817dc9ec843ef28734bab6d515
Signed-off-by: Munkyu Im <munkyu.im@samsung.com>

diff --git a/org.tizen.devtools/html/common_tools/emulator_features.htm b/org.tizen.devtools/html/common_tools/emulator_features.htm
index 61001bb..121d48f 100644 (file)
--- a/org.tizen.devtools/html/common_tools/emulator_features.htm
+++ b/org.tizen.devtools/html/common_tools/emulator_features.htm
@@ -253,8 +253,8 @@ Contrast<br/>
           <td class="note">The following preallocated addresses are not supported as a manual proxy:
                        <ul>
                                <li>Localhost</li>
-                               <li>127.0.0.0/8</li>
-                               <li>10.0.0.0/16</li>
+                               <li>127.0.0.1/8</li>
+                               <li>10.0.2.0/24</li>
                        </ul>
                        <p>The automatic proxy configuration is not supported due to license issues.</p> </td>
         </tr>
@@ -315,7 +315,7 @@ src="../images/emulator_nat_architecture.png"/></p>
 </li> </ul>
 
 <h3 id="Bridge" name="Bridge">Bridge (Bridged Network)</h3>
-<p>The bridge backend requires a dedicated IP for the  Emulator and you can communicate to an external without any port forwarding. If you want to use one of the following, you can try the bridge backend:</p>
+<p>The bridge backend requires a dedicated IP for the Emulator and you can communicate to an external without any port forwarding. If you want to use one of the followings, you can try the bridge backend:</p>
 
 <ul>
        <li>You want to permit an inbound connection with no port forwarding.</li>
@@ -323,14 +323,48 @@ src="../images/emulator_nat_architecture.png"/></p>
        <li>You want to use a firewall-free IP for the Emulator.</li>
        <li>You want high performance from the network.</li>
 </ul>
-
-<p>You can configure the Emulator IP in <strong>Emulator Manager &gt; Network Configuration</strong>. If you have a DHCP server on the network, you can configure the Emulator IP using DHCP. If not, you must configure the IP manually.</p>
 <p class="figure">Figure: Emulator bridged network architecture</p>
- 
+
 <p align="center"><img alt="Emulator bridged network architecture" src="../images/emulator_bridge_architecture.png"/></p>
 
+<table>
+       <tbody>
+               <tr>
+                       <th class="note">Note</th>
+               </tr>
+               <tr>
+                       <td class="note">
+                               <li>Network bridging will not work when the underlying physical network device is a wireless device.</li>
+                               <li>On Mac OS X, only physical network device named "en0" can be used for bridging.</li>
+                       </td>
+               </tr>
+       </tbody>
+</table>
+
+<p>When the Emulator creates an emulator instance, the Emulator Manager checks the Emulator's IP and sets the properties of the bridged network in <strong>Emulator Manager &gt; Network Configuration</strong> automatically.</p>
+<p>If you have a DHCP(Dynamic Host Configuration Protocol) server on the network, you can configure the Emulator IP using DHCP. If not, type the IP address that you want to assign.</p>
+<p>In the following host operating systems, you should configure the properties of the bridged network directly.</p>
+
+<h4 id="Bridge on MAC" name="Bridge on MAC">Bridge Configuration on Mac OS X Mavericks and above</h4>
 
+<ol>
+       <li>On the <b>Apple</b> menu, click <b>System Preferences</b>, and then click <b>Network</b>.</li>
+       <li>On the Action menu, click <b>Manage Virtual Interfaces</b>.</li>
+       <li>Click <b>Add (+)</b>, click <b>New Bridge</b>, and then select the Ethernet interfaces to include in the bridge.</li>
+       <li>Configure the TCP/IP for bridge (IP, DNS and so on).</li>
+</ol>
 
+<h4 id="Bridge on WIN8 and above" name="Bridge on WIN8 and above">Bridge Configuration on Windows 8 and above</h4>
+
+<ol>
+       <li>Click <b>Windows Start</b> button<img src="../images/windows-8-1-start-button.png"/>, and then click <b>Control Panel</b>. In the search box, type <b>adapter</b>, click <b>Network and Sharing Center</b>, and then click <b>View network connections</b>.</li>
+       <li>Right-click the physical network connection used for bridging, and then click <b>Properties</b></li>
+       <li>On the <b>General</b> tab (for a local area connection), click <b>Internet Protocol (TCP/IP)</b>, and then click <b>Properties</b>.</li>
+       <li>Click <b>Obtain an IP address automatically</b> to delete IP configuration, and then click <b>OK</b>. The IP configuration (IP address, Subnet mask, and Default gateway) will be used for the configuration of bridged network.</li>
+       <li>While holding down the CTRL key, select the network connection and the tap device that you want to include in the bridge. For example, <b>tap1</b> + <b>Local area connection</b>.</li>
+       <li>Right-click one of the selected network connections, and then click <b>Bridge Connections</b>.</li>
+       <li>Configure <b>Network bridge</b>'s TCP/IP. (Reuse the deleted TCP/IP configuration of No.4)</li>
+</ol>
 
 <h2 id="skin" name="skin">Using Custom Skin Layout</h2>
 
@@ -1017,4 +1051,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.devtools/html/images/windows-8-1-start-button.png b/org.tizen.devtools/html/images/windows-8-1-start-button.png
new file mode 100644 (file)
index 0000000..44386e8
Binary files /dev/null and b/org.tizen.devtools/html/images/windows-8-1-start-button.png differ