[guacamole-manual] branch master updated (cda6f96 -> 2033ce6)

[jm...@apache.org]

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

jmuehlner pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/guacamole-manual.git


    from cda6f96  Merge 1.5.3 changes back to master.
     add 9a65d49  GUACAMOLE-1796: Document new default for SQL Server batch size.
     add c11cb4d  GUACAMOLE-1796: Merge updated default for SQL Server batch size.
     new 2033ce6  Merge 1.5.3 changes back to master.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 src/jdbc-auth.md | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

[guacamole-manual] 01/01: Merge 1.5.3 changes back to master.

[jm...@apache.org]

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

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

commit 2033ce6c7ee42ae4b833af51e7fed0087659621b
Merge: cda6f96 c11cb4d
Author: James Muehlner <ja...@guac-dev.org>
AuthorDate: Fri Jul 14 16:57:45 2023 +0000

    Merge 1.5.3 changes back to master.

 src/jdbc-auth.md | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --cc src/jdbc-auth.md
index 1ea0b9d,a51a71e..88e87d8
--- a/src/jdbc-auth.md
+++ b/src/jdbc-auth.md
@@@ -752,9 -710,8 +752,7 @@@ to the database server
    objects will be automatically and transparently split across multiple
    queries.
  
-   By default, SQL Server queries will retrieve no more than 1000 objects.
- >>>>>>> staging/1.5.2
- :::
+   By default, SQL Server queries will retrieve no more than 500 objects.
 -:::
  
  #### Enforcing password policies