Merge to live

aspnet/mvc/overview/older-versions/mvc-music-store/mvc-music-store-part-7.md

@@ -68,13 +68,15 @@ Fill in the user information fields on the left using the following information:
 | **Field** | **Value** |
 | --- | --- |
 | **User Name** | Administrator |
-| **Password** | password123! |
-| **Confirm Password** | password123! |
+| **Password** |  |
+| **Confirm Password** |  |
 | **E-mail** | (any email address will work) |
 | **Security Question** | (whatever you like) |
 | **Security Answer** | (whatever you like) |
 
-*Note: You can of course use any password you'd like. The default password security settings require a password that is 7 characters long and contains one non-alphanumeric character.*
+**Note**: 
+* In the preceding table, the password has been ommited.
+* You can of course use any password you'd like. The default password security settings require a password that is 7 characters long and contains one non-alphanumeric character.
 
 Select the Administrator role for this user, and click the Create User button.
 

aspnet/toc.yml

@@ -3070,8 +3070,6 @@
               href: identity/overview/features-api/best-practices-for-deploying-passwords-and-other-sensitive-data-to-aspnet-and-azure.md
             - name: Account Confirmation and Password Recovery with ASP.NET Identity (C#)
               href: identity/overview/features-api/account-confirmation-and-password-recovery-with-aspnet-identity.md
-            - name: Two-factor authentication using SMS and email with ASP.NET Identity
-              href: identity/overview/features-api/two-factor-authentication-using-sms-and-email-with-aspnet-identity.md
         - name: Extensibility
           href: identity/overview/extensibility/index.md
           items: 

aspnet/web-forms/overview/deployment/web-deployment-in-the-enterprise/deploying-web-packages.md

@@ -136,7 +136,7 @@ MSDeploy V3 supports authentication with an access token, also known as a bearer
            $CREDENTIAL_PLACEHOLDER$,
            authtype="Bearer",
            includeAcls="False",
-           Password="{token}"
+           Password="{-token:}"
      -verb:sync
      -disableLink:AppPoolExtension
      -disableLink:ContentExtension

aspnet/web-forms/overview/deployment/web-deployment-in-the-enterprise/deploying-web-packages/samples/sample1.cmd

@@ -2,7 +2,7 @@
                           [/M:<computer name>]
                           [/A:<Basic | NTLM>]
                           [/U:<user name>]
-                          [/P:<password>]
+                          [/P:</pass/word>]
                           [/L]
                           [/G:<true | false>]
-                          [Additional MSDeploy.exe flags]
+                          [Additional MSDeploy.exe flags]

aspnet/web-forms/overview/older-versions-security/admin/recovering-and-changing-passwords-cs.md

@@ -73,8 +73,6 @@ The mail delivery configuration is specified through the [`<system.net>` element
 > [!NOTE]
 > `<system.net>` is a child element of the root `<configuration>` element and a sibling of `<system.web>`. Therefore, do not put the `<system.net>` element within the `<system.web>` element; instead, put it at the same level.
 
-[!code-xml[Main](recovering-and-changing-passwords-cs/samples/sample1.xml)]
-
 In addition to using an SMTP server on the network, you can alternatively specify a pickup directory where email messages to be sent should be deposited.
 
 Once you have configured the SMTP settings, visit the `RecoverPassword.aspx` page through a browser. First try entering a username that doesn't exist in the user store. As Figure 2 shows, the PasswordRecovery control displays a message indicating that the user information could not be accessed. The text of the message can be customized through the control's [`UserNameFailureText` property](https://msdn.microsoft.com/library/system.web.ui.webcontrols.passwordrecovery.usernamefailuretext.aspx).

aspnet/web-forms/overview/older-versions-security/admin/recovering-and-changing-passwords-vb.md

@@ -73,8 +73,6 @@ The mail delivery configuration is specified through the [`<system.net>` element
 > [!NOTE]
 > `<system.net>` is a child element of the root `<configuration>` element and a sibling of `<system.web>`. Therefore, do not put the `<system.net>` element within the `<system.web>` element; instead, put it at the same level.
 
-[!code-xml[Main](recovering-and-changing-passwords-vb/samples/sample1.xml)]
-
 In addition to using an SMTP server on the network, you can alternatively specify a pickup directory where email messages to be sent should be deposited.
 
 Once you have configured the SMTP settings, visit the `RecoverPassword.aspx` page through a browser. First try entering a username that doesn't exist in the user store. As Figure 2 shows, the PasswordRecovery control displays a message indicating that the user information could not be accessed. The text of the message can be customized through the control's [`UserNameFailureText` property](https://msdn.microsoft.com/library/system.web.ui.webcontrols.passwordrecovery.usernamefailuretext.aspx).

aspnet/web-pages/overview/security/16-adding-security-and-membership.md

@@ -68,8 +68,6 @@ The following procedure describes how to create the site and configure it.
 3. In the left pane, click the **Files** workspace selector.
 4. In the root folder of your website, open the *\_AppStart.cshtml* file, which is a special file that's used to contain global settings. It contains some statements that are commented out using the `//` characters:
 
-    [!code-csharp[Main](16-adding-security-and-membership/samples/sample1.cs)]
-
     These statements configure the `WebMail` helper, which can be used to send email. The membership system can use email to send confirmation messages when users register or when they want to change their passwords. (For example, after users register, they get an email that includes a link that they can click in order to finish the registration process.)
 
     Sending email requires access to an SMTP server, as described in [Adding Email to an ASP.NET Web Pages Site](https://go.microsoft.com/fwlink/?LinkId=202899). You'll store the email settings in this central *\_AppStart.cshtml* file so that you don't have to code them repeatedly into each page that can send email. (You don't need to configure SMTP settings to set up a registration database; you only need SMTP settings if you want to validate users from their email alias and let users reset a forgotten password.)