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/06/20 22:20:16 UTC
docs commit: Revert "[CB-3223] Remove all tizen-related content."
Updated Branches:
refs/heads/master c43e3ed71 -> 0108032cc
Revert "[CB-3223] Remove all tizen-related content."
This reverts commit 60aa87acb60f1d734f908a0cb8d59bda673cd9b9.
Conflicts:
docs/en/edge/cordova/accelerometer/acceleration/acceleration.md
docs/en/edge/cordova/accelerometer/accelerometer.clearWatch.md
docs/en/edge/cordova/accelerometer/accelerometer.getCurrentAcceleration.md
docs/en/edge/cordova/accelerometer/accelerometer.watchAcceleration.md
docs/en/edge/cordova/camera/camera.getPicture.md
docs/en/edge/cordova/camera/parameter/cameraOptions.md
docs/en/edge/cordova/compass/compass.clearWatch.md
docs/en/edge/cordova/compass/compass.getCurrentHeading.md
docs/en/edge/cordova/compass/compass.watchHeading.md
docs/en/edge/cordova/compass/parameters/compassOptions.md
docs/en/edge/cordova/connection/connection.type.md
docs/en/edge/cordova/device/device.cordova.md
docs/en/edge/cordova/device/device.model.md
docs/en/edge/cordova/device/device.name.md
docs/en/edge/cordova/device/device.platform.md
docs/en/edge/cordova/device/device.uuid.md
docs/en/edge/cordova/device/device.version.md
docs/en/edge/cordova/events/events.deviceready.md
docs/en/edge/cordova/geolocation/Coordinates/coordinates.md
docs/en/edge/cordova/geolocation/Position/position.md
docs/en/edge/cordova/geolocation/geolocation.clearWatch.md
docs/en/edge/cordova/geolocation/geolocation.getCurrentPosition.md
docs/en/edge/cordova/geolocation/geolocation.watchPosition.md
docs/en/edge/cordova/notification/notification.alert.md
docs/en/edge/cordova/notification/notification.beep.md
docs/en/edge/cordova/notification/notification.confirm.md
docs/en/edge/cordova/storage/database/database.md
docs/en/edge/cordova/storage/localstorage/localstorage.md
docs/en/edge/cordova/storage/sqlresultset/sqlresultset.md
docs/en/edge/cordova/storage/sqlresultsetrowlist/sqlresultsetrowlist.md
docs/en/edge/cordova/storage/sqltransaction/sqltransaction.md
docs/en/edge/cordova/storage/storage.opendatabase.md
Project: http://git-wip-us.apache.org/repos/asf/cordova-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-docs/commit/0108032c
Tree: http://git-wip-us.apache.org/repos/asf/cordova-docs/tree/0108032c
Diff: http://git-wip-us.apache.org/repos/asf/cordova-docs/diff/0108032c
Branch: refs/heads/master
Commit: 0108032ccd789829e73cb3842c6dd214e313b174
Parents: c43e3ed
Author: Michael Brooks <mi...@michaelbrooks.ca>
Authored: Thu Jun 20 13:19:12 2013 -0700
Committer: Michael Brooks <mi...@michaelbrooks.ca>
Committed: Thu Jun 20 13:19:12 2013 -0700
----------------------------------------------------------------------
.../accelerometer/acceleration/acceleration.md | 1 +
.../accelerometer/accelerometer.clearWatch.md | 1 +
.../accelerometer.getCurrentAcceleration.md | 1 +
.../edge/cordova/accelerometer/accelerometer.md | 3 +
.../accelerometer.watchAcceleration.md | 1 +
.../en/edge/cordova/camera/camera.getPicture.md | 8 ++
docs/en/edge/cordova/camera/camera.md | 8 ++
.../cordova/camera/parameter/cameraOptions.md | 6 +-
.../edge/cordova/compass/compass.clearWatch.md | 1 +
.../compass/compass.getCurrentHeading.md | 1 +
docs/en/edge/cordova/compass/compass.md | 3 +
.../cordova/compass/compass.watchHeading.md | 1 +
.../compass/parameters/compassOptions.md | 5 +-
docs/en/edge/cordova/connection/connection.md | 7 ++
.../edge/cordova/connection/connection.type.md | 6 ++
docs/en/edge/cordova/device/device.cordova.md | 1 +
docs/en/edge/cordova/device/device.md | 7 ++
docs/en/edge/cordova/device/device.model.md | 6 +-
docs/en/edge/cordova/device/device.name.md | 4 +
docs/en/edge/cordova/device/device.platform.md | 2 +
docs/en/edge/cordova/device/device.uuid.md | 3 +
docs/en/edge/cordova/device/device.version.md | 2 +
.../cordova/events/events.batterycritical.md | 1 +
.../en/edge/cordova/events/events.batterylow.md | 1 +
.../edge/cordova/events/events.batterystatus.md | 1 +
.../edge/cordova/events/events.deviceready.md | 1 +
docs/en/edge/cordova/events/events.md | 7 ++
docs/en/edge/cordova/events/events.offline.md | 1 +
docs/en/edge/cordova/events/events.online.md | 1 +
.../geolocation/Coordinates/coordinates.md | 1 +
.../cordova/geolocation/Position/position.md | 1 +
.../geolocation/geolocation.clearWatch.md | 1 +
.../geolocation.getCurrentPosition.md | 1 +
docs/en/edge/cordova/geolocation/geolocation.md | 3 +
.../geolocation/geolocation.watchPosition.md | 1 +
.../cordova/media/media.getCurrentPosition.md | 1 +
docs/en/edge/cordova/media/media.getDuration.md | 1 +
docs/en/edge/cordova/media/media.md | 5 +
docs/en/edge/cordova/media/media.pause.md | 1 +
docs/en/edge/cordova/media/media.play.md | 1 +
docs/en/edge/cordova/media/media.release.md | 1 +
docs/en/edge/cordova/media/media.seekTo.md | 1 +
docs/en/edge/cordova/media/media.startRecord.md | 4 +
docs/en/edge/cordova/media/media.stop.md | 1 +
docs/en/edge/cordova/media/media.stopRecord.md | 4 +
.../cordova/notification/notification.alert.md | 3 +-
.../cordova/notification/notification.beep.md | 7 ++
.../notification/notification.confirm.md | 1 +
.../edge/cordova/notification/notification.md | 3 +
.../edge/cordova/storage/database/database.md | 1 +
.../storage/localstorage/localstorage.md | 1 +
.../storage/sqlresultset/sqlresultset.md | 1 +
.../sqlresultsetrowlist/sqlresultsetrowlist.md | 1 +
.../storage/sqltransaction/sqltransaction.md | 1 +
docs/en/edge/cordova/storage/storage.md | 3 +
.../cordova/storage/storage.opendatabase.md | 1 +
.../edge/guide/getting-started/tizen/index.md | 107 +++++++++++++++++++
docs/en/edge/guide/plugin-development/index.md | 1 +
docs/en/edge/guide/whitelist/index.md | 36 +++++++
59 files changed, 282 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/0108032c/docs/en/edge/cordova/accelerometer/acceleration/acceleration.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/cordova/accelerometer/acceleration/acceleration.md b/docs/en/edge/cordova/accelerometer/acceleration/acceleration.md
index 93217dc..2a4e828 100644
--- a/docs/en/edge/cordova/accelerometer/acceleration/acceleration.md
+++ b/docs/en/edge/cordova/accelerometer/acceleration/acceleration.md
@@ -44,6 +44,7 @@ Supported Platforms
- Android
- BlackBerry WebWorks (OS 5.0 and higher)
- iOS
+- Tizen
- Windows Phone 7 and 8
- Windows 8
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/0108032c/docs/en/edge/cordova/accelerometer/accelerometer.clearWatch.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/cordova/accelerometer/accelerometer.clearWatch.md b/docs/en/edge/cordova/accelerometer/accelerometer.clearWatch.md
index 2559143..c387896 100644
--- a/docs/en/edge/cordova/accelerometer/accelerometer.clearWatch.md
+++ b/docs/en/edge/cordova/accelerometer/accelerometer.clearWatch.md
@@ -32,6 +32,7 @@ Supported Platforms
- Android
- BlackBerry WebWorks (OS 5.0 and higher)
- iOS
+- Tizen
- Windows Phone 7 and 8
- Windows 8
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/0108032c/docs/en/edge/cordova/accelerometer/accelerometer.getCurrentAcceleration.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/cordova/accelerometer/accelerometer.getCurrentAcceleration.md b/docs/en/edge/cordova/accelerometer/accelerometer.getCurrentAcceleration.md
index cda9926..da2bd24 100644
--- a/docs/en/edge/cordova/accelerometer/accelerometer.getCurrentAcceleration.md
+++ b/docs/en/edge/cordova/accelerometer/accelerometer.getCurrentAcceleration.md
@@ -40,6 +40,7 @@ Supported Platforms
- Android
- BlackBerry WebWorks (OS 5.0 and higher)
- iOS
+- Tizen
- Windows Phone 7 and 8
- Windows 8
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/0108032c/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 c37e683..31d6012 100644
--- a/docs/en/edge/cordova/accelerometer/accelerometer.md
+++ b/docs/en/edge/cordova/accelerometer/accelerometer.md
@@ -77,3 +77,6 @@ Permissions
Reference: [Application Manifest for Windows Phone](http://msdn.microsoft.com/en-us/library/ff769509%28v=vs.92%29.aspx)
+### Tizen
+
+ No permissions are required.
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/0108032c/docs/en/edge/cordova/accelerometer/accelerometer.watchAcceleration.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/cordova/accelerometer/accelerometer.watchAcceleration.md b/docs/en/edge/cordova/accelerometer/accelerometer.watchAcceleration.md
index 4464f62..22034a3 100644
--- a/docs/en/edge/cordova/accelerometer/accelerometer.watchAcceleration.md
+++ b/docs/en/edge/cordova/accelerometer/accelerometer.watchAcceleration.md
@@ -49,6 +49,7 @@ Supported Platforms
- Android
- BlackBerry WebWorks (OS 5.0 and higher)
- iOS
+- Tizen
- Windows Phone 7 and 8
- Windows 8
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/0108032c/docs/en/edge/cordova/camera/camera.getPicture.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/cordova/camera/camera.getPicture.md b/docs/en/edge/cordova/camera/camera.getPicture.md
index a03344a..0bb4750 100644
--- a/docs/en/edge/cordova/camera/camera.getPicture.md
+++ b/docs/en/edge/cordova/camera/camera.getPicture.md
@@ -70,6 +70,7 @@ Supported Platforms
- Android
- Blackberry WebWorks (OS 5.0 and higher)
- iOS
+- Tizen
- Windows Phone 7 and 8
- Windows 8
@@ -97,6 +98,13 @@ Windows Phone 7 Quirks
Invoking the native camera application while your device is connected
via Zune does not work, and triggers an error callback.
+Tizen Quirks
+----------------------
+
+Tizen only supports a `destinationType` of
+`Camera.DestinationType.FILE_URI` and a `sourceType` of
+`Camera.PictureSourceType.PHOTOLIBRARY`.
+
Quick Example
-------------
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/0108032c/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 644c75c..1fcc7e5 100644
--- a/docs/en/edge/cordova/camera/camera.md
+++ b/docs/en/edge/cordova/camera/camera.md
@@ -74,3 +74,11 @@ Permissions
Reference: [Application Manifest for Windows Phone](http://msdn.microsoft.com/en-us/library/ff769509%28v=vs.92%29.aspx)
+### Tizen
+
+#### config.xml
+
+ <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)
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/0108032c/docs/en/edge/cordova/camera/parameter/cameraOptions.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/cordova/camera/parameter/cameraOptions.md b/docs/en/edge/cordova/camera/parameter/cameraOptions.md
index e80e287..a3a7542 100644
--- a/docs/en/edge/cordova/camera/parameter/cameraOptions.md
+++ b/docs/en/edge/cordova/camera/parameter/cameraOptions.md
@@ -107,10 +107,14 @@ iOS Quirks
- Set `quality` below 50 to avoid memory errors on some devices.
- When using `destinationType.FILE_URI`, photos are saved in the application's temporary directory. You may delete the contents of this directory using the `navigator.fileMgr` APIs if storage space is a concern.
+Tizen Quirks
+--------------
+- options not supported
+- always returns a FILE URI
+
Windows Phone 7 and 8 Quirks
--------------
- Ignores the `allowEdit` parameter.
- Ignores the `correctOrientation` parameter.
- Ignores the `cameraDirection` parameter.
-
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/0108032c/docs/en/edge/cordova/compass/compass.clearWatch.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/cordova/compass/compass.clearWatch.md b/docs/en/edge/cordova/compass/compass.clearWatch.md
index cfce1dd..ea95109 100755
--- a/docs/en/edge/cordova/compass/compass.clearWatch.md
+++ b/docs/en/edge/cordova/compass/compass.clearWatch.md
@@ -31,6 +31,7 @@ Supported Platforms
- Android
- iOS
+- Tizen
- Windows Phone 7 and 8 ( if available in hardware )
- Windows 8
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/0108032c/docs/en/edge/cordova/compass/compass.getCurrentHeading.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/cordova/compass/compass.getCurrentHeading.md b/docs/en/edge/cordova/compass/compass.getCurrentHeading.md
index 3b235b1..7329038 100755
--- a/docs/en/edge/cordova/compass/compass.getCurrentHeading.md
+++ b/docs/en/edge/cordova/compass/compass.getCurrentHeading.md
@@ -39,6 +39,7 @@ Supported Platforms
- Android
- iOS
+- Tizen
- Windows Phone 7 and 8 ( if available in hardware )
- Windows 8
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/0108032c/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 a86f6c0..43ca2bc 100755
--- a/docs/en/edge/cordova/compass/compass.md
+++ b/docs/en/edge/cordova/compass/compass.md
@@ -68,3 +68,6 @@ Permissions
Reference: [Application Manifest for Windows Phone](http://msdn.microsoft.com/en-us/library/ff769509%28v=vs.92%29.aspx)
+### Tizen
+
+ No permissions are required.
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/0108032c/docs/en/edge/cordova/compass/compass.watchHeading.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/cordova/compass/compass.watchHeading.md b/docs/en/edge/cordova/compass/compass.watchHeading.md
index a402136..a472f96 100755
--- a/docs/en/edge/cordova/compass/compass.watchHeading.md
+++ b/docs/en/edge/cordova/compass/compass.watchHeading.md
@@ -45,6 +45,7 @@ Supported Platforms
- Android
- iOS
+- Tizen
- Windows Phone 7 and 8 (if available in hardware)
- Windows 8
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/0108032c/docs/en/edge/cordova/compass/parameters/compassOptions.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/cordova/compass/parameters/compassOptions.md b/docs/en/edge/cordova/compass/parameters/compassOptions.md
index 89dc6fe..aed37ca 100755
--- a/docs/en/edge/cordova/compass/parameters/compassOptions.md
+++ b/docs/en/edge/cordova/compass/parameters/compassOptions.md
@@ -32,7 +32,10 @@ Android Quirks
______________
- `filter` is not supported.
+Tizen Quirks
+-----------
+- `filter` is not supported.
+
Windows Phone 7 and 8 Quirks
--------------
- `filter` is not supported.
-
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/0108032c/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 f1d9e87..8831dcf 100644
--- a/docs/en/edge/cordova/connection/connection.md
+++ b/docs/en/edge/cordova/connection/connection.md
@@ -76,3 +76,10 @@ Permissions
Reference: [Application Manifest for Windows Phone](http://msdn.microsoft.com/en-us/library/ff769509%28v=vs.92%29.aspx)
+### Tizen
+
+#### 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/0108032c/docs/en/edge/cordova/connection/connection.type.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/cordova/connection/connection.type.md b/docs/en/edge/cordova/connection/connection.type.md
index 9adbd19..ed06ef3 100644
--- a/docs/en/edge/cordova/connection/connection.type.md
+++ b/docs/en/edge/cordova/connection/connection.type.md
@@ -34,6 +34,7 @@ Supported Platforms
- iOS
- Android
- BlackBerry WebWorks (OS 5.0 and higher)
+- Tizen
- Windows Phone 7 and 8
- Windows 8
@@ -124,3 +125,8 @@ Windows Phone Quirks
- Windows Phone cannot detect the type of cellular network connection.
- `navigator.connection.type` is set to `Connection.CELL` for all cellular data.
+Tizen Quirks
+--------------------
+
+- Tizen can only detect a WiFi or cellular connection.
+ - `navigator.connection.type` is set to `Connection.CELL_2G` for all cellular data.
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/0108032c/docs/en/edge/cordova/device/device.cordova.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/cordova/device/device.cordova.md b/docs/en/edge/cordova/device/device.cordova.md
index ffd4717..3fa38f3 100644
--- a/docs/en/edge/cordova/device/device.cordova.md
+++ b/docs/en/edge/cordova/device/device.cordova.md
@@ -35,6 +35,7 @@ Supported Platforms
- Android
- BlackBerry WebWorks (OS 5.0 and higher)
- iOS
+- Tizen
- Windows Phone 7 and 8
- Windows 8
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/0108032c/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 715f9c9..38abb0c 100644
--- a/docs/en/edge/cordova/device/device.md
+++ b/docs/en/edge/cordova/device/device.md
@@ -83,3 +83,10 @@ Permissions
Reference: [Application Manifest for Windows Phone](http://msdn.microsoft.com/en-us/library/ff769509%28v=vs.92%29.aspx)
+### Tizen
+
+#### 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/0108032c/docs/en/edge/cordova/device/device.model.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/cordova/device/device.model.md b/docs/en/edge/cordova/device/device.model.md
index 4d9e383..5831039 100644
--- a/docs/en/edge/cordova/device/device.model.md
+++ b/docs/en/edge/cordova/device/device.model.md
@@ -37,6 +37,7 @@ Supported Platforms
- Android
- BlackBerry WebWorks (OS 5.0 and higher)
- iOS
+- Tizen
- Windows Phone 7 and 8
- Windows 8
@@ -89,8 +90,11 @@ Android Quirks
- Gets the [product name](http://developer.android.com/reference/android/os/Build.html#PRODUCT) instead of the [model name](http://developer.android.com/reference/android/os/Build.html#MODEL), which is often the production code name. For example, the Nexus One returns `Passion`, and Motorola Droid returns `voles`.
+Tizen Quirks
+-----------
+- Returns the device model assigned by the vendor, for example, `TIZEN`
+
Windows Phone 7 and 8 Quirks
-------------
- Returns the device model specified by the manufacturer. For example, the Samsung Focus returns `SGH-i917`.
-
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/0108032c/docs/en/edge/cordova/device/device.name.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/cordova/device/device.name.md b/docs/en/edge/cordova/device/device.name.md
index 791f111..ce194d3 100644
--- a/docs/en/edge/cordova/device/device.name.md
+++ b/docs/en/edge/cordova/device/device.name.md
@@ -39,6 +39,7 @@ Supported Platforms
- Android
- BlackBerry WebWorks (OS 5.0 and higher)
- iOS
+- Tizen
- Windows Phone 7 and 8
- Windows 8
@@ -97,3 +98,6 @@ Windows Phone 7 and 8 Quirks
- Returns the device model specified by the manufacturer. For example, the Samsung Focus returns `SGH-i917`.
+Tizen Quirks
+-----------
+- Returns the device model assigned by the vendor, for example, `TIZEN`
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/0108032c/docs/en/edge/cordova/device/device.platform.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/cordova/device/device.platform.md b/docs/en/edge/cordova/device/device.platform.md
index f920d32..9d18373 100644
--- a/docs/en/edge/cordova/device/device.platform.md
+++ b/docs/en/edge/cordova/device/device.platform.md
@@ -30,6 +30,7 @@ Supported Platforms
- Android
- BlackBerry WebWorks (OS 5.0 and higher)
- iOS
+- Tizen
- Windows Phone 7 and 8
- Windows 8
@@ -41,6 +42,7 @@ Quick Example
// - "BlackBerry"
// - "iOS"
// - "WinCE"
+ // - "Tizen"
var devicePlatform = device.platform;
Full Example
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/0108032c/docs/en/edge/cordova/device/device.uuid.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/cordova/device/device.uuid.md b/docs/en/edge/cordova/device/device.uuid.md
index 0691c56..5812b10 100644
--- a/docs/en/edge/cordova/device/device.uuid.md
+++ b/docs/en/edge/cordova/device/device.uuid.md
@@ -35,6 +35,7 @@ Supported Platforms
- Android
- BlackBerry WebWorks (OS 5.0 and higher)
- iOS
+- Tizen
- Windows Phone 7 and 8
- Windows 8
@@ -53,6 +54,8 @@ Quick Example
// to the user account.
// Windows Phone 7 : Returns a hash of device+current user,
// if the user is not defined, a guid is generated and will persist until the app is uninstalled
+ // Tizen: returns the device IMEI (International Mobile Equipment Identity or IMEI is a number
+ // unique to every GSM and UMTS mobile phone.
var deviceID = device.uuid;
Full Example
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/0108032c/docs/en/edge/cordova/device/device.version.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/cordova/device/device.version.md b/docs/en/edge/cordova/device/device.version.md
index f793382..d657600 100644
--- a/docs/en/edge/cordova/device/device.version.md
+++ b/docs/en/edge/cordova/device/device.version.md
@@ -30,6 +30,7 @@ Supported Platforms
- Android 2.1+
- BlackBerry WebWorks (OS 5.0 and higher)
- iOS
+- Tizen
- Windows Phone 7 and 8
- Windows 8
@@ -45,6 +46,7 @@ Quick Example
// iPhone: iOS 3.2 returns "3.2"
//
// Windows Phone 7: returns current OS version number, ex. on Mango returns 7.10.7720
+ // Tizen: returns "TIZEN_20120425_2"
var deviceVersion = device.version;
Full Example
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/0108032c/docs/en/edge/cordova/events/events.batterycritical.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/cordova/events/events.batterycritical.md b/docs/en/edge/cordova/events/events.batterycritical.md
index 0f3faeb..5d81a58 100644
--- a/docs/en/edge/cordova/events/events.batterycritical.md
+++ b/docs/en/edge/cordova/events/events.batterycritical.md
@@ -46,6 +46,7 @@ Supported Platforms
- iOS
- Android
- BlackBerry WebWorks (OS 5.0 and higher)
+- Tizen
Quick Example
-------------
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/0108032c/docs/en/edge/cordova/events/events.batterylow.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/cordova/events/events.batterylow.md b/docs/en/edge/cordova/events/events.batterylow.md
index adbd7a0..c90e537 100644
--- a/docs/en/edge/cordova/events/events.batterylow.md
+++ b/docs/en/edge/cordova/events/events.batterylow.md
@@ -45,6 +45,7 @@ Supported Platforms
- iOS
- Android
- BlackBerry WebWorks (OS 5.0 and higher)
+- Tizen
Quick Example
-------------
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/0108032c/docs/en/edge/cordova/events/events.batterystatus.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/cordova/events/events.batterystatus.md b/docs/en/edge/cordova/events/events.batterystatus.md
index ccdecef..dc007cb 100644
--- a/docs/en/edge/cordova/events/events.batterystatus.md
+++ b/docs/en/edge/cordova/events/events.batterystatus.md
@@ -46,6 +46,7 @@ Supported Platforms
- Android
- BlackBerry WebWorks (OS 5.0 and higher)
- Windows Phone 7 and 8
+- Tizen
Windows Phone 7 and 8 Quirks
----------------------
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/0108032c/docs/en/edge/cordova/events/events.deviceready.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/cordova/events/events.deviceready.md b/docs/en/edge/cordova/events/events.deviceready.md
index 61681be..cfdbea0 100644
--- a/docs/en/edge/cordova/events/events.deviceready.md
+++ b/docs/en/edge/cordova/events/events.deviceready.md
@@ -51,6 +51,7 @@ Supported Platforms
- Android
- BlackBerry WebWorks (OS 5.0 and higher)
- iOS
+- Tizen
- Windows Phone 7 and 8
- Windows 8
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/0108032c/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 fe3d8ab..bdecd16 100644
--- a/docs/en/edge/cordova/events/events.md
+++ b/docs/en/edge/cordova/events/events.md
@@ -76,3 +76,10 @@ Permissions
No permissions are required.
+### Tizen
+
+#### 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/0108032c/docs/en/edge/cordova/events/events.offline.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/cordova/events/events.offline.md b/docs/en/edge/cordova/events/events.offline.md
index 8fe22e6..7eaeac1 100644
--- a/docs/en/edge/cordova/events/events.offline.md
+++ b/docs/en/edge/cordova/events/events.offline.md
@@ -44,6 +44,7 @@ Supported Platforms
- BlackBerry WebWorks (OS 5.0 and higher)
- iOS
- Windows Phone 7 and 8
+- Tizen
- Windows 8
Quick Example
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/0108032c/docs/en/edge/cordova/events/events.online.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/cordova/events/events.online.md b/docs/en/edge/cordova/events/events.online.md
index c7d2aba..fd6dcaf 100644
--- a/docs/en/edge/cordova/events/events.online.md
+++ b/docs/en/edge/cordova/events/events.online.md
@@ -43,6 +43,7 @@ Supported Platforms
- BlackBerry WebWorks (OS 5.0 and higher)
- iOS
- Windows Phone 7 and 8
+- Tizen
- Windows 8
Quick Example
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/0108032c/docs/en/edge/cordova/geolocation/Coordinates/coordinates.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/cordova/geolocation/Coordinates/coordinates.md b/docs/en/edge/cordova/geolocation/Coordinates/coordinates.md
index ff9e8fd..7783271 100644
--- a/docs/en/edge/cordova/geolocation/Coordinates/coordinates.md
+++ b/docs/en/edge/cordova/geolocation/Coordinates/coordinates.md
@@ -45,6 +45,7 @@ Supported Platforms
- Android
- BlackBerry WebWorks (OS 5.0 and higher)
- iOS
+- Tizen
- Windows Phone 7 and 8
- Windows 8
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/0108032c/docs/en/edge/cordova/geolocation/Position/position.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/cordova/geolocation/Position/position.md b/docs/en/edge/cordova/geolocation/Position/position.md
index 785cca6..2e92f58 100644
--- a/docs/en/edge/cordova/geolocation/Position/position.md
+++ b/docs/en/edge/cordova/geolocation/Position/position.md
@@ -39,6 +39,7 @@ Supported Platforms
- Android
- BlackBerry WebWorks (OS 5.0 and higher)
- iOS
+- Tizen
- Windows Phone 7 and 8
- Windows 8
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/0108032c/docs/en/edge/cordova/geolocation/geolocation.clearWatch.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/cordova/geolocation/geolocation.clearWatch.md b/docs/en/edge/cordova/geolocation/geolocation.clearWatch.md
index 35277d4..4ce1b7e 100644
--- a/docs/en/edge/cordova/geolocation/geolocation.clearWatch.md
+++ b/docs/en/edge/cordova/geolocation/geolocation.clearWatch.md
@@ -43,6 +43,7 @@ Supported Platforms
- Android
- BlackBerry WebWorks (OS 5.0 and higher)
- iOS
+- Tizen
- Windows Phone 7 and 8
- Windows 8
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/0108032c/docs/en/edge/cordova/geolocation/geolocation.getCurrentPosition.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/cordova/geolocation/geolocation.getCurrentPosition.md b/docs/en/edge/cordova/geolocation/geolocation.getCurrentPosition.md
index ff0913b..e4ac566 100644
--- a/docs/en/edge/cordova/geolocation/geolocation.getCurrentPosition.md
+++ b/docs/en/edge/cordova/geolocation/geolocation.getCurrentPosition.md
@@ -48,6 +48,7 @@ Supported Platforms
- Android
- BlackBerry WebWorks (OS 5.0 and higher)
- iOS
+- Tizen
- Windows Phone 7 and 8
- Windows 8
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/0108032c/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 2a5ca80..e771411 100644
--- a/docs/en/edge/cordova/geolocation/geolocation.md
+++ b/docs/en/edge/cordova/geolocation/geolocation.md
@@ -99,3 +99,6 @@ Permissions
Reference: [Application Manifest for Windows Phone](http://msdn.microsoft.com/en-us/library/ff769509%28v=vs.92%29.aspx)
+### Tizen
+
+ No permissions are required.
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/0108032c/docs/en/edge/cordova/geolocation/geolocation.watchPosition.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/cordova/geolocation/geolocation.watchPosition.md b/docs/en/edge/cordova/geolocation/geolocation.watchPosition.md
index 01c87db..24cde98 100644
--- a/docs/en/edge/cordova/geolocation/geolocation.watchPosition.md
+++ b/docs/en/edge/cordova/geolocation/geolocation.watchPosition.md
@@ -54,6 +54,7 @@ Supported Platforms
- Android
- BlackBerry WebWorks (OS 5.0 and higher)
- iOS
+- Tizen
- Windows Phone 7 and 8
- Windows 8
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/0108032c/docs/en/edge/cordova/media/media.getCurrentPosition.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/cordova/media/media.getCurrentPosition.md b/docs/en/edge/cordova/media/media.getCurrentPosition.md
index 30228b5..171bec6 100644
--- a/docs/en/edge/cordova/media/media.getCurrentPosition.md
+++ b/docs/en/edge/cordova/media/media.getCurrentPosition.md
@@ -44,6 +44,7 @@ Supported Platforms
- BlackBerry WebWorks (OS 5.0 and higher)
- iOS
- Windows Phone 7 and 8
+- Tizen
- Windows 8
Quick Example
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/0108032c/docs/en/edge/cordova/media/media.getDuration.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/cordova/media/media.getDuration.md b/docs/en/edge/cordova/media/media.getDuration.md
index 3a4dbc0..f48f9a0 100644
--- a/docs/en/edge/cordova/media/media.getDuration.md
+++ b/docs/en/edge/cordova/media/media.getDuration.md
@@ -38,6 +38,7 @@ Supported Platforms
- BlackBerry WebWorks (OS 5.0 and higher)
- iOS
- Windows Phone 7 and 8
+- Tizen
- Windows 8
Quick Example
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/0108032c/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 f2dfcf1..2f9e49e 100644
--- a/docs/en/edge/cordova/media/media.md
+++ b/docs/en/edge/cordova/media/media.md
@@ -77,6 +77,7 @@ Supported Platforms
- BlackBerry WebWorks (OS 5.0 and higher)
- iOS
- Windows Phone 7.5
+- Tizen
- Windows 8
Permissions
@@ -120,6 +121,10 @@ Permissions
Reference: [Application Manifest for Windows Phone](http://msdn.microsoft.com/en-us/library/ff769509%28v=vs.92%29.aspx)
+### Tizen
+
+ No permissions are required.
+
### Windows Phone Quirks
- Only one media file can be played back at a time.
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/0108032c/docs/en/edge/cordova/media/media.pause.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/cordova/media/media.pause.md b/docs/en/edge/cordova/media/media.pause.md
index ff9f3c1..aa72280 100644
--- a/docs/en/edge/cordova/media/media.pause.md
+++ b/docs/en/edge/cordova/media/media.pause.md
@@ -36,6 +36,7 @@ Supported Platforms
- BlackBerry WebWorks (OS 5.0 and higher)
- iOS
- Windows Phone 7 and 8
+- Tizen
- Windows 8
Quick Example
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/0108032c/docs/en/edge/cordova/media/media.play.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/cordova/media/media.play.md b/docs/en/edge/cordova/media/media.play.md
index 70f74ef..19899db 100644
--- a/docs/en/edge/cordova/media/media.play.md
+++ b/docs/en/edge/cordova/media/media.play.md
@@ -37,6 +37,7 @@ Supported Platforms
- BlackBerry WebWorks (OS 5.0 and higher)
- iOS
- Windows Phone 7 and 8
+- Tizen
- Windows 8
Quick Example
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/0108032c/docs/en/edge/cordova/media/media.release.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/cordova/media/media.release.md b/docs/en/edge/cordova/media/media.release.md
index e3de8f8..5ce1c4a 100644
--- a/docs/en/edge/cordova/media/media.release.md
+++ b/docs/en/edge/cordova/media/media.release.md
@@ -40,6 +40,7 @@ Supported Platforms
- BlackBerry WebWorks (OS 5.0 and higher)
- iOS
- Windows Phone 7 and 8
+- Tizen
- Windows 8
Quick Example
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/0108032c/docs/en/edge/cordova/media/media.seekTo.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/cordova/media/media.seekTo.md b/docs/en/edge/cordova/media/media.seekTo.md
index 05dc5d8..371705c 100644
--- a/docs/en/edge/cordova/media/media.seekTo.md
+++ b/docs/en/edge/cordova/media/media.seekTo.md
@@ -43,6 +43,7 @@ Supported Platforms
- BlackBerry WebWorks (OS 6.0 and higher)
- iOS
- Windows Phone 7 and 8
+- Tizen
- Windows 8
Quick Example
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/0108032c/docs/en/edge/cordova/media/media.startRecord.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/cordova/media/media.startRecord.md b/docs/en/edge/cordova/media/media.startRecord.md
index c40aed0..b94cee9 100644
--- a/docs/en/edge/cordova/media/media.startRecord.md
+++ b/docs/en/edge/cordova/media/media.startRecord.md
@@ -149,3 +149,7 @@ iOS Quirks
var myMedia = new Media("documents://beer.mp3")
+Tizen Quirks
+----------
+
+- Not supported on Tizen devices.
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/0108032c/docs/en/edge/cordova/media/media.stop.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/cordova/media/media.stop.md b/docs/en/edge/cordova/media/media.stop.md
index ea4f67e..77318d6 100644
--- a/docs/en/edge/cordova/media/media.stop.md
+++ b/docs/en/edge/cordova/media/media.stop.md
@@ -37,6 +37,7 @@ Supported Platforms
- BlackBerry WebWorks (OS 5.0 and higher)
- iOS
- Windows Phone 7 and 8
+- Tizen
- Windows 8
Quick Example
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/0108032c/docs/en/edge/cordova/media/media.stopRecord.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/cordova/media/media.stopRecord.md b/docs/en/edge/cordova/media/media.stopRecord.md
index 2f4d515..03fc246 100644
--- a/docs/en/edge/cordova/media/media.stopRecord.md
+++ b/docs/en/edge/cordova/media/media.stopRecord.md
@@ -136,3 +136,7 @@ Full Example
</body>
</html>
+Tizen Quirks
+----------
+
+- Not supported on Tizen devices.
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/0108032c/docs/en/edge/cordova/notification/notification.alert.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/cordova/notification/notification.alert.md b/docs/en/edge/cordova/notification/notification.alert.md
index 3239c2c..9421fad 100644
--- a/docs/en/edge/cordova/notification/notification.alert.md
+++ b/docs/en/edge/cordova/notification/notification.alert.md
@@ -42,13 +42,14 @@ Supported Platforms
- Android
- BlackBerry WebWorks (OS 5.0 and higher)
- iOS
+- Tizen
- Windows Phone 7 and 8
- Windows 8
Quick Example
-------------
- // Android / BlackBerry WebWorks (OS 5.0 and higher) / iOS
+ // Android / BlackBerry WebWorks (OS 5.0 and higher) / iOS / Tizen
//
function alertDismissed() {
// do something
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/0108032c/docs/en/edge/cordova/notification/notification.beep.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/cordova/notification/notification.beep.md b/docs/en/edge/cordova/notification/notification.beep.md
index 6de8ff9..5f0439a 100644
--- a/docs/en/edge/cordova/notification/notification.beep.md
+++ b/docs/en/edge/cordova/notification/notification.beep.md
@@ -32,6 +32,7 @@ Supported Platforms
- Android
- BlackBerry WebWorks (OS 5.0 and higher)
- iOS
+- Tizen
- Windows Phone 7 and 8
Quick Example
@@ -111,3 +112,9 @@ Windows Phone 7 and 8 Quirks
- Relies on a generic beep file from the Cordova distribution.
+Tizen Quirks
+-------------
+
+- Tizen implements beeps by playing an audio file via the media API.
+- The beep file must be short, must be located in a `sounds` sub-directory of the application's root directory, and must be named `beep.wav`.
+
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/0108032c/docs/en/edge/cordova/notification/notification.confirm.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/cordova/notification/notification.confirm.md b/docs/en/edge/cordova/notification/notification.confirm.md
index af2ea1a..9105fdd 100755
--- a/docs/en/edge/cordova/notification/notification.confirm.md
+++ b/docs/en/edge/cordova/notification/notification.confirm.md
@@ -51,6 +51,7 @@ Supported Platforms
- Android
- BlackBerry WebWorks (OS 5.0 and higher)
- iOS
+- Tizen
- Windows Phone 7 and 8
- Windows 8
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/0108032c/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 cf2dcca..d72d51b 100644
--- a/docs/en/edge/cordova/notification/notification.md
+++ b/docs/en/edge/cordova/notification/notification.md
@@ -64,3 +64,6 @@ Permissions
No permissions are required.
+### Tizen
+
+ No permissions are required.
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/0108032c/docs/en/edge/cordova/storage/database/database.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/cordova/storage/database/database.md b/docs/en/edge/cordova/storage/database/database.md
index 3b05cff..aaf72dc 100644
--- a/docs/en/edge/cordova/storage/database/database.md
+++ b/docs/en/edge/cordova/storage/database/database.md
@@ -39,6 +39,7 @@ Supported Platforms
- Android
- BlackBerry WebWorks (OS 6.0 and higher)
- iOS
+- Tizen
Transaction Quick Example
------------------
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/0108032c/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 9f3e925..e3d7fc8 100644
--- a/docs/en/edge/cordova/storage/localstorage/localstorage.md
+++ b/docs/en/edge/cordova/storage/localstorage/localstorage.md
@@ -47,6 +47,7 @@ Supported Platforms
- Android
- BlackBerry WebWorks (OS 6.0 and higher)
- iOS
+- Tizen
- Windows Phone 7 and 8
Key Quick Example
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/0108032c/docs/en/edge/cordova/storage/sqlresultset/sqlresultset.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/cordova/storage/sqlresultset/sqlresultset.md b/docs/en/edge/cordova/storage/sqlresultset/sqlresultset.md
index 1c2ad4f..6b7152f 100644
--- a/docs/en/edge/cordova/storage/sqlresultset/sqlresultset.md
+++ b/docs/en/edge/cordova/storage/sqlresultset/sqlresultset.md
@@ -54,6 +54,7 @@ Supported Platforms
- Android
- BlackBerry WebWorks (OS 6.0 and higher)
- iOS
+- Tizen
Execute SQL Quick Example
------------------
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/0108032c/docs/en/edge/cordova/storage/sqlresultsetrowlist/sqlresultsetrowlist.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/cordova/storage/sqlresultsetrowlist/sqlresultsetrowlist.md b/docs/en/edge/cordova/storage/sqlresultsetrowlist/sqlresultsetrowlist.md
index b5518b1..3d6fb35 100644
--- a/docs/en/edge/cordova/storage/sqlresultsetrowlist/sqlresultsetrowlist.md
+++ b/docs/en/edge/cordova/storage/sqlresultsetrowlist/sqlresultsetrowlist.md
@@ -49,6 +49,7 @@ Supported Platforms
- Android
- BlackBerry WebWorks (OS 6.0 and higher)
- iOS
+- Tizen
Execute SQL Quick Example
------------------
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/0108032c/docs/en/edge/cordova/storage/sqltransaction/sqltransaction.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/cordova/storage/sqltransaction/sqltransaction.md b/docs/en/edge/cordova/storage/sqltransaction/sqltransaction.md
index ac472e8..9760b25 100644
--- a/docs/en/edge/cordova/storage/sqltransaction/sqltransaction.md
+++ b/docs/en/edge/cordova/storage/sqltransaction/sqltransaction.md
@@ -39,6 +39,7 @@ Supported Platforms
- Android
- BlackBerry WebWorks (OS 6.0 and higher)
- iOS
+- Tizen
Execute SQL Quick Example
------------------
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/0108032c/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 4b5af49..1f703fd 100644
--- a/docs/en/edge/cordova/storage/storage.md
+++ b/docs/en/edge/cordova/storage/storage.md
@@ -75,3 +75,6 @@ Permissions
No permissions are required.
+### Tizen
+
+ No permissions are required.
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/0108032c/docs/en/edge/cordova/storage/storage.opendatabase.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/cordova/storage/storage.opendatabase.md b/docs/en/edge/cordova/storage/storage.opendatabase.md
index 4996324..a6f6c96 100644
--- a/docs/en/edge/cordova/storage/storage.opendatabase.md
+++ b/docs/en/edge/cordova/storage/storage.opendatabase.md
@@ -36,6 +36,7 @@ Supported Platforms
- Android
- BlackBerry WebWorks (OS 6.0 and higher)
- iOS
+- Tizen
Quick Example
-------------
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/0108032c/docs/en/edge/guide/getting-started/tizen/index.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/guide/getting-started/tizen/index.md b/docs/en/edge/guide/getting-started/tizen/index.md
new file mode 100644
index 0000000..9da55e8
--- /dev/null
+++ b/docs/en/edge/guide/getting-started/tizen/index.md
@@ -0,0 +1,107 @@
+---
+license: Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+---
+
+Getting Started with Tizen
+=========================
+
+This guide describes how to set up your development environment for Cordova and run a sample application. Note that Cordova used to be called PhoneGap, so some of the sites still use the old PhoneGap name.
+
+1. Requirements
+---------------
+
+- Linux Ubuntu 10.04/10.10/11.04/11.10 32-bit, Windows XP SP3/7 32-bit.
+
+2. Install SDK + Cordova
+-------------------------
+
+- Download and install the [Tizen SDK](https://developer.tizen.org/sdk).
+- Download and extract the latest copy of [Cordova](http://phonegap.com/download). You will be working in the `tizen` directory.
+- (optional) Install Tizen Cordova template projects: copy the `/templates` directory content into you Tizen Eclipse IDE web templates directory (e.g: `/home/my_username/tizen-sdk/IDE/Templates/web`).
+
+3. Set up New Project
+--------------------
+
+- **Method #1: Import a Cordova Tizen project sample**
+ - Launch Tizen Eclipse IDE
+ - Select **File → Import → Tizen Web Project**
+
+ 
+
+ - Click **Next**
+ - Make sure that **Select root directory** is checked
+ - Make sure **Copy projects into workspace** is checked
+ - Click **Browse**
+ - Browse to one of the Cordova Tizen `samples` project directory (e.g: `/cordova-basic`) and select it
+
+ 
+
+ - Click **Finish**
+
+ 
+
+ - Your project should now be imported and appear in the **Project Explorer** view
+
+- **Method #2: Use Tizen Eclipse IDE Cordova Tizen project templates**
+ - Launch Tizen Eclipse IDE
+ - Select **File → New → Tizen Web Project**
+ - Select **User Template** and **User defined** items
+ - Select one of the Tizen Cordova template (e.g: **CordovaBasicTemplate**)
+ - Fill the **Project name** and its target **Location**
+
+ 
+
+ - Click **Finish**
+
+ 
+
+ - Your project should now appear in the **Project Explorer** view
+
+4. Hello World
+--------------
+- To build your project:
+
+ - **Right Click** your project in the **Project Explorer** view and Select **Build Project**
+
+ 
+
+ - A widget package should be generated in your project root directory (e.g: `cordova-basic.wgt`)
+
+ - __NOTE:__ The sample Tizen Cordova projects provided go beyond basic "hello world" applications, and feature example usage of the Battery API.
+
+5A. Deploy to Simulator
+-----------------------
+
+- **Right Click** your project in the **Project Explorer** view and Select **Run As** and **Tizen Web Simulator Application**
+
+ 
+
+5B. Deploy to Device/Emulator
+--------------------
+
+- Make sure that your target device is properly launched, connected and configured. Its __Date and Time__ settings must be set correctly.
+- Select your application deployment target with the **Connection Explorer** view (Select **Window → Show View → Connection Explorer**.)
+
+ 
+
+- **Right-click** your project in the **Project Explorer** view and select **Run As** and **Tizen Web Application**
+
+ 
+
+Done!
+-----
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/0108032c/docs/en/edge/guide/plugin-development/index.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/guide/plugin-development/index.md b/docs/en/edge/guide/plugin-development/index.md
index ac027e9..c2ad4c7 100644
--- a/docs/en/edge/guide/plugin-development/index.md
+++ b/docs/en/edge/guide/plugin-development/index.md
@@ -107,3 +107,4 @@ simple Echo Plugin example discussed above.
- Developing a Plugin on iOS
- Developing a Plugin on Windows Phone
+The webOS and Tizen platforms currently do not support plugins.
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/0108032c/docs/en/edge/guide/whitelist/index.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/guide/whitelist/index.md b/docs/en/edge/guide/whitelist/index.md
index 340ca46..9e5b075 100644
--- a/docs/en/edge/guide/whitelist/index.md
+++ b/docs/en/edge/guide/whitelist/index.md
@@ -134,3 +134,39 @@ Access to [google.com][2]:
<access origin="http://google.com" />
+Tizen
+----------
+
+### Details
+
+The application root directory's `config.xml` file specifies domain
+whitelisting rules, using the `<access origin="..." />` element.
+For a complete reference, see the [Tizen Accessing External Network Resources documentation][10].
+
+### Syntax
+
+Access to [google.com][2]:
+
+ <access origin="http://google.com" subdomains="false" />
+
+Access to the secure [google.com][3] (`https://`):
+
+ <access origin="https://google.com" subdomains="false" />
+
+Access to all the subdomains on [google.com][2]:
+
+ <access origin="http://google.com" subdomains="true" />
+
+Access to all domains, including `file://` protocol:
+
+ <access origin="*" subdomains="true" />
+
+[1]: http://www.w3.org/TR/widgets-access/
+[2]: http://google.com
+[3]: https://google.com
+[4]: http://maps.google.com
+[5]: http://mail.google.com
+[6]: http://docs.google.com
+[7]: http://developer.mozilla.org
+[8]: https://developer.blackberry.com/html5/documentation/ww_developing/Access_element_834677_11.html
+[9]: https://developer.tizen.org/help/topic/org.tizen.help.gs/Creating%20a%20Project.html?path=0_1_1_4#8814682_CreatingaProject-AccessingExternalNetworkResources