You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by bo...@apache.org on 2012/05/25 21:25:50 UTC
[1/2] docs commit: Did merge commit, my pull did not pull earlier
Updated Branches:
refs/heads/master 0a5bd2227 -> 7b4cf0913
Did merge commit, my pull did not pull earlier
Project: http://git-wip-us.apache.org/repos/asf/incubator-cordova-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cordova-docs/commit/7b4cf091
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-docs/tree/7b4cf091
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-docs/diff/7b4cf091
Branch: refs/heads/master
Commit: 7b4cf09139575dfa055a24e4c75aa08f1a1068ea
Parents: 790f6a4 0a5bd22
Author: Joe Bowser <bo...@apache.org>
Authored: Fri May 25 12:25:34 2012 -0700
Committer: Joe Bowser <bo...@apache.org>
Committed: Fri May 25 12:25:34 2012 -0700
----------------------------------------------------------------------
.../cordova/storage/sqlresultset/sqlresultset.md | 2 +-
.../storage/sqlresultsetlist/sqlresultsetlist.md | 6 +-
.../en/edge/cordova/accelerometer/accelerometer.md | 8 +-
docs/en/edge/cordova/camera/camera.getPicture.md | 7 +-
docs/en/edge/cordova/camera/camera.md | 21 +++-
.../edge/cordova/camera/parameter/cameraOptions.md | 3 +-
docs/en/edge/cordova/compass/compass.md | 8 +-
docs/en/edge/cordova/connection/connection.md | 17 ++-
docs/en/edge/cordova/contacts/Contact/contact.md | 14 ++-
.../contacts/ContactAddress/contactaddress.md | 7 +-
.../cordova/contacts/ContactField/contactfield.md | 6 +-
.../ContactFindOptions/contactfindoptions.md | 5 +-
.../cordova/contacts/ContactName/contactname.md | 9 +-
.../ContactOrganization/contactorganization.md | 4 +-
docs/en/edge/cordova/contacts/contacts.create.md | 2 +-
docs/en/edge/cordova/contacts/contacts.find.md | 2 +-
docs/en/edge/cordova/contacts/contacts.md | 32 ++++-
docs/en/edge/cordova/device/device.md | 24 +++-
docs/en/edge/cordova/events/events.md | 14 ++-
.../cordova/file/directoryentry/directoryentry.md | 64 +++++-----
docs/en/edge/cordova/file/file.md | 30 +++-
docs/en/edge/cordova/file/fileentry/fileentry.md | 52 ++++----
.../file/filetransfererror/filetransfererror.md | 1 +
docs/en/edge/cordova/geolocation/geolocation.md | 25 +++-
docs/en/edge/cordova/media/capture/capture.md | 11 +-
docs/en/edge/cordova/media/media.md | 23 +++-
docs/en/edge/cordova/notification/notification.md | 12 +-
docs/en/edge/cordova/storage/database/database.md | 2 +-
.../cordova/storage/localstorage/localstorage.md | 4 +-
.../cordova/storage/sqlresultset/sqlresultset.md | 4 +-
.../storage/sqlresultsetlist/sqlresultsetlist.md | 8 +-
.../storage/sqltransaction/sqltransaction.md | 2 +-
docs/en/edge/cordova/storage/storage.md | 10 +-
.../edge/cordova/storage/storage.opendatabase.md | 2 +-
docs/en/edge/guide/upgrading/android/index.md | 4 +-
docs/en/edge/guide/upgrading/blackberry/index.md | 25 ++++
.../en/edge/guide/upgrading/windows-phone/index.md | 15 ++
docs/en/edge/guide/whitelist/index.md | 105 +++++++++++++++
docs/en/edge/index.md | 4 +
39 files changed, 449 insertions(+), 145 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cordova-docs/blob/7b4cf091/docs/en/edge/cordova/connection/connection.md
----------------------------------------------------------------------
diff --cc docs/en/edge/cordova/connection/connection.md
index ef2a767,f87e29d..fcc77ad
--- a/docs/en/edge/cordova/connection/connection.md
+++ b/docs/en/edge/cordova/connection/connection.md
@@@ -70,11 -70,10 +70,12 @@@ Permission
<plugin name="NetworkStatus" value="org.apache.cordova.NetworkManager"/>
+
#### 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" />
### Bada
http://git-wip-us.apache.org/repos/asf/incubator-cordova-docs/blob/7b4cf091/docs/en/edge/cordova/device/device.md
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cordova-docs/blob/7b4cf091/docs/en/edge/cordova/notification/notification.md
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cordova-docs/blob/7b4cf091/docs/en/edge/cordova/storage/storage.md
----------------------------------------------------------------------