Merging upstream version 8.2406.0+dfsg.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

2 files changed, 37 insertions, 7 deletions

diff --git a/source/conf.py b/source/conf.py
index 7a1de63..c3d3ea0 100644
--- a/source/conf.py
+++ b/source/conf.py
@@ -92,8 +92,8 @@ rst_epilog = """
 # real values will be generated dynamically from info in the repo. If the
 # user builds the docs from "bare" sources not yet processed
 ###############################################################################
-version = '8.2404'
-release = '8.2404.0'
+version = '8.2406'
+release = '8.2406.0'
 #release = version + ' daily stable'
 
 # For this to be true, it means that we are not attempting to build from
diff --git a/source/rainerscript/global.rst b/source/rainerscript/global.rst
index a55f54a..b0bd334 100644
--- a/source/rainerscript/global.rst
+++ b/source/rainerscript/global.rst
@@ -69,12 +69,42 @@ The following parameters can be set:
   small parameters to prevent that from happening.
   **This parameter only has an effect if general debugging is enabled.**
 
--  **netstreamDriverCaExtraFiles**
+- **netstreamDriverCaExtraFiles**
 
-   This directive allows to configure multiple additional extra CA files.
-   This is intended for SSL certificate chains to work appropriately,
-   as the different CA files in the chain need to be specified.
-   It must be remarked that this parameter only works with the OpenSSL driver.
+  This directive allows to configure multiple additional extra CA files.
+  This is intended for SSL certificate chains to work appropriately,
+  as the different CA files in the chain need to be specified.
+  It must be remarked that this parameter only works with the OpenSSL driver.
+
+- **defaultopensslengine** available 8.2406.0+
+
+  This parameter is used to specify a custom OpenSSL engine by its ID. If the
+  engine is not specified, the system will use the default engine provided by OpenSSL.
+
+  Note: Listing Available OpenSSL Engines
+  To determine the available OpenSSL engines on your system, use the following command:
+
+  .. code-block:: bash
+
+      openssl engine -t
+
+  This command will output a list of available engines along with their IDs and descriptions.
+  Use the engine ID from this list as the value for the defaultopensslengine parameter.
+
+  .. code-block:: text
+
+      (rdrand) Intel RDRAND engine
+      (dynamic) Dynamic engine loading support
+
+  Example configuration:
+
+  .. code-block:: text
+
+      global(
+        ...
+        defaultopensslengine="rdrand"
+        ...
+      )
 
 - **processInternalMessages** binary (on/off)