cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mwbro...@apache.org
Subject [15/17] docs commit: [CB-3962] Reduce the 'willies'
Date Mon, 04 Nov 2013 19:53:23 GMT
[CB-3962] Reduce the 'willies'

Conflicts:
	docs/en/edge/guide/cli/index.md


Project: http://git-wip-us.apache.org/repos/asf/cordova-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-docs/commit/d26c8df2
Tree: http://git-wip-us.apache.org/repos/asf/cordova-docs/tree/d26c8df2
Diff: http://git-wip-us.apache.org/repos/asf/cordova-docs/diff/d26c8df2

Branch: refs/heads/master
Commit: d26c8df2292745c7b8bda350cc95701c9598c2f2
Parents: d77c645
Author: Mike Sierra <msierra@adobe.com>
Authored: Mon Nov 4 13:10:15 2013 -0500
Committer: Michael Brooks <michael@michaelbrooks.ca>
Committed: Mon Nov 4 11:52:24 2013 -0800

----------------------------------------------------------------------
 STYLESHEET.md                                   | 14 +++++------
 docs/en/edge/cordova/events/events.online.md    |  4 ++--
 docs/en/edge/cordova/file/file.md               |  6 +++--
 .../en/edge/cordova/file/fileentry/fileentry.md |  2 +-
 .../cordova/file/filetransfer/filetransfer.md   |  2 +-
 .../en/edge/cordova/inappbrowser/window.open.md | 14 +++++------
 docs/en/edge/guide/hybrid/plugins/index.md      | 14 ++++++++---
 docs/en/edge/guide/hybrid/webviews/index.md     |  2 +-
 .../edge/guide/platforms/android/upgrading.md   |  8 +++----
 .../edge/guide/platforms/blackberry10/index.md  |  4 ++--
 .../edge/guide/platforms/blackberry10/tools.md  | 18 +++++++-------
 .../guide/platforms/blackberry10/upgrading.md   |  8 +++++--
 docs/en/edge/guide/platforms/ios/upgrading.md   | 25 ++++++++++----------
 docs/en/edge/guide/platforms/wp7/index.md       |  2 +-
 docs/en/edge/guide/platforms/wp8/index.md       |  2 +-
 docs/en/edge/guide/platforms/wp8/tools.md       | 12 +++++++---
 docs/en/edge/plugin_ref/spec.md                 | 10 ++++----
 17 files changed, 82 insertions(+), 65 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/d26c8df2/STYLESHEET.md
----------------------------------------------------------------------
diff --git a/STYLESHEET.md b/STYLESHEET.md
index ad494d6..cdb723a 100644
--- a/STYLESHEET.md
+++ b/STYLESHEET.md
@@ -129,7 +129,7 @@ immensely.
   E.g., "the pause event fires when..."  rather than "the pause event
   is fired when..." Rule of thumb: banish verbs ending in "ed".
 
-- __Not Kidding, Use Present Tense__: Minimize verbs ending with
+* __Not Kidding, Use Present Tense__: Minimize verbs ending with
   "ing": "This is necessary to provide...", not "This is necessary for
   providing..." <!-- are\s-+[a-z]+ing\b -->
 
@@ -154,16 +154,16 @@ immensely.
 
 * Do not drop articles: "In the Bada IDE", not "In Bada IDE"
 
-- Do not start a sentence with a lowercase member name. E.g., "Does
+* Do not start a sentence with a lowercase member name. E.g., "Does
   not support `filter`" rather than "`filter` is not supported"
   <!--RE \. `-->
 
-- Do not refer to "I," the author of the documentation, as in "What I
+* Do not refer to "I," the author of the documentation, as in "What I
   am going to show you now." Likewise avoid "we" and "let's," so
   instead of "We see that..." try "Note that..." Readers want to focus
   on the thing they're working on, not on you. <!--RE \bI\b-->
 
-- OK to refer to "you," the developer, but only sparingly, e.g., to
+* OK to refer to "you," the developer, but only sparingly, e.g., to
   avoid passive voice. Also do not use "your" as a routine substitute
   for "the" or "a" when referring to a noun.
 
@@ -212,7 +212,7 @@ immensely.
 
 * 'Directory', not 'folder'; may be exceptions in some GUI contexts
 
-- Prefer "can't" over "cannot"; sounds more relaxed. <!--RE cannot-->
+* Prefer "can't" over "cannot"; sounds more relaxed. <!--RE cannot-->
 
 * Subdirectory, not sub-directory
 
@@ -334,10 +334,10 @@ immensely.
 
 ## Links
 
-- Use titles in link text, never 'click here'. Consider using the
+* Use titles in link text, never 'click here'. Consider using the
   link's domain name as a substitute. <!--RE here]-->
 
-- Domain names are OK as a link's display text, but not full
+* Domain names are OK as a link's display text, but not full
   scheme-qualified URLs. No bare URLs in text outside of code.
   <!--RE \[http -->
 

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/d26c8df2/docs/en/edge/cordova/events/events.online.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/cordova/events/events.online.md b/docs/en/edge/cordova/events/events.online.md
index 77915b1..39aa908 100644
--- a/docs/en/edge/cordova/events/events.online.md
+++ b/docs/en/edge/cordova/events/events.online.md
@@ -92,8 +92,8 @@ at least a second to fire, prior to which `connection.type` is
 
 ## Windows Phone 7 Quirks
 
-When running in the Emulator, the `connection.status` is always unknown, so this event will
_not_ fire.
+When running in the Emulator, the `connection.status` is always unknown, so this event does
_not_ fire.
 
 ## Windows Phone 8 Quirks
 
-The Emulator reports the connection type as `Cellular`, which does not change, so events
will _not_ fire.
+The Emulator reports the connection type as `Cellular`, which does not change, so events
does _not_ fire.

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/d26c8df2/docs/en/edge/cordova/file/file.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/cordova/file/file.md b/docs/en/edge/cordova/file/file.md
index fc15046..1eb4b58 100644
--- a/docs/en/edge/cordova/file/file.md
+++ b/docs/en/edge/cordova/file/file.md
@@ -50,8 +50,10 @@ Interface, to add or remove this feature for a project:
         [ 'org.apache.cordova.file' ]
         $ cordova plugin rm org.apache.cordova.file
         
-To use the file-transfer plugin you must add that separately. Do not add the file plugin
manually because it will be automatically added as a dependency plugin by the CLI. 
-        
+You must add the `file-transfer` plugin separately. The CLI
+automatically adds the `file` plugin as a dependency, so there is no
+need to add it separately:
+
         $ cordova plugin add org.apache.cordova.file-transfer
         $ cordova plugin ls
         [ 'org.apache.cordova.file',

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/d26c8df2/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 36b8e6d..ac53113 100644
--- a/docs/en/edge/cordova/file/fileentry/fileentry.md
+++ b/docs/en/edge/cordova/file/fileentry/fileentry.md
@@ -95,7 +95,7 @@ Set metadata on a file.
 
 __Currently works only on iOS.__
 
-- this will set the extended attributes of a file.
+- This sets the extended attributes of a file.
 
 __Parameters__:
 

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/d26c8df2/docs/en/edge/cordova/file/filetransfer/filetransfer.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/cordova/file/filetransfer/filetransfer.md b/docs/en/edge/cordova/file/filetransfer/filetransfer.md
index 8dcd11b..45cfbfc 100644
--- a/docs/en/edge/cordova/file/filetransfer/filetransfer.md
+++ b/docs/en/edge/cordova/file/filetransfer/filetransfer.md
@@ -212,7 +212,7 @@ __Parameters__:
 
 - __errorCallback__: A callback that executes if an error occurs when retrieving the `Metadata`.
Invoked with a `FileTransferError` object. _(Function)_
 
-- __trustAllHosts__: Optional parameter, defaults to `false`. If set to `true` then it will
accept all security certificates. This is useful as Android rejects self signed security certificates.
Not recommended for production use. Supported on Android and iOS. _(boolean)_
+- __trustAllHosts__: Optional parameter, defaults to `false`. If set to `true`, it accepts
all security certificates. This is useful because Android rejects self-signed security certificates.
Not recommended for production use. Supported on Android and iOS. _(boolean)_
 
 - __options__: Optional parameters, currently only supports headers (such as Authorization
(Basic Authentication), etc).
 

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/d26c8df2/docs/en/edge/cordova/inappbrowser/window.open.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/cordova/inappbrowser/window.open.md b/docs/en/edge/cordova/inappbrowser/window.open.md
index f8a8070..08206ba 100644
--- a/docs/en/edge/cordova/inappbrowser/window.open.md
+++ b/docs/en/edge/cordova/inappbrowser/window.open.md
@@ -42,16 +42,16 @@ instance, or the system browser.
     
     Android only:
 
-    - __closebuttoncaption__ - set to a string that will be the caption for the "Done" button.

-    - __hidden__ - set to 'yes' to create the browser and load the page, but not show it.
The load event will fire when loading is complete. Omit or set to 'no' (default) to have the
browser open and load normally. 
-    - __clearcache__ - set to 'yes' to have the browser's cookie cache cleared before the
new window is opened
-    - __clearsessioncache__ - set to 'yes' to have the session cookie cache cleared before
the new window is opened
+    - __closebuttoncaption__: set to a string to use as the __Done__ button's caption.
+    - __hidden__: set to `yes` to create the browser and load the page, but not show it.
The load event fires when loading is complete. Omit or set to `no` (default) to have the browser
open and load normally. 
+    - __clearcache__: set to `yes` to have the browser's cookie cache cleared before the
new window is opened
+    - __clearsessioncache__: set to `yes` to have the session cookie cache cleared before
the new window is opened
 
     iOS only:
 
-    - __closebuttoncaption__ - set to a string that will be the caption for the "Done" button.
Note that you will have to localize this value yourself.
-    - __hidden__ - set to 'yes' to create the browser and load the page, but not show it.
The load event will fire when loading is complete. Omit or set to 'no' (default) to have the
browser open and load normally. 
-    - __toolbar__ -  set to 'yes' or 'no' to turn the toolbar on or off for the InAppBrowser
(defaults to 'yes')
+    - __closebuttoncaption__: set to a string to use as the __Done__ button's caption. Note
that you need to localize this value yourself.
+    - __hidden__: set to `yes` to create the browser and load the page, but not show it.
The load event fires when loading is complete. Omit or set to `no` (default) to have the browser
open and load normally. 
+    - __toolbar__:  set to `yes` or `no` to turn the toolbar on or off for the InAppBrowser
(defaults to `yes`)
     - __enableViewportScale__:  Set to `yes` or `no` to prevent viewport scaling through
a meta tag (defaults to `no`).
     - __mediaPlaybackRequiresUserAction__: Set to `yes` or `no` to prevent HTML5 audio or
video from autoplaying (defaults to `no`).
     - __allowInlineMediaPlayback__: Set to `yes` or `no` to allow inline HTML5 media playback,
displaying within the browser window rather than a device-specific playback interface. The
HTML's `video` element must also include the `webkit-playsinline` attribute (defaults to `no`)

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/d26c8df2/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 84e8919..8c8025d 100644
--- a/docs/en/edge/guide/hybrid/plugins/index.md
+++ b/docs/en/edge/guide/hybrid/plugins/index.md
@@ -191,13 +191,21 @@ The Tizen platform does not support plugins.
 
 ## Publishing plugins
 
-Once you developed your plugin, you might want to publish it and share it with the community.
You can publish your plugin to the cordova registry (based on [npmjs](https://github.com/isaacs/npmjs.org))
or to any other npmjs based registry. Users will be able to install it automatically using
either plugman or cordova-cli.
+Once you develop your plugin, you may want to publish and share it
+with the community. You can publish your plugin to the cordova
+registry (based on [`npmjs`](https://github.com/isaacs/npmjs.org)) or
+to any other `npmjs`-based registry. Other developers can install it
+automatically using either `plugman` or the Cordova CLI.  (For details
+on each development path, see Using Plugman to Manage Plugins and The
+Command-line Interface.)
 
-To publish a plugin you need to use the plugman tool and go through the following steps:
+To publish a plugin you need to use the `plugman` tool and go through
+the following steps:
 
     $ plugman adduser # that is if you don't have an account yet
     $ plugman publish /path/to/your/plugin
     
 That is it!
 
-Other registry-based commands are available and `plugman --help` will give you a list of
what commands are available and how to use them.
+Running `plugman --help` lists other available registry-based
+commands.

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/d26c8df2/docs/en/edge/guide/hybrid/webviews/index.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/guide/hybrid/webviews/index.md b/docs/en/edge/guide/hybrid/webviews/index.md
index 106a000..06e10bc 100644
--- a/docs/en/edge/guide/hybrid/webviews/index.md
+++ b/docs/en/edge/guide/hybrid/webviews/index.md
@@ -26,7 +26,7 @@ make full use of Cordova APIs. You can then deploy these Cordova
 application components along with native components in a hybrid
 application.
 
-To deploy a WebView, you will need to be familiar with each native
+To deploy a WebView, you need to be familiar with each native
 programming environment. The following provides instructions for
 supported platforms:
 

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/d26c8df2/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 39f2707..40bcadd 100644
--- a/docs/en/edge/guide/platforms/android/upgrading.md
+++ b/docs/en/edge/guide/platforms/android/upgrading.md
@@ -231,10 +231,10 @@ Run `bin/update <project>` with the project path listed in the
Cordova Source di
 
 ### Notes about 2.0.0 release
 
-`config.xml` will be replacing `cordova.xml` and `plugins.xml`.  This
-new file is a combination of the previous two.  However, the old files
-are deprecated, and while currently still work, will cease working in
-a future release.
+The `config.xml` file will replace `cordova.xml` and `plugins.xml`.
+This new file is a combination of the previous two.  However, the old
+files are deprecated, and while currently still work, will cease
+working in a future release.
 
 ## Upgrade to 1.9.0 from 1.8.1 ##
 

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/d26c8df2/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 fbb2dcd..db3e626 100644
--- a/docs/en/edge/guide/platforms/blackberry10/index.md
+++ b/docs/en/edge/guide/platforms/blackberry10/index.md
@@ -131,8 +131,8 @@ Then, run the `emulate` command to view the app:
 
 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 &rarr; Hardware__:
+emulator section above. You also need to obtain the PIN from the
+__Settings__ application under __About &rarr; Hardware__:
 
 ![](img/guide/platforms/blackberry10/bb_pin.png)
 

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/d26c8df2/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 e7f5b37..173b152 100644
--- a/docs/en/edge/guide/platforms/blackberry10/tools.md
+++ b/docs/en/edge/guide/platforms/blackberry10/tools.md
@@ -141,24 +141,22 @@ where
 
 If you have previously defined a default target (and previously
 installed a debug token, if that target is a BlackBerry device), you
-can run the script with no arguments, and the script will package your
-app and deploy it to the default target. For example:
+can run the script with no arguments, and the script packages your
+app and deploys it to the default target. For example:
 
     <path-to-project>/cordova/build debug
 
 ## run
 
-The `run` command deploys the app on the specified BlackBerry device
-or an emulator. Before deploying your app, you must first create a
-target for the device or emulator you want to deploy your app to using
-the target script. The deploy script will deploy the most recent build of your app.
+The `run` command deploys the app's most recent build on the specified
+BlackBerry device or an emulator. To deploy your app, you need to
+specify a target for the device or emulator:
 
     <path-to-project>/cordova/run <target>
 
-where `<target> `specifies the name of a previously added target. If
-`<target> `is a device, then that device must be connected to your
-computer by USB connection or be connected to the same Wi-Fi network
-as your computer.
+...where `<target> `specifies the name of a previously added target.
+If `<target>` is a device, then it must be connected to your computer
+via USB cable, or else over the same Wi-Fi network as your computer.
 
 ## plugin
 

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/d26c8df2/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 8681df2..d3a6eec 100644
--- a/docs/en/edge/guide/platforms/blackberry10/upgrading.md
+++ b/docs/en/edge/guide/platforms/blackberry10/upgrading.md
@@ -38,7 +38,9 @@ version of the CLI.
 4. Copy or overwrite any native assets from your original project
    (`Resources`, etc.)
 
-5. Copy your `config.xml` into the `www` directory, and remove any plugin definitions. You
will modify settings here instead of the platform directory.
+5. Copy the `config.xml` file into the `www` directory, and remove any
+   plugin definitions. You need to modify settings here rather than
+   within the platform directory.
 
 6. Use the cordova CLI tool to install any plugins you need. Note that
    the CLI handles all core APIs as plugins, so they may need to be
@@ -62,7 +64,9 @@ Please note that the CLI supports the BlackBerry10 platform exclusively.
For Pla
 4. Copy or overwrite any native assets from your original project
    (`Resources`, etc.)
 
-5. Copy your `config.xml` into the `www` directory, and remove any plugin definitions. You
will modify settings here instead of the platform directory.
+5. Copy the `config.xml` file into the `www` directory, and remove any
+   plugin definitions. You need to modify settings here rather than
+   within the platform directory.
 
 6. Use the cordova CLI tool to install any plugins you need. Note that
    the CLI handles all core APIs as plugins, so they may need to be

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/d26c8df2/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 848e3e9..78e1e6f 100644
--- a/docs/en/edge/guide/platforms/ios/upgrading.md
+++ b/docs/en/edge/guide/platforms/ios/upgrading.md
@@ -99,10 +99,9 @@ For CLI projects:
 
 7. Delete your `CordovaLib` directory, and copy the `CordovaLib` directory from the new project
into your project's root directory.
 
-__NOTE__: Starting with Cordova 3.0.0, projects do not come with any
-plugins, you will have to install the ones you require for your
-project using the `plugman` command-line utility. See Using Plugman to
-Manage Plugins.
+__NOTE__: Starting with Cordova 3.0.0, plugins are not pre-installed,
+and you need to use the `plugman` command-line utility to install them
+yourself. See Using Plugman to Manage Plugins.
 
 ## Upgrading 2.8.0 projects to 2.9.0 ##
 
@@ -134,7 +133,7 @@ Manage Plugins.
 
 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.
 
-7. Update any `<plugin>` tags that are in your `config.xml` to `<feature>` tags.
Note that existing `<plugin>` tags will still work, but are deprecated. You can copy
this information in the `config.xml` for a new project. For example:
+7. Update any `<plugin>` tags in the `config.xml` file to `<feature>` tags. Note
that existing `<plugin>` tags still work, but are deprecated. You can copy this information
in the `config.xml` file for a new project. For example:
 
         <plugins>
             <plugin name="LocalStorage" value="CDVLocalStorage" />
@@ -148,7 +147,7 @@ Manage Plugins.
     	<!-- other <feature> tags -->
         
 
-8. Delete your `CordovaLib` directory, and copy the `CordovaLib` directory from the new project
into your project's root directory.
+8. Delete the `CordovaLib` directory, and copy the `CordovaLib` directory from the new project
into your project's root directory.
 
 9. Add these two frameworks to your project:
         
@@ -283,13 +282,13 @@ Manage Plugins.
 
         <plugin name="InAppBrowser" value="CDVInAppBrowser" />
 
-12. Note that Objective-C plugins are _not_ whitelisted anymore. To whitelist your connections
with the app whitelist, you will need to set the `User-Agent` header of the connection to
the same user-agent as the main Cordova WebView.
-You can get this by accessing the `userAgent` property off the main view-controller. The
main view-controller (CDVViewController) also has a `URLisAllowed` method for you to check
whether a URL will pass the whitelist.
+12. Note that Objective-C plugins are _not_ whitelisted anymore. To whitelist your connections
with the app whitelist, you need to set the `User-Agent` header of the connection to the same
user-agent as the main Cordova WebView.
+You can get this by accessing the `userAgent` property off the main view-controller. The
main view-controller (`CDVViewController`) also has a `URLisAllowed` method for you to check
whether a URL passes the whitelist.
 
 13. Device API changes:
-    * For iOS, device.platform used to return `iPhone`, `iPad` or `iPod Touch`; now it returns
(correctly) `iOS`.
-    * For iOS, device.name (now deprecated for all platforms) used to return the name of
the user’s device (e.g ‘Shazron’s iPhone 5′); now it returns what device.platform
used to return: `iPhone`, `iPad` or `iPod Touch`.
-    * For all platforms, there is a new property called device.model; this returns the specific
device model, e.g `iPad2,5` (for other platforms, this returns what device.name used to return).
+    - For iOS, device.platform used to return `iPhone`, `iPad` or `iPod Touch`; now it returns
(correctly) `iOS`.
+    - For iOS, device.name (now deprecated for all platforms) used to return the name of
the user’s device (e.g ‘Shazron’s iPhone 5′); now it returns what device.platform
used to return: `iPhone`, `iPad` or `iPod Touch`.
+    - For all platforms, there is a new property called device.model; this returns the specific
device model, e.g `iPad2,5` (for other platforms, this returns what device.name used to return).
 
 ## Upgrading 2.1.0 projects to 2.2.0 ##
 
@@ -517,7 +516,7 @@ If you intend on using the Capture API, you will need the new __iPad retina-disp
 
 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).
+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` needs 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.
 
@@ -597,7 +596,7 @@ If you intend on using the Capture API, you will need the new __iPad retina-disp
 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
+33. Press __Command-B__ to build. You 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*).
 

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/d26c8df2/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 6e9875c..ac01d58 100644
--- a/docs/en/edge/guide/platforms/wp7/index.md
+++ b/docs/en/edge/guide/platforms/wp7/index.md
@@ -56,7 +56,7 @@ Download and install the [Windows Phone
 SDK](http://www.microsoft.com/download/en/details.aspx?displaylang=en&amp;id=27570/).
 
 Download and extract the latest copy of
-[Cordova](http://phonegap.com/download). You will be working in the
+[Cordova](http://phonegap.com/download). You need to work in the
 `lib\windows-phone-8\wp7` subdirectory, `lib\windows-phone-8\wp8`
 contains the Windwos Phone 8 version of Cordova.
 

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/d26c8df2/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 d322f93..4b08e12 100644
--- a/docs/en/edge/guide/platforms/wp8/index.md
+++ b/docs/en/edge/guide/platforms/wp8/index.md
@@ -71,7 +71,7 @@ SDK](http://www.microsoft.com/en-us/download/details.aspx?id=35471).
 
 Download and extract the latest copy of
 [Cordova](http://phonegap.com/download). The `lib\windows-phone-8\wp8`
-subdirectory is where you will do your work.
+subdirectory is where you need to do your work.
 
 Copy the `CordovaWP8_x_x_x.zip` file to the `\My Documents\Visual
 Studio 2012\Templates\ProjectTemplates\` directory.

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/d26c8df2/docs/en/edge/guide/platforms/wp8/tools.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/guide/platforms/wp8/tools.md b/docs/en/edge/guide/platforms/wp8/tools.md
index d85aff1..8ee5274 100644
--- a/docs/en/edge/guide/platforms/wp8/tools.md
+++ b/docs/en/edge/guide/platforms/wp8/tools.md
@@ -49,8 +49,14 @@ There are 2 ways to go about creating a new Apache Cordova WP7 or WP8 applicatio
 
 ### Run the batch file to create and install the templates.
 
-- The root of the repo contains a file createTemplates.bat.  Double clicking this file will
generate 2 .zip files. (CordovaWP7_x_x_x.zip + CordovaWP8_x_x_x.zip where x.x.x is the current
version number)  To easily use these files in Visual Studio, copy them to 
-"My Documents\Visual Studio 2012\Templates\ProjectTemplates\" You will then be able to create
new Apache Cordova Windows Phone apps from the Visual Studio File->New Project menu.
+- The root of the repo contains a `createTemplates.bat` file.
+  Double-clicking it generates two `.zip` files:
+  `CordovaWP7_x_x_x.zip` and `CordovaWP8_x_x_x.zip`, where _x.x.x_
+  represents the current version number. To easily use these files in
+  Visual Studio, copy them to `My Documents\Visual Studio
+  2012\Templates\ProjectTemplates\`. You are then able to create
+  new Apache Cordova Windows Phone apps from Visual Studio's
+  __File &rarr; New Project__ menu.
 
 - If you run the batch file from the command line, you can also call with a parameter to
install automatically
 
@@ -99,7 +105,7 @@ Run the 'run' command with the following *optional* parameters
 
     $ C:\path\to\my_new_project\cordova\run [Target] [Build]
 
-By default the `run` command will be called with `--emulator --debug` if flags are not provided.
+By default the `run` command is called with `--emulator --debug` if flags are not provided.
 
 ## Cleaning
 

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/d26c8df2/docs/en/edge/plugin_ref/spec.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/plugin_ref/spec.md b/docs/en/edge/plugin_ref/spec.md
index 0884ddc..7f48288 100644
--- a/docs/en/edge/plugin_ref/spec.md
+++ b/docs/en/edge/plugin_ref/spec.md
@@ -247,18 +247,18 @@ Details for the `<js-module>` tag:
 
 * Three tags are allowed within `<js-module>`:
 
-    * `<clobbers target="some.value"/>` indicates that the
+    - `<clobbers target="some.value"/>` indicates that the
       `module.exports` is inserted into the `window` object as
       `window.some.value`. You can have as many `<clobbers>` as you
       like. Any object not available on `window` is created.
 
-    * `<merges target="some.value"/>` indicates that the module
+    - `<merges target="some.value"/>` indicates that the module
       should be merged with any existing value at `window.some.value`.
       If any key already exists, the module's version overrides the
       original. You can have as many `<merges>` as you like. Any
       object not available on `window` is created.
 
-    * `<runs/>` means that your code should be specified with
+    - `<runs/>` means that your code should be specified with
       `cordova.require`, but not installed on the `window`
       object. This is useful when initializing the module, attaching
       event handlers or otherwise. You can only have up to one
@@ -266,7 +266,7 @@ Details for the `<js-module>` tag:
       `<clobbers/>` or `<merges/>` is redundant, since they also
       `cordova.require` your module.
 
-    * An empty `<js-module>` still loads and can be acccessed in other
+    - An empty `<js-module>` still loads and can be acccessed in other
       modules via `cordova.require`.
 
 If `src` does not resolve to an existing file, plugman stops and
@@ -278,7 +278,7 @@ platform-specific JavaScript module bindings.
 
 ## _dependency_ element
 
-The `<dependency>` tag allows you specify other plugins on which the
+The `<dependency>` tag allows you to specify other plugins on which the
 current plugin depends. While future versions will access them from
 plugin repositories, in the short term plugins are directly referenced
 as URLs by `<dependency>` tags. They are formatted as follows:


Mime
View raw message