You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by mw...@apache.org on 2013/07/15 19:58:02 UTC
[3/6] docs commit: [CB-3962] Change 'simulator' to 'emulate'.
[CB-3962] Change 'simulator' to 'emulate'.
Project: http://git-wip-us.apache.org/repos/asf/cordova-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-docs/commit/fa94a8e0
Tree: http://git-wip-us.apache.org/repos/asf/cordova-docs/tree/fa94a8e0
Diff: http://git-wip-us.apache.org/repos/asf/cordova-docs/diff/fa94a8e0
Branch: refs/heads/master
Commit: fa94a8e0312ae56ffd4f4ff12cdaff846a716b40
Parents: 197b50d
Author: Mike Sierra <le...@gmail.com>
Authored: Mon Jul 15 11:42:11 2013 -0400
Committer: Michael Brooks <mi...@michaelbrooks.ca>
Committed: Mon Jul 15 10:56:14 2013 -0700
----------------------------------------------------------------------
STYLESHEET.md | 5 ++---
.../geolocation/parameters/geolocation.options.md | 2 +-
docs/en/edge/guide/cli/index.md | 10 +++++-----
docs/en/edge/guide/overview/index.md | 3 +--
docs/en/edge/guide/platforms/blackberry/index.md | 12 ++++++------
docs/en/edge/guide/platforms/blackberry/tools.md | 6 +++---
docs/en/edge/guide/platforms/blackberry10/index.md | 14 +++++++-------
docs/en/edge/guide/platforms/blackberry10/tools.md | 12 ++++++------
docs/en/edge/guide/platforms/ios/index.md | 4 ++--
9 files changed, 33 insertions(+), 35 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/fa94a8e0/STYLESHEET.md
----------------------------------------------------------------------
diff --git a/STYLESHEET.md b/STYLESHEET.md
index 63fa221..2dd9f68 100644
--- a/STYLESHEET.md
+++ b/STYLESHEET.md
@@ -109,9 +109,8 @@ editorial guidelines.
* Mac "OS X", not "OSX"
-* Prefer "simulator" over "emulator"; clarify when interfaces refer to
- them differently. (Simulators more robustly model a device's
- internal state rather than its outward appearance.)
+* Prefer "emulator" over "simulator"; clarify when interfaces refer to
+ them differently.
* Prefer generic "SDK" over "IDE", or "SDK tools" when referring to
dedicated GUI coding environments such as Eclipse. (OK to refer to
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/fa94a8e0/docs/en/edge/cordova/geolocation/parameters/geolocation.options.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/cordova/geolocation/parameters/geolocation.options.md b/docs/en/edge/cordova/geolocation/parameters/geolocation.options.md
index ba6cd54..74353f4 100644
--- a/docs/en/edge/cordova/geolocation/parameters/geolocation.options.md
+++ b/docs/en/edge/cordova/geolocation/parameters/geolocation.options.md
@@ -35,5 +35,5 @@ Options
Android Quirks
--------------
-Android 2.x simulators do not return a geolocation result unless the `enableHighAccuracy` option is set to `true`.
+Android 2.x emulators do not return a geolocation result unless the `enableHighAccuracy` option is set to `true`.
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/fa94a8e0/docs/en/edge/guide/cli/index.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/guide/cli/index.md b/docs/en/edge/guide/cli/index.md
index 62761a8..865ff0c 100644
--- a/docs/en/edge/guide/cli/index.md
+++ b/docs/en/edge/guide/cli/index.md
@@ -244,11 +244,11 @@ on the Device, below.
## View the App in an Emulator
-SDKs for mobile platforms come bundled with emulators that execute a
-device image, so that you can launch the app from the home screen and
-see how it interacts with many platform features. Run a command such
-as the following to rebuild the app and view it within a specific
-platform's emulator:
+SDKs for mobile platforms often come bundled with emulators that
+execute a device image, so that you can launch the app from the home
+screen and see how it interacts with many platform features. Run a
+command such as the following to rebuild the app and view it within a
+specific platform's emulator:
$ cordova emulate android
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/fa94a8e0/docs/en/edge/guide/overview/index.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/guide/overview/index.md b/docs/en/edge/guide/overview/index.md
index f138ed6..856ae82 100644
--- a/docs/en/edge/guide/overview/index.md
+++ b/docs/en/edge/guide/overview/index.md
@@ -89,8 +89,7 @@ the CLI for progressively greater shares of the development cycle:
platform.
* For supporting platforms, the CLI can compile executible
- applications and run them in an SDK- or browser-based device
- emulator, depending on the device feature you want to test.
+ applications and run them in an SDK-based device emulator.
<!-- XREF
(See API and Configuration Guide for details.)
XREF -->
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/fa94a8e0/docs/en/edge/guide/platforms/blackberry/index.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/guide/platforms/blackberry/index.md b/docs/en/edge/guide/platforms/blackberry/index.md
index e17416d..5200a7a 100644
--- a/docs/en/edge/guide/platforms/blackberry/index.md
+++ b/docs/en/edge/guide/platforms/blackberry/index.md
@@ -95,9 +95,9 @@ BlackBerry Smartphone (OS5-7)
7A. Deploy to Simulator
--------------------------------------
-BlackBerry smartphone simulators are only available on Windows. BlackBerry 10, and PlayBook simulators require VMWare Player (Windows) or VMWare Fusion (Mac OS X). The WebWorks SDK provides a default simulator. Additional simulators are [available](http://us.blackberry.com/developers/resources/simulators.jsp).
+BlackBerry smartphone emulators are only available on Windows. BlackBerry 10, and PlayBook emulators require VMWare Player (Windows) or VMWare Fusion (Mac OS X). The WebWorks SDK provides a default emulator. Additional emulators are [available](http://us.blackberry.com/developers/resources/simulators.jsp).
-For instructions on installing simulators, please visit the following link(s):
+For instructions on installing emulators, please visit the following link(s):
- [BlackBerry 10](https://developer.blackberry.com/html5/documentation/using_the_bb10_simulator_2008466_11.html)
- [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)
@@ -107,19 +107,19 @@ For instructions on installing simulators, please visit the following link(s):
BlackBerry 10
- `qnx.sim.ip`
- `qnx.sim.password`
-- __NOTE:__ IP address of simulator obtained when placing the simulator in developer mode through simulator security settings. Simulator password can be set through simulator security settings.
+- __NOTE:__ IP address of emulator obtained when placing the emulator in developer mode through emulator security settings. Simulator password can be set through emulator security settings.
Playbook
- `playbook.sim.ip` :
- `playbook.sim.password`
-- __NOTE:__ IP address of simulator obtained when placing the simulator in developer mode through simulator security settings. Simulator password can be set through simulator security settings.
+- __NOTE:__ IP address of emulator obtained when placing the emulator in developer mode through emulator security settings. Simulator password can be set through emulator security settings.
Smartphone (Optional)
- `blackberry.sim.dir`
- `blackberry.sim.bin`
- __NOTE:__ On windows file separator '\' must be escaped when specifying directories. For example `C:\\Program Files\\BlackBerry\\Simulator`.
-While in your project directory, in command prompt/terminal type `./cordova/run <target>`. Replace `<target>` with either `qnx`, `playbook`, or `blackberry`. Note, for BlackBerry 10 and PlayBook, the simulator virtual image must already be started. For example...
+While in your project directory, in command prompt/terminal type `./cordova/run <target>`. Replace `<target>` with either `qnx`, `playbook`, or `blackberry`. Note, for BlackBerry 10 and PlayBook, the emulator virtual image must already be started. For example...
BlackBerry 10 (QNX)
- `./cordova/run qnx`
@@ -132,7 +132,7 @@ BlackBerry Smartphone (OS5-7)
When prompted __Do you have a BlackBerry device connected to your computer? (y/n)__, answer __n__.
-The application is installed to the simulator's home screen. Note that on BlackBerry OS 5, it is installed in the `Downloads` folder.
+The application is installed to the emulator's home screen. Note that on BlackBerry OS 5, it is installed in the `Downloads` folder.
7B. Deploy to Device (Windows and Mac)
--------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/fa94a8e0/docs/en/edge/guide/platforms/blackberry/tools.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/guide/platforms/blackberry/tools.md b/docs/en/edge/guide/platforms/blackberry/tools.md
index 8bd2987..3416a08 100644
--- a/docs/en/edge/guide/platforms/blackberry/tools.md
+++ b/docs/en/edge/guide/platforms/blackberry/tools.md
@@ -49,18 +49,18 @@ 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
-simulator executables.
+emulator executables.
$ /path/to/my_new_project/cordova/build <platform>
$ /path/to/my_new_project/cordova/build.bat <platform>
-## Launch simulator
+## Launch emulator
For BlackBerry projects, please make sure you customize the
`project.properties` file in the root of your Cordova project folder.
You need to do so to supply your BlackBerry signing key password, and
specify locations for the BlackBerry WebWorks SDK and BlackBerry
-simulator executables.
+emulator executables.
$ /path/to/my_new_project/cordova/run <platform>
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/fa94a8e0/docs/en/edge/guide/platforms/blackberry10/index.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/guide/platforms/blackberry10/index.md b/docs/en/edge/guide/platforms/blackberry10/index.md
index 9902522..1eae034 100644
--- a/docs/en/edge/guide/platforms/blackberry10/index.md
+++ b/docs/en/edge/guide/platforms/blackberry10/index.md
@@ -56,7 +56,7 @@ This command creates the folder structure for your project at the specified loca
Adding and managing targets
---------------------------
-A target refers to a BlackBerry device or simulator that you will use to test your app. Targets are added directly to your project; you can add multiple targets to your project, each with a unique name. Then, when you want to deploy your app to a particular target, you can simply refer to that target by name when you run your script.
+A target refers to a BlackBerry device or emulator that you will use to test your app. Targets are added directly to your project; you can add multiple targets to your project, each with a unique name. Then, when you want to deploy your app to a particular target, you can simply refer to that target by name when you run your script.
###Add a target
@@ -69,9 +69,9 @@ To add a target, on the command line, type the following command:
where
- `<name>` specifies a unique name for the target.
-- `<ip-address>` specifies the ip address of the BlackBerry device or simulator.
+- `<ip-address>` specifies the ip address of the BlackBerry device or emulator.
- `-t <device | simulator>` specifies the target type. If not provided, the default value is device.
-- `-p|--password <password>` specifies the password for the device or simulator. This is required only if the device or simulator is password protected.
+- `-p|--password <password>` specifies the password for the device or emulator. This is required only if the device or emulator is password protected.
- `--pin <device-pin>` specifies the PIN of the BlackBerry device, which identifies that device as a valid host for the debug token. This argument is required only if you are creating a debug token.
###Remove a target
@@ -124,7 +124,7 @@ To build your app in release mode, on the command line, type the following comma
where
-- `<target>` specifies the name of a previously added target. If `<target>` is not specified, the default target is used, if one has been created. This argument is only required if you want the script to deploy your app to a BlackBerry device or simulator and you have not created a default target. Additionally, if `<target>` is a device, then that device must be connected to your computer by USB connection or be connected to the same Wi-Fi network as your computer.
+- `<target>` specifies the name of a previously added target. If `<target>` is not specified, the default target is used, if one has been created. This argument is only required if you want the script to deploy your app to a BlackBerry device or emulator and you have not created a default target. Additionally, if `<target>` is a device, then that device must be connected to your computer by USB connection or be connected to the same Wi-Fi network as your computer.
- `-k|--keystorepass <password>` specifies the password you defined when you configured your computer to sign applications. This password is also used to create your debug token. This argument is only required if you want the script to create and install the debug token for you.
- `-p|--params <params-JSON-file>` specifies a JSON file containing additional parameters to pass to downstream tools.
- `-ll|--loglevel <level>` specifies the log level. The log level may be one of `error`, `warn`, or `verbose`.
@@ -138,11 +138,11 @@ Note that all of these parameters are optional. If you have previously defined a
Deploying an app
-------------------------
-You can test your app using either a BlackBerry device or a simulator. Before deploying your app, you must first create a target for the device or simulator you want to deploy your app to.
+You can test your app using either a BlackBerry device or an emulator. Before deploying your app, you must first create a target for the device or emulator you want to deploy your app to.
-The run script will first build your app. If you intend to deploy an app to a physical device for testing, you must first install a debug token on that device. If you specify the `--keystorepass <password>` argument when running the run script, the script will create and install the debug token for you. You do not need a debug token to test your app on a simulator, even if that app is unsigned.
+The run script will first build your app. If you intend to deploy an app to a physical device for testing, you must first install a debug token on that device. If you specify the `--keystorepass <password>` argument when running the run script, the script will create and install the debug token for you. You do not need a debug token to test your app on an emulator, even if that app is unsigned.
-To deploy your app to a device or simulator, on a command line type the following command:
+To deploy your app to a device or emulator, on a command line type the following command:
```
<path-to-project>/cordova/run <target> [--no-build]
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/fa94a8e0/docs/en/edge/guide/platforms/blackberry10/tools.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/guide/platforms/blackberry10/tools.md b/docs/en/edge/guide/platforms/blackberry10/tools.md
index 07ac1c6..7b3b5a1 100644
--- a/docs/en/edge/guide/platforms/blackberry10/tools.md
+++ b/docs/en/edge/guide/platforms/blackberry10/tools.md
@@ -46,7 +46,7 @@ bin/create <path-to-project>
## target
The `target` command allows you to manage the BlackBerry device(s) or
-simulator that you will use to test your app. You can add or remove a
+emulator that you will use to test your app. You can add or remove a
target, or set a target as the default target.
### Add a target
@@ -59,9 +59,9 @@ where
- `<name>` specifies a unique name for the target.
- `<ip-address>` specifies the ip address of the BlackBerry device or
- simulator.
+ emulator.
- `-p|--password <password>` specifies the password for the device or
- simulator. This is required only if the device or simulator is
+ emulator. This is required only if the device or emulator is
password protected.
- `--pin <device-pin>` specifies the PIN of the BlackBerry device,
which identifies that device as a valid host for the debug
@@ -108,7 +108,7 @@ where
- `<target>` specifies the name of a previously added target. If
`<target>` is not specified, the default target is used, if one has
been created. This argument is only required if you want the script
- to deploy your app to a BlackBerry device or simulator and you have
+ to deploy your app to a BlackBerry device or emulator and you have
not created a default target. Additionally, if `<target>` is a
device, then that device must be connected to your computer by USB
connection or be connected to the same Wi-Fi network as your
@@ -135,8 +135,8 @@ app and deploy it to the default target. For example:
## run
The `run` command deploys the app on the specified BlackBerry device
-or a simulator. Before deploying your app, you must first create a
-target for the device or simulator you want to deploy your app to. The
+or an emulator. Before deploying your app, you must first create a
+target for the device or emulator you want to deploy your app to. The
deploy script will deploy the most recent build of your app.
```
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/fa94a8e0/docs/en/edge/guide/platforms/ios/index.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/guide/platforms/ios/index.md b/docs/en/edge/guide/platforms/ios/index.md
index afabb2b..ffff2e7 100644
--- a/docs/en/edge/guide/platforms/ios/index.md
+++ b/docs/en/edge/guide/platforms/ios/index.md
@@ -28,7 +28,7 @@ version) runs only on OS X version 10.7 (Lion) or greater, and
includes the iOS 6 SDK (Software Development Kit). To submit apps to
the Apple App Store℠ requires the latest versions of the Apple tools.
-You can test many of the Cordova features using the iOS simulator
+You can test many of the Cordova features using the iOS emulator
installed with the iOS SDK and Xcode, but you need an actual device to
fully test all of the app's device features before submitting to the
App Store. The device must have at least iOS 5.x installed, the
@@ -38,7 +38,7 @@ Generation or later. To install apps onto a device, you must also be a
member of Apple's
[iOS Developer Program](https://developer.apple.com/programs/ios/),
which costs $99 per year. This guide shows how to deploy apps to the
-iOS simulator, for which you don't need to register with the developer
+iOS emulator, for which you don't need to register with the developer
program.
## Install the SDK