You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2021/08/18 12:18:32 UTC

svn commit: r1892414 - in /karaf/site/production/manual/latest: ./ commands/

Author: jbonofre
Date: Wed Aug 18 12:18:31 2021
New Revision: 1892414

URL: http://svn.apache.org/viewvc?rev=1892414&view=rev
Log:
[scm-publish] Updating main site with Karaf documentation

Modified:
    karaf/site/production/manual/latest/archetypes.html
    karaf/site/production/manual/latest/branding.html
    karaf/site/production/manual/latest/cdi.html
    karaf/site/production/manual/latest/commands/bundle-capabilities.adoc
    karaf/site/production/manual/latest/commands/bundle-classes.adoc
    karaf/site/production/manual/latest/commands/bundle-diag.adoc
    karaf/site/production/manual/latest/commands/bundle-headers.adoc
    karaf/site/production/manual/latest/commands/bundle-info.adoc
    karaf/site/production/manual/latest/commands/bundle-list.adoc
    karaf/site/production/manual/latest/commands/bundle-load-test.adoc
    karaf/site/production/manual/latest/commands/bundle-refresh.adoc
    karaf/site/production/manual/latest/commands/bundle-requirements.adoc
    karaf/site/production/manual/latest/commands/bundle-resolve.adoc
    karaf/site/production/manual/latest/commands/bundle-restart.adoc
    karaf/site/production/manual/latest/commands/bundle-services.adoc
    karaf/site/production/manual/latest/commands/bundle-start.adoc
    karaf/site/production/manual/latest/commands/bundle-stop.adoc
    karaf/site/production/manual/latest/commands/bundle-uninstall.adoc
    karaf/site/production/manual/latest/commands/config-meta.adoc
    karaf/site/production/manual/latest/commands/feature-export-bundles.adoc
    karaf/site/production/manual/latest/commands/feature-info.adoc
    karaf/site/production/manual/latest/commands/feature-install.adoc
    karaf/site/production/manual/latest/commands/feature-list.adoc
    karaf/site/production/manual/latest/commands/feature-repo-add.adoc
    karaf/site/production/manual/latest/commands/feature-requirement-add.adoc
    karaf/site/production/manual/latest/commands/feature-requirement-remove.adoc
    karaf/site/production/manual/latest/commands/feature-uninstall.adoc
    karaf/site/production/manual/latest/commands/http-proxy-add.adoc
    karaf/site/production/manual/latest/commands/instance-clone.adoc
    karaf/site/production/manual/latest/commands/instance-connect.adoc
    karaf/site/production/manual/latest/commands/instance-create.adoc
    karaf/site/production/manual/latest/commands/jaas-realm-manage.adoc
    karaf/site/production/manual/latest/commands/jdbc-ds-create.adoc
    karaf/site/production/manual/latest/commands/jms-send.adoc
    karaf/site/production/manual/latest/commands/log-display.adoc
    karaf/site/production/manual/latest/commands/log-tail.adoc
    karaf/site/production/manual/latest/commands/maven-http-proxy.adoc
    karaf/site/production/manual/latest/commands/maven-repository-add.adoc
    karaf/site/production/manual/latest/commands/maven-repository-change.adoc
    karaf/site/production/manual/latest/commands/obr-deploy.adoc
    karaf/site/production/manual/latest/commands/package-exports.adoc
    karaf/site/production/manual/latest/commands/package-imports.adoc
    karaf/site/production/manual/latest/commands/profile-edit.adoc
    karaf/site/production/manual/latest/commands/scheduler-reschedule.adoc
    karaf/site/production/manual/latest/commands/scheduler-schedule-command.adoc
    karaf/site/production/manual/latest/commands/scheduler-schedule-script.adoc
    karaf/site/production/manual/latest/commands/shell-threads.adoc
    karaf/site/production/manual/latest/commands/ssh-ssh.adoc
    karaf/site/production/manual/latest/commands/system-property.adoc
    karaf/site/production/manual/latest/commands/system-shutdown.adoc
    karaf/site/production/manual/latest/commands/wrapper-install.adoc
    karaf/site/production/manual/latest/configuration.html
    karaf/site/production/manual/latest/connect.html
    karaf/site/production/manual/latest/console.html
    karaf/site/production/manual/latest/creating-bundles.html
    karaf/site/production/manual/latest/custom-distribution.html
    karaf/site/production/manual/latest/debugging.html
    karaf/site/production/manual/latest/deployers.html
    karaf/site/production/manual/latest/developer-commands.html
    karaf/site/production/manual/latest/directory-structure.html
    karaf/site/production/manual/latest/docker.html
    karaf/site/production/manual/latest/ejb.html
    karaf/site/production/manual/latest/extending.html
    karaf/site/production/manual/latest/failover.html
    karaf/site/production/manual/latest/github-contributions.html
    karaf/site/production/manual/latest/http.html
    karaf/site/production/manual/latest/index.html
    karaf/site/production/manual/latest/installation.html
    karaf/site/production/manual/latest/instances.html
    karaf/site/production/manual/latest/interceptor.html
    karaf/site/production/manual/latest/jdbc.html
    karaf/site/production/manual/latest/jms.html
    karaf/site/production/manual/latest/jndi.html
    karaf/site/production/manual/latest/jpa.html
    karaf/site/production/manual/latest/jta.html
    karaf/site/production/manual/latest/kar.html
    karaf/site/production/manual/latest/karaf-maven-plugin.html
    karaf/site/production/manual/latest/log.html
    karaf/site/production/manual/latest/monitoring.html
    karaf/site/production/manual/latest/obr.html
    karaf/site/production/manual/latest/os-integration.html
    karaf/site/production/manual/latest/overview.html
    karaf/site/production/manual/latest/provisioning.html
    karaf/site/production/manual/latest/quick-start.html
    karaf/site/production/manual/latest/remote.html
    karaf/site/production/manual/latest/scheduler.html
    karaf/site/production/manual/latest/scripting.html
    karaf/site/production/manual/latest/security-framework.html
    karaf/site/production/manual/latest/security.html
    karaf/site/production/manual/latest/start-stop.html
    karaf/site/production/manual/latest/tuning.html
    karaf/site/production/manual/latest/update-notes.html
    karaf/site/production/manual/latest/urls.html
    karaf/site/production/manual/latest/webconsole.html
    karaf/site/production/manual/latest/webcontainer.html

Modified: karaf/site/production/manual/latest/archetypes.html
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/archetypes.html?rev=1892414&r1=1892413&r2=1892414&view=diff
==============================================================================
--- karaf/site/production/manual/latest/archetypes.html (original)
+++ karaf/site/production/manual/latest/archetypes.html Wed Aug 18 12:18:31 2021
@@ -943,7 +943,7 @@ package: com.mycompany.package
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2020-02-05 08:42:32 CET
+Last updated 2021-08-01 14:20:38 CEST
 </div>
 </div>
 </body>

Modified: karaf/site/production/manual/latest/branding.html
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/branding.html?rev=1892414&r1=1892413&r2=1892414&view=diff
==============================================================================
--- karaf/site/production/manual/latest/branding.html (original)
+++ karaf/site/production/manual/latest/branding.html Wed Aug 18 12:18:31 2021
@@ -691,7 +691,7 @@ webconsole.stylesheet = /res/karaf/ui/we
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2020-11-04 17:04:18 CET
+Last updated 2021-08-01 14:20:38 CEST
 </div>
 </div>
 </body>

Modified: karaf/site/production/manual/latest/cdi.html
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/cdi.html?rev=1892414&r1=1892413&r2=1892414&view=diff
==============================================================================
--- karaf/site/production/manual/latest/cdi.html (original)
+++ karaf/site/production/manual/latest/cdi.html Wed Aug 18 12:18:31 2021
@@ -609,7 +609,7 @@ karaf@root()&gt; feature:install pax-cdi
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2020-02-05 08:42:32 CET
+Last updated 2021-08-01 14:20:38 CEST
 </div>
 </div>
 </body>

Modified: karaf/site/production/manual/latest/commands/bundle-capabilities.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/bundle-capabilities.adoc?rev=1892414&r1=1892413&r2=1892414&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/bundle-capabilities.adoc (original)
+++ karaf/site/production/manual/latest/commands/bundle-capabilities.adoc Wed Aug 18 12:18:31 2021
@@ -25,11 +25,11 @@ bundle:capabilities [options] [ids]
 |--namespace
 |
 
-|--help
-|Display this help message
-
 |--context, -c
 |Use the given bundle context
+
+|--help
+|Display this help message
 |===
 
 

Modified: karaf/site/production/manual/latest/commands/bundle-classes.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/bundle-classes.adoc?rev=1892414&r1=1892413&r2=1892414&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/bundle-classes.adoc (original)
+++ karaf/site/production/manual/latest/commands/bundle-classes.adoc Wed Aug 18 12:18:31 2021
@@ -25,11 +25,11 @@ bundle:classes [options] [ids]
 |-a, --display-all-files
 |List all classes and files in the bundle
 
-|--help
-|Display this help message
-
 |--context, -c
 |Use the given bundle context
+
+|--help
+|Display this help message
 |===
 
 

Modified: karaf/site/production/manual/latest/commands/bundle-diag.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/bundle-diag.adoc?rev=1892414&r1=1892413&r2=1892414&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/bundle-diag.adoc (original)
+++ karaf/site/production/manual/latest/commands/bundle-diag.adoc Wed Aug 18 12:18:31 2021
@@ -22,11 +22,11 @@ bundle:diag [options] [ids]
 |===
 |Name |Description
 
-|--help
-|Display this help message
-
 |--context, -c
 |Use the given bundle context
+
+|--help
+|Display this help message
 |===
 
 

Modified: karaf/site/production/manual/latest/commands/bundle-headers.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/bundle-headers.adoc?rev=1892414&r1=1892413&r2=1892414&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/bundle-headers.adoc (original)
+++ karaf/site/production/manual/latest/commands/bundle-headers.adoc Wed Aug 18 12:18:31 2021
@@ -28,11 +28,11 @@ bundle:headers [options] [ids]
 |--indent
 |Indentation method
 
-|--help
-|Display this help message
-
 |--context, -c
 |Use the given bundle context
+
+|--help
+|Display this help message
 |===
 
 

Modified: karaf/site/production/manual/latest/commands/bundle-info.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/bundle-info.adoc?rev=1892414&r1=1892413&r2=1892414&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/bundle-info.adoc (original)
+++ karaf/site/production/manual/latest/commands/bundle-info.adoc Wed Aug 18 12:18:31 2021
@@ -22,11 +22,11 @@ bundle:info [options] [ids]
 |===
 |Name |Description
 
-|--help
-|Display this help message
-
 |--context, -c
 |Use the given bundle context
+
+|--help
+|Display this help message
 |===
 
 

Modified: karaf/site/production/manual/latest/commands/bundle-list.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/bundle-list.adoc?rev=1892414&r1=1892413&r2=1892414&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/bundle-list.adoc (original)
+++ karaf/site/production/manual/latest/commands/bundle-list.adoc Wed Aug 18 12:18:31 2021
@@ -34,9 +34,6 @@ bundle:list [options] [ids]
 |--no-ellipsis
 |
 
-|--help
-|Display this help message
-
 |-l
 |Show the locations
 
@@ -46,6 +43,9 @@ bundle:list [options] [ids]
 |--context, -c
 |Use the given bundle context
 
+|--help
+|Display this help message
+
 |-t
 |Specifies the bundle threshold; bundles with a start-level less than this value will not get printed out.
 

Modified: karaf/site/production/manual/latest/commands/bundle-load-test.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/bundle-load-test.adoc?rev=1892414&r1=1892413&r2=1892414&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/bundle-load-test.adoc (original)
+++ karaf/site/production/manual/latest/commands/bundle-load-test.adoc Wed Aug 18 12:18:31 2021
@@ -22,12 +22,12 @@ bundle:load-test [options]
 |--iterations
 |number of iterations per thread
 
-|--help
-|Display this help message
-
 |--delay
 |maximum delay between actions
 
+|--help
+|Display this help message
+
 |--threads
 |number of concurrent threads
 |===

Modified: karaf/site/production/manual/latest/commands/bundle-refresh.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/bundle-refresh.adoc?rev=1892414&r1=1892413&r2=1892414&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/bundle-refresh.adoc (original)
+++ karaf/site/production/manual/latest/commands/bundle-refresh.adoc Wed Aug 18 12:18:31 2021
@@ -22,11 +22,11 @@ bundle:refresh [options] [ids]
 |===
 |Name |Description
 
-|--help
-|Display this help message
-
 |--context, -c
 |Use the given bundle context
+
+|--help
+|Display this help message
 |===
 
 

Modified: karaf/site/production/manual/latest/commands/bundle-requirements.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/bundle-requirements.adoc?rev=1892414&r1=1892413&r2=1892414&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/bundle-requirements.adoc (original)
+++ karaf/site/production/manual/latest/commands/bundle-requirements.adoc Wed Aug 18 12:18:31 2021
@@ -25,11 +25,11 @@ bundle:requirements [options] [ids]
 |--namespace
 |
 
-|--help
-|Display this help message
-
 |--context, -c
 |Use the given bundle context
+
+|--help
+|Display this help message
 |===
 
 

Modified: karaf/site/production/manual/latest/commands/bundle-resolve.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/bundle-resolve.adoc?rev=1892414&r1=1892413&r2=1892414&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/bundle-resolve.adoc (original)
+++ karaf/site/production/manual/latest/commands/bundle-resolve.adoc Wed Aug 18 12:18:31 2021
@@ -22,11 +22,11 @@ bundle:resolve [options] [ids]
 |===
 |Name |Description
 
-|--help
-|Display this help message
-
 |--context, -c
 |Use the given bundle context
+
+|--help
+|Display this help message
 |===
 
 

Modified: karaf/site/production/manual/latest/commands/bundle-restart.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/bundle-restart.adoc?rev=1892414&r1=1892413&r2=1892414&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/bundle-restart.adoc (original)
+++ karaf/site/production/manual/latest/commands/bundle-restart.adoc Wed Aug 18 12:18:31 2021
@@ -22,11 +22,11 @@ bundle:restart [options] [ids]
 |===
 |Name |Description
 
-|--help
-|Display this help message
-
 |--context, -c
 |Use the given bundle context
+
+|--help
+|Display this help message
 |===
 
 

Modified: karaf/site/production/manual/latest/commands/bundle-services.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/bundle-services.adoc?rev=1892414&r1=1892413&r2=1892414&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/bundle-services.adoc (original)
+++ karaf/site/production/manual/latest/commands/bundle-services.adoc Wed Aug 18 12:18:31 2021
@@ -25,15 +25,15 @@ bundle:services [options] [ids]
 |-p
 |Shows the properties of the services
 
-|--help
-|Display this help message
-
 |-u
 |Shows the services each bundle uses. (By default the provided services are shown)
 
 |--context, -c
 |Use the given bundle context
 
+|--help
+|Display this help message
+
 |-a
 |Shows all services. (Karaf commands and completers are hidden by default)
 |===

Modified: karaf/site/production/manual/latest/commands/bundle-start.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/bundle-start.adoc?rev=1892414&r1=1892413&r2=1892414&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/bundle-start.adoc (original)
+++ karaf/site/production/manual/latest/commands/bundle-start.adoc Wed Aug 18 12:18:31 2021
@@ -25,11 +25,11 @@ bundle:start [options] [ids]
 |-t, --transient
 |Keep the bundle as auto-start
 
-|--help
-|Display this help message
-
 |--context, -c
 |Use the given bundle context
+
+|--help
+|Display this help message
 |===
 
 

Modified: karaf/site/production/manual/latest/commands/bundle-stop.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/bundle-stop.adoc?rev=1892414&r1=1892413&r2=1892414&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/bundle-stop.adoc (original)
+++ karaf/site/production/manual/latest/commands/bundle-stop.adoc Wed Aug 18 12:18:31 2021
@@ -25,11 +25,11 @@ bundle:stop [options] [ids]
 |-t, --transient
 |Keep the bundle as auto-start
 
-|--help
-|Display this help message
-
 |--context, -c
 |Use the given bundle context
+
+|--help
+|Display this help message
 |===
 
 

Modified: karaf/site/production/manual/latest/commands/bundle-uninstall.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/bundle-uninstall.adoc?rev=1892414&r1=1892413&r2=1892414&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/bundle-uninstall.adoc (original)
+++ karaf/site/production/manual/latest/commands/bundle-uninstall.adoc Wed Aug 18 12:18:31 2021
@@ -22,11 +22,11 @@ bundle:uninstall [options] [ids]
 |===
 |Name |Description
 
-|--help
-|Display this help message
-
 |--context, -c
 |Use the given bundle context
+
+|--help
+|Display this help message
 |===
 
 

Modified: karaf/site/production/manual/latest/commands/config-meta.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/config-meta.adoc?rev=1892414&r1=1892413&r2=1892414&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/config-meta.adoc (original)
+++ karaf/site/production/manual/latest/commands/config-meta.adoc Wed Aug 18 12:18:31 2021
@@ -22,11 +22,11 @@ config:meta [options] pid
 |===
 |Name |Description
 
-|--help
-|Display this help message
-
 |-c
 |Create respective config from metatype defaults
+
+|--help
+|Display this help message
 |===
 
 

Modified: karaf/site/production/manual/latest/commands/feature-export-bundles.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/feature-export-bundles.adoc?rev=1892414&r1=1892413&r2=1892414&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/feature-export-bundles.adoc (original)
+++ karaf/site/production/manual/latest/commands/feature-export-bundles.adoc Wed Aug 18 12:18:31 2021
@@ -28,11 +28,11 @@ feature:export-bundles [options] feature
 |-d, --dependencies-only
 |This flag indicates that only bundles marked as a dependency will be exported.
 
-|--help
-|Display this help message
-
 |-v, --version
 |The version of the feature you want to export bundles for.  Default is latest
+
+|--help
+|Display this help message
 |===
 
 

Modified: karaf/site/production/manual/latest/commands/feature-info.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/feature-info.adoc?rev=1892414&r1=1892413&r2=1892414&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/feature-info.adoc (original)
+++ karaf/site/production/manual/latest/commands/feature-info.adoc Wed Aug 18 12:18:31 2021
@@ -34,9 +34,6 @@ feature:info [options] name [version]
 |-t, --tree
 |Display feature tree
 
-|--help
-|Display this help message
-
 |-c, --configuration
 |Display configuration info
 
@@ -46,6 +43,9 @@ feature:info [options] name [version]
 |--conditional
 |Display conditional info
 
+|--help
+|Display this help message
+
 |--color
 |Colorize output (`always', `never' or `auto')
 |===

Modified: karaf/site/production/manual/latest/commands/feature-install.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/feature-install.adoc?rev=1892414&r1=1892413&r2=1892414&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/feature-install.adoc (original)
+++ karaf/site/production/manual/latest/commands/feature-install.adoc Wed Aug 18 12:18:31 2021
@@ -40,12 +40,12 @@ feature:install [options] features
 |-u, --upgrade
 |Perform an upgrade of feature if previous version are installed or install it
 
-|--help
-|Display this help message
-
 |-r, --no-auto-refresh
 |Do not automatically refresh bundles
 
+|--help
+|Display this help message
+
 |-s, --no-auto-start
 |Do not start the bundles
 

Modified: karaf/site/production/manual/latest/commands/feature-list.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/feature-list.adoc?rev=1892414&r1=1892413&r2=1892414&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/feature-list.adoc (original)
+++ karaf/site/production/manual/latest/commands/feature-list.adoc Wed Aug 18 12:18:31 2021
@@ -22,12 +22,12 @@ feature:list [options]
 |-o, --ordered
 |Display a list using alphabetical order 
 
-|--help
-|Display this help message
-
 |-b, --show-blacklisted
 |Display blacklisted features
 
+|--help
+|Display this help message
+
 |-r, --required
 |Display a list of all required features only
 

Modified: karaf/site/production/manual/latest/commands/feature-repo-add.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/feature-repo-add.adoc?rev=1892414&r1=1892413&r2=1892414&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/feature-repo-add.adoc (original)
+++ karaf/site/production/manual/latest/commands/feature-repo-add.adoc Wed Aug 18 12:18:31 2021
@@ -25,11 +25,11 @@ feature:repo-add [options] name/url [ver
 |===
 |Name |Description
 
-|--help
-|Display this help message
-
 |-i, --install
 |Install all features contained in the features repository
+
+|--help
+|Display this help message
 |===
 
 

Modified: karaf/site/production/manual/latest/commands/feature-requirement-add.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/feature-requirement-add.adoc?rev=1892414&r1=1892413&r2=1892414&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/feature-requirement-add.adoc (original)
+++ karaf/site/production/manual/latest/commands/feature-requirement-add.adoc Wed Aug 18 12:18:31 2021
@@ -37,12 +37,12 @@ feature:requirement-add [options] requir
 |--store
 |Store the resolution into the given file and result for offline analysis
 
-|--help
-|Display this help message
-
 |-r, --no-auto-refresh
 |Do not automatically refresh bundles
 
+|--help
+|Display this help message
+
 |-s, --no-auto-start
 |Do not start the bundles
 

Modified: karaf/site/production/manual/latest/commands/feature-requirement-remove.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/feature-requirement-remove.adoc?rev=1892414&r1=1892413&r2=1892414&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/feature-requirement-remove.adoc (original)
+++ karaf/site/production/manual/latest/commands/feature-requirement-remove.adoc Wed Aug 18 12:18:31 2021
@@ -40,12 +40,12 @@ feature:requirement-remove [options] req
 |--store
 |Store the resolution into the given file and result for offline analysis
 
-|--help
-|Display this help message
-
 |-r, --no-auto-refresh
 |Do not automatically refresh bundles
 
+|--help
+|Display this help message
+
 |-s, --no-auto-start
 |Do not start the bundles
 

Modified: karaf/site/production/manual/latest/commands/feature-uninstall.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/feature-uninstall.adoc?rev=1892414&r1=1892413&r2=1892414&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/feature-uninstall.adoc (original)
+++ karaf/site/production/manual/latest/commands/feature-uninstall.adoc Wed Aug 18 12:18:31 2021
@@ -28,15 +28,15 @@ feature:uninstall [options] features
 |-v, --verbose
 |Explain what is being done
 
-|--help
-|Display this help message
-
 |-r, --no-auto-refresh
 |Do not automatically refresh bundles
 
 |-c, --delete-configurations
 |Delete configurations
 
+|--help
+|Display this help message
+
 |-g, --region
 |Region to install to
 |===

Modified: karaf/site/production/manual/latest/commands/http-proxy-add.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/http-proxy-add.adoc?rev=1892414&r1=1892413&r2=1892414&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/http-proxy-add.adoc (original)
+++ karaf/site/production/manual/latest/commands/http-proxy-add.adoc Wed Aug 18 12:18:31 2021
@@ -25,11 +25,11 @@ http:proxy-add [options] url proxyTo
 |===
 |Name |Description
 
-|--help
-|Display this help message
-
 |-b, --lb
 |Define the filter to the balancing service to use
+
+|--help
+|Display this help message
 |===
 
 

Modified: karaf/site/production/manual/latest/commands/instance-clone.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/instance-clone.adoc?rev=1892414&r1=1892413&r2=1892414&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/instance-clone.adoc (original)
+++ karaf/site/production/manual/latest/commands/instance-clone.adoc Wed Aug 18 12:18:31 2021
@@ -43,12 +43,12 @@ instance:clone [options] name cloneName
 |-rs, --rmi-server-port
 |Port number for RMI server connection
 
-|--help
-|Display this help message
-
 |-o, --java-opts
 |JVM options to use when launching the cloned instance
 
+|--help
+|Display this help message
+
 |-br, --binary-resource
 |Add a text resource to the instance
 |===

Modified: karaf/site/production/manual/latest/commands/instance-connect.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/instance-connect.adoc?rev=1892414&r1=1892413&r2=1892414&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/instance-connect.adoc (original)
+++ karaf/site/production/manual/latest/commands/instance-connect.adoc Wed Aug 18 12:18:31 2021
@@ -31,11 +31,11 @@ instance:connect [options] name [command
 |-p, --password
 |Remote password
 
-|--help
-|Display this help message
-
 |-u, --username
 |Remote user name
+
+|--help
+|Display this help message
 |===
 
 

Modified: karaf/site/production/manual/latest/commands/instance-create.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/instance-create.adoc?rev=1892414&r1=1892413&r2=1892414&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/instance-create.adoc (original)
+++ karaf/site/production/manual/latest/commands/instance-create.adoc Wed Aug 18 12:18:31 2021
@@ -34,9 +34,6 @@ instance:create [options] name
 |-p, --profiles
 |Profiles to install on the instance
 
-|--help
-|Display this help message
-
 |-l, --location
 |Location of the new container instance in the file system
 
@@ -61,6 +58,9 @@ instance:create [options] name
 |-r, -rr, --rmi-port, --rmi-registry-port
 |Port number for RMI registry connection
 
+|--help
+|Display this help message
+
 |-br, --binary-resource
 |Add a text resource to the instance
 |===

Modified: karaf/site/production/manual/latest/commands/jaas-realm-manage.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/jaas-realm-manage.adoc?rev=1892414&r1=1892413&r2=1892414&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/jaas-realm-manage.adoc (original)
+++ karaf/site/production/manual/latest/commands/jaas-realm-manage.adoc Wed Aug 18 12:18:31 2021
@@ -22,12 +22,12 @@ jaas:realm-manage [options]
 |-f, --force
 |Force the management of this realm, even if another one was under management
 
-|--help
-|Display this help message
-
 |--realm
 |JAAS Realm. Must be combined with --module
 
+|--help
+|Display this help message
+
 |--index
 |Realm Index
 |===

Modified: karaf/site/production/manual/latest/commands/jdbc-ds-create.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/jdbc-ds-create.adoc?rev=1892414&r1=1892413&r2=1892414&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/jdbc-ds-create.adoc (original)
+++ karaf/site/production/manual/latest/commands/jdbc-ds-create.adoc Wed Aug 18 12:18:31 2021
@@ -34,12 +34,12 @@ jdbc:ds-create [options] name
 |-dn, --driverName
 |org.osgi.driver.name property of the DataSourceFactory
 
-|--help
-|Display this help message
-
 |-url
 |The JDBC URL to use
 
+|--help
+|Display this help message
+
 |-dc, --driverClass
 |org.osgi.driver.class property  of the DataSourceFactory
 

Modified: karaf/site/production/manual/latest/commands/jms-send.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/jms-send.adoc?rev=1892414&r1=1892413&r2=1892414&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/jms-send.adoc (original)
+++ karaf/site/production/manual/latest/commands/jms-send.adoc Wed Aug 18 12:18:31 2021
@@ -28,12 +28,12 @@ jms:send [options] connectionFactory que
 |===
 |Name |Description
 
-|--help
-|Display this help message
-
 |-r, --replyTo
 |Set the message ReplyTo
 
+|--help
+|Display this help message
+
 |-p, --password
 |Password to connect to the JMS broker
 

Modified: karaf/site/production/manual/latest/commands/log-display.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/log-display.adoc?rev=1892414&r1=1892413&r2=1892414&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/log-display.adoc (original)
+++ karaf/site/production/manual/latest/commands/log-display.adoc Wed Aug 18 12:18:31 2021
@@ -31,11 +31,11 @@ log:display [options] [logger]
 |-n
 |Number of entries to display
 
-|--help
-|Display this help message
-
 |-l, --level
 |The minimal log level to display
+
+|--help
+|Display this help message
 |===
 
 

Modified: karaf/site/production/manual/latest/commands/log-tail.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/log-tail.adoc?rev=1892414&r1=1892413&r2=1892414&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/log-tail.adoc (original)
+++ karaf/site/production/manual/latest/commands/log-tail.adoc Wed Aug 18 12:18:31 2021
@@ -31,11 +31,11 @@ log:tail [options] [logger]
 |-n
 |Number of entries to display
 
-|--help
-|Display this help message
-
 |-l, --level
 |The minimal log level to display
+
+|--help
+|Display this help message
 |===
 
 

Modified: karaf/site/production/manual/latest/commands/maven-http-proxy.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/maven-http-proxy.adoc?rev=1892414&r1=1892413&r2=1892414&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/maven-http-proxy.adoc (original)
+++ karaf/site/production/manual/latest/commands/maven-http-proxy.adoc Wed Aug 18 12:18:31 2021
@@ -37,9 +37,6 @@ maven:http-proxy [options] [hostPort]
 |-n, --non-proxy-hosts
 |Non-proxied hosts (in the format '192.168.*|localhost|...')
 
-|--help
-|Display this help message
-
 |--remove
 |Removes HTTP proxy configuration from Maven settings
 
@@ -49,6 +46,9 @@ maven:http-proxy [options] [hostPort]
 |-u, --username
 |Username for remote repository
 
+|--help
+|Display this help message
+
 |-x, --show-passwords
 |Do not hide passwords related to Maven encryption
 |===

Modified: karaf/site/production/manual/latest/commands/maven-repository-add.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/maven-repository-add.adoc?rev=1892414&r1=1892413&r2=1892414&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/maven-repository-add.adoc (original)
+++ karaf/site/production/manual/latest/commands/maven-repository-add.adoc Wed Aug 18 12:18:31 2021
@@ -46,12 +46,12 @@ maven:repository-add [options] [uri]
 |-cp, --checksum-policy
 |Checksum policy for repository (ignore, warn (default), fail)
 
-|--help
-|Display this help message
-
 |-u, --username
 |Username for remote repository
 
+|--help
+|Display this help message
+
 |-x, --show-passwords
 |Do not hide passwords related to Maven encryption
 

Modified: karaf/site/production/manual/latest/commands/maven-repository-change.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/maven-repository-change.adoc?rev=1892414&r1=1892413&r2=1892414&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/maven-repository-change.adoc (original)
+++ karaf/site/production/manual/latest/commands/maven-repository-change.adoc Wed Aug 18 12:18:31 2021
@@ -43,12 +43,12 @@ maven:repository-change [options] [uri]
 |-cp, --checksum-policy
 |Checksum policy for repository (ignore, warn (default), fail)
 
-|--help
-|Display this help message
-
 |-u, --username
 |Username for remote repository
 
+|--help
+|Display this help message
+
 |-x, --show-passwords
 |Do not hide passwords related to Maven encryption
 

Modified: karaf/site/production/manual/latest/commands/obr-deploy.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/obr-deploy.adoc?rev=1892414&r1=1892413&r2=1892414&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/obr-deploy.adoc (original)
+++ karaf/site/production/manual/latest/commands/obr-deploy.adoc Wed Aug 18 12:18:31 2021
@@ -25,11 +25,11 @@ obr:deploy [options] bundles
 |-d, --deployOptional
 |Deploy optional bundles
 
-|--help
-|Display this help message
-
 |-s, --start
 |Start the deployed bundles
+
+|--help
+|Display this help message
 |===
 
 

Modified: karaf/site/production/manual/latest/commands/package-exports.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/package-exports.adoc?rev=1892414&r1=1892413&r2=1892414&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/package-exports.adoc (original)
+++ karaf/site/production/manual/latest/commands/package-exports.adoc Wed Aug 18 12:18:31 2021
@@ -19,12 +19,12 @@ package:exports [options]
 |-d
 |Only show packages that are exported by more than one bundle
 
-|--help
-|Display this help message
-
 |--show-name-only
 |Show only package name
 
+|--help
+|Display this help message
+
 |-p
 |Only show package starting with given name
 

Modified: karaf/site/production/manual/latest/commands/package-imports.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/package-imports.adoc?rev=1892414&r1=1892413&r2=1892414&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/package-imports.adoc (original)
+++ karaf/site/production/manual/latest/commands/package-imports.adoc Wed Aug 18 12:18:31 2021
@@ -16,12 +16,12 @@ package:imports [options]
 |-b
 |Only show imports of the given bundle id
 
-|--help
-|Display this help message
-
 |--show-name-only
 |Show only package name
 
+|--help
+|Display this help message
+
 |--filter
 |Only show package instead of full filter
 

Modified: karaf/site/production/manual/latest/commands/profile-edit.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/profile-edit.adoc?rev=1892414&r1=1892413&r2=1892414&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/profile-edit.adoc (original)
+++ karaf/site/production/manual/latest/commands/profile-edit.adoc Wed Aug 18 12:18:31 2021
@@ -49,9 +49,6 @@ profile:edit [options] profile
 |--set
 |Set or create values (selected by default).
 
-|--help
-|Display this help message
-
 |-i, --import-pid
 |Imports the pids that are edited, from local OSGi config admin
 
@@ -70,6 +67,9 @@ profile:edit [options] profile
 |-b, --bundles
 |Edit bundles. To specify multiple bundles, specify this flag multiple times.
 
+|--help
+|Display this help message
+
 |-n, --endorsed
 |Edit endorsed libraries. To specify multiple libraries, specify this flag multiple times.
 

Modified: karaf/site/production/manual/latest/commands/scheduler-reschedule.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/scheduler-reschedule.adoc?rev=1892414&r1=1892413&r2=1892414&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/scheduler-reschedule.adoc (original)
+++ karaf/site/production/manual/latest/commands/scheduler-reschedule.adoc Wed Aug 18 12:18:31 2021
@@ -31,12 +31,12 @@ scheduler:reschedule [options] name
 |--times
 |Number of times this job should be executed
 
-|--help
-|Display this help message
-
 |--concurrent
 |Should jobs run concurrently or not (defaults to false)
 
+|--help
+|Display this help message
+
 |--cron
 |The cron expression
 |===

Modified: karaf/site/production/manual/latest/commands/scheduler-schedule-command.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/scheduler-schedule-command.adoc?rev=1892414&r1=1892413&r2=1892414&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/scheduler-schedule-command.adoc (original)
+++ karaf/site/production/manual/latest/commands/scheduler-schedule-command.adoc Wed Aug 18 12:18:31 2021
@@ -31,12 +31,12 @@ scheduler:schedule-command [options] com
 |--times
 |Number of times this job should be executed
 
-|--help
-|Display this help message
-
 |--concurrent
 |Should jobs run concurrently or not (defaults to false)
 
+|--help
+|Display this help message
+
 |--cron
 |The cron expression
 |===

Modified: karaf/site/production/manual/latest/commands/scheduler-schedule-script.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/scheduler-schedule-script.adoc?rev=1892414&r1=1892413&r2=1892414&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/scheduler-schedule-script.adoc (original)
+++ karaf/site/production/manual/latest/commands/scheduler-schedule-script.adoc Wed Aug 18 12:18:31 2021
@@ -31,15 +31,15 @@ scheduler:schedule-script [options] scri
 |--times
 |Number of times this job should be executed
 
-|--help
-|Display this help message
-
 |--name
 |Name of this job
 
 |--concurrent
 |Should jobs run concurrently or not (defaults to false)
 
+|--help
+|Display this help message
+
 |--cron
 |The cron expression
 |===

Modified: karaf/site/production/manual/latest/commands/shell-threads.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/shell-threads.adoc?rev=1892414&r1=1892413&r2=1892414&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/shell-threads.adoc (original)
+++ karaf/site/production/manual/latest/commands/shell-threads.adoc Wed Aug 18 12:18:31 2021
@@ -37,15 +37,15 @@ shell:threads [options] [id]
 |--monitors
 |Display monitors
 
-|--help
-|Display this help message
-
 |-t, --threshold
 |Minimal number of interesting stack trace line to display a thread
 
 |--locks
 |Display locks
 
+|--help
+|Display this help message
+
 |--no-format
 |Disable table rendered output
 |===

Modified: karaf/site/production/manual/latest/commands/ssh-ssh.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/ssh-ssh.adoc?rev=1892414&r1=1892413&r2=1892414&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/ssh-ssh.adoc (original)
+++ karaf/site/production/manual/latest/commands/ssh-ssh.adoc Wed Aug 18 12:18:31 2021
@@ -37,12 +37,12 @@ ssh:ssh [options] hostname [command]
 |-r, --retries
 |retry connection establishment (up to attempts times)
 
-|--help
-|Display this help message
-
 |-l, --username
 |The user name for remote login
 
+|--help
+|Display this help message
+
 |-k, --keyfile
 |The private keyFile location when using key login, need have BouncyCastle registered as security provider using this flag
 |===

Modified: karaf/site/production/manual/latest/commands/system-property.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/system-property.adoc?rev=1892414&r1=1892413&r2=1892414&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/system-property.adoc (original)
+++ karaf/site/production/manual/latest/commands/system-property.adoc Wed Aug 18 12:18:31 2021
@@ -31,11 +31,11 @@ system:property [options] [key] [value]
 |-p, --persistent
 |Persist the new value to the etc/system.properties file
 
-|--help
-|Display this help message
-
 |-u, --unset
 |Show unset know properties with value unset
+
+|--help
+|Display this help message
 |===
 
 

Modified: karaf/site/production/manual/latest/commands/system-shutdown.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/system-shutdown.adoc?rev=1892414&r1=1892413&r2=1892414&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/system-shutdown.adoc (original)
+++ karaf/site/production/manual/latest/commands/system-shutdown.adoc Wed Aug 18 12:18:31 2021
@@ -25,15 +25,15 @@ system:shutdown [options] [time]
 |-c, --clean, --clean-all, -ca
 |Force a clean restart by deleting the data directory
 
-|--help
-|Display this help message
-
 |-h, --halt
 |Halt the Karaf container.
 
 |-cc, --clean-cache, -cc
 |Force a clean restart by deleting the cache directory
 
+|--help
+|Display this help message
+
 |-f, --force
 |Force the shutdown without confirmation message.
 

Modified: karaf/site/production/manual/latest/commands/wrapper-install.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/wrapper-install.adoc?rev=1892414&r1=1892413&r2=1892414&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/wrapper-install.adoc (original)
+++ karaf/site/production/manual/latest/commands/wrapper-install.adoc Wed Aug 18 12:18:31 2021
@@ -22,12 +22,12 @@ wrapper:install [options]
 |-s, --start-type
 |Mode in which the service is installed. AUTO_START or DEMAND_START (Default: AUTO_START)
 
-|--help
-|Display this help message
-
 |-e, --env
 |Specify environment variable and values. To specify multiple environment variable and values, specify this flag multiple times.
 
+|--help
+|Display this help message
+
 |-n, --name
 |The service name that will be used when installing the service. (Default: karaf)
 

Modified: karaf/site/production/manual/latest/configuration.html
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/configuration.html?rev=1892414&r1=1892413&r2=1892414&view=diff
==============================================================================
--- karaf/site/production/manual/latest/configuration.html (original)
+++ karaf/site/production/manual/latest/configuration.html Wed Aug 18 12:18:31 2021
@@ -1199,7 +1199,7 @@ pattern | Pattern | String | %d{ABSOLUTE
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2021-05-31 06:26:27 CEST
+Last updated 2021-08-07 07:10:04 CEST
 </div>
 </div>
 </body>

Modified: karaf/site/production/manual/latest/connect.html
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/connect.html?rev=1892414&r1=1892413&r2=1892414&view=diff
==============================================================================
--- karaf/site/production/manual/latest/connect.html (original)
+++ karaf/site/production/manual/latest/connect.html Wed Aug 18 12:18:31 2021
@@ -625,7 +625,7 @@ public class Main {
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2020-02-05 08:42:32 CET
+Last updated 2021-08-01 14:20:38 CEST
 </div>
 </div>
 </body>

Modified: karaf/site/production/manual/latest/console.html
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/console.html?rev=1892414&r1=1892413&r2=1892414&view=diff
==============================================================================
--- karaf/site/production/manual/latest/console.html (original)
+++ karaf/site/production/manual/latest/console.html Wed Aug 18 12:18:31 2021
@@ -1206,7 +1206,7 @@ some commands, or limit the values allow
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2020-11-04 17:04:18 CET
+Last updated 2021-08-01 14:20:38 CEST
 </div>
 </div>
 </body>

Modified: karaf/site/production/manual/latest/creating-bundles.html
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/creating-bundles.html?rev=1892414&r1=1892413&r2=1892414&view=diff
==============================================================================
--- karaf/site/production/manual/latest/creating-bundles.html (original)
+++ karaf/site/production/manual/latest/creating-bundles.html Wed Aug 18 12:18:31 2021
@@ -761,7 +761,7 @@ This bundle is simply a Maven POM that s
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2020-11-04 17:04:18 CET
+Last updated 2021-08-01 14:20:38 CEST
 </div>
 </div>
 </body>

Modified: karaf/site/production/manual/latest/custom-distribution.html
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/custom-distribution.html?rev=1892414&r1=1892413&r2=1892414&view=diff
==============================================================================
--- karaf/site/production/manual/latest/custom-distribution.html (original)
+++ karaf/site/production/manual/latest/custom-distribution.html Wed Aug 18 12:18:31 2021
@@ -1278,7 +1278,7 @@ assembly descriptor, configured in POM a
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2020-11-04 17:04:18 CET
+Last updated 2021-08-01 14:20:38 CEST
 </div>
 </div>
 </body>

Modified: karaf/site/production/manual/latest/debugging.html
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/debugging.html?rev=1892414&r1=1892413&r2=1892414&view=diff
==============================================================================
--- karaf/site/production/manual/latest/debugging.html (original)
+++ karaf/site/production/manual/latest/debugging.html Wed Aug 18 12:18:31 2021
@@ -827,7 +827,7 @@ allowing you to create, rename, destroy,
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2021-05-31 06:26:27 CEST
+Last updated 2021-08-07 07:10:04 CEST
 </div>
 </div>
 </body>

Modified: karaf/site/production/manual/latest/deployers.html
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/deployers.html?rev=1892414&r1=1892413&r2=1892414&view=diff
==============================================================================
--- karaf/site/production/manual/latest/deployers.html (original)
+++ karaf/site/production/manual/latest/deployers.html Wed Aug 18 12:18:31 2021
@@ -833,7 +833,7 @@ For instance:</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2020-11-04 17:04:18 CET
+Last updated 2021-08-01 14:20:38 CEST
 </div>
 </div>
 </body>

Modified: karaf/site/production/manual/latest/developer-commands.html
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/developer-commands.html?rev=1892414&r1=1892413&r2=1892414&view=diff
==============================================================================
--- karaf/site/production/manual/latest/developer-commands.html (original)
+++ karaf/site/production/manual/latest/developer-commands.html Wed Aug 18 12:18:31 2021
@@ -825,7 +825,7 @@ system folder.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2020-11-04 17:04:18 CET
+Last updated 2021-08-01 14:20:38 CEST
 </div>
 </div>
 </body>

Modified: karaf/site/production/manual/latest/directory-structure.html
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/directory-structure.html?rev=1892414&r1=1892413&r2=1892414&view=diff
==============================================================================
--- karaf/site/production/manual/latest/directory-structure.html (original)
+++ karaf/site/production/manual/latest/directory-structure.html Wed Aug 18 12:18:31 2021
@@ -605,7 +605,7 @@ using the clean option to the Karaf star
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2020-10-01 05:46:39 CEST
+Last updated 2021-08-01 14:20:38 CEST
 </div>
 </div>
 </body>

Modified: karaf/site/production/manual/latest/docker.html
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/docker.html?rev=1892414&r1=1892413&r2=1892414&view=diff
==============================================================================
--- karaf/site/production/manual/latest/docker.html (original)
+++ karaf/site/production/manual/latest/docker.html Wed Aug 18 12:18:31 2021
@@ -567,29 +567,15 @@ table.CodeRay td.code>pre{padding:0}
 </div>
 <div class="sect4">
 <h5 id="_official_images">Official images</h5>
-<div class="admonitionblock note">
-<table>
-<tr>
-<td class="icon">
-<div class="title">Note</div>
-</td>
-<td class="content">
-<div class="paragraph">
-<p>The official Docker Karaf images are in preparation, as part of the Karaf build process. They should be available soon.</p>
-</div>
-</td>
-</tr>
-</table>
-</div>
 <div class="paragraph">
-<p>Apache Karaf official docker images should be available soon on Docker HUB: <a href="https://hub.docker.com/_/karaf/" class="bare">https://hub.docker.com/_/karaf/</a></p>
+<p>The Apache Karaf official images are available on Docker HUB: <a href="https://hub.docker.com/r/apache/karaf/tags?page=1&amp;ordering=last_updated" class="bare">https://hub.docker.com/r/apache/karaf/tags?page=1&amp;ordering=last_updated</a></p>
 </div>
 <div class="paragraph">
 <p>You can directly pull the official image:</p>
 </div>
 <div class="listingblock">
 <div class="content">
-<pre>docker pull karaf</pre>
+<pre>docker pull apache/karaf</pre>
 </div>
 </div>
 </div>
@@ -626,25 +612,25 @@ want to build the Karaf image run:</p>
 <div class="ulist">
 <ul>
 <li>
-<p>Run Karaf in interactive mode</p>
+<p>Run Karaf in interactive mode (using Karaf official docker image):</p>
 </li>
 </ul>
 </div>
 <div class="listingblock">
 <div class="content">
-<pre>docker run -i -t --name karaf karaf:latest karaf</pre>
+<pre>docker run -i -t --name karaf apache/karaf:latest karaf</pre>
 </div>
 </div>
 <div class="ulist">
 <ul>
 <li>
-<p>Run Karaf without interaction but log displayed</p>
+<p>Run Karaf without interaction but log displayed (using Karaf official docker image):</p>
 </li>
 </ul>
 </div>
 <div class="listingblock">
 <div class="content">
-<pre>docker run --name karaf karaf:latest</pre>
+<pre>docker run --name karaf apache/karaf:latest</pre>
 </div>
 </div>
 <div class="ulist">
@@ -1052,7 +1038,7 @@ Id
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2020-11-04 17:04:18 CET
+Last updated 2021-08-18 14:13:58 CEST
 </div>
 </div>
 </body>

Modified: karaf/site/production/manual/latest/ejb.html
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/ejb.html?rev=1892414&r1=1892413&r2=1892414&view=diff
==============================================================================
--- karaf/site/production/manual/latest/ejb.html (original)
+++ karaf/site/production/manual/latest/ejb.html Wed Aug 18 12:18:31 2021
@@ -631,7 +631,7 @@ openejb-soap                  | 4.5.2 |
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2020-11-04 17:04:18 CET
+Last updated 2021-08-01 14:20:38 CEST
 </div>
 </div>
 </body>

Modified: karaf/site/production/manual/latest/extending.html
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/extending.html?rev=1892414&r1=1892413&r2=1892414&view=diff
==============================================================================
--- karaf/site/production/manual/latest/extending.html (original)
+++ karaf/site/production/manual/latest/extending.html Wed Aug 18 12:18:31 2021
@@ -550,7 +550,7 @@ table.CodeRay td.code>pre{padding:0}
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2020-11-04 17:04:18 CET
+Last updated 2021-08-01 14:20:38 CEST
 </div>
 </div>
 </body>

Modified: karaf/site/production/manual/latest/failover.html
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/failover.html?rev=1892414&r1=1892413&r2=1892414&view=diff
==============================================================================
--- karaf/site/production/manual/latest/failover.html (original)
+++ karaf/site/production/manual/latest/failover.html Wed Aug 18 12:18:31 2021
@@ -928,7 +928,7 @@ to update the slave configuration to bin
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2021-05-31 06:26:27 CEST
+Last updated 2021-08-07 07:10:04 CEST
 </div>
 </div>
 </body>

Modified: karaf/site/production/manual/latest/github-contributions.html
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/github-contributions.html?rev=1892414&r1=1892413&r2=1892414&view=diff
==============================================================================
--- karaf/site/production/manual/latest/github-contributions.html (original)
+++ karaf/site/production/manual/latest/github-contributions.html Wed Aug 18 12:18:31 2021
@@ -632,7 +632,7 @@ git format-patch archon/trunk</pre>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2020-11-04 17:04:18 CET
+Last updated 2021-08-01 14:20:38 CEST
 </div>
 </div>
 </body>

Modified: karaf/site/production/manual/latest/http.html
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/http.html?rev=1892414&r1=1892413&r2=1892414&view=diff
==============================================================================
--- karaf/site/production/manual/latest/http.html (original)
+++ karaf/site/production/manual/latest/http.html Wed Aug 18 12:18:31 2021
@@ -629,7 +629,7 @@ table.CodeRay td.code>pre{padding:0}
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2021-05-31 06:26:27 CEST
+Last updated 2021-08-07 07:10:04 CEST
 </div>
 </div>
 </body>

Modified: karaf/site/production/manual/latest/index.html
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/index.html?rev=1892414&r1=1892413&r2=1892414&view=diff
==============================================================================
--- karaf/site/production/manual/latest/index.html (original)
+++ karaf/site/production/manual/latest/index.html Wed Aug 18 12:18:31 2021
@@ -9630,9 +9630,12 @@ encryption.enabled = false
 
 #
 # Encryption Service name
-#   the default one is 'basic'. Note that this digests without salting.
-#   a more powerful one named 'jasypt' is available when installing the
-#   encryption feature
+#   basic: the default encryption service which digests passwords without
+#          salting them
+#   jasypt: a more powerful alternative which supports salting
+#   spring-security-crypto: Supports bcrypt, argon2, pbkdf2, scrypt. Requires
+#                           the "spring-security-crypto-encryption" feature
+#                           to be installed.
 #
 encryption.name = basic
 
@@ -9649,12 +9652,8 @@ encryption.suffix = {CRYPT}
 #
 # Set the encryption algorithm to use in Karaf JAAS login module
 # Supported encryption algorithms follow:
-#   MD2
-#   MD5
-#   SHA-1
-#   SHA-256
-#   SHA-384
-#   SHA-512
+#   basic/jasypt: MD2, MD5, SHA-1, SHA-256, SHA-384, SHA-512
+#   spring-security-crypto: argon2, bcrypt, pbkdf2, scrypt
 #
 encryption.algorithm = SHA-256
 
@@ -9677,6 +9676,12 @@ file), without the <code>\{CRYPT\</code>
 prefixed and suffixed with <code>\{CRYPT\</code>}) and encrypt it again.</p>
 </div>
 <div class="paragraph">
+<p>The <code>encryption.name</code> property defines which encryption provider is used. The default is "basic" which just supports basic
+digesting of the password, without salting. This is not secure for production environments. A more secure alternative is
+"jasypt", which supports digesting with salting. However, the most secure alternative which should be used in production is
+"spring-security-crypto", which supports modern password digest algorithms such as "argon2" and "bcrypt".</p>
+</div>
+<div class="paragraph">
 <p>The <code>etc/org.apache.karaf.jaas.cfg</code> configuration file allows you to define advanced encryption behaviours:</p>
 </div>
 <div class="ulist">
@@ -9688,10 +9693,9 @@ prefixed and suffixed with <code>\{CRYPT
 <p>the <code>encryption.suffix</code> property defines the suffix to "flag" a password as encrypted. The default is <code>\{CRYPT\</code>}.</p>
 </li>
 <li>
-<p>the <code>encryption.algorithm</code> property defines the algorithm to use for encryption (digest). The possible values are <code>MD2</code>, <code>MD5</code>,
-<code>SHA-1</code>, <code>SHA-256</code>, <code>SHA-384</code>, <code>SHA-512</code>. The default is <code>SHA-256</code> since Karaf 4.3.0, prior to this it was <code>MD5</code>. When the <code>basic</code> algorithm is used then the value is digested
-using this algorithm without salting. For a more secure alternative which uses salts please consider using the <code>jasypt</code> encryption
-algorithm instead.</p>
+<p>the <code>encryption.algorithm</code> property defines the algorithm to use for encryption (digest). The possible values for the "basic" and
+"jasypt" provides are: <code>MD2</code>, <code>MD5</code>, <code>SHA-1</code>, <code>SHA-256</code>, <code>SHA-384</code>, <code>SHA-512</code>. The default is <code>SHA-256</code> since Karaf 4.3.0, prior to this it was <code>MD5</code>.
+When the "spring-security-crypto" <code>encryption.name</code> is configured, the possible values are: <code>argon2</code>, <code>bcrypt</code>, <code>pbkdf2</code>, <code>scrypt</code>.</p>
 </li>
 <li>
 <p>the <code>encryption.encoding</code> property defines the encoding of the encrypted password. The possible values are <code>hexadecimal</code>
@@ -10114,29 +10118,15 @@ can access those.</p>
 </div>
 <div class="sect4">
 <h5 id="_official_images">Official images</h5>
-<div class="admonitionblock note">
-<table>
-<tr>
-<td class="icon">
-<div class="title">Note</div>
-</td>
-<td class="content">
-<div class="paragraph">
-<p>The official Docker Karaf images are in preparation, as part of the Karaf build process. They should be available soon.</p>
-</div>
-</td>
-</tr>
-</table>
-</div>
 <div class="paragraph">
-<p>Apache Karaf official docker images should be available soon on Docker HUB: <a href="https://hub.docker.com/_/karaf/" class="bare">https://hub.docker.com/_/karaf/</a></p>
+<p>The Apache Karaf official images are available on Docker HUB: <a href="https://hub.docker.com/r/apache/karaf/tags?page=1&amp;ordering=last_updated" class="bare">https://hub.docker.com/r/apache/karaf/tags?page=1&amp;ordering=last_updated</a></p>
 </div>
 <div class="paragraph">
 <p>You can directly pull the official image:</p>
 </div>
 <div class="listingblock">
 <div class="content">
-<pre>docker pull karaf</pre>
+<pre>docker pull apache/karaf</pre>
 </div>
 </div>
 </div>
@@ -10173,25 +10163,25 @@ want to build the Karaf image run:</p>
 <div class="ulist">
 <ul>
 <li>
-<p>Run Karaf in interactive mode</p>
+<p>Run Karaf in interactive mode (using Karaf official docker image):</p>
 </li>
 </ul>
 </div>
 <div class="listingblock">
 <div class="content">
-<pre>docker run -i -t --name karaf karaf:latest karaf</pre>
+<pre>docker run -i -t --name karaf apache/karaf:latest karaf</pre>
 </div>
 </div>
 <div class="ulist">
 <ul>
 <li>
-<p>Run Karaf without interaction but log displayed</p>
+<p>Run Karaf without interaction but log displayed (using Karaf official docker image):</p>
 </li>
 </ul>
 </div>
 <div class="listingblock">
 <div class="content">
-<pre>docker run --name karaf karaf:latest</pre>
+<pre>docker run --name karaf apache/karaf:latest</pre>
 </div>
 </div>
 <div class="ulist">
@@ -20736,7 +20726,7 @@ git format-patch archon/trunk</pre>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2020-11-04 17:04:18 CET
+Last updated 2021-08-01 14:20:38 CEST
 </div>
 </div>
 </body>

Modified: karaf/site/production/manual/latest/installation.html
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/installation.html?rev=1892414&r1=1892413&r2=1892414&view=diff
==============================================================================
--- karaf/site/production/manual/latest/installation.html (original)
+++ karaf/site/production/manual/latest/installation.html Wed Aug 18 12:18:31 2021
@@ -928,7 +928,7 @@ This property is used to locate the <cod
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2020-11-04 17:04:18 CET
+Last updated 2021-08-01 14:20:38 CEST
 </div>
 </div>
 </body>

Modified: karaf/site/production/manual/latest/instances.html
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/instances.html?rev=1892414&r1=1892413&r2=1892414&view=diff
==============================================================================
--- karaf/site/production/manual/latest/instances.html (original)
+++ karaf/site/production/manual/latest/instances.html Wed Aug 18 12:18:31 2021
@@ -1083,7 +1083,7 @@ If wait is true, this operation is waiti
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2020-11-04 17:04:18 CET
+Last updated 2021-08-01 14:20:38 CEST
 </div>
 </div>
 </body>

Modified: karaf/site/production/manual/latest/interceptor.html
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/interceptor.html?rev=1892414&r1=1892413&r2=1892414&view=diff
==============================================================================
--- karaf/site/production/manual/latest/interceptor.html (original)
+++ karaf/site/production/manual/latest/interceptor.html Wed Aug 18 12:18:31 2021
@@ -684,7 +684,7 @@ if you put a binding on a class is it av
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2021-05-31 06:26:27 CEST
+Last updated 2021-08-07 07:10:04 CEST
 </div>
 </div>
 </body>

Modified: karaf/site/production/manual/latest/jdbc.html
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/jdbc.html?rev=1892414&r1=1892413&r2=1892414&view=diff
==============================================================================
--- karaf/site/production/manual/latest/jdbc.html (original)
+++ karaf/site/production/manual/latest/jdbc.html Wed Aug 18 12:18:31 2021
@@ -920,7 +920,7 @@ REF_GENERATION | TYPE_NAME | TABLE_NAME
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2020-11-04 17:04:18 CET
+Last updated 2021-08-01 14:20:38 CEST
 </div>
 </div>
 </body>

Modified: karaf/site/production/manual/latest/jms.html
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/jms.html?rev=1892414&r1=1892413&r2=1892414&view=diff
==============================================================================
--- karaf/site/production/manual/latest/jms.html (original)
+++ karaf/site/production/manual/latest/jms.html Wed Aug 18 12:18:31 2021
@@ -1021,7 +1021,7 @@ ID:vostro-59602-1387462183019-3:3:1:1:1
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2020-11-04 17:04:18 CET
+Last updated 2021-08-01 14:20:38 CEST
 </div>
 </div>
 </body>

Modified: karaf/site/production/manual/latest/jndi.html
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/jndi.html?rev=1892414&r1=1892413&r2=1892414&view=diff
==============================================================================
--- karaf/site/production/manual/latest/jndi.html (original)
+++ karaf/site/production/manual/latest/jndi.html Wed Aug 18 12:18:31 2021
@@ -847,7 +847,7 @@ and the regular JNDI service.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2020-02-05 08:42:32 CET
+Last updated 2021-08-01 14:20:38 CEST
 </div>
 </div>
 </body>

Modified: karaf/site/production/manual/latest/jpa.html
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/jpa.html?rev=1892414&r1=1892413&r2=1892414&view=diff
==============================================================================
--- karaf/site/production/manual/latest/jpa.html (original)
+++ karaf/site/production/manual/latest/jpa.html Wed Aug 18 12:18:31 2021
@@ -584,7 +584,7 @@ container managed persistence for applic
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2020-02-05 08:42:32 CET
+Last updated 2021-08-01 14:20:38 CEST
 </div>
 </div>
 </body>

Modified: karaf/site/production/manual/latest/jta.html
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/jta.html?rev=1892414&r1=1892413&r2=1892414&view=diff
==============================================================================
--- karaf/site/production/manual/latest/jta.html (original)
+++ karaf/site/production/manual/latest/jta.html Wed Aug 18 12:18:31 2021
@@ -674,7 +674,7 @@ aries.transaction.howl.bufferSizeKBytes
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2020-11-04 17:04:18 CET
+Last updated 2021-08-01 14:20:38 CEST
 </div>
 </div>
 </body>

Modified: karaf/site/production/manual/latest/kar.html
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/kar.html?rev=1892414&r1=1892413&r2=1892414&view=diff
==============================================================================
--- karaf/site/production/manual/latest/kar.html (original)
+++ karaf/site/production/manual/latest/kar.html Wed Aug 18 12:18:31 2021
@@ -922,7 +922,7 @@ list of <code>features</code> to include
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2020-11-04 17:04:18 CET
+Last updated 2021-08-01 14:20:38 CEST
 </div>
 </div>
 </body>

Modified: karaf/site/production/manual/latest/karaf-maven-plugin.html
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/karaf-maven-plugin.html?rev=1892414&r1=1892413&r2=1892414&view=diff
==============================================================================
--- karaf/site/production/manual/latest/karaf-maven-plugin.html (original)
+++ karaf/site/production/manual/latest/karaf-maven-plugin.html Wed Aug 18 12:18:31 2021
@@ -1933,7 +1933,7 @@ META-INF in the kar, without getting ins
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2021-05-31 06:26:27 CEST
+Last updated 2021-08-07 07:10:04 CEST
 </div>
 </div>
 </body>

Modified: karaf/site/production/manual/latest/log.html
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/log.html?rev=1892414&r1=1892413&r2=1892414&view=diff
==============================================================================
--- karaf/site/production/manual/latest/log.html (original)
+++ karaf/site/production/manual/latest/log.html Wed Aug 18 12:18:31 2021
@@ -1443,7 +1443,7 @@ You can now use your appender directly i
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2020-11-04 17:04:18 CET
+Last updated 2021-08-01 14:20:38 CEST
 </div>
 </div>
 </body>

Modified: karaf/site/production/manual/latest/monitoring.html
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/monitoring.html?rev=1892414&r1=1892413&r2=1892414&view=diff
==============================================================================
--- karaf/site/production/manual/latest/monitoring.html (original)
+++ karaf/site/production/manual/latest/monitoring.html Wed Aug 18 12:18:31 2021
@@ -981,7 +981,7 @@ Enter host password for user 'karaf':
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2021-05-31 06:26:27 CEST
+Last updated 2021-08-07 07:10:04 CEST
 </div>
 </div>
 </body>

Modified: karaf/site/production/manual/latest/obr.html
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/obr.html?rev=1892414&r1=1892413&r2=1892414&view=diff
==============================================================================
--- karaf/site/production/manual/latest/obr.html (original)
+++ karaf/site/production/manual/latest/obr.html Wed Aug 18 12:18:31 2021
@@ -1013,7 +1013,7 @@ by the OBR service (meaning installing m
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2020-11-04 17:04:18 CET
+Last updated 2021-08-01 14:20:38 CEST
 </div>
 </div>
 </body>

Modified: karaf/site/production/manual/latest/os-integration.html
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/os-integration.html?rev=1892414&r1=1892413&r2=1892414&view=diff
==============================================================================
--- karaf/site/production/manual/latest/os-integration.html (original)
+++ karaf/site/production/manual/latest/os-integration.html Wed Aug 18 12:18:31 2021
@@ -1303,7 +1303,7 @@ C:\opt\apache-karaf-4\bin\contrib&gt; ka
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2021-04-04 07:19:06 CEST
+Last updated 2021-08-01 14:20:38 CEST
 </div>
 </div>
 </body>

Modified: karaf/site/production/manual/latest/overview.html
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/overview.html?rev=1892414&r1=1892413&r2=1892414&view=diff
==============================================================================
--- karaf/site/production/manual/latest/overview.html (original)
+++ karaf/site/production/manual/latest/overview.html Wed Aug 18 12:18:31 2021
@@ -606,7 +606,7 @@ Framework, but you can easily switch to
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2021-05-31 06:26:27 CEST
+Last updated 2021-08-07 07:10:04 CEST
 </div>
 </div>
 </body>

Modified: karaf/site/production/manual/latest/provisioning.html
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/provisioning.html?rev=1892414&r1=1892413&r2=1892414&view=diff
==============================================================================
--- karaf/site/production/manual/latest/provisioning.html (original)
+++ karaf/site/production/manual/latest/provisioning.html Wed Aug 18 12:18:31 2021
@@ -1781,7 +1781,7 @@ feature3 won&#8217;t be installed:</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2021-05-31 06:26:27 CEST
+Last updated 2021-08-07 07:10:04 CEST
 </div>
 </div>
 </body>

Modified: karaf/site/production/manual/latest/quick-start.html
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/quick-start.html?rev=1892414&r1=1892413&r2=1892414&view=diff
==============================================================================
--- karaf/site/production/manual/latest/quick-start.html (original)
+++ karaf/site/production/manual/latest/quick-start.html Wed Aug 18 12:18:31 2021
@@ -789,7 +789,7 @@ karaf@root()&gt;</pre>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2020-12-18 11:39:47 CET
+Last updated 2021-08-01 14:20:38 CEST
 </div>
 </div>
 </body>

Modified: karaf/site/production/manual/latest/remote.html
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/remote.html?rev=1892414&r1=1892413&r2=1892414&view=diff
==============================================================================
--- karaf/site/production/manual/latest/remote.html (original)
+++ karaf/site/production/manual/latest/remote.html Wed Aug 18 12:18:31 2021
@@ -1096,7 +1096,7 @@ looks for the artifacts (bundles, featur
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2021-05-31 06:26:27 CEST
+Last updated 2021-08-07 07:10:04 CEST
 </div>
 </div>
 </body>

Modified: karaf/site/production/manual/latest/scheduler.html
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/scheduler.html?rev=1892414&r1=1892413&r2=1892414&view=diff
==============================================================================
--- karaf/site/production/manual/latest/scheduler.html (original)
+++ karaf/site/production/manual/latest/scheduler.html Wed Aug 18 12:18:31 2021
@@ -879,7 +879,7 @@ org.quartz.jobStore.driverDelegateClass=
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2021-05-04 08:49:44 CEST
+Last updated 2021-08-01 14:20:38 CEST
 </div>
 </div>
 </body>

Modified: karaf/site/production/manual/latest/scripting.html
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/scripting.html?rev=1892414&r1=1892413&r2=1892414&view=diff
==============================================================================
--- karaf/site/production/manual/latest/scripting.html (original)
+++ karaf/site/production/manual/latest/scripting.html Wed Aug 18 12:18:31 2021
@@ -1083,7 +1083,7 @@ wait-for-command = {
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2020-11-04 17:04:18 CET
+Last updated 2021-08-01 14:20:38 CEST
 </div>
 </div>
 </body>

Modified: karaf/site/production/manual/latest/security-framework.html
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/security-framework.html?rev=1892414&r1=1892413&r2=1892414&view=diff
==============================================================================
--- karaf/site/production/manual/latest/security-framework.html (original)
+++ karaf/site/production/manual/latest/security-framework.html Wed Aug 18 12:18:31 2021
@@ -1861,7 +1861,7 @@ for (Principal p : subject.getPrincipals
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2021-05-31 06:26:27 CEST
+Last updated 2021-08-07 07:10:04 CEST
 </div>
 </div>
 </body>

Modified: karaf/site/production/manual/latest/security.html
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/security.html?rev=1892414&r1=1892413&r2=1892414&view=diff
==============================================================================
--- karaf/site/production/manual/latest/security.html (original)
+++ karaf/site/production/manual/latest/security.html Wed Aug 18 12:18:31 2021
@@ -961,9 +961,12 @@ encryption.enabled = false
 
 #
 # Encryption Service name
-#   the default one is 'basic'. Note that this digests without salting.
-#   a more powerful one named 'jasypt' is available when installing the
-#   encryption feature
+#   basic: the default encryption service which digests passwords without
+#          salting them
+#   jasypt: a more powerful alternative which supports salting
+#   spring-security-crypto: Supports bcrypt, argon2, pbkdf2, scrypt. Requires
+#                           the "spring-security-crypto-encryption" feature
+#                           to be installed.
 #
 encryption.name = basic
 
@@ -980,12 +983,8 @@ encryption.suffix = {CRYPT}
 #
 # Set the encryption algorithm to use in Karaf JAAS login module
 # Supported encryption algorithms follow:
-#   MD2
-#   MD5
-#   SHA-1
-#   SHA-256
-#   SHA-384
-#   SHA-512
+#   basic/jasypt: MD2, MD5, SHA-1, SHA-256, SHA-384, SHA-512
+#   spring-security-crypto: argon2, bcrypt, pbkdf2, scrypt
 #
 encryption.algorithm = SHA-256
 
@@ -1008,6 +1007,12 @@ file), without the <code>\{CRYPT\</code>
 prefixed and suffixed with <code>\{CRYPT\</code>}) and encrypt it again.</p>
 </div>
 <div class="paragraph">
+<p>The <code>encryption.name</code> property defines which encryption provider is used. The default is "basic" which just supports basic
+digesting of the password, without salting. This is not secure for production environments. A more secure alternative is
+"jasypt", which supports digesting with salting. However, the most secure alternative which should be used in production is
+"spring-security-crypto", which supports modern password digest algorithms such as "argon2" and "bcrypt".</p>
+</div>
+<div class="paragraph">
 <p>The <code>etc/org.apache.karaf.jaas.cfg</code> configuration file allows you to define advanced encryption behaviours:</p>
 </div>
 <div class="ulist">
@@ -1019,10 +1024,9 @@ prefixed and suffixed with <code>\{CRYPT
 <p>the <code>encryption.suffix</code> property defines the suffix to "flag" a password as encrypted. The default is <code>\{CRYPT\</code>}.</p>
 </li>
 <li>
-<p>the <code>encryption.algorithm</code> property defines the algorithm to use for encryption (digest). The possible values are <code>MD2</code>, <code>MD5</code>,
-<code>SHA-1</code>, <code>SHA-256</code>, <code>SHA-384</code>, <code>SHA-512</code>. The default is <code>SHA-256</code> since Karaf 4.3.0, prior to this it was <code>MD5</code>. When the <code>basic</code> algorithm is used then the value is digested
-using this algorithm without salting. For a more secure alternative which uses salts please consider using the <code>jasypt</code> encryption
-algorithm instead.</p>
+<p>the <code>encryption.algorithm</code> property defines the algorithm to use for encryption (digest). The possible values for the "basic" and
+"jasypt" provides are: <code>MD2</code>, <code>MD5</code>, <code>SHA-1</code>, <code>SHA-256</code>, <code>SHA-384</code>, <code>SHA-512</code>. The default is <code>SHA-256</code> since Karaf 4.3.0, prior to this it was <code>MD5</code>.
+When the "spring-security-crypto" <code>encryption.name</code> is configured, the possible values are: <code>argon2</code>, <code>bcrypt</code>, <code>pbkdf2</code>, <code>scrypt</code>.</p>
 </li>
 <li>
 <p>the <code>encryption.encoding</code> property defines the encoding of the encrypted password. The possible values are <code>hexadecimal</code>
@@ -1407,7 +1411,7 @@ can access those.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2021-05-31 06:26:27 CEST
+Last updated 2021-08-07 07:10:04 CEST
 </div>
 </div>
 </body>

Modified: karaf/site/production/manual/latest/start-stop.html
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/start-stop.html?rev=1892414&r1=1892413&r2=1892414&view=diff
==============================================================================
--- karaf/site/production/manual/latest/start-stop.html (original)
+++ karaf/site/production/manual/latest/start-stop.html Wed Aug 18 12:18:31 2021
@@ -1131,7 +1131,7 @@ Running ...</pre>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2020-11-04 17:04:18 CET
+Last updated 2021-08-01 14:20:38 CEST
 </div>
 </div>
 </body>

Modified: karaf/site/production/manual/latest/tuning.html
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/tuning.html?rev=1892414&r1=1892413&r2=1892414&view=diff
==============================================================================
--- karaf/site/production/manual/latest/tuning.html (original)
+++ karaf/site/production/manual/latest/tuning.html Wed Aug 18 12:18:31 2021
@@ -782,7 +782,7 @@ ones from the bundles.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2020-11-04 17:04:18 CET
+Last updated 2021-08-01 14:20:38 CEST
 </div>
 </div>
 </body>

Modified: karaf/site/production/manual/latest/update-notes.html
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/update-notes.html?rev=1892414&r1=1892413&r2=1892414&view=diff
==============================================================================
--- karaf/site/production/manual/latest/update-notes.html (original)
+++ karaf/site/production/manual/latest/update-notes.html Wed Aug 18 12:18:31 2021
@@ -866,7 +866,7 @@ As soon as you use a "new style" feature
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2020-11-04 17:04:18 CET
+Last updated 2021-08-01 14:20:38 CEST
 </div>
 </div>
 </body>

Modified: karaf/site/production/manual/latest/urls.html
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/urls.html?rev=1892414&r1=1892413&r2=1892414&view=diff
==============================================================================
--- karaf/site/production/manual/latest/urls.html (original)
+++ karaf/site/production/manual/latest/urls.html Wed Aug 18 12:18:31 2021
@@ -990,7 +990,7 @@ accessed bypassing HTTP proxy</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2020-11-04 17:04:18 CET
+Last updated 2021-08-01 14:20:38 CEST
 </div>
 </div>
 </body>

Modified: karaf/site/production/manual/latest/webconsole.html
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/webconsole.html?rev=1892414&r1=1892413&r2=1892414&view=diff
==============================================================================
--- karaf/site/production/manual/latest/webconsole.html (original)
+++ karaf/site/production/manual/latest/webconsole.html Wed Aug 18 12:18:31 2021
@@ -653,7 +653,7 @@ role=admin</pre>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2021-06-02 10:47:06 CEST
+Last updated 2021-08-07 07:10:04 CEST
 </div>
 </div>
 </body>

Modified: karaf/site/production/manual/latest/webcontainer.html
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/webcontainer.html?rev=1892414&r1=1892413&r2=1892414&view=diff
==============================================================================
--- karaf/site/production/manual/latest/webcontainer.html (original)
+++ karaf/site/production/manual/latest/webcontainer.html Wed Aug 18 12:18:31 2021
@@ -1117,7 +1117,7 @@ URL         │ ProxyTo
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2020-11-04 17:04:18 CET
+Last updated 2021-08-01 14:20:38 CEST
 </div>
 </div>
 </body>