Merge pull request #573 from NativeScript/ikoevska/post-111-fixes

Ikoevska/post 111 fixes

Author: ikoevska

CHANGELOG.md

@@ -5,13 +5,15 @@ NativeScript CLI Changelog
 ==
 
 ### New
-* [Implemented #551](https://github.com/NativeScript/nativescript-cli/issues/551): Add support for Android 5.1.1 (API Level 22). In case you have this SDK installed, it will be used as default when using `tns platform add android`.
-* [Implemented #552](https://github.com/NativeScript/nativescript-cli/issues/552): Add `--sdk` option to specify Android Target SDK. You can use `tns platform add android --sdk <API_LEVEL>` to target specific SDK.
+
+* [Implemented #551](https://github.com/NativeScript/nativescript-cli/issues/551): You can now develop for Android 5.1.1 (API Level 22). If you have this SDK installed on your system, the CLI will set it as the default target SDK when you run `$ tns platform add android`
+* [Implemented #552](https://github.com/NativeScript/nativescript-cli/issues/552): You can now set the target Android SDK for your project by specifying the `--sdk ` option for `$ tns platform add android` operations.
 
 ### Fixed
-* [Fixed #555](https://github.com/NativeScript/nativescript-cli/issues/555): Merging plugin's platform specific XMLs with project's platform specific XMLs is not working correctly in some cases.
-* [Fixed #567](https://github.com/NativeScript/nativescript-cli/issues/567): Npm support does not work.
-* [Fixed #569](https://github.com/NativeScript/nativescript-cli/issues/569): On some Windows systems, installation is showing errors in the output.
+
+* [Fixed #555](https://github.com/NativeScript/nativescript-cli/issues/555): In some cases, the CLI merges incorrectly the plugin platform-specific `AndroidManifest.xml` or `Info.plist` with the respective platform-specific configuration files from the project.
+* [Fixed #567](https://github.com/NativeScript/nativescript-cli/issues/567): You cannot use npm as a package manager inside your project.
+* [Fixed #569](https://github.com/NativeScript/nativescript-cli/issues/569): On some Windows systems, the CLI installation shows errors in the console.
 
 1.1.0 (2015, June 10)
 ==

docs/man_pages/project/configuration/platform-add.md

@@ -3,8 +3,8 @@ platform add
 
 Usage | Synopsis
 ------|-------
-Android latest runtime | `$ tns platform add android [--frameworkPath <File Path>] [--symlink] [--sdk <target sdk>]`
-Android selected runtime | `$ tns platform add android[@<Version>] [--frameworkPath <File Path>] [--symlink] [--sdk <target sdk>]`
+Android latest runtime | `$ tns platform add android [--frameworkPath <File Path>] [--symlink] [--sdk <API Level>]`
+Android selected runtime | `$ tns platform add android[@<Version>] [--frameworkPath <File Path>] [--symlink] [--sdk <API Level>]`
 <% if (isMacOS) { %>iOS latest runtime | `$ tns platform add ios [--frameworkPath <File Path>] [--symlink]`
 iOS selected runtime | `$ tns platform add ios[@<Version>] [--frameworkPath <File Path>] [--symlink]`<% } %>
 
@@ -13,15 +13,16 @@ Configures the current project to target the selected platform. <% if(isHtml) {
 ### Options
 * `--frameworkPath` - Sets the path to a NativeScript runtime for the specified platform that you want to use instead of the default runtime. If `--symlink` is specified, `<File Path>` must point to directory in which the runtime is already extracted. If `--symlink` is not specified, `<File Path>` must point to a valid npm package. 
 * `--symlink` - Creates a symlink to a NativeScript runtime for the specified platform that you want to use instead of the default runtime. If `--frameworkPath` is specified, creates a symlink to the specified directory. If `--frameworkPath` is not specified, creates a symlink to platform runtime installed with your current version of NativeScript.
-* `--sdk` - Sets the Android target SDK. The value should be a valid Android API Level, for example 17, 19, MNC.
+* `--sdk` - Sets the target Android SDK for the project.
 
 ### Attributes
+* `<API Level>` is a valid Android API level. For example: 17, 19, MNC.<% if(isHtml) { %> For a complete list of the Android API levels and their corresponding Android versions, click [here](http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#platform).<% } %>
 * `<File Path>` is the complete path to a valid npm package or a directory that contains a NativeScript runtime for the selected platform.
 * `<Version>` is any available version of the respective platform runtime published in npm. <% if(isHtml) { %>If `@<Version>` is not specified, the NativeScript CLI installs the latest stable runtime for the selected platform.  
 To list all available versions for Android, run `$ npm view tns-android versions`  
-To list only experimental versions for android, run `$ npm view tns-android dist-tags`  
+To list only experimental versions for Android, run `$ npm view tns-android dist-tags`  
 To list all available versions for iOS, run `$ npm view tns-ios versions`  
-To list only experimental versions for ios, run `$ npm view tns-ios dist-tags` 
+To list only experimental versions for iOS, run `$ npm view tns-ios dist-tags`  
 
 ### Command Limitations