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:18 UTC

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

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/af6a5545/www/docs/de/edge/guide/platforms/wp8/upgrade.md
----------------------------------------------------------------------
diff --git a/www/docs/de/edge/guide/platforms/wp8/upgrade.md b/www/docs/de/edge/guide/platforms/wp8/upgrade.md
index 6e58919..767f984 100644
--- a/www/docs/de/edge/guide/platforms/wp8/upgrade.md
+++ b/www/docs/de/edge/guide/platforms/wp8/upgrade.md
@@ -18,7 +18,7 @@ license: >
     under the License.
 ---
 
-# <a href="upgrading.html">Aktualisieren von Windows Phone</a> 8
+# Aktualisieren von Windows Phone 8
 
 Diese Anleitung zeigt, wie Windows Phone 8 Projekte, um ein upgrade von älteren Versionen von Cordova zu ändern. Einige dieser Anweisungen beziehen sich auf Projekte, die mit einer älteren Befehlszeilentools, die vorangehen erstellt die `cordova` CLI-Hilfsprogramm. Informationen finden Sie unter The Command-Line Interface die CLI-Version zu aktualisieren. Der folgende Abschnitt zeigt wie von nicht-CLI und CLI Projekte aktualisiert.
 

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/af6a5545/www/docs/de/edge/guide/platforms/wp8/vmware.md
----------------------------------------------------------------------
diff --git a/www/docs/de/edge/guide/platforms/wp8/vmware.md b/www/docs/de/edge/guide/platforms/wp8/vmware.md
index 725af3d..ba34a76 100644
--- a/www/docs/de/edge/guide/platforms/wp8/vmware.md
+++ b/www/docs/de/edge/guide/platforms/wp8/vmware.md
@@ -28,7 +28,7 @@ Das [Microsoft Developer Network][1] bietet allgemeine Anweisungen zum Ausführe
 
 1.  VMWare Fusion wählen Sie die Image-Datei von Windows 8, die Sie vorbereitet haben, und wählen Sie **Einstellungen**.
 
-2.  Wählen Sie die **Prozessoren & <a href="../../../cordova/storage/storage.html">Speicher</a>** -Konfigurationsoptionen. Geben Sie, *zwei* Prozessorkerne und **Hypervisor-Anwendungen in dieser virtuellen Maschine zu ermöglichen**:
+2.  Wählen Sie die **Prozessoren & Speicher** -Konfigurationsoptionen. Geben Sie, *zwei* Prozessorkerne und **Hypervisor-Anwendungen in dieser virtuellen Maschine zu ermöglichen**:
     
     ![][2]
     

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/af6a5545/www/docs/de/edge/guide/support/index.md
----------------------------------------------------------------------
diff --git a/www/docs/de/edge/guide/support/index.md b/www/docs/de/edge/guide/support/index.md
index be523d2..e38ff19 100644
--- a/www/docs/de/edge/guide/support/index.md
+++ b/www/docs/de/edge/guide/support/index.md
@@ -457,7 +457,7 @@ Im folgenden wird die Gruppe von Entwicklungs-Tools und APIs verfügbar-Gerät f
       
       <tr>
         <th>
-          <a href="cordova_events_events.md.html"><a href="../../cordova/events/events.html">Veranstaltungen</a></a>
+          <a href="cordova_events_events.md.html">Veranstaltungen</a>
         </th>
         
         <td data-col="amazon-fireos" class="y">
@@ -792,7 +792,7 @@ Im folgenden wird die Gruppe von Entwicklungs-Tools und APIs verfügbar-Gerät f
       
       <tr>
         <th>
-          <a href="cordova_storage_storage.md.html"><a href="../../cordova/storage/storage.html">Speicher</a></a>
+          <a href="cordova_storage_storage.md.html">Speicher</a>
         </th>
         
         <td data-col="amazon-fireos" class="y">

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/af6a5545/www/docs/de/edge/index.md
----------------------------------------------------------------------
diff --git a/www/docs/de/edge/index.md b/www/docs/de/edge/index.md
index 5168f6b..487b94d 100644
--- a/www/docs/de/edge/index.md
+++ b/www/docs/de/edge/index.md
@@ -26,91 +26,91 @@ license: >
   <ul>
     <li>
       <h2>
-        <a href="guide/overview/index.html">Übersicht</a>
+        Übersicht
       </h2>
       
       <span>Beginnen Sie hier, wenn Sie mit Cordova sind. Umfasst die Installation sowie die nächsten Schritte.</span>
     </li>
     <li>
       <h2>
-        <a href="guide/support/index.html">Plattformunterstützung</a>
+        Plattformunterstützung
       </h2>
       
       <span>Kompatibilitätstabelle für alle wichtigen Funktionen.</span>
     </li>
     <li>
       <h2>
-        <a href="guide/cli/index.html">Die Befehlszeilenschnittstelle</a>
+        Die Befehlszeilenschnittstelle
       </h2>
       
       <span>Erstellen, erstellen und Bereitstellen von der Befehlszeile aus.</span>
     </li>
     <li>
       <h2>
-        <a href="guide/platforms/index.html">Plattform-Guides</a>
+        Plattform-Guides
       </h2>
       
       <span>Jede Plattform SDK einrichten und Projekte aktualisieren.</span>
     </li>
     <li>
       <h2>
-        <a href="plugin_ref/plugman.html">Plugins verwalten mithilfe Plugman</a>
+        Plugins verwalten mithilfe Plugman
       </h2>
       
       <span>Verwalten Sie Plugins ohne CLI, wenn den Plattform-zentrierte Workflow verwenden.</span>
     </li>
     <li>
       <h2>
-        <a href="config_ref/index.html">Die Datei config.xml</a> Datei
+        Die Datei config.xml Datei
       </h2>
       
       <span>Ihre app Features anpassen.</span>
     </li>
     <li>
       <h2>
-        <a href="config_ref/images.html">Symbole und Splash-Screens</a>
+        Symbole und Splash-Screens
       </h2>
       
       <span>Passen Sie Ihre app Anzeigen von Bildern.</span>
     </li>
     <li>
       <h2>
-        <a href="guide/hybrid/webviews/index.html">Einbetten von Webansichten für</a>
+        Einbetten von Webansichten für
       </h2>
       
       <span>Implementieren Sie die Cordova WebView im systemeigenen Projekt.</span>
     </li>
     <li>
       <h2>
-        <a href="guide/hybrid/plugins/index.html">Plugin-Entwicklung-Guide</a>
+        Plugin-Entwicklung-Guide
       </h2>
       
       <span>Entwickeln Sie Ihr eigenes Plugin.</span>
     </li>
     <li>
       <h2>
-        <a href="guide/appdev/privacy/index.html">Datenschutz-Guide</a>
+        Datenschutz-Guide
       </h2>
       
       <span>Erfahren Sie mehr über wichtige mobile Datenschutzprobleme.</span>
     </li>
     <li>
       <h2>
-        <a href="guide/appdev/security/index.html">Sicherheitshandbuch</a>
+        Sicherheitshandbuch
       </h2>
       
       <span>Informationen und Tipps für den Aufbau einer sicheren Anwendung.</span>
     </li>
     <li>
       <h2>
-        <a href="platform_plugin_versioning_ref/index.html">Plattformen und Plugins Versionsmanagement</a>
+        Plattformen und Plugins Versionsmanagement
       </h2>
       
-      <span><a href="cordova/storage/storage.html">Speicher</a>n und Wiederherstellen von Projekten für CLI in einen bekannten Zustand ohne Streit.</span>
+      <span>Speichern und Wiederherstellen von Projekten für CLI in einen bekannten Zustand ohne Streit.</span>
     </li>
     <li>
       <h2>
-        <a href="guide/appdev/whitelist/index.html">Whitelist-Guide</a>
+        Whitelist-Guide
       </h2>
       
       <span>Eine Anwendungszugriff auf externe Ressourcen gewähren.</span>
@@ -120,7 +120,7 @@ license: >
         Storage
       </h2>
       
-      <span>Eine <a href="guide/overview/index.html">Übersicht</a> über native <a href="cordova/storage/storage.html">Speicher</a>optionen.</span>
+      <span>Eine Übersicht über native Speicheroptionen.</span>
     </li>
     <li>
       <h2>
@@ -131,7 +131,7 @@ license: >
     </li>
     <li>
       <h2>
-        <a href="guide/next/index.html">Die nächsten Schritte</a>
+        Die nächsten Schritte
       </h2>
       
       <span>Einen Blick auf Themen, die neue Cordova Entwickler stoßen werden.</span>
@@ -152,14 +152,14 @@ license: >
   <ul>
     <li>
       <h2>
-        <a href="cordova/events/events.html">Veranstaltungen</a>
+        Veranstaltungen
       </h2>
       
       <span>Haken Sie in systemeigene Ereignisse durch JavaScript.</span>
     </li>
     <li>
       <h2>
-        <a href="cordova/plugins/pluginapis.html">Plugin APIs</a>
+        Plugin APIs
       </h2>
       
       <span>Entdecken Sie, welche Cordova-Plugins verwenden Sie in Ihrem Projekt verfügbar sind.</span>

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/af6a5545/www/docs/de/edge/platform_plugin_versioning_ref/index.md
----------------------------------------------------------------------
diff --git a/www/docs/de/edge/platform_plugin_versioning_ref/index.md b/www/docs/de/edge/platform_plugin_versioning_ref/index.md
index a92f261..d9c77ec 100644
--- a/www/docs/de/edge/platform_plugin_versioning_ref/index.md
+++ b/www/docs/de/edge/platform_plugin_versioning_ref/index.md
@@ -20,17 +20,17 @@ license: >
 
 # Plattformen und Plugins Versionsmanagement
 
-Ab Version 4.3.0 bietet Cordova die Möglichkeit zum <a href="../cordova/storage/storage.html">Speicher</a>n und wiederherstellen, Plattformen und Plugins.
+Ab Version 4.3.0 bietet Cordova die Möglichkeit zum Speichern und wiederherstellen, Plattformen und Plugins.
 
 Dieses Feature ermöglicht Entwicklern, speichern und ihre app in einen bekannten Zustand wiederherstellen, ohne in allen von der Plattform und Plugin Quellcode überprüfen.
 
-Der Befehl "<a href="../cordova/storage/storage.html">Speicher</a>n" speichert Informationen über die app-Plattform und Plugin-Versionen in "config.xml". Der 'Wiederherstellung' Schritt geschieht automatisch, wenn ein **'cordova prepare'** ausgegeben wird, machen Gebrauch von Informationen, die zuvor in der Datei config.xml gespeichert.
+Der Befehl "Speichern" speichert Informationen über die app-Plattform und Plugin-Versionen in "config.xml". Der 'Wiederherstellung' Schritt geschieht automatisch, wenn ein **'cordova prepare'** ausgegeben wird, machen Gebrauch von Informationen, die zuvor in der Datei config.xml gespeichert.
 
 Ein Szenario, wo speichern/wiederherstellen-Funktionen praktisch, ist in großen Teams, die auf eine Anwendung mit jedes Teammitglied Fokussierung auf einer Plattform oder Plugin arbeiten. Diese Funktion erleichtert das Teilen des Projekts und reduzieren die Menge der redundanten Code, der im Repository eingecheckt ist.
 
 ## Plattform-Versionsverwaltung
 
-### <a href="../cordova/storage/storage.html">Speicher</a>n von Plattformen
+### Speichern von Plattformen
 
 Um eine Plattform zu speichern, geben Sie folgenden Befehl ein:
 
@@ -100,7 +100,7 @@ Wenn Sie den Befehl **'cordova platform add android'** (keine Version/Ordner/Git
 
 *(Die Plugin-Befehle sind ein Spiegel der Plugin-Befehle)*
 
-### <a href="../cordova/storage/storage.html">Speicher</a>n von plugins
+### Speichern von plugins
 
 Um ein Plugin zu speichern, geben Sie folgenden Befehl ein:
 

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/af6a5545/www/docs/de/edge/plugin_ref/plugman.md
----------------------------------------------------------------------
diff --git a/www/docs/de/edge/plugin_ref/plugman.md b/www/docs/de/edge/plugin_ref/plugman.md
index f69b2d9..e8140db 100644
--- a/www/docs/de/edge/plugin_ref/plugman.md
+++ b/www/docs/de/edge/plugin_ref/plugman.md
@@ -20,7 +20,7 @@ license: >
 
 # Plugins verwalten mithilfe Plugman
 
-Ab Version 3.0 ff. Cordova implementiert alle Gerät APIs als Plugins und lässt sie standardmäßig deaktiviert. Es unterstützt auch zwei Möglichkeiten zum Hinzufügen und Entfernen von Plugins, je nach verwendeter Workflow diskutiert in der <a href="../guide/overview/index.html">Übersicht</a>:
+Ab Version 3.0 ff. Cordova implementiert alle Gerät APIs als Plugins und lässt sie standardmäßig deaktiviert. Es unterstützt auch zwei Möglichkeiten zum Hinzufügen und Entfernen von Plugins, je nach verwendeter Workflow diskutiert in der Übersicht:
 
 *   Wenn Sie einen Cross-Plattform-Workflow verwenden, verwenden Sie die `cordova` CLI-Hilfsprogramm, Plugins, hinzufügen, wie in der Command-Line Interface beschrieben. Die CLI ändert Plugins für alle angegebenen Plattformen gleichzeitig.
 
@@ -69,7 +69,7 @@ Weitere Parameter:
 
 *   `--plugins_dir`standardmaessig `<project>/cordova/plugins` , aber kann jedes Verzeichnis ein Unterverzeichnis für jeden abgerufenen Plugin.
 *   `--www`der Standardwert ist des Projekts `www` Ordnerspeicherort, kann jedoch jedes Verzeichnis, das als Cordova Projekt Anwendung Web Vermögenswerte verwendet werden.
-*   `--variable`ermöglicht es, bestimmte Variablen zum Zeitpunkt der Installation notwendig für bestimmte Plugins, die die API-Schlüssel oder andere benutzerdefinierte, benutzerdefinierte Parameter angeben. Finden Sie die [<a href="spec.html">Plugin-Spezifikation</a>][4] für weitere Informationen.
+*   `--variable`ermöglicht es, bestimmte Variablen zum Zeitpunkt der Installation notwendig für bestimmte Plugins, die die API-Schlüssel oder andere benutzerdefinierte, benutzerdefinierte Parameter angeben. Finden Sie die [Plugin-Spezifikation][4] für weitere Informationen.
 
  [4]: plugin_ref_spec.md.html#Plugin%20Specification
 

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/af6a5545/www/docs/de/edge/plugin_ref/spec.md
----------------------------------------------------------------------
diff --git a/www/docs/de/edge/plugin_ref/spec.md b/www/docs/de/edge/plugin_ref/spec.md
index efaeaa4..dd9e0bd 100644
--- a/www/docs/de/edge/plugin_ref/spec.md
+++ b/www/docs/de/edge/plugin_ref/spec.md
@@ -167,7 +167,7 @@ Ein oder mehrere Elemente Auflisten der Dateien oder Verzeichnisse in einer Cord
 
 Alle `<asset>` Tags erfordern beide `src` und `target` Attribute. Nur Web-Plugins enthält meist `<asset>` Elemente. Alle `<asset>` Elemente, die geschachtelt sind `<platform>` Elemente geben plattformspezifische Web Vermögenswerte, wie unten beschrieben. Attribute enthalten:
 
-*   `src` (erforderlich): wo ist die Datei oder das Verzeichnis in das Plugin-Paket relativ zum Dokument `plugin.xml` liegt. Wenn eine Datei am <a href="../cordova/storage/storage.html">Speicher</a>ort angegebenen `Src` nicht existiert, Plugman beendet und kehrt den Installationsvorgang, gibt eine Benachrichtigung über den Konflikt und beendet mit einem NULL-Code.
+*   `src` (erforderlich): wo ist die Datei oder das Verzeichnis in das Plugin-Paket relativ zum Dokument `plugin.xml` liegt. Wenn eine Datei am Speicherort angegebenen `Src` nicht existiert, Plugman beendet und kehrt den Installationsvorgang, gibt eine Benachrichtigung über den Konflikt und beendet mit einem NULL-Code.
 
 *   `target` (required):
     
@@ -276,7 +276,7 @@ Die `<source-file>` Element identifiziert ausführbare Quellcodes, die in ein Pr
 
 Es unterstützt die folgenden Attribute:
 
-*   `src` (erforderlich): <a href="../cordova/storage/storage.html">Speicher</a>ort der Datei relativ `plugin.xml`. Wenn die `src` -Datei nicht gefunden werden kann, Plugman beendet und kehrt die Installation, gibt eine Benachrichtigung über das Problem und beendet mit einem NULL-Code.
+*   `src` (erforderlich): Speicherort der Datei relativ `plugin.xml`. Wenn die `src` -Datei nicht gefunden werden kann, Plugman beendet und kehrt die Installation, gibt eine Benachrichtigung über das Problem und beendet mit einem NULL-Code.
 
 *   `target-dir`: ein Verzeichnis, in das die Dateien sollen, relativ zum Stammverzeichnis des Projektes Cordova kopiert werden. In der Praxis ist das wichtigste für Java-basierte Plattformen, wo muß eine Datei in das `com.alunny.foo` -Paket in das `com/Alunny/Foo` -Verzeichnis liegen. Für Plattformen, wo das Quellverzeichnis nicht wichtig ist, sollte dieses Attribut weggelassen werden.
     
@@ -324,7 +324,7 @@ Es unterstützt die folgenden Attribute:
     
     Das Ziel kann Platzhalter enthalten ( `*` ) Elemente. In diesem Fall Plugman rekursiv durchsucht die Verzeichnisstruktur des Projekts und verwendet die erste Übereinstimmung.
     
-    Auf iOS, der <a href="../cordova/storage/storage.html">Speicher</a>ort der Konfigurationsdateien relativ zum Stammverzeichnis des Projekt-Verzeichnis ist nicht bekannt, also ein Ziel angeben `config.xml` löst in`cordova-ios-project/MyAppName/config.xml`.
+    Auf iOS, der Speicherort der Konfigurationsdateien relativ zum Stammverzeichnis des Projekt-Verzeichnis ist nicht bekannt, also ein Ziel angeben `config.xml` löst in`cordova-ios-project/MyAppName/config.xml`.
     
     Wenn die angegebene Datei nicht vorhanden ist, wird das Tool ignoriert die Konfigurationsänderung und wird die Installation fortgesetzt.
 
@@ -397,7 +397,7 @@ Wie Quelle, Ressourcen- und Header-Dateien, aber speziell für Plattformen wie B
 
 Unterstützte Attribute:
 
-*   `src`(erforderlich): der <a href="../cordova/storage/storage.html">Speicher</a>ort der Datei relativ zum `plugin.xml` . Wenn `src` nicht auffindbar, Plugman beendet und kehrt die Installation Probleme eine Warnung über das Problem und beendet mit einem NULL-Code.
+*   `src`(erforderlich): der Speicherort der Datei relativ zum `plugin.xml` . Wenn `src` nicht auffindbar, Plugman beendet und kehrt die Installation Probleme eine Warnung über das Problem und beendet mit einem NULL-Code.
 
 *   `arch`: Die Architektur, für die die `.so` Datei erstellt wurde, entweder `device` oder`simulator`.
 

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/af6a5545/www/docs/en/1.5.0/guide/getting-started/android/index.md
----------------------------------------------------------------------
diff --git a/www/docs/en/1.5.0/guide/getting-started/android/index.md b/www/docs/en/1.5.0/guide/getting-started/android/index.md
index b9a7e76..c256e02 100644
--- a/www/docs/en/1.5.0/guide/getting-started/android/index.md
+++ b/www/docs/en/1.5.0/guide/getting-started/android/index.md
@@ -66,38 +66,38 @@ There is also a [Terminal](http://wiki.phonegap.com/w/page/30864168/phonegap-and
 	![](img/guide/platforms/android/javaSrc.jpg)
 - You might experience an error here, where Eclipse can't find cordova-1.5.0.jar. In this case, right click on the /libs folder and go to Build Paths/ &gt; Configure Build Paths. Then, in the Libraries tab, add cordova-1.5.0.jar to the Project. If Eclipse is being temperamental, you might need to refresh (F5) the project once again.
 - Right click on AndroidManifest.xml and select **Open With &gt; Text Editor**
-- Paste the following permissions under <a href="../../../phonegap/storage/parameters/version.html">version</a>Name: (view image below)
-
-        <supports-screens android:largeScreens="true" android:normalScreens="true" android:smallScreens="true" android:re<a href="../../../phonegap/storage/parameters/size.html">size</a>able="true" android:anyDensity="true" />
-        <uses-permission android:<a href="../../../phonegap/storage/parameters/name.html">name</a>="android.permission.CAMERA" />
-        <uses-permission android:<a href="../../../phonegap/storage/parameters/name.html">name</a>="android.permission.VIBRATE" />
-        <uses-permission android:<a href="../../../phonegap/storage/parameters/name.html">name</a>="android.permission.ACCESS_COARSE_LOCATION" />
-        <uses-permission android:<a href="../../../phonegap/storage/parameters/name.html">name</a>="android.permission.ACCESS_FINE_LOCATION" />
-        <uses-permission android:<a href="../../../phonegap/storage/parameters/name.html">name</a>="android.permission.ACCESS_LOCATION_EXTRA_COMMANDS" />
-        <uses-permission android:<a href="../../../phonegap/storage/parameters/name.html">name</a>="android.permission.READ_PHONE_STATE" />
-        <uses-permission android:<a href="../../../phonegap/storage/parameters/name.html">name</a>="android.permission.INTERNET" />
-        <uses-permission android:<a href="../../../phonegap/storage/parameters/name.html">name</a>="android.permission.RECEIVE_SMS" />
-        <uses-permission android:<a href="../../../phonegap/storage/parameters/name.html">name</a>="android.permission.RECORD_AUDIO" />
-        <uses-permission android:<a href="../../../phonegap/storage/parameters/name.html">name</a>="android.permission.MODIFY_AUDIO_SETTINGS" />
-        <uses-permission android:<a href="../../../phonegap/storage/parameters/name.html">name</a>="android.permission.READ_CONTACTS" />
-        <uses-permission android:<a href="../../../phonegap/storage/parameters/name.html">name</a>="android.permission.WRITE_CONTACTS" />
-        <uses-permission android:<a href="../../../phonegap/storage/parameters/name.html">name</a>="android.permission.WRITE_EXTERNAL_STORAGE" />
-        <uses-permission android:<a href="../../../phonegap/storage/parameters/name.html">name</a>="android.permission.ACCESS_NETWORK_STATE" /> <uses-permission android:<a href="../../../phonegap/storage/parameters/name.html">name</a>="android.permission.GET_ACCOUNTS" />
-        <uses-permission android:<a href="../../../phonegap/storage/parameters/name.html">name</a>="android.permission.BROADCAST_STICKY" />
+- Paste the following permissions under versionName: (view image below)
+
+        <supports-screens android:largeScreens="true" android:normalScreens="true" android:smallScreens="true" android:resizeable="true" android:anyDensity="true" />
+        <uses-permission android:name="android.permission.CAMERA" />
+        <uses-permission android:name="android.permission.VIBRATE" />
+        <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+        <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+        <uses-permission android:name="android.permission.ACCESS_LOCATION_EXTRA_COMMANDS" />
+        <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+        <uses-permission android:name="android.permission.INTERNET" />
+        <uses-permission android:name="android.permission.RECEIVE_SMS" />
+        <uses-permission android:name="android.permission.RECORD_AUDIO" />
+        <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
+        <uses-permission android:name="android.permission.READ_CONTACTS" />
+        <uses-permission android:name="android.permission.WRITE_CONTACTS" />
+        <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+        <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> <uses-permission android:name="android.permission.GET_ACCOUNTS" />
+        <uses-permission android:name="android.permission.BROADCAST_STICKY" />
 
 - Add `android:configChanges="orientation|keyboardHidden"` to the activity tag in AndroidManifest. (view image below)
 - Add a second activity under you application tag in AndroidManifest. (view image below)
 	
-	    <activity android:<a href="../../../phonegap/storage/parameters/name.html">name</a>="com.phonegap.DroidGap" android:label="@string/app_<a href="../../../phonegap/storage/parameters/name.html">name</a>" android:configChanges="orientation|keyboardHidden"> <intent-filter> </intent-filter> </activity>
+	    <activity android:name="com.phonegap.DroidGap" android:label="@string/app_name" android:configChanges="orientation|keyboardHidden"> <intent-filter> </intent-filter> </activity>
 
 	![](img/guide/platforms/android/manifest.jpg)
 
 
 
-4. <a href="../webos/index.html">Hello World</a>
+4. Hello World
 --------------    
 
-Now create and open a new file <a href="../../../phonegap/storage/parameters/name.html">name</a>d **index.html** in the **assets/www** directory. Paste the following code:
+Now create and open a new file named **index.html** in the **assets/www** directory. Paste the following code:
 
         <!DOCTYPE HTML>
         <html>
@@ -106,7 +106,7 @@ Now create and open a new file <a href="../../../phonegap/storage/parameters/nam
         <script type="text/javascript" charset="utf-8" src="cordova-1.5.0.js"></script>
         </head>
         <body>
-        <h1><a href="../webos/index.html">Hello World</a></h1>
+        <h1>Hello World</h1>
         </body>
         </html>
 
@@ -118,7 +118,7 @@ Now create and open a new file <a href="../../../phonegap/storage/parameters/nam
 - 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="../../../phonegap/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)
@@ -128,5 +128,5 @@ Now create and open a new file <a href="../../../phonegap/storage/parameters/nam
 Done!
 -----
 
-You can also checkout more detailed <a href="../../../phonegap/storage/parameters/version.html">version</a> of this guide [here](http://wiki.phonegap.com/w/page/30862722/phonegap-android-eclipse-quickstart).
+You can also checkout more detailed version of this guide [here](http://wiki.phonegap.com/w/page/30862722/phonegap-android-eclipse-quickstart).
 

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/af6a5545/www/docs/en/1.5.0/guide/getting-started/blackberry/index.md
----------------------------------------------------------------------
diff --git a/www/docs/en/1.5.0/guide/getting-started/blackberry/index.md b/www/docs/en/1.5.0/guide/getting-started/blackberry/index.md
index 81cc47d..f508393 100644
--- a/www/docs/en/1.5.0/guide/getting-started/blackberry/index.md
+++ b/www/docs/en/1.5.0/guide/getting-started/blackberry/index.md
@@ -55,10 +55,10 @@ For 4.x devices check out [this guide](http://wiki.phonegap.com/w/page/25653281/
 - Open up the project.properties file with your favourite editor and change the lines `BlackBerry.bbwp.dir=` and `PlayBook.bbwp.dir=` to equal the respective install locations of the SDKs you downloaded earlier.
 
 
-4. <a href="../webos/index.html">Hello World</a>
+4. Hello World
 --------------
 
-Build the PhoneGap sample project by typing `ant target build` in your command prompt/terminal while you are in your project's directory. Replace the target with either blackberry or playbook. Note this is the sample PhoneGap project and not a basic hello world application. You can go edit the index.html file located in the www directory of your project to make it say <a href="../webos/index.html">Hello World</a> if you wish.
+Build the PhoneGap sample project by typing `ant target build` in your command prompt/terminal while you are in your project's directory. Replace the target with either blackberry or playbook. Note this is the sample PhoneGap project and not a basic hello world application. You can go edit the index.html file located in the www directory of your project to make it say Hello World if you wish.
 
 
 5A. Deploy to Simulator (Windows Only)
@@ -68,7 +68,7 @@ Build the PhoneGap sample project by typing `ant target build` in your command p
 - Press the BlackBerry button on the simulator, go to downloads and you should see your app loaded there.
 
 
-5B. Deploy to <a href="../../../phonegap/device/device.html">Device</a> (Windows and Mac)
+5B. Deploy to Device (Windows and Mac)
 --------------------------------------
 
 - You have to have your signing keys from RIM by filling out this [form](https://www.blackberry.com/SignedKeys/).
@@ -79,5 +79,5 @@ Build the PhoneGap sample project by typing `ant target build` in your command p
 Done!
 -----
 
-You can also checkout more detailed <a href="../../../phonegap/storage/parameters/version.html">version</a> of this guide [here](http://wiki.phonegap.com/w/page/31930982/Getting-Started-with-PhoneGap-BlackBerry-WebWorks).
+You can also checkout more detailed version of this guide [here](http://wiki.phonegap.com/w/page/31930982/Getting-Started-with-PhoneGap-BlackBerry-WebWorks).
 

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/af6a5545/www/docs/en/1.5.0/guide/getting-started/index.md
----------------------------------------------------------------------
diff --git a/www/docs/en/1.5.0/guide/getting-started/index.md b/www/docs/en/1.5.0/guide/getting-started/index.md
index 451866d..124d04d 100644
--- a/www/docs/en/1.5.0/guide/getting-started/index.md
+++ b/www/docs/en/1.5.0/guide/getting-started/index.md
@@ -21,9 +21,9 @@ 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>
\ No newline at end of file
+- 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
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/af6a5545/www/docs/en/1.5.0/guide/getting-started/ios/index.md
----------------------------------------------------------------------
diff --git a/www/docs/en/1.5.0/guide/getting-started/ios/index.md b/www/docs/en/1.5.0/guide/getting-started/ios/index.md
index 1ac6580..96442b6 100644
--- a/www/docs/en/1.5.0/guide/getting-started/ios/index.md
+++ b/www/docs/en/1.5.0/guide/getting-started/ios/index.md
@@ -31,7 +31,7 @@ Video Tutorials:
 1. Requirements
 ---------------
 - Intel-based computer with Mac OS X Snow Leopard (10.6)
-- Necessary for Installing on <a href="../../../phonegap/device/device.html">Device</a>:
+- Necessary for Installing on Device:
     - An Apple iOS device (iPhone, iPad, iPod Touch)
     - iOS developer certification
 
@@ -46,13 +46,13 @@ Video Tutorials:
 3. Setup New Project
 --------------------
 
-- Launch Xcode, then under the <a href="../../../phonegap/file/fileobj/fileobj.html">File</a> menu select **New** and then **New Project...**
+- Launch Xcode, then under the File menu select **New** and then **New Project...**
 - Select **PhoneGap-based Application** from the list of templates
 
     ![](img/guide/platforms/ios/XCode4-templates.png)
 - Select the **Next** button, Fill in the "Product Name" &amp; "Company Identifier" for your app
 
-    ![](img/guide/platforms/ios/xcode4-<a href="../../../phonegap/storage/parameters/name.html">name</a>_your_app.png)
+    ![](img/guide/platforms/ios/xcode4-name_your_app.png)
     
 - Choose a directory to store your app
 - You should see your project in Xcode 4 now. Press the **Run** button in the top left corner. Your build should succeed and launch in the simulator
@@ -65,24 +65,24 @@ Video Tutorials:
 - After you drag, you should see a prompt with a few options. Make sure to select **Create folder references for any added folders**. Click Finish
 
 
-4. <a href="../webos/index.html">Hello World</a>
+4. Hello World
 --------------
 
-Open the folder <a href="../../../phonegap/storage/parameters/name.html">name</a>d **www** and type `<h1><a href="../webos/index.html">Hello World</a></h1>` after the `<body>` tag in **index.html**. You can also add any associated Javascript and CSS files there as well.
+Open the folder named **www** and type `<h1>Hello World</h1>` after the `<body>` tag in **index.html**. You can also add any associated Javascript and CSS files there as well.
     
     
 5A. Deploy to Simulator
 -----------------------
 
-- Make sure to change the Active SDK in the top left menu to **Simulator+<a href="../../../phonegap/storage/parameters/version.html">version</a>#**.
+- Make sure to change the Active SDK in the top left menu to **Simulator+version#**.
 - Hit **Run** in your project window header.
 
 
-5B. Deploy to <a href="../../../phonegap/device/device.html">Device</a>
+5B. Deploy to Device
 --------------------
 
 - Open [AppName]-Info.plist and change **BundleIdentifier** to the identifier provided by Apple. If you have a developer license, you can access and run the Assistant at [here](http://developer.apple.com/iphone/manage/overview/index.action) and register your App.
-- Make sure to change the Active SDK in the top left menu to **<a href="../../../phonegap/device/device.html">Device</a>+<a href="../../../phonegap/storage/parameters/version.html">version</a>#**.
+- Make sure to change the Active SDK in the top left menu to **Device+version#**.
 - Hit **Run** in your project window header.
 
     ![](img/guide/platforms/ios/HelloWorldiPhone4.png)    
@@ -91,5 +91,5 @@ Open the folder <a href="../../../phonegap/storage/parameters/name.html">name</a
 Done!
 -----
 
-You can also checkout more detailed <a href="../../../phonegap/storage/parameters/version.html">version</a> of this guide [here](http://wiki.phonegap.com/w/page/39991939/Getting-Started-with-PhoneGap-iOS-using-Xcode-4-%28Template-Version%29).
+You can also checkout more detailed version of this guide [here](http://wiki.phonegap.com/w/page/39991939/Getting-Started-with-PhoneGap-iOS-using-Xcode-4-%28Template-Version%29).
 

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/af6a5545/www/docs/en/1.5.0/guide/getting-started/symbian/index.md
----------------------------------------------------------------------
diff --git a/www/docs/en/1.5.0/guide/getting-started/symbian/index.md b/www/docs/en/1.5.0/guide/getting-started/symbian/index.md
index 2468795..cff6296 100644
--- a/www/docs/en/1.5.0/guide/getting-started/symbian/index.md
+++ b/www/docs/en/1.5.0/guide/getting-started/symbian/index.md
@@ -49,11 +49,11 @@ There are also [QT for Symbian](http://wiki.phonegap.com/w/page/16494811/PhoneGa
 - In cygwin, navigate to where you extracted PhoneGap 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. 
 
 
@@ -65,7 +65,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="../../../phonegap/device/device.html">Device</a>
+5B. Deploy to Device
 --------------------
 
 - Load the phonegap-symbian.wrt/app.wgz file into the device using bluetooth or email.
@@ -74,5 +74,5 @@ There are also [QT for Symbian](http://wiki.phonegap.com/w/page/16494811/PhoneGa
 Done!
 -----
 
-You can also checkout more detailed <a href="../../../phonegap/storage/parameters/version.html">version</a> of this guide [here](http://wiki.phonegap.com/w/page/16494780/Getting-Started-with-Phonegap-Nokia-WRT).
+You can also checkout more detailed version of this guide [here](http://wiki.phonegap.com/w/page/16494780/Getting-Started-with-Phonegap-Nokia-WRT).
 

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/af6a5545/www/docs/en/1.5.0/guide/getting-started/webos/index.md
----------------------------------------------------------------------
diff --git a/www/docs/en/1.5.0/guide/getting-started/webos/index.md b/www/docs/en/1.5.0/guide/getting-started/webos/index.md
index d8ed105..e209af6 100644
--- a/www/docs/en/1.5.0/guide/getting-started/webos/index.md
+++ b/www/docs/en/1.5.0/guide/getting-started/webos/index.md
@@ -64,7 +64,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="../../../phonegap/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)
@@ -74,5 +74,5 @@ In phonegap/webOS/framework/www, open up index.html with your favourite editor.
 Done!
 -----
 
-You can also checkout more detailed <a href="../../../phonegap/storage/parameters/version.html">version</a> of this guide [here](http://wiki.phonegap.com/w/page/16494781/Getting-Started-with-PhoneGap-webOS).
+You can also checkout more detailed version of this guide [here](http://wiki.phonegap.com/w/page/16494781/Getting-Started-with-PhoneGap-webOS).
 

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/af6a5545/www/docs/en/1.5.0/guide/getting-started/windows-phone/index.md
----------------------------------------------------------------------
diff --git a/www/docs/en/1.5.0/guide/getting-started/windows-phone/index.md b/www/docs/en/1.5.0/guide/getting-started/windows-phone/index.md
index a78f3b2..f9966bb 100644
--- a/www/docs/en/1.5.0/guide/getting-started/windows-phone/index.md
+++ b/www/docs/en/1.5.0/guide/getting-started/windows-phone/index.md
@@ -36,7 +36,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="../../../phonegap/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).
 
@@ -53,7 +53,7 @@ Necessary for Installing on <a href="../../../phonegap/device/device.html">Devic
 
 - Open Visual Studio Express for Windows Phone and choose **New Project**.
 - Select **PhoneGapStarter**.
-- Give your project a <a href="../../../phonegap/storage/parameters/name.html">name</a>, and select OK.
+- Give your project a name, and select OK.
 
     ![](img/guide/platforms/wp7/wpnewproj.png)
 
@@ -83,7 +83,7 @@ Necessary for Installing on <a href="../../../phonegap/device/device.html">Devic
 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="../../../phonegap/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)
@@ -92,6 +92,6 @@ In order to test your application on a device, the device must be registered. Cl
 Done!
 -----
 
-You can also checkout more detailed <a href="../../../phonegap/storage/parameters/version.html">version</a> of this guide [here](http://wiki.phonegap.com/w/page/48672055/Getting%20Started%20with%20PhoneGap%20Windows%20Phone%207).
+You can also checkout more detailed version of this guide [here](http://wiki.phonegap.com/w/page/48672055/Getting%20Started%20with%20PhoneGap%20Windows%20Phone%207).
 
 [register-url]: http://msdn.microsoft.com/en-us/library/windowsphone/develop/ff402565(v=vs.105).aspx

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/af6a5545/www/docs/en/1.5.0/guide/upgrading/blackberry/index.md
----------------------------------------------------------------------
diff --git a/www/docs/en/1.5.0/guide/upgrading/blackberry/index.md b/www/docs/en/1.5.0/guide/upgrading/blackberry/index.md
index 6298438..db0308c 100644
--- a/www/docs/en/1.5.0/guide/upgrading/blackberry/index.md
+++ b/www/docs/en/1.5.0/guide/upgrading/blackberry/index.md
@@ -21,7 +21,7 @@ license: >
 Upgrading Cordova BlackBerry
 ============================
 
-This document is for people who need to upgrade their Cordova <a href="../../../phonegap/storage/parameters/version.html">version</a>s from an older <a href="../../../phonegap/storage/parameters/version.html">version</a> to a current <a href="../../../phonegap/storage/parameters/version.html">version</a> of Cordova.
+This document is for people who need to upgrade their Cordova versions from an older version to a current version of Cordova.
 1.4.1
 Note: 1.5.0 represents a semi-major change to the PhoneGap/Cordova project! All references to PhoneGap have been changed to Cordova.
 
@@ -33,39 +33,39 @@ Updating just the www folder:
 
 1. Open your `www/` folder, which contains your app.
 2. Remove and update the old phonegap.1.4.1.jar file in the `ext/` folder and replace it with cordova.1.5.0.jar.
-3. Update the contents of the `ext-air/` folder and make sure to re<a href="../../../phonegap/storage/parameters/name.html">name</a> the folders with Phonegap with them to Cordova.
+3. Update the contents of the `ext-air/` folder and make sure to rename the folders with Phonegap with them to Cordova.
 4. Copy the new `cordova-1.5.0.js` into your project.
     - If playbook, then update the .js file in the `playbook/` folder.
 5. Update your HTML to use the new `cordova-1.5.0.js` file.
 6. Update your www/plugins.xml file - remember all of the references to PhoneGap need to be changed to Cordova:
 
 From: 
-    <plugin <a href="../../../phonegap/storage/parameters/name.html">name</a>="App"            value="com.phonegap.app.App"/>
-    <plugin <a href="../../../phonegap/storage/parameters/name.html">name</a>="<a href="../../../phonegap/device/device.html">Device</a>"         value="com.phonegap.device.<a href="../../../phonegap/device/device.html">Device</a>"/>
-    <plugin <a href="../../../phonegap/storage/parameters/name.html">name</a>="<a href="../../../phonegap/camera/camera.html">Camera</a>"         value="com.phonegap.camera.<a href="../../../phonegap/camera/camera.html">Camera</a>"/>	
-    <plugin <a href="../../../phonegap/storage/parameters/name.html">name</a>="Network Status" value="com.phonegap.network.Network"/>
-    <plugin <a href="../../../phonegap/storage/parameters/name.html">name</a>="<a href="../../../phonegap/notification/notification.html">Notification</a>"   value="com.phonegap.notification.<a href="../../../phonegap/notification/notification.html">Notification</a>"/>
-    <plugin <a href="../../../phonegap/storage/parameters/name.html">name</a>="<a href="../../../phonegap/accelerometer/accelerometer.html">Accelerometer</a>"  value="com.phonegap.accelerometer.<a href="../../../phonegap/accelerometer/accelerometer.html">Accelerometer</a>"/>
-    <plugin <a href="../../../phonegap/storage/parameters/name.html">name</a>="<a href="../../../phonegap/geolocation/geolocation.html">Geolocation</a>"    value="com.phonegap.geolocation.<a href="../../../phonegap/geolocation/geolocation.html">Geolocation</a>"/>
-    <plugin <a href="../../../phonegap/storage/parameters/name.html">name</a>="<a href="../../../phonegap/file/fileobj/fileobj.html">File</a>"           value="com.phonegap.file.<a href="../../../phonegap/file/fileobj/fileobj.html">File</a>Manager"/>
-    <plugin <a href="../../../phonegap/storage/parameters/name.html">name</a>="<a href="../../../phonegap/file/filetransfer/filetransfer.html"><a href="../../../phonegap/file/fileobj/fileobj.html">File</a>Transfer</a>"   value="com.phonegap.http.<a href="../../../phonegap/file/filetransfer/filetransfer.html"><a href="../../../phonegap/file/fileobj/fileobj.html">File</a>Transfer</a>"/>
-    <plugin <a href="../../../phonegap/storage/parameters/name.html">name</a>="<a href="../../../phonegap/contacts/Contact/contact.html">Contact</a>"        value="com.phonegap.pim.<a href="../../../phonegap/contacts/Contact/contact.html">Contact</a>"/>
-    <plugin <a href="../../../phonegap/storage/parameters/name.html">name</a>="<a href="../../../phonegap/media/media.html">Media</a><a href="../../../phonegap/media/capture/capture.html">Capture</a>"   value="com.phonegap.media.<a href="../../../phonegap/media/media.html">Media</a><a href="../../../phonegap/media/capture/capture.html">Capture</a>"/>
-    <plugin <a href="../../../phonegap/storage/parameters/name.html">name</a>="Battery"        value="com.phonegap.battery.Battery"/>
+    <plugin name="App"            value="com.phonegap.app.App"/>
+    <plugin name="Device"         value="com.phonegap.device.Device"/>
+    <plugin name="Camera"         value="com.phonegap.camera.Camera"/>	
+    <plugin name="Network Status" value="com.phonegap.network.Network"/>
+    <plugin name="Notification"   value="com.phonegap.notification.Notification"/>
+    <plugin name="Accelerometer"  value="com.phonegap.accelerometer.Accelerometer"/>
+    <plugin name="Geolocation"    value="com.phonegap.geolocation.Geolocation"/>
+    <plugin name="File"           value="com.phonegap.file.FileManager"/>
+    <plugin name="FileTransfer"   value="com.phonegap.http.FileTransfer"/>
+    <plugin name="Contact"        value="com.phonegap.pim.Contact"/>
+    <plugin name="MediaCapture"   value="com.phonegap.media.MediaCapture"/>
+    <plugin name="Battery"        value="com.phonegap.battery.Battery"/>
 
 To:
-    <plugin <a href="../../../phonegap/storage/parameters/name.html">name</a>="App"            value="org.apache.cordova.app.App"/>
-    <plugin <a href="../../../phonegap/storage/parameters/name.html">name</a>="<a href="../../../phonegap/device/device.html">Device</a>"         value="org.apache.cordova.device.<a href="../../../phonegap/device/device.html">Device</a>"/>
-    <plugin <a href="../../../phonegap/storage/parameters/name.html">name</a>="<a href="../../../phonegap/camera/camera.html">Camera</a>"         value="org.apache.cordova.camera.<a href="../../../phonegap/camera/camera.html">Camera</a>"/>
-    <plugin <a href="../../../phonegap/storage/parameters/name.html">name</a>="Network Status" value="org.apache.cordova.network.Network"/>
-    <plugin <a href="../../../phonegap/storage/parameters/name.html">name</a>="<a href="../../../phonegap/notification/notification.html">Notification</a>"   value="org.apache.cordova.notification.<a href="../../../phonegap/notification/notification.html">Notification</a>"/>
-    <plugin <a href="../../../phonegap/storage/parameters/name.html">name</a>="<a href="../../../phonegap/accelerometer/accelerometer.html">Accelerometer</a>"  value="org.apache.cordova.accelerometer.<a href="../../../phonegap/accelerometer/accelerometer.html">Accelerometer</a>"/>
-    <plugin <a href="../../../phonegap/storage/parameters/name.html">name</a>="<a href="../../../phonegap/geolocation/geolocation.html">Geolocation</a>"    value="org.apache.cordova.geolocation.<a href="../../../phonegap/geolocation/geolocation.html">Geolocation</a>"/>
-    <plugin <a href="../../../phonegap/storage/parameters/name.html">name</a>="<a href="../../../phonegap/file/fileobj/fileobj.html">File</a>"           value="org.apache.cordova.file.<a href="../../../phonegap/file/fileobj/fileobj.html">File</a>Manager"/>
-    <plugin <a href="../../../phonegap/storage/parameters/name.html">name</a>="<a href="../../../phonegap/file/filetransfer/filetransfer.html"><a href="../../../phonegap/file/fileobj/fileobj.html">File</a>Transfer</a>"   value="org.apache.cordova.http.<a href="../../../phonegap/file/filetransfer/filetransfer.html"><a href="../../../phonegap/file/fileobj/fileobj.html">File</a>Transfer</a>"/>
-    <plugin <a href="../../../phonegap/storage/parameters/name.html">name</a>="<a href="../../../phonegap/contacts/Contact/contact.html">Contact</a>"        value="org.apache.cordova.pim.<a href="../../../phonegap/contacts/Contact/contact.html">Contact</a>"/>
-    <plugin <a href="../../../phonegap/storage/parameters/name.html">name</a>="<a href="../../../phonegap/media/media.html">Media</a><a href="../../../phonegap/media/capture/capture.html">Capture</a>"   value="org.apache.cordova.media.<a href="../../../phonegap/media/media.html">Media</a><a href="../../../phonegap/media/capture/capture.html">Capture</a>"/>
-    <plugin <a href="../../../phonegap/storage/parameters/name.html">name</a>="Battery"        value="org.apache.cordova.battery.Battery"/>
+    <plugin name="App"            value="org.apache.cordova.app.App"/>
+    <plugin name="Device"         value="org.apache.cordova.device.Device"/>
+    <plugin name="Camera"         value="org.apache.cordova.camera.Camera"/>
+    <plugin name="Network Status" value="org.apache.cordova.network.Network"/>
+    <plugin name="Notification"   value="org.apache.cordova.notification.Notification"/>
+    <plugin name="Accelerometer"  value="org.apache.cordova.accelerometer.Accelerometer"/>
+    <plugin name="Geolocation"    value="org.apache.cordova.geolocation.Geolocation"/>
+    <plugin name="File"           value="org.apache.cordova.file.FileManager"/>
+    <plugin name="FileTransfer"   value="org.apache.cordova.http.FileTransfer"/>
+    <plugin name="Contact"        value="org.apache.cordova.pim.Contact"/>
+    <plugin name="MediaCapture"   value="org.apache.cordova.media.MediaCapture"/>
+    <plugin name="Battery"        value="org.apache.cordova.battery.Battery"/>
 
 Updating the sample folder (ie, updating using the ant tools):
 
@@ -73,37 +73,37 @@ Updating the sample folder (ie, updating using the ant tools):
 2. Update the .jar file in the `phonegap.1.4.1/ext/` folder.
 3. Update the contents of the `phonegap.1.4.1/ext-air/` folder.
 4. Update the .js file in the `phonegap.1.4.1/javascript/` folder.
-5. Open the `sample/lib/` folder and re<a href="../../../phonegap/storage/parameters/name.html">name</a> the `cordova.1.4.1/` folder to `cordova.1.5.0/`.
+5. Open the `sample/lib/` folder and rename the `cordova.1.4.1/` folder to `cordova.1.5.0/`.
 6. Update build.xml to update the ant tools.
 7. Type `ant blackberry build` or `ant playbook build` to update the `www/` folder with updated Cordova.
 8. Open the `www/` folder and update your HTML to use the new `cordova-1.5.0.js` file.
 9. Update your www/plugins.xml file - remember all of the references to PhoneGap need to be changed to Cordova:
 
 From: 
-    <plugin <a href="../../../phonegap/storage/parameters/name.html">name</a>="App"            value="com.phonegap.app.App"/>
-    <plugin <a href="../../../phonegap/storage/parameters/name.html">name</a>="<a href="../../../phonegap/device/device.html">Device</a>"         value="com.phonegap.device.<a href="../../../phonegap/device/device.html">Device</a>"/>
-    <plugin <a href="../../../phonegap/storage/parameters/name.html">name</a>="<a href="../../../phonegap/camera/camera.html">Camera</a>"         value="com.phonegap.camera.<a href="../../../phonegap/camera/camera.html">Camera</a>"/>	
-    <plugin <a href="../../../phonegap/storage/parameters/name.html">name</a>="Network Status" value="com.phonegap.network.Network"/>
-    <plugin <a href="../../../phonegap/storage/parameters/name.html">name</a>="<a href="../../../phonegap/notification/notification.html">Notification</a>"   value="com.phonegap.notification.<a href="../../../phonegap/notification/notification.html">Notification</a>"/>
-    <plugin <a href="../../../phonegap/storage/parameters/name.html">name</a>="<a href="../../../phonegap/accelerometer/accelerometer.html">Accelerometer</a>"  value="com.phonegap.accelerometer.<a href="../../../phonegap/accelerometer/accelerometer.html">Accelerometer</a>"/>
-    <plugin <a href="../../../phonegap/storage/parameters/name.html">name</a>="<a href="../../../phonegap/geolocation/geolocation.html">Geolocation</a>"    value="com.phonegap.geolocation.<a href="../../../phonegap/geolocation/geolocation.html">Geolocation</a>"/>
-    <plugin <a href="../../../phonegap/storage/parameters/name.html">name</a>="<a href="../../../phonegap/file/fileobj/fileobj.html">File</a>"           value="com.phonegap.file.<a href="../../../phonegap/file/fileobj/fileobj.html">File</a>Manager"/>
-    <plugin <a href="../../../phonegap/storage/parameters/name.html">name</a>="<a href="../../../phonegap/file/filetransfer/filetransfer.html"><a href="../../../phonegap/file/fileobj/fileobj.html">File</a>Transfer</a>"   value="com.phonegap.http.<a href="../../../phonegap/file/filetransfer/filetransfer.html"><a href="../../../phonegap/file/fileobj/fileobj.html">File</a>Transfer</a>"/>
-    <plugin <a href="../../../phonegap/storage/parameters/name.html">name</a>="<a href="../../../phonegap/contacts/Contact/contact.html">Contact</a>"        value="com.phonegap.pim.<a href="../../../phonegap/contacts/Contact/contact.html">Contact</a>"/>
-    <plugin <a href="../../../phonegap/storage/parameters/name.html">name</a>="<a href="../../../phonegap/media/media.html">Media</a><a href="../../../phonegap/media/capture/capture.html">Capture</a>"   value="com.phonegap.media.<a href="../../../phonegap/media/media.html">Media</a><a href="../../../phonegap/media/capture/capture.html">Capture</a>"/>
-    <plugin <a href="../../../phonegap/storage/parameters/name.html">name</a>="Battery"        value="com.phonegap.battery.Battery"/>
+    <plugin name="App"            value="com.phonegap.app.App"/>
+    <plugin name="Device"         value="com.phonegap.device.Device"/>
+    <plugin name="Camera"         value="com.phonegap.camera.Camera"/>	
+    <plugin name="Network Status" value="com.phonegap.network.Network"/>
+    <plugin name="Notification"   value="com.phonegap.notification.Notification"/>
+    <plugin name="Accelerometer"  value="com.phonegap.accelerometer.Accelerometer"/>
+    <plugin name="Geolocation"    value="com.phonegap.geolocation.Geolocation"/>
+    <plugin name="File"           value="com.phonegap.file.FileManager"/>
+    <plugin name="FileTransfer"   value="com.phonegap.http.FileTransfer"/>
+    <plugin name="Contact"        value="com.phonegap.pim.Contact"/>
+    <plugin name="MediaCapture"   value="com.phonegap.media.MediaCapture"/>
+    <plugin name="Battery"        value="com.phonegap.battery.Battery"/>
 
 To:
-    <plugin <a href="../../../phonegap/storage/parameters/name.html">name</a>="App"            value="org.apache.cordova.app.App"/>
-    <plugin <a href="../../../phonegap/storage/parameters/name.html">name</a>="<a href="../../../phonegap/device/device.html">Device</a>"         value="org.apache.cordova.device.<a href="../../../phonegap/device/device.html">Device</a>"/>
-    <plugin <a href="../../../phonegap/storage/parameters/name.html">name</a>="<a href="../../../phonegap/camera/camera.html">Camera</a>"         value="org.apache.cordova.camera.<a href="../../../phonegap/camera/camera.html">Camera</a>"/>
-    <plugin <a href="../../../phonegap/storage/parameters/name.html">name</a>="Network Status" value="org.apache.cordova.network.Network"/>
-    <plugin <a href="../../../phonegap/storage/parameters/name.html">name</a>="<a href="../../../phonegap/notification/notification.html">Notification</a>"   value="org.apache.cordova.notification.<a href="../../../phonegap/notification/notification.html">Notification</a>"/>
-    <plugin <a href="../../../phonegap/storage/parameters/name.html">name</a>="<a href="../../../phonegap/accelerometer/accelerometer.html">Accelerometer</a>"  value="org.apache.cordova.accelerometer.<a href="../../../phonegap/accelerometer/accelerometer.html">Accelerometer</a>"/>
-    <plugin <a href="../../../phonegap/storage/parameters/name.html">name</a>="<a href="../../../phonegap/geolocation/geolocation.html">Geolocation</a>"    value="org.apache.cordova.geolocation.<a href="../../../phonegap/geolocation/geolocation.html">Geolocation</a>"/>
-    <plugin <a href="../../../phonegap/storage/parameters/name.html">name</a>="<a href="../../../phonegap/file/fileobj/fileobj.html">File</a>"           value="org.apache.cordova.file.<a href="../../../phonegap/file/fileobj/fileobj.html">File</a>Manager"/>
-    <plugin <a href="../../../phonegap/storage/parameters/name.html">name</a>="<a href="../../../phonegap/file/filetransfer/filetransfer.html"><a href="../../../phonegap/file/fileobj/fileobj.html">File</a>Transfer</a>"   value="org.apache.cordova.http.<a href="../../../phonegap/file/filetransfer/filetransfer.html"><a href="../../../phonegap/file/fileobj/fileobj.html">File</a>Transfer</a>"/>
-    <plugin <a href="../../../phonegap/storage/parameters/name.html">name</a>="<a href="../../../phonegap/contacts/Contact/contact.html">Contact</a>"        value="org.apache.cordova.pim.<a href="../../../phonegap/contacts/Contact/contact.html">Contact</a>"/>
-    <plugin <a href="../../../phonegap/storage/parameters/name.html">name</a>="<a href="../../../phonegap/media/media.html">Media</a><a href="../../../phonegap/media/capture/capture.html">Capture</a>"   value="org.apache.cordova.media.<a href="../../../phonegap/media/media.html">Media</a><a href="../../../phonegap/media/capture/capture.html">Capture</a>"/>
-    <plugin <a href="../../../phonegap/storage/parameters/name.html">name</a>="Battery"        value="org.apache.cordova.battery.Battery"/>
+    <plugin name="App"            value="org.apache.cordova.app.App"/>
+    <plugin name="Device"         value="org.apache.cordova.device.Device"/>
+    <plugin name="Camera"         value="org.apache.cordova.camera.Camera"/>
+    <plugin name="Network Status" value="org.apache.cordova.network.Network"/>
+    <plugin name="Notification"   value="org.apache.cordova.notification.Notification"/>
+    <plugin name="Accelerometer"  value="org.apache.cordova.accelerometer.Accelerometer"/>
+    <plugin name="Geolocation"    value="org.apache.cordova.geolocation.Geolocation"/>
+    <plugin name="File"           value="org.apache.cordova.file.FileManager"/>
+    <plugin name="FileTransfer"   value="org.apache.cordova.http.FileTransfer"/>
+    <plugin name="Contact"        value="org.apache.cordova.pim.Contact"/>
+    <plugin name="MediaCapture"   value="org.apache.cordova.media.MediaCapture"/>
+    <plugin name="Battery"        value="org.apache.cordova.battery.Battery"/>
 

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/af6a5545/www/docs/en/1.5.0/guide/upgrading/webos/index.md
----------------------------------------------------------------------
diff --git a/www/docs/en/1.5.0/guide/upgrading/webos/index.md b/www/docs/en/1.5.0/guide/upgrading/webos/index.md
index 4950ed7..97e9252 100644
--- a/www/docs/en/1.5.0/guide/upgrading/webos/index.md
+++ b/www/docs/en/1.5.0/guide/upgrading/webos/index.md
@@ -21,7 +21,7 @@ license: >
 Upgrading PhoneGap webOS
 =======================
 
-This document is for people who need to upgrade their Cordova <a href="../../../phonegap/storage/parameters/version.html">version</a>s from an older <a href="../../../phonegap/storage/parameters/version.html">version</a> to a current <a href="../../../phonegap/storage/parameters/version.html">version</a> of Cordova.
+This document is for people who need to upgrade their Cordova versions from an older version to a current version of Cordova.
 
 ## Upgrade to 1.5.0 from 1.4.1 ##
 
@@ -35,4 +35,4 @@ This document is for people who need to upgrade their Cordova <a href="../../../
     to:
     <script type="text/javascript" src="phonegap-1.5.0.js"></script> 
 
-3. run the makefile to generate the newest <a href="../../../phonegap/storage/parameters/version.html">version</a> of the phonegap-1.5.0.js file
\ No newline at end of file
+3. run the makefile to generate the newest version of the phonegap-1.5.0.js file
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/af6a5545/www/docs/en/1.5.0/index.md
----------------------------------------------------------------------
diff --git a/www/docs/en/1.5.0/index.md b/www/docs/en/1.5.0/index.md
index 892531f..91b6922 100644
--- a/www/docs/en/1.5.0/index.md
+++ b/www/docs/en/1.5.0/index.md
@@ -22,62 +22,62 @@ license: >
     <h1>API Reference</h1>
     <ul>
         <li>
-            <h2><a href="phonegap/accelerometer/accelerometer.html">Accelerometer</a></h2>
+            <h2>Accelerometer</h2>
             <span>Tap into the device's motion sensor.</span>
         </li>
         <li>
-            <h2><a href="phonegap/camera/camera.html">Camera</a></h2>
-            <span><a href="phonegap/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="phonegap/media/capture/capture.html">Capture</a></h2>
-            <span><a href="phonegap/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="phonegap/compass/compass.html">Compass</a></h2>
+            <h2>Compass</h2>
             <span>Obtain the direction that the device is pointing.</span>
         </li>
         <li>
-            <h2><a href="phonegap/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="phonegap/contacts/Contact/contact.html">Contact</a>s</h2>
+            <h2>Contacts</h2>
             <span>Work with the devices contact database.</span>
         </li>
         <li>
-            <h2><a href="phonegap/device/device.html">Device</a></h2>
+            <h2>Device</h2>
             <span>Gather device specific information.</span>
         </li>
         <li>
-            <h2><a href="phonegap/events/events.html">Events</a></h2>
+            <h2>Events</h2>
             <span>Hook into native events through JavaScript.</span>
         </li>
         <li>
-            <h2><a href="phonegap/file/fileobj/fileobj.html">File</a></h2>
+            <h2>File</h2>
             <span>Hook into native file system through JavaScript.</span>
         </li>
         <li>
-            <h2><a href="phonegap/geolocation/geolocation.html">Geolocation</a></h2>
+            <h2>Geolocation</h2>
             <span>Make your application location aware.</span>
         </li>
         <li>
-            <h2><a href="phonegap/media/media.html">Media</a></h2>
+            <h2>Media</h2>
             <span>Record and play back audio files.</span>
         </li>
         <li>
-            <h2><a href="phonegap/notification/notification.html">Notification</a></h2>
+            <h2>Notification</h2>
             <span>Visual, audible, and tactile device notifications.</span>
         </li>
         <li>
-            <h2><a href="phonegap/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 PhoneGap app.</span>
         </li>
         <li>

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/af6a5545/www/docs/en/1.5.0/phonegap/accelerometer/acceleration/acceleration.md
----------------------------------------------------------------------
diff --git a/www/docs/en/1.5.0/phonegap/accelerometer/acceleration/acceleration.md b/www/docs/en/1.5.0/phonegap/accelerometer/acceleration/acceleration.md
index 86358b9..cd7160f 100644
--- a/www/docs/en/1.5.0/phonegap/accelerometer/acceleration/acceleration.md
+++ b/www/docs/en/1.5.0/phonegap/accelerometer/acceleration/acceleration.md
@@ -21,7 +21,7 @@ license: >
 Acceleration
 ============
 
-Contains `<a href="../accelerometer.html">Accelerometer</a>` data captured at a specific point in time.
+Contains `Accelerometer` data captured at a specific point in time.
 
 Properties
 ----------
@@ -34,7 +34,7 @@ Properties
 Description
 -----------
 
-This object is created and populated by PhoneGap, and returned by an `<a href="../accelerometer.html">Accelerometer</a>` method.
+This object is created and populated by PhoneGap, and returned by an `Accelerometer` method.
 
 Supported Platforms
 -------------------
@@ -44,7 +44,7 @@ Supported Platforms
 - iPhone
 - Windows Phone 7 ( Mango )
 
-Quick <a href="../../storage/storage.opendatabase.html">Example</a>
+Quick Example
 -------------
 
     function onSuccess(acceleration) {
@@ -58,27 +58,27 @@ Quick <a href="../../storage/storage.opendatabase.html">Example</a>
         alert('onError!');
     };
 
-    navigator.<a href="../accelerometer.getCurrentAcceleration.html">accelerometer.getCurrentAcceleration</a>(onSuccess, onError);
+    navigator.accelerometer.getCurrentAcceleration(onSuccess, onError);
 
-Full <a href="../../storage/storage.opendatabase.html">Example</a>
+Full Example
 ------------
 
     <!DOCTYPE html>
     <html>
       <head>
-        <title>Acceleration <a href="../../storage/storage.opendatabase.html">Example</a></title>
+        <title>Acceleration 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() {
-            navigator.<a href="../accelerometer.getCurrentAcceleration.html">accelerometer.getCurrentAcceleration</a>(onSuccess, onError);
+        function onDeviceReady() {
+            navigator.accelerometer.getCurrentAcceleration(onSuccess, onError);
         }
 
         // onSuccess: Get a snapshot of the current acceleration
@@ -99,7 +99,7 @@ Full <a href="../../storage/storage.opendatabase.html">Example</a>
         </script>
       </head>
       <body>
-        <h1><a href="../../storage/storage.opendatabase.html">Example</a></h1>
+        <h1>Example</h1>
         <p>getCurrentAcceleration</p>
       </body>
     </html>
\ 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/accelerometer/accelerometer.clearWatch.md
----------------------------------------------------------------------
diff --git a/www/docs/en/1.5.0/phonegap/accelerometer/accelerometer.clearWatch.md b/www/docs/en/1.5.0/phonegap/accelerometer/accelerometer.clearWatch.md
index 293f58c..f274a50 100644
--- a/www/docs/en/1.5.0/phonegap/accelerometer/accelerometer.clearWatch.md
+++ b/www/docs/en/1.5.0/phonegap/accelerometer/accelerometer.clearWatch.md
@@ -21,11 +21,11 @@ license: >
 accelerometer.clearWatch
 ========================
 
-Stop watching the `<a href="acceleration/acceleration.html">Acceleration</a>` referenced by the watch ID parameter.
+Stop watching the `Acceleration` referenced by the watch ID parameter.
 
     navigator.accelerometer.clearWatch(watchID);
 
-- __watchID__: The ID returned by `accelerometer.watch<a href="acceleration/acceleration.html">Acceleration</a>`.
+- __watchID__: The ID returned by `accelerometer.watchAcceleration`.
 
 Supported Platforms
 -------------------
@@ -34,36 +34,36 @@ Supported Platforms
 - BlackBerry WebWorks (OS 5.0 and higher)
 - iPhone
 
-Quick <a href="../storage/storage.opendatabase.html">Example</a>
+Quick Example
 -------------
 
-    var watchID = navigator.accelerometer.watch<a href="acceleration/acceleration.html">Acceleration</a>(onSuccess, onError, options);
+    var watchID = navigator.accelerometer.watchAcceleration(onSuccess, onError, options);
     
     // ... later on ...
     
     navigator.accelerometer.clearWatch(watchID);
     
-Full <a href="../storage/storage.opendatabase.html">Example</a>
+Full Example
 ------------
 
     <!DOCTYPE html>
     <html>
       <head>
-        <title><a href="acceleration/acceleration.html">Acceleration</a> <a href="../storage/storage.opendatabase.html">Example</a></title>
+        <title>Acceleration Example</title>
 
         <script type="text/javascript" charset="utf-8" src="cordova-1.5.0.js"></script>
         <script type="text/javascript" charset="utf-8">
 
-        // The watch id references the current `watch<a href="acceleration/acceleration.html">Acceleration</a>`
+        // The watch id references the current `watchAcceleration`
         var watchID = null;
         
         // 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() {
             startWatch();
         }
 
@@ -74,7 +74,7 @@ Full <a href="../storage/storage.opendatabase.html">Example</a>
             // Update acceleration every 3 seconds
             var options = { frequency: 3000 };
             
-            watchID = navigator.accelerometer.watch<a href="acceleration/acceleration.html">Acceleration</a>(onSuccess, onError, options);
+            watchID = navigator.accelerometer.watchAcceleration(onSuccess, onError, options);
         }
         
         // Stop watching the acceleration
@@ -90,9 +90,9 @@ Full <a href="../storage/storage.opendatabase.html">Example</a>
         //
         function onSuccess(acceleration) {
             var element = document.getElementById('accelerometer');
-            element.innerHTML = '<a href="acceleration/acceleration.html">Acceleration</a> X: ' + acceleration.x + '<br />' +
-                                '<a href="acceleration/acceleration.html">Acceleration</a> Y: ' + acceleration.y + '<br />' +
-                                '<a href="acceleration/acceleration.html">Acceleration</a> Z: ' + acceleration.z + '<br />' + 
+            element.innerHTML = 'Acceleration X: ' + acceleration.x + '<br />' +
+                                'Acceleration Y: ' + acceleration.y + '<br />' +
+                                'Acceleration Z: ' + acceleration.z + '<br />' + 
                                 'Timestamp: '      + acceleration.timestamp + '<br />';
         }
 

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/af6a5545/www/docs/en/1.5.0/phonegap/accelerometer/accelerometer.getCurrentAcceleration.md
----------------------------------------------------------------------
diff --git a/www/docs/en/1.5.0/phonegap/accelerometer/accelerometer.getCurrentAcceleration.md b/www/docs/en/1.5.0/phonegap/accelerometer/accelerometer.getCurrentAcceleration.md
index fe8cded..4e801b7 100644
--- a/www/docs/en/1.5.0/phonegap/accelerometer/accelerometer.getCurrentAcceleration.md
+++ b/www/docs/en/1.5.0/phonegap/accelerometer/accelerometer.getCurrentAcceleration.md
@@ -18,19 +18,19 @@ license: >
     under the License.
 ---
 
-accelerometer.getCurrent<a href="acceleration/acceleration.html">Acceleration</a>
+accelerometer.getCurrentAcceleration
 ====================================
 
 Get the current acceleration along the x, y, and z axis.
 
-    navigator.accelerometer.getCurrent<a href="acceleration/acceleration.html">Acceleration</a>(<a href="parameters/accelerometerSuccess.html">accelerometerSuccess</a>, <a href="parameters/accelerometerError.html">accelerometerError</a>);
+    navigator.accelerometer.getCurrentAcceleration(accelerometerSuccess, accelerometerError);
 
 Description
 -----------
 
 The accelerometer is a motion sensor that detects the change (delta) in movement relative to the current device orientation. The accelerometer can detect 3D movement along the x, y, and z axis.
 
-The acceleration is returned using the `<a href="parameters/accelerometerSuccess.html">accelerometerSuccess</a>` callback function.
+The acceleration is returned using the `accelerometerSuccess` callback function.
 
 Supported Platforms
 -------------------
@@ -39,13 +39,13 @@ Supported Platforms
 - BlackBerry WebWorks (OS 5.0 and higher)
 - iPhone
 
-Quick <a href="../storage/storage.opendatabase.html">Example</a>
+Quick Example
 -------------
 
     function onSuccess(acceleration) {
-        alert('<a href="acceleration/acceleration.html">Acceleration</a> X: ' + acceleration.x + '\n' +
-              '<a href="acceleration/acceleration.html">Acceleration</a> Y: ' + acceleration.y + '\n' +
-              '<a href="acceleration/acceleration.html">Acceleration</a> Z: ' + acceleration.z + '\n' +
+        alert('Acceleration X: ' + acceleration.x + '\n' +
+              'Acceleration Y: ' + acceleration.y + '\n' +
+              'Acceleration Z: ' + acceleration.z + '\n' +
               'Timestamp: '      + acceleration.timestamp + '\n');
     };
 
@@ -53,35 +53,35 @@ Quick <a href="../storage/storage.opendatabase.html">Example</a>
         alert('onError!');
     };
 
-    navigator.accelerometer.getCurrent<a href="acceleration/acceleration.html">Acceleration</a>(onSuccess, onError);
+    navigator.accelerometer.getCurrentAcceleration(onSuccess, onError);
 
-Full <a href="../storage/storage.opendatabase.html">Example</a>
+Full Example
 ------------
 
     <!DOCTYPE html>
     <html>
       <head>
-        <title><a href="acceleration/acceleration.html">Acceleration</a> <a href="../storage/storage.opendatabase.html">Example</a></title>
+        <title>Acceleration 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() {
-            navigator.accelerometer.getCurrent<a href="acceleration/acceleration.html">Acceleration</a>(onSuccess, onError);
+        function onDeviceReady() {
+            navigator.accelerometer.getCurrentAcceleration(onSuccess, onError);
         }
     
         // onSuccess: Get a snapshot of the current acceleration
         //
         function onSuccess(acceleration) {
-            alert('<a href="acceleration/acceleration.html">Acceleration</a> X: ' + acceleration.x + '\n' +
-                  '<a href="acceleration/acceleration.html">Acceleration</a> Y: ' + acceleration.y + '\n' +
-                  '<a href="acceleration/acceleration.html">Acceleration</a> Z: ' + acceleration.z + '\n' +
+            alert('Acceleration X: ' + acceleration.x + '\n' +
+                  'Acceleration Y: ' + acceleration.y + '\n' +
+                  'Acceleration Z: ' + acceleration.z + '\n' +
                   'Timestamp: '      + acceleration.timestamp + '\n');
         }
     
@@ -94,8 +94,8 @@ Full <a href="../storage/storage.opendatabase.html">Example</a>
         </script>
       </head>
       <body>
-        <h1><a href="../storage/storage.opendatabase.html">Example</a></h1>
-        <p>getCurrent<a href="acceleration/acceleration.html">Acceleration</a></p>
+        <h1>Example</h1>
+        <p>getCurrentAcceleration</p>
       </body>
     </html>
     
@@ -104,4 +104,4 @@ iPhone Quirks
 
 - iPhone doesn't have the concept of getting the current acceleration at any given point.
 - You must watch the acceleration and capture the data at given time intervals.
-- Thus, the `getCurrent<a href="acceleration/acceleration.html">Acceleration</a>` function will give you the last value reported from a phoneGap `watch<a href="accelerometer.html">Accelerometer</a>` call.
+- Thus, the `getCurrentAcceleration` function will give you the last value reported from a phoneGap `watchAccelerometer` call.

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/af6a5545/www/docs/en/1.5.0/phonegap/accelerometer/accelerometer.md
----------------------------------------------------------------------
diff --git a/www/docs/en/1.5.0/phonegap/accelerometer/accelerometer.md b/www/docs/en/1.5.0/phonegap/accelerometer/accelerometer.md
index afb5e45..7607cd0 100644
--- a/www/docs/en/1.5.0/phonegap/accelerometer/accelerometer.md
+++ b/www/docs/en/1.5.0/phonegap/accelerometer/accelerometer.md
@@ -21,23 +21,23 @@ license: >
 Accelerometer
 =============
 
-> <a href="../media/capture/capture.html">Capture</a>s device motion in the x, y, and z direction.
+> Captures device motion in the x, y, and z direction.
 
 Methods
 -------
 
-- accelerometer.getCurrent<a href="acceleration/acceleration.html">Acceleration</a>
-- accelerometer.watch<a href="acceleration/acceleration.html">Acceleration</a>
-- <a href="accelerometer.clearWatch.html">accelerometer.clearWatch</a>
+- accelerometer.getCurrentAcceleration
+- accelerometer.watchAcceleration
+- accelerometer.clearWatch
 
 Arguments
 ---------
 
-- <a href="parameters/accelerometerSuccess.html">accelerometerSuccess</a>
-- <a href="parameters/accelerometerError.html">accelerometerError</a>
-- <a href="parameters/accelerometerOptions.html">accelerometerOptions</a>
+- accelerometerSuccess
+- accelerometerError
+- accelerometerOptions
 
 Objects (Read-Only)
 -------------------
 
-- <a href="acceleration/acceleration.html">Acceleration</a>
\ No newline at end of file
+- Acceleration
\ 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/accelerometer/accelerometer.watchAcceleration.md
----------------------------------------------------------------------
diff --git a/www/docs/en/1.5.0/phonegap/accelerometer/accelerometer.watchAcceleration.md b/www/docs/en/1.5.0/phonegap/accelerometer/accelerometer.watchAcceleration.md
index d7225ee..88697cd 100644
--- a/www/docs/en/1.5.0/phonegap/accelerometer/accelerometer.watchAcceleration.md
+++ b/www/docs/en/1.5.0/phonegap/accelerometer/accelerometer.watchAcceleration.md
@@ -18,23 +18,23 @@ license: >
     under the License.
 ---
 
-accelerometer.watch<a href="acceleration/acceleration.html">Acceleration</a>
+accelerometer.watchAcceleration
 ===============================
 
 At a regular interval, get the acceleration along the x, y, and z axis.
 
-    var watchID = navigator.accelerometer.watch<a href="acceleration/acceleration.html">Acceleration</a>(<a href="parameters/accelerometerSuccess.html">accelerometerSuccess</a>,
-                                                           <a href="parameters/accelerometerError.html">accelerometerError</a>,
-                                                           [<a href="parameters/accelerometerOptions.html">accelerometerOptions</a>]);
+    var watchID = navigator.accelerometer.watchAcceleration(accelerometerSuccess,
+                                                           accelerometerError,
+                                                           [accelerometerOptions]);
                                                            
 Description
 -----------
 
 The accelerometer is a motion sensor that detects the change (delta) in movement relative to the current position. The accelerometer can detect 3D movement along the x, y, and z axis.
 
-The `accelerometer.watch<a href="acceleration/acceleration.html">Acceleration</a>` gets the device's current acceleration at a regular interval. Each time the `<a href="acceleration/acceleration.html">Acceleration</a>` is retrieved, the `<a href="parameters/accelerometerSuccess.html">accelerometerSuccess</a>` callback function is executed. Specify the interval in milliseconds via the `frequency` parameter in the `acceleratorOptions` object.
+The `accelerometer.watchAcceleration` gets the device's current acceleration at a regular interval. Each time the `Acceleration` is retrieved, the `accelerometerSuccess` callback function is executed. Specify the interval in milliseconds via the `frequency` parameter in the `acceleratorOptions` object.
 
-The returned watch ID references references the accelerometer watch interval. The watch ID can be used with `<a href="accelerometer.clearWatch.html">accelerometer.clearWatch</a>` to stop watching the accelerometer.
+The returned watch ID references references the accelerometer watch interval. The watch ID can be used with `accelerometer.clearWatch` to stop watching the accelerometer.
 
 Supported Platforms
 -------------------
@@ -44,13 +44,13 @@ Supported Platforms
 - iPhone
 
 
-Quick <a href="../storage/storage.opendatabase.html">Example</a>
+Quick Example
 -------------
 
     function onSuccess(acceleration) {
-        alert('<a href="acceleration/acceleration.html">Acceleration</a> X: ' + acceleration.x + '\n' +
-              '<a href="acceleration/acceleration.html">Acceleration</a> Y: ' + acceleration.y + '\n' +
-              '<a href="acceleration/acceleration.html">Acceleration</a> Z: ' + acceleration.z + '\n' +
+        alert('Acceleration X: ' + acceleration.x + '\n' +
+              'Acceleration Y: ' + acceleration.y + '\n' +
+              'Acceleration Z: ' + acceleration.z + '\n' +
               'Timestamp: '      + acceleration.timestamp + '\n');
     };
 
@@ -60,29 +60,29 @@ Quick <a href="../storage/storage.opendatabase.html">Example</a>
 
     var options = { frequency: 3000 };  // Update every 3 seconds
     
-    var watchID = navigator.accelerometer.watch<a href="acceleration/acceleration.html">Acceleration</a>(onSuccess, onError, options);
+    var watchID = navigator.accelerometer.watchAcceleration(onSuccess, onError, options);
 
-Full <a href="../storage/storage.opendatabase.html">Example</a>
+Full Example
 ------------
 
     <!DOCTYPE html>
     <html>
       <head>
-        <title><a href="acceleration/acceleration.html">Acceleration</a> <a href="../storage/storage.opendatabase.html">Example</a></title>
+        <title>Acceleration Example</title>
 
         <script type="text/javascript" charset="utf-8" src="cordova-1.5.0.js"></script>
         <script type="text/javascript" charset="utf-8">
 
-        // The watch id references the current `watch<a href="acceleration/acceleration.html">Acceleration</a>`
+        // The watch id references the current `watchAcceleration`
         var watchID = null;
         
         // 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() {
             startWatch();
         }
 
@@ -93,14 +93,14 @@ Full <a href="../storage/storage.opendatabase.html">Example</a>
             // Update acceleration every 3 seconds
             var options = { frequency: 3000 };
             
-            watchID = navigator.accelerometer.watch<a href="acceleration/acceleration.html">Acceleration</a>(onSuccess, onError, options);
+            watchID = navigator.accelerometer.watchAcceleration(onSuccess, onError, options);
         }
         
         // Stop watching the acceleration
         //
         function stopWatch() {
             if (watchID) {
-                navigator.<a href="accelerometer.clearWatch.html">accelerometer.clearWatch</a>(watchID);
+                navigator.accelerometer.clearWatch(watchID);
                 watchID = null;
             }
         }
@@ -109,9 +109,9 @@ Full <a href="../storage/storage.opendatabase.html">Example</a>
         //
         function onSuccess(acceleration) {
             var element = document.getElementById('accelerometer');
-            element.innerHTML = '<a href="acceleration/acceleration.html">Acceleration</a> X: ' + acceleration.x + '<br />' +
-                                '<a href="acceleration/acceleration.html">Acceleration</a> Y: ' + acceleration.y + '<br />' +
-                                '<a href="acceleration/acceleration.html">Acceleration</a> Z: ' + acceleration.z + '<br />' +
+            element.innerHTML = 'Acceleration X: ' + acceleration.x + '<br />' +
+                                'Acceleration Y: ' + acceleration.y + '<br />' +
+                                'Acceleration Z: ' + acceleration.z + '<br />' +
                                 'Timestamp: '      + acceleration.timestamp + '<br />';
         }
 

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/af6a5545/www/docs/en/1.5.0/phonegap/accelerometer/parameters/accelerometerOptions.md
----------------------------------------------------------------------
diff --git a/www/docs/en/1.5.0/phonegap/accelerometer/parameters/accelerometerOptions.md b/www/docs/en/1.5.0/phonegap/accelerometer/parameters/accelerometerOptions.md
index d105d2d..86fb292 100644
--- a/www/docs/en/1.5.0/phonegap/accelerometer/parameters/accelerometerOptions.md
+++ b/www/docs/en/1.5.0/phonegap/accelerometer/parameters/accelerometerOptions.md
@@ -26,4 +26,4 @@ An optional parameter to customize the retrieval of the accelerometer.
 Options
 -------
 
-- __frequency:__ How often to retrieve the `<a href="../acceleration/acceleration.html">Acceleration</a>` in milliseconds. _(Number)_ (Default: 10000)
\ No newline at end of file
+- __frequency:__ How often to retrieve the `Acceleration` in milliseconds. _(Number)_ (Default: 10000)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/af6a5545/www/docs/en/1.5.0/phonegap/accelerometer/parameters/accelerometerSuccess.md
----------------------------------------------------------------------
diff --git a/www/docs/en/1.5.0/phonegap/accelerometer/parameters/accelerometerSuccess.md b/www/docs/en/1.5.0/phonegap/accelerometer/parameters/accelerometerSuccess.md
index 5f448d2..67166dc 100644
--- a/www/docs/en/1.5.0/phonegap/accelerometer/parameters/accelerometerSuccess.md
+++ b/www/docs/en/1.5.0/phonegap/accelerometer/parameters/accelerometerSuccess.md
@@ -21,7 +21,7 @@ license: >
 accelerometerSuccess
 ====================
 
-onSuccess callback function that provides the <a href="../acceleration/acceleration.html">Acceleration</a> information.
+onSuccess callback function that provides the Acceleration information.
 
     function(acceleration) {
         // Do something
@@ -30,14 +30,14 @@ onSuccess callback function that provides the <a href="../acceleration/accelerat
 Parameters
 ----------
 
-- __acceleration:__ The acceleration at a single moment in time. (<a href="../acceleration/acceleration.html">Acceleration</a>)
+- __acceleration:__ The acceleration at a single moment in time. (Acceleration)
 
-<a href="../../storage/storage.opendatabase.html">Example</a>
+Example
 -------
 
     function onSuccess(acceleration) {
-        alert('<a href="../acceleration/acceleration.html">Acceleration</a> X: ' + acceleration.x + '\n' +
-              '<a href="../acceleration/acceleration.html">Acceleration</a> Y: ' + acceleration.y + '\n' +
-              '<a href="../acceleration/acceleration.html">Acceleration</a> Z: ' + acceleration.z + '\n' +
+        alert('Acceleration X: ' + acceleration.x + '\n' +
+              'Acceleration Y: ' + acceleration.y + '\n' +
+              'Acceleration Z: ' + acceleration.z + '\n' +
               'Timestamp: '      + acceleration.timestamp + '\n');
     };
\ No newline at end of file


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