Merged PR 6472: Resolved issues and bugs

Resolved issues and bugs

Author: serenaz

windows-apps-src/design/basics/navigate-between-two-pages.md

@@ -32,7 +32,7 @@ Learn how to use a frame and pages to enable basic peer-to-peer navigation in yo
     The solution is created, and the project files appear in **Solution Explorer**.
 5.  To run the program, choose **Debug** > **Start Debugging** from the menu, or press F5.
     A blank page is displayed.
-6.  Press Shift+F5 to stop debugging and return to Visual Studio.
+6.  To stop debugging and return to Visual Studio, exit the app, or click **Stop Debugging** from the menu.
 
 ## 2. Add basic pages
 
@@ -281,7 +281,7 @@ Here, we add a [**TextBlock**](https://msdn.microsoft.com/library/windows/apps/b
 </StackPanel>
 ```
 
-In the Page2.xaml code-behind file, override the `OnNavigatedTo` method with the following:
+In the Page2.xaml code-behind file, add the following to override the `OnNavigatedTo` method:
 
 ```csharp
 protected override void OnNavigatedTo(NavigationEventArgs e)

windows-apps-src/design/controls-and-patterns/navigationview.md

@@ -190,7 +190,9 @@ NavigationView has a built-in back button, which can be enabled with the followi
 
 The following is a simple example of how you can incorporate NavigationView into your app. 
 
-We demonstrate how to implement backwards navigation with NavigationView's back button. We also demonstrate localization of nav item content strings with `x:Uid`. For more information on localization, see [Localize strings in your UI](../../app-resources/localize-strings-ui-manifest.md).
+We demonstrate how to implement backwards navigation with NavigationView's back button. Note that to use NavigationView's back navigation properties, you'll need the [Windows 10 Insider Preview (introduced v10.0.17110.0)](https://www.microsoft.com/en-us/software-download/windowsinsiderpreviewSDK).
+
+We also demonstrate localization of nav item content strings with `x:Uid`. For more information on localization, see [Localize strings in your UI](../../app-resources/localize-strings-ui-manifest.md).
 
 ```xaml
 <Page
@@ -375,27 +377,33 @@ private void On_Navigated(object sender, NavigationEventArgs e)
 {
     NavView.IsBackEnabled = ContentFrame.CanGoBack;
 
-    Dictionary<Type, string> lookup = new Dictionary<Type, string>()
+    if (ContentFrame.SourcePageType == typeof(SettingsPage))
+    {
+        NavView.SelectedItem = NavView.SettingsItem as NavigationViewItem;
+    }
+    else 
     {
-        {typeof(HomePage), "home"},
-        {typeof(AppsPage), "apps"},
-        {typeof(GamesPage), "games"},
-        {typeof(MusicPage), "music"},
-        {typeof(MyContentPage), "content"}    
-    };
+        Dictionary<Type, string> lookup = new Dictionary<Type, string>()
+        {
+            {typeof(HomePage), "home"},
+            {typeof(AppsPage), "apps"},
+            {typeof(GamesPage), "games"},
+            {typeof(MusicPage), "music"},
+            {typeof(MyContentPage), "content"}    
+        };
 
-    String stringTag = lookup[ContentFrame.SourcePageType];
+        String stringTag = lookup[ContentFrame.SourcePageType];
 
-    // set the new SelectedItem  
-    foreach (NavigationViewItemBase item in NavView.MenuItems)
-    {
-        if (item is NavigationViewItem && item.Tag.Equals(stringTag))
+        // set the new SelectedItem  
+        foreach (NavigationViewItemBase item in NavView.MenuItems)
         {
-            NavView.SelectedItem = item;
-            item.IsSelected = true;
-            break;
-        }
-    }        
+            if (item is NavigationViewItem && item.Tag.Equals(stringTag))
+            {
+                item.IsSelected = true;
+                break;
+            }
+        }        
+    }
 }
 ```
 

windows-apps-src/design/controls-and-patterns/progress-controls.md

@@ -144,7 +144,7 @@ Both progress controls are rather simple; but some visual features of the contro
 **Sizing the ProgressRing**
 
 The ProgressRing can be sized as large as you want, but can only be as small as 20x20epx. In order to resize a ProgressRing, you must set its height and width. If only height or width are set, the control will assume minimum sizing (20x20epx) – conversely if the height and width are set to two different sizes, the smaller of the sizes will be assumed.
-To ensure your ProgressRing is correct for your needs, set bother the height and the width to the same value:
+To ensure your ProgressRing is correct for your needs, set both the height and the width to the same value:
 
 ```XAML
 <ProgressRing Height="100" Width="100"/>

windows-apps-src/design/controls-and-patterns/rating.md

@@ -1,7 +1,7 @@
 ---
 author: serenaz
-description: Enables users to rate content with touch, pen, mouse, gamepad and keyboard.
-title: Ratings Control
+description: Enables users to view and set ratings that reflect satisfaction with content and services. 
+title: Rating Control
 template: detail.hbs
 ms.author: sezhen
 ms.date: 10/25/2017
@@ -16,15 +16,13 @@ doc-status: Published
 ms.localizationpriority: medium
 ---
 
-# Ratings control
+# Rating control
 
-Allowing users to easily view and set ratings that reflect degrees of satisfaction with content and services is a critical app scenario.  The ratings control allows your users to do this with touch, pen, mouse, gamepad and keyboard. Use the ratings control to let your users rate movies, music and books with high quality interaction and animation. The ratings control has several great features that provide flexibility and customization.
+The rating control allows users to view and set ratings that reflect degrees of satisfaction with content and services. Users can interact with the rating control with touch, pen, mouse, gamepad or keyboard. The follow guidance shows how to use the rating control's features to provide flexibility and customization.
 
 > **Important APIs**: [RatingControl class](https://docs.microsoft.com/uwp/api/windows.ui.xaml.controls.ratingcontrol)
 
-![Example of Ratings Control](images/rating_rs2_doc_ratings_intro.png)
-
-In this article, we describe some key scenarios that the ratings control supports. Each scenario includes an example to provide context, and code that shows how to achieve the scenario.
+![Example of Rating Control](images/rating_rs2_doc_ratings_intro.png)
 
 ## Examples
 
@@ -44,7 +42,7 @@ In this article, we describe some key scenarios that the ratings control support
 
 ### Editable rating with placeholder value
 
-Perhaps the most common way to use the ratings control is to display an average rating while still allowing the user to enter their own rating value. In this scenario, the ratings control is initially set to reflect the average satisfaction rating of all users of a particular service or type of content (such as a music, videos, books, etc.). It remains in this state until a user interacts with the control with the goal of individually rating an item. This interaction changes the state of the ratings control to reflect the user's personal satisfaction rating.
+Perhaps the most common way to use the rating control is to display an average rating while still allowing the user to enter their own rating value. In this scenario, the rating control is initially set to reflect the average satisfaction rating of all users of a particular service or type of content (such as a music, videos, books, etc.). It remains in this state until a user interacts with the control with the goal of individually rating an item. This interaction changes the state of the ratings control to reflect the user's personal satisfaction rating.
 
 #### Initial average rating state
 ![Initial Average Rating State](images/rating_rs2_doc_movie_aggregate.png)
@@ -54,41 +52,40 @@ Perhaps the most common way to use the ratings control is to display an average
 ![Representation of User Rating Once Set](images/rating_rs2_doc_movie_user.png)
 
 ```XAML
-<RatingsControl x:Name="MyRatings" ValueChanged="RatingChanged"/>
+<RatingControl x:Name="MyRating" ValueChanged="RatingChanged"/>
 ```
 
 ```csharp
-private void RatingChanged(RatingsControl sender, object args)
+private void RatingChanged(RatingControl sender, object args)
 {
     if (sender.Value == null)
     {
-        MyRatings.Caption = "(" + SomeWebService.HowManyPreviousRatings() + ")";
+        MyRating.Caption = "(" + SomeWebService.HowManyPreviousRatings() + ")";
     }
 
     else
     {
-        MyRatings.Caption = "Your rating";
+        MyRating.Caption = "Your rating";
     }
 }
 ```
 
 ### Read-only rating mode
 
 Sometimes you need to show ratings of secondary content, such as that displayed in recommended content or when displaying a list of comments and their corresponding ratings. In this case, the user shouldn’t be able to edit the rating, so you can make the control read-only.
-The read only mode is also the recommended way of using the ratings control when it is used in very large virtualized lists of content, for both UI design and performance reasons.
-
+The read only mode is also the recommended way of using the rating control when it is used in very large virtualized lists of content, for both UI design and performance reasons.
 
 ![Read-Only Long List](images/rating_rs2_doc_reviews.png)
 
 To do this you would do the following:
 
 ```XAML
-<RatingsControl IsReadOnly="True"/>
+<RatingControl IsReadOnly="True"/>
 ```
 
 ## Additional functionality
 
-The ratings control has many additional features which can be used. Details for using these features can be found in our MSDN reference documentation.
+The rating control has many additional features which can be used. Details for using these features can be found in our MSDN reference documentation.
 Here is a non-comprehensive list of additional functionality:
 -   Great long list performance
 -   Compact sizing for tight UI scenarios

windows-apps-src/machine-learning/get-started.md

@@ -16,7 +16,7 @@ ms.localizationpriority: medium
 In this tutorial, we'll build a simple UWP app that uses a trained machine learning model to recognize a numeric digit drawn by the user. This tutorial primarily focuses on how to load and use Windows Machine Learning in your app.
 
 ## Prerequisites
-- [Windows SDK - Build 17110](https://www.microsoft.com/software-download/windowsinsiderpreviewSDK)
+- [Windows SDK - Build 17110](https://www.microsoft.com/en-us/software-download/windowsinsiderpreviewSDK)
 - [Visual Studio (Version 15.7 - Preview 1)](https://www.visualstudio.com/vs/preview/): Note that you'll need to check off the optional Windows 10 Preview SDK (10.0.17110.0) inside Visual Studio Installer.
 
 ## 1. Download the sample