Author: jbonofre
Date: Wed Nov 22 14:52:25 2017
New Revision: 1816059

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

Added:
    karaf/site/production/manual/latest/commands/config-install.adoc
    karaf/site/production/manual/latest/commands/config-property-get.adoc
    karaf/site/production/manual/latest/commands/jaas-whoami.adoc
    karaf/site/production/manual/latest/commands/log-load-test.adoc
    karaf/site/production/manual/latest/commands/maven-http-proxy-list.adoc
    karaf/site/production/manual/latest/commands/maven-http-proxy.adoc
    karaf/site/production/manual/latest/commands/maven-password.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/maven-repository-list.adoc
    karaf/site/production/manual/latest/commands/maven-repository-remove.adoc
    karaf/site/production/manual/latest/commands/maven-summary.adoc
    karaf/site/production/manual/latest/commands/scheduler-trigger.adoc
    karaf/site/production/manual/latest/configuration.html
    karaf/site/production/manual/latest/os-integration.html
    karaf/site/production/manual/latest/scheduler.html
Removed:
    karaf/site/production/manual/latest/commands/scr-activate.adoc
    karaf/site/production/manual/latest/commands/scr-components.adoc
    karaf/site/production/manual/latest/commands/scr-deactivate.adoc
    karaf/site/production/manual/latest/commands/scr-details.adoc
    karaf/site/production/manual/latest/commands/shell-alias.adoc
    karaf/site/production/manual/latest/commands/shell-cat.adoc
    karaf/site/production/manual/latest/commands/shell-clear.adoc
    karaf/site/production/manual/latest/commands/shell-date.adoc
    karaf/site/production/manual/latest/commands/shell-each.adoc
    karaf/site/production/manual/latest/commands/shell-echo.adoc
    karaf/site/production/manual/latest/commands/shell-edit.adoc
    karaf/site/production/manual/latest/commands/shell-env.adoc
    karaf/site/production/manual/latest/commands/shell-grep.adoc
    karaf/site/production/manual/latest/commands/shell-head.adoc
    karaf/site/production/manual/latest/commands/shell-history.adoc
    karaf/site/production/manual/latest/commands/shell-if.adoc
    karaf/site/production/manual/latest/commands/shell-less.adoc
    karaf/site/production/manual/latest/commands/shell-more.adoc
    karaf/site/production/manual/latest/commands/shell-new.adoc
    karaf/site/production/manual/latest/commands/shell-sleep.adoc
    karaf/site/production/manual/latest/commands/shell-sort.adoc
    karaf/site/production/manual/latest/commands/shell-tac.adoc
    karaf/site/production/manual/latest/commands/shell-tail.adoc
    karaf/site/production/manual/latest/commands/shell-wc.adoc
    karaf/site/production/manual/latest/commands/shell-while.adoc
    karaf/site/production/manual/latest/configugration.html
    karaf/site/production/manual/latest/wrapper.html
Modified:
    karaf/site/production/manual/latest/archetypes.html
    karaf/site/production/manual/latest/blueprint.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-dynamic-import.adoc
    karaf/site/production/manual/latest/commands/bundle-headers.adoc
    karaf/site/production/manual/latest/commands/bundle-id.adoc
    karaf/site/production/manual/latest/commands/bundle-info.adoc
    karaf/site/production/manual/latest/commands/bundle-install.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-level.adoc
    karaf/site/production/manual/latest/commands/bundle-start.adoc
    karaf/site/production/manual/latest/commands/bundle-status.adoc
    karaf/site/production/manual/latest/commands/bundle-stop.adoc
    karaf/site/production/manual/latest/commands/bundle-tree-show.adoc
    karaf/site/production/manual/latest/commands/bundle-uninstall.adoc
    karaf/site/production/manual/latest/commands/bundle-update.adoc
    karaf/site/production/manual/latest/commands/bundle-watch.adoc
    karaf/site/production/manual/latest/commands/commands.adoc
    karaf/site/production/manual/latest/commands/config-edit.adoc
    karaf/site/production/manual/latest/commands/config-meta.adoc
    karaf/site/production/manual/latest/commands/config-property-list.adoc
    karaf/site/production/manual/latest/commands/dev-dump-create.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-regions.adoc
    karaf/site/production/manual/latest/commands/feature-repo-add.adoc
    karaf/site/production/manual/latest/commands/feature-repo-list.adoc
    karaf/site/production/manual/latest/commands/feature-repo-refresh.adoc
    karaf/site/production/manual/latest/commands/feature-repo-remove.adoc
    karaf/site/production/manual/latest/commands/feature-requirement-add.adoc
    karaf/site/production/manual/latest/commands/feature-requirement-list.adoc
    karaf/site/production/manual/latest/commands/feature-requirement-remove.adoc
    karaf/site/production/manual/latest/commands/feature-start.adoc
    karaf/site/production/manual/latest/commands/feature-stop.adoc
    karaf/site/production/manual/latest/commands/feature-uninstall.adoc
    karaf/site/production/manual/latest/commands/feature-version-list.adoc
    karaf/site/production/manual/latest/commands/http-list.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/instance-list.adoc
    karaf/site/production/manual/latest/commands/instance-restart.adoc
    karaf/site/production/manual/latest/commands/instance-start.adoc
    karaf/site/production/manual/latest/commands/jaas-realm-list.adoc
    karaf/site/production/manual/latest/commands/jaas-realm-manage.adoc
    karaf/site/production/manual/latest/commands/jaas-su.adoc
    karaf/site/production/manual/latest/commands/jaas-sudo.adoc
    karaf/site/production/manual/latest/commands/jaas-user-delete.adoc
    karaf/site/production/manual/latest/commands/jaas-user-list.adoc
    karaf/site/production/manual/latest/commands/jdbc-ds-create.adoc
    karaf/site/production/manual/latest/commands/jms-browse.adoc
    karaf/site/production/manual/latest/commands/jms-consume.adoc
    karaf/site/production/manual/latest/commands/jms-count.adoc
    karaf/site/production/manual/latest/commands/jms-create.adoc
    karaf/site/production/manual/latest/commands/jms-info.adoc
    karaf/site/production/manual/latest/commands/jms-move.adoc
    karaf/site/production/manual/latest/commands/jms-queues.adoc
    karaf/site/production/manual/latest/commands/jms-send.adoc
    karaf/site/production/manual/latest/commands/jms-topics.adoc
    karaf/site/production/manual/latest/commands/kar-install.adoc
    karaf/site/production/manual/latest/commands/kar-list.adoc
    karaf/site/production/manual/latest/commands/log-display.adoc
    karaf/site/production/manual/latest/commands/log-get.adoc
    karaf/site/production/manual/latest/commands/log-log.adoc
    karaf/site/production/manual/latest/commands/log-tail.adoc
    karaf/site/production/manual/latest/commands/obr-deploy.adoc
    karaf/site/production/manual/latest/commands/obr-list.adoc
    karaf/site/production/manual/latest/commands/obr-resolve.adoc
    karaf/site/production/manual/latest/commands/obr-source.adoc
    karaf/site/production/manual/latest/commands/obr-start.adoc
    karaf/site/production/manual/latest/commands/obr-url-list.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-copy.adoc
    karaf/site/production/manual/latest/commands/profile-create.adoc
    karaf/site/production/manual/latest/commands/profile-display.adoc
    karaf/site/production/manual/latest/commands/profile-edit.adoc
    karaf/site/production/manual/latest/commands/scheduler-schedule.adoc
    karaf/site/production/manual/latest/commands/service-list.adoc
    karaf/site/production/manual/latest/commands/service-wait.adoc
    karaf/site/production/manual/latest/commands/shell-threads.adoc
    karaf/site/production/manual/latest/commands/shell-watch.adoc
    karaf/site/production/manual/latest/commands/ssh-ssh.adoc
    karaf/site/production/manual/latest/commands/ssh-sshd.adoc
    karaf/site/production/manual/latest/commands/subsystem-info.adoc
    karaf/site/production/manual/latest/commands/system-framework.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/web-list.adoc
    karaf/site/production/manual/latest/commands/wrapper-install.adoc
    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/dev-cdi.html
    karaf/site/production/manual/latest/developer-commands.html
    karaf/site/production/manual/latest/directory-structure.html
    karaf/site/production/manual/latest/ds.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/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/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/scripting.html
    karaf/site/production/manual/latest/security-framework.html
    karaf/site/production/manual/latest/security.html
    karaf/site/production/manual/latest/services.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
    karaf/site/production/manual/latest/writing-tests.html

Modified: karaf/site/production/manual/latest/archetypes.html
URL: 
http://svn.apache.org/viewvc/karaf/site/production/manual/latest/archetypes.html?rev=1816059&r1=1816058&r2=1816059&view=diff
==============================================================================
--- karaf/site/production/manual/latest/archetypes.html (original)
+++ karaf/site/production/manual/latest/archetypes.html Wed Nov 22 14:52:25 2017
@@ -927,7 +927,7 @@ package: com.mycompany.package
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2016-04-27 13:59:28 CEST
+Last updated 2017-07-26 16:36:29 +02:00
 </div>
 </div>
 </body>

Modified: karaf/site/production/manual/latest/blueprint.html
URL: 
http://svn.apache.org/viewvc/karaf/site/production/manual/latest/blueprint.html?rev=1816059&r1=1816058&r2=1816059&view=diff
==============================================================================
--- karaf/site/production/manual/latest/blueprint.html (original)
+++ karaf/site/production/manual/latest/blueprint.html Wed Nov 22 14:52:25 2017
@@ -517,7 +517,7 @@ table.CodeRay td.code>pre{padding:0}
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2016-04-27 13:59:28 CEST
+Last updated 2017-07-26 16:36:29 +02:00
 </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=1816059&r1=1816058&r2=1816059&view=diff
==============================================================================
--- karaf/site/production/manual/latest/branding.html (original)
+++ karaf/site/production/manual/latest/branding.html Wed Nov 22 14:52:25 2017
@@ -808,7 +808,7 @@ webconsole.stylesheet = /res/karaf/ui/we
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2016-04-27 13:59:28 CEST
+Last updated 2017-07-26 16:36:29 +02:00
 </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=1816059&r1=1816058&r2=1816059&view=diff
==============================================================================
--- karaf/site/production/manual/latest/cdi.html (original)
+++ karaf/site/production/manual/latest/cdi.html Wed Nov 22 14:52:25 2017
@@ -593,7 +593,7 @@ karaf@root()&gt; feature:install pax-cdi
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2016-04-27 13:59:28 CEST
+Last updated 2017-07-26 16:36:29 +02:00
 </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=1816059&r1=1816058&r2=1816059&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/bundle-capabilities.adoc 
(original)
+++ karaf/site/production/manual/latest/commands/bundle-capabilities.adoc Wed 
Nov 22 14:52:25 2017
@@ -22,14 +22,14 @@ bundle:capabilities [options] [ids]
 |===
 |Name |Description
 
-|--help
-|Display this help message
-
 |--namespace
 |
 
 |--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=1816059&r1=1816058&r2=1816059&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/bundle-classes.adoc (original)
+++ karaf/site/production/manual/latest/commands/bundle-classes.adoc Wed Nov 22 
14:52:25 2017
@@ -22,14 +22,14 @@ bundle:classes [options] [ids]
 |===
 |Name |Description
 
-|--help
-|Display this help message
-
 |-a, --display-all-files
 |List all classes and files in the bundle
 
 |--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=1816059&r1=1816058&r2=1816059&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/bundle-diag.adoc (original)
+++ karaf/site/production/manual/latest/commands/bundle-diag.adoc Wed Nov 22 
14:52:25 2017
@@ -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-dynamic-import.adoc
URL: 
http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/bundle-dynamic-import.adoc?rev=1816059&r1=1816058&r2=1816059&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/bundle-dynamic-import.adoc 
(original)
+++ karaf/site/production/manual/latest/commands/bundle-dynamic-import.adoc Wed 
Nov 22 14:52:25 2017
@@ -22,11 +22,11 @@ bundle:dynamic-import [options] id
 |===
 |Name |Description
 
-|--help
-|Display this help message
-
 |--context
 |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=1816059&r1=1816058&r2=1816059&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/bundle-headers.adoc (original)
+++ karaf/site/production/manual/latest/commands/bundle-headers.adoc Wed Nov 22 
14:52:25 2017
@@ -22,8 +22,8 @@ bundle:headers [options] [ids]
 |===
 |Name |Description
 
-|--help
-|Display this help message
+|--no-uses
+|Print or not the Export-Package uses section
 
 |--indent
 |Indentation method
@@ -31,8 +31,8 @@ bundle:headers [options] [ids]
 |--context, -c
 |Use the given bundle context
 
-|--no-uses
-|Print or not the Export-Package uses section
+|--help
+|Display this help message
 |===
 
 

Modified: karaf/site/production/manual/latest/commands/bundle-id.adoc
URL: 
http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/bundle-id.adoc?rev=1816059&r1=1816058&r2=1816059&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/bundle-id.adoc (original)
+++ karaf/site/production/manual/latest/commands/bundle-id.adoc Wed Nov 22 
14:52:25 2017
@@ -22,11 +22,11 @@ bundle:id [options] id
 |===
 |Name |Description
 
-|--help
-|Display this help message
-
 |--context
 |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=1816059&r1=1816058&r2=1816059&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/bundle-info.adoc (original)
+++ karaf/site/production/manual/latest/commands/bundle-info.adoc Wed Nov 22 
14:52:25 2017
@@ -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-install.adoc
URL: 
http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/bundle-install.adoc?rev=1816059&r1=1816058&r2=1816059&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/bundle-install.adoc (original)
+++ karaf/site/production/manual/latest/commands/bundle-install.adoc Wed Nov 22 
14:52:25 2017
@@ -22,15 +22,18 @@ bundle:install [options] urls
 |===
 |Name |Description
 
-|-s, --start
-|Starts the bundles after installation
-
 |-l, --start-level
 |Sets the start level of the bundles
 
 |--force, -f
 |Forces the command to execute
 
+|--r3-bundles
+|Allow OSGi R3 bundles
+
+|-s, --start
+|Starts the bundles after installation
+
 |--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=1816059&r1=1816058&r2=1816059&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/bundle-list.adoc (original)
+++ karaf/site/production/manual/latest/commands/bundle-list.adoc Wed Nov 22 
14:52:25 2017
@@ -22,32 +22,35 @@ bundle:list [options] [ids]
 |===
 |Name |Description
 
-|-t
-|Specifies the bundle threshold; bundles with a start-level less than this 
value will not get printed out.
+|-name, -n
+|Show bundle name
 
-|--no-format
-|Disable table rendered output
+|-u
+|Shows the update locations
 
-|-s
-|Shows the symbolic name
+|-r
+|Shows the bundle revisions
 
-|--help
-|Display this help message
+|--no-ellipsis
+|
 
 |-l
 |Show the locations
 
-|--no-ellipsis
-|
-
-|-u
-|Shows the update locations
+|-s
+|Shows the symbolic name
 
 |--context, -c
 |Use the given bundle context
 
-|-r
-|Shows the bundle revisions
+|-t
+|Specifies the bundle threshold; bundles with a start-level less than this 
value will not get printed out.
+
+|--help
+|Display this help message
+
+|--no-format
+|Disable table rendered output
 |===
 
 

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=1816059&r1=1816058&r2=1816059&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/bundle-load-test.adoc 
(original)
+++ karaf/site/production/manual/latest/commands/bundle-load-test.adoc Wed Nov 
22 14:52:25 2017
@@ -13,23 +13,23 @@ bundle:load-test [options]
 |===
 |Name |Description
 
-|--help
-|Display this help message
+|--refresh
+|percentage of bundle refresh vs restart
 
-|--delay
-|maximum delay between actions
+|--excludes
+|List of bundles (ids or symbolic names) to exclude
 
 |--iterations
 |number of iterations per thread
 
-|--excludes
-|List of bundles (ids or symbolic names) to exclude
+|--delay
+|maximum delay between actions
+
+|--help
+|Display this help message
 
 |--threads
 |number of concurrent threads
-
-|--refresh
-|percentage of bundle refresh vs restart
 |===
 
 

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=1816059&r1=1816058&r2=1816059&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/bundle-refresh.adoc (original)
+++ karaf/site/production/manual/latest/commands/bundle-refresh.adoc Wed Nov 22 
14:52:25 2017
@@ -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=1816059&r1=1816058&r2=1816059&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/bundle-requirements.adoc 
(original)
+++ karaf/site/production/manual/latest/commands/bundle-requirements.adoc Wed 
Nov 22 14:52:25 2017
@@ -22,14 +22,14 @@ bundle:requirements [options] [ids]
 |===
 |Name |Description
 
-|--help
-|Display this help message
-
 |--namespace
 |
 
 |--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=1816059&r1=1816058&r2=1816059&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/bundle-resolve.adoc (original)
+++ karaf/site/production/manual/latest/commands/bundle-resolve.adoc Wed Nov 22 
14:52:25 2017
@@ -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=1816059&r1=1816058&r2=1816059&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/bundle-restart.adoc (original)
+++ karaf/site/production/manual/latest/commands/bundle-restart.adoc Wed Nov 22 
14:52:25 2017
@@ -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=1816059&r1=1816058&r2=1816059&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/bundle-services.adoc (original)
+++ karaf/site/production/manual/latest/commands/bundle-services.adoc Wed Nov 
22 14:52:25 2017
@@ -25,17 +25,17 @@ bundle:services [options] [ids]
 |-p
 |Shows the properties of the services
 
-|-a
-|Shows all services. (Karaf commands and completers are hidden by default)
-
-|--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
+
+|-a
+|Shows all services. (Karaf commands and completers are hidden by default)
+
+|--help
+|Display this help message
 |===
 
 

Modified: karaf/site/production/manual/latest/commands/bundle-start-level.adoc
URL: 
http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/bundle-start-level.adoc?rev=1816059&r1=1816058&r2=1816059&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/bundle-start-level.adoc 
(original)
+++ karaf/site/production/manual/latest/commands/bundle-start-level.adoc Wed 
Nov 22 14:52:25 2017
@@ -25,11 +25,11 @@ bundle:start-level [options] id [startLe
 |===
 |Name |Description
 
-|--help
-|Display this help message
-
 |--context
 |Use the given bundle context
+
+|--help
+|Display this help message
 |===
 
 

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=1816059&r1=1816058&r2=1816059&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/bundle-start.adoc (original)
+++ karaf/site/production/manual/latest/commands/bundle-start.adoc Wed Nov 22 
14:52:25 2017
@@ -22,14 +22,14 @@ bundle:start [options] [ids]
 |===
 |Name |Description
 
-|--help
-|Display this help message
-
 |-t, --transient
 |Keep the bundle as auto-start
 
 |--context, -c
 |Use the given bundle context
+
+|--help
+|Display this help message
 |===
 
 

Modified: karaf/site/production/manual/latest/commands/bundle-status.adoc
URL: 
http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/bundle-status.adoc?rev=1816059&r1=1816058&r2=1816059&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/bundle-status.adoc (original)
+++ karaf/site/production/manual/latest/commands/bundle-status.adoc Wed Nov 22 
14:52:25 2017
@@ -22,11 +22,11 @@ bundle:status [options] id
 |===
 |Name |Description
 
-|--help
-|Display this help message
-
 |--context
 |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=1816059&r1=1816058&r2=1816059&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/bundle-stop.adoc (original)
+++ karaf/site/production/manual/latest/commands/bundle-stop.adoc Wed Nov 22 
14:52:25 2017
@@ -22,14 +22,14 @@ bundle:stop [options] [ids]
 |===
 |Name |Description
 
-|--help
-|Display this help message
-
 |-t, --transient
 |Keep the bundle as auto-start
 
 |--context, -c
 |Use the given bundle context
+
+|--help
+|Display this help message
 |===
 
 

Modified: karaf/site/production/manual/latest/commands/bundle-tree-show.adoc
URL: 
http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/bundle-tree-show.adoc?rev=1816059&r1=1816058&r2=1816059&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/bundle-tree-show.adoc 
(original)
+++ karaf/site/production/manual/latest/commands/bundle-tree-show.adoc Wed Nov 
22 14:52:25 2017
@@ -25,11 +25,11 @@ bundle:tree-show [options] id
 |-v, --version
 |Show bundle versions
 
-|--help
-|Display this help message
-
 |--context
 |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=1816059&r1=1816058&r2=1816059&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/bundle-uninstall.adoc 
(original)
+++ karaf/site/production/manual/latest/commands/bundle-uninstall.adoc Wed Nov 
22 14:52:25 2017
@@ -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/bundle-update.adoc
URL: 
http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/bundle-update.adoc?rev=1816059&r1=1816058&r2=1816059&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/bundle-update.adoc (original)
+++ karaf/site/production/manual/latest/commands/bundle-update.adoc Wed Nov 22 
14:52:25 2017
@@ -25,11 +25,17 @@ bundle:update [options] id [location]
 |===
 |Name |Description
 
-|--help
-|Display this help message
-
 |--context
 |Use the given bundle context
+
+|--raw
+|Do not update the bundles's Bundle-UpdateLocation manifest header
+
+|-r, --refresh
+|Perform a refresh after the bundle update
+
+|--help
+|Display this help message
 |===
 
 

Modified: karaf/site/production/manual/latest/commands/bundle-watch.adoc
URL: 
http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/bundle-watch.adoc?rev=1816059&r1=1816058&r2=1816059&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/bundle-watch.adoc (original)
+++ karaf/site/production/manual/latest/commands/bundle-watch.adoc Wed Nov 22 
14:52:25 2017
@@ -25,6 +25,12 @@ bundle:watch [options] [urls]
 |-i
 |Watch interval
 
+|--stop
+|Stops watching all bundles
+
+|--remove
+|Removes bundles from the watch list
+
 |--start
 |Starts watching the selected bundles
 
@@ -33,12 +39,6 @@ bundle:watch [options] [urls]
 
 |--help
 |Display this help message
-
-|--remove
-|Removes bundles from the watch list
-
-|--stop
-|Stops watching all bundles
 |===
 
 == Details

Modified: karaf/site/production/manual/latest/commands/commands.adoc
URL: 
http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/commands.adoc?rev=1816059&r1=1816058&r2=1816059&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/commands.adoc (original)
+++ karaf/site/production/manual/latest/commands/commands.adoc Wed Nov 22 
14:52:25 2017
@@ -32,10 +32,12 @@
 * [config:cancel|config-cancel]
 * [config:delete|config-delete]
 * [config:edit|config-edit]
+* [config:install|config-install]
 * [config:list|config-list]
 * [config:meta|config-meta]
 * [config:property-append|config-property-append]
 * [config:property-delete|config-property-delete]
+* [config:property-get|config-property-get]
 * [config:property-list|config-property-list]
 * [config:property-set|config-property-set]
 * [config:update|config-update]
@@ -105,6 +107,7 @@
 * [jaas:user-add|jaas-user-add]
 * [jaas:user-delete|jaas-user-delete]
 * [jaas:user-list|jaas-user-list]
+* [jaas:whoami|jaas-whoami]
 
 == jdbc
 
@@ -154,10 +157,22 @@
 * [log:display|log-display]
 * [log:exception-display|log-exception-display]
 * [log:get|log-get]
+* [log:load-test|log-load-test]
 * [log:log|log-log]
 * [log:set|log-set]
 * [log:tail|log-tail]
 
+== maven
+
+* [maven:http-proxy|maven-http-proxy]
+* [maven:http-proxy-list|maven-http-proxy-list]
+* [maven:password|maven-password]
+* [maven:repository-add|maven-repository-add]
+* [maven:repository-change|maven-repository-change]
+* [maven:repository-list|maven-repository-list]
+* [maven:repository-remove|maven-repository-remove]
+* [maven:summary|maven-summary]
+
 == obr
 
 * [obr:deploy|obr-deploy]
@@ -192,15 +207,9 @@
 
 * [scheduler:list|scheduler-list]
 * [scheduler:schedule|scheduler-schedule]
+* [scheduler:trigger|scheduler-trigger]
 * [scheduler:unschedule|scheduler-unschedule]
 
-== scr
-
-* [scr:activate|scr-activate]
-* [scr:components|scr-components]
-* [scr:deactivate|scr-deactivate]
-* [scr:details|scr-details]
-
 == service
 
 * [service:list|service-list]
@@ -208,37 +217,16 @@
 
 == shell
 
-* [shell:alias|shell-alias]
-* [shell:cat|shell-cat]
-* [shell:clear|shell-clear]
 * [shell:completion|shell-completion]
-* [shell:date|shell-date]
-* [shell:each|shell-each]
-* [shell:echo|shell-echo]
-* [shell:edit|shell-edit]
-* [shell:env|shell-env]
 * [shell:exec|shell-exec]
-* [shell:grep|shell-grep]
-* [shell:head|shell-head]
-* [shell:history|shell-history]
-* [shell:if|shell-if]
 * [shell:info|shell-info]
 * [shell:java|shell-java]
-* [shell:less|shell-less]
 * [shell:logout|shell-logout]
-* [shell:more|shell-more]
-* [shell:new|shell-new]
 * [shell:printf|shell-printf]
-* [shell:sleep|shell-sleep]
-* [shell:sort|shell-sort]
 * [shell:source|shell-source]
 * [shell:stack-traces-print|shell-stack-traces-print]
-* [shell:tac|shell-tac]
-* [shell:tail|shell-tail]
 * [shell:threads|shell-threads]
 * [shell:watch|shell-watch]
-* [shell:wc|shell-wc]
-* [shell:while|shell-while]
 
 == ssh
 

Modified: karaf/site/production/manual/latest/commands/config-edit.adoc
URL: 
http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/config-edit.adoc?rev=1816059&r1=1816058&r2=1816059&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/config-edit.adoc (original)
+++ karaf/site/production/manual/latest/commands/config-edit.adoc Wed Nov 22 
14:52:25 2017
@@ -22,14 +22,17 @@ config:edit [options] pid
 |===
 |Name |Description
 
+|--alias
+|Specifies the alias used for this factory config.
+
+|--factory
+|Define this config as a factory config. Will be created on calling update
+
 |--help
 |Display this help message
 
 |--force
 |Force the edition of this config, even if another one was under edition
-
-|--factory
-|Define this config as a factory config. Will be crearted on calling update
 |===
 
 == Details

Added: karaf/site/production/manual/latest/commands/config-install.adoc
URL: 
http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/config-install.adoc?rev=1816059&view=auto
==============================================================================
--- karaf/site/production/manual/latest/commands/config-install.adoc (added)
+++ karaf/site/production/manual/latest/commands/config-install.adoc Wed Nov 22 
14:52:25 2017
@@ -0,0 +1,35 @@
+= config:install
+
+== Description
+
+Install a cfg file in the Karaf etc folder.
+
+== Syntax
+
+config:install [options] url finalname 
+
+== Arguments
+
+|===
+|Name |Description
+
+| url
+| The URL of the cfg file.
+
+| finalname
+| Final name of the cfg file
+|===
+
+== Options
+
+|===
+|Name |Description
+
+|-o, --override
+|Override the target cfg file
+
+|--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=1816059&r1=1816058&r2=1816059&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/config-meta.adoc (original)
+++ karaf/site/production/manual/latest/commands/config-meta.adoc Wed Nov 22 
14:52:25 2017
@@ -6,15 +6,24 @@ Lists meta type information.
 
 == Syntax
 
-config:meta [options]
+config:meta [options] pid 
+
+== Arguments
+
+|===
+|Name |Description
+
+| pid
+| The configuration pid
+|===
 
 == Options
 
 |===
 |Name |Description
 
-|-p, --pid
-|The configuration pid
+|-c
+|Create respective config from metatype defaults
 
 |--help
 |Display this help message

Added: karaf/site/production/manual/latest/commands/config-property-get.adoc
URL: 
http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/config-property-get.adoc?rev=1816059&view=auto
==============================================================================
--- karaf/site/production/manual/latest/commands/config-property-get.adoc 
(added)
+++ karaf/site/production/manual/latest/commands/config-property-get.adoc Wed 
Nov 22 14:52:25 2017
@@ -0,0 +1,35 @@
+= config:property-get
+
+== Description
+
+Gets the value of a property in the currently edited configuration.
+
+== Syntax
+
+config:property-get [options] property 
+
+== Arguments
+
+|===
+|Name |Description
+
+| property
+| The name of the property to get value for
+|===
+
+== Options
+
+|===
+|Name |Description
+
+|--raw
+|
+
+|--help
+|Display this help message
+
+|-p, --pid
+|The configuration pid
+|===
+
+

Modified: karaf/site/production/manual/latest/commands/config-property-list.adoc
URL: 
http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/config-property-list.adoc?rev=1816059&r1=1816058&r2=1816059&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/config-property-list.adoc 
(original)
+++ karaf/site/production/manual/latest/commands/config-property-list.adoc Wed 
Nov 22 14:52:25 2017
@@ -13,6 +13,9 @@ config:property-list [options]
 |===
 |Name |Description
 
+|--raw
+|
+
 |--help
 |Display this help message
 

Modified: karaf/site/production/manual/latest/commands/dev-dump-create.adoc
URL: 
http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/dev-dump-create.adoc?rev=1816059&r1=1816058&r2=1816059&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/dev-dump-create.adoc (original)
+++ karaf/site/production/manual/latest/commands/dev-dump-create.adoc Wed Nov 
22 14:52:25 2017
@@ -22,17 +22,17 @@ dev:dump-create [options] [name]
 |===
 |Name |Description
 
-|-d, --directory
-|Creates dump in a directory in place of a ZIP archive
+|--no-heap-dump
+|Include or not the heap dump in ZIP archive
 
 |--no-thread-dump
 |Include or not the thread dump in ZIP archive
 
+|-d, --directory
+|Creates dump in a directory in place of a ZIP archive
+
 |--help
 |Display this help message
-
-|--no-heap-dump
-|Include or not the heap dump in ZIP archive
 |===
 
 

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=1816059&r1=1816058&r2=1816059&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/feature-export-bundles.adoc 
(original)
+++ karaf/site/production/manual/latest/commands/feature-export-bundles.adoc 
Wed Nov 22 14:52:25 2017
@@ -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=1816059&r1=1816058&r2=1816059&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/feature-info.adoc (original)
+++ karaf/site/production/manual/latest/commands/feature-info.adoc Wed Nov 22 
14:52:25 2017
@@ -25,23 +25,29 @@ feature:info [options] name [version]
 |===
 |Name |Description
 
+|-d, --dependency
+|Display dependencies info
+
 |-b, --bundle
 |Display bundles info
 
 |-t, --tree
 |Display feature tree
 
-|--help
-|Display this help message
-
 |-c, --configuration
 |Display configuration info
 
-|-d, --dependency
-|Display dependencies info
+|-x, --xml
+|Display feature xml
 
 |--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=1816059&r1=1816058&r2=1816059&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/feature-install.adoc (original)
+++ karaf/site/production/manual/latest/commands/feature-install.adoc Wed Nov 
22 14:52:25 2017
@@ -25,29 +25,35 @@ feature:install [options] features
 |-t, --simulate
 |Perform a simulation only
 
-|-s, --no-auto-start
-|Do not start the bundles
+|--features-wiring
+|Print the wiring between features
 
-|-m, --no-auto-manage
-|Do not automatically manage bundles
+|-v, --verbose
+|Explain what is being done
+
+|--all-wiring
+|Print the full wiring
 
 |--store
 |Store the resolution into the given file and result for offline analysis
 
-|--help
-|Display this help message
+|-u, --upgrade
+|Perform an upgrade of feature if previous version are installed or install it
 
 |-r, --no-auto-refresh
 |Do not automatically refresh bundles
 
-|-u, --upgrade
-|Perform an upgrade of feature if previous version are installed or install it
+|-s, --no-auto-start
+|Do not start the bundles
 
-|-v, --verbose
-|Explain what is being done
+|-m, --no-auto-manage
+|Do not automatically manage bundles
 
 |-g, --region
 |Region to install to
+
+|--help
+|Display this help message
 |===
 
 

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=1816059&r1=1816058&r2=1816059&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/feature-list.adoc (original)
+++ karaf/site/production/manual/latest/commands/feature-list.adoc Wed Nov 22 
14:52:25 2017
@@ -13,23 +13,23 @@ feature:list [options]
 |===
 |Name |Description
 
-|-r, --required
-|Display a list of all required features only
-
 |-i, --installed
 |Display a list of all installed features only
 
-|--no-format
-|Disable table rendered output
-
 |-s, --show-hidden
 |Display hidden features
 
+|-o, --ordered
+|Display a list using alphabetical order 
+
+|-r, --required
+|Display a list of all required features only
+
 |--help
 |Display this help message
 
-|-o, --ordered
-|Display a list using alphabetical order 
+|--no-format
+|Disable table rendered output
 |===
 
 

Modified: karaf/site/production/manual/latest/commands/feature-regions.adoc
URL: 
http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/feature-regions.adoc?rev=1816059&r1=1816058&r2=1816059&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/feature-regions.adoc (original)
+++ karaf/site/production/manual/latest/commands/feature-regions.adoc Wed Nov 
22 14:52:25 2017
@@ -22,6 +22,12 @@ feature:regions [options] [regions]
 |===
 |Name |Description
 
+|-n, --namespaces
+|Show namespaces in each filter.
+
+|-f, --filters
+|Show filters.
+
 |-v, --verbose
 |Show all info.
 
@@ -30,12 +36,6 @@ feature:regions [options] [regions]
 
 |--help
 |Display this help message
-
-|-f, --filters
-|Show filters.
-
-|-n, --namespaces
-|Show namespaces in each filter.
 |===
 
 

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=1816059&r1=1816058&r2=1816059&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/feature-repo-add.adoc 
(original)
+++ karaf/site/production/manual/latest/commands/feature-repo-add.adoc Wed Nov 
22 14:52:25 2017
@@ -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-repo-list.adoc
URL: 
http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/feature-repo-list.adoc?rev=1816059&r1=1816058&r2=1816059&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/feature-repo-list.adoc 
(original)
+++ karaf/site/production/manual/latest/commands/feature-repo-list.adoc Wed Nov 
22 14:52:25 2017
@@ -13,14 +13,14 @@ feature:repo-list [options]
 |===
 |Name |Description
 
-|--no-format
-|Disable table rendered output
-
 |-r
 |Reload all feature urls
 
 |--help
 |Display this help message
+
+|--no-format
+|Disable table rendered output
 |===
 
 

Modified: karaf/site/production/manual/latest/commands/feature-repo-refresh.adoc
URL: 
http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/feature-repo-refresh.adoc?rev=1816059&r1=1816058&r2=1816059&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/feature-repo-refresh.adoc 
(original)
+++ karaf/site/production/manual/latest/commands/feature-repo-refresh.adoc Wed 
Nov 22 14:52:25 2017
@@ -6,14 +6,14 @@ Refresh a features repository
 
 == Syntax
 
-feature:repo-refresh [options] [Feature name or uri] [Feature version] 
+feature:repo-refresh [options] [repository] [Feature version] 
 
 == Arguments
 
 |===
 |Name |Description
 
-| Feature name or uri
+| repository
 | Shortcut name of the feature repository or the full URI
 
 | Feature version

Modified: karaf/site/production/manual/latest/commands/feature-repo-remove.adoc
URL: 
http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/feature-repo-remove.adoc?rev=1816059&r1=1816058&r2=1816059&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/feature-repo-remove.adoc 
(original)
+++ karaf/site/production/manual/latest/commands/feature-repo-remove.adoc Wed 
Nov 22 14:52:25 2017
@@ -6,7 +6,7 @@ Removes the specified repository feature
 
 == Syntax
 
-feature:repo-remove [options] repository 
+feature:repo-remove [options] repository [Feature version] 
 
 == Arguments
 
@@ -14,7 +14,10 @@ feature:repo-remove [options] repository
 |Name |Description
 
 | repository
-| Name or url of the repository to remove.
+| Shortcut name of the feature repository or the full URI
+
+| Feature version
+| The version of the feature if using the feature name. Should be empty if 
using the uri
 |===
 
 == Options
@@ -22,11 +25,11 @@ feature:repo-remove [options] repository
 |===
 |Name |Description
 
-|--help
-|Display this help message
-
 |-u, --uninstall-all
 |Uninstall all features from the 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=1816059&r1=1816058&r2=1816059&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/feature-requirement-add.adoc 
(original)
+++ karaf/site/production/manual/latest/commands/feature-requirement-add.adoc 
Wed Nov 22 14:52:25 2017
@@ -25,23 +25,32 @@ feature:requirement-add [options] requir
 |-t, --simulate
 |Perform a simulation only
 
-|-s, --no-auto-start
-|Do not start the bundles
+|--features-wiring
+|Print the wiring between features
 
-|-m, --no-auto-manage
-|Do not automatically manage bundles
+|-v, --verbose
+|Explain what is being done
 
-|--help
-|Display this help message
+|--all-wiring
+|Print the full wiring
+
+|--store
+|Store the resolution into the given file and result for offline analysis
 
 |-r, --no-auto-refresh
 |Do not automatically refresh bundles
 
-|-v, --verbose
-|Explain what is being done
+|-s, --no-auto-start
+|Do not start the bundles
+
+|-m, --no-auto-manage
+|Do not automatically manage bundles
 
 |-g, --region
 |Region to install to
+
+|--help
+|Display this help message
 |===
 
 

Modified: 
karaf/site/production/manual/latest/commands/feature-requirement-list.adoc
URL: 
http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/feature-requirement-list.adoc?rev=1816059&r1=1816058&r2=1816059&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/feature-requirement-list.adoc 
(original)
+++ karaf/site/production/manual/latest/commands/feature-requirement-list.adoc 
Wed Nov 22 14:52:25 2017
@@ -13,11 +13,11 @@ feature:requirement-list [options]
 |===
 |Name |Description
 
-|--no-format
-|Disable table rendered output
-
 |--help
 |Display this help message
+
+|--no-format
+|Disable table rendered output
 |===
 
 

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=1816059&r1=1816058&r2=1816059&view=diff
==============================================================================
--- 
karaf/site/production/manual/latest/commands/feature-requirement-remove.adoc 
(original)
+++ 
karaf/site/production/manual/latest/commands/feature-requirement-remove.adoc 
Wed Nov 22 14:52:25 2017
@@ -25,6 +25,24 @@ feature:requirement-remove [options] req
 |-t, --simulate
 |Perform a simulation only
 
+|--features-wiring
+|Print the wiring between features
+
+|-g, --region
+|Region to apply to
+
+|-v, --verbose
+|Explain what is being done
+
+|--all-wiring
+|Print the full wiring
+
+|--store
+|Store the resolution into the given file and result for offline analysis
+
+|-r, --no-auto-refresh
+|Do not automatically refresh bundles
+
 |-s, --no-auto-start
 |Do not start the bundles
 
@@ -33,15 +51,6 @@ feature:requirement-remove [options] req
 
 |--help
 |Display this help message
-
-|-r, --no-auto-refresh
-|Do not automatically refresh bundles
-
-|-v, --verbose
-|Explain what is being done
-
-|-g, --region
-|Region to apply to
 |===
 
 

Modified: karaf/site/production/manual/latest/commands/feature-start.adoc
URL: 
http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/feature-start.adoc?rev=1816059&r1=1816058&r2=1816059&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/feature-start.adoc (original)
+++ karaf/site/production/manual/latest/commands/feature-start.adoc Wed Nov 22 
14:52:25 2017
@@ -25,14 +25,14 @@ feature:start [options] feature
 |-t, --simulate
 |Perform a simulation only
 
-|--help
-|Display this help message
+|-g, --region
+|Region to apply to
 
 |-v, --verbose
 |Explain what is being done
 
-|-g, --region
-|Region to apply to
+|--help
+|Display this help message
 |===
 
 

Modified: karaf/site/production/manual/latest/commands/feature-stop.adoc
URL: 
http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/feature-stop.adoc?rev=1816059&r1=1816058&r2=1816059&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/feature-stop.adoc (original)
+++ karaf/site/production/manual/latest/commands/feature-stop.adoc Wed Nov 22 
14:52:25 2017
@@ -2,7 +2,7 @@
 
 == Description
 
-Start features with the specified name and version.
+Stop features with the specified name and version.
 
 == Syntax
 
@@ -25,14 +25,14 @@ feature:stop [options] feature
 |-t, --simulate
 |Perform a simulation only
 
-|--help
-|Display this help message
+|-g, --region
+|Region to apply to
 
 |-v, --verbose
 |Explain what is being done
 
-|-g, --region
-|Region to apply to
+|--help
+|Display this help message
 |===
 
 

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=1816059&r1=1816058&r2=1816059&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/feature-uninstall.adoc 
(original)
+++ karaf/site/production/manual/latest/commands/feature-uninstall.adoc Wed Nov 
22 14:52:25 2017
@@ -25,17 +25,17 @@ feature:uninstall [options] features
 |-t, --simulate
 |Perform a simulation only
 
-|--help
-|Display this help message
+|-v, --verbose
+|Explain what is being done
 
 |-r, --no-auto-refresh
 |Do not automatically refresh bundles
 
-|-v, --verbose
-|Explain what is being done
-
 |-g, --region
 |Region to install to
+
+|--help
+|Display this help message
 |===
 
 

Modified: karaf/site/production/manual/latest/commands/feature-version-list.adoc
URL: 
http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/feature-version-list.adoc?rev=1816059&r1=1816058&r2=1816059&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/feature-version-list.adoc 
(original)
+++ karaf/site/production/manual/latest/commands/feature-version-list.adoc Wed 
Nov 22 14:52:25 2017
@@ -22,11 +22,11 @@ feature:version-list [options] feature
 |===
 |Name |Description
 
-|--no-format
-|Disable table rendered output
-
 |--help
 |Display this help message
+
+|--no-format
+|Disable table rendered output
 |===
 
 

Modified: karaf/site/production/manual/latest/commands/http-list.adoc
URL: 
http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/http-list.adoc?rev=1816059&r1=1816058&r2=1816059&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/http-list.adoc (original)
+++ karaf/site/production/manual/latest/commands/http-list.adoc Wed Nov 22 
14:52:25 2017
@@ -13,11 +13,11 @@ http:list [options]
 |===
 |Name |Description
 
-|--no-format
-|Disable table rendered output
-
 |--help
 |Display this help message
+
+|--no-format
+|Disable table rendered output
 |===
 
 

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=1816059&r1=1816058&r2=1816059&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/instance-clone.adoc (original)
+++ karaf/site/production/manual/latest/commands/instance-clone.adoc Wed Nov 22 
14:52:25 2017
@@ -25,32 +25,32 @@ instance:clone [options] name cloneName
 |===
 |Name |Description
 
+|-l, --location
+|Location of the cloned container instance in the file system
+
 |-v, --verbose
 |Display actions performed by the command (disabled by default)
 
-|--help
-|Display this help message
-
-|-br, --binary-resource
+|-tr, --text-resource
 |Add a text resource to the instance
 
 |-s, --ssh-port
 |Port number for remote secure shell connection
 
+|-r, -rr, --rmi-port, --rmi-registry-port
+|Port number for RMI registry connection
+
 |-rs, --rmi-server-port
 |Port number for RMI server connection
 
-|-tr, --text-resource
-|Add a text resource to the instance
-
-|-l, --location
-|Location of the cloned container instance in the file system
-
 |-o, --java-opts
 |JVM options to use when launching the cloned instance
 
-|-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/instance-connect.adoc
URL: 
http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/instance-connect.adoc?rev=1816059&r1=1816058&r2=1816059&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/instance-connect.adoc 
(original)
+++ karaf/site/production/manual/latest/commands/instance-connect.adoc Wed Nov 
22 14:52:25 2017
@@ -25,17 +25,17 @@ instance:connect [options] name [command
 |===
 |Name |Description
 
-|--help
-|Display this help message
-
-|-u, --username
-|Remote user name
+|-k, --keyfile
+|Remote key file to use for key authentication
 
 |-p, --password
 |Remote password
 
-|-k, --keyfile
-|Remote key file to use for key authentication
+|-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=1816059&r1=1816058&r2=1816059&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/instance-create.adoc (original)
+++ karaf/site/production/manual/latest/commands/instance-create.adoc Wed Nov 
22 14:52:25 2017
@@ -22,47 +22,47 @@ instance:create [options] name
 |===
 |Name |Description
 
-|-s, --ssh-port
-|Port number for remote secure shell connection
-
-|-l, --location
-|Location of the new container instance in the file system
-
 |-b, --bare
 |Do not use add default features
 
+|-tr, --text-resource
+|Add a text resource to the instance
+
+|-rs, --rmi-server-port
+|Port number for RMI server connection
+
 |-p, --profiles
 |Profiles to install on the instance
 
+|-l, --location
+|Location of the new container instance in the file system
+
+|--help
+|Display this help message
+
 |-o, --java-opts
 |JVM options to use when launching the instance
 
 |-furl, --featureURL
 |Additional feature descriptor URLs. This option can be specified multiple 
times to add multiple URLs
 
-|-a, --address
-|IP address of the new container instance running on (when virtual IP is used)
-
 |-f, --feature
 |Initial features. This option can be specified multiple times to enable 
multiple initial features
 
+|-a, --address
+|IP address of the new container instance running on (when virtual IP is used)
+
 |-v, --verbose
 |Display actions performed by the command (disabled by default)
 
-|--help
-|Display this help message
-
-|-br, --binary-resource
-|Add a text resource to the instance
-
-|-rs, --rmi-server-port
-|Port number for RMI server connection
-
-|-tr, --text-resource
-|Add a text resource to the instance
+|-s, --ssh-port
+|Port number for remote secure shell connection
 
 |-r, -rr, --rmi-port, --rmi-registry-port
 |Port number for RMI registry connection
+
+|-br, --binary-resource
+|Add a text resource to the instance
 |===
 
 

Modified: karaf/site/production/manual/latest/commands/instance-list.adoc
URL: 
http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/instance-list.adoc?rev=1816059&r1=1816058&r2=1816059&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/instance-list.adoc (original)
+++ karaf/site/production/manual/latest/commands/instance-list.adoc Wed Nov 22 
14:52:25 2017
@@ -16,14 +16,14 @@ instance:list [options]
 |-l, --location
 |Displays the location of the container instances
 
+|--no-color
+|Disable table rendered output
+
 |-o, --java-opts
 |Displays the Java options used to launch the JVM
 
 |--help
 |Display this help message
-
-|--no-color
-|Disable table rendered output
 |===
 
 

Modified: karaf/site/production/manual/latest/commands/instance-restart.adoc
URL: 
http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/instance-restart.adoc?rev=1816059&r1=1816058&r2=1816059&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/instance-restart.adoc 
(original)
+++ karaf/site/production/manual/latest/commands/instance-restart.adoc Wed Nov 
22 14:52:25 2017
@@ -22,12 +22,12 @@ instance:restart [options] name
 |===
 |Name |Description
 
-|--help
-|Display this help message
-
 |-o, --java-opts
 |Java options when launching the instance
 
+|--help
+|Display this help message
+
 |-d, --debug
 |Start the instance in debug mode
 |===

Modified: karaf/site/production/manual/latest/commands/instance-start.adoc
URL: 
http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/instance-start.adoc?rev=1816059&r1=1816058&r2=1816059&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/instance-start.adoc (original)
+++ karaf/site/production/manual/latest/commands/instance-start.adoc Wed Nov 22 
14:52:25 2017
@@ -22,14 +22,14 @@ instance:start [options] name
 |===
 |Name |Description
 
-|--help
-|Display this help message
+|-o, --java-opts
+|Java options when launching the instance
 
 |-w, --wait
 |Wait for the instance to be fully started
 
-|-o, --java-opts
-|Java options when launching the instance
+|--help
+|Display this help message
 
 |-d, --debug
 |Start the instance in debug mode

Modified: karaf/site/production/manual/latest/commands/jaas-realm-list.adoc
URL: 
http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/jaas-realm-list.adoc?rev=1816059&r1=1816058&r2=1816059&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/jaas-realm-list.adoc (original)
+++ karaf/site/production/manual/latest/commands/jaas-realm-list.adoc Wed Nov 
22 14:52:25 2017
@@ -16,11 +16,11 @@ jaas:realm-list [options]
 |-h, --hidden
 |Show hidden realms
 
-|--no-format
-|Disable table rendered output
-
 |--help
 |Display this help message
+
+|--no-format
+|Disable table rendered output
 |===
 
 

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=1816059&r1=1816058&r2=1816059&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/jaas-realm-manage.adoc 
(original)
+++ karaf/site/production/manual/latest/commands/jaas-realm-manage.adoc Wed Nov 
22 14:52:25 2017
@@ -13,23 +13,23 @@ jaas:realm-manage [options]
 |===
 |Name |Description
 
-|--module
-|JAAS Login Module Class Name
-
 |-h, --hidden
 |Manage hidden realms
 
+|--realm
+|JAAS Realm
+
+|-f, --force
+|Force the management of this realm, even if another one was under management
+
 |--index
 |Realm Index
 
-|--realm
-|JAAS Realm
+|--module
+|JAAS Login Module Class Name
 
 |--help
 |Display this help message
-
-|-f, --force
-|Force the management of this realm, even if another one was under management
 |===
 
 

Modified: karaf/site/production/manual/latest/commands/jaas-su.adoc
URL: 
http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/jaas-su.adoc?rev=1816059&r1=1816058&r2=1816059&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/jaas-su.adoc (original)
+++ karaf/site/production/manual/latest/commands/jaas-su.adoc Wed Nov 22 
14:52:25 2017
@@ -22,11 +22,11 @@ jaas:su [options] [user]
 |===
 |Name |Description
 
-|--help
-|Display this help message
-
 |--realm
 |
+
+|--help
+|Display this help message
 |===
 
 

Modified: karaf/site/production/manual/latest/commands/jaas-sudo.adoc
URL: 
http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/jaas-sudo.adoc?rev=1816059&r1=1816058&r2=1816059&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/jaas-sudo.adoc (original)
+++ karaf/site/production/manual/latest/commands/jaas-sudo.adoc Wed Nov 22 
14:52:25 2017
@@ -22,14 +22,14 @@ jaas:sudo [options] [command]
 |===
 |Name |Description
 
-|--help
-|Display this help message
-
 |--realm
 |
 
 |--user
 |
+
+|--help
+|Display this help message
 |===
 
 

Modified: karaf/site/production/manual/latest/commands/jaas-user-delete.adoc
URL: 
http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/jaas-user-delete.adoc?rev=1816059&r1=1816058&r2=1816059&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/jaas-user-delete.adoc 
(original)
+++ karaf/site/production/manual/latest/commands/jaas-user-delete.adoc Wed Nov 
22 14:52:25 2017
@@ -2,7 +2,7 @@
 
 == Description
 
-Delete a usergit s
+Delete a user
 
 == Syntax
 

Modified: karaf/site/production/manual/latest/commands/jaas-user-list.adoc
URL: 
http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/jaas-user-list.adoc?rev=1816059&r1=1816058&r2=1816059&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/jaas-user-list.adoc (original)
+++ karaf/site/production/manual/latest/commands/jaas-user-list.adoc Wed Nov 22 
14:52:25 2017
@@ -13,11 +13,11 @@ jaas:user-list [options]
 |===
 |Name |Description
 
-|--no-format
-|Disable table rendered output
-
 |--help
 |Display this help message
+
+|--no-format
+|Disable table rendered output
 |===
 
 

Added: karaf/site/production/manual/latest/commands/jaas-whoami.adoc
URL: 
http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/jaas-whoami.adoc?rev=1816059&view=auto
==============================================================================
--- karaf/site/production/manual/latest/commands/jaas-whoami.adoc (added)
+++ karaf/site/production/manual/latest/commands/jaas-whoami.adoc Wed Nov 22 
14:52:25 2017
@@ -0,0 +1,32 @@
+= jaas:whoami
+
+== Description
+
+List currently active principals according to JAAS.
+
+== Syntax
+
+jaas:whoami [options]
+
+== Options
+
+|===
+|Name |Description
+
+|--no-format
+|Disable table rendered output.
+
+|-g, --groups
+|Show groups instead of user.
+
+|-a, --all
+|Show all JAAS principals regardless of type.
+
+|-r, --roles
+|Show roles instead of user.
+
+|--help
+|Display this help message
+|===
+
+

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=1816059&r1=1816058&r2=1816059&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/jdbc-ds-create.adoc (original)
+++ karaf/site/production/manual/latest/commands/jdbc-ds-create.adoc Wed Nov 22 
14:52:25 2017
@@ -22,26 +22,29 @@ jdbc:ds-create [options] name
 |===
 |Name |Description
 
+|-p, --password
+|The database password
+
+|-dt, --databaseType
+|The database type (ConnectionPoolDataSource, XADataSource or DataSource)
+
 |-dbName
 |Database name to use
 
-|--help
-|Display this help message
-
 |-dn, --driverName
 |org.osgi.driver.name property of the DataSourceFactory
 
-|-u, --username
-|The database username
+|-url
+|The JDBC URL to use
 
 |-dc, --driverClass
 |org.osgi.driver.class property  of the DataSourceFactory
 
-|-p, --password
-|The database password
+|--help
+|Display this help message
 
-|-url
-|The JDBC URL to use
+|-u, --username
+|The database username
 |===
 
 

Modified: karaf/site/production/manual/latest/commands/jms-browse.adoc
URL: 
http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/jms-browse.adoc?rev=1816059&r1=1816058&r2=1816059&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/jms-browse.adoc (original)
+++ karaf/site/production/manual/latest/commands/jms-browse.adoc Wed Nov 22 
14:52:25 2017
@@ -25,20 +25,20 @@ jms:browse [options] connectionFactory q
 |===
 |Name |Description
 
-|-s, --selector
-|The selector to select the messages to browse
-
 |-v, --verbose
 |Display JMS properties
 
-|--help
-|Display this help message
+|-s, --selector
+|The selector to select the messages to browse
+
+|-p, --password
+|Password to connect to the JMS broker
 
 |-u, --username
 |Username to connect to the JMS broker
 
-|-p, --password
-|Password to connect to the JMS broker
+|--help
+|Display this help message
 |===
 
 

Modified: karaf/site/production/manual/latest/commands/jms-consume.adoc
URL: 
http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/jms-consume.adoc?rev=1816059&r1=1816058&r2=1816059&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/jms-consume.adoc (original)
+++ karaf/site/production/manual/latest/commands/jms-consume.adoc Wed Nov 22 
14:52:25 2017
@@ -28,14 +28,14 @@ jms:consume [options] connectionFactory
 |-s, --selector
 |The selector to use to select the messages to consume
 
-|--help
-|Display this help message
+|-p, --password
+|Password to connect to the JMS broker
 
 |-u, --username
 |Username to connect to the JMS broker
 
-|-p, --password
-|Password to connect to the JMS broker
+|--help
+|Display this help message
 |===
 
 

Modified: karaf/site/production/manual/latest/commands/jms-count.adoc
URL: 
http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/jms-count.adoc?rev=1816059&r1=1816058&r2=1816059&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/jms-count.adoc (original)
+++ karaf/site/production/manual/latest/commands/jms-count.adoc Wed Nov 22 
14:52:25 2017
@@ -25,14 +25,14 @@ jms:count [options] connectionFactory qu
 |===
 |Name |Description
 
-|--help
-|Display this help message
+|-p, --password
+|Password to connect to the JMS broker
 
 |-u, --username
 |Username to connect to the JMS broker
 
-|-p, --password
-|Password to connect to the JMS broker
+|--help
+|Display this help message
 |===
 
 

Modified: karaf/site/production/manual/latest/commands/jms-create.adoc
URL: 
http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/jms-create.adoc?rev=1816059&r1=1816058&r2=1816059&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/jms-create.adoc (original)
+++ karaf/site/production/manual/latest/commands/jms-create.adoc Wed Nov 22 
14:52:25 2017
@@ -22,20 +22,20 @@ jms:create [options] name
 |===
 |Name |Description
 
+|-t, --type
+|The JMS connection factory type (ActiveMQ, Artemis or WebsphereMQ)
+
 |--url
 |URL of the JMS broker. For WebsphereMQ type, the URL is 
hostname/port/queuemanager/channel
 
-|--help
-|Display this help message
-
-|-t, --type
-|The JMS connection factory type (ActiveMQ or WebsphereMQ)
+|-p, --password
+|Password to connect to the JMS broker
 
 |-u, --username
 |Username to connect to the JMS broker
 
-|-p, --password
-|Password to connect to the JMS broker
+|--help
+|Display this help message
 |===
 
 

Modified: karaf/site/production/manual/latest/commands/jms-info.adoc
URL: 
http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/jms-info.adoc?rev=1816059&r1=1816058&r2=1816059&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/jms-info.adoc (original)
+++ karaf/site/production/manual/latest/commands/jms-info.adoc Wed Nov 22 
14:52:25 2017
@@ -22,14 +22,14 @@ jms:info [options] connectionFactory
 |===
 |Name |Description
 
-|--help
-|Display this help message
+|-p, --password
+|Password to connect to the JMS broker
 
 |-u, --username
 |Username to connect to the JMS broker
 
-|-p, --password
-|Password to connect to the JMS broker
+|--help
+|Display this help message
 |===
 
 

Modified: karaf/site/production/manual/latest/commands/jms-move.adoc
URL: 
http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/jms-move.adoc?rev=1816059&r1=1816058&r2=1816059&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/jms-move.adoc (original)
+++ karaf/site/production/manual/latest/commands/jms-move.adoc Wed Nov 22 
14:52:25 2017
@@ -28,17 +28,17 @@ jms:move [options] connectionFactory sou
 |===
 |Name |Description
 
-|--help
-|Display this help message
-
-|-u, --username
-|Username to connect to the JMS broker
+|-s, --selector
+|Selector to move only some messages
 
 |-p, --password
 |Password to connect to the JMS broker
 
-|-s, --selector
-|Selector to move only some messages
+|-u, --username
+|Username to connect to the JMS broker
+
+|--help
+|Display this help message
 |===
 
 

Modified: karaf/site/production/manual/latest/commands/jms-queues.adoc
URL: 
http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/jms-queues.adoc?rev=1816059&r1=1816058&r2=1816059&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/jms-queues.adoc (original)
+++ karaf/site/production/manual/latest/commands/jms-queues.adoc Wed Nov 22 
14:52:25 2017
@@ -22,14 +22,14 @@ jms:queues [options] connectionFactory
 |===
 |Name |Description
 
-|--help
-|Display this help message
+|-p, --password
+|Password to connect to the JMS broker
 
 |-u, --username
 |Username to connect to the JMS broker
 
-|-p, --password
-|Password to connect to the JMS broker
+|--help
+|Display this help message
 |===
 
 

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=1816059&r1=1816058&r2=1816059&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/jms-send.adoc (original)
+++ karaf/site/production/manual/latest/commands/jms-send.adoc Wed Nov 22 
14:52:25 2017
@@ -28,17 +28,17 @@ jms:send [options] connectionFactory que
 |===
 |Name |Description
 
-|--help
-|Display this help message
-
-|-u, --username
-|Username to connect to the JMS broker
-
 |-r, --replyTo
 |Set the message ReplyTo
 
 |-p, --password
 |Password to connect to the JMS broker
+
+|-u, --username
+|Username to connect to the JMS broker
+
+|--help
+|Display this help message
 |===
 
 

Modified: karaf/site/production/manual/latest/commands/jms-topics.adoc
URL: 
http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/jms-topics.adoc?rev=1816059&r1=1816058&r2=1816059&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/jms-topics.adoc (original)
+++ karaf/site/production/manual/latest/commands/jms-topics.adoc Wed Nov 22 
14:52:25 2017
@@ -22,14 +22,14 @@ jms:topics [options] connectionFactory
 |===
 |Name |Description
 
-|--help
-|Display this help message
+|-p, --password
+|Password to connect to the JMS broker
 
 |-u, --username
 |Username to connect to the JMS broker
 
-|-p, --password
-|Password to connect to the JMS broker
+|--help
+|Display this help message
 |===
 
 

Modified: karaf/site/production/manual/latest/commands/kar-install.adoc
URL: 
http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/kar-install.adoc?rev=1816059&r1=1816058&r2=1816059&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/kar-install.adoc (original)
+++ karaf/site/production/manual/latest/commands/kar-install.adoc Wed Nov 22 
14:52:25 2017
@@ -22,6 +22,9 @@ kar:install [options] url
 |===
 |Name |Description
 
+|--no-start
+|Do not start the bundles automatically
+
 |--help
 |Display this help message
 |===

Modified: karaf/site/production/manual/latest/commands/kar-list.adoc
URL: 
http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/kar-list.adoc?rev=1816059&r1=1816058&r2=1816059&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/kar-list.adoc (original)
+++ karaf/site/production/manual/latest/commands/kar-list.adoc Wed Nov 22 
14:52:25 2017
@@ -13,11 +13,11 @@ kar:list [options]
 |===
 |Name |Description
 
-|--no-format
-|Disable table rendered output
-
 |--help
 |Display this help message
+
+|--no-format
+|Disable table rendered output
 |===
 
 

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=1816059&r1=1816058&r2=1816059&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/log-display.adoc (original)
+++ karaf/site/production/manual/latest/commands/log-display.adoc Wed Nov 22 
14:52:25 2017
@@ -22,20 +22,20 @@ log:display [options] [logger]
 |===
 |Name |Description
 
+|-p
+|Pattern for formatting the output
+
 |--no-color
 |Disable syntax coloring of log events
 
-|-p
-|Pattern for formatting the output
+|-n
+|Number of entries to display
 
 |-l, --level
 |The minimal log level to display
 
 |--help
 |Display this help message
-
-|-n
-|Number of entries to display
 |===
 
 

Modified: karaf/site/production/manual/latest/commands/log-get.adoc
URL: 
http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/log-get.adoc?rev=1816059&r1=1816058&r2=1816059&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/log-get.adoc (original)
+++ karaf/site/production/manual/latest/commands/log-get.adoc Wed Nov 22 
14:52:25 2017
@@ -14,7 +14,7 @@ log:get [options] [logger]
 |Name |Description
 
 | logger
-| The name of the logger, ALL or ROOT (default)
+| The name of the logger or ALL (default)
 |===
 
 == Options
@@ -22,11 +22,11 @@ log:get [options] [logger]
 |===
 |Name |Description
 
-|--no-format
-|Disable table rendered output
-
 |--help
 |Display this help message
+
+|--no-format
+|Disable table rendered output
 |===
 
 

Added: karaf/site/production/manual/latest/commands/log-load-test.adoc
URL: 
http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/log-load-test.adoc?rev=1816059&view=auto
==============================================================================
--- karaf/site/production/manual/latest/commands/log-load-test.adoc (added)
+++ karaf/site/production/manual/latest/commands/log-load-test.adoc Wed Nov 22 
14:52:25 2017
@@ -0,0 +1,26 @@
+= log:load-test
+
+== Description
+
+Load test log.
+
+== Syntax
+
+log:load-test [options]
+
+== Options
+
+|===
+|Name |Description
+
+|--messaged
+|
+
+|--threads
+|
+
+|--help
+|Display this help message
+|===
+
+

Modified: karaf/site/production/manual/latest/commands/log-log.adoc
URL: 
http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/log-log.adoc?rev=1816059&r1=1816058&r2=1816059&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/log-log.adoc (original)
+++ karaf/site/production/manual/latest/commands/log-log.adoc Wed Nov 22 
14:52:25 2017
@@ -22,11 +22,11 @@ log:log [options] message
 |===
 |Name |Description
 
-|--help
-|Display this help message
-
 |--level, -l
 |The level the message will be logged at
+
+|--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=1816059&r1=1816058&r2=1816059&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/log-tail.adoc (original)
+++ karaf/site/production/manual/latest/commands/log-tail.adoc Wed Nov 22 
14:52:25 2017
@@ -22,20 +22,20 @@ log:tail [options] [logger]
 |===
 |Name |Description
 
+|-p
+|Pattern for formatting the output
+
 |--no-color
 |Disable syntax coloring of log events
 
-|-p
-|Pattern for formatting the output
+|-n
+|Number of entries to display
 
 |-l, --level
 |The minimal log level to display
 
 |--help
 |Display this help message
-
-|-n
-|Number of entries to display
 |===
 
 

Added: karaf/site/production/manual/latest/commands/maven-http-proxy-list.adoc
URL: 
http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/maven-http-proxy-list.adoc?rev=1816059&view=auto
==============================================================================
--- karaf/site/production/manual/latest/commands/maven-http-proxy-list.adoc 
(added)
+++ karaf/site/production/manual/latest/commands/maven-http-proxy-list.adoc Wed 
Nov 22 14:52:25 2017
@@ -0,0 +1,23 @@
+= maven:http-proxy-list
+
+== Description
+
+Lists HTTP proxy configurations for Maven remote repositories
+
+== Syntax
+
+maven:http-proxy-list [options]
+
+== Options
+
+|===
+|Name |Description
+
+|-x, --show-passwords
+|Do not hide passwords related to Maven encryption
+
+|--help
+|Display this help message
+|===
+
+

Added: 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=1816059&view=auto
==============================================================================
--- karaf/site/production/manual/latest/commands/maven-http-proxy.adoc (added)
+++ karaf/site/production/manual/latest/commands/maven-http-proxy.adoc Wed Nov 
22 14:52:25 2017
@@ -0,0 +1,56 @@
+= maven:http-proxy
+
+== Description
+
+Manage HTTP proxy configuration for Maven remote repositories
+
+== Syntax
+
+maven:http-proxy [options] [hostPort] 
+
+== Arguments
+
+|===
+|Name |Description
+
+| hostPort
+| host:port of HTTP proxy
+|===
+
+== Options
+
+|===
+|Name |Description
+
+|-p, --password
+|Password for remote repository (may be encrypted, see "maven:password -ep")
+
+|-f, --force
+|Do not ask for confirmation
+
+|-id
+|Identifier of HTTP proxy
+
+|--change
+|Changes HTTP proxy configuration in Maven settings
+
+|-n, --non-proxy-hosts
+|Non-proxied hosts (in the format '192.168.*|localhost|...')
+
+|--remove
+|Removes HTTP proxy configuration from Maven settings
+
+|--add
+|Adds HTTP proxy configuration to Maven settings
+
+|-u, --username
+|Username for remote repository
+
+|-x, --show-passwords
+|Do not hide passwords related to Maven encryption
+
+|--help
+|Display this help message
+|===
+
+

Added: karaf/site/production/manual/latest/commands/maven-password.adoc
URL: 
http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/maven-password.adoc?rev=1816059&view=auto
==============================================================================
--- karaf/site/production/manual/latest/commands/maven-password.adoc (added)
+++ karaf/site/production/manual/latest/commands/maven-password.adoc Wed Nov 22 
14:52:25 2017
@@ -0,0 +1,29 @@
+= maven:password
+
+== Description
+
+Manage passwords for remote repositories and proxies
+
+== Syntax
+
+maven:password [options]
+
+== Options
+
+|===
+|Name |Description
+
+|-emp, --encrypt-master-password
+|Encrypts master password used to encrypt/decrypt other passwords, see "mvn 
-emp"
+
+|-ep, --encrypt-password
+|Encrypts passwords to use for remote repositories and proxies, see "mvn -ep"
+
+|-p, --persist
+|
+
+|--help
+|Display this help message
+|===
+
+

Added: 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=1816059&view=auto
==============================================================================
--- karaf/site/production/manual/latest/commands/maven-repository-add.adoc 
(added)
+++ karaf/site/production/manual/latest/commands/maven-repository-add.adoc Wed 
Nov 22 14:52:25 2017
@@ -0,0 +1,62 @@
+= maven:repository-add
+
+== Description
+
+Adds Maven repository
+
+== Syntax
+
+maven:repository-add [options] [uri] 
+
+== Arguments
+
+|===
+|Name |Description
+
+| uri
+| Repository URI. It may be file:// based, http(s):// based, may use other 
known protocol or even property placeholders (like ${karaf.base})
+|===
+
+== Options
+
+|===
+|Name |Description
+
+|-nr, --no-releases
+|Disable release handling in this repository
+
+|-p, --password
+|Password for remote repository (may be encrypted, see "maven:password -ep")
+
+|-f, --force
+|Do not ask for confirmation
+
+|-id
+|Identifier of repository
+
+|-idx
+|Index at which new repository is to be inserted (0-based) (defaults to last - 
repository will be appended)
+
+|-d, --default
+|Edit default repository instead of remote one
+
+|-s, --snapshots
+|Enable SNAPSHOT handling in the repository
+
+|-cp, --checksum-policy
+|Checksum policy for repository (ignore, warn (default), fail)
+
+|-u, --username
+|Username for remote repository
+
+|-x, --show-passwords
+|Do not hide passwords related to Maven encryption
+
+|--help
+|Display this help message
+
+|-up, --update-policy
+|Update policy for repository (never, daily (default), interval:N, always)
+|===
+
+

Added: 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=1816059&view=auto
==============================================================================
--- karaf/site/production/manual/latest/commands/maven-repository-change.adoc 
(added)
+++ karaf/site/production/manual/latest/commands/maven-repository-change.adoc 
Wed Nov 22 14:52:25 2017
@@ -0,0 +1,59 @@
+= maven:repository-change
+
+== Description
+
+Changes configuration of Maven repository
+
+== Syntax
+
+maven:repository-change [options] [uri] 
+
+== Arguments
+
+|===
+|Name |Description
+
+| uri
+| Repository URI. It may be file:// based, http(s):// based, may use other 
known protocol or even property placeholders (like ${karaf.base})
+|===
+
+== Options
+
+|===
+|Name |Description
+
+|-nr, --no-releases
+|Disable release handling in this repository
+
+|-p, --password
+|Password for remote repository (may be encrypted, see "maven:password -ep")
+
+|-f, --force
+|Do not ask for confirmation
+
+|-id
+|Identifier of repository
+
+|-d, --default
+|Edit default repository instead of remote one
+
+|-s, --snapshots
+|Enable SNAPSHOT handling in the repository
+
+|-cp, --checksum-policy
+|Checksum policy for repository (ignore, warn (default), fail)
+
+|-u, --username
+|Username for remote repository
+
+|-x, --show-passwords
+|Do not hide passwords related to Maven encryption
+
+|--help
+|Display this help message
+
+|-up, --update-policy
+|Update policy for repository (never, daily (default), interval:N, always)
+|===
+
+


Reply via email to