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/25 00:12:56 UTC
[01/12] docs commit: [CB-3820] remove dead links to nonexistent
platform-specific config pages
Updated Branches:
refs/heads/master f28dd9b90 -> 2a5b0f089
[CB-3820] remove dead links to nonexistent platform-specific config pages
Project: http://git-wip-us.apache.org/repos/asf/cordova-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-docs/commit/e73f0d59
Tree: http://git-wip-us.apache.org/repos/asf/cordova-docs/tree/e73f0d59
Diff: http://git-wip-us.apache.org/repos/asf/cordova-docs/diff/e73f0d59
Branch: refs/heads/master
Commit: e73f0d59e3739c66b7850237c7e76800dd75618c
Parents: f28dd9b
Author: Mike Sierra <le...@gmail.com>
Authored: Fri Jul 19 12:22:33 2013 -0400
Committer: Michael Brooks <mi...@michaelbrooks.ca>
Committed: Wed Jul 24 15:10:00 2013 -0700
----------------------------------------------------------------------
docs/en/edge/config_ref/index.md | 4 ----
1 file changed, 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/e73f0d59/docs/en/edge/config_ref/index.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/config_ref/index.md b/docs/en/edge/config_ref/index.md
index 51af63d..807f13f 100644
--- a/docs/en/edge/config_ref/index.md
+++ b/docs/en/edge/config_ref/index.md
@@ -33,10 +33,6 @@ properties, characteristics and behaviours are encapsulated as much as possible
- iOS Configuration
- Android Configuration
- BlackBerry Configuration
-- Windows Phone 7 Configuration
-- Windows Phone 8 Configuration
-- Windows 8 Configuration
-- FirefoxOS Configuration
## config.xml Elements
[12/12] docs commit: [CB-3816] no space in 'Hello World' until other
bug gets fixed
Posted by mw...@apache.org.
[CB-3816] no space in 'Hello World' until other bug gets fixed
Project: http://git-wip-us.apache.org/repos/asf/cordova-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-docs/commit/2a5b0f08
Tree: http://git-wip-us.apache.org/repos/asf/cordova-docs/tree/2a5b0f08
Diff: http://git-wip-us.apache.org/repos/asf/cordova-docs/diff/2a5b0f08
Branch: refs/heads/master
Commit: 2a5b0f08965062b6000019d01dc74660a622f661
Parents: db19cf2
Author: Mike Sierra <le...@gmail.com>
Authored: Wed Jul 24 13:44:03 2013 -0400
Committer: Michael Brooks <mi...@michaelbrooks.ca>
Committed: Wed Jul 24 15:12:08 2013 -0700
----------------------------------------------------------------------
docs/en/edge/guide/cli/index.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/2a5b0f08/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 bdb8d97..3b728d6 100644
--- a/docs/en/edge/guide/cli/index.md
+++ b/docs/en/edge/guide/cli/index.md
@@ -72,7 +72,7 @@ To install the `cordova` command-line tool, follow these steps:
Go to the directory where you maintain your source code, and run a
command such as the following:
- $ cordova create hello com.example.hello "Hello World"
+ $ cordova create hello com.example.hello HelloWorld
The first argument specifies a _hello_ directory to be generated
for your project. Its `www` subdirectory houses your application's
@@ -83,7 +83,7 @@ distribute the application.
The other two arguments are optional: the `com.example.hello` argument
provides your project with a reverse domain-style identifier, and the
-`"Hello World!"` provides the application's display text. You can edit
+`HelloWorld` provides the application's display text. You can edit
both of these values later in the `config.xml` file.
## Add Platforms
[02/12] docs commit: [CB-3820] add CLI to config.xml discussion
Posted by mw...@apache.org.
[CB-3820] add CLI to config.xml discussion
Project: http://git-wip-us.apache.org/repos/asf/cordova-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-docs/commit/8a37ba32
Tree: http://git-wip-us.apache.org/repos/asf/cordova-docs/tree/8a37ba32
Diff: http://git-wip-us.apache.org/repos/asf/cordova-docs/diff/8a37ba32
Branch: refs/heads/master
Commit: 8a37ba325be2f61b7ed9961ba9e26ef30362474c
Parents: e73f0d5
Author: Mike Sierra <le...@gmail.com>
Authored: Fri Jul 19 13:41:49 2013 -0400
Committer: Michael Brooks <mi...@michaelbrooks.ca>
Committed: Wed Jul 24 15:10:08 2013 -0700
----------------------------------------------------------------------
docs/en/edge/config_ref/index.md | 26 ++++++++++++++++----------
1 file changed, 16 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/8a37ba32/docs/en/edge/config_ref/index.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/config_ref/index.md b/docs/en/edge/config_ref/index.md
index 807f13f..e060740 100644
--- a/docs/en/edge/config_ref/index.md
+++ b/docs/en/edge/config_ref/index.md
@@ -19,16 +19,22 @@ license: Licensed to the Apache Software Foundation (ASF) under one
# Configuration Reference
-You can set various application configuration parameters using a platform-agnostic configuration file, `config.xml`.
-This file is based on the W3C [Packaged Web Apps (Widgets)](http://www.w3.org/TR/widgets/) specification.
-
-The location of the `config.xml` file is different depending on the platform. The contents, in general, are not.
-
-## Platform-Specific Properties
-
-As with any abstraction layer, Apache Cordova cannot be a perfect silver bullet. As such, some native and platform-specific
-properties, characteristics and behaviours are encapsulated as much as possible as `<preference>` elements inside the
-`config.xml` file. The following sub-sections linked to are guides which go into more details about these preferences.
+Many aspects of an application's behavior can be controlled with a
+platform-agnostic configuration file, `config.xml`, which is formatted
+based on the W3C's
+[Packaged Web Apps (Widgets)](http://www.w3.org/TR/widgets/)
+specification.
+
+For projects created with the Cordova CLI (described in The
+Command-line Interface), this file can be found in the top-level `www`
+directory. Using the CLI to build projects regenerates versions of
+this file in various subdirectories within `platforms`. For non-CLI
+projects, each platform-specific file serves as a source.
+
+While the location of the `config.xml` file may change depending on
+the platform, its contents generally do not. Some platform-specific
+features are also specified in the same configuration file. Details
+are listed below:
- iOS Configuration
- Android Configuration
[11/12] docs commit: [CB-3816] corrected 'merges' content;
mirrors src tree, doesn't map files in flat dir
Posted by mw...@apache.org.
[CB-3816] corrected 'merges' content; mirrors src tree, doesn't map files in flat dir
Project: http://git-wip-us.apache.org/repos/asf/cordova-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-docs/commit/db19cf23
Tree: http://git-wip-us.apache.org/repos/asf/cordova-docs/tree/db19cf23
Diff: http://git-wip-us.apache.org/repos/asf/cordova-docs/diff/db19cf23
Branch: refs/heads/master
Commit: db19cf23dfea4b5f400fc7edbfe74cfbc8f1dfa6
Parents: 636109a
Author: Mike Sierra <le...@gmail.com>
Authored: Tue Jul 23 15:02:19 2013 -0400
Committer: Michael Brooks <mi...@michaelbrooks.ca>
Committed: Wed Jul 24 15:12:01 2013 -0700
----------------------------------------------------------------------
docs/en/edge/guide/cli/index.md | 41 ++++++++++++++++++++++--------------
1 file changed, 25 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/db19cf23/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 520af1d..bdb8d97 100644
--- a/docs/en/edge/guide/cli/index.md
+++ b/docs/en/edge/guide/cli/index.md
@@ -278,35 +278,44 @@ argument for each command.
## Customize each Platform
-While Cordova allows you to easily build apps for different platforms,
-sometimes you need to add customizations. In that case, you don't
-want to modify the CSS in various `www` directories within the
-top-level `platforms` directory, because they're regularly replaced
-with the top-level `www` directory's cross-platform source. Instead,
-the top-level `merges` directory offers a place to specify assets to
-be deployed for specific platforms. Any file you place in a platform's
-subdirectory replaces a corresponding file within the top-level `www`
-source tree.
-
-Here is how you might uses `merges` to boost the default font size for
-Android devices:
+While Cordova allows you to easily deploy an app for many different
+platforms, sometimes you need to add customizations. In that case,
+you don't want to modify the source files in various `www` directories
+within the top-level `platforms` directory, because they're regularly
+replaced with the top-level `www` directory's cross-platform source.
+
+Instead, the top-level `merges` directory offers a place to specify
+assets to deploy on specific platforms. Each platform-specific
+subdirectory within `merges` mirrors the directory structure of the
+`www` source tree, allowing you to override or add files as needed.
+For example, here is how you might uses `merges` to boost the default
+font size for Android devices:
* Edit the `www/index.html` file, adding a link to an additional CSS
file, `overrides.css` in this case:
<link rel="stylesheet" type="text/css" href="css/overrides.css" />
-* Create an empty `www/css/overrides.css` file.
+* Optionally create an empty `www/css/overrides.css` file, which would
+ apply for all non-Android builds, preventing a missing-file error.
-* Edit a corresponding `merges/android/overrides.css` file, adding a
- line that overrides the 12-point default font size specified within
- `www/css/index.css`:
+* Create a `css` subdirectory within `merges/android`, then add a
+ corresponding `overrides.css` file. Specify CSS that overrides the
+ 12-point default font size specified within `www/css/index.css`, for
+ example:
body { font-size:14px; }
When you rebuild the project, the Android version features the custom
font size, while others remain unchanged.
+You can also use `merges` to add files not present in the original
+`www` directory. For example, an app can incorporate a _back button_
+graphic into the iOS interface, stored in
+`merges/ios/img/back_button.png`, while the Android version can
+instead capture `backbutton` events from the corresponding hardware
+button.
+
## Update the App
After installing installing the `cordova` utility, you can always
[08/12] docs commit: [CB-3816] doc CLI's 'merges' feature
Posted by mw...@apache.org.
[CB-3816] doc CLI's 'merges' feature
Project: http://git-wip-us.apache.org/repos/asf/cordova-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-docs/commit/e1f4b801
Tree: http://git-wip-us.apache.org/repos/asf/cordova-docs/tree/e1f4b801
Diff: http://git-wip-us.apache.org/repos/asf/cordova-docs/diff/e1f4b801
Branch: refs/heads/master
Commit: e1f4b801b11fac7d691da02ae4d8d0358ac95f61
Parents: 3d9c8c0
Author: Mike Sierra <le...@gmail.com>
Authored: Mon Jul 22 15:15:19 2013 -0400
Committer: Michael Brooks <mi...@michaelbrooks.ca>
Committed: Wed Jul 24 15:11:39 2013 -0700
----------------------------------------------------------------------
docs/en/edge/guide/cli/index.md | 31 +++++++++++++++++++++++++++++++
1 file changed, 31 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/e1f4b801/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 42046b2..c01fd9d 100644
--- a/docs/en/edge/guide/cli/index.md
+++ b/docs/en/edge/guide/cli/index.md
@@ -276,6 +276,37 @@ debug console from a release version:
You can batch-remove or add plugins by specifying more than one
argument for each command.
+## Customize each Platform
+
+While Cordova allows you to easily build apps for different platforms,
+sometimes you need to add customizations. In that case, you don't
+want to modify the CSS in various `www` directories within the
+top-level `platforms` directory, because they're regularly replaced
+with the top-level `www` directory's cross-platform source. Instead,
+the top-level `merges` directory offers a place to specify assets to
+be deployed for specific platforms. Any file you place in a platform's
+subdirectory replaces a corresponding file within the top-level `www`
+source tree.
+
+Here is how you might uses `merges` to boost the default font size for
+Android devices:
+
+* Edit the `www/index.html` file, adding a link to an additional CSS
+ file, `overrides.css` in this case:
+
+ <link rel="stylesheet" type="text/css" href="css/overrides.css" />
+
+* Create an empty `www/css/overrides.css` file.
+
+* Edit a corresponding `merges/android/overrides.css` file, adding a
+ line that overrides the 12-point default font size specified within
+ `www/css/index.css`:
+
+ body { font-size:14px; }
+
+When you rebuild the project, the Android version features the custom
+font size.
+
## Update the App
After installing installing the `cordova` utility, you can always
[04/12] docs commit: [CB-3829] repaired many links referencing CLI
section
Posted by mw...@apache.org.
[CB-3829] repaired many links referencing CLI section
Project: http://git-wip-us.apache.org/repos/asf/cordova-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-docs/commit/06746e79
Tree: http://git-wip-us.apache.org/repos/asf/cordova-docs/tree/06746e79
Diff: http://git-wip-us.apache.org/repos/asf/cordova-docs/diff/06746e79
Branch: refs/heads/master
Commit: 06746e792bd956512b99d4f1634bdec8fb0da5fa
Parents: e84da58
Author: Mike Sierra <le...@gmail.com>
Authored: Fri Jul 19 14:35:22 2013 -0400
Committer: Michael Brooks <mi...@michaelbrooks.ca>
Committed: Wed Jul 24 15:10:22 2013 -0700
----------------------------------------------------------------------
docs/en/edge/guide/platforms/android/index.md | 2 +-
docs/en/edge/guide/platforms/android/upgrading.md | 5 ++---
docs/en/edge/guide/platforms/blackberry/index.md | 2 +-
docs/en/edge/guide/platforms/blackberry/upgrading.md | 3 +--
docs/en/edge/guide/platforms/blackberry10/index.md | 2 +-
docs/en/edge/guide/platforms/blackberry10/upgrading.md | 5 ++---
docs/en/edge/guide/platforms/ios/index.md | 2 +-
docs/en/edge/guide/platforms/ios/upgrading.md | 5 ++---
docs/en/edge/guide/platforms/win8/index.md | 2 +-
docs/en/edge/guide/platforms/win8/upgrading.md | 3 +--
docs/en/edge/guide/platforms/wp7/index.md | 2 +-
docs/en/edge/guide/platforms/wp8/index.md | 2 +-
docs/en/edge/guide/platforms/wp8/upgrading.md | 5 ++---
13 files changed, 17 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/06746e79/docs/en/edge/guide/platforms/android/index.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/guide/platforms/android/index.md b/docs/en/edge/guide/platforms/android/index.md
index ddad02e..a136520 100644
--- a/docs/en/edge/guide/platforms/android/index.md
+++ b/docs/en/edge/guide/platforms/android/index.md
@@ -30,7 +30,7 @@ detailed platform-specific information:
* Android Command-line Tools
The command-line tools above refer to versions prior to Cordova 3.0.
-See The Cordova Command-line Interface for information about the
+See The Command-line Interface for information about the
current interface.
## Requirements and Support
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/06746e79/docs/en/edge/guide/platforms/android/upgrading.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/guide/platforms/android/upgrading.md b/docs/en/edge/guide/platforms/android/upgrading.md
index 64be68f..b3c4085 100644
--- a/docs/en/edge/guide/platforms/android/upgrading.md
+++ b/docs/en/edge/guide/platforms/android/upgrading.md
@@ -21,14 +21,13 @@ license: Licensed to the Apache Software Foundation (ASF) under one
This guide shows how to modify Android projects to upgrade from older versions of Cordova.
Most of these instructions apply to projects created with an older set
-of command-line tools that precede the `cordova` CLI utility. See The
-Cordova Command-line Interface for information how to update the
+of command-line tools that precede the `cordova` CLI utility. See The Command-line Interface for information how to update the
version of the CLI.
## Upgrade to the CLI (3.0.0) from 2.9.0 ##
1. Create a new Apache Cordova 3.0.0 project using the cordova CLI, as
- described in The Cordova Command-line Interface.
+ described in The Command-line Interface.
2. Add your platforms the the cordova project, for example: `cordova
platform add android`.
3. Copy the contents of your project's `www` folder to the `www` folder
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/06746e79/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 07998ee..0a08165 100644
--- a/docs/en/edge/guide/platforms/blackberry/index.md
+++ b/docs/en/edge/guide/platforms/blackberry/index.md
@@ -31,7 +31,7 @@ information:
* BlackBerry Command-line Tools
The command-line tools above refer to versions prior to Cordova 3.0.
-See The Cordova Command-line Interface for information about the
+See The Command-line Interface for information about the
current interface.
## Requirements and Support
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/06746e79/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 8c17b29..9103535 100644
--- a/docs/en/edge/guide/platforms/blackberry/upgrading.md
+++ b/docs/en/edge/guide/platforms/blackberry/upgrading.md
@@ -21,8 +21,7 @@ license: Licensed to the Apache Software Foundation (ASF) under one
This guide shows how to modify BlackBerry projects to upgrade from older versions of Cordova.
Most of these instructions apply to projects created with an older set
-of command-line tools that precede the `cordova` CLI utility. See The
-Cordova Command-line Interface for information how to update the
+of command-line tools that precede the `cordova` CLI utility. See The Command-line Interface for information how to update the
version of the CLI.
## Upgrading 2.8.0 projects to 2.9.0 ##
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/06746e79/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 1b044e5..9f808d0 100644
--- a/docs/en/edge/guide/platforms/blackberry10/index.md
+++ b/docs/en/edge/guide/platforms/blackberry10/index.md
@@ -27,7 +27,7 @@ detailed platform-specific information:
* BlackBerry 10 Command-line Tools
The command-line tools above refer to versions prior to Cordova 3.0.
-See The Cordova Command-line Interface for information about the
+See The Command-line Interface for information about the
current interface.
## Requirements
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/06746e79/docs/en/edge/guide/platforms/blackberry10/upgrading.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/guide/platforms/blackberry10/upgrading.md b/docs/en/edge/guide/platforms/blackberry10/upgrading.md
index da9a58c..9c2c16b 100644
--- a/docs/en/edge/guide/platforms/blackberry10/upgrading.md
+++ b/docs/en/edge/guide/platforms/blackberry10/upgrading.md
@@ -21,8 +21,7 @@ license: Licensed to the Apache Software Foundation (ASF) under one
This guide shows how to modify BlackBerry projects to upgrade from older versions of Cordova.
Most of these instructions apply to projects created with an older set
-of command-line tools that precede the `cordova` CLI utility. See The
-Cordova Command-line Interface for information how to update the
+of command-line tools that precede the `cordova` CLI utility. See The Command-line Interface for information how to update the
version of the CLI.
@@ -31,7 +30,7 @@ Please note that the CLI supports the BlackBerry10 platform exclusively. For Pla
## Upgrade to the CLI (3.0.0) from 2.9.0 ##
1. **Create a new Apache Cordova 3.0.0 project using the cordova CLI**, as
- described in The Cordova Command-line Interface.
+ described in The Command-line Interface.
2. **Add your platforms the the cordova project**, for example: `cordova
platform add blackberry10`.
3. **Copy the contents of the original project's `www` folder** to the `www` folder
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/06746e79/docs/en/edge/guide/platforms/ios/index.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/guide/platforms/ios/index.md b/docs/en/edge/guide/platforms/ios/index.md
index d92045c..674593a 100644
--- a/docs/en/edge/guide/platforms/ios/index.md
+++ b/docs/en/edge/guide/platforms/ios/index.md
@@ -30,7 +30,7 @@ following for more detailed platform-specific information:
* iOS Command-line Tools
The command-line tools above refer to versions prior to Cordova 3.0.
-See The Cordova Command-line Interface for information about the
+See The Command-line Interface for information about the
current interface.
## Requirements and Support
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/06746e79/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 e290a6b..82a5343 100644
--- a/docs/en/edge/guide/platforms/ios/upgrading.md
+++ b/docs/en/edge/guide/platforms/ios/upgrading.md
@@ -21,8 +21,7 @@ license: Licensed to the Apache Software Foundation (ASF) under one
This guide shows how to modify iOS projects to upgrade from older versions of Cordova.
Most of these instructions apply to projects created with an older set
-of command-line tools that precede the `cordova` CLI utility. See The
-Cordova Command-line Interface for information how to update the
+of command-line tools that precede the `cordova` CLI utility. See The Command-line Interface for information how to update the
version of the CLI.
Please note that **Xcode 4.5 is required**. To submit to the Apple App Store, you must use the latest shipped version of the iOS SDK, which is iOS 6. The iOS 6 SDK requires Xcode 4.5.
@@ -30,7 +29,7 @@ Please note that **Xcode 4.5 is required**. To submit to the Apple App Store, yo
## Upgrade to the CLI (3.0.0) from 2.9.0 ##
1. Create a new Apache Cordova 3.0.0 project using the cordova CLI, as
- described in The Cordova Command-line Interface.
+ described in The Command-line Interface.
2. Add your platforms the the cordova project, for example: `cordova
platform add ios`.
3. Copy the contents of the project's `www` folder to the `www` folder
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/06746e79/docs/en/edge/guide/platforms/win8/index.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/guide/platforms/win8/index.md b/docs/en/edge/guide/platforms/win8/index.md
index 471793a..42bbb90 100644
--- a/docs/en/edge/guide/platforms/win8/index.md
+++ b/docs/en/edge/guide/platforms/win8/index.md
@@ -27,7 +27,7 @@ detailed platform-specific information:
* Windows 8 Command-line Tools
The command-line tools above refer to versions prior to Cordova 3.0.
-See The Cordova Command-line Interface for information about the
+See The Command-line Interface for information about the
current interface.
Microsoft deprecated the name _Metro-style apps_ in Windows 8 and
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/06746e79/docs/en/edge/guide/platforms/win8/upgrading.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/guide/platforms/win8/upgrading.md b/docs/en/edge/guide/platforms/win8/upgrading.md
index 102ad4a..c9e5fb4 100644
--- a/docs/en/edge/guide/platforms/win8/upgrading.md
+++ b/docs/en/edge/guide/platforms/win8/upgrading.md
@@ -21,8 +21,7 @@ license: Licensed to the Apache Software Foundation (ASF) under one
This guide shows how to modify Windows 8 projects to upgrade from older versions of Cordova.
Most of these instructions apply to projects created with an older set
-of command-line tools that precede the `cordova` CLI utility. See The
-Cordova Command-line Interface for information how to update the
+of command-line tools that precede the `cordova` CLI utility. See The Command-line Interface for information how to update the
version of the CLI.
## Upgrade to 2.9.0 from 2.8.0 ##
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/06746e79/docs/en/edge/guide/platforms/wp7/index.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/guide/platforms/wp7/index.md b/docs/en/edge/guide/platforms/wp7/index.md
index e26780d..b5a1fe4 100644
--- a/docs/en/edge/guide/platforms/wp7/index.md
+++ b/docs/en/edge/guide/platforms/wp7/index.md
@@ -33,7 +33,7 @@ applies to both versions:
* Windows Phone Command-line Tools
The command-line tools above refer to versions prior to Cordova 3.0.
-See The Cordova Command-line Interface for information about the
+See The Command-line Interface for information about the
current interface.
## 1. System Requirements
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/06746e79/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 c45956f..7656de9 100644
--- a/docs/en/edge/guide/platforms/wp8/index.md
+++ b/docs/en/edge/guide/platforms/wp8/index.md
@@ -35,7 +35,7 @@ applies to both versions:
* Windows Phone Command-line Tools
The command-line tools above refer to versions prior to Cordova 3.0.
-See The Cordova Command-line Interface for information about the
+See The Command-line Interface for information about the
current interface.
## 1. System Requirements
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/06746e79/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 bc58ba6..76e27eb 100644
--- a/docs/en/edge/guide/platforms/wp8/upgrading.md
+++ b/docs/en/edge/guide/platforms/wp8/upgrading.md
@@ -22,15 +22,14 @@ license: Licensed to the Apache Software Foundation (ASF) under one
This guide shows how to modify Windows Phone projects, both versions 7
and 8, to upgrade from older versions of Cordova.
Most of these instructions apply to projects created with an older set
-of command-line tools that precede the `cordova` CLI utility. See The
-Cordova Command-line Interface for information how to update the
+of command-line tools that precede the `cordova` CLI utility. See The Command-line Interface for information how to update the
version of the CLI.
The following section shows how to upgrade from non-CLI projects.
## Upgrade to the CLI (3.0.0) from 2.9.0 ##
1. Create a new Apache Cordova 3.0.0 project using the cordova CLI, as
- described in The Cordova Command-line Interface.
+ described in The Command-line Interface.
2. Add your platforms the the cordova project, for example: `cordova
platform add wp7 wp8`.
3. Copy the contents of the project's `www` folder to the `www` folder
[10/12] docs commit: [CB-3816] clarify 3.0's different upgrade
approach
Posted by mw...@apache.org.
[CB-3816] clarify 3.0's different upgrade approach
Project: http://git-wip-us.apache.org/repos/asf/cordova-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-docs/commit/636109a4
Tree: http://git-wip-us.apache.org/repos/asf/cordova-docs/tree/636109a4
Diff: http://git-wip-us.apache.org/repos/asf/cordova-docs/diff/636109a4
Branch: refs/heads/master
Commit: 636109a43ecabed101490b60753ee5e0249f5dd8
Parents: a61dbbb
Author: Mike Sierra <le...@gmail.com>
Authored: Tue Jul 23 09:55:31 2013 -0400
Committer: Michael Brooks <mi...@michaelbrooks.ca>
Committed: Wed Jul 24 15:11:54 2013 -0700
----------------------------------------------------------------------
docs/en/edge/guide/cli/index.md | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/636109a4/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 ff0e2c1..520af1d 100644
--- a/docs/en/edge/guide/cli/index.md
+++ b/docs/en/edge/guide/cli/index.md
@@ -316,10 +316,18 @@ update it to the latest version by running the following command:
Use this syntax to install a specific version:
- $ sudo npm install -g cordova@2.8.0
+ $ sudo npm install -g cordova@3.0.0
Run the `info` command for a listing that includes the current version
along with other available version numbers:
$ npm info cordova
+Cordova 3.0 is the first version to support the command-line interface
+described in this section. If you are updating from a version prior to
+3.0, you need to create a new project as described above, then copy
+the older application's assets into the top-level `www` directory.
+Where applicable, further details about upgrading to 3.0 are available
+in the Platform Guides. Once you upgrade to the `cordova`
+command-line interface, the more time-consuming procedures described
+there are no longer relevant.
[06/12] docs commit: [CB-3816] add 'run' command
Posted by mw...@apache.org.
[CB-3816] add 'run' command
Project: http://git-wip-us.apache.org/repos/asf/cordova-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-docs/commit/dc47477d
Tree: http://git-wip-us.apache.org/repos/asf/cordova-docs/tree/dc47477d
Diff: http://git-wip-us.apache.org/repos/asf/cordova-docs/diff/dc47477d
Branch: refs/heads/master
Commit: dc47477daa2bc342792a145b62b012dd622b9b92
Parents: bd91cb7
Author: Mike Sierra <le...@gmail.com>
Authored: Mon Jul 22 12:28:51 2013 -0400
Committer: Michael Brooks <mi...@michaelbrooks.ca>
Committed: Wed Jul 24 15:11:23 2013 -0700
----------------------------------------------------------------------
docs/en/edge/guide/cli/index.md | 20 +++++++++++++-------
1 file changed, 13 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/dc47477d/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 b9d0455..b8ffc4e 100644
--- a/docs/en/edge/guide/cli/index.md
+++ b/docs/en/edge/guide/cli/index.md
@@ -170,7 +170,7 @@ an alternative to modify and compile the platform-specific code that
Cordova generates within `platforms/ios`. You can use the same
approach with other platforms' SDKs.
-## View the App in an Emulator
+## Test the App on an Emulator or Device
SDKs for mobile platforms often come bundled with emulators that
execute a device image, so that you can launch the app from the home
@@ -196,6 +196,18 @@ launch from the home screen:
+Alternately, you can plug the handset into your computer and test the
+app directly:
+
+ $ cordova run android
+
+Before running this command, you need to set up the device for
+testing, following procedures that vary for each platform. In
+Android's case, you would have to enable a __USB debugging__ option on
+the device, and perhaps add a USB driver depending on your development
+environmnent.
+See Platform Guides for details on each platform's requirements.
+
## Add Features
When you build and view a new project, the default application that
@@ -264,12 +276,6 @@ debug console from a release version:
You can batch-remove or add plugins by specifying more than one
argument for each command.
-<!--
-
-## Run the App on the Device
-
--->
-
## Update the App
After installing installing the `cordova` utility, you can always
[09/12] docs commit: [CB-3816] stupid little edit
Posted by mw...@apache.org.
[CB-3816] stupid little edit
Project: http://git-wip-us.apache.org/repos/asf/cordova-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-docs/commit/a61dbbb0
Tree: http://git-wip-us.apache.org/repos/asf/cordova-docs/tree/a61dbbb0
Diff: http://git-wip-us.apache.org/repos/asf/cordova-docs/diff/a61dbbb0
Branch: refs/heads/master
Commit: a61dbbb0d4639a7b8fc23421160f2d70426b8019
Parents: e1f4b80
Author: Mike Sierra <le...@gmail.com>
Authored: Mon Jul 22 15:18:26 2013 -0400
Committer: Michael Brooks <mi...@michaelbrooks.ca>
Committed: Wed Jul 24 15:11:47 2013 -0700
----------------------------------------------------------------------
docs/en/edge/guide/cli/index.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/a61dbbb0/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 c01fd9d..ff0e2c1 100644
--- a/docs/en/edge/guide/cli/index.md
+++ b/docs/en/edge/guide/cli/index.md
@@ -305,7 +305,7 @@ Android devices:
body { font-size:14px; }
When you rebuild the project, the Android version features the custom
-font size.
+font size, while others remain unchanged.
## Update the App
[05/12] docs commit: [CB-3827] remove 'Upgrading Guides' from home
page to fix Xref glitch; no longer matches any standalone top-level content
Posted by mw...@apache.org.
[CB-3827] remove 'Upgrading Guides' from home page to fix Xref glitch; no longer matches any standalone top-level content
Project: http://git-wip-us.apache.org/repos/asf/cordova-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-docs/commit/bd91cb79
Tree: http://git-wip-us.apache.org/repos/asf/cordova-docs/tree/bd91cb79
Diff: http://git-wip-us.apache.org/repos/asf/cordova-docs/diff/bd91cb79
Branch: refs/heads/master
Commit: bd91cb79d1a321a3dac24dcad8f2f1c37536e8a4
Parents: 06746e7
Author: Mike Sierra <le...@gmail.com>
Authored: Fri Jul 19 22:29:16 2013 -0400
Committer: Michael Brooks <mi...@michaelbrooks.ca>
Committed: Wed Jul 24 15:10:29 2013 -0700
----------------------------------------------------------------------
docs/en/edge/index.md | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/bd91cb79/docs/en/edge/index.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/index.md b/docs/en/edge/index.md
index afd255f..42f5aa4 100644
--- a/docs/en/edge/index.md
+++ b/docs/en/edge/index.md
@@ -31,11 +31,7 @@ license: Licensed to the Apache Software Foundation (ASF) under one
</li>
<li>
<h2>Platform Guides</h2>
- <span>Set up each SDK to create your first app.</span>
- </li>
- <li>
- <h2>Upgrading Guides</h2>
- <span>Upgrade an application to the latest release.</span>
+ <span>Set up each SDK and update projects</span>
</li>
<li>
<h2>Configuration Reference</h2>
[07/12] docs commit: [CB-3816 CB-4343] HelloWorld => hello,
to avoid confusion w/project name
Posted by mw...@apache.org.
[CB-3816 CB-4343] HelloWorld => hello, to avoid confusion w/project name
Project: http://git-wip-us.apache.org/repos/asf/cordova-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-docs/commit/3d9c8c0d
Tree: http://git-wip-us.apache.org/repos/asf/cordova-docs/tree/3d9c8c0d
Diff: http://git-wip-us.apache.org/repos/asf/cordova-docs/diff/3d9c8c0d
Branch: refs/heads/master
Commit: 3d9c8c0d0f23cfde77e5d4ffb62f8c6fd11332bb
Parents: dc47477
Author: Mike Sierra <le...@gmail.com>
Authored: Mon Jul 22 13:31:53 2013 -0400
Committer: Michael Brooks <mi...@michaelbrooks.ca>
Committed: Wed Jul 24 15:11:31 2013 -0700
----------------------------------------------------------------------
docs/en/edge/guide/cli/index.md | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/3d9c8c0d/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 b8ffc4e..42046b2 100644
--- a/docs/en/edge/guide/cli/index.md
+++ b/docs/en/edge/guide/cli/index.md
@@ -72,9 +72,9 @@ To install the `cordova` command-line tool, follow these steps:
Go to the directory where you maintain your source code, and run a
command such as the following:
- $ cordova create HelloWorld com.example.hello "Hello World"
+ $ cordova create hello com.example.hello "Hello World"
-The first argument specifies a _HelloWorld_ directory to be generated
+The first argument specifies a _hello_ directory to be generated
for your project. Its `www` subdirectory houses your application's
home page, along with various resources under `css`, `js`, and `img`,
which follow common web development file-naming conventions. The
@@ -91,7 +91,7 @@ both of these values later in the `config.xml` file.
All subsequent commands need to be run within the project's directory,
or any subdirectories within its scope:
- $ cd HelloWorld
+ $ cd hello
Before you can build the project, you need to specify a set of target
platforms. Your ability to run these commands depends on whether your
[03/12] docs commit: [CB-3962] use →
arrow entity to indicate nesting
Posted by mw...@apache.org.
[CB-3962] use → arrow entity to indicate nesting
Project: http://git-wip-us.apache.org/repos/asf/cordova-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-docs/commit/e84da58e
Tree: http://git-wip-us.apache.org/repos/asf/cordova-docs/tree/e84da58e
Diff: http://git-wip-us.apache.org/repos/asf/cordova-docs/diff/e84da58e
Branch: refs/heads/master
Commit: e84da58ef2b7bbb4e674fa6d832b0e7cfa3c16b1
Parents: 8a37ba3
Author: Mike Sierra <le...@gmail.com>
Authored: Fri Jul 19 14:27:57 2013 -0400
Committer: Michael Brooks <mi...@michaelbrooks.ca>
Committed: Wed Jul 24 15:10:15 2013 -0700
----------------------------------------------------------------------
docs/en/edge/guide/platforms/ios/upgrading.md | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/e84da58e/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 0a8330f..e290a6b 100644
--- a/docs/en/edge/guide/platforms/ios/upgrading.md
+++ b/docs/en/edge/guide/platforms/ios/upgrading.md
@@ -95,9 +95,9 @@ NOTE: Starting with Cordova 3.0.0, projects do not come with any plugins, you wi
OpenAL
ImageIO
-10. Update your project's target **Build Settings**. Under **Linking** -> **Other Linker Flags**, edit **"-Obj-C"** to be **"-ObjC"**
+10. Update your project's target **Build Settings**. Under **Linking → Other Linker Flags**, edit **"-Obj-C"** to be **"-ObjC"**
-11. Update your project's target **Build Settings**. Under **Linking** -> **Other Linker Flags**, change **"-all\_load"** to be **"-force\_load ${BUILT\_PRODUCTS\_DIR}/libCordova.a"**. You would only need to do this if you have the problem defined in [this issue.](https://issues.apache.org/jira/browse/CB-3458)
+11. Update your project's target **Build Settings**. Under **Linking → Other Linker Flags**, change **"-all\_load"** to be **"-force\_load ${BUILT\_PRODUCTS\_DIR}/libCordova.a"**. You would only need to do this if you have the problem defined in [this issue.](https://issues.apache.org/jira/browse/CB-3458)
## Upgrading 2.6.0 projects to 2.7.0 ##
@@ -209,10 +209,10 @@ With **Cordova 2.1.0**, CordovaLib has been upgraded to use **Automatic Referenc
6. **Copy** the **www/cordova-2.1.0.js** file from the new project into your **www** folder, and delete your **www/cordova-2.0.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-2.1.0.js** file
8. Update (or replace, if you never changed the file) your `AppDelegate.m` according to the one from the new project:
- - Edited -> application:didFinishLaunchingWithOptions:
- - Added -> application:supportedInterfaceOrientationsForWindow:
+ - Edited → application:didFinishLaunchingWithOptions:
+ - Added → application:supportedInterfaceOrientationsForWindow:
9. Update (or replace, if you never changed the file) your `MainViewController.m` according to the one from the new project:
- - Added -> viewWillAppear
+ - Added → viewWillAppear
10. Copy the **cordova** folder from the new project into your project's root folder **(in 2.1.0, this has the updated scripts to support paths with spaces)**
11. Remove the **VERSION** file reference from your **project** (_not_ the one in CordovaLib)
12. Next, update your CordovaLib sub-project reference. Beginning with Cordova 2.1.0, we are not using the CORDOVALIB Xcode variable anymore when referencing where CordovaLib resides, the reference is an absolute file reference now.
@@ -259,9 +259,9 @@ With **Cordova 2.1.0**, CordovaLib has been upgraded to use **Automatic Referenc
25. Locate the **VERSION** file, drag it into your main project (we want to create a link to it, not a copy)
26. Select the **Create groups for any added folders** radiobutton, then select the **Finish** button
27. Select the **VERSION** file that you just dragged in a previous step
-28. Type the **Option-Command-1** key combination to show the **File Inspector** (or menuitem **View -> Utilities -> Show File Inspector**)
+28. Type the **Option-Command-1** key combination to show the **File Inspector** (or menuitem **View → Utilities → Show File Inspector**)
29. Choose **Relative to CORDOVALIB** in the **File Inspector** for the drop-down menu for **Location**
-30. Set the Xcode preference **Xcode Preferences -> Locations -> Derived Data -> Advanced...** to **Unique** (this is so the unified headers can be found)
+30. Set the Xcode preference **Xcode Preferences → Locations → Derived Data → Advanced...** to **Unique** (this is so the unified headers can be found)
31. Select the **project icon** in the Project Navigator, select your **Target**, then select the **Build Settings** tab
32. Search for **Header Search Paths**. For that setting, add these three values below (with quotes):