GUACAMOLE-1935: Merge note clarifying VNC authentication mechanisms and underlying support.
diff --git a/src/configuring-guacamole.md b/src/configuring-guacamole.md
index 8a654ba..f36bdb9 100644
--- a/src/configuring-guacamole.md
+++ b/src/configuring-guacamole.md
@@ -554,6 +554,19 @@
parameter is optional. By default, lossy compression will be used when
heuristics determine that it would likely outperform lossless compression.
+`compress-level`
+: Controls the level of compression requested of the VNC server when either
+ tight or zlib encoding is in use, on a scale of 0 to 9, with 0 being no
+ compression and 9 being the highest level of compression. Note that this
+ is negotiated with the server, and ultimately the decision on the amount
+ of compression that is done is up to the VNC server.
+
+`quality-level`
+: Sets the JPEG qualit level, on a scale of 0 to 9, when the tight encoding
+ is in use, with 0 being the lowest image quality (but likely improved
+ compression and speed) and 9 being the highest image quality but with
+ reduced compression and speed.
+
#### VNC Repeater
There exist VNC repeaters, such as UltraVNC Repeater, which act as
diff --git a/src/images/guacamole-preferences.png b/src/images/guacamole-preferences.png
index b751e8d..50d12ba 100644
--- a/src/images/guacamole-preferences.png
+++ b/src/images/guacamole-preferences.png
Binary files differ
diff --git a/src/reverse-proxy.md b/src/reverse-proxy.md
index 704e4f3..48981ef 100644
--- a/src/reverse-proxy.md
+++ b/src/reverse-proxy.md
@@ -85,7 +85,7 @@
```xml
<Valve className="org.apache.catalina.valves.RemoteIpValve"
- internalProxies="127.0.0.1"
+ internalProxies="127\.0\.0\.1"
remoteIpHeader="x-forwarded-for"
remoteIpProxiesHeader="x-forwarded-by"
protocolHeader="x-forwarded-proto" />
@@ -96,7 +96,25 @@
directly. Often it is run on the same system that runs Tomcat, but in other
cases (for example, when running Docker), it may be on a different
system/container and may need to be set to the actual IP address of the reverse
-proxy system. Only proxy servers listed in the `internalProxies` or
+proxy system.
+
+Note that, in situations where both IPv4 and IPv6 are enabled, you may experience
+inconsistency in Guacamole being able to retrieve the client IP address if you
+fail to account for both IP versions in the `internalProxies` regex. This is
+true even if your proxy is running on the same system as Tomcat and you only
+have loopback addresses listed, but you fail to account for both IPv4 and
+IPv6. Here is an example `RemoteIpValve` configuration that handles both
+localhost addresses:
+
+```xml
+<Valve className="org.apache.catalina.valves.RemoteIpValve"
+ internalProxies="127\.0\.0\.1|0:0:0:0:0:0:0:1"
+ remoteIpHeader="x-forwarded-for"
+ remoteIpProxiesHeader="x-forwarded-by"
+ protocolHeader="x-forwarded-proto" />
+```
+
+ Only proxy servers listed in the `internalProxies` or
`trustedProxies` parameters will be allowed to manipulate the remote IP address
information. The other parameters in this configuration line allow you to
control which headers coming from the proxy server(s) are used for various
diff --git a/src/totp-auth.md b/src/totp-auth.md
index 7cac421..6fb1012 100644
--- a/src/totp-auth.md
+++ b/src/totp-auth.md
@@ -74,6 +74,14 @@
Enrollment is completed once the user enters a valid authentication code
generated by their device using the provided key.
+:::{important}
+If the user does not confirm/complete the enrollment process, the next time the
+user logs in they will be asked to go through the enrollment process, again, and
+the TOTP data will be regenerated. This means the previously-scanned QR code
+and TOTP codes generated with the use of that code will be invalid.
+:::
+
+
(totp-reset-data)=
### Reseting TOTP Data
diff --git a/src/using-guacamole.md b/src/using-guacamole.md
index 9dc4484..4c642bb 100644
--- a/src/using-guacamole.md
+++ b/src/using-guacamole.md
@@ -507,3 +507,10 @@
in this chapter, and changing these settings will affect the default values
selected within the Guacamole menu of future connections.
+### Recent connection settings
+
+The user interface can be configured with regard to whether recent connections
+are displayed and how many are tracked. The default setting is to track the most
+recent 6 connections, but you can use the checkbox to disable the recent
+connections area altogether, or you can adjust the number of recent
+connections kept in history from the default of 6.
