Return-Path: X-Original-To: apmail-cordova-commits-archive@www.apache.org Delivered-To: apmail-cordova-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 0CBA510AE0 for ; Thu, 20 Feb 2014 21:09:27 +0000 (UTC) Received: (qmail 69910 invoked by uid 500); 20 Feb 2014 21:08:51 -0000 Delivered-To: apmail-cordova-commits-archive@cordova.apache.org Received: (qmail 69456 invoked by uid 500); 20 Feb 2014 21:08:42 -0000 Mailing-List: contact commits-help@cordova.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cordova.apache.org Delivered-To: mailing list commits@cordova.apache.org Received: (qmail 69400 invoked by uid 99); 20 Feb 2014 21:08:41 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 20 Feb 2014 21:08:41 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id E2EB692A718; Thu, 20 Feb 2014 21:08:40 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: purplecabbage@apache.org To: commits@cordova.apache.org Date: Thu, 20 Feb 2014 21:08:44 -0000 Message-Id: <41fc729ef9f14230b802cb1372bdfb0f@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [05/50] [abbrv] docs commit: reformat NOTE & TIP reformat NOTE & TIP Project: http://git-wip-us.apache.org/repos/asf/cordova-docs/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-docs/commit/97207328 Tree: http://git-wip-us.apache.org/repos/asf/cordova-docs/tree/97207328 Diff: http://git-wip-us.apache.org/repos/asf/cordova-docs/diff/97207328 Branch: refs/heads/master Commit: 972073288cee627fc1bf4ba219c82126ee92bdda Parents: a579a76 Author: Mike Sierra Authored: Tue Feb 4 17:59:57 2014 -0500 Committer: Mike Sierra Committed: Tue Feb 4 17:59:57 2014 -0500 ---------------------------------------------------------------------- docs/en/edge/guide/cli/index.md | 2 +- docs/en/edge/guide/platforms/android/config.md | 4 ++-- docs/en/edge/plugin_ref/plugman.md | 20 +++++++++++++------- 3 files changed, 16 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/97207328/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 c64a878..7e74016 100644 --- a/docs/en/edge/guide/cli/index.md +++ b/docs/en/edge/guide/cli/index.md @@ -221,7 +221,7 @@ Some mobile platforms emulate a particular device by default, such as the iPhone for iOS projects. For other platforms, you may need to first associate a device with an emulator. -Note: Emulator support is currently not available for Amazon Fire OS +__NOTE__: Emulator support is currently not available for Amazon Fire OS. (See the Platform Guides for details.) For example, you may first run the `android` command to launch the http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/97207328/docs/en/edge/guide/platforms/android/config.md ---------------------------------------------------------------------- diff --git a/docs/en/edge/guide/platforms/android/config.md b/docs/en/edge/guide/platforms/android/config.md index fdf1744..5584185 100644 --- a/docs/en/edge/guide/platforms/android/config.md +++ b/docs/en/edge/guide/platforms/android/config.md @@ -26,8 +26,8 @@ config.xml File for information on global configuration options. - `KeepRunning` (boolean, defaults to `true`): Determines whether the application stays running in the background even after a `pause` - event fires. Note: setting this to false will not kill the app after - a pause event, it will only halt execution of code in the cordova + event fires. Setting this to `false` does not kill the app after a + `pause` event, but simply halts execution of code within the cordova webview while the app is in the background. http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/97207328/docs/en/edge/plugin_ref/plugman.md ---------------------------------------------------------------------- diff --git a/docs/en/edge/plugin_ref/plugman.md b/docs/en/edge/plugin_ref/plugman.md index 33442cc..e6f0323 100644 --- a/docs/en/edge/plugin_ref/plugman.md +++ b/docs/en/edge/plugin_ref/plugman.md @@ -43,13 +43,19 @@ is available from any directory on your machine: You must have also have `git` on your `PATH` to be able to install plugins directly from remote git URLs. -**TIP:** If you find that after installing plugman with npm you are still unable to run any `plugman` commands, make sure that you have -added the `/npm/` directory into your `PATH`. - -**NOTE:** You can skip this step if you don't want to pollute your global npm namespace by installing Plugman globally. If this is the case, then -when you create a Cordova project with the shell tools, there will be a `node_modules` directory inside your project which contains Plugman. -Since you did not instally globally, you will have to invoke node for every Plugman command, for example `node ./node_modules/plugman/main.js -version`. -The rest of this guide assumes you have installed Plugman globally, meaning you can invoke it with just `plugman`. +__TIP__: If you find that after installing plugman with `npm` you are +still unable to run any `plugman` commands, make sure that you have +added the `/npm/` directory into your `PATH`. + +__NOTE__: You can skip this step if you don't want to pollute your +global `npm` namespace by installing Plugman globally. If this is the +case, then when you create a Cordova project with the shell tools, +there will be a `node_modules` directory inside your project which +contains Plugman. Since you did not install globally, you need to +invoke `node` for each Plugman command, for example `node +./node_modules/plugman/main.js -version`. The rest of this guide +assumes you have installed Plugman globally, meaning you can invoke it +with just `plugman`. ## Create a Cordova Project