Merge pull request dotnet#6149 from dotnet/master

Update live with current master
mshwf · Jun 27, 2018 · f9e38d3 · f9e38d3
2 parents ed7b4b9 + 143f1a8
commit f9e38d3
Show file tree

Hide file tree

Showing 45 changed files with 980 additions and 1,317 deletions.
diff --git a/docs/core/porting/libraries.md b/docs/core/porting/libraries.md
@@ -67,18 +67,6 @@ Similar to CAS, Security Transparency allows separating sandboxed code from secu
 
 Use security boundaries provided by the operating system, such as virtualization, containers, or user accounts for running processes with the least set of privileges.
 
-### global.json
-
-The *global.json* file is an optional file that allows you to set the .NET Core tools version of a project. If you're using nightly builds of .NET Core and wish to specify a specific version of the SDK, specify the version with a *global.json* file. It typically resides in the current working directory or one of its parent directories. 
-
-```json
-{
-  "sdk": {
-    "version": "2.1.0-preview1-006491"
-  }
-}
-```
-
 ## Converting a PCL project
 
 You can convert the targets of a PCL project to .NET Standard by loading the library in Visual Studio 2017 and performing the following steps:

diff --git a/docs/csharp/language-reference/keywords/byte.md b/docs/csharp/language-reference/keywords/byte.md
@@ -12,7 +12,7 @@ ms.assetid: 111f1db9-ca32-4f0e-b497-4783517eda47
 
 `byte` denotes an integral type that stores values as indicated in the following table.  
 
-|Type|Range|Size|.NET Framework type|  
+|Type|Range|Size|.NET type|  
 |----------|-----------|----------|-------------------------|  
 |`byte`|0 to 255|Unsigned 8-bit integer|<xref:System.Byte?displayProperty=nameWithType>|  
 

diff --git a/docs/csharp/language-reference/keywords/char.md b/docs/csharp/language-reference/keywords/char.md
@@ -14,7 +14,7 @@ The `char` keyword is used to declare an instance of the <xref:System.Char?displ
 
  Unicode characters are used to represent most of the written languages throughout the world.
 
-|Type|Range|Size|.NET Framework type|
+|Type|Range|Size|.NET type|
 |----------|-----------|----------|-------------------------|
 |`char`|U+0000 to U+FFFF|Unicode 16-bit character|<xref:System.Char?displayProperty=nameWithType>|
 

diff --git a/docs/csharp/language-reference/keywords/codesnippet/CSharp/enum_1.cs b/docs/csharp/language-reference/keywords/codesnippet/CSharp/enum_1.cs
diff --git a/docs/csharp/language-reference/keywords/codesnippet/CSharp/enum_2.cs b/docs/csharp/language-reference/keywords/codesnippet/CSharp/enum_2.cs
diff --git a/docs/csharp/language-reference/keywords/codesnippet/CSharp/enum_3.cs b/docs/csharp/language-reference/keywords/codesnippet/CSharp/enum_3.cs
diff --git a/docs/csharp/language-reference/keywords/codesnippet/CSharp/equals_1.cs b/docs/csharp/language-reference/keywords/codesnippet/CSharp/equals_1.cs
diff --git a/docs/csharp/language-reference/keywords/codesnippet/CSharp/explicit_1.cs b/docs/csharp/language-reference/keywords/codesnippet/CSharp/explicit_1.cs
diff --git a/docs/csharp/language-reference/keywords/codesnippet/CSharp/explicit_2.cs b/docs/csharp/language-reference/keywords/codesnippet/CSharp/explicit_2.cs
diff --git a/docs/csharp/language-reference/keywords/codesnippet/CSharp/explicit_3.cs b/docs/csharp/language-reference/keywords/codesnippet/CSharp/explicit_3.cs
diff --git a/docs/csharp/language-reference/keywords/codesnippet/CSharp/explicit_4.cs b/docs/csharp/language-reference/keywords/codesnippet/CSharp/explicit_4.cs
diff --git a/docs/csharp/language-reference/keywords/codesnippet/CSharp/extern_1.cs b/docs/csharp/language-reference/keywords/codesnippet/CSharp/extern_1.cs
diff --git a/docs/csharp/language-reference/keywords/codesnippet/CSharp/false-literal_1.cs b/docs/csharp/language-reference/keywords/codesnippet/CSharp/false-literal_1.cs
diff --git a/docs/csharp/language-reference/keywords/codesnippet/CSharp/false-operator_1.cs b/docs/csharp/language-reference/keywords/codesnippet/CSharp/false-operator_1.cs
diff --git a/docs/csharp/language-reference/keywords/codesnippet/CSharp/float_1.cs b/docs/csharp/language-reference/keywords/codesnippet/CSharp/float_1.cs
diff --git a/docs/csharp/language-reference/keywords/codesnippet/CSharp/from-clause_1.cs b/docs/csharp/language-reference/keywords/codesnippet/CSharp/from-clause_1.cs