Revert "Removed tlasharptla-winfx-md.md token, replaced token with token text (dotnet#66)"

ChrisMaddock · web-flow · commit edc867f12d05 · 2018-04-25T20:44:07.000+01:00
This reverts commit a050037.
diff --git a/includes/tlasharptla-winfx-md.md b/includes/tlasharptla-winfx-md.md
@@ -0,0 +1 @@
+Microsoft .NET Framework
diff --git a/xml/System.AddIn.Pipeline/FrameworkElementAdapters.xml b/xml/System.AddIn.Pipeline/FrameworkElementAdapters.xml
@@ -19,7 +19,7 @@
       <format type="text/markdown"><![CDATA[  
   
 ## Remarks  
-Windows Presentation Foundation (WPF) extends the .NET Framework add-in model to allow WPF UIs to be passed between host applications and add-ins. WPF requires that the WPF UIs that are passed either directly or indirectly derive from <xref:System.Windows.FrameworkElement>. However, add-ins and host applications are typically run in separate application domains and are, consequently, separated by an isolation boundary. For this reason, the .NET Framework add-in model requires the types that are passed across the isolation boundary to be remotable. A remotable type conforms to one of the following:  
+ [!INCLUDE[TLA#tla_wpf](~/includes/tlasharptla-wpf-md.md)] extends the [!INCLUDE[TLA#tla_winfx](~/includes/tlasharptla-winfx-md.md)] add-in model to allow [!INCLUDE[TLA2#tla_wpf](~/includes/tla2sharptla-wpf-md.md)] [!INCLUDE[TLA2#tla_ui#plural](~/includes/tla2sharptla-uisharpplural-md.md)] to be passed between host applications and add-ins. [!INCLUDE[TLA2#tla_wpf](~/includes/tla2sharptla-wpf-md.md)] requires that the [!INCLUDE[TLA2#tla_wpf](~/includes/tla2sharptla-wpf-md.md)] [!INCLUDE[TLA2#tla_ui#plural](~/includes/tla2sharptla-uisharpplural-md.md)] that are passed either directly or indirectly derive from <xref:System.Windows.FrameworkElement>. However, add-ins and host applications are typically run in separate application domains and are, consequently, separated by an isolation boundary. For this reason, the [!INCLUDE[TLA2#tla_winfx](~/includes/tla2sharptla-winfx-md.md)] add-in model requires the types that are passed across the isolation boundary to be remotable. A remotable type conforms to one of the following:  
   
 -   Implements the <xref:System.Runtime.Serialization.ISerializable> interface.  
   
@@ -31,7 +31,7 @@ Windows Presentation Foundation (WPF) extends the .NET Framework add-in model to
   
  Once the <xref:System.AddIn.Contract.INativeHandleContract> is passed across the isolation boundary, it must be converted to a type that can be displayed by the host application or the add-in. In this case, the static <xref:System.AddIn.Pipeline.FrameworkElementAdapters.ContractToViewAdapter%2A> method is called to convert an <xref:System.AddIn.Contract.INativeHandleContract> to a <xref:System.Windows.FrameworkElement>.  
   
- For more detailed exposition of WPF add-ins, see [WPF Add-Ins Overview](~/docs/framework/wpf/app-development/wpf-add-ins-overview.md).  
+ For more detailed exposition of [!INCLUDE[TLA2#tla_wpf](~/includes/tla2sharptla-wpf-md.md)] add-ins, see [WPF Add-Ins Overview](~/docs/framework/wpf/app-development/wpf-add-ins-overview.md).  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Printing/PrintServer.xml b/xml/System.Printing/PrintServer.xml
@@ -977,6 +977,18 @@
         <summary>Gets the major version of the operating system.</summary>
         <value>An <see cref="T:System.Int32" /> that identifies the major version of the operating system.</value>
         <remarks>
+          <format type="text/markdown"><![CDATA[  
+  
+## Remarks  
+ The versions of Windows on which [!INCLUDE[TLA#tla_winfx](~/includes/tlasharptla-winfx-md.md)] can be run have the following major (right of the decimal) and minor (left of the decimal) version numbers:  
+  
+-   [!INCLUDE[TLA#tla_winxp](~/includes/tlasharptla-winxp-md.md)]: 5.1  
+  
+-   [!INCLUDE[TLA#tla_winnetsvrfam](~/includes/tlasharptla-winnetsvrfam-md.md)]: 5.2  
+  
+-   [!INCLUDE[TLA#tla_winvista](~/includes/tlasharptla-winvista-md.md)]: 6.0  
+  
+ ]]></format>
         </remarks>
         <altmember cref="P:System.Printing.PrintServer.MinorVersion" />
       </Docs>
@@ -999,6 +1011,18 @@
         <summary>Gets the minor version within the major version of the operating system.</summary>
         <value>An <see cref="T:System.Int32" /> that identifies the minor version of the operating system.</value>
         <remarks>
+          <format type="text/markdown"><![CDATA[  
+  
+## Remarks  
+ The versions of Windows on which [!INCLUDE[TLA#tla_winfx](~/includes/tlasharptla-winfx-md.md)] can be run have the following major (right of the decimal) and minor (left of the decimal) version numbers:  
+  
+-   [!INCLUDE[TLA#tla_winxp](~/includes/tlasharptla-winxp-md.md)]: 5.1  
+  
+-   [!INCLUDE[TLA#tla_winnetsvrfam](~/includes/tlasharptla-winnetsvrfam-md.md)]: 5.2  
+  
+-   [!INCLUDE[TLA#tla_winvista](~/includes/tlasharptla-winvista-md.md)]: 6.0  
+  
+ ]]></format>
         </remarks>
         <altmember cref="P:System.Printing.PrintServer.MajorVersion" />
       </Docs>
@@ -1199,6 +1223,14 @@
 ## Remarks  
  In practice, the value of this property is always the same as the value of <xref:System.Printing.PrintServer.MajorVersion%2A> except that the latter is a type <xref:System.Int32>.  
   
+ The versions of Windows on which [!INCLUDE[TLA#tla_winfx](~/includes/tlasharptla-winfx-md.md)] can be run have the following major (right of the decimal) and minor (left of the decimal) version numbers:  
+  
+-   [!INCLUDE[TLA#tla_winxp](~/includes/tlasharptla-winxp-md.md)]: 5.1  
+  
+-   [!INCLUDE[TLA#tla_winnetsvrfam](~/includes/tlasharptla-winnetsvrfam-md.md)]: 5.2  
+  
+-   [!INCLUDE[TLA#tla_winvista](~/includes/tlasharptla-winvista-md.md)]: 6.0  
+  
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.Windows.Automation/AutomationElement.xml b/xml/System.Windows.Automation/AutomationElement.xml
@@ -564,7 +564,7 @@
 ## Remarks  
  This identifier is used by UI Automation client applications. UI Automation providers should use the equivalent identifier in <xref:System.Windows.Automation.AutomationElementIdentifiers>.  
   
- Within the Windows Presentation Foundation (WPF) framework, the default value reported will always be `en-US` because the .NET Framework automatically defaults to English. For other user interface (UI) frameworks, this property must be explicitly set or it will not be exposed.  
+ Within the [!INCLUDE[TLA#tla_winclient](~/includes/tlasharptla-winclient-md.md)] framework, the default value reported will always be `en-US` because the [!INCLUDE[TLA#tla_winfx](~/includes/tlasharptla-winfx-md.md)] framework automatically defaults to English. For other [!INCLUDE[TLA#tla_ui](~/includes/tlasharptla-ui-md.md)] frameworks this property must be explicitly set or it will not be exposed.  
   
  This property can exist on a per-control basis, but typically is only available on an application level.  
   
diff --git a/xml/System.Windows.Documents.DocumentStructures/FigureStructure.xml b/xml/System.Windows.Documents.DocumentStructures/FigureStructure.xml
@@ -157,7 +157,7 @@
       </Parameters>
       <Docs>
         <param name="value">The child <see cref="T:System.Object" /> to add.</param>
-        <summary>This member supports the .NET Framework infrastructure and is not intended to be used directly from your code.</summary>
+        <summary>This member supports the [!INCLUDE[TLA#tla_winfx](~/includes/tlasharptla-winfx-md.md)] infrastructure and is not intended to be used directly from your code.</summary>
         <remarks>
           <format type="text/markdown"><![CDATA[  
   
diff --git a/xml/System.Windows.Documents.DocumentStructures/ListStructure.xml b/xml/System.Windows.Documents.DocumentStructures/ListStructure.xml
@@ -150,7 +150,7 @@
       </Parameters>
       <Docs>
         <param name="value">The child <see cref="T:System.Object" /> that is added.</param>
-        <summary>This member supports the .NET Framework infrastructure and is not intended to be used directly from your code.</summary>
+        <summary>This member supports the [!INCLUDE[TLA#tla_winfx](~/includes/tlasharptla-winfx-md.md)] infrastructure and is not intended to be used directly from your code.</summary>
         <remarks>
           <format type="text/markdown"><![CDATA[  
   
diff --git a/xml/System.Windows.Documents.DocumentStructures/ParagraphStructure.xml b/xml/System.Windows.Documents.DocumentStructures/ParagraphStructure.xml
@@ -157,7 +157,7 @@
       </Parameters>
       <Docs>
         <param name="value">The child <see cref="T:System.Object" /> that is added.</param>
-        <summary>This member supports the .NET Framework infrastructure and is not intended to be used directly from your code.</summary>
+        <summary>This member supports the [!INCLUDE[TLA#tla_winfx](~/includes/tlasharptla-winfx-md.md)] infrastructure and is not intended to be used directly from your code.</summary>
         <remarks>
           <format type="text/markdown"><![CDATA[  
   
diff --git a/xml/System.Windows.Documents.DocumentStructures/StoryFragment.xml b/xml/System.Windows.Documents.DocumentStructures/StoryFragment.xml
@@ -373,7 +373,7 @@
       </Parameters>
       <Docs>
         <param name="value">The child <see cref="T:System.Object" /> that is added.</param>
-        <summary>This member supports the .NET Framework infrastructure and is not intended to be used directly from your code.</summary>
+        <summary>This member supports the [!INCLUDE[TLA#tla_winfx](~/includes/tlasharptla-winfx-md.md)] infrastructure and is not intended to be used directly from your code.</summary>
         <remarks>
           <format type="text/markdown"><![CDATA[  
   
diff --git a/xml/System.Windows.Documents.DocumentStructures/TableRowGroupStructure.xml b/xml/System.Windows.Documents.DocumentStructures/TableRowGroupStructure.xml
@@ -149,7 +149,7 @@
       </Parameters>
       <Docs>
         <param name="value">The child <see cref="T:System.Object" /> that is added.</param>
-        <summary>This member supports the .NET Framework infrastructure and is not intended to be used directly from your code.</summary>
+        <summary>This member supports the [!INCLUDE[TLA#tla_winfx](~/includes/tlasharptla-winfx-md.md)] infrastructure and is not intended to be used directly from your code.</summary>
         <remarks>
           <format type="text/markdown"><![CDATA[  
   
diff --git a/xml/System.Windows.Documents.DocumentStructures/TableRowStructure.xml b/xml/System.Windows.Documents.DocumentStructures/TableRowStructure.xml
@@ -149,7 +149,7 @@
       </Parameters>
       <Docs>
         <param name="value">The child <see cref="T:System.Object" /> that is added.</param>
-        <summary>This member supports the .NET Framework infrastructure and is not intended to be used directly from your code.</summary>
+        <summary>This member supports the [!INCLUDE[TLA#tla_winfx](~/includes/tlasharptla-winfx-md.md)] infrastructure and is not intended to be used directly from your code.</summary>
         <remarks>
           <format type="text/markdown"><![CDATA[  
   
diff --git a/xml/System.Windows.Documents.DocumentStructures/TableStructure.xml b/xml/System.Windows.Documents.DocumentStructures/TableStructure.xml
@@ -158,7 +158,7 @@
       </Parameters>
       <Docs>
         <param name="value">The child <see cref="T:System.Object" /> that is added.</param>
-        <summary>This member supports the .NET Framework infrastructure and is not intended to be used directly from your code.</summary>
+        <summary>This member supports the [!INCLUDE[TLA#tla_winfx](~/includes/tlasharptla-winfx-md.md)] infrastructure and is not intended to be used directly from your code.</summary>
         <remarks>
           <format type="text/markdown"><![CDATA[  
   
diff --git a/xml/System.Windows.Documents/PageContentCollection.xml b/xml/System.Windows.Documents/PageContentCollection.xml
@@ -144,7 +144,7 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>This member supports the .NET Framework infrastructure and is not intended to be used directly from your code.  Use the type-safe <see cref="M:System.Windows.Documents.PageContentCollection.GetEnumerator" /> method instead.</summary>
+        <summary>This member supports the [!INCLUDE[TLA#tla_winfx](~/includes/tlasharptla-winfx-md.md)] infrastructure and is not intended to be used directly from your code.  Use the type-safe <see cref="M:System.Windows.Documents.PageContentCollection.GetEnumerator" /> method instead.</summary>
         <returns>The enumerator.</returns>
         <remarks>To be added.</remarks>
       </Docs>
diff --git a/xml/System.Windows.Interop/IErrorPage.xml b/xml/System.Windows.Interop/IErrorPage.xml
@@ -110,7 +110,7 @@
         <ReturnType>System.Windows.Threading.DispatcherOperationCallback</ReturnType>
       </ReturnValue>
       <Docs>
-        <summary>Gets or sets a reference to a <see cref="T:System.Windows.Threading.DispatcherOperationCallback" /> handler, which can handle requests for .NET Framework runtime downloads.</summary>
+        <summary>Gets or sets a reference to a <see cref="T:System.Windows.Threading.DispatcherOperationCallback" /> handler, which can handle requests for [!INCLUDE[TLA#tla_winfx](~/includes/tlasharptla-winfx-md.md)] runtime downloads.</summary>
         <value>A <see cref="T:System.Windows.Threading.DispatcherOperationCallback" /> handler,</value>
         <remarks>To be added.</remarks>
       </Docs>
diff --git a/xml/System.Windows/MessageBoxOptions.xml b/xml/System.Windows/MessageBoxOptions.xml
@@ -48,7 +48,7 @@
       </ReturnValue>
       <MemberValue>131072</MemberValue>
       <Docs>
-        <summary>The message box is displayed on the default desktop of the interactive window station. Specifies that the message box is displayed from a .NET Framework windows service application in order to notify the user of an event.</summary>
+        <summary>The message box is displayed on the default desktop of the interactive window station. Specifies that the message box is displayed from a [!INCLUDE[TLA#tla_winfx](~/includes/tlasharptla-winfx-md.md)] windows service application in order to notify the user of an event.</summary>
       </Docs>
     </Member>
     <Member MemberName="None">
@@ -124,7 +124,7 @@
       </ReturnValue>
       <MemberValue>2097152</MemberValue>
       <Docs>
-        <summary>The message box is displayed on the currently active desktop even if a user is not logged on to the computer. Specifies that the message box is displayed from a .NET Framework windows service application in order to notify the user of an event.</summary>
+        <summary>The message box is displayed on the currently active desktop even if a user is not logged on to the computer. Specifies that the message box is displayed from a [!INCLUDE[TLA#tla_winfx](~/includes/tlasharptla-winfx-md.md)] windows service application in order to notify the user of an event.</summary>
       </Docs>
     </Member>
   </Members>
