Merge pull request #3410 from dotnet/master

Update live with current master

Author: mairaw

.openpublishing.publish.config.json

@@ -13,16 +13,17 @@
       "type_mapping": {
         "Conceptual": "Content",
         "ManagedReference": "Content",
-        "RestApi": "Content",
+        "NetEnum": "Content",
+        "NetDelegate": "Content",
+        "NetNamespace": "Content",
+        "NetMember": "Content",
+        "NetType": "Content",
         "Tutorial": "Content"
       },
       "build_entry_point": "docs",
       "template_folder": "_themes",
       "base_path": "dotnet",
       "site_name": "Docs",
-      "customized_template_paths": [
-        "_dependentPackages/memberpage.plugins/content"
-      ],
       "customized_tasks": {
         "docset_prebuild": [
           "_dependentPackages/ECMA2Yaml/tools/Run.ps1",
@@ -36,7 +37,8 @@
       "ECMA2Yaml": {
         "SourceXmlFolder": "xml",
         "OutputYamlFolder": "api",
-        "Flatten": true
+        "Flatten": true,
+        "SDPMode": true
       },
       "SplitTOC": [
         "api/toc.yml"
@@ -103,13 +105,6 @@
       "target_framework": "net45",
       "version": "latest"
     },
-    {
-      "id": "memberpage.plugins",
-      "nuget_feed": "https://www.myget.org/F/docfx/api/v2",
-      "path_to_root": "_dependentPackages/memberpage.plugins",
-      "target_framework": "net45",
-      "version": "latest"
-    },
     {
       "id": "Microsoft.OpenPublishing.CommonPlugins",
       "nuget_feed": "https://www.myget.org/F/op/api/v2",

_zip/missingapi.yml

@@ -1,6 +1,18 @@
 ### YamlMime:XRefMap
 hrefUpdated: true
 references:
+- uid: System.MonoNotSupportedAttribute
+  name: MonoNotSupportedAttribute
+  fullname: System.MonoNotSupportedAttribute
+- uid: System.ServiceModel.Configuration.ServiceModelEnumValidatorAttribute
+  name: ServiceModelEnumValidatorAttribute
+  fullname: System.ServiceModel.Configuration.ServiceModelEnumValidatorAttribute
+- uid: System.ServiceModel.Configuration.ServiceModelTimeSpanValidatorAttribute
+  name: ServiceModelTimeSpanValidatorAttribute
+  fullname: System.ServiceModel.Configuration.ServiceModelTimeSpanValidatorAttribute
+- uid: System.Web.WebCategoryAttribute
+  name: WebCategoryAttribute
+  fullname: System.Web.WebCategoryAttribute
 - uid: System.Windows.Localization.Attributes*
   href: https://msdn.microsoft.com/library/system.windows.localization.attributes.aspx
   name: Attributes
@@ -49,3 +61,18 @@ references:
   name.vb: ResizeGripDirection
   fullName: WindowChrome.ResizeGripDirection
   fullName.vb: WindowChrome.ResizeGripDirection
+- uid: Xunit.FactAttribute
+  name: FactAttribute
+  fullName: Xunit.FactAttribute
+- uid: Xunit.TheoryAttribute
+  name: TheoryAttribute
+  fullName: Xunit.TheoryAttribute
+- uid: Xunit.TheoryData
+  name: TheoryData
+  fullName: Xunit.TheoryData
+- uid: Xunit.MemberDataAttribute
+  name: MemberDataAttribute
+  fullName: Xunit.MemberDataAttribute
+- uid: Xunit.InlineDataAttribute
+  name: InlineDataAttribute
+  fullName: Xunit.InlineDataAttribute

xml/Microsoft.VisualBasic.FileIO/FileSystem.xml

@@ -3400,9 +3400,9 @@
    
   
 ## Examples  
- This example opens a <xref:System.IO.StreamWriter> with the `My.Computer.FileSystem.OpenTextFileWriter` method and uses it to write a string to a text file with the `WriteLine` method of the `StreamWriter` class.  
+ This example opens a <xref:System.IO.StreamWriter> with the `My.Computer.FileSystem.OpenTextFileWriter` method with `Unicode` encoding and uses it to write a string to a text file with the `WriteLine` method of the `StreamWriter` class.  
   
- [!code-vb[VbRefFile#14](~/samples/snippets/visualbasic/VS_Snippets_VBCSharp/VbRefFile/VB/Class1.vb#14)]  
+ [!code-vb[VbRefFile#23](~/samples/snippets/visualbasic/VS_Snippets_VBCSharp/VbRefFile/VB/Class1.vb#23)]  
   
  ]]></format>
         </remarks>

xml/System.Diagnostics.Eventing.Reader/EventLogInformation.xml

@@ -60,7 +60,18 @@
       <Docs>
         <summary>Gets the file attributes of the log file associated with the log.</summary>
         <value>Returns an integer value. This value can be null.</value>
-        <remarks>To be added.</remarks>
+        <remarks>
+          <format type="text/markdown"><![CDATA[  
+  
+## Remarks  
+
+ The values of this property are the same as those of the <xref:System.IO.FileAttributes> type. To make working with this property easier, you can convert the value to that type using the following code:  
+  
+ [!code-csharp[System.Diagnostics.Eventing.Reader.EventLogInformation#1](~/samples/snippets/csharp/VS_Snippets_CLR_System/System.Diagnostics.Eventing.Reader.EventLogInformation/cs/attributes.cs#1)]
+ [!code-vb[System.Diagnostics.Eventing.Reader.EventLogInformation#1](~/samples/snippets/visualbasic/VS_Snippets_CLR_System/System.Diagnostics.Eventing.Reader.EventLogInformation/vb/attributes.vb#1)] 
+
+ ]]></format>
+        </remarks>
         <related type="Article" href="https://msdn.microsoft.com/library/d26107ee-7a80-44d7-b43b-cf774559e4ac">Technology Summary for Reading and Managing Event Logs</related>
         <related type="Article" href="https://msdn.microsoft.com/library/79377aba-b6e5-4e4d-a9be-ea25ce6f1dc5">Event Log Scenarios</related>
       </Docs>

xml/System.IO/File.xml

@@ -1192,7 +1192,7 @@
         <param name="path">The path and name of the file to create.</param>
         <param name="bufferSize">The number of bytes buffered for reads and writes to the file.</param>
         <param name="options">One of the <see cref="T:System.IO.FileOptions" /> values that describes how to create or overwrite the file.</param>
-        <param name="fileSecurity">One of the <see cref="T:System.Security.AccessControl.FileSecurity" /> values that determines the access control and audit security for the file.</param>
+        <param name="fileSecurity">A <see cref="T:System.Security.AccessControl.FileSecurity" /> object that determines the access control and audit security for the file.</param>
         <summary>Creates or overwrites a file in the specified path, specifying a buffer size, options that describe how to create or overwrite the file, and a value that determines the access control and audit security for the file.</summary>
         <returns>A new file with the specified buffer size, file options, and file security.</returns>
         <remarks>