GUACAMOLE-1060: Merge documentation for controlling Nginx upload size.
diff --git a/src/chapters/configuring.xml b/src/chapters/configuring.xml
index ac882ab..435b19e 100644
--- a/src/chapters/configuring.xml
+++ b/src/chapters/configuring.xml
@@ -1433,6 +1433,28 @@
</entry>
</row>
<row>
+ <entry><parameter>wol-udp-port</parameter></entry>
+ <entry>
+ <para><indexterm>
+ <primary>wol-udp-port</primary>
+ </indexterm><indexterm>
+ <primary>VNC</primary>
+ <secondary>wol-udp-port</secondary>
+ </indexterm>This parameter configures the
+ UDP port that will be set in the WoL packet.
+ In most cases the UDP port isn't processed
+ by the system that will be woken up; however,
+ there are certain cases where it is useful
+ for the port to be set, as in situations
+ where a router is listening for the packet
+ and can make routing decisions depending
+ upon the port that is used. If not
+ configured the default UDP port 9 will be
+ used.
+ </para>
+ </entry>
+ </row>
+ <row>
<entry><parameter>wol-wait-time</parameter></entry>
<entry>
<para><indexterm>
@@ -3285,6 +3307,28 @@
</entry>
</row>
<row>
+ <entry><parameter>wol-udp-port</parameter></entry>
+ <entry>
+ <para><indexterm>
+ <primary>wol-udp-port</primary>
+ </indexterm><indexterm>
+ <primary>RDP</primary>
+ <secondary>wol-udp-port</secondary>
+ </indexterm>This parameter configures the
+ UDP port that will be set in the WoL packet.
+ In most cases the UDP port isn't processed
+ by the system that will be woken up; however,
+ there are certain cases where it is useful
+ for the port to be set, as in situations
+ where a router is listening for the packet
+ and can make routing decisions depending
+ upon the port that is used. If not
+ configured the default UDP port 9 will be
+ used.
+ </para>
+ </entry>
+ </row>
+ <row>
<entry><parameter>wol-wait-time</parameter></entry>
<entry>
<para><indexterm>
@@ -4375,6 +4419,28 @@
</entry>
</row>
<row>
+ <entry><parameter>wol-udp-port</parameter></entry>
+ <entry>
+ <para><indexterm>
+ <primary>wol-udp-port</primary>
+ </indexterm><indexterm>
+ <primary>SSH</primary>
+ <secondary>wol-udp-port</secondary>
+ </indexterm>This parameter configures the
+ UDP port that will be set in the WoL packet.
+ In most cases the UDP port isn't processed
+ by the system that will be woken up; however,
+ there are certain cases where it is useful
+ for the port to be set, as in situations
+ where a router is listening for the packet
+ and can make routing decisions depending
+ upon the port that is used. If not
+ configured the default UDP port 9 will be
+ used.
+ </para>
+ </entry>
+ </row>
+ <row>
<entry><parameter>wol-wait-time</parameter></entry>
<entry>
<para><indexterm>
@@ -5264,6 +5330,28 @@
</entry>
</row>
<row>
+ <entry><parameter>wol-udp-port</parameter></entry>
+ <entry>
+ <para><indexterm>
+ <primary>wol-udp-port</primary>
+ </indexterm><indexterm>
+ <primary>telnet</primary>
+ <secondary>wol-udp-port</secondary>
+ </indexterm>This parameter configures the
+ UDP port that will be set in the WoL packet.
+ In most cases the UDP port isn't processed
+ by the system that will be woken up; however,
+ there are certain cases where it is useful
+ for the port to be set, as in situations
+ where a router is listening for the packet
+ and can make routing decisions depending
+ upon the port that is used. If not
+ configured the default UDP port 9 will be
+ used.
+ </para>
+ </entry>
+ </row>
+ <row>
<entry><parameter>wol-wait-time</parameter></entry>
<entry>
<para><indexterm>
diff --git a/src/chapters/docker.xml b/src/chapters/docker.xml
index 0a19f5c..a0a1006 100644
--- a/src/chapters/docker.xml
+++ b/src/chapters/docker.xml
@@ -416,6 +416,19 @@
exhausted by one user alone.</para>
</entry>
</row>
+ <row>
+ <entry><envar>MYSQL_AUTO_CREATE_ACCOUNTS</envar></entry>
+ <entry>
+ <para>Whether or not accounts that do not exist in the
+ MySQL database will be automatically created when successfully
+ authenticated through other modules. If set to "true" accounts
+ will be automatically created. Otherwise, and by default,
+ accounts will not be automatically created and will need to
+ be manually created in order for permissions within the
+ MySQL database extension to be assigned to users
+ authenticated with other modules.</para>
+ </entry>
+ </row>
</tbody>
</tgroup>
</informaltable>
@@ -643,6 +656,19 @@
exhausted by one user alone.</para>
</entry>
</row>
+ <row>
+ <entry><envar>POSTGRES_AUTO_CREATE_ACCOUNTS</envar></entry>
+ <entry>
+ <para>Whether or not accounts that do not exist in the
+ PostgreSQL database will be automatically created when
+ successfully authenticated through other modules. If set
+ to "true", accounts will be automatically created. Otherwise,
+ and by default, accounts will not be automatically created
+ and will need to be manually created in order for permissions
+ within the PostgreSQL database extension to be assigned to
+ users authenticated with other modules.</para>
+ </entry>
+ </row>
</tbody>
</tgroup>
</informaltable>
diff --git a/src/chapters/installing.xml b/src/chapters/installing.xml
index 423497f..92bf162 100644
--- a/src/chapters/installing.xml
+++ b/src/chapters/installing.xml
@@ -226,12 +226,32 @@
</entry>
</row>
<row>
- <entry><link xl:href="http://www.ossp.org/pkg/lib/uuid/">OSSP
- UUID</link></entry>
+ <entry>libuuid (part of <link xmlns:xlink="http://www.w3.org/1999/xlink"
+ xlink:href="https://www.kernel.org/pub/linux/utils/util-linux/"
+ >util-linux</link>)</entry>
<entry>
- <para>OSSP UUID is used by libguac to assign unique IDs to each
- Guacamole connection. These unique IDs are the basis for
- connection sharing support.</para>
+ <para>libuuid is used by libguac to assign unique, internal IDs to
+ each Guacamole user and connection. These unique IDs are the
+ basis for connection sharing support.</para>
+ <informaltable frame="none" rowheader="firstcol">
+ <tgroup cols="2">
+ <colspec colname="c1" colnum="1" colwidth="1.0*"/>
+ <colspec colname="c2" colnum="2" colwidth="1.0*"/>
+ <tbody>
+ <row>
+ <entry>Debian / Ubuntu package</entry>
+ <entry><package>uuid-dev</package></entry>
+ </row>
+ <row>
+ <entry>Fedora / CentOS / RHEL package</entry>
+ <entry><package>libuuid-devel</package></entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </informaltable>
+ <para>If libuuid is unavailable, the <link
+ xl:href="http://www.ossp.org/pkg/lib/uuid/">OSSP UUID</link>
+ library may also be used:</para>
<informaltable frame="none" rowheader="firstcol">
<tgroup cols="2">
<colspec colname="c1" colnum="1" colwidth="1.0*"/>
