You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ag...@apache.org on 2014/03/31 22:26:56 UTC
[29/31] REBASE
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/aff7c50c/docs/en/3.2.0/cordova/camera/camera.md
----------------------------------------------------------------------
diff --cc docs/en/3.2.0/cordova/camera/camera.md
index 0000000,ef0112c..5f9d9c3
mode 000000,100644..100644
--- a/docs/en/3.2.0/cordova/camera/camera.md
+++ b/docs/en/3.2.0/cordova/camera/camera.md
@@@ -1,0 -1,112 +1,112 @@@
+ ---
+ 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.
+ ---
+
+ # Camera
+
+ > The `camera` object provides access to the device's default camera application.
+
+ __WARNING__: Collection and use of images from a
+ device's camera raises important privacy issues. Your app's privacy
+ policy should discuss how the app uses the camera and whether the
+ images recorded are shared with any other parties. In addition, if
+ the app's use of the camera is not apparent in the user interface, you
+ should provide a just-in-time notice before the app accesses the
-camera (if the device operating system doesn't do so already). That
++camera, if the device operating system doesn't do so already. That
+ notice should provide the same information noted above, as well as
+ obtaining the user's permission (e.g., by presenting choices for
+ __OK__ and __No Thanks__). For more information, please see the
+ Privacy Guide.
+
+ ## Methods
+
+ - camera.getPicture
+ - camera.cleanup
+
+ ## 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 org.apache.cordova.camera
+ $ cordova plugin ls
+ [ 'org.apache.cordova.camera' ]
+ $ cordova plugin rm org.apache.cordova.camera
+
+ These commands apply to all targeted platforms, but modify the
+ platform-specific configuration settings described below:
+
+ * Amazon Fire OS
+
+ (in app/res/xml/config.xml)
+ <feature name="Camera">
+ <param name="android-package" value="org.apache.cordova.camera.CameraLauncher" />
+ </feature>
+
+ (in app/AndroidManifest)
+ <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+
+ * Android
+
+ (in app/res/xml/config.xml)
+ <feature name="Camera">
+ <param name="android-package" value="org.apache.cordova.camera.CameraLauncher" />
+ </feature>
+
+ (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/config.xml)
+ <feature id="blackberry.media.camera" />
+
+ <rim:permissions>
+ <rim:permit>use_camera</rim:permit>
+ </rim:permissions>
+
+ * iOS (in the named application directory's `config.xml`)
+
+ <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>
+
+ 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"/>
+
+ 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)
+
+ Some platforms may support this feature without requiring any special
+ configuration. See Platform Support for an overview.
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/aff7c50c/docs/en/3.2.0/cordova/geolocation/geolocation.md
----------------------------------------------------------------------
diff --cc docs/en/3.2.0/cordova/geolocation/geolocation.md
index 0000000,9b60832..68c5d48
mode 000000,100644..100644
--- a/docs/en/3.2.0/cordova/geolocation/geolocation.md
+++ b/docs/en/3.2.0/cordova/geolocation/geolocation.md
@@@ -1,0 -1,137 +1,137 @@@
+ ---
+ 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.
+ ---
+
+ # Geolocation
+
+ > The `geolocation` object provides access to location data based on the device's GPS sensor or inferred from network signals.
+
+ `Geolocation` provides information about the device's location, such as
+ latitude and longitude. Common sources of location information include
+ Global Positioning System (GPS) and location inferred from network
+ signals such as IP address, RFID, WiFi and Bluetooth MAC addresses,
+ and GSM/CDMA cell IDs. There is no guarantee that the API returns the
+ device's actual location.
+
+ This API is based on the
+ [W3C Geolocation API Specification](http://dev.w3.org/geo/api/spec-source.html),
+ and only executes on devices that don't already provide an implementation.
+
+ __WARNING__: Collection and use of geolocation data
+ raises important privacy issues. Your app's privacy policy should
+ discuss how the app uses geolocation data, whether it is shared with
+ any other parties, and the level of precision of the data (for
+ example, coarse, fine, ZIP code level, etc.). Geolocation data is
-generally considered sensitive because it can reveal user's
++generally considered sensitive because it can reveal users'
+ whereabouts and, if stored, the history of their travels.
+ Therefore, in addition to the app's privacy policy, you should
+ strongly consider providing a just-in-time notice before the app
+ accesses geolocation data (if the device operating system doesn't do
+ so already). That notice should provide the same information noted
+ above, as well as obtaining the user's permission (e.g., by presenting
+ choices for __OK__ and __No Thanks__). For more information, please
+ see the Privacy Guide.
+
+ ## Methods
+
+ - geolocation.getCurrentPosition
+ - geolocation.watchPosition
+ - geolocation.clearWatch
+
+ ## Arguments
+
+ - geolocationSuccess
+ - geolocationError
+ - geolocationOptions
+
+ ## Objects (Read-Only)
+
+ - Position
+ - PositionError
+ - Coordinates
+
+ ## 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 org.apache.cordova.geolocation
+ $ cordova plugin ls
+ [ 'org.apache.cordova.geolocation' ]
+ $ cordova plugin rm org.apache.cordova.geolocation
+
+ These commands apply to all targeted platforms, but modify the
+ platform-specific configuration settings described below:
+
+ * Amazon Fire OS
+
+ (in app/res/xml/config.xml)
+ <feature name="Geolocation">
+ <param name="android-package" value="org.apache.cordova.geolocation.GeoBroker" />
+ </feature>
+
+ (in app/AndroidManifest.xml)
+ <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+ <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+
+ * Android
+
+ (in app/res/xml/config.xml)
+ <feature name="Geolocation">
+ <param name="android-package" value="org.apache.cordova.geolocation.GeoBroker" />
+ </feature>
+
+ (in app/AndroidManifest.xml)
+ <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+ <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+
+ * BlackBerry WebWorks
+
+ (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>
+
+ * FirefoxOS (in the manifest.webapp file)
+
+ "permissions": {
+ "geolocation": { "description": "Used to position the map to your current position" }
+ }
+
+ * iOS (in the named application directory's `config.xml`)
+
+ <feature name="Geolocation">
+ <param name="ios-package" value="CDVLocation" />
+ </feature>
+
+ * Windows Phone (in `Properties/WPAppManifest.xml`)
+
+ <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)
+
+ Some platforms may support this feature without requiring any special
+ configuration. See Platform Support for an overview.
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/aff7c50c/docs/en/3.2.0/cordova/media/capture/capture.md
----------------------------------------------------------------------
diff --cc docs/en/3.2.0/cordova/media/capture/capture.md
index 0000000,a56154f..2f5d6ca
mode 000000,100644..100644
--- a/docs/en/3.2.0/cordova/media/capture/capture.md
+++ b/docs/en/3.2.0/cordova/media/capture/capture.md
@@@ -1,0 -1,164 +1,164 @@@
+ ---
+ 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.
+ ---
+
+ # Capture
+
+ > Provides access to the device's audio, image, and video capture capabilities.
+
+ __WARNING__: Collection and use of images, video, or
+ audio from the device's camera or microphone raises important privacy
+ issues. Your app's privacy policy should discuss how the app uses
+ such sensors and whether the data recorded is shared with any other
+ parties. In addition, if the app's use of the camera or microphone is
+ not apparent in the user interface, you should provide a just-in-time
-notice before the app accesses the camera or microphone (if the
-device operating system doesn't do so already). That notice should
++notice before the app accesses the camera or microphone, if the
++device operating system doesn't do so already. That notice should
+ provide the same information noted above, as well as obtaining the
+ user's permission (e.g., by presenting choices for __OK__ and __No
-Thanks__). Note that some app marketplaces may require your app to
++Thanks__). Note that some app marketplaces may require the app to
+ provide just-in-time notice and obtain permission from the user prior
+ to accessing the camera or microphone. For more information, please
+ see the Privacy Guide.
+
+ ## Objects
+
+ - Capture
+ - CaptureAudioOptions
+ - CaptureImageOptions
+ - CaptureVideoOptions
+ - CaptureCallback
+ - CaptureErrorCB
+ - ConfigurationData
+ - MediaFile
+ - MediaFileData
+
+ ## Methods
+
+ - capture.captureAudio
+ - capture.captureImage
+ - capture.captureVideo
+ - MediaFile.getFormatData
+
+ ## Scope
+
+ The `capture` object is assigned to the `navigator.device` object, and
+ therefore has global scope.
+
+ // The global capture object
+ var capture = navigator.device.capture;
+
+ ## Properties
+
+ - __supportedAudioModes__: The audio recording formats supported by the device. (ConfigurationData[])
+
+ - __supportedImageModes__: The recording image sizes and formats supported by the device. (ConfigurationData[])
+
+ - __supportedVideoModes__: The recording video resolutions and formats supported by the device. (ConfigurationData[])
+
+ ## Methods
+
+ - `capture.captureAudio`: Launch the device's audio recording application to record audio clips.
+
+ - `capture.captureImage`: Launch the device's camera application to take photos.
+
+ - `capture.captureVideo`: Launch the device's video recorder application to record videos.
+
+ ## Supported Platforms
+
+ - Amazon Fire OS
+ - Android
+ - BlackBerry WebWorks 5.0+
+ - iOS
+ - Windows Phone 7 and 8
+ - Windows 8
+
+ ## 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 org.apache.cordova.media-capture
+ $ cordova plugin ls
+ [ 'org.apache.cordova.file',
+ 'org.apache.cordova.media-capture']
+ $ cordova plugin rm org.apache.cordova.media-capture
+
+ These commands apply to all targeted platforms, but modify the
+ platform-specific configuration settings described below:
+
+ * Amazon Fire OS
+
+ (in app/res/xml/config.xml)
+ <feature name="File">
+ <param name="android-package" value="org.apache.cordova.file.FileUtils" />
+ </feature>
+ <feature name="Capture">
+ <param name="android-package" value="org.apache.cordova.mediacapture.Capture" />
+ </feature>
+
+ (in app/AndroidManifest.xml)
+ <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+ <uses-permission android:name="android.permission.RECORD_AUDIO" />
+ <uses-permission android:name="android.permission.RECORD_VIDEO" />
+
+ * Android
+
+ (in app/res/xml/config.xml)
+ <feature name="File">
+ <param name="android-package" value="org.apache.cordova.file.FileUtils" />
+ </feature>
+ <feature name="Capture">
+ <param name="android-package" value="org.apache.cordova.mediacapture.Capture" />
+ </feature>
+
+ (in app/AndroidManifest.xml)
+ <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+ <uses-permission android:name="android.permission.RECORD_AUDIO" />
+ <uses-permission android:name="android.permission.RECORD_VIDEO" />
+
+ * BlackBerry WebWorks
+
+ (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" />
+
+ * iOS (in the named application directory's `config.xml`)
+
+ <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>
+
+ Some platforms may support this feature without requiring any special
+ configuration. See Platform Support for an overview.
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/aff7c50c/docs/en/3.2.0/guide/platforms/blackberry/index.md
----------------------------------------------------------------------
diff --cc docs/en/3.2.0/guide/platforms/blackberry/index.md
index 0000000,51e1166..d9e6311
mode 000000,100644..100644
--- a/docs/en/3.2.0/guide/platforms/blackberry/index.md
+++ b/docs/en/3.2.0/guide/platforms/blackberry/index.md
@@@ -1,0 -1,213 +1,213 @@@
+ ---
+ 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.
+ ---
+
+ # BlackBerry Platform Guide
+
+ This guide shows you how to set up an SDK environment to target
+ applications for the BlackBerry platform prior to version 10. If you
+ want to target the most recent version, see the BlackBerry 10 Platform
+ Guide. See the following for more detailed platform-specific
+ information:
+
+ * BlackBerry Configuration
+ * Upgrading BlackBerry
+ * BlackBerry Plugins
+ * BlackBerry Command-line Tools
+
+ The command-line tools above refer to versions prior to Cordova 3.0.
+ See The Command-Line Interface for information about the
+ current interface.
+
+ ## Requirements and Support
+
+ This version of BlackBerry is not supported by the `cordova` utility
+ described in The Command-Line Interface, but by a separate set of
+ command-line tools. Download the Cordova distribution from
+ [cordova.apache.org](http://cordova.apache.org/#download).
+
+ Cordova for BlackBerry relies on the [BlackBerry WebWorks
+ framework](https://bdsc.webapps.blackberry.com/html5), which is
+ available for Windows XP (32-bit), Windows 7 (32-bit and 64-bit), and
+ Mac (OS X 10.6.4+). WebWorks applications can _only_ be deployed on
+ the following BlackBerry platforms:
+
+ * BlackBerry OS 5.0 and higher
+ * BlackBerry PlayBook
+ * BlackBerry 10 (QNX)
+
+ WebWorks requires the Java Development Kit (JDK). For Windows, use the
+ 32-bit version of
+ [Oracle JDK](http://www.oracle.com/technetwork/java/javase/downloads/index.html#jdk).
+ Java in installed by default on Mac OS X up to version 10.7, which
+ requires
+ [a separate installation](http://support.apple.com/kb/DL1421).
+ It also requires Apache Ant, which on Mac is part of the Java
+ installation. The Windows version is available from
+ [ant.apache.org](http://ant.apache.org/bindownload.cgi).
+
+ ## Install the SDK
+
+ Download and install the appropriate WebWorks SDK for your
+ development. BlackBerry PlayBook and BlackBerry Smartphone WebWorks
+ SDKs can be downloaded from the following locations.
+
+ - [BlackBerry PlayBook SDK] (https://developer.blackberry.com/html5/download/#playbook) and [Adobe Air SDK](http://www.adobe.com/devnet/air/air-sdk-download.html)
+
+ - [BlackBerry Smartphones SDK] (https://developer.blackberry.com/html5/download/#smartphones)
+
+ ## Register for Signing Keys
+
+ If you wish to publish your application on BlackBerry App World, or on
+ an actual device, you’ll need to register for a set of free Code
+ Signing Keys. To do so, complete the [BlackBerry Keys Order
+ Form](https://www.blackberry.com/SignedKeys).
+ Once you receive your Signing Keys, they require setup. See the [BlackBerry HTML5/WebWorks website](https://developer.blackberry.com/html5/documentation/signing_setup_bb10_apps_2008396_11.html) for information.
+
+ ## Install Cordova
+
+ Download and extract the latest copy of [Cordova](http://cordova.apache.org/#download).
+
+ ## Set up a New Project
+
+ - Open up a command-line terminal and navigate to where you extracted Cordova.
+
+ - There is a directory for each platform that Cordova supports.
+ Navigate to the `blackberry` directory.
+
+ - The `blackberry` directory contains several subdirectories. The
+ `example` directory contains a complete Cordova project. Copy the
+ `example` directory to another location on your computer, and
+ navigate there.
+
+ - Edit the `project.properties` file to specify the WebWorks SDK you
+ are using. For example, here are the respective settings for
+ BlackBerry PlayBook, BlackBerry Smartphone (OS5-7), or BlackBerry 10
+ (QNX):
+
+ playbook.bbwp.dir=C:\\Program Files\\Research In Motion\\BlackBerry WebWorks SDK for TabletOS 2.1.0.6\\bbwp
+ blackberry.bbwp.dir=C:\\Program Files\\Research In Motion\\BlackBerry WebWorks Packager
+ qnx.bbwp.dir=C:\\Program Files (x86)\\Research In Motion\\BlackBerry 10 WebWorks SDK 1.0.2.9
+
+ These correspond to parameters you specify when building your
+ project. The first time you run these commands, they generate a
+ "HelloWorld" application:
+
+ cordova/build playbook
+ cordova/build blackberry
+ cordova/build qnx
+
+ Along with the SDK, you also need to register for a code signing key
+ and debug token. The signing key allows you to distribute apps through
+ BlackBerry World. The debug token allows you to test unsigned apps on
+ a BlackBerry emulator or device. You do not need to create and
+ install the debug token yourself; if you supply the keystore password,
+ the build script creates and installs the debug token for you. To set
+ up the signing key, go to the BlackBerry website to obtain it, making
+ sure to retain the password you specify. Then run the
+ `blackberry-signer` utility that is included with the SDK.
+ BlackBerry provides more information here:
+
+ * [Register for your code signing key](https://www.blackberry.com/SignedKeys/codesigning.html)
+
+ * [Set up your computer for code signing](http://developer.blackberry.com/html5/documentation/set_up_for_signing.html)
+
+ * [comprehensive guide to setting up your SDK environment](http://developer.blackberry.com/native/documentation/bb10/com.qnx.doc.native_sdk.quickstart/topic/set_up_your_environment.html)
+
+ ## Deploy to Emulator
+
+ BlackBerry smartphone emulators are only available on Windows.
+ BlackBerry PlayBook emulators require VMWare Player (Windows) or
+ VMWare Fusion (Mac OS X). The WebWorks SDK provides a default
+ emulator, but additional emulators are [available through
+ BlackBerry](http://us.blackberry.com/developers/resources/simulators.jsp).
+
+ From your project directory, type `./cordova/run <target>`, replacing
+ `<target>` with either `qnx`, `playbook`, or `blackberry`. Note that
+ for BlackBerry 10 and PlayBook, the emulator virtual image must
+ already be started.
+
+ See the following for more information:
+
+ * [BlackBerry PlayBook](https://developer.blackberry.com/html5/documentation/using_the_tablet_simulator_1866980_11.html)
+
+ * [BlackBerry Smartphone](https://developer.blackberry.com/html5/documentation/run_your_app_on_smartphone_sim_1876976_11.html)
+
+ For BlackBerry Playbook, edit the `project.properties` file to
+ customize the `playbook.sim.ip` and `playbook.sim.password`
+ properties. The emulator's IP address is available through the
+ __Settings__ application on the home screen. Enable the __Security and
+ Privacy → Development Mode__ option to display the address. The
+ password can also be set in the __Security and Privacy__ tab.
+
+ For BlackBerry Smartphone, edit the `project.properties` file to
+ customize the `blackberry.sim.dir` and `blackberry.sim.bin`
+ properties. You need to escape path delimiters when specifying
+ directory paths on Windows, for example: `C:\\Program
+ Files\\BlackBerry\\Simulator`.
+
+ Once the emulator is installed and running, run either of the
+ following to install an application to the home screen:
+
+ cordova/run playbook
+ cordova/run blackberry
+
+ If you are prompted whether a device is connected to your computer,
+ answer no.
+
+ __NOTE__: On BlackBerry OS 5, the application is installed in the
+ `Downloads` directory.
+
+ ## Deploy to Device
+
-To deploy your app to a device, it must be connected, and you must be
++To deploy the app to a device, it must be connected, and you must be
+ registered for code signing keys as described above. Also, to deploy
+ apps on BlackBerry PlayBook, the __Settings → Security →
+ Development Mode__ option must be enabled.
+
+ On BlackBerry PlayBook, edit the `project.properties` file and modify
+ the following to reflect the device's IP and password as descibed
+ above, along with the signing key password you set up:
+
+ From your project directory, type `./cordova/run <target>`, replacing
+ `<target>` with either `qnx`, `playbook`, or `blackberry`.
+
+ On BlackBerry Smartphone (OS5-7), specify the
+ `blackberry.sigtool.password` property as the signing key password.
+
+ Then from the project's directory, run either of the commands you
+ would to view the app in an emulator:
+
+ cordova/run playbook
+ cordova/run blackberry
+
+ If you are prompted whether a device is connected to your computer,
+ answer yes.
+
+ __NOTE__: On BlackBerry OS 5, the application is installed in the
+ `Downloads` directory.
+
+ ## Additional Information
+
+ The following articles may help resolve common problems when
+ developing applications built for the BlackBerry WebWorks framework:
+
+ * [BlackBerry WebWorks Development Pitfalls](http://supportforums.blackberry.com/t5/Web-and-WebWorks-Development/Common-BlackBerry-WebWorks-development-pitfalls-that-can-be/ta-p/624712)
+
+ * [Best practices for packaging WebWorks applications](https://bdsc.webapps.blackberrycom/html5/documentation/ww_developing/bestpractice_compiling_ww_apps_1873324_11.html)
+
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/aff7c50c/docs/en/3.2.0/guide/platforms/blackberry/tools.md
----------------------------------------------------------------------
diff --cc docs/en/3.2.0/guide/platforms/blackberry/tools.md
index 0000000,7a3b3a5..1322fcf
mode 000000,100644..100644
--- a/docs/en/3.2.0/guide/platforms/blackberry/tools.md
+++ b/docs/en/3.2.0/guide/platforms/blackberry/tools.md
@@@ -1,0 -1,88 +1,88 @@@
+ ---
+ 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.
+ ---
+
-# BlackBerry Command-line Tools
++# BlackBerry Shell Tool Guide
+
+ The `cordova` command-line utility is a high-level tool that allows
+ you to build applications across several platforms at once. An older
+ version of the Cordova framework provides sets of command-line tools
+ specific to each platform. To use them as an alternative to the CLI,
+ you need to download this version of Cordova from
+ [cordova.apache.org](http://cordova.apache.org). The download contains
+ separate archives for each platform. Expand the platform you wish to
+ target. The tools described here are typically available in the
+ top-level `bin` directory, otherwise consult the __README__ file for
+ more detailed directions.
+
+ For information on the low-level command-line interface that enables
+ plugins, see Using Plugman to Manage Plugins. See Application Plugins
-for an overview.
++for details on how to develop plugins.
+
+ ## Create a Project
+
+ Run the `create` command, specifying the existing path to the project,
+ the reverse-domain-style package identifier, and the app's display
+ name. Here is the syntax for both Mac and Windows:
+
- $ /path/to/cordova-blackberry-webworks/bin/create /path/to/my_new_project com.example.project_name ProjectName
- $ /path/to/cordova-blackberry-webworks/bin/create.bat /path/to/my_new_project com.example.project_name ProjectName
++ $ /path/to/cordova-blackberry-webworks/bin/create /path/to/my_new_project com.example.project_name ProjectName
++ $ /path/to/cordova-blackberry-webworks/bin/create.bat /path/to/my_new_project com.example.project_name ProjectName
+
+ __NOTE__: The BlackBerry platform ignores the package name placeholder
+ (`com.example.project_name`), but it's still required for use by
+ cross-platform tools.
+
+ ## Build a Project
+
+ For BlackBerry projects, please make sure you customize the
+ `project.properties` file in your Cordova project's root directory.
+ You need to do so to supply your BlackBerry signing key password, and
+ specify locations for the BlackBerry WebWorks SDK and BlackBerry
+ emulator executables.
+
- $ /path/to/my_new_project/cordova/build <platform>
- $ /path/to/my_new_project/cordova/build.bat <platform>
++ $ /path/to/my_new_project/cordova/build <platform>
++ $ /path/to/my_new_project/cordova/build.bat <platform>
+
+ ## Launch Emulator
+
+ For BlackBerry projects, please make sure you customize the
+ `project.properties` file in the root of your Cordova project directory.
+ You need to do so to supply your BlackBerry signing key password, and
+ specify locations for the BlackBerry WebWorks SDK and BlackBerry
+ emulator executables.
+
- $ /path/to/my_new_project/cordova/run <platform>
++ $ /path/to/my_new_project/cordova/run <platform>
+
+ and then choose 'no' when prompted with:
+
- Do you have a BlackBerry device connected to your computer? (y/n)
- $ /path/to/my_new_project/cordova/run <platform>
++ Do you have a BlackBerry device connected to your computer? (y/n)
++ $ /path/to/my_new_project/cordova/run <platform>
+
+ and then choose 'no' when prompted with:
+
- Do you have a BlackBerry device connected to your computer? (y/n)
++ Do you have a BlackBerry device connected to your computer? (y/n)
+
+ ## Logging
+
+ Unfortunately, streaming logs directly from the device is currently
+ unsupported. However, BlackBerry offers built-in Web Inspector support
+ for Playbook and BlackBerry smartphone devices running BlackBerry OS
+ 7.0 and above. You can also access your application's logs (including
+ any calls to `console.log`) on your device by holding down the ''ALT''
+ key from the home screen and typing ''lglg'' keys.
+
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/aff7c50c/docs/en/3.2.0/guide/platforms/win8/tools.md
----------------------------------------------------------------------
diff --cc docs/en/3.2.0/guide/platforms/win8/tools.md
index 0000000,d6b1a1b..6e37f05
mode 000000,100644..100644
--- a/docs/en/3.2.0/guide/platforms/win8/tools.md
+++ b/docs/en/3.2.0/guide/platforms/win8/tools.md
@@@ -1,0 -1,50 +1,50 @@@
+ ---
+ 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.
+ ---
+
-# Windows 8 Command-line Tools
++# Windows 8 Shell Tool Guide
+
+ The `cordova` command-line utility is a high-level tool that allows
+ you to build applications across several platforms at once. An older
+ version of the Cordova framework provides sets of command-line tools
+ specific to each platform. To use them as an alternative to the CLI,
+ you need to download this version of Cordova from
+ [cordova.apache.org](http://cordova.apache.org). The download contains
+ separate archives for each platform. Expand the platform you wish to
+ target. The tools described here are typically available in the
+ top-level `bin` directory, otherwise consult the __README__ file for
+ more detailed directions.
+
+ For information on the low-level command-line interface that enables
+ plugins, see Using Plugman to Manage Plugins. See Application Plugins
+ for an overview.
+
+ ## Windows 8
+
+ The Windows 8 command-line tools only support creating new projects.
+ Commands must be run from a cmd or powershell prompt.
+
+ ## Create a Project
+
+ Run the `create` command with the following parameters:
+
+ * Path to your new Cordova Windows 8 project
+
+ * Package Name, following reverse-domain style convention. This becomes the default Namespace.
+
+ * Project name
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/aff7c50c/docs/en/3.3.0/guide/platforms/wp7/index.md
----------------------------------------------------------------------
diff --cc docs/en/3.3.0/guide/platforms/wp7/index.md
index 0000000,cfbd488..6c98fc7
mode 000000,100644..100644
--- a/docs/en/3.3.0/guide/platforms/wp7/index.md
+++ b/docs/en/3.3.0/guide/platforms/wp7/index.md
@@@ -1,0 -1,131 +1,131 @@@
+ ---
+ 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.
+ ---
+
+ # Windows Phone 7 Platform Guide
+
+ This guide shows how to set up your SDK development environment to
+ deploy Cordova apps for Windows Phone 7 devices. Apps also run on
+ Windows Phone 8 devices using the same APIs, but version 7 lacks some
+ of IE10's advanced features available on Windows Phone 8. Windows
+ Phone 8 apps do _not_ run on Windows Phone 7 devices.
+
+ See the following for more detailed platform-specific information that
+ applies to both versions:
+
+ * Upgrading Windows Phone
+ * Windows Phone Plugins
-* Windows Phone Command-line Tools
++* Windows Phone Shell Tool Guide
+
+ The command-line tools above refer to versions prior to Cordova 3.0.
+ See The Command-Line Interface for information about the
+ current interface.
+
+ ## System Requirements
+
+ Use Windows 7 or Windows 8 (Pro) or Windows Vista with SP2. The
+ 64-bit version (x64) of Windows is required for the SDK. The Pro
+ version is recommended for running a device emulator.
+
+ Register and pay for a [Windows Phone Dev
+ Center](http://dev.windowsphone.com/en-us/publish) account if you want
+ to install an app on a real device or submit it to Market Place.
+
+ __NOTE__: Running the SDK in Virtual Machine may present challenges.
+ Read [Windows Phone on a Mac](http://aka.ms/BuildaWP8apponaMac) for
+ insights on developing solutions.
+
+ ## Install SDK and Cordova
+
+ Download and install the [Windows Phone
+ SDK](http://www.microsoft.com/download/en/details.aspx?displaylang=en&id=27570/).
+
+ Download and extract the latest copy of
+ [Cordova](http://phonegap.com/download). You need to work in the
+ `lib\windows-phone-8\wp7` subdirectory, `lib\windows-phone-8\wp8`
+ contains the Windwos Phone 8 version of Cordova.
+
+ Copy the `CordovaWP7_x_x_x.zip` file to the `\My Documents\Visual
+ Studio 2012\Templates\ProjectTemplates\` directory.
+
+ ## Building the Template
+
+ __NOTE__: Skip this step if the `lib\windows-phone` directory already
+ contains a `CordovaWP7_x_x_x.zip` file.
+
+ To simplify development, Cordova bundles a script to build Visual
+ Studio templates. These allow you to rapidly generate Cordova apps,
+ and you can modify them if necessary. The steps below show how to
+ generate it.
+
+ ### Run the Batch File to Create and Install the Templates
+
+ The root of the repo contains a `createTemplates.bat` file.
+ Double-clicking this file generates two `.zip` files:
+ `CordovaWP7_x_x_x.zip` and `CordovaWP8_x_x_x.zip`, where _3.3.0_ is
+ the current version number. To use these files easily in Visual
+ Studio, copy them to the `My Documents\Visual Studio
+ 2012\Templates\ProjectTemplates\` subdirectory. You are then able to
+ create new __Apache Cordova Windows Phone_ apps from Visual Studio's
+ __File → New Project__ menu.
+
+ If you run the batch file from the command line, you can also call
+ with a parameter to install automatically:
+
+ >createTemplates.bat -install
+
+ ## Set up a New Project
+
+ - Open Visual Studio Express for Windows Phone and choose __New
+ Project__.
+
+ - Select __CordovaWP7__. The version number displays in the template
+ description.
+
+ - Give the project a name, and select __OK__.
+
+ ## Review the Project Structure
+
+ The `www` directory features `html`, `js`, and `css` subdirectories
-and any other resources your app requires.
++and any other resources the app requires.
+ Any additional content needs to be a part of the Visual Studio
+ project, and it must be set as content.
+
+ The following sample structure represents a 2.3.0 project, but may
+ vary depending on installed version:
+
+ 
+
+ ## Build the Project for the Device
+
+ Before testing your application on a device, the device must be
+ registered. Consult
+ [Microsoft's documentation](http://msdn.microsoft.com/en-us/library/windowsphone/develop/ff402565(v=vs.105).aspx)
+ for details on how to deploy and test on Windows Phone 7. These are
+ the basic steps:
+
+ - Make sure your phone is connected, and the screen is unlocked.
+
+ - In Visual Studio, select __Device__ from the drop-down menu at the top.
+
+ - Press the green __play__ button next to the main drop-down menu to
+ start debugging, or else type __F5__.
+
+ 
+
+ At this point, you're done.
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/aff7c50c/docs/en/3.3.0/guide/platforms/wp8/tools.md
----------------------------------------------------------------------
diff --cc docs/en/3.3.0/guide/platforms/wp8/tools.md
index 0000000,6294231..2ca3f45
mode 000000,100644..100644
--- a/docs/en/3.3.0/guide/platforms/wp8/tools.md
+++ b/docs/en/3.3.0/guide/platforms/wp8/tools.md
@@@ -1,0 -1,113 +1,120 @@@
+ ---
+ 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.
+ ---
+
-# Windows Phone Command-line Tools
-
-The `cordova` command-line utility is a high-level tool that allows
-you to build applications across several platforms at once. An older
-version of the Cordova framework provides sets of command-line tools
-specific to each platform. To use them as an alternative to the CLI,
-you need to download this version of Cordova from
-[cordova.apache.org](http://cordova.apache.org). The download contains
-separate archives for each platform. Expand the platform you wish to
-target. The tools described here are typically available in the
-top-level `bin` directory, otherwise consult the __README__ file for
-more detailed directions.
-
-For information on the low-level command-line interface that enables
-plugins, see Using Plugman to Manage Plugins. See Application Plugins
-for an overview.
++# Windows Phone Shell Tool Guide
++
++This guide shows how to use Cordova's set of platform-centered shell
++tools to develop Windows Phone apps for both versions 7 and 8. This
++development path, discussed in the Overview, may offer you a greater
++range of development options for the Windows Phone platform than the
++cross-platform CLI tool described in The Command-Line Interface.
++Before using either development path, you must first configure the SDK
++environment as described in the Windows Phone 7 Platform Guide or
++the Windows Phone 8 Platform Guide.
++
++To enable shell tools for Windows Phone development, download Cordova
++from [cordova.apache.org](http://cordova.apache.org). The download
++contains separate archives for each platform. Expand each you wish to
++target, `wp8` in this case, which in turn is forked into `wp7` and
++`wp8` subdirectories. The relevant tools are typically available
++in the top-level `bin` directory, otherwise consult the __README__
++file for more detailed directions.
++
++These tools allow you to create, build, and run apps. For information
++on the all-purpose command-line interface that enables plugin
++features, see Using Plugman to Manage Plugins. See Application Plugins
++for details on how to develop plugins.
+
+ ## Windows Phone
+
+ The Windows Phone command-line tools support creating, building, and
+ running new projects. Commands must be run from a cmd or powershell
+ prompt.
+
-The WP8 repo now includes code for building both WP7 + WP8 apps. The
++The `WP8` repo now includes code to build both WP7 and WP8 apps. The
+ repo has subdirectories for each: `wp7/` and `wp8/`.
+
+ ## Create a Project
+
+ There are 2 ways to go about creating a new Apache Cordova WP7 or WP8 application.
+
+ ### Run the Batch File to Create and Install the Templates
+
+ - The root of the repo contains a `createTemplates.bat` file.
+ Double-clicking it generates two `.zip` files:
+ `CordovaWP7_x_x_x.zip` and `CordovaWP8_x_x_x.zip`, where _3.3.0_
+ represents the current version number. To easily use these files in
+ Visual Studio, copy them to `My Documents\Visual Studio
+ 2012\Templates\ProjectTemplates\`. You are then able to create
+ new Apache Cordova Windows Phone apps from Visual Studio's
+ __File → New Project__ menu.
+
+ - If you run the batch file from the command line, you can also call with a parameter to install automatically
+
+ Run the script :
+
- >createTemplates.bat -install
++ >createTemplates.bat -install
+
+ ### Use the Create Scripts on the Command Line
+
+ Run the `create` command, specifying the existing path to the project,
+ the reverse-domain-style package identifier, and the app's display
+ name. Here is the syntax for both Windows Phone 7 and 8:
+
- >.\wp7\bin\create PathToNewProject [ PackageName ] [ AppName ]
- >.\wp8\bin\create PathToNewProject [ PackageName ] [ AppName ]
++ >.\wp7\bin\create PathToNewProject [ PackageName ] [ AppName ]
++ >.\wp8\bin\create PathToNewProject [ PackageName ] [ AppName ]
+
- >PathToNewProject : The path to where you wish to create the project
- >PackageName : The namespace for the project (default is Cordova.Example)
- >AppName : The name of the application (default is CordovaWP8AppProj or CordovaWP7AppProj)
++ >PathToNewProject : The path to where you wish to create the project
++ >PackageName : The namespace for the project (default is Cordova.Example)
++ >AppName : The name of the application (default is CordovaWP8AppProj or CordovaWP7AppProj)
+
- >examples:
- >.\wp7\bin\create C:\path\to\my_new_project
- >.\wp8\bin\create C:\path\to\my_new_project io.cordova.example CordovaWP8App
++ >examples:
++ >.\wp7\bin\create C:\path\to\my_new_project
++ >.\wp8\bin\create C:\path\to\my_new_project io.cordova.example CordovaWP8App
+
+ Launch Visual Studio and open Solution file (.sln) in (C:\path\to\my_new_project)
+
+ Build and Run it
+
+ ## Building the Project (Clean, then Build)
+
+ * Debug
+
- $ C:\path\to\my_new_project\cordova\build --debug
++ $ C:\path\to\my_new_project\cordova\build --debug
+
+ * Release
+
- $ C:\path\to\my_new_project\cordova\build --release
++ $ C:\path\to\my_new_project\cordova\build --release
+
+ ## Running the App
+
+ Run the 'run' command with the following *optional* parameters
+
+ * Target specification. This includes `--emulator`, `--device`, or `--target=<targetID>`.
+
+ * Build specification. This includes `--debug`, `--release`, or `--nobuild`.
+
- $ C:\path\to\my_new_project\cordova\run [Target] [Build]
++ $ C:\path\to\my_new_project\cordova\run [Target] [Build]
+
+ By default the `run` command is called with `--emulator --debug` if flags are not provided.
+
+ ## Cleaning
+
- $ C:\path\to\my_new_project\cordova\clean
++ $ C:\path\to\my_new_project\cordova\clean
+
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/aff7c50c/docs/en/edge/guide/appdev/whitelist/index.md
----------------------------------------------------------------------
diff --cc docs/en/edge/guide/appdev/whitelist/index.md
index be0c104,4e5e484..77f47ad
--- a/docs/en/edge/guide/appdev/whitelist/index.md
+++ b/docs/en/edge/guide/appdev/whitelist/index.md
@@@ -126,19 -131,17 +131,31 @@@ ways
(For more information on support, see BlackBerry's documentation on the
[access element][8].)
- ## iOS
-
- ### Changed in 3.1.0:
+ ## iOS Changes in 3.1.0
- Prior to version 3.1.0, Cordova-iOS included some non-standard extensions to the domain whilelisting scheme supported by other Cordova platforms. As of 3.1.0, the iOS whitelist now conforms to the resource whitelist syntax described at the top of this document. If you upgrade from pre-3.1.0, and you were using these extensions, you may have to change the `config.xml` file in order to continue whitelisting the same set of resources as before.
-Prior to version 3.1.0, Cordova-iOS included some non-standard extensions to the domain whitelisting scheme supported by other Cordova platforms. As of 3.1.0, the iOS whitelist now conforms to the resource whitelist syntax described at the top of this document. If you upgrade from pre-3.1.0, and you were using these extensions, you may have to change your `config.xml` file in order to continue whitelisting the same set of resources as before.
++Prior to version 3.1.0, Cordova-iOS included some non-standard
++extensions to the domain whilelisting scheme supported by other
++Cordova platforms. As of 3.1.0, the iOS whitelist now conforms to the
++resource whitelist syntax described at the top of this document. If
++you upgrade from pre-3.1.0, and you were using these extensions, you
++may have to change the `config.xml` file in order to continue
++whitelisting the same set of resources as before.
Specifically, these patterns need to be updated:
- * "`apache.org`" (no protocol): This would previously match `http`, `https`, `ftp`, and `ftps` protocols. Change to "`*://apache.org/*`" to include all protocols, or include a line for each protocol you need to support.
-- `apache.org` (no protocol): This would previously match `http`, `https`, `ftp`, and `ftps` protocols. Change to "`*://apache.org/*`" to include all protocols, or include a line for each protocol you need to support.
++* "`apache.org`" (no protocol): This would previously match `http`,
++ `https`, `ftp`, and `ftps` protocols. Change to "`*://apache.org/*`"
++ to include all protocols, or include a line for each protocol you
++ need to support.
- * "`http://apache.*`" (wildcard at end of domain): This would previously match all top-level-domains, including all possible two-letter TLDs (but not useful domains like .co.uk). Include a line for each TLD which you actually control, and need to whitelist.
-- `http://apache.*` (wildcard at end of domain): This would previously match all top-level-domains, including all possible two-letter TLDs (but not useful domains like .co.uk). Include a line for each TLD which you actually control, and need to whitelist.
++* "`http://apache.*`" (wildcard at end of domain): This would
++ previously match all top-level-domains, including all possible
++ two-letter TLDs (but not useful domains like .co.uk). Include a line
++ for each TLD which you actually control, and need to whitelist.
- * "`h*t*://ap*he.o*g`" (wildcards for random missing letters): These are no longer supported; change to include a line for each domain and protocol that you actually need to whitelist.
-- `h*t*://ap*he.o*g` (wildcards for random missing letters): These are no longer supported; change to include a line for each domain and protocol that you actually need to whitelist.
++* "`h*t*://ap*he.o*g`" (wildcards for random missing letters): These
++ are no longer supported; change to include a line for each domain
++ and protocol that you actually need to whitelist.
## Windows Phone Whitelisting
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/aff7c50c/docs/en/edge/guide/hybrid/plugins/index.md
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/aff7c50c/docs/en/edge/guide/overview/index.md
----------------------------------------------------------------------
diff --cc docs/en/edge/guide/overview/index.md
index 15c7405,784df71..9664020
--- a/docs/en/edge/guide/overview/index.md
+++ b/docs/en/edge/guide/overview/index.md
@@@ -70,48 -71,56 +71,57 @@@ communicate between Cordova and custom
## Development Paths
- The easiest way to set up an application is to run the `cordova`
- command-line utility, also known as the _command-line interface_
- (CLI). (To install the CLI, see The Command-line Interface.)
- Depending on the set of platforms you wish to target, you can rely on
- the CLI for progressively greater shares of the development cycle:
-
- * In the most basic scenario, you can use the CLI simply to create a
- new project that is populated with default configuration for you to
- modify.
-
- * For many mobile platforms, you can also use the CLI to set up
- additional project files required to compile within each SDK. For
- this to work, you must install each targeted platform's SDK.
- (See the Platform Guides for instructions.)
- As indicated in the Platform Support table, you may need to
- run the CLI on different operating systems depending on the targeted
- platform.
-
- * For supporting platforms, the CLI can compile executible
- applications and run them in an SDK-based device emulator.
- <!-- XREF
- (See Application Development Guide for details.)
- XREF -->
- For comprehensive testing, you can also generate application files
- and install them directly on a device.
-
- At any point in the development cycle, you can also rely on
- platform-specific SDK tools, which may provide a richer set of
- options.
- (See the Platform Guides for details about each platform's SDK tool set.)
- An SDK environment is more appropriate if you want implement a hybrid
- app that mixes web-based and native application components.
- <!-- XREF
- (See Hybrid Application Guide for more information.)
- XREF -->
- You may use the command-line utility to initially generate the app, or
- iteratively thereafter to feed updated code to SDK tools. You may
- also build the app's configuration file yourself.
- (See The config.xml File for details.)
-
- <!-- XREF
- To build projects on some platforms, you may need to apply digital signatures.
- See Distributing Applications for information on how to upload the app to various store portals.
- XREF -->
+ As of version 3.0, you can use two basic workflows to create a mobile
+ app. While you can often use either workflow to accomplish the same
+ task, they each offer advantages:
+
+ - __Cross-platform workflow__: Use this workflow if you want your app
+ to run on as many different mobile operating systems as possible,
+ with little need for platform-specific development. This workflow
+ centers around the `cordova` utility, otherwise known as the Cordova
+ _CLI_, that was introduced with Cordova 3.0. The CLI is a high-level
+ tool that allows you to build projects for many platforms at once,
+ abstracting away much of the functionality of lower-level shell
+ scripts. The CLI copies a common set of web assets into
+ subdirectories for each mobile platform, makes any necessary
+ configuration changes for each, runs build scripts to generate
+ application binaries. The CLI also provides a common interface to
+ apply plugins to your app. (For details on the CLI, see The
+ Command-Line Interface.)
+
+ - __Platform-centered workflow__: Use this workflow if you want to
+ focus on building an app for a single platform and need to be able
+ to modify it at a lower level. You need to use this approach, for
+ example, if you want your app to mix custom native components with
+ web-based Cordova components, as discussed in Embedding WebViews.
+ As a rule of thumb, use this workflow if you need to modify the
+ project within the SDK. This workflow relies on a set of
+ lower-level shell scripts that are tailored for each supported
+ platform, and a separate Plugman utility that allows you to apply
+ plugins. While you can use this workflow to build cross-platform
+ apps, it is generally more difficult because the lack of a
+ higher-level tool means separate build cycles and plugin
+ modifications for each platform. Still, this workflow allows you
+ greater access to development options provided by each SDK, and is
+ essential for complex hybrid apps. (See the various Platform Guides
+ for details on each platform's available shell utilities.)
+
+ When first starting out, it may be easiest to use the cross-platform
+ workflow to create an app, as described in The Command-line Interface.
+ You then have the option to switch to a platform-centered workflow if
+ you need the greater control the SDK provides. Lower-level shell
+ utilities are available at
+ [cordova.apache.org](http://cordova.apache.org) in a separate
+ distribution than the CLI. For projects initially generated by the
+ CLI, these shell tools are also available in the project's various
+ `platforms/*/cordova` directories.
+
+ __NOTE__: Once you switch from the CLI-based workflow to one centered
+ around the platform-specific SDKs and shell tools, you can't go back.
+ The CLI maintains a common set of cross-platform source code, which on
+ each build it uses to write over platform-specific source code. To
+ preserve any modifications you make to the platform-specific assets,
+ you need to switch to the platform-centered shell tools, which ignore
+ the cross-platform source code, and instead relies on the
+ platform-specific source code.
+
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/aff7c50c/docs/en/edge/guide/platforms/android/index.md
----------------------------------------------------------------------
diff --cc docs/en/edge/guide/platforms/android/index.md
index b65c814,75315ac..44b7ed1
--- a/docs/en/edge/guide/platforms/android/index.md
+++ b/docs/en/edge/guide/platforms/android/index.md
@@@ -35,60 -48,58 +35,62 @@@ Cordova supports Android 2.2, 2.3, and
platforms are deprecated as they dip below 5% on Google's
[distribution dashboard](http://developer.android.com/about/dashboards/index.html).
-<!--
-NOTE, doc said:
-- Android 2.1 (Deprecated May 2013)
-- Android 3.x (Deprecated May 2013)
--->
+## Install Cordova Shell Tools
-Developers should use the `cordova` utility in conjunction with
-the Android SDK. See The Command-Line Interface for
-information how to install it, add projects, then build and deploy a
-project.
+If you want to use Cordova's Android-centered shell tools in
+conjunction with the SDK, download Cordova from
+[cordova.apache.org](http://cordova.apache.org). Otherwise ignore this
+section if you plan to use the cross-platform CLI tool described in
+The Command-Line Interface.
+
+The Cordova download contains separate archives for each platform. Be
+sure to expand the appropriate archive, `android` in this case, within
+an empty directory. The relevant executible utilities are available
+in the top-level `bin` directory. (Consult the __README__ file if
+necessary for more detailed directions.)
+
+These shell tools allow you to create, build, and run Android apps.
+For information on the additional command-line interface that enables
+plugin features across all platforms, see Using Plugman to Manage
+Plugins. See Application Plugins for details on how to develop
+plugins.
- ## Install the SDK
-
Install the Android SDK from
- [developer.android.com/sdk](http://developer.android.com/sdk/). You
- may be presented with a choice of where to install the SDK, otherwise
- move the downloaded `adt-bundle` tree to wherever you store
- development tools.
+ [developer.android.com/sdk](http://developer.android.com/sdk/). The android sdk
+ is distributed as an 'adt-bundle-<os>-<arch>-<ver>' file.
+ On windows, the adt-bundle is packaged with an installer.
+ On OSX and Linux, simply unpack the 'adt-bundle' in the location you store development tools.
+ [More detailed information on Android SDK setup can be found here](http://developer.android.com/sdk/installing/bundle.html)
+
-For Cordova command-line tools to work, you need to include the SDK's
-`tools` and `platform-tools` directories in your PATH environment. You also
-will need `java` and `ant`. You may already have `java` and `ant` in your
-PATH environment, try invoking them from a command line prompt to see if they
-are missing, and add only what is missing to your PATH. Be aware that Mavericks
-omits `ant` as compared to previous versions of OSX, so you may need to
-install `ant` separately if you are using Mavericks or later of OSX. On
-OSX or Linux, you can use a text editor to create or modify the
-`~/.bash_profile` file, adding a line such as the following (modify the
-locations to where the SDK is installed on your workstation):
+For Cordova command-line tools to work, or the CLI that is based upon
+them, you need to include the SDK's `tools` and `platform-tools`
+directories in your `PATH`. On a Mac, you can use a text editor to
+create or modify the `~/.bash_profile` file, adding a line such as the
+following, depending on where the SDK installs:
- export PATH=${PATH}:/Development/adt-bundle/sdk/platform-tools:/Development/adt-bundle/sdk/tools
+ export PATH=${PATH}:/Development/adt-bundle/sdk/platform-tools:/Development/adt-bundle/sdk/tools
- This exposes SDK tools in newly opened terminal windows. Otherwise run
- this to make them available in the current session:
+ Add the paths for `java` and `ant` if needed. This line in `~/.bash_profile`
+ exposes these tools in newly opened terminal windows. If your terminal
+ window is already open in OSX, or to avoid a logout/login on Linux, run
+ this to make them available in the current terminal window:
- $ source ~/.bash_profile
+ $ source ~/.bash_profile
-To modify the PATH environment on Windows:
+To modify the `PATH` environment on Windows 7:
-* Click on the __Start__ menu in the lower-left corner of the desktop,
- right-click on __Computer__, then click __Properties__.
+1. Click on the __Start__ menu in the lower-left corner of the desktop,
+ right-click on __Computer__, then select __Properties__.
-* Click __Advanced System Settings__ in the column on the left.
+1. Select __Advanced System Settings__ in the column on the left.
-* In the resulting dialog box, press __Environment Variables__.
+1. In the resulting dialog box, press __Environment Variables__.
-* Select the __PATH__ variable and press __Edit__.
+1. Select the __PATH__ variable and press __Edit__.
-* Append the following to the PATH based on where you installed the
- SDK, for example:
+1. Append the following to the `PATH` based on where you installed the
+ SDK, for example:
;C:\Development\adt-bundle\sdk\platform-tools;C:\Development\adt-bundle\sdk\tools
@@@ -243,19 -197,44 +245,48 @@@ If instead you are working within Eclip
choose __Run As → Android Application__. You may be asked to
specify an AVD if none are already open.
- For a faster experience, use an Intel-based emulator image:
+ For a faster experience, you can use the `Virtual Machine Acceleration` to improve
+ the execution speed.
+ Many modern CPUs provide extensions to execute Virtual Machines more efficiently.
+ Before attempting to use this type of acceleration, you need to determine if your
+ current development system's CPU, supports one the following virtualization technologies:
+
+ * __Intel Virtualization Technology__ (VT-x, vmx) → [Intel VT-x supported processor list](http://ark.intel.com/products/virtualizationtechnology)
+ * __AMD Virtualization__ (AMD-V, SVM), only supported for Linux (Since May 2006, all CPUs AMD include AMD-V, except Sempron).
+
+ Another way to find out if your Intel processor supports VT-x Technology, it's by executing the
+ `Intel Processor Identification Utility`, for `Windows`you can download it from the Intel [Download Center](https://downloadcenter.intel.com/Detail_Desc.aspx?ProductID=1881&DwnldID=7838),
+ or you can use the [booteable utility](https://downloadcenter.intel.com/Detail_Desc.aspx?ProductID=1881&DwnldID=7840&lang=eng), which is `OS Independent`.
+
+ After install and execute the `Intel Processor Identification Utility` over Windows, you will get the following window,
+ in order to check if your CPU supports the Virtualization Technologies:
+
+ 
+
+ In order to speed up the emulator, you need to download and install one or more `Intel x86 Atom` System Images,
+ as well as the `Intel Hardware Accelerated Execution Manager (HAXM)`.
+
+ Open your Android SDK Manager, and select the `Intel x86 Atom` System Image, for whichever version that you want to test. Then go to `Extras`
+ and select `Intel x86 Emulator Accelerator (HAXM)`, and install those packages:
+
+ 
+
+ After download, run the Intel installer, which is available within your
+ Android SDK at `extras/intel/Hardware_Accelerated_Execution_Manager`.
+ __Note__:`If you have any problems installing the package, you can find more information and step by step guidance check this`
+ [Intel Article](http://software.intel.com/en-us/android/articles/speeding-up-the-android-emulator-on-intel-architecture).
-Once installed, in order to test it, create new a AVD with the `CPU/ABI` set to an `Intel (Atom) x86` Image:
+1. Install one or more `Intel x86 Atom` System Images as well as the
+ `Intel Hardware Accelerated Execution Manager`, available under
+ __Extras__.
-
+1. Run the Intel installer, which is available within your Android SDK
+ at `extras/intel/Hardware_Accelerated_Execution_Manager`.
-If you are using `Linux-based system`, follow the instructions in the [Android Developer Site](http://developer.android.com/tools/devices/emulator.html#vm-linux).
+1. Create a new AVD with the target set to an Intel image.
-When starting the emulator, ensure there are no error messages indicating a failure to load HAXM modules.
+1. When starting the emulator, ensure there are no error messages
+ indicating a failure to load HAX modules.
## Deploy to Device
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/aff7c50c/docs/en/edge/guide/platforms/android/tools.md
----------------------------------------------------------------------
diff --cc docs/en/edge/guide/platforms/android/tools.md
index d278e52,e624089..029ee0e
--- a/docs/en/edge/guide/platforms/android/tools.md
+++ b/docs/en/edge/guide/platforms/android/tools.md
@@@ -17,31 -17,24 +17,31 @@@ license: Licensed to the Apache Softwar
under the License.
---
-# Android Command-line Tools
-
-The `cordova` command-line utility is a high-level tool that allows
-you to build applications across several platforms at once. An older
-version of the Cordova framework provides sets of command-line tools
-specific to each platform. To use them as an alternative to the CLI,
-you need to download this version of Cordova from
+# Android Shell Tool Guide
+
+This guide shows how to use Cordova's set of platform-centered shell
+tools to develop Android apps. This development path, discussed in the
+Overview, may offer you a greater range of development options than
+the cross-platform CLI tool described in The Command-Line Interface.
+For example, you need to use shell tools when deploying a custom
+Cordova WebView alongside native components. Before using either
+development path, you must first configure the Android SDK environment
+as described in the Android Platform Guide.
+
+To enable shell tools for Android, download Cordova from
[cordova.apache.org](http://cordova.apache.org). The download contains
-separate archives for each platform. Expand the platform you wish to
-target. The tools described here are typically available in the
-top-level `bin` directory, otherwise consult the __README__ file for
-more detailed directions.
+separate archives for each platform. Expand each you wish to target,
+`android` in this case. The relevant tools are typically available in
+the top-level `bin` directory, otherwise consult the __README__ file
+for more detailed directions.
-For information on the low-level command-line interface that enables
-plugins, see Using Plugman to Manage Plugins. See Application Plugins
-for an overview.
+These tools allow you to create, build, and run Android apps. For
+information on the additional command-line interface that enables
+plugin features across all platforms, see Using Plugman to Manage
+Plugins. See Application Plugins for details on how to develop
+plugins.
- ## Create a project
+ ## Create a Project
Run the `create` command, specifying the existing path to the project,
the reverse-domain-style package identifier, and the app's display