You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by bc...@apache.org on 2012/03/28 20:03:09 UTC

[1/2] docs commit: [CB-229] Rename assets from PhoneGap to Cordova.

Updated Branches:
  refs/heads/master 8c566c6df -> 80e274d30


[CB-229] Rename assets from PhoneGap to Cordova.


Project: http://git-wip-us.apache.org/repos/asf/incubator-cordova-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cordova-docs/commit/80e274d3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-docs/tree/80e274d3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-docs/diff/80e274d3

Branch: refs/heads/master
Commit: 80e274d308e422cfe47f2af09981b9ecb20d7e5f
Parents: 8c566c6
Author: Bryce Curtis <cu...@gmail.com>
Authored: Wed Mar 28 13:02:50 2012 -0500
Committer: Bryce Curtis <cu...@gmail.com>
Committed: Wed Mar 28 13:02:50 2012 -0500

----------------------------------------------------------------------
 .../en/edge/guide/getting-started/android/index.md |   21 +++++-----
 .../edge/guide/getting-started/blackberry/index.md |   16 ++++---
 docs/en/edge/guide/getting-started/ios/index.md    |   10 +++--
 docs/en/edge/index.md                              |    4 +-
 .../accelerometer/acceleration/acceleration.md     |    8 ++--
 .../accelerometer/accelerometer.clearWatch.md      |    6 +-
 .../accelerometer.getCurrentAcceleration.md        |    8 ++--
 .../accelerometer.watchAcceleration.md             |   12 +++---
 docs/en/edge/phonegap/camera/camera.getPicture.md  |    6 +-
 .../en/edge/phonegap/compass/compass.clearWatch.md |    6 +-
 .../phonegap/compass/compass.clearWatchFilter.md   |    6 +-
 .../phonegap/compass/compass.getCurrentHeading.md  |    6 +-
 .../edge/phonegap/compass/compass.watchHeading.md  |    6 +-
 .../phonegap/compass/compass.watchHeadingFilter.md |    6 +-
 .../en/edge/phonegap/connection/connection.type.md |    6 +-
 docs/en/edge/phonegap/contacts/Contact/contact.md  |    6 +-
 .../contacts/ContactAddress/contactaddress.md      |    6 +-
 .../phonegap/contacts/ContactField/contactfield.md |    8 ++--
 .../ContactFindOptions/contactfindoptions.md       |    6 +-
 .../phonegap/contacts/ContactName/contactname.md   |    6 +-
 .../ContactOrganization/contactorganization.md     |    6 +-
 docs/en/edge/phonegap/contacts/contacts.create.md  |    6 +-
 docs/en/edge/phonegap/contacts/contacts.find.md    |    6 +-
 docs/en/edge/phonegap/device/device.md             |    2 +-
 docs/en/edge/phonegap/device/device.name.md        |    8 ++--
 docs/en/edge/phonegap/device/device.phonegap.md    |   18 ++++----
 docs/en/edge/phonegap/device/device.platform.md    |    8 ++--
 docs/en/edge/phonegap/device/device.uuid.md        |    8 ++--
 docs/en/edge/phonegap/device/device.version.md     |    8 ++--
 docs/en/edge/phonegap/events/events.backbutton.md  |   14 +++---
 .../edge/phonegap/events/events.batterycritical.md |   18 ++++----
 docs/en/edge/phonegap/events/events.batterylow.md  |   18 ++++----
 .../edge/phonegap/events/events.batterystatus.md   |   18 ++++----
 docs/en/edge/phonegap/events/events.deviceready.md |   32 +++++++-------
 .../edge/phonegap/events/events.endcallbutton.md   |   14 +++---
 docs/en/edge/phonegap/events/events.md             |    2 +-
 docs/en/edge/phonegap/events/events.menubutton.md  |   14 +++---
 docs/en/edge/phonegap/events/events.offline.md     |   16 ++++----
 docs/en/edge/phonegap/events/events.online.md      |   16 ++++----
 docs/en/edge/phonegap/events/events.pause.md       |   18 ++++----
 docs/en/edge/phonegap/events/events.resume.md      |   18 ++++----
 .../en/edge/phonegap/events/events.searchbutton.md |   14 +++---
 .../edge/phonegap/events/events.startcallbutton.md |   14 +++---
 .../phonegap/events/events.volumedownbutton.md     |   14 +++---
 .../edge/phonegap/events/events.volumeupbutton.md  |   14 +++---
 .../phonegap/file/directoryentry/directoryentry.md |    2 +-
 docs/en/edge/phonegap/file/fileentry/fileentry.md  |    2 +-
 .../en/edge/phonegap/file/filereader/filereader.md |    6 +-
 .../en/edge/phonegap/file/filesystem/filesystem.md |    6 +-
 .../phonegap/file/filetransfer/filetransfer.md     |    6 +-
 .../en/edge/phonegap/file/filewriter/filewriter.md |    6 +-
 .../file/localfilesystem/localfilesystem.md        |    6 +-
 .../geolocation/Coordinates/coordinates.md         |    8 ++--
 .../edge/phonegap/geolocation/Position/position.md |    8 ++--
 .../phonegap/geolocation/geolocation.clearWatch.md |    6 +-
 .../geolocation/geolocation.getCurrentPosition.md  |    6 +-
 docs/en/edge/phonegap/geolocation/geolocation.md   |    2 +-
 .../geolocation/geolocation.watchPosition.md       |    6 +-
 .../en/edge/phonegap/media/capture/captureAudio.md |    4 +-
 .../en/edge/phonegap/media/capture/captureImage.md |    2 +-
 .../en/edge/phonegap/media/capture/captureVideo.md |    4 +-
 .../phonegap/media/media.getCurrentPosition.md     |    6 +-
 docs/en/edge/phonegap/media/media.getDuration.md   |    6 +-
 docs/en/edge/phonegap/media/media.pause.md         |    6 +-
 docs/en/edge/phonegap/media/media.play.md          |    6 +-
 docs/en/edge/phonegap/media/media.release.md       |    6 +-
 docs/en/edge/phonegap/media/media.seekTo.md        |    6 +-
 docs/en/edge/phonegap/media/media.startRecord.md   |    6 +-
 docs/en/edge/phonegap/media/media.stop.md          |    6 +-
 docs/en/edge/phonegap/media/media.stopRecord.md    |    6 +-
 .../phonegap/notification/notification.alert.md    |    8 ++--
 .../phonegap/notification/notification.beep.md     |   10 ++--
 .../phonegap/notification/notification.confirm.md  |    6 +-
 .../phonegap/notification/notification.vibrate.md  |    6 +-
 docs/en/edge/phonegap/storage/database/database.md |   12 +++---
 .../phonegap/storage/localstorage/localstorage.md  |    6 +-
 .../phonegap/storage/parameters/display_name.md    |    2 +-
 docs/en/edge/phonegap/storage/parameters/name.md   |    2 +-
 docs/en/edge/phonegap/storage/parameters/size.md   |    2 +-
 .../en/edge/phonegap/storage/parameters/version.md |    2 +-
 .../phonegap/storage/sqlresultset/sqlresultset.md  |   12 +++---
 .../storage/sqlresultsetlist/sqlresultsetlist.md   |   10 ++--
 .../storage/sqltransaction/sqltransaction.md       |   10 ++--
 docs/en/edge/phonegap/storage/storage.md           |   10 ++--
 .../edge/phonegap/storage/storage.opendatabase.md  |    8 ++--
 lib/phonegap/jodoc.rb                              |    2 +-
 lib/phonegap_docs.rb                               |    2 +-
 template/docs/default/index.html                   |    4 +-
 template/docs/es/index.html                        |    4 +-
 template/docs/fr/index.html                        |    4 +-
 template/docs/jp/index.html                        |    4 +-
 91 files changed, 374 insertions(+), 369 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cordova-docs/blob/80e274d3/docs/en/edge/guide/getting-started/android/index.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/guide/getting-started/android/index.md b/docs/en/edge/guide/getting-started/android/index.md
index 32cef5d..9460a42 100644
--- a/docs/en/edge/guide/getting-started/android/index.md
+++ b/docs/en/edge/guide/getting-started/android/index.md
@@ -1,11 +1,12 @@
 Getting Started with Android
 ============================
 
+This guide describes how to set up your development environment for Cordova and run a sample application.  Note that Cordova used to be called PhoneGap, so some of the sites still use the old PhoneGap name.
 
 Video Tutorials:
 ----------------
 
-- [PhoneGap and Android Quick Start Video Using Ecliplse](http://www.youtube.com/v/MzcIcyBYJMA?autoplay=1)
+- [Cordova and Android Quick Start Video Using Ecliplse](http://www.youtube.com/v/MzcIcyBYJMA?autoplay=1)
 
 
 1. Requirements
@@ -16,13 +17,13 @@ Video Tutorials:
 There is also a [Terminal](http://wiki.phonegap.com/w/page/30864168/phonegap-android-terminal-quickstart) of this tutorial that doesn't use Eclipse.
 
 
-2. Install SDK + PhoneGap
+2. Install SDK + Cordova
 ----------------------------
 
 - Download and install [Eclipse Classic](http://www.eclipse.org/downloads/)
 - Download and install [Android SDK](http://developer.android.com/sdk/index.html)
 - Download and install [ADT Plugin](http://developer.android.com/sdk/eclipse-adt.html#installing)
-- Donwload the latest copy of [PhoneGap](http://phonegap.com/download) and extract its contents. We will be working with the Android directory.
+- Donwload the latest copy of [Cordova](http://phonegap.com/download) and extract its contents. We will be working with the Android directory.
 
  3. Setup New Project
 -----------------------
@@ -33,16 +34,16 @@ There is also a [Terminal](http://wiki.phonegap.com/w/page/30864168/phonegap-and
 - In the root directory of the project, create two new directories:
  	- **/libs**
  	- **assets/www**
-- Copy **cordova.js** from your PhoneGap download earlier to **assets/www**
-- Copy **cordova.jar** from your PhoneGap download earlier to **/libs**
-- Copy **xml** folder from your PhoneGap download earlier to **/res**
+- Copy **cordova-1.6.0.js** from your Cordova download earlier to **assets/www**
+- Copy **cordova-1.6.0.jar** from your Cordova download earlier to **/libs**
+- Copy **xml** folder from your Cordova download earlier to **/res**
 - Make a few adjustments too the project's main Java file found in the **src** folder in Eclipse: (view image below)
 	- Change the class's extend from **Activity** to **DroidGap**
 	- Replace the **setContentView()** line with **super.loadUrl("file:///android_asset/www/index.html");**	
 	- Add **import org.apache.cordova.*;**
 
 	![](img/guide/getting-started/android/javaSrc.jpg)
-- You might experience an error here, where Eclipse can't find cordova-1.5.0.jar. In this case, right click on the /libs folder and go to Build Paths/ &gt; Configure Build Paths. Then, in the Libraries tab, add cordova-1.5.0.jar to the Project. If Eclipse is being temperamental, you might need to refresh (F5) the project once again.
+- You might experience an error here, where Eclipse can't find cordova-1.6.0.jar. In this case, right click on the /libs folder and go to Build Paths/ &gt; Configure Build Paths. Then, in the Libraries tab, add cordova-1.6.0.jar to the Project. If Eclipse is being temperamental, you might need to refresh (F5) the project once again.
 - Right click on AndroidManifest.xml and select **Open With &gt; Text Editor**
 - Paste the following permissions under versionName: (view image below)
 
@@ -75,15 +76,15 @@ Now create and open a new file named **index.html** in the **assets/www** direct
 	    <!DOCTYPE HTML>
         <html>
         <head>
-        <title>PhoneGap</title>
-        <script type="text/javascript" charset="utf-8" src="cordova.js"></script>
+        <title>Cordova</title>
+        <script type="text/javascript" charset="utf-8" src="cordova-1.6.0.js"></script>
         </head>
         <body>
         <h1>Hello World</h1>
         </body>
         </html>
 	
-    *cordova.js might need to be replaced with cordova-&lt;VERSION NUMBER&gt;.js
+    *cordova-1.6.0.js might need to be replaced with latest cordova-<VERSION NUMBER>.js
 
 
 5A. Deploy to Simulator

http://git-wip-us.apache.org/repos/asf/incubator-cordova-docs/blob/80e274d3/docs/en/edge/guide/getting-started/blackberry/index.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/guide/getting-started/blackberry/index.md b/docs/en/edge/guide/getting-started/blackberry/index.md
index dd7a67b..a6f887e 100644
--- a/docs/en/edge/guide/getting-started/blackberry/index.md
+++ b/docs/en/edge/guide/getting-started/blackberry/index.md
@@ -1,11 +1,13 @@
 Getting Started with Blackberry
 ============================
 
+This guide describes how to set up your development environment for Cordova and run a sample application.  Note that Cordova used to be called PhoneGap, so some of the sites still use the old PhoneGap name.
+
 
 Video Tutorials:
 ----------------
 
-- [PhoneGap and BlackBerry Widgets uick Start Video](http://www.youtube.com/v/eF0h0K0OLwI?autoplay=1)
+- [Cordova and BlackBerry Widgets Quick Start Video](http://www.youtube.com/v/eF0h0K0OLwI?autoplay=1)
 
 
 
@@ -17,20 +19,20 @@ Video Tutorials:
 For 4.x devices check out [this guide](http://wiki.phonegap.com/w/page/25653281/Getting%20Started%20with%20PhoneGap-BlackBerry%20with%20the%20Latest%20Environment).
 
 
-2. Install SDK + PhoneGap
--------------------------
+2. Install SDK + Cordova
+------------------------
 
 - (Windows Only) Download and install [SUN JDK](http://www.oracle.com/technetwork/java/javase/downloads/index.html#jdk) (32-Bit Version). Add it to your PATH variable.
 - (Windows Only) Download and extract [Apache Ant](http://ant.apache.org/bindownload.cgi). Add it to your PATH variable.
 - Download [BlackBerry WebWorks Smartphone SDK](ttps://bdsc.webapps.blackberry.com/html5/download/sdk) for BlackBerry development and/or [BlackBerry WebWorks Tablet OS SDK](https://bdsc.webapps.blackberry.com/html5/download/sdk) for Playbook development. Keep note of the directories you install these SDKs.
-- Donwload the latest copy of [PhoneGap](http://phonegap.com/download) and extract its contents. We will be working with the Android directory.
+- Donwload the latest copy of [Cordova](http://phonegap.com/download) and extract its contents. We will be working with the Android directory.
 
 
 3. Setup New Project
 --------------------
 
-- Open up a command prompt/terminal and navigate to where you extracted PhoneGap. CD into the PhoneGapBlackBerry directory.
-- Create a PhoneGap BlackBerry and PlayBook project. Type 'ant create -Dproject.path='followed by the location you wish to create your project into the command prompt/terminal.
+- Open up a command prompt/terminal and navigate to where you extracted Cordova. CD into the Cordova BlackBerry directory.
+- Create a Cordova BlackBerry and PlayBook project. Type 'ant create -Dproject.path='followed by the location you wish to create your project into the command prompt/terminal.
 - Change to the newly created directory located at `C:\Dev\bbw\sample`.
 - Open up the project.properties file with your favourite editor and change the lines `BlackBerry.bbwp.dir=` and `PlayBook.bbwp.dir=` to equal the respective install locations of the SDKs you downloaded earlier.
 
@@ -38,7 +40,7 @@ For 4.x devices check out [this guide](http://wiki.phonegap.com/w/page/25653281/
 4. Hello World
 --------------
 
-Build the PhoneGap sample project by typing `ant target build` in your command prompt/terminal while you are in your project's directory. Replace the target with either blackberry or playbook. Note this is the sample PhoneGap project and not a basic hello world application. You can go edit the index.html file located in the www directory of your project to make it say Hello World if you wish.
+Build the Cordova sample project by typing `ant target build` in your command prompt/terminal while you are in your project's directory. Replace the target with either blackberry or playbook. Note this is the sample Cordova project and not a basic hello world application. You can go edit the index.html file located in the www directory of your project to make it say Hello World if you wish.
 
 
 5A. Deploy to Simulator (Windows Only)

http://git-wip-us.apache.org/repos/asf/incubator-cordova-docs/blob/80e274d3/docs/en/edge/guide/getting-started/ios/index.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/guide/getting-started/ios/index.md b/docs/en/edge/guide/getting-started/ios/index.md
index 32002ac..5768cef 100644
--- a/docs/en/edge/guide/getting-started/ios/index.md
+++ b/docs/en/edge/guide/getting-started/ios/index.md
@@ -1,11 +1,13 @@
 Getting Started with iOS
 ========================
 
+This guide describes how to set up your development environment for Cordova and run a sample application.  Note that Cordova used to be called PhoneGap, so some of the sites still use the old PhoneGap name.
+
 
 Video Tutorials:
 ----------------
 
-- [PhoneGap Installer - Xcode 4 Template](http://www.youtube.com/v/R9zktJUN7AI?autoplay=1)
+- [Cordova Installer - Xcode 4 Template](http://www.youtube.com/v/R9zktJUN7AI?autoplay=1)
 
 
 1. Requirements
@@ -16,11 +18,11 @@ Video Tutorials:
     - iOS developer certification
 
 
-2. Install SDK + PhoneGap
--------------------------
+2. Install SDK + Cordova
+------------------------
 
 - Download and install Xcode from [Apple Developer Portal](http://developer.apple.com) (Membership required)</p>
-- Donwload the latest copy of [PhoneGap](http://phonegap.com/download) and extract its contents. We will be working with the Android directory.
+- Donwload the latest copy of [Cordova](http://phonegap.com/download) and extract its contents. We will be working with the Android directory.
 
 
 3. Setup New Project

http://git-wip-us.apache.org/repos/asf/incubator-cordova-docs/blob/80e274d3/docs/en/edge/index.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/index.md b/docs/en/edge/index.md
index a36b93a..ed23b39 100644
--- a/docs/en/edge/index.md
+++ b/docs/en/edge/index.md
@@ -58,11 +58,11 @@
     <ul>
         <li>
             <h2>Getting Started Guides</h2>
-            <span>Setup each SDK and create your first PhoneGap app.</span>
+            <span>Setup each SDK and create your first Cordova app.</span>
         </li>
         <li>
             <h2><a href="_index.html">Keyword Index</a></h2>
-            <span>Full index of the PhoneGap Documentation.</span>
+            <span>Full index of the Cordova Documentation.</span>
         </li>
     </ul>
 </div>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-cordova-docs/blob/80e274d3/docs/en/edge/phonegap/accelerometer/acceleration/acceleration.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/phonegap/accelerometer/acceleration/acceleration.md b/docs/en/edge/phonegap/accelerometer/acceleration/acceleration.md
index 9aea51b..580e202 100644
--- a/docs/en/edge/phonegap/accelerometer/acceleration/acceleration.md
+++ b/docs/en/edge/phonegap/accelerometer/acceleration/acceleration.md
@@ -14,7 +14,7 @@ Properties
 Description
 -----------
 
-This object is created and populated by PhoneGap, and returned by an `Accelerometer` method.
+This object is created and populated by Cordova, and returned by an `Accelerometer` method.
 
 Supported Platforms
 -------------------
@@ -48,14 +48,14 @@ Full Example
       <head>
         <title>Acceleration Example</title>
 
-        <script type="text/javascript" charset="utf-8" src="phonegap.js"></script>
+        <script type="text/javascript" charset="utf-8" src="cordova-1.6.0.js"></script>
         <script type="text/javascript" charset="utf-8">
 
-        // Wait for PhoneGap to load
+        // Wait for Cordova to load
         //
         document.addEventListener("deviceready", onDeviceReady, false);
 
-        // PhoneGap is ready
+        // Cordova is ready
         //
         function onDeviceReady() {
             navigator.accelerometer.getCurrentAcceleration(onSuccess, onError);

http://git-wip-us.apache.org/repos/asf/incubator-cordova-docs/blob/80e274d3/docs/en/edge/phonegap/accelerometer/accelerometer.clearWatch.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/phonegap/accelerometer/accelerometer.clearWatch.md b/docs/en/edge/phonegap/accelerometer/accelerometer.clearWatch.md
index d5c5c12..9d70da7 100644
--- a/docs/en/edge/phonegap/accelerometer/accelerometer.clearWatch.md
+++ b/docs/en/edge/phonegap/accelerometer/accelerometer.clearWatch.md
@@ -31,17 +31,17 @@ Full Example
       <head>
         <title>Acceleration Example</title>
 
-        <script type="text/javascript" charset="utf-8" src="phonegap.js"></script>
+        <script type="text/javascript" charset="utf-8" src="cordova-1.6.0.js"></script>
         <script type="text/javascript" charset="utf-8">
 
         // The watch id references the current `watchAcceleration`
         var watchID = null;
         
-        // Wait for PhoneGap to load
+        // Wait for Cordova to load
         //
         document.addEventListener("deviceready", onDeviceReady, false);
 
-        // PhoneGap is ready
+        // Cordova is ready
         //
         function onDeviceReady() {
             startWatch();

http://git-wip-us.apache.org/repos/asf/incubator-cordova-docs/blob/80e274d3/docs/en/edge/phonegap/accelerometer/accelerometer.getCurrentAcceleration.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/phonegap/accelerometer/accelerometer.getCurrentAcceleration.md b/docs/en/edge/phonegap/accelerometer/accelerometer.getCurrentAcceleration.md
index 2c2e69d..09ea085 100644
--- a/docs/en/edge/phonegap/accelerometer/accelerometer.getCurrentAcceleration.md
+++ b/docs/en/edge/phonegap/accelerometer/accelerometer.getCurrentAcceleration.md
@@ -43,14 +43,14 @@ Full Example
       <head>
         <title>Acceleration Example</title>
 
-        <script type="text/javascript" charset="utf-8" src="phonegap.js"></script>
+        <script type="text/javascript" charset="utf-8" src="cordova-1.6.0.js"></script>
         <script type="text/javascript" charset="utf-8">
 
-        // Wait for PhoneGap to load
+        // Wait for Cordova to load
         //
         document.addEventListener("deviceready", onDeviceReady, false);
 
-        // PhoneGap is ready
+        // Cordova is ready
         //
         function onDeviceReady() {
             navigator.accelerometer.getCurrentAcceleration(onSuccess, onError);
@@ -84,4 +84,4 @@ iPhone Quirks
 
 - iPhone doesn't have the concept of getting the current acceleration at any given point.
 - You must watch the acceleration and capture the data at given time intervals.
-- Thus, the `getCurrentAcceleration` function will give you the last value reported from a phoneGap `watchAccelerometer` call.
+- Thus, the `getCurrentAcceleration` function will give you the last value reported from a Cordova `watchAccelerometer` call.

http://git-wip-us.apache.org/repos/asf/incubator-cordova-docs/blob/80e274d3/docs/en/edge/phonegap/accelerometer/accelerometer.watchAcceleration.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/phonegap/accelerometer/accelerometer.watchAcceleration.md b/docs/en/edge/phonegap/accelerometer/accelerometer.watchAcceleration.md
index 27fc13a..4bc2484 100644
--- a/docs/en/edge/phonegap/accelerometer/accelerometer.watchAcceleration.md
+++ b/docs/en/edge/phonegap/accelerometer/accelerometer.watchAcceleration.md
@@ -50,17 +50,17 @@ Full Example
       <head>
         <title>Acceleration Example</title>
 
-        <script type="text/javascript" charset="utf-8" src="phonegap.js"></script>
+        <script type="text/javascript" charset="utf-8" src="cordova-1.6.0.js"></script>
         <script type="text/javascript" charset="utf-8">
 
         // The watch id references the current `watchAcceleration`
         var watchID = null;
         
-        // Wait for PhoneGap to load
+        // Wait for Cordova to load
         //
         document.addEventListener("deviceready", onDeviceReady, false);
 
-        // PhoneGap is ready
+        // Cordova is ready
         //
         function onDeviceReady() {
             startWatch();
@@ -111,6 +111,6 @@ Full Example
  iPhone Quirks
 -------------
 
-- At the interval requested, PhoneGap will call the success callback function and pass the accelerometer results.
-- However, in requests to the device PhoneGap restricts the interval to minimum of every 40ms and a maximum of every 1000ms.
-  - For example, if you request an interval of 3 seconds (3000ms), PhoneGap will request an interval of 1 second from the device but invoke the success callback at the requested interval of 3 seconds.
+- At the interval requested, Cordova will call the success callback function and pass the accelerometer results.
+- However, in requests to the device Cordova restricts the interval to minimum of every 40ms and a maximum of every 1000ms.
+  - For example, if you request an interval of 3 seconds (3000ms), Cordova will request an interval of 1 second from the device but invoke the success callback at the requested interval of 3 seconds.

http://git-wip-us.apache.org/repos/asf/incubator-cordova-docs/blob/80e274d3/docs/en/edge/phonegap/camera/camera.getPicture.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/phonegap/camera/camera.getPicture.md b/docs/en/edge/phonegap/camera/camera.getPicture.md
index 268002b..1b13131 100644
--- a/docs/en/edge/phonegap/camera/camera.getPicture.md
+++ b/docs/en/edge/phonegap/camera/camera.getPicture.md
@@ -72,17 +72,17 @@ Full Example
       <head>
         <title>Capture Photo</title>
 
-        <script type="text/javascript" charset="utf-8" src="phonegap.js"></script>
+        <script type="text/javascript" charset="utf-8" src="cordova-1.6.0.js"></script>
         <script type="text/javascript" charset="utf-8">
 
         var pictureSource;   // picture source
         var destinationType; // sets the format of returned value 
         
-        // Wait for PhoneGap to connect with the device
+        // Wait for Cordova to connect with the device
         //
         document.addEventListener("deviceready",onDeviceReady,false);
     
-        // PhoneGap is ready to be used!
+        // Cordova is ready to be used!
         //
         function onDeviceReady() {
             pictureSource=navigator.camera.PictureSourceType;

http://git-wip-us.apache.org/repos/asf/incubator-cordova-docs/blob/80e274d3/docs/en/edge/phonegap/compass/compass.clearWatch.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/phonegap/compass/compass.clearWatch.md b/docs/en/edge/phonegap/compass/compass.clearWatch.md
index c65dc87..4422f88 100755
--- a/docs/en/edge/phonegap/compass/compass.clearWatch.md
+++ b/docs/en/edge/phonegap/compass/compass.clearWatch.md
@@ -31,17 +31,17 @@ Full Example
       <head>
         <title>Compass Example</title>
 
-        <script type="text/javascript" charset="utf-8" src="phonegap.js"></script>
+        <script type="text/javascript" charset="utf-8" src="cordova-1.6.0.js"></script>
         <script type="text/javascript" charset="utf-8">
 
         // The watch id references the current `watchHeading`
         var watchID = null;
         
-        // Wait for PhoneGap to load
+        // Wait for Cordova to load
         //
         document.addEventListener("deviceready", onDeviceReady, false);
 
-        // PhoneGap is ready
+        // Cordova is ready
         //
         function onDeviceReady() {
             startWatch();

http://git-wip-us.apache.org/repos/asf/incubator-cordova-docs/blob/80e274d3/docs/en/edge/phonegap/compass/compass.clearWatchFilter.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/phonegap/compass/compass.clearWatchFilter.md b/docs/en/edge/phonegap/compass/compass.clearWatchFilter.md
index d80502c..44d200f 100644
--- a/docs/en/edge/phonegap/compass/compass.clearWatchFilter.md
+++ b/docs/en/edge/phonegap/compass/compass.clearWatchFilter.md
@@ -29,17 +29,17 @@ Full Example
       <head>
         <title>Compass Example</title>
 
-        <script type="text/javascript" charset="utf-8" src="phonegap.js"></script>
+        <script type="text/javascript" charset="utf-8" src="cordova-1.6.0.js"></script>
         <script type="text/javascript" charset="utf-8">
 
         // The watch id references the current `watchHeading`
         var watchID = null;
         
-        // Wait for PhoneGap to load
+        // Wait for Cordova to load
         //
         document.addEventListener("deviceready", onDeviceReady, false);
 
-        // PhoneGap is ready
+        // Cordova is ready
         //
         function onDeviceReady() {
             startWatch();

http://git-wip-us.apache.org/repos/asf/incubator-cordova-docs/blob/80e274d3/docs/en/edge/phonegap/compass/compass.getCurrentHeading.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/phonegap/compass/compass.getCurrentHeading.md b/docs/en/edge/phonegap/compass/compass.getCurrentHeading.md
index 7fc02e6..940955c 100755
--- a/docs/en/edge/phonegap/compass/compass.getCurrentHeading.md
+++ b/docs/en/edge/phonegap/compass/compass.getCurrentHeading.md
@@ -40,14 +40,14 @@ Full Example
       <head>
         <title>Compass Example</title>
 
-        <script type="text/javascript" charset="utf-8" src="phonegap.js"></script>
+        <script type="text/javascript" charset="utf-8" src="cordova-1.6.0.js"></script>
         <script type="text/javascript" charset="utf-8">
 
-        // Wait for PhoneGap to load
+        // Wait for Cordova to load
         //
         document.addEventListener("deviceready", onDeviceReady, false);
 
-        // PhoneGap is ready
+        // Cordova is ready
         //
         function onDeviceReady() {
             navigator.compass.getCurrentHeading(onSuccess, onError);

http://git-wip-us.apache.org/repos/asf/incubator-cordova-docs/blob/80e274d3/docs/en/edge/phonegap/compass/compass.watchHeading.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/phonegap/compass/compass.watchHeading.md b/docs/en/edge/phonegap/compass/compass.watchHeading.md
index 66d89bf..71c9170 100755
--- a/docs/en/edge/phonegap/compass/compass.watchHeading.md
+++ b/docs/en/edge/phonegap/compass/compass.watchHeading.md
@@ -46,17 +46,17 @@ Full Example
       <head>
         <title>Compass Example</title>
 
-        <script type="text/javascript" charset="utf-8" src="phonegap.js"></script>
+        <script type="text/javascript" charset="utf-8" src="cordova-1.6.0.js"></script>
         <script type="text/javascript" charset="utf-8">
 
         // The watch id references the current `watchHeading`
         var watchID = null;
         
-        // Wait for PhoneGap to load
+        // Wait for Cordova to load
         //
         document.addEventListener("deviceready", onDeviceReady, false);
 
-        // PhoneGap is ready
+        // Cordova is ready
         //
         function onDeviceReady() {
             startWatch();

http://git-wip-us.apache.org/repos/asf/incubator-cordova-docs/blob/80e274d3/docs/en/edge/phonegap/compass/compass.watchHeadingFilter.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/phonegap/compass/compass.watchHeadingFilter.md b/docs/en/edge/phonegap/compass/compass.watchHeadingFilter.md
index 28f8394..2333d8f 100644
--- a/docs/en/edge/phonegap/compass/compass.watchHeadingFilter.md
+++ b/docs/en/edge/phonegap/compass/compass.watchHeadingFilter.md
@@ -44,17 +44,17 @@ Full Example
       <head>
         <title>Compass Example</title>
 
-        <script type="text/javascript" charset="utf-8" src="phonegap.js"></script>
+        <script type="text/javascript" charset="utf-8" src="cordova-1.6.0.js"></script>
         <script type="text/javascript" charset="utf-8">
 
         // The watch id references the current `watchHeading`
         var watchID = null;
         
-        // Wait for PhoneGap to load
+        // Wait for Cordova to load
         //
         document.addEventListener("deviceready", onDeviceReady, false);
 
-        // PhoneGap is ready
+        // Cordova is ready
         //
         function onDeviceReady() {
             startWatch();

http://git-wip-us.apache.org/repos/asf/incubator-cordova-docs/blob/80e274d3/docs/en/edge/phonegap/connection/connection.type.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/phonegap/connection/connection.type.md b/docs/en/edge/phonegap/connection/connection.type.md
index d934050..6155894 100644
--- a/docs/en/edge/phonegap/connection/connection.type.md
+++ b/docs/en/edge/phonegap/connection/connection.type.md
@@ -46,14 +46,14 @@ Full Example
       <head>
         <title>navigator.network.connection.type Example</title>
         
-        <script type="text/javascript" charset="utf-8" src="phonegap.js"></script>
+        <script type="text/javascript" charset="utf-8" src="cordova-1.6.0.js"></script>
         <script type="text/javascript" charset="utf-8">
             
-        // Wait for PhoneGap to load
+        // Wait for Cordova to load
         // 
         document.addEventListener("deviceready", onDeviceReady, false);
         
-        // PhoneGap is loaded and it is now safe to make calls PhoneGap methods
+        // Cordova is loaded and it is now safe to make calls Cordova methods
         //
         function onDeviceReady() {
             checkConnection();

http://git-wip-us.apache.org/repos/asf/incubator-cordova-docs/blob/80e274d3/docs/en/edge/phonegap/contacts/Contact/contact.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/phonegap/contacts/Contact/contact.md b/docs/en/edge/phonegap/contacts/Contact/contact.md
index 52f2e93..6657841 100644
--- a/docs/en/edge/phonegap/contacts/Contact/contact.md
+++ b/docs/en/edge/phonegap/contacts/Contact/contact.md
@@ -99,14 +99,14 @@ Full Example
       <head>
         <title>Contact Example</title>
 
-        <script type="text/javascript" charset="utf-8" src="phonegap.js"></script>
+        <script type="text/javascript" charset="utf-8" src="cordova-1.6.0.js"></script>
         <script type="text/javascript" charset="utf-8">
 
-        // Wait for PhoneGap to load
+        // Wait for Cordova to load
         //
         document.addEventListener("deviceready", onDeviceReady, false);
 
-        // PhoneGap is ready
+        // Cordova is ready
         //
         function onDeviceReady() {
 		    // create

http://git-wip-us.apache.org/repos/asf/incubator-cordova-docs/blob/80e274d3/docs/en/edge/phonegap/contacts/ContactAddress/contactaddress.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/phonegap/contacts/ContactAddress/contactaddress.md b/docs/en/edge/phonegap/contacts/ContactAddress/contactaddress.md
index c84c15a..abc948f 100644
--- a/docs/en/edge/phonegap/contacts/ContactAddress/contactaddress.md
+++ b/docs/en/edge/phonegap/contacts/ContactAddress/contactaddress.md
@@ -63,14 +63,14 @@ Full Example
       <head>
         <title>Contact Example</title>
 
-        <script type="text/javascript" charset="utf-8" src="phonegap.js"></script>
+        <script type="text/javascript" charset="utf-8" src="cordova-1.6.0.js"></script>
         <script type="text/javascript" charset="utf-8">
 
-        // Wait for PhoneGap to load
+        // Wait for Cordova to load
         //
         document.addEventListener("deviceready", onDeviceReady, false);
 
-        // PhoneGap is ready
+        // Cordova is ready
         //
         function onDeviceReady() {
 		    // find all contacts

http://git-wip-us.apache.org/repos/asf/incubator-cordova-docs/blob/80e274d3/docs/en/edge/phonegap/contacts/ContactField/contactfield.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/phonegap/contacts/ContactField/contactfield.md b/docs/en/edge/phonegap/contacts/ContactField/contactfield.md
index 8eb0a8b..09b680c 100644
--- a/docs/en/edge/phonegap/contacts/ContactField/contactfield.md
+++ b/docs/en/edge/phonegap/contacts/ContactField/contactfield.md
@@ -15,7 +15,7 @@ Details
 
 The `ContactField` object is a reusable component that is used to support contact fields in a generic fashion.  Each `ContactField` object contains a value property, a type property, and a pref property.  A `Contact` object stores several properties in `ContactField[]` arrays, such as phone numbers and email addresses.
 
-In most instances, there are no pre-determined values for the __type__ attribute of a `ContactField` object.  For example, a phone number can have __type__ values of 'home', 'work', 'mobile', 'iPhone', or any other value that is supported by the contact database on a particular device platform.  However, in the case of the `Contact` __photos__ field, PhoneGap makes use of the __type__ field to indicate the format of the returned image.  PhoneGap will return __type: 'url'__ when the __value__ attribute contains a URL to the photo image, or __type: 'base64'__ when the returned __value__ attribute contains a Base64 encoded image string.
+In most instances, there are no pre-determined values for the __type__ attribute of a `ContactField` object.  For example, a phone number can have __type__ values of 'home', 'work', 'mobile', 'iPhone', or any other value that is supported by the contact database on a particular device platform.  However, in the case of the `Contact` __photos__ field, Cordova makes use of the __type__ field to indicate the format of the returned image.  Cordova will return __type: 'url'__ when the __value__ attribute contains a URL to the photo image, or __type: 'base64'__ when the returned __value__ attribute contains a Base64 encoded image string.
 
 Supported Platforms
 -------------------
@@ -48,14 +48,14 @@ Full Example
       <head>
         <title>Contact Example</title>
 
-        <script type="text/javascript" charset="utf-8" src="phonegap.js"></script>
+        <script type="text/javascript" charset="utf-8" src="cordova-1.6.0.js"></script>
         <script type="text/javascript" charset="utf-8">
 
-        // Wait for PhoneGap to load
+        // Wait for Cordova to load
         //
         document.addEventListener("deviceready", onDeviceReady, false);
 
-        // PhoneGap is ready
+        // Cordova is ready
         //
         function onDeviceReady() {
 			// create a new contact

http://git-wip-us.apache.org/repos/asf/incubator-cordova-docs/blob/80e274d3/docs/en/edge/phonegap/contacts/ContactFindOptions/contactfindoptions.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/phonegap/contacts/ContactFindOptions/contactfindoptions.md b/docs/en/edge/phonegap/contacts/ContactFindOptions/contactfindoptions.md
index 586ba67..984ee34 100644
--- a/docs/en/edge/phonegap/contacts/ContactFindOptions/contactfindoptions.md
+++ b/docs/en/edge/phonegap/contacts/ContactFindOptions/contactfindoptions.md
@@ -49,14 +49,14 @@ Full Example
       <head>
         <title>Contact Example</title>
 
-        <script type="text/javascript" charset="utf-8" src="phonegap.js"></script>
+        <script type="text/javascript" charset="utf-8" src="cordova-1.6.0.js"></script>
         <script type="text/javascript" charset="utf-8">
 
-        // Wait for PhoneGap to load
+        // Wait for Cordova to load
         //
         document.addEventListener("deviceready", onDeviceReady, false);
 
-        // PhoneGap is ready
+        // Cordova is ready
         //
         function onDeviceReady() {
 			// specify contact search criteria

http://git-wip-us.apache.org/repos/asf/incubator-cordova-docs/blob/80e274d3/docs/en/edge/phonegap/contacts/ContactName/contactname.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/phonegap/contacts/ContactName/contactname.md b/docs/en/edge/phonegap/contacts/ContactName/contactname.md
index 6399d3d..1e1b997 100644
--- a/docs/en/edge/phonegap/contacts/ContactName/contactname.md
+++ b/docs/en/edge/phonegap/contacts/ContactName/contactname.md
@@ -56,14 +56,14 @@ Full Example
       <head>
         <title>Contact Example</title>
 
-        <script type="text/javascript" charset="utf-8" src="phonegap.js"></script>
+        <script type="text/javascript" charset="utf-8" src="cordova-1.6.0.js"></script>
         <script type="text/javascript" charset="utf-8">
 
-        // Wait for PhoneGap to load
+        // Wait for Cordova to load
         //
         document.addEventListener("deviceready", onDeviceReady, false);
 
-        // PhoneGap is ready
+        // Cordova is ready
         //
         function onDeviceReady() {
 			var options = new ContactFindOptions();

http://git-wip-us.apache.org/repos/asf/incubator-cordova-docs/blob/80e274d3/docs/en/edge/phonegap/contacts/ContactOrganization/contactorganization.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/phonegap/contacts/ContactOrganization/contactorganization.md b/docs/en/edge/phonegap/contacts/ContactOrganization/contactorganization.md
index 9f64f09..b06ef12 100644
--- a/docs/en/edge/phonegap/contacts/ContactOrganization/contactorganization.md
+++ b/docs/en/edge/phonegap/contacts/ContactOrganization/contactorganization.md
@@ -55,14 +55,14 @@ Full Example
       <head>
         <title>Contact Example</title>
 
-        <script type="text/javascript" charset="utf-8" src="phonegap.js"></script>
+        <script type="text/javascript" charset="utf-8" src="cordova-1.6.0.js"></script>
         <script type="text/javascript" charset="utf-8">
 
-        // Wait for PhoneGap to load
+        // Wait for Cordova to load
         //
         document.addEventListener("deviceready", onDeviceReady, false);
 
-        // PhoneGap is ready
+        // Cordova is ready
         //
         function onDeviceReady() {
 			var options = new ContactFindOptions();

http://git-wip-us.apache.org/repos/asf/incubator-cordova-docs/blob/80e274d3/docs/en/edge/phonegap/contacts/contacts.create.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/phonegap/contacts/contacts.create.md b/docs/en/edge/phonegap/contacts/contacts.create.md
index c9634f6..ccb9881 100644
--- a/docs/en/edge/phonegap/contacts/contacts.create.md
+++ b/docs/en/edge/phonegap/contacts/contacts.create.md
@@ -32,14 +32,14 @@ Full Example
       <head>
         <title>Contact Example</title>
 
-        <script type="text/javascript" charset="utf-8" src="phonegap.js"></script>
+        <script type="text/javascript" charset="utf-8" src="cordova-1.6.0.js"></script>
         <script type="text/javascript" charset="utf-8">
 
-        // Wait for PhoneGap to load
+        // Wait for Cordova to load
         //
         document.addEventListener("deviceready", onDeviceReady, false);
 
-        // PhoneGap is ready
+        // Cordova is ready
         //
         function onDeviceReady() {
 			var myContact = navigator.contacts.create({"displayName": "Test User"});

http://git-wip-us.apache.org/repos/asf/incubator-cordova-docs/blob/80e274d3/docs/en/edge/phonegap/contacts/contacts.find.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/phonegap/contacts/contacts.find.md b/docs/en/edge/phonegap/contacts/contacts.find.md
index e50cef3..2d2b8f2 100644
--- a/docs/en/edge/phonegap/contacts/contacts.find.md
+++ b/docs/en/edge/phonegap/contacts/contacts.find.md
@@ -54,14 +54,14 @@ Full Example
       <head>
         <title>Contact Example</title>
 
-        <script type="text/javascript" charset="utf-8" src="phonegap.js"></script>
+        <script type="text/javascript" charset="utf-8" src="cordova-1.6.0.js"></script>
         <script type="text/javascript" charset="utf-8">
 
-        // Wait for PhoneGap to load
+        // Wait for Cordova to load
         //
         document.addEventListener("deviceready", onDeviceReady, false);
 
-        // PhoneGap is ready
+        // Cordova is ready
         //
         function onDeviceReady() {
 		    // find all contacts with 'Bob' in any name field

http://git-wip-us.apache.org/repos/asf/incubator-cordova-docs/blob/80e274d3/docs/en/edge/phonegap/device/device.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/phonegap/device/device.md b/docs/en/edge/phonegap/device/device.md
index 925f7e7..2e88997 100644
--- a/docs/en/edge/phonegap/device/device.md
+++ b/docs/en/edge/phonegap/device/device.md
@@ -7,7 +7,7 @@ Properties
 ----------
 
 - device.name
-- device.phonegap
+- device.cordova
 - device.platform
 - device.uuid
 - device.version

http://git-wip-us.apache.org/repos/asf/incubator-cordova-docs/blob/80e274d3/docs/en/edge/phonegap/device/device.name.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/phonegap/device/device.name.md b/docs/en/edge/phonegap/device/device.name.md
index 1fad923..b2f1875 100644
--- a/docs/en/edge/phonegap/device/device.name.md
+++ b/docs/en/edge/phonegap/device/device.name.md
@@ -37,20 +37,20 @@ Full Example
       <head>
         <title>Device Properties Example</title>
 
-        <script type="text/javascript" charset="utf-8" src="phonegap.js"></script>
+        <script type="text/javascript" charset="utf-8" src="cordova-1.6.0.js"></script>
         <script type="text/javascript" charset="utf-8">
 
-        // Wait for PhoneGap to load
+        // Wait for Cordova to load
         //
         document.addEventListener("deviceready", onDeviceReady, false);
 
-        // PhoneGap is ready
+        // Cordova is ready
         //
         function onDeviceReady() {
             var element = document.getElementById('deviceProperties');
     
             element.innerHTML = 'Device Name: '     + device.name     + '<br />' + 
-                                'Device PhoneGap: ' + device.phonegap + '<br />' + 
+                                'Device Cordova: '  + device.cordova + '<br />' + 
                                 'Device Platform: ' + device.platform + '<br />' + 
                                 'Device UUID: '     + device.uuid     + '<br />' + 
                                 'Device Version: '  + device.version  + '<br />';

http://git-wip-us.apache.org/repos/asf/incubator-cordova-docs/blob/80e274d3/docs/en/edge/phonegap/device/device.phonegap.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/phonegap/device/device.phonegap.md b/docs/en/edge/phonegap/device/device.phonegap.md
index 80da863..1ad7eea 100644
--- a/docs/en/edge/phonegap/device/device.phonegap.md
+++ b/docs/en/edge/phonegap/device/device.phonegap.md
@@ -1,14 +1,14 @@
-device.phonegap
+device.cordova
 ===============
 
-Get the version of phonegap running on the device.
+Get the version of Cordova running on the device.
 
-    var string = device.phonegap;
+    var string = device.cordova;
     
 Description
 -----------
 
-`device.phonegap` returns the version of phonegap running on the device.
+`device.cordova` returns the version of Cordova running on the device.
 
 Supported Platforms
 -------------------
@@ -22,7 +22,7 @@ Supported Platforms
 Quick Example
 -------------
 
-    var name = device.phonegap;
+    var name = device.cordova;
 
 Full Example
 ------------
@@ -32,20 +32,20 @@ Full Example
       <head>
         <title>Device Properties Example</title>
 
-        <script type="text/javascript" charset="utf-8" src="phonegap.js"></script>
+        <script type="text/javascript" charset="utf-8" src="cordova-1.6.0.js"></script>
         <script type="text/javascript" charset="utf-8">
 
-        // Wait for PhoneGap to load
+        // Wait for Cordova to load
         //
         document.addEventListener("deviceready", onDeviceReady, false);
 
-        // PhoneGap is ready
+        // Cordova is ready
         //
         function onDeviceReady() {
             var element = document.getElementById('deviceProperties');
     
             element.innerHTML = 'Device Name: '     + device.name     + '<br />' + 
-                                'Device PhoneGap: ' + device.phonegap + '<br />' + 
+                                'Device Cordova: '  + device.cordova  + '<br />' + 
                                 'Device Platform: ' + device.platform + '<br />' + 
                                 'Device UUID: '     + device.uuid     + '<br />' + 
                                 'Device Version: '  + device.version  + '<br />';

http://git-wip-us.apache.org/repos/asf/incubator-cordova-docs/blob/80e274d3/docs/en/edge/phonegap/device/device.platform.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/phonegap/device/device.platform.md b/docs/en/edge/phonegap/device/device.platform.md
index ba38f86..959970b 100644
--- a/docs/en/edge/phonegap/device/device.platform.md
+++ b/docs/en/edge/phonegap/device/device.platform.md
@@ -33,20 +33,20 @@ Full Example
       <head>
         <title>Device Properties Example</title>
 
-        <script type="text/javascript" charset="utf-8" src="phonegap.js"></script>
+        <script type="text/javascript" charset="utf-8" src="cordova-1.6.0.js"></script>
         <script type="text/javascript" charset="utf-8">
 
-        // Wait for PhoneGap to load
+        // Wait for Cordova to load
         //
         document.addEventListener("deviceready", onDeviceReady, false);
 
-        // PhoneGap is ready
+        // Cordova is ready
         //
         function onDeviceReady() {
             var element = document.getElementById('deviceProperties');
     
             element.innerHTML = 'Device Name: '     + device.name     + '<br />' + 
-                                'Device PhoneGap: ' + device.phonegap + '<br />' + 
+                                'Device Cordova: '  + device.cordova  + '<br />' + 
                                 'Device Platform: ' + device.platform + '<br />' + 
                                 'Device UUID: '     + device.uuid     + '<br />' + 
                                 'Device Version: '  + device.version  + '<br />';

http://git-wip-us.apache.org/repos/asf/incubator-cordova-docs/blob/80e274d3/docs/en/edge/phonegap/device/device.uuid.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/phonegap/device/device.uuid.md b/docs/en/edge/phonegap/device/device.uuid.md
index 7082d93..a20d1db 100644
--- a/docs/en/edge/phonegap/device/device.uuid.md
+++ b/docs/en/edge/phonegap/device/device.uuid.md
@@ -45,20 +45,20 @@ Full Example
       <head>
         <title>Device Properties Example</title>
 
-        <script type="text/javascript" charset="utf-8" src="phonegap.js"></script>
+        <script type="text/javascript" charset="utf-8" src="cordova-1.6.0.js"></script>
         <script type="text/javascript" charset="utf-8">
 
-        // Wait for PhoneGap to load
+        // Wait for Cordova to load
         //
         document.addEventListener("deviceready", onDeviceReady, false);
 
-        // PhoneGap is ready
+        // Cordova is ready
         //
         function onDeviceReady() {
             var element = document.getElementById('deviceProperties');
     
             element.innerHTML = 'Device Name: '     + device.name     + '<br />' + 
-                                'Device PhoneGap: ' + device.phonegap + '<br />' + 
+                                'Device Cordova: '  + device.cordova  + '<br />' + 
                                 'Device Platform: ' + device.platform + '<br />' + 
                                 'Device UUID: '     + device.uuid     + '<br />' + 
                                 'Device Version: '  + device.version  + '<br />';

http://git-wip-us.apache.org/repos/asf/incubator-cordova-docs/blob/80e274d3/docs/en/edge/phonegap/device/device.version.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/phonegap/device/device.version.md b/docs/en/edge/phonegap/device/device.version.md
index cf41777..de8cc2f 100644
--- a/docs/en/edge/phonegap/device/device.version.md
+++ b/docs/en/edge/phonegap/device/device.version.md
@@ -36,20 +36,20 @@ Full Example
       <head>
         <title>Device Properties Example</title>
 
-        <script type="text/javascript" charset="utf-8" src="phonegap.js"></script>
+        <script type="text/javascript" charset="utf-8" src="cordova-1.6.0.js"></script>
         <script type="text/javascript" charset="utf-8">
 
-        // Wait for PhoneGap to load
+        // Wait for Cordova to load
         //
         document.addEventListener("deviceready", onDeviceReady, false);
 
-        // PhoneGap is ready
+        // Cordova is ready
         //
         function onDeviceReady() {
             var element = document.getElementById('deviceProperties');
         
             element.innerHTML = 'Device Name: '     + device.name     + '<br />' + 
-                                'Device PhoneGap: ' + device.phonegap + '<br />' + 
+                                'Device Cordova: '  + device.cordova  + '<br />' + 
                                 'Device Platform: ' + device.platform + '<br />' + 
                                 'Device UUID: '     + device.uuid     + '<br />' + 
                                 'Device Version: '  + device.version  + '<br />';

http://git-wip-us.apache.org/repos/asf/incubator-cordova-docs/blob/80e274d3/docs/en/edge/phonegap/events/events.backbutton.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/phonegap/events/events.backbutton.md b/docs/en/edge/phonegap/events/events.backbutton.md
index 3949a7e..845b3f3 100644
--- a/docs/en/edge/phonegap/events/events.backbutton.md
+++ b/docs/en/edge/phonegap/events/events.backbutton.md
@@ -10,7 +10,7 @@ Details
 
 If you need to override the default back button behaviour you can register an event listener for the 'backbutton' event.  It is no longer necessary to call any other method to over ride the back button behaviour.  Now, you only need to register an event listener for 'backbutton'.
 
-Typically, you will want to attach an event listener with `document.addEventListener` once you receive the PhoneGap 'deviceready' event.
+Typically, you will want to attach an event listener with `document.addEventListener` once you receive the Cordova 'deviceready' event.
 
 Supported Platforms
 -------------------
@@ -33,22 +33,22 @@ Full Example
     <!DOCTYPE html>
     <html>
       <head>
-        <title>PhoneGap Back Button Example</title>
+        <title>Cordova Back Button Example</title>
 
-        <script type="text/javascript" charset="utf-8" src="phonegap.js"></script>
+        <script type="text/javascript" charset="utf-8" src="cordova-1.6.0.js"></script>
         <script type="text/javascript" charset="utf-8">
 
-        // Call onDeviceReady when PhoneGap is loaded.
+        // Call onDeviceReady when Cordova is loaded.
         //
-        // At this point, the document has loaded but phonegap.js has not.
-        // When PhoneGap is loaded and talking with the native device,
+        // At this point, the document has loaded but cordova-1.6.0.js has not.
+        // When Cordova is loaded and talking with the native device,
         // it will call the event `deviceready`.
         //
         function onLoad() {
             document.addEventListener("deviceready", onDeviceReady, false);
         }
 
-        // PhoneGap is loaded and it is now safe to call PhoneGap methods
+        // Cordova is loaded and it is now safe to call Cordova methods
         //
         function onDeviceReady() {
             // Register the event listener

http://git-wip-us.apache.org/repos/asf/incubator-cordova-docs/blob/80e274d3/docs/en/edge/phonegap/events/events.batterycritical.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/phonegap/events/events.batterycritical.md b/docs/en/edge/phonegap/events/events.batterycritical.md
index e169a99..1054ed5 100644
--- a/docs/en/edge/phonegap/events/events.batterycritical.md
+++ b/docs/en/edge/phonegap/events/events.batterycritical.md
@@ -1,21 +1,21 @@
 batterycritical
 ===========
 
-This is an event that fires when a PhoneGap application detects the battery has reached the critical level threshold.
+This is an event that fires when a Cordova application detects the battery has reached the critical level threshold.
 
     window.addEventListener("batterycritical", yourCallbackFunction, false);
 
 Details
 -------
 
-This event that fires when a PhoneGap application detects the percentage of battery has reached the critical battery threshold. This value is device specific.
+This event that fires when a Cordova application detects the percentage of battery has reached the critical battery threshold. This value is device specific.
 
 The batterycritical handler will be called with an object that contains two properties:
 
 - __level:__ The percentage of battery (0-100). _(Number)_
 - __isPlugged:__ A boolean that represents whether or not the device is plugged in or not. _(Boolean)_
 
-Typically, you will want to attach an event listener with `window.addEventListener` once you receive the PhoneGap 'deviceready' event.
+Typically, you will want to attach an event listener with `window.addEventListener` once you receive the Cordova 'deviceready' event.
 
 Supported Platforms
 -------------------
@@ -40,22 +40,22 @@ Full Example
     <!DOCTYPE html>
     <html>
       <head>
-        <title>PhoneGap Device Ready Example</title>
+        <title>Cordova Device Ready Example</title>
 
-        <script type="text/javascript" charset="utf-8" src="phonegap.js"></script>
+        <script type="text/javascript" charset="utf-8" src="cordova-1.6.0.js"></script>
         <script type="text/javascript" charset="utf-8">
 
-        // Call onDeviceReady when PhoneGap is loaded.
+        // Call onDeviceReady when Cordova is loaded.
         //
-        // At this point, the document has loaded but phonegap.js has not.
-        // When PhoneGap is loaded and talking with the native device,
+        // At this point, the document has loaded but cordova-1.6.0.js has not.
+        // When Cordova is loaded and talking with the native device,
         // it will call the event `deviceready`.
         // 
 	    function onLoad() {
     	    document.addEventListener("deviceready", onDeviceReady, false);
     	}
 
-        // PhoneGap is loaded and it is now safe to make calls PhoneGap methods
+        // Cordova is loaded and it is now safe to make calls Cordova methods
         //
         function onDeviceReady() {
 		    window.addEventListener("batterycritical", onBatteryCritical, false);

http://git-wip-us.apache.org/repos/asf/incubator-cordova-docs/blob/80e274d3/docs/en/edge/phonegap/events/events.batterylow.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/phonegap/events/events.batterylow.md b/docs/en/edge/phonegap/events/events.batterylow.md
index e051be4..97de8c8 100644
--- a/docs/en/edge/phonegap/events/events.batterylow.md
+++ b/docs/en/edge/phonegap/events/events.batterylow.md
@@ -1,21 +1,21 @@
 batterylow
 ===========
 
-This is an event that fires when a PhoneGap application detects the battery has reached the low level threshold.
+This is an event that fires when a Cordova application detects the battery has reached the low level threshold.
 
     window.addEventListener("batterylow", yourCallbackFunction, false);
 
 Details
 -------
 
-This event that fires when a PhoneGap application detects the percentage of battery has reached the low battery threshold. This value is device specific.
+This event that fires when a Cordova application detects the percentage of battery has reached the low battery threshold. This value is device specific.
 
 The batterylow handler will be called with an object that contains two properties:
 
 - __level:__ The percentage of battery (0-100). _(Number)_
 - __isPlugged:__ A boolean that represents whether or not the device is plugged in or not. _(Boolean)_
 
-Typically, you will want to attach an event listener with `document.addEventListener` once you receive the PhoneGap 'deviceready' event.
+Typically, you will want to attach an event listener with `document.addEventListener` once you receive the Cordova 'deviceready' event.
 
 Supported Platforms
 -------------------
@@ -40,22 +40,22 @@ Full Example
     <!DOCTYPE html>
     <html>
       <head>
-        <title>PhoneGap Device Ready Example</title>
+        <title>Cordova Device Ready Example</title>
 
-        <script type="text/javascript" charset="utf-8" src="phonegap.js"></script>
+        <script type="text/javascript" charset="utf-8" src="cordova-1.6.0.js"></script>
         <script type="text/javascript" charset="utf-8">
 
-        // Call onDeviceReady when PhoneGap is loaded.
+        // Call onDeviceReady when Cordova is loaded.
         //
-        // At this point, the document has loaded but phonegap.js has not.
-        // When PhoneGap is loaded and talking with the native device,
+        // At this point, the document has loaded but cordova-1.6.0.js has not.
+        // When Cordova is loaded and talking with the native device,
         // it will call the event `deviceready`.
         // 
 	    function onLoad() {
     	    document.addEventListener("deviceready", onDeviceReady, false);
     	}
 
-        // PhoneGap is loaded and it is now safe to make calls PhoneGap methods
+        // Cordova is loaded and it is now safe to make calls Cordova methods
         //
         function onDeviceReady() {
 		    window.addEventListener("batterylow", onBatteryLow, false);

http://git-wip-us.apache.org/repos/asf/incubator-cordova-docs/blob/80e274d3/docs/en/edge/phonegap/events/events.batterystatus.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/phonegap/events/events.batterystatus.md b/docs/en/edge/phonegap/events/events.batterystatus.md
index 1fa5dc0..e7dcdae 100644
--- a/docs/en/edge/phonegap/events/events.batterystatus.md
+++ b/docs/en/edge/phonegap/events/events.batterystatus.md
@@ -1,21 +1,21 @@
 batterystatus
 ===========
 
-This is an event that fires when a PhoneGap application detects a change in the battery status.
+This is an event that fires when a Cordova application detects a change in the battery status.
 
     window.addEventListener("batterystatus", yourCallbackFunction, false);
 
 Details
 -------
 
-This event that fires when a PhoneGap application detects the percentage of battery has changed by at least 1 percent. It is also fired if the device has been plugged in or un-plugged.
+This event that fires when a Cordova application detects the percentage of battery has changed by at least 1 percent. It is also fired if the device has been plugged in or un-plugged.
 
 The battery status handler will be called with an object that contains two properties:
 
 - __level:__ The percentage of battery (0-100). _(Number)_
 - __isPlugged:__ A boolean that represents whether or not the device is plugged in or not. _(Boolean)_
 
-Typically, you will want to attach an event listener with `window.addEventListener` once you receive the PhoneGap 'deviceready' event.
+Typically, you will want to attach an event listener with `window.addEventListener` once you receive the Cordova 'deviceready' event.
 
 Supported Platforms
 -------------------
@@ -40,22 +40,22 @@ Full Example
     <!DOCTYPE html>
     <html>
       <head>
-        <title>PhoneGap Device Ready Example</title>
+        <title>Cordova Device Ready Example</title>
 
-        <script type="text/javascript" charset="utf-8" src="phonegap.js"></script>
+        <script type="text/javascript" charset="utf-8" src="cordova-1.6.0.js"></script>
         <script type="text/javascript" charset="utf-8">
 
-        // Call onDeviceReady when PhoneGap is loaded.
+        // Call onDeviceReady when Cordova is loaded.
         //
-        // At this point, the document has loaded but phonegap.js has not.
-        // When PhoneGap is loaded and talking with the native device,
+        // At this point, the document has loaded but cordova-1.6.0.js has not.
+        // When Cordova is loaded and talking with the native device,
         // it will call the event `deviceready`.
         // 
 	    function onLoad() {
     	    document.addEventListener("deviceready", onDeviceReady, false);
     	}
 
-        // PhoneGap is loaded and it is now safe to make calls PhoneGap methods
+        // Cordova is loaded and it is now safe to make calls Cordova methods
         //
         function onDeviceReady() {
 		    window.addEventListener("batterystatus", onBatteryStatus, false);

http://git-wip-us.apache.org/repos/asf/incubator-cordova-docs/blob/80e274d3/docs/en/edge/phonegap/events/events.deviceready.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/phonegap/events/events.deviceready.md b/docs/en/edge/phonegap/events/events.deviceready.md
index 743e305..b9bcbae 100644
--- a/docs/en/edge/phonegap/events/events.deviceready.md
+++ b/docs/en/edge/phonegap/events/events.deviceready.md
@@ -1,18 +1,18 @@
 deviceready
 ===========
 
-This is an event that fires when PhoneGap is fully loaded.
+This is an event that fires when Cordova is fully loaded.
 
     document.addEventListener("deviceready", yourCallbackFunction, false);
 
 Details
 -------
 
-This is a very important event that every PhoneGap application should use.
+This is a very important event that every Cordova application should use.
 
-PhoneGap consists of two code bases: native and JavaScript. While the native code is loading, a custom loading image is displayed. However, JavaScript is only loaded once the DOM loads. This means your web application could, potentially, call a PhoneGap JavaScript function before it is loaded.
+Cordova consists of two code bases: native and JavaScript. While the native code is loading, a custom loading image is displayed. However, JavaScript is only loaded once the DOM loads. This means your web application could, potentially, call a Cordova JavaScript function before it is loaded.
 
-The PhoneGap `deviceready` event fires once PhoneGap has fully loaded. After the device has fired, you can safely make calls to PhoneGap function.
+The Cordova `deviceready` event fires once Cordova has fully loaded. After the device has fired, you can safely make calls to Cordova function.
 
 Typically, you will want to attach an event listener with `document.addEventListener` once the HTML document's DOM has loaded.
 
@@ -29,7 +29,7 @@ Quick Example
     document.addEventListener("deviceready", onDeviceReady, false);
 
     function onDeviceReady() {
-        // Now safe to use the PhoneGap API
+        // Now safe to use the Cordova API
     }
 
 Full Example
@@ -38,25 +38,25 @@ Full Example
     <!DOCTYPE html>
     <html>
       <head>
-        <title>PhoneGap Device Ready Example</title>
+        <title>Cordova Device Ready Example</title>
 
-        <script type="text/javascript" charset="utf-8" src="phonegap.js"></script>
+        <script type="text/javascript" charset="utf-8" src="cordova-1.6.0.js"></script>
         <script type="text/javascript" charset="utf-8">
 
-        // Call onDeviceReady when PhoneGap is loaded.
+        // Call onDeviceReady when Cordova is loaded.
         //
-        // At this point, the document has loaded but phonegap.js has not.
-        // When PhoneGap is loaded and talking with the native device,
+        // At this point, the document has loaded but cordova-1.6.0.js has not.
+        // When Cordova is loaded and talking with the native device,
         // it will call the event `deviceready`.
         //
         function onLoad() {
             document.addEventListener("deviceready", onDeviceReady, false);
         }
 
-        // PhoneGap is loaded and it is now safe to make calls PhoneGap methods
+        // Cordova is loaded and it is now safe to make calls Cordova methods
         //
         function onDeviceReady() {
-            // Now safe to use the PhoneGap API
+            // Now safe to use the Cordova API
         }
 
         </script>
@@ -70,15 +70,15 @@ BlackBerry (OS 4.6) Quirks
 
 Custom events are not supported in the RIM BrowserField (web browser view), so the `deviceready` event will never fire.
 
-A workaround is to manually query `PhoneGap.available` until PhoneGap has fully loaded.
+A workaround is to manually query `cordova.available` until Cordova has fully loaded.
 
     function onLoad() {
         // BlackBerry OS 4 browser does not support events.
-        // So, manually wait until PhoneGap is available.
+        // So, manually wait until Cordova is available.
         //
         var intervalID = window.setInterval(
           function() {
-              if (PhoneGap.available) {
+              if (cordova.available) {
                   window.clearInterval(intervalID);
                   onDeviceReady();
               }
@@ -88,5 +88,5 @@ A workaround is to manually query `PhoneGap.available` until PhoneGap has fully
     }
 
     function onDeviceReady() {
-        // Now safe to use the PhoneGap API
+        // Now safe to use the Cordova API
     }

http://git-wip-us.apache.org/repos/asf/incubator-cordova-docs/blob/80e274d3/docs/en/edge/phonegap/events/events.endcallbutton.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/phonegap/events/events.endcallbutton.md b/docs/en/edge/phonegap/events/events.endcallbutton.md
index 48db299..bf8bef8 100644
--- a/docs/en/edge/phonegap/events/events.endcallbutton.md
+++ b/docs/en/edge/phonegap/events/events.endcallbutton.md
@@ -10,7 +10,7 @@ Details
 
 If you need to override the default end call behaviour you can register an event listener for the 'endcallbutton' event.
 
-Typically, you will want to attach an event listener with `document.addEventListener` once you receive the PhoneGap 'deviceready' event.
+Typically, you will want to attach an event listener with `document.addEventListener` once you receive the Cordova 'deviceready' event.
 
 Supported Platforms
 -------------------
@@ -33,22 +33,22 @@ Full Example
                           "http://www.w3.org/TR/html4/strict.dtd">
     <html>
       <head>
-        <title>PhoneGap End Call Button Example</title>
+        <title>Cordova End Call Button Example</title>
 
-        <script type="text/javascript" charset="utf-8" src="phonegap.js"></script>
+        <script type="text/javascript" charset="utf-8" src="cordova-1.6.0.js"></script>
         <script type="text/javascript" charset="utf-8">
 
-        // Call onDeviceReady when PhoneGap is loaded.
+        // Call onDeviceReady when Cordova is loaded.
         //
-        // At this point, the document has loaded but phonegap.js has not.
-        // When PhoneGap is loaded and talking with the native device,
+        // At this point, the document has loaded but cordova-1.6.0.js has not.
+        // When Cordova is loaded and talking with the native device,
         // it will call the event `deviceready`.
         //
         function onLoad() {
             document.addEventListener("deviceready", onDeviceReady, false);
         }
 
-        // PhoneGap is loaded and it is now safe to make calls PhoneGap methods
+        // Cordova is loaded and it is now safe to make calls Cordova methods
         //
         function onDeviceReady() {
             // Register the event listener

http://git-wip-us.apache.org/repos/asf/incubator-cordova-docs/blob/80e274d3/docs/en/edge/phonegap/events/events.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/phonegap/events/events.md b/docs/en/edge/phonegap/events/events.md
index 831138f..bc68a06 100644
--- a/docs/en/edge/phonegap/events/events.md
+++ b/docs/en/edge/phonegap/events/events.md
@@ -1,7 +1,7 @@
 Events
 ======
 
-> PhoneGap lifecycle events.
+> Cordova lifecycle events.
 
 Event Types
 -----------

http://git-wip-us.apache.org/repos/asf/incubator-cordova-docs/blob/80e274d3/docs/en/edge/phonegap/events/events.menubutton.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/phonegap/events/events.menubutton.md b/docs/en/edge/phonegap/events/events.menubutton.md
index d23faae..26825ae 100644
--- a/docs/en/edge/phonegap/events/events.menubutton.md
+++ b/docs/en/edge/phonegap/events/events.menubutton.md
@@ -10,7 +10,7 @@ Details
 
 If you need to override the default menu button behaviour you can register an event listenter for the 'menubutton' event.
 
-Typically, you will want to attach an event listener with `document.addEventListener` once you receive the PhoneGap 'deviceready' event.
+Typically, you will want to attach an event listener with `document.addEventListener` once you receive the Cordova 'deviceready' event.
 
 Supported Platforms
 -------------------
@@ -34,22 +34,22 @@ Full Example
                           "http://www.w3.org/TR/html4/strict.dtd">
     <html>
       <head>
-        <title>PhoneGap Menu Button Example</title>
+        <title>Cordova Menu Button Example</title>
 
-        <script type="text/javascript" charset="utf-8" src="phonegap.js"></script>
+        <script type="text/javascript" charset="utf-8" src="cordova-1.6.0.js"></script>
         <script type="text/javascript" charset="utf-8">
 
-        // Call onDeviceReady when PhoneGap is loaded.
+        // Call onDeviceReady when Cordova is loaded.
         //
-        // At this point, the document has loaded but phonegap.js has not.
-        // When PhoneGap is loaded and talking with the native device,
+        // At this point, the document has loaded but cordova-1.6.0.js has not.
+        // When Cordova is loaded and talking with the native device,
         // it will call the event `deviceready`.
         //
         function onLoad() {
             document.addEventListener("deviceready", onDeviceReady, false);
         }
 
-        // PhoneGap is loaded and it is now safe to make calls PhoneGap methods
+        // Cordova is loaded and it is now safe to make calls Cordova methods
         //
         function onDeviceReady() {
             // Register the event listener

http://git-wip-us.apache.org/repos/asf/incubator-cordova-docs/blob/80e274d3/docs/en/edge/phonegap/events/events.offline.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/phonegap/events/events.offline.md b/docs/en/edge/phonegap/events/events.offline.md
index 6ca27d8..d0263c7 100644
--- a/docs/en/edge/phonegap/events/events.offline.md
+++ b/docs/en/edge/phonegap/events/events.offline.md
@@ -1,7 +1,7 @@
 offline
 ===========
 
-This is an event that fires when a PhoneGap application is offline (not connected to the Internet).
+This is an event that fires when a Cordova application is offline (not connected to the Internet).
 
     document.addEventListener("offline", yourCallbackFunction, false);
 
@@ -10,7 +10,7 @@ Details
 
 When the application's network connection changes to being offline, the offline event is fired.  
 
-Typically, you will want to attach an event listener with `document.addEventListener` once you receive the PhoneGap 'deviceready' event.
+Typically, you will want to attach an event listener with `document.addEventListener` once you receive the Cordova 'deviceready' event.
 
 Supported Platforms
 -------------------
@@ -34,22 +34,22 @@ Full Example
     <!DOCTYPE html>
     <html>
       <head>
-        <title>PhoneGap Offline Example</title>
+        <title>Cordova Offline Example</title>
 
-        <script type="text/javascript" charset="utf-8" src="phonegap.js"></script>
+        <script type="text/javascript" charset="utf-8" src="cordova-1.6.0.js"></script>
         <script type="text/javascript" charset="utf-8">
 
-        // Call onDeviceReady when PhoneGap is loaded.
+        // Call onDeviceReady when Cordova is loaded.
         //
-        // At this point, the document has loaded but phonegap.js has not.
-        // When PhoneGap is loaded and talking with the native device,
+        // At this point, the document has loaded but cordova-1.6.0.js has not.
+        // When Cordova is loaded and talking with the native device,
         // it will call the event `deviceready`.
         //
         function onLoad() {
             document.addEventListener("deviceready", onDeviceReady, false);
         }
 
-        // PhoneGap is loaded and it is now safe to make calls PhoneGap methods
+        // Cordova is loaded and it is now safe to make calls Cordova methods
         //
         function onDeviceReady() {
 		    document.addEventListener("offline", onOffline, false);

http://git-wip-us.apache.org/repos/asf/incubator-cordova-docs/blob/80e274d3/docs/en/edge/phonegap/events/events.online.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/phonegap/events/events.online.md b/docs/en/edge/phonegap/events/events.online.md
index 549245b..d2692dc 100644
--- a/docs/en/edge/phonegap/events/events.online.md
+++ b/docs/en/edge/phonegap/events/events.online.md
@@ -1,7 +1,7 @@
 online
 ===========
 
-This is an event that fires when a PhoneGap application is online (connected to the Internet).
+This is an event that fires when a Cordova application is online (connected to the Internet).
 
     document.addEventListener("online", yourCallbackFunction, false);
 
@@ -10,7 +10,7 @@ Details
 
 When the application's network connection changes to being online, the online event is fired.  
 
-Typically, you will want to attach an event listener with `document.addEventListener` once you receive the PhoneGap 'deviceready' event.
+Typically, you will want to attach an event listener with `document.addEventListener` once you receive the Cordova 'deviceready' event.
 
 Supported Platforms
 -------------------
@@ -34,22 +34,22 @@ Full Example
     <!DOCTYPE html>
     <html>
       <head>
-        <title>PhoneGap Online Example</title>
+        <title>Cordova Online Example</title>
 
-        <script type="text/javascript" charset="utf-8" src="phonegap.js"></script>
+        <script type="text/javascript" charset="utf-8" src="cordova-1.6.0.js"></script>
         <script type="text/javascript" charset="utf-8">
 
-        // Call onDeviceReady when PhoneGap is loaded.
+        // Call onDeviceReady when Cordova is loaded.
         //
-        // At this point, the document has loaded but phonegap.js has not.
-        // When PhoneGap is loaded and talking with the native device,
+        // At this point, the document has loaded but cordova-1.6.0.js has not.
+        // When Cordova is loaded and talking with the native device,
         // it will call the event `deviceready`.
         //
         function onLoad() {
             document.addEventListener("deviceready", onDeviceReady, false);
         }
 
-        // PhoneGap is loaded and it is now safe to make calls PhoneGap methods
+        // Cordova is loaded and it is now safe to make calls Cordova methods
         //
         function onDeviceReady() {
             document.addEventListener("online", onOnline, false);

http://git-wip-us.apache.org/repos/asf/incubator-cordova-docs/blob/80e274d3/docs/en/edge/phonegap/events/events.pause.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/phonegap/events/events.pause.md b/docs/en/edge/phonegap/events/events.pause.md
index 67a0a64..68b8ee8 100644
--- a/docs/en/edge/phonegap/events/events.pause.md
+++ b/docs/en/edge/phonegap/events/events.pause.md
@@ -1,16 +1,16 @@
 pause
 ===========
 
-This is an event that fires when a PhoneGap application is put into the background.
+This is an event that fires when a Cordova application is put into the background.
 
     document.addEventListener("pause", yourCallbackFunction, false);
 
 Details
 -------
 
-PhoneGap consists of two code bases: native and JavaScript. While the native code puts the application into the background the pause event is fired.  
+Cordova consists of two code bases: native and JavaScript. While the native code puts the application into the background the pause event is fired.  
 
-Typically, you will want to attach an event listener with `document.addEventListener` once you receive the PhoneGap 'deviceready' event.
+Typically, you will want to attach an event listener with `document.addEventListener` once you receive the Cordova 'deviceready' event.
 
 Supported Platforms
 -------------------
@@ -34,22 +34,22 @@ Full Example
     <!DOCTYPE html>
     <html>
       <head>
-        <title>PhoneGap Pause Example</title>
+        <title>Cordova Pause Example</title>
 
-        <script type="text/javascript" charset="utf-8" src="phonegap.js"></script>
+        <script type="text/javascript" charset="utf-8" src="cordova-1.6.0.js"></script>
         <script type="text/javascript" charset="utf-8">
 
-        // Call onDeviceReady when PhoneGap is loaded.
+        // Call onDeviceReady when Cordova is loaded.
         //
-        // At this point, the document has loaded but phonegap.js has not.
-        // When PhoneGap is loaded and talking with the native device,
+        // At this point, the document has loaded but cordova-1.6.0.js has not.
+        // When Cordova is loaded and talking with the native device,
         // it will call the event `deviceready`.
         //
         function onLoad() {
             document.addEventListener("deviceready", onDeviceReady, false);
         }
 
-        // PhoneGap is loaded and it is now safe to make calls PhoneGap methods
+        // Cordova is loaded and it is now safe to make calls Cordova methods
         //
         function onDeviceReady() {
 		    document.addEventListener("pause", onPause, false);

http://git-wip-us.apache.org/repos/asf/incubator-cordova-docs/blob/80e274d3/docs/en/edge/phonegap/events/events.resume.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/phonegap/events/events.resume.md b/docs/en/edge/phonegap/events/events.resume.md
index 88ff8d6..5213c31 100644
--- a/docs/en/edge/phonegap/events/events.resume.md
+++ b/docs/en/edge/phonegap/events/events.resume.md
@@ -1,16 +1,16 @@
 resume
 ===========
 
-This is an event that fires when a PhoneGap application is retrieved from the background.
+This is an event that fires when a Cordova application is retrieved from the background.
 
     document.addEventListener("resume", yourCallbackFunction, false);
 
 Details
 -------
 
-PhoneGap consists of two code bases: native and JavaScript. While the native code pulls the application from the background the resume event is fired.  
+Cordova consists of two code bases: native and JavaScript. While the native code pulls the application from the background the resume event is fired.  
 
-Typically, you will want to attach an event listener with `document.addEventListener` once you receive the PhoneGap 'deviceready' event.
+Typically, you will want to attach an event listener with `document.addEventListener` once you receive the Cordova 'deviceready' event.
 
 Supported Platforms
 -------------------
@@ -34,22 +34,22 @@ Full Example
     <!DOCTYPE html>
     <html>
       <head>
-        <title>PhoneGap Resume Example</title>
+        <title>Cordova Resume Example</title>
 
-        <script type="text/javascript" charset="utf-8" src="phonegap.js"></script>
+        <script type="text/javascript" charset="utf-8" src="cordova-1.6.0.js"></script>
         <script type="text/javascript" charset="utf-8">
 
-        // Call onDeviceReady when PhoneGap is loaded.
+        // Call onDeviceReady when Cordova is loaded.
         //
-        // At this point, the document has loaded but phonegap.js has not.
-        // When PhoneGap is loaded and talking with the native device,
+        // At this point, the document has loaded but cordova-1.6.0.js has not.
+        // When Cordova is loaded and talking with the native device,
         // it will call the event `deviceready`.
         //
         function onLoad() {
             document.addEventListener("deviceready", onDeviceReady, false);
         }
 
-        // PhoneGap is loaded and it is now safe to make calls PhoneGap methods
+        // Cordova is loaded and it is now safe to make calls Cordova methods
         //
         function onDeviceReady() {
             document.addEventListener("resume", onResume, false);

http://git-wip-us.apache.org/repos/asf/incubator-cordova-docs/blob/80e274d3/docs/en/edge/phonegap/events/events.searchbutton.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/phonegap/events/events.searchbutton.md b/docs/en/edge/phonegap/events/events.searchbutton.md
index 4533b57..b5dad9b 100644
--- a/docs/en/edge/phonegap/events/events.searchbutton.md
+++ b/docs/en/edge/phonegap/events/events.searchbutton.md
@@ -10,7 +10,7 @@ Details
 
 If you need to override the default search button behaviour on Android you can register an event listener for the 'searchbutton' event.
 
-Typically, you will want to attach an event listener with `document.addEventListener` once you receive the PhoneGap 'deviceready' event.
+Typically, you will want to attach an event listener with `document.addEventListener` once you receive the Cordova 'deviceready' event.
 
 Supported Platforms
 -------------------
@@ -33,22 +33,22 @@ Full Example
                           "http://www.w3.org/TR/html4/strict.dtd">
     <html>
       <head>
-        <title>PhoneGap Search Button Example</title>
+        <title>Cordova Search Button Example</title>
 
-        <script type="text/javascript" charset="utf-8" src="phonegap.js"></script>
+        <script type="text/javascript" charset="utf-8" src="cordova-1.6.0.js"></script>
         <script type="text/javascript" charset="utf-8">
 
-        // Call onDeviceReady when PhoneGap is loaded.
+        // Call onDeviceReady when Cordova is loaded.
         //
-        // At this point, the document has loaded but phonegap.js has not.
-        // When PhoneGap is loaded and talking with the native device,
+        // At this point, the document has loaded but cordova-1.6.0.js has not.
+        // When Cordova is loaded and talking with the native device,
         // it will call the event `deviceready`.
         //
         function onLoad() {
             document.addEventListener("deviceready", onDeviceReady, false);
         }
 
-        // PhoneGap is loaded and it is now safe to make calls PhoneGap methods
+        // Cordova is loaded and it is now safe to make calls Cordova methods
         //
         function onDeviceReady() {
             // Register the event listener

http://git-wip-us.apache.org/repos/asf/incubator-cordova-docs/blob/80e274d3/docs/en/edge/phonegap/events/events.startcallbutton.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/phonegap/events/events.startcallbutton.md b/docs/en/edge/phonegap/events/events.startcallbutton.md
index b8ec55f..0094777 100644
--- a/docs/en/edge/phonegap/events/events.startcallbutton.md
+++ b/docs/en/edge/phonegap/events/events.startcallbutton.md
@@ -10,7 +10,7 @@ Details
 
 If you need to override the default start call behaviour you can register an event listener for the 'startcallbutton' event.
 
-Typically, you will want to attach an event listener with `document.addEventListener` once you receive the PhoneGap 'deviceready' event.
+Typically, you will want to attach an event listener with `document.addEventListener` once you receive the Cordova 'deviceready' event.
 
 Supported Platforms
 -------------------
@@ -33,22 +33,22 @@ Full Example
                           "http://www.w3.org/TR/html4/strict.dtd">
     <html>
       <head>
-        <title>PhoneGap Start Call Button Example</title>
+        <title>Cordova Start Call Button Example</title>
 
-        <script type="text/javascript" charset="utf-8" src="phonegap.js"></script>
+        <script type="text/javascript" charset="utf-8" src="cordova-1.6.0.js"></script>
         <script type="text/javascript" charset="utf-8">
 
-        // Call onDeviceReady when PhoneGap is loaded.
+        // Call onDeviceReady when Cordova is loaded.
         //
-        // At this point, the document has loaded but phonegap.js has not.
-        // When PhoneGap is loaded and talking with the native device,
+        // At this point, the document has loaded but cordova-1.6.0.js has not.
+        // When Cordova is loaded and talking with the native device,
         // it will call the event `deviceready`.
         //
         function onLoad() {
             document.addEventListener("deviceready", onDeviceReady, false);
         }
 
-        // PhoneGap is loaded and it is now safe to make calls PhoneGap methods
+        // Cordova is loaded and it is now safe to make calls Cordova methods
         //
         function onDeviceReady() {
             // Register the event listener