Restore bad includes find/replace items from WPF (#1688)

* checkpoint 1

* checkpoint 2

* checkpoint whatever

* checkpoint whoopsie

* checkin or checkout??

* final!

* Update object-lifetime-events.md

* Update wpf-globalization-and-localization-overview.md

* Update 3-d-graphics-overview.md

dotnet-desktop-guide/framework/wpf/advanced/bidirectional-features-in-wpf-overview.md

@@ -161,7 +161,7 @@ The following graphic shows the output of the previous example with arrows drawn
 
 ![Graphic that illustrates arrows drawn using the Path element.](./media/bidirectional-features-in-wpf-overview/arrows-drawn-path-element.png)
 
-The <xref:System.Windows.Controls.Image> and <xref:System.Windows.Shapes.Path> are two examples of a how UI elements in a specific direction within a container, <xref:System.Windows.FlowDirection> can be used with elements such as <xref:System.Windows.Controls.InkPresenter> which renders ink on a surface, <xref:System.Windows.Media.LinearGradientBrush>, <xref:System.Windows.Media.RadialGradientBrush>. Whenever you need a right to left behavior for your content that mimics a left to right behavior, or vice versa, Windows Presentation Foundation (WPF) provides that capability.
+The <xref:System.Windows.Controls.Image> and <xref:System.Windows.Shapes.Path> are two examples of a how WPF uses <xref:System.Windows.FlowDirection>. Beside laying out UI elements in a specific direction within a container, <xref:System.Windows.FlowDirection> can be used with elements such as <xref:System.Windows.Controls.InkPresenter> which renders ink on a surface, <xref:System.Windows.Media.LinearGradientBrush>, <xref:System.Windows.Media.RadialGradientBrush>. Whenever you need a right to left behavior for your content that mimics a left to right behavior, or vice versa, Windows Presentation Foundation (WPF) provides that capability.
 
 <a name="NumberSubstitution"></a>
 

dotnet-desktop-guide/framework/wpf/advanced/code-behind-and-xaml-in-wpf.md

@@ -47,21 +47,21 @@ ms.assetid: 9df6d3c9-aed3-471c-af36-6859b19d999f
 
 - The handler must match the delegate for the appropriate event in the backing type system.  
 
-- For the Microsoft Visual Basic language specifically, you can use the language-specific `Handles` keyword to associate handlers with instances and events in the handler declaration, instead of attaching handlers with attributes in WPF event system, such as certain routed event scenarios or attached events. For details, see [Visual Basic and WPF Event Handling](visual-basic-and-wpf-event-handling.md).  
+- For the Microsoft Visual Basic language specifically, you can use the language-specific `Handles` keyword to associate handlers with instances and events in the handler declaration, instead of attaching handlers with attributes in XAML. However, this technique does have some limitations because the `Handles` keyword cannot support all of the specific features of the WPF event system, such as certain routed event scenarios or attached events. For details, see [Visual Basic and WPF Event Handling](visual-basic-and-wpf-event-handling.md).  
 
 <a name="x_Code"></a>
 
 ## x:Code  
 
- [x:Code](/dotnet/desktop/xaml-services/xcode-intrinsic-xaml-type) is a directive element defined in WPF schema) will not try to interpret the contents literally as XML.  
+ [x:Code](/dotnet/desktop/xaml-services/xcode-intrinsic-xaml-type) is a directive element defined in XAML. An `x:Code` directive element can contain inline programming code. The code that is defined inline can interact with the XAML on the same page. The following example illustrates inline C# code. Notice that the code is inside the `x:Code` element and that the code must be surrounded by `<CDATA[`...`]]>` to escape the contents for XML, so that a XAML processor (interpreting either the XAML schema or the WPF schema) will not try to interpret the contents literally as XML.  
 
  [!code-xaml[XAMLOvwSupport#ButtonWithInlineCode](~/samples/snippets/csharp/VS_Snippets_Wpf/XAMLOvwSupport/CSharp/page4.xaml#buttonwithinlinecode)]  
 
 <a name="Inline_Code_Limitations"></a>
 
 ## Inline Code Limitations  
 
- You should consider avoiding or limiting the use of inline code. In terms of architecture and coding philosophy, maintaining a separation between markup and code-behind keeps the designer and developer roles much more distinct. On a more technical level, the code that you write for inline code can be awkward to write, because you are always writing into the WPF mappings include most but not all CLR namespaces that are present in the WPF assemblies; you will have to fully qualify calls to types and members contained within the other CLR namespaces. You also cannot define anything beyond the partial class in the inline code, and all user code entities you reference must exist as a member or variable within the generated partial class. Other language specific programming features, such as macros or `#ifdef` against global variables or build variables, are also not available. For more information, see [x:Code Intrinsic XAML Type](/dotnet/desktop/xaml-services/xcode-intrinsic-xaml-type).  
+ You should consider avoiding or limiting the use of inline code. In terms of architecture and coding philosophy, maintaining a separation between markup and code-behind keeps the designer and developer roles much more distinct. On a more technical level, the code that you write for inline code can be awkward to write, because you are always writing into the XAML generated partial class, and can only use the default XML namespace mappings. Because you cannot add `using` statements, you must fully qualify many of the API calls that you make. The default WPF mappings include most but not all CLR namespaces that are present in the WPF assemblies; you will have to fully qualify calls to types and members contained within the other CLR namespaces. You also cannot define anything beyond the partial class in the inline code, and all user code entities you reference must exist as a member or variable within the generated partial class. Other language specific programming features, such as macros or `#ifdef` against global variables or build variables, are also not available. For more information, see [x:Code Intrinsic XAML Type](/dotnet/desktop/xaml-services/xcode-intrinsic-xaml-type).  
 
 ## See also
 

dotnet-desktop-guide/framework/wpf/advanced/custom-dependency-properties.md

@@ -25,7 +25,7 @@ This topic describes the reasons that Windows Presentation Foundation (WPF) appl
 
 ## Prerequisites
 
-This topic assumes that you understand dependency properties from the perspective of a consumer of existing dependency properties on WPF classes, and have read the [Dependency Properties Overview](dependency-properties-overview.md) topic. In order to follow the examples in this topic, you should also understand WPF applications.
+This topic assumes that you understand dependency properties from the perspective of a consumer of existing dependency properties on WPF classes, and have read the [Dependency Properties Overview](dependency-properties-overview.md) topic. In order to follow the examples in this topic, you should also understand XAML and know how to write WPF applications.
 
 <a name="whatis"></a>
 

dotnet-desktop-guide/framework/wpf/advanced/dependency-property-metadata.md

@@ -17,7 +17,7 @@ The Windows Presentation Foundation (WPF) property system includes a metadata re
 
 ## Prerequisites  
 
- This topic assumes that you understand dependency properties from the perspective of a consumer of existing dependency properties on WPF applications.  
+ This topic assumes that you understand dependency properties from the perspective of a consumer of existing dependency properties on WPF classes, and have read the [Dependency Properties Overview](dependency-properties-overview.md). In order to follow the examples in this topic, you should also understand XAML and know how to write WPF applications.  
 
 <a name="dp_metadata_contents"></a>
 

dotnet-desktop-guide/framework/wpf/advanced/dependency-property-value-precedence.md

@@ -17,7 +17,7 @@ ms.assetid: 1fbada8e-4867-4ed1-8d97-62c07dad7ebc
 
 ## Prerequisites  
 
- This topic assumes that you understand dependency properties from the perspective of a consumer of existing dependency properties on WPF classes, and have read [Dependency Properties Overview](dependency-properties-overview.md). To follow the examples in this topic, you should also understand WPF applications.  
+ This topic assumes that you understand dependency properties from the perspective of a consumer of existing dependency properties on WPF classes, and have read [Dependency Properties Overview](dependency-properties-overview.md). To follow the examples in this topic, you should also understand XAML and know how to write WPF applications.  
 
 <a name="intro"></a>
 

dotnet-desktop-guide/framework/wpf/advanced/documents-in-wpf.md

@@ -16,7 +16,7 @@ ms.assetid: 6e8db7bc-050a-4070-aa72-bb8c46e87ff8
 ---
 # Documents in WPF
 
-WPF also provides integrated services for document display, packaging, and security. This topic provides an introduction to WPF document types and document packaging.  
+Windows Presentation Foundation (WPF) offers a wide range of document features that enable the creation of high-fidelity content that is designed to be more easily accessed and read than in previous generations of Windows. In addition to enhanced capabilities and quality, WPF also provides integrated services for document display, packaging, and security. This topic provides an introduction to WPF document types and document packaging.  
 
 <a name="types_of_documents"></a>
 

dotnet-desktop-guide/framework/wpf/advanced/drag-and-drop-overview.md

@@ -17,7 +17,7 @@ ms.assetid: 1a5b27b0-0ac5-4cdf-86c0-86ac0271fa64
 ---
 # Drag and Drop Overview
 
-This topic provides an overview of drag-and-drop support in user interface (UI), and dropping them.  
+This topic provides an overview of drag-and-drop support in Windows Presentation Foundation (WPF) applications. Drag-and-drop commonly refers to a method of data transfer that involves using a mouse (or some other pointing device) to select one or more objects, dragging these objects over some desired drop target in the user interface (UI), and dropping them.  
 
 <a name="Drag_and_Drop_Support"></a>
 

dotnet-desktop-guide/framework/wpf/advanced/drag-and-drop.md

@@ -12,7 +12,7 @@ ms.assetid: 77c48920-8c8b-41eb-8fe8-b411962c8623
 ---
 # Drag and Drop
 
-WPF applications as well as other Windows applications.  
+Windows Presentation Foundation (WPF) provides a highly flexible drag and drop infrastructure which supports dragging and dropping of data within both WPF applications as well as other Windows applications.  
 
 ## In This Section  
 

dotnet-desktop-guide/framework/wpf/advanced/draw-text-using-glyphs.md

@@ -14,7 +14,7 @@ This topic explains how to use the low-level <xref:System.Windows.Documents.Glyp
 
 ## Example  
 
- The following examples show how to define properties for a <xref:System.Windows.Documents.Glyphs> object in XAML. The examples assume that the Arial, Courier New, and Times New Roman fonts are installed in the C:\WINDOWS\Fonts folder on the local computer.  
+ The following examples show how to define properties for a <xref:System.Windows.Documents.Glyphs> object in XAML. The <xref:System.Windows.Documents.Glyphs> object represents the output of a <xref:System.Windows.Media.GlyphRun> in XAML. The examples assume that the Arial, Courier New, and Times New Roman fonts are installed in the C:\WINDOWS\Fonts folder on the local computer.  
 
  [!code-xaml[GlyphsOvwSample1#1](~/samples/snippets/csharp/VS_Snippets_Wpf/GlyphsOvwSample1/CS/default.xaml#1)]  
 

dotnet-desktop-guide/framework/wpf/advanced/framework-property-metadata.md

@@ -9,7 +9,7 @@ ms.assetid: 9962f380-b885-4b61-a62e-457397083fea
 ---
 # Framework Property Metadata
 
-Framework property metadata options are reported for the properties of object elements considered to be at the WPF framework level in the WPF presentation APIs and executables. Framework property metadata is queried by these systems to determine feature-specific characteristics of particular element properties.  
+Framework property metadata options are reported for the properties of object elements considered to be at the WPF framework level in the Windows Presentation Foundation (WPF) architecture. In general the WPF framework-level designation entails that features such as rendering, data binding, and property system refinements are handled by the WPF presentation APIs and executables. Framework property metadata is queried by these systems to determine feature-specific characteristics of particular element properties.  
 
 <a name="prerequisites"></a>
 

dotnet-desktop-guide/framework/wpf/advanced/globalization-for-wpf.md

@@ -63,7 +63,7 @@ The following example shows a hexadecimal character reference. Notice that it ha
 
 ### Unicode
 
- WPF application can use <xref:System.Globalization.StringInfo> to manipulate strings without understanding whether they have surrogate pairs or combining characters.
+ XAML supports all Unicode features including surrogates. As long as the character set can be mapped to Unicode, it is supported. For example, GB18030 introduces some characters that are mapped to the Chinese, Japanese, and Korean (CFK) extension A and B and surrogate pairs, therefore it is fully supported. A WPF application can use <xref:System.Globalization.StringInfo> to manipulate strings without understanding whether they have surrogate pairs or combining characters.
 
 <a name="design_intl_ui_with_xaml"></a>
 
@@ -165,7 +165,7 @@ The following example shows a hexadecimal character reference. Notice that it ha
 
 ### Localizable User Interface
 
- UI. UI and use a programming language such as C# to react to user interaction.
+ WPF applications use XAML to define their UI. XAML allows developers to specify a hierarchy of objects with a set of properties and logic. The primary use of XAML is to develop WPF applications but it can be used to specify a hierarchy of any common language runtime (CLR) objects. Most developers use XAML to specify their application's UI and use a programming language such as C# to react to user interaction.
 
  From a resource point of view, a UI is a resource element and therefore its final distribution format must be localizable to support international languages. Because XAML cannot handle events many XAML applications contain blocks of code to do this. For more information, see [XAML in WPF](xaml-in-wpf.md). Code is stripped out and compiled into different binaries when a XAML file is tokenized into the BAML form of XAML. The BAML form of XAML files, images, and other types of managed resource objects are embedded in the satellite resource assembly, which can be localized into other languages, or the main assembly when localization is not required.
 

dotnet-desktop-guide/framework/wpf/advanced/how-to-create-a-custom-routed-event.md

@@ -20,7 +20,7 @@ For your custom event to support event routing, you need to register a <xref:Sys
 
  Note that even though the event is raised through the `OnTap` virtual method in this particular example, how you raise your event or how your event responds to changes depends on your needs.  
 
- Note also that this example basically implements an entire subclass of <xref:System.Windows.Controls.Button>; that subclass is built as a separate assembly and then instantiated as a custom class on a separate Windows Presentation Foundation (WPF) element does.  
+ Note also that this example basically implements an entire subclass of <xref:System.Windows.Controls.Button>; that subclass is built as a separate assembly and then instantiated as a custom class on a separate XAML page. This is to illustrate the concept that subclassed controls can be inserted into trees composed of other controls, and that in this situation, custom events on these controls have the very same event routing capabilities as any native WPF element does.  
 
  [!code-csharp[RoutedEventCustom#CustomClass](~/samples/snippets/csharp/VS_Snippets_Wpf/RoutedEventCustom/CSharp/SDKSampleLibrary/class1.cs#customclass)]
  [!code-vb[RoutedEventCustom#CustomClass](~/samples/snippets/visualbasic/VS_Snippets_Wpf/RoutedEventCustom/VB/SDKSampleLibrary/Class1.vb#customclass)]  

dotnet-desktop-guide/framework/wpf/advanced/how-to-make-an-object-follow-the-mouse-pointer.md

@@ -15,7 +15,7 @@ description: Learn how to make an object follow the mouse pointer and change the
 
 This example shows how to change the dimensions of an object when the mouse pointer moves on the screen.  
 
- The example includes an user interface (UI) and a code-behind file that creates the event handler.  
+ The example includes an Extensible Application Markup Language (XAML) file that creates the user interface (UI) and a code-behind file that creates the event handler.  
 
 ## Example  
 

dotnet-desktop-guide/framework/wpf/advanced/how-to-register-an-attached-property.md

@@ -12,7 +12,7 @@ description: Learn how to register an attached property and provide public acces
 ---
 # How to: Register an Attached Property
 
-This example shows how to register an attached property and provide public accessors so that you can use the property in both WPF types are also implemented as dependency properties. You can use dependency properties on any <xref:System.Windows.DependencyObject> types.  
+This example shows how to register an attached property and provide public accessors so that you can use the property in both XAML and code. Attached properties are a syntax concept defined by XAML. Most attached properties for WPF types are also implemented as dependency properties. You can use dependency properties on any <xref:System.Windows.DependencyObject> types.  
 
 ## Example  
 

dotnet-desktop-guide/framework/wpf/advanced/how-to-set-margins-of-elements-and-controls.md

@@ -15,7 +15,7 @@ description: Learn how to set the Margin property by changing any existing prope
 
 This example describes how to set the <xref:System.Windows.FrameworkElement.Margin%2A> property, by changing any existing property value for the margin in code-behind. The <xref:System.Windows.FrameworkElement.Margin%2A> property is a property of the <xref:System.Windows.FrameworkElement> base element, and is thus inherited by a variety of controls and other elements.  
 
- This example is written in XAML refers to. The code-behind is shown in both a C# and a Microsoft Visual Basic version.  
+ This example is written in Extensible Application Markup Language (XAML), with a code-behind file that the XAML refers to. The code-behind is shown in both a C# and a Microsoft Visual Basic version.  
 
 ## Example  
 

dotnet-desktop-guide/framework/wpf/advanced/how-to-use-a-grid-for-automatic-layout.md

@@ -11,7 +11,7 @@ ms.assetid: ab9de407-e0c1-4047-bdf0-24951bf73879
 
 This example describes how to use a grid in the automatic layout approach to creating a localizable application.  
 
- Localization of a UI was adapted for required adjustment. Now with the capabilities of Windows Presentation Foundation (WPF) you can design elements that reduce the need for adjustment. The approach to writing applications that can be more easily re-sized and repositioned is called `auto layout`.  
+ Localization of a user interface (UI) can be a time consuming process. Often localizers need to re-size and reposition elements in addition to translating text. In the past each language that a UI was adapted for required adjustment. Now with the capabilities of Windows Presentation Foundation (WPF) you can design elements that reduce the need for adjustment. The approach to writing applications that can be more easily re-sized and repositioned is called `auto layout`.  
 
  The following Extensible Application Markup Language (XAML) example demonstrates using a grid to position some buttons and text. Notice that the height and width of the cells are set to `Auto`; therefore the cell that contains the button with an image adjusts to fit the image. Because the <xref:System.Windows.Controls.Grid> element can adjust to its content it can be useful when taking the automatic layout approach to designing applications that can be localized.  
 

dotnet-desktop-guide/framework/wpf/advanced/how-to-use-automatic-layout-to-create-a-button.md

@@ -11,7 +11,7 @@ ms.assetid: 96c206d0-9e77-4784-9d2d-5045aed2021c
 
 This example describes how to use the automatic layout approach to create a button in a localizable application.  
 
- Localization of a UI was adapted for required adjustment. Now with the capabilities of Windows Presentation Foundation (WPF) you can design elements that reduce the need for adjustment. The approach to writing applications that can be more easily resized and repositioned is called `automatic layout`.  
+ Localization of a user interface (UI) can be a time consuming process. Often localizers need to resize and reposition elements in addition to translating text. In the past each language that a UI was adapted for required adjustment. Now with the capabilities of Windows Presentation Foundation (WPF) you can design elements that reduce the need for adjustment. The approach to writing applications that can be more easily resized and repositioned is called `automatic layout`.  
 
 ## Example