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/10/31 22:07:06 UTC
[1/4] docs commit: [CB-5122] clarify 'merges' feature available in
topic head
Updated Branches:
refs/heads/master 4b3109344 -> 52f2bb6d8
[CB-5122] clarify 'merges' feature available in topic head
Project: http://git-wip-us.apache.org/repos/asf/cordova-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-docs/commit/613f2dba
Tree: http://git-wip-us.apache.org/repos/asf/cordova-docs/tree/613f2dba
Diff: http://git-wip-us.apache.org/repos/asf/cordova-docs/diff/613f2dba
Branch: refs/heads/master
Commit: 613f2dba9ae572b14e121643c62d2264fb315ece
Parents: 4b31093
Author: Mike Sierra <ms...@adobe.com>
Authored: Wed Oct 30 13:09:10 2013 -0400
Committer: Michael Brooks <mi...@michaelbrooks.ca>
Committed: Thu Oct 31 14:03:07 2013 -0700
----------------------------------------------------------------------
----------------------------------------------------------------------
[4/4] docs commit: [CB-5122] Match STYLESHEET reference to versioning.
Posted by mw...@apache.org.
[CB-5122] Match STYLESHEET reference to versioning.
Project: http://git-wip-us.apache.org/repos/asf/cordova-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-docs/commit/52f2bb6d
Tree: http://git-wip-us.apache.org/repos/asf/cordova-docs/tree/52f2bb6d
Diff: http://git-wip-us.apache.org/repos/asf/cordova-docs/diff/52f2bb6d
Branch: refs/heads/master
Commit: 52f2bb6d88a9ee7a01c5dda37316654325861fd6
Parents: 7b8642b
Author: Michael Brooks <mi...@michaelbrooks.ca>
Authored: Thu Oct 31 14:06:59 2013 -0700
Committer: Michael Brooks <mi...@michaelbrooks.ca>
Committed: Thu Oct 31 14:06:59 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/52f2bb6d/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 4abb613..0ac6404 100644
--- a/docs/en/edge/guide/cli/index.md
+++ b/docs/en/edge/guide/cli/index.md
@@ -450,7 +450,7 @@ in the Platform Guides. Once you upgrade to the `cordova`
command-line interface and use `npm update` to stay current, the more
time-consuming procedures described there are no longer relevant.
-Cordova versions 3.0 and later may still require various changes to
+Cordova 3.0+ may still require various changes to
project-level directory structures and other dependencies. After you
run the `npm` command above to update Cordova itself, you may need to
ensure your project's resources conform to the latest version's
[3/4] docs commit: [CB-5122] Merged both CLI 'update' sections
Posted by mw...@apache.org.
[CB-5122] Merged both CLI 'update' sections
Project: http://git-wip-us.apache.org/repos/asf/cordova-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-docs/commit/7b8642b5
Tree: http://git-wip-us.apache.org/repos/asf/cordova-docs/tree/7b8642b5
Diff: http://git-wip-us.apache.org/repos/asf/cordova-docs/diff/7b8642b5
Branch: refs/heads/master
Commit: 7b8642b50b1104361de99149e63561dfb4b461aa
Parents: 4fb4ed9
Author: Mike Sierra <ms...@adobe.com>
Authored: Thu Oct 31 10:24:01 2013 -0400
Committer: Michael Brooks <mi...@michaelbrooks.ca>
Committed: Thu Oct 31 14:04:14 2013 -0700
----------------------------------------------------------------------
----------------------------------------------------------------------
[2/4] docs commit: [CB-5122] Merged both CLI 'update' sections
Posted by mw...@apache.org.
[CB-5122] Merged both CLI 'update' sections
Project: http://git-wip-us.apache.org/repos/asf/cordova-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-docs/commit/4fb4ed9b
Tree: http://git-wip-us.apache.org/repos/asf/cordova-docs/tree/4fb4ed9b
Diff: http://git-wip-us.apache.org/repos/asf/cordova-docs/diff/4fb4ed9b
Branch: refs/heads/master
Commit: 4fb4ed9bcf223d19b790c0b7d74cc7c148fcf12a
Parents: 613f2db
Author: Mike Sierra <ms...@adobe.com>
Authored: Thu Oct 31 10:24:01 2013 -0400
Committer: Michael Brooks <mi...@michaelbrooks.ca>
Committed: Thu Oct 31 14:03:57 2013 -0700
----------------------------------------------------------------------
docs/en/edge/guide/cli/index.md | 32 ++++++++++++++++----------------
1 file changed, 16 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/4fb4ed9b/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 f0eb66a..4abb613 100644
--- a/docs/en/edge/guide/cli/index.md
+++ b/docs/en/edge/guide/cli/index.md
@@ -424,22 +424,10 @@ a local `info.txt` file.
__NOTE:__ Currently, only details on iOS and Android platforms are
available.
-## Updating the App
+## Updating Cordova and Your Project
-When a new version of Cordova is released, you should update your
-`cordova` utility by following the Updating Cordova section below.
-Once you have updated Cordova, you can update the Cordova resources that
-your project uses by typing:
-
- $ cordova platform update <PLATFORM>
-This will replace the old cordova resources with new ones for the
-specified PLATFORM. You should do this for every platform that you
-are developing for.
-
-## Updating Cordova
-
-After installing the `cordova` utility, you can always
-update it to the latest version by running the following command:
+After installing the `cordova` utility, you can always update it to
+the latest version by running the following command:
$ sudo npm update -g cordova
@@ -447,7 +435,7 @@ Use this syntax to install a specific version:
$ sudo npm install -g cordova@3.1.0
-Run `cordova -v` to see the currently running version. Run the `npm
+Run `cordova -v` to see which version is currently running. Run the `npm
info` command for a longer listing that includes the current version
along with other available version numbers:
@@ -461,3 +449,15 @@ Where applicable, further details about upgrading to 3.0 are available
in the Platform Guides. Once you upgrade to the `cordova`
command-line interface and use `npm update` to stay current, the more
time-consuming procedures described there are no longer relevant.
+
+Cordova versions 3.0 and later may still require various changes to
+project-level directory structures and other dependencies. After you
+run the `npm` command above to update Cordova itself, you may need to
+ensure your project's resources conform to the latest version's
+requirements. Run a command such as the following for each platform
+you're building:
+
+ $ cordova platform update android
+ $ cordova platform update ios
+ ...etc.
+