Merge to live

iis/TOC.yml

@@ -282,10 +282,6 @@
           href: manage/configuring-security/analyzing-client-usage-data-with-iis-user-access-logging.md
         - name: Configure Request Filtering in IIS
           href: manage/configuring-security/configure-request-filtering-in-iis.md
-        - name: IIS 8 - Certificate Management and Deployment
-          href: manage/configuring-security/iis-8-certificate-management-and-deployment.md
-        - name: IIS 8 - Sandboxing and Security
-          href: manage/configuring-security/iis-8-sandboxing-and-security.md
     - name: Managing Performance Settings
       items: 
         - name: Improving Performance with Native Output Caching
@@ -296,8 +292,6 @@
           href: manage/managing-performance-settings/walkthrough-iis-output-caching.md
         - name: Configure IIS 7 Output Caching
           href: manage/managing-performance-settings/configure-iis-7-output-caching.md
-        - name: Use Bit Rate Throttling
-          href: manage/managing-performance-settings/use-bit-rate-throttling.md
     - name: Managing your Configuration Settings
       items: 
         - name: Delegating Configuration to web.config Files
@@ -602,8 +596,6 @@
           href: troubleshoot/using-failed-request-tracing/troubleshooting-failed-requests-using-tracing-in-iis.md
         - name: Using Failed Request Tracing Rules to Troubleshoot Application Request Routing
           href: troubleshoot/using-failed-request-tracing/using-failed-request-tracing-rules-to-troubleshoot-application-request-routing-arr.md
-        - name: Troubleshoot with Failed Request Tracing
-          href: troubleshoot/using-failed-request-tracing/troubleshoot-with-failed-request-tracing.md
         - name: Troubleshooting Failed Requests Using Tracing in IIS 8.5
           href: troubleshoot/using-failed-request-tracing/troubleshooting-failed-requests-using-tracing-in-iis-85.md
     - name: Performance Issues
@@ -707,8 +699,6 @@
           href: extensions/troubleshooting-application-request-routing/troubleshooting-502-errors-in-arr.md
     - name: URL Rewrite Module
       items: 
-        - name: URL Rewrite Module - Video Walkthrough
-          href: extensions/url-rewrite-module/url-rewrite-module-video-walkthrough.md
         - name: Using the URL Rewrite Module
           href: extensions/url-rewrite-module/using-the-url-rewrite-module.md
         - name: Creating Rewrite Rules for the URL Rewrite Module
@@ -773,8 +763,6 @@
           href: extensions/introduction-to-iis-express/iis-75-express-readme.md
         - name: IIS 8.0 Express Readme
           href: extensions/introduction-to-iis-express/iis-80-express-readme.md
-        - name: IIS 8 - IIS Express for Developers
-          href: extensions/introduction-to-iis-express/iis-8-iis-express-for-developers.md
     - name: Using IIS Express
       items: 
         - name: Using the Windows System Tray to Manage Websites and Applications
@@ -972,8 +960,6 @@
           href: web-hosting/getting-started/deploying-a-static-content-server.md
         - name: Using Windows SharePoint Services 3.0 on IIS 7.0
           href: web-hosting/getting-started/using-windows-sharepoint-services-30-on-iis.md
-        - name: Microsoft Web Platform Privacy Statements
-          href: web-hosting/getting-started/microsoft-web-platform-privacy-statements.md
     - name: Frequently Asked Questions (FAQ)
       items: 
         - name: Tools and Utilities Questions
@@ -998,12 +984,8 @@
           href: web-hosting/migrate-to-the-microsoft-web-platform/breaking-changes-for-aspnet-4-apps-running-on-iis-7-integrated-mode.md
         - name: IIS 7 for Apache Administrators
           href: web-hosting/migrate-to-the-microsoft-web-platform/iis-for-apache-administrators.md
-        - name: Migrate to a Windows-Based Platform
-          href: web-hosting/migrate-to-the-microsoft-web-platform/migrate-to-a-windows-based-platform.md
         - name: Migrate from MySQL to SQL Server 2008
           href: web-hosting/migrate-to-the-microsoft-web-platform/migrate-from-mysql-to-sql-server-2008.md
-        - name: How to Migrate to the Microsoft Web Platform
-          href: web-hosting/migrate-to-the-microsoft-web-platform/how-to-migrate-to-the-microsoft-web-platform.md
     - name: Configuring Components
       items: 
         - name: Enabling LINQ with ASP.NET
@@ -1054,8 +1036,6 @@
           href: web-hosting/configuring-servers-in-the-windows-web-platform/sql-server-2005.md
         - name: SQL 2008 for Hosters
           href: web-hosting/configuring-servers-in-the-windows-web-platform/sql-2008-for-hosters.md
-        - name: Configure your Servers for the Windows Web Hosting Platform
-          href: web-hosting/configuring-servers-in-the-windows-web-platform/configure-your-servers-for-the-windows-web-hosting-platform.md
     - name: Installing Infrastructure Components
       items: 
         - name: Planning the Deployment

iis/configuration/system.applicationHost/sites/site/bindings/binding.md

@@ -101,7 +101,7 @@ You can add `<binding>` elements within the `<bindings>` element for each site i
 | --- | --- |
 | `bindingInformation` | Required string attribute.<br><br>Specifies information to communicate with a site. For example, a Web site binding includes the IP address (or unspecified IP addresses), the port number, and an optional host header used to communicate with the site. |
 | `protocol` | Required string attribute.<br><br>Specifies the protocol for communicating with a site. |
-| `sslFlags` | Optional uint attribute.<br><br>Specifies the type of binding used for Secure Sockets Layer (SSL) certificates.<br><ul> <li>A value of "0" specifies that the secure connection be made using an IP/Port combination. Only one certificate can be bound to a combination of IP address and the port.</li> <li>A value of "1" specifies that the secure connection be made using the port number and the host name obtained by using Server Name Indication (SNI).</li> <li>A value of "2" specifies that the secure connection be made using the centralized SSL certificate store without requiring a Server Name Indicator.</li> <li>A value of "3" specifies that the secure connection be made using the centralized SSL certificate store while requiring Server Name Indicator</li></ul> Centralized SSL certificate support enables you to create a centralized certificate store that can contain multiple certificate files. You can name the certificate files to correspond to the host names that they contain. This enables you to create a binding that only requires a port, rather than an IP/port or a host name/port combination. When a request comes in, IIS matches the port, determines the host name from the request, and searches the centralized certificate store for a certificate file with a matching name. It uses that certificate. <br><br> With a Server Name Indicator (SNI), the host name is exchanged as part of the SSL handshake. SNI is enabled in the Add Site Binding dialog box when you add a binding with a type of HTTPS. This is especially useful for SSL connections that host multiple servers on a single network address. For more information, see [IIS 8.0 Server Name Indication (SNI): SSL Scalability](/iis/get-started/whats-new-in-iis-8/iis-80-server-name-indication-sni-ssl-scalability). <br><br>The sslFlags attribute is only set when the protocol is **https**. The default value is `0`. |
+| `sslFlags` | Optional `uint` attribute that works like flags type, with the following possible flags: <table> <tbody> <tr> <th>Value</th> <th>Description</th></tr> <tr> <th><code>0</code></th> <td>The secure connection made using an IP/Port combination. Only one certificate can be bound to a combination of IP address and the port.</td></tr> <tr> <th><code>1</code></th> <td>The secure connection made using the port number and the host name obtained by using Server Name Indication (SNI).</td></tr> <tr> <th><code>2</code></th> <td>The secure connection be made using the centralized SSL certificate store.</td></tr> <tr> <th><code>4</code></th> <td>Disable HTTP/2.</td></tr> <tr> <th><code>8</code></th> <td>Disable OCSP Stapling.</td></tr> <tr> <th><code>16</code></th> <td>Disable QUIC.</td></tr> <tr> <th><code>32</code></th> <td>Disable TLS 1.3 over TCP.</td></tr> <tr> <th><code>64</code></th> <td>Disable Legacy TLS.</td></tr> </tbody></table> Centralized SSL certificate support enables creating a centralized certificate store that can contain multiple certificate files. The certificate files can be named to correspond to the host names that they contain. This enables creating a binding that only requires a port, rather than an IP/port or a host name/port combination. When a request comes in, IIS matches the port, determines the host name from the request, and searches the centralized certificate store for a certificate file with a matching name. It uses that certificate. <br><br> With a Server Name Indicator (SNI), the host name is exchanged as part of the SSL handshake. SNI is enabled in the **Add Site Binding** dialog box when adding a binding with a type of HTTPS. This is useful for SSL connections that host multiple servers on a single network address. <br><br> Values greater than 4 are only supported in IIS 10 version 1809 and higher. The default value is `0`. |
 
 ### Child Elements
 

iis/configuration/system.applicationHost/sites/siteDefaults/bindings/binding.md

@@ -76,7 +76,7 @@ You can add default `<binding>` elements within the `<bindings>` element in the
 | --- | --- |
 | `bindingInformation` | Required string attribute.<br><br>Specifies information to communicate with a site. For example, a Web site binding includes the IP address (or unspecified IP addresses), the port number, and an optional host header used to communicate with the site. |
 | `protocol` | Required string attribute.<br><br>Specifies the protocol for communicating with a site. |
-| `sslFlags` | Optional uint attribute.<br><br>Specifies the type of binding used for Secure Sockets Layer (SSL) certificates.<br><ul> <li>A value of "0" specifies that the secure connection be made using an IP/Port combination. Only one certificate can be bound to a combination of IP address and the port.</li> <li>A value of "1" specifies that the secure connection be made using the port number and the host name obtained by using Server Name Indication (SNI).</li> <li>A value of "2" specifies that the secure connection be made using the centralized SSL certificate store without requiring Server Name Indicator (SNI)</li> <li>A value of "3" specifies that the secure connection be made using the centralized SSL certificate store while requiring Server Name Indicator (SNI)</li></ul> Centralized SSL certificate support enables you to create a centralized certificate store that can contain multiple certificate files. You can name the certificate files to correspond to the host names that they contain. This enables you to create a binding that only requires a port, rather than an IP/port or a host name/port combination. When a request comes in, IIS matches the port, determines the host name from the request, and searches the centralized certificate store for a certificate file with a matching name. It uses that certificate. <br><br> With a Server Name Indicator (SNI), the host name is exchanged as part of the SSL handshake. SNI is enabled in the Add Site Binding dialog box when you add a binding with a type of HTTPS. This is especially useful for SSL connections that host multiple servers on a single network address. <br><br> The default value is `0`. |
+| `sslFlags` | Optional `uint` attribute that works like flags type, with the following possible flags: <table> <tbody> <tr> <th>Value</th> <th>Description</th></tr> <tr> <th><code>0</code></th> <td>The secure connection made using an IP/Port combination. Only one certificate can be bound to a combination of IP address and the port.</td></tr> <tr> <th><code>1</code></th> <td>The secure connection made using the port number and the host name obtained by using Server Name Indication (SNI).</td></tr> <tr> <th><code>2</code></th> <td>The secure connection be made using the centralized SSL certificate store.</td></tr> <tr> <th><code>4</code></th> <td>Disable HTTP/2.</td></tr> <tr> <th><code>8</code></th> <td>Disable OCSP Stapling.</td></tr> <tr> <th><code>16</code></th> <td>Disable QUIC.</td></tr> <tr> <th><code>32</code></th> <td>Disable TLS 1.3 over TCP.</td></tr> <tr> <th><code>64</code></th> <td>Disable Legacy TLS.</td></tr> </tbody></table> Centralized SSL certificate support enables creating a centralized certificate store that can contain multiple certificate files. The certificate files can be named to correspond to the host names that they contain. This enables creating a binding that only requires a port, rather than an IP/port or a host name/port combination. When a request comes in, IIS matches the port, determines the host name from the request, and searches the centralized certificate store for a certificate file with a matching name. It uses that certificate. <br><br> With a Server Name Indicator (SNI), the host name is exchanged as part of the SSL handshake. SNI is enabled in the **Add Site Binding** dialog box when adding a binding with a type of HTTPS. This is useful for SSL connections that host multiple servers on a single network address. <br><br> Values greater than 4 are only supported in IIS 10 version 1809 and higher. The default value is `0`. |
 
 ### Child Elements
 

iis/extensions/url-rewrite-module/using-custom-rewrite-providers-with-url-rewrite-module.md

@@ -15,7 +15,7 @@ This walkthrough will guide you through how to use custom rewrite providers with
 
 ## Install URL Rewrite Extensibility Samples
 
-In order to complete this walkthrough, download and install URL Rewrite Extensibility Samples (`https://www.microsoft.com/download/details.aspx?id=43353`). The Extensibility Samples installation package includes .NET assemblies and the source code with full implementation of rewrite providers for the three most common use cases:
+In order to complete this walkthrough, download and install [IIS URL Rewrite 2.1](https://iis-umbraco.azurewebsites.net/downloads/microsoft/url-rewrite). The URL Rewrite Extensibility Samples for 2.0 are no longer available.
 
 - Storing of the rewrite or redirect mappings in a SQL database;
 - Storing of the rewrite or redirect mappings in a text file;

iis/extensions/url-rewrite-module/using-the-url-rewrite-module.md

@@ -87,10 +87,6 @@ These articles cover the functionality of the URL Rewrite Module and explain how
 - [URL Rewrite for ASP.NET Web Forms](url-rewriting-for-aspnet-web-forms.md)
 - [Developing rule templates for the URL Rewrite module](developing-rule-template-for-url-rewrite-module.md)
 
-### Video walkthrough
-
-- [Using the URL rewrite module - video walkthrough](url-rewrite-module-video-walkthrough.md)
-
 ## Changes since Go Live release
 
 The following additions, changes, and important bug fixes have been made to URL rewrite module since the Go Live release:

iis/get-started/whats-new-in-iis-10/new-features-introduced-in-iis-10.md

@@ -28,7 +28,7 @@ Learn more: [Introducing IIS on Nano Server](introducing-iis-on-nano-server.md)
 
 Windows Server 2016 and Windows 10 with the Anniversary Update add support for containers which are isolated, resource controlled, and portable operating environments. Windows Server 2016 and Windows 10 support two different container runtimes with a different degree of isolation: Windows containers achieve isolation through process and namespace isolation, while Hyper-V containers achieve isolation through lightweight virtual machines. IIS 10.0 runs in both container runtimes as well as on both base OS images, Server Core and Nano Server, allowing you to choose the best Windows container environment for your web workloads.
 
-Get started with [IIS base images available on Docker Hub](https://hub.docker.com/r/microsoft/iis/) or follow this tutorial to [deploy an ASP.NET MVC application to IIS running inside a container](/aspnet/mvc/overview/deployment/docker-aspnetmvc).
+Get started with [IIS base images available on Docker Hub](https://hub.docker.com/r/microsoft/windows-servercore-iis/) or follow this tutorial to [deploy an ASP.NET MVC application to IIS running inside a container](/aspnet/mvc/overview/deployment/docker-aspnetmvc).
 
 ## Managing IIS
 

iis/manage/configuring-security/application-pool-identities.md

@@ -54,11 +54,11 @@ You can try this by selecting a file in Windows Explorer and adding the "Default
 4. Select the **Security** tab
 5. Click the **Edit** button and then **Add** button
 6. Click the **Locations** button and make sure that you select your computer.
-
-    ![Screenshot of the Select Users or Groups dialog.](application-pool-identities/_static/image9.jpg)
 7. Enter **IIS AppPool\DefaultAppPool** in the **Enter the object names to select:** text box.
 8. Click the **Check Names** button and click **OK**.
 
+    ![Screenshot of the Select Users or Groups dialog.](application-pool-identities/_static/image9.jpg)
+
 By doing this, the file or directory you selected will now also allow the **DefaultAppPool** identity access.
 
 You can do this via the command-line by using the ICACLS tool. The following example gives full access to the DefaultAppPool identity.