You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by db...@apache.org on 2015/09/11 06:40:52 UTC

[08/51] [partial] docs commit: Reverting autolinking change because of inconsistencies.

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/af6a5545/www/docs/en/1.8.0/cordova/media/media.release.md
----------------------------------------------------------------------
diff --git a/www/docs/en/1.8.0/cordova/media/media.release.md b/www/docs/en/1.8.0/cordova/media/media.release.md
index dd000f6..a484d1e 100644
--- a/www/docs/en/1.8.0/cordova/media/media.release.md
+++ b/www/docs/en/1.8.0/cordova/media/media.release.md
@@ -29,7 +29,7 @@ Releases the underlying operating systems audio resources.
 Description
 -----------
 
-Function `media.release` is a synchronous function that releases the underlying operating systems audio resources.  This function is particularly important for Android as there are a finite amount of OpenCore instances for media playback.  Developers should call the 'release' function when they no longer need the <a href="media.html">Media</a> resource.
+Function `media.release` is a synchronous function that releases the underlying operating systems audio resources.  This function is particularly important for Android as there are a finite amount of OpenCore instances for media playback.  Developers should call the 'release' function when they no longer need the Media resource.
 
 Supported Platforms
 -------------------
@@ -39,36 +39,36 @@ Supported Platforms
 - iOS
 - Windows Phone 7 ( Mango )
     
-Quick <a href="../storage/storage.opendatabase.html">Example</a>
+Quick Example
 -------------
 
         // Audio player
         //
-        var my_media = new <a href="media.html">Media</a>(src, onSuccess, onError);
+        var my_media = new Media(src, onSuccess, onError);
         
-        my_<a href="media.play.html">media.play</a>();
-        my_<a href="media.stop.html">media.stop</a>();
+        my_media.play();
+        my_media.stop();
         my_media.release();
 
-Full <a href="../storage/storage.opendatabase.html">Example</a>
+Full Example
 ------------
 
         <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
                               "http://www.w3.org/TR/html4/strict.dtd">
         <html>
           <head>
-            <title><a href="media.html">Media</a> <a href="../storage/storage.opendatabase.html">Example</a></title>
+            <title>Media Example</title>
         
             <script type="text/javascript" charset="utf-8" src="cordova-1.8.0.js"></script>
             <script type="text/javascript" charset="utf-8">
         
             // Wait for Cordova to load
             //
-            document.addEventListener("<a href="../events/events.deviceready.html">deviceready</a>", on<a href="../device/device.html">Device</a>Ready, false);
+            document.addEventListener("deviceready", onDeviceReady, false);
         
             // Cordova is ready
             //
-            function on<a href="../device/device.html">Device</a>Ready() {
+            function onDeviceReady() {
                 playAudio("http://audio.ibeat.org/content/p1rj1s/p1rj1s_-_rockGuitar.mp3");
             }
         
@@ -80,27 +80,27 @@ Full <a href="../storage/storage.opendatabase.html">Example</a>
             // Play audio
             //
             function playAudio(src) {
-                // Create <a href="media.html">Media</a> object from src
-                my_media = new <a href="media.html">Media</a>(src, onSuccess, onError);
+                // Create Media object from src
+                my_media = new Media(src, onSuccess, onError);
         
                 // Play audio
-                my_<a href="media.play.html">media.play</a>();
+                my_media.play();
         
                 // Update my_media position every second
                 if (mediaTimer == null) {
                     mediaTimer = setInterval(function() {
                         // get my_media position
-                        my_media.getCurrent<a href="../geolocation/Position/position.html">Position</a>(
+                        my_media.getCurrentPosition(
                             // success callback
                             function(position) {
                                 if (position > -1) {
-                                    setAudio<a href="../geolocation/Position/position.html">Position</a>((position) + " sec");
+                                    setAudioPosition((position) + " sec");
                                 }
                             },
                             // error callback
                             function(e) {
                                 console.log("Error getting pos=" + e);
-                                setAudio<a href="../geolocation/Position/position.html">Position</a>("Error: " + e);
+                                setAudioPosition("Error: " + e);
                             }
                         );
                     }, 1000);
@@ -109,9 +109,9 @@ Full <a href="../storage/storage.opendatabase.html">Example</a>
         
             // Pause audio
             // 
-            function <a href="../events/events.pause.html">pause</a>Audio() {
+            function pauseAudio() {
                 if (my_media) {
-                    my_media.<a href="../events/events.pause.html">pause</a>();
+                    my_media.pause();
                 }
             }
         
@@ -119,7 +119,7 @@ Full <a href="../storage/storage.opendatabase.html">Example</a>
             // 
             function stopAudio() {
                 if (my_media) {
-                    my_<a href="media.stop.html">media.stop</a>();
+                    my_media.stop();
                 }
                 clearInterval(mediaTimer);
                 mediaTimer = null;
@@ -140,7 +140,7 @@ Full <a href="../storage/storage.opendatabase.html">Example</a>
         
             // Set audio position
             // 
-            function setAudio<a href="../geolocation/Position/position.html">Position</a>(position) {
+            function setAudioPosition(position) {
                 document.getElementById('audio_position').innerHTML = position;
             }
         
@@ -148,7 +148,7 @@ Full <a href="../storage/storage.opendatabase.html">Example</a>
           </head>
           <body>
             <a href="#" class="btn large" onclick="playAudio('http://audio.ibeat.org/content/p1rj1s/p1rj1s_-_rockGuitar.mp3');">Play Audio</a>
-            <a href="#" class="btn large" onclick="<a href="../events/events.pause.html">pause</a>Audio();">Pause Playing Audio</a>
+            <a href="#" class="btn large" onclick="pauseAudio();">Pause Playing Audio</a>
             <a href="#" class="btn large" onclick="stopAudio();">Stop Playing Audio</a>
             <p id="audio_position"></p>
           </body>

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/af6a5545/www/docs/en/1.8.0/cordova/media/media.seekTo.md
----------------------------------------------------------------------
diff --git a/www/docs/en/1.8.0/cordova/media/media.seekTo.md b/www/docs/en/1.8.0/cordova/media/media.seekTo.md
index 74d1ac3..0b54682 100644
--- a/www/docs/en/1.8.0/cordova/media/media.seekTo.md
+++ b/www/docs/en/1.8.0/cordova/media/media.seekTo.md
@@ -34,7 +34,7 @@ Parameters
 Description
 -----------
 
-Function `media.seekTo` is an asynchronous function that updates the current position of the underlying audio file of a <a href="media.html">Media</a> object. Also updates the ___position__ parameter within the <a href="media.html">Media</a> object. 
+Function `media.seekTo` is an asynchronous function that updates the current position of the underlying audio file of a Media object. Also updates the ___position__ parameter within the Media object. 
 
 Supported Platforms
 -------------------
@@ -44,38 +44,38 @@ Supported Platforms
 - iOS
 - Windows Phone 7 ( Mango )
     
-Quick <a href="../storage/storage.opendatabase.html">Example</a>
+Quick Example
 -------------
 
         // Audio player
         //
-        var my_media = new <a href="media.html">Media</a>(src, onSuccess, onError);
-		my_<a href="media.play.html">media.play</a>();
+        var my_media = new Media(src, onSuccess, onError);
+		my_media.play();
         // SeekTo to 10 seconds after 5 seconds
         setTimeout(function() {
             my_media.seekTo(10000);
         }, 5000);
 
 
-Full <a href="../storage/storage.opendatabase.html">Example</a>
+Full Example
 ------------
 
         <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
                       "http://www.w3.org/TR/html4/strict.dtd">
         <html>
           <head>
-            <title><a href="media.html">Media</a> <a href="../storage/storage.opendatabase.html">Example</a></title>
+            <title>Media Example</title>
         
             <script type="text/javascript" charset="utf-8" src="cordova-1.8.0.js"></script>
             <script type="text/javascript" charset="utf-8">
         
             // Wait for Cordova to load
             //
-            document.addEventListener("<a href="../events/events.deviceready.html">deviceready</a>", on<a href="../device/device.html">Device</a>Ready, false);
+            document.addEventListener("deviceready", onDeviceReady, false);
         
             // Cordova is ready
             //
-            function on<a href="../device/device.html">Device</a>Ready() {
+            function onDeviceReady() {
                 playAudio("http://audio.ibeat.org/content/p1rj1s/p1rj1s_-_rockGuitar.mp3");
             }
         
@@ -87,19 +87,19 @@ Full <a href="../storage/storage.opendatabase.html">Example</a>
             // Play audio
             //
             function playAudio(src) {
-                // Create <a href="media.html">Media</a> object from src
-                my_media = new <a href="media.html">Media</a>(src, onSuccess, onError);
+                // Create Media object from src
+                my_media = new Media(src, onSuccess, onError);
         
                 // Play audio
-                my_<a href="media.play.html">media.play</a>();
+                my_media.play();
                 // Update media position every second
         		mediaTimer = setInterval(function() {
             		// get media position
-           			my_media.getCurrent<a href="../geolocation/Position/position.html">Position</a>(
+           			my_media.getCurrentPosition(
                 		// success callback
                 		function(position) {
                     		if (position > -1) {
-                        		setAudio<a href="../geolocation/Position/position.html">Position</a>(position + " sec");
+                        		setAudioPosition(position + " sec");
                     		}
                 		},
                 		// error callback
@@ -118,7 +118,7 @@ Full <a href="../storage/storage.opendatabase.html">Example</a>
             // 
             function stopAudio() {
                 if (my_media) {
-                    my_<a href="media.stop.html">media.stop</a>();
+                    my_media.stop();
                 }
                 clearInterval(mediaTimer);
                 mediaTimer = null;
@@ -139,7 +139,7 @@ Full <a href="../storage/storage.opendatabase.html">Example</a>
         
             // Set audio position
             // 
-            function setAudio<a href="../geolocation/Position/position.html">Position</a>(position) {
+            function setAudioPosition(position) {
                 document.getElementById('audio_position').innerHTML = position;
             }
         

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/af6a5545/www/docs/en/1.8.0/cordova/media/media.startRecord.md
----------------------------------------------------------------------
diff --git a/www/docs/en/1.8.0/cordova/media/media.startRecord.md b/www/docs/en/1.8.0/cordova/media/media.startRecord.md
index ef6ed12..301cd36 100644
--- a/www/docs/en/1.8.0/cordova/media/media.startRecord.md
+++ b/www/docs/en/1.8.0/cordova/media/media.startRecord.md
@@ -39,14 +39,14 @@ Supported Platforms
 - iOS
 - Windows Phone 7 ( Mango )
     
-Quick <a href="../storage/storage.opendatabase.html">Example</a>
+Quick Example
 -------------
 
     // Record audio
     // 
     function recordAudio() {
         var src = "myrecording.mp3";
-        var mediaRec = new <a href="media.html">Media</a>(src,
+        var mediaRec = new Media(src,
             // success callback
             function() {
                 console.log("recordAudio():Audio Success");
@@ -62,26 +62,26 @@ Quick <a href="../storage/storage.opendatabase.html">Example</a>
     }
 
 
-Full <a href="../storage/storage.opendatabase.html">Example</a>
+Full Example
 ------------
 
     <!DOCTYPE html>
     <html>
       <head>
-        <title><a href="../device/device.html">Device</a> Properties <a href="../storage/storage.opendatabase.html">Example</a></title>
+        <title>Device Properties Example</title>
 
         <script type="text/javascript" charset="utf-8" src="cordova-1.8.0.js"></script>
         <script type="text/javascript" charset="utf-8">
 
         // Wait for Cordova to load
         //
-        document.addEventListener("<a href="../events/events.deviceready.html">deviceready</a>", on<a href="../device/device.html">Device</a>Ready, false);
+        document.addEventListener("deviceready", onDeviceReady, false);
 
         // Record audio
         // 
         function recordAudio() {
             var src = "myrecording.mp3";
-            var mediaRec = new <a href="media.html">Media</a>(src, onSuccess, onError);
+            var mediaRec = new Media(src, onSuccess, onError);
 
             // Record audio
             mediaRec.startRecord();
@@ -90,7 +90,7 @@ Full <a href="../storage/storage.opendatabase.html">Example</a>
             var recTime = 0;
             var recInterval = setInterval(function() {
                 recTime = recTime + 1;
-                setAudio<a href="../geolocation/Position/position.html">Position</a>(recTime + " sec");
+                setAudioPosition(recTime + " sec");
                 if (recTime >= 10) {
                     clearInterval(recInterval);
                     mediaRec.stopRecord();
@@ -100,7 +100,7 @@ Full <a href="../storage/storage.opendatabase.html">Example</a>
 
         // Cordova is ready
         //
-        function on<a href="../device/device.html">Device</a>Ready() {
+        function onDeviceReady() {
             recordAudio();
         }
     
@@ -119,7 +119,7 @@ Full <a href="../storage/storage.opendatabase.html">Example</a>
 
         // Set audio position
         // 
-        function setAudio<a href="../geolocation/Position/position.html">Position</a>(position) {
+        function setAudioPosition(position) {
             document.getElementById('audio_position').innerHTML = position;
         }
 
@@ -139,4 +139,4 @@ BlackBerry WebWorks Quirks
 iOS Quirks
 ----------
 
-- The file to record to must already exist and should be of type .wav. The <a href="../file/fileobj/fileobj.html">File</a> API's can be used to create the file.
+- The file to record to must already exist and should be of type .wav. The File API's can be used to create the file.

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/af6a5545/www/docs/en/1.8.0/cordova/media/media.stop.md
----------------------------------------------------------------------
diff --git a/www/docs/en/1.8.0/cordova/media/media.stop.md b/www/docs/en/1.8.0/cordova/media/media.stop.md
index 7f86364..170299d 100644
--- a/www/docs/en/1.8.0/cordova/media/media.stop.md
+++ b/www/docs/en/1.8.0/cordova/media/media.stop.md
@@ -39,14 +39,14 @@ Supported Platforms
 - iOS
 - Windows Phone 7 ( Mango )
     
-Quick <a href="../storage/storage.opendatabase.html">Example</a>
+Quick Example
 -------------
 
     // Play audio
     //
     function playAudio(url) {
         // Play the audio file at url
-        var my_media = new <a href="media.html">Media</a>(url,
+        var my_media = new Media(url,
             // success callback
             function() {
                 console.log("playAudio():Audio Success");
@@ -57,7 +57,7 @@ Quick <a href="../storage/storage.opendatabase.html">Example</a>
         });
 
         // Play audio
-        my_<a href="media.play.html">media.play</a>();
+        my_media.play();
 
         // Pause after 10 seconds
         setTimeout(function() {
@@ -65,25 +65,25 @@ Quick <a href="../storage/storage.opendatabase.html">Example</a>
         }, 10000);        
     }
 
-Full <a href="../storage/storage.opendatabase.html">Example</a>
+Full Example
 ------------
 
         <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
                               "http://www.w3.org/TR/html4/strict.dtd">
         <html>
           <head>
-            <title><a href="media.html">Media</a> <a href="../storage/storage.opendatabase.html">Example</a></title>
+            <title>Media Example</title>
         
             <script type="text/javascript" charset="utf-8" src="cordova-1.8.0.js"></script>
             <script type="text/javascript" charset="utf-8">
         
             // Wait for Cordova to load
             //
-            document.addEventListener("<a href="../events/events.deviceready.html">deviceready</a>", on<a href="../device/device.html">Device</a>Ready, false);
+            document.addEventListener("deviceready", onDeviceReady, false);
         
             // Cordova is ready
             //
-            function on<a href="../device/device.html">Device</a>Ready() {
+            function onDeviceReady() {
                 playAudio("http://audio.ibeat.org/content/p1rj1s/p1rj1s_-_rockGuitar.mp3");
             }
         
@@ -95,27 +95,27 @@ Full <a href="../storage/storage.opendatabase.html">Example</a>
             // Play audio
             //
             function playAudio(src) {
-                // Create <a href="media.html">Media</a> object from src
-                my_media = new <a href="media.html">Media</a>(src, onSuccess, onError);
+                // Create Media object from src
+                my_media = new Media(src, onSuccess, onError);
         
                 // Play audio
-                my_<a href="media.play.html">media.play</a>();
+                my_media.play();
         
                 // Update my_media position every second
                 if (mediaTimer == null) {
                     mediaTimer = setInterval(function() {
                         // get my_media position
-                        my_media.getCurrent<a href="../geolocation/Position/position.html">Position</a>(
+                        my_media.getCurrentPosition(
                             // success callback
                             function(position) {
                                 if (position > -1) {
-                                    setAudio<a href="../geolocation/Position/position.html">Position</a>((position) + " sec");
+                                    setAudioPosition((position) + " sec");
                                 }
                             },
                             // error callback
                             function(e) {
                                 console.log("Error getting pos=" + e);
-                                setAudio<a href="../geolocation/Position/position.html">Position</a>("Error: " + e);
+                                setAudioPosition("Error: " + e);
                             }
                         );
                     }, 1000);
@@ -124,9 +124,9 @@ Full <a href="../storage/storage.opendatabase.html">Example</a>
         
             // Pause audio
             // 
-            function <a href="../events/events.pause.html">pause</a>Audio() {
+            function pauseAudio() {
                 if (my_media) {
-                    my_media.<a href="../events/events.pause.html">pause</a>();
+                    my_media.pause();
                 }
             }
         
@@ -155,7 +155,7 @@ Full <a href="../storage/storage.opendatabase.html">Example</a>
         
             // Set audio position
             // 
-            function setAudio<a href="../geolocation/Position/position.html">Position</a>(position) {
+            function setAudioPosition(position) {
                 document.getElementById('audio_position').innerHTML = position;
             }
         
@@ -163,7 +163,7 @@ Full <a href="../storage/storage.opendatabase.html">Example</a>
           </head>
           <body>
             <a href="#" class="btn large" onclick="playAudio('http://audio.ibeat.org/content/p1rj1s/p1rj1s_-_rockGuitar.mp3');">Play Audio</a>
-            <a href="#" class="btn large" onclick="<a href="../events/events.pause.html">pause</a>Audio();">Pause Playing Audio</a>
+            <a href="#" class="btn large" onclick="pauseAudio();">Pause Playing Audio</a>
             <a href="#" class="btn large" onclick="stopAudio();">Stop Playing Audio</a>
             <p id="audio_position"></p>
           </body>

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/af6a5545/www/docs/en/1.8.0/cordova/media/media.stopRecord.md
----------------------------------------------------------------------
diff --git a/www/docs/en/1.8.0/cordova/media/media.stopRecord.md b/www/docs/en/1.8.0/cordova/media/media.stopRecord.md
index c0e358a..62b0142 100644
--- a/www/docs/en/1.8.0/cordova/media/media.stopRecord.md
+++ b/www/docs/en/1.8.0/cordova/media/media.stopRecord.md
@@ -18,18 +18,18 @@ license: >
     under the License.
 ---
 
-<a href="media.stop.html">media.stop</a>Record
+media.stopRecord
 ================
 
 Stops recording an audio file.
 
-    <a href="media.stop.html">media.stop</a>Record();
+    media.stopRecord();
 
 
 Description
 -----------
 
-Function `<a href="media.stop.html">media.stop</a>Record` is a synchronous function that stops recording an audio file.
+Function `media.stopRecord` is a synchronous function that stops recording an audio file.
 
 Supported Platforms
 -------------------
@@ -39,14 +39,14 @@ Supported Platforms
 - iOS
 - Windows Phone 7 ( Mango )
     
-Quick <a href="../storage/storage.opendatabase.html">Example</a>
+Quick Example
 -------------
 
     // Record audio
     // 
     function recordAudio() {
         var src = "myrecording.mp3";
-        var mediaRec = new <a href="media.html">Media</a>(src,
+        var mediaRec = new Media(src,
             // success callback
             function() {
                 console.log("recordAudio():Audio Success");
@@ -67,26 +67,26 @@ Quick <a href="../storage/storage.opendatabase.html">Example</a>
     }
 
 
-Full <a href="../storage/storage.opendatabase.html">Example</a>
+Full Example
 ------------
 
     <!DOCTYPE html>
     <html>
       <head>
-        <title><a href="../device/device.html">Device</a> Properties <a href="../storage/storage.opendatabase.html">Example</a></title>
+        <title>Device Properties Example</title>
 
         <script type="text/javascript" charset="utf-8" src="cordova-1.8.0.js"></script>
         <script type="text/javascript" charset="utf-8">
 
         // Wait for Cordova to load
         //
-        document.addEventListener("<a href="../events/events.deviceready.html">deviceready</a>", on<a href="../device/device.html">Device</a>Ready, false);
+        document.addEventListener("deviceready", onDeviceReady, false);
 
         // Record audio
         // 
         function recordAudio() {
             var src = "myrecording.mp3";
-            var mediaRec = new <a href="media.html">Media</a>(src, onSuccess, onError);
+            var mediaRec = new Media(src, onSuccess, onError);
 
             // Record audio
             mediaRec.startRecord();
@@ -95,7 +95,7 @@ Full <a href="../storage/storage.opendatabase.html">Example</a>
             var recTime = 0;
             var recInterval = setInterval(function() {
                 recTime = recTime + 1;
-                setAudio<a href="../geolocation/Position/position.html">Position</a>(recTime + " sec");
+                setAudioPosition(recTime + " sec");
                 if (recTime >= 10) {
                     clearInterval(recInterval);
                     mediaRec.stopRecord();
@@ -105,7 +105,7 @@ Full <a href="../storage/storage.opendatabase.html">Example</a>
 
         // Cordova is ready
         //
-        function on<a href="../device/device.html">Device</a>Ready() {
+        function onDeviceReady() {
             recordAudio();
         }
     
@@ -124,7 +124,7 @@ Full <a href="../storage/storage.opendatabase.html">Example</a>
 
         // Set audio position
         // 
-        function setAudio<a href="../geolocation/Position/position.html">Position</a>(position) {
+        function setAudioPosition(position) {
             document.getElementById('audio_position').innerHTML = position;
         }
 

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/af6a5545/www/docs/en/1.8.0/cordova/notification/notification.alert.md
----------------------------------------------------------------------
diff --git a/www/docs/en/1.8.0/cordova/notification/notification.alert.md b/www/docs/en/1.8.0/cordova/notification/notification.alert.md
index 34ca31f..c48b2ca 100644
--- a/www/docs/en/1.8.0/cordova/notification/notification.alert.md
+++ b/www/docs/en/1.8.0/cordova/notification/notification.alert.md
@@ -45,7 +45,7 @@ Supported Platforms
 - Bada 1.2 & 2.x
 - webOS
 
-Quick <a href="../storage/storage.opendatabase.html">Example</a>
+Quick Example
 -------------
 
     // Android / BlackBerry WebWorks (OS 5.0 and higher) / iPhone
@@ -61,24 +61,24 @@ Quick <a href="../storage/storage.opendatabase.html">Example</a>
         'Done'                  // buttonName
     );
         
-Full <a href="../storage/storage.opendatabase.html">Example</a>
+Full Example
 ------------
 
     <!DOCTYPE html>
     <html>
       <head>
-        <title><a href="notification.html">Notification</a> <a href="../storage/storage.opendatabase.html">Example</a></title>
+        <title>Notification Example</title>
 
         <script type="text/javascript" charset="utf-8" src="cordova-1.8.0.js"></script>
         <script type="text/javascript" charset="utf-8">
 
         // Wait for Cordova to load
         //
-        document.addEventListener("<a href="../events/events.deviceready.html">deviceready</a>", on<a href="../device/device.html">Device</a>Ready, false);
+        document.addEventListener("deviceready", onDeviceReady, false);
 
         // Cordova is ready
         //
-        function on<a href="../device/device.html">Device</a>Ready() {
+        function onDeviceReady() {
             // Empty
         }
     

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/af6a5545/www/docs/en/1.8.0/cordova/notification/notification.beep.md
----------------------------------------------------------------------
diff --git a/www/docs/en/1.8.0/cordova/notification/notification.beep.md b/www/docs/en/1.8.0/cordova/notification/notification.beep.md
index 87c52f2..0fac446 100644
--- a/www/docs/en/1.8.0/cordova/notification/notification.beep.md
+++ b/www/docs/en/1.8.0/cordova/notification/notification.beep.md
@@ -36,37 +36,37 @@ Supported Platforms
 - Windows Phone 7 ( Mango )
 - Bada 1.2 & 2.x
 
-Quick <a href="../storage/storage.opendatabase.html">Example</a>
+Quick Example
 -------------
 
     // Beep twice!
     navigator.notification.beep(2);
 
-Full <a href="../storage/storage.opendatabase.html">Example</a>
+Full Example
 ------------
 
     <!DOCTYPE html>
     <html>
       <head>
-        <title><a href="notification.html">Notification</a> <a href="../storage/storage.opendatabase.html">Example</a></title>
+        <title>Notification Example</title>
 
         <script type="text/javascript" charset="utf-8" src="cordova-1.8.0.js"></script>
         <script type="text/javascript" charset="utf-8">
 
         // Wait for Cordova to load
         //
-        document.addEventListener("<a href="../events/events.deviceready.html">deviceready</a>", on<a href="../device/device.html">Device</a>Ready, false);
+        document.addEventListener("deviceready", onDeviceReady, false);
 
         // Cordova is ready
         //
-        function on<a href="../device/device.html">Device</a>Ready() {
+        function onDeviceReady() {
             // Empty
         }
 
         // Show a custom alert
         //
         function showAlert() {
-		    navigator.<a href="notification.alert.html">notification.alert</a>(
+		    navigator.notification.alert(
 		        'You are the winner!',  // message
 		        'Game Over',            // title
 		        'Done'                  // buttonName
@@ -82,7 +82,7 @@ Full <a href="../storage/storage.opendatabase.html">Example</a>
         // Vibrate for 2 seconds
         //
         function vibrate() {
-            navigator.<a href="notification.vibrate.html">notification.vibrate</a>(2000);
+            navigator.notification.vibrate(2000);
         }
 
         </script>
@@ -97,7 +97,7 @@ Full <a href="../storage/storage.opendatabase.html">Example</a>
 Android Quirks
 --------------
 
-- Android plays the default "<a href="notification.html">Notification</a> ringtone" specified under the "Settings/Sound & Display" panel.
+- Android plays the default "Notification ringtone" specified under the "Settings/Sound & Display" panel.
 
 iPhone Quirks
 -------------

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/af6a5545/www/docs/en/1.8.0/cordova/notification/notification.confirm.md
----------------------------------------------------------------------
diff --git a/www/docs/en/1.8.0/cordova/notification/notification.confirm.md b/www/docs/en/1.8.0/cordova/notification/notification.confirm.md
index 1551436..4c19a67 100644
--- a/www/docs/en/1.8.0/cordova/notification/notification.confirm.md
+++ b/www/docs/en/1.8.0/cordova/notification/notification.confirm.md
@@ -51,7 +51,7 @@ Supported Platforms
 - Windows Phone 7 ( Mango )
 - Bada 1.2 & 2.x
 
-Quick <a href="../storage/storage.opendatabase.html">Example</a>
+Quick Example
 -------------
 
 	// process the confirmation dialog result
@@ -70,24 +70,24 @@ Quick <a href="../storage/storage.opendatabase.html">Example</a>
         );
     }
         
-Full <a href="../storage/storage.opendatabase.html">Example</a>
+Full Example
 ------------
 
     <!DOCTYPE html>
     <html>
       <head>
-        <title><a href="notification.html">Notification</a> <a href="../storage/storage.opendatabase.html">Example</a></title>
+        <title>Notification Example</title>
 
         <script type="text/javascript" charset="utf-8" src="cordova-1.8.0.js"></script>
         <script type="text/javascript" charset="utf-8">
 
         // Wait for Cordova to load
         //
-        document.addEventListener("<a href="../events/events.deviceready.html">deviceready</a>", on<a href="../device/device.html">Device</a>Ready, false);
+        document.addEventListener("deviceready", onDeviceReady, false);
 
         // Cordova is ready
         //
-        function on<a href="../device/device.html">Device</a>Ready() {
+        function onDeviceReady() {
             // Empty
         }
     

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/af6a5545/www/docs/en/1.8.0/cordova/notification/notification.md
----------------------------------------------------------------------
diff --git a/www/docs/en/1.8.0/cordova/notification/notification.md b/www/docs/en/1.8.0/cordova/notification/notification.md
index 5e34de8..3cdd531 100644
--- a/www/docs/en/1.8.0/cordova/notification/notification.md
+++ b/www/docs/en/1.8.0/cordova/notification/notification.md
@@ -26,10 +26,10 @@ Notification
 Methods
 -------
 
-- <a href="notification.alert.html">notification.alert</a>
-- <a href="notification.confirm.html">notification.confirm</a>
-- <a href="notification.beep.html">notification.beep</a>
-- <a href="notification.vibrate.html">notification.vibrate</a>
+- notification.alert
+- notification.confirm
+- notification.beep
+- notification.vibrate
 
 Permissions
 -----------
@@ -64,7 +64,7 @@ Permissions
 
 ### iOS
 
-#### App/Supporting <a href="../file/fileobj/fileobj.html">File</a>s/Cordova.plist
+#### App/Supporting Files/Cordova.plist
 
     <key>Plugins</key>
     <dict>

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/af6a5545/www/docs/en/1.8.0/cordova/notification/notification.vibrate.md
----------------------------------------------------------------------
diff --git a/www/docs/en/1.8.0/cordova/notification/notification.vibrate.md b/www/docs/en/1.8.0/cordova/notification/notification.vibrate.md
index ce3e032..7ac0b4b 100644
--- a/www/docs/en/1.8.0/cordova/notification/notification.vibrate.md
+++ b/www/docs/en/1.8.0/cordova/notification/notification.vibrate.md
@@ -36,38 +36,38 @@ Supported Platforms
 - Windows Phone 7
 - Bada 1.2 & 2.x
 
-Quick <a href="../storage/storage.opendatabase.html">Example</a>
+Quick Example
 -------------
 
     // Vibrate for 2.5 seconds
     //
     navigator.notification.vibrate(2500);
 
-Full <a href="../storage/storage.opendatabase.html">Example</a>
+Full Example
 ------------
     
     <!DOCTYPE html>
     <html>
       <head>
-        <title><a href="notification.html">Notification</a> <a href="../storage/storage.opendatabase.html">Example</a></title>
+        <title>Notification Example</title>
 
         <script type="text/javascript" charset="utf-8" src="cordova-1.8.0.js"></script>
         <script type="text/javascript" charset="utf-8">
 
         // Wait for Cordova to load
         //
-        document.addEventListener("<a href="../events/events.deviceready.html">deviceready</a>", on<a href="../device/device.html">Device</a>Ready, false);
+        document.addEventListener("deviceready", onDeviceReady, false);
 
         // Cordova is ready
         //
-        function on<a href="../device/device.html">Device</a>Ready() {
+        function onDeviceReady() {
             // Empty
         }
     
         // Show a custom alert
         //
         function showAlert() {
-		    navigator.<a href="notification.alert.html">notification.alert</a>(
+		    navigator.notification.alert(
 		        'You are the winner!',  // message
 		        'Game Over',            // title
 		        'Done'                  // buttonName
@@ -77,7 +77,7 @@ Full <a href="../storage/storage.opendatabase.html">Example</a>
         // Beep three times
         //
         function playBeep() {
-            navigator.<a href="notification.beep.html">notification.beep</a>(3);
+            navigator.notification.beep(3);
         }
     
         // Vibrate for 2 seconds

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/af6a5545/www/docs/en/1.8.0/cordova/storage/database/database.md
----------------------------------------------------------------------
diff --git a/www/docs/en/1.8.0/cordova/storage/database/database.md b/www/docs/en/1.8.0/cordova/storage/database/database.md
index be11c88..5992ebe 100644
--- a/www/docs/en/1.8.0/cordova/storage/database/database.md
+++ b/www/docs/en/1.8.0/cordova/storage/database/database.md
@@ -32,7 +32,7 @@ Methods
 Details
 -------
 
-A Database object is returned from a call to `window.<a href="../storage.opendatabase.html">openDatabase</a>()`.
+A Database object is returned from a call to `window.openDatabase()`.
 
 Supported Platforms
 -------------------
@@ -42,7 +42,7 @@ Supported Platforms
 - iPhone
 - webOS
 
-Transaction Quick <a href="../storage.opendatabase.html">Example</a>
+Transaction Quick Example
 ------------------
 	function populateDB(tx) {
 		 tx.executeSql('DROP TABLE IF EXISTS DEMO');
@@ -59,34 +59,34 @@ Transaction Quick <a href="../storage.opendatabase.html">Example</a>
 		alert("success!");
 	}
 	
-	var db = window.<a href="../storage.opendatabase.html">openDatabase</a>("Database", "1.0", "Cordova Demo", 200000);
+	var db = window.openDatabase("Database", "1.0", "Cordova Demo", 200000);
 	db.transaction(populateDB, errorCB, successCB);
 
-Change Version Quick <a href="../storage.opendatabase.html">Example</a>
+Change Version Quick Example
 -------------------
 
-	var db = window.<a href="../storage.opendatabase.html">openDatabase</a>("Database", "1.0", "Cordova Demo", 200000);
+	var db = window.openDatabase("Database", "1.0", "Cordova Demo", 200000);
 	db.changeVersion("1.0", "1.1");
 
-Full <a href="../storage.opendatabase.html">Example</a>
+Full Example
 ------------
 
     <!DOCTYPE html>
     <html>
       <head>
-        <title><a href="../storage.html">Storage</a> <a href="../storage.opendatabase.html">Example</a></title>
+        <title>Storage Example</title>
 
         <script type="text/javascript" charset="utf-8" src="cordova-1.8.0.js"></script>
         <script type="text/javascript" charset="utf-8">
 
         // Wait for Cordova to load
         //
-        document.addEventListener("<a href="../../events/events.deviceready.html">deviceready</a>", on<a href="../../device/device.html">Device</a>Ready, false);
+        document.addEventListener("deviceready", onDeviceReady, false);
 
         // Cordova is ready
         //
-        function on<a href="../../device/device.html">Device</a>Ready() {
-			var db = window.<a href="../storage.opendatabase.html">openDatabase</a>("Database", "1.0", "Cordova Demo", 200000);
+        function onDeviceReady() {
+			var db = window.openDatabase("Database", "1.0", "Cordova Demo", 200000);
 			db.transaction(populateDB, errorCB, successCB);
         }
 		
@@ -114,7 +114,7 @@ Full <a href="../storage.opendatabase.html">Example</a>
         </script>
       </head>
       <body>
-        <h1><a href="../storage.opendatabase.html">Example</a></h1>
+        <h1>Example</h1>
         <p>Database</p>
       </body>
     </html>

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/af6a5545/www/docs/en/1.8.0/cordova/storage/localstorage/localstorage.md
----------------------------------------------------------------------
diff --git a/www/docs/en/1.8.0/cordova/storage/localstorage/localstorage.md b/www/docs/en/1.8.0/cordova/storage/localstorage/localstorage.md
index abe1319..b85efc2 100644
--- a/www/docs/en/1.8.0/cordova/storage/localstorage/localstorage.md
+++ b/www/docs/en/1.8.0/cordova/storage/localstorage/localstorage.md
@@ -18,12 +18,12 @@ license: >
     under the License.
 ---
 
-local<a href="../storage.html">Storage</a>
+localStorage
 ===============
 
-Provides access to a W3C <a href="../storage.html">Storage</a> interface (http://dev.w3.org/html5/webstorage/#the-localstorage-attribute)
+Provides access to a W3C Storage interface (http://dev.w3.org/html5/webstorage/#the-localstorage-attribute)
 
-    var storage = window.local<a href="../storage.html">Storage</a>;
+    var storage = window.localStorage;
 
 Methods
 -------
@@ -37,9 +37,9 @@ Methods
 Details
 -----------
 
-local<a href="../storage.html">Storage</a> provides an interface to a W3C <a href="../storage.html">Storage</a> interface.  It allows one to save data as key-value pairs.
+localStorage provides an interface to a W3C Storage interface.  It allows one to save data as key-value pairs.
 
-Note: window.session<a href="../storage.html">Storage</a> provides the same interface, but is cleared between app launches.
+Note: window.sessionStorage provides the same interface, but is cleared between app launches.
 
 Supported Platforms
 -------------------
@@ -50,67 +50,67 @@ Supported Platforms
 - Windows Phone 7
 - webOS
 
-Key Quick <a href="../storage.opendatabase.html">Example</a>
+Key Quick Example
 -------------
 
-    var keyName = window.local<a href="../storage.html">Storage</a>.key(0);
+    var keyName = window.localStorage.key(0);
 
-Set Item Quick <a href="../storage.opendatabase.html">Example</a>
+Set Item Quick Example
 -------------
 
-    window.local<a href="../storage.html">Storage</a>.setItem("key", "value");
+    window.localStorage.setItem("key", "value");
 
-Get Item Quick <a href="../storage.opendatabase.html">Example</a>
+Get Item Quick Example
 -------------
 
-	var value = window.local<a href="../storage.html">Storage</a>.getItem("key");
+	var value = window.localStorage.getItem("key");
 	// value is now equal to "value"
 
-Remove Item Quick <a href="../storage.opendatabase.html">Example</a>
+Remove Item Quick Example
 -------------
 
-	window.local<a href="../storage.html">Storage</a>.removeItem("key");
+	window.localStorage.removeItem("key");
 
-Clear Quick <a href="../storage.opendatabase.html">Example</a>
+Clear Quick Example
 -------------
 
-	window.local<a href="../storage.html">Storage</a>.clear();
+	window.localStorage.clear();
 
-Full <a href="../storage.opendatabase.html">Example</a>
+Full Example
 ------------
 
     <!DOCTYPE html>
     <html>
       <head>
-        <title><a href="../storage.html">Storage</a> <a href="../storage.opendatabase.html">Example</a></title>
+        <title>Storage Example</title>
 
         <script type="text/javascript" charset="utf-8" src="cordova-1.8.0.js"></script>
         <script type="text/javascript" charset="utf-8">
 
         // Wait for Cordova to load
         //
-        document.addEventListener("<a href="../../events/events.deviceready.html">deviceready</a>", on<a href="../../device/device.html">Device</a>Ready, false);
+        document.addEventListener("deviceready", onDeviceReady, false);
 
         // Cordova is ready
         //
-        function on<a href="../../device/device.html">Device</a>Ready() {
-			window.local<a href="../storage.html">Storage</a>.setItem("key", "value");
-			var keyname = window.local<a href="../storage.html">Storage</a>.key(i);
+        function onDeviceReady() {
+			window.localStorage.setItem("key", "value");
+			var keyname = window.localStorage.key(i);
 			// keyname is now equal to "key"
-			var value = window.local<a href="../storage.html">Storage</a>.getItem("key");
+			var value = window.localStorage.getItem("key");
 			// value is now equal to "value"
-			window.local<a href="../storage.html">Storage</a>.removeItem("key");
-			window.local<a href="../storage.html">Storage</a>.setItem("key2", "value2");
-			window.local<a href="../storage.html">Storage</a>.clear();
-			// local<a href="../storage.html">Storage</a> is now empty
+			window.localStorage.removeItem("key");
+			window.localStorage.setItem("key2", "value2");
+			window.localStorage.clear();
+			// localStorage is now empty
         }
     
 
         </script>
       </head>
       <body>
-        <h1><a href="../storage.opendatabase.html">Example</a></h1>
-        <p>local<a href="../storage.html">Storage</a></p>
+        <h1>Example</h1>
+        <p>localStorage</p>
       </body>
     </html>
 
@@ -118,4 +118,4 @@ Full <a href="../storage.opendatabase.html">Example</a>
 Windows Phone 7 Quirks
 -------------
 
-- dot notation is NOT available on Windows Phone. Be sure to use : window.local<a href="../storage.html">Storage</a>.setItem/getItem, and not the w3 spec defined calls to window.local<a href="../storage.html">Storage</a>.someKey = 'someValue';
+- 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';

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/af6a5545/www/docs/en/1.8.0/cordova/storage/sqlresultset/sqlresultset.md
----------------------------------------------------------------------
diff --git a/www/docs/en/1.8.0/cordova/storage/sqlresultset/sqlresultset.md b/www/docs/en/1.8.0/cordova/storage/sqlresultset/sqlresultset.md
index ae10b06..f768178 100644
--- a/www/docs/en/1.8.0/cordova/storage/sqlresultset/sqlresultset.md
+++ b/www/docs/en/1.8.0/cordova/storage/sqlresultset/sqlresultset.md
@@ -21,7 +21,7 @@ license: >
 SQLResultSet
 =======
 
-When the executeSql method of a <a href="../sqltransaction/sqltransaction.html">SQLTransaction</a> is called it will invoke it's callback with a SQLResultSet.
+When the executeSql method of a SQLTransaction is called it will invoke it's callback with a SQLResultSet.
 
 Properties
 -------
@@ -33,7 +33,7 @@ Properties
 Details
 -------
 
-When you call the <a href="../sqltransaction/sqltransaction.html">SQLTransaction</a> executeSql method its 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 <a href="../sqlresultsetlist/sqlresultsetlist.html">SQLResultSetList</a> and it contains the data returned from a SQL select statement.
+When you call the SQLTransaction executeSql method its 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
 -------------------
@@ -43,7 +43,7 @@ Supported Platforms
 - iPhone
 - webOS
 
-Execute SQL Quick <a href="../storage.opendatabase.html">Example</a>
+Execute SQL Quick Example
 ------------------
 
 	function queryDB(tx) {
@@ -65,23 +65,23 @@ Execute SQL Quick <a href="../storage.opendatabase.html">Example</a>
 		alert("Error processing SQL: "+err.code);
 	}
 	
-	var db = window.<a href="../storage.opendatabase.html">open<a href="../database/database.html">Database</a></a>("<a href="../database/database.html">Database</a>", "1.0", "Cordova Demo", 200000);
+	var db = window.openDatabase("Database", "1.0", "Cordova Demo", 200000);
 	db.transaction(queryDB, errorCB);
 
-Full <a href="../storage.opendatabase.html">Example</a>
+Full Example
 ------------
 
     <!DOCTYPE html>
     <html>
       <head>
-        <title><a href="../storage.html">Storage</a> <a href="../storage.opendatabase.html">Example</a></title>
+        <title>Storage Example</title>
 
         <script type="text/javascript" charset="utf-8" src="cordova-1.8.0.js"></script>
         <script type="text/javascript" charset="utf-8">
 
         // Wait for Cordova to load
         //
-        document.addEventListener("<a href="../../events/events.deviceready.html">deviceready</a>", on<a href="../../device/device.html">Device</a>Ready, false);
+        document.addEventListener("deviceready", onDeviceReady, false);
 
 		// Populate the database 
 		//
@@ -120,21 +120,21 @@ Full <a href="../storage.opendatabase.html">Example</a>
 		// Transaction success callback
 		//
 		function successCB() {
-			var db = window.<a href="../storage.opendatabase.html">open<a href="../database/database.html">Database</a></a>("<a href="../database/database.html">Database</a>", "1.0", "Cordova Demo", 200000);
+			var db = window.openDatabase("Database", "1.0", "Cordova Demo", 200000);
 			db.transaction(queryDB, errorCB);
 		}
 
 		// Cordova is ready
 		//
-		function on<a href="../../device/device.html">Device</a>Ready() {
-			var db = window.<a href="../storage.opendatabase.html">open<a href="../database/database.html">Database</a></a>("<a href="../database/database.html">Database</a>", "1.0", "Cordova Demo", 200000);
+		function onDeviceReady() {
+			var db = window.openDatabase("Database", "1.0", "Cordova Demo", 200000);
 			db.transaction(populateDB, errorCB, successCB);
 		}
 	
         </script>
       </head>
       <body>
-        <h1><a href="../storage.opendatabase.html">Example</a></h1>
-        <p><a href="../database/database.html">Database</a></p>
+        <h1>Example</h1>
+        <p>Database</p>
       </body>
     </html>

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/af6a5545/www/docs/en/1.8.0/cordova/storage/sqlresultsetlist/sqlresultsetlist.md
----------------------------------------------------------------------
diff --git a/www/docs/en/1.8.0/cordova/storage/sqlresultsetlist/sqlresultsetlist.md b/www/docs/en/1.8.0/cordova/storage/sqlresultsetlist/sqlresultsetlist.md
index 3602e65..1f7e1cc 100644
--- a/www/docs/en/1.8.0/cordova/storage/sqlresultsetlist/sqlresultsetlist.md
+++ b/www/docs/en/1.8.0/cordova/storage/sqlresultsetlist/sqlresultsetlist.md
@@ -18,10 +18,10 @@ license: >
     under the License.
 ---
 
-<a href="../sqlresultset/sqlresultset.html">SQLResultSet</a>List
+SQLResultSetList
 =======
 
-One of the properties of the <a href="../sqlresultset/sqlresultset.html">SQLResultSet</a> containing the rows returned from a SQL query.
+One of the properties of the SQLResultSet containing the rows returned from a SQL query.
 
 Properties
 -------
@@ -36,7 +36,7 @@ Methods
 Details
 -------
 
-The <a href="../sqlresultset/sqlresultset.html">SQLResultSet</a>List 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 specifying an index.  The item method returns a JavaScript Object who's properties are the columns of the database the select statement was executed against.
+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 specifying 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
 -------------------
@@ -46,7 +46,7 @@ Supported Platforms
 - iPhone
 - webOS
 
-Execute SQL Quick <a href="../storage.opendatabase.html">Example</a>
+Execute SQL Quick Example
 ------------------
 
 	function queryDB(tx) {
@@ -65,23 +65,23 @@ Execute SQL Quick <a href="../storage.opendatabase.html">Example</a>
 		alert("Error processing SQL: "+err.code);
 	}
 	
-	var db = window.<a href="../storage.opendatabase.html">open<a href="../database/database.html">Database</a></a>("<a href="../database/database.html">Database</a>", "1.0", "Cordova Demo", 200000);
+	var db = window.openDatabase("Database", "1.0", "Cordova Demo", 200000);
 	db.transaction(queryDB, errorCB);
 
-Full <a href="../storage.opendatabase.html">Example</a>
+Full Example
 ------------
 
     <!DOCTYPE html>
     <html>
       <head>
-        <title><a href="../storage.html">Storage</a> <a href="../storage.opendatabase.html">Example</a></title>
+        <title>Storage Example</title>
 
         <script type="text/javascript" charset="utf-8" src="cordova-1.8.0.js"></script>
         <script type="text/javascript" charset="utf-8">
 
         // Wait for Cordova to load
         //
-        document.addEventListener("<a href="../../events/events.deviceready.html">deviceready</a>", on<a href="../../device/device.html">Device</a>Ready, false);
+        document.addEventListener("deviceready", onDeviceReady, false);
 
 		// Populate the database 
 		//
@@ -117,21 +117,21 @@ Full <a href="../storage.opendatabase.html">Example</a>
 		// Transaction success callback
 		//
 		function successCB() {
-			var db = window.<a href="../storage.opendatabase.html">open<a href="../database/database.html">Database</a></a>("<a href="../database/database.html">Database</a>", "1.0", "Cordova Demo", 200000);
+			var db = window.openDatabase("Database", "1.0", "Cordova Demo", 200000);
 			db.transaction(queryDB, errorCB);
 		}
 
 		// Cordova is ready
 		//
-		function on<a href="../../device/device.html">Device</a>Ready() {
-			var db = window.<a href="../storage.opendatabase.html">open<a href="../database/database.html">Database</a></a>("<a href="../database/database.html">Database</a>", "1.0", "Cordova Demo", 200000);
+		function onDeviceReady() {
+			var db = window.openDatabase("Database", "1.0", "Cordova Demo", 200000);
 			db.transaction(populateDB, errorCB, successCB);
 		}
 	
         </script>
       </head>
       <body>
-        <h1><a href="../storage.opendatabase.html">Example</a></h1>
-        <p><a href="../database/database.html">Database</a></p>
+        <h1>Example</h1>
+        <p>Database</p>
       </body>
     </html>

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/af6a5545/www/docs/en/1.8.0/cordova/storage/sqltransaction/sqltransaction.md
----------------------------------------------------------------------
diff --git a/www/docs/en/1.8.0/cordova/storage/sqltransaction/sqltransaction.md b/www/docs/en/1.8.0/cordova/storage/sqltransaction/sqltransaction.md
index d6efe5d..beaf7c4 100644
--- a/www/docs/en/1.8.0/cordova/storage/sqltransaction/sqltransaction.md
+++ b/www/docs/en/1.8.0/cordova/storage/sqltransaction/sqltransaction.md
@@ -21,7 +21,7 @@ license: >
 SQLTransaction
 =======
 
-Contains methods that allow the user to execute SQL statements against the <a href="../database/database.html">Database</a>.
+Contains methods that allow the user to execute SQL statements against the Database.
 
 Methods
 -------
@@ -31,7 +31,7 @@ Methods
 Details
 -------
 
-When you call a <a href="../database/database.html">Database</a> 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.  
+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
 -------------------
@@ -41,7 +41,7 @@ Supported Platforms
 - iPhone
 - webOS
 
-Execute SQL Quick <a href="../storage.opendatabase.html">Example</a>
+Execute SQL Quick Example
 ------------------
 
 	function populateDB(tx) {
@@ -59,28 +59,28 @@ Execute SQL Quick <a href="../storage.opendatabase.html">Example</a>
 		alert("success!");
 	}
 	
-	var db = window.<a href="../storage.opendatabase.html">open<a href="../database/database.html">Database</a></a>("<a href="../database/database.html">Database</a>", "1.0", "Cordova Demo", 200000);
+	var db = window.openDatabase("Database", "1.0", "Cordova Demo", 200000);
 	db.transaction(populateDB, errorCB, successCB);
 
-Full <a href="../storage.opendatabase.html">Example</a>
+Full Example
 ------------
 
     <!DOCTYPE html>
     <html>
       <head>
-        <title><a href="../storage.html">Storage</a> <a href="../storage.opendatabase.html">Example</a></title>
+        <title>Storage Example</title>
 
         <script type="text/javascript" charset="utf-8" src="cordova-1.8.0.js"></script>
         <script type="text/javascript" charset="utf-8">
 
         // Wait for Cordova to load
         //
-        document.addEventListener("<a href="../../events/events.deviceready.html">deviceready</a>", on<a href="../../device/device.html">Device</a>Ready, false);
+        document.addEventListener("deviceready", onDeviceReady, false);
 
         // Cordova is ready
         //
-        function on<a href="../../device/device.html">Device</a>Ready() {
-			var db = window.<a href="../storage.opendatabase.html">open<a href="../database/database.html">Database</a></a>("<a href="../database/database.html">Database</a>", "1.0", "Cordova Demo", 200000);
+        function onDeviceReady() {
+			var db = window.openDatabase("Database", "1.0", "Cordova Demo", 200000);
 			db.transaction(populateDB, errorCB, successCB);
         }
 		
@@ -108,7 +108,7 @@ Full <a href="../storage.opendatabase.html">Example</a>
         </script>
       </head>
       <body>
-        <h1><a href="../storage.opendatabase.html">Example</a></h1>
+        <h1>Example</h1>
         <p>SQLTransaction</p>
       </body>
     </html>

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/af6a5545/www/docs/en/1.8.0/cordova/storage/storage.md
----------------------------------------------------------------------
diff --git a/www/docs/en/1.8.0/cordova/storage/storage.md b/www/docs/en/1.8.0/cordova/storage/storage.md
index 5d12acd..7174491 100644
--- a/www/docs/en/1.8.0/cordova/storage/storage.md
+++ b/www/docs/en/1.8.0/cordova/storage/storage.md
@@ -23,30 +23,30 @@ Storage
 
 > Provides access to the devices storage options.
 
-This API is based on the [W3C Web SQL <a href="database/database.html">Database</a> 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.
+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
 -------
 
-- <a href="storage.opendatabase.html">open<a href="database/database.html">Database</a></a>
+- openDatabase
 
 Arguments
 ---------
 
-- <a href="parameters/name.html">database_name</a>
-- <a href="parameters/version.html">database_version</a>
-- <a href="parameters/display_name.html">database_displayname</a>
-- <a href="parameters/size.html">database_size</a>
+- database_name
+- database_version
+- database_displayname
+- database_size
 
 Objects
 -------
 
-- <a href="database/database.html">Database</a>
-- <a href="sqltransaction/sqltransaction.html">SQLTransaction</a>
-- <a href="sqlresultset/sqlresultset.html">SQLResultSet</a>
-- <a href="sqlresultsetlist/sqlresultsetlist.html"><a href="sqlresultset/sqlresultset.html">SQLResultSet</a>List</a>
-- <a href="sqlerror/sqlerror.html">SQLError</a>
-- <a href="localstorage/localstorage.html">localStorage</a>
+- Database
+- SQLTransaction
+- SQLResultSet
+- SQLResultSetList
+- SQLError
+- localStorage
 
 Permissions
 -----------

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/af6a5545/www/docs/en/1.8.0/cordova/storage/storage.opendatabase.md
----------------------------------------------------------------------
diff --git a/www/docs/en/1.8.0/cordova/storage/storage.opendatabase.md b/www/docs/en/1.8.0/cordova/storage/storage.opendatabase.md
index ded27ad..f66c1be 100644
--- a/www/docs/en/1.8.0/cordova/storage/storage.opendatabase.md
+++ b/www/docs/en/1.8.0/cordova/storage/storage.opendatabase.md
@@ -18,19 +18,19 @@ license: >
     under the License.
 ---
 
-open<a href="database/database.html">Database</a>
+openDatabase
 ===============
 
-Returns a new <a href="database/database.html">Database</a> object.
+Returns a new Database object.
 
-    var dbShell = window.open<a href="database/database.html">Database</a>(<a href="parameters/name.html">database_name</a>, <a href="parameters/version.html">database_version</a>, <a href="parameters/display_name.html">database_displayname</a>, <a href="parameters/size.html">database_size</a>);
+    var dbShell = window.openDatabase(database_name, database_version, database_displayname, database_size);
 
 Description
 -----------
 
-window.open<a href="database/database.html">Database</a> returns a new <a href="database/database.html">Database</a> object.
+window.openDatabase returns a new Database object.
 
-This method will create a new SQL Lite <a href="database/database.html">Database</a> and return a <a href="database/database.html">Database</a> object.  Use the <a href="database/database.html">Database</a> Object to manipulate the data.
+This method will create a new SQL Lite Database and return a Database object.  Use the Database Object to manipulate the data.
 
 Supported Platforms
 -------------------
@@ -43,7 +43,7 @@ Supported Platforms
 Quick Example
 -------------
 
-    var db = window.open<a href="database/database.html">Database</a>("test", "1.0", "Test DB", 1000000);
+    var db = window.openDatabase("test", "1.0", "Test DB", 1000000);
 
 Full Example
 ------------
@@ -51,25 +51,25 @@ Full Example
     <!DOCTYPE html>
     <html>
       <head>
-        <title><a href="storage.html">Storage</a> Example</title>
+        <title>Storage Example</title>
 
         <script type="text/javascript" charset="utf-8" src="cordova-1.8.0.js"></script>
         <script type="text/javascript" charset="utf-8">
 
         // Wait for Cordova to load
         //
-        document.addEventListener("<a href="../events/events.deviceready.html">deviceready</a>", on<a href="../device/device.html">Device</a>Ready, false);
+        document.addEventListener("deviceready", onDeviceReady, false);
 
         // Cordova is ready
         //
-        function on<a href="../device/device.html">Device</a>Ready() {
-			var db = window.open<a href="database/database.html">Database</a>("test", "1.0", "Test DB", 1000000);
+        function onDeviceReady() {
+			var db = window.openDatabase("test", "1.0", "Test DB", 1000000);
         }
 		
         </script>
       </head>
       <body>
         <h1>Example</h1>
-        <p>Open <a href="database/database.html">Database</a></p>
+        <p>Open Database</p>
       </body>
     </html>

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/af6a5545/www/docs/en/1.8.0/guide/getting-started/android/index.md
----------------------------------------------------------------------
diff --git a/www/docs/en/1.8.0/guide/getting-started/android/index.md b/www/docs/en/1.8.0/guide/getting-started/android/index.md
index 0e10360..ffe1662 100644
--- a/www/docs/en/1.8.0/guide/getting-started/android/index.md
+++ b/www/docs/en/1.8.0/guide/getting-started/android/index.md
@@ -98,7 +98,7 @@ This guide describes how to set up your development environment for Cordova and
     ![](img/guide/platforms/android/manifest.jpg)
 
 
-4. <a href="../webos/index.html">Hello World</a>
+4. Hello World
 --------------    
 
 - Create and open a new file named **index.html** in the **assets/www** directory. Paste the following code:
@@ -110,7 +110,7 @@ This guide describes how to set up your development environment for Cordova and
         <script type="text/javascript" charset="utf-8" src="cordova-1.8.0.js"></script>
         </head>
         <body>
-        <h1><a href="../webos/index.html">Hello World</a></h1>
+        <h1>Hello World</h1>
         </body>
         </html>
 
@@ -121,7 +121,7 @@ This guide describes how to set up your development environment for Cordova and
 - Eclipse will ask you to select an appropriate AVD. If there isn't one, then you'll need to create it.
 
 
-5B. Deploy to <a href="../../../cordova/device/device.html">Device</a>
+5B. Deploy to Device
 --------------------
 
 - Make sure USB debugging is enabled on your device and plug it into your system. (**Settings &gt; Applications &gt; Development**)

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/af6a5545/www/docs/en/1.8.0/guide/getting-started/bada/index.md
----------------------------------------------------------------------
diff --git a/www/docs/en/1.8.0/guide/getting-started/bada/index.md b/www/docs/en/1.8.0/guide/getting-started/bada/index.md
index 09ba9b0..e93287c 100644
--- a/www/docs/en/1.8.0/guide/getting-started/bada/index.md
+++ b/www/docs/en/1.8.0/guide/getting-started/bada/index.md
@@ -39,7 +39,7 @@ This guide describes how to set up your development environment for Cordova and
 
 3. Setup New Project
 --------------------
-- In Bada IDE, select _<a href="../../../cordova/file/fileobj/fileobj.html">File</a>_ -> Import project -> Bada C++ / Flash Project. 
+- In Bada IDE, select _File_ -> Import project -> Bada C++ / Flash Project. 
     - Note: Bada 1.2 select "Bada Application Project"
     
     ![](img/guide/platforms/bada/import_bada_project.png)
@@ -54,7 +54,7 @@ This guide describes how to set up your development environment for Cordova and
     ![](img/guide/platforms/bada/bada_project.png)
  
  
-4. <a href="../webos/index.html">Hello World</a>
+4. Hello World
 --------------
 
 **Bada 2.x**: Your HTML/CSS/Javascript code lives under the Res/ folder. Make sure your index.html contains the following two lines in the <head> section.
@@ -80,7 +80,7 @@ This guide describes how to set up your development environment for Cordova and
 
 - Right click on your project&apos;s folder and select Run As -&gt; bada Simulator Application. You need to close the emulator every time you update your app!
 
-5B. Deploy to <a href="../../../cordova/device/device.html">Device</a>
+5B. Deploy to Device
 --------------------
 
 - Make sure your device is properly configured 

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/af6a5545/www/docs/en/1.8.0/guide/getting-started/blackberry/index.md
----------------------------------------------------------------------
diff --git a/www/docs/en/1.8.0/guide/getting-started/blackberry/index.md b/www/docs/en/1.8.0/guide/getting-started/blackberry/index.md
index 698e7ea..8aeb884 100644
--- a/www/docs/en/1.8.0/guide/getting-started/blackberry/index.md
+++ b/www/docs/en/1.8.0/guide/getting-started/blackberry/index.md
@@ -55,7 +55,7 @@ Cordova for BlackBerry makes use of the [BlackBerry WebWorks framework](https://
 - 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.  <a href="../webos/index.html">Hello World</a>
+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 `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.
@@ -75,7 +75,7 @@ BlackBerry smartphone simulators are only available on Windows. PlayBook simulat
 - 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 <a href="../../../cordova/device/device.html">Device</a> (Windows and Mac)
+5B.  Deploy to Device (Windows and Mac)
 --------------------------------------
 
 - Deploying to a device requires signing keys which can be obtained from RIM.
@@ -91,7 +91,7 @@ BlackBerry smartphone simulators are only available on Windows. PlayBook simulat
         - `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` : <a href="../../../cordova/device/device.html">Device</a> password which is set 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.
 

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/af6a5545/www/docs/en/1.8.0/guide/getting-started/index.md
----------------------------------------------------------------------
diff --git a/www/docs/en/1.8.0/guide/getting-started/index.md b/www/docs/en/1.8.0/guide/getting-started/index.md
index cef668b..2bddf89 100644
--- a/www/docs/en/1.8.0/guide/getting-started/index.md
+++ b/www/docs/en/1.8.0/guide/getting-started/index.md
@@ -21,10 +21,10 @@ license: >
 Getting Started Guides
 ======================
 
-- <a href="android/index.html">Getting Started with Android</a>
-- <a href="blackberry/index.html">Getting Started with BlackBerry</a>
-- <a href="ios/index.html">Getting Started with iOS</a>
-- <a href="symbian/index.html">Getting Started with Symbian</a>
-- <a href="webos/index.html">Getting Started with WebOS</a>
-- <a href="windows-phone/index.html">Getting Started with Windows Phone</a>
-- <a href="bada/index.html">Getting Started with Bada</a>
+- Getting Started with Android
+- Getting Started with BlackBerry
+- Getting Started with iOS
+- Getting Started with Symbian
+- Getting Started with WebOS
+- Getting Started with Windows Phone
+- Getting Started with Bada

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/af6a5545/www/docs/en/1.8.0/guide/getting-started/ios/index.md
----------------------------------------------------------------------
diff --git a/www/docs/en/1.8.0/guide/getting-started/ios/index.md b/www/docs/en/1.8.0/guide/getting-started/ios/index.md
index ef7cbb1..4420b6d 100644
--- a/www/docs/en/1.8.0/guide/getting-started/ios/index.md
+++ b/www/docs/en/1.8.0/guide/getting-started/ios/index.md
@@ -48,7 +48,7 @@ Setup New Project
 -----------------
 
 - Launch Xcode
-- Select the _<a href="../../../cordova/file/fileobj/fileobj.html">File</a> Menu_
+- Select the _File Menu_
 - Select _New_ -> _New Project..._
 - Select _Cordova-based Application_ from the list of templates
 
@@ -92,14 +92,14 @@ in Xcode project templates.
 
     ![](img/guide/platforms/ios/create-folder-reference.png)
 
-<a href="../webos/index.html">Hello World</a>
+Hello World
 -----------
 
 - Select the folder named `www` in the Xcode _Project Navigator_
 - Select the file `index.html`
 - Add the following after `<body>`:
 
-        <h1><a href="../webos/index.html">Hello World</a></h1>
+        <h1>Hello World</h1>
 
 You can also add any associated JavaScript and CSS files there as well.
     
@@ -109,13 +109,13 @@ Deploy to Simulator
 - 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
 
-Deploy to <a href="../../../cordova/device/device.html">Device</a>
+Deploy to Device
 ----------------
 
-- Open `YourAppName-Info.plist`, under the _Supporting <a href="../../../cordova/file/fileobj/fileobj.html">File</a>s_ group
+- Open `YourAppName-Info.plist`, 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 run the [Assistant](http://developer.apple.com/iphone/manage/overview/index.action) to register your app
-- Change the _Active SDK_ in the Scheme drop-down menu on the toolbar to _Your<a href="../../../cordova/device/device.html">Device</a>Name_
+- Change the _Active SDK_ in the Scheme drop-down menu on the toolbar to _YourDeviceName_
     - You will need to have your device connected via USB
 - Select the _Run_ button in your project window's toolbar
 

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/af6a5545/www/docs/en/1.8.0/guide/getting-started/symbian/index.md
----------------------------------------------------------------------
diff --git a/www/docs/en/1.8.0/guide/getting-started/symbian/index.md b/www/docs/en/1.8.0/guide/getting-started/symbian/index.md
index 9fd0938..aaac5e1 100644
--- a/www/docs/en/1.8.0/guide/getting-started/symbian/index.md
+++ b/www/docs/en/1.8.0/guide/getting-started/symbian/index.md
@@ -50,11 +50,11 @@ There are also [QT for Symbian](http://wiki.phonegap.com/w/page/16494811/PhoneGa
 - In cygwin, navigate to where you extracted Cordova and go into the Symbian directory</li>
 
  
-4. <a href="../webos/index.html">Hello World</a>
+4. Hello World
 --------------
 
 - Open up index.html located in phonegap/symbian/framework/www with your favourite editor. 
-- In the `body` tag, remove the line `"Build your phonegap app here! Dude!"` and add the line `<h1><a href="../webos/index.html">Hello World</a></h1>`
+- In the `body` tag, remove the line `"Build your phonegap app here! Dude!"` and add the line `<h1>Hello World</h1>`
 - In cygwin/terminal, type make. This will produce phonegap-symbian.wrt/app.wgz. 
 
 
@@ -66,7 +66,7 @@ There are also [QT for Symbian](http://wiki.phonegap.com/w/page/16494811/PhoneGa
 - Load the phonegap-symbian.wrt/app.wgz file into the emulator.
 
 
-5B. Deploy to <a href="../../../cordova/device/device.html">Device</a>
+5B. Deploy to Device
 --------------------
 
 - Load the phonegap-symbian.wrt/app.wgz file into the device using bluetooth or email.

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/af6a5545/www/docs/en/1.8.0/guide/getting-started/webos/index.md
----------------------------------------------------------------------
diff --git a/www/docs/en/1.8.0/guide/getting-started/webos/index.md b/www/docs/en/1.8.0/guide/getting-started/webos/index.md
index e87bd6a..68d7570 100644
--- a/www/docs/en/1.8.0/guide/getting-started/webos/index.md
+++ b/www/docs/en/1.8.0/guide/getting-started/webos/index.md
@@ -65,7 +65,7 @@ In phonegap/webOS/framework/www, open up index.html with your favourite editor.
 - Type `make` in your terminal/cygwin while in the webOS directory.
 
 
-5B. Deploy to <a href="../../../cordova/device/device.html">Device</a>
+5B. Deploy to Device
 --------------------
 
 - Make sure your device is in [Developer Mode and plug it in.](http://developer.palm.com/index.php?option=com_content&amp;view=article&amp;id=1552&amp;Itemid=59#dev_mode)

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/af6a5545/www/docs/en/1.8.0/guide/getting-started/windows-phone/index.md
----------------------------------------------------------------------
diff --git a/www/docs/en/1.8.0/guide/getting-started/windows-phone/index.md b/www/docs/en/1.8.0/guide/getting-started/windows-phone/index.md
index 1497693..cc334e9 100644
--- a/www/docs/en/1.8.0/guide/getting-started/windows-phone/index.md
+++ b/www/docs/en/1.8.0/guide/getting-started/windows-phone/index.md
@@ -37,7 +37,7 @@ Video Tutorials:
 
 Note: Running in VM has issues, if you are on a Mac, you will need to setup a bootcamp partition with Windows 7 or Vista
 
-Necessary for Installing on <a href="../../../cordova/device/device.html">Device</a> and Submitting to Market Place:
+Necessary for Installing on Device and Submitting to Market Place:
 
 - Become an [App Hub member](http://create.msdn.com/en-US/home/membership).
 
@@ -84,7 +84,7 @@ Necessary for Installing on <a href="../../../cordova/device/device.html">Device
 In order to test your application on a device, the device must be registered. Click [here][register-url] to read documentation on deploying and testing on your Windows Phone.
 
 - Make sure your phone is connected, and the screen is unlocked
-- In Visual Studio, select 'Windows Phone <a href="../../../cordova/device/device.html">Device</a>' from the top drop-down menu.
+- In Visual Studio, select 'Windows Phone Device' from the top drop-down menu.
 - Hit the green **play button** beside the drop-down menu to start debugging or press F5.
 
     ![](img/guide/platforms/wp7/wpd.png)

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/af6a5545/www/docs/en/1.8.0/guide/upgrading/blackberry/index.md
----------------------------------------------------------------------
diff --git a/www/docs/en/1.8.0/guide/upgrading/blackberry/index.md b/www/docs/en/1.8.0/guide/upgrading/blackberry/index.md
index 489ff3b..b4afe55 100644
--- a/www/docs/en/1.8.0/guide/upgrading/blackberry/index.md
+++ b/www/docs/en/1.8.0/guide/upgrading/blackberry/index.md
@@ -36,16 +36,16 @@ Updating just the www folder:
     - If playbook, then update the .js file in the `playbook/` folder.
 5. Update your HTML to use the new `cordova-1.8.0.js` file.
 6. Update your `www/plugins.xml` file. Two plugins changed their
-   namespace/service label. Change the old entries for the <a href="../../../cordova/media/capture/capture.html">Capture</a> and
-   <a href="../../../cordova/contacts/Contact/contact.html">Contact</a> plugins from:
+   namespace/service label. Change the old entries for the Capture and
+   Contact plugins from:
 
-        <plugin name="<a href="../../../cordova/media/capture/capture.html">Capture</a>" value="org.apache.cordova.media.<a href="../../../cordova/media/media.html">Media</a><a href="../../../cordova/media/capture/capture.html">Capture</a>"/>
-        <plugin name="<a href="../../../cordova/contacts/Contact/contact.html">Contact</a>" value="org.apache.cordova.pim.<a href="../../../cordova/contacts/Contact/contact.html">Contact</a>"/>
+        <plugin name="Capture" value="org.apache.cordova.media.MediaCapture"/>
+        <plugin name="Contact" value="org.apache.cordova.pim.Contact"/>
 
    To:
 
-        <plugin name="<a href="../../../cordova/media/capture/capture.html">Capture</a>" value="org.apache.cordova.capture.<a href="../../../cordova/media/media.html">Media</a><a href="../../../cordova/media/capture/capture.html">Capture</a>"/>
-        <plugin name="<a href="../../../cordova/contacts/Contact/contact.html">Contact</a>s" value="org.apache.cordova.pim.<a href="../../../cordova/contacts/Contact/contact.html">Contact</a>"/>
+        <plugin name="Capture" value="org.apache.cordova.capture.MediaCapture"/>
+        <plugin name="Contacts" value="org.apache.cordova.pim.Contact"/>
 
 
 Updating the sample folder (ie, updating using the ant tools):
@@ -59,13 +59,13 @@ Updating the sample folder (ie, updating using the ant tools):
 7. Open the `www/` folder and update your HTML to use the new `cordova-1.8.0.js` file.
 8. Open the `www/` folder and update the `plugins.xml` file. Two plugins
    changed their namespace/service label. Change the old entries for the
-   <a href="../../../cordova/media/capture/capture.html">Capture</a> and <a href="../../../cordova/contacts/Contact/contact.html">Contact</a> plugins from:
+   Capture and Contact plugins from:
 
-         <plugin name="<a href="../../../cordova/media/capture/capture.html">Capture</a>" value="org.apache.cordova.media.<a href="../../../cordova/media/media.html">Media</a><a href="../../../cordova/media/capture/capture.html">Capture</a>"/>
-         <plugin name="<a href="../../../cordova/contacts/Contact/contact.html">Contact</a>" value="org.apache.cordova.pim.<a href="../../../cordova/contacts/Contact/contact.html">Contact</a>"/>
+         <plugin name="Capture" value="org.apache.cordova.media.MediaCapture"/>
+         <plugin name="Contact" value="org.apache.cordova.pim.Contact"/>
 
    To:
 
-         <plugin name="<a href="../../../cordova/media/capture/capture.html">Capture</a>" value="org.apache.cordova.capture.<a href="../../../cordova/media/media.html">Media</a><a href="../../../cordova/media/capture/capture.html">Capture</a>"/>
-         <plugin name="<a href="../../../cordova/contacts/Contact/contact.html">Contact</a>s" value="org.apache.cordova.pim.<a href="../../../cordova/contacts/Contact/contact.html">Contact</a>"/>
+         <plugin name="Capture" value="org.apache.cordova.capture.MediaCapture"/>
+         <plugin name="Contacts" value="org.apache.cordova.pim.Contact"/>
 

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/af6a5545/www/docs/en/1.8.0/guide/upgrading/index.md
----------------------------------------------------------------------
diff --git a/www/docs/en/1.8.0/guide/upgrading/index.md b/www/docs/en/1.8.0/guide/upgrading/index.md
index 6e981c4..b539a58 100644
--- a/www/docs/en/1.8.0/guide/upgrading/index.md
+++ b/www/docs/en/1.8.0/guide/upgrading/index.md
@@ -23,10 +23,10 @@ Upgrading Guides
 
 > Learn how to upgrade an application to the latest Apache Cordova release.
 
-- <a href="android/index.html">Upgrading Cordova Android</a>
-- <a href="bada/index.html">Upgrading Cordova Bada</a>
-- <a href="blackberry/index.html">Upgrading Cordova BlackBerry</a>
-- <a href="ios/index.html">Upgrading Cordova iOS</a>
-- <a href="symbian/index.html">Upgrading Cordova Symbian</a>
-- <a href="webos/index.html">Upgrading Cordova webOS</a>
-- <a href="windows-phone/index.html">Upgrading Cordova Windows Phone</a>
+- Upgrading Cordova Android
+- Upgrading Cordova Bada
+- Upgrading Cordova BlackBerry
+- Upgrading Cordova iOS
+- Upgrading Cordova Symbian
+- Upgrading Cordova webOS
+- Upgrading Cordova Windows Phone

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/af6a5545/www/docs/en/1.8.0/guide/upgrading/ios/index.md
----------------------------------------------------------------------
diff --git a/www/docs/en/1.8.0/guide/upgrading/ios/index.md b/www/docs/en/1.8.0/guide/upgrading/ios/index.md
index e86c4f1..b5ab36b 100644
--- a/www/docs/en/1.8.0/guide/upgrading/ios/index.md
+++ b/www/docs/en/1.8.0/guide/upgrading/ios/index.md
@@ -28,8 +28,8 @@ Upgrading Cordova iOS
 3. **Copy** the **www/cordova-1.8.0.js** file from the new project into your **www** folder, and delete your **www/cordova-1.7.x.js** file
 4. **Update** the Cordova script reference in your **www/index.html** file (and any other files that contain the script reference) to point to the new **cordova-1.8.0.js** file
 
-If you intend on using the **<a href="../../../cordova/media/capture/capture.html">Capture</a> API**, you will need the new **iPad retina-display** assets:
+If you intend on using the **Capture API**, you will need the new **iPad retina-display** assets:
 
-1.  **Copy** the **Resources/<a href="../../../cordova/media/capture/capture.html">Capture</a>.bundle** item from the new project into your project folder, over-writing your existing **Resources/<a href="../../../cordova/media/capture/capture.html">Capture</a>.bundle** item
-2.  In your project, select the **<a href="../../../cordova/media/capture/capture.html">Capture</a>.bundle** item into Xcode into your Project Navigator, and press the **Delete** key, then select **Remove Reference** from the dialog that pops up.
-3.  Drag the new **<a href="../../../cordova/media/capture/capture.html">Capture</a>.bundle** from Step 1. above into Xcode into your Project Navigator, and select the **Create groups for any added folders** radio-button
+1.  **Copy** the **Resources/Capture.bundle** item from the new project into your project folder, over-writing your existing **Resources/Capture.bundle** item
+2.  In your project, select the **Capture.bundle** item into Xcode into your Project Navigator, and press the **Delete** key, then select **Remove Reference** from the dialog that pops up.
+3.  Drag the new **Capture.bundle** from Step 1. above into Xcode into your Project Navigator, and select the **Create groups for any added folders** radio-button

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/af6a5545/www/docs/en/1.8.0/guide/whitelist/index.md
----------------------------------------------------------------------
diff --git a/www/docs/en/1.8.0/guide/whitelist/index.md b/www/docs/en/1.8.0/guide/whitelist/index.md
index 4aba002..dec4216 100644
--- a/www/docs/en/1.8.0/guide/whitelist/index.md
+++ b/www/docs/en/1.8.0/guide/whitelist/index.md
@@ -107,7 +107,7 @@ iOS
 ### Details
 
 1. Open `Cordova.plist`.
-    - In Xcode, it is found at `AppName/Supporting <a href="../../cordova/file/fileobj/fileobj.html">File</a>s/Cordova.plist`
+    - In Xcode, it is found at `AppName/Supporting Files/Cordova.plist`
     - In the directory, it is found at `AppName/Cordova.plist`
 2. Add a new `String` value under the `ExternalHosts` key.
     - We recommend using Xcode to avoid editing raw XML.

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/af6a5545/www/docs/en/1.8.0/index.md
----------------------------------------------------------------------
diff --git a/www/docs/en/1.8.0/index.md b/www/docs/en/1.8.0/index.md
index 0706f65..1a07d88 100644
--- a/www/docs/en/1.8.0/index.md
+++ b/www/docs/en/1.8.0/index.md
@@ -22,70 +22,70 @@ license: >
     <h1>API Reference</h1>
     <ul>
         <li>
-            <h2><a href="cordova/accelerometer/accelerometer.html">Accelerometer</a></h2>
+            <h2>Accelerometer</h2>
             <span>Tap into the device's motion sensor.</span>
         </li>
         <li>
-            <h2><a href="cordova/camera/camera.html">Camera</a></h2>
-            <span><a href="cordova/media/capture/capture.html">Capture</a> a photo using the device's camera.</span>
+            <h2>Camera</h2>
+            <span>Capture a photo using the device's camera.</span>
         </li>
         <li>
-            <h2><a href="cordova/media/capture/capture.html">Capture</a></h2>
-            <span><a href="cordova/media/capture/capture.html">Capture</a> media files using device's media capture applications.</span>
+            <h2>Capture</h2>
+            <span>Capture media files using device's media capture applications.</span>
         </li>
         <li>
-            <h2><a href="cordova/compass/compass.html">Compass</a></h2>
+            <h2>Compass</h2>
             <span>Obtain the direction that the device is pointing.</span>
         </li>
         <li>
-            <h2><a href="cordova/connection/connection.html">Connection</a></h2>
+            <h2>Connection</h2>
             <span>Quickly check the network state, and cellular network information.</span>
         </li>
         <li>
-            <h2><a href="cordova/contacts/Contact/contact.html">Contact</a>s</h2>
+            <h2>Contacts</h2>
             <span>Work with the devices contact database.</span>
         </li>
         <li>
-            <h2><a href="cordova/device/device.html">Device</a></h2>
+            <h2>Device</h2>
             <span>Gather device specific information.</span>
         </li>
         <li>
-            <h2><a href="cordova/events/events.html">Events</a></h2>
+            <h2>Events</h2>
             <span>Hook into native events through JavaScript.</span>
         </li>
         <li>
-            <h2><a href="cordova/file/fileobj/fileobj.html">File</a></h2>
+            <h2>File</h2>
             <span>Hook into native file system through JavaScript.</span>
         </li>
         <li>
-            <h2><a href="cordova/geolocation/geolocation.html">Geolocation</a></h2>
+            <h2>Geolocation</h2>
             <span>Make your application location aware.</span>
         </li>
         <li>
-            <h2><a href="cordova/media/media.html">Media</a></h2>
+            <h2>Media</h2>
             <span>Record and play back audio files.</span>
         </li>
         <li>
-            <h2><a href="cordova/notification/notification.html">Notification</a></h2>
+            <h2>Notification</h2>
             <span>Visual, audible, and tactile device notifications.</span>
         </li>
         <li>
-            <h2><a href="cordova/storage/storage.html">Storage</a></h2>
+            <h2>Storage</h2>
             <span>Hook into the devices native storage options.</span>
         </li>
     </ul>
     <h1>Guides</h1>
     <ul>
         <li>
-            <h2><a href="guide/getting-started/index.html">Getting Started Guides</a></h2>
+            <h2>Getting Started Guides</h2>
             <span>Setup each SDK and create your first Cordova app.</span>
         </li>
         <li>
-            <h2><a href="guide/upgrading/index.html">Upgrading Guides</a></h2>
+            <h2>Upgrading Guides</h2>
             <span>Upgrade an application to the latest Cordova release.</span>
         </li>
         <li>
-            <h2><a href="guide/whitelist/index.html">Domain Whitelist Guide</a></h2>
+            <h2>Domain Whitelist Guide</h2>
             <span>Grant an application access to external domains.</span>
         </li>
         <li>


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org