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/16 23:20:54 UTC
[3/8] docs commit: [CB-3962] global: Blackberry => BlackBerry
[CB-3962] global: Blackberry => BlackBerry
Project: http://git-wip-us.apache.org/repos/asf/cordova-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-docs/commit/b624d4e5
Tree: http://git-wip-us.apache.org/repos/asf/cordova-docs/tree/b624d4e5
Diff: http://git-wip-us.apache.org/repos/asf/cordova-docs/diff/b624d4e5
Branch: refs/heads/master
Commit: b624d4e56e10f5232af125b2525e5068b419b9d3
Parents: b4f636d
Author: Mike Sierra <le...@gmail.com>
Authored: Tue Jul 16 10:08:19 2013 -0400
Committer: Michael Brooks <mi...@michaelbrooks.ca>
Committed: Tue Jul 16 14:15:50 2013 -0700
----------------------------------------------------------------------
STYLESHEET.md | 2 ++
docs/en/edge/cordova/camera/camera.getPicture.md | 2 +-
docs/en/edge/cordova/contacts/ContactAddress/contactaddress.md | 2 +-
.../contacts/ContactOrganization/contactorganization.md | 4 ++--
docs/en/edge/guide/cli/index.md | 2 +-
docs/en/edge/guide/overview/index.md | 4 ++--
docs/en/edge/guide/platforms/blackberry/plugin.md | 4 ++--
docs/en/edge/guide/platforms/blackberry/tools.md | 4 ++--
docs/en/edge/guide/platforms/blackberry/upgrading.md | 6 +++---
docs/en/edge/guide/platforms/blackberry10/tools.md | 2 +-
docs/en/edge/guide/platforms/index.md | 4 ++--
docs/en/edge/guide/platforms/ios/upgrading.md | 2 +-
12 files changed, 20 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/b624d4e5/STYLESHEET.md
----------------------------------------------------------------------
diff --git a/STYLESHEET.md b/STYLESHEET.md
index 96846da..e77e02d 100644
--- a/STYLESHEET.md
+++ b/STYLESHEET.md
@@ -117,6 +117,8 @@ editorial guidelines.
* Mac "OS X", not "OSX"
+* BlackBerry, not Blackberry
+
* Prefer "emulator" over "simulator"; clarify when interfaces refer to
them differently.
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/b624d4e5/docs/en/edge/cordova/camera/camera.getPicture.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/cordova/camera/camera.getPicture.md b/docs/en/edge/cordova/camera/camera.getPicture.md
index 0bb4750..a7a3f8f 100644
--- a/docs/en/edge/cordova/camera/camera.getPicture.md
+++ b/docs/en/edge/cordova/camera/camera.getPicture.md
@@ -68,7 +68,7 @@ Supported Platforms
-------------------
- Android
-- Blackberry WebWorks (OS 5.0 and higher)
+- BlackBerry WebWorks (OS 5.0 and higher)
- iOS
- Tizen
- Windows Phone 7 and 8
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/b624d4e5/docs/en/edge/cordova/contacts/ContactAddress/contactaddress.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/cordova/contacts/ContactAddress/contactaddress.md b/docs/en/edge/cordova/contacts/ContactAddress/contactaddress.md
index 51dd78b..11ebd4c 100644
--- a/docs/en/edge/cordova/contacts/ContactAddress/contactaddress.md
+++ b/docs/en/edge/cordova/contacts/ContactAddress/contactaddress.md
@@ -144,7 +144,7 @@ Android 2.X Quirks
BlackBerry WebWorks (OS 5.0 and higher) Quirks
--------------------------------------------
-- __pref__: Not supported on Blackberry devices, returning `false`.
+- __pref__: Not supported on BlackBerry devices, returning `false`.
- __type__: Partially supported. Only one each of _Work_ and _Home_ type addresses can be stored per contact.
- __formatted__: Partially supported. Returns a concatenation of all BlackBerry address fields.
- __streetAddress__: Supported. Returns a concatenation of BlackBerry __address1__ and __address2__ address fields.
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/b624d4e5/docs/en/edge/cordova/contacts/ContactOrganization/contactorganization.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/cordova/contacts/ContactOrganization/contactorganization.md b/docs/en/edge/cordova/contacts/ContactOrganization/contactorganization.md
index 9edfd04..a65d4e2 100644
--- a/docs/en/edge/cordova/contacts/ContactOrganization/contactorganization.md
+++ b/docs/en/edge/cordova/contacts/ContactOrganization/contactorganization.md
@@ -131,8 +131,8 @@ Android 2.X Quirks
BlackBerry WebWorks (OS 5.0 and higher) Quirks
--------------------------------------------
-- __pref__: Not supported by Blackberry devices, returning `false`.
-- __type__: Not supported by Blackberry devices, returning `null`.
+- __pref__: Not supported by BlackBerry devices, returning `false`.
+- __type__: Not supported by BlackBerry devices, returning `null`.
- __name__: Partially supported. The first organization name is stored in the BlackBerry __company__ field.
- __department__: Not supported, returning `null`.
- __title__: Partially supported. The first organization title is stored in the BlackBerry __jobTitle__ field.
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/b624d4e5/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 08e9d8d..4c63c12 100644
--- a/docs/en/edge/guide/cli/index.md
+++ b/docs/en/edge/guide/cli/index.md
@@ -39,7 +39,7 @@ platform's SDK. The CLI supports the following combinations:
* iOS (Mac)
* Android (Mac, Linux)
-* Blackberry (Mac, Windows)
+* BlackBerry (Mac, Windows)
* Windows Phone 7 (Windows)
* Windows Phone 8 (Windows)
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/b624d4e5/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 856ae82..4d1cece 100644
--- a/docs/en/edge/guide/overview/index.md
+++ b/docs/en/edge/guide/overview/index.md
@@ -130,8 +130,8 @@ available for each mobile platform:
<tr>
<th></td>
<th>Android</th>
- <th>Blackberry</th>
- <th>Blackberry 10</th>
+ <th>BlackBerry</th>
+ <th>BlackBerry 10</th>
<th>iOS</th>
<th>Windows<br/>Phone 7</th>
<th>Windows<br/>Phone 8</th>
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/b624d4e5/docs/en/edge/guide/platforms/blackberry/plugin.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/guide/platforms/blackberry/plugin.md b/docs/en/edge/guide/platforms/blackberry/plugin.md
index b8f78b0..aca4b83 100644
--- a/docs/en/edge/guide/platforms/blackberry/plugin.md
+++ b/docs/en/edge/guide/platforms/blackberry/plugin.md
@@ -23,7 +23,7 @@ BlackBerry Plugins
This guide shows how to develop an Echo plugin on BlackBerry. The
Plugin Development Guide provides a broad overview with which you
should already be familiar, and this guide picks up where it leaves
-off. In addition, download the [Cordova Blackberry
+off. In addition, download the [Cordova BlackBerry
repository](https://git-wip-us.apache.org/repos/asf?p=cordova-blackberry-webworks.git;a=summary).
The `Cordova-BlackBerry` project allows you to deploy to BlackBerry
@@ -85,7 +85,7 @@ and [str] are the arguments we are passing in.
import org.apache.cordova.json4j.JSONException;
import org.apache.cordova.json4j.JSONObject;
/**
- * A simple plugin to demonstrate how to build a plugin for Blackberry
+ * A simple plugin to demonstrate how to build a plugin for BlackBerry
* Basically echos back the msg that a user calls to this plugin
*/
public final class Echo extends Plugin {
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/b624d4e5/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 3416a08..ee9f3b3 100644
--- a/docs/en/edge/guide/platforms/blackberry/tools.md
+++ b/docs/en/edge/guide/platforms/blackberry/tools.md
@@ -17,7 +17,7 @@ license: Licensed to the Apache Software Foundation (ASF) under one
under the License.
---
-# Blackberry Command-line Tools
+# BlackBerry Command-line Tools
The `cordova` command-line utility is a high-level tool that allows
you to build applications across several platforms at once. An older
@@ -39,7 +39,7 @@ name. Here is the syntax for both Mac and Windows:
$ /path/to/cordova-blackberry-webworks/bin/create /path/to/my_new_project com.example.project_name ProjectName
$ /path/to/cordova-blackberry-webworks/bin/create.bat /path/to/my_new_project com.example.project_name ProjectName
-__NOTE:__ The Blackberry platform ignores the package name placeholder
+__NOTE:__ The BlackBerry platform ignores the package name placeholder
(`com.example.project_name`), but it's still required for use by
cross-platform tools.
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/b624d4e5/docs/en/edge/guide/platforms/blackberry/upgrading.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/guide/platforms/blackberry/upgrading.md b/docs/en/edge/guide/platforms/blackberry/upgrading.md
index 4e02b0c..d278a17 100644
--- a/docs/en/edge/guide/platforms/blackberry/upgrading.md
+++ b/docs/en/edge/guide/platforms/blackberry/upgrading.md
@@ -29,7 +29,7 @@ This document describes the process of upgrading Cordova projects to the latest
1. **Download and extract the Cordova 2.9.0 source** to a **permanent folder location** on your hard drive (say to ~/Cordova-2.9.0)
2. **Quit any running SDK tools**: Eclipse, Momentics and the like.
3. **Navigate** to the directory where you put the downloaded source above, using a unix like terminal: **Terminal.app**, **Bash**, **Cygwin**, etc.
-4. **Create a new project**, as described in Blackberry Command-line Tools. This becomes the home of your updated project.
+4. **Create a new project**, as described in BlackBerry Command-line Tools. This becomes the home of your updated project.
5. **Copy** your projects source from the old project's /www folder to the new project's /www folder
6. **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.js** file
@@ -55,7 +55,7 @@ Also note that the cordova js script file is now called 'cordova.js' and no long
1. **Download and extract the Cordova 2.8.0 source** to a **permanent folder location** on your hard drive (say to ~/Cordova-2.8.0)
2. **Quit any running SDK tools**: Eclipse, Momentics and the like.
3. **Navigate** to the directory where you put the downloaded source above, using a unix like terminal: **Terminal.app**, **Bash**, **Cygwin**, etc.
-4. **Create a new project**, as described in Blackberry Command-line Tools. This becomes the home of your updated project.
+4. **Create a new project**, as described in BlackBerry Command-line Tools. This becomes the home of your updated project.
5. **Copy** your projects source from the old project's /www folder to the new project's /www folder
6. **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.js** file
@@ -76,7 +76,7 @@ Also note that the cordova js script file is now called 'cordova.js' and no long
1. **Download and extract the Cordova 2.7.0 source** to a **permanent folder location** on your hard drive (say to ~/Cordova-2.7.0)
2. **Quit any running SDK tools**: Eclipse, Momentics and the like.
3. **Navigate** to the directory where you put the downloaded source above, using a unix like terminal: **Terminal.app**, **Bash**, **Cygwin**, etc.
-4. **Create a new project**, as described in Blackberry Command-line Tools. You need the assets from this new project.
+4. **Create a new project**, as described in BlackBerry Command-line Tools. You need the assets from this new project.
5. **Copy** the **www/cordova-2.7.0.js** file from the new project into your **www** folder, and delete your **www/cordova-2.6.0.js** file
6. **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-2.7.0.js** file
7. **Copy** the **native** folder from the new project into the existing project, overwriting the old **native** folder
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/b624d4e5/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 b6a868f..87ec400 100644
--- a/docs/en/edge/guide/platforms/blackberry10/tools.md
+++ b/docs/en/edge/guide/platforms/blackberry10/tools.md
@@ -17,7 +17,7 @@ license: Licensed to the Apache Software Foundation (ASF) under one
under the License.
---
-# Blackberry 10 Command-line Tools
+# BlackBerry 10 Command-line Tools
The `cordova` command-line utility is a high-level tool that allows
you to build applications across several platforms at once. An older
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/b624d4e5/docs/en/edge/guide/platforms/index.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/guide/platforms/index.md b/docs/en/edge/guide/platforms/index.md
index 9f6d91c..6c65f1d 100644
--- a/docs/en/edge/guide/platforms/index.md
+++ b/docs/en/edge/guide/platforms/index.md
@@ -51,14 +51,14 @@ a lower-level alternative to the `cordova` command-line utility.
* BlackBerry Platform Guide
* BlackBerry Configuration
-* Blackberry Command-line Tools
+* BlackBerry Command-line Tools
* Upgrading BlackBerry
## BlackBerry 10
* BlackBerry 10 Platform Guide
* BlackBerry 10 Plugins
-* Blackberry 10 Command-line Tools
+* BlackBerry 10 Command-line Tools
## iOS
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/b624d4e5/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 c0b48c2..150fb26 100644
--- a/docs/en/edge/guide/platforms/ios/upgrading.md
+++ b/docs/en/edge/guide/platforms/ios/upgrading.md
@@ -291,7 +291,7 @@ If you intend on using the **Capture API**, you will need the new **iPad retina-
5. **Add** all the new **MainViewController** and **AppDelegate** files into your Xcode project
6. **Copy** the **www/cordova-1.6.1.js** file from the new project into your **www** folder, and delete your **www/cordova-1.5.0.js** file
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 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).
9. **Integrate** any settings, **Plugins** and **ExternalHosts** entries that you had in your **backed-up Cordova.plist** into the new `Cordova.plist`
10. **Integrate** any project-specific code that you have in your **backed-up AppDelegate.h and AppDelegate.m** into the new AppDelegate files. Any **UIWebViewDelegate** or **CDVCommandDelegate** code in `AppDelegate.m` will need to go into MainViewController.m now (see commented out sections in that file)
11. **Integrate** any project-specific code that you have in your **backed-up MainViewController.h and MainViewController.m** into the new MainViewController files