.NET framework -> .NET Framework (#16508)

Youssef1313 · gewarren · mairaw · web-flow · commit b74f50e4f4e6 · 2020-02-11T12:07:56.000-08:00
* .NET framework -&gt; .NET Framework

* the .NET Framework -&gt; .NET Framework

* Update indexers.md

* Update csharp-7.md

* Update handling-reentrancy-in-async-apps.md

* Update mitigation-serialization-control-characters.md

* Update index.md

* Update net-container-os-targets.md

* Update walkthroughs-technical-get-started-overview.md

* Apply suggestions from code review

Co-Authored-By: Genevieve Warren &lt;gewarren@microsoft.com&gt;

* Apply suggestions from code review

Co-Authored-By: Maira Wenzel &lt;mairaw@microsoft.com&gt;

* Apply suggestions from code review

Co-Authored-By: Maira Wenzel &lt;mairaw@microsoft.com&gt;

* Update docs/framework/wpf/advanced/wpf-globalization-and-localization-overview.md

Co-Authored-By: Andy De George &lt;2672110+Thraka@users.noreply.github.com&gt;

Co-authored-by: Genevieve Warren &lt;gewarren@microsoft.com&gt;
Co-authored-by: Maira Wenzel &lt;mairaw@microsoft.com&gt;
Co-authored-by: Andy De George &lt;2672110+Thraka@users.noreply.github.com&gt;
diff --git a/docs/csharp/delegate-class.md b/docs/csharp/delegate-class.md
@@ -1,6 +1,6 @@
 ---
 title: System.Delegate and the `delegate` keyword
-description: Learn about the classes in the .NET Framework that support delegates and how those map to the 'delegate' keyword.
+description: Learn about the classes in .NET that support delegates and how those map to the 'delegate' keyword.
 ms.date: 06/20/2016
 ms.technology: csharp-fundamentals
 ms.assetid: f3742fda-13c2-4283-8966-9e21c2674393
@@ -10,7 +10,7 @@ ms.assetid: f3742fda-13c2-4283-8966-9e21c2674393
 
 [Previous](delegates-overview.md)
 
-This article will cover the classes in the .NET framework
+This article covers the classes in .NET
 that support delegates, and how those map to the `delegate`
 keyword.
 
diff --git a/docs/csharp/indexers.md b/docs/csharp/indexers.md
@@ -391,7 +391,7 @@ This construct does require using the fully qualified type names on the right
 side of the `=` sign.
 
 The second technique is to strip off the time portions of any `DateTime` object
-used to index into the collections. The .NET framework does not include a Date only type.
+used to index into the collections. .NET doesn't include a date-only type.
 Developers use the `DateTime` type, but use the `Date` property to ensure that any
 `DateTime` object from that day are equal.
 
diff --git a/docs/csharp/programming-guide/concepts/async/handling-reentrancy-in-async-apps.md b/docs/csharp/programming-guide/concepts/async/handling-reentrancy-in-async-apps.md
@@ -22,10 +22,10 @@ When you include asynchronous code in your app, you should consider and possibly
 - [Reviewing and Running the Example App](#BKMD_SettingUpTheExample)
 
 > [!NOTE]
-> To run the example, you must have Visual Studio 2012 or newer and the .NET Framework 4.5 or newer installed on your computer.
+> To run the example, you must have Visual Studio 2012 or newer and .NET Framework 4.5 or newer installed on your computer.
 
 > [!NOTE]
-> Transport Layer Security (TLS) version 1.2 is now the minimum version to use in your app development. If your app targets a .NET framework version earlier than 4.7, please refer to the following article for [Transport Layer Security (TLS) best practices with the .NET Framework](../../../../framework/network-programming/tls.md) 
+> Transport Layer Security (TLS) version 1.2 is now the minimum version to use in your app development. If your app targets a .NET Framework version earlier than 4.7, refer to the following article for [Transport Layer Security (TLS) best practices with the .NET Framework](../../../../framework/network-programming/tls.md).
 
 ## <a name="BKMK_RecognizingReentrancy"></a> Recognizing Reentrancy
 
diff --git a/docs/csharp/whats-new/csharp-7.md b/docs/csharp/whats-new/csharp-7.md
@@ -313,7 +313,7 @@ costly if those allocations occur in tight loops.
 The new language feature means that async method return types aren't limited to `Task`, `Task<T>`, and `void`. The returned type
 must still satisfy the async pattern, meaning a `GetAwaiter` method
 must be accessible. As one concrete example, the `ValueTask` type
-has been added to the .NET framework to make use of this new language
+has been added to .NET to make use of this new language
 feature:
 
 [!code-csharp[UsingValueTask](~/samples/snippets/csharp/new-in-7/AsyncWork.cs#UsingValueTask "Using ValueTask")]
diff --git a/docs/framework/migration-guide/mitigation-serialization-control-characters.md b/docs/framework/migration-guide/mitigation-serialization-control-characters.md
@@ -10,19 +10,19 @@ ms.assetid: e065d458-a128-44f2-9f17-66af9d5be954
 ---
 # Mitigation: Serialization of control characters with the DataContractJsonSerializer
 
-Starting with the .NET Framework 4.7, the way in which control characters are serialized with the <xref:System.Runtime.Serialization.Json.DataContractJsonSerializer> has changed to conform to ECMAScript V6 and V8. 
+Starting with .NET Framework 4.7, the way in which control characters are serialized with the <xref:System.Runtime.Serialization.Json.DataContractJsonSerializer> has changed to conform to ECMAScript V6 and V8. 
  
 ## Impact
 
-In the .NET framework 4.6.2 and earlier versions, the <xref:System.Runtime.Serialization.Json.DataContractJsonSerializer> did not serialize some special control characters, such as `\b`, `\f`, and `\t`, in a way that was compatible with the ECMAScript V6 and V8 standards.
+In .NET Framework 4.6.2 and earlier versions, the <xref:System.Runtime.Serialization.Json.DataContractJsonSerializer> did not serialize some special control characters, such as `\b`, `\f`, and `\t`, in a way that was compatible with the ECMAScript V6 and V8 standards.
 
-For apps that target versions of the .NET Framework starting with the .NET Framework 4.7, serialization of these control characters is compatible with ECMAScript V6 and V8. The following APIs are affected:
+For apps that target versions of .NET Framework starting with .NET Framework 4.7, serialization of these control characters is compatible with ECMAScript V6 and V8. The following APIs are affected:
 
 - <xref:System.Runtime.Serialization.Json.DataContractJsonSerializer.WriteObject%2A> 
 
 ## Mitigation
 
-For apps that target versions of the .NET Framework starting with the .NET Framework 4.7, this behavior is enabled by default.
+For apps that target versions of .NET Framework starting with .NET Framework 4.7, this behavior is enabled by default.
 
 If this behavior is not desirable, you can opt out of this feature by adding the following line to the `<runtime>` section of the app.config or web.config file:
 
diff --git a/docs/framework/misc/security-and-public-read-only-array-fields.md b/docs/framework/misc/security-and-public-read-only-array-fields.md
@@ -9,7 +9,8 @@ ms.assetid: 3df28dee-2a9f-40ff-9852-bfdbe59c27f3
 Never use read-only public array fields from managed libraries to define the boundary behavior or security of your applications because read-only public array fields can be modified.  
   
 ## Remarks  
- Some .NET framework classes include read-only public fields that contain platform-specific boundary parameters.  For example, the <xref:System.IO.Path.InvalidPathChars> field is an array that describes the characters that are not allowed in a file path string.  Many similar fields are present throughout the .NET Framework.  
+
+Some .NET classes include read-only public fields that contain platform-specific boundary parameters. For example, the <xref:System.IO.Path.InvalidPathChars> field is an array that describes the characters that are not allowed in a file path string. Many similar fields are present throughout .NET.  
   
  The values of public read-only fields like <xref:System.IO.Path.InvalidPathChars> can be modified by your code or code that shares your code’s application domain.  You should not use read-only public array fields like this to define the boundary behavior of your applications.  If you do, malicious code can alter the boundary definitions and use your code in unexpected ways.  
   
diff --git a/docs/framework/network-programming/tls.md b/docs/framework/network-programming/tls.md
@@ -134,7 +134,7 @@ These versions of the WCF framework are hardcoded to use values SSL 3.0 and TLS
 
 ## If your app targets .NET Framework 3.5
 
-If you must explicitly set a security protocol instead of letting the .NET framework or the OS pick the security protocol, add `SecurityProtocolTypeExtensions` and `SslProtocolsExtension` enumerations to your code. `SecurityProtocolTypeExtensions` and `SslProtocolsExtension` include values for `Tls12`, `Tls11`, and the `SystemDefault` value. See [Support for TLS System Default Versions included in .NET Framework 3.5 on Windows 8.1 and Windows Server 2012 R2](https://support.microsoft.com/help/3154520/support-for-tls-system-default-versions-included-in-the--net-framework).
+If you must explicitly set a security protocol instead of letting .NET or the OS pick the security protocol, add `SecurityProtocolTypeExtensions` and `SslProtocolsExtension` enumerations to your code. `SecurityProtocolTypeExtensions` and `SslProtocolsExtension` include values for `Tls12`, `Tls11`, and the `SystemDefault` value. For more information, see [Support for TLS System Default Versions included in .NET Framework 3.5 on Windows 8.1 and Windows Server 2012 R2](https://support.microsoft.com/help/3154520/support-for-tls-system-default-versions-included-in-the--net-framework).
 
 <a name="configuring-security-via-appcontext-switches"></a>
 
@@ -203,7 +203,7 @@ If your app targets .NET Framework 4.7 or later versions, this key defaults to a
 
 For more info, see [Cumulative Update for Windows 10 Version 1511 and Windows Server 2016 Technical Preview 4: May 10, 2016](https://support.microsoft.com/help/3156421/cumulative-update-for-windows-10-version-1511-and-windows-server-2016).
 
-For more information with .NET framework 3.5.1, see [Support for TLS System Default Versions included in .NET Framework 3.5.1 on Windows 7 SP1 and Server 2008 R2 SP1](https://support.microsoft.com/help/3154518/support-for-tls-system-default-versions-included-in-the--net-framework).
+For more information with .NET Framework 3.5.1, see [Support for TLS System Default Versions included in .NET Framework 3.5.1 on Windows 7 SP1 and Server 2008 R2 SP1](https://support.microsoft.com/help/3154518/support-for-tls-system-default-versions-included-in-the--net-framework).
 
 The following _.REG_ file sets the registry keys and their variants to their most safe values:
 
diff --git a/docs/framework/wcf/add-service-reference-in-a-portable-subset-project.md b/docs/framework/wcf/add-service-reference-in-a-portable-subset-project.md
@@ -4,7 +4,8 @@ ms.date: "03/30/2017"
 ms.assetid: 61ccfe0f-a34b-40ca-8f5e-725fa1b8095e
 ---
 # Add Service Reference in a Portable Subset Project
-Portable subset projects enable .NET assembly programmers to maintain a single source tree and build system while still supporting multiple .NET implementations (desktop, Silverlight, Windows Phone, and XBOX). Portable subset projects only reference .NET portable libraries which are a .NET framework assembly that can be used on any .NET implementation.  
+
+Portable subset projects enable .NET assembly programmers to maintain a single source tree and build system while still supporting multiple .NET implementations (desktop, Silverlight, Windows Phone, and Xbox). Portable subset projects only reference portable libraries that are .NET assemblies that can be used on any .NET implementation.
   
 ## Add Service Reference Details  
  When adding a service reference in a portable subset project the following restrictions are enforced:  
diff --git a/docs/framework/wcf/migrating-from-net-remoting-to-wcf.md b/docs/framework/wcf/migrating-from-net-remoting-to-wcf.md
@@ -280,7 +280,7 @@ catch (FaultException<CustomerServiceFault> fault)
   
 - **.NET Remoting is a legacy product.** As described in [.NET Remoting](https://docs.microsoft.com/previous-versions/dotnet/netframework-4.0/72x4h507%28v=vs.100%29), it is considered a legacy product and is not recommended for new development. WCF or ASP.NET Web API are recommended for new and existing applications.  
   
-- **WCF uses cross-platform standards.** WCF was designed with cross-platform interoperability in mind and supports many industry standards (SOAP, WS-Security, WS-Trust, etc.). A WCF service can interoperate with clients running on operating systems other than Windows. Remoting was designed primarily for environments where both the server and client applications run using the .NET framework on a Windows operating system.  
+- **WCF uses cross-platform standards.** WCF was designed with cross-platform interoperability in mind and supports many industry standards (SOAP, WS-Security, WS-Trust, etc.). A WCF service can interoperate with clients running on operating systems other than Windows. Remoting was designed primarily for environments where both the server and client applications run using .NET Framework on a Windows operating system.
   
 - **WCF has built-in security.** WCF was designed with security in mind and offers many options for authentication, transport level security, message level security, etc. Remoting was designed to make it easy for applications to interoperate but was not designed to be secure in non-trusted environments. WCF was designed to work in both trusted and non-trusted environments.  
   
diff --git a/docs/framework/wcf/wcf-and-aspnet-web-api.md b/docs/framework/wcf/wcf-and-aspnet-web-api.md
@@ -16,7 +16,7 @@ WCF is Microsoft’s unified programming model for building service-oriented app
 |Supports building services with WS-* standards like Reliable Messaging, Transactions, Message Security.|Uses basic protocol and formats such as HTTP, WebSockets, SSL, JSON, and XML. There is no support for higher level protocols such as Reliable Messaging or Transactions.|  
 |Supports Request-Reply, One Way, and Duplex message exchange patterns.|HTTP is request/response but additional patterns can be supported through [SignalR](https://github.com/SignalR/SignalR) and WebSockets integration.|  
 |WCF SOAP services can be described in WSDL allowing automated tools to generate client proxies even for services with complex schemas.|There is a variety of ways to describe a Web API ranging from auto-generated HTML help page describing snippets to structured metadata for OData integrated APIs.|  
-|Ships with the .NET framework.|Ships with .NET framework but is open-source and is also available out-of-band as independent download.|  
+|Ships with the .NET Framework.|Ships with .NET Framework but is open-source and is also available out-of-band as independent download.|  
   
  Use WCF to create reliable, secure web services that are accessible over a variety of transports. Use ASP.NET Web API to create HTTP-based services that are accessible from a wide variety of clients. Use ASP.NET Web API if you are creating and designing new REST-style services. Although WCF provides some support for writing REST-style services, the support for REST in ASP.NET Web API is more complete and all future REST feature improvements will be made in ASP.NET Web API. If you have an existing WCF service and you want to expose additional REST endpoints, use WCF and the <xref:System.ServiceModel.WebHttpBinding>.  
   
diff --git a/docs/framework/wcf/wcf-simplification-features.md b/docs/framework/wcf/wcf-simplification-features.md
@@ -73,7 +73,7 @@ WCF now has support for contract-first development. The svcutil.exe tool has a /
 
 ## Add Service Reference From a Portable Subset Project
 
-Portable subset projects enable .NET assembly programmers to maintain a single source tree and build system while still supporting multiple .NET implementations (desktop, Silverlight, Windows Phone, and XBOX). Portable subset projects only reference .NET portable libraries which are a .NET framework assembly that can be used on any .NET implementation. The developer experience is the same as adding a service reference within any other WCF client application. For more information, see [Add Service Reference in a Portable Subset Project](add-service-reference-in-a-portable-subset-project.md).
+Portable subset projects enable .NET assembly programmers to maintain a single source tree and build system while still supporting multiple .NET implementations (desktop, Silverlight, Windows Phone, and Xbox). Portable subset projects only reference .NET portable libraries that are assemblies that can be used on any .NET implementation. The developer experience is the same as adding a service reference within any other WCF client application. For more information, see [Add Service Reference in a Portable Subset Project](add-service-reference-in-a-portable-subset-project.md).
 
 ## ASP.NET Compatibility Mode Default Changed
 
diff --git a/docs/framework/wcf/whats-new.md b/docs/framework/wcf/whats-new.md
@@ -31,7 +31,7 @@ WCF now has support for contract-first development. The svcutil.exe has a /servi
 
 ### Add Service Reference from a Portable Subset Project
 
-Portable subset projects enable .NET assembly programmers to maintain a single source tree and build system while still supporting multiple .NET platforms (desktop, Silverlight, Windows Phone, and XBOX). Portable subset projects only reference .NET portable libraries which are a .NET framework assembly that can be used on any .NET platform. The developer experience is the same as adding a service reference within any other WCF client application. For more information, see [Add Service Reference in a Portable Subset Project](add-service-reference-in-a-portable-subset-project.md).
+Portable subset projects enable .NET assembly programmers to maintain a single source tree and build system while still supporting multiple .NET platforms (desktop, Silverlight, Windows Phone, and Xbox). Portable subset projects only reference .NET portable libraries that are assemblies that can be used on any .NET platform. The developer experience is the same as adding a service reference within any other WCF client application. For more information, see [Add Service Reference in a Portable Subset Project](add-service-reference-in-a-portable-subset-project.md).
 
 ### ASP.NET Compatibility Mode Default Changed
 
diff --git a/docs/framework/wpf/advanced/wpf-globalization-and-localization-overview.md b/docs/framework/wpf/advanced/wpf-globalization-and-localization-overview.md
@@ -209,11 +209,11 @@ On German Windows, if this resources.dll is placed in a de-DE folder next to the
 |Code|Original English BAML|Localized BAML|
 |Culturally neutral resources|Other resources in English|Other resources localized to German|
 
-The .NET framework automatically chooses which satellite resources assembly to load based on the application's `Thread.CurrentThread.CurrentUICulture`. This defaults to the culture of your Windows OS. So if you are using German Windows, the de-DE\MyDialog.resources.dll loads, if you are using English Windows, the en-US\MyDialog.resources.dll loads. You can set the ultimate fallback resource for your application by specifying the NeutralResourcesLanguage in your project's AssemblyInfo.\*. For example if you specify:
+.NET automatically chooses which satellite resources assembly to load based on the application's <xref:System.Threading.Thread.CurrentUICulture%2A?displayProperty=nameWithType>. This defaults to the culture of your Windows OS. If you're using German Windows, the *de-DE\MyDialog.resources.dll* file loads. If you're using English Windows, the *en-US\MyDialog.resources.dll* file loads. You can set the ultimate fallback resource for your application by specifying the `NeutralResourcesLanguage` attribute in your project’s *AssemblyInfo* file. For example, if you specify:
 
 `[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]`
 
-then the en-US\MyDialog.resources.dll will be used with German Windows if a de-DE\MyDialog.resources.dll or de\MyDialog.resources.dll are both unavailable.
+then the *en-US\MyDialog.resources.dll* file is used with German Windows if neither of the following files are available: *de-DE\MyDialog.resources.dll* or *de\MyDialog.resources.dll*.
 
 ### Microsoft Saudi Arabia Homepage
 
diff --git a/docs/visual-basic/programming-guide/com-interop/com-interoperability-in-net-framework-applications.md b/docs/visual-basic/programming-guide/com-interop/com-interoperability-in-net-framework-applications.md
@@ -2,7 +2,7 @@
 title: "COM Interoperability in .NET Framework Applications"
 ms.date: 07/20/2015
 helpviewer_keywords: 
-  - "interoperability, COM and .NET framework objects"
+  - "interoperability, COM and .NET Framework objects"
   - "COM interop [Visual Basic]"
   - "shared components"
 ms.assetid: f5a72143-c268-4dff-a019-974ad940e17d
diff --git a/docs/visual-basic/programming-guide/concepts/async/handling-reentrancy-in-async-apps.md b/docs/visual-basic/programming-guide/concepts/async/handling-reentrancy-in-async-apps.md
@@ -11,7 +11,7 @@ When you include asynchronous code in your app, you should consider and possibly
 > To run the example, you must have Visual Studio 2012 or newer and the .NET Framework 4.5 or newer installed on your computer.
 
 > [!NOTE]
-> Transport Layer Security (TLS) version 1.2 is now the minimum version to use in your app development. If your app targets a .NET framework version earlier than 4.7, please refer to the following article for [Transport Layer Security (TLS) best practices with the .NET Framework](../../../../framework/network-programming/tls.md) 
+> Transport Layer Security (TLS) version 1.2 is now the minimum version to use in your app development. If your app targets a .NET Framework version earlier than 4.7, refer to the following article for [Transport Layer Security (TLS) best practices with the .NET Framework](../../../../framework/network-programming/tls.md).
 
 ## <a name="BKMK_RecognizingReentrancy"></a> Recognizing Reentrancy
 
diff --git a/includes/migration-guide/retargeting/ef/entity-framework-version-must-match-net.md b/includes/migration-guide/retargeting/ef/entity-framework-version-must-match-net.md
@@ -2,7 +2,7 @@
 
 |   |   |
 |---|---|
-|Details|The entity framework version should be matched with the .NET framework version. Entity Framework 5 is recommended for .NET Framework 4.5. There are some known issues with EF 4.x in a .NET Framework 4.5 project around <xref:System.ComponentModel.DataAnnotations>. In .NET 4.5, these were moved to a different assembly, so there are issues determining which annotations to use.|
+|Details|The Entity Framework (EF) version should be matched with the .NET Framework version. Entity Framework 5 is recommended for .NET Framework 4.5. There are some known issues with EF 4.x in a .NET Framework 4.5 project around <xref:System.ComponentModel.DataAnnotations>. In .NET Framework 4.5, these were moved to a different assembly, so there are issues determining which annotations to use.|
 |Suggestion|Upgrade to Entity Framework 5 for .NET Framework 4.5|
 |Scope|Major|
 |Version|4.5|
diff --git a/includes/migration-guide/retargeting/wcf/serialization-control-characters-with-datacontractjsonserializer-now.md b/includes/migration-guide/retargeting/wcf/serialization-control-characters-with-datacontractjsonserializer-now.md
