cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mwbro...@apache.org
Subject [4/9] [CB-3962] fix inline text in upgrading sections; add more vertical space in listings
Date Mon, 29 Jul 2013 18:58:22 GMT
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/7e5cc869/docs/en/edge/cordova/media/media.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/cordova/media/media.md b/docs/en/edge/cordova/media/media.md
index f673f38..6b89a87 100644
--- a/docs/en/edge/cordova/media/media.md
+++ b/docs/en/edge/cordova/media/media.md
@@ -33,8 +33,11 @@ Parameters
 ----------
 
 - __src__: A URI containing the audio content. _(DOMString)_
+
 - __mediaSuccess__: (Optional) The callback that executes after a `Media` object has completed the current play, record, or stop action. _(Function)_
+
 - __mediaError__: (Optional) The callback that executes if an error occurs. _(Function)_
+
 - __mediaStatus__: (Optional) The callback that executes to indicate status changes. _(Function)_
 
 Constants
@@ -53,14 +56,23 @@ Methods
 -------
 
 - `media.getCurrentPosition`: Returns the current position within an audio file.
+
 - `media.getDuration`: Returns the duration of an audio file.
+
 - `media.play`: Start or resume playing an audio file.
+
 - `media.pause`: Pause playback of an audio file.
+
 - `media.release`: Releases the underlying operating system's audio resources.
+
 - `media.seekTo`: Moves the position within the audio file.
+
 - `media.setVolume`: Set the volume for audio playback.
+
 - `media.startRecord`: Start recording an audio file.
+
 - `media.stopRecord`: Stop recording an audio file.
+
 - `media.stop`: Stop playing an audio file.
 
 Additional ReadOnly Parameters
@@ -68,6 +80,7 @@ Additional ReadOnly Parameters
 
 - __position__: The position within the audio playback, in seconds.
     - Not automatically updated during play; call `getCurrentPosition` to update.
+
 - __duration__: The duration of the media, in seconds.
 
 Supported Platforms
@@ -137,6 +150,7 @@ Reference: [Application Manifest for Windows Phone](http://msdn.microsoft.com/en
 ### Windows Phone Quirks
 
 - Only one media file can be played back at a time.
+
 - There are strict restrictions on how your application interacts with other media. See the [Microsoft documentation for details][url].
 
 [url]: http://msdn.microsoft.com/en-us/library/windowsphone/develop/hh184838(v=vs.92).aspx

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/7e5cc869/docs/en/edge/cordova/media/media.setVolume.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/cordova/media/media.setVolume.md b/docs/en/edge/cordova/media/media.setVolume.md
index dc7ef9e..f960457 100644
--- a/docs/en/edge/cordova/media/media.setVolume.md
+++ b/docs/en/edge/cordova/media/media.setVolume.md
@@ -71,7 +71,6 @@ Quick Example
         }, 5000);
     }
 
-
 Full Example
 ------------
 

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/7e5cc869/docs/en/edge/cordova/media/media.startRecord.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/cordova/media/media.startRecord.md b/docs/en/edge/cordova/media/media.startRecord.md
index d33d777..50f9ef9 100644
--- a/docs/en/edge/cordova/media/media.startRecord.md
+++ b/docs/en/edge/cordova/media/media.startRecord.md
@@ -144,7 +144,9 @@ iOS Quirks
 ----------
 
 - iOS only records to files of type _.wav_ and returns an error if the file name extension is not correct.
+
 - If a full path is not provided, the recording is placed in the application's `documents/tmp` directory. This can be accessed via the `File` API using `LocalFileSystem.TEMPORARY`. Any subdirectory specified at record time must already exist.
+
 - Files can be recorded and played back using the documents URI:
 
         var myMedia = new Media("documents://beer.mp3")

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/7e5cc869/docs/en/edge/cordova/notification/notification.alert.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/cordova/notification/notification.alert.md b/docs/en/edge/cordova/notification/notification.alert.md
index ab73d58..99f1c0d 100644
--- a/docs/en/edge/cordova/notification/notification.alert.md
+++ b/docs/en/edge/cordova/notification/notification.alert.md
@@ -25,8 +25,11 @@ Shows a custom alert or dialog box.
     navigator.notification.alert(message, alertCallback, [title], [buttonName])
 
 - __message__: Dialog message. _(String)_
+
 - __alertCallback__: Callback to invoke when alert dialog is dismissed. _(Function)_
+
 - __title__: Dialog title. _(String)_ (Optional, defaults to `Alert`)
+
 - __buttonName__: Button name. _(String)_ (Optional, defaults to `OK`)
 
 Description

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/7e5cc869/docs/en/edge/cordova/notification/notification.beep.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/cordova/notification/notification.beep.md b/docs/en/edge/cordova/notification/notification.beep.md
index a254e96..37e87a5 100644
--- a/docs/en/edge/cordova/notification/notification.beep.md
+++ b/docs/en/edge/cordova/notification/notification.beep.md
@@ -107,5 +107,6 @@ Tizen Quirks
 -------------
 
 - Tizen implements beeps by playing an audio file via the media API.
+
 - The beep file must be short, must be located in a `sounds` sub-directory of the application's root directory, and must be named `beep.wav`.
 

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/7e5cc869/docs/en/edge/cordova/notification/notification.confirm.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/cordova/notification/notification.confirm.md b/docs/en/edge/cordova/notification/notification.confirm.md
index 48567da..072a603 100755
--- a/docs/en/edge/cordova/notification/notification.confirm.md
+++ b/docs/en/edge/cordova/notification/notification.confirm.md
@@ -25,8 +25,11 @@ Displays a customizable confirmation dialog box.
     navigator.notification.confirm(message, confirmCallback, [title], [buttonLabels])
 
 - __message__: Dialog message. _(String)_
+
 - __confirmCallback__: Callback to invoke with index of button pressed (1, 2, or 3) or when the dialog is dismissed without a button press (0). _(Function)_
+
 - __title__: Dialog title. _(String)_ (Optional, defaults to `Confirm`)
+
 - __buttonLabels__: Comma-separated string specifying button labels. _(String)_ (Optional, defaults to `OK,Cancel`)
 
 Description

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/7e5cc869/docs/en/edge/cordova/notification/notification.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/cordova/notification/notification.md b/docs/en/edge/cordova/notification/notification.md
index dba157d..192982b 100644
--- a/docs/en/edge/cordova/notification/notification.md
+++ b/docs/en/edge/cordova/notification/notification.md
@@ -42,7 +42,6 @@ Interface, to add or remove this feature for a project:
         $ cordova plugin rm org.apache.cordova.core.dialogs
         $ cordova plugin rm org.apache.cordova.core.vibration
 
-
 These commands apply to all targeted platforms, but modify the
 platform-specific configuration settings described below:
 

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/7e5cc869/docs/en/edge/cordova/notification/notification.prompt.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/cordova/notification/notification.prompt.md b/docs/en/edge/cordova/notification/notification.prompt.md
index 434df6b..620ebc2 100644
--- a/docs/en/edge/cordova/notification/notification.prompt.md
+++ b/docs/en/edge/cordova/notification/notification.prompt.md
@@ -25,9 +25,13 @@ Shows a customizable prompt dialog box.
     navigator.notification.prompt(message, promptCallback, [title], [buttonLabels], [defaultText])
 
 - __message__: Dialog message. _(String)_
+
 - __promptCallback__: Callback to invoke when a button is pressed. _(Function)_
+
 - __title__: Dialog title _(String)_ (Optional, defaults to `Prompt`)
+
 - __buttonLabels__: Array of strings specifying button labels _(Array)_ (Optional, defaults to `["OK","Cancel"]`)
+
 - __defaultText__: Default textbox input value (`String`) (Optional, Default: "Default text")
 
 Description
@@ -44,6 +48,7 @@ in the prompt dialog box. The `results` object passed to the callback
 contains the following properties:
 
 - __buttonIndex__: The index of the pressed button. _(Number)_ Note that the index uses one-based indexing, so the value is `1`, `2`, `3`, etc.
+
 - __input1__: The text entered in the prompt dialog box. _(String)_
 
 Supported Platforms
@@ -121,4 +126,5 @@ Android Quirks
 ----------------------
 
 - Android supports a maximum of three buttons, and ignores any more than that.
+
 - On Android 3.0 and later, buttons are displayed in reverse order for devices that use the Holo theme.

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/7e5cc869/docs/en/edge/cordova/storage/database/database.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/cordova/storage/database/database.md b/docs/en/edge/cordova/storage/database/database.md
index 5ac6444..7d2ec41 100644
--- a/docs/en/edge/cordova/storage/database/database.md
+++ b/docs/en/edge/cordova/storage/database/database.md
@@ -26,6 +26,7 @@ Methods
 -------
 
 - __transaction__: Runs a database transaction.
+
 - __changeVersion__: Allows scripts to automatically verify the version number and change it when updating a schema.
 
 Details

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/7e5cc869/docs/en/edge/cordova/storage/localstorage/localstorage.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/cordova/storage/localstorage/localstorage.md b/docs/en/edge/cordova/storage/localstorage/localstorage.md
index 614584c..8428966 100644
--- a/docs/en/edge/cordova/storage/localstorage/localstorage.md
+++ b/docs/en/edge/cordova/storage/localstorage/localstorage.md
@@ -28,9 +28,13 @@ Methods
 -------
 
 - __key__: Returns the name of the key at the specified position.
+
 - __getItem__: Returns the item identified by the specified key.
+
 - __setItem__: Assigns a keyed item's value.
+
 - __removeItem__: Removes the item identified by the specified key.
+
 - __clear__: Removes all of the key/value pairs.
 
 Details

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/7e5cc869/docs/en/edge/cordova/storage/sqlerror/sqlerror.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/cordova/storage/sqlerror/sqlerror.md b/docs/en/edge/cordova/storage/sqlerror/sqlerror.md
index 5515103..1f33944 100644
--- a/docs/en/edge/cordova/storage/sqlerror/sqlerror.md
+++ b/docs/en/edge/cordova/storage/sqlerror/sqlerror.md
@@ -26,6 +26,7 @@ Properties
 ----------
 
 - __code__: One of the predefined error codes listed below.
+
 - __message__: A description of the error.
 
 Constants

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/7e5cc869/docs/en/edge/cordova/storage/sqlresultset/sqlresultset.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/cordova/storage/sqlresultset/sqlresultset.md b/docs/en/edge/cordova/storage/sqlresultset/sqlresultset.md
index 89a0704..e29c0d0 100644
--- a/docs/en/edge/cordova/storage/sqlresultset/sqlresultset.md
+++ b/docs/en/edge/cordova/storage/sqlresultset/sqlresultset.md
@@ -27,7 +27,9 @@ Properties
 -------
 
 - __insertId__: The row ID of the row that the `SQLResultSet` object's SQL statement inserted into the database.
+
 - __rowsAffected__: The number of rows changed by the SQL statement, zero if the statement did not affect any rows.
+
 - __rows__: a `SQLResultSetRowList` representing the rows returned, empty if no rows are returned.
 
 Details

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/7e5cc869/docs/en/edge/guide/platforms/android/config.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/guide/platforms/android/config.md b/docs/en/edge/guide/platforms/android/config.md
index 00a1ecd..991ac18 100644
--- a/docs/en/edge/guide/platforms/android/config.md
+++ b/docs/en/edge/guide/platforms/android/config.md
@@ -19,22 +19,47 @@ license: Licensed to the Apache Software Foundation (ASF) under one
 
 # Android Configuration
 
-The `config.xml` settings file controls various settings of Cordova. This is application wide, and not set per CordovaWebView Instance.
+The `config.xml` file controls various Cordova settings. These apply
+across the application, and per CordovaWebView instance.
 
-## <preference>
+## `<preference>`
 
-Various **other** preferences (as **&lt;preference&gt;** tags) default on not breaking existing apps. The available preferences are:
+Various other preferences (as `<preference>` tags) default on not
+breaking existing apps. The available preferences are:
 
-1. **useBrowserHistory (boolean, defaults to true)** - set to false if you want to use the history shim that was used to work around the hashtag error present in Android 3.x prior to the history fix.  (Note: This setting will be deprecated in April 2013)
-2. **loadingDialog** - Display a native loading dialog when loading the app. The value's format is _Title, Message_
-3. **loadingPageDialog** - Display a native loading dialog when loading sub-pages. The value's format is _Title, Message_
-4. **errorUrl** - Set the error page for your application. Should be located in your Android project in file://android_asset/www/
-5. **backgroundColor** - Set the background color for your application.  Supports a four-byte hex value, with the first byte representing alpha value, and the following three bytes with standard RGB values. (i.e. 0x00000000 = Black)
-6. **loadUrlTimeoutValue** - How much time Cordova should wait before throwing a timeout error on the application.
-7. **keepRunning (boolean, defaults to true)** - Determines whether Cordova will keep running in the background or not
-8. **splashscreen** - The name of the file minus its extension in the `res/drawable` directory.  If you have multiple assets, they all must share this common name in their respective directories.
-9. **disallowOverscroll (boolean, defaults to false)** - set to true if you want to disable the glow when a user scrolls beyond the edge of the webview.
+* `useBrowserHistory` (boolean, defaults to true): set to false if you
+  want to use the history shim that was used to work around the
+  hashtag error present in Android 3.x prior to the history fix.
+  (Note: This setting will be deprecated in April 2013)
 
-## &lt;plugin&gt;
+* `loadingDialog`: Display a native loading dialog when loading the
+  app. The value's format is _Title, Message_
+
+* `loadingPageDialog`: Display a native loading dialog when loading
+  sub-pages. The value's format is _Title, Message_
+
+* `errorUrl`: Set the error page for your application. Should be
+  located in your Android project in file://android_asset/www/
+
+* `backgroundColor`: Set the background color for your application.
+  Supports a four-byte hex value, with the first byte representing
+  alpha value, and the following three bytes with standard RGB
+  values. (i.e. 0x00000000 = Black)
+
+* `loadUrlTimeoutValue`: How much time Cordova should wait before
+  throwing a timeout error on the application.
+
+* `keepRunning` (boolean, defaults to true): Determines whether
+  Cordova stays running in the background.
+
+* `splashscreen`: The name of the file minus its extension in the
+  `res/drawable` directory.  If you have multiple assets, they all
+  must share this common name in their respective directories.
+
+* `disallowOverscroll` (boolean, defaults to false): set to `true` to
+  disable the glow when a user scrolls beyond the edge of the webview.
+
+## `<plugin>`
+
+Android supports using `<feature>` as analogues to `<plugin>` elements.
 
-Android supports using &lt;feature&gt; as analogues to &lt;plugin&gt; elements.

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/7e5cc869/docs/en/edge/guide/platforms/android/index.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/guide/platforms/android/index.md b/docs/en/edge/guide/platforms/android/index.md
index 6382f30..4e42f50 100644
--- a/docs/en/edge/guide/platforms/android/index.md
+++ b/docs/en/edge/guide/platforms/android/index.md
@@ -111,19 +111,27 @@ Cordova The Command-line Interface. For example, in a source-code directory:
 Once created, here's how to use the SDK to modify it:
 
 * Launch the __Eclipse__ application.
+
 * Select the __New Project__ menu item.
+
 * Choose __Android Project from Existing Code__ from the resulting dialog box, and press __Next__:
     ![](img/guide/platforms/android/eclipse_new_project.png)
+
 * Navigate to `hello`, or whichever directory you created for the project, then to the `platforms/android` subdirectory.
+
 * Press __Finish__.
 
 Once the Eclipse window opens, a red __X__ may appear to indicate
 unresolved problems. If so, follow these additional steps:
 
-* Right-click on the project folder.
+* Right-click on the project directory.
+
 * In the resulting __Properties__ dialog, select __Android__ from the navigation pane.
+
 * For the project build target, select the highest Android API level you have installed.
+
 * Click __OK__.
+
 * Select __Clean__ from the __Project__ menu. This should correct all the errors in the project.
 
 ## Deploy to Emulator
@@ -179,9 +187,12 @@ For a faster experience, use an Intel-based emulator image:
 * Install one or more `Intel x86 Atom` System Images as well as the
   `Intel Hardware Accelerated Execution Manager`, available under
   __Extras__.
+
 * Run the Intel installer, which is available within your Android SDK
   at `extras/intel/Hardware_Accelerated_Execution_Manager`.
+
 * Create a new AVD with the target set to an Intel image.
+
 * When starting the emulator, ensure there are no error messages
   indicating a failure to load HAX modules.
 

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/7e5cc869/docs/en/edge/guide/platforms/android/plugin.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/guide/platforms/android/plugin.md b/docs/en/edge/guide/platforms/android/plugin.md
index c71971a..9658ffa 100644
--- a/docs/en/edge/guide/platforms/android/plugin.md
+++ b/docs/en/edge/guide/platforms/android/plugin.md
@@ -38,7 +38,7 @@ This marshals a request from the WebView to the Android native side,
 more or less boiling down to calling the `action` method on the
 `service` class, with the arguments passed in the `args` Array.
 
-Whether you distribute your plugin as Java file or as a JAR of its own, the plugin must be added to the `config.xml` file in your Cordova-Android application's `res/xml/` folder.
+Whether you distribute your plugin as Java file or as a JAR of its own, the plugin must be added to the `config.xml` file in your Cordova-Android application's `res/xml/` directory.
 
     <plugin name="<service_name>" value="<full_name_including_namespace>"/>
 
@@ -184,6 +184,7 @@ Eclipse can be used to debug an Android project, and the plugins can be debugged
 * Plugins have access to a `CordovaInterface` object. This object has access to the Android `Activity` that is running the application. This is the `Context` required to launch
 a new Android `Intent`. The `CordovaInterface` allows plugins to start an `Activity` for a result, and to set the callback plugin for when the `Intent` comes back to the application. This is important, since the
 `Intent`s system is how Android communicates between processes.
+
 * Plugins do not have direct access to the `Context` as they have in the past. The legacy `ctx` member is deprecated, and will be removed six months after 2.0 is released. All of `ctx` methods exist on the `Context`, so both `getContext()` and `getActivity()` are capable of returning the proper object required.
 
 ## Use the Source

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/7e5cc869/docs/en/edge/guide/platforms/android/tools.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/guide/platforms/android/tools.md b/docs/en/edge/guide/platforms/android/tools.md
index 09fcfdc..ce4b19c 100644
--- a/docs/en/edge/guide/platforms/android/tools.md
+++ b/docs/en/edge/guide/platforms/android/tools.md
@@ -58,6 +58,7 @@ Release, on Mac or Windows:
 The `run` command accepts the following _optional_ parameters:
 
 * Target specification. This includes `--emulator`, `--device`, or `--target=<targetID>`.
+
 * Build specification. This includes `--debug`, `--release`, or `--nobuild`.
 
     $ /path/to/project/cordova/run [Target] [Build]

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/7e5cc869/docs/en/edge/guide/platforms/android/upgrading.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/guide/platforms/android/upgrading.md b/docs/en/edge/guide/platforms/android/upgrading.md
index b3c4085..b626c94 100644
--- a/docs/en/edge/guide/platforms/android/upgrading.md
+++ b/docs/en/edge/guide/platforms/android/upgrading.md
@@ -28,13 +28,17 @@ version of the CLI.
 
 1. Create a new Apache Cordova 3.0.0 project using the cordova CLI, as
    described in The Command-line Interface.
+
 2. Add your platforms the the cordova project, for example: `cordova
    platform add android`.
-3. Copy the contents of your project's `www` folder to the `www` folder
+
+3. Copy the contents of your project's `www` directory to the `www` directory
    at the root of the cordova project you just created.
+
 4. Copy any native assets from your old project into the appropriate
    directories under `platforms/android`: this directory is where your
    native cordova-android project exists.
+
 5. Use the cordova CLI tool to install any plugins you need. Note that
    the CLI handles all core APIs as plugins, so they may need to be
    added. Only 3.0.0 plugins are compatible with the CLI.
@@ -42,226 +46,373 @@ version of the CLI.
 ## Upgrade to 3.0.0 from 2.9.0 ##
 
 1. Create a new Apache Cordova Android project.
-2. Copy the contents of your `www` folder to the new project.
-3. Copy any native Android assets from your `res` folder to the new project.
+
+2. Copy the contents of your `www` directory to the new project.
+
+3. Copy any native Android assets from your `res` directory to the new project.
+
 4. Copy over any plugins you installed from the `src` subdirectories into the new project.
-5. Make sure to upgrade any deprecated `<plugin>` references from your old `config.xml` file to the new `<feature>` specification. 
+
+5. Make sure to upgrade any deprecated `<plugin>` references from your old `config.xml` file to the new `<feature>` specification.
+
 - __NOTE:__ all core APIs have been removed and must be installed as plugins. Please see the Using Plugman to Manage Plugins Guide for details.
 
 ## Upgrade to 2.9.0 from 2.8.0
-1. Run `bin/update <project_path>`
+
+1. Run `bin/update <project_path>`.
 
 ## Upgrade to 2.8.0 from 2.7.0 ##
-1. Remove `cordova-2.7.0.jar` from the project's `libs` directory
-2. Add `cordova-2.8.0.jar` to the project's `libs` directory
-3. If you are using Eclipse, please refresh your eclipse project and do a clean
-4. Copy the new cordova.js into your project
-5. Update your HTML to use the new cordova.js file
-6. Copy the `res/xml/config.xml` file to match `framework/res/xml/config.xml`
-7. Update `framework/res/xml/config.xml` to have similar settings as it did previously
-8. Copy files from `bin/templates/cordova` to the project's `cordova` directory
+
+1. Remove `cordova-2.7.0.jar` from the project's `libs` directory.
+
+2. Add `cordova-2.8.0.jar` to the project's `libs` directory.
+
+3. If you are using Eclipse, please refresh your eclipse project and do a clean.
+
+4. Copy the new `cordova.js` into your project.
+
+5. Update your HTML to use the new `cordova.js` file.
+
+6. Copy the `res/xml/config.xml` file to match `framework/res/xml/config.xml`.
+
+7. Update `framework/res/xml/config.xml` to have similar settings as it did previously.
+
+8. Copy files from `bin/templates/cordova` to the project's `cordova` directory.
 
 ## Upgrade to 2.7.0 from 2.6.0 ##
-1. Remove `cordova-2.6.0.jar` from the project's `libs` directory
-2. Add `cordova-2.7.0.jar` to the project's `libs` directory
-3. If you are using Eclipse, please refresh your eclipse project and do a clean
-4. Copy the new `cordova-2.7.0.js` into your project
-5. Update your HTML to use the new `cordova-2.7.0.js` file
-6. Copy the `res/xml/config.xml` to match `framework/res/xml/config.xml`
-7. Update `framework/res/xml/config.xml` to have similar settings as it did previously
-8. Copy files from `bin/templates/cordova` to the project's `cordova` directory
+
+1. Remove `cordova-2.6.0.jar` from the project's `libs` directory.
+
+2. Add `cordova-2.7.0.jar` to the project's `libs` directory.
+
+3. If you are using Eclipse, please refresh your eclipse project and do a clean.
+
+4. Copy the new `cordova-2.7.0.js` into your project.
+
+5. Update your HTML to use the new `cordova-2.7.0.js` file.
+
+6. Copy the `res/xml/config.xml` to match `framework/res/xml/config.xml`.
+
+7. Update `framework/res/xml/config.xml` to have similar settings as it did previously.
+
+8. Copy files from `bin/templates/cordova` to the project's `cordova` directory.
 
 ## Upgrade to 2.6.0 from 2.5.0 ##
-1. Remove `cordova-2.5.0.jar` from the project's `libs` directory
-2. Add `cordova-2.6.0.jar` to the project's `libs` directory
-3. If you are using Eclipse, please refresh your eclipse project and do a clean
-4. Copy the new `cordova-2.6.0.js` into your project
-5. Update your HTML to use the new `cordova-2.6.0.js` file
-6. Copy the `res/xml/config.xml` to match `framework/res/xml/config.xml`
-7. Update `framework/res/xml/config.xml` to have similar settings as it did previously
-8. Copy files from `bin/templates/cordova` to the project's `cordova` directory
+
+1. Remove `cordova-2.5.0.jar` from the project's `libs` directory.
+
+2. Add `cordova-2.6.0.jar` to the project's `libs` directory.
+
+3. If you are using Eclipse, please refresh your eclipse project and do a clean.
+
+4. Copy the new `cordova-2.6.0.js` into your project.
+
+5. Update your HTML to use the new `cordova-2.6.0.js` file.
+
+6. Copy the `res/xml/config.xml` to match `framework/res/xml/config.xml`.
+
+7. Update `framework/res/xml/config.xml` to have similar settings as it did previously.
+
+8. Copy files from `bin/templates/cordova` to the project's `cordova` directory.
 
 Run `bin/update <project>` with the project path listed in the Cordova Source directory.
 
 ## Upgrade to 2.5.0 from 2.4.0 ##
 
-1. Remove `cordova-2.4.0.jar` from the project's `libs` directory
-2. Add `cordova-2.5.0.jar` to the project's `libs` directory
-3. If you are using Eclipse, please refresh your eclipse project and do a clean
-4. Copy the new `cordova-2.5.0.js` into your project
-5. Update your HTML to use the new `cordova-2.5.0.js` file
-6. Copy the `res/xml/config.xml` to match `framework/res/xml/config.xml`
-7. Update `framework/res/xml/config.xml` to have similar settings as it did previously
-8. Copy files from `bin/templates/cordova` to the project's `cordova` directory
+1. Remove `cordova-2.4.0.jar` from the project's `libs` directory.
+
+2. Add `cordova-2.5.0.jar` to the project's `libs` directory.
+
+3. If you are using Eclipse, please refresh your eclipse project and do a clean.
+
+4. Copy the new `cordova-2.5.0.js` into your project.
+
+5. Update your HTML to use the new `cordova-2.5.0.js` file.
+
+6. Copy the `res/xml/config.xml` to match `framework/res/xml/config.xml`.
+
+7. Update `framework/res/xml/config.xml` to have similar settings as it did previously.
+
+8. Copy files from `bin/templates/cordova` to the project's `cordova` directory.
 
 ## Upgrade to 2.4.0 from 2.3.0 ##
 
-1. Remove `cordova-2.3.0.jar` from the project's `libs` directory
-2. Add `cordova-2.4.0.jar` to the project's `libs` directory
-3. If you are using Eclipse, please refresh your eclipse project and do a clean
-4. Copy the new `cordova-2.4.0.js` into your project
-5. Update your HTML to use the new `cordova-2.4.0.js` file
-6. Copy the `res/xml/config.xml` to match `framework/res/xml/config.xml`
-7. Copy files from `bin/templates/cordova` to the project's `cordova` directory
+1. Remove `cordova-2.3.0.jar` from the project's `libs` directory.
+
+2. Add `cordova-2.4.0.jar` to the project's `libs` directory.
+
+3. If you are using Eclipse, please refresh your eclipse project and do a clean.
+
+4. Copy the new `cordova-2.4.0.js` into your project.
+
+5. Update your HTML to use the new `cordova-2.4.0.js` file.
+
+6. Copy the `res/xml/config.xml` to match `framework/res/xml/config.xml`.
+
+7. Copy files from `bin/templates/cordova` to the project's `cordova` directory.
 
 ## Upgrade to 2.3.0 from 2.2.0 ##
 
-1. Remove `cordova-2.2.0.jar` from the project's `libs` directory
-2. Add `cordova-2.3.0.jar` to the project's `libs` directory
-3. If you are using Eclipse, please refresh your eclipse project and do a clean
-4. Copy the new `cordova-2.3.0.js` into your project
-5. Update your HTML to use the new `cordova-2.3.0.js` file
-6. Copy the `res/xml/config.xml` to match `framework/res/xml/config.xml`
-7. Copy files from `bin/templates/cordova` to the project's `cordova` directory
+1. Remove `cordova-2.2.0.jar` from the project's `libs` directory.
+
+2. Add `cordova-2.3.0.jar` to the project's `libs` directory.
+
+3. If you are using Eclipse, please refresh your eclipse project and do a clean.
+
+4. Copy the new `cordova-2.3.0.js` into your project.
+
+5. Update your HTML to use the new `cordova-2.3.0.js` file.
+
+6. Copy the `res/xml/config.xml` to match `framework/res/xml/config.xml`.
+
+7. Copy files from `bin/templates/cordova` to the project's `cordova` directory.
 
 ## Upgrade to 2.2.0 from 2.1.0 ##
 
-1. Remove `cordova-2.1.0.jar` from the project's `libs` directory
-2. Add `cordova-2.2.0.jar` to the project's `libs` directory
-3. If you are using Eclipse, please refresh your eclipse project and do a clean
-4. Copy the new `cordova-2.2.0.js` into your project
-5. Update your HTML to use the new `cordova-2.2.0.js` file
-6. Copy the `res/xml/config.xml` to match `framework/res/xml/config.xml`
-7. Copy files from `bin/templates/cordova` to the project's `cordova` directory
+1. Remove `cordova-2.1.0.jar` from the project's `libs` directory.
+
+2. Add `cordova-2.2.0.jar` to the project's `libs` directory.
+
+3. If you are using Eclipse, please refresh your eclipse project and do a clean.
+
+4. Copy the new `cordova-2.2.0.js` into your project.
+
+5. Update your HTML to use the new `cordova-2.2.0.js` file.
+
+6. Copy the `res/xml/config.xml` to match `framework/res/xml/config.xml`.
+
+7. Copy files from `bin/templates/cordova` to the project's `cordova` directory.
 
 ## Upgrade to 2.1.0 from 2.0.0 ##
 
-1. Remove `cordova-2.0.0.jar` from the project's `libs` directory
-2. Add `cordova-2.1.0.jar` to the project's `libs` directory
-3. If you are using Eclipse, please refresh your eclipse project and do a clean
-4. Copy the new `cordova-2.1.0.js` into your project
-5. Update your HTML to use the new `cordova-2.1.0.js` file
-6. Copy the `res/xml/config.xml` to match `framework/res/xml/config.xml`
-7. Copy files from `bin/templates/cordova` to the project's `cordova` directory
+1. Remove `cordova-2.0.0.jar` from the project's `libs` directory.
+
+2. Add `cordova-2.1.0.jar` to the project's `libs` directory.
+
+3. If you are using Eclipse, please refresh your eclipse project and do a clean.
+
+4. Copy the new `cordova-2.1.0.js` into your project.
+
+5. Update your HTML to use the new `cordova-2.1.0.js` file.
+
+6. Copy the `res/xml/config.xml` to match `framework/res/xml/config.xml`.
+
+7. Copy files from `bin/templates/cordova` to the project's `cordova` directory.
 
 ## Upgrade to 2.0.0 from 1.9.0 ##
 
-1. Remove `cordova-1.9.0.jar` from the project's `libs` directory
-2. Add `cordova-2.0.0.jar` to the project's `libs` directory
-3. If you are using Eclipse, please refresh your eclipse project and do a clean
-4. Copy the new `cordova-2.0.0.js` into your project
-5. Update your HTML to use the new `cordova-2.0.0.js` file
-6. Copy the `res/xml/config.xml` to match `framework/res/xml/config.xml`
+1. Remove `cordova-1.9.0.jar` from the project's `libs` directory.
+
+2. Add `cordova-2.0.0.jar` to the project's `libs` directory.
+
+3. If you are using Eclipse, please refresh your eclipse project and do a clean.
+
+4. Copy the new `cordova-2.0.0.js` into your project.
+
+5. Update your HTML to use the new `cordova-2.0.0.js` file.
+
+6. Copy the `res/xml/config.xml` to match `framework/res/xml/config.xml`.
 
 ### Notes about 2.0.0 release
-config.xml will be replacing cordova.xml and plugins.xml.  This new file is a combination of the previous two.  However, the
-old files are deprecated, and while currently still work, will cease working in a future release.
+
+`config.xml` will be replacing `cordova.xml` and `plugins.xml`.  This
+new file is a combination of the previous two.  However, the old files
+are deprecated, and while currently still work, will cease working in
+a future release.
 
 ## Upgrade to 1.9.0 from 1.8.1 ##
 
-1. Remove `cordova-1.8.0.jar` from the project's `libs` directory
-2. Add `cordova-1.9.0.jar` to the project's `libs` directory
-3. If you are using Eclipse, please refresh your eclipse project and do a clean
-4. Copy the new `cordova-1.9.0.js` into your project
-5. Update your HTML to use the new `cordova-1.9.0.js` file
-6. Update `res/xml/plugins.xml` to match `framework/res/xml/plugins.xml`
+1. Remove `cordova-1.8.0.jar` from the project's `libs` directory.
+
+2. Add `cordova-1.9.0.jar` to the project's `libs` directory.
+
+3. If you are using Eclipse, please refresh your eclipse project and do a clean.
+
+4. Copy the new `cordova-1.9.0.js` into your project.
+
+5. Update your HTML to use the new `cordova-1.9.0.js` file.
+
+6. Update `res/xml/plugins.xml` to match `framework/res/xml/plugins.xml`.
 
 ### Notes about 1.9.0 release
 
-- Third-Party plugins may or may not work.  This is because of the introduction of the CordovaWebView.  These plugins need to get a context from the CordovaInterface using
-getContext() or getActivity().  If you are not an experienced Android developer, please contact the plugin maintainer and add this task to their bug tracker.
+Due to the introduction of the `CordovaWebView`, third-Party plugins
+may not work.  These plugins need to get a context from the
+`CordovaInterface` using `getContext()` or `getActivity()`.  If you
+are not an experienced Android developer, please contact the plugin
+maintainer and add this task to their bug tracker.
 
 ## Upgrade to 1.8.0 from 1.8.0 ##
 
-1. Remove `cordova-1.8.0.jar` from the project's `libs` directory
-2. Add `cordova-1.8.1.jar` to the project's `libs` directory
-3. If you are using Eclipse, please refresh your eclipse project and do a clean
-4. Copy the new `cordova-1.8.1.js` into your project
-5. Update your HTML to use the new `cordova-1.8.1.js` file
-6. Update `res/xml/plugins.xml` to match `framework/res/xml/plugins.xml`
+1. Remove `cordova-1.8.0.jar` from the project's `libs` directory.
+
+2. Add `cordova-1.8.1.jar` to the project's `libs` directory.
+
+3. If you are using Eclipse, please refresh your eclipse project and do a clean.
+
+4. Copy the new `cordova-1.8.1.js` into your project.
+
+5. Update your HTML to use the new `cordova-1.8.1.js` file.
+
+6. Update `res/xml/plugins.xml` to match `framework/res/xml/plugins.xml`.
 
 ## Upgrade to 1.8.0 from 1.7.0 ##
 
-1. Remove `cordova-1.7.0.jar` from the project's `libs` directory
-2. Add `cordova-1.8.0.jar` to the project's `libs` directory
-3. If you are using Eclipse, please refresh your eclipse project and do a clean
-4. Copy the new `cordova-1.8.0.js` into your project
-5. Update your HTML to use the new `cordova-1.8.0.js` file
-6. Update `res/xml/plugins.xml` to match `framework/res/xml/plugins.xml`
+1. Remove `cordova-1.7.0.jar` from the project's `libs` directory.
+
+2. Add `cordova-1.8.0.jar` to the project's `libs` directory.
+
+3. If you are using Eclipse, please refresh your eclipse project and do a clean.
+
+4. Copy the new `cordova-1.8.0.js` into your project.
+
+5. Update your HTML to use the new `cordova-1.8.0.js` file.
+
+6. Update `res/xml/plugins.xml` to match `framework/res/xml/plugins.xml`.
 
 ## Upgrade to 1.8.0 from 1.7.0 ##
 
-1. Remove `cordova-1.7.0.jar` from the project's `libs` directory
-2. Add `cordova-1.8.0.jar` to the project's `libs` directory
-3. If you are using Eclipse, please refresh your eclipse project and do a clean
-4. Copy the new `cordova-1.8.0.js` into your project
-5. Update your HTML to use the new `cordova-1.8.0.js` file
-6. Update `res/xml/plugins.xml` to match `framework/res/xml/plugins.xml`
+1. Remove `cordova-1.7.0.jar` from the project's `libs` directory.
+
+2. Add `cordova-1.8.0.jar` to the project's `libs` directory.
+
+3. If you are using Eclipse, please refresh your eclipse project and do a clean.
+
+4. Copy the new `cordova-1.8.0.js` into your project.
+
+5. Update your HTML to use the new `cordova-1.8.0.js` file.
+
+6. Update `res/xml/plugins.xml` to match `framework/res/xml/plugins.xml`.
 
 ## Upgrade to 1.7.0 from 1.6.1 ##
 
-1. Remove `cordova-1.6.1.jar` from the project's `libs` directory
-2. Add `cordova-1.7.0.jar` to the project's `libs` directory
-3. If you are using Eclipse, please refresh your eclipse project and do a clean
-4. Copy the new `cordova-1.7.0.js` into your project
-5. Update `res/xml/plugins.xml` to match `framework/res/xml/plugins.xml`
+1. Remove `cordova-1.6.1.jar` from the project's `libs` directory.
+
+2. Add `cordova-1.7.0.jar` to the project's `libs` directory.
+
+3. If you are using Eclipse, please refresh your eclipse project and do a clean.
+
+4. Copy the new `cordova-1.7.0.js` into your project.
+
+5. Update `res/xml/plugins.xml` to match `framework/res/xml/plugins.xml`.
 
 ## Upgrade to 1.6.1 from 1.6.0 ##
 
-1. Remove `cordova-1.6.0.jar` from the project's `libs` directory
-2. Add `cordova-1.6.1.jar` to the project's `libs` directory
-3. If you are using Eclipse, please refresh your eclipse project and do a clean
-4. Copy the new `cordova-1.6.1.js` into your project
-5. Update `res/xml/plugins.xml` to match `framework/res/xml/plugins.xml`
+1. Remove `cordova-1.6.0.jar` from the project's `libs` directory.
+
+2. Add `cordova-1.6.1.jar` to the project's `libs` directory.
+
+3. If you are using Eclipse, please refresh your eclipse project and do a clean.
+
+4. Copy the new `cordova-1.6.1.js` into your project.
+
+5. Update `res/xml/plugins.xml` to match `framework/res/xml/plugins.xml`.
 
 ## Upgrade to 1.6.0 from 1.5.0 ##
-1. Remove `cordova-1.5.0.jar` from the project's `libs` directory
-2. Add `cordova-1.6.0.jar` to the project's `libs` directory
-3. If you are using Eclipse, please refresh your eclipse project and do a clean
-4. Copy the new `cordova-1.6.0.js` into your project
-5. Update your HTML to use the new `cordova-1.6.0.js` file
-6. Update `res/xml/plugins.xml` to match `framework/res/xml/plugins.xml`
-7. Replace `res/xml/phonegap.xml` with `res/xml/cordova.xml` to match `framework/res/xml/cordova.xml`
+
+1. Remove `cordova-1.5.0.jar` from the project's `libs` directory.
+
+2. Add `cordova-1.6.0.jar` to the project's `libs` directory.
+
+3. If you are using Eclipse, please refresh your eclipse project and do a clean.
+
+4. Copy the new `cordova-1.6.0.js` into your project.
+
+5. Update your HTML to use the new `cordova-1.6.0.js` file.
+
+6. Update `res/xml/plugins.xml` to match `framework/res/xml/plugins.xml`.
+
+7. Replace `res/xml/phonegap.xml` with `res/xml/cordova.xml` to match `framework/res/xml/cordova.xml`.
 
 ## Upgrade to 1.5.0 from 1.4.0##
-1. Remove `phonegap-1.4.0.jar` from the project's `libs` directory
-2. Add `cordova-1.5.0.jar` to the project's `libs` directory
-3. If you are using Eclipse, please refresh your eclipse project and do a clean
-4. Copy the new `cordova-1.5.0.js` into your project
-5. Update your HTML to use the new `cordova-1.5.0.js` file
-6. Update `res/xml/plugins.xml` to match `framework/res/xml/plugins.xml`
-7. Replace `res/xml/phonegap.xml` with `res/xml/cordova.xml` to match `framework/res/xml/cordova.xml`
+
+1. Remove `phonegap-1.4.0.jar` from the project's `libs` directory.
+
+2. Add `cordova-1.5.0.jar` to the project's `libs` directory.
+
+3. If you are using Eclipse, please refresh your eclipse project and do a clean.
+
+4. Copy the new `cordova-1.5.0.js` into your project.
+
+5. Update your HTML to use the new `cordova-1.5.0.js` file.
+
+6. Update `res/xml/plugins.xml` to match `framework/res/xml/plugins.xml`.
+
+7. Replace `res/xml/phonegap.xml` with `res/xml/cordova.xml` to match `framework/res/xml/cordova.xml`.
 
 ## Upgrade to 1.4.0 from 1.3.0 ##
-1. Remove `phonegap-1.3.0.jar` from the project's `libs` directory
-2. Add `phonegap-1.4.0.jar` to the project's `libs` directory
-3. If you are using Eclipse, please refresh your eclipse project and do a clean
-4. Copy the new `phonegap-1.4.0.js` into your project
-5. Update your HTML to use the new `phonegap-1.4.0.js` file
-6. Update `res/xml/plugins.xml` to match `framework/res/xml/plugins.xml`
-7. Update `res/xml/phonegap.xml` to match `framework/res/xml/phonegap.xml`
+
+1. Remove `phonegap-1.3.0.jar` from the project's `libs` directory.
+
+2. Add `phonegap-1.4.0.jar` to the project's `libs` directory.
+
+3. If you are using Eclipse, please refresh your eclipse project and do a clean.
+
+4. Copy the new `phonegap-1.4.0.js` into your project.
+
+5. Update your HTML to use the new `phonegap-1.4.0.js` file.
+
+6. Update `res/xml/plugins.xml` to match `framework/res/xml/plugins.xml`.
+
+7. Update `res/xml/phonegap.xml` to match `framework/res/xml/phonegap.xml`.
 
 ## Upgrade to 1.3.0 from 1.2.0 ##
-1. Remove `phonegap-1.2.0.jar` from the project's `libs` directory
-2. Add `phonegap-1.3.0.jar` to the project's `libs` directory
-3. If you are using Eclipse, please refresh your eclipse project and do a clean
-4. Copy the new `phonegap-1.3.0.js` into your project
-5. Update your HTML to use the new `phonegap-1.2.0.js` file
-6. Update `res/xml/plugins.xml` to match `framework/res/xml/plugins.xml`
-7. Update `res/xml/phonegap.xml` to match `framework/res/xml/phonegap.xml`
+
+1. Remove `phonegap-1.2.0.jar` from the project's `libs` directory.
+
+2. Add `phonegap-1.3.0.jar` to the project's `libs` directory.
+
+3. If you are using Eclipse, please refresh your eclipse project and do a clean.
+
+4. Copy the new `phonegap-1.3.0.js` into your project.
+
+5. Update your HTML to use the new `phonegap-1.2.0.js` file.
+
+6. Update `res/xml/plugins.xml` to match `framework/res/xml/plugins.xml`.
+
+7. Update `res/xml/phonegap.xml` to match `framework/res/xml/phonegap.xml`.
 
 ## Upgrade to 1.2.0 from 1.1.0 ##
-1. Remove `phonegap-1.1.0.jar` from the project's `libs` directory
-2. Add `phonegap-1.2.0.jar` to the project's `libs` directory
-3. If you are using Eclipse, please refresh your eclipse project and do a clean
-4. Copy the new `phonegap-1.2.0.js` into your project
-5. Update your HTML to use the new `phonegap-1.2.0.js` file
-6. Update `res/xml/plugins.xml` to match `framework/res/xml/plugins.xml`
-7. Update `res/xml/phonegap.xml` to match `framework/res/xml/phonegap.xml`
+
+1. Remove `phonegap-1.1.0.jar` from the project's `libs` directory.
+
+2. Add `phonegap-1.2.0.jar` to the project's `libs` directory.
+
+3. If you are using Eclipse, please refresh your eclipse project and do a clean.
+
+4. Copy the new `phonegap-1.2.0.js` into your project.
+
+5. Update your HTML to use the new `phonegap-1.2.0.js` file.
+
+6. Update `res/xml/plugins.xml` to match `framework/res/xml/plugins.xml`.
+
+7. Update `res/xml/phonegap.xml` to match `framework/res/xml/phonegap.xml`.
 
 ## Upgrade to 1.1.0 from 1.0.0 ##
-1. Remove `phonegap-1.0.0.jar` from the project's `libs` directory
-2. Add `phonegap-1.1.0.jar` to the project's `libs` directory
-3. If you are using Eclipse, please refresh your eclipse project and do a clean
-4. Copy the new `phonegap-1.1.0.js` into your project
-5. Update your HTML to use the new `phonegap-1.1.0.js` file
-6. Update `res/xml/plugins.xml` to match `framework/res/xml/plugins.xml`
+
+1. Remove `phonegap-1.0.0.jar` from the project's `libs` directory.
+
+2. Add `phonegap-1.1.0.jar` to the project's `libs` directory.
+
+3. If you are using Eclipse, please refresh your eclipse project and do a clean.
+
+4. Copy the new `phonegap-1.1.0.js` into your project.
+
+5. Update your HTML to use the new `phonegap-1.1.0.js` file.
+
+6. Update `res/xml/plugins.xml` to match `framework/res/xml/plugins.xml`.
 
 ## Upgrade to 1.0.0 from 0.9.6 ##
-1. Remove `phonegap-0.9.6.jar` from the project's `libs` directory
-2. Add `phonegap-1.0.0.jar` to the project's `libs` directory
-3. If you are using Eclipse, please refresh your eclipse project and do a clean
-4. Copy the new `phonegap-1.0.0.js` into your project
-5. Update your HTML to use the new `phonegap-1.0.0.js` file
-6. Add the `res/xml/plugins.xml` to match `framework/res/xml/plugins.xml`
+
+1. Remove `phonegap-0.9.6.jar` from the project's `libs` directory.
+
+2. Add `phonegap-1.0.0.jar` to the project's `libs` directory.
+
+3. If you are using Eclipse, please refresh your eclipse project and do a clean.
+
+4. Copy the new `phonegap-1.0.0.js` into your project.
+
+5. Update your HTML to use the new `phonegap-1.0.0.js` file.
+
+6. Add the `res/xml/plugins.xml` to match `framework/res/xml/plugins.xml`.
 

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/7e5cc869/docs/en/edge/guide/platforms/android/webview.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/guide/platforms/android/webview.md b/docs/en/edge/guide/platforms/android/webview.md
index ece0458..8bed446 100644
--- a/docs/en/edge/guide/platforms/android/webview.md
+++ b/docs/en/edge/guide/platforms/android/webview.md
@@ -34,14 +34,18 @@ but may be eventually be automated.
 
 ## Prerequisites
 
-1. **Cordova 1.9** or greater
+1. Cordova 1.9 or greater
+
 2. Android SDK updated with 15
 
 ## Guide to using CordovaWebView in an Android Project
 
 1. Use `bin/create` to fetch the `commons-codec-1.6.jar` file.
-2. `cd` into `/framework` and run `ant jar` to build the cordova jar. It creates the .jar file formed as `cordova-x.x.x.jar` in the `/framework` folder.
+
+2. `cd` into `/framework` and run `ant jar` to build the cordova jar. It creates the .jar file formed as `cordova-x.x.x.jar` in the `/framework` directory.
+
 3. Copy the cordova jar into your Android project's `/libs` directory.
+
 4. Edit your application's `main.xml` file (under `/res/xml`) to look like the following, with the `layout_height`, `layout_width` and `id` modified to suit your application:
 
         <org.apache.cordova.CordovaWebView
@@ -116,4 +120,5 @@ but may be eventually be automated.
     }
 
 6. Copy your application's HTML and JavaScript files to your Android project's `/assets/www` directory.
-7. Copy `cordova.xml` and `plugins.xml` from `/framework/res/xml` to your project's `/res/xml` folder.
+
+7. Copy `cordova.xml` and `plugins.xml` from `/framework/res/xml` to your project's `/res/xml` directory.

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/7e5cc869/docs/en/edge/guide/platforms/blackberry/index.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/guide/platforms/blackberry/index.md b/docs/en/edge/guide/platforms/blackberry/index.md
index 9f18563..6cc4d70 100644
--- a/docs/en/edge/guide/platforms/blackberry/index.md
+++ b/docs/en/edge/guide/platforms/blackberry/index.md
@@ -68,6 +68,7 @@ development. BlackBerry PlayBook and BlackBerry Smartphone WebWorks
 SDKs can be downloaded from the following locations.
 
 - [BlackBerry PlayBook SDK] (https://developer.blackberry.com/html5/download/#playbook) and [Adobe Air SDK](http://www.adobe.com/devnet/air/air-sdk-download.html)
+
 - [BlackBerry Smartphones SDK] (https://developer.blackberry.com/html5/download/#smartphones)
 
 ## 3.  Register for Signing Keys
@@ -85,12 +86,17 @@ Download and extract the latest copy of [Cordova](http://cordova.apache.org/#dow
 ## 5.  Set up New Project
 
 - Open up a command-line terminal and navigate to where you extracted Cordova.
+
 - There is a directory for each platform that Cordova supports.  CD into the `blackberry` directory.
-- The blackberry directory contains several directories.  The `example` folder contains a complete Cordova project.  Copy the `example` folder to another location on your computer.
+
+- The blackberry directory contains several directories.  The `example` directory contains a complete Cordova project.  Copy the `example` directory to another location on your computer.
+
 - Change to the newly created directory.
+
 - Open up the project.properties file with your favorite editor and edit the entries for the WebWorks SDKs you are using. For example...
 
 BlackBerry 10 (QNX)
+
 - `qnx.bbwp.dir=C:\\Program Files (x86)\\Research In Motion\\BlackBerry 10 WebWorks SDK 1.0.2.9`
 
 Along with the SDK, you also need to register for a code signing key
@@ -171,7 +177,7 @@ If you are prompted whether a device is connected to your computer,
 answer no.
 
 __NOTE:__ On BlackBerry OS 5, the application is installed in the
-`Downloads` folder.
+`Downloads` directory.
 
 ## Deploy to Device
 
@@ -199,7 +205,7 @@ If you are prompted whether a device is connected to your computer,
 answer yes.
 
 __NOTE:__ On BlackBerry OS 5, the application is installed in the
-`Downloads` folder.
+`Downloads` directory.
 
 ## Additional Information
 

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/7e5cc869/docs/en/edge/guide/platforms/blackberry/plugin.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/guide/platforms/blackberry/plugin.md b/docs/en/edge/guide/platforms/blackberry/plugin.md
index 56ba5ac..d919c8c 100644
--- a/docs/en/edge/guide/platforms/blackberry/plugin.md
+++ b/docs/en/edge/guide/platforms/blackberry/plugin.md
@@ -43,7 +43,7 @@ to the `window.echo` function:
 
 ## Modifying plugins.xml
 
-Your project's `www/plugins.xml` folder contains all of the necessary
+Your project's `www/plugins.xml` directory contains all of the necessary
 references to your Cordova project's plugins. Add an
 additional reference so that when `cordova.exec` is called, Cordova
 knows how to map the `Echo` argument of `cordova.exec` to the `Echo`
@@ -58,12 +58,12 @@ class that we want to write natively:
 ## Adding Echo.java
 
 If you notice the structure of the value attribute, you'll see a
-defined path that leads to the Echo plugin. In the root folder of the
-Cordova BlackBerry WebWorks repo, look for a folder called framework.
-This folder contains all of the source code that runs natively on the
+defined path that leads to the Echo plugin. In the root directory of the
+Cordova BlackBerry WebWorks repo, look for a directory called `framework`.
+This directory contains all of the source code that runs natively on the
 BlackBerry. Navigate to `framework/ext/src/org/apache/cordova`. At
-this point, you'll see all of the plugin folders, inside of which is
-the source code. So add the folder echo to
+this point, you'll see all of the plugin directorys, inside of which is
+the source code. So add the directory echo to
 `framework/ext/src/org/apache/cordova/echo` and create a file called
 `Echo.java` at `framework/ext/src/org/apache/cordova/echo/Echo.java`.
 
@@ -131,7 +131,7 @@ status exceptions like `PluginResult.Status.ERROR`,
 `PluginResult.Status.INVALID_ACTION`. When passed back, these types of
 results fire the fail callback in JavaScript.
 
-## Updating the .jar in your project's www folder
+## Updating the .jar in your project's www directory
 
 The added `Echo.java` needs to be updated in your project.  To build
 the `.jar` file, Navigate to the BlackBerry WebWorks repo's root

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/7e5cc869/docs/en/edge/guide/platforms/blackberry/tools.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/guide/platforms/blackberry/tools.md b/docs/en/edge/guide/platforms/blackberry/tools.md
index ee9f3b3..df4a1f7 100644
--- a/docs/en/edge/guide/platforms/blackberry/tools.md
+++ b/docs/en/edge/guide/platforms/blackberry/tools.md
@@ -57,7 +57,7 @@ emulator executables.
 ## Launch emulator
 
 For BlackBerry projects, please make sure you customize the
-`project.properties` file in the root of your Cordova project folder.
+`project.properties` file in the root of your Cordova project directory.
 You need to do so to supply your BlackBerry signing key password, and
 specify locations for the BlackBerry WebWorks SDK and BlackBerry
 emulator executables.

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/7e5cc869/docs/en/edge/guide/platforms/blackberry/upgrading.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/guide/platforms/blackberry/upgrading.md b/docs/en/edge/guide/platforms/blackberry/upgrading.md
index 9103535..3885260 100644
--- a/docs/en/edge/guide/platforms/blackberry/upgrading.md
+++ b/docs/en/edge/guide/platforms/blackberry/upgrading.md
@@ -19,33 +19,47 @@ license: Licensed to the Apache Software Foundation (ASF) under one
 
 # Upgrading BlackBerry
 
-This guide shows how to modify BlackBerry projects to upgrade from older versions of Cordova.
-Most of these instructions apply to projects created with an older set
-of command-line tools that precede the `cordova` CLI utility. See The Command-line Interface for information how to update the
-version of the CLI.
+This guide shows how to modify BlackBerry projects to upgrade from
+older versions of Cordova.  These instructions apply to projects
+created with an older set of command-line tools that precede the
+`cordova` CLI utility. See The Command-line Interface for information
+how to update the version of the CLI.
 
 ## Upgrading 2.8.0 projects to 2.9.0 ##
 
 BlackBerry 10:
 
-1. **Download and extract the Cordova 2.9.0 source** to a **permanent folder location** on your hard drive (say to ~/Cordova-2.9.0)
-2. **Quit any running SDK tools**: Eclipse, Momentics and the like.
-3. **Navigate** to the directory where you put the downloaded source above, using a unix like terminal: **Terminal.app**, **Bash**, **Cygwin**, etc.
-4. **Create a new project**, as described in BlackBerry Command-line Tools. This becomes the home of your updated project.
-5. **Copy** your projects source from the old project's /www folder to the new project's /www folder
-6. **Update** the Cordova script reference in your **www/index.html** file (and any other files that contain the script reference) to point to the new **cordova.js** file
+1. Download and extract the Cordova 2.9.0 source to a permanent location on your hard drive, for example to `~/Cordova-2.9.0`.
+
+2. Quit any running SDK tools: Eclipse, Momentics and the like.
+
+3. Navigate to the directory where you put the downloaded source above, using a unix like terminal: Terminal.app, Bash, Cygwin, etc.
+
+4. Create a new project, as described in BlackBerry Command-line Tools. This becomes the home of your updated project.
+
+5. Copy your project's source from the old project's `/www` directory to the new project's `/www` directory.
+
+6. Update the Cordova script reference in your `www/index.html` file (and any other files that contain the script reference) to point to the new `cordova.js` file.
 
 ### BlackBerryOS/Playbook ###
 
-1. **Download and extract the Cordova 2.9.0 source** to a **permanent folder location** on your hard drive (say to ~/Cordova-2.9.0)
-2. **Quit any running SDK tools**: Eclipse, Momentics and the like.
-3. **Navigate** to the directory where you put the downloaded source above, using a unix like terminal: **Terminal.app**, **Bash**, **Cygwin**, etc.
-4. **Create a new project**, as described in iOS Command-line Tools. You need the assets from this new project.
-5. **Copy** the **www/cordova.js** file from the new project into your **www** folder, and delete your **www/cordova.js** file
-6. **Update** the Cordova script reference in your **www/index.html** file (and any other files that contain the script reference) to point to the new **cordova.js** file
-7. **Copy** the **native** folder from the new project into the existing project, overwriting the old **native** folder
-8. **Copy** the **lib** folder from the new project into the existing project, overwriting the old **lib** folder
-9. **Copy** the **cordova** folder from the new project into the existing project, overwriting the old **cordova** folder
+1. Download and extract the Cordova 2.9.0 source to a permanent location on your hard drive, for example to `~/Cordova-2.9.0`.
+
+2. Quit any running SDK tools: Eclipse, Momentics and the like.
+
+3. Navigate to the directory where you put the downloaded source above, using a unix like terminal: Terminal.app, Bash, Cygwin, etc.
+
+4. Create a new project, as described in iOS Command-line Tools. You need the assets from this new project.
+
+5. Copy the `www/cordova.js` file from the new project into your `www` directory, and delete your `www/cordova.js` file.
+
+6. Update the Cordova script reference in your `www/index.html` file (and any other files that contain the script reference) to point to the new `cordova.js` file.
+
+7. Copy the `native` directory from the new project into the existing project, overwriting the old `native` directory.
+
+8. Copy the `lib` directory from the new project into the existing project, overwriting the old `lib` directory.
+
+9. Copy the `cordova` directory from the new project into the existing project, overwriting the old `cordova` directory.
 
 ## Upgrading 2.7.0 projects to 2.8.0 ##
 
@@ -54,181 +68,270 @@ BlackBerry 10:
 BlackBerry 10 uses the new CLI tooling and manages core APIs as plugins. The instructions migrate your project to a new project, rather than updating an existing project, due to the complexity of updating an old project.
 Also note that the cordova js script file is now called 'cordova.js' and no longer contains a version string.
 
-1. **Download and extract the Cordova 2.8.0 source** to a **permanent folder location** on your hard drive (say to ~/Cordova-2.8.0)
-2. **Quit any running SDK tools**: Eclipse, Momentics and the like.
-3. **Navigate** to the directory where you put the downloaded source above, using a unix like terminal: **Terminal.app**, **Bash**, **Cygwin**, etc.
-4. **Create a new project**, as described in BlackBerry Command-line Tools. This becomes the home of your updated project.
-5. **Copy** your projects source from the old project's /www folder to the new project's /www folder
-6. **Update** the Cordova script reference in your **www/index.html** file (and any other files that contain the script reference) to point to the new **cordova.js** file
+1. Download and extract the Cordova 2.8.0 source to a permanent location on your hard drive, for example to `~/Cordova-2.8.0`.
+
+2. Quit any running SDK tools: Eclipse, Momentics and the like.
+
+3. Navigate to the directory where you put the downloaded source above, using a unix like terminal: Terminal.app, Bash, Cygwin, etc.
+
+4. Create a new project, as described in BlackBerry Command-line Tools. This becomes the home of your updated project.
+
+5. Copy your project's source from the old project's `/www` directory to the new project's `/www` directory.
+
+6. Update the Cordova script reference in your `www/index.html` file (and any other files that contain the script reference) to point to the new `cordova.js` file.
 
 BlackBerryOS/Playbook:
 
-1. **Download and extract the Cordova 2.8.0 source** to a **permanent folder location** on your hard drive (say to ~/Cordova-2.8.0)
-2. **Quit any running SDK tools**: Eclipse, Momentics and the like.
-3. **Navigate** to the directory where you put the downloaded source above, using a unix like terminal: **Terminal.app**, **Bash**, **Cygwin**, etc.
-4. **Create a new project**, as described in iOS Command-line Tools. You need the assets from this new project.
-5. **Copy** the **www/cordova.js** file from the new project into your **www** folder, and delete your **www/cordova.js** file
-6. **Update** the Cordova script reference in your **www/index.html** file (and any other files that contain the script reference) to point to the new **cordova.js** file
-7. **Copy** the **native** folder from the new project into the existing project, overwriting the old **native** folder
-8. **Copy** the **lib** folder from the new project into the existing project, overwriting the old **lib** folder
-9. **Copy** the **cordova** folder from the new project into the existing project, overwriting the old **cordova** folder
+1. Download and extract the Cordova 2.8.0 source to a permanent location on your hard drive, for example to `~/Cordova-2.8.0`.
+
+2. Quit any running SDK tools: Eclipse, Momentics and the like.
+
+3. Navigate to the directory where you put the downloaded source above, using a unix like terminal: Terminal.app, Bash, Cygwin, etc.
+
+4. Create a new project, as described in iOS Command-line Tools. You need the assets from this new project.
+
+5. Copy the `www/cordova.js` file from the new project into your `www` directory, and delete your `www/cordova.js` file.
+
+6. Update the Cordova script reference in your `www/index.html` file (and any other files that contain the script reference) to point to the new `cordova.js` file.
+
+7. Copy the `native` directory from the new project into the existing project, overwriting the old `native` directory.
+
+8. Copy the `lib` directory from the new project into the existing project, overwriting the old `lib` directory.
+
+9. Copy the `cordova` directory from the new project into the existing project, overwriting the old `cordova` directory.
 
 ## Upgrading 2.6.0 projects to 2.7.0 ##
 
-1. **Download and extract the Cordova 2.7.0 source** to a **permanent folder location** on your hard drive (say to ~/Cordova-2.7.0)
-2. **Quit any running SDK tools**: Eclipse, Momentics and the like.
-3. **Navigate** to the directory where you put the downloaded source above, using a unix like terminal: **Terminal.app**, **Bash**, **Cygwin**, etc.
-4. **Create a new project**, as described in BlackBerry Command-line Tools. You need the assets from this new project.
-5. **Copy** the **www/cordova-2.7.0.js** file from the new project into your **www** folder, and delete your **www/cordova-2.6.0.js** file
-6. **Update** the Cordova script reference in your **www/index.html** file (and any other files that contain the script reference) to point to the new **cordova-2.7.0.js** file
-7. **Copy** the **native** folder from the new project into the existing project, overwriting the old **native** folder
-8. **Copy** the **lib** folder from the new project into the existing project, overwriting the old **lib** folder
-9. **Copy** the **cordova** folder from the new project into the existing project, overwriting the old **cordova** folder
+1. Download and extract the Cordova 2.7.0 source to a permanent location on your hard drive, for example to `~/Cordova-2.7.0`.
+
+2. Quit any running SDK tools: Eclipse, Momentics and the like.
+
+3. Navigate to the directory where you put the downloaded source above, using a unix like terminal: Terminal.app, Bash, Cygwin, etc.
+
+4. Create a new project, as described in BlackBerry Command-line Tools. You need the assets from this new project.
+
+5. Copy the `www/cordova-2.7.0.js` file from the new project into your `www` directory, and delete your `www/cordova-2.6.0.js` file.
+
+6. Update the Cordova script reference in your `www/index.html` file (and any other files that contain the script reference) to point to the new `cordova-2.7.0.js` file.
+
+7. Copy the `native` directory from the new project into the existing project, overwriting the old `native` directory.
+
+8. Copy the `lib` directory from the new project into the existing project, overwriting the old `lib` directory.
+
+9. Copy the `cordova` directory from the new project into the existing project, overwriting the old `cordova` directory.
 
 ## Upgrade to 2.6.0 from 2.5.0 ##
 
-Updating the PhoneGap download folder:
+Updating the PhoneGap download directory:
 
-It is recommended that you download a fresh copy of the entire folder.
+It is recommended that you download a fresh copy of the entire directory.
 
 However, here are the new parts needed for the piecemeal update:
-1. Update the cordova.blackberry.js file in the ‘Phonegap-2.6.0/lib/blackberry/javascript’ folder
-2. Update the ‘ext’, ‘ext-air’, and ‘ext-qnx’ in the ‘Phonegap-2.6.0/lib/blackberry/framework’ folder
-3. Update the ‘build.xml’ file in the ‘Phonegap-2.6.0/lib/blackberry’ folder
-4. Update the ‘Phonegap-2.6.0/lib/blackberry/bin’ folder
-5. Update the ‘VERSION’ file in the ‘Phonegap-2.6.0/lib/blackberry’ folder
-
-Updating the example/ folder or migrating an existing project:
-
-1. Open your `www/` folder, which contains your app.
-2. Remove and update the .jar file in the `ext/` folder.
-3. Update the contents of the `ext-air/` folder.
-4. Update the contents of the `ext-qnx/` folder.
+
+1. Update the cordova.blackberry.js file in the `Phonegap-2.6.0/lib/blackberry/javascript` directory.
+
+2. Update the `ext`, `ext-air`, and `ext-qnx` in the `Phonegap-2.6.0/lib/blackberry/framework` directory.
+
+3. Update the `build.xml` file in the `Phonegap-2.6.0/lib/blackberry` directory.
+
+4. Update the `Phonegap-2.6.0/lib/blackberry/bin` directory.
+
+5. Update the `VERSION` file in the `Phonegap-2.6.0/lib/blackberry` directory.
+
+Updating the `example/` directory or migrating an existing project:
+
+1. Open your `www/` directory, which contains your app.
+
+2. Remove and update the .jar file in the `ext/` directory.
+
+3. Update the contents of the `ext-air/` directory.
+
+4. Update the contents of the `ext-qnx/` directory.
+
 4. Copy the new `cordova-2.6.0.js` into your project.
+
 5. Update your HTML to use the new `cordova-2.6.0.js` file.
 
 ## Upgrade to 2.5.0 from 2.4.0 ##
 
-Updating the PhoneGap download folder:
+Updating the PhoneGap download directory:
 
-It is recommended that you download a fresh copy of the entire folder.
+It is recommended that you download a fresh copy of the entire directory.
 
 However, here are the new parts needed for the piecemeal update:
-1. Update the cordova.blackberry.js file in the ‘Phonegap-2.5.0/lib/blackberry/javascript’ folder
-2. Update the ‘ext’, ‘ext-air’, and ‘ext-qnx’ in the ‘Phonegap-2.5.0/lib/blackberry/framework’ folder
-3. Update the ‘build.xml’ file in the ‘Phonegap-2.5.0/lib/blackberry’ folder
-4. Update the ‘Phonegap-2.5.0/lib/blackberry/bin’ folder
-5. Update the ‘VERSION’ file in the ‘Phonegap-2.5.0/lib/blackberry’ folder
-
-Updating the example/ folder or migrating an existing project:
-
-1. Open your `www/` folder, which contains your app.
-2. Remove and update the .jar file in the `ext/` folder.
-3. Update the contents of the `ext-air/` folder.
-4. Update the contents of the `ext-qnx/` folder.
+
+1. Update the cordova.blackberry.js file in the `Phonegap-2.5.0/lib/blackberry/javascript` directory.
+
+2. Update the `ext`, `ext-air`, and `ext-qnx` in the `Phonegap-2.5.0/lib/blackberry/framework` directory.
+
+3. Update the `build.xml` file in the `Phonegap-2.5.0/lib/blackberry` directory.
+
+4. Update the `Phonegap-2.5.0/lib/blackberry/bin` directory.
+
+5. Update the `VERSION` file in the `Phonegap-2.5.0/lib/blackberry` directory.
+
+Updating the example/ directory or migrating an existing project:
+
+1. Open your `www/` directory, which contains your app.
+
+2. Remove and update the .jar file in the `ext/` directory.
+
+3. Update the contents of the `ext-air/` directory.
+
+4. Update the contents of the `ext-qnx/` directory.
+
 4. Copy the new `cordova-2.5.0.js` into your project.
+
 5. Update your HTML to use the new `cordova-2.5.0.js` file.
 
 ## Upgrade to 2.4.0 from 2.3.0 ##
 
-Updating just the `www` folder:
+Updating just the `www` directory:
+
+1. Open your `www/` directory, which contains your app.
+
+2. Remove and update the .jar file in the `ext/` directory.
+
+3. Update the contents of the `ext-air/` directory.
 
-1. Open your `www/` folder, which contains your app.
-2. Remove and update the .jar file in the `ext/` folder.
-3. Update the contents of the `ext-air/` folder.
 4. Copy the new `cordova-2.4.0.js` into your project.
-    - If playbook, then update the .js file in the `playbook/` folder.
-    - If BlackBerry 10, then update the .js file in the `qnx/` folder.
+    - If playbook, then update the .js file in the `playbook/` directory.
+    - If BlackBerry 10, then update the .js file in the `qnx/` directory.
+
 5. Update your HTML to use the new `cordova-2.4.0.js` file.
 
-Updating the sample folder (ie, updating using the ant tools):
+Updating the sample directory (ie, updating using the ant tools):
+
+1. Open the `sample/lib/` directory.
 
-1. Open the `sample/lib/` folder.
-2. Update the .jar file in the `cordova.2.3.0/ext/` folder.
-3. Update the contents of the `cordova.2.3.0/ext-air/` folder.
-4. Update the contents of the `cordova.2.3.0/ext-qnx/` folder.
-5. Update the .js file in the `cordova.2.3.0/javascript/` folder.
-6. Open the `sample/lib/` folder and rename the `cordova.2.3.0/` folder to `cordova.2.4.0/`.
-7. Type `ant blackberry build` or `ant playbook build` to update the `www/` folder with updated Cordova.
-8. Open the `www/` folder and update your HTML to use the new `cordova-2.4.0.js` file
+2. Update the .jar file in the `cordova.2.3.0/ext/` directory.
+
+3. Update the contents of the `cordova.2.3.0/ext-air/` directory.
+
+4. Update the contents of the `cordova.2.3.0/ext-qnx/` directory.
+
+5. Update the .js file in the `cordova.2.3.0/javascript/` directory.
+
+6. Open the `sample/lib/` directory and rename the `cordova.2.3.0/` directory to `cordova.2.4.0/`.
+
+7. Type `ant blackberry build` or `ant playbook build` to update the `www/` directory with updated Cordova.
+
+8. Open the `www/` directory and update your HTML to use the new `cordova-2.4.0.js` file.
 
 ## Upgrade to 2.3.0 from 2.2.0 ##
 
-Updating just the `www` folder:
+Updating just the `www` directory:
+
+1. Open your `www/` directory, which contains your app.
+
+2. Remove and update the .jar file in the `ext/` directory.
+
+3. Update the contents of the `ext-air/` directory.
 
-1. Open your `www/` folder, which contains your app.
-2. Remove and update the .jar file in the `ext/` folder.
-3. Update the contents of the `ext-air/` folder.
 4. Copy the new `cordova-2.3.0.js` into your project.
-    - If playbook, then update the .js file in the `playbook/` folder.
-    - If BlackBerry 10, then update the .js file in the `qnx/` folder.
+    - If playbook, then update the .js file in the `playbook/` directory.
+    - If BlackBerry 10, then update the .js file in the `qnx/` directory.
+
 5. Update your HTML to use the new `cordova-2.3.0.js` file.
 
-Updating the sample folder (ie, updating using the ant tools):
+Updating the sample directory (ie, updating using the ant tools):
+
+1. Open the `sample/lib/` directory.
+
+2. Update the .jar file in the `cordova.2.2.0/ext/` directory.
+
+3. Update the contents of the `cordova.2.2.0/ext-air/` directory.
+
+4. Update the contents of the `cordova.2.2.0/ext-qnx/` directory.
+
+5. Update the .js file in the `cordova.2.2.0/javascript/` directory.
+
+6. Open the `sample/lib/` directory and rename the `cordova.2.2.0/` directory to `cordova.2.3.0/`.
 
-1. Open the `sample/lib/` folder.
-2. Update the .jar file in the `cordova.2.2.0/ext/` folder.
-3. Update the contents of the `cordova.2.2.0/ext-air/` folder.
-4. Update the contents of the `cordova.2.2.0/ext-qnx/` folder.
-5. Update the .js file in the `cordova.2.2.0/javascript/` folder.
-6. Open the `sample/lib/` folder and rename the `cordova.2.2.0/` folder to `cordova.2.3.0/`.
-7. Type `ant blackberry build` or `ant playbook build` to update the `www/` folder with updated Cordova.
-8. Open the `www/` folder and update your HTML to use the new `cordova-2.3.0.js` file
+7. Type `ant blackberry build` or `ant playbook build` to update the `www/` directory with updated Cordova.
+
+8. Open the `www/` directory and update your HTML to use the new `cordova-2.3.0.js` file.
 
 ## Upgrade to 2.2.0 from 2.1.0 ##
 
-Updating just the www folder:
+Updating just the www directory:
+
+1. Open your `www/` directory, which contains your app.
+
+2. Remove and update the .jar file in the `ext/` directory.
+
+3. Update the contents of the `ext-air/` directory.
 
-1. Open your `www/` folder, which contains your app.
-2. Remove and update the .jar file in the `ext/` folder.
-3. Update the contents of the `ext-air/` folder.
 4. Copy the new `cordova-2.2.0.js` into your project.
-    - If playbook, then update the .js file in the `playbook/` folder.
-    - If BlackBerry 10, then update the .js file in the `qnx/` folder.
+    - If playbook, then update the .js file in the `playbook/` directory.
+    - If BlackBerry 10, then update the .js file in the `qnx/` directory.
+
 5. Update your HTML to use the new `cordova-2.2.0.js` file.
 
-Updating the sample folder (ie, updating using the ant tools):
+Updating the sample directory (ie, updating using the ant tools):
+
+1. Open the `sample/lib/` directory.
+
+2. Update the .jar file in the `cordova.2.1.0/ext/` directory.
+
+3. Update the contents of the `cordova.2.1.0/ext-air/` directory.
 
-1. Open the `sample/lib/` folder.
-2. Update the .jar file in the `cordova.2.1.0/ext/` folder.
-3. Update the contents of the `cordova.2.1.0/ext-air/` folder.
-4. Update the contents of the `cordova.2.1.0/ext-qnx/` folder.
-5. Update the .js file in the `cordova.2.1.0/javascript/` folder.
-6. Open the `sample/lib/` folder and rename the `cordova.2.1.0/` folder to `cordova.2.2.0/`.
-7. Type `ant blackberry build` or `ant playbook build` to update the `www/` folder with updated Cordova.
-8. Open the `www/` folder and update your HTML to use the new `cordova-2.2.0.js` file.
+4. Update the contents of the `cordova.2.1.0/ext-qnx/` directory.
+
+5. Update the .js file in the `cordova.2.1.0/javascript/` directory.
+
+6. Open the `sample/lib/` directory and rename the `cordova.2.1.0/` directory to `cordova.2.2.0/`.
+
+7. Type `ant blackberry build` or `ant playbook build` to update the `www/` directory with updated Cordova.
+
+8. Open the `www/` directory and update your HTML to use the new `cordova-2.2.0.js` file.
 
 ## Upgrade to 2.1.0 from 2.0.0 ##
 
-Updating just the `www` folder:
+Updating just the `www` directory:
+
+1. Open your `www/` directory, which contains your app.
+
+2. Remove and update the .jar file in the `ext/` directory.
+
+3. Update the contents of the `ext-air/` directory.
 
-1. Open your `www/` folder, which contains your app.
-2. Remove and update the .jar file in the `ext/` folder.
-3. Update the contents of the `ext-air/` folder.
 4. Copy the new `cordova-2.1.0.js` into your project.
-    - If playbook, then update the .js file in the `playbook/` folder.
+    - If playbook, then update the .js file in the `playbook/` directory.
+
 5. Update your HTML to use the new `cordova-2.1.0.js` file.
 
-Updating the sample folder (ie, updating using the ant tools):
+Updating the sample directory (ie, updating using the ant tools):
+
+1. Open the `sample/lib/` directory.
+
+2. Update the .jar file in the `cordova.2.0.0/ext/` directory.
+
+3. Update the contents of the `cordova.2.0.0/ext-air/` directory.
 
-1. Open the `sample/lib/` folder.
-2. Update the .jar file in the `cordova.2.0.0/ext/` folder.
-3. Update the contents of the `cordova.2.0.0/ext-air/` folder.
-4. Update the .js file in the `cordova.2.0.0/javascript/` folder.
-5. Open the `sample/lib/` folder and rename the `cordova.2.0.0/` folder to `cordova.2.1.0/`.
-6. Type `ant blackberry build` or `ant playbook build` to update the `www/` folder with updated Cordova.
-7. Open the `www/` folder and update your HTML to use the new `cordova-2.1.0.js` file.
+4. Update the .js file in the `cordova.2.0.0/javascript/` directory.
+
+5. Open the `sample/lib/` directory and rename the `cordova.2.0.0/` directory to `cordova.2.1.0/`.
+
+6. Type `ant blackberry build` or `ant playbook build` to update the `www/` directory with updated Cordova.
+
+7. Open the `www/` directory and update your HTML to use the new `cordova-2.1.0.js` file.
 
 ## Upgrade to 2.0.0 from 1.9.0 ##
 
-Updating just the `www` folder:
+Updating just the `www` directory:
+
+1. Open your `www/` directory, which contains your app.
+
+2. Remove and update the .jar file in the `ext/` directory.
+
+3. Update the contents of the `ext-air/` directory.
 
-1. Open your `www/` folder, which contains your app.
-2. Remove and update the .jar file in the `ext/` folder.
-3. Update the contents of the `ext-air/` folder.
 4. Copy the new `cordova-2.0.0.js` into your project.
-    - If playbook, then update the .js file in the `playbook/` folder.
+    - If playbook, then update the .js file in the `playbook/` directory.
+
 5. Update your HTML to use the new `cordova-2.0.0.js` file.
+
 6. Update your `www/plugins.xml` file. Two plugins changed their
    namespace/service label. Change the old entries for the Capture and
    Contact plugins from:
@@ -241,16 +344,23 @@ Updating just the `www` folder:
         <plugin name="Capture" value="org.apache.cordova.capture.MediaCapture"/>
         <plugin name="Contacts" value="org.apache.cordova.pim.Contact"/>
 
-Updating the sample folder (ie, updating using the ant tools):
+Updating the sample directory (ie, updating using the ant tools):
+
+1. Open the `sample/lib/` directory.
+
+2. Update the .jar file in the `cordova.1.9.0/ext/` directory.
+
+3. Update the contents of the `cordova.1.9.0/ext-air/` directory.
+
+4. Update the .js file in the `cordova.1.9.0/javascript/` directory.
 
-1. Open the `sample/lib/` folder.
-2. Update the .jar file in the `cordova.1.9.0/ext/` folder.
-3. Update the contents of the `cordova.1.9.0/ext-air/` folder.
-4. Update the .js file in the `cordova.1.9.0/javascript/` folder.
-5. Open the `sample/lib/` folder and rename the `cordova.1.9.0/` folder to `cordova.2.0.0/`.
-6. Type `ant blackberry build` or `ant playbook build` to update the `www/` folder with updated Cordova.
-7. Open the `www/` folder and update your HTML to use the new `cordova-2.0.0.js` file.
-8. Open the `www/` folder and update the `plugins.xml` file. Two plugins
+5. Open the `sample/lib/` directory and rename the `cordova.1.9.0/` directory to `cordova.2.0.0/`.
+
+6. Type `ant blackberry build` or `ant playbook build` to update the `www/` directory with updated Cordova.
+
+7. Open the `www/` directory and update your HTML to use the new `cordova-2.0.0.js` file.
+
+8. Open the `www/` directory and update the `plugins.xml` file. Two plugins
    changed their namespace/service label. Change the old entries for the
    Capture and Contact plugins from:
 
@@ -266,14 +376,19 @@ Updating the sample folder (ie, updating using the ant tools):
 
 ## Upgrade to 1.8.0 from 1.7.0 ##
 
-Updating just the `www` folder:
+Updating just the `www` directory:
+
+1. Open your `www/` directory, which contains your app.
+
+2. Remove and update the .jar file in the `ext/` directory.
+
+3. Update the contents of the `ext-air/` directory.
 
-1. Open your `www/` folder, which contains your app.
-2. Remove and update the .jar file in the `ext/` folder.
-3. Update the contents of the `ext-air/` folder.
 4. Copy the new `cordova-1.8.0.js` into your project.
-    - If playbook, then update the .js file in the `playbook/` folder.
+    - If playbook, then update the .js file in the `playbook/` directory.
+
 5. Update your HTML to use the new `cordova-1.8.0.js` file.
+
 6. Update your `www/plugins.xml` file. Two plugins changed their
    namespace/service label. Change the old entries for the Capture and
    Contact plugins from:
@@ -286,16 +401,23 @@ Updating just the `www` folder:
         <plugin name="Capture" value="org.apache.cordova.capture.MediaCapture"/>
         <plugin name="Contacts" value="org.apache.cordova.pim.Contact"/>
 
-Updating the sample folder (ie, updating using the ant tools):
+Updating the sample directory (ie, updating using the ant tools):
+
+1. Open the `sample/lib/` directory.
+
+2. Update the .jar file in the `cordova.1.7.0/ext/` directory.
+
+3. Update the contents of the `cordova.1.7.0/ext-air/` directory.
+
+4. Update the .js file in the `cordova.1.7.0/javascript/` directory.
+
+5. Open the `sample/lib/` directory and rename the `cordova.1.7.0/` directory to `cordova.1.8.0/`.
+
+6. Type `ant blackberry build` or `ant playbook build` to update the `www/` directory with updated Cordova.
+
+7. Open the `www/` directory and update your HTML to use the new `cordova-1.8.0.js` file.
 
-1. Open the `sample/lib/` folder.
-2. Update the .jar file in the `cordova.1.7.0/ext/` folder.
-3. Update the contents of the `cordova.1.7.0/ext-air/` folder.
-4. Update the .js file in the `cordova.1.7.0/javascript/` folder.
-5. Open the `sample/lib/` folder and rename the `cordova.1.7.0/` folder to `cordova.1.8.0/`.
-6. Type `ant blackberry build` or `ant playbook build` to update the `www/` folder with updated Cordova.
-7. Open the `www/` folder and update your HTML to use the new `cordova-1.8.0.js` file.
-8. Open the `www/` folder and update the `plugins.xml` file. Two plugins
+8. Open the `www/` directory and update the `plugins.xml` file. Two plugins
    changed their namespace/service label. Change the old entries for the
    Capture and Contact plugins from:
 

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/7e5cc869/docs/en/edge/guide/platforms/blackberry10/index.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/guide/platforms/blackberry10/index.md b/docs/en/edge/guide/platforms/blackberry10/index.md
index c8539ed..5867ac1 100644
--- a/docs/en/edge/guide/platforms/blackberry10/index.md
+++ b/docs/en/edge/guide/platforms/blackberry10/index.md
@@ -29,7 +29,11 @@ The development environment is available on Windows, Mac and Linux.
 
 Developers should use the `cordova` utility in conjunction with the Blackberry Native SDK.  See The Command-line Interface for information how to install `cordova`, add projects, then build and deploy.
 
-## Install the BlackBerry Native SDK
+-   Windows XP (32-bit) or Windows 7 (32-bit and 64-bit) or Mac OSX 10.6.4+
+
+-   node.js (> 0.9.9) [Download node.js now](http://nodejs.org/)
+
+-   BlackBerry 10 Native SDK. [Download the BlackBerry 10 Native SDK now.](http://developer.blackberry.com/native/download/)
 
 The BlackBerry Native SDK is available from [developer.blackberry.com](http://developer.blackberry.com/native/download/).
 
@@ -39,18 +43,24 @@ Windows
 
     bbndk-env.bat
 
-Linux/Mac 
+To create a new project, you use the `create` command to set up the directory structure for your app.
+
+1.  On the command line, navigate to the directory where you extracted Cordova.
 
-    source bbndk-env.sh
+2.  Run the `create` command using the following syntax:
 
 ## Set up Emulators
 
-If you wish to run a device emulator, download and install the BlackBerry 10 Simulator.
+This command creates the directory structure for your project at the specified location. All of your project resource files should be stored in the *<path-to-project>*/www directory, or in a subdirectory within it.
 
 * [Download](http://developer.blackberry.com/native/download/)
 * [Getting Started](http://developer.blackberry.com/devzone/develop/simulator/blackberry_10_simulator_start.html)
 
-## Set up for Signing
+- '<path-to-project>' specifies the directory you want the project created in
+
+- '<project-package>' specifies a reverse domain style identifier
+
+- '<project-name>' specifies the apps display name
 
 If you wish to test on a device or distribute apps through BlackBerry World, your system must be setup for code signing.
 
@@ -73,7 +83,15 @@ directory:
 
 *Note*: the create command bootstraps dependency installation through the 'npm install' command. Depending on installation directory and system permissions, this may require admin privileges. If a problem is encountered on OSX/Linux, run 'sudo npm install' before using the create command. On Windows, run 'npm install' in a command line utility opened with admin privileges.
 
-## Deploy to Emulator
+-   `<name>`  specifies a unique name for the target.
+
+-   `<ip-address>`  specifies the ip address of the BlackBerry device or emulator.
+
+-   `-t <device | simulator>` specifies the target type. If not provided, the default value is device.
+
+-   `-p|--password <password>`  specifies the password for the device or emulator. This is required only if the device or emulator is password protected.
+
+-   `--pin <device-pin>`  specifies the PIN of the BlackBerry device, which identifies that device as a valid host for the debug token. This argument is required only if you are creating a debug token.
 
 Before testing an app on either an emulator or a device, you need to add a _target_ to your project. Each is identified with a unique name, and associated with an IP address. You need to get the IP address from the emulator before you use it to view apps.
 
@@ -91,7 +109,9 @@ Windows
 
     platforms\blackberry10\cordova\target.bat add emu 169.254.0.1 -t simulator
 
-Mac/Linux
+-   When you build the app in release mode, you are preparing it for distribution through BlackBerry World. The script packages your app resources and plugins together in a .bar file, then signs the app.
+
+-   When you build the app in debug mode, you are preparing it to be tested. The script packages your app resources and plugins together in a .bar file, but does not sign it. The script can also deploy the app onto a previously defined target. If you have not already created and installed a debug token, you can supply the keystore password, and the build script will create and install the debug token for you as well.
 
     platforms/blackberry10/cordova/target add emu 169.254.0.1 -t simulator
 
@@ -103,7 +123,11 @@ Then, run the `emulate` command to view the app:
 
 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 __Settings__ application under __About &rarr; Hardware__.
 
-![](img/guide/platforms/blackberry10/bb_pin.png)
+-   `-k|--keystorepass <password>`  specifies the password you defined when you configured your computer to sign applications.
+
+-   `-b|--buildId <number>`  specifies the build version number of your application. Typically, this number should be incremented from the previous signed version. This argument is optional.
+
+-   `-p|--params <params-JSON-file>`  specifies a JSON file containing additional parameters to pass to downstream tools. This argument is optional.
 
 Run the target command-line utility to associate a name with an IP address, device password and PIN.
 
@@ -113,7 +137,13 @@ Windows
 
 Mac/Linux
 
-    platforms/blackberry10/cordova/target add mydevice 169.254.0.1 -t device --password 123456 --pin FFFF972E
+-   `<target>`  specifies the name of a previously added target. If `<target>`  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 not created a default target. Additionally, if `<target>`  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 computer.
+
+-   `-k|--keystorepass <password>`  specifies the password you defined when you configured your computer to sign applications. This password is also used to create your debug token. This argument is only required if you want the script to create and install the debug token for you.
+
+-   `-p|--params <params-JSON-file>`  specifies a JSON file containing additional parameters to pass to downstream tools.
+
+-   `-ll|--loglevel <level>`  specifies the log level. The log level may be one of `error`, `warn`, or `verbose`.
 
 --password refers to the password to unlock the device
 
@@ -129,7 +159,9 @@ Windows
 
     platforms\blackberry10\cordova\run.bat --device --keystorepass mysecret
 
-Mac/Linux
+where
+
+-   `<target>`  specifies the name of a previously added target. If `<target>`  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 computer.
 
     platforms/blackberry10/cordova/run --device --keystorepass mysecret
 


Mime
View raw message