GUACAMOLE-747: Merge documentation directing users to example branding extension.
diff --git a/src/chapters/configuring.xml b/src/chapters/configuring.xml
index 435b19e..4de49e0 100644
--- a/src/chapters/configuring.xml
+++ b/src/chapters/configuring.xml
@@ -5495,6 +5495,24 @@
omitted, the first container in the pod will be used.</para>
</entry>
</row>
+ <row>
+ <entry><parameter>exec-command</parameter></entry>
+ <entry>
+ <para><indexterm>
+ <primary>Kubernetes</primary>
+ <secondary>command</secondary>
+ </indexterm>The command to run within the container, with
+ input and output attached to this command's process.
+ <emphasis>This parameter is optional.</emphasis> If
+ omitted, no command will be run, and input/output will
+ instead be attached to the main process of the
+ container.</para>
+ <para>When this parameter is specified, the behavior of the
+ connection is analogous to running <command>kubectl
+ exec</command>. When omitted, the behavior is analogous
+ to running <command>kubectl attach</command>.</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*"/>
diff --git a/src/chapters/reverse-proxy.xml b/src/chapters/reverse-proxy.xml
index f6c372d..0e9106c 100644
--- a/src/chapters/reverse-proxy.xml
+++ b/src/chapters/reverse-proxy.xml
@@ -220,6 +220,26 @@
}</programlisting>
</informalexample>
</section>
+ <section xml:id="nginx-file-upload-size">
+ <title>Adjusting file upload limits</title>
+ <para>When proxying Guacamole through Nginx, you may run into issues with the default
+ limitations that Nginx places on file uploads (1MB). The errors you receive can
+ be non-intuitive (permission denied, for example), but may be indicative of these
+ limits. The <code>client_max_body_size</code> parameter can be set within the
+ <code>location</code> block to configure the maximum file upload size:</para>
+ <informalexample>
+ <programlisting>location /guacamole/ {
+ proxy_pass http://<replaceable>HOSTNAME</replaceable>:<replaceable>8080</replaceable>/guacamole/;
+ proxy_buffering off;
+ proxy_http_version 1.1;
+ proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+ proxy_set_header Upgrade $http_upgrade;
+ proxy_set_header Connection $http_connection;
+ <emphasis>client_max_body_size <replaceable>1g</replaceable>;</emphasis>
+ access_log off;
+}</programlisting>
+ </informalexample>
+ </section>
</section>
<section xml:id="apache">
<title>Apache and <package>mod_proxy</package></title>
