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/31 22:00:56 UTC
[01/15] docs commit: [CB-3815] in compat tbl, NO CLI support for win8
Updated Branches:
refs/heads/master 7db07ce41 -> 810182c2b
[CB-3815] in compat tbl, NO CLI support for win8
Project: http://git-wip-us.apache.org/repos/asf/cordova-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-docs/commit/02e70008
Tree: http://git-wip-us.apache.org/repos/asf/cordova-docs/tree/02e70008
Diff: http://git-wip-us.apache.org/repos/asf/cordova-docs/diff/02e70008
Branch: refs/heads/master
Commit: 02e70008a34d05ca81d96e6d1ad99177b3d8269b
Parents: 7db07ce
Author: Mike Sierra <le...@gmail.com>
Authored: Wed Jul 31 10:15:22 2013 -0400
Committer: Michael Brooks <mi...@michaelbrooks.ca>
Committed: Wed Jul 31 12:58:22 2013 -0700
----------------------------------------------------------------------
docs/en/edge/guide/overview/index.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/02e70008/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 195c84e..180de48 100644
--- a/docs/en/edge/guide/overview/index.md
+++ b/docs/en/edge/guide/overview/index.md
@@ -149,7 +149,7 @@ available for each mobile platform:
<td data-col="ios" class="y">Mac</td>
<td data-col="winphone7" class="y">Windows</td>
<td data-col="winphone8" class="y">Windows</td>
- <td data-col="win8" class="u"></td>
+ <td data-col="win8" class="n"></td>
</tr>
<tr>
[07/15] docs commit: [CB-3816] doc -v flag for simple version nimber
Posted by mw...@apache.org.
[CB-3816] doc -v flag for simple version nimber
Project: http://git-wip-us.apache.org/repos/asf/cordova-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-docs/commit/89a6b5a1
Tree: http://git-wip-us.apache.org/repos/asf/cordova-docs/tree/89a6b5a1
Diff: http://git-wip-us.apache.org/repos/asf/cordova-docs/diff/89a6b5a1
Branch: refs/heads/master
Commit: 89a6b5a11ec299ffd3cf8abecd16bf6e1c3e741f
Parents: 50774b7
Author: Mike Sierra <le...@gmail.com>
Authored: Wed Jul 31 12:10:36 2013 -0400
Committer: Michael Brooks <mi...@michaelbrooks.ca>
Committed: Wed Jul 31 12:59:43 2013 -0700
----------------------------------------------------------------------
docs/en/edge/guide/cli/index.md | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/89a6b5a1/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 52eb8b4..7464365 100644
--- a/docs/en/edge/guide/cli/index.md
+++ b/docs/en/edge/guide/cli/index.md
@@ -351,7 +351,8 @@ Use this syntax to install a specific version:
$ sudo npm install -g cordova@3.0.0
-Run the `info` command for a listing that includes the current version
+Run `cordova -v` to see the currently running version. Run the `npm
+info` command for a longer listing that includes the current version
along with other available version numbers:
$ npm info cordova
[11/15] docs commit: [CB-3815] bb10 supports compass
Posted by mw...@apache.org.
[CB-3815] bb10 supports compass
Project: http://git-wip-us.apache.org/repos/asf/cordova-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-docs/commit/fc6d1651
Tree: http://git-wip-us.apache.org/repos/asf/cordova-docs/tree/fc6d1651
Diff: http://git-wip-us.apache.org/repos/asf/cordova-docs/diff/fc6d1651
Branch: refs/heads/master
Commit: fc6d1651aec0bcf94b2f91a138cb5b7fdee8f5cc
Parents: 65e1372
Author: Mike Sierra <le...@gmail.com>
Authored: Wed Jul 31 13:10:31 2013 -0400
Committer: Michael Brooks <mi...@michaelbrooks.ca>
Committed: Wed Jul 31 13:00:14 2013 -0700
----------------------------------------------------------------------
docs/en/edge/guide/overview/index.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/fc6d1651/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 efbb65b..1e97505 100644
--- a/docs/en/edge/guide/overview/index.md
+++ b/docs/en/edge/guide/overview/index.md
@@ -223,7 +223,7 @@ available for each mobile platform:
<th><a href="cordova_compass_compass.md.html">Compass</a></th>
<td data-col="android" class="y"></td>
<td data-col="blackberry" class="n"></td>
- <td data-col="blackberry10" class="n"></td>
+ <td data-col="blackberry10" class="y"></td>
<td data-col="ios" class="y">(3GS+)</td>
<td data-col="winphone7" class="y"></td>
<td data-col="winphone8" class="y"></td>
[06/15] docs commit: [CB-3815] correct API support for BB10 in compat
tbl
Posted by mw...@apache.org.
[CB-3815] correct API support for BB10 in compat tbl
Project: http://git-wip-us.apache.org/repos/asf/cordova-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-docs/commit/50774b7f
Tree: http://git-wip-us.apache.org/repos/asf/cordova-docs/tree/50774b7f
Diff: http://git-wip-us.apache.org/repos/asf/cordova-docs/diff/50774b7f
Branch: refs/heads/master
Commit: 50774b7f7a4b1a350abde113d3b86265b8dcd43a
Parents: 10c920e
Author: Mike Sierra <le...@gmail.com>
Authored: Wed Jul 31 12:01:21 2013 -0400
Committer: Michael Brooks <mi...@michaelbrooks.ca>
Committed: Wed Jul 31 12:59:33 2013 -0700
----------------------------------------------------------------------
docs/en/edge/guide/overview/index.md | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/50774b7f/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 db51d24..efbb65b 100644
--- a/docs/en/edge/guide/overview/index.md
+++ b/docs/en/edge/guide/overview/index.md
@@ -307,7 +307,7 @@ available for each mobile platform:
<th><a href="cordova_globalization_globalization.md.html">Globalization</a></th>
<td data-col="android" class="y"></td>
<td data-col="blackberry" class="y"></td>
- <td data-col="blackberry10" class="y"></td>
+ <td data-col="blackberry10" class="n"></td>
<td data-col="ios" class="y"></td>
<td data-col="winphone7" class="n"></td>
<td data-col="winphone8" class="y"></td>
@@ -331,7 +331,7 @@ available for each mobile platform:
<th><a href="cordova_media_media.md.html">Media</a></th>
<td data-col="android" class="y"></td>
<td data-col="blackberry" class="n"></td>
- <td data-col="blackberry10" class="n"></td>
+ <td data-col="blackberry10" class="y"></td>
<td data-col="ios" class="y"></td>
<td data-col="winphone7" class="y"></td>
<td data-col="winphone8" class="y"></td>
@@ -355,7 +355,7 @@ available for each mobile platform:
<th><a href="cordova_splashscreen_splashscreen.md.html">Splashscreen</a></th>
<td data-col="android" class="y"></td>
<td data-col="blackberry" class="n"></td>
- <td data-col="blackberry10" class="n"></td>
+ <td data-col="blackberry10" class="y"></td>
<td data-col="ios" class="y"></td>
<td data-col="winphone7" class="n"></td>
<td data-col="winphone8" class="n"></td>
[03/15] docs commit: [CB-3815] SDK support is implicit;
rm from compat tbl
Posted by mw...@apache.org.
[CB-3815] SDK support is implicit; rm from compat tbl
Project: http://git-wip-us.apache.org/repos/asf/cordova-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-docs/commit/e579c05c
Tree: http://git-wip-us.apache.org/repos/asf/cordova-docs/tree/e579c05c
Diff: http://git-wip-us.apache.org/repos/asf/cordova-docs/diff/e579c05c
Branch: refs/heads/master
Commit: e579c05cec8ff95b5dc876ba5ded66a44a43a44c
Parents: 4ee71b8
Author: Mike Sierra <le...@gmail.com>
Authored: Wed Jul 31 10:18:25 2013 -0400
Committer: Michael Brooks <mi...@michaelbrooks.ca>
Committed: Wed Jul 31 12:59:08 2013 -0700
----------------------------------------------------------------------
docs/en/edge/guide/overview/index.md | 11 -----------
1 file changed, 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/e579c05c/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 1c096b5..358c8ae 100644
--- a/docs/en/edge/guide/overview/index.md
+++ b/docs/en/edge/guide/overview/index.md
@@ -153,17 +153,6 @@ available for each mobile platform:
</tr>
<tr>
- <th><a href="guide_platforms_index.md.html">SDK platform support</a></th>
- <td data-col="android" class="y"><a href="guide_platforms_android_index.md.html"> </a></td>
- <td data-col="blackberry" class="y"><a href="guide_platforms_blackberry_index.md.html"> </a></td>
- <td data-col="blackberry10" class="y"><a href="guide_platforms_blackberry10_index.md.html"> </a></td>
- <td data-col="ios" class="y"><a href="guide_platforms_ios_index.md.html"> </a></td>
- <td data-col="winphone7" class="y"><a href="guide_platforms_wp7_index.md.html"> </a></td>
- <td data-col="winphone8" class="y"><a href="guide_platforms_windows-phone-8_index.md.html"> </a></td>
- <td data-col="win8" class="y"><a href="guide_platforms_windows-8_index.md.html"> </a></td>
- </tr>
-
- <tr>
<th><a href="#">Embedded<br/>WebView</a></th>
<td data-col="android" class="y"><a href="guide_platforms_android_webview.md.html"></a></td>
<td data-col="blackberry" class="n"></td>
[14/15] docs commit: [CB-3962] bullet lists for non-procedures
Posted by mw...@apache.org.
[CB-3962] bullet lists for non-procedures
Project: http://git-wip-us.apache.org/repos/asf/cordova-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-docs/commit/8f334ec8
Tree: http://git-wip-us.apache.org/repos/asf/cordova-docs/tree/8f334ec8
Diff: http://git-wip-us.apache.org/repos/asf/cordova-docs/diff/8f334ec8
Branch: refs/heads/master
Commit: 8f334ec84a856515612b770f9f87681f333eed6a
Parents: e6efa33
Author: Mike Sierra <le...@gmail.com>
Authored: Wed Jul 31 14:29:24 2013 -0400
Committer: Michael Brooks <mi...@michaelbrooks.ca>
Committed: Wed Jul 31 13:00:35 2013 -0700
----------------------------------------------------------------------
docs/en/edge/guide/hybrid/plugins/index.md | 56 +++++++++++---------
docs/en/edge/guide/platforms/android/webview.md | 4 +-
docs/en/edge/guide/platforms/ios/plugin.md | 4 +-
docs/en/edge/guide/platforms/ios/webview.md | 18 +++----
docs/en/edge/guide/platforms/wp8/plugin.md | 2 +-
5 files changed, 44 insertions(+), 40 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/8f334ec8/docs/en/edge/guide/hybrid/plugins/index.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/guide/hybrid/plugins/index.md b/docs/en/edge/guide/hybrid/plugins/index.md
index 1b7efb3..cb4d01b 100644
--- a/docs/en/edge/guide/hybrid/plugins/index.md
+++ b/docs/en/edge/guide/hybrid/plugins/index.md
@@ -44,44 +44,48 @@ front-facing and arguably most important part of your Cordova plugin.
You can structure your plugin's JavaScript however you like. The one
thing you _must_ use to communicate between the Cordova JavaScript
- and native environments is the `cordova.exec` function. Here is an example:
+and native environments is the `cordova.exec` function. Here is an example:
- cordova.exec(function(winParam) {}, function(error) {}, "service",
- "action", ["firstArgument", "secondArgument", 42,
- false]);
+ cordova.exec(function(winParam) {}, function(error) {}, "service",
+ "action", ["firstArgument", "secondArgument", 42,
+ false]);
The parameters are detailed below:
-1. `function(winParam) {}` - Success function callback. Assuming your
- `exec` call completes successfully, this function is invoked
- (optionally with any parameters you pass back to it).
-2. `function(error) {}` - Error function callback. If the operation does
- not complete successfully, this function is invoked (optionally
- with an error parameter).
-3. `"service"` - The service name to call into on the native side. This
- is mapped to a native class, about which more information is
- available in the native guides listed below.
-4. `"action"` - The action name to call into. This is picked up by the
- native class receiving the `exec` call, and, depending on the
- platform, essentially maps to a class's method.
- The native guides listed below provide details.
-5. `[/* arguments */]` - Arguments to pass into the native environment.
+* `function(winParam) {}`: Success function callback. Assuming your
+ `exec` call completes successfully, this function is invoked
+ (optionally with any parameters you pass back to it).
+
+* `function(error) {}`: Error function callback. If the operation does
+ not complete successfully, this function is invoked (optionally with
+ an error parameter).
+
+* `"service"`: The service name to call into on the native side. This
+ is mapped to a native class, about which more information is
+ available in the native guides listed below.
+
+* `"action"`: The action name to call into. This is picked up by the
+ native class receiving the `exec` call, and, depending on the
+ platform, essentially maps to a class's method. The native guides
+ listed below provide details.
+
+* `[/* arguments */]`: Arguments to pass into the native environment.
### Echo Plugin JavaScript Example
- window.echo = function(str, callback) {
- cordova.exec(callback, function(err) {
- callback('Nothing to echo.');
- }, "Echo", "echo", [str]);
- };
+ window.echo = function(str, callback) {
+ cordova.exec(callback, function(err) {
+ callback('Nothing to echo.');
+ }, "Echo", "echo", [str]);
+ };
Let's dive into this. The plugin attaches itself to `window`,
specifically to the `echo` function. Plugin users would then use it as
follows:
- window.echo("echome", function(echoValue) {
- alert(echoValue == "echome"); // should alert true.
- });
+ window.echo("echome", function(echoValue) {
+ alert(echoValue == "echome"); // should alert true.
+ });
First, let's take a look at the last three arguments to the `exec`
function. We will be calling the `Echo` "service", requesting the `echo`
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/8f334ec8/docs/en/edge/guide/platforms/android/webview.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/guide/platforms/android/webview.md b/docs/en/edge/guide/platforms/android/webview.md
index 8bed446..30aa4ed 100644
--- a/docs/en/edge/guide/platforms/android/webview.md
+++ b/docs/en/edge/guide/platforms/android/webview.md
@@ -34,9 +34,9 @@ but may be eventually be automated.
## Prerequisites
-1. Cordova 1.9 or greater
+* Cordova 1.9 or greater
-2. Android SDK updated with 15
+* Android SDK updated with 15
## Guide to using CordovaWebView in an Android Project
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/8f334ec8/docs/en/edge/guide/platforms/ios/plugin.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/guide/platforms/ios/plugin.md b/docs/en/edge/guide/platforms/ios/plugin.md
index 2ad548b..59c01cb 100644
--- a/docs/en/edge/guide/platforms/ios/plugin.md
+++ b/docs/en/edge/guide/platforms/ios/plugin.md
@@ -197,9 +197,9 @@ call, you should use a background thread. For example:
See other methods that you can override in:
-1. [CDVPlugin.h](https://github.com/apache/cordova-ios/blob/master/CordovaLib/Classes/CDVPlugin.h)
+* [CDVPlugin.h](https://github.com/apache/cordova-ios/blob/master/CordovaLib/Classes/CDVPlugin.h)
-2. [CDVPlugin.m](https://github.com/apache/cordova-ios/blob/master/CordovaLib/Classes/CDVPlugin.m)
+* [CDVPlugin.m](https://github.com/apache/cordova-ios/blob/master/CordovaLib/Classes/CDVPlugin.m)
For example, you can hook into the `pause`, `resume`, app terminate and `handleOpenURL` events.
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/8f334ec8/docs/en/edge/guide/platforms/ios/webview.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/guide/platforms/ios/webview.md b/docs/en/edge/guide/platforms/ios/webview.md
index 26d176f..31de972 100644
--- a/docs/en/edge/guide/platforms/ios/webview.md
+++ b/docs/en/edge/guide/platforms/ios/webview.md
@@ -31,11 +31,11 @@ based Cleaver implementation.
## Prerequisites
-1. Cordova 2.3.0 or greater
+* Cordova 2.3.0 or greater
-2. Xcode 4.5 or greater
+* Xcode 4.5 or greater
-3. `config.xml` file (from a newly created iOS project)
+* `config.xml` file (from a newly created iOS project)
## Adding Cleaver to your Xcode project (CordovaLib sub-project)
@@ -103,11 +103,11 @@ based Cleaver implementation.
## Using CDVViewController in your code
-1. Add this **header**:
+1. Add this header:
#import <Cordova/CDVViewController.h>
-2. Instantiate a **new** `CDVViewController`, and **retain it somewhere** (e.g. to a property in your class):
+2. Instantiate a new `CDVViewController`, and retain it somewhere (e.g. to a property in your class):
CDVViewController* viewController = [CDVViewController new];
@@ -137,15 +137,15 @@ based Cleaver implementation.
## Adding your HTML, CSS and JavaScript assets
-1. Create a **new folder** in your project **on disk**, `www` for example.
+1. Create a new folder in your project on disk, `www` for example.
-2. Put your **HTML, CSS and JavaScript** assets into this folder.
+2. Put your HTML, CSS and JavaScript assets into this folder.
3. Drag and drop the folder into the Project Navigator of Xcode.
-4. Choose the **Create folder references for any added folders** radio button.
+4. Choose the __Create folder references for any added folders__ radio button.
-5. Set the appropriate `wwwFolderName` and `startPage` properties for the folder you created in **(1)** or use the defaults (see previous section) when you instantiate the `CDVViewController`.
+5. Set the appropriate `wwwFolderName` and `startPage` properties for the folder you initially created, or use the defaults (see previous section) when you instantiate the `CDVViewController`.
/*
if you created a folder called 'myfolder' and
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/8f334ec8/docs/en/edge/guide/platforms/wp8/plugin.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/guide/platforms/wp8/plugin.md b/docs/en/edge/guide/platforms/wp8/plugin.md
index 139436d..2b7c732 100644
--- a/docs/en/edge/guide/platforms/wp8/plugin.md
+++ b/docs/en/edge/guide/platforms/wp8/plugin.md
@@ -173,7 +173,7 @@ If we wanted to add the contacts capability to the WMAppManifest.xml, it would l
See other methods that you can override in:
-1. [BaseCommand.cs](https://github.com/apache/cordova-wp7/blob/master/templates/standalone/cordovalib/Commands/BaseCommand.cs)
+* [BaseCommand.cs](https://github.com/apache/cordova-wp7/blob/master/templates/standalone/cordovalib/Commands/BaseCommand.cs)
For example, you can hook into the 'pause' and 'resume' application events.
[04/15] docs commit: [CB-3815] add tizen to compat tbl
Posted by mw...@apache.org.
[CB-3815] add tizen to compat tbl
Project: http://git-wip-us.apache.org/repos/asf/cordova-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-docs/commit/462130bf
Tree: http://git-wip-us.apache.org/repos/asf/cordova-docs/tree/462130bf
Diff: http://git-wip-us.apache.org/repos/asf/cordova-docs/diff/462130bf
Branch: refs/heads/master
Commit: 462130bf6c919e90edacc42a4ef8bd81a035bdd6
Parents: e579c05
Author: Mike Sierra <le...@gmail.com>
Authored: Wed Jul 31 10:32:19 2013 -0400
Committer: Michael Brooks <mi...@michaelbrooks.ca>
Committed: Wed Jul 31 12:59:16 2013 -0700
----------------------------------------------------------------------
docs/en/edge/guide/overview/index.md | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/462130bf/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 358c8ae..db51d24 100644
--- a/docs/en/edge/guide/overview/index.md
+++ b/docs/en/edge/guide/overview/index.md
@@ -136,6 +136,7 @@ available for each mobile platform:
<th>Windows<br/>Phone 7</th>
<th>Windows<br/>Phone 8</th>
<th>Windows<br/>8</th>
+ <th>Tizen</th>
</tr>
</thead>
@@ -150,6 +151,7 @@ available for each mobile platform:
<td data-col="winphone7" class="y">Windows</td>
<td data-col="winphone8" class="y">Windows</td>
<td data-col="win8" class="n"></td>
+ <td data-col="tizen" class="n"></td>
</tr>
<tr>
@@ -161,6 +163,7 @@ available for each mobile platform:
<td data-col="winphone7" class="n"></td>
<td data-col="winphone8" class="n"></td>
<td data-col="win8" class="n"></td>
+ <td data-col="tizen" class="n"></td>
</tr>
<tr>
@@ -172,6 +175,7 @@ available for each mobile platform:
<td data-col="winphone7" class="y"><a href="guide_guide_platforms_wp8_plugin.md.html"></a></td>
<td data-col="winphone8" class="n"></td>
<td data-col="win8" class="n"></td>
+ <td data-col="tizen" class="n"></td>
</tr>
<tr>
@@ -188,6 +192,7 @@ available for each mobile platform:
<td data-col="winphone7" class="y"></td>
<td data-col="winphone8" class="y"></td>
<td data-col="win8" class="y"></td>
+ <td data-col="tizen" class="y"></td>
</tr>
<tr>
@@ -199,6 +204,7 @@ available for each mobile platform:
<td data-col="winphone7" class="y"></td>
<td data-col="winphone8" class="y"></td>
<td data-col="win8" class="y"></td>
+ <td data-col="tizen" class="y"></td>
</tr>
<tr>
@@ -210,6 +216,7 @@ available for each mobile platform:
<td data-col="winphone7" class="y"></td>
<td data-col="winphone8" class="y"></td>
<td data-col="win8" class="n"></td>
+ <td data-col="tizen" class="n"></td>
</tr>
<tr>
@@ -221,6 +228,7 @@ available for each mobile platform:
<td data-col="winphone7" class="y"></td>
<td data-col="winphone8" class="y"></td>
<td data-col="win8" class="y"></td>
+ <td data-col="tizen" class="y"></td>
</tr>
<tr>
@@ -232,6 +240,7 @@ available for each mobile platform:
<td data-col="winphone7" class="y"></td>
<td data-col="winphone8" class="y"></td>
<td data-col="win8" class="y"></td>
+ <td data-col="tizen" class="y"></td>
</tr>
<tr>
@@ -243,6 +252,7 @@ available for each mobile platform:
<td data-col="winphone7" class="y"></td>
<td data-col="winphone8" class="y"></td>
<td data-col="win8" class="y"></td>
+ <td data-col="tizen" class="n"></td>
</tr>
<tr>
@@ -254,6 +264,7 @@ available for each mobile platform:
<td data-col="winphone7" class="y"></td>
<td data-col="winphone8" class="y"></td>
<td data-col="win8" class="y"></td>
+ <td data-col="tizen" class="y"></td>
</tr>
<tr>
@@ -265,6 +276,7 @@ available for each mobile platform:
<td data-col="winphone7" class="y"></td>
<td data-col="winphone8" class="y"></td>
<td data-col="win8" class="y"></td>
+ <td data-col="tizen" class="y"></td>
</tr>
<tr>
@@ -276,6 +288,7 @@ available for each mobile platform:
<td data-col="winphone7" class="y"></td>
<td data-col="winphone8" class="y"></td>
<td data-col="win8" class="y"></td>
+ <td data-col="tizen" class="n"></td>
</tr>
<tr>
@@ -287,6 +300,7 @@ available for each mobile platform:
<td data-col="winphone7" class="y"></td>
<td data-col="winphone8" class="y"></td>
<td data-col="win8" class="y"></td>
+ <td data-col="tizen" class="y"></td>
</tr>
<tr>
@@ -298,6 +312,7 @@ available for each mobile platform:
<td data-col="winphone7" class="n"></td>
<td data-col="winphone8" class="y"></td>
<td data-col="win8" class="n"></td>
+ <td data-col="tizen" class="n"></td>
</tr>
<tr>
@@ -309,6 +324,7 @@ available for each mobile platform:
<td data-col="winphone7" class="y"></td>
<td data-col="winphone8" class="y"></td>
<td data-col="win8" class="y"></td>
+ <td data-col="tizen" class="n"></td>
</tr>
<tr>
@@ -320,6 +336,7 @@ available for each mobile platform:
<td data-col="winphone7" class="y"></td>
<td data-col="winphone8" class="y"></td>
<td data-col="win8" class="y"></td>
+ <td data-col="tizen" class="y"></td>
</tr>
<tr>
@@ -331,6 +348,7 @@ available for each mobile platform:
<td data-col="winphone7" class="y"></td>
<td data-col="winphone8" class="y"></td>
<td data-col="win8" class="y"></td>
+ <td data-col="tizen" class="y"></td>
</tr>
<tr>
@@ -342,6 +360,7 @@ available for each mobile platform:
<td data-col="winphone7" class="n"></td>
<td data-col="winphone8" class="n"></td>
<td data-col="win8" class="n"></td>
+ <td data-col="tizen" class="n"></td>
</tr>
<tr>
@@ -353,6 +372,7 @@ available for each mobile platform:
<td data-col="winphone7" class="y"></td>
<td data-col="winphone8" class="y"></td>
<td data-col="win8" class="y"></td>
+ <td data-col="tizen" class="y"></td>
</tr>
</tbody>
[12/15] docs commit: [CB-3962] no ( extra space in parens )
Posted by mw...@apache.org.
[CB-3962] no ( extra space in parens )
Project: http://git-wip-us.apache.org/repos/asf/cordova-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-docs/commit/0b3e0b72
Tree: http://git-wip-us.apache.org/repos/asf/cordova-docs/tree/0b3e0b72
Diff: http://git-wip-us.apache.org/repos/asf/cordova-docs/diff/0b3e0b72
Branch: refs/heads/master
Commit: 0b3e0b721930fcffa3a43d3a5f5dea7e1670ac2b
Parents: fc6d165
Author: Mike Sierra <le...@gmail.com>
Authored: Wed Jul 31 13:16:53 2013 -0400
Committer: Michael Brooks <mi...@michaelbrooks.ca>
Committed: Wed Jul 31 13:00:21 2013 -0700
----------------------------------------------------------------------
STYLESHEET.md | 3 +++
docs/en/edge/cordova/compass/compass.clearWatch.md | 2 +-
docs/en/edge/cordova/compass/compass.getCurrentHeading.md | 2 +-
docs/en/edge/guide/platforms/win8/tools.md | 2 +-
docs/en/edge/guide/platforms/wp8/index.md | 2 +-
docs/en/edge/guide/platforms/wp8/upgrading.md | 2 +-
6 files changed, 8 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/0b3e0b72/STYLESHEET.md
----------------------------------------------------------------------
diff --git a/STYLESHEET.md b/STYLESHEET.md
index a592ece..52991a6 100644
--- a/STYLESHEET.md
+++ b/STYLESHEET.md
@@ -227,3 +227,6 @@ editorial guidelines.
same line, separated with a colon unless the topic features trailing
punctuation. The text you are reading provides an example.
+* In body text, no ( extra space inside parens ). OK to increase
+ readability of code.
+
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/0b3e0b72/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 dd70cc5..4c68542 100755
--- a/docs/en/edge/cordova/compass/compass.clearWatch.md
+++ b/docs/en/edge/cordova/compass/compass.clearWatch.md
@@ -32,7 +32,7 @@ Supported Platforms
- Android
- iOS
- Tizen
-- Windows Phone 7 and 8 ( if available in hardware )
+- Windows Phone 7 and 8 (if available in hardware)
- Windows 8
Quick Example
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/0b3e0b72/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 8ce3f5e..3c839bd 100755
--- a/docs/en/edge/cordova/compass/compass.getCurrentHeading.md
+++ b/docs/en/edge/cordova/compass/compass.getCurrentHeading.md
@@ -40,7 +40,7 @@ Supported Platforms
- Android
- iOS
- Tizen
-- Windows Phone 7 and 8 ( if available in hardware )
+- Windows Phone 7 and 8 (if available in hardware)
- Windows 8
Quick Example
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/0b3e0b72/docs/en/edge/guide/platforms/win8/tools.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/guide/platforms/win8/tools.md b/docs/en/edge/guide/platforms/win8/tools.md
index e40db4f..db2c68b 100644
--- a/docs/en/edge/guide/platforms/win8/tools.md
+++ b/docs/en/edge/guide/platforms/win8/tools.md
@@ -41,6 +41,6 @@ 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 )
+* 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/0b3e0b72/docs/en/edge/guide/platforms/wp8/index.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/guide/platforms/wp8/index.md b/docs/en/edge/guide/platforms/wp8/index.md
index fd97c69..f3d08ee 100644
--- a/docs/en/edge/guide/platforms/wp8/index.md
+++ b/docs/en/edge/guide/platforms/wp8/index.md
@@ -57,7 +57,7 @@ current interface.
- See the [list of Intel processors that support VT-x (virtualization) and EPT (SLAT)](http://ark.intel.com/Products/VirtualizationTechnology)
- Enable the virtualization capability (i.e., VT-x on Intel) in your BIOS settings, as usually this is disabled by default.
-- SDK + IDE ( Visual Studio )
+- SDK + IDE (Visual Studio)
- Visual Studio 2012 Professional, Premium, or Ultimate. Note that Visual Studio Express for Windows Phone (included in the SDK) is not recommended because you can not build the template (see below) with VS Express, as it does not have the __Export Template__ functionality, which is only in VS Pro or higher.
- Register and pay for a [Windows Phone Dev Center](http://dev.windowsphone.com/en-us/publish) account if you want to install your app on a real device or submit it to Market Place.
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/0b3e0b72/docs/en/edge/guide/platforms/wp8/upgrading.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/guide/platforms/wp8/upgrading.md b/docs/en/edge/guide/platforms/wp8/upgrading.md
index 5a208dd..5cc09b1 100644
--- a/docs/en/edge/guide/platforms/wp8/upgrading.md
+++ b/docs/en/edge/guide/platforms/wp8/upgrading.md
@@ -92,7 +92,7 @@ In Visual Studio's Solution Explorer window:
2. Copy the contents of your `www` directory to the new project, and be sure these items are added to the VS project.
-3. Update your HTML to use the new `cordova.js` file. ( note that there is no longer a version number in the name ).
+3. Update your HTML to use the new `cordova.js` file. (Note the lack of a version number in the filename.)
4. Copy and overwrite any splash screen, or icon images.
[10/15] docs commit: [CB-4347 CB-3962 CB-3822] minor stylesheet fixes
& reformat
Posted by mw...@apache.org.
[CB-4347 CB-3962 CB-3822] minor stylesheet fixes & reformat
Project: http://git-wip-us.apache.org/repos/asf/cordova-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-docs/commit/65e13725
Tree: http://git-wip-us.apache.org/repos/asf/cordova-docs/tree/65e13725
Diff: http://git-wip-us.apache.org/repos/asf/cordova-docs/diff/65e13725
Branch: refs/heads/master
Commit: 65e1372593a4e0d3a84d8c4611ae1d30aea0e339
Parents: 2fa779a
Author: Mike Sierra <le...@gmail.com>
Authored: Wed Jul 31 13:06:29 2013 -0400
Committer: Michael Brooks <mi...@michaelbrooks.ca>
Committed: Wed Jul 31 13:00:07 2013 -0700
----------------------------------------------------------------------
.../edge/guide/platforms/blackberry10/index.md | 115 ++++++++++++-------
1 file changed, 73 insertions(+), 42 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/65e13725/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 7695c8d..2eb91b4 100644
--- a/docs/en/edge/guide/platforms/blackberry10/index.md
+++ b/docs/en/edge/guide/platforms/blackberry10/index.md
@@ -19,55 +19,65 @@ license: Licensed to the Apache Software Foundation (ASF) under one
# BlackBerry 10 Platform Guide
-This guide shows how to set up your development environment to build and deploy Cordova apps for BlackBerry 10 devices.
-
-For previous versions of BlackBerry, you need to use a different set of command-line tools, described in BlackBerry Platform Guide.
+This guide shows how to set up your development environment to build
+and deploy Cordova apps for BlackBerry 10 devices. For previous
+versions of BlackBerry, you need to use a different set of
+command-line tools, described in BlackBerry Platform Guide.
## Requirements
The development environment is available on Windows, Mac and Linux.
-Developers should use the `cordova` utility in conjunction with the Blackberry Native SDK. See The Command-line Interface for information how to install `cordova`, add projects, then build and deploy.
+Developers should use the `cordova` utility in conjunction with the
+Blackberry Native SDK. See The Command-line Interface for information
+how to install `cordova`, add projects, then build and deploy for each
+platform.
## Install the BlackBerry Native SDK
-The BlackBerry Native SDK is available from [developer.blackberry.com](http://developer.blackberry.com/native/download/).
-
-After installing the BlackBerry Native SDK, its tools must be added to your system path.
+The BlackBerry Native SDK is available from
+[developer.blackberry.com](http://developer.blackberry.com/native/download/).
+Following installation, you need to add its command-line tools to your
+system path.
-### Windows
+On Windows:
-Go to My Computer → Properties → Advanced → Environment Variables
+* Go to __My Computer → Properties → Advanced → Environment Variables__.
-Append to PATH based on where you installed the Native SDK, for example:
+* Append the Native SDK's install directory to the PATH, for example:
;C:\bbndk\host_10_1_0_132\darwin\x86\usr\bin\
-### Mac/Linux
+On Mac and Linux:
-Edit the ~/.bash_profile file, adding a line such as the following, depending on where the Native SDK was installed:
+* Edit the `~/.bash_profile` file, adding a line such as the
+ following, depending on where the Native SDK was installed:
$ export PATH=${PATH}:/Applications/bbndk/host_10_1_0_132/darwin/x86/usr/bin/
-Then run the following to apply the change immidiately:
+* Run the following to apply the change in the current session:
$ source ~/.bash_profile
## Set up for Signing
-If you wish to test on a device or distribute apps through BlackBerry World, your system must be setup for code signing.
+If you wish to test on a device or distribute apps through BlackBerry
+World, your system must be setup for code signing.
-To obtain a signing key, go to the BlackBerry website and make sure to retain the password you specify. Then run the `blackberry-signer` utility that is included with the BlackBerry Native SDK.
+To obtain a signing key, go to the BlackBerry website and make sure to
+retain the password you specify. Then run the `blackberry-signer`
+utility that is included with the BlackBerry Native SDK.
Detailed instuctions can be found here:
* [Register for your code signing key.](https://www.blackberry.com/SignedKeys/codesigning.html)
+
* [Set up your system for code signing.](https://developer.blackberry.com/html5/documentation/signing_setup_bb10_apps_2008396_11.html)
## Create a Project
-Use the `cordova` utility to set up a new project, as described in The Command-line Interface. For example, in a source-code
-directory:
+Use the `cordova` utility to set up a new project, as described in The
+Command-line Interface. For example, in a source-code directory:
$ cordova create hello com.example.hello
$ cd hello
@@ -76,28 +86,36 @@ directory:
## Deploy to Emulator
-If you wish to run a device emulator, download and install the BlackBerry 10 Simulator.
+If you wish to run a device emulator, download and install the
+BlackBerry 10 Simulator.
* [Download](http://developer.blackberry.com/native/download/)
* [Getting Started](http://developer.blackberry.com/devzone/develop/simulator/blackberry_10_simulator_start.html)
-Before testing an app on either an emulator or a device, you need to add a _target_ to your project. Each is identified with a unique name, and associated with an IP address. You need to get the IP address from the emulator before you use it to view apps.
+Before testing an app on either an emulator or a device, you need to
+add a _target_ to your project. Each is identified with a unique name,
+and associated with an IP address. You need to get the IP address from
+the emulator before you use it to view apps.
Launch the emulator image, then choose __Settings__ from the home screen:
-Navigate to the __Security and Privacy → Development Mode__ section, enable the option, and obtain the IP address:
+Navigate to the __Security and Privacy → Development Mode__
+section, enable the option, and obtain the IP address:
-An additional set of command-line utilities are included when you set up the BlackBerry 10 platform for your project. The following command, in this case invoked from the project top-level directory, associates a target named _emu_ with the IP address displayed above.
+An additional set of command-line utilities are included when you set
+up the BlackBerry 10 platform for your project. The following
+command, in this case invoked from the project top-level directory,
+associates a target named _emu_ with the IP address displayed above.
-Windows
+* On Windows:
$ platforms\blackberry10\cordova\target.bat add emu 169.254.0.1 -t simulator
-Mac/Linux
+* On Mac/Linux:
$ platforms/blackberry10/cordova/target add emu 169.254.0.1 -t simulator
@@ -107,58 +125,71 @@ Then, run the `emulate` command to view the app:
## Deploy to Device
-To deploy to a device, make sure it is plugged into your computer. Enable development mode and obtain the IP address as desribed in the emulator section above. You will also need to obtain the PIN from the the __Settings__ application under __About → Hardware__.
+To deploy to a device, make sure it is plugged into your computer.
+Enable development mode and obtain the IP address as desribed in the
+emulator section above. You will also need to obtain the PIN from the
+the __Settings__ application under __About → Hardware__:
-Run the target command-line utility to associate a name with an IP address, device password and PIN.
+Run the target command-line utility to associate a name with an IP
+address, device password and PIN.
-Windows
+* On Windows:
$ platforms\blackberry10\cordova\target.bat add mydevice 169.254.0.1 -t device --password 123456 --pin FFFF972E
-Mac/Linux
+* On Mac/Linux:
$ platforms/blackberry10/cordova/target add mydevice 169.254.0.1 -t device --password 123456 --pin FFFF972E
---password refers to the password to unlock the device
+where:
---pin refers to the device PIN obtained from the Settings application
+* `--password` refers to the password to unlock the device.
+
+* `--pin` refers to the device PIN obtained from the __Settings__ application.
Then, run the `run` command to view the app:
$ cordova run blackberry10
-If a debug token has not yet been created for this device, an error message will prompt you to use the platform run script with the password you provided when registering for signing keys.
+If a debug token is not yet set up for the device, an error message
+prompts you to use the platform run script with the password you
+provided when registering for signing keys.
-Windows
+* On Windows:
$ platforms\blackberry10\cordova\run.bat --device --keystorepass mysecret
-Mac/Linux
+* On Mac/Linux:
$ platforms/blackberry10/cordova/run --device --keystorepass mysecret
## Debugging with WebInspector
-When debugging on the device or a simulator, you may run WebInspector remotely to view the application's internal state.
-
-A prompt displays the URL that allows you to connect to your app with a standard web browser.
-
-For more information, see [Debugging using WebInspector](http://developer.blackberry.com/html5/documentation/web_inspector_overview_1553586_11.html).
+When debugging on the device or an emulator, you may run WebInspector
+remotely to view the application's internal state. A prompt displays
+the URL that allows you to connect to your app with a standard web
+browser. For more information, see
+[Debugging using WebInspector](http://developer.blackberry.com/html5/documentation/web_inspector_overview_1553586_11.html).
## Building a Release Version
-By default, running the `cordova build` command creates an unsigned _.bar_ package file suitable for testing on a device or simulator.
+By default, running the `cordova build` command creates an unsigned
+_.bar_ package file suitable for testing on a device or simulator.
-You need to run a different `build` command to create a release version suitable for distribution through BlackBerry World. This command uses the following syntax:
+You need to run a different `build` command to create a release
+version suitable for distribution through BlackBerry World. It does
+not rely on the `cordova` CLI tool, and instead uses the following
+syntax:
-Windows
+* On Windows:
$ platforms\blackberry10\cordova\build.bat --release --keystorepass mysecret
-Mac/Linux
+* On Mac/Linux:
$ platforms/blackberry10/cordova/build --release --keystorepass mysecret
---keystorepass specifies the password you defined when you configured your computer to sign applications.
+The `--keystorepass` option specifies the password you defined when
+configuring your computer to sign applications.
[05/15] docs commit: [CB-3962] subdirectory, not sub-directory
Posted by mw...@apache.org.
[CB-3962] subdirectory, not sub-directory
Project: http://git-wip-us.apache.org/repos/asf/cordova-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-docs/commit/10c920e4
Tree: http://git-wip-us.apache.org/repos/asf/cordova-docs/tree/10c920e4
Diff: http://git-wip-us.apache.org/repos/asf/cordova-docs/diff/10c920e4
Branch: refs/heads/master
Commit: 10c920e4ae9b582b3ff5b73e3f5bee5b6395a4cc
Parents: 462130b
Author: Mike Sierra <le...@gmail.com>
Authored: Wed Jul 31 11:44:02 2013 -0400
Committer: Michael Brooks <mi...@michaelbrooks.ca>
Committed: Wed Jul 31 12:59:25 2013 -0700
----------------------------------------------------------------------
STYLESHEET.md | 2 ++
docs/en/edge/cordova/notification/notification.beep.md | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/10c920e4/STYLESHEET.md
----------------------------------------------------------------------
diff --git a/STYLESHEET.md b/STYLESHEET.md
index 66fe450..731559c 100644
--- a/STYLESHEET.md
+++ b/STYLESHEET.md
@@ -120,6 +120,8 @@ editorial guidelines.
* 'Directory', not 'folder'; may be exceptions in some GUI contexts
+* Subdirectory, not sub-directory
+
* 'Press' a button on the screen; 'type' a key; do not 'hit' either.
* 'Set up' as verb, 'setup' as noun.
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/10c920e4/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 37e87a5..104208e 100644
--- a/docs/en/edge/cordova/notification/notification.beep.md
+++ b/docs/en/edge/cordova/notification/notification.beep.md
@@ -108,5 +108,5 @@ 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`.
+- The beep file must be short, must be located in a `sounds` subdirectory of the application's root directory, and must be named `beep.wav`.
[02/15] docs commit: [CB-3815] remove PhoneGap Build from Cordova's
compat tbl
Posted by mw...@apache.org.
[CB-3815] remove PhoneGap Build from Cordova's compat tbl
Project: http://git-wip-us.apache.org/repos/asf/cordova-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-docs/commit/4ee71b83
Tree: http://git-wip-us.apache.org/repos/asf/cordova-docs/tree/4ee71b83
Diff: http://git-wip-us.apache.org/repos/asf/cordova-docs/diff/4ee71b83
Branch: refs/heads/master
Commit: 4ee71b8385c15b69c123eca7ad2d64fff45bc5a0
Parents: 02e7000
Author: Mike Sierra <le...@gmail.com>
Authored: Wed Jul 31 10:16:02 2013 -0400
Committer: Michael Brooks <mi...@michaelbrooks.ca>
Committed: Wed Jul 31 12:58:30 2013 -0700
----------------------------------------------------------------------
docs/en/edge/guide/overview/index.md | 11 -----------
1 file changed, 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/4ee71b83/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 180de48..1c096b5 100644
--- a/docs/en/edge/guide/overview/index.md
+++ b/docs/en/edge/guide/overview/index.md
@@ -153,17 +153,6 @@ available for each mobile platform:
</tr>
<tr>
- <th><a href="#">PhoneGap<br/>Build</a></th>
- <td data-col="android" class="y"></td>
- <td data-col="blackberry" class="y"></td>
- <td data-col="blackberry10" class="y"></td>
- <td data-col="ios" class="y"></td>
- <td data-col="winphone7" class="u"></td>
- <td data-col="winphone8" class="y"></td>
- <td data-col="win8" class="u"></td>
- </tr>
-
- <tr>
<th><a href="guide_platforms_index.md.html">SDK platform support</a></th>
<td data-col="android" class="y"><a href="guide_platforms_android_index.md.html"> </a></td>
<td data-col="blackberry" class="y"><a href="guide_platforms_blackberry_index.md.html"> </a></td>
[15/15] docs commit: [CB-3962] remove gratuitous em dashes
Posted by mw...@apache.org.
[CB-3962] remove gratuitous em dashes
Project: http://git-wip-us.apache.org/repos/asf/cordova-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-docs/commit/810182c2
Tree: http://git-wip-us.apache.org/repos/asf/cordova-docs/tree/810182c2
Diff: http://git-wip-us.apache.org/repos/asf/cordova-docs/diff/810182c2
Branch: refs/heads/master
Commit: 810182c2ba82a83cecf6979c4a7267fa1ec1de12
Parents: 8f334ec
Author: Mike Sierra <le...@gmail.com>
Authored: Wed Jul 31 14:56:54 2013 -0400
Committer: Michael Brooks <mi...@michaelbrooks.ca>
Committed: Wed Jul 31 13:00:44 2013 -0700
----------------------------------------------------------------------
.../compass/parameters/compassHeading.md | 4 +-
.../file/directoryentry/directoryentry.md | 4 +-
.../en/edge/cordova/file/fileentry/fileentry.md | 2 +-
.../globalization/globalization.stringToDate.md | 12 ++--
docs/en/edge/guide/platforms/ios/plugin.md | 2 +-
docs/en/edge/guide/platforms/ios/upgrading.md | 62 ++++++++++++--------
docs/en/edge/guide/platforms/ios/webview.md | 4 +-
7 files changed, 52 insertions(+), 38 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/810182c2/docs/en/edge/cordova/compass/parameters/compassHeading.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/cordova/compass/parameters/compassHeading.md b/docs/en/edge/cordova/compass/parameters/compassHeading.md
index 0d96acf..bcf1c25 100644
--- a/docs/en/edge/cordova/compass/parameters/compassHeading.md
+++ b/docs/en/edge/cordova/compass/parameters/compassHeading.md
@@ -25,9 +25,9 @@ A `CompassHeading` object is returned to the `compassSuccess` callback function.
Properties
----------
-- __magneticHeading__: The heading in degrees from 0 - 359.99 at a single moment in time. _(Number)_
+- __magneticHeading__: The heading in degrees from 0-359.99 at a single moment in time. _(Number)_
-- __trueHeading__: The heading relative to the geographic North Pole in degrees 0 - 359.99 at a single moment in time. A negative value indicates that the true heading cannot be determined. _(Number)_
+- __trueHeading__: The heading relative to the geographic North Pole in degrees 0-359.99 at a single moment in time. A negative value indicates that the true heading cannot be determined. _(Number)_
- __headingAccuracy__: The deviation in degrees between the reported heading and the true heading. _(Number)_
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/810182c2/docs/en/edge/cordova/file/directoryentry/directoryentry.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/cordova/file/directoryentry/directoryentry.md b/docs/en/edge/cordova/file/directoryentry/directoryentry.md
index 0c1b34b..702f733 100644
--- a/docs/en/edge/cordova/file/directoryentry/directoryentry.md
+++ b/docs/en/edge/cordova/file/directoryentry/directoryentry.md
@@ -103,8 +103,8 @@ __Quick Example__
setMetadata
----------------
-Set metadata on a directory.
-__Currently works only on iOS.__ - this will set the extended attributes of a directory.
+Sets a directory's extended attributes, or metadata. _Currently works
+only on iOS._
__Parameters:__
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/810182c2/docs/en/edge/cordova/file/fileentry/fileentry.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/cordova/file/fileentry/fileentry.md b/docs/en/edge/cordova/file/fileentry/fileentry.md
index 2a7b747..4089ef1 100644
--- a/docs/en/edge/cordova/file/fileentry/fileentry.md
+++ b/docs/en/edge/cordova/file/fileentry/fileentry.md
@@ -180,7 +180,7 @@ __Parameters:__
- __newName__: The new name of the file. Defaults to the current name if unspecified. _(DOMString)_
-- __successCallback__: A callback that is passed the new files `FileEntry` object. _(Function)_
+- __successCallback__: A callback that is passed the new file's `FileEntry` object. _(Function)_
- __errorCallback__: A callback that executes if an error occurs when attempting to move the file. Invoked with a `FileError` object. _(Function)_
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/810182c2/docs/en/edge/cordova/globalization/globalization.stringToDate.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/cordova/globalization/globalization.stringToDate.md b/docs/en/edge/cordova/globalization/globalization.stringToDate.md
index 797cf18..cff0e4e 100644
--- a/docs/en/edge/cordova/globalization/globalization.stringToDate.md
+++ b/docs/en/edge/cordova/globalization/globalization.stringToDate.md
@@ -34,17 +34,17 @@ a parameter. That object should have the following properties:
- __year__: The four digit year. _(Number)_
-- __month__: The month from (0 - 11). _(Number)_
+- __month__: The month from (0-11). _(Number)_
-- __day__: The day from (1 - 31). _(Number)_
+- __day__: The day from (1-31). _(Number)_
-- __hour__: The hour from (0 - 23). _(Number)_
+- __hour__: The hour from (0-23). _(Number)_
-- __minute__: The minute from (0 - 59). _(Number)_
+- __minute__: The minute from (0-59). _(Number)_
-- __second__: The second from (0 - 59). _(Number)_
+- __second__: The second from (0-59). _(Number)_
-- __millisecond__: The milliseconds (from 0 - 999), not available on all platforms. _(Number)_
+- __millisecond__: The milliseconds (from 0-999), not available on all platforms. _(Number)_
The inbound `dateString` parameter should be of type `String`.
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/810182c2/docs/en/edge/guide/platforms/ios/plugin.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/guide/platforms/ios/plugin.md b/docs/en/edge/guide/platforms/ios/plugin.md
index 59c01cb..404cb13 100644
--- a/docs/en/edge/guide/platforms/ios/plugin.md
+++ b/docs/en/edge/guide/platforms/ios/plugin.md
@@ -157,7 +157,7 @@ application folder:
@end
Let's take a look at the code. At the top we have all of the necessary
-Cordova imports. Our class extends from `CDVPlugin` - very important.
+Cordova imports. Our class extends from `CDVPlugin` (very important).
This plugin only supports one action, the `echo` action. First, we
grab the echo string using the `objectAtIndex` method on our `args`,
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/810182c2/docs/en/edge/guide/platforms/ios/upgrading.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/guide/platforms/ios/upgrading.md b/docs/en/edge/guide/platforms/ios/upgrading.md
index caae78f..b2ce50b 100644
--- a/docs/en/edge/guide/platforms/ios/upgrading.md
+++ b/docs/en/edge/guide/platforms/ios/upgrading.md
@@ -170,7 +170,7 @@ Plugins.
9. In your `config.xml` file, [add this new line](https://git-wip-us.apache.org/repos/asf?p=cordova-ios.git;a=blobdiff;f=bin/templates/project/__TESTING__/config.xml;h=d307827b7e67301171a913417fb10003d43ce39d;hp=04260aa9786d6d74ab20a07c86d7e8b34e31968c;hb=97b89edfae3527828c0ca6bb2f6d58d9ded95188;hpb=942d33c8e7174a5766029ea1232ba2e0df745c3f).
-10. In your `config.xml` file, [UIWebViewBounce has ben changed to DisallowOverscroll - and default values are different](https://git-wip-us.apache.org/repos/asf?p=cordova-ios.git;a=blobdiff;f=bin/templates/project/__TESTING__/config.xml;h=8889726d9a8f8c530fe1371c56d858c34552992a;hp=d307827b7e67301171a913417fb10003d43ce39d;hb=57982de638a4dce6ae130a26662591741b065f00;hpb=ec411f18309d577b4debefd9a2f085ba719701d5).
+10. In your `config.xml` file, [UIWebViewBounce has been changed to DisallowOverscroll, and default values are different](https://git-wip-us.apache.org/repos/asf?p=cordova-ios.git;a=blobdiff;f=bin/templates/project/__TESTING__/config.xml;h=8889726d9a8f8c530fe1371c56d858c34552992a;hp=d307827b7e67301171a913417fb10003d43ce39d;hb=57982de638a4dce6ae130a26662591741b065f00;hpb=ec411f18309d577b4debefd9a2f085ba719701d5).
10. In your `config.xml` file, the `EnableLocation` preference has been deprecated.
@@ -336,7 +336,9 @@ With Cordova 2.1.0, `CordovaLib` has been upgraded to use __Automatic Reference
5. Copy the `cordova` directory from the new project into your project's root directory (if you want the project command-line tools).
-6. Add a new entry under `Plugins` in your `Cordova.plist` file (under the __Supporting Files__ group) - the key is `Device` and the value is `CDVDevice`.
+6. Add a new entry under `Plugins` in your `Cordova.plist` file, under
+ the __Supporting Files__ group. The key is `Device` and the value
+ is `CDVDevice`.
7. Remove `Cordova.framework`.
@@ -348,7 +350,7 @@ With Cordova 2.1.0, `CordovaLib` has been upgraded to use __Automatic Reference
11. Locate the `CordovaLib` directory that was installed in your hard-drive under your home folder's `Documents` subdirectory.
-12. Locate the `CordovaLib.xcodeproj` file in the `CordovaLib` directory, then drag and drop the file into your project - it should appear as a sub-project.
+12. Locate the `CordovaLib.xcodeproj` file in the `CordovaLib` directory, then drag and drop the file into your project. It should appear as a sub-project.
13. Build your project, you should get some errors relating to `#import` directives.
@@ -420,20 +422,20 @@ __NOTE:__ If your project is not working as expected in the Simulator, please ta
1. Install Cordova 1.9.0.
-2. Create a new project - you will have to grab assets from this new project.
+2. Create a new project. You will need some of the assets from this new project.
3. Copy the `www/cordova-1.9.0.js` file from the new project into your `www` directory, and delete your `www/cordova-1.8.x.js` file.
4. Update the Cordova script reference in your `www/index.html` file (and any other files that contain the script reference) to point to the new `cordova-1.9.0.js` file.
__NOTE:__ 1.9.0 supports the new `BackupWebStorage` boolean `Cordova.plist` setting. It's enabled by default, so set it to
-`false` to disable it, especially on iOS 6. See [Release Notes - Safari and UIKit Section](https://developer.apple.com/library/prerelease/ios/#releasenotes/General/RN-iOSSDK-6_0/_index.html)
+`false` to disable it, especially on iOS 6. See [Release Notes: Safari and UIKit Section](https://developer.apple.com/library/prerelease/ios/#releasenotes/General/RN-iOSSDK-6_0/_index.html)
## Upgrading 1.7.0 projects to 1.8.x ##
1. Install Cordova 1.8.0.
-2. Create a new project - you will have to grab assets from this new project.
+2. Create a new project. You will need some of the assets from this new project.
3. Copy the `www/cordova-1.8.0.js` file from the new project into your `www` directory, and delete your `www/cordova-1.7.x.js` file.
@@ -451,7 +453,7 @@ If you intend on using the Capture API, you will need the new __iPad retina-disp
1. Install Cordova 1.7.0.
-2. Create a new project - you will have to grab assets from this new project.
+2. Create a new project. You will need some of the assets from this new project.
3. Copy the `www/cordova-1.7.0.js` file from the new project into your `www` directory, and delete your `www/cordova-1.6.0.js` file.
@@ -463,7 +465,7 @@ If you intend on using the Capture API, you will need the new __iPad retina-disp
2. Make a backup of `AppDelegate.m`, `AppDelegate.h`, `MainViewController.m`, `MainViewController.h`, and `Cordova.plist` in your project.
-3. Create a new project - you will have to grab assets from this new project.
+3. Create a new project. You will need some of the assets from this new project.
4. Copy these files from the new project into your 1.5.0-based project folder on disk, replacing any old files (backup your files first from step 2 above):
@@ -479,7 +481,10 @@ If you intend on using the Capture API, you will need the new __iPad retina-disp
7. Update the Cordova script reference in your `www/index.html` file (and any other files that contain the script reference) to point to the new `cordova-1.6.1.js` file.
-8. Add the new `Cordova.plist` file into your project - this is because the core plugin service names needed to be changed to match the ones from Android and BlackBerry, for a unified Cordova JavaScript file (cordova-js).
+8. Add the new `Cordova.plist` file into your project. This is
+ necessary because the core plugin service names must change to
+ match the ones from Android and BlackBerry, for a unified Cordova
+ JavaScript file (`cordova-js`).
9. Integrate any settings, __Plugins__ and __ExternalHosts__ entries that you had in your __backed-up Cordova.plist__ into the new `Cordova.plist`.
@@ -497,7 +502,7 @@ If you intend on using the Capture API, you will need the new __iPad retina-disp
1. Install Cordova 1.5.0.
-2. Create a new project and run it once - you will have to grab assets from this new project.
+2. Create a new project and run it once. You will need some of the assets from this new project.
3. Copy the `www/cordova-1.5.0.js` file from the new project into your `www` directory, and delete your `www/phonegap-1.4.x.js` file.
@@ -557,11 +562,15 @@ If you intend on using the Capture API, you will need the new __iPad retina-disp
30. Press __Option-Command-F__, choose __Replace__ from the drop-down on the top left of the Source window.
-31. Enter `com.phonegap` for the Find string, and `org.apache.cordova` for the Replace string - then press the __Replace All__ button.
+31. Enter `com.phonegap` for the Find string, and `org.apache.cordova`
+ for the Replace string, then press the __Replace All__ button.
-32. Enter __PG__ for the Find string, and __CDV__ for the Replace string - then press the __Replace All__ button.
+32. Enter __PG__ for the Find string, and __CDV__ for the Replace
+ string, then press the __Replace All__ button.
-33. Press __Command-B__ to build, you will still have deprecations that you can get rid of in the future (see `CDVDeprecated.h` - replace classes in your code that use PG* to CDV*, for example).
+33. Press __Command-B__ to build, you will still have deprecations
+ that you can get rid of in the future (see `CDVDeprecated.h`. For
+ example, replace classes in your code that use PG* to CDV*).
## Upgrading 1.4.0 projects to 1.4.1 ##
@@ -569,7 +578,7 @@ If you intend on using the Capture API, you will need the new __iPad retina-disp
2. Make a backup of `MainViewController.m`.
-3. Create a new project - you will have to grab assets from this new project.
+3. Create a new project. You will need some of the assets from this new project.
4. Copy the `MainViewController.m` file from the new project into your 1.4.0-based project folder on disk, replacing the old file (backup your files first from step 2 above).
@@ -585,7 +594,7 @@ If you intend on using the Capture API, you will need the new __iPad retina-disp
2. Make a backup of `AppDelegate.m` and `AppDelegate.h` in your project.
-3. Create a new project - you will have to grab assets from this new project.
+3. Create a new project. You will need some of the assets from this new project.
4. Copy these files from the new project into your 1.3.0-based project folder on disk, replacing any old files (backup your files first from step 2 above):
@@ -601,7 +610,8 @@ If you intend on using the Capture API, you will need the new __iPad retina-disp
7. Update the Cordova script reference in your `www/index.html` file (and any other files that contain the script reference) to point to the new `phonegap-1.4.0.js` file.
-8. Add a new entry under `Plugins` in your `PhoneGap.plist` file - key is `com.phonegap.battery` and the value is `PGBattery`.
+8. Add a new entry under `Plugins` in your `PhoneGap.plist` file. The
+ key is `com.phonegap.battery` and the value is `PGBattery`.
9. Integrate any project-specific code that you have in your backed-up `AppDelegate.h` and `AppDelegate.m` into the new AppDelegate files.
@@ -611,7 +621,7 @@ If you intend on using the Capture API, you will need the new __iPad retina-disp
2. Make a backup of `AppDelegate.m` and `AppDelegate.h` in your project.
-3. Create a new project - you will have to grab assets from this new project.
+3. Create a new project. You will need some of the assets from this new project.
4. Copy these files from the new project into your 1.2.0-based project folder on disk, replacing any old files (backup your files first from step 2 above):
@@ -627,7 +637,8 @@ If you intend on using the Capture API, you will need the new __iPad retina-disp
7. Update the Cordova script reference in your `www/index.html` file (and any other files that contain the script reference) to point to the new `phonegap-1.3.0.js` file.
-8. Add a new entry under `Plugins` in your `PhoneGap.plist` file - key is `com.phonegap.battery` and the value is `PGBattery`.
+8. Add a new entry under `Plugins` in your `PhoneGap.plist` file. The
+ key is `com.phonegap.battery` and the value is `PGBattery`.
9. Integrate any project-specific code that you have in your backed-up `AppDelegate.h` and `AppDelegate.m` into the new AppDelegate files.
@@ -637,7 +648,7 @@ If you intend on using the Capture API, you will need the new __iPad retina-disp
2. Make a backup of `AppDelegate.m` and `AppDelegate.h` in your project.
-3. Create a new project - you will have to grab assets from this new project.
+3. Create a new project. You will need some of the assets from this new project.
4. Copy these files from the new project into your 1.1.0-based project folder on disk, replacing any old files (backup your files first from step 2 above):
@@ -653,7 +664,8 @@ If you intend on using the Capture API, you will need the new __iPad retina-disp
7. Update the Cordova script reference in your `www/index.html` file (and any other files that contain the script reference) to point to the new `phonegap-1.2.0.js` file.
-8. Add a new entry under `Plugins` in your `PhoneGap.plist` file - key is `com.phonegap.battery` and the value is `PGBattery`.
+8. Add a new entry under `Plugins` in your `PhoneGap.plist` file. The
+ key is `com.phonegap.battery` and the value is `PGBattery`.
9. Integrate any project-specific code that you have in your backed-up `AppDelegate.h` and `AppDelegate.m` into the new AppDelegate files.
@@ -663,7 +675,7 @@ If you intend on using the Capture API, you will need the new __iPad retina-disp
2. Make a backup of `AppDelegate.m` and `AppDelegate.h` in your project.
-3. Create a new project - you will have to grab assets from this new project.
+3. Create a new project. You will need some of the assets from this new project.
4. Copy these files from the new project into your 1.0.0-based project folder on disk, replacing any old files (backup your files first from step 2 above):
@@ -679,7 +691,8 @@ If you intend on using the Capture API, you will need the new __iPad retina-disp
7. Update the Cordova script reference in your `www/index.html` file (and any other files that contain the script reference) to point to the new `phonegap-1.1.0.js` file.
-8. Add a new entry under `Plugins` in your `PhoneGap.plist` file - key is `com.phonegap.battery` and the value is `PGBattery`.
+8. Add a new entry under `Plugins` in your `PhoneGap.plist` file. The
+ key is `com.phonegap.battery` and the value is `PGBattery`.
9. Integrate any project-specific code that you have in your backed-up `AppDelegate.h` and `AppDelegate.m` into the new AppDelegate files.
@@ -689,7 +702,7 @@ If you intend on using the Capture API, you will need the new __iPad retina-disp
2. Make a backup of `AppDelegate.m` and `AppDelegate.h` in your project.
-3. Create a new project - you will have to grab assets from this new project.
+3. Create a new project. You will need some of the assets from this new project.
4. Copy these files from the new project into your 0.9.6-based project folder on disk, replacing any old files (backup your files first from step 2 above):
@@ -705,6 +718,7 @@ If you intend on using the Capture API, you will need the new __iPad retina-disp
7. Update the Cordova script reference in your `www/index.html` file (and any other files that contain the script reference) to point to the new `phonegap-1.0.0.js` file.
-8. Add a new entry under `Plugins` in your `PhoneGap.plist` file - key is `com.phonegap.battery` and the value is `PGBattery`.
+8. Add a new entry under `Plugins` in your `PhoneGap.plist` file. The
+ key is `com.phonegap.battery` and the value is `PGBattery`.
9. Integrate any project-specific code that you have in your backed-up `AppDelegate.h` and `AppDelegate.m` into the new AppDelegate files.
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/810182c2/docs/en/edge/guide/platforms/ios/webview.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/guide/platforms/ios/webview.md b/docs/en/edge/guide/platforms/ios/webview.md
index 31de972..31998f8 100644
--- a/docs/en/edge/guide/platforms/ios/webview.md
+++ b/docs/en/edge/guide/platforms/ios/webview.md
@@ -80,11 +80,11 @@ based Cleaver implementation.
MobileCoreServices.framework
CoreMedia.framework
-16. Expand **Target Dependencies** - the top box labeled like this if you have multiple boxes!
+16. Expand **Target Dependencies**, the top box labeled like this if you have multiple boxes!
17. Select the **+** button, and add the `CordovaLib` build product.
-18. Expand **Link Binaries with Libraries** - the top box labeled like
+18. Expand **Link Binaries with Libraries**, the top box labeled like
this if you have multiple boxes!
19. Select the **+** button, and add `libCordova.a`.
[09/15] docs commit: [CB-3962] no (s) necessary for plural
Posted by mw...@apache.org.
[CB-3962] no (s) necessary for plural
Project: http://git-wip-us.apache.org/repos/asf/cordova-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-docs/commit/2fa779ac
Tree: http://git-wip-us.apache.org/repos/asf/cordova-docs/tree/2fa779ac
Diff: http://git-wip-us.apache.org/repos/asf/cordova-docs/diff/2fa779ac
Branch: refs/heads/master
Commit: 2fa779ac1b13a754915df3b3245e16872023eb77
Parents: bd38519
Author: Mike Sierra <le...@gmail.com>
Authored: Wed Jul 31 12:38:00 2013 -0400
Committer: Michael Brooks <mi...@michaelbrooks.ca>
Committed: Wed Jul 31 12:59:59 2013 -0700
----------------------------------------------------------------------
STYLESHEET.md | 3 +++
docs/en/edge/cordova/media/capture/captureAudio.md | 2 +-
docs/en/edge/cordova/media/capture/captureImage.md | 2 +-
docs/en/edge/cordova/media/capture/captureVideo.md | 2 +-
docs/en/edge/guide/platforms/blackberry10/tools.md | 6 +++---
5 files changed, 9 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/2fa779ac/STYLESHEET.md
----------------------------------------------------------------------
diff --git a/STYLESHEET.md b/STYLESHEET.md
index 731559c..a592ece 100644
--- a/STYLESHEET.md
+++ b/STYLESHEET.md
@@ -169,6 +169,9 @@ editorial guidelines.
* Avoid unnecessary/gratuitous slash-delimited alternators in text, as
in this example (but OK to refer to try/catch blocks).
+* Avoid trailing (s) to denote optional plural. It's usually implicit.
+ E.g., "return information about captured image files", not "file(s)"
+
## Punctuation
* Initial Cap Words in Headings, Except for Short Prepositions or
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/2fa779ac/docs/en/edge/cordova/media/capture/captureAudio.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/cordova/media/capture/captureAudio.md b/docs/en/edge/cordova/media/capture/captureAudio.md
index edf05e3..ba0fc36 100644
--- a/docs/en/edge/cordova/media/capture/captureAudio.md
+++ b/docs/en/edge/cordova/media/capture/captureAudio.md
@@ -20,7 +20,7 @@ license: Licensed to the Apache Software Foundation (ASF) under one
capture.captureAudio
====================
-> Start the audio recorder application and return information about the captured audio clip file(s).
+> Start the audio recorder application and return information about captured audio clip files.
navigator.device.capture.captureAudio(
CaptureCB captureSuccess, CaptureErrorCB captureError, [CaptureAudioOptions options]
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/2fa779ac/docs/en/edge/cordova/media/capture/captureImage.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/cordova/media/capture/captureImage.md b/docs/en/edge/cordova/media/capture/captureImage.md
index 4b02b0b..9153a47 100644
--- a/docs/en/edge/cordova/media/capture/captureImage.md
+++ b/docs/en/edge/cordova/media/capture/captureImage.md
@@ -20,7 +20,7 @@ license: Licensed to the Apache Software Foundation (ASF) under one
capture.captureImage
====================
-> Start the camera application and return information about captured image file(s).
+> Start the camera application and return information about captured image files.
navigator.device.capture.captureImage(
CaptureCB captureSuccess, CaptureErrorCB captureError, [CaptureImageOptions options]
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/2fa779ac/docs/en/edge/cordova/media/capture/captureVideo.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/cordova/media/capture/captureVideo.md b/docs/en/edge/cordova/media/capture/captureVideo.md
index e893b54..997a3b1 100644
--- a/docs/en/edge/cordova/media/capture/captureVideo.md
+++ b/docs/en/edge/cordova/media/capture/captureVideo.md
@@ -20,7 +20,7 @@ license: Licensed to the Apache Software Foundation (ASF) under one
capture.captureVideo
====================
-> Start the video recorder application and return information about captured video clip file(s).
+> Start the video recorder application and return information about captured video clip files.
navigator.device.capture.captureVideo(
CaptureCB captureSuccess, CaptureErrorCB captureError, [CaptureVideoOptions options]
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/2fa779ac/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 9cb5e3d..8c3f6fa 100644
--- a/docs/en/edge/guide/platforms/blackberry10/tools.md
+++ b/docs/en/edge/guide/platforms/blackberry10/tools.md
@@ -58,9 +58,9 @@ command-line utility opened with administrator privileges.
## target
-The `target` command allows you to manage the BlackBerry device(s) or
-emulator that you will use to test your app. You can add or remove a
-target, or set a target as the default target.
+The `target` command allows you to manage the emulator or BlackBerry
+devices that you use to test your app. You can add or remove a target,
+or set a target as the default target.
### Add a target
[08/15] docs commit: [CB-3962] monospace for inline commands
Posted by mw...@apache.org.
[CB-3962] monospace for inline commands
Project: http://git-wip-us.apache.org/repos/asf/cordova-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-docs/commit/bd38519a
Tree: http://git-wip-us.apache.org/repos/asf/cordova-docs/tree/bd38519a
Diff: http://git-wip-us.apache.org/repos/asf/cordova-docs/diff/bd38519a
Branch: refs/heads/master
Commit: bd38519afca668723a88fa6528093eefd391ce21
Parents: 89a6b5a
Author: Mike Sierra <le...@gmail.com>
Authored: Wed Jul 31 12:31:58 2013 -0400
Committer: Michael Brooks <mi...@michaelbrooks.ca>
Committed: Wed Jul 31 12:59:50 2013 -0700
----------------------------------------------------------------------
docs/en/edge/guide/hybrid/plugins/index.md | 2 +-
docs/en/edge/guide/platforms/blackberry10/tools.md | 16 ++++++++++------
2 files changed, 11 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/bd38519a/docs/en/edge/guide/hybrid/plugins/index.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/guide/hybrid/plugins/index.md b/docs/en/edge/guide/hybrid/plugins/index.md
index 64896fd..1b7efb3 100644
--- a/docs/en/edge/guide/hybrid/plugins/index.md
+++ b/docs/en/edge/guide/hybrid/plugins/index.md
@@ -100,7 +100,7 @@ Cordova has a plugin specification available to enable automated
installation of the plugin for Android, iOS, BlackBerry 10 and Windows
Phone platforms. By structuring your plugin in a particular way and
adding a `plugin.xml` manifest file, you can enable users to install
-your plugin via the command line tooling.
+your plugin via the command-line tooling.
- Plugin Specification
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/bd38519a/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 cf8c65a..9cb5e3d 100644
--- a/docs/en/edge/guide/platforms/blackberry10/tools.md
+++ b/docs/en/edge/guide/platforms/blackberry10/tools.md
@@ -37,20 +37,24 @@ arguments.
## create
-The 'create' command creates a new project:
+The `create` command creates a new project:
bin/create <path-to-project> <project-package> <project-name>
where
-- '<path-to-project>' specifies the directory you want the project created in
+- `<path-to-project>` specifies the directory you want the project created in
-- '<project-package>' specifies a reverse domain style identifier
+- `<project-package>` specifies a reverse domain style identifier
-- '<project-name>' specifies the apps display name
+- `<project-name>` specifies the apps display name
-*Note*: the create command bootstraps dependency installation through the 'npm install' command. Depending on installation directory and system permissions, this may require admin privileges.
-If a problem is encountered on OSX/Linux, run 'sudo npm install' before using the create command. On Windows, run 'npm install' in a command line utility opened with admin privileges.
+__NOTE:__ the `create` command bootstraps dependency installation
+through the `npm install` command. Depending on the installation
+directory and system permissions, this may require administrator
+privileges. If there's problem on OSX/Linux, run `sudo npm install`
+before using the `create` command. On Windows, run `npm install` in a
+command-line utility opened with administrator privileges.
## target
[13/15] docs commit: [CB-3822] merge extra 'setup new project'
section in older BB
Posted by mw...@apache.org.
[CB-3822] merge extra 'setup new project' section in older BB
Project: http://git-wip-us.apache.org/repos/asf/cordova-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-docs/commit/e6efa331
Tree: http://git-wip-us.apache.org/repos/asf/cordova-docs/tree/e6efa331
Diff: http://git-wip-us.apache.org/repos/asf/cordova-docs/diff/e6efa331
Branch: refs/heads/master
Commit: e6efa3314621c3dbdbb4e6ee16539d7cd8047c30
Parents: 0b3e0b7
Author: Mike Sierra <le...@gmail.com>
Authored: Wed Jul 31 13:43:27 2013 -0400
Committer: Michael Brooks <mi...@michaelbrooks.ca>
Committed: Wed Jul 31 13:00:28 2013 -0700
----------------------------------------------------------------------
.../en/edge/guide/platforms/blackberry/index.md | 93 +++++++++-----------
1 file changed, 44 insertions(+), 49 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/e6efa331/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 6cc4d70..76eb31c 100644
--- a/docs/en/edge/guide/platforms/blackberry/index.md
+++ b/docs/en/edge/guide/platforms/blackberry/index.md
@@ -71,33 +71,46 @@ SDKs can be downloaded from the following locations.
- [BlackBerry Smartphones SDK] (https://developer.blackberry.com/html5/download/#smartphones)
-## 3. Register for Signing Keys
+## Register for Signing Keys
-If you wish to publish your application on BlackBerry App World, or deploy on an actual device you’ll need to register for a set of free Code 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.
-To register for Signing Keys visit, and complete the [BlackBerry Keys Order Form](https://www.blackberry.com/SignedKeys).
-
-Once you receive your Signing Keys, they'll need to be setup. To learn how to setup your Signing Keys visit the [BlackBerry HTML5/WebWorks website](https://developer.blackberry.com/html5/documentation/signing_setup_bb10_apps_2008396_11.html).
-
-## 4. Install Cordova
+## Install Cordova
Download and extract the latest copy of [Cordova](http://cordova.apache.org/#download).
-## 5. Set up New Project
+## 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. CD into the `blackberry` directory.
+- There is a directory for each platform that Cordova supports.
+ Navigate to the `blackberry` directory.
-- The blackberry directory contains several directories. The `example` directory contains a complete Cordova project. Copy the `example` directory to another location on your computer.
+- 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.
-- Change to the newly created directory.
+- 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):
-- Open up the project.properties file with your favorite editor and edit the entries for the WebWorks SDKs you are using. For example...
+ 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
-BlackBerry 10 (QNX)
+These correspond to parameters you specify when building your
+project. The first time you run these commands, they generate a
+"HelloWorld" application:
-- `qnx.bbwp.dir=C:\\Program Files (x86)\\Research In Motion\\BlackBerry 10 WebWorks SDK 1.0.2.9`
+ 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
@@ -105,40 +118,16 @@ 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
+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. Consult the
-following for more information:
+`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)
-Build the Cordova sample project by typing `./cordova/build <target>` in your command prompt while you are in your project's directory. Replace `<target>` with either `qnx` `playbook` or `blackberry`. For example...
-
-* [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)
-
-## Set up a New Project
-
-* Open up a command-line terminal. From the directory where you
- extracted Cordova, navigate to the `blackberry` subdirectory.
-
-* Copy the `blackberry` directory's `example` subdirectory 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 or BlackBerry Smartphone (OS5-7):
-
- 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
-
-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
+* [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
@@ -148,7 +137,12 @@ 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).
-While in your project directory, in command prompt 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...
+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)
@@ -170,8 +164,8 @@ 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
+ cordova/run playbook
+ cordova/run blackberry
If you are prompted whether a device is connected to your computer,
answer no.
@@ -186,11 +180,12 @@ 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
+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:
-While in your project directory, in command prompt type `./cordova/run <target>`. Replace `<target>` with either `qnx`, `playbook`, or `blackberry`. For example...
+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.
@@ -198,8 +193,8 @@ On BlackBerry Smartphone (OS5-7), specify the
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
+ cordova/run playbook
+ cordova/run blackberry
If you are prompted whether a device is connected to your computer,
answer yes.