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/09/19 16:18:36 UTC

[1/4] docs commit: [CB-3962] standardize 'splash screen'

Updated Branches:
  refs/heads/master 0d03ee875 -> 348bc004d


[CB-3962] standardize 'splash screen'


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

Branch: refs/heads/master
Commit: 216561a365460950cfa2b41f289a31d18e8c9787
Parents: 0d03ee8
Author: Mike Sierra <ms...@adobe.com>
Authored: Wed Sep 18 11:04:43 2013 -0400
Committer: Michael Brooks <mi...@michaelbrooks.ca>
Committed: Thu Sep 19 16:18:02 2013 +0200

----------------------------------------------------------------------
 STYLESHEET.md                                     | 2 ++
 docs/en/edge/config_ref/index.md                  | 7 ++++---
 docs/en/edge/cordova/splashscreen/splashscreen.md | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/216561a3/STYLESHEET.md
----------------------------------------------------------------------
diff --git a/STYLESHEET.md b/STYLESHEET.md
index 52991a6..3f11a36 100644
--- a/STYLESHEET.md
+++ b/STYLESHEET.md
@@ -118,6 +118,8 @@ editorial guidelines.
 
 * WebView, not Webview. (OK to use lowercase webview in code)
 
+* "splash screen" unless specifically referring to API.
+
 * 'Directory', not 'folder'; may be exceptions in some GUI contexts
 
 * Subdirectory, not sub-directory

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/216561a3/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 2e89ffa..2862706 100644
--- a/docs/en/edge/config_ref/index.md
+++ b/docs/en/edge/config_ref/index.md
@@ -179,15 +179,16 @@ all of them:
 
 -->
 
-* `AutoHideSplashScreen` (boolean, defaults to `true`): set to `false` to
-  control when the splashscreen is hidden through a JavaScript API.
+* `AutoHideSplashScreen` (boolean, defaults to `true`): set to `false`
+  to control when the splash screen image is hidden through a
+  JavaScript API.
 
         <preference name="AutoHideSplashScreen" value="false"/>
 
 <!-- autoHideSplashScreen vs iOS AutoHideSplashScreen:
 
 * `AutoHideSplashScreen`: (`true` or `false`): Set to `false` to
-  control when the splashscreen is hidden through a JavaScript
+  control when the splash screen image is hidden through a JavaScript
   API. This preference defaults to true.
 
         <preference name="autoHideSplashScreen" value="false"/>

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/216561a3/docs/en/edge/cordova/splashscreen/splashscreen.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/cordova/splashscreen/splashscreen.md b/docs/en/edge/cordova/splashscreen/splashscreen.md
index 246ce58..50b7642 100644
--- a/docs/en/edge/cordova/splashscreen/splashscreen.md
+++ b/docs/en/edge/cordova/splashscreen/splashscreen.md
@@ -71,7 +71,7 @@ configuration.  See _Platform Support_ in the Overview section.
         super.setIntegerProperty("splashscreen", R.drawable.splash);
         super.loadUrl(Config.getStartUrl(), 10000);
 
-    The first line sets the image to display as the splashscreen. If you name your image anything other than `splash.png`, you need to modify this line.
+    The first line sets the image to display as the splash screen. If you name your image anything other than `splash.png`, you need to modify this line.
     The second line is the normal `super.loadUrl` line, but it has a second parameter that specifies a timeout value for the splash screen. In this example the splash screen displays for 10 seconds. To dismiss the splash screen once the app receives the `deviceready` event, call the `navigator.splashscreen.hide()` method.
 
 ### iOS


[2/4] docs commit: [CB-3962] directory, not folder

Posted by mw...@apache.org.
[CB-3962] directory, not folder


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

Branch: refs/heads/master
Commit: d3059c39d82264d4389102e225e01f3b350699e0
Parents: 216561a
Author: Mike Sierra <ms...@adobe.com>
Authored: Wed Sep 18 11:14:48 2013 -0400
Committer: Michael Brooks <mi...@michaelbrooks.ca>
Committed: Thu Sep 19 16:18:12 2013 +0200

----------------------------------------------------------------------
 docs/en/edge/config_ref/index.md                |  2 +-
 .../edge/guide/platforms/blackberry10/plugin.md |  2 +-
 docs/en/edge/guide/platforms/ios/plugin.md      |  4 +-
 docs/en/edge/guide/platforms/ios/upgrading.md   | 40 ++++++++++----------
 docs/en/edge/guide/platforms/ios/webview.md     | 12 +++---
 docs/en/edge/guide/platforms/win8/index.md      |  2 +-
 docs/en/edge/guide/platforms/wp7/index.md       |  6 +--
 docs/en/edge/guide/platforms/wp8/index.md       |  6 +--
 docs/en/edge/guide/platforms/wp8/plugin.md      |  2 +-
 docs/en/edge/guide/platforms/wp8/tools.md       |  2 +-
 docs/en/edge/guide/platforms/wp8/upgrading.md   | 20 +++++-----
 docs/en/edge/plugin_ref/spec.md                 |  2 +-
 12 files changed, 50 insertions(+), 50 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/d3059c39/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 2862706..95b5af2 100644
--- a/docs/en/edge/config_ref/index.md
+++ b/docs/en/edge/config_ref/index.md
@@ -261,7 +261,7 @@ attributes are optional:
         <icon src="app.png" width="128" height="128"/>
 
 Likewise, the default splash screen must be named `splash.png` and
-must reside in the root of your application folder in _png_
+must reside in the root of your application directory in _png_
 format. Otherwise, use the `gap:splash` tag to specify a different
 filename:
 

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/d3059c39/docs/en/edge/guide/platforms/blackberry10/plugin.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/guide/platforms/blackberry10/plugin.md b/docs/en/edge/guide/platforms/blackberry10/plugin.md
index 8e86ff8..2bd4fe5 100644
--- a/docs/en/edge/guide/platforms/blackberry10/plugin.md
+++ b/docs/en/edge/guide/platforms/blackberry10/plugin.md
@@ -175,7 +175,7 @@ looks like this:
   - **simulator** (>*binary file* *.so)
 
 (The list shows the hierarchical relationship among the top-level
-folders. The parenthesis shows the contents of a given directory. All
+directories. The parenthesis shows the contents of a given directory. All
 directory names appear in bold text. File names are preceded by the `>`
 sign.)
 

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/d3059c39/docs/en/edge/guide/platforms/ios/plugin.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/guide/platforms/ios/plugin.md b/docs/en/edge/guide/platforms/ios/plugin.md
index 541e4f9..65f0c48 100644
--- a/docs/en/edge/guide/platforms/ios/plugin.md
+++ b/docs/en/edge/guide/platforms/ios/plugin.md
@@ -120,8 +120,8 @@ We would add the following to the project's `config.xml` file:
         <param name="ios-package" value="Echo" />
     </feature>
 
-Then we would add the following files (`Echo.h` and `Echo.m`) to the Plugins folder inside our Cordova-iOS
-application folder:
+Then we would add the following files (`Echo.h` and `Echo.m`) to the Plugins directory inside our Cordova-iOS
+application directory:
 
     /********* Echo.h Cordova Plugin Header *******/
 

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/d3059c39/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 b2ce50b..44ea4f1 100644
--- a/docs/en/edge/guide/platforms/ios/upgrading.md
+++ b/docs/en/edge/guide/platforms/ios/upgrading.md
@@ -46,7 +46,7 @@ The iOS 6 SDK requires Xcode 4.5.
    inside the `platforms\ios` directory.
 
 5. Copy your `config.xml` into the `www` directory, and remove any plugin
-   definitions. Modify settings here instead of the platform folder.
+   definitions. Modify settings here instead of 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
@@ -56,7 +56,7 @@ The iOS 6 SDK requires Xcode 4.5.
 
 ## Upgrading 2.9.0 projects to 3.0.0 ##
 
-1. Download and extract the Cordova 3.0.0 source to a permanent folder location on your hard drive, for example to `~/Documents/Cordova-3.0.0`.
+1. Download and extract the Cordova 3.0.0 source to a permanent directory location on your hard drive, for example to `~/Documents/Cordova-3.0.0`.
 
 2. Quit Xcode if it is running.
 
@@ -77,7 +77,7 @@ Plugins.
 
 ## Upgrading 2.8.0 projects to 2.9.0 ##
 
-1. Download and extract the Cordova 2.9.0 source to a permanent folder location on your hard drive, for example to `~/Documents/Cordova-2.9.0`.
+1. Download and extract the Cordova 2.9.0 source to a permanent directory location on your hard drive, for example to `~/Documents/Cordova-2.9.0`.
 
 2. Quit Xcode if it is running.
 
@@ -93,7 +93,7 @@ Plugins.
 
 ## Upgrading 2.7.0 projects to 2.8.0 ##
 
-1. Download and extract the Cordova 2.8.0 source to a permanent folder location on your hard drive, for example to `~/Documents/Cordova-2.8.0`.
+1. Download and extract the Cordova 2.8.0 source to a permanent directory location on your hard drive, for example to `~/Documents/Cordova-2.8.0`.
 
 2. Quit Xcode if it is running.
 
@@ -132,7 +132,7 @@ Plugins.
 
 ## Upgrading 2.6.0 projects to 2.7.0 ##
 
-1. Download and extract the Cordova 2.7.0 source to a permanent folder location on your hard drive, for example to `~/Documents/Cordova-2.7.0`.
+1. Download and extract the Cordova 2.7.0 source to a permanent directory location on your hard drive, for example to `~/Documents/Cordova-2.7.0`.
 
 2. Quit Xcode if it is running.
 
@@ -152,7 +152,7 @@ Plugins.
 
 ## Upgrading 2.5.0 projects to 2.6.0 ##
 
-1. Download and extract the Cordova 2.6.0 source to a permanent folder location on your hard drive, for example to `~/Documents/Cordova-2.6.0`.
+1. Download and extract the Cordova 2.6.0 source to a permanent directory location on your hard drive, for example to `~/Documents/Cordova-2.6.0`.
 
 2. Quit Xcode if it is running.
 
@@ -178,7 +178,7 @@ Plugins.
 
 ## Upgrading 2.4.0 projects to 2.5.0 ##
 
-1. Download and extract the Cordova 2.5.0 source to a permanent folder location on your hard drive, for example to `~/Documents/Cordova-2.5.0`.
+1. Download and extract the Cordova 2.5.0 source to a permanent directory location on your hard drive, for example to `~/Documents/Cordova-2.5.0`.
 
 2. Quit Xcode if it is running.
 
@@ -204,7 +204,7 @@ Plugins.
 
 ## Upgrading 2.3.0 projects to 2.4.0 ##
 
-1. Download and extract the Cordova 2.4.0 source to a permanent folder location on your hard drive, for example to `~/Documents/Cordova-2.4.0`.
+1. Download and extract the Cordova 2.4.0 source to a permanent directory location on your hard drive, for example to `~/Documents/Cordova-2.4.0`.
 
 2. Quit Xcode if it is running.
 
@@ -230,7 +230,7 @@ Plugins.
 
 ## Upgrading 2.2.0 projects to 2.3.0 ##
 
-1. Download and extract the Cordova 2.3.0 source to a permanent folder location on your hard drive, for example to `~/Documents/Cordova-2.3.0`.
+1. Download and extract the Cordova 2.3.0 source to a permanent directory location on your hard drive, for example to `~/Documents/Cordova-2.3.0`.
 
 2. Quit Xcode if it is running.
 
@@ -264,7 +264,7 @@ You can get this by accessing the `userAgent` property off the main view-control
 
 ## Upgrading 2.1.0 projects to 2.2.0 ##
 
-1. Download and extract the Cordova 2.2.0 source to a permanent folder location on your hard drive, for example to `~/Documents/Cordova-2.2.0`.
+1. Download and extract the Cordova 2.2.0 source to a permanent directory location on your hard drive, for example to `~/Documents/Cordova-2.2.0`.
 
 2. Quit Xcode if it is running.
 
@@ -288,13 +288,13 @@ You can get this by accessing the `userAgent` property off the main view-control
 
         `update_cordova_subproject path/to/your/project/xcodeproj`
 
-__NOTE:__ In 2.2.0, the `bin/create` script copy in the `CordovaLib` sub-project into your project. To have the same kind of setup, just copy in the right `CordovaLib` into your project folder, and update the `CordovaLib` sub-project location (relative to the project) in the Xcode File Inspector.
+__NOTE:__ In 2.2.0, the `bin/create` script copy in the `CordovaLib` sub-project into your project. To have the same kind of setup, just copy in the right `CordovaLib` into your project directory, and update the `CordovaLib` sub-project location (relative to the project) in the Xcode File Inspector.
 
 ## Upgrading 2.0.0 projects to 2.1.0 ##
 
 With Cordova 2.1.0, `CordovaLib` has been upgraded to use __Automatic Reference Counting (ARC)__. You don't need to upgrade to __ARC__ to use CordovaLib, but if you want to upgrade your project to use __ARC__, please use the Xcode migration wizard from the menu: __Edit &rarr; Refactor &rarr; Convert to Objective-C ARC...__, de-select libCordova.a, then run the wizard to completion.
 
-1. Download and extract the Cordova 2.1.0 source to a permanent folder location on your hard drive, for example to `~/Documents/Cordova-2.1.0`.
+1. Download and extract the Cordova 2.1.0 source to a permanent directory location on your hard drive, for example to `~/Documents/Cordova-2.1.0`.
 
 2. Quit Xcode if it is running.
 
@@ -443,7 +443,7 @@ __NOTE:__ 1.9.0 supports the new `BackupWebStorage` boolean `Cordova.plist` sett
 
 If you intend on using the Capture API, you will need the new __iPad retina-display__ assets:
 
-1.  Copy the `Resources/Capture.bundle` item from the new project into your project folder, over-writing your existing `Resources/Capture.bundle` item.
+1.  Copy the `Resources/Capture.bundle` item from the new project into your project directory, over-writing your existing `Resources/Capture.bundle` item.
 
 2.  In your project, select the `Capture.bundle` item into your Project Navigator in Xcode, type the __Delete__ key, then select __Remove Reference__ from the resulting dialog.
 
@@ -467,7 +467,7 @@ If you intend on using the Capture API, you will need the new __iPad retina-disp
 
 3. Create a new project. You will need some of the assets from this new project.
 
-4. Copy these files from the new project into your 1.5.0-based project folder on disk, replacing any old files (backup your files first from step 2 above):
+4. Copy these files from the new project into your 1.5.0-based project directory on disk, replacing any old files (backup your files first from step 2 above):
 
         AppDelegate.h
         AppDelegate.m
@@ -580,7 +580,7 @@ If you intend on using the Capture API, you will need the new __iPad retina-disp
 
 3. Create a new project. You will need some of the assets from this new project.
 
-4. Copy the `MainViewController.m` file from the new project into your 1.4.0-based project folder on disk, replacing the old file (backup your files first from step 2 above).
+4. Copy the `MainViewController.m` file from the new project into your 1.4.0-based project directory on disk, replacing the old file (backup your files first from step 2 above).
 
 5. Add the `MainViewController.m` file into your Xcode project.
 
@@ -596,7 +596,7 @@ If you intend on using the Capture API, you will need the new __iPad retina-disp
 
 3. Create a new project. You will need some of the assets from this new project.
 
-4. Copy these files from the new project into your 1.3.0-based project folder on disk, replacing any old files (backup your files first from step 2 above):
+4. Copy these files from the new project into your 1.3.0-based project directory on disk, replacing any old files (backup your files first from step 2 above):
 
         AppDelegate.h
         AppDelegate.m
@@ -623,7 +623,7 @@ If you intend on using the Capture API, you will need the new __iPad retina-disp
 
 3. Create a new project. You will need some of the assets from this new project.
 
-4. Copy these files from the new project into your 1.2.0-based project folder on disk, replacing any old files (backup your files first from step 2 above):
+4. Copy these files from the new project into your 1.2.0-based project directory on disk, replacing any old files (backup your files first from step 2 above):
 
         AppDelegate.h
         AppDelegate.m
@@ -650,7 +650,7 @@ If you intend on using the Capture API, you will need the new __iPad retina-disp
 
 3. Create a new project. You will need some of the assets from this new project.
 
-4. Copy these files from the new project into your 1.1.0-based project folder on disk, replacing any old files (backup your files first from step 2 above):
+4. Copy these files from the new project into your 1.1.0-based project directory on disk, replacing any old files (backup your files first from step 2 above):
 
         AppDelegate.h
         AppDelegate.m
@@ -677,7 +677,7 @@ If you intend on using the Capture API, you will need the new __iPad retina-disp
 
 3. Create a new project. You will need some of the assets from this new project.
 
-4. Copy these files from the new project into your 1.0.0-based project folder on disk, replacing any old files (backup your files first from step 2 above):
+4. Copy these files from the new project into your 1.0.0-based project directory on disk, replacing any old files (backup your files first from step 2 above):
 
         AppDelegate.h
         AppDelegate.m
@@ -704,7 +704,7 @@ If you intend on using the Capture API, you will need the new __iPad retina-disp
 
 3. Create a new project. You will need some of the assets from this new project.
 
-4. Copy these files from the new project into your 0.9.6-based project folder on disk, replacing any old files (backup your files first from step 2 above):
+4. Copy these files from the new project into your 0.9.6-based project directory on disk, replacing any old files (backup your files first from step 2 above):
 
         AppDelegate.h
         AppDelegate.m

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/d3059c39/docs/en/edge/guide/platforms/ios/webview.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/guide/platforms/ios/webview.md b/docs/en/edge/guide/platforms/ios/webview.md
index c95b069..e755392 100644
--- a/docs/en/edge/guide/platforms/ios/webview.md
+++ b/docs/en/edge/guide/platforms/ios/webview.md
@@ -39,19 +39,19 @@ based Cleaver implementation.
 
 ## Adding Cleaver to your Xcode project (CordovaLib sub-project)
 
-1. Download and extract the Cordova source to a permanent folder location on your hard drive, for example to `~/Documents/Cordova`.
+1. Download and extract the Cordova source to a permanent directory location on your hard drive, for example to `~/Documents/Cordova`.
 
 2. Quit Xcode if it is running.
 
 3. Using Terminal.app, navigate to the directory where you put the downloaded source above.
 
-4. Copy the `config.xml` file into your project folder on disk (see the Prerequisites above).
+4. Copy the `config.xml` file into your project directory on disk (see the Prerequisites above).
 
 5. Drag and drop the `config.xml` file into the Project Navigator of Xcode.
 
 6. Choose the __Create groups for any added folders__ radio button and press __Finish__.
 
-7. Drag and drop the `CordovaLib.xcodeproj` file into the Project Navigator of Xcode (from the permanent folder location above, and it should be in the `CordovaLib` subdirectory).
+7. Drag and drop the `CordovaLib.xcodeproj` file into the Project Navigator of Xcode (from the permanent directory location above, and it should be in the `CordovaLib` subdirectory).
 
 8. Select `CordovaLib.xcodeproj` in the Project Navigator.
 
@@ -137,11 +137,11 @@ based Cleaver implementation.
 
 ## Adding your HTML, CSS and JavaScript assets
 
-1. Create a new folder in your project on disk, `www` for example.
+1. Create a new directory in your project on disk, `www` for example.
 
-2. Put your HTML, CSS and JavaScript assets into this folder.
+2. Put your HTML, CSS and JavaScript assets into this directory.
 
-3. Drag and drop the folder into the Project Navigator of Xcode.
+3. Drag and drop the directory into the Project Navigator of Xcode.
 
 4. Choose the __Create folder references for any added folders__ radio button.
 

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/d3059c39/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 a4c0baf..95ed938 100644
--- a/docs/en/edge/guide/platforms/win8/index.md
+++ b/docs/en/edge/guide/platforms/win8/index.md
@@ -47,7 +47,7 @@ Follow the instructions [here](http://www.windowsstore.com/) to submit your apps
 
 - Set up your preferred variant of Visual Studio 2012. All of the product's paid versions (Professional, etc.) let you build Windows Store apps. You need __Express for Windows 8__ to build Windows Store apps using the [Express editions](http://www.microsoft.com/visualstudio/eng/products/visual-studio-express-products).
 
-- Download and extract the latest copy of [Cordova](http://phonegap.com/download). You will be working in the `lib\windows-8` subfolder.
+- Download and extract the latest copy of [Cordova](http://phonegap.com/download). You will be working in the `lib\windows-8` subdirectory.
 
 ## 3. Set up New Project
 

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/d3059c39/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 8b36931..91cd38d 100644
--- a/docs/en/edge/guide/platforms/wp7/index.md
+++ b/docs/en/edge/guide/platforms/wp7/index.md
@@ -51,9 +51,9 @@ __NOTE:__ Running the SDK in Virtual Machine might present some challenges. You
 
 - 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 `lib\windows-phone-8\wp7` subfolder, `lib\windows-phone-8\wp8` contains the Windwos Phone 8 version of Cordova.
+- Download and extract the latest copy of [Cordova](http://phonegap.com/download). You will be working in the `lib\windows-phone-8\wp7` subdirectory, `lib\windows-phone-8\wp8` contains the Windwos Phone 8 version of Cordova.
 
-- Copy the file CordovaWP7_x_x_x.zip to the folder : \My Documents\Visual Studio 2012\Templates\ProjectTemplates\
+- Copy the file CordovaWP7_x_x_x.zip to the `\My Documents\Visual Studio 2012\Templates\ProjectTemplates\` directory.
 
 ## 2.1. Building the template
 
@@ -82,7 +82,7 @@ Run the script :
 
 ## 4. Review the project structure
 
-- The `www` folder contains your Cordova `html/js/css` and any other resources included in your app.
+- The `www` directory contains your Cordova `html/js/css` and any other resources included in your app.
 
 - Any content that you add here needs to be a part of the Visual Studio project, and it must be set as content.
 

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/d3059c39/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 76e4e3f..fd7e823 100644
--- a/docs/en/edge/guide/platforms/wp8/index.md
+++ b/docs/en/edge/guide/platforms/wp8/index.md
@@ -68,9 +68,9 @@ __NOTE:__ Running the SDK in Virtual Machine might present some challenges. You
 
 - Download and install [Windows Phone SDK](http://www.microsoft.com/en-us/download/details.aspx?id=35471)
 
-- Download and extract the latest copy of [Cordova](http://phonegap.com/download). You will be working in the `lib\windows-phone-8\wp8` subfolder, `lib\windows-phone-8\wp7` contains the Windwos Phone 7 version of Cordova.
+- Download and extract the latest copy of [Cordova](http://phonegap.com/download). You will be working in the `lib\windows-phone-8\wp8` subdirectory, `lib\windows-phone-8\wp7` contains the Windwos Phone 7 version of Cordova.
 
-- Copy the file CordovaWP8_x_x_x.zip to the folder : \My Documents\Visual Studio 2012\Templates\ProjectTemplates\
+- Copy the file CordovaWP8_x_x_x.zip to the `\My Documents\Visual Studio 2012\Templates\ProjectTemplates\` directory.
 
 ## 2.1. Building the template
 
@@ -101,7 +101,7 @@ Run the script :
 
 ## 4. Review the project structure
 
-- The `www` folder contains your Cordova `html/js/css` and any other resources included in your app.
+- The `www` directory contains your Cordova `html/js/css` and any other resources included in your app.
 
 - Any content that you add here needs to be a part of the Visual Studio project, and it must be set as content.
 

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/d3059c39/docs/en/edge/guide/platforms/wp8/plugin.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/guide/platforms/wp8/plugin.md b/docs/en/edge/guide/platforms/wp8/plugin.md
index 62d843e..8deb6ce 100644
--- a/docs/en/edge/guide/platforms/wp8/plugin.md
+++ b/docs/en/edge/guide/platforms/wp8/plugin.md
@@ -26,7 +26,7 @@ application JavaScript code and manages native API calls. There is a BaseCommand
 and it comes with the majority of the 'plumbing' built for you already.
 
 1. Select your project, and right-click to choose __Add &rarr; New Item...__
-    - Preferably add it to the 'Plugins' folder, but it is up to you
+    - Preferably add it to the 'Plugins' directory, but it is up to you
 
 2. Select 'Class' and name it `Echo.cs`
     - The name of this class must _exactly_ match what you call into `cordova.exec(win, fail, "Echo", ...)`

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/d3059c39/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 e720d59..d57af0d 100644
--- a/docs/en/edge/guide/platforms/wp8/tools.md
+++ b/docs/en/edge/guide/platforms/wp8/tools.md
@@ -37,7 +37,7 @@ running new projects. Commands must be run from a cmd or powershell
 prompt.
 
 The WP8 repo now includes code for building both WP7 + WP8 apps.  The
-repo has subfolders for each: wp7/ and wp8/
+repo has subdirectories for each: `wp7/` and `wp8/`.
 
 ## Create a project
 

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/d3059c39/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 5cc09b1..5de5752 100644
--- a/docs/en/edge/guide/platforms/wp8/upgrading.md
+++ b/docs/en/edge/guide/platforms/wp8/upgrading.md
@@ -236,7 +236,7 @@ In Visual Studio's Solution Explorer window:
 
 1. Delete `GapLib/WP7CordovaClassLib.dll` from your project.
 
-2. Remove the reference to `WP7CordovaClassLib` in the __References__ folder.
+2. Remove the reference to `WP7CordovaClassLib` in the __References__ directory.
 
 3. Right-click on __References__ and select __Add Reference__.
 
@@ -253,7 +253,7 @@ In Visual Studio's Solution Explorer window:
 
 1. Delete `GapLib/WP7CordovaClassLib.dll` from your project.
 
-2. Remove the reference to `WP7CordovaClassLib` in the __References__ folder.
+2. Remove the reference to `WP7CordovaClassLib` in the __References__ directory.
 
 3. Right-click on __References__ and select __Add Reference__.
 
@@ -270,7 +270,7 @@ In Visual Studio's Solution Explorer window:
 
 1. Delete `GapLib/WP7CordovaClassLib.dll` from your project.
 
-2. Remove the reference to `WP7CordovaClassLib` in the __References__ folder.
+2. Remove the reference to `WP7CordovaClassLib` in the __References__ directory.
 
 3. Right-click on __References__ and select __Add Reference__.
 
@@ -287,7 +287,7 @@ In Visual Studio's Solution Explorer window:
 
 1. Delete `GapLib/WP7CordovaClassLib.dll` from your project.
 
-2. Remove the reference to `WP7CordovaClassLib` in the __References__ folder.
+2. Remove the reference to `WP7CordovaClassLib` in the __References__ directory.
 
 3. Right-click on __References__ and select __Add Reference__.
 
@@ -304,7 +304,7 @@ In Visual Studio's Solution Explorer window:
 
 1. Delete `GapLib/WP7CordovaClassLib.dll` from your project.
 
-2. Remove the reference to `WP7CordovaClassLib` in the __References__ folder.
+2. Remove the reference to `WP7CordovaClassLib` in the __References__ directory.
 
 3. Right-click on __References__ and select __Add Reference__.
 
@@ -321,7 +321,7 @@ In Visual Studio's Solution Explorer window:
 
 1. Delete `GapLib/WP7CordovaClassLib.dll` from your project.
 
-2. Remove the reference to `WP7CordovaClassLib` in the __References__ folder.
+2. Remove the reference to `WP7CordovaClassLib` in the __References__ directory.
 
 3. Right-click on __References__ and select __Add Reference__.
 
@@ -338,7 +338,7 @@ In Visual Studio's Solution Explorer window:
 
 1. Delete `GapLib/WP7CordovaClassLib.dll` from your project.
 
-2. Remove the reference to `WP7CordovaClassLib` in the __References__ folder.
+2. Remove the reference to `WP7CordovaClassLib` in the __References__ directory.
 
 3. Right-click on __References__ and select __Add Reference__.
 
@@ -355,7 +355,7 @@ In Visual Studio's Solution Explorer window:
 
 1. Delete `GapLib/WP7CordovaClassLib.dll` from your project.
 
-2. Remove the reference to `WP7CordovaClassLib` in the __References__ folder.
+2. Remove the reference to `WP7CordovaClassLib` in the __References__ directory.
 
 3. Right-click on __References__ and select __Add Reference__.
 
@@ -372,7 +372,7 @@ In Visual Studio's Solution Explorer window:
 
 1. Delete `GapLib/WP7CordovaClassLib.dll` from your project.
 
-2. Remove the reference to `WP7CordovaClassLib` in the __References__ folder.
+2. Remove the reference to `WP7CordovaClassLib` in the __References__ directory.
 
 3. Right-click on __References__ and select __Add Reference__.
 
@@ -389,7 +389,7 @@ In Visual Studio's Solution Explorer window:
 
 1. Delete `GapLib/WP7CordovaClassLib.dll` from your project.
 
-2. Remove the reference to `WP7CordovaClassLib` in the __References__ folder.
+2. Remove the reference to `WP7CordovaClassLib` in the __References__ directory.
 
 3. Right-click on __References__ and select __Add Reference__.
 

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/d3059c39/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 53551d7..d62e72e 100644
--- a/docs/en/edge/plugin_ref/spec.md
+++ b/docs/en/edge/plugin_ref/spec.md
@@ -117,7 +117,7 @@ A custom Apache Cordova-based framework requires that an engine element includes
 * `version` (required): The version that your framework must have in order to install.
 
 * `scriptSrc` (required): The script file that tells plugman what version of the custom framework is. 
-Ideally, this file should be within the top level directory of your plugin folder.
+Ideally, this file should be within the top level directory of your plugin directory.
 
 * `platform` (required): Which platforms that your framework supports. You may use the wildcard '*'
 to say supported for all platforms, specify multiple with a pipe character like 'android|ios|blackberry10' 


[4/4] docs commit: [CB-3962] add to stylesheet

Posted by mw...@apache.org.
[CB-3962] add to stylesheet


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

Branch: refs/heads/master
Commit: 348bc004d7ae973a569e7dd56680da4592944319
Parents: 57aeef0
Author: Mike Sierra <ms...@adobe.com>
Authored: Wed Sep 18 11:23:46 2013 -0400
Committer: Michael Brooks <mi...@michaelbrooks.ca>
Committed: Thu Sep 19 16:18:24 2013 +0200

----------------------------------------------------------------------
 STYLESHEET.md | 3 +++
 1 file changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/348bc004/STYLESHEET.md
----------------------------------------------------------------------
diff --git a/STYLESHEET.md b/STYLESHEET.md
index 3f11a36..09a46b6 100644
--- a/STYLESHEET.md
+++ b/STYLESHEET.md
@@ -84,6 +84,9 @@ editorial guidelines.
 * Possessives are OK: "the device's home screen" rather than clumsier:
   "the home screen of the device"
 
+* 'The FOO file', not 'the file FOO', no matter how long FOO's
+  filename is.
+
 * Hyphenate adjective phrases: "command-line tools", but not when it's
   a noun, as in "the command line."
 


[3/4] docs commit: [CB-3962] 'the FOO file', not 'the file FOO'

Posted by mw...@apache.org.
[CB-3962] 'the FOO file', not 'the file FOO'


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

Branch: refs/heads/master
Commit: 57aeef08606c4aadb81b58da668543bff8be523e
Parents: d3059c3
Author: Mike Sierra <ms...@adobe.com>
Authored: Wed Sep 18 11:18:02 2013 -0400
Committer: Michael Brooks <mi...@michaelbrooks.ca>
Committed: Thu Sep 19 16:18:19 2013 +0200

----------------------------------------------------------------------
 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 | 40 +++++++++++-----------
 3 files changed, 22 insertions(+), 22 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/57aeef08/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 91cd38d..6f78cde 100644
--- a/docs/en/edge/guide/platforms/wp7/index.md
+++ b/docs/en/edge/guide/platforms/wp7/index.md
@@ -53,7 +53,7 @@ __NOTE:__ Running the SDK in Virtual Machine might present some challenges. You
 
 - Download and extract the latest copy of [Cordova](http://phonegap.com/download). You will be working in the `lib\windows-phone-8\wp7` subdirectory, `lib\windows-phone-8\wp8` contains the Windwos Phone 8 version of Cordova.
 
-- Copy the file CordovaWP7_x_x_x.zip to the `\My Documents\Visual Studio 2012\Templates\ProjectTemplates\` directory.
+- Copy the `CordovaWP7_x_x_x.zip` file to the `\My Documents\Visual Studio 2012\Templates\ProjectTemplates\` directory.
 
 ## 2.1. Building the template
 

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/57aeef08/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 fd7e823..4e08697 100644
--- a/docs/en/edge/guide/platforms/wp8/index.md
+++ b/docs/en/edge/guide/platforms/wp8/index.md
@@ -70,7 +70,7 @@ __NOTE:__ Running the SDK in Virtual Machine might present some challenges. You
 
 - Download and extract the latest copy of [Cordova](http://phonegap.com/download). You will be working in the `lib\windows-phone-8\wp8` subdirectory, `lib\windows-phone-8\wp7` contains the Windwos Phone 7 version of Cordova.
 
-- Copy the file CordovaWP8_x_x_x.zip to the `\My Documents\Visual Studio 2012\Templates\ProjectTemplates\` directory.
+- Copy the `CordovaWP8_x_x_x.zip` file to the `\My Documents\Visual Studio 2012\Templates\ProjectTemplates\` directory.
 
 ## 2.1. Building the template
 

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/57aeef08/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 5de5752..6a0b465 100644
--- a/docs/en/edge/guide/platforms/wp8/upgrading.md
+++ b/docs/en/edge/guide/platforms/wp8/upgrading.md
@@ -240,8 +240,8 @@ In Visual Studio's Solution Explorer window:
 
 3. Right-click on __References__ and select __Add Reference__.
 
-4. Navigate to the new distribution and add the file `WP7CordovaClassLib.dll`.
-    - __NOTE:__ You can view the version of the DLL by right-clicking on the reference, and selecting __Properties__.
+4. Navigate to the new distribution and add the `WP7CordovaClassLib.dll` file.
+    - __NOTE:__ You can view the DLL's version by right-clicking on the reference, and selecting __Properties__.
 
 5. Copy the new `cordova-1.9.0.js` into your project. (Be sure it is marked as Content.)
 
@@ -257,8 +257,8 @@ In Visual Studio's Solution Explorer window:
 
 3. Right-click on __References__ and select __Add Reference__.
 
-4. Navigate to the new distribution and add the file `WP7CordovaClassLib.dll`.
-    - __NOTE:__ You can view the version of the DLL by right-clicking on the reference, and selecting __Properties__.
+4. Navigate to the new distribution and add the `WP7CordovaClassLib.dll` file.
+    - __NOTE:__ You can view the DLL's version by right-clicking on the reference, and selecting __Properties__.
 
 5. Copy the new `cordova-1.8.0.js` into your project. (Be sure it is marked as Content.)
 
@@ -274,8 +274,8 @@ In Visual Studio's Solution Explorer window:
 
 3. Right-click on __References__ and select __Add Reference__.
 
-4. Navigate to the new distribution and add the file `WP7CordovaClassLib.dll`.
-    - __NOTE:__ You can view the version of the DLL by right-clicking on the reference, and selecting __Properties__.
+4. Navigate to the new distribution and add the `WP7CordovaClassLib.dll` file.
+    - __NOTE:__ You can view the DLL's version by right-clicking on the reference, and selecting __Properties__.
 
 5. Copy the new `cordova-1.7.0.js` into your project. (Be sure it is marked as Content.)
 
@@ -291,8 +291,8 @@ In Visual Studio's Solution Explorer window:
 
 3. Right-click on __References__ and select __Add Reference__.
 
-4. Navigate to the new distribution and add the file `WP7CordovaClassLib.dll`.
-    - __NOTE:__ You can view the version of the DLL by right-clicking on the reference, and selecting __Properties__.
+4. Navigate to the new distribution and add the `WP7CordovaClassLib.dll` file.
+    - __NOTE:__ You can view the DLL's version by right-clicking on the reference, and selecting __Properties__.
 
 5. Copy the new `cordova-1.6.1.js` into your project. (Be sure it is marked as Content.)
 
@@ -308,8 +308,8 @@ In Visual Studio's Solution Explorer window:
 
 3. Right-click on __References__ and select __Add Reference__.
 
-4. Navigate to the new distribution and add the file `WP7CordovaClassLib.dll`.
-    - __NOTE:__ You can view the version of the DLL by right-clicking on the reference, and selecting __Properties__.
+4. Navigate to the new distribution and add the `WP7CordovaClassLib.dll` file.
+    - __NOTE:__ You can view the DLL's version by right-clicking on the reference, and selecting __Properties__.
 
 5. Copy the new `cordova-1.6.0.js` into your project. (Be sure it is marked as Content.)
 
@@ -325,8 +325,8 @@ In Visual Studio's Solution Explorer window:
 
 3. Right-click on __References__ and select __Add Reference__.
 
-4. Navigate to the new distribution and add the file `WP7CordovaClassLib.dll`.
-    - __NOTE:__ You can view the version of the DLL by right-clicking on the reference, and selecting __Properties__.
+4. Navigate to the new distribution and add the `WP7CordovaClassLib.dll` file.
+    - __NOTE:__ You can view the DLL's version by right-clicking on the reference, and selecting __Properties__.
 
 5. Copy the new `cordova-1.5.0.js` into your project. (Be sure it is marked as Content.)
 
@@ -342,8 +342,8 @@ In Visual Studio's Solution Explorer window:
 
 3. Right-click on __References__ and select __Add Reference__.
 
-4. Navigate to the new distribution and add the file `WP7CordovaClassLib.dll`.
-    - __NOTE:__ You can view the version of the DLL by right-clicking on the reference, and selecting __Properties__.
+4. Navigate to the new distribution and add the `WP7CordovaClassLib.dll` file.
+    - __NOTE:__ You can view the DLL's version by right-clicking on the reference, and selecting __Properties__.
 
 5. Copy the new `cordova-1.4.0.js` into your project. (Be sure it is marked as Content.)
 
@@ -359,8 +359,8 @@ In Visual Studio's Solution Explorer window:
 
 3. Right-click on __References__ and select __Add Reference__.
 
-4. Navigate to the new distribution and add the file `WP7CordovaClassLib.dll`.
-    - __NOTE:__ You can view the version of the DLL by right-clicking on the reference, and selecting __Properties__.
+4. Navigate to the new distribution and add the `WP7CordovaClassLib.dll` file.
+    - __NOTE:__ You can view the DLL's version by right-clicking on the reference, and selecting __Properties__.
 
 5. Copy the new `cordova-1.3.0.js` into your project. (Be sure it is marked as Content.)
 
@@ -376,8 +376,8 @@ In Visual Studio's Solution Explorer window:
 
 3. Right-click on __References__ and select __Add Reference__.
 
-4. Navigate to the new distribution and add the file `WP7CordovaClassLib.dll`.
-    - __NOTE:__ You can view the version of the DLL by right-clicking on the reference, and selecting __Properties__.
+4. Navigate to the new distribution and add the `WP7CordovaClassLib.dll` file.
+    - __NOTE:__ You can view the DLL's version by right-clicking on the reference, and selecting __Properties__.
 
 5. Copy the new `cordova-1.2.0.js` into your project. (Be sure it is marked as Content.)
 
@@ -393,8 +393,8 @@ In Visual Studio's Solution Explorer window:
 
 3. Right-click on __References__ and select __Add Reference__.
 
-4. Navigate to the new distribution and add the file `WP7CordovaClassLib.dll`.
-    - __NOTE:__ you can view the version of the DLL by right-clicking on the reference, and selecting __Properties__.
+4. Navigate to the new distribution and add the `WP7CordovaClassLib.dll` file.
+    - __NOTE:__ you can view the DLL's version by right-clicking on the reference, and selecting __Properties__.
 
 5. Copy the new `cordova-1.1.0.js` into your project. (Be sure it is marked as Content.)