You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by mw...@apache.org on 2013/07/30 20:02:24 UTC

[1/5] docs commit: [CB-3818] fix bad config file formatting

Updated Branches:
  refs/heads/master e5acb7a37 -> 881d8dcbd


[CB-3818] fix bad config file formatting


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

Branch: refs/heads/master
Commit: cd19d2b32820f4dbdeb896aa9e810289aa5975fd
Parents: e5acb7a
Author: Mike Sierra <le...@gmail.com>
Authored: Tue Jul 30 11:12:40 2013 -0400
Committer: Michael Brooks <mi...@michaelbrooks.ca>
Committed: Tue Jul 30 11:01:44 2013 -0700

----------------------------------------------------------------------
 .../en/edge/cordova/accelerometer/accelerometer.md | 13 +++++--------
 docs/en/edge/cordova/camera/camera.md              | 17 +++++++----------
 docs/en/edge/cordova/compass/compass.md            |  9 +++------
 docs/en/edge/cordova/connection/connection.md      | 15 ++++++---------
 docs/en/edge/cordova/contacts/contacts.md          | 13 ++++++-------
 docs/en/edge/cordova/device/device.md              | 14 ++++++--------
 docs/en/edge/cordova/events/events.md              | 14 ++++++--------
 docs/en/edge/cordova/file/file.md                  | 10 +++++-----
 docs/en/edge/cordova/geolocation/geolocation.md    | 14 ++++++--------
 .../en/edge/cordova/globalization/globalization.md |  3 +--
 docs/en/edge/cordova/inappbrowser/inappbrowser.md  |  9 +++------
 docs/en/edge/cordova/media/capture/capture.md      | 14 ++++++--------
 docs/en/edge/cordova/media/media.md                | 12 +++++-------
 docs/en/edge/cordova/notification/notification.md  | 11 +++++------
 docs/en/edge/cordova/splashscreen/splashscreen.md  |  6 ++----
 docs/en/edge/cordova/storage/storage.md            |  6 ++----
 16 files changed, 74 insertions(+), 106 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/cd19d2b3/docs/en/edge/cordova/accelerometer/accelerometer.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/cordova/accelerometer/accelerometer.md b/docs/en/edge/cordova/accelerometer/accelerometer.md
index 9c2704d..ce07c94 100644
--- a/docs/en/edge/cordova/accelerometer/accelerometer.md
+++ b/docs/en/edge/cordova/accelerometer/accelerometer.md
@@ -53,34 +53,31 @@ Interface, to add or remove this feature for a project:
 These commands apply to all targeted platforms, but modify the
 platform-specific configuration settings described below:
 
-* Android
+* Android (in `app/res/xml/config.xml`)
 
-    <!-- app/res/xml/config.xml -->
     <feature name="Accelerometer">
         <param name="android-package" value="org.apache.cordova.AccelListener" />
     </feature>
 
 * BlackBerry WebWorks
 
-    <!-- www/plugins.xml -->
+    (in www/plugins.xml)
     <feature name="Accelerometer">
         <param name="blackberry-package" value="org.apache.cordova.accelerometer.Accelerometer" />
     </feature>
 
-    <!-- www/config.xml -->
+    (in www/config.xml)
     <feature id="blackberry.system"  required="true" version="1.0.0.0" />
     <feature id="org.apache.cordova" required="true" version="1.0.0" />
 
-* iOS
+* iOS (in `config.xml`)
 
-    <!-- config.xml -->
     <feature name="Accelerometer">
         <param name="ios-package" value="CDVAccelerometer" />
     </feature>
 
-* Windows Phone
+* Windows Phone (in `Properties/WPAppManifest.xml`)
 
-    <!-- Properties/WPAppManifest.xml -->
     <Capabilities>
         <Capability Name="ID_CAP_SENSORS" />
     </Capabilities>

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/cd19d2b3/docs/en/edge/cordova/camera/camera.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/cordova/camera/camera.md b/docs/en/edge/cordova/camera/camera.md
index 54649dd..36cebd2 100644
--- a/docs/en/edge/cordova/camera/camera.md
+++ b/docs/en/edge/cordova/camera/camera.md
@@ -44,38 +44,36 @@ platform-specific configuration settings described below:
 
 * Android
 
-    <!-- app/res/xml/config.xml -->
+    (in app/res/xml/config.xml)
     <feature name="Camera">
         <param name="android-package" value="org.apache.cordova.CameraLauncher" />
     </feature>
 
-    <!-- app/AndroidManifest -->
+    (in app/AndroidManifest)
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 
 * BlackBerry WebWorks
 
-    <!-- www/plugins.xml -->
+    (in www/plugins.xml)
     <feature name="Camera">
         <param name="blackberry-package" value="org.apache.cordova.camera.Camera" />
     </feature>
 
-    <!-- www/config.xml -->
+    (in www/config.xml)
     <feature id="blackberry.media.camera" />
 
     <rim:permissions>
         <rim:permit>use_camera</rim:permit>
     </rim:permissions>
 
-* iOS
+* iOS (in `config.xml`)
 
-    <!-- config.xml -->
     <feature name="Camera">
         <param name="ios-package" value="CDVCamera" />
     </feature>
 
-* Windows Phone
+* Windows Phone (in `Properties/WPAppManifest.xml`)
 
-    <!-- Properties/WPAppManifest.xml -->
     <Capabilities>
         <Capability Name="ID_CAP_ISV_CAMERA" />
         <Capability Name="ID_HW_FRONTCAMERA" />
@@ -83,9 +81,8 @@ platform-specific configuration settings described below:
 
 Reference: [Application Manifest for Windows Phone](http://msdn.microsoft.com/en-us/library/ff769509%28v=vs.92%29.aspx)
 
-* Tizen
+* Tizen (in `config.xml`)
 
-    <!-- config.xml -->
     <feature name="http://tizen.org/api/application" required="true"/>
     <feature name="http://tizen.org/api/application.launch" required="true"/>
 

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/cd19d2b3/docs/en/edge/cordova/compass/compass.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/cordova/compass/compass.md b/docs/en/edge/cordova/compass/compass.md
index fdd3096..48e40e6 100755
--- a/docs/en/edge/cordova/compass/compass.md
+++ b/docs/en/edge/cordova/compass/compass.md
@@ -51,9 +51,8 @@ Interface, to add or remove this feature for a project:
 These commands apply to all targeted platforms, but modify the
 platform-specific configuration settings described below:
 
-* Android
+* Android (in `app/res/xml/config.xml`)
 
-    <!-- app/res/xml/config.xml -->
     <feature name="Compass">
         <param name="android-package" value="org.apache.cordova.CompassListener" />
     </feature>
@@ -62,16 +61,14 @@ platform-specific configuration settings described below:
 
   No special permissions are required.
 
-* iOS
+* iOS (in `config.xml`)
 
-    <!-- config.xml -->
     <feature name="Compass">
         <param name="ios-package" value="CDVLocation" />
     </feature>
 
-* Windows Phone
+* Windows Phone (in `Properties/WPAppManifest.xml`)
 
-    <!-- Properties/WPAppManifest.xml -->
     <Capabilities>
         <Capability Name="ID_CAP_SENSORS" />
     </Capabilities>

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/cd19d2b3/docs/en/edge/cordova/connection/connection.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/cordova/connection/connection.md b/docs/en/edge/cordova/connection/connection.md
index c1fcf60..c287bb8 100644
--- a/docs/en/edge/cordova/connection/connection.md
+++ b/docs/en/edge/cordova/connection/connection.md
@@ -53,42 +53,39 @@ platform-specific configuration settings described below:
 
 * Android
 
-    <!-- app/res/xml/config.xml -->
+    (in app/res/xml/config.xml)
     <feature name="NetworkStatus">
         <param name="android-package" value="org.apache.cordova.NetworkManager" />
     </feature>
 
-    <!-- app/AndroidManifest.xml -->
+    (in app/AndroidManifest.xml)
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
 
 * BlackBerry WebWorks
 
-    <!-- www/plugins.xml -->
+    (in www/plugins.xml)
     <feature name="Network Status">
         <param name="blackberry-package" value="org.apache.cordova.network.Network" />
     </feature>
 
-* iOS
+* iOS (in `config.xml`)
 
-    <!-- config.xml -->
     <feature name="NetworkStatus">
         <param name="ios-package" value="CDVConnection" />
     </feature>
 
-* Windows Phone
+* Windows Phone (in `Properties/WPAppManifest.xml`)
 
-    <!-- Properties/WPAppManifest.xml -->
     <Capabilities>
         <Capability Name="ID_CAP_NETWORKING" />
     </Capabilities>
 
 Reference: [Application Manifest for Windows Phone](http://msdn.microsoft.com/en-us/library/ff769509%28v=vs.92%29.aspx)
 
-* Tizen
+* Tizen (in `config.xml`)
 
-    <!-- config.xml -->
     <feature name="http://tizen.org/api/systeminfo" required="true"/>
 
 Reference: [Application Manifest for Tizen Web Application](https://developer.tizen.org/help/topic/org.tizen.help.gs/Creating%20a%20Project.html?path=0_1_1_3#8814682_CreatingaProject-EditingconfigxmlFeatures)

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/cd19d2b3/docs/en/edge/cordova/contacts/contacts.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/cordova/contacts/contacts.md b/docs/en/edge/cordova/contacts/contacts.md
index 7e33118..56a9bd7 100644
--- a/docs/en/edge/cordova/contacts/contacts.md
+++ b/docs/en/edge/cordova/contacts/contacts.md
@@ -63,39 +63,38 @@ platform-specific configuration settings described below:
 
 * Android
 
-    <!-- app/res/xml/config.xml -->
+    (in app/res/xml/config.xml)
     <feature name="Contacts">
         <param name="android-package" value="org.apache.cordova.ContactManager" />
     </feature>
 
-    <!-- app/AndroidManifest.xml -->
+    (in app/AndroidManifest.xml)
     <uses-permission android:name="android.permission.GET_ACCOUNTS" />
     <uses-permission android:name="android.permission.READ_CONTACTS" />
     <uses-permission android:name="android.permission.WRITE_CONTACTS" />
 
 * BlackBerry WebWorks
 
-    <!-- www/plugins.xml -->
+    (in www/plugins.xml)
     <feature name="Contact">
         <param name="blackberry-package" value="org.apache.cordova.pim.Contact" />
     </feature>
 
-    <!-- www/config.xml -->
+    (in www/config.xml)
     <feature id="blackberry.find"        required="true" version="1.0.0.0" />
     <feature id="blackberry.identity"    required="true" version="1.0.0.0" />
     <feature id="blackberry.pim.Address" required="true" version="1.0.0.0" />
     <feature id="blackberry.pim.Contact" required="true" version="1.0.0.0" />
 
-* iOS
+* iOS (in `config.xml`)
 
-    <!-- config.xml -->
     <feature name="Contacts">
         <param name="ios-package" value="CDVContacts" />
     </feature>
 
 * Windows Phone
 
-    <!-- Properties/WPAppManifest.xml -->
+    (in Properties/WPAppManifest.xml)
     <Capabilities>
         <Capability Name="ID_CAP_CONTACTS" />
     </Capabilities>

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/cd19d2b3/docs/en/edge/cordova/device/device.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/cordova/device/device.md b/docs/en/edge/cordova/device/device.md
index ced2c76..4ad55f5 100644
--- a/docs/en/edge/cordova/device/device.md
+++ b/docs/en/edge/cordova/device/device.md
@@ -55,22 +55,22 @@ platform-specific configuration settings described below:
 
 * Android
 
-    <!-- app/res/xml/config.xml -->
+    (in app/res/xml/config.xml)
     <feature name="Device">
         <param name="android-package" value="org.apache.cordova.Device" />
     </feature>
 
-    <!-- app/AndroidManifest.xml -->
+    (in app/AndroidManifest.xml)
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
 
 * BlackBerry WebWorks
 
-    <!-- www/plugins.xml -->
+    (in www/plugins.xml)
     <feature name="Device">
         <param name="blackberry-package" value="org.apache.cordova.device.Device" />
     </feature>
 
-    <!-- www/config.xml -->
+    (in www/config.xml)
     <feature id="blackberry.app" required="true" version="1.0.0.0" />
     <rim:permissions>
         <rim:permit>read_device_identifying_information</rim:permit>
@@ -80,9 +80,8 @@ platform-specific configuration settings described below:
 
   No special permissions are required.
 
-* Windows Phone
+* Windows Phone (in `Properties/WPAppManifest.xml`)
 
-    <!-- Properties/WPAppManifest.xml -->
     <Capabilities>
         <Capability Name="ID_CAP_WEBBROWSERCOMPONENT" />
         <Capability Name="ID_CAP_IDENTITY_DEVICE" />
@@ -91,9 +90,8 @@ platform-specific configuration settings described below:
 
 Reference: [Application Manifest for Windows Phone](http://msdn.microsoft.com/en-us/library/ff769509%28v=vs.92%29.aspx)
 
-* Tizen
+* Tizen (in `config.xml`)
 
-    <!-- config.xml -->
     <feature name="http://tizen.org/api/systeminfo" required="true"/>
 
 Reference: [Application Manifest for Tizen Web Application](https://developer.tizen.org/help/topic/org.tizen.help.gs/Creating%20a%20Project.html?path=0_1_1_3#8814682_CreatingaProject-EditingconfigxmlFeatures)

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/cd19d2b3/docs/en/edge/cordova/events/events.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/cordova/events/events.md b/docs/en/edge/cordova/events/events.md
index eb51584..cce5476 100644
--- a/docs/en/edge/cordova/events/events.md
+++ b/docs/en/edge/cordova/events/events.md
@@ -45,29 +45,28 @@ Event Types
 
 * Android
 
-    <!-- app/res/xml/config.xml -->
+    (in app/res/xml/config.xml)
     <feature name="Battery">
         <param name="android-package" value="org.apache.cordova.BatteryListener" />
     </feature>
 
-    <!-- app/AndroidManifest.xml -->
+    (in app/AndroidManifest.xml)
     <uses-permission android:name="android.permission.BROADCAST_STICKY" />
 
 * BlackBerry WebWorks
 
-    <!-- www/plugins.xml -->
+    (in www/plugins.xml)
     <feature name="Battery">
         <param name="blackberry-package" value="org.apache.cordova.battery.Battery" />
     </feature>
 
-    <!-- www/config.xml -->
+    (in www/config.xml)
     <feature id="blackberry.app"          required="true" version="1.0.0.0" />
     <feature id="blackberry.app.event"    required="true" version="1.0.0.0" />
     <feature id="blackberry.system.event" required="true" version="1.0.0.0" />
 
-* iOS
+* iOS (in `config.xml`)
 
-    <!-- config.xml -->
     <feature name="Battery">
         <param name="ios-package" value="CDVBattery" />
     </feature>
@@ -76,9 +75,8 @@ Event Types
 
   No special permissions are required.
 
-* Tizen
+* Tizen (in `config.xml`)
 
-    <!-- config.xml -->
     <feature name="http://tizen.org/api/systeminfo" required="true"/>
 
 Reference: [Application Manifest for Tizen Web Application](https://developer.tizen.org/help/topic/org.tizen.help.gs/Creating%20a%20Project.html?path=0_1_1_3#8814682_CreatingaProject-EditingconfigxmlFeatures)

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/cd19d2b3/docs/en/edge/cordova/file/file.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/cordova/file/file.md b/docs/en/edge/cordova/file/file.md
index 2a8350b..1221b12 100644
--- a/docs/en/edge/cordova/file/file.md
+++ b/docs/en/edge/cordova/file/file.md
@@ -55,7 +55,7 @@ platform-specific configuration settings described below:
 
 * Android
 
-    <!-- app/res/xml/config.xml -->
+    (in app/res/xml/config.xml)
     <feature name="File">
         <param name="android-package" value="org.apache.cordova.FileUtils" />
     </feature>
@@ -63,12 +63,12 @@ platform-specific configuration settings described below:
         <param name="android-package" value="org.apache.cordova.FileTransfer" />
     </feature>
 
-    <!-- app/AndroidManifest.xml -->
+    (in app/AndroidManifest.xml)
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 
 * BlackBerry WebWorks
 
-    <!-- www/plugins.xml -->
+    (in www/plugins.xml)
     <feature name="File">
         <param name="blackberry-package" value="org.apache.cordova.file.FileManager" />
     </feature>
@@ -76,7 +76,7 @@ platform-specific configuration settings described below:
         <param name="blackberry-package" value="org.apache.cordova.http.FileTransfer" />
     </feature>
 
-    <!-- www/config.xml -->
+    (in www/config.xml)
     <feature id="blackberry.io.file" required="true" version="1.0.0.0" />
     <feature id="blackberry.utils"   required="true" version="1.0.0.0" />
     <feature id="blackberry.io.dir"  required="true" version="1.0.0.0" />
@@ -86,7 +86,7 @@ platform-specific configuration settings described below:
 
 * iOS
 
-    <!-- config.xml -->
+    (in config.xml)
     <feature name="File">
         <param name="ios-package" value="CDVFile" />
     </feature>

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/cd19d2b3/docs/en/edge/cordova/geolocation/geolocation.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/cordova/geolocation/geolocation.md b/docs/en/edge/cordova/geolocation/geolocation.md
index 0f39c66..2d860a9 100644
--- a/docs/en/edge/cordova/geolocation/geolocation.md
+++ b/docs/en/edge/cordova/geolocation/geolocation.md
@@ -70,38 +70,36 @@ platform-specific configuration settings described below:
 
 * Android
 
-    <!-- app/res/xml/config.xml -->
+    (in app/res/xml/config.xml)
     <feature name="Geolocation">
         <param name="android-package" value="org.apache.cordova.GeoBroker" />
     </feature>
 
-    <!-- app/AndroidManifest.xml -->
+    (in app/AndroidManifest.xml)
     <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" />
 
 * BlackBerry WebWorks
 
-    <!-- www/plugins.xml -->
+    (in www/plugins.xml)
     <feature name="Geolocation">
         <param name="blackberry-package" value="org.apache.cordova.geolocation.Geolocation" />
     </feature>
 
-    <!-- www/config.xml -->
+    (in www/config.xml)
     <rim:permissions>
         <rim:permit>read_geolocation</rim:permit>
     </rim:permissions>
 
-* iOS
+* iOS (in `config.xml`)
 
-    <!-- config.xml -->
     <feature name="Geolocation">
         <param name="ios-package" value="CDVLocation" />
     </feature>
 
-* Windows Phone
+* Windows Phone (in `Properties/WPAppManifest.xml`)
 
-    <!-- Properties/WPAppManifest.xml -->
     <Capabilities>
         <Capability Name="ID_CAP_LOCATION" />
     </Capabilities>

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/cd19d2b3/docs/en/edge/cordova/globalization/globalization.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/cordova/globalization/globalization.md b/docs/en/edge/cordova/globalization/globalization.md
index f9ad81a..ac3f55a 100644
--- a/docs/en/edge/cordova/globalization/globalization.md
+++ b/docs/en/edge/cordova/globalization/globalization.md
@@ -65,9 +65,8 @@ Interface, to add or remove this feature for a project:
 These commands apply to all targeted platforms, but modify the
 platform-specific configuration settings described below:
 
-* Android
+* Android (in `app/res/xml/config.xml`)
 
-    <!-- app/res/xml/config.xml -->
     <feature name="Globalization">
         <param name="android-package" value="org.apache.cordova.Globalization" />
     </feature>

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/cd19d2b3/docs/en/edge/cordova/inappbrowser/inappbrowser.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/cordova/inappbrowser/inappbrowser.md b/docs/en/edge/cordova/inappbrowser/inappbrowser.md
index ab46919..5cec63e 100644
--- a/docs/en/edge/cordova/inappbrowser/inappbrowser.md
+++ b/docs/en/edge/cordova/inappbrowser/inappbrowser.md
@@ -51,23 +51,20 @@ Interface, to add or remove this feature for a project:
 These commands apply to all targeted platforms, but modify the
 platform-specific configuration settings described below:
 
-* Android
+* Android (in `app/res/xml/config.xml`)
 
-    <!-- app/res/xml/config.xml -->
     <feature name="InAppBrowser">
         <param name="android-package" value="org.apache.cordova.InAppBrowser" />
     </feature>
 
-* iOS
+* iOS (in `config.xml`)
 
-    <!-- config.xml -->
     <feature name="InAppBrowser">
         <param name="ios-package" value="CDVInAppBrowser" />
     </feature>
 
-* Windows Phone 7 + 8
+* Windows Phone 7 + 8 (in `config.xml`)
 
-    <!-- config.xml -->
     <feature name="InAppBrowser" />
 
 addEventListener

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/cd19d2b3/docs/en/edge/cordova/media/capture/capture.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/cordova/media/capture/capture.md b/docs/en/edge/cordova/media/capture/capture.md
index 775ef57..dcc4c2b 100644
--- a/docs/en/edge/cordova/media/capture/capture.md
+++ b/docs/en/edge/cordova/media/capture/capture.md
@@ -95,36 +95,34 @@ platform-specific configuration settings described below:
 
 * Android
 
-    <!-- app/res/xml/plugins.xml -->
+    (in app/res/xml/plugins.xml)
     <feature name="Capture">
         <param name="android-package" value="org.apache.cordova.Capture" />
     </feature>
 
-    <!-- app/AndroidManifest.xml -->
+    (in app/AndroidManifest.xml)
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 
 * BlackBerry WebWorks
 
-    <!-- www/plugins.xml -->
+    (in www/plugins.xml)
     <feature name="Capture">
         <param name="blackberry-package" value="org.apache.cordova.capture.MediaCapture" />
     </feature>
 
-    <!-- www/config.xml -->
+    (in www/config.xml)
     <feature id="blackberry.system"  required="true" version="1.0.0.0" />
     <feature id="blackberry.io.file" required="true" version="1.0.0.0" />
 
-* iOS
+* iOS (in `config.xml`)
 
-    <!-- config.xml -->
     <feature name="Capture">
         <param name="ios-package" value="CDVCapture" />
     </feature>
 
-* Windows Phone
+* Windows Phone (in `Properties/WPAppManifest.xml`)
 
-    <!-- Properties/WPAppManifest.xml -->
     <Capabilities>
         <Capability Name="ID_CAP_MEDIALIB" />
         <Capability Name="ID_CAP_MICROPHONE" />

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/cd19d2b3/docs/en/edge/cordova/media/media.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/cordova/media/media.md b/docs/en/edge/cordova/media/media.md
index 6b89a87..acc382b 100644
--- a/docs/en/edge/cordova/media/media.md
+++ b/docs/en/edge/cordova/media/media.md
@@ -106,33 +106,31 @@ platform-specific configuration settings described below:
 
 * Android
 
-    <!-- app/res/xml/config.xml -->
+    (in app/res/xml/config.xml)
     <feature name="Media">
         <param name="android-package" value="org.apache.cordova.AudioHandler" />
     </feature>
 
-    <!-- app/AndroidManifest.xml -->
+    (in app/AndroidManifest.xml)
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
     <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 
 * BlackBerry WebWorks
 
-    <!-- www/plugins.xml -->
+    (in www/plugins.xml)
     <feature name="Capture">
         <param name="blackberry-package" value="org.apache.cordova.media.MediaCapture" />
     </feature>
 
-* iOS
+* iOS (in `config.xml`)
 
-    <!-- config.xml -->
     <feature name="Media">
         <param name="ios-package" value="CDVSound" />
     </feature>
 
-* Windows Phone
+* Windows Phone (in `Properties/WPAppManifest.xml`)
 
-    <!-- Properties/WPAppManifest.xml -->
     <Capabilities>
         <Capability Name="ID_CAP_MEDIALIB" />
         <Capability Name="ID_CAP_MICROPHONE" />

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/cd19d2b3/docs/en/edge/cordova/notification/notification.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/cordova/notification/notification.md b/docs/en/edge/cordova/notification/notification.md
index 192982b..2bd33f9 100644
--- a/docs/en/edge/cordova/notification/notification.md
+++ b/docs/en/edge/cordova/notification/notification.md
@@ -47,27 +47,26 @@ platform-specific configuration settings described below:
 
 * Android
 
-    <!-- app/res/xml/config.xml -->
+    (in app/res/xml/config.xml)
     <feature name="Notification">
         <param name="android-package" value="org.apache.cordova.Notification" />
     </feature>
 
-    <!-- app/AndroidManifest.xml -->
+    (in app/AndroidManifest.xml)
     <uses-permission android:name="android.permission.VIBRATE" />
 
 * BlackBerry WebWorks
 
-    <!-- www/plugins.xml -->
+    (in www/plugins.xml)
     <feature name="Notification">
         <param name="blackberry-package" value="org.apache.cordova.notification.Notification" />
     </feature>
 
-    <!-- www/config.xml -->
+    (in www/config.xml)
     <feature id="blackberry.ui.dialog" />
 
-* iOS
+* iOS (in `config.xml`)
 
-    <!-- config.xml -->
     <feature name="Notification">
         <param name="ios-package" value="CDVNotification" />
     </feature>

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/cd19d2b3/docs/en/edge/cordova/splashscreen/splashscreen.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/cordova/splashscreen/splashscreen.md b/docs/en/edge/cordova/splashscreen/splashscreen.md
index 40588d5..6374eec 100644
--- a/docs/en/edge/cordova/splashscreen/splashscreen.md
+++ b/docs/en/edge/cordova/splashscreen/splashscreen.md
@@ -40,16 +40,14 @@ Interface, to add or remove this feature for a project:
 These commands apply to all targeted platforms, but modify the
 platform-specific configuration settings described below:
 
-* Android
+* Android (in `app/res/xml/config.xml`)
 
-    <!-- app/res/xml/config.xml -->
     <feature name="SplashScreen">
         <param name="android-package" value="org.apache.cordova.SplashScreen" />
     </feature>
 
-* iOS
+* iOS (in `config.xml`)
 
-    <!-- config.xml -->
     <feature name="SplashScreen">
         <param name="ios-package" value="CDVSplashScreen" />
     </feature>

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/cd19d2b3/docs/en/edge/cordova/storage/storage.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/cordova/storage/storage.md b/docs/en/edge/cordova/storage/storage.md
index 234523f..ed32fec 100644
--- a/docs/en/edge/cordova/storage/storage.md
+++ b/docs/en/edge/cordova/storage/storage.md
@@ -54,16 +54,14 @@ Objects
 
 ## Accessing the Feature
 
-* Android
+* Android (in `app/res/xml/config.xml`)
 
-    <!-- app/res/xml/config.xml -->
     <feature name="Storage">
         <param name="android-package" value="org.apache.cordova.Storage" />
     </feature>
 
-* BlackBerry WebWorks
+* BlackBerry WebWorks (in `www/config.xml`)
 
-    <!-- www/config.xml -->
     <feature id="blackberry.widgetcache" required="true" version="1.0.0.0" />
 
 * iOS


[5/5] docs commit: [CB-3818] enable access to battery events; other events enabled by default?

Posted by mw...@apache.org.
[CB-3818] enable access to battery events; other events enabled by default?


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

Branch: refs/heads/master
Commit: 881d8dcbdfde789c9d3ed27c9937364dc5f7b17a
Parents: 0929908
Author: Mike Sierra <le...@gmail.com>
Authored: Tue Jul 30 12:42:57 2013 -0400
Committer: Michael Brooks <mi...@michaelbrooks.ca>
Committed: Tue Jul 30 11:02:15 2013 -0700

----------------------------------------------------------------------
 docs/en/edge/cordova/events/events.md | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/881d8dcb/docs/en/edge/cordova/events/events.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/cordova/events/events.md b/docs/en/edge/cordova/events/events.md
index ac3eb14..62ecb1e 100644
--- a/docs/en/edge/cordova/events/events.md
+++ b/docs/en/edge/cordova/events/events.md
@@ -43,9 +43,11 @@ Event Types
 
 ## Accessing the Feature
 
-As of version 3.0, Cordova implements device-level APIs as _plugins_.
-Use the CLI's `plugin` command, described in The Command-line
-Interface, to add or remove this feature for a project:
+As of version 3.0, Cordova implements battery status and other
+device-level APIs as _plugins_. Access to all other events not related
+to battery status are enabled by default.  Use the CLI's `plugin`
+command, described in The Command-line Interface, to enable or disable
+battery events:
 
         $ cordova plugin add https://git-wip-us.apache.org/repos/asf/cordova-plugin-battery-status.git
         $ cordova plugin rm org.apache.cordova.core.battery-status


[3/5] docs commit: [CB-3818] collapse unnecessary vertical space

Posted by mw...@apache.org.
[CB-3818] collapse unnecessary vertical space


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

Branch: refs/heads/master
Commit: 8cb8b7cab596c0ce79945dbb79dee83b15d2d87d
Parents: 7a7599c
Author: Mike Sierra <le...@gmail.com>
Authored: Tue Jul 30 11:30:25 2013 -0400
Committer: Michael Brooks <mi...@michaelbrooks.ca>
Committed: Tue Jul 30 11:01:59 2013 -0700

----------------------------------------------------------------------
 docs/en/edge/cordova/accelerometer/accelerometer.md |  4 +---
 docs/en/edge/cordova/compass/compass.md             |  8 ++------
 docs/en/edge/cordova/device/device.md               |  4 +---
 docs/en/edge/cordova/events/events.md               |  4 +---
 docs/en/edge/cordova/file/file.md                   |  4 +---
 docs/en/edge/cordova/geolocation/geolocation.md     |  4 +---
 docs/en/edge/cordova/media/media.md                 |  4 +---
 docs/en/edge/cordova/notification/notification.md   |  8 ++------
 docs/en/edge/cordova/storage/storage.md             | 12 +++---------
 9 files changed, 13 insertions(+), 39 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/8cb8b7ca/docs/en/edge/cordova/accelerometer/accelerometer.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/cordova/accelerometer/accelerometer.md b/docs/en/edge/cordova/accelerometer/accelerometer.md
index 3dc534d..9177ff3 100644
--- a/docs/en/edge/cordova/accelerometer/accelerometer.md
+++ b/docs/en/edge/cordova/accelerometer/accelerometer.md
@@ -84,6 +84,4 @@ platform-specific configuration settings described below:
 
   Reference: [Application Manifest for Windows Phone](http://msdn.microsoft.com/en-us/library/ff769509%28v=vs.92%29.aspx)
 
-* Tizen
-
-  No special permissions are required.
+* Tizen (no special permissions required)

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/8cb8b7ca/docs/en/edge/cordova/compass/compass.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/cordova/compass/compass.md b/docs/en/edge/cordova/compass/compass.md
index a3a8361..ff98fc9 100755
--- a/docs/en/edge/cordova/compass/compass.md
+++ b/docs/en/edge/cordova/compass/compass.md
@@ -57,9 +57,7 @@ platform-specific configuration settings described below:
             <param name="android-package" value="org.apache.cordova.CompassListener" />
         </feature>
 
-* BlackBerry WebWorks
-
-  No special permissions are required.
+* BlackBerry WebWorks (no special permissions required)
 
 * iOS (in `config.xml`)
 
@@ -75,6 +73,4 @@ platform-specific configuration settings described below:
 
   Reference: [Application Manifest for Windows Phone](http://msdn.microsoft.com/en-us/library/ff769509%28v=vs.92%29.aspx)
 
-* Tizen
-
-  No special permissions are required.
+* Tizen (no special permissions required)

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/8cb8b7ca/docs/en/edge/cordova/device/device.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/cordova/device/device.md b/docs/en/edge/cordova/device/device.md
index dd3dbb9..6885435 100644
--- a/docs/en/edge/cordova/device/device.md
+++ b/docs/en/edge/cordova/device/device.md
@@ -76,9 +76,7 @@ platform-specific configuration settings described below:
             <rim:permit>read_device_identifying_information</rim:permit>
         </rim:permissions>
 
-* iOS
-
-  No special permissions are required.
+* iOS (no special permissions required)
 
 * Windows Phone (in `Properties/WPAppManifest.xml`)
 

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/8cb8b7ca/docs/en/edge/cordova/events/events.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/cordova/events/events.md b/docs/en/edge/cordova/events/events.md
index 426736d..ac3eb14 100644
--- a/docs/en/edge/cordova/events/events.md
+++ b/docs/en/edge/cordova/events/events.md
@@ -81,9 +81,7 @@ platform-specific configuration settings described below:
             <param name="ios-package" value="CDVBattery" />
         </feature>
 
-* Windows Phone
-
-  No special permissions are required.
+* Windows Phone (no special permissions required)
 
 * Tizen (in `config.xml`)
 

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/8cb8b7ca/docs/en/edge/cordova/file/file.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/cordova/file/file.md b/docs/en/edge/cordova/file/file.md
index 804f438..7d86278 100644
--- a/docs/en/edge/cordova/file/file.md
+++ b/docs/en/edge/cordova/file/file.md
@@ -93,6 +93,4 @@ platform-specific configuration settings described below:
             <param name="ios-package" value="CDVFileTransfer" />
         </feature>
 
-* Windows Phone
-
-  No special permissions are required.
+* Windows Phone (no special permissions required)

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/8cb8b7ca/docs/en/edge/cordova/geolocation/geolocation.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/cordova/geolocation/geolocation.md b/docs/en/edge/cordova/geolocation/geolocation.md
index 7496763..4e4f37f 100644
--- a/docs/en/edge/cordova/geolocation/geolocation.md
+++ b/docs/en/edge/cordova/geolocation/geolocation.md
@@ -106,6 +106,4 @@ platform-specific configuration settings described below:
 
   Reference: [Application Manifest for Windows Phone](http://msdn.microsoft.com/en-us/library/ff769509%28v=vs.92%29.aspx)
 
-* Tizen
-
-  No special permissions are required.
+* Tizen (no special permissions required)

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/8cb8b7ca/docs/en/edge/cordova/media/media.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/cordova/media/media.md b/docs/en/edge/cordova/media/media.md
index 548607c..8a27f14 100644
--- a/docs/en/edge/cordova/media/media.md
+++ b/docs/en/edge/cordova/media/media.md
@@ -141,9 +141,7 @@ platform-specific configuration settings described below:
 
   Reference: [Application Manifest for Windows Phone](http://msdn.microsoft.com/en-us/library/ff769509%28v=vs.92%29.aspx)
 
-* Tizen
-
-  No special permissions are required.
+* Tizen (no special permissions required)
 
 ### Windows Phone Quirks
 

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/8cb8b7ca/docs/en/edge/cordova/notification/notification.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/cordova/notification/notification.md b/docs/en/edge/cordova/notification/notification.md
index 256f168..975ece0 100644
--- a/docs/en/edge/cordova/notification/notification.md
+++ b/docs/en/edge/cordova/notification/notification.md
@@ -71,10 +71,6 @@ platform-specific configuration settings described below:
             <param name="ios-package" value="CDVNotification" />
         </feature>
 
-* Windows Phone
+* Windows Phone (no special permissions required)
 
-  No special permissions are required.
-
-* Tizen
-
-  No special permissions are required.
+* Tizen (no special permissions required)

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/8cb8b7ca/docs/en/edge/cordova/storage/storage.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/cordova/storage/storage.md b/docs/en/edge/cordova/storage/storage.md
index a529da0..02d1fa4 100644
--- a/docs/en/edge/cordova/storage/storage.md
+++ b/docs/en/edge/cordova/storage/storage.md
@@ -64,14 +64,8 @@ Objects
 
         <feature id="blackberry.widgetcache" required="true" version="1.0.0.0" />
 
-* iOS
+* iOS (no special permissions required)
 
-  No special permissions are required.
+* Windows Phone (no special permissions required)
 
-* Windows Phone
-
-  No special permissions are required.
-
-* Tizen
-
-  No special permissions are required.
+* Tizen (no special permissions required)


[2/5] docs commit: [CB-3818] boost indent for syntax to appear in block

Posted by mw...@apache.org.
[CB-3818] boost indent for syntax to appear in block


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

Branch: refs/heads/master
Commit: 7a7599c5811660fcd3c5876671ba6319b35e443b
Parents: cd19d2b
Author: Mike Sierra <le...@gmail.com>
Authored: Tue Jul 30 11:28:36 2013 -0400
Committer: Michael Brooks <mi...@michaelbrooks.ca>
Committed: Tue Jul 30 11:01:52 2013 -0700

----------------------------------------------------------------------
 .../edge/cordova/accelerometer/accelerometer.md | 34 +++++-----
 docs/en/edge/cordova/camera/camera.md           | 52 +++++++--------
 docs/en/edge/cordova/compass/compass.md         | 20 +++---
 docs/en/edge/cordova/connection/connection.md   | 42 ++++++------
 docs/en/edge/cordova/contacts/contacts.md       | 50 +++++++--------
 docs/en/edge/cordova/device/device.md           | 46 +++++++-------
 docs/en/edge/cordova/events/events.md           | 48 ++++++++------
 docs/en/edge/cordova/file/file.md               | 67 ++++++++++----------
 docs/en/edge/cordova/geolocation/geolocation.md | 46 +++++++-------
 .../edge/cordova/globalization/globalization.md |  6 +-
 .../edge/cordova/inappbrowser/inappbrowser.md   | 14 ++--
 docs/en/edge/cordova/media/capture/capture.md   | 48 +++++++-------
 docs/en/edge/cordova/media/media.md             | 46 +++++++-------
 .../edge/cordova/notification/notification.md   | 30 ++++-----
 .../edge/cordova/splashscreen/splashscreen.md   | 12 ++--
 docs/en/edge/cordova/storage/storage.md         |  8 +--
 16 files changed, 289 insertions(+), 280 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/7a7599c5/docs/en/edge/cordova/accelerometer/accelerometer.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/cordova/accelerometer/accelerometer.md b/docs/en/edge/cordova/accelerometer/accelerometer.md
index ce07c94..3dc534d 100644
--- a/docs/en/edge/cordova/accelerometer/accelerometer.md
+++ b/docs/en/edge/cordova/accelerometer/accelerometer.md
@@ -55,34 +55,34 @@ platform-specific configuration settings described below:
 
 * Android (in `app/res/xml/config.xml`)
 
-    <feature name="Accelerometer">
-        <param name="android-package" value="org.apache.cordova.AccelListener" />
-    </feature>
+        <feature name="Accelerometer">
+            <param name="android-package" value="org.apache.cordova.AccelListener" />
+        </feature>
 
 * BlackBerry WebWorks
 
-    (in www/plugins.xml)
-    <feature name="Accelerometer">
-        <param name="blackberry-package" value="org.apache.cordova.accelerometer.Accelerometer" />
-    </feature>
+        (in www/plugins.xml)
+        <feature name="Accelerometer">
+            <param name="blackberry-package" value="org.apache.cordova.accelerometer.Accelerometer" />
+        </feature>
 
-    (in www/config.xml)
-    <feature id="blackberry.system"  required="true" version="1.0.0.0" />
-    <feature id="org.apache.cordova" required="true" version="1.0.0" />
+        (in www/config.xml)
+        <feature id="blackberry.system"  required="true" version="1.0.0.0" />
+        <feature id="org.apache.cordova" required="true" version="1.0.0" />
 
 * iOS (in `config.xml`)
 
-    <feature name="Accelerometer">
-        <param name="ios-package" value="CDVAccelerometer" />
-    </feature>
+        <feature name="Accelerometer">
+            <param name="ios-package" value="CDVAccelerometer" />
+        </feature>
 
 * Windows Phone (in `Properties/WPAppManifest.xml`)
 
-    <Capabilities>
-        <Capability Name="ID_CAP_SENSORS" />
-    </Capabilities>
+        <Capabilities>
+            <Capability Name="ID_CAP_SENSORS" />
+        </Capabilities>
 
-Reference: [Application Manifest for Windows Phone](http://msdn.microsoft.com/en-us/library/ff769509%28v=vs.92%29.aspx)
+  Reference: [Application Manifest for Windows Phone](http://msdn.microsoft.com/en-us/library/ff769509%28v=vs.92%29.aspx)
 
 * Tizen
 

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/7a7599c5/docs/en/edge/cordova/camera/camera.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/cordova/camera/camera.md b/docs/en/edge/cordova/camera/camera.md
index 36cebd2..10d3c6b 100644
--- a/docs/en/edge/cordova/camera/camera.md
+++ b/docs/en/edge/cordova/camera/camera.md
@@ -44,46 +44,46 @@ platform-specific configuration settings described below:
 
 * Android
 
-    (in app/res/xml/config.xml)
-    <feature name="Camera">
-        <param name="android-package" value="org.apache.cordova.CameraLauncher" />
-    </feature>
+        (in app/res/xml/config.xml)
+        <feature name="Camera">
+            <param name="android-package" value="org.apache.cordova.CameraLauncher" />
+        </feature>
 
-    (in app/AndroidManifest)
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+        (in app/AndroidManifest)
+        <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 
 * BlackBerry WebWorks
 
-    (in www/plugins.xml)
-    <feature name="Camera">
-        <param name="blackberry-package" value="org.apache.cordova.camera.Camera" />
-    </feature>
+        (in www/plugins.xml)
+        <feature name="Camera">
+            <param name="blackberry-package" value="org.apache.cordova.camera.Camera" />
+        </feature>
 
-    (in www/config.xml)
-    <feature id="blackberry.media.camera" />
+        (in www/config.xml)
+        <feature id="blackberry.media.camera" />
 
-    <rim:permissions>
-        <rim:permit>use_camera</rim:permit>
-    </rim:permissions>
+        <rim:permissions>
+            <rim:permit>use_camera</rim:permit>
+        </rim:permissions>
 
 * iOS (in `config.xml`)
 
-    <feature name="Camera">
-        <param name="ios-package" value="CDVCamera" />
-    </feature>
+        <feature name="Camera">
+            <param name="ios-package" value="CDVCamera" />
+        </feature>
 
 * Windows Phone (in `Properties/WPAppManifest.xml`)
 
-    <Capabilities>
-        <Capability Name="ID_CAP_ISV_CAMERA" />
-        <Capability Name="ID_HW_FRONTCAMERA" />
-    </Capabilities>
+        <Capabilities>
+            <Capability Name="ID_CAP_ISV_CAMERA" />
+            <Capability Name="ID_HW_FRONTCAMERA" />
+        </Capabilities>
 
-Reference: [Application Manifest for Windows Phone](http://msdn.microsoft.com/en-us/library/ff769509%28v=vs.92%29.aspx)
+  Reference: [Application Manifest for Windows Phone](http://msdn.microsoft.com/en-us/library/ff769509%28v=vs.92%29.aspx)
 
 * Tizen (in `config.xml`)
 
-    <feature name="http://tizen.org/api/application" required="true"/>
-    <feature name="http://tizen.org/api/application.launch" required="true"/>
+        <feature name="http://tizen.org/api/application" required="true"/>
+        <feature name="http://tizen.org/api/application.launch" required="true"/>
 
-Reference: [Application Manifest for Tizen Web Application](https://developer.tizen.org/help/topic/org.tizen.help.gs/Creating%20a%20Project.html?path=0_1_1_3#8814682_CreatingaProject-EditingconfigxmlFeatures)
+  Reference: [Application Manifest for Tizen Web Application](https://developer.tizen.org/help/topic/org.tizen.help.gs/Creating%20a%20Project.html?path=0_1_1_3#8814682_CreatingaProject-EditingconfigxmlFeatures)

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/7a7599c5/docs/en/edge/cordova/compass/compass.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/cordova/compass/compass.md b/docs/en/edge/cordova/compass/compass.md
index 48e40e6..a3a8361 100755
--- a/docs/en/edge/cordova/compass/compass.md
+++ b/docs/en/edge/cordova/compass/compass.md
@@ -53,9 +53,9 @@ platform-specific configuration settings described below:
 
 * Android (in `app/res/xml/config.xml`)
 
-    <feature name="Compass">
-        <param name="android-package" value="org.apache.cordova.CompassListener" />
-    </feature>
+        <feature name="Compass">
+            <param name="android-package" value="org.apache.cordova.CompassListener" />
+        </feature>
 
 * BlackBerry WebWorks
 
@@ -63,17 +63,17 @@ platform-specific configuration settings described below:
 
 * iOS (in `config.xml`)
 
-    <feature name="Compass">
-        <param name="ios-package" value="CDVLocation" />
-    </feature>
+        <feature name="Compass">
+            <param name="ios-package" value="CDVLocation" />
+        </feature>
 
 * Windows Phone (in `Properties/WPAppManifest.xml`)
 
-    <Capabilities>
-        <Capability Name="ID_CAP_SENSORS" />
-    </Capabilities>
+        <Capabilities>
+            <Capability Name="ID_CAP_SENSORS" />
+        </Capabilities>
 
-Reference: [Application Manifest for Windows Phone](http://msdn.microsoft.com/en-us/library/ff769509%28v=vs.92%29.aspx)
+  Reference: [Application Manifest for Windows Phone](http://msdn.microsoft.com/en-us/library/ff769509%28v=vs.92%29.aspx)
 
 * Tizen
 

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/7a7599c5/docs/en/edge/cordova/connection/connection.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/cordova/connection/connection.md b/docs/en/edge/cordova/connection/connection.md
index c287bb8..6c5cb24 100644
--- a/docs/en/edge/cordova/connection/connection.md
+++ b/docs/en/edge/cordova/connection/connection.md
@@ -53,39 +53,39 @@ platform-specific configuration settings described below:
 
 * Android
 
-    (in app/res/xml/config.xml)
-    <feature name="NetworkStatus">
-        <param name="android-package" value="org.apache.cordova.NetworkManager" />
-    </feature>
+        (in app/res/xml/config.xml)
+        <feature name="NetworkStatus">
+            <param name="android-package" value="org.apache.cordova.NetworkManager" />
+        </feature>
 
-    (in app/AndroidManifest.xml)
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+        (in app/AndroidManifest.xml)
+        <uses-permission android:name="android.permission.INTERNET" />
+        <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+        <uses-permission android:name="android.permission.READ_PHONE_STATE" />
 
 * BlackBerry WebWorks
 
-    (in www/plugins.xml)
-    <feature name="Network Status">
-        <param name="blackberry-package" value="org.apache.cordova.network.Network" />
-    </feature>
+        (in www/plugins.xml)
+        <feature name="Network Status">
+            <param name="blackberry-package" value="org.apache.cordova.network.Network" />
+        </feature>
 
 * iOS (in `config.xml`)
 
-    <feature name="NetworkStatus">
-        <param name="ios-package" value="CDVConnection" />
-    </feature>
+        <feature name="NetworkStatus">
+            <param name="ios-package" value="CDVConnection" />
+        </feature>
 
 * Windows Phone (in `Properties/WPAppManifest.xml`)
 
-    <Capabilities>
-        <Capability Name="ID_CAP_NETWORKING" />
-    </Capabilities>
+        <Capabilities>
+            <Capability Name="ID_CAP_NETWORKING" />
+        </Capabilities>
 
-Reference: [Application Manifest for Windows Phone](http://msdn.microsoft.com/en-us/library/ff769509%28v=vs.92%29.aspx)
+  Reference: [Application Manifest for Windows Phone](http://msdn.microsoft.com/en-us/library/ff769509%28v=vs.92%29.aspx)
 
 * Tizen (in `config.xml`)
 
-    <feature name="http://tizen.org/api/systeminfo" required="true"/>
+        <feature name="http://tizen.org/api/systeminfo" required="true"/>
 
-Reference: [Application Manifest for Tizen Web Application](https://developer.tizen.org/help/topic/org.tizen.help.gs/Creating%20a%20Project.html?path=0_1_1_3#8814682_CreatingaProject-EditingconfigxmlFeatures)
+  Reference: [Application Manifest for Tizen Web Application](https://developer.tizen.org/help/topic/org.tizen.help.gs/Creating%20a%20Project.html?path=0_1_1_3#8814682_CreatingaProject-EditingconfigxmlFeatures)

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/7a7599c5/docs/en/edge/cordova/contacts/contacts.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/cordova/contacts/contacts.md b/docs/en/edge/cordova/contacts/contacts.md
index 56a9bd7..3147238 100644
--- a/docs/en/edge/cordova/contacts/contacts.md
+++ b/docs/en/edge/cordova/contacts/contacts.md
@@ -63,40 +63,40 @@ platform-specific configuration settings described below:
 
 * Android
 
-    (in app/res/xml/config.xml)
-    <feature name="Contacts">
-        <param name="android-package" value="org.apache.cordova.ContactManager" />
-    </feature>
+        (in app/res/xml/config.xml)
+        <feature name="Contacts">
+            <param name="android-package" value="org.apache.cordova.ContactManager" />
+        </feature>
 
-    (in app/AndroidManifest.xml)
-    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
-    <uses-permission android:name="android.permission.READ_CONTACTS" />
-    <uses-permission android:name="android.permission.WRITE_CONTACTS" />
+        (in app/AndroidManifest.xml)
+        <uses-permission android:name="android.permission.GET_ACCOUNTS" />
+        <uses-permission android:name="android.permission.READ_CONTACTS" />
+        <uses-permission android:name="android.permission.WRITE_CONTACTS" />
 
 * BlackBerry WebWorks
 
-    (in www/plugins.xml)
-    <feature name="Contact">
-        <param name="blackberry-package" value="org.apache.cordova.pim.Contact" />
-    </feature>
+        (in www/plugins.xml)
+        <feature name="Contact">
+            <param name="blackberry-package" value="org.apache.cordova.pim.Contact" />
+        </feature>
 
-    (in www/config.xml)
-    <feature id="blackberry.find"        required="true" version="1.0.0.0" />
-    <feature id="blackberry.identity"    required="true" version="1.0.0.0" />
-    <feature id="blackberry.pim.Address" required="true" version="1.0.0.0" />
-    <feature id="blackberry.pim.Contact" required="true" version="1.0.0.0" />
+        (in www/config.xml)
+        <feature id="blackberry.find"        required="true" version="1.0.0.0" />
+        <feature id="blackberry.identity"    required="true" version="1.0.0.0" />
+        <feature id="blackberry.pim.Address" required="true" version="1.0.0.0" />
+        <feature id="blackberry.pim.Contact" required="true" version="1.0.0.0" />
 
 * iOS (in `config.xml`)
 
-    <feature name="Contacts">
-        <param name="ios-package" value="CDVContacts" />
-    </feature>
+        <feature name="Contacts">
+            <param name="ios-package" value="CDVContacts" />
+        </feature>
 
 * Windows Phone
 
-    (in Properties/WPAppManifest.xml)
-    <Capabilities>
-        <Capability Name="ID_CAP_CONTACTS" />
-    </Capabilities>
+        (in Properties/WPAppManifest.xml)
+        <Capabilities>
+            <Capability Name="ID_CAP_CONTACTS" />
+        </Capabilities>
 
-Reference: [Application Manifest for Windows Phone](http://msdn.microsoft.com/en-us/library/ff769509%28v=vs.92%29.aspx)
+  Reference: [Application Manifest for Windows Phone](http://msdn.microsoft.com/en-us/library/ff769509%28v=vs.92%29.aspx)

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/7a7599c5/docs/en/edge/cordova/device/device.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/cordova/device/device.md b/docs/en/edge/cordova/device/device.md
index 4ad55f5..dd3dbb9 100644
--- a/docs/en/edge/cordova/device/device.md
+++ b/docs/en/edge/cordova/device/device.md
@@ -55,26 +55,26 @@ platform-specific configuration settings described below:
 
 * Android
 
-    (in app/res/xml/config.xml)
-    <feature name="Device">
-        <param name="android-package" value="org.apache.cordova.Device" />
-    </feature>
+        (in app/res/xml/config.xml)
+        <feature name="Device">
+            <param name="android-package" value="org.apache.cordova.Device" />
+        </feature>
 
-    (in app/AndroidManifest.xml)
-    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+        (in app/AndroidManifest.xml)
+        <uses-permission android:name="android.permission.READ_PHONE_STATE" />
 
 * BlackBerry WebWorks
 
-    (in www/plugins.xml)
-    <feature name="Device">
-        <param name="blackberry-package" value="org.apache.cordova.device.Device" />
-    </feature>
+        (in www/plugins.xml)
+        <feature name="Device">
+            <param name="blackberry-package" value="org.apache.cordova.device.Device" />
+        </feature>
 
-    (in www/config.xml)
-    <feature id="blackberry.app" required="true" version="1.0.0.0" />
-    <rim:permissions>
-        <rim:permit>read_device_identifying_information</rim:permit>
-    </rim:permissions>
+        (in www/config.xml)
+        <feature id="blackberry.app" required="true" version="1.0.0.0" />
+        <rim:permissions>
+            <rim:permit>read_device_identifying_information</rim:permit>
+        </rim:permissions>
 
 * iOS
 
@@ -82,16 +82,16 @@ platform-specific configuration settings described below:
 
 * Windows Phone (in `Properties/WPAppManifest.xml`)
 
-    <Capabilities>
-        <Capability Name="ID_CAP_WEBBROWSERCOMPONENT" />
-        <Capability Name="ID_CAP_IDENTITY_DEVICE" />
-        <Capability Name="ID_CAP_IDENTITY_USER" />
-    </Capabilities>
+        <Capabilities>
+            <Capability Name="ID_CAP_WEBBROWSERCOMPONENT" />
+            <Capability Name="ID_CAP_IDENTITY_DEVICE" />
+            <Capability Name="ID_CAP_IDENTITY_USER" />
+        </Capabilities>
 
-Reference: [Application Manifest for Windows Phone](http://msdn.microsoft.com/en-us/library/ff769509%28v=vs.92%29.aspx)
+  Reference: [Application Manifest for Windows Phone](http://msdn.microsoft.com/en-us/library/ff769509%28v=vs.92%29.aspx)
 
 * Tizen (in `config.xml`)
 
-    <feature name="http://tizen.org/api/systeminfo" required="true"/>
+        <feature name="http://tizen.org/api/systeminfo" required="true"/>
 
-Reference: [Application Manifest for Tizen Web Application](https://developer.tizen.org/help/topic/org.tizen.help.gs/Creating%20a%20Project.html?path=0_1_1_3#8814682_CreatingaProject-EditingconfigxmlFeatures)
+  Reference: [Application Manifest for Tizen Web Application](https://developer.tizen.org/help/topic/org.tizen.help.gs/Creating%20a%20Project.html?path=0_1_1_3#8814682_CreatingaProject-EditingconfigxmlFeatures)

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/7a7599c5/docs/en/edge/cordova/events/events.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/cordova/events/events.md b/docs/en/edge/cordova/events/events.md
index cce5476..426736d 100644
--- a/docs/en/edge/cordova/events/events.md
+++ b/docs/en/edge/cordova/events/events.md
@@ -43,33 +43,43 @@ Event Types
 
 ## Accessing the Feature
 
+As of version 3.0, Cordova implements device-level APIs as _plugins_.
+Use the CLI's `plugin` command, described in The Command-line
+Interface, to add or remove this feature for a project:
+
+        $ cordova plugin add https://git-wip-us.apache.org/repos/asf/cordova-plugin-battery-status.git
+        $ cordova plugin rm org.apache.cordova.core.battery-status
+
+These commands apply to all targeted platforms, but modify the
+platform-specific configuration settings described below:
+
 * Android
 
-    (in app/res/xml/config.xml)
-    <feature name="Battery">
-        <param name="android-package" value="org.apache.cordova.BatteryListener" />
-    </feature>
+        (in app/res/xml/config.xml)
+        <feature name="Battery">
+            <param name="android-package" value="org.apache.cordova.BatteryListener" />
+        </feature>
 
-    (in app/AndroidManifest.xml)
-    <uses-permission android:name="android.permission.BROADCAST_STICKY" />
+        (in app/AndroidManifest.xml)
+        <uses-permission android:name="android.permission.BROADCAST_STICKY" />
 
 * BlackBerry WebWorks
 
-    (in www/plugins.xml)
-    <feature name="Battery">
-        <param name="blackberry-package" value="org.apache.cordova.battery.Battery" />
-    </feature>
+        (in www/plugins.xml)
+        <feature name="Battery">
+            <param name="blackberry-package" value="org.apache.cordova.battery.Battery" />
+        </feature>
 
-    (in www/config.xml)
-    <feature id="blackberry.app"          required="true" version="1.0.0.0" />
-    <feature id="blackberry.app.event"    required="true" version="1.0.0.0" />
-    <feature id="blackberry.system.event" required="true" version="1.0.0.0" />
+        (in www/config.xml)
+        <feature id="blackberry.app"          required="true" version="1.0.0.0" />
+        <feature id="blackberry.app.event"    required="true" version="1.0.0.0" />
+        <feature id="blackberry.system.event" required="true" version="1.0.0.0" />
 
 * iOS (in `config.xml`)
 
-    <feature name="Battery">
-        <param name="ios-package" value="CDVBattery" />
-    </feature>
+        <feature name="Battery">
+            <param name="ios-package" value="CDVBattery" />
+        </feature>
 
 * Windows Phone
 
@@ -77,6 +87,6 @@ Event Types
 
 * Tizen (in `config.xml`)
 
-    <feature name="http://tizen.org/api/systeminfo" required="true"/>
+        <feature name="http://tizen.org/api/systeminfo" required="true"/>
 
-Reference: [Application Manifest for Tizen Web Application](https://developer.tizen.org/help/topic/org.tizen.help.gs/Creating%20a%20Project.html?path=0_1_1_3#8814682_CreatingaProject-EditingconfigxmlFeatures)
+  Reference: [Application Manifest for Tizen Web Application](https://developer.tizen.org/help/topic/org.tizen.help.gs/Creating%20a%20Project.html?path=0_1_1_3#8814682_CreatingaProject-EditingconfigxmlFeatures)

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/7a7599c5/docs/en/edge/cordova/file/file.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/cordova/file/file.md b/docs/en/edge/cordova/file/file.md
index 1221b12..804f438 100644
--- a/docs/en/edge/cordova/file/file.md
+++ b/docs/en/edge/cordova/file/file.md
@@ -55,44 +55,43 @@ platform-specific configuration settings described below:
 
 * Android
 
-    (in app/res/xml/config.xml)
-    <feature name="File">
-        <param name="android-package" value="org.apache.cordova.FileUtils" />
-    </feature>
-    <feature name="FileTransfer">
-        <param name="android-package" value="org.apache.cordova.FileTransfer" />
-    </feature>
+        (in app/res/xml/config.xml)
+        <feature name="File">
+            <param name="android-package" value="org.apache.cordova.FileUtils" />
+        </feature>
+        <feature name="FileTransfer">
+            <param name="android-package" value="org.apache.cordova.FileTransfer" />
+        </feature>
 
-    (in app/AndroidManifest.xml)
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+        (in app/AndroidManifest.xml)
+        <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 
 * BlackBerry WebWorks
 
-    (in www/plugins.xml)
-    <feature name="File">
-        <param name="blackberry-package" value="org.apache.cordova.file.FileManager" />
-    </feature>
-    <feature name="FileTransfer">
-        <param name="blackberry-package" value="org.apache.cordova.http.FileTransfer" />
-    </feature>
-
-    (in www/config.xml)
-    <feature id="blackberry.io.file" required="true" version="1.0.0.0" />
-    <feature id="blackberry.utils"   required="true" version="1.0.0.0" />
-    <feature id="blackberry.io.dir"  required="true" version="1.0.0.0" />
-    <rim:permissions>
-        <rim:permit>access_shared</rim:permit>
-    </rim:permissions>
-
-* iOS
-
-    (in config.xml)
-    <feature name="File">
-        <param name="ios-package" value="CDVFile" />
-    </feature>
-    <feature name="FileTransfer">
-        <param name="ios-package" value="CDVFileTransfer" />
-    </feature>
+        (in www/plugins.xml)
+        <feature name="File">
+            <param name="blackberry-package" value="org.apache.cordova.file.FileManager" />
+        </feature>
+        <feature name="FileTransfer">
+            <param name="blackberry-package" value="org.apache.cordova.http.FileTransfer" />
+        </feature>
+
+        (in www/config.xml)
+        <feature id="blackberry.io.file" required="true" version="1.0.0.0" />
+        <feature id="blackberry.utils"   required="true" version="1.0.0.0" />
+        <feature id="blackberry.io.dir"  required="true" version="1.0.0.0" />
+        <rim:permissions>
+            <rim:permit>access_shared</rim:permit>
+        </rim:permissions>
+
+* iOS (in `config.xml`)
+
+        <feature name="File">
+            <param name="ios-package" value="CDVFile" />
+        </feature>
+        <feature name="FileTransfer">
+            <param name="ios-package" value="CDVFileTransfer" />
+        </feature>
 
 * Windows Phone
 

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/7a7599c5/docs/en/edge/cordova/geolocation/geolocation.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/cordova/geolocation/geolocation.md b/docs/en/edge/cordova/geolocation/geolocation.md
index 2d860a9..7496763 100644
--- a/docs/en/edge/cordova/geolocation/geolocation.md
+++ b/docs/en/edge/cordova/geolocation/geolocation.md
@@ -70,41 +70,41 @@ platform-specific configuration settings described below:
 
 * Android
 
-    (in app/res/xml/config.xml)
-    <feature name="Geolocation">
-        <param name="android-package" value="org.apache.cordova.GeoBroker" />
-    </feature>
+        (in app/res/xml/config.xml)
+        <feature name="Geolocation">
+            <param name="android-package" value="org.apache.cordova.GeoBroker" />
+        </feature>
 
-    (in app/AndroidManifest.xml)
-    <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" />
+        (in app/AndroidManifest.xml)
+        <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" />
 
 * BlackBerry WebWorks
 
-    (in www/plugins.xml)
-    <feature name="Geolocation">
-        <param name="blackberry-package" value="org.apache.cordova.geolocation.Geolocation" />
-    </feature>
+        (in www/plugins.xml)
+        <feature name="Geolocation">
+            <param name="blackberry-package" value="org.apache.cordova.geolocation.Geolocation" />
+        </feature>
 
-    (in www/config.xml)
-    <rim:permissions>
-        <rim:permit>read_geolocation</rim:permit>
-    </rim:permissions>
+        (in www/config.xml)
+        <rim:permissions>
+            <rim:permit>read_geolocation</rim:permit>
+        </rim:permissions>
 
 * iOS (in `config.xml`)
 
-    <feature name="Geolocation">
-        <param name="ios-package" value="CDVLocation" />
-    </feature>
+        <feature name="Geolocation">
+            <param name="ios-package" value="CDVLocation" />
+        </feature>
 
 * Windows Phone (in `Properties/WPAppManifest.xml`)
 
-    <Capabilities>
-        <Capability Name="ID_CAP_LOCATION" />
-    </Capabilities>
+        <Capabilities>
+            <Capability Name="ID_CAP_LOCATION" />
+        </Capabilities>
 
-Reference: [Application Manifest for Windows Phone](http://msdn.microsoft.com/en-us/library/ff769509%28v=vs.92%29.aspx)
+  Reference: [Application Manifest for Windows Phone](http://msdn.microsoft.com/en-us/library/ff769509%28v=vs.92%29.aspx)
 
 * Tizen
 

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/7a7599c5/docs/en/edge/cordova/globalization/globalization.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/cordova/globalization/globalization.md b/docs/en/edge/cordova/globalization/globalization.md
index ac3f55a..81fec2d 100644
--- a/docs/en/edge/cordova/globalization/globalization.md
+++ b/docs/en/edge/cordova/globalization/globalization.md
@@ -67,6 +67,6 @@ platform-specific configuration settings described below:
 
 * Android (in `app/res/xml/config.xml`)
 
-    <feature name="Globalization">
-        <param name="android-package" value="org.apache.cordova.Globalization" />
-    </feature>
+        <feature name="Globalization">
+            <param name="android-package" value="org.apache.cordova.Globalization" />
+        </feature>

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/7a7599c5/docs/en/edge/cordova/inappbrowser/inappbrowser.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/cordova/inappbrowser/inappbrowser.md b/docs/en/edge/cordova/inappbrowser/inappbrowser.md
index 5cec63e..b868fb3 100644
--- a/docs/en/edge/cordova/inappbrowser/inappbrowser.md
+++ b/docs/en/edge/cordova/inappbrowser/inappbrowser.md
@@ -53,19 +53,19 @@ platform-specific configuration settings described below:
 
 * Android (in `app/res/xml/config.xml`)
 
-    <feature name="InAppBrowser">
-        <param name="android-package" value="org.apache.cordova.InAppBrowser" />
-    </feature>
+        <feature name="InAppBrowser">
+            <param name="android-package" value="org.apache.cordova.InAppBrowser" />
+        </feature>
 
 * iOS (in `config.xml`)
 
-    <feature name="InAppBrowser">
-        <param name="ios-package" value="CDVInAppBrowser" />
-    </feature>
+        <feature name="InAppBrowser">
+            <param name="ios-package" value="CDVInAppBrowser" />
+        </feature>
 
 * Windows Phone 7 + 8 (in `config.xml`)
 
-    <feature name="InAppBrowser" />
+        <feature name="InAppBrowser" />
 
 addEventListener
 ================

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/7a7599c5/docs/en/edge/cordova/media/capture/capture.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/cordova/media/capture/capture.md b/docs/en/edge/cordova/media/capture/capture.md
index dcc4c2b..237d78f 100644
--- a/docs/en/edge/cordova/media/capture/capture.md
+++ b/docs/en/edge/cordova/media/capture/capture.md
@@ -95,38 +95,38 @@ platform-specific configuration settings described below:
 
 * Android
 
-    (in app/res/xml/plugins.xml)
-    <feature name="Capture">
-        <param name="android-package" value="org.apache.cordova.Capture" />
-    </feature>
+        (in app/res/xml/plugins.xml)
+        <feature name="Capture">
+            <param name="android-package" value="org.apache.cordova.Capture" />
+        </feature>
 
-    (in app/AndroidManifest.xml)
-    <uses-permission android:name="android.permission.RECORD_AUDIO" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+        (in app/AndroidManifest.xml)
+        <uses-permission android:name="android.permission.RECORD_AUDIO" />
+        <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 
 * BlackBerry WebWorks
 
-    (in www/plugins.xml)
-    <feature name="Capture">
-        <param name="blackberry-package" value="org.apache.cordova.capture.MediaCapture" />
-    </feature>
+        (in www/plugins.xml)
+        <feature name="Capture">
+            <param name="blackberry-package" value="org.apache.cordova.capture.MediaCapture" />
+        </feature>
 
-    (in www/config.xml)
-    <feature id="blackberry.system"  required="true" version="1.0.0.0" />
-    <feature id="blackberry.io.file" required="true" version="1.0.0.0" />
+        (in www/config.xml)
+        <feature id="blackberry.system"  required="true" version="1.0.0.0" />
+        <feature id="blackberry.io.file" required="true" version="1.0.0.0" />
 
 * iOS (in `config.xml`)
 
-    <feature name="Capture">
-        <param name="ios-package" value="CDVCapture" />
-    </feature>
+        <feature name="Capture">
+            <param name="ios-package" value="CDVCapture" />
+        </feature>
 
 * Windows Phone (in `Properties/WPAppManifest.xml`)
 
-    <Capabilities>
-        <Capability Name="ID_CAP_MEDIALIB" />
-        <Capability Name="ID_CAP_MICROPHONE" />
-        <Capability Name="ID_HW_FRONTCAMERA" />
-        <Capability Name="ID_CAP_ISV_CAMERA" />
-        <Capability Name="ID_CAP_CAMERA" />
-    </Capabilities>
+        <Capabilities>
+            <Capability Name="ID_CAP_MEDIALIB" />
+            <Capability Name="ID_CAP_MICROPHONE" />
+            <Capability Name="ID_HW_FRONTCAMERA" />
+            <Capability Name="ID_CAP_ISV_CAMERA" />
+            <Capability Name="ID_CAP_CAMERA" />
+        </Capabilities>

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/7a7599c5/docs/en/edge/cordova/media/media.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/cordova/media/media.md b/docs/en/edge/cordova/media/media.md
index acc382b..548607c 100644
--- a/docs/en/edge/cordova/media/media.md
+++ b/docs/en/edge/cordova/media/media.md
@@ -106,40 +106,40 @@ platform-specific configuration settings described below:
 
 * Android
 
-    (in app/res/xml/config.xml)
-    <feature name="Media">
-        <param name="android-package" value="org.apache.cordova.AudioHandler" />
-    </feature>
+        (in app/res/xml/config.xml)
+        <feature name="Media">
+            <param name="android-package" value="org.apache.cordova.AudioHandler" />
+        </feature>
 
-    (in app/AndroidManifest.xml)
-    <uses-permission android:name="android.permission.RECORD_AUDIO" />
-    <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+        (in app/AndroidManifest.xml)
+        <uses-permission android:name="android.permission.RECORD_AUDIO" />
+        <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
+        <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 
 * BlackBerry WebWorks
 
-    (in www/plugins.xml)
-    <feature name="Capture">
-        <param name="blackberry-package" value="org.apache.cordova.media.MediaCapture" />
-    </feature>
+        (in www/plugins.xml)
+        <feature name="Capture">
+            <param name="blackberry-package" value="org.apache.cordova.media.MediaCapture" />
+        </feature>
 
 * iOS (in `config.xml`)
 
-    <feature name="Media">
-        <param name="ios-package" value="CDVSound" />
-    </feature>
+        <feature name="Media">
+            <param name="ios-package" value="CDVSound" />
+        </feature>
 
 * Windows Phone (in `Properties/WPAppManifest.xml`)
 
-    <Capabilities>
-        <Capability Name="ID_CAP_MEDIALIB" />
-        <Capability Name="ID_CAP_MICROPHONE" />
-        <Capability Name="ID_HW_FRONTCAMERA" />
-        <Capability Name="ID_CAP_ISV_CAMERA" />
-        <Capability Name="ID_CAP_CAMERA" />
-    </Capabilities>
+        <Capabilities>
+            <Capability Name="ID_CAP_MEDIALIB" />
+            <Capability Name="ID_CAP_MICROPHONE" />
+            <Capability Name="ID_HW_FRONTCAMERA" />
+            <Capability Name="ID_CAP_ISV_CAMERA" />
+            <Capability Name="ID_CAP_CAMERA" />
+        </Capabilities>
 
-Reference: [Application Manifest for Windows Phone](http://msdn.microsoft.com/en-us/library/ff769509%28v=vs.92%29.aspx)
+  Reference: [Application Manifest for Windows Phone](http://msdn.microsoft.com/en-us/library/ff769509%28v=vs.92%29.aspx)
 
 * Tizen
 

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/7a7599c5/docs/en/edge/cordova/notification/notification.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/cordova/notification/notification.md b/docs/en/edge/cordova/notification/notification.md
index 2bd33f9..256f168 100644
--- a/docs/en/edge/cordova/notification/notification.md
+++ b/docs/en/edge/cordova/notification/notification.md
@@ -47,29 +47,29 @@ platform-specific configuration settings described below:
 
 * Android
 
-    (in app/res/xml/config.xml)
-    <feature name="Notification">
-        <param name="android-package" value="org.apache.cordova.Notification" />
-    </feature>
+        (in app/res/xml/config.xml)
+        <feature name="Notification">
+            <param name="android-package" value="org.apache.cordova.Notification" />
+        </feature>
 
-    (in app/AndroidManifest.xml)
-    <uses-permission android:name="android.permission.VIBRATE" />
+        (in app/AndroidManifest.xml)
+        <uses-permission android:name="android.permission.VIBRATE" />
 
 * BlackBerry WebWorks
 
-    (in www/plugins.xml)
-    <feature name="Notification">
-        <param name="blackberry-package" value="org.apache.cordova.notification.Notification" />
-    </feature>
+        (in www/plugins.xml)
+        <feature name="Notification">
+            <param name="blackberry-package" value="org.apache.cordova.notification.Notification" />
+        </feature>
 
-    (in www/config.xml)
-    <feature id="blackberry.ui.dialog" />
+        (in www/config.xml)
+        <feature id="blackberry.ui.dialog" />
 
 * iOS (in `config.xml`)
 
-    <feature name="Notification">
-        <param name="ios-package" value="CDVNotification" />
-    </feature>
+        <feature name="Notification">
+            <param name="ios-package" value="CDVNotification" />
+        </feature>
 
 * Windows Phone
 

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/7a7599c5/docs/en/edge/cordova/splashscreen/splashscreen.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/cordova/splashscreen/splashscreen.md b/docs/en/edge/cordova/splashscreen/splashscreen.md
index 6374eec..15914d0 100644
--- a/docs/en/edge/cordova/splashscreen/splashscreen.md
+++ b/docs/en/edge/cordova/splashscreen/splashscreen.md
@@ -42,15 +42,15 @@ platform-specific configuration settings described below:
 
 * Android (in `app/res/xml/config.xml`)
 
-    <feature name="SplashScreen">
-        <param name="android-package" value="org.apache.cordova.SplashScreen" />
-    </feature>
+        <feature name="SplashScreen">
+            <param name="android-package" value="org.apache.cordova.SplashScreen" />
+        </feature>
 
 * iOS (in `config.xml`)
 
-    <feature name="SplashScreen">
-        <param name="ios-package" value="CDVSplashScreen" />
-    </feature>
+        <feature name="SplashScreen">
+            <param name="ios-package" value="CDVSplashScreen" />
+        </feature>
 
 Setup
 -----

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/7a7599c5/docs/en/edge/cordova/storage/storage.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/cordova/storage/storage.md b/docs/en/edge/cordova/storage/storage.md
index ed32fec..a529da0 100644
--- a/docs/en/edge/cordova/storage/storage.md
+++ b/docs/en/edge/cordova/storage/storage.md
@@ -56,13 +56,13 @@ Objects
 
 * Android (in `app/res/xml/config.xml`)
 
-    <feature name="Storage">
-        <param name="android-package" value="org.apache.cordova.Storage" />
-    </feature>
+        <feature name="Storage">
+            <param name="android-package" value="org.apache.cordova.Storage" />
+        </feature>
 
 * BlackBerry WebWorks (in `www/config.xml`)
 
-    <feature id="blackberry.widgetcache" required="true" version="1.0.0.0" />
+        <feature id="blackberry.widgetcache" required="true" version="1.0.0.0" />
 
 * iOS
 


[4/5] docs commit: [CB-3818] clarify diff storage specs; no plugin access

Posted by mw...@apache.org.
[CB-3818] clarify diff storage specs; no plugin access


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

Branch: refs/heads/master
Commit: 0929908011e88d471cd37fe6c470a2e9f7e46720
Parents: 8cb8b7c
Author: Mike Sierra <le...@gmail.com>
Authored: Tue Jul 30 12:36:54 2013 -0400
Committer: Michael Brooks <mi...@michaelbrooks.ca>
Committed: Tue Jul 30 11:02:07 2013 -0700

----------------------------------------------------------------------
 .../storage/localstorage/localstorage.md        | 16 +++++----
 docs/en/edge/cordova/storage/storage.md         | 36 +++++++++++++-------
 2 files changed, 34 insertions(+), 18 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/09299080/docs/en/edge/cordova/storage/localstorage/localstorage.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/cordova/storage/localstorage/localstorage.md b/docs/en/edge/cordova/storage/localstorage/localstorage.md
index 8428966..66b3562 100644
--- a/docs/en/edge/cordova/storage/localstorage/localstorage.md
+++ b/docs/en/edge/cordova/storage/localstorage/localstorage.md
@@ -20,9 +20,11 @@ license: Licensed to the Apache Software Foundation (ASF) under one
 localStorage
 ===============
 
-Provides access to a [W3C Storage interface](http://dev.w3.org/html5/webstorage/#the-localstorage-attribute)
+Provides access to the W3C's
+[Web Storage interface](http://dev.w3.org/html5/webstorage/#the-localstorage-attribute)
 
-    var storage = window.localStorage;
+    var permanentStorage = window.localStorage;
+    var tempStorage = window.sessionStorage;
 
 Methods
 -------
@@ -40,10 +42,12 @@ Methods
 Details
 -----------
 
-The `window.localStorage` interface is based on the W3C Web Storage
-interface.  An app can use it to save persistent data using key-value
-pairs.  The `window.sessionStorage` interface works the same way, but
-all data is cleared each time the app closes.
+The `window.localStorage` interface implements the W3C's [Web Storage
+interface](http://dev.w3.org/html5/webstorage/).  An app can use it to
+save persistent data using key-value pairs.  The
+`window.sessionStorage` interface works the same way in every respect,
+except that all data is cleared each time the app closes. Each
+database provides a separate namespace.
 
 Supported Platforms
 -------------------

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/09299080/docs/en/edge/cordova/storage/storage.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/cordova/storage/storage.md b/docs/en/edge/cordova/storage/storage.md
index 02d1fa4..0e93244 100644
--- a/docs/en/edge/cordova/storage/storage.md
+++ b/docs/en/edge/cordova/storage/storage.md
@@ -22,12 +22,22 @@ Storage
 
 > Provides access to the device's storage options.
 
-This API is based on the [W3C Web SQL Database
-Specification](http://dev.w3.org/html5/webdatabase/) and [W3C Web
-Storage API Specification](http://dev.w3.org/html5/webstorage/). Some
-devices already provide an implementation of these specifications, in
-which case the built-in support applies.  Cordova's implementation
-offers compatible support for those that don't.
+This API offers storage options based on two different W3C
+specifications:
+
+* The
+  [Web Storage API Specification](http://dev.w3.org/html5/webstorage/)
+  allows you to access data via simple key/value pairs.  See the
+  section on localStorage for complete details on this interface.
+
+* The
+  [Web SQL Database Specification](http://dev.w3.org/html5/webdatabase/)
+  offers more full-featured database tables accessed via SQL queries.
+  A summary of this interface appears immediately below.
+
+Cordova provides access to both interfaces for the minority of devices
+that don't already support them. Otherwise the built-in
+implementations apply.
 
 Methods
 -------
@@ -50,10 +60,17 @@ Objects
 - SQLResultSet
 - SQLResultSetRowList
 - SQLError
-- localStorage
 
 ## Accessing the Feature
 
+As of version 3.0, access to Storage APIs is built into Cordova, and
+does not require using the CLI to add plugins as described in The
+Command-line Interface.
+
+If you are using the older set of Cordova tools that precede the CLI,
+the following platform-specific configuration settings are still
+required:
+
 * Android (in `app/res/xml/config.xml`)
 
         <feature name="Storage">
@@ -64,8 +81,3 @@ Objects
 
         <feature id="blackberry.widgetcache" required="true" version="1.0.0.0" />
 
-* iOS (no special permissions required)
-
-* Windows Phone (no special permissions required)
-
-* Tizen (no special permissions required)