You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by mw...@apache.org on 2013/11/05 20:34:37 UTC
svn commit: r1539110 [1/2] - in /cordova/site/public/docs/en: 3.0.0/ 3.1.0/
edge/
Author: mwbrooks
Date: Tue Nov 5 19:34:36 2013
New Revision: 1539110
URL: http://svn.apache.org/r1539110
Log:
Update documentation.
Modified:
cordova/site/public/docs/en/3.0.0/guide_platforms_android_config.md.html
cordova/site/public/docs/en/3.1.0/cordova_inappbrowser_inappbrowser.md.html
cordova/site/public/docs/en/3.1.0/guide_platforms_android_config.md.html
cordova/site/public/docs/en/edge/config_ref_images.md.html
cordova/site/public/docs/en/edge/config_ref_index.md.html
cordova/site/public/docs/en/edge/cordova_camera_camera.md.html
cordova/site/public/docs/en/edge/cordova_compass_compass.md.html
cordova/site/public/docs/en/edge/cordova_connection_connection.md.html
cordova/site/public/docs/en/edge/cordova_contacts_contacts.md.html
cordova/site/public/docs/en/edge/cordova_device_device.md.html
cordova/site/public/docs/en/edge/cordova_events_events.md.html
cordova/site/public/docs/en/edge/cordova_file_file.md.html
cordova/site/public/docs/en/edge/cordova_geolocation_geolocation.md.html
cordova/site/public/docs/en/edge/cordova_globalization_globalization.md.html
cordova/site/public/docs/en/edge/cordova_inappbrowser_inappbrowser.md.html
cordova/site/public/docs/en/edge/cordova_media_capture_capture.md.html
cordova/site/public/docs/en/edge/cordova_media_media.md.html
cordova/site/public/docs/en/edge/cordova_notification_notification.md.html
cordova/site/public/docs/en/edge/cordova_storage_storage.md.html
cordova/site/public/docs/en/edge/guide_appdev_whitelist_index.md.html
cordova/site/public/docs/en/edge/guide_cli_index.md.html
cordova/site/public/docs/en/edge/guide_hybrid_plugins_index.md.html
cordova/site/public/docs/en/edge/guide_hybrid_webviews_index.md.html
cordova/site/public/docs/en/edge/guide_platforms_android_config.md.html
cordova/site/public/docs/en/edge/guide_platforms_android_index.md.html
cordova/site/public/docs/en/edge/guide_platforms_android_upgrading.md.html
cordova/site/public/docs/en/edge/guide_platforms_blackberry10_index.md.html
cordova/site/public/docs/en/edge/guide_platforms_blackberry10_tools.md.html
cordova/site/public/docs/en/edge/guide_platforms_blackberry10_upgrading.md.html
cordova/site/public/docs/en/edge/guide_platforms_blackberry_index.md.html
cordova/site/public/docs/en/edge/guide_platforms_blackberry_tools.md.html
cordova/site/public/docs/en/edge/guide_platforms_ios_index.md.html
cordova/site/public/docs/en/edge/guide_platforms_ios_upgrading.md.html
cordova/site/public/docs/en/edge/guide_platforms_wp7_index.md.html
cordova/site/public/docs/en/edge/guide_platforms_wp8_index.md.html
cordova/site/public/docs/en/edge/guide_platforms_wp8_tools.md.html
cordova/site/public/docs/en/edge/guide_platforms_wp8_upgrading.md.html
cordova/site/public/docs/en/edge/guide_support_index.md.html
cordova/site/public/docs/en/edge/plugin_ref_spec.md.html
Modified: cordova/site/public/docs/en/3.0.0/guide_platforms_android_config.md.html
URL: http://svn.apache.org/viewvc/cordova/site/public/docs/en/3.0.0/guide_platforms_android_config.md.html?rev=1539110&r1=1539109&r2=1539110&view=diff
==============================================================================
--- cordova/site/public/docs/en/3.0.0/guide_platforms_android_config.md.html (original)
+++ cordova/site/public/docs/en/3.0.0/guide_platforms_android_config.md.html Tue Nov 5 19:34:36 2013
@@ -167,7 +167,10 @@ values. For example, <code>0x00000000</c
<li><p><code>loadUrlTimeoutValue</code>: How much time Cordova should wait before
throwing a timeout error on the application.</p></li>
<li><p><code>keepRunning</code> (boolean, defaults to <code>true</code>): Determines whether
-Cordova stays running in the background.</p></li>
+Cordova stays running in the background. Note: setting this to
+false will not kill the app after a <a href="cordova_events_events.md.html#pause">pause</a> event, it will only
+halt execution of code in the cordova webview while the app is
+in the background.</p></li>
<li><p><code>splashscreen</code>: The name of the file minus its extension in the
<code>res/drawable</code> directory. If you have multiple assets, they all
must share this common name in their respective directories.</p></li>
Modified: cordova/site/public/docs/en/3.1.0/cordova_inappbrowser_inappbrowser.md.html
URL: http://svn.apache.org/viewvc/cordova/site/public/docs/en/3.1.0/cordova_inappbrowser_inappbrowser.md.html?rev=1539110&r1=1539109&r2=1539110&view=diff
==============================================================================
--- cordova/site/public/docs/en/3.1.0/cordova_inappbrowser_inappbrowser.md.html (original)
+++ cordova/site/public/docs/en/3.1.0/cordova_inappbrowser_inappbrowser.md.html Tue Nov 5 19:34:36 2013
@@ -403,7 +403,7 @@ ref.<a href="cordova_inappbrowser_inappb
iabRef = <a href="cordova_inappbrowser_inappbrowser.md.html#window.open">window.open</a>('http://apache.org', '_blank', 'location=yes');
iabRef.<a href="cordova_inappbrowser_inappbrowser.md.html#addEventListener">addEventListener</a>('loadstart', iabLoadStart);
iabRef.<a href="cordova_inappbrowser_inappbrowser.md.html#addEventListener">addEventListener</a>('loadstop', iabLoadStop);
- iabRef.<a href="cordova_inappbrowser_inappbrowser.md.html#removeEventListener">removeEventListener</a>('loaderror', iabLoadError);
+ iabRef.<a href="cordova_inappbrowser_inappbrowser.md.html#addEventListener">addEventListener</a>('loaderror', iabLoadError);
iabRef.<a href="cordova_inappbrowser_inappbrowser.md.html#addEventListener">addEventListener</a>('exit', iabClose);
}
@@ -611,7 +611,7 @@ ref.<a href="cordova_inappbrowser_inappb
code: "var img=document.querySelector('#header img'); img.src='http://cordova.apache.org/images/cordova_bot.png';"
}, function() {
alert("Image Element Successfully Hijacked");
- }
+ });
}
function iabClose(event) {
@@ -695,10 +695,10 @@ ref.<a href="cordova_inappbrowser_inappb
//
function changeBackgroundColor() {
iabRef.<a href="cordova_inappbrowser_inappbrowser.md.html#insertCSS">insertCSS</a>({
- code: "body { background: #ffff00"
+ code: "body { background: #ffff00; }"
}, function() {
alert("Styles Altered");
- }
+ });
}
function iabClose(event) {
Modified: cordova/site/public/docs/en/3.1.0/guide_platforms_android_config.md.html
URL: http://svn.apache.org/viewvc/cordova/site/public/docs/en/3.1.0/guide_platforms_android_config.md.html?rev=1539110&r1=1539109&r2=1539110&view=diff
==============================================================================
--- cordova/site/public/docs/en/3.1.0/guide_platforms_android_config.md.html (original)
+++ cordova/site/public/docs/en/3.1.0/guide_platforms_android_config.md.html Tue Nov 5 19:34:36 2013
@@ -148,7 +148,9 @@ config.xml File</a> for information on g
<li>
<p><code>KeepRunning</code> (boolean, defaults to <code>true</code>): Determines whether the
application stays running in the background even after a <code><a href="cordova_events_events.md.html#pause">pause</a></code>
-event fires.</p>
+event fires. Note: setting this to false will not kill the app after
+a <a href="cordova_events_events.md.html#pause">pause</a> event, it will only halt execution of code in the cordova
+webview while the app is in the background.</p>
<pre class="prettyprint"><code><preference name="KeepRunning" value="false"/>
</code></pre>
Modified: cordova/site/public/docs/en/edge/config_ref_images.md.html
URL: http://svn.apache.org/viewvc/cordova/site/public/docs/en/edge/config_ref_images.md.html?rev=1539110&r1=1539109&r2=1539110&view=diff
==============================================================================
--- cordova/site/public/docs/en/edge/config_ref_images.md.html (original)
+++ cordova/site/public/docs/en/edge/config_ref_images.md.html Tue Nov 5 19:34:36 2013
@@ -216,7 +216,7 @@ images for low, medium, high, and extra-
<p>The iOS platform specifies variants for iPhone/iPod and iPad, with
variants for retina displays and different orientations. The <em>568h</em>
-file is customized for the iPhone 5's taller screen:</p>
+file applies to the iPhone 5's taller screen:</p>
<pre class="prettyprint"><code> ios/screen-ipad-landscape-2x.png
ios/screen-ipad-landscape.png
@@ -259,16 +259,17 @@ each should be:</p>
<preference name="splashScreenDelay", 10000 />
</code></pre>
-<p>The first line sets the image to display as the splash screen. If you name your image anything other than <code>splash.png</code>, you need to modify this line.</p>
+<p>The first line sets the image to display as the splash screen. If you
+name the image anything other than <code>splash.png</code>, you need to modify
+this line.</p>
<p>The second line sets the delay of how long the splashscreen appears in milliseconds. To dismiss the splash screen once the app receives the <code><a href="cordova_events_events.md.html#deviceready">deviceready</a></code> event, call the <code>navigator.<a href="cordova_splashscreen_splashscreen.md.html#splashscreen.hide">splashscreen.hide</a>()</code> method.</p>
<h2><a name="Icons%20and%20Splash%20Screens_splash_screens_for_the_ios_platform">Splash Screens for the iOS Platform</a></h2>
-<p>Copy your splash screen images into the iOS project's
-<code>Resources/splash</code> directory. Only add the images for the devices you
-want to support, such as iPad or iPhone. The size of each image should
-be:</p>
+<p>Copy splash screen images into the iOS project's <code>Resources/splash</code>
+directory. Only add those images for the devices you want to support,
+such as iPad or iPhone. The size of each image should be:</p>
<ul>
<li>Default-568h@2x~iphone.png (640x1136 pixels)</li>
@@ -282,8 +283,8 @@ be:</p>
<h2><a name="Icons%20and%20Splash%20Screens_splash_screens_for_the_blackberry_10_platform">Splash Screens for the BlackBerry 10 Platform</a></h2>
-<p>Copy your splash screen images into the project's
-<code>res/screen/blackberry10</code> directory. The file names should be:</p>
+<p>Copy splash screen images into the project's <code>res/screen/blackberry10</code>
+directory. The file names should be:</p>
<ul>
<li>splash-1280x768.png (1280x768 pixels)</li>
Modified: cordova/site/public/docs/en/edge/config_ref_index.md.html
URL: http://svn.apache.org/viewvc/cordova/site/public/docs/en/edge/config_ref_index.md.html?rev=1539110&r1=1539109&r2=1539110&view=diff
==============================================================================
--- cordova/site/public/docs/en/edge/config_ref_index.md.html (original)
+++ cordova/site/public/docs/en/edge/config_ref_index.md.html Tue Nov 5 19:34:36 2013
@@ -146,9 +146,9 @@
<h1><a name="The%20config.xml%20File">The config.xml File</a></h1>
<p>Many aspects of an app's behavior can be controlled with a global
-configuration file, <code>config.xml</code>, that is placed in the top-level web
+configuration file, <code>config.xml</code>, that belongs in the top-level web
asset directory along with the app's home page. This
-platform-agnostic XML file is formatted based on the W3C's <a class="external" href="http://www.w3.org/TR/widgets/">Packaged
+platform-agnostic XML file is arranged based on the W3C's <a class="external" href="http://www.w3.org/TR/widgets/">Packaged
Web Apps (Widgets)</a> specification, and
extended to specify core Cordova API features, plugins, and
platform-specific settings.</p>
@@ -229,13 +229,13 @@ expressed in major/minor/patch notation.
on the device's home screen and within app-store interfaces.</p></li>
<li><p>The <code><description></code> and <code><author></code> elements specify metadata and
contact information that may appear within app-store listings.</p></li>
-<li><p>The optional <code><content></code> element defines your application's starting
+<li><p>The optional <code><content></code> element defines the app's starting
page in the top-level web assets directory. The default value is
<code>index.html</code>, which customarily appears in a project's top-level
<code>www</code> directory.</p></li>
<li><p><code><access></code> elements define the set of external domains the app is
-allowed to communicate with. The default value shown above allows it
-to access any server. See the Domain <a href="guide_appdev_whitelist_index.md.html#Whitelist%20Guide">Whitelist Guide</a> for details.</p></li>
+allowed to communicate with. The default value shown above allows
+it to access any server. See the Domain <a href="guide_appdev_whitelist_index.md.html#Whitelist%20Guide">Whitelist Guide</a> for details.</p></li>
<li><p>The <code><preference></code> tag sets various options as pairs of
<code>name</code>/<code>value</code> attributes. Each preference's <code>name</code> is
case-insensitive. Many preferences are unique to specific
@@ -263,7 +263,7 @@ Possible values are <code>default</code>
<pre class="prettyprint"><code><preference name="Orientation" value="landscape" />
</code></pre>
-<p><strong>NOTE:</strong> The <code>default</code> value means <em>both</em> landscape and portrait
+<p><strong>NOTE</strong>: The <code>default</code> value means <em>both</em> landscape and portrait
orientations are enabled. If you want to use each platform's
default settings (usually portrait-only), leave this tag out of the
<code>config.xml</code> file. Also, BlackBerry uses <code>auto</code> instead of <code>default</code>
@@ -313,7 +313,7 @@ keyboard, helping users navigate from on
<p>Applies to iOS and BlackBerry. </p>
-<p><strong>NOTE:</strong> For BlackBerry, valid values are <code>enable</code> or <code>disable</code>.</p>
+<p><strong>NOTE</strong>: For BlackBerry, valid values are <code>enable</code> or <code>disable</code>.</p>
</li>
</ul>
@@ -322,7 +322,7 @@ keyboard, helping users navigate from on
<p>If you use the CLI to build applications, you use the <code>plugin</code> command
to enable device APIs. This does not modify the top-level <code>config.xml</code>
file, so the <code><feature></code> element does not apply to your workflow. If
-you are working directly in an SDK and using the platform-specific
+you work directly in an SDK and using the platform-specific
<code>config.xml</code> file as source, you use the <code><feature></code> tag to enable
device-level APIs and external plugins. They typically appear in this
form:</p>
Modified: cordova/site/public/docs/en/edge/cordova_camera_camera.md.html
URL: http://svn.apache.org/viewvc/cordova/site/public/docs/en/edge/cordova_camera_camera.md.html?rev=1539110&r1=1539109&r2=1539110&view=diff
==============================================================================
--- cordova/site/public/docs/en/edge/cordova_camera_camera.md.html (original)
+++ cordova/site/public/docs/en/edge/cordova_camera_camera.md.html Tue Nov 5 19:34:36 2013
@@ -177,12 +177,12 @@
<p>The <code>camera</code> object provides access to the device's default camera application.</p>
</blockquote>
-<p><strong>Important privacy note:</strong> Collection and use of images from a
+<p><strong>WARNING</strong>: Collection and use of images from a
device's camera raises important privacy issues. Your app's privacy
policy should discuss how the app uses the camera and whether the
images recorded are shared with any other parties. In addition, if
the app's use of the camera is not apparent in the user interface, you
-should provide a just-in-time notice prior to your app accessing the
+should provide a just-in-time notice before the app accesses the
camera (if the device operating system doesn't do so already). That
notice should provide the same information noted above, as well as
obtaining the user's permission (e.g., by presenting choices for
@@ -320,7 +320,7 @@ example:</p>
<li><p>Post the data to a remote server</p></li>
</ul>
-<p><strong>NOTE:</strong> Photo resolution on newer devices is quite good. Photos
+<p><strong>NOTE</strong>: Photo resolution on newer devices is quite good. Photos
selected from the device's gallery are not downscaled to a lower
quality, even if a <code>quality</code> parameter is specified. To avoid common
memory problems, set <code><a href="cordova_camera_camera.md.html#Camera">Camera</a>.destinationType</code> to <code>FILE_URI</code> rather
@@ -357,7 +357,7 @@ displays:</p>
<h2><a name="camera.getPicture_windows_phone_7_quirks">Windows Phone 7 Quirks</a></h2>
-<p>Invoking the native camera application while your device is connected
+<p>Invoking the native camera application while the device is connected
via Zune does not work, and triggers an error callback.</p>
<h2><a name="camera.getPicture_tizen_quirks">Tizen Quirks</a></h2>
@@ -763,7 +763,7 @@ location.</p>
<p>Set the position of the popover.</p>
-<p><strong>Parameters:</strong></p>
+<p><strong>Parameters</strong>:</p>
<ul>
<li>
Modified: cordova/site/public/docs/en/edge/cordova_compass_compass.md.html
URL: http://svn.apache.org/viewvc/cordova/site/public/docs/en/edge/cordova_compass_compass.md.html?rev=1539110&r1=1539109&r2=1539110&view=diff
==============================================================================
--- cordova/site/public/docs/en/edge/cordova_compass_compass.md.html (original)
+++ cordova/site/public/docs/en/edge/cordova_compass_compass.md.html Tue Nov 5 19:34:36 2013
@@ -125,6 +125,7 @@
<option value="compassError_example">Â Â Â Â Â Â - Example</option>
<option value="compassOptions">compassOptions</option>
<option value="compassOptions_options">Â Â Â Â Â Â - Options</option>
+<option value="compassOptions_android_quirks">Â Â Â Â Â Â - Android Quirks</option>
<option value="compassOptions_tizen_quirks">Â Â Â Â Â Â - Tizen Quirks</option>
<option value="compassOptions_windows_phone_7_and_8_quirks">Â Â Â Â Â Â - Windows Phone 7 and 8 Quirks</option>
<option value="compassHeading">compassHeading</option>
@@ -639,27 +640,22 @@ navigator.<a href="cordova_compass_compa
<li><p><strong>filter</strong>: The change in degrees required to initiate a watchHeading success callback. <em>(Number)</em></p></li>
</ul>
-<p>Android Quirks</p>
-
-<hr>
+<h2><a name="compassOptions_android_quirks">Android Quirks</a></h2>
<ul>
-<li>
-<code>filter</code> is not supported.</li>
+<li>No support for <code>filter</code>.</li>
</ul>
<h2><a name="compassOptions_tizen_quirks">Tizen Quirks</a></h2>
<ul>
-<li>
-<code>filter</code> is not supported.</li>
+<li>No support for <code>filter</code>.</li>
</ul>
<h2><a name="compassOptions_windows_phone_7_and_8_quirks">Windows Phone 7 and 8 Quirks</a></h2>
<ul>
-<li>
-<code>filter</code> is not supported.</li>
+<li>No support for <code>filter</code>.</li>
</ul>
<hr>
@@ -672,7 +668,7 @@ navigator.<a href="cordova_compass_compa
<ul>
<li><p><strong>magneticHeading</strong>: The heading in degrees from 0-359.99 at a single moment in time. <em>(Number)</em></p></li>
-<li><p><strong>trueHeading</strong>: The heading relative to the geographic North Pole in degrees 0-359.99 at a single moment in time. A negative value indicates that the true heading cannot be determined. <em>(Number)</em></p></li>
+<li><p><strong>trueHeading</strong>: The heading relative to the geographic North Pole in degrees 0-359.99 at a single moment in time. A negative value indicates that the true heading can't be determined. <em>(Number)</em></p></li>
<li><p><strong>headingAccuracy</strong>: The deviation in degrees between the reported heading and the true heading. <em>(Number)</em></p></li>
<li><p><strong>timestamp</strong>: The time at which this heading was determined. <em>(milliseconds)</em></p></li>
</ul>
@@ -684,15 +680,15 @@ navigator.<a href="cordova_compass_compa
<h2><a name="compassHeading_android_quirks">Android Quirks</a></h2>
<ul>
-<li><p><code>trueHeading</code> is not supported, but reports the same value as <code>magneticHeading</code></p></li>
-<li><p><code>headingAccuracy</code> is always 0 because there is no difference between the <code>magneticHeading</code> and <code>trueHeading</code>.</p></li>
+<li><p>The <code>trueHeading</code> property is not supported, but reports the same value as <code>magneticHeading</code>.</p></li>
+<li><p>The <code>headingAccuracy</code> property is always 0 because there is no difference between the <code>magneticHeading</code> and <code>trueHeading</code>.</p></li>
</ul>
<h2><a name="compassHeading_ios_quirks">iOS Quirks</a></h2>
<ul>
-<li><p><code>trueHeading</code> is only returned when location services are enabled via <code>navigator.geolocation.watchLocation()</code></p></li>
-<li><p>For iOS 4 devices and above, heading factors in the device's current orientation, not in reference to its absolute position, for apps that supports that orientation.</p></li>
+<li><p>The <code>trueHeading</code> property is only returned for location services enabled via <code>navigator.geolocation.watchLocation()</code>.</p></li>
+<li><p>For iOS 4 devices and above, heading factors in the device's current orientation, and does not reference its absolute position, for apps that supports that orientation.</p></li>
</ul>
<hr>
Modified: cordova/site/public/docs/en/edge/cordova_connection_connection.md.html
URL: http://svn.apache.org/viewvc/cordova/site/public/docs/en/edge/cordova_connection_connection.md.html?rev=1539110&r1=1539109&r2=1539110&view=diff
==============================================================================
--- cordova/site/public/docs/en/edge/cordova_connection_connection.md.html (original)
+++ cordova/site/public/docs/en/edge/cordova_connection_connection.md.html Tue Nov 5 19:34:36 2013
@@ -351,7 +351,7 @@ eventually be removed.</p>
<h2><a name="connection.type_ios_quirks">iOS Quirks</a></h2>
<ul>
-<li>iOS cannot detect the type of cellular network connection.
+<li>iOS can't detect the type of cellular network connection.
<ul>
<li>
<code>navigator.<a href="cordova_connection_connection.md.html#connection.type">connection.type</a></code> is set to <code><a href="cordova_connection_connection.md.html#Connection">Connection</a>.CELL</code> for all cellular data.</li>
@@ -364,7 +364,7 @@ eventually be removed.</p>
<ul>
<li><p>When running in the emulator, always detects <code>navigator.<a href="cordova_connection_connection.md.html#connection.type">connection.type</a></code> as <code><a href="cordova_connection_connection.md.html#Connection">Connection</a>.UNKNOWN</code>.</p></li>
<li>
-<p>Windows Phone cannot detect the type of cellular network connection.</p>
+<p>Windows Phone can't detect the type of cellular network connection.</p>
<ul>
<li>
Modified: cordova/site/public/docs/en/edge/cordova_contacts_contacts.md.html
URL: http://svn.apache.org/viewvc/cordova/site/public/docs/en/edge/cordova_contacts_contacts.md.html?rev=1539110&r1=1539109&r2=1539110&view=diff
==============================================================================
--- cordova/site/public/docs/en/edge/cordova_contacts_contacts.md.html (original)
+++ cordova/site/public/docs/en/edge/cordova_contacts_contacts.md.html Tue Nov 5 19:34:36 2013
@@ -225,21 +225,21 @@
<p>The <code>contacts</code> object provides access to the device contacts database.</p>
</blockquote>
-<p><strong>Important privacy note:</strong> Collection and use of contact data raises
+<p><strong>WARNING</strong>: Collection and use of contact data raises
important privacy issues. Your app's privacy policy should discuss
how the app uses contact data and whether it is shared with any other
parties. <a href="cordova_contacts_contacts.md.html#Contact">Contact</a> information is considered sensitive because it
reveals the people with whom a person communicates. Therefore, in
-addition to your app's privacy policy, you should strongly consider
-providing a just-in-time notice prior to your app accessing or using
-contact data (if the device operating system doesn't do so
-already). That notice should provide the same information noted above,
+addition to the app's privacy policy, you should strongly consider
+providing a just-in-time notice before the app accesses or uses
+contact data, if the device operating system doesn't do so
+already. That notice should provide the same information noted above,
as well as obtaining the user's permission (e.g., by presenting
choices for <strong>OK</strong> and <strong>No Thanks</strong>). Note that some app
-marketplaces may require your app to provide just-in-time notice and
-obtain permission from the user prior to accessing contact data. A
+marketplaces may require the app to provide a just-in-time notice and
+obtain the user's permission before accessing contact data. A
clear and easy-to-understand user experience surrounding the use of
-contact data will help avoid user confusion and perceived misuse of
+contact data helps avoid user confusion and perceived misuse of
contact data. For more information, please see the <a href="guide_appdev_privacy_index.md.html#Privacy%20Guide">Privacy Guide</a>.</p>
<h2><a name="Contacts_methods">Methods</a></h2>
@@ -523,7 +523,7 @@ navigator.<a href="cordova_contacts_cont
<ul>
<li><p><strong>id</strong>: A globally unique identifier. <em>(DOMString)</em></p></li>
-<li><p><strong>displayName</strong>: The name of this <a href="cordova_contacts_contacts.md.html#Contact">Contact</a>, suitable for display to end-users. <em>(DOMString)</em></p></li>
+<li><p><strong>displayName</strong>: The name of this <a href="cordova_contacts_contacts.md.html#Contact">Contact</a>, suitable for display to end users. <em>(DOMString)</em></p></li>
<li><p><strong>name</strong>: An object containing all components of a persons name. <em>(<a href="cordova_contacts_contacts.md.html#ContactName">ContactName</a>)</em></p></li>
<li><p><strong>nickname</strong>: A casual name by which to address the contact. <em>(DOMString)</em></p></li>
<li><p><strong>phoneNumbers</strong>: An array of all the contact's phone numbers. <em>(<a href="cordova_contacts_contacts.md.html#ContactField">ContactField</a>[])</em></p></li>
@@ -553,7 +553,7 @@ created, stored, or removed from the dev
<a href="cordova_contacts_contacts.md.html#Contacts">Contacts</a> can also be retrieved (individually or in bulk) from the
database by invoking the <code><a href="cordova_contacts_contacts.md.html#contacts.find">contacts.find</a></code> method.</p>
-<p><strong>NOTE:</strong> Not all of the contact fields listed above are supported on
+<p><strong>NOTE</strong>: Not all of the contact fields listed above are supported on
every <a href="#device%20platform">device platform</a>. Please check each platform's <em>Quirks</em> section
for details.</p>
@@ -723,7 +723,7 @@ function onError(<a href="cordova_contac
<ul>
<li><p><strong>displayName</strong>: When creating a contact, the value provided for the display name parameter differs from the display name retrieved when finding the contact.</p></li>
-<li><p><strong>urls</strong>: When creating a contact, users can input and save more than one web address, but only one is available is available when searching the contact.</p></li>
+<li><p><strong>urls</strong>: When creating a contact, users can input and save more than one web address, but only one is available when searching the contact.</p></li>
<li><p><strong>phoneNumbers</strong>: The <em>pref</em> option is not supported. The <em>type</em> is not supported in a <em>find</em> operation. Only one <code>phoneNumber</code> is allowed for each <em>type</em>.</p></li>
<li><p><strong>emails</strong>: The <em>pref</em> option is not supported. Home and personal references same email entry. Only one entry is allowed for each <em>type</em>.</p></li>
<li><p><strong>addresses</strong>: Supports only work, and home/personal <em>type</em>. The home and personal <em>type</em> reference the same address entry. Only one entry is allowed for each <em>type</em>.</p></li>
Modified: cordova/site/public/docs/en/edge/cordova_device_device.md.html
URL: http://svn.apache.org/viewvc/cordova/site/public/docs/en/edge/cordova_device_device.md.html?rev=1539110&r1=1539109&r2=1539110&view=diff
==============================================================================
--- cordova/site/public/docs/en/edge/cordova_device_device.md.html (original)
+++ cordova/site/public/docs/en/edge/cordova_device_device.md.html Tue Nov 5 19:34:36 2013
@@ -535,7 +535,7 @@ platform name. For example, the Storm2
//
// iPhone: (Paraphrased from the UIDevice Class documentation)
// Returns a string of hash values created from multiple hardware identifies.
-// It is guaranteed to be unique for every device and cannot be tied
+// It is guaranteed to be unique for every device and can't be tied
// to the user account.
// Windows Phone 7 : Returns a hash of device+current user,
// if the user is not defined, a guid is generated and will persist until the app is uninstalled
@@ -582,7 +582,7 @@ var deviceID = <a href="cordova_device_d
<p>The <code>uuid</code> on iOS is not unique to a device, but varies for each
application, for each installation. It changes if you delete and
re-install the app, and possibly also when you upgrade iOS, or even
-upgrade your app per version (apparent in iOS 5.1). The <code>uuid</code> is not
+upgrade the app per version (apparent in iOS 5.1). The <code>uuid</code> is not
a reliable value.</p>
<h2><a name="device.uuid_windows_phone_7_and_8_quirks">Windows Phone 7 and 8 Quirks</a></h2>
@@ -665,7 +665,7 @@ var deviceVersion = <a href="cordova_dev
<h1><a name="device.name">device.name</a></h1>
-<p><strong>WARNING:</strong> <code><a href="cordova_device_device.md.html#device.name">device.name</a></code> is deprecated as of version 2.3.0. Use <code><a href="cordova_device_device.md.html#device.model">device.model</a></code> instead.</p>
+<p><strong>WARNING</strong>: <code><a href="cordova_device_device.md.html#device.name">device.name</a></code> is deprecated as of version 2.3.0. Use <code><a href="cordova_device_device.md.html#device.model">device.model</a></code> instead.</p>
<p>Get the device's model name.</p>
Modified: cordova/site/public/docs/en/edge/cordova_events_events.md.html
URL: http://svn.apache.org/viewvc/cordova/site/public/docs/en/edge/cordova_events_events.md.html?rev=1539110&r1=1539109&r2=1539110&view=diff
==============================================================================
--- cordova/site/public/docs/en/edge/cordova_events_events.md.html (original)
+++ cordova/site/public/docs/en/edge/cordova_events_events.md.html Tue Nov 5 19:34:36 2013
@@ -330,9 +330,9 @@ device APIs have loaded and are ready to
<p>Cordova consists of two code bases: native and JavaScript. While the
native code loads, a custom loading image displays. However,
-JavaScript only loads once the DOM loads. This means your web
-application may potentially call a Cordova JavaScript function before
-the corresponding native code is available.</p>
+JavaScript only loads once the DOM loads. This means the web app may
+potentially call a Cordova JavaScript function before the
+corresponding native code becomes available.</p>
<p>The <code><a href="cordova_events_events.md.html#deviceready">deviceready</a></code> event fires once Cordova has fully loaded. Once the
event fires, you can safely make calls to Cordova APIs. Applications
@@ -671,11 +671,11 @@ at least a second to fire, prior to whic
<h2><a name="online_windows_phone_7_quirks">Windows Phone 7 Quirks</a></h2>
-<p>When running in the Emulator, the <code>connection.status</code> is always unknown, so this event will <em>not</em> fire.</p>
+<p>When running in the Emulator, the <code>connection.status</code> is always unknown, so this event does <em>not</em> fire.</p>
<h2><a name="online_windows_phone_8_quirks">Windows Phone 8 Quirks</a></h2>
-<p>The Emulator reports the <a href="#connection%20type">connection type</a> as <code>Cellular</code>, which does not change, so events will <em>not</em> fire.</p>
+<p>The Emulator reports the <a href="#connection%20type">connection type</a> as <code>Cellular</code>, which does not change, so events does <em>not</em> fire.</p>
<hr>
Modified: cordova/site/public/docs/en/edge/cordova_file_file.md.html
URL: http://svn.apache.org/viewvc/cordova/site/public/docs/en/edge/cordova_file_file.md.html?rev=1539110&r1=1539109&r2=1539110&view=diff
==============================================================================
--- cordova/site/public/docs/en/edge/cordova_file_file.md.html (original)
+++ cordova/site/public/docs/en/edge/cordova_file_file.md.html Tue Nov 5 19:34:36 2013
@@ -296,7 +296,9 @@ Interface</a>, to add or remove this fea
$ cordova plugin rm org.apache.cordova.file
</code></pre>
-<p>To use the file-transfer plugin you must add that separately. Do not add the file plugin manually because it will be automatically added as a dependency plugin by the CLI. </p>
+<p>You must add the <code>file-transfer</code> plugin separately. The CLI
+automatically adds the <code>file</code> plugin as a dependency, so there is no
+need to add it separately:</p>
<pre class="prettyprint"><code> $ cordova plugin add org.apache.cordova.file-transfer
$ cordova plugin ls
@@ -420,7 +422,7 @@ specified portion of the file. Negative
are measured from the end of the file. Indexes are positioned
relative to the current slice. (See the full example below.)</p>
-<p><strong>Parameters:</strong></p>
+<p><strong>Parameters</strong>:</p>
<ul>
<li><p><strong>start</strong>: The index of the first byte to read, inclusive.</p></li>
@@ -467,7 +469,7 @@ var slice3 = file.slice(120, 135);
<li><p><strong>onloadend</strong>: Called when the request has completed (either in success or failure). <em>(Function)</em></p></li>
</ul>
-<p><strong>NOTE:</strong> The following porperty is not supported:</p>
+<p><strong>NOTE</strong>: The following porperty is not supported:</p>
<ul>
<li>
@@ -504,7 +506,7 @@ string. Event listeners receive the <co
<h2><a name="FileReader_readasdataurl">readAsDataURL</a></h2>
-<p><strong>Parameters:</strong></p>
+<p><strong>Parameters</strong>:</p>
<ul>
<li>
@@ -531,7 +533,7 @@ entry.file(win, fail);
<h2><a name="FileReader_readastext">readAsText</a></h2>
-<p><strong>Parameters:</strong></p>
+<p><strong>Parameters</strong>:</p>
<ul>
<li><p><strong>file</strong>: the file object to read.</p></li>
@@ -649,7 +651,7 @@ entry.file(win, fail);
<p>Currently supported on iOS and Android only.</p>
-<p><strong>Parameters:</strong></p>
+<p><strong>Parameters</strong>:</p>
<ul>
<li>
@@ -678,7 +680,7 @@ entry.file(win, fail);
<p>Currently supported on iOS and Android only.</p>
-<p><strong>Parameters:</strong></p>
+<p><strong>Parameters</strong>:</p>
<ul>
<li>
@@ -1023,7 +1025,7 @@ specification.</p>
<li><p><strong>fullPath</strong>: The full absolute path from the root to the <code><a href="cordova_file_file.md.html#FileEntry">FileEntry</a></code>. <em>(DOMString)</em></p></li>
</ul>
-<p><strong>NOTE:</strong> The following attribute is defined by the W3C specification,
+<p><strong>NOTE</strong>: The following attribute is defined by the W3C specification,
but is <em>not</em> supported:</p>
<ul>
@@ -1060,7 +1062,7 @@ but is <em>not</em> supported:</p>
<p>Look up metadata about a file.</p>
-<p><strong>Parameters:</strong></p>
+<p><strong>Parameters</strong>:</p>
<ul>
<li><p><strong>successCallback</strong>: A callback that is passed a <code><a href="cordova_file_file.md.html#Metadata">Metadata</a></code> object. <em>(Function)</em></p></li>
@@ -1088,10 +1090,10 @@ entry.getMetadata(success, fail);
<p><strong>Currently works only on iOS.</strong></p>
<ul>
-<li>this will set the extended attributes of a file.</li>
+<li>This sets the extended attributes of a file.</li>
</ul>
-<p><strong>Parameters:</strong></p>
+<p><strong>Parameters</strong>:</p>
<ul>
<li><p><strong>successCallback</strong>: A callback that executes when the metadata is set. <em>(Function)</em></p></li>
@@ -1166,7 +1168,7 @@ results if the app attempts to:</p>
<p>In addition, moving a file on top of an existing file attempts to
delete and replace that file.</p>
-<p><strong>Parameters:</strong></p>
+<p><strong>Parameters</strong>:</p>
<ul>
<li><p><strong>parent</strong>: The parent directory to which to move the file. <em>(<a href="cordova_file_file.md.html#DirectoryEntry">DirectoryEntry</a>)</em></p></li>
@@ -1204,7 +1206,7 @@ the app attempts to:</p>
<li>copy a file into its parent if a name different from its current one is not provided.</li>
</ul>
-<p><strong>Parameters:</strong></p>
+<p><strong>Parameters</strong>:</p>
<ul>
<li><p><strong>parent</strong>: The parent directory to which to copy the file. <em>(<a href="cordova_file_file.md.html#DirectoryEntry">DirectoryEntry</a>)</em></p></li>
@@ -1248,7 +1250,7 @@ console.log(fileURL);
<p>Deletes a file.</p>
-<p><strong>Parameters:</strong></p>
+<p><strong>Parameters</strong>:</p>
<ul>
<li><p><strong>successCallback</strong>: A callback that executes after the file has been deleted. Invoked with no parameters. <em>(Function)</em></p></li>
@@ -1273,7 +1275,7 @@ entry.remove(success, fail);
<p>Look up the parent <code><a href="cordova_file_file.md.html#DirectoryEntry">DirectoryEntry</a></code> containing the file.</p>
-<p><strong>Parameters:</strong></p>
+<p><strong>Parameters</strong>:</p>
<ul>
<li><p><strong>successCallback</strong>: A callback that is passed the file's parent <code><a href="cordova_file_file.md.html#DirectoryEntry">DirectoryEntry</a></code>. <em>(Function)</em></p></li>
@@ -1298,7 +1300,7 @@ entry.getParent(success, fail);
<p>Create a <code><a href="cordova_file_file.md.html#FileWriter">FileWriter</a></code> object associated with the file represented by the <code><a href="cordova_file_file.md.html#FileEntry">FileEntry</a></code>.</p>
-<p><strong>Parameters:</strong></p>
+<p><strong>Parameters</strong>:</p>
<ul>
<li><p><strong>successCallback</strong>: A callback that is passed a <code><a href="cordova_file_file.md.html#FileWriter">FileWriter</a></code> object. <em>(Function)</em></p></li>
@@ -1324,7 +1326,7 @@ entry.createWriter(success, fail);
<p>Return a <code><a href="cordova_file_file.md.html#File">File</a></code> object that represents the current state of the file
that this <code><a href="cordova_file_file.md.html#FileEntry">FileEntry</a></code> represents.</p>
-<p><strong>Parameters:</strong></p>
+<p><strong>Parameters</strong>:</p>
<ul>
<li><p><strong>successCallback</strong>: A callback that is passed a <code><a href="cordova_file_file.md.html#File">File</a></code> object. <em>(Function)</em></p></li>
@@ -1362,7 +1364,7 @@ specification.</p>
<li><p><strong>fullPath</strong>: The full absolute path from the root to the <code><a href="cordova_file_file.md.html#DirectoryEntry">DirectoryEntry</a></code>. <em>(DOMString)</em></p></li>
</ul>
-<p><strong>NOTE:</strong> The following attribute is defined by the W3C specification,
+<p><strong>NOTE</strong>: The following attribute is defined by the W3C specification,
but is <em>not</em> supported:</p>
<ul>
@@ -1403,7 +1405,7 @@ but is <em>not</em> supported:</p>
<p>Look up metadata about a directory.</p>
-<p><strong>Parameters:</strong></p>
+<p><strong>Parameters</strong>:</p>
<ul>
<li><p><strong>successCallback</strong>: A callback function to execute with a <code><a href="cordova_file_file.md.html#Metadata">Metadata</a></code> object. <em>(Function)</em></p></li>
@@ -1429,7 +1431,7 @@ entry.getMetadata(success, fail);
<p>Sets a directory's extended attributes, or metadata. <em>Currently works
only on iOS.</em></p>
-<p><strong>Parameters:</strong></p>
+<p><strong>Parameters</strong>:</p>
<ul>
<li><p><strong>successCallback</strong>: A callback that executes when the metadata is successfully set. <em>(Function)</em></p></li>
@@ -1505,7 +1507,7 @@ entry.setMetadata(success, fail, { "com.
<p>Moving a directory on top of an existing empty directory attempts to
delete and replace that directory.</p>
-<p><strong>Parameters:</strong></p>
+<p><strong>Parameters</strong>:</p>
<ul>
<li><p><strong>parent</strong>: The parent directory to which to move the directory. <em>(<a href="cordova_file_file.md.html#DirectoryEntry">DirectoryEntry</a>)</em></p></li>
@@ -1546,7 +1548,7 @@ function moveDir(entry) {
<p>Directory copies are always recursive, and copy all contents of the directory.</p>
-<p><strong>Parameters:</strong></p>
+<p><strong>Parameters</strong>:</p>
<ul>
<li><p><strong>parent</strong>: The parent directory to which to copy the directory. <em>(<a href="cordova_file_file.md.html#DirectoryEntry">DirectoryEntry</a>)</em></p></li>
@@ -1596,7 +1598,7 @@ console.log(dirURL);
<li><p>delete the root directory of a filesystem.</p></li>
</ul>
-<p><strong>Parameters:</strong></p>
+<p><strong>Parameters</strong>:</p>
<ul>
<li><p><strong>successCallback</strong>: A callback that executes after the directory is deleted. Invoked with no parameters. <em>(Function)</em></p></li>
@@ -1621,7 +1623,7 @@ entry.remove(success, fail);
<p>Look up the parent <code><a href="cordova_file_file.md.html#DirectoryEntry">DirectoryEntry</a></code> containing the directory.</p>
-<p><strong>Parameters:</strong></p>
+<p><strong>Parameters</strong>:</p>
<ul>
<li><p><strong>successCallback</strong>: A callback that is passed the directory's parent <code><a href="cordova_file_file.md.html#DirectoryEntry">DirectoryEntry</a></code>. <em>(Function)</em></p></li>
@@ -1660,7 +1662,7 @@ var directoryReader = entry.createReader
<li>create a directory whose immediate parent does not yet exist.</li>
</ul>
-<p><strong>Parameters:</strong></p>
+<p><strong>Parameters</strong>:</p>
<ul>
<li><p><strong>path</strong>: The path to the directory to be looked up or created. Either an absolute path, or a relative path from this <code><a href="cordova_file_file.md.html#DirectoryEntry">DirectoryEntry</a></code>. <em>(DOMString)</em></p></li>
@@ -1691,7 +1693,7 @@ entry.getDirectory("newDir", {create: tr
<li>create a file whose immediate parent does not yet exist.</li>
</ul>
-<p><strong>Parameters:</strong></p>
+<p><strong>Parameters</strong>:</p>
<ul>
<li><p><strong>path</strong>: The path to the file to be looked up or created. Either an absolute path, or a relative path from this <code><a href="cordova_file_file.md.html#DirectoryEntry">DirectoryEntry</a></code>. <em>(DOMString)</em></p></li>
@@ -1717,14 +1719,14 @@ entry.getFile("newFile.txt", {create: tr
<h2><a name="DirectoryEntry_removerecursively">removeRecursively</a></h2>
<p>Deletes a directory and all of its contents. In the event of an error (such as trying to delete
-a directory containing a file that cannot be removed), some of the contents of the directory may
+a directory containing a file that can't be removed), some of the contents of the directory may
be deleted. An error results if the app attempts to:</p>
<ul>
<li>delete the root directory of a filesystem.</li>
</ul>
-<p><strong>Parameters:</strong></p>
+<p><strong>Parameters</strong>:</p>
<ul>
<li><p><strong>successCallback</strong>: A callback that executes after the <code><a href="cordova_file_file.md.html#DirectoryEntry">DirectoryEntry</a></code> has been deleted. Invoked with no parameters. <em>(Function)</em></p></li>
@@ -1795,7 +1797,7 @@ specification.</p>
<p>Read the entries in this directory.</p>
-<p><strong>Parameters:</strong></p>
+<p><strong>Parameters</strong>:</p>
<ul>
<li><p><strong>successCallback</strong>: A callback that is passed an array of <code><a href="cordova_file_file.md.html#FileEntry">FileEntry</a></code> and <code><a href="cordova_file_file.md.html#DirectoryEntry">DirectoryEntry</a></code> objects. <em>(Function)</em></p></li>
@@ -1869,7 +1871,7 @@ device.</p>
<h2><a name="FileTransfer_upload">upload</a></h2>
-<p><strong>Parameters:</strong></p>
+<p><strong>Parameters</strong>:</p>
<ul>
<li><p><strong>filePath</strong>: Full path of the file on the device.</p></li>
@@ -2015,14 +2017,14 @@ to a Nginx server.</p>
<h2><a name="FileTransfer_download">download</a></h2>
-<p><strong>Parameters:</strong></p>
+<p><strong>Parameters</strong>:</p>
<ul>
<li><p><strong>source</strong>: URL of the server to download the file, as encoded by <code>encodeURI()</code>.</p></li>
<li><p><strong>target</strong>: Full path of the file on the device.</p></li>
<li><p><strong>successCallback</strong>: A callback that is passed a <code><a href="cordova_file_file.md.html#FileEntry">FileEntry</a></code> object. <em>(Function)</em></p></li>
<li><p><strong>errorCallback</strong>: A callback that executes if an error occurs when retrieving the <code><a href="cordova_file_file.md.html#Metadata">Metadata</a></code>. Invoked with a <code><a href="cordova_file_file.md.html#FileTransferError">FileTransferError</a></code> object. <em>(Function)</em></p></li>
-<li><p><strong>trustAllHosts</strong>: Optional parameter, defaults to <code>false</code>. If set to <code>true</code> then it will accept all security certificates. This is useful as Android rejects self signed security certificates. Not recommended for production use. Supported on Android and iOS. <em>(boolean)</em></p></li>
+<li><p><strong>trustAllHosts</strong>: Optional parameter, defaults to <code>false</code>. If set to <code>true</code>, it accepts all security certificates. This is useful because Android rejects self-signed security certificates. Not recommended for production use. Supported on Android and iOS. <em>(boolean)</em></p></li>
<li><p><strong>options</strong>: Optional parameters, currently only supports headers (such as Authorization (Basic Authentication), etc).</p></li>
</ul>
@@ -2144,7 +2146,7 @@ upload script.</p>
<ul>
<li>
-<strong>chunkedMode:</strong>: Ignored on WP7.</li>
+<strong>chunkedMode</strong>: Ignored on WP7.</li>
</ul>
<hr>
Modified: cordova/site/public/docs/en/edge/cordova_geolocation_geolocation.md.html
URL: http://svn.apache.org/viewvc/cordova/site/public/docs/en/edge/cordova_geolocation_geolocation.md.html?rev=1539110&r1=1539109&r2=1539110&view=diff
==============================================================================
--- cordova/site/public/docs/en/edge/cordova_geolocation_geolocation.md.html (original)
+++ cordova/site/public/docs/en/edge/cordova_geolocation_geolocation.md.html Tue Nov 5 19:34:36 2013
@@ -204,16 +204,16 @@ device's actual location.</p>
<a class="external" href="http://dev.w3.org/geo/api/spec-source.html">W3C </a><a href="cordova_geolocation_geolocation.md.html#Geolocation">Geolocation</a> API Specification,
and only executes on devices that don't already provide an implementation.</p>
-<p><strong>Important privacy note:</strong> Collection and use of geolocation data
+<p><strong>WARNING</strong>: Collection and use of geolocation data
raises important privacy issues. Your app's privacy policy should
discuss how the app uses geolocation data, whether it is shared with
any other parties, and the level of precision of the data (for
example, coarse, fine, ZIP code level, etc.). <a href="cordova_geolocation_geolocation.md.html#Geolocation">Geolocation</a> data is
-generally considered sensitive because it can reveal a person's
-whereabouts and, if stored, the history of his or her travels.
-Therefore, in addition to your app's privacy policy, you should
-strongly consider providing a just-in-time notice prior to your app
-accessing geolocation data (if the device operating system doesn't do
+generally considered sensitive because it can reveal user's
+whereabouts and, if stored, the history of their travels.
+Therefore, in addition to the app's privacy policy, you should
+strongly consider providing a just-in-time notice before the app
+accesses geolocation data (if the device operating system doesn't do
so already). That notice should provide the same information noted
above, as well as obtaining the user's permission (e.g., by presenting
choices for <strong>OK</strong> and <strong>No Thanks</strong>). For more information, please
Modified: cordova/site/public/docs/en/edge/cordova_globalization_globalization.md.html
URL: http://svn.apache.org/viewvc/cordova/site/public/docs/en/edge/cordova_globalization_globalization.md.html?rev=1539110&r1=1539109&r2=1539110&view=diff
==============================================================================
--- cordova/site/public/docs/en/edge/cordova_globalization_globalization.md.html (original)
+++ cordova/site/public/docs/en/edge/cordova_globalization_globalization.md.html Tue Nov 5 19:34:36 2013
@@ -618,7 +618,7 @@ client's user preferences.</p>
a parameter contains the following properties:</p>
<ul>
-<li><p><strong>pattern</strong>: The date and time pattern to format and parse dates. The patterns follow Unicode Technical Standard #35. <a class="external" href="http://unicode.org/reports/tr35/tr35-4.html">http://unicode.org/reports/tr35/tr35-4.html</a>. <em>(String)</em></p></li>
+<li><p><strong>pattern</strong>: The date and time pattern to format and parse dates. The patterns follow <a class="external" href="http://unicode.org/reports/tr35/tr35-4.html">Unicode Technical Standard #35</a>. <em>(String)</em></p></li>
<li><p><strong>timezone</strong>: The abbreviated name of the time zone on the client. <em>(String)</em></p></li>
<li><p><strong>utc_offset</strong>: The current difference in seconds between the client's time zone and coordinated universal time. <em>(Number)</em></p></li>
<li><p><strong>dst_offset</strong>: The current daylight saving time offset in seconds between the client's non-daylight saving's time zone and the client's daylight saving's time zone. <em>(Number)</em></p></li>
@@ -1081,7 +1081,7 @@ popup dialog with text similar to <code>
as a parameter. That object contains the following properties:</p>
<ul>
-<li><p><strong>pattern</strong>: The number pattern to format and parse numbers. The patterns follow Unicode Technical Standard #35. <a class="external" href="http://unicode.org/reports/tr35/tr35-4.html">http://unicode.org/reports/tr35/tr35-4.html</a>. <em>(String)</em></p></li>
+<li><p><strong>pattern</strong>: The number pattern to format and parse numbers. The patterns follow <a class="external" href="http://unicode.org/reports/tr35/tr35-4.html">Unicode Technical Standard #35</a>. <em>(String)</em></p></li>
<li><p><strong>symbol</strong>: The symbol to use when formatting and parsing, such as a percent or currency symbol. <em>(String)</em></p></li>
<li><p><strong>fraction</strong>: The number of fractional digits to use when parsing and formatting numbers. <em>(Number)</em></p></li>
<li><p><strong>rounding</strong>: The rounding increment to use when parsing and formatting. <em>(Number)</em></p></li>
@@ -1197,7 +1197,7 @@ to the client's user preferences and ISO
as a parameter. That object should contain the following properties:</p>
<ul>
-<li><p><strong>pattern</strong>: The currency pattern to format and parse currency values. The patterns follow Unicode Technical Standard #35. <a class="external" href="http://unicode.org/reports/tr35/tr35-4.html">http://unicode.org/reports/tr35/tr35-4.html</a>. <em>(String)</em></p></li>
+<li><p><strong>pattern</strong>: The currency pattern to format and parse currency values. The patterns follow <a class="external" href="http://unicode.org/reports/tr35/tr35-4.html">Unicode Technical Standard #35</a>. <em>(String)</em></p></li>
<li><p><strong>code</strong>: The ISO 4217 currency code for the pattern. <em>(String)</em></p></li>
<li><p><strong>fraction</strong>: The number of fractional digits to use when parsing and formatting currency. <em>(Number)</em></p></li>
<li><p><strong>rounding</strong>: The rounding increment to use when parsing and formatting. <em>(Number)</em></p></li>
Modified: cordova/site/public/docs/en/edge/cordova_inappbrowser_inappbrowser.md.html
URL: http://svn.apache.org/viewvc/cordova/site/public/docs/en/edge/cordova_inappbrowser_inappbrowser.md.html?rev=1539110&r1=1539109&r2=1539110&view=diff
==============================================================================
--- cordova/site/public/docs/en/edge/cordova_inappbrowser_inappbrowser.md.html (original)
+++ cordova/site/public/docs/en/edge/cordova_inappbrowser_inappbrowser.md.html Tue Nov 5 19:34:36 2013
@@ -181,8 +181,8 @@
<pre class="prettyprint"><code>var ref = <a href="cordova_inappbrowser_inappbrowser.md.html#window.open">window.open</a>('http://apache.org', '_blank', 'location=yes');
</code></pre>
-<p><strong>NOTE:</strong> The <a href="cordova_inappbrowser_inappbrowser.md.html#InAppBrowser">InAppBrowser</a> window behaves like a standard web browser,
-and cannot access Cordova APIs.</p>
+<p><strong>NOTE</strong>: The <a href="cordova_inappbrowser_inappbrowser.md.html#InAppBrowser">InAppBrowser</a> window behaves like a standard web browser,
+and can't access Cordova APIs.</p>
<h2><a name="InAppBrowser_description">Description</a></h2>
@@ -405,7 +405,7 @@ ref.<a href="cordova_inappbrowser_inappb
iabRef = <a href="cordova_inappbrowser_inappbrowser.md.html#window.open">window.open</a>('http://apache.org', '_blank', 'location=yes');
iabRef.<a href="cordova_inappbrowser_inappbrowser.md.html#addEventListener">addEventListener</a>('loadstart', iabLoadStart);
iabRef.<a href="cordova_inappbrowser_inappbrowser.md.html#addEventListener">addEventListener</a>('loadstop', iabLoadStop);
- iabRef.<a href="cordova_inappbrowser_inappbrowser.md.html#removeEventListener">removeEventListener</a>('loaderror', iabLoadError);
+ iabRef.<a href="cordova_inappbrowser_inappbrowser.md.html#addEventListener">addEventListener</a>('loaderror', iabLoadError);
iabRef.<a href="cordova_inappbrowser_inappbrowser.md.html#addEventListener">addEventListener</a>('exit', iabClose);
}
@@ -488,7 +488,7 @@ ref.<a href="cordova_inappbrowser_inappb
<ul>
<li>
-<strong>ref:</strong> reference to the <a href="cordova_inappbrowser_inappbrowser.md.html#InAppBrowser">InAppBrowser</a> window (<code><a href="cordova_inappbrowser_inappbrowser.md.html#InAppBrowser">InAppBrowser</a></code>)</li>
+<strong>ref</strong>: reference to the <a href="cordova_inappbrowser_inappbrowser.md.html#InAppBrowser">InAppBrowser</a> window (<code><a href="cordova_inappbrowser_inappbrowser.md.html#InAppBrowser">InAppBrowser</a></code>)</li>
</ul>
<h2><a name="show_supported_platforms">Supported Platforms</a></h2>
@@ -697,10 +697,10 @@ ref.<a href="cordova_inappbrowser_inappb
//
function changeBackgroundColor() {
iabRef.<a href="cordova_inappbrowser_inappbrowser.md.html#insertCSS">insertCSS</a>({
- code: "body { background: #ffff00"
+ code: "body { background: #ffff00; }"
}, function() {
alert("Styles Altered");
- }
+ });
}
function iabClose(event) {
@@ -772,28 +772,28 @@ instance, or the system browser.</p>
<strong>location</strong>: Set to <code>yes</code> or <code>no</code> to turn the <code><a href="cordova_inappbrowser_inappbrowser.md.html#InAppBrowser">InAppBrowser</a></code>'s location bar on or off.</li>
</ul>
-<h2>Android only</h2>
+<p>Android only:</p>
<ul>
<li>
-<strong>closebuttoncaption</strong> - set to a string that will be the caption for the "Done" button. </li>
+<strong>closebuttoncaption</strong>: set to a string to use as the <strong>Done</strong> button's caption.</li>
<li>
-<strong>hidden</strong> - set to 'yes' to create the browser and load the page, but not <a href="cordova_inappbrowser_inappbrowser.md.html#show">show</a> it. The load event will fire when loading is complete. Omit or set to 'no' (default) to have the browser open and load normally. </li>
+<strong>hidden</strong>: set to <code>yes</code> to create the browser and load the page, but not <a href="cordova_inappbrowser_inappbrowser.md.html#show">show</a> it. The load event fires when loading is complete. Omit or set to <code>no</code> (default) to have the browser open and load normally. </li>
<li>
-<strong>clearcache</strong> - set to 'yes' to have the browser's cookie cache cleared before the new window is opened</li>
+<strong>clearcache</strong>: set to <code>yes</code> to have the browser's cookie cache cleared before the new window is opened</li>
<li>
-<strong>clearsessioncache</strong> - set to 'yes' to have the session cookie cache cleared before the new window is opened</li>
+<strong>clearsessioncache</strong>: set to <code>yes</code> to have the session cookie cache cleared before the new window is opened</li>
</ul>
-<h2>iOS only</h2>
+<p>iOS only:</p>
<ul>
<li>
-<strong>closebuttoncaption</strong> - set to a string that will be the caption for the "Done" button. Note that you will have to localize this value yourself.</li>
+<strong>closebuttoncaption</strong>: set to a string to use as the <strong>Done</strong> button's caption. Note that you need to localize this value yourself.</li>
<li>
-<strong>hidden</strong> - set to 'yes' to create the browser and load the page, but not <a href="cordova_inappbrowser_inappbrowser.md.html#show">show</a> it. The load event will fire when loading is complete. Omit or set to 'no' (default) to have the browser open and load normally. </li>
+<strong>hidden</strong>: set to <code>yes</code> to create the browser and load the page, but not <a href="cordova_inappbrowser_inappbrowser.md.html#show">show</a> it. The load event fires when loading is complete. Omit or set to <code>no</code> (default) to have the browser open and load normally. </li>
<li>
-<strong>toolbar</strong> - set to 'yes' or 'no' to turn the toolbar on or off for the <a href="cordova_inappbrowser_inappbrowser.md.html#InAppBrowser">InAppBrowser</a> (defaults to 'yes')</li>
+<strong>toolbar</strong>: set to <code>yes</code> or <code>no</code> to turn the toolbar on or off for the <a href="cordova_inappbrowser_inappbrowser.md.html#InAppBrowser">InAppBrowser</a> (defaults to <code>yes</code>)</li>
<li>
<strong>enableViewportScale</strong>: Set to <code>yes</code> or <code>no</code> to prevent viewport scaling through a meta tag (defaults to <code>no</code>).</li>
<li>
Modified: cordova/site/public/docs/en/edge/cordova_media_capture_capture.md.html
URL: http://svn.apache.org/viewvc/cordova/site/public/docs/en/edge/cordova_media_capture_capture.md.html?rev=1539110&r1=1539109&r2=1539110&view=diff
==============================================================================
--- cordova/site/public/docs/en/edge/cordova_media_capture_capture.md.html (original)
+++ cordova/site/public/docs/en/edge/cordova_media_capture_capture.md.html Tue Nov 5 19:34:36 2013
@@ -214,13 +214,13 @@
<p>Provides access to the device's audio, image, and video capture capabilities.</p>
</blockquote>
-<p><strong>Important privacy note:</strong> Collection and use of images, video, or
+<p><strong>WARNING</strong>: Collection and use of images, video, or
audio from the device's camera or microphone raises important privacy
issues. Your app's privacy policy should discuss how the app uses
such sensors and whether the data recorded is shared with any other
parties. In addition, if the app's use of the camera or microphone is
not apparent in the user interface, you should provide a just-in-time
-notice prior to your app accessing the camera or microphone (if the
+notice before the app accesses the camera or microphone (if the
device operating system doesn't do so already). That notice should
provide the same information noted above, as well as obtaining the
user's permission (e.g., by presenting choices for <strong>OK</strong> and <strong>No
@@ -528,13 +528,13 @@ navigator.device.<a href="cordova_media_
<h2><a name="CaptureAudioOptions_android_quirks">Android Quirks</a></h2>
<ul>
-<li>The <code>duration</code> parameter is not supported. Recording lengths cannot be limited programmatically.</li>
+<li>The <code>duration</code> parameter is not supported. Recording lengths can't be limited programmatically.</li>
</ul>
<h2><a name="CaptureAudioOptions_blackberry_webworks_quirks">BlackBerry WebWorks Quirks</a></h2>
<ul>
-<li>The <code>duration</code> parameter is not supported. Recording lengths cannot be limited programmatically.</li>
+<li>The <code>duration</code> parameter is not supported. Recording lengths can't be limited programmatically.</li>
</ul>
<h2><a name="CaptureAudioOptions_ios_quirks">iOS Quirks</a></h2>
@@ -854,7 +854,7 @@ navigator.device.<a href="cordova_media_
<h2><a name="CaptureVideoOptions_blackberry_webworks_quirks">BlackBerry WebWorks Quirks</a></h2>
<ul>
-<li>The <strong>duration</strong> parameter is not supported, so the length of recordings cannot be limited programmatically.</li>
+<li>The <strong>duration</strong> parameter is not supported, so the length of recordings can't be limited programmatically.</li>
</ul>
<h2><a name="CaptureVideoOptions_ios_quirks">iOS Quirks</a></h2>
Modified: cordova/site/public/docs/en/edge/cordova_media_media.md.html
URL: http://svn.apache.org/viewvc/cordova/site/public/docs/en/edge/cordova_media_media.md.html?rev=1539110&r1=1539109&r2=1539110&view=diff
==============================================================================
--- cordova/site/public/docs/en/edge/cordova_media_media.md.html (original)
+++ cordova/site/public/docs/en/edge/cordova_media_media.md.html Tue Nov 5 19:34:36 2013
@@ -221,7 +221,7 @@
<pre class="prettyprint"><code>var media = new <a href="cordova_media_media.md.html#Media">Media</a>(src, mediaSuccess, [<a href="cordova_media_media.md.html#mediaError">mediaError</a>], [mediaStatus]);
</code></pre>
-<p><strong>NOTE:</strong> The current implementation does not adhere to a W3C
+<p><strong>NOTE</strong>: The current implementation does not adhere to a W3C
specification for media capture, and is provided for convenience only.
A future implementation will adhere to the latest W3C specification
and may deprecate the current APIs.</p>
Modified: cordova/site/public/docs/en/edge/cordova_notification_notification.md.html
URL: http://svn.apache.org/viewvc/cordova/site/public/docs/en/edge/cordova_notification_notification.md.html?rev=1539110&r1=1539109&r2=1539110&view=diff
==============================================================================
--- cordova/site/public/docs/en/edge/cordova_notification_notification.md.html (original)
+++ cordova/site/public/docs/en/edge/cordova_notification_notification.md.html Tue Nov 5 19:34:36 2013
@@ -607,6 +607,7 @@ function showPrompt() {
<li>iOS</li>
<li>Tizen</li>
<li>Windows Phone 7 and 8</li>
+<li>Windows 8</li>
</ul>
<h2><a name="notification.beep_quick_example">Quick Example</a></h2>
Modified: cordova/site/public/docs/en/edge/cordova_storage_storage.md.html
URL: http://svn.apache.org/viewvc/cordova/site/public/docs/en/edge/cordova_storage_storage.md.html?rev=1539110&r1=1539109&r2=1539110&view=diff
==============================================================================
--- cordova/site/public/docs/en/edge/cordova_storage_storage.md.html (original)
+++ cordova/site/public/docs/en/edge/cordova_storage_storage.md.html Tue Nov 5 19:34:36 2013
@@ -149,9 +149,10 @@
<p>An overview of storage options for Cordova.</p>
</blockquote>
-<p>There are several storage APIs that are available to Cordova applications. For
-a more complete overview and examples, see
-<a class="external" href="http://www.html5rocks.com/en/features/storage">http://www.html5rocks.com/en/features/storage</a>.</p>
+<p>There are several storage APIs that are available to Cordova applications.
+See
+<a class="external" href="http://www.html5rocks.com/en/features/storage">html5rocks</a>.
+for a more complete overview and examples.</p>
<h2><a name="Storage_localstorage">LocalStorage</a></h2>
@@ -200,7 +201,7 @@ offers more full-featured database table
<h2><a name="Storage_plugin_based_options">Plugin-Based Options</a></h2>
<ul>
-<li>Most notably - The <a href="cordova_file_file.md.html#File">File</a> API.</li>
+<li>Most notably, the <a href="cordova_file_file.md.html#File">File</a> API.</li>
<li>More storage options exist through <a class="external" href="http://plugins.cordova.io/">Cordova plugins</a>.</li>
</ul>
Modified: cordova/site/public/docs/en/edge/guide_appdev_whitelist_index.md.html
URL: http://svn.apache.org/viewvc/cordova/site/public/docs/en/edge/guide_appdev_whitelist_index.md.html?rev=1539110&r1=1539109&r2=1539110&view=diff
==============================================================================
--- cordova/site/public/docs/en/edge/guide_appdev_whitelist_index.md.html (original)
+++ cordova/site/public/docs/en/edge/guide_appdev_whitelist_index.md.html Tue Nov 5 19:34:36 2013
@@ -206,7 +206,7 @@ on each platform.)</p>
<p>Platform-specific whitelisting rules are found in
<code>res/xml/config.xml</code>.</p>
-<p><strong>NOTE:</strong> On Android 2.3 and before, domain whitelisting only works
+<p><strong>NOTE</strong>: On Android 2.3 and before, domain whitelisting only works
for <code>href</code> hyperlinks, not referenced resources such as images and
scripts. Take steps to avoid scripts from being injected into the
application.</p>
@@ -285,9 +285,9 @@ protocol:</p>
<p>Specifically, these patterns need to be updated:</p>
<ul>
-<li><p>"<code>apache.org</code>" (no protocol): This would previously match <code>http</code>, <code>https</code>, <code>ftp</code>, and <code>ftps</code> protocols. Change to "<code>*://apache.org/*</code>" to include all protocols, or include a line for each protocol you need to support.</p></li>
-<li><p>"<code>http://apache.*</code>" (wildcard at end of domain): This would previously match all top-level-domains, including all possible two-letter TLDs (but not useful domains like .co.uk). Include a line for each TLD which you actually control, and need to whitelist.</p></li>
-<li><p>"<code>h*t*://ap*he.o*g</code>" (wildcards for random missing letters): These are no longer supported; change to include a line for each domain and protocol that you actually need to whitelist.</p></li>
+<li><p><code>apache.org</code> (no protocol): This would previously match <code>http</code>, <code>https</code>, <code>ftp</code>, and <code>ftps</code> protocols. Change to "<code>*://apache.org/*</code>" to include all protocols, or include a line for each protocol you need to support.</p></li>
+<li><p><code>http://apache.*</code> (wildcard at end of domain): This would previously match all top-level-domains, including all possible two-letter TLDs (but not useful domains like .co.uk). Include a line for each TLD which you actually control, and need to whitelist.</p></li>
+<li><p><code>h*t*://ap*he.o*g</code> (wildcards for random missing letters): These are no longer supported; change to include a line for each domain and protocol that you actually need to whitelist.</p></li>
</ul>
<h2><a name="Whitelist%20Guide_windows_phone_whitelisting">Windows Phone Whitelisting</a></h2>
Modified: cordova/site/public/docs/en/edge/guide_cli_index.md.html
URL: http://svn.apache.org/viewvc/cordova/site/public/docs/en/edge/guide_cli_index.md.html?rev=1539110&r1=1539109&r2=1539110&view=diff
==============================================================================
--- cordova/site/public/docs/en/edge/guide_cli_index.md.html (original)
+++ cordova/site/public/docs/en/edge/guide_cli_index.md.html Tue Nov 5 19:34:36 2013
@@ -616,7 +616,7 @@ each platform, and versions of the CLI a
<p>It both presents the information to screen and captures the output in
a local <code>info.txt</code> file.</p>
-<p><strong>NOTE:</strong> Currently, only details on iOS and Android platforms are
+<p><strong>NOTE</strong>: Currently, only details on iOS and Android platforms are
available.</p>
<h2><a name="The%20Command-line%20Interface_updating_cordova_and_your_project">Updating Cordova and Your Project</a></h2>
Modified: cordova/site/public/docs/en/edge/guide_hybrid_plugins_index.md.html
URL: http://svn.apache.org/viewvc/cordova/site/public/docs/en/edge/guide_hybrid_plugins_index.md.html?rev=1539110&r1=1539109&r2=1539110&view=diff
==============================================================================
--- cordova/site/public/docs/en/edge/guide_hybrid_plugins_index.md.html (original)
+++ cordova/site/public/docs/en/edge/guide_hybrid_plugins_index.md.html Tue Nov 5 19:34:36 2013
@@ -327,9 +327,16 @@ listed below, and each builds on the sim
<h2><a name="Plugin%20Development%20Guide_publishing_plugins">Publishing plugins</a></h2>
-<p>Once you developed your plugin, you might want to publish it and share it with the community. You can publish your plugin to the cordova registry (based on <a class="external" href="https://github.com/isaacs/npmjs.org">npmjs</a>) or to any other npmjs based registry. Users will be able to install it automatically using either plugman or cordova-cli.</p>
+<p>Once you develop your plugin, you may want to publish and share it
+with the community. You can publish your plugin to the cordova
+registry (based on <a class="external" href="https://github.com/isaacs/npmjs.org"><code>npmjs</code></a>) or
+to any other <code>npmjs</code>-based registry. Other developers can install it
+automatically using either <code>plugman</code> or the Cordova CLI. (For details
+on each development path, see <a href="plugin_ref_plugman.md.html#Using%20Plugman%20to%20Manage%20Plugins">Using Plugman to Manage Plugins</a> and <a href="#The%0ACommand-line%20Interface">The
+Command-line Interface</a>.)</p>
-<p>To publish a plugin you need to use the plugman tool and go through the following steps:</p>
+<p>To publish a plugin you need to use the <code>plugman</code> tool and go through
+the following steps:</p>
<pre class="prettyprint"><code>$ plugman adduser # that is if you don't have an account yet
$ plugman publish /path/to/your/plugin
@@ -337,7 +344,8 @@ $ plugman publish /path/to/your/plugin
<p>That is it!</p>
-<p>Other registry-based commands are available and <code>plugman --help</code> will give you a list of what commands are available and how to use them.</p>
+<p>Running <code>plugman --help</code> lists other available registry-based
+commands.</p>
</div>
</div>
Modified: cordova/site/public/docs/en/edge/guide_hybrid_webviews_index.md.html
URL: http://svn.apache.org/viewvc/cordova/site/public/docs/en/edge/guide_hybrid_webviews_index.md.html?rev=1539110&r1=1539109&r2=1539110&view=diff
==============================================================================
--- cordova/site/public/docs/en/edge/guide_hybrid_webviews_index.md.html (original)
+++ cordova/site/public/docs/en/edge/guide_hybrid_webviews_index.md.html Tue Nov 5 19:34:36 2013
@@ -148,7 +148,7 @@ make full use of Cordova APIs. You can t
application components along with native components in a hybrid
application.</p>
-<p>To deploy a WebView, you will need to be familiar with each native
+<p>To deploy a WebView, you need to be familiar with each native
programming environment. The following provides instructions for
supported platforms:</p>
Modified: cordova/site/public/docs/en/edge/guide_platforms_android_config.md.html
URL: http://svn.apache.org/viewvc/cordova/site/public/docs/en/edge/guide_platforms_android_config.md.html?rev=1539110&r1=1539109&r2=1539110&view=diff
==============================================================================
--- cordova/site/public/docs/en/edge/guide_platforms_android_config.md.html (original)
+++ cordova/site/public/docs/en/edge/guide_platforms_android_config.md.html Tue Nov 5 19:34:36 2013
@@ -150,13 +150,15 @@ config.xml File</a> for information on g
<li>
<p><code>KeepRunning</code> (boolean, defaults to <code>true</code>): Determines whether the
application stays running in the background even after a <code><a href="cordova_events_events.md.html#pause">pause</a></code>
-event fires.</p>
+event fires. Note: setting this to false will not kill the app after
+a <a href="cordova_events_events.md.html#pause">pause</a> event, it will only halt execution of code in the cordova
+webview while the app is in the background.</p>
<pre class="prettyprint"><code><preference name="KeepRunning" value="false"/>
</code></pre>
</li>
<li>
-<p><code>LoadUrlTimeoutValue</code> (number, default is <code>20000</code>): When loading a
+<p><code>LoadUrlTimeoutValue</code> (number, default to <code>20000</code>, 20 seconds): When loading a
page, the amount of time to wait before throwing a timeout error.
This example specifies 10 seconds rather than 20:</p>
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=1539110&r1=1539109&r2=1539110&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 Tue Nov 5 19:34:36 2013
@@ -186,10 +186,11 @@ project.</p>
<h2><a name="Android%20Platform%20Guide_install_the_sdk">Install the SDK</a></h2>
<p>Install the Android SDK from
-<a class="external" href="http://developer.android.com/sdk/">developer.android.com/sdk</a>. You
-may be presented with a choice of where to install the SDK, otherwise
-move the downloaded <code>adt-bundle</code> tree to wherever you store
-development tools.</p>
+<a class="external" href="http://developer.android.com/sdk/">developer.android.com/sdk</a>. The android sdk
+is distributed as an 'adt-bundle-<os>-<arch>-<ver>' file.
+On windows, the adt-bundle is packaged with an installer.
+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></ver></arch></os></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. On
@@ -312,7 +313,7 @@ application to the emulator from the com
<pre class="prettyprint"><code> $ cordova emulate android
</code></pre>
-<p>If instead you are working within Eclipse, right-click the project and
+<p>If instead you work 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>