From d6659c0e75cd8b8a18130691db6906c35de5ce33 Mon Sep 17 00:00:00 2001
From: CanHua Li <canli@microsoft.com>
Date: Mon, 11 Mar 2019 16:26:14 -0700
Subject: [PATCH 1/7] Add PaneTitle to NavigationViewTemplateSettings

---
 .../PaneTitle.md                              | 47 +++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 active/NavigationView/NavigationViewTemplateSettings/PaneTitle.md

diff --git a/active/NavigationView/NavigationViewTemplateSettings/PaneTitle.md b/active/NavigationView/NavigationViewTemplateSettings/PaneTitle.md
new file mode 100644
index 000000000..d85934f65
--- /dev/null
+++ b/active/NavigationView/NavigationViewTemplateSettings/PaneTitle.md
@@ -0,0 +1,47 @@
+# Background
+PaneTitle is added to NavigationView in RS4, but it's a String. Since RS5, we introduced PaneHeader(UIElement) to deprecate PaneTitle. If both PaneTitle and PaneHeader are provided by customer, PaneHeader is used.
+
+This API update addes PaneTitle [Template-Settings](https://docs.microsoft.com/en-us/windows/uwp/xaml-platform/template-settings-classes) to the NavigationView control.
+
+# Description
+Provides calculated PaneTitle that can be referenced as TemplatedParent sources when defining templates for a NavigatiionView control. Not intended for general use.
+
+# Examples
+
+```
+[WUXC_VERSION_RS5]
+[webhosthidden]
+unsealed runtimeclass NavigationViewTemplateSettings : Windows.UI.Xaml.DependencyObject
+{
+    ...
+
+    [WUXC_VERSION_MUXONLY]
+    {
+        String PaneTitle{ get; };
+        static Windows.UI.Xaml.DependencyProperty PaneTitleProperty{ get; };
+    }
+}
+```
+
+# Remarks
+This is intended for use in the style of the `NavigationView` control. Sample usage:
+
+```xaml
+    <Style TargetType="local:NavigationView">
+ ...
+                                    <TextBlock
+                                        x:Name="PaneTitleTextBlock" 
+                                        Grid.Column="0"
+                                        Text="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.PaneTitle}"
+                                        HorizontalAlignment="Left"
+                                        VerticalAlignment="Center"
+                                        Style="{StaticResource NavigationViewItemHeaderTextStyle}"/>
+```
+
+# API Notes
+
+## Class: NavigationViewTemplateSettings 
+| Member Name | Description |
+|:- |:--|
+| PaneTitle | The NavigationView.PaneTitle displayed in the control. Empty when NavigationView.PaneHeader is set, |
+

From c31fb326646def948d79605669a49e2e30ff0286 Mon Sep 17 00:00:00 2001
From: Jevan Saks <jevansa@microsoft.com>
Date: Tue, 12 Mar 2019 09:50:19 -0700
Subject: [PATCH 2/7] Update
 active/NavigationView/NavigationViewTemplateSettings/PaneTitle.md

Co-Authored-By: licanhua <canli@microsoft.com>
---
 .../NavigationView/NavigationViewTemplateSettings/PaneTitle.md   | 1 -
 1 file changed, 1 deletion(-)

diff --git a/active/NavigationView/NavigationViewTemplateSettings/PaneTitle.md b/active/NavigationView/NavigationViewTemplateSettings/PaneTitle.md
index d85934f65..f7c77a0a1 100644
--- a/active/NavigationView/NavigationViewTemplateSettings/PaneTitle.md
+++ b/active/NavigationView/NavigationViewTemplateSettings/PaneTitle.md
@@ -9,7 +9,6 @@ Provides calculated PaneTitle that can be referenced as TemplatedParent sources
 # Examples
 
 ```
-[WUXC_VERSION_RS5]
 [webhosthidden]
 unsealed runtimeclass NavigationViewTemplateSettings : Windows.UI.Xaml.DependencyObject
 {

From 435c55e9959264c21809181eb5bf32d8f4648d1b Mon Sep 17 00:00:00 2001
From: Canhua Li <canli@microsoft.com>
Date: Tue, 12 Mar 2019 09:51:20 -0700
Subject: [PATCH 3/7] Update
 active/NavigationView/NavigationViewTemplateSettings/PaneTitle.md

---
 .../NavigationView/NavigationViewTemplateSettings/PaneTitle.md  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/active/NavigationView/NavigationViewTemplateSettings/PaneTitle.md b/active/NavigationView/NavigationViewTemplateSettings/PaneTitle.md
index f7c77a0a1..6b9ad2f5a 100644
--- a/active/NavigationView/NavigationViewTemplateSettings/PaneTitle.md
+++ b/active/NavigationView/NavigationViewTemplateSettings/PaneTitle.md
@@ -42,5 +42,5 @@ This is intended for use in the style of the `NavigationView` control. Sample us
 ## Class: NavigationViewTemplateSettings 
 | Member Name | Description |
 |:- |:--|
-| PaneTitle | The NavigationView.PaneTitle displayed in the control. Empty when NavigationView.PaneHeader is set, |
+| PaneTitle | The NavigationView.PaneTitle displayed in the control. Empty when NavigationView.PaneHeader is set |
 

From 37e74e1dc779f686f3244ebf54f66f26340f52b2 Mon Sep 17 00:00:00 2001
From: Jevan Saks <jevansa@microsoft.com>
Date: Tue, 12 Mar 2019 09:52:41 -0700
Subject: [PATCH 4/7] Update
 active/NavigationView/NavigationViewTemplateSettings/PaneTitle.md

Co-Authored-By: licanhua <canli@microsoft.com>
---
 .../NavigationView/NavigationViewTemplateSettings/PaneTitle.md   | 1 -
 1 file changed, 1 deletion(-)

diff --git a/active/NavigationView/NavigationViewTemplateSettings/PaneTitle.md b/active/NavigationView/NavigationViewTemplateSettings/PaneTitle.md
index 6b9ad2f5a..4e16fd470 100644
--- a/active/NavigationView/NavigationViewTemplateSettings/PaneTitle.md
+++ b/active/NavigationView/NavigationViewTemplateSettings/PaneTitle.md
@@ -14,7 +14,6 @@ unsealed runtimeclass NavigationViewTemplateSettings : Windows.UI.Xaml.Dependenc
 {
     ...
 
-    [WUXC_VERSION_MUXONLY]
     {
         String PaneTitle{ get; };
         static Windows.UI.Xaml.DependencyProperty PaneTitleProperty{ get; };

From 7255b195ecd6ee8c96ac825714de2f1148c0fde6 Mon Sep 17 00:00:00 2001
From: Canhua Li <canli@microsoft.com>
Date: Tue, 12 Mar 2019 09:53:16 -0700
Subject: [PATCH 5/7] Update
 active/NavigationView/NavigationViewTemplateSettings/PaneTitle.md

---
 .../NavigationView/NavigationViewTemplateSettings/PaneTitle.md  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/active/NavigationView/NavigationViewTemplateSettings/PaneTitle.md b/active/NavigationView/NavigationViewTemplateSettings/PaneTitle.md
index 4e16fd470..5cd8e125f 100644
--- a/active/NavigationView/NavigationViewTemplateSettings/PaneTitle.md
+++ b/active/NavigationView/NavigationViewTemplateSettings/PaneTitle.md
@@ -4,7 +4,7 @@ PaneTitle is added to NavigationView in RS4, but it's a String. Since RS5, we in
 This API update addes PaneTitle [Template-Settings](https://docs.microsoft.com/en-us/windows/uwp/xaml-platform/template-settings-classes) to the NavigationView control.
 
 # Description
-Provides calculated PaneTitle that can be referenced as TemplatedParent sources when defining templates for a NavigatiionView control. Not intended for general use.
+Provides calculated PaneTitle that can be referenced as TemplatedParent sources when defining templates for a NavigationView control. Not intended for general use.
 
 # Examples
 

From 9bb4de5786a299987d10973185361d70f7af6f8b Mon Sep 17 00:00:00 2001
From: MikeHillberg <18429489+MikeHillberg@users.noreply.github.com>
Date: Thu, 14 Mar 2019 12:45:40 -0700
Subject: [PATCH 6/7] Update
 active/NavigationView/NavigationViewTemplateSettings/PaneTitle.md

Co-Authored-By: licanhua <canli@microsoft.com>
---
 .../NavigationView/NavigationViewTemplateSettings/PaneTitle.md   | 1 -
 1 file changed, 1 deletion(-)

diff --git a/active/NavigationView/NavigationViewTemplateSettings/PaneTitle.md b/active/NavigationView/NavigationViewTemplateSettings/PaneTitle.md
index 5cd8e125f..23e59c20c 100644
--- a/active/NavigationView/NavigationViewTemplateSettings/PaneTitle.md
+++ b/active/NavigationView/NavigationViewTemplateSettings/PaneTitle.md
@@ -1,7 +1,6 @@
 # Background
 PaneTitle is added to NavigationView in RS4, but it's a String. Since RS5, we introduced PaneHeader(UIElement) to deprecate PaneTitle. If both PaneTitle and PaneHeader are provided by customer, PaneHeader is used.
 
-This API update addes PaneTitle [Template-Settings](https://docs.microsoft.com/en-us/windows/uwp/xaml-platform/template-settings-classes) to the NavigationView control.
 
 # Description
 Provides calculated PaneTitle that can be referenced as TemplatedParent sources when defining templates for a NavigationView control. Not intended for general use.

From 89d2c57c4043e830a231495fb3cccdf1f5630c3e Mon Sep 17 00:00:00 2001
From: MikeHillberg <18429489+MikeHillberg@users.noreply.github.com>
Date: Thu, 14 Mar 2019 12:46:48 -0700
Subject: [PATCH 7/7] Update
 active/NavigationView/NavigationViewTemplateSettings/PaneTitle.md

Co-Authored-By: licanhua <canli@microsoft.com>
---
 .../NavigationViewTemplateSettings/PaneTitle.md   | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/active/NavigationView/NavigationViewTemplateSettings/PaneTitle.md b/active/NavigationView/NavigationViewTemplateSettings/PaneTitle.md
index 23e59c20c..bf54b4d49 100644
--- a/active/NavigationView/NavigationViewTemplateSettings/PaneTitle.md
+++ b/active/NavigationView/NavigationViewTemplateSettings/PaneTitle.md
@@ -1,5 +1,18 @@
 # Background
-PaneTitle is added to NavigationView in RS4, but it's a String. Since RS5, we introduced PaneHeader(UIElement) to deprecate PaneTitle. If both PaneTitle and PaneHeader are provided by customer, PaneHeader is used.
+Xaml controls are typically implemented using an element tree that’s defined in a template.
+For example the template for a ComboBox control has a TextBlock in it to display the selected value.
+Several controls have properties that are only expected to be useful to these templates, 
+and so there’s a common pattern for the control to expose them in a TemplateSettings property. 
+For example [ComboBox.TemplateSettings](https://docs.microsoft.com/en-us/uwp/api/Windows.UI.Xaml.Controls.ComboBox.TemplateSettings) 
+is used by the ComboBox’s template. See [this doc page](https://docs.microsoft.com/en-us/windows/uwp/xaml-platform/template-settings-classes) for more details. 
+
+The new API here adds a PaneTitle property to NavigationView's existing
+[TemplateSettings property](https://docs.microsoft.com/uwp/api/Windows.UI.Xaml.Controls.NavigationViewTemplateSettings).
+This helps the control template decide if it should show the
+[NavigationView.PaneTitle](https://docs.microsoft.com/uwp/api/Windows.UI.Xaml.Controls.NavigationView.PaneTitle)
+property, as it should be ignored if the
+[NavigationView.PaneHeader](https://docs.microsoft.com/uwp/api/Windows.UI.Xaml.Controls.NavigationView.PaneHeader)
+property is set. (The RS5 PaneHeader property supersedes/replaces the RS4 PaneTitle property.)
 
 
 # Description