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 1145139)
+++ deployer/spring/src/main/java/org/apache/karaf/deployer/spring/SpringURLHandler.java	(working copy)
@@ -84,8 +84,8 @@
                 os.close();
                 return new ByteArrayInputStream(os.toByteArray());
             } catch (Exception e) {
-                logger.error("Error opening spring xml url", e);
-                throw (IOException) new IOException("Error opening spring xml url").initCause(e);
+                logger.error("Error opening Spring xml url", e);
+                throw (IOException) new IOException("Error opening Spring xml url").initCause(e);
             }
         }
     }
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 1145139)
+++ deployer/features/src/main/java/org/apache/karaf/deployer/features/FeatureURLHandler.java	(working copy)
@@ -53,7 +53,7 @@
         }
         featureXmlURL = new URL(url.getPath());
 
-        logger.debug("Blueprint xml URL is: [" + featureXmlURL + "]");
+        logger.debug("Features xml URL is: [" + featureXmlURL + "]");
         return new Connection(url);
     }
 
@@ -79,8 +79,8 @@
                 os.close();
                 return new ByteArrayInputStream(os.toByteArray());
             } catch (Exception e) {
-                logger.error("Error opening blueprint xml url", e);
-                throw (IOException) new IOException("Error opening blueprint xml url").initCause(e);
+                logger.error("Error opening features xml url", e);
+                throw (IOException) new IOException("Error opening features xml url").initCause(e);
             }
         }
     }
Index: tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/utils/MojoSupport.java
===================================================================
--- tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/utils/MojoSupport.java	(revision 1141702)
+++ tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/utils/MojoSupport.java	(working copy)
@@ -53,7 +53,7 @@
 import org.apache.maven.project.ProjectBuildingException;
 
 /**
- * @version $Revision: 1.1 $
+ * @version $Revision$
  */
 public abstract class MojoSupport extends AbstractMojo {
 
@@ -65,7 +65,7 @@
     protected MavenProjectHelper projectHelper;
 
     /**
-     * The maven project.
+     * The Maven project.
      *
      * @parameter expression="${project}"
      * @required
@@ -319,13 +319,13 @@
     }
 
     /**
-     * Required because maven3 returns null in {@link ArtifactRepository#getProtocol()} (see KARAF-244)
+     * Required because Maven 3 returns null in {@link ArtifactRepository#getProtocol()} (see KARAF-244)
      */
     private String extractProtocolFromLocalMavenRepo() {
         try {
             return new URL(localRepo.getUrl()).getProtocol();
         } catch (MalformedURLException e) {
-            // Basically this should not happen; if though cancel the process
+            // Basically this should not happen; if it does though cancel the process
             throw new RuntimeException("Repository URL is not valid", e);
         }
     }
@@ -348,7 +348,7 @@
             if (skipNonMavenProtocols) {
                 return null;
             }
-            throw new MojoExecutionException("Bundle url is not a maven url: " + bundle);
+            throw new MojoExecutionException("Bundle url is not a Maven url: " + bundle);
         } else {
             bundle = bundle.substring(index + "mvn:".length());
         }
Index: tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/commands/GenerateHelpMojo.java
===================================================================
--- tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/commands/GenerateHelpMojo.java	(revision 1145139)
+++ tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/commands/GenerateHelpMojo.java	(working copy)
@@ -87,7 +87,7 @@
     protected String format;
 
     /**
-     * The classloader to use to load the commands
+     * The classloader to use for loading the commands
      *
      * @parameter default-value="project"
      */
Index: tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/WarURLHandler.java
===================================================================
--- tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/WarURLHandler.java	(revision 1141702)
+++ tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/WarURLHandler.java	(working copy)
@@ -35,32 +35,32 @@
  */
 public class WarURLHandler extends URLStreamHandler {
 
-	private final Logger logger = LoggerFactory.getLogger(WarURLHandler.class);
+    private final Logger logger = LoggerFactory.getLogger(WarURLHandler.class);
 
-	private static String SYNTAX = "war: war-uri";
+    private static String SYNTAX = "war: war-uri";
 
-	private URL warURL;
+    private URL warURL;
 
     /**
      * Open the connection for the given URL.
-     *
+     * 
      * @param url the url from which to open a connection.
      * @return a connection on the specified URL.
      * @throws java.io.IOException if an error occurs or if the URL is malformed.
      */
     @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 );
-		}
+    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);
+        }
 
         // We don't resolve any specific data here, just forward it to another URL Stream Handler
-		warURL = new URL(url.getPath());
-		return warURL.openConnection();
-	}
+        warURL = new URL(url.getPath());
+        return warURL.openConnection();
+    }
 
-	public URL getWarURL() {
-		return warURL;
-	}
+    public URL getWarURL() {
+        return warURL;
+    }
 
 }
Index: tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/FeatureURLHandler.java
===================================================================
--- tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/FeatureURLHandler.java	(revision 1141702)
+++ tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/FeatureURLHandler.java	(working copy)
@@ -31,8 +31,8 @@
 
 
 /**
- * As org.apache.karaf.deployer.features.FeatureURLHandler need run with OSGi container
- * so create this class only used for features-maven-plugin
+ * As org.apache.karaf.deployer.features.FeatureURLHandler needs to be run with 
+ * the OSGi container this class was created for use by the karaf-maven-plugin
  */
 public class FeatureURLHandler extends URLStreamHandler {
 
@@ -56,7 +56,7 @@
         }
         featureXmlURL = new URL(url.getPath());
 
-        logger.debug("Feature xml URL is: [" + featureXmlURL + "]");
+        logger.debug("Features xml URL is: [" + featureXmlURL + "]");
         return new Connection(url);
     }
 
@@ -82,7 +82,7 @@
                 os.close();
                 return new ByteArrayInputStream(os.toByteArray());
             } catch (Exception e) {
-                logger.error("Error opening feature xml url", e);
+                logger.error("Error opening features xml url", e);
                 throw (IOException) new IOException("Error opening features xml url").initCause(e);
             }
         }
Index: tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/ValidateDescriptorMojo.java
===================================================================
--- tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/ValidateDescriptorMojo.java	(revision 1141702)
+++ tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/ValidateDescriptorMojo.java	(working copy)
@@ -61,7 +61,7 @@
 /**
  * Validates a features XML file
  * 
- * @version $Revision: 1.1 $
+ * @version $Revision$
  * @goal features-validate-descriptor
  * @execute phase="process-resources"
  * @requiresDependencyResolution runtime
@@ -103,21 +103,21 @@
     private File file;
 
     /**
-     * karaf config.properties
+     * Karaf config.properties
      * 
      * @parameter default-value="config.properties"
      */
     private String karafConfig;
     
     /**
-     * which jre version we wanna parse to get jre exported package in config.properties
+     * which JRE version to parse from config.properties to get the JRE exported packages
      * 
      * @parameter default-value="jre-1.5"
      */
     private String jreVersion;
 
     /**
-     * which karaf version used for karaf core features resolution
+     * which Karaf version used for Karaf core features resolution
      *
      * @parameter
      */
@@ -203,7 +203,7 @@
         readSystemPackages();
         info(" - getting list of provided bundle exports");
         readProvidedBundles();
-        info(" - populating repositories with karaf core features descriptors");
+        info(" - populating repositories with Karaf core features descriptors");
         appendKarafCoreFeaturesDescriptors();
     }
 
Index: tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/DependencyHelper.java
===================================================================
--- tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/DependencyHelper.java	(revision 1141702)
+++ tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/DependencyHelper.java	(working copy)
@@ -53,44 +53,44 @@
 import static org.apache.karaf.deployer.kar.KarArtifactInstaller.FEATURE_CLASSIFIER;
 
 /**
- * @version $Rev:$ $Date:$
+ * @version $Rev$ $Date$
  */
 public class DependencyHelper {
 
     /**
-      * The entry point to Aether, i.e. the component doing all the work.
-      *
-      * @component
-      * @required
-      * @readonly
-      */
-     private final RepositorySystem repoSystem;
+     * The entry point to Aether, i.e. the component doing all the work.
+     *
+     * @component
+     * @required
+     * @readonly
+     */
+    private final RepositorySystem repoSystem;
 
-     /**
-      * The current repository/network configuration of Maven.
-      *
-      * @parameter default-value="${repositorySystemSession}"
-      * @required
-      * @readonly
-      */
-     private final RepositorySystemSession repoSession;
+    /**
+     * The current repository/network configuration of Maven.
+     *
+     * @parameter default-value="${repositorySystemSession}"
+     * @required
+     * @readonly
+     */
+    private final RepositorySystemSession repoSession;
 
-     /**
-      * The project's remote repositories to use for the resolution of project dependencies.
-      *
-      * @parameter default-value="${project.remoteProjectRepositories}"
-      * @readonly
-      */
-     private final List<RemoteRepository> projectRepos;
+    /**
+     * The project's remote repositories to use for the resolution of project dependencies.
+     *
+     * @parameter default-value="${project.remoteProjectRepositories}"
+     * @readonly
+     */
+    private final List<RemoteRepository> projectRepos;
 
-     /**
-      * The project's remote repositories to use for the resolution of plugins and their dependencies.
-      *
-      * @parameter default-value="${project.remotePluginRepositories}"
-      * @required
-      * @readonly
-      */
-     private final List<RemoteRepository> pluginRepos;
+    /**
+     * The project's remote repositories to use for the resolution of plugins and their dependencies.
+     *
+     * @parameter default-value="${project.remotePluginRepositories}"
+     * @required
+     * @readonly
+     */
+    private final List<RemoteRepository> pluginRepos;
 
     private boolean includeTopLevelProvidedScopeDependencies;
 
Index: tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/MvnUrlUtil.java
===================================================================
--- tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/MvnUrlUtil.java	(revision 1141702)
+++ tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/MvnUrlUtil.java	(working copy)
@@ -37,7 +37,7 @@
  * N.B. we do not handle repository-url in mvn urls.
  * N.B. version is required in mvn urls.
  *
- * @version $Rev:$ $Date:$
+ * @version $Rev$ $Date$
  */
 public class MvnUrlUtil {
 
@@ -101,8 +101,8 @@
     }
 
     /**
-     * similar to a Main class method
-     * Returns a path for an srtifact.
+     * Similar to a Main class method
+     * Returns a path for an artifact.
      * Input: path (no ':') returns path
      * Input: mvn:<groupId>/<artifactId>/<version>/<type>/<classifier> converts to default repo location path
      * Input:  <groupId>:<artifactId>:<type>:<classifier>:<version>:<type>:<classifier> converts to default repo location path
Index: tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/SpringURLHandler.java
===================================================================
--- tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/SpringURLHandler.java	(revision 1141702)
+++ tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/SpringURLHandler.java	(working copy)
@@ -31,8 +31,8 @@
 import org.slf4j.LoggerFactory;
 
 /**
- * As org.apache.karaf.deployer.spring.SpringURLHandler need run with OSGi container
- * so create this class only used for features-maven-plugin
+ * As org.apache.karaf.deployer.spring.SpringURLHandler needs to be run with 
+ * the OSGi container this class was created for use by the karaf-maven-plugin
  */
 public class SpringURLHandler extends URLStreamHandler {
 
@@ -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 );
 		}
 		springXmlURL = new URL(url.getPath());
 
@@ -82,8 +82,8 @@
                 os.close();
                 return new ByteArrayInputStream(os.toByteArray());
             } catch (Exception e) {
-                logger.error("Error opening spring xml url", e);
-                throw (IOException) new IOException("Error opening spring xml url").initCause(e);
+                logger.error("Error opening Spring xml url", e);
+                throw (IOException) new IOException("Error opening Spring xml url").initCause(e);
             }
         }
     }
Index: tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/CustomBundleURLStreamHandlerFactory.java
===================================================================
--- tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/CustomBundleURLStreamHandlerFactory.java	(revision 1141702)
+++ tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/CustomBundleURLStreamHandlerFactory.java	(working copy)
@@ -20,31 +20,30 @@
 import java.net.URLStreamHandler;
 import java.net.URLStreamHandlerFactory;
 
-public class CustomBundleURLStreamHandlerFactory implements
-		URLStreamHandlerFactory {
-	private static final String MVN_URI_PREFIX = "mvn";
-	private static final String WRAP_URI_PREFIX = "wrap";
+public class CustomBundleURLStreamHandlerFactory implements URLStreamHandlerFactory {
+    private static final String MVN_URI_PREFIX = "mvn";
+    private static final String WRAP_URI_PREFIX = "wrap";
     private static final String FEATURE_URI_PREFIX = "feature";
     private static final String SPRING_URI_PREFIX = "spring";
     private static final String BLUEPRINT_URI_PREFIX = "blueprint";
     private static final String WAR_URI_PREFIX = "war";
 
     public URLStreamHandler createURLStreamHandler(String protocol) {
-		if (protocol.equals(MVN_URI_PREFIX)) {
-			return new org.ops4j.pax.url.mvn.Handler();
-		} else if (protocol.equals(WRAP_URI_PREFIX)){
-			return new org.ops4j.pax.url.wrap.Handler();
-		} else if (protocol.equals(FEATURE_URI_PREFIX)){
-			return new FeatureURLHandler();
-		} else if (protocol.equals(SPRING_URI_PREFIX)){
-			return new SpringURLHandler();
-		} else if (protocol.equals(BLUEPRINT_URI_PREFIX)){
-			return new BlueprintURLHandler();
+        if (protocol.equals(MVN_URI_PREFIX)) {
+            return new org.ops4j.pax.url.mvn.Handler();
+        } else if (protocol.equals(WRAP_URI_PREFIX)) {
+            return new org.ops4j.pax.url.wrap.Handler();
+        } else if (protocol.equals(FEATURE_URI_PREFIX)) {
+            return new FeatureURLHandler();
+        } else if (protocol.equals(SPRING_URI_PREFIX)) {
+            return new SpringURLHandler();
+        } else if (protocol.equals(BLUEPRINT_URI_PREFIX)) {
+            return new BlueprintURLHandler();
         } else if (protocol.equals(WAR_URI_PREFIX)) {
             return new WarURLHandler();
-		} else {
-			return null;
-		}
-	}
+        } else {
+            return null;
+        }
+    }
 
 }
Index: tooling/karaf-maven-plugin/src/main/resources/org/apache/karaf/features/karaf-features-1.0.0-ordered.xsd
===================================================================
--- tooling/karaf-maven-plugin/src/main/resources/org/apache/karaf/features/karaf-features-1.0.0-ordered.xsd	(revision 1141702)
+++ tooling/karaf-maven-plugin/src/main/resources/org/apache/karaf/features/karaf-features-1.0.0-ordered.xsd	(working copy)
@@ -23,7 +23,7 @@
 
     <xs:annotation>
         <xs:documentation><![CDATA[
-Karaf features mechanism. For documentation please visit 
+Karaf features mechanism. For documentation please visit the  
 <a href="http://karaf.apache.org/">Karaf website</a>.
         ]]></xs:documentation>
     </xs:annotation>
@@ -31,9 +31,9 @@
     <xs:complexType name="features">
         <xs:annotation>
             <xs:documentation><![CDATA[
-Root element of Feature definition. It contains optional attribute which allow
-name of repository. This name will be used in shell to display source repository
-of given feature.
+Root element of the Feature definition. It contains optional attributes which allow
+for naming the repository. This name will be used in shell to display the source repository
+of a given feature.
             ]]></xs:documentation>
         </xs:annotation>
         <xs:sequence>
@@ -66,7 +66,7 @@
             <xs:element name="details" type="xs:string" minOccurs="0" maxOccurs="unbounded">
                 <xs:annotation>
                     <xs:documentation><![CDATA[
-Long info displayed in features:info command result.
+The text information that will be displayed with the features:info command.
                     ]]>
                     </xs:documentation>
                 </xs:annotation>
@@ -82,7 +82,7 @@
         <xs:attribute name="resolver" type="tns:resolver">
             <xs:annotation>
                 <xs:documentation><![CDATA[
-Karaf allow using dynamic resolvers.
+Karaf allows for using dynamic resolvers.
                 ]]>
                 </xs:documentation>
             </xs:annotation>
@@ -108,7 +108,7 @@
                 <xs:attribute name="start" type="xs:boolean" default="true">
                     <xs:annotation>
                         <xs:documentation><![CDATA[
-This switch allow you to leave bundle in resolved state rather than the default active state.
+This switch allows you to install the bundle in resolved state rather than the default active state.
                         ]]>
                         </xs:documentation>
                     </xs:annotation>
@@ -116,7 +116,7 @@
                 <xs:attribute name="dependency" type="xs:boolean">
                     <xs:annotation>
                         <xs:documentation><![CDATA[
-Mark bundle as dependency for resolver.
+Mark this bundle as a dependency for the resolver.
                         ]]>
                         </xs:documentation>
                     </xs:annotation>
@@ -128,7 +128,7 @@
     <xs:complexType name="dependency">
         <xs:annotation>
             <xs:documentation><![CDATA[
-Dependency of feature.
+Dependency of the feature.
             ]]></xs:documentation>
         </xs:annotation>
         <xs:simpleContent>
@@ -163,14 +163,14 @@
                 <xs:attribute name="finalname" type="xs:string" use="required">
                     <xs:annotation>
                         <xs:documentation><![CDATA[
-Name of file name where given deployable element should be stored.
+Name of file where given deployable element should be stored.
                         ]]></xs:documentation>
                     </xs:annotation>
                 </xs:attribute>
                 <xs:attribute name="override" type="xs:boolean">
                     <xs:annotation>
                         <xs:documentation><![CDATA[
-flag to specify if the finalname file should be overriden
+Flag to specify if an already existing file with name of finalname should be overridden
                         ]]></xs:documentation>
                     </xs:annotation>
                 </xs:attribute>
@@ -182,7 +182,7 @@
     <xs:simpleType name="featureName">
         <xs:annotation>
             <xs:documentation><![CDATA[
-Feature name should be non empty string.
+Feature name should be a non-empty string.
             ]]></xs:documentation>
         </xs:annotation>
         <xs:restriction base="xs:string">
@@ -193,7 +193,7 @@
     <xs:simpleType name="resolver">
         <xs:annotation>
             <xs:documentation><![CDATA[
-Resolver to use. Karaf will look for OSGi servie which have following properties:
+Resolver to use. Karaf will look for an OSGi service which has the following properties:
 objectClass: org.apache.karaf.features.Resolver
 name: the value
             ]]></xs:documentation>