Merge pull request #1149 from dotnet/publish-15046

dotnet-desktop-guide/framework/wpf/controls/label.md

@@ -14,7 +14,7 @@ ms.assetid: 241c1ce2-60f8-4613-a0ec-9b9bb25fb6af
   
  A <xref:System.Windows.Controls.Label> provides both functional and visual support for access keys. It is frequently used to enable quick keyboard access to controls such as a <xref:System.Windows.Controls.TextBox>. To assign a <xref:System.Windows.Controls.Label> to a <xref:System.Windows.Controls.Control>, set the <xref:System.Windows.Controls.Label.Target%2A?displayProperty=nameWithType> property to the control that should get focus when the user presses the access key.  
   
- The following image shows a <xref:System.Windows.Controls.Label> "Themes" that targets a <xref:System.Windows.Controls.ComboBox>.  When the user presses , the <xref:System.Windows.Controls.ComboBox> receives focus.  For more information, see [How to: Set the Target Property of a Label](/previous-versions/dotnet/netframework-3.5/ms752101(v=vs.90)).  
+ The following image shows a <xref:System.Windows.Controls.Label> "Theme" that targets a <xref:System.Windows.Controls.ComboBox>.  When the user presses <kbd>T</kbd>, the <xref:System.Windows.Controls.ComboBox> receives focus.  For more information, see [How to: Set the Target Property of a Label](/previous-versions/dotnet/netframework-3.5/ms752101(v=vs.90)).  
   
  ![Screenshot of Display Properties dialog showing labeled by usage.](./media/label/display-properties-labeled-by.png "LabeledBy")  
   

dotnet-desktop-guide/framework/wpf/graphics-multimedia/opacity-masks-overview.md

@@ -51,7 +51,7 @@ LinearGradientBrush opacity masking example
      ![Object with a DrawingBrush opacity mask](./media/wcpsdk-drawingbrushasopacitymask-single.jpg "wcpsdk_drawingbrushasopacitymask_single")  
 DrawingBrush opacity masking example  
   
- The gradient brushes (<xref:System.Windows.Media.LinearGradientBrush> and <xref:System.Windows.Media.RadialGradientBrush>) are particularly well-suited for use as an opacity mask. Because a <xref:System.Windows.Media.SolidColorBrush> fills an area with a uniform color, they make poor opacity masks; using a <xref:System.Windows.Media.SolidColorBrush> is equivalent to setting the element's or visual's <xref:System.Windows.UIElement.OpacityMask%2A> property.  
+ The gradient brushes (<xref:System.Windows.Media.LinearGradientBrush> and <xref:System.Windows.Media.RadialGradientBrush>) are particularly well-suited for use as an opacity mask. Because a <xref:System.Windows.Media.SolidColorBrush> fills an area with a uniform color, they make poor opacity masks; using a <xref:System.Windows.Media.SolidColorBrush> is equivalent to setting the element's or visual's <xref:System.Windows.UIElement.Opacity%2A> property.  
   
 <a name="creatingopacitymaskswithgradients"></a>
 ## Using a Gradient as an Opacity Mask  

dotnet-desktop-guide/samples/snippets/csharp/VS_Snippets_Wpf/ControlTemplateExamples/CS/resources/progressbar.xaml

@@ -65,7 +65,7 @@
                 <Rectangle x:Name="PART_GlowRect"
                            Width="100"
                            HorizontalAlignment="Left"
-                           Fill="{StaticResource ProgressBarIndicatorAnimatedFill}"
+                           Fill="{DynamicResource ProgressBarIndicatorAnimatedFill}"
                            Margin="-100,0,0,0" />
               </Grid>
             </Border>

dotnet-desktop-guide/samples/snippets/csharp/VS_Snippets_Wpf/ListViewCode/CSharp/Window1.xaml

@@ -1,12 +1,10 @@
-<Window x:Class="SDKSample.Window1"
+<Window x:Class="SDKSample.Window1"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Loaded="OnLoad"
-    Loaded="OnLoad"
         xmlns:ds="clr-namespace:SDKSample">
 
     <Window.Resources>
-    <ObjectDataProvider x:Key="EmployeeInfoDataSource"
+        <ObjectDataProvider x:Key="EmployeeInfoDataSource" ObjectType="{x:Type ds:myEmployees}" />
-           ObjectType="{x:Type ds:myEmployees}"/>
     </Window.Resources>
     <Grid>
         <Grid.RowDefinitions>
@@ -17,16 +15,14 @@
             <ColumnDefinition/>
             <ColumnDefinition/>
         </Grid.ColumnDefinitions>
-    <TextBlock Grid.Row="0" Grid.Column="0" FontSize="14"
+        <TextBlock Grid.Row="0" Grid.Column="0" FontSize="14" HorizontalAlignment="Center">
-               HorizontalAlignment="Center">
             ListView created with XAML
         </TextBlock>
         <StackPanel Grid.Row="1" Grid.Column="0" HorizontalAlignment="Center">
             <!--<SnippetListViewEmployee>-->
 
             <!--<SnippetItemsSource>-->
-      <ListView ItemsSource="{Binding Source=
+            <ListView ItemsSource="{Binding Source={StaticResource EmployeeInfoDataSource}}">
-                             {StaticResource EmployeeInfoDataSource}}">
                 <!--</SnippetItemsSource>-->
 
                 <!--<SnippetListViewView>-->
@@ -34,24 +30,18 @@
                     <!--<SnippetGridViewColumn>-->
 
                     <!--<SnippetGridViewAllowsColumnReorderPart1>-->
-          <GridView AllowsColumnReorder="true"
+                    <GridView AllowsColumnReorder="true" ColumnHeaderToolTip="Employee Information">
-                    ColumnHeaderToolTip="Employee Information">
                         <!--</SnippetGridViewAllowsColumnReorderPart1>-->
 
                         <!--<SnippetGridViewColumnProperties>-->
-            <GridViewColumn DisplayMemberBinding=
+                        <GridViewColumn DisplayMemberBinding="{Binding Path=FirstName}" Header="First Name" Width="100"/>
-                                "{Binding Path=FirstName}" 
-                            Header="First Name" Width="100"/>
                         <!--</SnippetGridViewColumnProperties>-->
 
                         <!--<SnippetHeaderContextMenu>-->
-                        <GridViewColumn DisplayMemberBinding=
+                        <GridViewColumn DisplayMemberBinding="{Binding Path=LastName}" Width="100">
-                                "{Binding Path=LastName}" 
-                            Width="100">
                             <GridViewColumnHeader>Last Name
                                 <GridViewColumnHeader.ContextMenu>
-                                <ContextMenu  MenuItem.Click="LastNameCM_Click"  
+                                    <ContextMenu MenuItem.Click="LastNameCM_Click" Name="LastNameCM">
-                                              Name="LastNameCM">
                                         <MenuItem Header="Ascending" />
                                         <MenuItem Header="Descending" />
                                     </ContextMenu>
@@ -60,9 +50,7 @@
                         </GridViewColumn>
                         <!--</SnippetHeaderContextMenu>-->
 
-                        <GridViewColumn DisplayMemberBinding=
+                        <GridViewColumn DisplayMemberBinding="{Binding Path=EmployeeNumber}" Header="Employee No." Width="100"/>
-                                "{Binding Path=EmployeeNumber}" 
-                            Header="Employee No." Width="100"/>
                         <!--<SnippetGridViewAllowsColumnReorderPart2>-->
                     </GridView>
                     <!--</SnippetGridViewAllowsColumnReorderPart2>-->
@@ -75,12 +63,10 @@
 
         </StackPanel>
 
-    <TextBlock Grid.Row="0" Grid.Column="1" FontSize="14"
+        <TextBlock Grid.Row="0" Grid.Column="1" FontSize="14" HorizontalAlignment="Center">
-               HorizontalAlignment="Center">
             ListView created with Code
         </TextBlock>
-    <StackPanel Grid.Row="1" Grid.Column="1"  Name="myStackPanel"
+        <StackPanel Grid.Row="1" Grid.Column="1" Name="myStackPanel" HorizontalAlignment="Center">
-                HorizontalAlignment="Center">
         </StackPanel>
     </Grid>