cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rakat...@apache.org
Subject [03/11] docs commit: Moving dev to 6.x. This closes #537
Date Tue, 08 Mar 2016 00:05:02 GMT
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/28d8c235/www/docs/en/6.x/guide/platforms/android/upgrade.md
----------------------------------------------------------------------
diff --git a/www/docs/en/6.x/guide/platforms/android/upgrade.md b/www/docs/en/6.x/guide/platforms/android/upgrade.md
index 33b2bee..d6dd685 100644
--- a/www/docs/en/6.x/guide/platforms/android/upgrade.md
+++ b/www/docs/en/6.x/guide/platforms/android/upgrade.md
@@ -27,6 +27,67 @@ Most of these instructions apply to projects created with an older set
 of command-line tools that precede the `cordova` CLI utility. See [The Command-Line Interface](../../cli/index.html) for information how to update the
 version of the CLI.
 
+## Upgrading to 5.X.X
+
+The best way to upgrade to 5.X.X is to simply remove the Android platform from
+your project and re-add it with the new version. For example,
+
+```
+cordova platform remove android
+cordova platform add android@5.X.X
+```
+
+If you use the above method, be aware that any changes you made to the android
+platform folder will be lost (editing the contents of this folder is
+discouraged).
+
+Alternatively, you may attempt to use the platform update script. For non-CLI
+projects, run:
+
+        bin/update path/to/project
+
+For CLI projects:
+
+1. Update the `cordova` CLI version. See [The Command-Line Interface](../../cli/index.html).
+
+2. Run `cordova platform update android@5.0.0` in your existing projects.
+
+### Upgrading Plugins for Android Marshmallow
+
+Version 5.0.0 adds support for Android API level 23 (Marshmallow). Android
+Marshmallow introduced a new permissions model that may require you to update
+some installed plugins to ensure they are compatible with newer phones. Older
+plugin versions that do not properly handle permissions can cause your
+application to crash unexpectedly. Note that this does not affect every plugin,
+but only those that access Android permissions deemed *dangerous*
+(see [the table of dangerous permissions][android-dangerous-permissions]).
+
+The following core plugins are affected by this change and must be upgraded to
+be used with **cordova-android 5.0.0+**:
+
+Plugin                      | Minimum Compatible Version
+----------------------------|---------------------------
+cordova-plugin-camera       | 2.0.0
+cordova-plugin-contacts     | 2.0.0
+cordova-plugin-file         | 4.0.0
+cordova-plugin-geolocation  | 2.0.0
+cordova-plugin-media        | 2.0.0
+
+For non-core plugins, you can verify if a plugin requests a
+[dangerous permission][android-dangerous-permissions] by checking the plugin's
+`plugin.xml` file. If the plugin uses Android permissions, you will see entries
+in `plugin.xml` that declare them. For example:
+
+```       
+<uses-permission android:name="android.permission.PERMISSION_NAME" />
+```
+
+Where `PERMISSION_NAME` is replaced with the name of an Android permission.
+The `plugin.xml` file can be found in the plugin's folder in your Cordova
+project (e.g. `plugins/example-plugin/plugin.xml`). Consult the documentation of
+any plugins using dangerous permissions to determine what steps need to be taken
+to ensure **cordova-android 5.0.0+** compatibility.  
+
 ## Upgrading to 4.0.0
 
 There are specific upgrade steps required to take advantage of the significant
@@ -40,7 +101,7 @@ For CLI projects:
 
 1. Update the `cordova` CLI version. See [The Command-Line Interface](../../cli/index.html).
 
-2. Run `cordova platform update android` in your existing projects.
+2. Run `cordova platform update android@4.0.0` in your existing projects.
 
 ### Upgrading the Whitelist
 All whitelist functionality is now implemented via plugin.  Without a plugin,
@@ -83,7 +144,7 @@ upgrade step required is to add the plugin:
 For non-CLI projects, run:
 
         bin/update path/to/project
-        
+
 For CLI projects:
 
 1. Update the `cordova` CLI version. See [The Command-Line Interface](../../cli/index.html).
@@ -102,12 +163,12 @@ their workspace.
 
 ## Upgrading to 3.2.0 from 3.1.0
 
-For projects that were created with the cordova CLI: 
+For projects that were created with the cordova CLI:
 
 1. Update the `cordova` CLI version. See [The Command-Line Interface](../../cli/index.html).
 
 2. Run `cordova platform update android`
-        
+
 For projects not created with the cordova CLI, run:
 
         bin/update <project_path>
@@ -118,16 +179,16 @@ This is a regression with Chromium on Android and the problem can be reproduced
 
 ## Upgrading to 3.1.0 from 3.0.0
 
-For projects that were created with the cordova CLI: 
+For projects that were created with the cordova CLI:
 
 1. Update the `cordova` CLI version. See [The Command-Line Interface](../../cli/index.html).
 
 2. Run `cordova platform update android`
-        
+
 For projects not created with the cordova CLI, run:
 
         bin/update <project_path>
-        
+
 ## 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
@@ -519,3 +580,4 @@ plugin maintainer and add this task to their bug tracker.
 
 6. Add the `res/xml/plugins.xml` to match `framework/res/xml/plugins.xml`.
 
+[android-dangerous-permissions]: http://developer.android.com/guide/topics/security/permissions.html#perm-groups

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/28d8c235/www/docs/en/6.x/guide/platforms/blackberry10/home.md
----------------------------------------------------------------------
diff --git a/www/docs/en/6.x/guide/platforms/blackberry10/home.md b/www/docs/en/6.x/guide/platforms/blackberry10/home.md
new file mode 100644
index 0000000..bae3ba2
--- /dev/null
+++ b/www/docs/en/6.x/guide/platforms/blackberry10/home.md
@@ -0,0 +1,29 @@
+---
+license: >
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+title: Blackberry 10 Guides
+---
+
+# Blackberry 10 Guides
+
+* [BlackBerry 10 Platform Guide](index.html)
+* [BlackBerry 10 Shell Tool Guide](tools.html)
+* [BlackBerry 10 Configuration](config.html)
+* [BlackBerry 10 Plugins](plugin.html)
+* [Upgrading BlackBerry 10](upgrade.html)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/28d8c235/www/docs/en/6.x/guide/platforms/blackberry10/index.md
----------------------------------------------------------------------
diff --git a/www/docs/en/6.x/guide/platforms/blackberry10/index.md b/www/docs/en/6.x/guide/platforms/blackberry10/index.md
index 7bdcdbc..c0762b0 100644
--- a/www/docs/en/6.x/guide/platforms/blackberry10/index.md
+++ b/www/docs/en/6.x/guide/platforms/blackberry10/index.md
@@ -30,7 +30,7 @@ For BlackBerry 10, you need to install the SDK regardless of whether
 you want to use the cross-platform Cordova CLI for development, or a
 narrower set of platform-centered command-line tools.  For a
 comparison of the two development paths, see the [Overview](../../overview/index.html).  For
-details on each, see [The Command-Line Interface](../../cli/index.html) and the BlackBerry 10
+details on each, see [Cordova CLI Reference] and the BlackBerry 10
 Shell Tool Guide.
 
 ## Requirements
@@ -137,7 +137,7 @@ The final step is to generate a signing certificate:
 ## Create a Project
 
 Use the `cordova` utility to set up a new project, as described in 
-[The Command-Line Interface](../../cli/index.html). For example, in a source-code directory:
+[Cordova CLI Reference](../../../cordova-cli/index.html). For example, in a source-code directory:
  
         $ cordova create hello com.example.hello
         $ cd hello
@@ -268,3 +268,5 @@ Once the target is defined, you can provide it to the run command using
 `--target`:
 
     $ cordova run blackberry10 --target=emu
+
+[Cordova CLI Reference]:(../../../cordova-cli/index.html)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/28d8c235/www/docs/en/6.x/guide/platforms/firefoxos/index.md
----------------------------------------------------------------------
diff --git a/www/docs/en/6.x/guide/platforms/firefoxos/index.md b/www/docs/en/6.x/guide/platforms/firefoxos/index.md
deleted file mode 100644
index d7d7b1d..0000000
--- a/www/docs/en/6.x/guide/platforms/firefoxos/index.md
+++ /dev/null
@@ -1,79 +0,0 @@
----
-license: >
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
-
-title: Firefox OS Platform Guide
----
-
-# Firefox OS Platform Guide
-
-This guide describes how to set up your development environment to
-create Cordova apps for Firefox OS devices, then test and publish those apps.
-
-## Requirements and Support
-
-Firefox OS apps are basically just web apps, with the addition of a manifest.webapp file that defines metadata about the app and allows it to be installed on Firefox OS devices. Any platform that Cordova supports can be used.To find out more about building web apps, consult the [App Center](https://developer.mozilla.org/en-US/Apps) on [MDN](https://developer.mozilla.org/en-US/).
-
-## Installation and Environment Setup
-
-First install [Node.js](http://nodejs.org/), then install the Cordova package like so:
-
-  	$ npm install -g cordova
-
-Next, create a sample Cordova app then navigate into the newly created directory:
-
-  	$ cordova create test-app
-  	$ cd test-app
-
-Add Firefox OS as a supported platform to the app with the following:
-
-  	$ cordova platform add firefoxos
-
-This creates a Firefox OS app in platforms/firefoxos/www directory, which currently looks the same except that it has a Firefox manifest file (manifest.webapp) inside the www directory.
-
-## Developing your app
-
-At this point you are ready to go — change the code inside test-app/www to whatever you want your app to be. You can add [supported plugins]() to the app using "cordova plugin add", for example:
-
-	cordova plugin add cordova-plugin-device
-	cordova plugin add cordova-plugin-vibration
-
-When your app code is written, deploy your changes to the Firefox OS app you've added to your project with
-
-  	$ cordova prepare firefoxos
-  	
-To create a packaged app one can zip the platforms/firefoxos/www directory. You can also simply build it using 
-
-    $ cordova build firefoxos
-
-The Firefox OS packaged app will be built in platforms/firefoxos/build/package.zip
-
-## Testing and Debugging
-
-The app can be tested using the Firefox OS [Web IDE](https://developer.mozilla.org/en-US/docs/Tools/WebIDE).
-
-When you have connected the Web IDE to your test device/simulator, select the "Open Packaged App" option, then make sure you point to the test-app/platforms/firefoxos/www/ directory to include the App in the Manager interface.
-
-For here you can install the app on your test device/simulator (with the "Play" button). Using the "Pause" button you can then debug the app and edit its code live. 
-
-Note: Before attempting to publish your app you should consider validating it using the [App validator](https://marketplace.firefox.com/developers/validator).
-
-## Publishing your app on the Firefox Marketplace
-
-You can submit your app to the Firefox Marketplace, or publish it yourself. Visit the [Firefox Marketplace Zone](https://developer.mozilla.org/en-US/Marketplace) on MDN to find out more about how to do this; [App publishing options](https://developer.mozilla.org/en-US/Marketplace/Publishing/Publish_options) is the best place to start.
-

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/28d8c235/www/docs/en/6.x/guide/platforms/index.md
----------------------------------------------------------------------
diff --git a/www/docs/en/6.x/guide/platforms/index.md b/www/docs/en/6.x/guide/platforms/index.md
deleted file mode 100644
index 7eb4abf..0000000
--- a/www/docs/en/6.x/guide/platforms/index.md
+++ /dev/null
@@ -1,102 +0,0 @@
----
-license: >
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
-
-title: Platform Guides
----
-
-# Platform Guides
-
-Before developing for any of the platforms listed below, install
-cordova's command-line interface (CLI).
-(For details, see [The Command-Line Interface](../cli/index.html).)
-
-To develop Cordova applications, you must install SDKs for each mobile
-platform you are targeting. This installation is necessary regardless
-of whether you do the majority of your work in the SDK or use the CLI
-for your build cycle.
-
-Each _Platform Guide_ listed below tells you what you need to know to
-set up each platform's development environment: where to obtain the
-SDK, how to set up device emulators, how to connect devices for direct
-testing, and how to manage signing key requirements.  Additional
-guides provide information on each platform's unique set of
-configuration options, instructions to add plugins, how to upgrade
-each platform, and platform-specific command-line tools that serve as
-a lower-level alternative to the `cordova` command-line utility.
-
-## Amazon Fire OS
-
-* [Amazon Fire OS Platform Guide](amazonfireos/index.html)
-* [Amazon Fire OS Configuration](amazonfireos/config.html)
-* [Amazon Fire OS WebViews](amazonfireos/webview.html)
-* [Amazon Fire OS Plugins](amazonfireos/plugin.html)
-
-## Android
-
-* [Android Platform Guide](android/index.html)
-* [Android Shell Tool Guide](android/tools.html)
-* [Android Configuration](android/config.html)
-* [Android Plugins](android/plugin.html)
-* [Android WebViews](android/webview.html)
-* [Upgrading Android](android/upgrade.html)
-* [Android Lifecycle Guide](android/lifecycle.html)
-
-## BlackBerry 10
-
-* [BlackBerry 10 Platform Guide](blackberry10/index.html)
-* [BlackBerry 10 Shell Tool Guide](blackberry10/tools.html)
-* [BlackBerry 10 Configuration](blackberry10/config.html)
-* [BlackBerry 10 Plugins](blackberry10/plugin.html)
-* [Upgrading BlackBerry](blackberry/upgrade.html) 10
-
-## Firefox OS
-
-* [Firefox OS Platform Guide](firefoxos/index.html)
-
-## iOS
-
-* [iOS Platform Guide](ios/index.html)
-* [iOS Shell Tool Guide](ios/tools.html)
-* [iOS Configuration](ios/config.html)
-* [iOS Plugins](ios/plugin.html)
-* [iOS WebViews](ios/webview.html)
-* [Upgrading iOS](ios/upgrade.html)
-
-## Ubuntu
-
-* [Ubuntu Platform Guide](ubuntu/index.html)
-
-## Windows Phone 8
-
-* [Windows Phone 8 Platform Guide](wp8/index.html)
-* [Windows Phone 8 Plugins](wp8/plugin.html)
-* [Upgrading Windows Phone 8](wp8/upgrade.html)
-
-## Windows
-
-* [Windows Platform Guide](win8/index.html)
-* [Windows Plugins](win8/plugin.html)
-* [Windows Packaging](win8/packaging.html)
-* [Upgrading Windows 8](win8/upgrade.html)
-
-## OS X
-
-* [OS X Platform Guide](osx/index.html)
-* [OS X Configuration](osx/config.html)
-* [OS X Plugins](osx/plugin.html)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/28d8c235/www/docs/en/6.x/guide/platforms/ios/config.md
----------------------------------------------------------------------
diff --git a/www/docs/en/6.x/guide/platforms/ios/config.md b/www/docs/en/6.x/guide/platforms/ios/config.md
deleted file mode 100644
index d316d0d..0000000
--- a/www/docs/en/6.x/guide/platforms/ios/config.md
+++ /dev/null
@@ -1,173 +0,0 @@
----
-license: >
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
-
-title: iOS Configuration
----
-
-# iOS Configuration
-
-The `config.xml` file controls an app's basic settings that apply
-across each application and CordovaWebView instance. This section
-details preferences that only apply to iOS builds. See [The config.xml
-File](config_ref_index.md.html#The%20config.xml%20File) for information on global configuration options.
-
-- `EnableViewportScale` (boolean, defaults to `false`): Set to `true`
-  to allow a viewport meta tag to either disable or restrict the range
-  of user scaling, which is enabled by default.
-
-        <preference name="EnableViewportScale" value="true"/>
-
-  Place a viewport such as the following in the HTML to disable
-  scaling and fit content flexibly within the rendering WebView:
-
-        <meta name='viewport' content='width=device-width, initial-scale=1, user-scalable=no' />
-
-- `MediaPlaybackAllowsAirPlay` (boolean, defaults to `true`):
-  Set to `false` to prevent Air Play from being used in this view. Available in default UIWebView and WKWebView.
-
-        <preference name="MediaPlaybackAllowsAirPlay" value="false"/>
-
-- `MediaPlaybackRequiresUserAction` (boolean, defaults to `false`):
-  Set to `true` to prevent HTML5 videos or audios from playing
-  automatically with the `autoplay` attribute or via JavaScript.
-
-        <preference name="MediaPlaybackRequiresUserAction" value="true"/>
-
-- `AllowInlineMediaPlayback` (boolean, defaults to `false`): Set to
-  `true` to allow HTML5 media playback to appear _inline_ within the
-  screen layout, using browser-supplied controls rather than native
-  controls. For this to work, add the `webkit-playsinline` attribute
-  to any `<video>` elements.
-
-        <preference name="AllowInlineMediaPlayback" value="true"/>
-
-- `BackupWebStorage` (string, either `none`, `local`, or the default
-  `cloud`): Set to `cloud` to allow web storage data to backup via
-  iCloud. Set to `local` to allow only local backups via iTunes
-  sync. Set to `none` prevent web storage backups.
-
-        <preference name="BackupWebStorage" value="local"/>
-
-- `TopActivityIndicator` (string, defaults to `gray`): Controls the
-  appearance of the small spinning icon in the status bar that
-  indicates significant processor activity.  Valid values are
-  `whiteLarge`, `white`, and `gray`.
-
-        <preference name="TopActivityIndicator" value="white"/>
-
-- `KeyboardDisplayRequiresUserAction` (boolean, defaults to `true`):
-  Set to `false` to allow the keyboard to appear when calling
-  `focus()` on form inputs.
-
-        <preference name="KeyboardDisplayRequiresUserAction" value="false"/>
-
-- `SuppressesIncrementalRendering` (boolean, defaults to `false`): Set
-  to `true` to wait until all content has been received before it
-  renders to the screen.
-
-        <preference name="SuppressesIncrementalRendering" value="true"/>
-
-- `GapBetweenPages` (float, defaults to `0`): The size of the gap, in points, between pages.
-
-        <preference name="GapBetweenPages" value="0"/>
-
-- `PageLength` (float, defaults to `0`): The size of each page, in points, in the
-  direction that the pages flow. When PaginationMode is right to left or left to right,
-  this property represents the width of each page. When PaginationMode is topToBottom
-  or bottomToTop, this property represents the height of each page. The default value
-  is 0, which means the layout uses the size of the viewport to determine the dimensions
-  of the page.
-
-        <preference name="PageLength" value="0"/>
-
-- `PaginationBreakingMode` (string, defaults to `page`): Valid values are `page` and
-  `column`.The manner in which column- or page-breaking occurs. This property
-  determines whether certain CSS properties regarding column- and page-breaking are
-  honored or ignored. When this property is set to `column`,  the content respects
-  the CSS properties related to column-breaking in place of page-breaking.
-
-        <preference name="PaginationBreakingMode" value="page"/>
-
-- `PaginationMode` (string, defaults to `unpaginated`): Valid values are `unpaginated`,
-  `leftToRight`, `topToBottom`, `bottomToTop`, and `rightToLeft`. This property determines
-  whether content in the web view is broken up into pages that fill the view one screen
-  at a time, or shown as one long scrolling view. If set to a paginated form, this
-  property toggles a paginated layout on the content, causing the web view to use the
-  values of PageLength and GapBetweenPages to relayout its content.
-
-        <preference name="PaginationMode" value="unpaginated"/>
-
-- `UIWebViewDecelerationSpeed` (string, defaults to `normal`): Valid values are `normal`,
-  `fast`. This property controls the deceleration speed of momentum scrolling. `normal` is
-  the default speed for most native apps, and `fast` is the default for Mobile Safari.
-
-        <preference name="UIWebViewDecelerationSpeed" value="fast" />
-
-- `ErrorUrl` (string, not set by default):
-  If set, will display the referenced local page upon an error in the application.
-
-        <preference name="ErrorUrl" value="myErrorPage.html"/>
-
-- `OverrideUserAgent` (string, not set by default):
-  If set, the value will replace the old UserAgent of webview.
-  It is helpful to identify the request from app/browser when requesting remote pages.
-  Use with caution, this may causes compitiable issue with web servers.
-  For most cases, use AppendUserAgent instead.
-
-        <preference name="OverrideUserAgent" value="Mozilla/5.0 My Browser" />
-
-- `AppendUserAgent` (string, not set by default):
-  If set, the value will append to the end of old UserAgent of webview.
-  When using with OverrideUserAgent, this value will be ignored.
-
-        <preference name="AppendUserAgent" value="My Browser" />
-
-- `target-device` (string, defaults to `universal`): Valid values are `handset`, `tablet`, `universal`
-  For targeting a specific device family.  This property maps directly to `TARGETED_DEVICE_FAMILY`
-  in the xcode project.
-  Note that if you target `universal` (which is the default) you will need to supply screen shots for
-  both iPhone and iPad or your app may be rejected.
-
-        <preference name="target-device" value="universal" />
-
-- `deployment-target` (string, not set by default):
-  This sets the `IPHONEOS_DEPLOYMENT_TARGET` in the build, which ultimately tranlsates to the `MinimumOSVersion` in the ipa.
-  For more details please refer to Apple's documentation on
-  [`Deployment Target Settings`](https://developer.apple.com/library/mac/documentation/DeveloperTools/Conceptual/cross_development/Configuring/configuring.html)
-
-        <preference name="deployment-target" value="7.0" />
-
-- `CordovaWebViewEngine` (string, defaults to 'CDVUIWebViewEngine'):
-  This sets the WebView engine plugin to be used to render the host app. The plugin must conform to the CDVWebViewEngineProtocol protocol. The 'value' here should match the 'feature' name of the WebView engine plugin that is installed. This preference usually would be set by the WebView engine plugin that is installed, automatically.
-
-        <preference name="CordovaWebViewEngine" value="CDVUIWebViewEngine" />
-
-- `SuppressesLongPressGesture` (boolean, defaults to `false`): Set to `true` to
-  avoid iOS9+ rendering a magnifying glass widget when the user longpresses the webview.
-  Test your app thoroughly since this may interfere with text selection capabilities.
-
-        <preference name="SuppressesLongPressGesture" value="true" />
-
-- `Suppresses3DTouchGesture` (boolean, defaults to `false`): Set to `true` to
-  avoid 3D Touch capable iOS devices rendering a magnifying glass widget when the user
-  applies force while longpressing the webview. Test your app thoroughly since this
-  disables `onclick` handlers, but plays nice with `ontouchend`.
-  If this setting is `true`, `SuppressesLongPressGesture` will effectively be `true` as well.
-
-        <preference name="Suppresses3DTouchGesture" value="true" />

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/28d8c235/www/docs/en/6.x/guide/platforms/ios/index.md
----------------------------------------------------------------------
diff --git a/www/docs/en/6.x/guide/platforms/ios/index.md b/www/docs/en/6.x/guide/platforms/ios/index.md
index 4aff843..e5ef751 100644
--- a/www/docs/en/6.x/guide/platforms/ios/index.md
+++ b/www/docs/en/6.x/guide/platforms/ios/index.md
@@ -23,45 +23,33 @@ title: iOS Platform Guide
 # iOS Platform Guide
 
 This guide shows how to set up your SDK development environment to
-deploy Cordova apps for iOS devices such as iPhone and iPad. See the
-following for more detailed platform-specific information:
-
-* [iOS Configuration](config.html)
-* [Upgrading iOS](upgrade.html)
-* [iOS WebViews](webview.html)
-* [iOS Plugins](plugin.html)
-* [iOS Shell Tool Guide](tools.html)
-
-The command-line tools above refer to versions prior to Cordova 3.0.
-See [The Command-Line Interface](../../cli/index.html) for information about the
-current interface.
+deploy Cordova apps for iOS devices such as iPhone and iPad, 
+and how to optionally use iOS-centered command-line tools in your 
+development workflow. You need to install the SDK tools regardless of 
+whether you want to use these platform-centered shell tools 
+or cross-platform Cordova CLI for development. For a comparison of the two 
+development paths, see the [Overview](../../overview/index.html#development-paths). 
+For details on the CLI, see [Cordova CLI Reference].  
 
 ## Requirements and Support
 
-Apple® tools required to build iOS applications run only on the OS X
+Apple® tools required to build iOS applications only run on the OS X
 operating system on Intel-based Macs. Xcode® 6.0 (the minimum required
 version) runs only on OS X version 10.9 (Mavericks) or greater, and
 includes the iOS 8 SDK (Software Development Kit).  To submit apps to
 the Apple App Store℠ requires the latest versions of the Apple tools.
 
-You can test many of the Cordova features using the iOS emulator
+You can test many of the Cordova features using the iOS simulator
 installed with the iOS SDK and Xcode, but you need an actual device to
 fully test all of the app's device features before submitting to the
 App Store.  The device must have at least iOS 6.x installed, the
 minimum iOS version supported as of Cordova 3.0.  Supporting devices
 include all iPad® models, iPhone® 3GS and above, and iPod® Touch 3rd
-Generation or later. To install apps onto a device, you must also be a
-member of Apple's
-[iOS Developer Program](https://developer.apple.com/programs/ios/),
-which costs $99 per year. This guide shows how to deploy apps to the
-iOS emulator, for which you don't need to register with the developer
-program.
+Generation or later. 
 
-The [ios-sim](https://www.npmjs.org/package/ios-sim) and 
-[ios-deploy](https://www.npmjs.org/package/ios-deploy) tools - allows you
-to launch iOS apps into the iOS Simulator and iOS Device from the command-line.
+## Installing the Requirements
 
-## Install the SDK
+### Xcode
 
 There are two ways to download Xcode:
 
@@ -72,56 +60,31 @@ There are two ways to download Xcode:
   which requires registration as an Apple Developer.
 
 Once Xcode is installed, several command-line tools need to be enabled
-for Cordova to run. From the __Xcode__ menu, select __Preferences__,
-then the __Downloads__ tab. From the __Components__ panel, press the
-__Install__ button next to the __Command Line Tools__ listing.
+for Cordova to run. From the command line, run: 
+``` xcode-select --install``` 
+
+### Deployment Tools
 
-## Install Deploy Tools
+The [ios-sim](https://www.npmjs.org/package/ios-sim) and 
+[ios-deploy](https://www.npmjs.org/package/ios-deploy) tools - allows you
+to launch iOS apps into the iOS Simulator and iOS Device from the command-line.
 
-Run from comman-line terminal:
+To install them, run the following from command-line terminal:
 
         $ npm install -g ios-sim
         $ npm install -g ios-deploy
 
-## Create a New Project
-
-Use the `cordova` utility to set up a new project, as described in The
-Cordova [The Command-Line Interface](../../cli/index.html). For example, in a source-code directory:
-
-        $ cordova create hello com.example.hello "HelloWorld"
-        $ cd hello
-        $ cordova platform add ios
-        $ cordova prepare              # or "cordova build"
-
-## Deploy the app
+## Project Configuration
 
-To deploy the app on a connected iOS device:
+Installing Xcode will mostly set everything needed to get started with the native side of things. 
+You should now be able to create and build a cordova project. 
+For more details on installing and using the CLI, refer to [Create your first app](../../cli/index.html) guide.
 
-        $ cordova run ios --device
-To deploy the app on a default iOS emulator:
+### Deploying to Simulator
 
-        $ cordova emulate ios
+To preview the app in the iOS simulator:
 
-You can use __cordova run ios --list__ to see all available targets and 
-__cordova run ios --target=target_name__ to run application on a specific 
-device or emulator (for example,  `cordova run ios --target="iPhone-6"`).
-
-You can also use __cordova run --help__ to see additional build and run
-options.
-
-## Open a Project in the SDK
-
-Once ios platform is added to your project, you can open it from 
-within Xcode. Double-click to open the `hello/platforms/ios/hello.xcodeproj`
-file. The screen should look like this:
-
-![]({{ site.baseurl }}/static/img/guide/platforms/ios/helloworld_project.png)
-
-## Deploy to Emulator
-
-To preview the app in the iOS emulator:
-
-1. Make sure the _.xcodeproj_ file is selected in the left panel.
+1. Open the project file from Xcode and make sure the _.xcodeproj_ file is selected in the left panel.
 
 2. Select the __hello__ app in the panel immediately to the right.
 
@@ -132,20 +95,20 @@ To preview the app in the iOS emulator:
 
 4. Press the __Run__ button that appears in the same toolbar to the
    left of the __Scheme__. That builds, deploys and runs the
-   application in the emulator. A separate emulator application opens
+   application in the simulator. A separate simulator application opens
    to display the app:
 
    ![]({{ site.baseurl }}/static/img/guide/platforms/ios/HelloWorldStandard.png)
 
-   Only one emulator may run at a time, so if you want to test the app
-   in a different emulator, you need to quit the emulator application
+   Only one simulator may run at a time, so if you want to test the app
+   in a different simulator, you need to quit the simulator application
    and run a different target within Xcode.
 
-Xcode comes bundled with emulators for the latest versions of iPhone
+Xcode comes bundled with simulators for the latest versions of iPhone
 and iPad. Older versions may be available from the __Xcode &rarr;
 Preferences &rarr; Downloads &rarr; Components__ panel.
 
-## Deploy to Device
+### Deploying to Device
 
 For details about various requirements to deploy to a device, refer
 to the _Launch Your App On Devices_ section of
@@ -153,15 +116,13 @@ Apple's
 [About App Distribution Workflows](https://developer.apple.com/library/prerelease/ios/documentation/IDEs/Conceptual/AppDistributionGuide/Introduction/Introduction.html).
 Briefly, you need to do the following before deploying:
 
-1. Join the Apple iOS Developer Program.
-
-2. Create a _Provisioning Profile_ within the
+1. Create a _Provisioning Profile_ within the
    [iOS Provisioning Portal](https://developer.apple.com/ios/manage/overview/index.action).
    You can use its _Development Provisioning Assistant_ to create and
    install the profile and certificate Xcode requires.
 
-3. Verify that the _Code Signing_ section's _Code Signing Identity_
-   within the project settings is set to your provisioning profile
+2. Verify that the _Code Signing Identity_ setting within the _Code Signing_ section
+   within the build settings is set to your provisioning profile
    name.
 
 To deploy to the device:
@@ -178,86 +139,114 @@ To deploy to the device:
 4. Press the __Run__ button to build, deploy and run the application
    on your device.
 
-## Common Problems
+## Signing an App
+
+First, you should read through the [Code Signing Support Page](https://developer.apple.com/support/code-signing/) 
+and the [App Distribution Workflows](https://developer.apple.com/library/prerelease/ios/documentation/IDEs/Conceptual/AppDistributionGuide/Introduction/Introduction.html).
+
+### Using Flags
 
-__Deprecation Warnings__: When an application programming interface
-(API) is changed or replaced by another API, it is marked as
-_deprecated_.  The API still works in the near term, but is eventually
-removed.  Some of these deprecated interfaces are reflected in Apache
-Cordova, and Xcode issues warnings about them when you build and
-deploy an application.
+To sign an app, you need the following parameters:
 
-Xcode's warning about the `invokeString` method concerns functionality
-that launches an app from a custom URL. While the mechanism to load
-from a custom URL has changed, this code is still present to provide
-backwards functionality for apps created with older versions of
-Cordova.  The sample app does not use this functionality, so these
-warnings can be ignored.  To prevent these warnings from appearing,
-remove the code that references the deprecated invokeString API:
+| Parameter                | Flag                     | Description
+|--------------------------|--------------------------|-----------------------------------
+| Code Sign Identity       | `--codeSignIdentity`     | Code signing identity to use for signing. It can be created with Xcode and added to your keychain.
+| Provisioning Profile     | `--provisioningProfile`  | GUID of the provisioning profile to be used for signing. It is copied here on your Mac: ```~/Library/MobileDevice/Provisioning\ Profiles/```. Opening it in a text editor, you can find the GUID which needs to be specified here.
+| Code Sign Resource Rules | `--codesignResourceRules`| (Optional) Used to control which files in a bundle should be sealed by a code signature. For more details, read [The OS X Code Signing In Depth article](https://developer.apple.com/library/mac/technotes/tn2206/_index.html#//apple_ref/doc/uid/DTS40007919-CH1-TNTAG206) 
 
-* Edit the _Classes/MainViewController.m_ file, surround the following
-  block of code with `/*` and `*/` comments as shown below, then type
-  __Command-s__ to save the file:
+### Using build.json
 
-        (void)webViewDidFinishLoad:(UIWebView*)theWebView
-        {
-        // only valid if ___PROJECTNAME__-Info.plist specifies a protocol to handle
-        /*
-        if (self.invokeString) {
-          // this is passed before the deviceready event is fired, so you can access it in js when you receive deviceready
-          NSLog(@"DEPRECATED: window.invokeString - use the window.handleOpenURL(url) function instead, which is always called when the app is launched through a custom scheme url.");
-          NSString* jsString = [NSString stringWithFormat:@"var invokeString = \"%@\";", self.invokeString];
-          [theWebView stringByEvaluatingJavaScriptFromString:jsString];
-        }
-        */
-        // Black base color for background matches the native apps
-        theWebView.backgroundColor = [UIColor blackColor];
+Alternatively, you could specify them in a build configuration file (`build.json`)
+using the `--buildConfig` argument to the same commands. Here's a sample of a
+build configuration file:
 
-        return [super webViewDidFinishLoad:theWebView];
-        }
+    {
+         "ios": {
+             "debug": {
+                 "codeSignIdentity": "iPhone Development",
+                 "provisioningProfile": "926c2bd6-8de9-4c2f-8407-1016d2d12954"
+             },
+             "release": {
+                 "codeSignIdentity": "iPhone Distribution",
+                 "provisioningProfile": "70f699ad-faf1-4adE-8fea-9d84738fb306"
+             }
+         }
+    }
+    
+### Using xcrun
 
-* Edit the _Classes/AppViewDelegate.m_ file, comment out the following
-  line by inserting a double slash as shown below, then type
-  __Command-s__ to save the file:
+You can also sign from the command line using the following command:
 
-        //self.viewController.invokeString = invokeString;
+```
+    xcrun -sdk iphoneos PackageApplication -v /home/user/app/build/device/MyApp.app -o /home/user/app/build/device/MyApp.ipa --sign "iPhone Development" --embed "7151ab45-6085-4ea1-9bcd-022b5cebe44b"
+```
 
-* Press __Command-b__ to rebuild the project and eliminate the warnings.
+## Debugging
 
-<!-- Does this fix only last until the next "cordova prepare"? -->
+For details on the debugging tools that come with Xcode, see this [article](https://developer.apple.com/support/debugging)
+and this [video](https://developer.apple.com/videos/play/wwdc2014-413/).
+
+### Open a Project within Xcode
+
+Cordova for iOS projects can be opened in Xcode. This can be useful if 
+you wish to use Xcode built in debugging/profiling tools or if you are
+developing iOS plugins. Please note that when opening your project in Xcode, 
+it is recommended that you do NOT edit your code in the IDE. This will edit the code 
+in the ```platforms``` folder of your project (not ```www```), and changes are liable to be overwritten. 
+Instead, edit the ```www``` folder and copy over your changes by running ```cordova build```.
+
+Plugin developers wishing to edit their native code in the IDE should use the ```--link``` flag when adding their 
+plugin to the project via cordova plugin add. This will link the files so that changes to the plugin files in the 
+platforms folder are reflected in your plugin's source folder (and vice versa).
+
+Once the ios platform is added to your project and built using ```cordova build```, you can open it from 
+within Xcode. Double-click to open the `${PROJECT_NAME}/platforms/ios/${PROJECT_NAME}.xcodeproj`
+file. The screen should look like this:
+
+![]({{ site.baseurl }}/static/img/guide/platforms/ios/helloworld_project.png)
 
-__Missing Headers__: Compilation errors relating to missing headers
-result from problems with the build location, and can be fixed 
-via Xcode preferences:
+## Platform Centered Workflow
 
-1. Select __Xcode &rarr; Preferences &rarr; Locations__.
+cordova-ios includes a number of scripts that allow the platform to be used
+without the full Cordova CLI. This development path may offer you a greater
+range of development options in certain situations than the cross-platform cordova CLI.
+For example, you need to use shell tools when deploying a custom
+Cordova WebView alongside native components. Before using this
+development path, you must still configure the SDK environment
+as described in [Requirements and Support](#link-requirements-and-support)
+above.
 
-2. In the __Derived Data__ section, press the __Advanced__ button and
-   select __Unique__ as the __Build Location__ as shown here:
+For each of the scripts discussed below, refer to
+ [Cordova CLI Reference](../../../cordova-cli/index.html) for more information on their
+arguments and usage. Each script has a name that matches the corresponding CLI
+command. For example, `cordova-ios/bin/create` is equivalent to
+`cordova create`.
 
-   ![]({{ site.baseurl }}/static/img/guide/platforms/ios/xcode_build_location.png)
+To get started, either download the cordova-ios package from
+[npm](https://www.npmjs.com/package/cordova-ios) or
+[Github](https://github.com/apache/cordova-ios).
 
-This is the default setting for a new Xcode install, but it may be set
-differently following an upgrade from an older version of Xcode.
+To create a project using this package, run the `create` script in the `bin`
+folder:
 
-For further information, consult Apple's documentation:
+    $ cordova-ios/bin/create ...
+    
+To run the app, use the `run` script in the `bin` folder:
 
-*  [Start Developing iOS Apps Today](http://developer.apple.com/library/ios/#referencelibrary/GettingStarted/RoadMapiOS/index.html#//apple_ref/doc/uid/TP40011343) provides a quick overview of steps for developing iOS Apps.
+    $ cordova-ios/bin/run 
 
-* [Member Center home page](https://developer.apple.com/membercenter/index.action)
-   provides links to several iOS technical resources including
-   technical resources, the provisioning portal, distribution guides
-   and community forums.
+The created project will have a folder named `cordova` inside that contains
+scripts for the project-specific Cordova commands (e.g. `run`, `build`, etc.).
+Additionally, The project will feature a structure different from that of a
+normal Cordova project. Notably, `/www` is moved to `/assets/www`.
 
-* [Tools Workflow Guide for iOS](http://developer.apple.com/library/ios/#documentation/Xcode/Conceptual/ios_development_workflow/00-About_the_iOS_Application_Development_Workflow/introduction.html#//apple_ref/doc/uid/TP40007959)
+To install plugins in this project, use the [Cordova Plugman Utility](../../../plugin_ref/plugman.html).
 
-* [Xcode User Guide](http://developer.apple.com/library/ios/#documentation/ToolsLanguages/Conceptual/Xcode4UserGuide/000-About_Xcode/about.html#//apple_ref/doc/uid/TP40010215)
+## Upgrading
 
-* [Session Videos](https://developer.apple.com/videos/wwdc/2012/) from
-  the Apple World Wide Developer Conference 2012 (WWDC2012)
+Refer to [this](./upgrade.html) article for instructions to upgrade your ```cordova-ios``` version.
 
-* The [xcode-select command](http://developer.apple.com/library/mac/#documentation/Darwin/Reference/ManPages/man1/xcode-select.1.html),
-  which helps specify the correct version of Xcode if more than one is installed.
 
 (Mac®, OS X®, Apple®, Xcode®, App Store℠, iPad®, iPhone®, iPod® and  Finder® are Trademarks of Apple Inc.)
 
+ [Cordova CLI Reference]:(../../../cordova-cli/index.html)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/28d8c235/www/docs/en/6.x/guide/platforms/ios/plugin.md
----------------------------------------------------------------------
diff --git a/www/docs/en/6.x/guide/platforms/ios/plugin.md b/www/docs/en/6.x/guide/platforms/ios/plugin.md
index bb318f5..9dcc255 100644
--- a/www/docs/en/6.x/guide/platforms/ios/plugin.md
+++ b/www/docs/en/6.x/guide/platforms/ios/plugin.md
@@ -17,13 +17,13 @@ license: >
     specific language governing permissions and limitations
     under the License.
 
-title: iOS Plugins
+title: iOS Plugin Development Guide
 ---
 
-# iOS Plugins
+# iOS Plugin Development Guide
 
 This section provides details for how to implement native plugin code
-on the iOS platform. Before reading this, see Application Plugins for
+on the iOS platform. Before reading this, see [Plugin Development Guide][plugin-dev] for
 an overview of the plugin's structure and its common JavaScript
 interface. This section continues to demonstrate the sample _echo_
 plugin that communicates from the Cordova webview to the native
@@ -48,8 +48,7 @@ the arguments passed in the `args` array.
 
 Specify the plugin as a `<feature>` tag in your Cordova-iOS
 application's project's `config.xml` file, using the `plugin.xml` file
-to inject this markup automatically, as described in Application
-Plugins:
+to inject this markup automatically, as described in [Plugin Development Guide][plugin-dev]:
 
         <feature name="LocalStorage">
             <param name="ios-package" value="CDVLocalStorage" />
@@ -65,22 +64,22 @@ able to access it.
 ## Plugin Initialization and Lifetime
 
 One instance of a plugin object is created for the life of each
-`UIWebView`. Plugins are ordinarily instantiated when first referenced
-by a call from JavaScript. Otherwise they can be instantiated by
-setting a `param` named `onload` to `true` in the `config.xml` file:
+`UIWebView`. Plugins are not instantiated until they are first
+referenced by a call from JavaScript, unless `<param>` with an `onload`
+`name` attribute is set to `"true"` in `config.xml`. For example,
 
         <feature name="Echo">
             <param name="ios-package" value="Echo" />
             <param name="onload" value="true" />
         </feature>
 
-There is _no_ designated initializer for plugins. Instead, plugins
-should use the `pluginInitialize` method for their startup logic.
+Plugins should use the `pluginInitialize` method for their startup logic.
 
-Plugins with long-running requests, background activity such as media
-playback, listeners, or that maintain internal state should implement
-the `onReset` method to clean up those activities. The method runs
-when the `UIWebView` navigates to a new page or refreshes, which
+Plugins with long-running requests or background activities such as media
+playback, listeners, or that maintain internal state should implement 
+the `onReset` method to cancel those long-running requests or to clean up 
+after those activities.
+The method runs when the `UIWebView` navigates to a new page or refreshes, which
 reloads the JavaScript.
 
 ## Writing an iOS Cordova Plugin
@@ -154,7 +153,7 @@ Then we would add the following `Echo.h` and `Echo.m` files to the
 
         /********* Echo.h Cordova Plugin Header *******/
 
-        #import <Cordova/CDV.h>
+        #import <Cordova/CDVPlugin.h>
 
         @interface Echo : CDVPlugin
 
@@ -165,7 +164,7 @@ Then we would add the following `Echo.h` and `Echo.m` files to the
         /********* Echo.m Cordova Plugin Implementation *******/
 
         #import "Echo.h"
-        #import <Cordova/CDV.h>
+        #import <Cordova/CDVPlugin.h>
 
         @implementation Echo
 
@@ -203,7 +202,7 @@ success callback is called, it passes in the `echo` parameter.
 ## iOS Integration
 
 The `CDVPlugin` class features other methods that your plugin can
-override.  For example, you can capture the `[pause](../../../cordova/events/events.pause.html)`, `[resume](../../../cordova/events/events.resume.html)`, app
+override.  For example, you can capture the [pause][PauseEvent], [resume][ResumeEvent], app
 terminate and `handleOpenURL` events. See the
 [CDVPlugin.h][CDVPlugin.h] and [CDVPlugin.m][CDVPlugin.m]
 classes for guidance.
@@ -230,10 +229,7 @@ example:
 ## Debugging iOS Plugins
 
 To debug on the Objective-C side, you need Xcode's built-in debugger.
-For JavaScript, on iOS 5.0 or greater you can use [Weinre, an Apache Cordova
-Project](https://github.com/apache/cordova-weinre) or [iWebInspector,
-a third-party utility](http://www.iwebinspector.com/).  For iOS 8, you
-can attach Safari 8.0 to the app running within the iOS 8 Simulator.
+For JavaScript, you can attach Safari to the app running within the iOS Simulator/Device.
 
 ## Common Pitfalls
 
@@ -248,4 +244,6 @@ can attach Safari 8.0 to the app running within the iOS 8 Simulator.
 [CDVPluginResult.h]: https://github.com/apache/cordova-ios/blob/master/CordovaLib/Classes/Public/CDVPluginResult.h
 [CDVCommandDelegate.h]: https://github.com/apache/cordova-ios/blob/master/CordovaLib/Classes/Public/CDVCommandDelegate.h
 [CDVPlugin.h]: https://github.com/apache/cordova-ios/blob/master/CordovaLib/Classes/Public/CDVPlugin.h
-[CDVPlugin.m]: https://github.com/apache/cordova-ios/blob/master/CordovaLib/Classes/Public/CDVPlugin.m
\ No newline at end of file
+[CDVPlugin.m]: https://github.com/apache/cordova-ios/blob/master/CordovaLib/Classes/Public/CDVPlugin.m
+[ResumeEvent]: ../../../cordova/events/events.html#resume
+[PauseEvent]: ../../../cordova/events/events.html#pause

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/28d8c235/www/docs/en/6.x/guide/platforms/ios/tools.md
----------------------------------------------------------------------
diff --git a/www/docs/en/6.x/guide/platforms/ios/tools.md b/www/docs/en/6.x/guide/platforms/ios/tools.md
deleted file mode 100644
index bdefd58..0000000
--- a/www/docs/en/6.x/guide/platforms/ios/tools.md
+++ /dev/null
@@ -1,104 +0,0 @@
----
-license: >
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
-
-title: iOS Shell Tool Guide
----
-
-# iOS Shell Tool Guide
-
-This guide shows how to use Cordova's set of platform-centered shell
-tools to develop iOS apps. This development path, discussed in the
-[Overview](../../overview/index.html), may offer you a greater range of development options for iOS
-than the cross-platform CLI tool described in The Command-Line
-Interface.  For example, you need to use shell tools when deploying a
-custom Cordova WebView alongside native components. Before using
-either development path, you must first configure the SDK environment
-as described in the [iOS Platform Guide](index.html).  These tools rely upon
-Xcode's command-line tools such as `xcode-select` and `xcodebuild`.
-
-To enable shell tools for iOS, download Cordova from
-[cordova.apache.org](http://cordova.apache.org). The download contains
-separate archives for each platform. Expand each you wish to target,
-`ios` in this case. The relevant tools are typically available in the
-top-level `bin` directory, otherwise consult the __README__ file for
-more detailed directions.
-
-These tools allow you to create, build, and run iOS apps.  For
-information on the additional command-line interface that enables
-plugin features across all platforms, see Using Plugman to Manage
-Plugins. See Application Plugins for details on how to develop
-plugins.
-
-## Create a Project
-
-Run the `create` command, specifying the existing path to the project,
-the reverse-domain-style package identifier, and the app's display
-name.
-
-        $ ./path/to/cordova-ios/bin/create /path/to/my_new_project com.example.project_name ProjectName
-
-## Build a Project
-
-        $ /path/to/my_new_project/cordova/build
-
-## Run App on an Emulator
-
-        $ /path/to/my_new_project/cordova/run --emulator
-
-## Run App on a Device
-
-        $ /path/to/my_new_project/cordova/run --device
-
-## Signing the App
-
-You can learn more about signing, distributing iOS apps, creating a certificate and provisioning profile on the [iOS Developer Library](https://developer.apple.com/library/ios/documentation/IDEs/Conceptual/AppDistributionGuide/ConfiguringYourApp/ConfiguringYourApp.html).
-
-To sign the app in Cordova you need the following:
-
-* Code signing identity (`--codeSignIdentity`): [Using XCode](https://developer.apple.com/library/ios/documentation/IDEs/Conceptual/AppDistributionGuide/MaintainingCertificates/MaintainingCertificates.html#//apple_ref/doc/uid/TP40012582-CH31-SW6) you can create a new iOS signing identity and add it to your keychain. The type of of the code signing identity - typically distribution or development, needs to be specified here.
-
-* Provisioning profile (`--provisioningProfile`):  [Using the Apple Member Center](https://developer.apple.com/library/ios/documentation/IDEs/Conceptual/AppDistributionGuide/MaintainingProfiles/MaintainingProfiles.html#//apple_ref/doc/uid/TP40012582-CH30-SW61) you can create a provisioning profile. Download the provisioning profile onto your machine and launch it in XCode to register it. It is copied here on your Mac: ~/Library/MobileDevice/Provisioning\ Profiles/. Opening it in a text editor, you can find the UUID which needs to be specified here.
-
-* Code signing resource rules(`--codeSignResourceRules`) (Optional): Allows you to specify custom signing resource rules.
-
-These parameters can be specified using the command line arguments above to `build` or `run` scripts:
-
-        $ /path/to/my_new_project/cordova/build --codeSignIdentitiy="iPhone Distribtion" --provisioningProfile="926c2bd6-8de9-4c2f-8407-1016d2d12954" 
-
-Alternatively, you could specify them in a build configuration file (build.json) using (`--buildConfig`) argument. Here's a sample of a build configuration file:
-
-    {
-         "ios": {
-             "debug": {
-                 "codeSignIdentitiy": "iPhone Development",
-                 "provisioningProfile": "926c2bd6-8de9-4c2f-8407-1016d2d12954",
-             },
-             "release": {
-                 "codeSignIdentitiy": "iPhone Distribution"
-                 "provisioningProfile": "70f699ad-faf1-4adE-8fea-9d84738fb306",
-             }
-         }
-     }
-
-There is also support to mix and match command line arguments and parameters in build.json file. Values from the command line arguments will get precedence. 
-
-## Logging
-
-        $ /path/to/my_new_project/cordova/log
-

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/28d8c235/www/docs/en/6.x/guide/platforms/ios/upgrade.md
----------------------------------------------------------------------
diff --git a/www/docs/en/6.x/guide/platforms/ios/upgrade.md b/www/docs/en/6.x/guide/platforms/ios/upgrade.md
index 26026e0..c12150c 100644
--- a/www/docs/en/6.x/guide/platforms/ios/upgrade.md
+++ b/www/docs/en/6.x/guide/platforms/ios/upgrade.md
@@ -803,4 +803,4 @@ If you intend on using the Capture API, you will need the new __iPad retina-disp
 8. Add a new entry under `Plugins` in the `PhoneGap.plist` file. The
    key is `com.phonegap.battery` and the value is `PGBattery`.
 
-9. Integrate any project-specific code that you have in your backed-up `AppDelegate.h` and `AppDelegate.m` into the new AppDelegate files.
+9. Integrate any project-specific code that you have in your backed-up `AppDelegate.h` and `AppDelegate.m` into the new AppDelegate files.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/28d8c235/www/docs/en/6.x/guide/platforms/osx/config.md
----------------------------------------------------------------------
diff --git a/www/docs/en/6.x/guide/platforms/osx/config.md b/www/docs/en/6.x/guide/platforms/osx/config.md
new file mode 100644
index 0000000..9ff467c
--- /dev/null
+++ b/www/docs/en/6.x/guide/platforms/osx/config.md
@@ -0,0 +1,80 @@
+---
+license: >
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+title: OS X Configuration
+---
+
+# OS X Configuration
+
+The `config.xml` file controls an app's basic settings that apply
+across each application and CordovaWebView instance. This section
+details preferences that only apply to OS X builds. See [The config.xml
+File](config_ref_index.md.html#The%20config.xml%20File) for information on global configuration options.
+
+## Overview
+
+| Name | Default | Version |  Comment |
+|------|---------|---------|---------|
+| `HideMousePointer` |  _disabled_ |  4.0.0 | Sets the timeout for hiding the mouse pointer |
+| `OSXLocalStoragePath` |  `~/Library/Application Support/{bundle.id}`|  4.0.0 | Sets the local storage path |
+| `WindowSize` |  `auto`|  4.0.0 | Sets the size of the application window. |
+| `EnableWebGL` |  `false`|  4.0.0 | Enables WebGL on the web view. |
+
+
+## Details
+
+### HideMousePointer
+(integer, defaults to _disabled_)    
+Idle duration in seconds after which the mouse pointer should be hidden.
+Set it to `0` for immediate.
+
+Example: hide mouse pointer after 5 seconds:
+
+    <preference name="HideMousePointer" value="5"/>
+
+### OSXLocalStoragePath
+(string, defaults to `~/Library/Application Support/{bundle.id}`)    
+Sets the directory for the local storage path.
+
+Example: use custom path:
+
+    <preference name="OSXLocalStoragePath" value="~/.myapp/database"/>
+
+### WindowSize
+(string, defaults to `auto`)      
+Defines the size of the application window in the format `WxH` or the special values `auto` and
+`fullscreen`. The latter will open a borderless window spanning the entire desktop area. Please note,
+that this is different from the _normal_ OS X fullscreen mode, which would never span multiple displays.
+
+Example: set the window size to 800 x 400:
+
+    <preference name="WindowSize" value="800x400"/>
+
+> **Note**: The global cordova `fullscreen` preference is not supported.
+
+### EnableWebGL
+(boolean, defaults to `false`)    
+If set to `true` it enables WebGL on the webview. 
+
+Example: enable WebGL
+
+    <preference name="EnableWebGL" value="true" />
+    
+    
+

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/28d8c235/www/docs/en/6.x/guide/platforms/osx/index.md
----------------------------------------------------------------------
diff --git a/www/docs/en/6.x/guide/platforms/osx/index.md b/www/docs/en/6.x/guide/platforms/osx/index.md
new file mode 100644
index 0000000..3732c4e
--- /dev/null
+++ b/www/docs/en/6.x/guide/platforms/osx/index.md
@@ -0,0 +1,139 @@
+---
+license: >
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+title: OS X Platform Guide
+---
+
+# OS X Platform Guide
+
+This guide shows how to set up your SDK development environment to
+deploy Cordova apps for OS X computers. See the
+following for more detailed platform-specific information:
+
+* [OS X Configuration](config.html)
+* [OS X Plugins](plugin.html)
+
+The command-line tools above refer to versions prior to Cordova 3.0.
+See [The Command-Line Interface](../../cli/index.html) for information about the
+current interface.
+
+## Requirements and Support
+
+Apple® tools required to build OS X applications run only on the OS X
+operating system on Intel-based Macs. Xcode® 6.0 (the minimum required
+version) runs only on OS X version 10.9 (Mavericks) or greater, and
+includes the OS X SDK (Software Development Kit). To submit apps to
+the Apple App Store℠ requires the latest versions of the Apple tools.
+
+You can test all of the Cordova features using the XCode or any other
+IDE such as [JetBrain's AppCode](https://www.jetbrains.com/objc/), but 
+you need to use XCode to sign before submitting to the
+App Store. To sign the apps, you must also be a member of Apple's
+[OS X Developer Program](https://developer.apple.com/osx/).
+
+## Install the SDK
+
+There are two ways to download Xcode:
+
+* from the [App Store](https://itunes.apple.com/us/app/xcode/id497799835?mt=12),
+  available by searching for "Xcode" in the __App Store__ application.
+
+* from [Apple Developer Downloads](https://developer.apple.com/downloads/index.action),
+  which requires registration as an Apple Developer.
+
+Once Xcode is installed, several command-line tools need to be enabled
+for Cordova to run. From the __Xcode__ menu, select __Preferences__,
+then the __Downloads__ tab. From the __Components__ panel, press the
+__Install__ button next to the __Command Line Tools__ listing.
+
+## Create a New Project
+
+Use the `cordova` utility to set up a new project, as described in The
+Cordova [The Command-Line Interface](../../cli/index.html). For example, in a source-code directory:
+
+        $ cordova create hello com.example.hello "HelloWorld"
+        $ cd hello
+        $ cordova platform add osx
+        $ cordova prepare              # or "cordova build"
+
+## Run the app
+
+To run the app on your desktop:
+
+        $ cordova run
+
+And you should see a bordered window with the example app:
+
+![]({{ site.baseurl }}/static/img/guide/platforms/osx/helloworld_run.png)
+
+You can also use __cordova run --help__ to see additional build and run
+options.
+
+## Open a Project in the SDK
+
+Once osx platform is added to your project, you can open it from 
+within Xcode. Double-click to open the `hello/platforms/osx/HelloWorld.xcodeproj`
+file. The screen should look like this:
+
+![]({{ site.baseurl }}/static/img/guide/platforms/osx/helloworld_project.png)
+
+> **TIP**  
+> You can also use the `open` command to open the XCode project directly
+> from the command line:
+> ```
+> $ open platforms/osx/HelloWorld.xcodeproj
+> ```
+
+## Common Problems
+
+__Deprecation Warnings__: When an application programming interface
+(API) is changed or replaced by another API, it is marked as
+_deprecated_.  The API still works in the near term, but is eventually
+removed.  Some of these deprecated interfaces are reflected in Apache
+Cordova, and Xcode issues warnings about them when you build and
+deploy an application.
+
+__Missing Headers__: Compilation errors relating to missing headers
+result from problems with the build location, and can be fixed 
+via Xcode preferences:
+
+1. Select __Xcode &rarr; Preferences &rarr; Locations__.
+
+2. In the __Derived Data__ section, press the __Advanced__ button and
+   select __Unique__ as the __Build Location__ as shown here:
+
+   ![]({{ site.baseurl }}/static/img/guide/platforms/ios/xcode_build_location.png)
+
+This is the default setting for a new Xcode install, but it may be set
+differently following an upgrade from an older version of Xcode.
+
+For further information, consult Apple's documentation:
+
+* [Member Center home page](https://developer.apple.com/membercenter/index.action)
+   provides links to several OS X technical resources including
+   technical resources, the provisioning portal, distribution guides
+   and community forums.
+
+* [Xcode User Guide](http://developer.apple.com/library/ios/#documentation/ToolsLanguages/Conceptual/Xcode4UserGuide/000-About_Xcode/about.html#//apple_ref/doc/uid/TP40010215)
+
+* The [xcode-select command](http://developer.apple.com/library/mac/#documentation/Darwin/Reference/ManPages/man1/xcode-select.1.html),
+  which helps specify the correct version of Xcode if more than one is installed.
+
+(Mac®, OS X®, Apple®, Xcode®, App Store℠, iPad®, iPhone®, iPod® and  Finder® are Trademarks of Apple Inc.)
+

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/28d8c235/www/docs/en/6.x/guide/platforms/osx/plugin.md
----------------------------------------------------------------------
diff --git a/www/docs/en/6.x/guide/platforms/osx/plugin.md b/www/docs/en/6.x/guide/platforms/osx/plugin.md
new file mode 100644
index 0000000..d0eddb8
--- /dev/null
+++ b/www/docs/en/6.x/guide/platforms/osx/plugin.md
@@ -0,0 +1,27 @@
+---
+license: >
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+title: OS X Plugins
+---
+
+# OS X Plugins
+
+This section is not written yet.  
+Please refer to the [iOS Plugin Guide](../ios/plugin.html) that has many
+similarities to OS X.


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org


Mime
View raw message