docs commit: Last commit should have gone into edge, woops

[fi...@apache.org]

Updated Branches:
  refs/heads/master 273078605 -> 57a6e3a63


Last commit should have gone into edge, woops


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

Branch: refs/heads/master
Commit: 57a6e3a637fb10c9fd063369b15d04d69ba5a924
Parents: 2730786
Author: Fil Maj <ma...@gmail.com>
Authored: Tue Feb 5 15:12:17 2013 -0800
Committer: Fil Maj <ma...@gmail.com>
Committed: Tue Feb 5 15:12:17 2013 -0800

----------------------------------------------------------------------
 .../edge/guide/project-settings/android/index.md   |    6 ++++++
 docs/en/edge/guide/project-settings/index.md       |    4 ----
 2 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/57a6e3a6/docs/en/edge/guide/project-settings/android/index.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/guide/project-settings/android/index.md b/docs/en/edge/guide/project-settings/android/index.md
index 1df7a7c..0c2a2c7 100644
--- a/docs/en/edge/guide/project-settings/android/index.md
+++ b/docs/en/edge/guide/project-settings/android/index.md
@@ -24,6 +24,8 @@ Project Settings for Android
 
 The `config.xml` settings file controls various settings of Cordova. This is application wide, and not set per CordovaWebView Instance.
 
+## &lt;preference&gt;
+
 Various **other** preferences (as **&lt;preference&gt;** tags) default on not breaking existing apps. The available preferences are:
 
 1. **useBrowserHistory (boolean, defaults to true)** - set to false if you want to use the history shim that was used to work around the hashtag error present in Android 3.x prior to the history fix.  (Note: This setting will be deprecated in April 2013)
@@ -34,3 +36,7 @@ Various **other** preferences (as **&lt;preference&gt;** tags) default on not br
 6. **loadUrlTimeoutValue** - How much time Cordova should wait before throwing a timeout error on the application.
 7. **keepRunning (boolean, defaults to true)** - Determines whether Cordova will keep running in the background or not
 8. **splashscreen** - The name of the file minus its extension in the res/drawable directory.  If you have multiple assets, they all must share this common name in their respective directories.
+
+## &lt;plugin&gt;
+
+Android supports using &lt;feature&gt; as analogues to &lt;plugin&gt; elements.

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/57a6e3a6/docs/en/edge/guide/project-settings/index.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/guide/project-settings/index.md b/docs/en/edge/guide/project-settings/index.md
index 2699bc0..ca69139 100644
--- a/docs/en/edge/guide/project-settings/index.md
+++ b/docs/en/edge/guide/project-settings/index.md
@@ -66,10 +66,6 @@ These elements map to native APIs that the application will be able to access. A
 the `<plugin>` elements and maps them to native code to enable your Cordova application to access device APIs otherwise
 unavailable to typical web-based applications.
 
-#### `<plugin>` quirks
-
-- Android supports `<feature>` elements as analogues to `<plugin>`.
-
 ### `<access>`
 
 These elements define how your whitelist works. Please see the Domain Whitelist Guide for more information.