Repository: tinkerpop Updated Branches: refs/heads/tp33 98ab1b05a -> e1c46b265
TINKERPOP-2023 minor edits Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/6434d040 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/6434d040 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/6434d040 Branch: refs/heads/tp33 Commit: 6434d0406c13ca2b5315fbfd0ff1c7b49c2fddfe Parents: d05e3c5 Author: Robert Dale <robd...@gmail.com> Authored: Mon Aug 13 15:45:27 2018 -0400 Committer: Robert Dale <robd...@gmail.com> Committed: Fri Aug 17 15:06:33 2018 -0400 ---------------------------------------------------------------------- docs/src/reference/gremlin-applications.asciidoc | 4 ++-- docs/src/upgrade/release-3.2.x-incubating.asciidoc | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6434d040/docs/src/reference/gremlin-applications.asciidoc ---------------------------------------------------------------------- diff --git a/docs/src/reference/gremlin-applications.asciidoc b/docs/src/reference/gremlin-applications.asciidoc index 8ad8a0a..d13e2ef 100644 --- a/docs/src/reference/gremlin-applications.asciidoc +++ b/docs/src/reference/gremlin-applications.asciidoc @@ -751,7 +751,7 @@ The following table describes the various configuration options for the Gremlin |connectionPool.sslCipherSuites |The list of JSSE ciphers to support for SSL connections. If specified, only the ciphers that are listed and supported will be enabled. If not specified, the JVM default is used. |_none_ |connectionPool.sslEnabledProtocols |The list of SSL protocols to support for SSL connections. If specified, only the protocols that are listed and supported will be enabled. If not specified, the JVM default is used. |_none_ |connectionPool.sslSkipCertValidation |Configures the `TrustManager` to trust all certs without any validation. Should not be used in production.|false -|connectionPool.trustCertChainFile |File location for a SSL Certificate Chain to use when SSL is enabled. If this value is not provided and SSL is enabled, the default `TrustManager` will be uesd. |_none_ +|connectionPool.trustCertChainFile |File location for a SSL Certificate Chain to use when SSL is enabled. If this value is not provided and SSL is enabled, the default `TrustManager` will be used. |_none_ |connectionPool.trustStore |File location for a SSL Certificate Chain to use when SSL is enabled. If this value is not provided and SSL is enabled, the default `TrustManager` will be used. |_none_ |connectionPool.trustStorePassword |The password of the `trustStore` if it is password-protected |_none_ |hosts |The list of hosts that the driver will connect to. |localhost @@ -1161,7 +1161,7 @@ The following table describes the various configuration options that Gremlin Ser |ssl.keyPassword |The password of the `keyFile` if it is password-protected. |_none_ |ssl.keyStore |The private key in JKS or PKCS#12 format. |_none_ |ssl.keyStorePassword |The password of the `keyStore` if it is password-protected. |_none_ -|ssl.keyStoreType |JKS (Java 8 default) or PKCS#12 (Java 9+ default) |_none_ +|ssl.keyStoreType |`JKS` (Java 8 default) or `PKCS12` (Java 9+ default) |_none_ |ssl.needClientAuth | Optional. One of NONE, OPTIONAL, REQUIRE. Enables client certificate authentication at the enforcement level specified. Can be used in combination with Authenticator. |_none_ |ssl.sslCipherSuites |The list of JSSE ciphers to support for SSL connections. If specified, only the ciphers that are listed and supported will be enabled. If not specified, the JVM default is used. |_none_ |ssl.sslEnabledProtocols |The list of SSL protocols to support for SSL connections. If specified, only the protocols that are listed and supported will be enabled. If not specified, the JVM default is used. |_none_ http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6434d040/docs/src/upgrade/release-3.2.x-incubating.asciidoc ---------------------------------------------------------------------- diff --git a/docs/src/upgrade/release-3.2.x-incubating.asciidoc b/docs/src/upgrade/release-3.2.x-incubating.asciidoc index 9b0a120..ec973de 100644 --- a/docs/src/upgrade/release-3.2.x-incubating.asciidoc +++ b/docs/src/upgrade/release-3.2.x-incubating.asciidoc @@ -49,7 +49,8 @@ The packaged `*-secure.yaml` files now restrict the protocol to `TLSv1.2` by def PEM-based configurations are deprecated and may be removed in a future release. -See the section on configuring SSL. +See also http://tinkerpop.apache.org/docs/current/reference/#_configuration[Connecting via Java Configuration], +http://tinkerpop.apache.org/docs/current/reference/#_configuring_2[Gremlin Server Configuration]. link:https://issues.apache.org/jira/browse/TINKERPOP-2022[TINKERPOP-2022] link:https://issues.apache.org/jira/browse/TINKERPOP-2023[TINKERPOP-2023]
