Merge 1.1.0 changes back to master.
diff --git a/src/chapters/configuring.xml b/src/chapters/configuring.xml
index 0d13f1d..f4d41a7 100644
--- a/src/chapters/configuring.xml
+++ b/src/chapters/configuring.xml
@@ -3059,7 +3059,11 @@
<section xml:id="ssh-authentication">
<title>Authentication</title>
<para>SSH provides authentication through passwords and public key
- authentication.</para>
+ authentication, and also supports the NONE method.</para>
+ <para>SSH NONE authentication is seen occasionally in appliances
+ and items like network or SAN fabric switches. Generally
+ for this authentication method you need only provide a
+ username.</para>
<para>For Guacamole to use public key authentication, it must have access to your
private key and, if applicable, its passphrase. If the private key requires a
passphrase, but no passphrase is provided, you will be prompted for the
diff --git a/src/chapters/totp-auth.xml b/src/chapters/totp-auth.xml
index 8c199e6..b5e923b 100644
--- a/src/chapters/totp-auth.xml
+++ b/src/chapters/totp-auth.xml
@@ -77,8 +77,8 @@
<section xml:id="totp-enrollment">
<title>Enrollment</title>
<para>If the user does not yet have a TOTP key associated with their account (they have
- not yet completed enrollment), they be required to enroll an authentication device
- after passing the first authentication factor. A QR code containing an
+ not yet completed enrollment), they will be required to enroll an authentication
+ device after passing the first authentication factor. A QR code containing an
automatically-generated key will be presented to the user to be scanned by their
authentication app or device:</para>
<mediaobject>
