Index: deployer/spring/src/main/java/org/apache/karaf/deployer/spring/SpringURLHandler.java
===================================================================
--- deployer/spring/src/main/java/org/apache/karaf/deployer/spring/SpringURLHandler.java	(revision 1141702)
+++ deployer/spring/src/main/java/org/apache/karaf/deployer/spring/SpringURLHandler.java	(working copy)
@@ -54,7 +54,7 @@
     @Override
 	public URLConnection openConnection(URL url) throws IOException {
 		if (url.getPath() == null || url.getPath().trim().length() == 0) {
-			throw new MalformedURLException ("Path can not be null or empty. Syntax: " + SYNTAX );
+			throw new MalformedURLException ("Path cannot be null or empty. Syntax: " + SYNTAX );
 		}
 		springXmlURL = new URL(url.getPath());
 
Index: deployer/blueprint/src/main/java/org/apache/karaf/deployer/blueprint/BlueprintURLHandler.java
===================================================================
--- deployer/blueprint/src/main/java/org/apache/karaf/deployer/blueprint/BlueprintURLHandler.java	(revision 1141702)
+++ deployer/blueprint/src/main/java/org/apache/karaf/deployer/blueprint/BlueprintURLHandler.java	(working copy)
@@ -54,7 +54,7 @@
     @Override
 	public URLConnection openConnection(URL url) throws IOException {
 		if (url.getPath() == null || url.getPath().trim().length() == 0) {
-			throw new MalformedURLException ("Path can not be null or empty. Syntax: " + SYNTAX );
+			throw new MalformedURLException ("Path cannot be null or empty. Syntax: " + SYNTAX );
 		}
 		blueprintXmlURL = new URL(url.getPath());
 
Index: deployer/kar/src/main/java/org/apache/karaf/deployer/kar/KarArtifactInstaller.java
===================================================================
--- deployer/kar/src/main/java/org/apache/karaf/deployer/kar/KarArtifactInstaller.java	(revision 1141702)
+++ deployer/kar/src/main/java/org/apache/karaf/deployer/kar/KarArtifactInstaller.java	(working copy)
@@ -159,7 +159,7 @@
     }
 
     public void uninstall(File file) throws Exception {
-		logger.warn("Karaf archive '" + file + "' has been removed; however, it's feature URLs have not been deregistered, and it's bundles are still available in '" + localRepoPath + "'.");
+		logger.warn("Karaf archive '" + file + "' has been removed; however, its feature URLs have not been deregistered, and its bundles are still available in '" + localRepoPath + "'.");
 	}
 
 	public void update(File file) throws Exception {
Index: deployer/features/src/main/java/org/apache/karaf/deployer/features/FeatureURLHandler.java
===================================================================
--- deployer/features/src/main/java/org/apache/karaf/deployer/features/FeatureURLHandler.java	(revision 1141702)
+++ deployer/features/src/main/java/org/apache/karaf/deployer/features/FeatureURLHandler.java	(working copy)
@@ -49,7 +49,7 @@
     @Override
     public URLConnection openConnection(URL url) throws IOException {
         if (url.getPath() == null || url.getPath().trim().length() == 0) {
-            throw new MalformedURLException("Path can not be null or empty. Syntax: " + SYNTAX );
+            throw new MalformedURLException("Path cannot be null or empty. Syntax: " + SYNTAX );
         }
         featureXmlURL = new URL(url.getPath());
 
Index: diagnostic/command/src/main/java/org/apache/karaf/diagnostic/command/DumpCommand.java
===================================================================
--- diagnostic/command/src/main/java/org/apache/karaf/diagnostic/command/DumpCommand.java	(revision 1141702)
+++ diagnostic/command/src/main/java/org/apache/karaf/diagnostic/command/DumpCommand.java	(working copy)
@@ -36,7 +36,7 @@
  * 
  * @author ldywicki
  */
-@Command(scope = "dev", name = "create-dump", description = "Creates zip archive wich diagnostic info.")
+@Command(scope = "dev", name = "create-dump", description = "Creates zip archive with diagnostic info.")
 public class DumpCommand extends OsgiCommandSupport {
 
     /**
@@ -52,7 +52,7 @@
     /**
      * Directory switch.
      */
-    @Option(name = "-d", aliases = "--directory", description = "Creates dump in directory instead ZIP")
+    @Option(name = "-d", aliases = "--directory", description = "Creates dump in a directory instead of ZIP file")
     boolean directory;
 
     /**
Index: admin/core/src/main/java/org/apache/karaf/jpm/impl/ProcessImpl.java
===================================================================
--- admin/core/src/main/java/org/apache/karaf/jpm/impl/ProcessImpl.java	(revision 1141702)
+++ admin/core/src/main/java/org/apache/karaf/jpm/impl/ProcessImpl.java	(working copy)
@@ -77,7 +77,7 @@
             ret = ScriptUtils.executeProcess(new java.lang.ProcessBuilder("kill", "-9", Integer.toString(pid)));
         }
         if (ret != 0) {
-            throw new IOException("Unable to destroy proces, it may be already terminated");
+            throw new IOException("Unable to destroy process, it may already be terminated");
         }
     }
 
Index: admin/core/src/main/java/org/apache/karaf/admin/internal/AdminServiceImpl.java
===================================================================
--- admin/core/src/main/java/org/apache/karaf/admin/internal/AdminServiceImpl.java	(revision 1141702)
+++ admin/core/src/main/java/org/apache/karaf/admin/internal/AdminServiceImpl.java	(working copy)
@@ -261,7 +261,7 @@
             throw new IllegalArgumentException("Instance " + oldName + " not found");
         }
         if (instance.isRoot()) {
-            throw new IllegalArgumentException("You can't rename the root instance");
+            throw new IllegalArgumentException("Root instance cannot be renamed");
         }
         if (instance.getPid() != 0) {
             throw new IllegalStateException("Instance not stopped");
@@ -312,7 +312,7 @@
             throw new IllegalArgumentException("Instance " + name + " not found");
         }
         if (instance.isRoot()) {
-            throw new IllegalArgumentException("You can't clone the root instance");
+            throw new IllegalArgumentException("Root instance cannot be cloned");
         }
         if (instance.getPid() != 0) {
             throw new IllegalStateException("Instance not stopped");
Index: admin/management/src/main/java/org/apache/karaf/admin/management/codec/JmxInstance.java
===================================================================
--- admin/management/src/main/java/org/apache/karaf/admin/management/codec/JmxInstance.java	(revision 1141702)
+++ admin/management/src/main/java/org/apache/karaf/admin/management/codec/JmxInstance.java	(working copy)
@@ -102,7 +102,7 @@
             descriptions[7] = "The location of the instance.";
 
             itemTypes[8] = SimpleType.STRING;
-            descriptions[8] = "The java options of the instance.";
+            descriptions[8] = "The Java options of the instance.";
 
             return new CompositeType("Instance", desc, itemNames, descriptions, itemTypes);
         } catch (OpenDataException e) {
Index: admin/command/src/main/java/org/apache/karaf/admin/command/ChangeOptsCommand.java
===================================================================
--- admin/command/src/main/java/org/apache/karaf/admin/command/ChangeOptsCommand.java	(revision 1141702)
+++ admin/command/src/main/java/org/apache/karaf/admin/command/ChangeOptsCommand.java	(working copy)
@@ -19,13 +19,13 @@
 import org.apache.felix.gogo.commands.Argument;
 import org.apache.felix.gogo.commands.Command;
 
-@Command(scope = "admin", name = "change-opts", description = "Changes the java options of an existing container instance.")
+@Command(scope = "admin", name = "change-opts", description = "Changes the Java options of an existing container instance.")
 public class ChangeOptsCommand extends AdminCommandSupport {
 
     @Argument(index = 0, name = "name", description="The name of the container instance", required = true, multiValued = false)
     private String instance = null;
 
-    @Argument(index = 1, name = "javaOpts", description = "The new java options to set", required = true, multiValued = false)
+    @Argument(index = 1, name = "javaOpts", description = "The new Java options to set", required = true, multiValued = false)
     private String javaOpts;
 
     protected Object doExecute() throws Exception {
Index: admin/command/src/main/java/org/apache/karaf/admin/command/ListCommand.java
===================================================================
--- admin/command/src/main/java/org/apache/karaf/admin/command/ListCommand.java	(revision 1141702)
+++ admin/command/src/main/java/org/apache/karaf/admin/command/ListCommand.java	(working copy)
@@ -29,7 +29,7 @@
     @Option(name = "-l", aliases = { "--location" }, description = "Displays the location of the container instances", required = false, multiValued = false)
     boolean location;
 
-    @Option(name = "-o", aliases = { "--java-opts" }, description = "Displays the java options used to launch the JVM", required = false, multiValued = false)
+    @Option(name = "-o", aliases = { "--java-opts" }, description = "Displays the Java options used to launch the JVM", required = false, multiValued = false)
     boolean javaOpts;
 
     protected Object doExecute() throws Exception {
Index: tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/AddToRepositoryMojo.java
===================================================================
--- tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/AddToRepositoryMojo.java	(revision 1141702)
+++ tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/AddToRepositoryMojo.java	(working copy)
@@ -53,7 +53,7 @@
 /**
  * Generates the features XML file
  *
- * @version $Revision: 1.1 $
+ * @version $Revision$
  * @goal features-add-to-repository
  * @phase compile
  * @execute phase="compile"
@@ -82,7 +82,7 @@
     private File repository;
 
     /**
-     * which is the target karaf version used to resolve karaf core features descriptors
+     * the target karaf version used to resolve karaf core features descriptors
      *
      * @parameter
      */
Index: tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/BlueprintURLHandler.java
===================================================================
--- tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/BlueprintURLHandler.java	(revision 1141702)
+++ tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/BlueprintURLHandler.java	(working copy)
@@ -52,7 +52,7 @@
     @Override
 	public URLConnection openConnection(URL url) throws IOException {
 		if (url.getPath() == null || url.getPath().trim().length() == 0) {
-			throw new MalformedURLException ("Path can not be null or empty. Syntax: " + SYNTAX );
+			throw new MalformedURLException ("Path cannot be null or empty. Syntax: " + SYNTAX );
 		}
 		blueprintXmlURL = new URL(url.getPath());