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:41:13 UTC

[29/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.5.0/phonegap/media/capture/captureVideo.md
----------------------------------------------------------------------
diff --git a/www/docs/en/1.5.0/phonegap/media/capture/captureVideo.md b/www/docs/en/1.5.0/phonegap/media/capture/captureVideo.md
index 23256bf..46e3184 100644
--- a/www/docs/en/1.5.0/phonegap/media/capture/captureVideo.md
+++ b/www/docs/en/1.5.0/phonegap/media/capture/captureVideo.md
@@ -24,7 +24,7 @@ capture.captureVideo
 > Start the video recorder application and return information about captured video clip file(s).
 
     navigator.device.capture.captureVideo( 
-	    <a href="<a href="capture.html">Capture</a>CB.html"><a href="capture.html">Capture</a>CB</a> captureSuccess, <a href="capture.html">Capture</a>ErrorCB captureError, [<a href="capture.html">Capture</a>VideoOptions options]
+	    CaptureCB captureSuccess, CaptureErrorCB captureError, [CaptureVideoOptions options]
 	);
 
 Description
@@ -32,9 +32,9 @@ Description
 
 This method starts an asynchronous operation to capture video recordings using the device video recording application.  The operation allows the device user to capture multiple recordings in a single session.
 
-The capture operation ends when either the user exits the video recording application, or the maximum number of recordings, specified by the __limit__ parameter in <a href="capture.html">Capture</a>VideoOptions, has been reached.  If no value is provided for the __limit__ parameter, a default value of one (1) is used, and the capture operation will terminate after the user records a single video clip.
+The capture operation ends when either the user exits the video recording application, or the maximum number of recordings, specified by the __limit__ parameter in CaptureVideoOptions, has been reached.  If no value is provided for the __limit__ parameter, a default value of one (1) is used, and the capture operation will terminate after the user records a single video clip.
 
-When the capture operation is finished, it will invoke the <a href="<a href="capture.html">Capture</a>CB.html"><a href="capture.html">Capture</a>CB</a> callback with an array of <a href="<a href="../media.html">Media</a><a href="../../file/fileobj/fileobj.html">File</a>.html"><a href="../media.html">Media</a><a href="../../file/fileobj/fileobj.html">File</a></a> objects describing each captured video clip file.  If the operation is terminated by the user before an video clip is captured, the <a href="capture.html">Capture</a>ErrorCB callback will be invoked with a <a href="capture.html">Capture</a>Error object with the <a href="capture.html">Capture</a>Error.`CAPTURE_NO_MEDIA_FILES` error code.
+When the capture operation is finished, it will invoke the CaptureCB callback with an array of MediaFile objects describing each captured video clip file.  If the operation is terminated by the user before an video clip is captured, the CaptureErrorCB callback will be invoked with a CaptureError object with the CaptureError.`CAPTURE_NO_MEDIA_FILES` error code.
 
 Supported Platforms
 -------------------
@@ -44,33 +44,33 @@ Supported Platforms
 - iOS
 - Windows Phone 7 ( Mango )
 
-Quick <a href="../../storage/storage.opendatabase.html">Example</a>
+Quick Example
 -------------
 
     // capture callback
-    var captureSuccess = function(media<a href="../../file/fileobj/fileobj.html">File</a>s) {
+    var captureSuccess = function(mediaFiles) {
         var i, path, len;
-        for (i = 0, len = media<a href="../../file/fileobj/fileobj.html">File</a>s.length; i < len; i += 1) {
-            path = media<a href="../../file/fileobj/fileobj.html">File</a>s[i].fullPath;
+        for (i = 0, len = mediaFiles.length; i < len; i += 1) {
+            path = mediaFiles[i].fullPath;
             // do something interesting with the file
         }
     };
 
     // capture error callback
     var captureError = function(error) {
-        navigator.<a href="../../notification/notification.alert.html">notification.alert</a>('Error code: ' + error.code, null, '<a href="capture.html">Capture</a> Error');
+        navigator.notification.alert('Error code: ' + error.code, null, 'Capture Error');
     };
 
     // start video capture
     navigator.device.capture.captureVideo(captureSuccess, captureError, {limit:2});
 
-Full <a href="../../storage/storage.opendatabase.html">Example</a>
+Full Example
 ------------
 
     <!DOCTYPE html>
     <html>
       <head>
-        <title><a href="capture.html">Capture</a> Video</title>
+        <title>Capture Video</title>
 
         <script type="text/javascript" charset="utf-8" src="cordova-1.5.0.js"></script>
         <script type="text/javascript" charset="utf-8" src="json2.js"></script>
@@ -78,10 +78,10 @@ Full <a href="../../storage/storage.opendatabase.html">Example</a>
 
         // Called when capture operation is finished
         //
-        function captureSuccess(media<a href="../../file/fileobj/fileobj.html">File</a>s) {
+        function captureSuccess(mediaFiles) {
             var i, len;
-            for (i = 0, len = media<a href="../../file/fileobj/fileobj.html">File</a>s.length; i < len; i += 1) {
-                upload<a href="../../file/fileobj/fileobj.html">File</a>(media<a href="../../file/fileobj/fileobj.html">File</a>s[i]);
+            for (i = 0, len = mediaFiles.length; i < len; i += 1) {
+                uploadFile(mediaFiles[i]);
             }	    
         }
 
@@ -89,7 +89,7 @@ Full <a href="../../storage/storage.opendatabase.html">Example</a>
         // 
         function captureError(error) {
 	        var msg = 'An error occurred during capture: ' + error.code;
-            navigator.<a href="../../notification/notification.alert.html">notification.alert</a>(msg, null, 'Uh oh!');
+            navigator.notification.alert(msg, null, 'Uh oh!');
         }
 
         // A button will call this function
@@ -101,10 +101,10 @@ Full <a href="../../storage/storage.opendatabase.html">Example</a>
         }
 
         // Upload files to server
-        function upload<a href="../../file/fileobj/fileobj.html">File</a>(media<a href="../../file/fileobj/fileobj.html">File</a>) {
-            var ft = new <a href="../../file/filetransfer/filetransfer.html"><a href="../../file/fileobj/fileobj.html">File</a>Transfer</a>(),
-                path = media<a href="../../file/fileobj/fileobj.html">File</a>.fullPath,
-                <a href="../../storage/parameters/name.html">name</a> = media<a href="../../file/fileobj/fileobj.html">File</a>.<a href="../../storage/parameters/name.html">name</a>;
+        function uploadFile(mediaFile) {
+            var ft = new FileTransfer(),
+                path = mediaFile.fullPath,
+                name = mediaFile.name;
 
             ft.upload(path,
                 "http://my.domain.com/upload.php",
@@ -115,17 +115,17 @@ Full <a href="../../storage/storage.opendatabase.html">Example</a>
                 function(error) {
                     console.log('Error uploading file ' + path + ': ' + error.code);
                 },
-                { fileName: <a href="../../storage/parameters/name.html">name</a> });   
+                { fileName: name });   
         }
 
         </script>
         </head>
         <body>
-            <button onclick="captureVideo();"><a href="capture.html">Capture</a> Video</button> <br>
+            <button onclick="captureVideo();">Capture Video</button> <br>
         </body>
     </html>
 
 BlackBerry WebWorks Quirks
 --------------------------
 
-- PhoneGap for BlackBerry WebWorks attempts to launch the __Video Recorder__ application, provided by RIM, to capture the video recordings.  The developer will receive a <a href="capture.html">Capture</a>Error.`CAPTURE_NOT_SUPPORTED` error code if the application is not installed on the device.
+- PhoneGap for BlackBerry WebWorks attempts to launch the __Video Recorder__ application, provided by RIM, to capture the video recordings.  The developer will receive a CaptureError.`CAPTURE_NOT_SUPPORTED` error code if the application is not installed on the device.

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/af6a5545/www/docs/en/1.5.0/phonegap/media/capture/captureVideoOptions.md
----------------------------------------------------------------------
diff --git a/www/docs/en/1.5.0/phonegap/media/capture/captureVideoOptions.md b/www/docs/en/1.5.0/phonegap/media/capture/captureVideoOptions.md
index b7e4c20..29667ad 100644
--- a/www/docs/en/1.5.0/phonegap/media/capture/captureVideoOptions.md
+++ b/www/docs/en/1.5.0/phonegap/media/capture/captureVideoOptions.md
@@ -18,7 +18,7 @@ license: >
     under the License.
 ---
 
-<a href="capture.html">Capture</a>VideoOptions
+CaptureVideoOptions
 ===================
 
 > Encapsulates video capture configuration options.
@@ -30,31 +30,31 @@ Properties
 - __duration:__ The maximum duration of a video clip, in seconds.
 - __mode:__ The selected video capture mode.  The value must match one of the elements in `capture.supportedVideoModes`.
 
-Quick <a href="../../storage/storage.opendatabase.html">Example</a>
+Quick Example
 -------------
 
     // limit capture operation to 3 video clips
     var options = { limit: 3 };
 
-    navigator.device.<a href="captureVideo.html">capture.captureVideo</a>(captureSuccess, captureError, options);
+    navigator.device.capture.captureVideo(captureSuccess, captureError, options);
 
 Android Quirks
 --------------
 
 - The __duration__ parameter is not supported.  Recording lengths cannot be limited programmatically.
-- The __mode__ parameter is not supported.  The video <a href="../../storage/parameters/size.html">size</a> and format cannot be altered programmatically; however, these parameters can be changed by the device user. By default, videos are recorded in 3GPP (video/3gpp) format.
+- The __mode__ parameter is not supported.  The video size and format cannot be altered programmatically; however, these parameters can be changed by the device user. By default, videos are recorded in 3GPP (video/3gpp) format.
 
 
 BlackBerry WebWorks Quirks
 --------------------------
 
 - The __duration__ parameter is not supported.  Recording lengths cannot be limited programmatically.
-- The __mode__ parameter is not supported.  The video <a href="../../storage/parameters/size.html">size</a> and format cannot be altered programmatically; however, these parameters can be changed by the device user. By default, videos are recorded in 3GPP (video/3gpp) format.
+- The __mode__ parameter is not supported.  The video size and format cannot be altered programmatically; however, these parameters can be changed by the device user. By default, videos are recorded in 3GPP (video/3gpp) format.
 
 iOS Quirks
 ----------
 
 - The __limit__ parameter is not supported.  One video is recorded per invocation.
 - The __duration__ parameter is not supported.  Recording lengths cannot be limited programmatically.
-- The __mode__ parameter is not supported.  The video <a href="../../storage/parameters/size.html">size</a> and format cannot be altered programmatically. By default, videos are recorded in MOV (video/quicktime) format.
+- The __mode__ parameter is not supported.  The video size and format cannot be altered programmatically. By default, videos are recorded in MOV (video/quicktime) format.
 

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/af6a5545/www/docs/en/1.5.0/phonegap/media/media.getCurrentPosition.md
----------------------------------------------------------------------
diff --git a/www/docs/en/1.5.0/phonegap/media/media.getCurrentPosition.md b/www/docs/en/1.5.0/phonegap/media/media.getCurrentPosition.md
index 2793b72..938d2e5 100644
--- a/www/docs/en/1.5.0/phonegap/media/media.getCurrentPosition.md
+++ b/www/docs/en/1.5.0/phonegap/media/media.getCurrentPosition.md
@@ -18,23 +18,23 @@ license: >
     under the License.
 ---
 
-media.getCurrent<a href="../geolocation/Position/position.html">Position</a>
+media.getCurrentPosition
 ========================
 
 Returns the current position within an audio file.
 
-    media.getCurrent<a href="../geolocation/Position/position.html">Position</a>(mediaSuccess, [<a href="Parameters/mediaError.html">mediaError</a>]);
+    media.getCurrentPosition(mediaSuccess, [mediaError]);
 
 Parameters
 ----------
 
 - __mediaSuccess__: The callback that is called with the current position in seconds.
-- __<a href="Parameters/mediaError.html">mediaError</a>__: (Optional) The callback that is called if there was an error.
+- __mediaError__: (Optional) The callback that is called if there was an error.
 
 Description
 -----------
 
-Function `media.getCurrent<a href="../geolocation/Position/position.html">Position</a>` is an asynchronous function that returns 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.getCurrentPosition` is an asynchronous function that returns the current position of the underlying audio file of a Media object. Also updates the ___position__ parameter within the Media object. 
 
 Supported Platforms
 -------------------
@@ -43,17 +43,17 @@ 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);
 
         // Update media position every second
         var 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) {
@@ -68,25 +68,25 @@ Quick <a href="../storage/storage.opendatabase.html">Example</a>
         }, 1000);
 
 
-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.5.0.js"></script>
             <script type="text/javascript" charset="utf-8">
         
             // Wait for PhoneGap 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);
         
             // PhoneGap is ready
             //
-            function on<a href="../device/device.html">Device</a>Ready() {
+            function onDeviceReady() {
                 playAudio("http://audio.ibeat.org/content/p1rj1s/p1rj1s_-_rockGuitar.mp3");
             }
         
@@ -98,27 +98,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);
@@ -127,9 +127,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();
                 }
             }
         
@@ -137,7 +137,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;
@@ -158,7 +158,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;
             }
         
@@ -166,7 +166,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.5.0/phonegap/media/media.getDuration.md
----------------------------------------------------------------------
diff --git a/www/docs/en/1.5.0/phonegap/media/media.getDuration.md b/www/docs/en/1.5.0/phonegap/media/media.getDuration.md
index 2fb4906..e4efa7e 100644
--- a/www/docs/en/1.5.0/phonegap/media/media.getDuration.md
+++ b/www/docs/en/1.5.0/phonegap/media/media.getDuration.md
@@ -38,12 +38,12 @@ 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);
 
         // Get duration
         var counter = 0;
@@ -60,25 +60,25 @@ Quick <a href="../storage/storage.opendatabase.html">Example</a>
        }, 100);
 
 
-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.5.0.js"></script>
             <script type="text/javascript" charset="utf-8">
         
             // Wait for PhoneGap 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);
         
             // PhoneGap is ready
             //
-            function on<a href="../device/device.html">Device</a>Ready() {
+            function onDeviceReady() {
                 playAudio("http://audio.ibeat.org/content/p1rj1s/p1rj1s_-_rockGuitar.mp3");
             }
         
@@ -90,27 +90,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);
@@ -119,9 +119,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();
                 }
             }
         
@@ -129,7 +129,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;
@@ -150,7 +150,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;
             }
         
@@ -158,7 +158,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.5.0/phonegap/media/media.md
----------------------------------------------------------------------
diff --git a/www/docs/en/1.5.0/phonegap/media/media.md b/www/docs/en/1.5.0/phonegap/media/media.md
index 53c2c4c..1094fb8 100644
--- a/www/docs/en/1.5.0/phonegap/media/media.md
+++ b/www/docs/en/1.5.0/phonegap/media/media.md
@@ -23,7 +23,7 @@ Media
 
 > The `Media` object provides the ability to record and play back audio files on a device. 
 
-    var media = new Media(src, mediaSuccess, [<a href="Parameters/mediaError.html">mediaError</a>], [mediaStatus]);
+    var media = new Media(src, mediaSuccess, [mediaError], [mediaStatus]);
 
 
 Note: The current implementation does not adhere to a W3C specification for media capture, and is provided for convenience only.  A future implementation will adhere to the latest W3C specification and may deprecate the current APIs.
@@ -33,26 +33,26 @@ Parameters
 
 - __src__: A URI containing the audio content. _(DOMString)_
 - __mediaSuccess__: (Optional) The callback that is invoked after a Media object has completed the current play/record or stop action. _(Function)_
-- __<a href="Parameters/mediaError.html">mediaError</a>__: (Optional) The callback that is invoked if there was an error. _(Function)_
+- __mediaError__: (Optional) The callback that is invoked if there was an error. _(Function)_
 - __mediaStatus__: (Optional) The callback that is invoked to indicate status changes. _(Function)_
 
 Methods
 -------
 
-- media.getCurrent<a href="../geolocation/Position/position.html">Position</a>: Returns the current position within an audio file.
-- <a href="media.getDuration.html">media.getDuration</a>: Returns the duration of an audio file.
-- <a href="media.play.html">media.play</a>: Start or <a href="../events/events.resume.html">resume</a> playing audio file.
-- media.<a href="../events/events.pause.html">pause</a>: Pause playing audio file.
-- <a href="media.release.html">media.release</a>: Releases the underlying OS'es audio resources.
-- <a href="media.seekTo.html">media.seekTo</a>: Moves the position within the audio file.
-- <a href="media.startRecord.html">media.startRecord</a>: Start recording audio file.
-- <a href="media.stop.html">media.stop</a>Record: Stop recording audio file.
-- <a href="media.stop.html">media.stop</a>: Stop playing audio file.
+- media.getCurrentPosition: Returns the current position within an audio file.
+- media.getDuration: Returns the duration of an audio file.
+- media.play: Start or resume playing audio file.
+- media.pause: Pause playing audio file.
+- media.release: Releases the underlying OS'es audio resources.
+- media.seekTo: Moves the position within the audio file.
+- media.startRecord: Start recording audio file.
+- media.stopRecord: Stop recording audio file.
+- media.stop: Stop playing audio file.
 
 Additional ReadOnly Parameters
 ---------------------
 
-- ___position__: The position within the audio playback in seconds.  Not automatically updated during play, call getCurrent<a href="../geolocation/Position/position.html">Position</a> to update.
+- ___position__: The position within the audio playback in seconds.  Not automatically updated during play, call getCurrentPosition to update.
 - ___duration__: The duration of the media in seconds.
 
 Supported Platforms

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/af6a5545/www/docs/en/1.5.0/phonegap/media/media.pause.md
----------------------------------------------------------------------
diff --git a/www/docs/en/1.5.0/phonegap/media/media.pause.md b/www/docs/en/1.5.0/phonegap/media/media.pause.md
index e634d4c..22a4fc4 100644
--- a/www/docs/en/1.5.0/phonegap/media/media.pause.md
+++ b/www/docs/en/1.5.0/phonegap/media/media.pause.md
@@ -18,18 +18,18 @@ license: >
     under the License.
 ---
 
-media.<a href="../events/events.pause.html">pause</a>
+media.pause
 ===========
 
 Pauses playing an audio file.
 
-    media.<a href="../events/events.pause.html">pause</a>();
+    media.pause();
 
 
 Description
 -----------
 
-Function `media.<a href="../events/events.pause.html">pause</a>` is a synchronous function that <a href="../events/events.pause.html">pause</a>s playing an audio file.
+Function `media.pause` is a synchronous function that pauses playing an audio file.
 
 Supported Platforms
 -------------------
@@ -38,14 +38,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");
@@ -56,34 +56,34 @@ 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() {
-            media.<a href="../events/events.pause.html">pause</a>();
+            media.pause();
         }, 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.5.0.js"></script>
             <script type="text/javascript" charset="utf-8">
         
             // Wait for PhoneGap 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);
         
             // PhoneGap 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();
                 }
             }
         
@@ -134,7 +134,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;
@@ -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.5.0/phonegap/media/media.play.md
----------------------------------------------------------------------
diff --git a/www/docs/en/1.5.0/phonegap/media/media.play.md b/www/docs/en/1.5.0/phonegap/media/media.play.md
index 3a81131..6913f9c 100644
--- a/www/docs/en/1.5.0/phonegap/media/media.play.md
+++ b/www/docs/en/1.5.0/phonegap/media/media.play.md
@@ -21,7 +21,7 @@ license: >
 media.play
 ==========
 
-Starts or <a href="../events/events.resume.html">resume</a>s playing an audio file.
+Starts or resumes playing an audio file.
 
     media.play();
 
@@ -29,7 +29,7 @@ Starts or <a href="../events/events.resume.html">resume</a>s playing an audio fi
 Description
 -----------
 
-Function `media.play` is a synchronous function that starts or <a href="../events/events.resume.html">resume</a>s playing an audio file.
+Function `media.play` is a synchronous function that starts or resumes playing an audio file.
 
 Supported Platforms
 -------------------
@@ -38,14 +38,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");
@@ -60,25 +60,25 @@ Quick <a href="../storage/storage.opendatabase.html">Example</a>
     }
 
 
-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.5.0.js"></script>
             <script type="text/javascript" charset="utf-8">
         
             // Wait for PhoneGap 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);
         
             // PhoneGap is ready
             //
-            function on<a href="../device/device.html">Device</a>Ready() {
+            function onDeviceReady() {
                 playAudio("http://audio.ibeat.org/content/p1rj1s/p1rj1s_-_rockGuitar.mp3");
             }
         
@@ -91,8 +91,8 @@ Full <a href="../storage/storage.opendatabase.html">Example</a>
             //
             function playAudio(src) {
             	if (my_media == null) {
-                	// 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);
             	} // else play current audio
                 // Play audio
                 my_media.play();
@@ -101,17 +101,17 @@ Full <a href="../storage/storage.opendatabase.html">Example</a>
                 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);
@@ -120,9 +120,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();
                 }
             }
         
@@ -130,7 +130,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;
@@ -151,7 +151,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;
             }
         
@@ -159,7 +159,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.5.0/phonegap/media/media.release.md
----------------------------------------------------------------------
diff --git a/www/docs/en/1.5.0/phonegap/media/media.release.md b/www/docs/en/1.5.0/phonegap/media/media.release.md
index 235f613..5622d13 100644
--- a/www/docs/en/1.5.0/phonegap/media/media.release.md
+++ b/www/docs/en/1.5.0/phonegap/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
 -------------------
@@ -38,36 +38,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.5.0.js"></script>
             <script type="text/javascript" charset="utf-8">
         
             // Wait for PhoneGap 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);
         
             // PhoneGap is ready
             //
-            function on<a href="../device/device.html">Device</a>Ready() {
+            function onDeviceReady() {
                 playAudio("http://audio.ibeat.org/content/p1rj1s/p1rj1s_-_rockGuitar.mp3");
             }
         
@@ -79,27 +79,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);
@@ -108,9 +108,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();
                 }
             }
         
@@ -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;
             }
         
@@ -147,7 +147,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.5.0/phonegap/media/media.seekTo.md
----------------------------------------------------------------------
diff --git a/www/docs/en/1.5.0/phonegap/media/media.seekTo.md b/www/docs/en/1.5.0/phonegap/media/media.seekTo.md
index 133e10e..fbdd9a5 100644
--- a/www/docs/en/1.5.0/phonegap/media/media.seekTo.md
+++ b/www/docs/en/1.5.0/phonegap/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
 -------------------
@@ -43,38 +43,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.5.0.js"></script>
             <script type="text/javascript" charset="utf-8">
         
             // Wait for PhoneGap 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);
         
             // PhoneGap is ready
             //
-            function on<a href="../device/device.html">Device</a>Ready() {
+            function onDeviceReady() {
                 playAudio("http://audio.ibeat.org/content/p1rj1s/p1rj1s_-_rockGuitar.mp3");
             }
         
@@ -86,19 +86,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
@@ -117,7 +117,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;
@@ -138,7 +138,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.5.0/phonegap/media/media.startRecord.md
----------------------------------------------------------------------
diff --git a/www/docs/en/1.5.0/phonegap/media/media.startRecord.md b/www/docs/en/1.5.0/phonegap/media/media.startRecord.md
index 56522e7..d8fe2a0 100644
--- a/www/docs/en/1.5.0/phonegap/media/media.startRecord.md
+++ b/www/docs/en/1.5.0/phonegap/media/media.startRecord.md
@@ -38,14 +38,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");
@@ -61,26 +61,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.5.0.js"></script>
         <script type="text/javascript" charset="utf-8">
 
         // Wait for PhoneGap 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();
@@ -89,7 +89,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();
@@ -99,7 +99,7 @@ Full <a href="../storage/storage.opendatabase.html">Example</a>
 
         // PhoneGap is ready
         //
-        function on<a href="../device/device.html">Device</a>Ready() {
+        function onDeviceReady() {
             recordAudio();
         }
     
@@ -118,7 +118,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;
         }
 
@@ -134,4 +134,4 @@ Full <a href="../storage/storage.opendatabase.html">Example</a>
 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.5.0/phonegap/media/media.stop.md
----------------------------------------------------------------------
diff --git a/www/docs/en/1.5.0/phonegap/media/media.stop.md b/www/docs/en/1.5.0/phonegap/media/media.stop.md
index 75e7d81..8000955 100644
--- a/www/docs/en/1.5.0/phonegap/media/media.stop.md
+++ b/www/docs/en/1.5.0/phonegap/media/media.stop.md
@@ -38,14 +38,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");
@@ -56,7 +56,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() {
@@ -64,25 +64,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.5.0.js"></script>
             <script type="text/javascript" charset="utf-8">
         
             // Wait for PhoneGap 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);
         
             // PhoneGap is ready
             //
-            function on<a href="../device/device.html">Device</a>Ready() {
+            function onDeviceReady() {
                 playAudio("http://audio.ibeat.org/content/p1rj1s/p1rj1s_-_rockGuitar.mp3");
             }
         
@@ -94,27 +94,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);
@@ -123,9 +123,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();
                 }
             }
         
@@ -154,7 +154,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;
             }
         
@@ -162,7 +162,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.5.0/phonegap/media/media.stopRecord.md
----------------------------------------------------------------------
diff --git a/www/docs/en/1.5.0/phonegap/media/media.stopRecord.md b/www/docs/en/1.5.0/phonegap/media/media.stopRecord.md
index 61f169a..62d1ca0 100644
--- a/www/docs/en/1.5.0/phonegap/media/media.stopRecord.md
+++ b/www/docs/en/1.5.0/phonegap/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
 -------------------
@@ -38,14 +38,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");
@@ -66,26 +66,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.5.0.js"></script>
         <script type="text/javascript" charset="utf-8">
 
         // Wait for PhoneGap 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();
@@ -94,7 +94,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();
@@ -104,7 +104,7 @@ Full <a href="../storage/storage.opendatabase.html">Example</a>
 
         // PhoneGap is ready
         //
-        function on<a href="../device/device.html">Device</a>Ready() {
+        function onDeviceReady() {
             recordAudio();
         }
     
@@ -123,7 +123,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.5.0/phonegap/notification/notification.alert.md
----------------------------------------------------------------------
diff --git a/www/docs/en/1.5.0/phonegap/notification/notification.alert.md b/www/docs/en/1.5.0/phonegap/notification/notification.alert.md
index dc97021..68415e5 100644
--- a/www/docs/en/1.5.0/phonegap/notification/notification.alert.md
+++ b/www/docs/en/1.5.0/phonegap/notification/notification.alert.md
@@ -28,7 +28,7 @@ Shows a custom alert or dialog box.
 - __message:__ Dialog message (`String`)
 - __alertCallback:__ Callback to invoke when alert dialog is dismissed. (`Function`)
 - __title:__ Dialog title (`String`) (Optional, Default: "Alert")
-- __buttonName:__ Button <a href="../storage/parameters/name.html">name</a> (`String`) (Optional, Default: "OK")
+- __buttonName:__ Button name (`String`) (Optional, Default: "OK")
     
 Description
 -----------
@@ -44,7 +44,7 @@ Supported Platforms
 - iPhone
 - Windows Phone 7 ( Mango )
 
-Quick <a href="../storage/storage.opendatabase.html">Example</a>
+Quick Example
 -------------
 
     // Android / BlackBerry WebWorks (OS 5.0 and higher) / iPhone
@@ -64,24 +64,24 @@ Quick <a href="../storage/storage.opendatabase.html">Example</a>
     //
     navigator.notification.alert('You are the winner!');
         
-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.5.0.js"></script>
         <script type="text/javascript" charset="utf-8">
 
         // Wait for PhoneGap 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);
 
         // PhoneGap is ready
         //
-        function on<a href="../device/device.html">Device</a>Ready() {
+        function onDeviceReady() {
             // Empty
         }
     
@@ -111,4 +111,4 @@ Full <a href="../storage/storage.opendatabase.html">Example</a>
 Windows Phone 7 Quirks
 -------------
 
-- Ignores button <a href="../storage/parameters/name.html">name</a>s, always uses 'OK' 
\ No newline at end of file
+- Ignores button names, always uses 'OK' 
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/af6a5545/www/docs/en/1.5.0/phonegap/notification/notification.beep.md
----------------------------------------------------------------------
diff --git a/www/docs/en/1.5.0/phonegap/notification/notification.beep.md b/www/docs/en/1.5.0/phonegap/notification/notification.beep.md
index a291dfd..4d0c0c1 100644
--- a/www/docs/en/1.5.0/phonegap/notification/notification.beep.md
+++ b/www/docs/en/1.5.0/phonegap/notification/notification.beep.md
@@ -36,37 +36,37 @@ Supported Platforms
 - iPhone
 - Windows Phone 7 ( Mango )
 
-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.5.0.js"></script>
         <script type="text/javascript" charset="utf-8">
 
         // Wait for PhoneGap 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);
 
         // PhoneGap 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
 -------------
@@ -106,7 +106,7 @@ iPhone Quirks
 - There is no native beep API for iPhone.
   - PhoneGap implements beep by playing an audio file via the media API.
   - The user must provide a file with the desired beep tone.
-  - This file must be less than 30 seconds long, located in the www/ root, and must be <a href="../storage/parameters/name.html">name</a>d `beep.wav`.
+  - This file must be less than 30 seconds long, located in the www/ root, and must be named `beep.wav`.
 
 Windows Phone 7 Quirks
 -------------

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/af6a5545/www/docs/en/1.5.0/phonegap/notification/notification.confirm.md
----------------------------------------------------------------------
diff --git a/www/docs/en/1.5.0/phonegap/notification/notification.confirm.md b/www/docs/en/1.5.0/phonegap/notification/notification.confirm.md
index c1ca458..731d4cc 100644
--- a/www/docs/en/1.5.0/phonegap/notification/notification.confirm.md
+++ b/www/docs/en/1.5.0/phonegap/notification/notification.confirm.md
@@ -43,7 +43,7 @@ Supported Platforms
 - iPhone
 - Windows Phone 7 ( Mango )
 
-Quick <a href="../storage/storage.opendatabase.html">Example</a>
+Quick Example
 -------------
 
 	// process the confirmation dialog result
@@ -62,24 +62,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.5.0.js"></script>
         <script type="text/javascript" charset="utf-8">
 
         // Wait for PhoneGap 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);
 
         // PhoneGap is ready
         //
-        function on<a href="../device/device.html">Device</a>Ready() {
+        function onDeviceReady() {
             // Empty
         }
     
@@ -109,4 +109,4 @@ Full <a href="../storage/storage.opendatabase.html">Example</a>
 Windows Phone 7 Quirks
 -------------
 
-- Ignores button <a href="../storage/parameters/name.html">name</a>s, always 'OK|Cancel'
\ No newline at end of file
+- Ignores button names, always 'OK|Cancel'
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/af6a5545/www/docs/en/1.5.0/phonegap/notification/notification.md
----------------------------------------------------------------------
diff --git a/www/docs/en/1.5.0/phonegap/notification/notification.md b/www/docs/en/1.5.0/phonegap/notification/notification.md
index 5a0efa2..f337c57 100644
--- a/www/docs/en/1.5.0/phonegap/notification/notification.md
+++ b/www/docs/en/1.5.0/phonegap/notification/notification.md
@@ -26,7 +26,7 @@ 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>
\ No newline at end of file
+- notification.alert
+- notification.confirm
+- notification.beep
+- notification.vibrate
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/af6a5545/www/docs/en/1.5.0/phonegap/notification/notification.vibrate.md
----------------------------------------------------------------------
diff --git a/www/docs/en/1.5.0/phonegap/notification/notification.vibrate.md b/www/docs/en/1.5.0/phonegap/notification/notification.vibrate.md
index df8f5ee..5d19e43 100644
--- a/www/docs/en/1.5.0/phonegap/notification/notification.vibrate.md
+++ b/www/docs/en/1.5.0/phonegap/notification/notification.vibrate.md
@@ -36,38 +36,38 @@ Supported Platforms
 - iPhone
 - Windows Phone 7
 
-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.5.0.js"></script>
         <script type="text/javascript" charset="utf-8">
 
         // Wait for PhoneGap 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);
 
         // PhoneGap 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.5.0/phonegap/storage/database/database.md
----------------------------------------------------------------------
diff --git a/www/docs/en/1.5.0/phonegap/storage/database/database.md b/www/docs/en/1.5.0/phonegap/storage/database/database.md
index dec1fe1..aa0ccf8 100644
--- a/www/docs/en/1.5.0/phonegap/storage/database/database.md
+++ b/www/docs/en/1.5.0/phonegap/storage/database/database.md
@@ -27,12 +27,12 @@ Methods
 -------
 
 - __transaction__: Runs a database transaction. 
-- __changeVersion__: method allows scripts to atomically verify the <a href="../parameters/version.html">version</a> number and change it at the same time as doing a schema update. 
+- __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.<a href="../storage.opendatabase.html">openDatabase</a>()`.
+A Database object is returned from a call to `window.openDatabase()`.
 
 Supported Platforms
 -------------------
@@ -41,7 +41,7 @@ Supported Platforms
 - BlackBerry WebWorks (OS 6.0 and higher)
 - iPhone
 
-Transaction Quick <a href="../storage.opendatabase.html">Example</a>
+Transaction Quick Example
 ------------------
 	function populateDB(tx) {
 		 tx.executeSql('DROP TABLE IF EXISTS DEMO');
@@ -58,34 +58,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", "PhoneGap Demo", 200000);
+	var db = window.openDatabase("Database", "1.0", "PhoneGap 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", "PhoneGap Demo", 200000);
+	var db = window.openDatabase("Database", "1.0", "PhoneGap 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="../../contacts/Contact/contact.html">Contact</a> <a href="../storage.opendatabase.html">Example</a></title>
+        <title>Contact Example</title>
 
         <script type="text/javascript" charset="utf-8" src="cordova-1.5.0.js"></script>
         <script type="text/javascript" charset="utf-8">
 
         // Wait for PhoneGap 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);
 
         // PhoneGap 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", "PhoneGap Demo", 200000);
+        function onDeviceReady() {
+			var db = window.openDatabase("Database", "1.0", "PhoneGap Demo", 200000);
 			db.transaction(populateDB, errorCB, successCB);
         }
 		
@@ -113,7 +113,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.5.0/phonegap/storage/localstorage/localstorage.md
----------------------------------------------------------------------
diff --git a/www/docs/en/1.5.0/phonegap/storage/localstorage/localstorage.md b/www/docs/en/1.5.0/phonegap/storage/localstorage/localstorage.md
index 307e70b..6fcc2e7 100644
--- a/www/docs/en/1.5.0/phonegap/storage/localstorage/localstorage.md
+++ b/www/docs/en/1.5.0/phonegap/storage/localstorage/localstorage.md
@@ -18,17 +18,17 @@ 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
 -------
 
-- __key__: Returns the <a href="../parameters/name.html">name</a> of the key at the position specified. 
+- __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.
@@ -37,7 +37,7 @@ 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.
 
 Supported Platforms
 -------------------
@@ -46,66 +46,66 @@ Supported Platforms
 - BlackBerry WebWorks (OS 6.0 and higher)
 - iPhone
 
-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="../../contacts/Contact/contact.html">Contact</a> <a href="../storage.opendatabase.html">Example</a></title>
+        <title>Contact Example</title>
 
         <script type="text/javascript" charset="utf-8" src="cordova-1.5.0.js"></script>
         <script type="text/javascript" charset="utf-8">
 
         // Wait for PhoneGap 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);
 
         // PhoneGap is ready
         //
-        function on<a href="../../device/device.html">Device</a>Ready() {
-			window.local<a href="../storage.html">Storage</a>.setItem("key", "value");
-			var key<a href="../parameters/name.html">name</a> = window.local<a href="../storage.html">Storage</a>.key(i);
-			// key<a href="../parameters/name.html">name</a> is now equal to "key"
-			var value = window.local<a href="../storage.html">Storage</a>.getItem("key");
+        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.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>

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/af6a5545/www/docs/en/1.5.0/phonegap/storage/parameters/display_name.md
----------------------------------------------------------------------
diff --git a/www/docs/en/1.5.0/phonegap/storage/parameters/display_name.md b/www/docs/en/1.5.0/phonegap/storage/parameters/display_name.md
index 362e188..bd9320e 100644
--- a/www/docs/en/1.5.0/phonegap/storage/parameters/display_name.md
+++ b/www/docs/en/1.5.0/phonegap/storage/parameters/display_name.md
@@ -18,7 +18,7 @@ license: >
     under the License.
 ---
 
-display_<a href="name.html">name</a>
+display_name
 ==================
 
-The display <a href="name.html">name</a> of the database.
\ No newline at end of file
+The display name of the database.
\ No newline at end of file


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