You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by st...@apache.org on 2012/04/11 22:59:21 UTC

[5/9] added 1.6.0

http://git-wip-us.apache.org/repos/asf/incubator-cordova-docs/blob/72364fb9/docs/en/1.6.0/cordova/notification/notification.vibrate.md
----------------------------------------------------------------------
diff --git a/docs/en/1.6.0/cordova/notification/notification.vibrate.md b/docs/en/1.6.0/cordova/notification/notification.vibrate.md
new file mode 100644
index 0000000..089190c
--- /dev/null
+++ b/docs/en/1.6.0/cordova/notification/notification.vibrate.md
@@ -0,0 +1,83 @@
+notification.vibrate
+====================
+
+Vibrates the device for the specified amount of time.
+
+    navigator.notification.vibrate(milliseconds)
+
+- __time:__ Milliseconds to vibrate the device. 1000 milliseconds equals 1 second (`Number`)
+
+Supported Platforms
+-------------------
+
+- Android
+- BlackBerry WebWorks (OS 5.0 and higher)
+- iPhone
+- Windows Phone 7
+
+Quick Example
+-------------
+
+    // Vibrate for 2.5 seconds
+    //
+    navigator.notification.vibrate(2500);
+
+Full Example
+------------
+    
+    <!DOCTYPE html>
+    <html>
+      <head>
+        <title>Notification Example</title>
+
+        <script type="text/javascript" charset="utf-8" src="cordova-1.6.0.js"></script>
+        <script type="text/javascript" charset="utf-8">
+
+        // Wait for Cordova to load
+        //
+        document.addEventListener("deviceready", onDeviceReady, false);
+
+        // Cordova is ready
+        //
+        function onDeviceReady() {
+            // Empty
+        }
+    
+        // Show a custom alert
+        //
+        function showAlert() {
+		    navigator.notification.alert(
+		        'You are the winner!',  // message
+		        'Game Over',            // title
+		        'Done'                  // buttonName
+		    );
+        }
+    
+        // Beep three times
+        //
+        function playBeep() {
+            navigator.notification.beep(3);
+        }
+    
+        // Vibrate for 2 seconds
+        //
+        function vibrate() {
+            navigator.notification.vibrate(2000);
+        }
+
+        </script>
+      </head>
+      <body>
+        <p><a href="#" onclick="showAlert(); return false;">Show Alert</a></p>
+        <p><a href="#" onclick="playBeep(); return false;">Play Beep</a></p>
+        <p><a href="#" onclick="vibrate(); return false;">Vibrate</a></p>
+      </body>
+    </html>
+
+iPhone Quirks
+-------------
+
+- __time:__ Ignores the time and vibrates for a pre-set amount of time.
+
+        navigator.notification.vibrate();
+        navigator.notification.vibrate(2500);   // 2500 is ignored

http://git-wip-us.apache.org/repos/asf/incubator-cordova-docs/blob/72364fb9/docs/en/1.6.0/cordova/storage/database/database.md
----------------------------------------------------------------------
diff --git a/docs/en/1.6.0/cordova/storage/database/database.md b/docs/en/1.6.0/cordova/storage/database/database.md
new file mode 100644
index 0000000..9643375
--- /dev/null
+++ b/docs/en/1.6.0/cordova/storage/database/database.md
@@ -0,0 +1,104 @@
+Database
+=======
+
+Contains methods that allow the user to manipulate the Database
+
+Methods
+-------
+
+- __transaction__: Runs a database transaction. 
+- __changeVersion__: method allows scripts to atomically verify the version number and change it at the same time as doing a schema update. 
+
+Details
+-------
+
+A Database object is returned from a call to `window.openDatabase()`.
+
+Supported Platforms
+-------------------
+
+- Android
+- BlackBerry WebWorks (OS 6.0 and higher)
+- iPhone
+
+Transaction Quick Example
+------------------
+	function populateDB(tx) {
+		 tx.executeSql('DROP TABLE IF EXISTS DEMO');
+		 tx.executeSql('CREATE TABLE IF NOT EXISTS DEMO (id unique, data)');
+		 tx.executeSql('INSERT INTO DEMO (id, data) VALUES (1, "First row")');
+		 tx.executeSql('INSERT INTO DEMO (id, data) VALUES (2, "Second row")');
+	}
+	
+	function errorCB(err) {
+		alert("Error processing SQL: "+err.code);
+	}
+	
+	function successCB() {
+		alert("success!");
+	}
+	
+	var db = window.openDatabase("Database", "1.0", "Cordova Demo", 200000);
+	db.transaction(populateDB, errorCB, successCB);
+
+Change Version Quick Example
+-------------------
+
+	var db = window.openDatabase("Database", "1.0", "Cordova Demo", 200000);
+	db.changeVersion("1.0", "1.1");
+
+Full Example
+------------
+
+    <!DOCTYPE html>
+    <html>
+      <head>
+        <title>Contact Example</title>
+
+        <script type="text/javascript" charset="utf-8" src="cordova-1.6.0.js"></script>
+        <script type="text/javascript" charset="utf-8">
+
+        // Wait for Cordova to load
+        //
+        document.addEventListener("deviceready", onDeviceReady, false);
+
+        // Cordova is ready
+        //
+        function onDeviceReady() {
+			var db = window.openDatabase("Database", "1.0", "Cordova Demo", 200000);
+			db.transaction(populateDB, errorCB, successCB);
+        }
+		
+		// Populate the database 
+		//
+		function populateDB(tx) {
+			 tx.executeSql('DROP TABLE IF EXISTS DEMO');
+			 tx.executeSql('CREATE TABLE IF NOT EXISTS DEMO (id unique, data)');
+			 tx.executeSql('INSERT INTO DEMO (id, data) VALUES (1, "First row")');
+			 tx.executeSql('INSERT INTO DEMO (id, data) VALUES (2, "Second row")');
+		}
+		
+		// Transaction error callback
+		//
+		function errorCB(tx, err) {
+			alert("Error processing SQL: "+err);
+		}
+		
+		// Transaction success callback
+		//
+		function successCB() {
+			alert("success!");
+		}
+	
+        </script>
+      </head>
+      <body>
+        <h1>Example</h1>
+        <p>Database</p>
+      </body>
+    </html>
+
+Android 1.X Quirks
+------------------
+
+- __changeVersion:__ This method is not support by Android 1.X devices.

http://git-wip-us.apache.org/repos/asf/incubator-cordova-docs/blob/72364fb9/docs/en/1.6.0/cordova/storage/localstorage/localstorage.md
----------------------------------------------------------------------
diff --git a/docs/en/1.6.0/cordova/storage/localstorage/localstorage.md b/docs/en/1.6.0/cordova/storage/localstorage/localstorage.md
new file mode 100644
index 0000000..86a11c1
--- /dev/null
+++ b/docs/en/1.6.0/cordova/storage/localstorage/localstorage.md
@@ -0,0 +1,100 @@
+localStorage
+===============
+
+Provides access to a W3C Storage interface (http://dev.w3.org/html5/webstorage/#the-localstorage-attribute)
+
+    var storage = window.localStorage;
+
+Methods
+-------
+
+- __key__: Returns the name of the key at the position specified. 
+- __getItem__: Returns the item identified by it's key.
+- __setItem__: Saves and item at the key provided.
+- __removeItem__: Removes the item identified by it's key.
+- __clear__: Removes all of the key value pairs.
+
+Details
+-----------
+
+localStorage provides an interface to a W3C Storage interface.  It allows one to save data as key-value pairs.
+
+Note: window.sessionStorage provides the same interface, but is cleared between app launches.
+
+Supported Platforms
+-------------------
+
+- Android
+- BlackBerry WebWorks (OS 6.0 and higher)
+- iPhone
+- Windows Phone 7
+
+Key Quick Example
+-------------
+
+    var keyName = window.localStorage.key(0);
+
+Set Item Quick Example
+-------------
+
+    window.localStorage.setItem("key", "value");
+
+Get Item Quick Example
+-------------
+
+	var value = window.localStorage.getItem("key");
+	// value is now equal to "value"
+
+Remove Item Quick Example
+-------------
+
+	window.localStorage.removeItem("key");
+
+Clear Quick Example
+-------------
+
+	window.localStorage.clear();
+
+Full Example
+------------
+
+    <!DOCTYPE html>
+    <html>
+      <head>
+        <title>Contact Example</title>
+
+        <script type="text/javascript" charset="utf-8" src="cordova-1.6.0.js"></script>
+        <script type="text/javascript" charset="utf-8">
+
+        // Wait for Cordova to load
+        //
+        document.addEventListener("deviceready", onDeviceReady, false);
+
+        // Cordova is ready
+        //
+        function onDeviceReady() {
+			window.localStorage.setItem("key", "value");
+			var keyname = window.localStorage.key(i);
+			// keyname is now equal to "key"
+			var value = window.localStorage.getItem("key");
+			// value is now equal to "value"
+			window.localStorage.removeItem("key");
+			window.localStorage.setItem("key2", "value2");
+			window.localStorage.clear();
+			// localStorage is now empty
+        }
+    
+
+        </script>
+      </head>
+      <body>
+        <h1>Example</h1>
+        <p>localStorage</p>
+      </body>
+    </html>
+
+
+Windows Phone 7 Quirks
+-------------
+
+- dot notation is NOT available on Windows Phone. Be sure to use : window.localStorage.setItem/getItem, and not the w3 spec defined calls to window.localStorage.someKey = 'someValue';
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-cordova-docs/blob/72364fb9/docs/en/1.6.0/cordova/storage/parameters/display_name.md
----------------------------------------------------------------------
diff --git a/docs/en/1.6.0/cordova/storage/parameters/display_name.md b/docs/en/1.6.0/cordova/storage/parameters/display_name.md
new file mode 100644
index 0000000..cf99b51
--- /dev/null
+++ b/docs/en/1.6.0/cordova/storage/parameters/display_name.md
@@ -0,0 +1,4 @@
+database_displayname
+==================
+
+The display name of the database.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-cordova-docs/blob/72364fb9/docs/en/1.6.0/cordova/storage/parameters/name.md
----------------------------------------------------------------------
diff --git a/docs/en/1.6.0/cordova/storage/parameters/name.md b/docs/en/1.6.0/cordova/storage/parameters/name.md
new file mode 100644
index 0000000..6184633
--- /dev/null
+++ b/docs/en/1.6.0/cordova/storage/parameters/name.md
@@ -0,0 +1,4 @@
+database_name
+============
+
+The name of the database.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-cordova-docs/blob/72364fb9/docs/en/1.6.0/cordova/storage/parameters/size.md
----------------------------------------------------------------------
diff --git a/docs/en/1.6.0/cordova/storage/parameters/size.md b/docs/en/1.6.0/cordova/storage/parameters/size.md
new file mode 100644
index 0000000..1e96ccc
--- /dev/null
+++ b/docs/en/1.6.0/cordova/storage/parameters/size.md
@@ -0,0 +1,4 @@
+database_size
+==============
+
+The size of the database in bytes.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-cordova-docs/blob/72364fb9/docs/en/1.6.0/cordova/storage/parameters/version.md
----------------------------------------------------------------------
diff --git a/docs/en/1.6.0/cordova/storage/parameters/version.md b/docs/en/1.6.0/cordova/storage/parameters/version.md
new file mode 100644
index 0000000..712dc78
--- /dev/null
+++ b/docs/en/1.6.0/cordova/storage/parameters/version.md
@@ -0,0 +1,4 @@
+database_version
+=============
+
+The version of the database.

http://git-wip-us.apache.org/repos/asf/incubator-cordova-docs/blob/72364fb9/docs/en/1.6.0/cordova/storage/sqlerror/sqlerror.md
----------------------------------------------------------------------
diff --git a/docs/en/1.6.0/cordova/storage/sqlerror/sqlerror.md b/docs/en/1.6.0/cordova/storage/sqlerror/sqlerror.md
new file mode 100644
index 0000000..9f12197
--- /dev/null
+++ b/docs/en/1.6.0/cordova/storage/sqlerror/sqlerror.md
@@ -0,0 +1,28 @@
+SQLError
+========
+
+A `SQLError` object is thrown when an error occurs.
+
+Properties
+----------
+
+- __code:__ One of the predefined error codes listed below.
+- __message:__ A description of the error.
+
+Constants
+---------
+
+- `SQLError.UNKNOWN_ERR`
+- `SQLError.DATABASE_ERR`
+- `SQLError.VERSION_ERR`
+- `SQLError.TOO_LARGE_ERR`
+- `SQLError.QUOTA_ERR`
+- `SQLError.SYNTAX_ERR`
+- `SQLError.CONSTRAINT_ERR`
+- `SQLError.TIMEOUT_ERR`
+
+Description
+-----------
+
+The `SQLError` object is thrown when an error occurs when manipulating a database.
+

http://git-wip-us.apache.org/repos/asf/incubator-cordova-docs/blob/72364fb9/docs/en/1.6.0/cordova/storage/sqlresultset/sqlresultset.md
----------------------------------------------------------------------
diff --git a/docs/en/1.6.0/cordova/storage/sqlresultset/sqlresultset.md b/docs/en/1.6.0/cordova/storage/sqlresultset/sqlresultset.md
new file mode 100644
index 0000000..c8d14ce
--- /dev/null
+++ b/docs/en/1.6.0/cordova/storage/sqlresultset/sqlresultset.md
@@ -0,0 +1,115 @@
+SQLResultSet
+=======
+
+When the executeSql method of a SQLTransaction is called it will invoke it's callback with a SQLResultSet.
+
+Properties
+-------
+
+- __insertId__: the row ID of the row that the SQLResultSet object's SQL statement inserted into the database
+- __rowsAffected__: the number of rows that were changed by the SQL statement.  If the statement did not affect any rows then it is set to 0. 
+- __rows__: a SQLResultSetRowList representing the rows returned.  If no rows are returned the object will be empty.
+
+Details
+-------
+
+When you call the SQLTransaction executeSql method it's callback methods will be called with a SQLResultSet object.  The result object has three properties.  The first is the `insertId` which will return the row number of a success SQL insert statement.  If the SQL statement is not an insert then the `insertId` is not set.  The `rowsAffected` is always 0 for a SQL select statement.  For insert or update statements it returns the number of rows that have been modified.  The final property is of type SQLResultSetList and it contains the data returned from a SQL select statement.
+
+Supported Platforms
+-------------------
+
+- Android
+- BlackBerry WebWorks (OS 6.0 and higher)
+- iPhone
+
+Execute SQL Quick Example
+------------------
+
+	function queryDB(tx) {
+		tx.executeSql('SELECT * FROM DEMO', [], querySuccess, errorCB);
+	}
+
+	function querySuccess(tx, results) {
+		// this will be empty since no rows were inserted.
+		console.log("Insert ID = " + results.insertId);
+		// this will be 0 since it is a select statement
+		console.log("Rows Affected = " + results.rowsAffected);
+		// the number of rows returned by the select statement
+		console.log("Insert ID = " + results.rows.length);
+	}
+	
+	function errorCB(err) {
+		alert("Error processing SQL: "+err.code);
+	}
+	
+	var db = window.openDatabase("Database", "1.0", "Cordova Demo", 200000);
+	db.transaction(queryDB, errorCB);
+
+Full Example
+------------
+
+    <!DOCTYPE html>
+    <html>
+      <head>
+        <title>Contact Example</title>
+
+        <script type="text/javascript" charset="utf-8" src="cordova-1.6.0.js"></script>
+        <script type="text/javascript" charset="utf-8">
+
+        // Wait for Cordova to load
+        //
+        document.addEventListener("deviceready", onDeviceReady, false);
+
+		// Populate the database 
+		//
+		function populateDB(tx) {
+			tx.executeSql('DROP TABLE IF EXISTS DEMO');
+			tx.executeSql('CREATE TABLE IF NOT EXISTS DEMO (id unique, data)');
+			tx.executeSql('INSERT INTO DEMO (id, data) VALUES (1, "First row")');
+			tx.executeSql('INSERT INTO DEMO (id, data) VALUES (2, "Second row")');
+		}
+
+		// Query the database
+		//
+		function queryDB(tx) {
+			tx.executeSql('SELECT * FROM DEMO', [], querySuccess, errorCB);
+		}
+
+		// Query the success callback
+		//
+		function querySuccess(tx, results) {
+			// this will be empty since no rows were inserted.
+			console.log("Insert ID = " + results.insertId);
+			// this will be 0 since it is a select statement
+			console.log("Rows Affected = " + results.rowsAffected);
+			// the number of rows returned by the select statement
+			console.log("Insert ID = " + results.rows.length);
+		}
+
+		// Transaction error callback
+		//
+		function errorCB(err) {
+			console.log("Error processing SQL: "+err.code);
+		}
+
+		// Transaction success callback
+		//
+		function successCB() {
+			var db = window.openDatabase("Database", "1.0", "Cordova Demo", 200000);
+			db.transaction(queryDB, errorCB);
+		}
+
+		// Cordova is ready
+		//
+		function onDeviceReady() {
+			var db = window.openDatabase("Database", "1.0", "Cordova Demo", 200000);
+			db.transaction(populateDB, errorCB, successCB);
+		}
+	
+        </script>
+      </head>
+      <body>
+        <h1>Example</h1>
+        <p>Database</p>
+      </body>
+    </html>

http://git-wip-us.apache.org/repos/asf/incubator-cordova-docs/blob/72364fb9/docs/en/1.6.0/cordova/storage/sqlresultsetlist/sqlresultsetlist.md
----------------------------------------------------------------------
diff --git a/docs/en/1.6.0/cordova/storage/sqlresultsetlist/sqlresultsetlist.md b/docs/en/1.6.0/cordova/storage/sqlresultsetlist/sqlresultsetlist.md
new file mode 100644
index 0000000..9886ecf
--- /dev/null
+++ b/docs/en/1.6.0/cordova/storage/sqlresultsetlist/sqlresultsetlist.md
@@ -0,0 +1,116 @@
+SQLResultSetList
+=======
+
+One of the properties of the SQLResultSet containing the rows returned from a SQL query.
+
+Properties
+-------
+
+- __length__: the number of rows returned by the SQL query
+
+Methods
+-------
+
+- __item__: returns the row at the specified index represented by a JavaScript object.
+
+Details
+-------
+
+The SQLResultSetList contains the data returned from a SQL select statement.  The object contains a length property letting you know how many rows the select statement has been returned.  To get a row of data you would call the `item` method specifing an index.  The item method returns a JavaScript Object who's properties are the columns of the database the select statement was executed against.
+
+Supported Platforms
+-------------------
+
+- Android
+- BlackBerry WebWorks (OS 6.0 and higher)
+- iPhone
+
+Execute SQL Quick Example
+------------------
+
+	function queryDB(tx) {
+		tx.executeSql('SELECT * FROM DEMO', [], querySuccess, errorCB);
+	}
+
+	function querySuccess(tx, results) {
+		var len = results.rows.length;
+	���	console.log("DEMO table: " + len + " rows found.");
+	���	for (var i=0; i<len; i++){
+	����	console.log("Row = " + i + " ID = " + results.rows.item(i).id + " Data =  " + results.rows.item(i).data);
+		}
+	}
+	
+	function errorCB(err) {
+		alert("Error processing SQL: "+err.code);
+	}
+	
+	var db = window.openDatabase("Database", "1.0", "Cordova Demo", 200000);
+	db.transaction(queryDB, errorCB);
+
+Full Example
+------------
+
+    <!DOCTYPE html>
+    <html>
+      <head>
+        <title>Contact Example</title>
+
+        <script type="text/javascript" charset="utf-8" src="cordova-1.6.0.js"></script>
+        <script type="text/javascript" charset="utf-8">
+
+        // Wait for Cordova to load
+        //
+        document.addEventListener("deviceready", onDeviceReady, false);
+
+		// Populate the database 
+		//
+		function populateDB(tx) {
+			tx.executeSql('DROP TABLE IF EXISTS DEMO');
+			tx.executeSql('CREATE TABLE IF NOT EXISTS DEMO (id unique, data)');
+			tx.executeSql('INSERT INTO DEMO (id, data) VALUES (1, "First row")');
+			tx.executeSql('INSERT INTO DEMO (id, data) VALUES (2, "Second row")');
+		}
+
+		// Query the database
+		//
+		function queryDB(tx) {
+			tx.executeSql('SELECT * FROM DEMO', [], querySuccess, errorCB);
+		}
+
+		// Query the success callback
+		//
+		function querySuccess(tx, results) {
+			var len = results.rows.length;
+			console.log("DEMO table: " + len + " rows found.");
+			for (var i=0; i<len; i++){
+				console.log("Row = " + i + " ID = " + results.rows.item(i).id + " Data =  " + results.rows.item(i).data);
+			}
+		}
+
+		// Transaction error callback
+		//
+		function errorCB(err) {
+			console.log("Error processing SQL: "+err.code);
+		}
+
+		// Transaction success callback
+		//
+		function successCB() {
+			var db = window.openDatabase("Database", "1.0", "Cordova Demo", 200000);
+			db.transaction(queryDB, errorCB);
+		}
+
+		// Cordova is ready
+		//
+		function onDeviceReady() {
+			var db = window.openDatabase("Database", "1.0", "Cordova Demo", 200000);
+			db.transaction(populateDB, errorCB, successCB);
+		}
+	
+        </script>
+      </head>
+      <body>
+        <h1>Example</h1>
+        <p>Database</p>
+      </body>
+    </html>

http://git-wip-us.apache.org/repos/asf/incubator-cordova-docs/blob/72364fb9/docs/en/1.6.0/cordova/storage/sqltransaction/sqltransaction.md
----------------------------------------------------------------------
diff --git a/docs/en/1.6.0/cordova/storage/sqltransaction/sqltransaction.md b/docs/en/1.6.0/cordova/storage/sqltransaction/sqltransaction.md
new file mode 100644
index 0000000..20989c8
--- /dev/null
+++ b/docs/en/1.6.0/cordova/storage/sqltransaction/sqltransaction.md
@@ -0,0 +1,93 @@
+SQLTransaction
+=======
+
+Contains methods that allow the user to execute SQL statements against the Database.
+
+Methods
+-------
+
+- __executeSql__: executes a SQL statement
+
+Details
+-------
+
+When you call a Database objects transaction method it's callback methods will be called with a SQLTransaction object.  The user can build up a database transaction by calling the executeSql method multiple times.  
+
+Supported Platforms
+-------------------
+
+- Android
+- BlackBerry WebWorks (OS 6.0 and higher)
+- iPhone
+
+Execute SQL Quick Example
+------------------
+
+	function populateDB(tx) {
+		 tx.executeSql('DROP TABLE IF EXISTS DEMO');
+		 tx.executeSql('CREATE TABLE IF NOT EXISTS DEMO (id unique, data)');
+		 tx.executeSql('INSERT INTO DEMO (id, data) VALUES (1, "First row")');
+		 tx.executeSql('INSERT INTO DEMO (id, data) VALUES (2, "Second row")');
+	}
+	
+	function errorCB(err) {
+		alert("Error processing SQL: "+err);
+	}
+	
+	function successCB() {
+		alert("success!");
+	}
+	
+	var db = window.openDatabase("Database", "1.0", "Cordova Demo", 200000);
+	db.transaction(populateDB, errorCB, successCB);
+
+Full Example
+------------
+
+    <!DOCTYPE html>
+    <html>
+      <head>
+        <title>Contact Example</title>
+
+        <script type="text/javascript" charset="utf-8" src="cordova-1.6.0.js"></script>
+        <script type="text/javascript" charset="utf-8">
+
+        // Wait for Cordova to load
+        //
+        document.addEventListener("deviceready", onDeviceReady, false);
+
+        // Cordova is ready
+        //
+        function onDeviceReady() {
+			var db = window.openDatabase("Database", "1.0", "Cordova Demo", 200000);
+			db.transaction(populateDB, errorCB, successCB);
+        }
+		
+		// Populate the database 
+		//
+		function populateDB(tx) {
+			 tx.executeSql('DROP TABLE IF EXISTS DEMO');
+			 tx.executeSql('CREATE TABLE IF NOT EXISTS DEMO (id unique, data)');
+			 tx.executeSql('INSERT INTO DEMO (id, data) VALUES (1, "First row")');
+			 tx.executeSql('INSERT INTO DEMO (id, data) VALUES (2, "Second row")');
+		}
+		
+		// Transaction error callback
+		//
+		function errorCB(err) {
+			alert("Error processing SQL: "+err);
+		}
+		
+		// Transaction success callback
+		//
+		function successCB() {
+			alert("success!");
+		}
+	
+        </script>
+      </head>
+      <body>
+        <h1>Example</h1>
+        <p>SQLTransaction</p>
+      </body>
+    </html>

http://git-wip-us.apache.org/repos/asf/incubator-cordova-docs/blob/72364fb9/docs/en/1.6.0/cordova/storage/storage.md
----------------------------------------------------------------------
diff --git a/docs/en/1.6.0/cordova/storage/storage.md b/docs/en/1.6.0/cordova/storage/storage.md
new file mode 100644
index 0000000..1ce586e
--- /dev/null
+++ b/docs/en/1.6.0/cordova/storage/storage.md
@@ -0,0 +1,29 @@
+Storage
+==========
+
+> Provides access to the devices storage options.  
+
+This API is based on the [W3C Web SQL Database Specification](http://dev.w3.org/html5/webdatabase/) and [W3C Web Storage API Specification](http://dev.w3.org/html5/webstorage/). Some devices already provide an implementation of this spec. For those devices, the built-in support is used instead of replacing it with Cordova's implementation. For devices that don't have storage support, Cordova's implementation should be compatible with the W3C specification.
+
+Methods
+-------
+
+- openDatabase
+
+Arguments
+---------
+
+- database_name
+- database_version
+- database_displayname
+- database_size
+
+Objects
+-------
+
+- Database
+- SQLTransaction
+- SQLResultSet
+- SQLResultSetList
+- SQLError
+- localStorage
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-cordova-docs/blob/72364fb9/docs/en/1.6.0/cordova/storage/storage.opendatabase.md
----------------------------------------------------------------------
diff --git a/docs/en/1.6.0/cordova/storage/storage.opendatabase.md b/docs/en/1.6.0/cordova/storage/storage.opendatabase.md
new file mode 100644
index 0000000..7493081
--- /dev/null
+++ b/docs/en/1.6.0/cordova/storage/storage.opendatabase.md
@@ -0,0 +1,54 @@
+openDatabase
+===============
+
+Returns a new Database object.
+
+    var dbShell = window.openDatabase(database_name, database_version, database_displayname, database_size);
+
+Description
+-----------
+
+window.openDatabase returns a new Database object.
+
+This method will create a new SQL Lite Database and return a Database object.  Use the Database Object to manipulate the data.
+
+Supported Platforms
+-------------------
+
+- Android
+- BlackBerry WebWorks (OS 6.0 and higher)
+- iPhone
+
+Quick Example
+-------------
+
+    var db = window.openDatabase("test", "1.0", "Test DB", 1000000);
+
+Full Example
+------------
+
+    <!DOCTYPE html>
+    <html>
+      <head>
+        <title>Contact Example</title>
+
+        <script type="text/javascript" charset="utf-8" src="cordova-1.6.0.js"></script>
+        <script type="text/javascript" charset="utf-8">
+
+        // Wait for Cordova to load
+        //
+        document.addEventListener("deviceready", onDeviceReady, false);
+
+        // Cordova is ready
+        //
+        function onDeviceReady() {
+			var db = window.openDatabase("test", "1.0", "Test DB", 1000000);
+        }
+		
+        </script>
+      </head>
+      <body>
+        <h1>Example</h1>
+        <p>Open Database</p>
+      </body>
+    </html>

http://git-wip-us.apache.org/repos/asf/incubator-cordova-docs/blob/72364fb9/docs/en/1.6.0/guide/getting-started/android/index.md
----------------------------------------------------------------------
diff --git a/docs/en/1.6.0/guide/getting-started/android/index.md b/docs/en/1.6.0/guide/getting-started/android/index.md
index 9460a42..2ecd2e4 100644
--- a/docs/en/1.6.0/guide/getting-started/android/index.md
+++ b/docs/en/1.6.0/guide/getting-started/android/index.md
@@ -3,51 +3,55 @@ 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:
-----------------
-
-- [Cordova and Android Quick Start Video Using Ecliplse](http://www.youtube.com/v/MzcIcyBYJMA?autoplay=1)
-
 
 1. Requirements
 ---------------
 
 - Eclipse 3.4+
 
-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 + 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 [Cordova](http://phonegap.com/download) and extract its contents. We will be working with the Android directory.
+- Download 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
------------------------
+---------------------
 
-- Launch Eclipse, then under the menu select **New &gt; Android Project**
+- Launch Eclipse, and select menu item **New &gt; Android Project**.  Fill out the three panels of the **New Android Project** wizard shown below.
 
     ![](img/guide/getting-started/android/AndroidFlow.png)
-- In the root directory of the project, create two new directories:
+    
+- In the root directory of your project, create two new directories:
  	- **/libs**
  	- **assets/www**
 - 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)
+
+- Verify that **cordova-1.6.0.jar** is listed in the Build Path for your project. Right click on the /libs folder and go to **Build Paths/ &gt; Configure Build Path...**. 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.
+
+    ![](img/guide/getting-started/android/buildPath.jpg)
+
+- Edit your project's main Java file found in the **src** folder in Eclipse:
+	- Add **import org.apache.cordova.*;**
 	- 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.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)
-
-        <supports-screens android:largeScreens="true" android:normalScreens="true" android:smallScreens="true" android:resizeable="true" android:anyDensity="true" />
+	
+- Right click on AndroidManifest.xml and select **Open With &gt; XML Editor**
+- Paste the following permissions between the **&lt;uses-sdk.../&gt;** and **&lt;application.../&gt;** tags.
+
+        <supports-screens 
+            android:largeScreens="true" 
+            android:normalScreens="true" 
+            android:smallScreens="true" 
+            android:resizeable="true" 
+            android:anyDensity="true" />
         <uses-permission android:name="android.permission.CAMERA" />
         <uses-permission android:name="android.permission.VIBRATE" />
         <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
@@ -61,17 +65,22 @@ There is also a [Terminal](http://wiki.phonegap.com/w/page/30864168/phonegap-and
         <uses-permission android:name="android.permission.READ_CONTACTS" />
         <uses-permission android:name="android.permission.WRITE_CONTACTS" />
         <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-        <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> <uses-permission android:name="android.permission.GET_ACCOUNTS" />
+        <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> 
+        <uses-permission android:name="android.permission.GET_ACCOUNTS" />
         <uses-permission android:name="android.permission.BROADCAST_STICKY" />
 
-- Add `android:configChanges="orientation|keyboardHidden"` to the activity tag in AndroidManifest. (view image below)
+- Support orientation changes by pasting the folowing inside the **&lt;activity&gt;** tag.
+
+        android:configChanges="orientation|keyboardHidden"
 
-	![](img/guide/getting-started/android/manifest.jpg)
+- Your AndroidManifest.xml file should look like
+
+    ![](img/guide/getting-started/android/manifest.jpg)
 
 4. Hello World
 --------------    
 
-Now create and open a new file named **index.html** in the **assets/www** directory. Paste the following code:
+- Create and open a new file named **index.html** in the **assets/www** directory. Paste the following code:
 
 	    <!DOCTYPE HTML>
         <html>
@@ -83,26 +92,21 @@ Now create and open a new file named **index.html** in the **assets/www** direct
         <h1>Hello World</h1>
         </body>
         </html>
-	
-    *cordova-1.6.0.js might need to be replaced with latest cordova-<VERSION NUMBER>.js
 
 
 5A. Deploy to Simulator
 -----------------------
 
-- Right click the project and go to **Run As** and click **Android Application**
+- Right click the project and go to **Run As &gt; Android Application**
 - Eclipse will ask you to select an appropriate AVD. If there isn't one, then you'll need to create it.
 
 
 5B. Deploy to Device
 --------------------
 
-- Make sure USB debugging is enabled on your device and plug it into your system. (Settings &gt; Applications &gt; Development)
-- Right click the project and go to **Run As** and click **Android Application**
+- Make sure USB debugging is enabled on your device and plug it into your system. (**Settings &gt; Applications &gt; Development**)
+- Right click the project and go to **Run As &gt; Android Application**
 
 
 Done!
 -----
-
-You can also checkout more detailed version of this guide [here](http://wiki.phonegap.com/w/page/30862722/phonegap-android-eclipse-quickstart).
-

http://git-wip-us.apache.org/repos/asf/incubator-cordova-docs/blob/72364fb9/docs/en/1.6.0/guide/getting-started/blackberry/index.md
----------------------------------------------------------------------
diff --git a/docs/en/1.6.0/guide/getting-started/blackberry/index.md b/docs/en/1.6.0/guide/getting-started/blackberry/index.md
index a6f887e..cf4d131 100644
--- a/docs/en/1.6.0/guide/getting-started/blackberry/index.md
+++ b/docs/en/1.6.0/guide/getting-started/blackberry/index.md
@@ -1,65 +1,82 @@
 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.
+Cordova for BlackBerry makes use of the [BlackBerry WebWorks framework](https://bdsc.webapps.blackberry.com/html5). BlackBerry WebWorks tooling is available for Windows or Mac environments. WebWorks applications can ONLY be deployed to BlackBerry devices running OS 5.0 and higher or the BlackBerry PlayBook operating system.
 
-
-Video Tutorials:
-----------------
-
-- [Cordova and BlackBerry Widgets Quick Start Video](http://www.youtube.com/v/eF0h0K0OLwI?autoplay=1)
-
-
-
-1. Requirements
+1.  Requirements
 ---------------
 
 - Windows XP (32-bit) or Windows 7 (32-bit and 64-bit) or Mac OSX 10.6.4+
-
-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 + 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 [Cordova](http://phonegap.com/download) and extract its contents. We will be working with the Android directory.
-
-
-3. Setup New Project
+- Java Development Kit (JDK)
+    - Windows: [Oracle JDK](http://www.oracle.com/technetwork/java/javase/downloads/index.html#jdk) (32-Bit Version)
+    - Mac OS X: Versions prior to Mac OS X 10.7 provided Java by default.  OS X 10.7+ requires installation of [Java](http://support.apple.com/kb/DL1421).
+-   Apache Ant
+    - Windows: [Apache Ant](http://ant.apache.org/bindownload.cgi).
+    - Mac OS X: Apache Ant is bundled with Java install.
+
+2.  Install SDK + Cordova
+-------------------------
+
+- PlayBook development requires the [Adobe Air SDK](http://www.adobe.com/devnet/air/air-sdk-download.html)
+- Download and install one or more of the WebWorks SDKs. Keep note of the install directory.
+    - Smartphone Development: [BlackBerry WebWorks Smartphone SDK](https://bdsc.webapps.blackberry.com/html5/download/sdk)
+    - PlayBook Development: [BlackBerry WebWorks Tablet OS SDK](https://bdsc.webapps.blackberry.com/html5/download/sdk)
+- Download the latest copy of [Cordova](http://phonegap.com/download) and extract its contents.
+
+3.  Setup New Project
 --------------------
 
-- 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.
-
+- Open up a command prompt/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 two directories, `sample` and `www`.  The `sample` folder contains a complete Cordova project.  Copy the `sample` folder 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 `blackberry.bbwp.dir=` and/or `playbook.bbwp.dir=`. Set the  value(s) to the directory containing the `bbwp` binary in the WebWorks SDK(s) installed earlier.
 
-4. Hello World
+4.  Hello World
 --------------
 
-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.
+Build the Cordova sample project by typing `ant target build` in your command prompt/terminal while you are in your project's directory. Replace `target` with either `blackberry` or `playbook`. Note this is a sample Cordova project and not a basic hello world application. The provided index.html in the www contains example usages of many of the Cordova API.
 
-
-5A. Deploy to Simulator (Windows Only)
+5A.  Deploy to Simulator
 --------------------------------------
 
-- While in your project directory, in command prompt/terminal type `ant target load-simulator`. Replace the target with either blackberry or playbook.
-- Press the BlackBerry button on the simulator, go to downloads and you should see your app loaded there.
+BlackBerry smartphone simulators are only available on Windows. PlayBook simulators require VMWare Player (Windows) or VMWare Fusion (Mac OS X). The WebWorks SDK provides a default simulator. Additional simulators are [available](http://us.blackberry.com/developers/resources/simulators.jsp).
 
+- Open the project.properties file with your favorite editor and customize the following properties.
+    - Smartphone (Optional)
+        - `blackberry.sim.dir` : Path to directory containing simulator. On windows file separator '\' must be escaped '\\\'.
+        - `blackberry.sim.bin` : Name of the simulator executable in the specified directory.
+    - Playbook
+        - `playbook.sim.ip` : IP address of simulator obtained when placing the simulator in developer mode through simulator security settings.
+        - `playbook.sim.password` : Simulator password which can be set through simulator security settings.
+- While in your project directory, in command prompt/terminal type `ant target load-simulator`. Replace `target` with either `blackberry` or `playbook`.  Note, for PlayBook the simulator virtual image must already be started.
+- The application will be installed in the All Applications section in the simulator.  Note, on BlackBerry OS 5 the application is installed in the Downloads folder.
 
-5B. Deploy to Device (Windows and Mac)
+5B.  Deploy to Device (Windows and Mac)
 --------------------------------------
 
-- You have to have your signing keys from RIM by filling out this [form](https://www.blackberry.com/SignedKeys/).
-- While in your project directory, in command prompt/terminal type `ant target load-device`. Replace the target with either blackberry or playbook.
-- Press the BlackBerry button on the simulator, go to downloads and you should see your app loaded there.
-
-
-Done!
------
-
-You can also checkout more detailed version of this guide [here](http://wiki.phonegap.com/w/page/31930982/Getting-Started-with-PhoneGap-BlackBerry-WebWorks).
+- Deploying to a device requires signing keys which can be obtained from RIM.
+    - Fill out this [form](https://bdsc.webapps.blackberry.com/html5/signingkey). to request signing keys.
+    - Install the signing keys once they have been received:
+        - [Setup Smartphone Signing keys](https://bdsc.webapps.blackberry.com/html5/documentation/ww_publishing/signing_setup_smartphone_apps_1920010_11.html)
+        - [Setup Tablet Signing keys](https://bdsc.webapps.blackberry.com/html5/documentation/ww_publishing/signing_setup_tablet_apps_1920009_11.html)
+- Install [BlackBerry Desktop Sofware](http://us.blackberry.com/apps-software/desktop/) to be able to install a signed application to a smartphone device attached via USB.
+- Open the project.properties file with your favorite editor and customize the following properties:
+    - Smartphone (Optional)
+        - `blackberry.sigtool.password` : Password used when code signing keys were registered.  If not specified, a prompt will occur.
+    - Playbook (Required)
+        - `playbook.sigtool.csk.password` : Signing key password.
+        - `playbook.sigtool.p12.password` : Signing key password.
+        - `playbook.device.ip` : IP address of device obtained when placing the device in developer mode through device security settings.
+        - `playbook.device.password` : Device password which is set through device security settings.
+- While in your project directory, in command prompt/terminal type `ant target load-device`. Replace `target` with either `blackberry` or `playbook`.
+- The application will be installed in the All Applications section in the device.  Note, on BlackBerry OS 5 the application is installed in the Downloads folder.
+
+Additional Information
+----------------------
+
+The following articles provide help to issues you may encounter when developing a Cordova application which is based on the BlackBerry WebWorks framework.
+
+- [BlackBerry WebWorks Development Pitfalls](http://supportforums.blackberry.com/t5/Web-and-WebWorks-Development/Common-BlackBerry-WebWorks-development-pitfalls-that-can-be/ta-p/624712)
+- [Best practices for packaging WebWorks applications](https://bdsc.webapps.blackberry.com/html5/documentation/ww_developing/bestpractice_compiling_ww_apps_1873324_11.html)
 

http://git-wip-us.apache.org/repos/asf/incubator-cordova-docs/blob/72364fb9/docs/en/1.6.0/guide/getting-started/ios/index.md
----------------------------------------------------------------------
diff --git a/docs/en/1.6.0/guide/getting-started/ios/index.md b/docs/en/1.6.0/guide/getting-started/ios/index.md
index a1eb4d2..768e065 100644
--- a/docs/en/1.6.0/guide/getting-started/ios/index.md
+++ b/docs/en/1.6.0/guide/getting-started/ios/index.md
@@ -1,8 +1,7 @@
 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.
-
+This guide describes how to set up your development environment for Cordova and run a sample application.
 
 Video Tutorials:
 ----------------
@@ -12,60 +11,85 @@ Video Tutorials:
 
 1. Requirements
 ---------------
-- Intel-based computer with Mac OS X Snow Leopard (10.6)
+- Intel-based computer with Mac OS X Lion (10.7)
 - Necessary for Installing on Device:
     - An Apple iOS device (iPhone, iPad, iPod Touch)
-    - iOS developer certification
+    - iOS ceveloper certification
 
 
 2. Install SDK + Cordova
 ------------------------
 
-- Download and install Xcode from [Apple Developer Portal](http://developer.apple.com) (Membership required)</p>
-- Donwload the latest copy of [Cordova](http://phonegap.com/download) and extract its contents. We will be working with the Android directory.
+- Install Xcode from the [Mac App Store](http://itunes.apple.com/us/app/xcode/id497799835?mt=12) </p>
+- Donwload the latest copy of [Cordova](http://phonegap.com/download) and extract its contents. We will be working with the **lib/ios** directory.
 
 
 3. Setup New Project
 --------------------
 
-- Launch Xcode, then under the File menu select **New** and then **New Project...**
+- Launch Xcode
+- Select the **File** menu
+- Select **New**, then **New Project...**
 - Select **Cordova-based Application** from the list of templates
 
     ![](img/guide/getting-started/ios/XCode4-templates.png)
-- Select the **Next** button, Fill in the "Product Name" &amp; "Company Identifier" for your app
+- Select the **Next** button
+- Fill in the "Product Name" &amp; "Company Identifier" for your app
 
     ![](img/guide/getting-started/ios/xcode4-name_your_app.png)
     
-- Choose a directory to store your app
-- You should see your project in Xcode 4 now. Press the **Run** button in the top left corner. Your build should succeed and launch in the simulator
-- You should see a error in your simulator informing you index.html was not found
-- To fix this, we need to copy the **www** directory into the project. Right click on the project in the left navigation window and click show in finder
-- In Finder, you should see the **www** directory beside your project
-- Next step is **IMPORTANT**! Drag the **www** folder into Xcode 4. You can't just drag the www folder into your app's folder. It needs to be dragged into Xcode 4!! In my case I would drag it and drop it on HiWorld shown below.
+- Do **NOT** check the "Use Automatic Reference Counting" checkbox
+- Select the **Next** button
+- **Choose a folder** to save your new app in
+- Select the **Create** button, this will create your project
+- Select the **Run** button in the top left corner. Your build should succeed and launch in the iOS Simulator
+
+    a. You should see an error in the iOS Simulator informing you that **www/index.html** was not found
+    
+    b. To fix this, we need to add a folder reference to the **www** directory into the project. 
+    
+    ![](img/guide/getting-started/ios/index-not-found.png)
+
+- **Right-click** on the project icon in the Project Navigator (left sidebar) and select **Show in Finder**
+- **In the Finder**, you should see the **www** directory beside your project
+
+    ![](img/guide/getting-started/ios/www-folder.png)
+
+- **IMPORTANT**! **Drag** the **www** folder into Xcode 4. **Don't** drag the www folder into your app's folder. **It needs to be dragged into Xcode 4.** For example, you would drag and drop it on the **highlighted red section** of the HelloWorld project shown below.
     
     ![](img/guide/getting-started/ios/project.jpg)
-- After you drag, you should see a prompt with a few options. Make sure to select **Create folder references for any added folders**. Click Finish
+- A window sheet should slide down with a few options, after the **"www"** folder has been dragged and dropped into the project. 
+- Select the radio-button **Create folder references for any added folders**.
+
+    ![](img/guide/getting-started/ios/create-folder-reference.png)
+
+- Select the **Finish** button
 
 
 4. Hello World
 --------------
 
-Open the folder named **www** and type `<h1>Hello World</h1>` after the `<body>` tag in **index.html**. You can also add any associated Javascript and CSS files there as well.
+- Select the folder named **www** in your Project Navigator in Xcode
+- Select the **index.html** file
+- Type `<h1>Hello World</h1>` after the `<body>` tag
+
+You can also add any associated JavaScript and CSS files there as well.
     
     
 5A. Deploy to Simulator
 -----------------------
 
-- Make sure to change the Active SDK in the top left menu to **Simulator+version#**.
-- Hit **Run** in your project window header.
+- Change the Active SDK in the Scheme drop-down menu on the toolbar to **iOS version# Simulator**.
+- Select the **Run** button in your project window's toolbar
 
 
 5B. Deploy to Device
 --------------------
 
-- Open [AppName]-Info.plist and change **BundleIdentifier** to the identifier provided by Apple. If you have a developer license, you can access and run the Assistant at [here](http://developer.apple.com/iphone/manage/overview/index.action) and register your App.
-- Make sure to change the Active SDK in the top left menu to **Device+version#**.
-- Hit **Run** in your project window header.
+- Open [AppName]-Info.plist (where [AppName] is your application's name), under the "Supporting Files" group
+- Change **BundleIdentifier** to the identifier provided by Apple, or your own bundle identifier. If you have a developer license, you can access and run the Assistant [here](http://developer.apple.com/iphone/manage/overview/index.action) and register your app.
+- Change the Active SDK in the Scheme drop-down menu on the toolbar to **[DEVICENAME]** where [DEVICENAME] is the name of the device you want to deploy to.
+- Select the **Run** button in your project window's toolbar
 
     ![](img/guide/getting-started/ios/HelloWorldiPhone4.png)    
 
@@ -73,5 +97,4 @@ Open the folder named **www** and type `<h1>Hello World</h1>` after the `<body>`
 Done!
 -----
 
-You can also checkout more detailed version of this guide [here](http://wiki.phonegap.com/w/page/39991939/Getting-Started-with-PhoneGap-iOS-using-Xcode-4-%28Template-Version%29).
-
+Add more HTML, CSS and JavaScript to your **www** folder outside of Xcode, your file additions will be picked up automatically inside Xcode.

http://git-wip-us.apache.org/repos/asf/incubator-cordova-docs/blob/72364fb9/docs/en/1.6.0/guide/getting-started/windows-phone/index.md
----------------------------------------------------------------------
diff --git a/docs/en/1.6.0/guide/getting-started/windows-phone/index.md b/docs/en/1.6.0/guide/getting-started/windows-phone/index.md
index 14ebd09..971e268 100644
--- a/docs/en/1.6.0/guide/getting-started/windows-phone/index.md
+++ b/docs/en/1.6.0/guide/getting-started/windows-phone/index.md
@@ -33,7 +33,7 @@ Necessary for Installing on Device and Submitting to Market Place:
 --------------------
 
 - Open Visual Studio Express for Windows Phone and choose **New Project**.
-- Select **PhoneGapStarter**.
+- Select **CordovaStarter**. ( the version number will be displayed in the template description )
 - Give your project a name, and select OK.
 
     ![](img/guide/getting-started/windows-phone/wpnewproj.PNG)

http://git-wip-us.apache.org/repos/asf/incubator-cordova-docs/blob/72364fb9/docs/en/1.6.0/phonegap/accelerometer/acceleration/acceleration.md
----------------------------------------------------------------------
diff --git a/docs/en/1.6.0/phonegap/accelerometer/acceleration/acceleration.md b/docs/en/1.6.0/phonegap/accelerometer/acceleration/acceleration.md
deleted file mode 100644
index 580e202..0000000
--- a/docs/en/1.6.0/phonegap/accelerometer/acceleration/acceleration.md
+++ /dev/null
@@ -1,85 +0,0 @@
-Acceleration
-============
-
-Contains `Accelerometer` data captured at a specific point in time.
-
-Properties
-----------
-
-- __x:__ Amount of motion on the x-axis. Range [0, 1] (`Number`)
-- __y:__ Amount of motion on the y-axis. Range [0, 1] (`Number`)
-- __z:__ Amount of motion on the z-axis. Range [0, 1] (`Number`)
-- __timestamp:__ Creation timestamp in milliseconds. (`DOMTimeStamp`)
-
-Description
------------
-
-This object is created and populated by Cordova, and returned by an `Accelerometer` method.
-
-Supported Platforms
--------------------
-
-- Android
-- BlackBerry WebWorks (OS 5.0 and higher)
-- iPhone
-- Windows Phone 7 ( Mango )
-
-Quick Example
--------------
-
-    function onSuccess(acceleration) {
-        alert('Acceleration X: ' + acceleration.x + '\n' +
-              'Acceleration Y: ' + acceleration.y + '\n' +
-              'Acceleration Z: ' + acceleration.z + '\n' +
-              'Timestamp: '      + acceleration.timestamp + '\n');
-    };
-
-    function onError() {
-        alert('onError!');
-    };
-
-    navigator.accelerometer.getCurrentAcceleration(onSuccess, onError);
-
-Full Example
-------------
-
-    <!DOCTYPE html>
-    <html>
-      <head>
-        <title>Acceleration Example</title>
-
-        <script type="text/javascript" charset="utf-8" src="cordova-1.6.0.js"></script>
-        <script type="text/javascript" charset="utf-8">
-
-        // Wait for Cordova to load
-        //
-        document.addEventListener("deviceready", onDeviceReady, false);
-
-        // Cordova is ready
-        //
-        function onDeviceReady() {
-            navigator.accelerometer.getCurrentAcceleration(onSuccess, onError);
-        }
-
-        // onSuccess: Get a snapshot of the current acceleration
-        //
-        function onSuccess() {
-            alert('Acceleration X: ' + acceleration.x + '\n' +
-                  'Acceleration Y: ' + acceleration.y + '\n' +
-                  'Acceleration Z: ' + acceleration.z + '\n' +
-                  'Timestamp: '      + acceleration.timestamp + '\n');
-        }
-
-        // onError: Failed to get the acceleration
-        //
-        function onError() {
-            alert('onError!');
-        }
-
-        </script>
-      </head>
-      <body>
-        <h1>Example</h1>
-        <p>getCurrentAcceleration</p>
-      </body>
-    </html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-cordova-docs/blob/72364fb9/docs/en/1.6.0/phonegap/accelerometer/accelerometer.clearWatch.md
----------------------------------------------------------------------
diff --git a/docs/en/1.6.0/phonegap/accelerometer/accelerometer.clearWatch.md b/docs/en/1.6.0/phonegap/accelerometer/accelerometer.clearWatch.md
deleted file mode 100644
index 9d70da7..0000000
--- a/docs/en/1.6.0/phonegap/accelerometer/accelerometer.clearWatch.md
+++ /dev/null
@@ -1,91 +0,0 @@
-accelerometer.clearWatch
-========================
-
-Stop watching the `Acceleration` referenced by the watch ID parameter.
-
-    navigator.accelerometer.clearWatch(watchID);
-
-- __watchID__: The ID returned by `accelerometer.watchAcceleration`.
-
-Supported Platforms
--------------------
-
-- Android
-- BlackBerry WebWorks (OS 5.0 and higher)
-- iPhone
-
-Quick Example
--------------
-
-    var watchID = navigator.accelerometer.watchAcceleration(onSuccess, onError, options);
-    
-    // ... later on ...
-    
-    navigator.accelerometer.clearWatch(watchID);
-    
-Full Example
-------------
-
-    <!DOCTYPE html>
-    <html>
-      <head>
-        <title>Acceleration Example</title>
-
-        <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 Cordova to load
-        //
-        document.addEventListener("deviceready", onDeviceReady, false);
-
-        // Cordova is ready
-        //
-        function onDeviceReady() {
-            startWatch();
-        }
-
-        // Start watching the acceleration
-        //
-        function startWatch() {
-            
-            // Update acceleration every 3 seconds
-            var options = { frequency: 3000 };
-            
-            watchID = navigator.accelerometer.watchAcceleration(onSuccess, onError, options);
-        }
-        
-        // Stop watching the acceleration
-        //
-        function stopWatch() {
-            if (watchID) {
-                navigator.accelerometer.clearWatch(watchID);
-                watchID = null;
-            }
-        }
-		    
-        // onSuccess: Get a snapshot of the current acceleration
-        //
-        function onSuccess(acceleration) {
-            var element = document.getElementById('accelerometer');
-            element.innerHTML = 'Acceleration X: ' + acceleration.x + '<br />' +
-                                'Acceleration Y: ' + acceleration.y + '<br />' +
-                                'Acceleration Z: ' + acceleration.z + '<br />' + 
-                                'Timestamp: '      + acceleration.timestamp + '<br />';
-        }
-
-        // onError: Failed to get the acceleration
-        //
-        function onError() {
-            alert('onError!');
-        }
-
-        </script>
-      </head>
-      <body>
-        <div id="accelerometer">Waiting for accelerometer...</div>
-		<button onclick="stopWatch();">Stop Watching</button>
-      </body>
-    </html>

http://git-wip-us.apache.org/repos/asf/incubator-cordova-docs/blob/72364fb9/docs/en/1.6.0/phonegap/accelerometer/accelerometer.getCurrentAcceleration.md
----------------------------------------------------------------------
diff --git a/docs/en/1.6.0/phonegap/accelerometer/accelerometer.getCurrentAcceleration.md b/docs/en/1.6.0/phonegap/accelerometer/accelerometer.getCurrentAcceleration.md
deleted file mode 100644
index 09ea085..0000000
--- a/docs/en/1.6.0/phonegap/accelerometer/accelerometer.getCurrentAcceleration.md
+++ /dev/null
@@ -1,87 +0,0 @@
-accelerometer.getCurrentAcceleration
-====================================
-
-Get the current acceleration along the x, y, and z axis.
-
-    navigator.accelerometer.getCurrentAcceleration(accelerometerSuccess, accelerometerError);
-
-Description
------------
-
-The accelerometer is a motion sensor that detects the change (delta) in movement relative to the current device orientation. The accelerometer can detect 3D movement along the x, y, and z axis.
-
-The acceleration is returned using the `accelerometerSuccess` callback function.
-
-Supported Platforms
--------------------
-
-- Android
-- BlackBerry WebWorks (OS 5.0 and higher)
-- iPhone
-
-Quick Example
--------------
-
-    function onSuccess(acceleration) {
-        alert('Acceleration X: ' + acceleration.x + '\n' +
-              'Acceleration Y: ' + acceleration.y + '\n' +
-              'Acceleration Z: ' + acceleration.z + '\n' +
-              'Timestamp: '      + acceleration.timestamp + '\n');
-    };
-
-    function onError() {
-        alert('onError!');
-    };
-
-    navigator.accelerometer.getCurrentAcceleration(onSuccess, onError);
-
-Full Example
-------------
-
-    <!DOCTYPE html>
-    <html>
-      <head>
-        <title>Acceleration Example</title>
-
-        <script type="text/javascript" charset="utf-8" src="cordova-1.6.0.js"></script>
-        <script type="text/javascript" charset="utf-8">
-
-        // Wait for Cordova to load
-        //
-        document.addEventListener("deviceready", onDeviceReady, false);
-
-        // Cordova is ready
-        //
-        function onDeviceReady() {
-            navigator.accelerometer.getCurrentAcceleration(onSuccess, onError);
-        }
-    
-        // onSuccess: Get a snapshot of the current acceleration
-        //
-        function onSuccess(acceleration) {
-            alert('Acceleration X: ' + acceleration.x + '\n' +
-                  'Acceleration Y: ' + acceleration.y + '\n' +
-                  'Acceleration Z: ' + acceleration.z + '\n' +
-                  'Timestamp: '      + acceleration.timestamp + '\n');
-        }
-    
-        // onError: Failed to get the acceleration
-        //
-        function onError() {
-            alert('onError!');
-        }
-
-        </script>
-      </head>
-      <body>
-        <h1>Example</h1>
-        <p>getCurrentAcceleration</p>
-      </body>
-    </html>
-    
-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 Cordova `watchAccelerometer` call.

http://git-wip-us.apache.org/repos/asf/incubator-cordova-docs/blob/72364fb9/docs/en/1.6.0/phonegap/accelerometer/accelerometer.md
----------------------------------------------------------------------
diff --git a/docs/en/1.6.0/phonegap/accelerometer/accelerometer.md b/docs/en/1.6.0/phonegap/accelerometer/accelerometer.md
deleted file mode 100644
index ccb6812..0000000
--- a/docs/en/1.6.0/phonegap/accelerometer/accelerometer.md
+++ /dev/null
@@ -1,23 +0,0 @@
-Accelerometer
-=============
-
-> Captures device motion in the x, y, and z direction.
-
-Methods
--------
-
-- accelerometer.getCurrentAcceleration
-- accelerometer.watchAcceleration
-- accelerometer.clearWatch
-
-Arguments
----------
-
-- accelerometerSuccess
-- accelerometerError
-- accelerometerOptions
-
-Objects (Read-Only)
--------------------
-
-- Acceleration
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-cordova-docs/blob/72364fb9/docs/en/1.6.0/phonegap/accelerometer/accelerometer.watchAcceleration.md
----------------------------------------------------------------------
diff --git a/docs/en/1.6.0/phonegap/accelerometer/accelerometer.watchAcceleration.md b/docs/en/1.6.0/phonegap/accelerometer/accelerometer.watchAcceleration.md
deleted file mode 100644
index 4bc2484..0000000
--- a/docs/en/1.6.0/phonegap/accelerometer/accelerometer.watchAcceleration.md
+++ /dev/null
@@ -1,116 +0,0 @@
-accelerometer.watchAcceleration
-===============================
-
-At a regular interval, get the acceleration along the x, y, and z axis.
-
-    var watchID = navigator.accelerometer.watchAcceleration(accelerometerSuccess,
-                                                           accelerometerError,
-                                                           [accelerometerOptions]);
-                                                           
-Description
------------
-
-The accelerometer is a motion sensor that detects the change (delta) in movement relative to the current position. The accelerometer can detect 3D movement along the x, y, and z axis.
-
-The `accelerometer.watchAcceleration` gets the device's current acceleration at a regular interval. Each time the `Acceleration` is retrieved, the `accelerometerSuccess` callback function is executed. Specify the interval in milliseconds via the `frequency` parameter in the `acceleratorOptions` object.
-
-The returned watch ID references references the accelerometer watch interval. The watch ID can be used with `accelerometer.clearWatch` to stop watching the accelerometer.
-
-Supported Platforms
--------------------
-
-- Android
-- BlackBerry WebWorks (OS 5.0 and higher)
-- iPhone
-
-
-Quick Example
--------------
-
-    function onSuccess(acceleration) {
-        alert('Acceleration X: ' + acceleration.x + '\n' +
-              'Acceleration Y: ' + acceleration.y + '\n' +
-              'Acceleration Z: ' + acceleration.z + '\n' +
-              'Timestamp: '      + acceleration.timestamp + '\n');
-    };
-
-    function onError() {
-        alert('onError!');
-    };
-
-    var options = { frequency: 3000 };  // Update every 3 seconds
-    
-    var watchID = navigator.accelerometer.watchAcceleration(onSuccess, onError, options);
-
-Full Example
-------------
-
-    <!DOCTYPE html>
-    <html>
-      <head>
-        <title>Acceleration Example</title>
-
-        <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 Cordova to load
-        //
-        document.addEventListener("deviceready", onDeviceReady, false);
-
-        // Cordova is ready
-        //
-        function onDeviceReady() {
-            startWatch();
-        }
-
-        // Start watching the acceleration
-        //
-        function startWatch() {
-            
-            // Update acceleration every 3 seconds
-            var options = { frequency: 3000 };
-            
-            watchID = navigator.accelerometer.watchAcceleration(onSuccess, onError, options);
-        }
-        
-        // Stop watching the acceleration
-        //
-        function stopWatch() {
-            if (watchID) {
-                navigator.accelerometer.clearWatch(watchID);
-                watchID = null;
-            }
-        }
-        
-        // onSuccess: Get a snapshot of the current acceleration
-        //
-        function onSuccess(acceleration) {
-            var element = document.getElementById('accelerometer');
-            element.innerHTML = 'Acceleration X: ' + acceleration.x + '<br />' +
-                                'Acceleration Y: ' + acceleration.y + '<br />' +
-                                'Acceleration Z: ' + acceleration.z + '<br />' +
-                                'Timestamp: '      + acceleration.timestamp + '<br />';
-        }
-
-        // onError: Failed to get the acceleration
-        //
-        function onError() {
-            alert('onError!');
-        }
-
-        </script>
-      </head>
-      <body>
-        <div id="accelerometer">Waiting for accelerometer...</div>
-      </body>
-    </html>
-    
- iPhone Quirks
--------------
-
-- 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/72364fb9/docs/en/1.6.0/phonegap/accelerometer/parameters/accelerometerError.md
----------------------------------------------------------------------
diff --git a/docs/en/1.6.0/phonegap/accelerometer/parameters/accelerometerError.md b/docs/en/1.6.0/phonegap/accelerometer/parameters/accelerometerError.md
deleted file mode 100644
index 0765bfb..0000000
--- a/docs/en/1.6.0/phonegap/accelerometer/parameters/accelerometerError.md
+++ /dev/null
@@ -1,8 +0,0 @@
-accelerometerError
-==================
-
-onError callback function for acceleration functions.
-
-    function() {
-        // Handle the error
-    }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-cordova-docs/blob/72364fb9/docs/en/1.6.0/phonegap/accelerometer/parameters/accelerometerOptions.md
----------------------------------------------------------------------
diff --git a/docs/en/1.6.0/phonegap/accelerometer/parameters/accelerometerOptions.md b/docs/en/1.6.0/phonegap/accelerometer/parameters/accelerometerOptions.md
deleted file mode 100644
index 82066ac..0000000
--- a/docs/en/1.6.0/phonegap/accelerometer/parameters/accelerometerOptions.md
+++ /dev/null
@@ -1,9 +0,0 @@
-accelerometerOptions
-====================
-
-An optional parameter to customize the retrieval of the accelerometer.
-
-Options
--------
-
-- __frequency:__ How often to retrieve the `Acceleration` in milliseconds. _(Number)_ (Default: 10000)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-cordova-docs/blob/72364fb9/docs/en/1.6.0/phonegap/accelerometer/parameters/accelerometerSuccess.md
----------------------------------------------------------------------
diff --git a/docs/en/1.6.0/phonegap/accelerometer/parameters/accelerometerSuccess.md b/docs/en/1.6.0/phonegap/accelerometer/parameters/accelerometerSuccess.md
deleted file mode 100644
index 23e7a43..0000000
--- a/docs/en/1.6.0/phonegap/accelerometer/parameters/accelerometerSuccess.md
+++ /dev/null
@@ -1,23 +0,0 @@
-accelerometerSuccess
-====================
-
-onSuccess callback function that provides the Acceleration information.
-
-    function(acceleration) {
-        // Do something
-    }
-
-Parameters
-----------
-
-- __acceleration:__ The acceleration at a single moment in time. (Acceleration)
-
-Example
--------
-
-    function onSuccess(acceleration) {
-        alert('Acceleration X: ' + acceleration.x + '\n' +
-              'Acceleration Y: ' + acceleration.y + '\n' +
-              'Acceleration Z: ' + acceleration.z + '\n' +
-              'Timestamp: '      + acceleration.timestamp + '\n');
-    };
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-cordova-docs/blob/72364fb9/docs/en/1.6.0/phonegap/camera/camera.getPicture.md
----------------------------------------------------------------------
diff --git a/docs/en/1.6.0/phonegap/camera/camera.getPicture.md b/docs/en/1.6.0/phonegap/camera/camera.getPicture.md
deleted file mode 100644
index 1b13131..0000000
--- a/docs/en/1.6.0/phonegap/camera/camera.getPicture.md
+++ /dev/null
@@ -1,171 +0,0 @@
-camera.getPicture
-=================
-
-Takes a photo using the camera or retrieves a photo from the device's album.  The image is returned as a base64 encoded `String` or as the URI of an image file.
-
-    navigator.camera.getPicture( cameraSuccess, cameraError, [ cameraOptions ] );
-
-Description
------------
-
-Function `camera.getPicture` opens the device's default camera application so that the user can take a picture (if `Camera.sourceType = Camera.PictureSourceType.CAMERA`, which is the default). Once the photo is taken, the camera application closes and your application is restored.
-
-If `Camera.sourceType = Camera.PictureSourceType.PHOTOLIBRARY` or `Camera.PictureSourceType.SAVEDPHOTOALBUM`, then a photo chooser dialog is shown, from which a photo from the album can be selected.
-
-The return value will be sent to the `cameraSuccess` function, in one of the following formats, depending on the `cameraOptions` you specify:
-
-- A `String` containing the Base64 encoded photo image (default). 
-- A `String` representing the image file location on local storage.  
-
-You can do whatever you want with the encoded image or URI, for example:
-
-- Render the image in an `<img>` tag _(see example below)_
-- Save the data locally (`LocalStorage`, [Lawnchair](http://brianleroux.github.com/lawnchair/), etc)
-- Post the data to a remote server
-
-Note: The image quality of pictures taken using the camera on newer devices is quite good.  _Encoding such images using Base64 has caused memory issues on some of these devices (iPhone 4, BlackBerry Torch 9800)._  Therefore, using FILE_URI as the 'Camera.destinationType' is highly recommended.
-
-Supported Platforms
--------------------
-
-- Android
-- Blackberry WebWorks (OS 5.0 and higher)
-- iPhone
-- Windows Phone 7 ( Mango )
-
-Quick Example
--------------
-
-Take photo and retrieve Base64-encoded image:
-
-    navigator.camera.getPicture(onSuccess, onFail, { quality: 50 }); 
-
-    function onSuccess(imageData) {
-        var image = document.getElementById('myImage');
-        image.src = "data:image/jpeg;base64," + imageData;
-    }
-
-    function onFail(message) {
-        alert('Failed because: ' + message);
-    }
-
-Take photo and retrieve image file location: 
-
-    navigator.camera.getPicture(onSuccess, onFail, { quality: 50, 
-        destinationType: Camera.DestinationType.FILE_URI }); 
-
-    function onSuccess(imageURI) {
-        var image = document.getElementById('myImage');
-        image.src = imageURI;
-    }
-
-    function onFail(message) {
-        alert('Failed because: ' + message);
-    }
-
-
-Full Example
-------------
-
-    <!DOCTYPE html>
-    <html>
-      <head>
-        <title>Capture Photo</title>
-
-        <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 Cordova to connect with the device
-        //
-        document.addEventListener("deviceready",onDeviceReady,false);
-    
-        // Cordova is ready to be used!
-        //
-        function onDeviceReady() {
-            pictureSource=navigator.camera.PictureSourceType;
-            destinationType=navigator.camera.DestinationType;
-        }
-
-        // Called when a photo is successfully retrieved
-        //
-        function onPhotoDataSuccess(imageData) {
-          // Uncomment to view the base64 encoded image data
-          // console.log(imageData);
-      
-          // Get image handle
-          //
-          var smallImage = document.getElementById('smallImage');
-      
-          // Unhide image elements
-          //
-          smallImage.style.display = 'block';
-      
-          // Show the captured photo
-          // The inline CSS rules are used to resize the image
-          //
-          smallImage.src = "data:image/jpeg;base64," + imageData;
-        }
-
-        // Called when a photo is successfully retrieved
-        //
-        function onPhotoURISuccess(imageURI) {
-          // Uncomment to view the image file URI 
-          // console.log(imageURI);
-      
-          // Get image handle
-          //
-          var largeImage = document.getElementById('largeImage');
-      
-          // Unhide image elements
-          //
-          largeImage.style.display = 'block';
-      
-          // Show the captured photo
-          // The inline CSS rules are used to resize the image
-          //
-          largeImage.src = imageURI;
-        }
-
-        // A button will call this function
-        //
-        function capturePhoto() {
-          // Take picture using device camera and retrieve image as base64-encoded string
-          navigator.camera.getPicture(onPhotoDataSuccess, onFail, { quality: 50 });
-        }
-
-        // A button will call this function
-        //
-        function capturePhotoEdit() {
-          // Take picture using device camera, allow edit, and retrieve image as base64-encoded string  
-          navigator.camera.getPicture(onPhotoDataSuccess, onFail, { quality: 20, allowEdit: true }); 
-        }
-    
-        // A button will call this function
-        //
-        function getPhoto(source) {
-          // Retrieve image file location from specified source
-          navigator.camera.getPicture(onPhotoURISuccess, onFail, { quality: 50, 
-            destinationType: destinationType.FILE_URI,
-            sourceType: source });
-        }
-
-        // Called if something bad happens.
-        // 
-        function onFail(message) {
-          alert('Failed because: ' + message);
-        }
-
-        </script>
-      </head>
-      <body>
-        <button onclick="capturePhoto();">Capture Photo</button> <br>
-        <button onclick="capturePhotoEdit();">Capture Editable Photo</button> <br>
-        <button onclick="getPhoto(pictureSource.PHOTOLIBRARY);">From Photo Library</button><br>
-        <button onclick="getPhoto(pictureSource.SAVEDPHOTOALBUM);">From Photo Album</button><br>
-        <img style="display:none;width:60px;height:60px;" id="smallImage" src="" />
-        <img style="display:none;" id="largeImage" src="" />
-      </body>
-    </html>

http://git-wip-us.apache.org/repos/asf/incubator-cordova-docs/blob/72364fb9/docs/en/1.6.0/phonegap/camera/camera.md
----------------------------------------------------------------------
diff --git a/docs/en/1.6.0/phonegap/camera/camera.md b/docs/en/1.6.0/phonegap/camera/camera.md
deleted file mode 100644
index e8ec1d8..0000000
--- a/docs/en/1.6.0/phonegap/camera/camera.md
+++ /dev/null
@@ -1,9 +0,0 @@
-Camera
-======
-
-> The `camera` object provides access to the device's default camera application.
-
-Methods
--------
-
-- camera.getPicture
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-cordova-docs/blob/72364fb9/docs/en/1.6.0/phonegap/camera/parameter/cameraError.md
----------------------------------------------------------------------
diff --git a/docs/en/1.6.0/phonegap/camera/parameter/cameraError.md b/docs/en/1.6.0/phonegap/camera/parameter/cameraError.md
deleted file mode 100644
index cc219eb..0000000
--- a/docs/en/1.6.0/phonegap/camera/parameter/cameraError.md
+++ /dev/null
@@ -1,13 +0,0 @@
-cameraError
-===========
-
-onError callback function that provides an error message.
-
-    function(message) {
-        // Show a helpful message
-    }
-
-Parameters
-----------
-
-- __message:__ The message is provided by the device's native code. (`String`)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-cordova-docs/blob/72364fb9/docs/en/1.6.0/phonegap/camera/parameter/cameraOptions.md
----------------------------------------------------------------------
diff --git a/docs/en/1.6.0/phonegap/camera/parameter/cameraOptions.md b/docs/en/1.6.0/phonegap/camera/parameter/cameraOptions.md
deleted file mode 100644
index 6c2414b..0000000
--- a/docs/en/1.6.0/phonegap/camera/parameter/cameraOptions.md
+++ /dev/null
@@ -1,90 +0,0 @@
-cameraOptions
-=============
-
-Optional parameters to customize the camera settings.
-
-    { quality : 75, 
-      destinationType : Camera.DestinationType.DATA_URL, 
-      sourceType : Camera.PictureSourceType.CAMERA, 
-      allowEdit : true,
-      encodingType: Camera.EncodingType.JPEG,
-      targetWidth: 100,
-      targetHeight: 100 };
-
-Options
--------
-
-- __quality:__ Quality of saved image. Range is [0, 100]. (`Number`)
-
-- __destinationType:__ Choose the format of the return value.  Defined in navigator.camera.DestinationType (`Number`)
-        
-            Camera.DestinationType = {
-                DATA_URL : 0,                // Return image as base64 encoded string
-                FILE_URI : 1                 // Return image file URI
-            };
-
-- __sourceType:__ Set the source of the picture.  Defined in nagivator.camera.PictureSourceType (`Number`)
-     
-        Camera.PictureSourceType = {
-            PHOTOLIBRARY : 0,
-            CAMERA : 1,
-            SAVEDPHOTOALBUM : 2
-        };
-
-- __allowEdit:__ Allow simple editing of image before selection. (`Boolean`)
-  
-- __EncodingType:__ Choose the encoding of the returned image file.  Defined in navigator.camera.EncodingType (`Number`)
-        
-            Camera.EncodingType = {
-                JPEG : 0,               // Return JPEG encoded image
-                PNG : 1                 // Return PNG encoded image
-            };
-
-- __targetWidth:__ Width in pixels to scale image. Must be used with targetHeight.  Aspect ratio is maintained. (`Number`)
-- __targetHeight:__ Height in pixels to scale image. Must be used with targetWidth. Aspect ratio is maintained. (`Number`)
-
-- __MediaType:__ Set the type of media to select from.  Only works when PictureSourceType is PHOTOLIBRARY or SAVEDPHOTOALBUM. Defined in nagivator.camera.MediaType (`Number`)
-     
-        Camera.MediaType = { 
-			PICTURE: 0,             // allow selection of still pictures only. DEFAULT. Will return format specified via DestinationType
-			VIDEO: 1,               // allow selection of video only, WILL ALWAYS RETURN FILE_URI
-			ALLMEDIA : 2			// allow selection from all media types
-};
-  
-Android Quirks
---------------
-
-- Ignores the `allowEdit` parameter.
-- Camera.PictureSourceType.PHOTOLIBRARY and Camera.PictureSourceType.SAVEDPHOTOALBUM both display the same photo album.
-- Camera.EncodingType is not supported.
-
-BlackBerry Quirks
------------------
-
-- Ignores the `quality` parameter.
-- Ignores the `sourceType` parameter.
-- Ignores the `allowEdit` parameter.
-- Application must have key injection permissions to close native Camera application after photo is taken.
-- Using Large image sizes may result in inability to encode image on later model devices with high resolution cameras (e.g. Torch 9800).
-- Camera.MediaType is not supported.
-
-Palm Quirks
------------
-
-- Ignores the `quality` parameter.
-- Ignores the `sourceType` parameter.
-- Ignores the `allowEdit` parameter.
-- Camera.MediaType is not supported.
-
-iPhone Quirks
---------------
-
-- Set `quality` below 50 to avoid memory error on some devices.
-- When `destinationType.FILE_URI` is used, photos are saved in the application's temporary directory.
-- The contents of the application's temporary directory is deleted when the application ends. Developers may also delete the contents of this directory using the navigator.fileMgr APIs if storage space is a concern.
-
-Windows Phone 7 Quirks
---------------
-
-- Ignores the `allowEdit` parameter.
-           
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-cordova-docs/blob/72364fb9/docs/en/1.6.0/phonegap/camera/parameter/cameraSuccess.md
----------------------------------------------------------------------
diff --git a/docs/en/1.6.0/phonegap/camera/parameter/cameraSuccess.md b/docs/en/1.6.0/phonegap/camera/parameter/cameraSuccess.md
deleted file mode 100644
index a64a8ef..0000000
--- a/docs/en/1.6.0/phonegap/camera/parameter/cameraSuccess.md
+++ /dev/null
@@ -1,23 +0,0 @@
-cameraSuccess
-=============
-
-onSuccess callback function that provides the image data.
-
-    function(imageData) {
-        // Do something with the image
-    }
-
-Parameters
-----------
-
-- __imageData:__ Base64 encoding of the image data, OR the image file URI, depending on `cameraOptions` used. (`String`)
-
-Example
--------
-
-    // Show image
-    //
-    function cameraCallback(imageData) {
-        var image = document.getElementById('myImage');
-        image.src = "data:image/jpeg;base64," + imageData;
-    }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-cordova-docs/blob/72364fb9/docs/en/1.6.0/phonegap/compass/compass.clearWatch.md
----------------------------------------------------------------------
diff --git a/docs/en/1.6.0/phonegap/compass/compass.clearWatch.md b/docs/en/1.6.0/phonegap/compass/compass.clearWatch.md
deleted file mode 100755
index 4422f88..0000000
--- a/docs/en/1.6.0/phonegap/compass/compass.clearWatch.md
+++ /dev/null
@@ -1,90 +0,0 @@
-compass.clearWatch
-========================
-
-Stop watching the compass referenced by the watch ID parameter.
-
-    navigator.compass.clearWatch(watchID);
-
-- __watchID__: The ID returned by `compass.watchHeading`.
-
-Supported Platforms
--------------------
-
-- Android
-- iPhone
-- Windows Phone 7 ( Mango ) if available in hardware
-
-Quick Example
--------------
-
-    var watchID = navigator.compass.watchHeading(onSuccess, onError, options);
-    
-    // ... later on ...
-    
-    navigator.compass.clearWatch(watchID);
-    
-Full Example
-------------
-
-    <!DOCTYPE html>
-    <html>
-      <head>
-        <title>Compass Example</title>
-
-        <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 Cordova to load
-        //
-        document.addEventListener("deviceready", onDeviceReady, false);
-
-        // Cordova is ready
-        //
-        function onDeviceReady() {
-            startWatch();
-        }
-
-        // Start watching the compass
-        //
-        function startWatch() {
-            
-            // Update compass every 3 seconds
-            var options = { frequency: 3000 };
-            
-            watchID = navigator.compass.watchHeading(onSuccess, onError, options);
-        }
-        
-        // Stop watching the compass
-        //
-        function stopWatch() {
-            if (watchID) {
-                navigator.compass.clearWatch(watchID);
-                watchID = null;
-            }
-        }
-        
-        // onSuccess: Get the current heading
-        //
-        function onSuccess(heading) {
-            var element = document.getElementById('heading');
-            element.innerHTML = 'Heading: ' + heading.magneticHeading;
-        }
-
-        // onError: Failed to get the heading
-        //
-        function onError(compassError) {
-            alert('Compass error: ' + compassError.code);
-        }
-
-
-        </script>
-      </head>
-      <body>
-        <div id="heading">Waiting for heading...</div>
-        <button onclick="startWatch();">Start Watching</button>
-        <button onclick="stopWatch();">Stop Watching</button>
-      </body>
-    </html>

http://git-wip-us.apache.org/repos/asf/incubator-cordova-docs/blob/72364fb9/docs/en/1.6.0/phonegap/compass/compass.clearWatchFilter.md
----------------------------------------------------------------------
diff --git a/docs/en/1.6.0/phonegap/compass/compass.clearWatchFilter.md b/docs/en/1.6.0/phonegap/compass/compass.clearWatchFilter.md
deleted file mode 100644
index 44d200f..0000000
--- a/docs/en/1.6.0/phonegap/compass/compass.clearWatchFilter.md
+++ /dev/null
@@ -1,88 +0,0 @@
-compass.clearWatchFilter
-========================
-
-Stop watching the compass referenced by the watch ID parameter.
-
-    navigator.compass.clearWatchFilter(watchID);
-
-- __watchID__: The ID returned by `compass.watchHeadingFilter`.
-
-Supported Platforms
--------------------
-
-- iPhone
-
-Quick Example
--------------
-
-    var watchID = navigator.compass.watchHeadingFilter(onSuccess, onError, options);
-    
-    // ... later on ...
-    
-    navigator.compass.clearWatchFilter(watchID);
-    
-Full Example
-------------
-
-    <!DOCTYPE html>
-    <html>
-      <head>
-        <title>Compass Example</title>
-
-        <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 Cordova to load
-        //
-        document.addEventListener("deviceready", onDeviceReady, false);
-
-        // Cordova is ready
-        //
-        function onDeviceReady() {
-            startWatch();
-        }
-
-        // Start watching the compass
-        //
-        function startWatch() {
-            
-            // Get notified on compass heading changes or 10 degrees or more
-            var options = { filter: 10 };
-            
-            watchID = navigator.compass.watchHeadingFilter(onSuccess, onError, options);
-        }
-        
-        // Stop watching the compass
-        //
-        function stopWatch() {
-            if (watchID) {
-                navigator.compass.clearWatchFilter(watchID);
-                watchID = null;
-            }
-        }
-        
-        // onSuccess: Get the current heading
-        //
-        function onSuccess(heading) {
-            var element = document.getElementById('heading');
-            element.innerHTML = 'Heading: ' + heading.magneticHeading;
-        }
-
-        // onError: Failed to get the heading
-        //
-        function onError(compassError) {
-            alert('Compass error: ' + compassError.code);
-        }
-
-
-        </script>
-      </head>
-      <body>
-        <div id="heading">Waiting for heading...</div>
-        <button onclick="startWatch();">Start Watching via Filter</button>
-        <button onclick="stopWatch();">Stop Watching</button>
-      </body>
-    </html>