This is an automated email from the ASF dual-hosted git repository.

jbonofre pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/karaf.git


The following commit(s) were added to refs/heads/main by this push:
     new 92d3828398 Fix "useful" typos
     new a102d86a3b Merge pull request #1708 from wborn/useful-typos
92d3828398 is described below

commit 92d38283989a74d24d2fb9b9c7c2d68e614cea1a
Author: Wouter Born <git...@maindrain.net>
AuthorDate: Thu Jan 12 17:41:52 2023 +0100

    Fix "useful" typos
    
    Signed-off-by: Wouter Born <git...@maindrain.net>
---
 assemblies/features/standard/src/main/feature/feature.xml           | 6 +++---
 .../karaf/instance/resources/etc/org.apache.karaf.management.cfg    | 2 +-
 itests/test/src/test/filtered-resources/etc/feature.xml             | 2 +-
 manual/src/main/asciidoc/user-guide/remote.adoc                     | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/assemblies/features/standard/src/main/feature/feature.xml 
b/assemblies/features/standard/src/main/feature/feature.xml
index 74b637f289..0d07990190 100644
--- a/assemblies/features/standard/src/main/feature/feature.xml
+++ b/assemblies/features/standard/src/main/feature/feature.xml
@@ -344,10 +344,10 @@ hostKey = ${karaf.etc}/host.key
 #
 completionMode = GLOBAL
 
-# If set to true, shell:logout command will not exit Karaf. This can be usfeul 
to avoid accidental exits.
+# If set to true, shell:logout command will not exit Karaf. This can be useful 
to avoid accidental exits.
 # You will be able to exit via 'shutdown' or 'halt' instead.
 disableLogout = false
-# If set to true, it will stop CTRL-D from exiting Karaf. This can be usfeul 
to avoid accidental exits.
+# If set to true, it will stop CTRL-D from exiting Karaf. This can be useful 
to avoid accidental exits.
 # You will be able to exit via 'shutdown' or 'halt' instead.
 disableEofExit = false
 
@@ -1337,7 +1337,7 @@ jmxmpObjectName = connector:name=jmxmp
 #locateRmiRegistry = true
 
 #
-# Locate an existing MBean server if possible (usefull when Karaf is embedded)
+# Locate an existing MBean server if possible (useful when Karaf is embedded)
 #
 #locateExistingMBeanServerIfPossible = true
 
diff --git 
a/instance/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.karaf.management.cfg
 
b/instance/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.karaf.management.cfg
index d0a9ccc908..047e08bd3d 100644
--- 
a/instance/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.karaf.management.cfg
+++ 
b/instance/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.karaf.management.cfg
@@ -141,6 +141,6 @@ jmxmpObjectName = connector:name=jmxmp
 #locateRmiRegistry = true
 
 #
-# Locate an existing MBean server if possible (usefull when Karaf is embedded)
+# Locate an existing MBean server if possible (useful when Karaf is embedded)
 #
 #locateExistingMBeanServerIfPossible = true
\ No newline at end of file
diff --git a/itests/test/src/test/filtered-resources/etc/feature.xml 
b/itests/test/src/test/filtered-resources/etc/feature.xml
index 922ddf7518..f827ff6184 100644
--- a/itests/test/src/test/filtered-resources/etc/feature.xml
+++ b/itests/test/src/test/filtered-resources/etc/feature.xml
@@ -846,7 +846,7 @@
             #locateRmiRegistry = true
 
             #
-            # Locate an existing MBean server if possible (usefull when Karaf 
is embedded)
+            # Locate an existing MBean server if possible (useful when Karaf 
is embedded)
             #
             #locateExistingMBeanServerIfPossible = true
         </config>
diff --git a/manual/src/main/asciidoc/user-guide/remote.adoc 
b/manual/src/main/asciidoc/user-guide/remote.adoc
index 9e75e8eee8..ebcf732b34 100644
--- a/manual/src/main/asciidoc/user-guide/remote.adoc
+++ b/manual/src/main/asciidoc/user-guide/remote.adoc
@@ -138,10 +138,10 @@ sftpEnabled=true
 #
 completionMode = GLOBAL
 
-# If set to true, shell:logout command will not exit Karaf. This can be usfeul 
to avoid accidental exits.
+# If set to true, shell:logout command will not exit Karaf. This can be useful 
to avoid accidental exits.
 # You will be able to exit via 'shutdown' or 'halt' instead.
 disableLogout = false
-# If set to true, it will stop CTRL-D from exiting Karaf. This can be usfeul 
to avoid accidental exits.
+# If set to true, it will stop CTRL-D from exiting Karaf. This can be useful 
to avoid accidental exits.
 # You will be able to exit via 'shutdown' or 'halt' instead.
 disableEofExit = false
 ----

Reply via email to