This is an automated email from the ASF dual-hosted git repository.

vnick pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/guacamole-manual.git

commit 475eb17a6f0bd7b375e7b3b1ca8696092d675428
Merge: e2ef925 64278f2
Author: Virtually Nick <[email protected]>
AuthorDate: Sun Apr 20 21:46:22 2025 -0400

    Merge patch branch to main.

 .gitignore                                         |    2 +
 Dockerfile                                         |    7 +-
 Makefile                                           |   54 +-
 README.md                                          |   15 +-
 src/_static/gug.css                                |   51 +-
 ...dhoc-connections.md => adhoc-connections.md.j2} |   76 +-
 src/administration.md                              |   10 +-
 src/auth-ban.md                                    |  108 --
 src/auth-ban.md.j2                                 |   58 +
 src/{auth-restrict.md => auth-restrict.md.j2}      |   86 +-
 src/batch-import.md                                |    9 +-
 src/cas-auth.md                                    |  154 --
 src/cas-auth.md.j2                                 |   93 +
 src/conf.py                                        |   18 +-
 ...ng-guacamole.md => configuring-guacamole.md.j2} |  237 +--
 src/duo-auth.md                                    |  251 ---
 src/duo-auth.md.j2                                 |  119 ++
 src/external-auth.md                               |   46 +
 src/filter-j2.py                                   |  256 +++
 Makefile => src/generate-j2-data.py                |   36 +-
 src/guacamole-docker.md                            |  926 +--------
 ...installing-guacamole.md => guacamole-native.md} |  121 +-
 src/header-auth.md                                 |   73 -
 src/header-auth.md.j2                              |   48 +
 src/include/ban.properties.in                      |   21 +
 src/include/cas-optional.properties.in             |   46 +
 src/include/cas.properties.in                      |   11 +
 src/include/duo-bypass-enforce.properties.in       |   28 +
 src/include/duo-optional.properties.in             |    8 +
 src/include/duo.properties.in                      |   41 +
 src/include/ext-client-ips.md                      |   11 +
 src/include/ext-completing.md                      |   36 +
 src/include/ext-macros.md.j2                       |  409 ++++
 src/include/http-auth.properties.in                |    9 +
 src/include/jdbc-access-window.properties.in       |    9 +
 src/include/jdbc-concurrent-use.properties.in      |   37 +
 src/include/jdbc-default-user.md                   |    8 +
 src/include/jdbc-external.properties.in            |   23 +
 src/include/jdbc-macros.md.j2                      |  297 +++
 src/include/jdbc-password-age.properties.in        |   14 +
 src/include/jdbc-password-complexity.properties.in |   29 +
 src/include/jdbc-password-reuse.properties.in      |    8 +
 src/include/jdbc-upgrade.md                        |   18 +
 src/include/jdbc.properties.in                     |   18 +
 src/include/json-optional.properties.in            |   12 +
 src/include/json.properties.in                     |   16 +
 src/include/ksm-optional.properties.in             |   24 +
 src/include/ksm-user-vaults.properties.in          |    7 +
 src/include/ksm.properties.in                      |    7 +
 src/include/ldap-optional.properties.in            |  267 +++
 src/include/ldap.properties.in                     |   16 +
 src/include/mysql-access-window.properties.in      |    5 +
 src/include/mysql-concurrent-use.properties.in     |    5 +
 src/include/mysql-external.properties.in           |    5 +
 src/include/mysql-optional.properties.in           |  114 ++
 src/include/mysql-password-age.properties.in       |    5 +
 .../mysql-password-complexity.properties.in        |    5 +
 src/include/mysql-password-reuse.properties.in     |    5 +
 src/include/mysql.properties.in                    |    5 +
 src/include/openid-optional.properties.in          |   51 +
 src/include/openid.properties.in                   |   52 +
 src/include/postgresql-access-window.properties.in |    5 +
 .../postgresql-concurrent-use.properties.in        |    5 +
 src/include/postgresql-external.properties.in      |    5 +
 src/include/postgresql-optional.properties.in      |  106 ++
 src/include/postgresql-password-age.properties.in  |    5 +
 .../postgresql-password-complexity.properties.in   |    5 +
 .../postgresql-password-reuse.properties.in        |    5 +
 src/include/postgresql.properties.in               |    5 +
 src/include/quickconnect.properties.in             |   15 +
 src/include/radius.properties.in                   |  112 ++
 src/include/recording-playback.properties.in       |    5 +
 src/include/saml.properties.in                     |   89 +
 src/include/sqlserver-access-window.properties.in  |    5 +
 src/include/sqlserver-concurrent-use.properties.in |    5 +
 src/include/sqlserver-external.properties.in       |    5 +
 src/include/sqlserver-optional.properties.in       |   50 +
 src/include/sqlserver-password-age.properties.in   |    5 +
 .../sqlserver-password-complexity.properties.in    |    5 +
 src/include/sqlserver-password-reuse.properties.in |    5 +
 src/include/sqlserver.properties.in                |    5 +
 src/include/sso-download.md                        |   15 -
 src/include/sso-login-behavior.md                  |    4 +-
 src/include/totp-bypass-enforce.properties.in      |   27 +
 src/include/totp.properties.in                     |   23 +
 src/include/warn-config-changes.md                 |   10 +
 src/include/webapp.properties.in                   |  168 ++
 src/index.md                                       |   53 +-
 src/installing-guacamole.md                        |  809 +-------
 src/jdbc-auth-schema.md                            |  833 +++++++++
 src/jdbc-auth.md                                   | 1964 +-------------------
 src/{json-auth.md => json-auth.md.j2}              |   76 +-
 src/{ldap-auth.md => ldap-auth.md.j2}              |  357 +---
 src/mfa.md                                         |   28 +
 src/mysql-auth.md.j2                               |  196 ++
 src/openid-auth.md                                 |  188 --
 src/openid-auth.md.j2                              |   91 +
 src/postgresql-auth.md.j2                          |  191 ++
 src/radius-auth.md                                 |  250 ---
 src/radius-auth.md.j2                              |  112 ++
 ...ording-playback.md => recording-playback.md.j2} |  111 +-
 src/reverse-proxy.md                               |    4 +-
 src/saml-auth.md                                   |  156 --
 src/saml-auth.md.j2                                |   70 +
 src/security.md                                    |   35 +
 src/sqlserver-auth.md.j2                           |  165 ++
 src/sso.md                                         |   29 +
 src/totp-auth.md                                   |  288 ---
 src/totp-auth.md.j2                                |  171 ++
 src/using-guacamole.md                             |    4 +-
 src/{vault.md => vault.md.j2}                      |  187 +-
 111 files changed, 5524 insertions(+), 6074 deletions(-)


Reply via email to