cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From i..@apache.org
Subject svn commit: r1590759 [3/8] - in /cordova/site/public/docs: en/2.3.0/ en/2.4.0/ en/2.5.0/ en/2.6.0/ en/2.7.0/ en/2.8.0/ en/2.9.0/ en/3.2.0/ en/3.3.0/ en/3.4.0/ en/edge/ es/edge/ fr/edge/
Date Mon, 28 Apr 2014 19:25:05 GMT
Modified: cordova/site/public/docs/en/edge/guide_platforms_android_index.md.html
URL: http://svn.apache.org/viewvc/cordova/site/public/docs/en/edge/guide_platforms_android_index.md.html?rev=1590759&r1=1590758&r2=1590759&view=diff
==============================================================================
--- cordova/site/public/docs/en/edge/guide_platforms_android_index.md.html (original)
+++ cordova/site/public/docs/en/edge/guide_platforms_android_index.md.html Mon Apr 28 19:25:02 2014
@@ -114,9 +114,13 @@
             <h1>Android Platform Guide</h1>
             <small><select><option value="Android%2520Platform%2520Guide">Android Platform Guide</option>
 <option value="Android%20Platform%20Guide_requirements_and_support">      - Requirements and Support</option>
-<option value="Android%20Platform%20Guide_open_a_project_in_the_sdk">      - Open a Project in the SDK</option>
+<option value="Android%20Platform%20Guide_install_cordova_shell_tools">      - Install Cordova Shell Tools</option>
+<option value="Android%20Platform%20Guide_open_a_new_project_in_the_sdk">      - Open a New Project in the SDK</option>
+<option value="Android%20Platform%20Guide_build_the_project">      - Build the Project</option>
+<option value="Android%20Platform%20Guide_configure_an_emulator">      - Configure an Emulator</option>
 <option value="Android%20Platform%20Guide_deploy_to_emulator">      - Deploy to Emulator</option>
-<option value="Android%20Platform%20Guide_deploy_to_device">      - Deploy to Device</option></select></small>
+<option value="Android%20Platform%20Guide_deploy_to_device">      - Deploy to Device</option>
+<option value="Android%20Platform%20Guide_other_commands">      - Other Commands</option></select></small>
         </div>
 
         <div id="sidebar">
@@ -148,47 +152,41 @@
             <div id="content">
                 <h1><a name="Android%20Platform%20Guide">Android Platform Guide</a></h1>
 
-<p>This guide shows how to set up your SDK development environment to
-deploy Cordova apps for Android devices. It shows how to install the
-Android SDK, open an Android project in the SDK, and deploy it to an
-emulator or device.  You need to follow the instructions to install
-the Android SDK, regardless of whether you use the cross-platform
-workflow discussed in the <a href="guide_overview_index.md.html#Overview">Overview</a>, or the platform-centered shell
-tools detailed at <a href="guide_platforms_android_tools.md.html#Android%20Command-line%20Tools">Android Command-line Tools</a>.</p>
-
-<p>See the following for more detailed platform-specific information:</p>
-
-<ul>
-<li><a href="guide_platforms_android_config.md.html#Android%20Configuration">Android Configuration</a></li>
-<li><a href="guide_platforms_android_webview.md.html#Android%20WebViews">Android WebViews</a></li>
-<li><a href="guide_platforms_android_plugin.md.html#Android%20Plugins">Android Plugins</a></li>
-<li><a href="guide_platforms_android_upgrading.md.html#Upgrading%20Android">Upgrading Android</a></li>
-<li><a href="guide_platforms_android_tools.md.html#Android%20Command-line%20Tools">Android Command-line Tools</a></li>
-</ul>
-
-<p>The command-line tools above refer to versions prior to Cordova 3.0.
-See <a href="guide_cli_index.md.html#The%20Command-Line%20Interface">The Command-Line Interface</a> for information about the
-current interface.</p>
+<p>This guide shows how to set up your SDK environment to deploy Cordova
+apps for Android devices, and how to optionally use Android-centered
+command-line tools in your development workflow.  You need to install
+the Android SDK regardless of whether you want to use these
+platform-centered shell tools or cross-platform Cordova CLI for
+development. For a comparison of the two development paths, see the
+<a href="guide_overview_index.md.html#Overview">Overview</a>.  For details on the CLI, see <a href="guide_cli_index.md.html#The%20Command-Line%20Interface">The Command-Line Interface</a>.</p>
 
 <h2><a name="Android%20Platform%20Guide_requirements_and_support">Requirements and Support</a></h2>
 
-<p>See the <a class="external" href="http://developer.android.com/sdk/index.html">System Requirements</a>
-for the Android SDK.</p>
+<p>See the Android SDK's <a class="external" href="http://developer.android.com/sdk/index.html">System Requirements</a>.</p>
 
 <p>Cordova supports Android 2.2, 2.3, and 4.x.  As a general rule,
 platforms are deprecated as they dip below 5% on Google's
 <a class="external" href="http://developer.android.com/about/dashboards/index.html">distribution dashboard</a>.</p>
 
-<!--
-NOTE, doc said:
-- Android 2.1 (Deprecated May 2013)
-- Android 3.x (Deprecated May 2013)
--->
-
-<p>Developers should use the <code>cordova</code> utility in conjunction with
-the Android SDK.  See <a href="guide_cli_index.md.html#The%20Command-Line%20Interface">The Command-Line Interface</a> for
-information how to install it, add projects, then build and deploy a
-project.</p>
+<h2><a name="Android%20Platform%20Guide_install_cordova_shell_tools">Install Cordova Shell Tools</a></h2>
+
+<p>If you want to use Cordova's Android-centered shell tools in
+conjunction with the SDK, download Cordova from
+<a class="external" href="http://cordova.apache.org">cordova.apache.org</a>. Otherwise ignore this
+section if you plan to use the cross-platform CLI tool described in
+<a href="guide_cli_index.md.html#The%20Command-Line%20Interface">The Command-Line Interface</a>.</p>
+
+<p>The Cordova download contains separate archives for each platform. Be
+sure to expand the appropriate archive, <code>android</code> in this case, within
+an empty directory.  The relevant executible utilities are available
+in the top-level <code>bin</code> directory. (Consult the <strong>README</strong> file if
+necessary for more detailed directions.)</p>
+
+<p>These shell tools allow you to create, build, and run Android apps.
+For information on the additional command-line interface that enables
+plugin features across all platforms, see <a href="#Using%20Plugman%20to%20Manage%0APlugins">Using Plugman to Manage
+Plugins</a>. See Application Plugins for details on how to develop
+plugins.</p>
 
 <p>Install the Android SDK from
 <a class="external" href="http://developer.android.com/sdk/">developer.android.com/sdk</a>. The android sdk
@@ -197,18 +195,13 @@ On windows, the adt-bundle is packaged w
 On OSX and Linux, simply unpack the 'adt-bundle' in the location you store development tools. 
 <a class="external" href="http://developer.android.com/sdk/installing/bundle.html">More detailed information on Android SDK setup can be found here</a></p>
 
-<p>For Cordova command-line tools to work, you need to include the SDK's
-<code>tools</code> and <code>platform-tools</code> directories in your PATH environment. You also
-will need <code>java</code> and <code>ant</code>. You may already have <code>java</code> and <code>ant</code> in your
-PATH environment, try invoking them from a command line prompt to see if they
-are missing, and add only what is missing to your PATH. Be aware that Mavericks
-omits <code>ant</code> as compared to previous versions of OSX, so you may need to
-install <code>ant</code> separately if you are using Mavericks or later of OSX. On
-OSX or Linux, you can use a text editor to create or modify the
-<code>~/.bash_profile</code> file, adding a line such as the following (modify the
-locations to where the SDK is installed on your workstation):</p>
+<p>For Cordova command-line tools to work, or the CLI that is based upon
+them, you need to include the SDK's <code>tools</code> and <code>platform-tools</code>
+directories in your <code>PATH</code>.  On a Mac, you can use a text editor to
+create or modify the <code>~/.bash_profile</code> file, adding a line such as the
+following, depending on where the SDK installs:</p>
 
-<pre class="prettyprint"><code>export PATH=${PATH}:/Development/adt-bundle/sdk/platform-tools:/Development/adt-bundle/sdk/tools
+<pre class="prettyprint"><code>    export PATH=${PATH}:/Development/adt-bundle/sdk/platform-tools:/Development/adt-bundle/sdk/tools
 </code></pre>
 
 <p>Add the paths for <code>java</code> and <code>ant</code> if needed. This line in <code>~/.bash_profile</code>
@@ -216,85 +209,126 @@ exposes these tools in newly opened term
 window is already open in OSX, or to avoid a logout/login on Linux, run
 this to make them available in the current terminal window:</p>
 
-<pre class="prettyprint"><code>$ source ~/.bash_profile
+<pre class="prettyprint"><code>    $ source ~/.bash_profile
 </code></pre>
 
-<p>To modify the PATH environment on Windows:</p>
+<p>To modify the <code>PATH</code> environment on Windows 7:</p>
 
-<ul>
+<ol>
 <li><p>Click on the <strong>Start</strong> menu in the lower-left corner of the desktop,
-right-click on <strong>Computer</strong>, then click <strong>Properties</strong>.</p></li>
-<li><p>Click <strong>Advanced System Settings</strong> in the column on the left.</p></li>
+right-click on <strong>Computer</strong>, then select <strong>Properties</strong>.</p></li>
+<li><p>Select <strong>Advanced System Settings</strong> in the column on the left.</p></li>
 <li><p>In the resulting dialog box, press <strong>Environment Variables</strong>.</p></li>
 <li><p>Select the <strong>PATH</strong> variable and press <strong>Edit</strong>.</p></li>
 <li>
-<p>Append the following to the PATH based on where you installed the
+<p>Append the following to the <code>PATH</code> based on where you installed the
 SDK, for example:</p>
 
 <pre class="prettyprint"><code>;C:\Development\adt-bundle\sdk\platform-tools;C:\Development\adt-bundle\sdk\tools
 </code></pre>
 </li>
 <li><p>Save the value and close both dialog boxes.</p></li>
-<li>
-<p>You may also need to add Java and Ant. Open a command prompt and
-type <code>java</code>, and also type <code>ant</code>. For whichever fail to run, append to the PATH
-like this:</p>
+</ol>
 
-<pre class="prettyprint"><code>;%JAVA_HOME%\bin;%ANT_HOME%\bin
+<p>You may also need to enable Java and Ant. Open a command prompt and
+type <code>java</code>, and also type <code>ant</code>. Append to the <code>PATH</code> whichever of
+these fails to run:</p>
+
+<pre class="prettyprint"><code>    ;%JAVA_HOME%\bin;%ANT_HOME%\bin
 </code></pre>
-</li>
-</ul>
 
-<h2><a name="Android%20Platform%20Guide_open_a_project_in_the_sdk">Open a Project in the SDK</a></h2>
+<h2><a name="Android%20Platform%20Guide_open_a_new_project_in_the_sdk">Open a New Project in the SDK</a></h2>
 
-<p>Use the <code>cordova</code> utility to set up a new project, as described in The
-Cordova <a href="guide_cli_index.md.html#The%20Command-Line%20Interface">The Command-Line Interface</a>. For example, in a source-code directory:</p>
+<p>At this point, to create a new project you can choose between the
+cross-platform CLI tool described in <a href="guide_cli_index.md.html#The%20Command-Line%20Interface">The Command-Line Interface</a>, or
+the set of Android-specific shell tools. From within a source-code
+directory, here's the CLI approach:</p>
 
-<pre class="prettyprint"><code>    $ cordova create hello com.example.hello "HelloWorld"
+<pre class="prettyprint"><code>    $ cordova create hello com.example.hello HelloWorld
     $ cd hello
     $ cordova platform add android
     $ cordova build
 </code></pre>
 
-<p>Once created, you can use the Eclipse that comes along with the Android SDK to modify it:</p>
+<p>Here's the corresponding lower-level shell-tool approach for both Unix
+and Windows:</p>
 
-<ul>
+<pre class="prettyprint"><code>    $ /path/to/cordova-android/bin/create /path/to/new/hello com.example.hello HelloWorld
+    C:\path\to\cordova-android\bin\create.bat C:\path\to\new\hello com.example.hello HelloWorld
+</code></pre>
+
+<p>Here's how to use the SDK to modify it:</p>
+
+<ol>
 <li><p>Launch the <strong>Eclipse</strong> application.</p></li>
 <li><p>Select the <strong>New Project</strong> menu item.</p></li>
-<li><p>Choose <strong>Android Project from Existing Code</strong> from the resulting dialog box, and press <strong>Next</strong>:
-<img src="img/guide/platforms/android/eclipse_new_project.png" alt="" title=""></p></li>
-<li><p>Navigate to <code>hello</code>, or whichever directory you created for the project, then to the <code>platforms/android</code> subdirectory.</p></li>
-<li><p>Make sure both <code>hello</code> and <code>hello-CordovaLib</code> projects are selected to be imported. The <code>hello-CordovaLib</code> project is needed as of Cordova 3.3.0 because Cordova is now used as an Android Library instead of a .jar file.</p></li>
+<li>
+<p>Choose <strong>Android Project from Existing Code</strong> from the resulting
+dialog box, and press <strong>Next</strong>:</p>
+
+<p><img src="img/guide/platforms/android/eclipse_new_project.png" alt="" title=""></p>
+</li>
+<li><p>If you're using the CLI, navigate to the <code>hello</code> directory you
+created for the project, then to the <code>platforms/android</code>
+subdirectory. Alternately, if you use the <code>create</code> shell utility,
+simply navigate to the <code>hello</code> directory.</p></li>
 <li><p>Press <strong>Finish</strong>.</p></li>
-</ul>
+</ol>
 
 <p>Once the Eclipse window opens, a red <strong>X</strong> may appear to indicate
 unresolved problems. If so, follow these additional steps:</p>
 
-<ul>
+<ol>
 <li><p>Right-click on the project directory.</p></li>
 <li><p>In the resulting <strong>Properties</strong> dialog, select <strong>Android</strong> from the navigation pane.</p></li>
 <li><p>For the project build target, select the highest Android API level you have installed.</p></li>
 <li><p>Click <strong>OK</strong>.</p></li>
 <li><p>Select <strong>Clean</strong> from the <strong>Project</strong> menu. This should correct all the errors in the project.</p></li>
-</ul>
+</ol>
 
-<h2><a name="Android%20Platform%20Guide_deploy_to_emulator">Deploy to Emulator</a></h2>
+<h2><a name="Android%20Platform%20Guide_build_the_project">Build the Project</a></h2>
 
-<p>You can use the <code>cordova</code> utility to run an app in an emulator, or you
-can run it within the SDK.  Either way, the SDK must first be
-configured to display at least one device. To do so, use the Android
-SDK Manager, a Java application that runs separately from Eclipse.
-There are two ways to open it:</p>
+<p>If you are using the CLI in development, the project directory's
+top-level <code>www</code> directory contains the source files. Run either of
+these within the project directory to rebuild the app:</p>
 
-<ul>
+<pre class="prettyprint"><code>    $ cordova build
+    $ cordova build android   # do not rebuild other platforms
+</code></pre>
+
+<p>If you are using the Android-specific shell tools in development,
+there is a different approach.  Once you generate the project, the
+default app's source is available in the <code>assets/www</code> subdirectory.
+Subsequent commands are available in its <code>cordova</code> subdirectory.</p>
+
+<p>The <code>build</code> command cleans project files and rebuilds the app. Here is
+the syntax for both Mac and Windows. The first pair of examples
+generate debugging information, and the second signs the apps for
+release:</p>
+
+<pre class="prettyprint"><code>    $ /path/to/project/cordova/build --debug
+    C:\path\to\project\cordova\build.bat --debug
+
+    $ /path/to/project/cordova/build --release
+    C:\path\to\project\cordova\build.bat --release
+</code></pre>
+
+<h2><a name="Android%20Platform%20Guide_configure_an_emulator">Configure an Emulator</a></h2>
+
+<p>You can use either the <code>cordova</code> CLI utility or Cordova's
+Android-centered shell tools to run an app in an emulator.  Either
+way, the SDK must first be configured to display at least one device.
+To do so, use the Android SDK Manager, a Java application that runs
+separately from Eclipse.  There are two ways to open it:</p>
+
+<ol>
 <li><p>Run <code>android</code> on the command line.</p></li>
 <li>
 <p>From within Eclipse, press this toolbar icon:</p>
 
 <p><img src="img/guide/platforms/android/eclipse_android_sdk_button.png" alt="" title=""></p>
 </li>
-</ul>
+</ol>
 
 <p>Once open, the Android SDK Manager displays various runtime libraries:</p>
 
@@ -321,13 +355,37 @@ additional controls available for hardwa
 
 <p><img src="img/guide/platforms/android/asdk_emulator.png" alt="" title=""></p>
 
-<p>At this point you can use the <code>cordova</code> utility to deploy the
+<h2><a name="Android%20Platform%20Guide_deploy_to_emulator">Deploy to Emulator</a></h2>
+
+<p>At this point you can use the <code>cordova</code> CLI utility to deploy the
 application to the emulator from the command line:</p>
 
 <pre class="prettyprint"><code>    $ cordova emulate android
 </code></pre>
 
-<p>If instead you work within Eclipse, right-click the project and
+<p>Otherwise use the alternate shell interface:</p>
+
+<pre class="prettyprint"><code>    $ /path/to/project/cordova/run --emulator
+</code></pre>
+
+<p>Instead of relying on whichever emulator is currently enabled within
+the SDK, you can refer to each by the names you supply:</p>
+
+<pre class="prettyprint"><code>    $ /path/to/project/cordova/run --target=NAME
+</code></pre>
+
+<p>This pushes the app to the home screen and launches it:</p>
+
+<p><img src="img/guide/platforms/android/emulator2x.png" alt="" title=""></p>
+
+<p>When you <code>run</code> the app, you also <code>build</code> it. You can append additional
+<code>--debug</code>, <code>--release</code>, and <code>--nobuild</code> flags to control how it is
+built, or even whether a rebuild is necessary:</p>
+
+<pre class="prettyprint"><code>    $ /path/to/project/cordova/run --emulator --nobuild
+</code></pre>
+
+<p>If instead you are working within Eclipse, right-click the project and
 choose <strong>Run As → Android Application</strong>. You may be asked to
 specify an AVD if none are already open.</p>
 
@@ -367,13 +425,16 @@ Android SDK at <code>extras/intel/Hardwa
 <strong>Note</strong>:<code>If you have any problems installing the package, you can find more information and step by step guidance check this</code> 
 <a class="external" href="http://software.intel.com/en-us/android/articles/speeding-up-the-android-emulator-on-intel-architecture">Intel Article</a>.</p>
 
-<p>Once installed, in order to test it, create new a AVD  with the <code>CPU/ABI</code> set to an <code>Intel (Atom) x86</code>  Image:</p>
-
-<p><img src="img/guide/platforms/android/asdk_new_and_dev_intel.png" alt="" title=""></p>
-
-<p>If you are using <code>Linux-based system</code>, follow the instructions in the <a class="external" href="http://developer.android.com/tools/devices/emulator.html#vm-linux">Android Developer Site</a>.</p>
-
-<p>When starting the emulator, ensure there are no error messages indicating a failure to load HAXM modules.</p>
+<ol>
+<li><p>Install one or more <code>Intel x86 Atom</code> System Images as well as the
+<code>Intel Hardware Accelerated Execution Manager</code>, available under
+<strong>Extras</strong>.</p></li>
+<li><p>Run the Intel installer, which is available within your Android SDK
+at <code>extras/intel/Hardware_Accelerated_Execution_Manager</code>.</p></li>
+<li><p>Create a new AVD with the target set to an Intel image.</p></li>
+<li><p>When starting the emulator, ensure there are no error messages
+indicating a failure to load HAX modules.</p></li>
+</ol>
 
 <h2><a name="Android%20Platform%20Guide_deploy_to_device">Deploy to Device</a></h2>
 
@@ -382,13 +443,36 @@ enabled on your device as described on t
 <a class="external" href="http://developer.android.com/tools/device.html">Android Developer Site</a>,
 and use a mini USB cable to plug it into your system.</p>
 
-<p>You can push the app to the device from the command line:</p>
+<p>You can use this CLI command to push the app to the device:</p>
 
 <pre class="prettyprint"><code>    $ cordova run android
 </code></pre>
 
-<p>Alternately within Eclipse, right-click the project and choose <strong>Run
-As → Android Application</strong>.</p>
+<p>...or use this Android-centered shell interface:</p>
+
+<pre class="prettyprint"><code>    $ /path/to/project/cordova/run --device
+</code></pre>
+
+<p>With no flags specified, the <code>run</code> command detects a connected
+device, or a currently running emulator if no device is found,
+otherwise it prompts to specify an emulator.</p>
+
+<p>To run the app from within Eclipse, right-click the project and choose
+<strong>Run As → Android Application</strong>.</p>
+
+<h2><a name="Android%20Platform%20Guide_other_commands">Other Commands</a></h2>
+
+<p>The following generates a detailed log of the app as it runs:</p>
+
+<pre class="prettyprint"><code>    $ /path/to/project/cordova/log
+    C:\path\to\project\cordova\log.bat
+</code></pre>
+
+<p>The following cleans the project files:</p>
+
+<pre class="prettyprint"><code>    $ /path/to/project/cordova/clean
+    C:\path\to\project\cordova\clean.bat
+</code></pre>
 
             </div>
         </div>

Modified: cordova/site/public/docs/en/edge/guide_platforms_android_tools.md.html
URL: http://svn.apache.org/viewvc/cordova/site/public/docs/en/edge/guide_platforms_android_tools.md.html?rev=1590759&r1=1590758&r2=1590759&view=diff
==============================================================================
--- cordova/site/public/docs/en/edge/guide_platforms_android_tools.md.html (original)
+++ cordova/site/public/docs/en/edge/guide_platforms_android_tools.md.html Mon Apr 28 19:25:02 2014
@@ -111,12 +111,12 @@
             </small>
         </div>
         <div id="subheader">
-            <h1>Android Command-line Tools</h1>
-            <small><select><option value="Android%2520Command-line%2520Tools">Android Command-line Tools</option>
-<option value="Android%20Command-line%20Tools_create_a_project">      - Create a Project</option>
-<option value="Android%20Command-line%20Tools_build">      - Build</option>
-<option value="Android%20Command-line%20Tools_run_the_app">      - Run the App</option>
-<option value="Android%20Command-line%20Tools_logging">      - Logging</option></select></small>
+            <h1>Android Shell Tool Guide</h1>
+            <small><select><option value="Android%2520Shell%2520Tool%2520Guide">Android Shell Tool Guide</option>
+<option value="Android%20Shell%20Tool%20Guide_create_a_project">      - Create a Project</option>
+<option value="Android%20Shell%20Tool%20Guide_build">      - Build</option>
+<option value="Android%20Shell%20Tool%20Guide_run_the_app">      - Run the App</option>
+<option value="Android%20Shell%20Tool%20Guide_logging">      - Logging</option></select></small>
         </div>
 
         <div id="sidebar">
@@ -146,50 +146,57 @@
 
         <div id="scrollable">
             <div id="content">
-                <h1><a name="Android%20Command-line%20Tools">Android Command-line Tools</a></h1>
+                <h1><a name="Android%20Shell%20Tool%20Guide">Android Shell Tool Guide</a></h1>
 
-<p>The <code>cordova</code> command-line utility is a high-level tool that allows
-you to build applications across several platforms at once. An older
-version of the Cordova framework provides sets of command-line tools
-specific to each platform. To use them as an alternative to the CLI,
-you need to download this version of Cordova from
+<p>This guide shows how to use Cordova's set of platform-centered shell
+tools to develop Android apps. This development path, discussed in the
+<a href="guide_overview_index.md.html#Overview">Overview</a>, may offer you a greater range of development options than
+the cross-platform CLI tool described in <a href="guide_cli_index.md.html#The%20Command-Line%20Interface">The Command-Line Interface</a>.
+For example, you need to use shell tools when deploying a custom
+Cordova WebView alongside native components.  Before using either
+development path, you must first configure the Android SDK environment
+as described in the <a href="guide_platforms_android_index.md.html#Android%20Platform%20Guide">Android Platform Guide</a>.</p>
+
+<p>To enable shell tools for Android, download Cordova from
 <a class="external" href="http://cordova.apache.org">cordova.apache.org</a>. The download contains
-separate archives for each platform. Expand the platform you wish to
-target. The tools described here are typically available in the
-top-level <code>bin</code> directory, otherwise consult the <strong>README</strong> file for
-more detailed directions.</p>
-
-<p>For information on the low-level command-line interface that enables
-plugins, see <a href="plugin_ref_plugman.md.html#Using%20Plugman%20to%20Manage%20Plugins">Using Plugman to Manage Plugins</a>. See Application Plugins
-for an overview.</p>
+separate archives for each platform. Expand each you wish to target,
+<code>android</code> in this case. The relevant tools are typically available in
+the top-level <code>bin</code> directory, otherwise consult the <strong>README</strong> file
+for more detailed directions.</p>
+
+<p>These tools allow you to create, build, and run Android apps.  For
+information on the additional command-line interface that enables
+plugin features across all platforms, see <a href="#Using%20Plugman%20to%20Manage%0APlugins">Using Plugman to Manage
+Plugins</a>. See Application Plugins for details on how to develop
+plugins.</p>
 
-<h2><a name="Android%20Command-line%20Tools_create_a_project">Create a Project</a></h2>
+<h2><a name="Android%20Shell%20Tool%20Guide_create_a_project">Create a Project</a></h2>
 
 <p>Run the <code>create</code> command, specifying the existing path to the project,
 the reverse-domain-style package identifier, and the app's display
 name.  Here is the syntax for both Mac and Windows:</p>
 
-<pre class="prettyprint"><code>$ /path/to/cordova-android/bin/create /path/to/project com.example.project_name ProjectName
-$ C:\path\to\cordova-android\bin\create.bat C:\path\to\project com.example.project_name ProjectName
+<pre class="prettyprint"><code>    $ /path/to/cordova-android/bin/create /path/to/project com.example.project_name ProjectName
+    $ C:\path\to\cordova-android\bin\create.bat C:\path\to\project com.example.project_name ProjectName
 </code></pre>
 
-<h2><a name="Android%20Command-line%20Tools_build">Build</a></h2>
+<h2><a name="Android%20Shell%20Tool%20Guide_build">Build</a></h2>
 
 <p>This cleans then builds a project.</p>
 
 <p>Debug, on Mac or Windows:</p>
 
-<pre class="prettyprint"><code>$ /path/to/project/cordova/build --debug
-$ C:\path\to\project\cordova\build.bat --debug
+<pre class="prettyprint"><code>    $ /path/to/project/cordova/build --debug
+    $ C:\path\to\project\cordova\build.bat --debug
 </code></pre>
 
 <p>Release, on Mac or Windows:</p>
 
-<pre class="prettyprint"><code>$ /path/to/project/cordova/build --release
-$ C:\path\to\project\cordova\build.bat --release
+<pre class="prettyprint"><code>    $ /path/to/project/cordova/build --release
+    $ C:\path\to\project\cordova\build.bat --release
 </code></pre>
 
-<h2><a name="Android%20Command-line%20Tools_run_the_app">Run the App</a></h2>
+<h2><a name="Android%20Shell%20Tool%20Guide_run_the_app">Run the App</a></h2>
 
 <p>The <code>run</code> command accepts the following <em>optional</em> parameters:</p>
 
@@ -198,8 +205,9 @@ $ C:\path\to\project\cordova\build.bat -
 <li>
 <p>Build specification. This includes <code>--debug</code>, <code>--release</code>, or <code>--nobuild</code>.</p>
 
-<p>$ /path/to/project/cordova/run [Target] [Build]
-$ C:\path\to\project\cordova\run.bat [Target] [Build]</p>
+<pre class="prettyprint"><code>$ /path/to/project/cordova/run [Target] [Build]
+$ C:\path\to\project\cordova\run.bat [Target] [Build]
+</code></pre>
 </li>
 </ul>
 
@@ -209,16 +217,16 @@ AVD is available as a target, you're pro
 default the <code>run</code> command detects a connected device, or a currently
 running emulator if no device is found.</p>
 
-<h2><a name="Android%20Command-line%20Tools_logging">Logging</a></h2>
+<h2><a name="Android%20Shell%20Tool%20Guide_logging">Logging</a></h2>
 
-<pre class="prettyprint"><code>$ /path/to/project/cordova/log
-$ C:\path\to\project\cordova\log.bat
+<pre class="prettyprint"><code>    $ /path/to/project/cordova/log
+    $ C:\path\to\project\cordova\log.bat
 </code></pre>
 
 <h3>Cleaning</h3>
 
-<pre class="prettyprint"><code>$ /path/to/project/cordova/clean
-$ C:\path\to\project\cordova\clean.bat
+<pre class="prettyprint"><code>    $ /path/to/project/cordova/clean
+    $ C:\path\to\project\cordova\clean.bat
 </code></pre>
 
             </div>

Modified: cordova/site/public/docs/en/edge/guide_platforms_android_webview.md.html
URL: http://svn.apache.org/viewvc/cordova/site/public/docs/en/edge/guide_platforms_android_webview.md.html?rev=1590759&r1=1590758&r2=1590759&view=diff
==============================================================================
--- cordova/site/public/docs/en/edge/guide_platforms_android_webview.md.html (original)
+++ cordova/site/public/docs/en/edge/guide_platforms_android_webview.md.html Mon Apr 28 19:25:02 2014
@@ -144,7 +144,7 @@
             <div id="content">
                 <h1><a name="Android%20WebViews">Android WebViews</a></h1>
 
-<p>This section shows how to embed a Cordova-enabled WebView component
+<p>This guide shows how to embed a Cordova-enabled WebView component
 within a larger Android application. For details on how these
 components can communicate with each other, see Application Plugins.</p>
 

Modified: cordova/site/public/docs/en/edge/guide_platforms_blackberry10_config.md.html
URL: http://svn.apache.org/viewvc/cordova/site/public/docs/en/edge/guide_platforms_blackberry10_config.md.html?rev=1590759&r1=1590758&r2=1590759&view=diff
==============================================================================
--- cordova/site/public/docs/en/edge/guide_platforms_blackberry10_config.md.html (original)
+++ cordova/site/public/docs/en/edge/guide_platforms_blackberry10_config.md.html Mon Apr 28 19:25:02 2014
@@ -173,7 +173,7 @@ popups display in a child browser window
 <p><code>WebSecurity</code> (<code>disable</code> or the default <code>enable</code>): Set to <code>disable</code>
 to override web security settings, allowing access to remote content
 from unknown sources. This preference is intended as a development
-convenience only, so remove it before packaging your app for
+convenience only, so remove it before packaging the app for
 distribution.  For the released app, all URIs should be known and
 whitelisted using the <code>&lt;access&gt;</code> element, described in the Domain
 <a href="guide_appdev_whitelist_index.md.html#Whitelist%20Guide">Whitelist Guide</a>.</p>

Modified: cordova/site/public/docs/en/edge/guide_platforms_blackberry10_index.md.html
URL: http://svn.apache.org/viewvc/cordova/site/public/docs/en/edge/guide_platforms_blackberry10_index.md.html?rev=1590759&r1=1590758&r2=1590759&view=diff
==============================================================================
--- cordova/site/public/docs/en/edge/guide_platforms_blackberry10_index.md.html (original)
+++ cordova/site/public/docs/en/edge/guide_platforms_blackberry10_index.md.html Mon Apr 28 19:25:02 2014
@@ -114,6 +114,7 @@
             <h1>BlackBerry 10 Platform Guide</h1>
             <small><select><option value="BlackBerry%252010%2520Platform%2520Guide">BlackBerry 10 Platform Guide</option>
 <option value="BlackBerry%2010%20Platform%20Guide_requirements">      - Requirements</option>
+<option value="BlackBerry%2010%20Platform%20Guide_install_the_blackberry_webworks_sdk">      - Install the BlackBerry WebWorks SDK</option>
 <option value="BlackBerry%2010%20Platform%20Guide_install_the_blackberry_native_sdk">      - Install the BlackBerry Native SDK</option>
 <option value="BlackBerry%2010%20Platform%20Guide_set_up_for_signing">      - Set up for Signing</option>
 <option value="BlackBerry%2010%20Platform%20Guide_create_a_project">      - Create a Project</option>
@@ -153,35 +154,48 @@
             <div id="content">
                 <h1><a name="BlackBerry%2010%20Platform%20Guide">BlackBerry 10 Platform Guide</a></h1>
 
-<p>This guide shows how to set up your development environment to build
-and deploy Cordova apps for BlackBerry 10 devices.  For previous
-versions of BlackBerry, you need to use a different set of
-command-line tools, described in BlackBerry Platform Guide.</p>
+<p>This guide shows how to set up your SDK environment to deploy
+Cordova apps for BlackBerry 10 devices.  For previous versions of
+BlackBerry, you need to use a different SDK environment and set of
+command-line tools, described in the BlackBerry Platform Guide.
+For BlackBerry 10, you need to install the SDK regardless of whether
+you want to use the cross-platform Cordova CLI for development, or a
+narrower set of platform-centered command-line tools.  For a
+comparison of the two development paths, see the <a href="guide_overview_index.md.html#Overview">Overview</a>.  For
+details on each, see <a href="guide_cli_index.md.html#The%20Command-Line%20Interface">The Command-Line Interface</a> and the <a href="#BlackBerry%2010%0AShell%20Tool%20Guide">BlackBerry 10
+Shell Tool Guide</a>.</p>
 
 <h2><a name="BlackBerry%2010%20Platform%20Guide_requirements">Requirements</a></h2>
 
 <p>The development environment is available on Windows, Mac and Linux.</p>
 
 <p>Developers should use the <code>cordova</code> utility in conjunction with the
-BlackBerry WebWorks SDK or BlackBerry Native SDK. See <a href="guide_cli_index.md.html#The%20Command-Line%20Interface">The Command-Line
-Interface</a> for information how to install `cordova`, add projects, then
+BlackBerry WebWorks SDK or BlackBerry Native SDK. See <a href="#The%20Command-Line%0AInterface">The Command-Line
+Interface</a> for information how to install <code>cordova</code>, add projects, then
 build and deploy for each platform.</p>
 
 <p>Blackberry 10 Device Simulator:</p>
 
-<pre class="prettyprint"><code>* `Processor:`Intel dual core 2.0 GHz/AMD Athlon 4200+ or higher
-* `Disk space: 10 GB`
-* `RAM Memory: 4 GB`
-* `Virtualization:
-    * __Intel Virtualization Technology__ (VT, VT-x, vmx) &amp;rarr; [Intel VT-x supported processor list](http://ark.intel.com/products/virtualizationtechnology)
-    * __AMD Virtualization__ (AMD-V, SVM) (Since May 2006, all CPUs AMD include AMD-V, except Sempron).
-</code></pre>
+<ul>
+<li>Processor: Intel dual core 2.0 GHz/AMD Athlon 4200+ or higher</li>
+<li>Disk space: 10 GB </li>
+<li>RAM Memory: 4 GB </li>
+<li>Virtualization: one of the following:
+<ul>
+<li>
+<strong>Intel Virtualization Technology</strong> (VT, VT-x, vmx) → <a class="external" href="http://ark.intel.com/products/virtualizationtechnology">Intel VT-x supported processor list</a>
+</li>
+<li>
+<strong>AMD Virtualization</strong> (AMD-V, SVM) (Since May 2006 all AMD CPUs include AMD-V except Sempron).</li>
+</ul>
+</li>
+</ul>
 
 <p>More information about requirements: <a class="external" href="http://developer.blackberry.com/devzone/develop/simulator/simulator_systemrequirements.html">BB10 Simulator requeriments</a>.</p>
 
 <h2><a name="BlackBerry%2010%20Platform%20Guide_install_the_blackberry_webworks_sdk">Install the BlackBerry WebWorks SDK</a></h2>
 
-<p>Download and install the BlackBerry WebWorks SDK from <a class="external" href="https://developer.blackberry.com/html5/download">developer.blackberry.com</a></p>
+<p>Download and install the BlackBerry WebWorks SDK from <a class="external" href="https://developer.blackberry.com/html5/download/">developer.blackberry.com</a></p>
 
 <p>The installer will add command-line tools to your path. Depending on your OS,
 you may need to open a new terminal window or re-log in.</p>
@@ -203,7 +217,8 @@ system path.</p>
 <li>
 <p>Append the Native SDK's install directory to the PATH, for example:</p>
 
-<p>;C:\bbndk\host<em>10</em>2<em>0</em>132\darwin\x86\usr\bin\</p>
+<pre class="prettyprint"><code>;C:\bbndk\host_10_1_0_132\win32\x86\usr\bin\
+</code></pre>
 </li>
 </ul>
 
@@ -214,29 +229,56 @@ system path.</p>
 <p>Edit the <code>~/.bash_profile</code> file, adding a line such as the
 following, depending on where the Native SDK was installed:</p>
 
-<p>$ export PATH=${PATH}:/Applications/Momentics.app/host<em>10</em>2<em>0</em>15/darwin/x86/usr/bin/</p>
+<pre class="prettyprint"><code>$ export PATH=${PATH}:/Applications/bbndk/host_10_1_0_132/darwin/x86/usr/bin/
+</code></pre>
+
+<p>or for the 10.2 Native SDK:</p>
+
+<pre class="prettyprint"><code>$ export PATH=${PATH}:/Applications/Momentics.app/host_10_2_0_15/darwin/x86/usr/bin/
+</code></pre>
 </li>
 <li>
 <p>Run the following to apply the change in the current session:</p>
 
-<p>$ source ~/.bash_profile</p>
+<pre class="prettyprint"><code>$ source ~/.bash_profile
+</code></pre>
 </li>
 </ul>
 
 <p>If you got any environmental problem, using the Native SDK from the command line, execute the appropriate file for your platform, located within the installation path:</p>
 
-<pre class="prettyprint"><code>* On Windows:
-    $ `\bbndk\bbndk-env_xx_xx_xx_xxxx.bat`
+<ul>
+<li>
+<p>On Windows → MS-DOS shell:</p>
 
-* On Linux &amp;rarr; Installed as root user:
-    $ `./opt/bbndk/bbndk-env_xx_xx_xx_xxxx.sh`
+<pre class="prettyprint"><code>C:\&gt; \bbndk\bbndk-env_xx_xx_xx_xxxx.bat
+</code></pre>
+</li>
+<li>
+<p>On Windows → git bash shell:</p>
 
-* On Linux &amp;rarr; Installed as non-root user:
-    $ `./home/username/bbndk/bbndk-env_xx_xx_xx_xxxx.sh`
+<pre class="prettyprint"><code>$ `\bbndk\bbndk-env_xx_xx_xx_xxxx.bat`
+</code></pre>
+</li>
+<li>
+<p>On Linux → Installed as root user:</p>
+
+<pre class="prettyprint"><code>$ `./opt/bbndk/bbndk-env_xx_xx_xx_xxxx.sh`
+</code></pre>
+</li>
+<li>
+<p>On Linux → Installed as non-root user:</p>
+
+<pre class="prettyprint"><code>$ `./home/username/bbndk/bbndk-env_xx_xx_xx_xxxx.sh`
+</code></pre>
+</li>
+<li>
+<p>On Mac:</p>
 
-* On Mac:
-    $ `/Developer/SDKs/bbndk/bbndk-env_xx_xx_xx_xxxx.sh`
+<pre class="prettyprint"><code>$ `/Developer/SDKs/bbndk/bbndk-env_xx_xx_xx_xxxx.sh`
 </code></pre>
+</li>
+</ul>
 
 <h2><a name="BlackBerry%2010%20Platform%20Guide_set_up_for_signing">Set up for Signing</a></h2>
 
@@ -259,13 +301,13 @@ download page.</p>
 
 <h2><a name="BlackBerry%2010%20Platform%20Guide_create_a_project">Create a Project</a></h2>
 
-<p>Use the <code>cordova</code> utility to set up a new project, as described in <a href="#The%0ACommand-Line%20Interface">The
-Command-Line Interface</a>. For example, in a source-code directory:</p>
+<p>Use the <code>cordova</code> utility to set up a new project, as described in The
+Command-line Interface. For example, in a source-code directory:</p>
 
-<pre class="prettyprint"><code>$ cordova create hello com.example.hello
-$ cd hello
-$ cordova platform add blackberry10
-$ cordova build
+<pre class="prettyprint"><code>    $ cordova create hello com.example.hello
+    $ cd hello
+    $ cordova platform add blackberry10
+    $ cordova build
 </code></pre>
 
 <h2><a name="BlackBerry%2010%20Platform%20Guide_deploy_to_emulator">Deploy to Emulator</a></h2>
@@ -290,33 +332,94 @@ section and enable the option:</p>
 
 <p><img src="img/guide/platforms/blackberry10/bb_devel.png" alt="" title=""></p>
 
+<p>An additional set of command-line utilities are included when you set
+up the BlackBerry 10 platform for your project.  The following
+command, in this case invoked from the project top-level directory,
+associates a target named <em>emu</em> with the IP address displayed above.</p>
+
+<ul>
+<li>
+<p>On Windows:</p>
+
+<pre class="prettyprint"><code>$ platforms\blackberry10\cordova\target.bat add emu 169.254.0.1 -t simulator
+</code></pre>
+</li>
+<li>
+<p>On Mac/Linux:</p>
+
+<pre class="prettyprint"><code>$ platforms/blackberry10/cordova/target add emu 169.254.0.1 -t simulator
+</code></pre>
+</li>
+</ul>
+
 <p>Then, run the <code>emulate</code> command to view the app:</p>
 
-<pre class="prettyprint"><code>$ cordova emulate blackberry10 --devicepass &lt;password&gt;
+<pre class="prettyprint"><code>    $ cordova emulate blackberry10
 </code></pre>
 
 <h2><a name="BlackBerry%2010%20Platform%20Guide_deploy_to_device">Deploy to Device</a></h2>
 
-<p>To deploy to a device, make sure it is plugged into your computer and
-development mode is enabled.</p>
+<p>To deploy to a device, make sure it is plugged into your computer.
+Enable development mode and obtain the IP address as desribed in the
+emulator section above. You will also need to obtain the PIN from the
+the <strong>Settings</strong> application under <strong>About → Hardware</strong>:</p>
+
+<p><img src="img/guide/platforms/blackberry10/bb_pin.png" alt="" title=""></p>
+
+<p>Run the target command-line utility to associate a name with an IP
+address, device password and PIN.</p>
+
+<ul>
+<li>
+<p>On Windows:</p>
+
+<pre class="prettyprint"><code>$ platforms\blackberry10\cordova\target.bat add mydevice 169.254.0.1 -t device --password 123456 --pin FFFF972E
+</code></pre>
+</li>
+<li>
+<p>On Mac/Linux:</p>
+
+<pre class="prettyprint"><code>$ platforms/blackberry10/cordova/target add mydevice 169.254.0.1 -t device --password 123456 --pin FFFF972E
+</code></pre>
+</li>
+</ul>
+
+<p>where:</p>
+
+<ul>
+<li><p><code>--password</code> refers to the password to unlock the device.</p></li>
+<li><p><code>--pin</code> refers to the device PIN obtained from the <strong>Settings</strong> application.</p></li>
+</ul>
 
 <p>Then, run the <code>run</code> command to view the app:</p>
 
-<pre class="prettyprint"><code>$ cordova run blackberry10 --devicepass &lt;password&gt;
+<pre class="prettyprint"><code>    $ cordova run blackberry10
 </code></pre>
 
 <p>If a debug token is not yet set up for the device, an error message
-prompts you to provide the password you defined when configuring your
-computer to sign applications.</p>
+prompts you to use the platform run script with the password you
+provided when registering for signing keys.</p>
+
+<ul>
+<li>
+<p>On Windows:</p>
+
+<pre class="prettyprint"><code>$ platforms\blackberry10\cordova\run.bat --device --keystorepass mysecret
+</code></pre>
+</li>
+<li>
+<p>On Mac/Linux:</p>
 
-<pre class="prettyprint"><code>$ cordova run blackberry10 --devicepass &lt;password&gt; --keystorepass &lt;signing password&gt;
+<pre class="prettyprint"><code>$ platforms/blackberry10/cordova/run --device --keystorepass mysecret
 </code></pre>
+</li>
+</ul>
 
 <h2><a name="BlackBerry%2010%20Platform%20Guide_debugging_with_webinspector">Debugging with WebInspector</a></h2>
 
 <p>When debugging on the device or an emulator, you may run WebInspector
 remotely to view the application's internal state.  A prompt displays
-the URL that allows you to connect to your app with a standard web
+the URL that allows you to connect to the app with a standard web
 browser.  For more information, see
 <a class="external" href="http://developer.blackberry.com/html5/documentation/web_inspector_overview_1553586_11.html">Debugging using WebInspector</a>.</p>
 
@@ -349,12 +452,14 @@ associates a target named <em>emu</em> w
 <li>
 <p>On Windows:</p>
 
-<p>$ platforms\blackberry10\cordova\target.bat add emu 192.168.2.24 -t simulator</p>
+<pre class="prettyprint"><code>$ platforms\blackberry10\cordova\build.bat --release --keystorepass mysecret
+</code></pre>
 </li>
 <li>
 <p>On Mac/Linux:</p>
 
-<p>$ platforms/blackberry10/cordova/target add emu 192.168.2.24 -t simulator</p>
+<pre class="prettyprint"><code>$ platforms/blackberry10/cordova/build --release --keystorepass mysecret
+</code></pre>
 </li>
 </ul>
 

Modified: cordova/site/public/docs/en/edge/guide_platforms_blackberry10_tools.md.html
URL: http://svn.apache.org/viewvc/cordova/site/public/docs/en/edge/guide_platforms_blackberry10_tools.md.html?rev=1590759&r1=1590758&r2=1590759&view=diff
==============================================================================
--- cordova/site/public/docs/en/edge/guide_platforms_blackberry10_tools.md.html (original)
+++ cordova/site/public/docs/en/edge/guide_platforms_blackberry10_tools.md.html Mon Apr 28 19:25:02 2014
@@ -111,13 +111,13 @@
             </small>
         </div>
         <div id="subheader">
-            <h1>BlackBerry 10 Command-line Tools</h1>
-            <small><select><option value="BlackBerry%252010%2520Command-line%2520Tools">BlackBerry 10 Command-line Tools</option>
-<option value="BlackBerry%2010%20Command-line%20Tools_create_an_app">      - Create an App</option>
-<option value="BlackBerry%2010%20Command-line%20Tools_create_a_target">      - Create a Target</option>
-<option value="BlackBerry%2010%20Command-line%20Tools_build_the_app">      - Build the App</option>
-<option value="BlackBerry%2010%20Command-line%20Tools_run_the_app">      - Run the App</option>
-<option value="BlackBerry%2010%20Command-line%20Tools_handle_plugins">      - Handle Plugins</option></select></small>
+            <h1>BlackBerry 10 Shell Tool Guide</h1>
+            <small><select><option value="BlackBerry%252010%2520Shell%2520Tool%2520Guide">BlackBerry 10 Shell Tool Guide</option>
+<option value="BlackBerry%2010%20Shell%20Tool%20Guide_create_an_app">      - Create an App</option>
+<option value="BlackBerry%2010%20Shell%20Tool%20Guide_create_a_target">      - Create a Target</option>
+<option value="BlackBerry%2010%20Shell%20Tool%20Guide_build_the_app">      - Build the App</option>
+<option value="BlackBerry%2010%20Shell%20Tool%20Guide_run_the_app">      - Run the App</option>
+<option value="BlackBerry%2010%20Shell%20Tool%20Guide_handle_plugins">      - Handle Plugins</option></select></small>
         </div>
 
         <div id="sidebar">
@@ -147,7 +147,7 @@
 
         <div id="scrollable">
             <div id="content">
-                <h1><a name="BlackBerry%2010%20Command-line%20Tools">BlackBerry 10 Command-line Tools</a></h1>
+                <h1><a name="BlackBerry%2010%20Shell%20Tool%20Guide">BlackBerry 10 Shell Tool Guide</a></h1>
 
 <p>The <code>cordova</code> command-line utility is a high-level tool that allows
 you to build applications across several platforms at once. An older
@@ -162,18 +162,18 @@ more detailed directions.</p>
 
 <p>For information on the low-level command-line interface that enables
 plugins, see <a href="plugin_ref_plugman.md.html#Using%20Plugman%20to%20Manage%20Plugins">Using Plugman to Manage Plugins</a>. See Application Plugins
-for an overview.</p>
+for details on how to develop plugins.</p>
 
 <p>If you need help with any command listed below, type the command along
 with the <code>-h</code> or <code>-help</code> arguments, which are supported by all
 commands and which provide descriptions for each of the available
 arguments.</p>
 
-<h2><a name="BlackBerry%2010%20Command-line%20Tools_create_an_app">Create an App</a></h2>
+<h2><a name="BlackBerry%2010%20Shell%20Tool%20Guide_create_an_app">Create an App</a></h2>
 
 <p>The <code>create</code> command creates a new project:</p>
 
-<pre class="prettyprint"><code>bin/create &lt;path-to-project&gt; &lt;project-package&gt; &lt;project-name&gt;
+<pre class="prettyprint"><code>    bin/create &lt;path-to-project&gt; &lt;project-package&gt; &lt;project-name&gt;
 </code></pre>
 
 <p>where</p>
@@ -191,15 +191,15 @@ privileges.  If there's problem on OSX/L
 before using the <code>create</code> command. On Windows, run <code>npm install</code> in a
 command-line utility opened with administrator privileges.</p>
 
-<h2><a name="BlackBerry%2010%20Command-line%20Tools_create_a_target">Create a Target</a></h2>
+<h2><a name="BlackBerry%2010%20Shell%20Tool%20Guide_create_a_target">Create a Target</a></h2>
 
 <p>The <code>target</code> command allows you to manage the emulator or BlackBerry
-devices that you use to test your app. You can add or remove a target,
+devices that you use to test the app. You can add or remove a target,
 or set a target as the default target.</p>
 
 <h3>Add a Target</h3>
 
-<pre class="prettyprint"><code>&lt;path-to-project&gt;/cordova/target add &lt;name&gt; &lt;ip-address&gt; [-t | --type &lt;device | simulator&gt;] [-p | --password &lt;password&gt;] [--pin &lt;device-pin&gt;]
+<pre class="prettyprint"><code>    &lt;path-to-project&gt;/cordova/target add &lt;name&gt; &lt;ip-address&gt; [-t | --type &lt;device | simulator&gt;] [-p | --password &lt;password&gt;] [--pin &lt;device-pin&gt;]
 </code></pre>
 
 <p>where</p>
@@ -219,23 +219,23 @@ token.</p></li>
 
 <h3>Remove a Target</h3>
 
-<pre class="prettyprint"><code>&lt;path-to-project&gt;/cordova/target remove &lt;name&gt;
+<pre class="prettyprint"><code>    &lt;path-to-project&gt;/cordova/target remove &lt;name&gt;
 </code></pre>
 
 <h3>Set a Target as the Default</h3>
 
-<pre class="prettyprint"><code>&lt;path-to-project&gt;/cordova/target default &lt;name&gt;
+<pre class="prettyprint"><code>    &lt;path-to-project&gt;/cordova/target default &lt;name&gt;
 </code></pre>
 
-<h2><a name="BlackBerry%2010%20Command-line%20Tools_build_the_app">Build the App</a></h2>
+<h2><a name="BlackBerry%2010%20Shell%20Tool%20Guide_build_the_app">Build the App</a></h2>
 
 <p>The <code>build</code> command builds the project as a .bar file. You can build
-your app in either release mode (which produces a signed .bar file) or
+the app in either release mode (which produces a signed .bar file) or
 in debug mode (which produces an unsigned .bar file).</p>
 
 <h3>Build the App in Release Mode</h3>
 
-<pre class="prettyprint"><code>&lt;path-to-project&gt;/cordova/build release [-k | --keystorepass &lt;password&gt;] [-b | --buildId &lt;number&gt;] [-p | --params &lt;params-JSON-file&gt;]
+<pre class="prettyprint"><code>    &lt;path-to-project&gt;/cordova/build release [-k | --keystorepass &lt;password&gt;] [-b | --buildId &lt;number&gt;] [-p | --params &lt;params-JSON-file&gt;]
 </code></pre>
 
 <p>where</p>
@@ -248,7 +248,7 @@ in debug mode (which produces an unsigne
 
 <h3>Build the Project in Debug Mode</h3>
 
-<pre class="prettyprint"><code>&lt;path-to-project&gt;/cordova/build debug [&lt;target&gt;] [-k | --keystorepass &lt;password&gt;] [-p | --params &lt;params-JSON-file&gt;]  [-ll | --loglevel &lt;error|warn|verbose&gt;]
+<pre class="prettyprint"><code>    &lt;path-to-project&gt;/cordova/build debug [&lt;target&gt;] [-k | --keystorepass &lt;password&gt;] [-p | --params &lt;params-JSON-file&gt;]  [-ll | --loglevel &lt;error|warn|verbose&gt;]
 </code></pre>
 
 <p>where</p>
@@ -257,7 +257,7 @@ in debug mode (which produces an unsigne
 <li><p><code>&lt;target&gt;</code> specifies the name of a previously added target. If
 <code>&lt;target&gt;</code> is not specified, the default target is used, if one has
 been created. This argument is only required if you want the script
-to deploy your app to a BlackBerry device or emulator and you have
+to deploy the app to a BlackBerry device or emulator and you have
 not created a default target. Additionally, if <code>&lt;target&gt;</code> is a
 device, then that device must be connected to your computer by USB
 connection or be connected to the same Wi-Fi network as your
@@ -278,43 +278,43 @@ installed a debug token, if that target 
 can run the script with no arguments, and the script packages your
 app and deploys it to the default target. For example:</p>
 
-<pre class="prettyprint"><code>&lt;path-to-project&gt;/cordova/build debug
+<pre class="prettyprint"><code>    &lt;path-to-project&gt;/cordova/build debug
 </code></pre>
 
-<h2><a name="BlackBerry%2010%20Command-line%20Tools_run_the_app">Run the App</a></h2>
+<h2><a name="BlackBerry%2010%20Shell%20Tool%20Guide_run_the_app">Run the App</a></h2>
 
 <p>The <code>run</code> command deploys the app's most recent build on the specified
 BlackBerry device or an emulator. To deploy your app, you need to
 specify a target for the device or emulator:</p>
 
-<pre class="prettyprint"><code>&lt;path-to-project&gt;/cordova/run &lt;target&gt;
+<pre class="prettyprint"><code>    &lt;path-to-project&gt;/cordova/run &lt;target&gt;
 </code></pre>
 
 <p>...where <code>&lt;target&gt;</code>specifies the name of a previously added target.
 If <code>&lt;target&gt;</code> is a device, then it must be connected to your computer
 via USB cable, or else over the same Wi-Fi network as your computer.</p>
 
-<h2><a name="BlackBerry%2010%20Command-line%20Tools_handle_plugins">Handle Plugins</a></h2>
+<h2><a name="BlackBerry%2010%20Shell%20Tool%20Guide_handle_plugins">Handle Plugins</a></h2>
 
 <p>The <code>target</code> command allows you to add and remove plugins.  To fetch a
 locally hosted plugin:</p>
 
-<pre class="prettyprint"><code>&lt;path-to-project&gt;/cordova/plugin fetch &lt;path-to-plugin&gt;
+<pre class="prettyprint"><code>    &lt;path-to-project&gt;/cordova/plugin fetch &lt;path-to-plugin&gt;
 </code></pre>
 
 <p>View a list of installed plugins:</p>
 
-<pre class="prettyprint"><code>&lt;path-to-project&gt;/cordova/plugin ls
+<pre class="prettyprint"><code>    &lt;path-to-project&gt;/cordova/plugin ls
 </code></pre>
 
 <p>Add a plugin:</p>
 
-<pre class="prettyprint"><code>&lt;path-to-project&gt;/cordova/plugin add &lt;name&gt;
+<pre class="prettyprint"><code>    &lt;path-to-project&gt;/cordova/plugin add &lt;name&gt;
 </code></pre>
 
 <p>Remove a plugin:</p>
 
-<pre class="prettyprint"><code>&lt;path-to-project&gt;/cordova/plugin rm &lt;name&gt;
+<pre class="prettyprint"><code>    &lt;path-to-project&gt;/cordova/plugin rm &lt;name&gt;
 </code></pre>
 
             </div>

Modified: cordova/site/public/docs/en/edge/guide_platforms_index.md.html
URL: http://svn.apache.org/viewvc/cordova/site/public/docs/en/edge/guide_platforms_index.md.html?rev=1590759&r1=1590758&r2=1590759&view=diff
==============================================================================
--- cordova/site/public/docs/en/edge/guide_platforms_index.md.html (original)
+++ cordova/site/public/docs/en/edge/guide_platforms_index.md.html Mon Apr 28 19:25:02 2014
@@ -184,21 +184,22 @@ a lower-level alternative to the <code>c
 
 <ul>
 <li><a href="guide_platforms_android_index.md.html#Android%20Platform%20Guide">Android Platform Guide</a></li>
+<li><a href="guide_platforms_android_tools.md.html#Android%20Shell%20Tool%20Guide">Android Shell Tool Guide</a></li>
 <li><a href="guide_platforms_android_config.md.html#Android%20Configuration">Android Configuration</a></li>
-<li><a href="guide_platforms_android_webview.md.html#Android%20WebViews">Android WebViews</a></li>
 <li><a href="guide_platforms_android_plugin.md.html#Android%20Plugins">Android Plugins</a></li>
-<li><a href="guide_platforms_android_tools.md.html#Android%20Command-line%20Tools">Android Command-line Tools</a></li>
-<li><a href="guide_platforms_android_upgrading.md.html#Upgrading%20Android">Upgrading Android</a></li>
+<li><a href="guide_platforms_android_webview.md.html#Android%20WebViews">Android WebViews</a></li>
+<li><a href="guide_platforms_android_upgrade.md.html#Upgrading%20Android">Upgrading Android</a></li>
 </ul>
 
 <h2><a name="Platform%20Guides_blackberry_10">BlackBerry 10</a></h2>
 
 <ul>
 <li><a href="guide_platforms_blackberry10_index.md.html#BlackBerry%2010%20Platform%20Guide">BlackBerry 10 Platform Guide</a></li>
-<li><a href="guide_platforms_blackberry10_config.md.html#BlackBerry%2010%20Configuration">BlackBerry 10 Configuration</a></li>
+<li><a href="guide_platforms_blackberry10_tools.md.html#BlackBerry%2010%20Shell%20Tool%20Guide">BlackBerry 10 Shell Tool Guide</a></li>
+<li>BlackBerry Configuration</li>
 <li><a href="guide_platforms_blackberry10_plugin.md.html#BlackBerry%2010%20Plugins">BlackBerry 10 Plugins</a></li>
-<li><a href="guide_platforms_blackberry10_tools.md.html#BlackBerry%2010%20Command-line%20Tools">BlackBerry 10 Command-line Tools</a></li>
-<li><a href="guide_platforms_blackberry10_upgrading.md.html#Upgrading%20BlackBerry%2010">Upgrading BlackBerry 10</a></li>
+<li>BlackBerry 10 Command-line Tools</li>
+<li><a href="guide_platforms_blackberry10_upgrade.md.html#Upgrading%20BlackBerry%2010">Upgrading BlackBerry 10</a></li>
 </ul>
 
 <h2><a name="Platform%20Guides_firefox_os">Firefox OS</a></h2>
@@ -211,11 +212,11 @@ a lower-level alternative to the <code>c
 
 <ul>
 <li><a href="guide_platforms_ios_index.md.html#iOS%20Platform%20Guide">iOS Platform Guide</a></li>
+<li><a href="guide_platforms_ios_tools.md.html#iOS%20Shell%20Tool%20Guide">iOS Shell Tool Guide</a></li>
 <li><a href="guide_platforms_ios_config.md.html#iOS%20Configuration">iOS Configuration</a></li>
-<li><a href="guide_platforms_ios_webview.md.html#iOS%20WebViews">iOS WebViews</a></li>
 <li><a href="guide_platforms_ios_plugin.md.html#iOS%20Plugins">iOS Plugins</a></li>
-<li><a href="guide_platforms_ios_tools.md.html#iOS%20Command-line%20Tools">iOS Command-line Tools</a></li>
-<li><a href="guide_platforms_ios_upgrading.md.html#Upgrading%20iOS">Upgrading iOS</a></li>
+<li><a href="guide_platforms_ios_webview.md.html#iOS%20WebViews">iOS WebViews</a></li>
+<li><a href="guide_platforms_ios_upgrade.md.html#Upgrading%20iOS">Upgrading iOS</a></li>
 </ul>
 
 <h2><a name="Platform%20Guides_ubuntu">Ubuntu</a></h2>
@@ -229,14 +230,14 @@ a lower-level alternative to the <code>c
 <ul>
 <li><a href="guide_platforms_wp8_index.md.html#Windows%20Phone%20Platform%20Guide">Windows Phone Platform Guide</a></li>
 <li><a href="guide_platforms_wp8_plugin.md.html#Windows%20Phone%20Plugins">Windows Phone Plugins</a></li>
-<li><a href="guide_platforms_wp8_upgrading.md.html#Upgrading%20Windows%20Phone">Upgrading Windows Phone</a></li>
+<li><a href="guide_platforms_wp8_upgrade.md.html#Upgrading%20Windows%20Phone">Upgrading Windows Phone</a></li>
 </ul>
 
 <h2><a name="Platform%20Guides_windows_8">Windows 8</a></h2>
 
 <ul>
 <li><a href="guide_platforms_win8_index.md.html#Windows%208%20Platform%20Guide">Windows 8 Platform Guide</a></li>
-<li><a href="guide_platforms_win8_upgrading.md.html#Upgrading%20Windows%208">Upgrading Windows 8</a></li>
+<li><a href="guide_platforms_win8_upgrade.md.html#Upgrading%20Windows%208">Upgrading Windows 8</a></li>
 </ul>
 
 <h2><a name="Platform%20Guides_tizen">Tizen</a></h2>

Modified: cordova/site/public/docs/en/edge/guide_platforms_ios_index.md.html
URL: http://svn.apache.org/viewvc/cordova/site/public/docs/en/edge/guide_platforms_ios_index.md.html?rev=1590759&r1=1590758&r2=1590759&view=diff
==============================================================================
--- cordova/site/public/docs/en/edge/guide_platforms_ios_index.md.html (original)
+++ cordova/site/public/docs/en/edge/guide_platforms_ios_index.md.html Mon Apr 28 19:25:02 2014
@@ -156,10 +156,10 @@ following for more detailed platform-spe
 
 <ul>
 <li><a href="guide_platforms_ios_config.md.html#iOS%20Configuration">iOS Configuration</a></li>
-<li><a href="guide_platforms_ios_upgrading.md.html#Upgrading%20iOS">Upgrading iOS</a></li>
+<li><a href="guide_platforms_ios_upgrade.md.html#Upgrading%20iOS">Upgrading iOS</a></li>
 <li><a href="guide_platforms_ios_webview.md.html#iOS%20WebViews">iOS WebViews</a></li>
 <li><a href="guide_platforms_ios_plugin.md.html#iOS%20Plugins">iOS Plugins</a></li>
-<li><a href="guide_platforms_ios_tools.md.html#iOS%20Command-line%20Tools">iOS Command-line Tools</a></li>
+<li>iOS Command-line Tools</li>
 </ul>
 
 <p>The command-line tools above refer to versions prior to Cordova 3.0.

Modified: cordova/site/public/docs/en/edge/guide_platforms_ios_plugin.md.html
URL: http://svn.apache.org/viewvc/cordova/site/public/docs/en/edge/guide_platforms_ios_plugin.md.html?rev=1590759&r1=1590758&r2=1590759&view=diff
==============================================================================
--- cordova/site/public/docs/en/edge/guide_platforms_ios_plugin.md.html (original)
+++ cordova/site/public/docs/en/edge/guide_platforms_ios_plugin.md.html Mon Apr 28 19:25:02 2014
@@ -378,7 +378,7 @@ example:</p>
 For JavaScript, on iOS 5.0 you can use <a class="external" href="https://github.com/apache/cordova-weinre">Weinre, an Apache Cordova
 Project</a> or <a class="external" href="http://www.iwebinspector.com/">iWebInspector,
 a third-party utility</a>.  For iOS 6, you
-can attach Safari 6.0 to your app running within the iOS 6 Simulator.</p>
+can attach Safari 6.0 to the app running within the iOS 6 Simulator.</p>
 
 <h2><a name="iOS%20Plugins_common_pitfalls">Common Pitfalls</a></h2>
 

Modified: cordova/site/public/docs/en/edge/guide_platforms_ios_tools.md.html
URL: http://svn.apache.org/viewvc/cordova/site/public/docs/en/edge/guide_platforms_ios_tools.md.html?rev=1590759&r1=1590758&r2=1590759&view=diff
==============================================================================
--- cordova/site/public/docs/en/edge/guide_platforms_ios_tools.md.html (original)
+++ cordova/site/public/docs/en/edge/guide_platforms_ios_tools.md.html Mon Apr 28 19:25:02 2014
@@ -111,13 +111,13 @@
             </small>
         </div>
         <div id="subheader">
-            <h1>iOS Command-line Tools</h1>
-            <small><select><option value="iOS%2520Command-line%2520Tools">iOS Command-line Tools</option>
-<option value="iOS%20Command-line%20Tools_create_a_project">      - Create a Project</option>
-<option value="iOS%20Command-line%20Tools_build_a_project">      - Build a Project</option>
-<option value="iOS%20Command-line%20Tools_run_app_on_an_emulator">      - Run App on an Emulator</option>
-<option value="iOS%20Command-line%20Tools_releasing">      - Releasing</option>
-<option value="iOS%20Command-line%20Tools_logging">      - Logging</option></select></small>
+            <h1>iOS Shell Tool Guide</h1>
+            <small><select><option value="iOS%2520Shell%2520Tool%2520Guide">iOS Shell Tool Guide</option>
+<option value="iOS%20Shell%20Tool%20Guide_create_a_project">      - Create a Project</option>
+<option value="iOS%20Shell%20Tool%20Guide_build_a_project">      - Build a Project</option>
+<option value="iOS%20Shell%20Tool%20Guide_run_app_on_an_emulator">      - Run App on an Emulator</option>
+<option value="iOS%20Shell%20Tool%20Guide_releasing">      - Releasing</option>
+<option value="iOS%20Shell%20Tool%20Guide_logging">      - Logging</option></select></small>
         </div>
 
         <div id="sidebar">
@@ -147,53 +147,58 @@
 
         <div id="scrollable">
             <div id="content">
-                <h1><a name="iOS%20Command-line%20Tools">iOS Command-line Tools</a></h1>
+                <h1><a name="iOS%20Shell%20Tool%20Guide">iOS Shell Tool Guide</a></h1>
 
-<p>The <code>cordova</code> command-line utility is a high-level tool that allows
-you to build applications across several platforms at once. An older
-version of the Cordova framework provides sets of command-line tools
-specific to each platform. To use them as an alternative to the CLI,
-you need to download this version of Cordova from
+<p>This guide shows how to use Cordova's set of platform-centered shell
+tools to develop iOS apps. This development path, discussed in the
+<a href="guide_overview_index.md.html#Overview">Overview</a>, may offer you a greater range of development options for iOS
+than the cross-platform CLI tool described in <a href="#The%20Command-Line%0AInterface">The Command-Line
+Interface</a>.  For example, you need to use shell tools when deploying a
+custom Cordova WebView alongside native components. Before using
+either development path, you must first configure the SDK environment
+as described in the <a href="guide_platforms_ios_index.md.html#iOS%20Platform%20Guide">iOS Platform Guide</a>.  These tools rely upon
+Xcode's command-line tools such as <code>xcode-select</code> and <code>xcodebuild</code>.</p>
+
+<p>To enable shell tools for iOS, download Cordova from
 <a class="external" href="http://cordova.apache.org">cordova.apache.org</a>. The download contains
-separate archives for each platform. Expand the platform you wish to
-target. The tools described here are typically available in the
+separate archives for each platform. Expand each you wish to target,
+<code>ios</code> in this case. The relevant tools are typically available in the
 top-level <code>bin</code> directory, otherwise consult the <strong>README</strong> file for
 more detailed directions.</p>
 
-<p>The iOS command-line tools are built upon shell scripts and rely on
-Xcode command-line tools such as <code>xcode-select</code> and <code>xcodebuild</code>.</p>
-
-<p>For information on the low-level command-line interface that enables
-plugins, see <a href="plugin_ref_plugman.md.html#Using%20Plugman%20to%20Manage%20Plugins">Using Plugman to Manage Plugins</a>. See Application Plugins
-for an overview.</p>
+<p>These tools allow you to create, build, and run iOS apps.  For
+information on the additional command-line interface that enables
+plugin features across all platforms, see <a href="#Using%20Plugman%20to%20Manage%0APlugins">Using Plugman to Manage
+Plugins</a>. See Application Plugins for details on how to develop
+plugins.</p>
 
-<h2><a name="iOS%20Command-line%20Tools_create_a_project">Create a Project</a></h2>
+<h2><a name="iOS%20Shell%20Tool%20Guide_create_a_project">Create a Project</a></h2>
 
 <p>Run the <code>create</code> command, specifying the existing path to the project,
 the reverse-domain-style package identifier, and the app's display
 name.</p>
 
-<pre class="prettyprint"><code>$ ./path/to/cordova-ios/bin/create /path/to/my_new_project com.example.project_name ProjectName
+<pre class="prettyprint"><code>    $ ./path/to/cordova-ios/bin/create /path/to/my_new_project com.example.project_name ProjectName
 </code></pre>
 
-<h2><a name="iOS%20Command-line%20Tools_build_a_project">Build a Project</a></h2>
+<h2><a name="iOS%20Shell%20Tool%20Guide_build_a_project">Build a Project</a></h2>
 
-<pre class="prettyprint"><code>$ /path/to/my_new_project/cordova/build
+<pre class="prettyprint"><code>    $ /path/to/my_new_project/cordova/build
 </code></pre>
 
-<h2><a name="iOS%20Command-line%20Tools_run_app_on_an_emulator">Run App on an Emulator</a></h2>
+<h2><a name="iOS%20Shell%20Tool%20Guide_run_app_on_an_emulator">Run App on an Emulator</a></h2>
 
-<pre class="prettyprint"><code>$ /path/to/my_new_project/cordova/run
+<pre class="prettyprint"><code>    $ /path/to/my_new_project/cordova/run
 </code></pre>
 
-<h2><a name="iOS%20Command-line%20Tools_releasing">Releasing</a></h2>
+<h2><a name="iOS%20Shell%20Tool%20Guide_releasing">Releasing</a></h2>
 
-<pre class="prettyprint"><code>$ /path/to/my_new_project/cordova/release
+<pre class="prettyprint"><code>    $ /path/to/my_new_project/cordova/release
 </code></pre>
 
-<h2><a name="iOS%20Command-line%20Tools_logging">Logging</a></h2>
+<h2><a name="iOS%20Shell%20Tool%20Guide_logging">Logging</a></h2>
 
-<pre class="prettyprint"><code>$ /path/to/my_new_project/cordova/log
+<pre class="prettyprint"><code>    $ /path/to/my_new_project/cordova/log
 </code></pre>
 
             </div>

Modified: cordova/site/public/docs/en/edge/guide_platforms_ios_webview.md.html
URL: http://svn.apache.org/viewvc/cordova/site/public/docs/en/edge/guide_platforms_ios_webview.md.html?rev=1590759&r1=1590758&r2=1590759&view=diff
==============================================================================
--- cordova/site/public/docs/en/edge/guide_platforms_ios_webview.md.html (original)
+++ cordova/site/public/docs/en/edge/guide_platforms_ios_webview.md.html Mon Apr 28 19:25:02 2014
@@ -147,7 +147,7 @@
             <div id="content">
                 <h1><a name="iOS%20WebViews">iOS WebViews</a></h1>
 
-<p>This section shows how to embed a Cordova-enabled WebView component
+<p>This guide shows how to embed a Cordova-enabled WebView component
 within a larger iOS application. For details on how these components
 can communicate with each other, see Application Plugins.</p>
 

Modified: cordova/site/public/docs/en/edge/guide_platforms_tizen_index.md.html
URL: http://svn.apache.org/viewvc/cordova/site/public/docs/en/edge/guide_platforms_tizen_index.md.html?rev=1590759&r1=1590758&r2=1590759&view=diff
==============================================================================
--- cordova/site/public/docs/en/edge/guide_platforms_tizen_index.md.html (original)
+++ cordova/site/public/docs/en/edge/guide_platforms_tizen_index.md.html Mon Apr 28 19:25:02 2014
@@ -244,7 +244,7 @@ Explorer</strong>.</p>
 </li>
 <li>
 <p>Right-click the project in the <strong>Project Explorer</strong> view, then
-select <strong>Run As &amp; rarr; Tizen Web Application</strong>:</p>
+select <strong>Run As → Tizen Web Application</strong>:</p>
 
 <p><img src="img/guide/platforms/tizen/runas_web_app.png" alt="" title=""></p>
 </li>

Modified: cordova/site/public/docs/en/edge/guide_platforms_win8_index.md.html
URL: http://svn.apache.org/viewvc/cordova/site/public/docs/en/edge/guide_platforms_win8_index.md.html?rev=1590759&r1=1590758&r2=1590759&view=diff
==============================================================================
--- cordova/site/public/docs/en/edge/guide_platforms_win8_index.md.html (original)
+++ cordova/site/public/docs/en/edge/guide_platforms_win8_index.md.html Mon Apr 28 19:25:02 2014
@@ -159,7 +159,7 @@ section also shows how to modify Cordova
 Regardless of which approach you take, you need to install the Visual
 Studio SDK, as described below.</p>
 
-<p>See <a href="guide_platforms_win8_upgrading.md.html#Upgrading%20Windows%208">Upgrading Windows 8</a> for information on how to upgrade existing
+<p>See <a href="guide_platforms_win8_upgrade.md.html#Upgrading%20Windows%208">Upgrading Windows 8</a> for information on how to upgrade existing
 Windows 8 Cordova projects.</p>
 
 <p>Cordova WebViews running on Windows 8 rely on Internet Explorer 10 as
@@ -171,21 +171,29 @@ on how to support IE10 along with compar
 
 <h2><a name="Windows%208%20Platform%20Guide_requirements_and_support">Requirements and Support</a></h2>
 
-<p>You need the following:</p>
+<p>You need one of the following OS/SDK combinations, either from an
+installation disk or an <em>ISO</em> disk image file:</p>
 
 <ul>
-<li>A 64-bit version of Windows 8 Pro, either an installation disk or an
-<em>ISO</em> disk image file. An evaluation version is available on the
-<a class="external" href="http://msdn.microsoft.com/en-US/evalcenter/jj554510">Microsoft Developer Network</a>.</li>
+<li><p>Windows 8.0 or 8.1, 32 or 64-bit <em>Home</em>, <em>Pro</em>, or <em>Enterprise</em>
+editions, along with
+<a class="external" href="http://www.visualstudio.com/downloads">Visual Studio 2012 Express</a>.</p></li>
+<li><p>Windows 8.1, 32 or 64-bit <em>Home</em>, <em>Pro</em>, or <em>Enterprise</em> editions,
+along with 
+<a class="external" href="http://www.visualstudio.com/downloads">Visual Studio 2013 Pro</a>
+or higher. An evaluation version of Windows 8.1 Enterprise is
+available from the
+<a class="external" href="http://msdn.microsoft.com/en-US/evalcenter/jj554510">Microsoft Developer Network</a>.</p></li>
 </ul>
 
+<p>Apps compiled under Windows 8.1 do <em>not</em> run under Windows 8.0. Apps
+compiled under Windows 8.0 are forward-compatible with 8.1.</p>
+
   <!-- 64-bit necessary? Pro necessary? ELSE still recommended for parallel WP dev -->
 
-<ul>
-<li>
-<a class="external" href="http://www.visualstudio.com/downloads">Visual Studio</a>, either the
-<em>Ultimate</em>, <em>Premium</em>, or <em>Professional</em> 2013 editions.</li>
-</ul>
+<p>Follow the instructions at
+<a class="external" href="http://www.windowsstore.com/">windowsstore.com</a>
+to submit the app to Windows Store.</p>
 
   <!-- true? -->
 
@@ -282,8 +290,6 @@ next <code>build</code>:</p>
 
 <h2><a name="Windows%208%20Platform%20Guide_open_the_project_in_the_sdk_and_deploy_the_app">Open the Project in the SDK and Deploy the App</a></h2>
 
-<!-- wasn't able to 'run' or 'emulate', so doc'ing SDK as fallback -->
-
 <p>Once you build a Cordova app as described above, you can open it with
 Visual Studio. The various <code>build</code> commands generate a Visual Studio
 Solution (<em>.sln</em>) file. Open the file in the File Explorer to modify

Modified: cordova/site/public/docs/en/edge/guide_platforms_wp8_index.md.html
URL: http://svn.apache.org/viewvc/cordova/site/public/docs/en/edge/guide_platforms_wp8_index.md.html?rev=1590759&r1=1590758&r2=1590759&view=diff
==============================================================================
--- cordova/site/public/docs/en/edge/guide_platforms_wp8_index.md.html (original)
+++ cordova/site/public/docs/en/edge/guide_platforms_wp8_index.md.html Mon Apr 28 19:25:02 2014
@@ -170,7 +170,7 @@ Phone SDK, as described below.</p>
 
 <ul>
 <li><a href="guide_platforms_wp8_plugin.md.html#Windows%20Phone%20Plugins">Windows Phone Plugins</a></li>
-<li><a href="guide_platforms_wp8_upgrading.md.html#Upgrading%20Windows%20Phone">Upgrading Windows Phone</a></li>
+<li><a href="guide_platforms_wp8_upgrade.md.html#Upgrading%20Windows%20Phone">Upgrading Windows Phone</a></li>
 </ul>
 
 <p>For the Windows Phone 8 platform, the Cordova WebView relies on
@@ -189,7 +189,7 @@ on how to support IE10 along with compar
 <li><p>A 64-bit version of Windows 8 Pro, either an installation disk or an
 <em>ISO</em> disk image file. An evaluation version is available on the
 <a class="external" href="http://msdn.microsoft.com/en-US/evalcenter/jj554510">Microsoft Developer Network</a>.
-The Pro version is necessary to run the device emulator,</p></li>
+The Pro version is necessary to run the device emulator.</p></li>
 <li><p>The <a class="external" href="https://dev.windowsphone.com/en-us/downloadsdk">Windows Phone SDK</a>.</p></li>
 </ul>
 
@@ -414,8 +414,8 @@ location or to simulate sequences of mov
 <h2><a name="Windows%20Phone%20Platform%20Guide_deploy_to_device">Deploy to Device</a></h2>
 
 <p>Before testing your application on a device, the device must be
-registered. Consult <a class="external" href="http://msdn.microsoft.com/en-us/library/windowsphone/develop/ff402565(v=vs.105">Microsoft's
-documentation</a>.aspx)
+registered. Consult <a class="external" href="http://msdn.microsoft.com/en-us/library/windowsphone/develop/ff402565(v=vs.105).aspx">Microsoft's
+documentation</a>
 for details on how to deploy and test on Windows Phone 8. Also, make
 sure the phone is connected to the computer, and the screen is
 unlocked.</p>

Modified: cordova/site/public/docs/en/edge/guide_platforms_wp8_plugin.md.html
URL: http://svn.apache.org/viewvc/cordova/site/public/docs/en/edge/guide_platforms_wp8_plugin.md.html?rev=1590759&r1=1590758&r2=1590759&view=diff
==============================================================================
--- cordova/site/public/docs/en/edge/guide_platforms_wp8_plugin.md.html (original)
+++ cordova/site/public/docs/en/edge/guide_platforms_wp8_plugin.md.html Mon Apr 28 19:25:02 2014
@@ -118,6 +118,7 @@
 <option value="Windows%20Phone%20Plugins_interpreting_arguments_in_c">      - Interpreting Arguments in C</option>
 <option value="Windows%20Phone%20Plugins_passing_results_from_c_to_javascript">      - Passing Results from C# to JavaScript</option>
 <option value="Windows%20Phone%20Plugins_handling_serialization_errors">      - Handling Serialization Errors</option>
+<option value="Windows%20Phone%20Plugins_plugin_lifetime">      - Plugin Lifetime</option>
 <option value="Windows%20Phone%20Plugins_plugin_xml">      - Plugin XML</option>
 <option value="Windows%20Phone%20Plugins_debugging_plugins">      - Debugging Plugins</option>
 <option value="Windows%20Phone%20Plugins_common_pitfalls">      - Common Pitfalls</option></select></small>
@@ -334,6 +335,18 @@ bad input. This pattern appears througho
     }
 </code></pre>
 
+<h2><a name="Windows%20Phone%20Plugins_plugin_lifetime">Plugin Lifetime</a></h2>
+
+<p>Plugins with long-running requests, background activity such as media
+playback, listeners, or that maintain internal state should implement
+the <code>onReset</code> method to clean up those activities. The method runs
+when the CordovaView WebBrowser navigates to a new page or refreshes, which
+reloads the JavaScript.</p>
+
+<pre class="prettyprint"><code>    // defined in WPCordovaClassLib.Cordova.Commands.BaseCommand
+    public virtual void OnReset() { }
+</code></pre>
+
 <h2><a name="Windows%20Phone%20Plugins_plugin_xml">Plugin XML</a></h2>
 
 <p>The following shows how to use the <code>plugin.xml</code> file to specify a

Modified: cordova/site/public/docs/en/edge/guide_support_index.md.html
URL: http://svn.apache.org/viewvc/cordova/site/public/docs/en/edge/guide_support_index.md.html?rev=1590759&r1=1590758&r2=1590759&view=diff
==============================================================================
--- cordova/site/public/docs/en/edge/guide_support_index.md.html (original)
+++ cordova/site/public/docs/en/edge/guide_support_index.md.html Mon Apr 28 19:25:02 2014
@@ -223,7 +223,7 @@ CLI's shorthand stubs.)</p>
     </tr>
 
     <tr>
-        <th><a href="cordova_accelerometer_accelerometer.md.html">Accelerometer</a></th>
+        <th><a class="external" href="https://github.com/apache/cordova-plugin-device-motion/blob/dev/doc/index.md">Accelerometer</a></th>
         <td data-col="amazon-fireos" class="y"></td>
         <td data-col="android" class="y"></td>
         <td data-col="blackberry10" class="y"></td>
@@ -237,7 +237,7 @@ CLI's shorthand stubs.)</p>
     </tr>
 
     <tr>
-        <th><a href="cordova_camera_camera.md.html">Camera</a></th>
+        <th><a class="external" href="https://github.com/apache/cordova-plugin-camera/blob/dev/doc/index.md">Camera</a></th>
         <td data-col="amazon-fireos" class="y"></td>
         <td data-col="android" class="y"></td>
         <td data-col="blackberry10" class="y"></td>
@@ -251,7 +251,7 @@ CLI's shorthand stubs.)</p>
     </tr>
 
     <tr>
-        <th><a href="cordova_media_capture_capture.md.html">Capture</a></th>
+        <th><a class="external" href="https://github.com/apache/cordova-plugin-media-capture/blob/dev/doc/index.md">Capture</a></th>
         <td data-col="amazon-fireos" class="y"></td>
         <td data-col="android" class="y"></td>
         <td data-col="blackberry10" class="y"></td>
@@ -265,7 +265,7 @@ CLI's shorthand stubs.)</p>
     </tr>
 
     <tr>
-        <th><a href="cordova_compass_compass.md.html">Compass</a></th>
+        <th><a class="external" href="https://github.com/apache/cordova-plugin-device-orientation/blob/dev/doc/index.md">Compass</a></th>
         <td data-col="amazon-fireos" class="y"></td>
         <td data-col="android" class="y"></td>
         <td data-col="blackberry10" class="y"></td>
@@ -279,7 +279,7 @@ CLI's shorthand stubs.)</p>
     </tr>
 
     <tr>
-        <th><a href="cordova_connection_connection.md.html">Connection</a></th>
+        <th><a class="external" href="https://github.com/apache/cordova-plugin-network-information/blob/dev/doc/index.md">Connection</a></th>
         <td data-col="amazon-fireos" class="y"></td>
         <td data-col="android" class="y"></td>
         <td data-col="blackberry10" class="y"></td>
@@ -293,7 +293,7 @@ CLI's shorthand stubs.)</p>
     </tr>
 
     <tr>
-        <th><a href="cordova_contacts_contacts.md.html">Contacts</a></th>
+        <th><a class="external" href="https://github.com/apache/cordova-plugin-contacts/blob/dev/doc/index.md">Contacts</a></th>
         <td data-col="amazon-fireos" class="y"></td>
         <td data-col="android" class="y"></td>
         <td data-col="blackberry10" class="y"></td>
@@ -307,7 +307,7 @@ CLI's shorthand stubs.)</p>
     </tr>
 
     <tr>
-        <th><a href="cordova_device_device.md.html">Device</a></th>
+        <th><a class="external" href="https://github.com/apache/cordova-plugin-device/blob/dev/doc/index.md">Device</a></th>
         <td data-col="amazon-fireos" class="y"></td>
         <td data-col="android" class="y"></td>
         <td data-col="blackberry10" class="y"></td>
@@ -335,7 +335,7 @@ CLI's shorthand stubs.)</p>
     </tr>
 
     <tr>
-        <th><a href="cordova_file_file.md.html">File</a></th>
+        <th><a class="external" href="https://github.com/apache/cordova-plugin-file/blob/dev/doc/index.md">File</a></th>
         <td data-col="amazon-fireos" class="y"></td>
         <td data-col="android" class="y"></td>
         <td data-col="blackberry10" class="y"></td>
@@ -349,7 +349,7 @@ CLI's shorthand stubs.)</p>
     </tr>
 
     <tr>
-        <th><a href="cordova_geolocation_geolocation.md.html">Geolocation</a></th>
+        <th><a class="external" href="https://github.com/apache/cordova-plugin-geolocation/blob/dev/doc/index.md">Geolocation</a></th>
         <td data-col="amazon-fireos" class="y"></td>
         <td data-col="android" class="y"></td>
         <td data-col="blackberry10" class="y"></td>
@@ -363,7 +363,7 @@ CLI's shorthand stubs.)</p>
     </tr>
 
     <tr>
-        <th><a href="cordova_globalization_globalization.md.html">Globalization</a></th>
+        <th><a class="external" href="https://github.com/apache/cordova-plugin-globalization/blob/dev/doc/index.md">Globalization</a></th>
         <td data-col="amazon-fireos" class="y"></td>
         <td data-col="android" class="y"></td>
         <td data-col="blackberry10" class="n"></td>
@@ -377,7 +377,7 @@ CLI's shorthand stubs.)</p>
     </tr>
 
     <tr>
-        <th><a href="cordova_inappbrowser_inappbrowser.md.html">InAppBrowser</a></th>
+        <th><a class="external" href="https://github.com/apache/cordova-plugin-inappbrowser/blob/dev/doc/index.md">InAppBrowser</a></th>
         <td data-col="amazon-fireos" class="y"></td>
         <td data-col="android" class="y"></td>
         <td data-col="blackberry10" class="y"></td>
@@ -391,7 +391,7 @@ CLI's shorthand stubs.)</p>
     </tr>
 
     <tr>
-        <th><a href="cordova_media_media.md.html">Media</a></th>
+        <th><a class="external" href="https://github.com/apache/cordova-plugin-media/blob/dev/doc/index.md">Media</a></th>
         <td data-col="amazon-fireos" class="y"></td>
         <td data-col="android" class="y"></td>
         <td data-col="blackberry10" class="y"></td>
@@ -405,7 +405,7 @@ CLI's shorthand stubs.)</p>
     </tr>
 
     <tr>
-        <th><a href="cordova_notification_notification.md.html">Notification</a></th>
+        <th><a class="external" href="https://github.com/apache/cordova-plugin-dialogs/blob/dev/doc/index.md">Notification</a></th>
         <td data-col="amazon-fireos" class="y"></td>
         <td data-col="android" class="y"></td>
         <td data-col="blackberry10" class="y"></td>
@@ -419,7 +419,7 @@ CLI's shorthand stubs.)</p>
     </tr>
 
     <tr>
-        <th><a href="cordova_splashscreen_splashscreen.md.html">Splashscreen</a></th>
+        <th><a class="external" href="https://github.com/apache/cordova-plugin-splashscreen/blob/dev/doc/index.md">Splashscreen</a></th>
         <td data-col="amazon-fireos" class="y"></td>
         <td data-col="android" class="y"></td>
         <td data-col="blackberry10" class="y"></td>

Modified: cordova/site/public/docs/en/edge/index.html
URL: http://svn.apache.org/viewvc/cordova/site/public/docs/en/edge/index.html?rev=1590759&r1=1590758&r2=1590759&view=diff
==============================================================================
--- cordova/site/public/docs/en/edge/index.html (original)
+++ cordova/site/public/docs/en/edge/index.html Mon Apr 28 19:25:02 2014
@@ -168,7 +168,7 @@
         </li>
         <li>
             <h2><a href="config_ref_index.md.html#The%20config.xml%20File">The config.xml File</a></h2>
-            <span>Customize the features of your app.</span>
+            <span>Customize the app's features.</span>
         </li>
         <li>
             <h2><a href="config_ref_images.md.html#Icons%20and%20Splash%20Screens">Icons and Splash Screens</a></h2>

Modified: cordova/site/public/docs/en/edge/plugin_ref_plugman.md.html
URL: http://svn.apache.org/viewvc/cordova/site/public/docs/en/edge/plugin_ref_plugman.md.html?rev=1590759&r1=1590758&r2=1590759&view=diff
==============================================================================
--- cordova/site/public/docs/en/edge/plugin_ref_plugman.md.html (original)
+++ cordova/site/public/docs/en/edge/plugin_ref_plugman.md.html Mon Apr 28 19:25:02 2014
@@ -227,7 +227,7 @@ listed on the <a href="guide_platforms_i
 <li>
 <code>--www</code> defaults to the project's <code>www</code> folder location, but can be any directory that is to be used as cordova project application web assets.</li>
 <li>
-<code>--variable</code> allows to specify certain variables at install time, necessary for certain plugins requiring API keys or other custom, user-defined parameters. Please see the <a href="plugin_spec.md">plugin specification</a> for more information.</li>
+<code>--variable</code> allows to specify certain variables at install time, necessary for certain plugins requiring API keys or other custom, user-defined parameters. Please see the <a href="plugin_ref_spec.md.html#Plugin%20Specification">plugin specification</a> for more information.</li>
 </ul>
 
 <h2><a name="Using%20Plugman%20to%20Manage%20Plugins_remove_a_plugin">Remove a Plugin</a></h2>

Modified: cordova/site/public/docs/en/edge/plugin_ref_spec.md.html
URL: http://svn.apache.org/viewvc/cordova/site/public/docs/en/edge/plugin_ref_spec.md.html?rev=1590759&r1=1590758&r2=1590759&view=diff
==============================================================================
--- cordova/site/public/docs/en/edge/plugin_ref_spec.md.html (original)
+++ cordova/site/public/docs/en/edge/plugin_ref_spec.md.html Mon Apr 28 19:25:02 2014
@@ -386,7 +386,8 @@ exits with a non-zero code.</p></li>
 relative to the <code>www</code> directory.
 Assets can be targeted to subdirectories, for example:</p>
 
-<p><asset src="www/new-foo.js" target="js/experimental/foo.js"></asset></p>
+<pre class="prettyprint"><code>&lt;asset src="www/new-foo.js" target="js/experimental/foo.js" /&gt;
+</code></pre>
 
 <p>creates the <code>js/experimental</code> directory within the <code>www</code> directory,
 unless already present, then copies the <code>new-foo.js</code> file and
@@ -751,7 +752,7 @@ plugman's scope.  Examples:</p>
 <pre class="prettyprint"><code>&lt;info&gt;
 You need to install __Google Play Services__ from the `Android Extras` section using the Android SDK manager (run `android`).
 
-You need to add the following line to your `local.properties`
+You need to add the following line to the `local.properties`:
 
 android.library.reference.1=PATH_TO_ANDROID_SDK/sdk/extras/google/google_play_services/libproject/google-play-services_lib
 &lt;/info&gt;



Mime
View raw message