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 2018/09/11 05:46:43 UTC
[karaf] branch master updated: Fix docker documentation
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/karaf.git
The following commit(s) were added to refs/heads/master by this push:
new 3ae1671 Fix docker documentation
3ae1671 is described below
commit 3ae1671ce7d2821dabce464722a01262b5381467
Author: Jean-Baptiste Onofré <jb...@apache.org>
AuthorDate: Tue Sep 11 07:46:22 2018 +0200
Fix docker documentation
---
manual/src/main/asciidoc/index.adoc | 2 +-
manual/src/main/asciidoc/overview.adoc | 2 +-
manual/src/main/asciidoc/user-guide/docker.adoc | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/manual/src/main/asciidoc/index.adoc b/manual/src/main/asciidoc/index.adoc
index 12f0eea..cb58b66 100644
--- a/manual/src/main/asciidoc/index.adoc
+++ b/manual/src/main/asciidoc/index.adoc
@@ -58,7 +58,7 @@ include::user-guide/instances.adoc[]
include::user-guide/security.adoc[]
-include::user-guide/dockerClient.adoc[]
+include::user-guide/docker.adoc[]
include::user-guide/obr.adoc[]
diff --git a/manual/src/main/asciidoc/overview.adoc b/manual/src/main/asciidoc/overview.adoc
index 6e21926..ff3bbce 100644
--- a/manual/src/main/asciidoc/overview.adoc
+++ b/manual/src/main/asciidoc/overview.adoc
@@ -17,7 +17,7 @@
Apache Karaf is a modern and polymorphic container.
Karaf can be used standalone as a container, supporting a wide range of applications and technologies.
-It also supports the "run anywhere" (on any machine with Java, cloud, dockerClient images, ...) using the embedded mode.
+It also supports the "run anywhere" (on any machine with Java, cloud, docker images, ...) using the embedded mode.
It's a lightweight, powerful, and enterprise ready platform.
diff --git a/manual/src/main/asciidoc/user-guide/docker.adoc b/manual/src/main/asciidoc/user-guide/docker.adoc
index 559f627..5847d38 100644
--- a/manual/src/main/asciidoc/user-guide/docker.adoc
+++ b/manual/src/main/asciidoc/user-guide/docker.adoc
@@ -113,7 +113,7 @@ You have to do it using the `-H` option on `dockerd`:
/usr/bin/dockerd -H fd:// -H tcp://localhost:2375
----
-Apache Karaf Docker feature exposes `DockerService` OSGi service that you can use programmatically (the `dockerClient:*` commands
+Apache Karaf Docker feature exposes `DockerService` OSGi service that you can use programmatically (the `docker:*` commands
and the `DockerMBean` use the `DockerService` service).
==== System-wide information
@@ -378,4 +378,4 @@ The `docker:top` command displays the current running processes in an existing c
----
karaf@root()> docker:top my-container
-----
\ No newline at end of file
+----