Index: deployer/wrap/src/main/java/org/apache/karaf/deployer/wrap/WrapDeploymentListener.java
===================================================================
--- deployer/wrap/src/main/java/org/apache/karaf/deployer/wrap/WrapDeploymentListener.java	(revision 1154936)
+++ deployer/wrap/src/main/java/org/apache/karaf/deployer/wrap/WrapDeploymentListener.java	(working copy)
@@ -30,8 +30,6 @@
  * <p>
  * A deployment listener that listens for non OSGi jar deployements.
  * </p>
- *
- * @author jbonofre
  */
 public class WrapDeploymentListener implements ArtifactUrlTransformer {
 
Index: diagnostic/common/src/main/java/org/apache/karaf/diagnostic/common/FeaturesDumpProvider.java
===================================================================
--- diagnostic/common/src/main/java/org/apache/karaf/diagnostic/common/FeaturesDumpProvider.java	(revision 1154936)
+++ diagnostic/common/src/main/java/org/apache/karaf/diagnostic/common/FeaturesDumpProvider.java	(working copy)
@@ -24,10 +24,8 @@
 import org.apache.karaf.features.Repository;
 
 /**
- * Dump provider which add file named features.txt with informations
+ * Dump provider which adds a file named features.txt with information
  * about installed features and repositories. 
- * 
- * @author ldywicki
  */
 public class FeaturesDumpProvider extends TextDumpProvider {
 
@@ -37,8 +35,8 @@
     private final FeaturesService features;
 
     /**
-     * Creates new dump entry witch contains information about
-     * karaf features.
+     * Creates new dump entry which contains information about
+     * Karaf features.
      * 
      * @param features Feature service.
      */
Index: diagnostic/common/src/main/java/org/apache/karaf/diagnostic/common/LogDumpProvider.java
===================================================================
--- diagnostic/common/src/main/java/org/apache/karaf/diagnostic/common/LogDumpProvider.java	(revision 1154936)
+++ diagnostic/common/src/main/java/org/apache/karaf/diagnostic/common/LogDumpProvider.java	(working copy)
@@ -27,8 +27,6 @@
 /**
  * Dump provider which copies log files from data/log directory to
  * destination.
- * 
- * @author ldywicki
  */
 public class LogDumpProvider implements DumpProvider {
 
Index: diagnostic/common/src/main/java/org/apache/karaf/diagnostic/common/ThreadDumpProvider.java
===================================================================
--- diagnostic/common/src/main/java/org/apache/karaf/diagnostic/common/ThreadDumpProvider.java	(revision 1154936)
+++ diagnostic/common/src/main/java/org/apache/karaf/diagnostic/common/ThreadDumpProvider.java	(working copy)
@@ -23,9 +23,7 @@
 import org.apache.karaf.diagnostic.core.common.TextDumpProvider;
 
 /**
- * Provider which dumps thread info to file named threads.txt.
- * 
- * @author ldywicki
+ * Provider which dumps thread info to a file named threads.txt.
  */
 public class ThreadDumpProvider extends TextDumpProvider {
 
Index: diagnostic/common/src/main/java/org/apache/karaf/diagnostic/common/BundleDumpProvider.java
===================================================================
--- diagnostic/common/src/main/java/org/apache/karaf/diagnostic/common/BundleDumpProvider.java	(revision 1154936)
+++ diagnostic/common/src/main/java/org/apache/karaf/diagnostic/common/BundleDumpProvider.java	(working copy)
@@ -25,10 +25,8 @@
 import org.osgi.framework.BundleContext;
 
 /**
- * Dump provider which produces file named bundles.txt with list of
- * installed bundles and it's state.
- * 
- * @author ldywicki
+ * Dump provider which produces a file named bundles.txt with a list of
+ * installed bundles and their states.
  */
 public class BundleDumpProvider extends TextDumpProvider {
 
Index: diagnostic/core/src/main/java/org/apache/karaf/diagnostic/core/DumpProvider.java
===================================================================
--- diagnostic/core/src/main/java/org/apache/karaf/diagnostic/core/DumpProvider.java	(revision 1154936)
+++ diagnostic/core/src/main/java/org/apache/karaf/diagnostic/core/DumpProvider.java	(working copy)
@@ -16,10 +16,8 @@
 package org.apache.karaf.diagnostic.core;
 
 /**
- * Interface which represents instance of tool which can provide dump
+ * Interface which represents instance of a tool that provides dump
  * information.
- * 
- * @author ldywicki
  */
 public interface DumpProvider {
 
Index: diagnostic/core/src/main/java/org/apache/karaf/diagnostic/core/DumpDestination.java
===================================================================
--- diagnostic/core/src/main/java/org/apache/karaf/diagnostic/core/DumpDestination.java	(revision 1154936)
+++ diagnostic/core/src/main/java/org/apache/karaf/diagnostic/core/DumpDestination.java	(working copy)
@@ -19,8 +19,6 @@
 
 /**
  * Destination for created dumps.
- * 
- * @author ldywicki
  */
 public interface DumpDestination {
 
Index: diagnostic/core/src/main/java/org/apache/karaf/diagnostic/core/common/TextDumpProvider.java
===================================================================
--- diagnostic/core/src/main/java/org/apache/karaf/diagnostic/core/common/TextDumpProvider.java	(revision 1154936)
+++ diagnostic/core/src/main/java/org/apache/karaf/diagnostic/core/common/TextDumpProvider.java	(working copy)
@@ -22,9 +22,7 @@
 import org.apache.karaf.diagnostic.core.DumpProvider;
 
 /**
- * Base class for dump providers which writes text to destination.
- * 
- * @author ldywicki
+ * Base class for dump providers that write text to destination.
  */
 public abstract class TextDumpProvider implements DumpProvider {
 
@@ -52,10 +50,10 @@
     }
 
     /**
-     * This method should create output.
+     * This method should create the output.
      * 
-     * @param outputStreamWriter Stream which points to file specified in constructor.
-     * @throws Exception If any problem occur.
+     * @param outputStreamWriter Stream which points to the file specified in constructor.
+     * @throws Exception If any problem occurs.
      */
     protected abstract void writeDump(OutputStreamWriter outputStreamWriter) throws Exception;
 
Index: diagnostic/core/src/main/java/org/apache/karaf/diagnostic/core/common/ZipDumpDestination.java
===================================================================
--- diagnostic/core/src/main/java/org/apache/karaf/diagnostic/core/common/ZipDumpDestination.java	(revision 1154936)
+++ diagnostic/core/src/main/java/org/apache/karaf/diagnostic/core/common/ZipDumpDestination.java	(working copy)
@@ -26,8 +26,6 @@
 
 /**
  * Class which packages dumps to ZIP archive.
- * 
- * @author ldywicki
  */
 public class ZipDumpDestination implements DumpDestination {
 
Index: diagnostic/core/src/main/java/org/apache/karaf/diagnostic/core/common/DirectoryDumpDestination.java
===================================================================
--- diagnostic/core/src/main/java/org/apache/karaf/diagnostic/core/common/DirectoryDumpDestination.java	(revision 1154936)
+++ diagnostic/core/src/main/java/org/apache/karaf/diagnostic/core/common/DirectoryDumpDestination.java	(working copy)
@@ -22,9 +22,7 @@
 import org.apache.karaf.diagnostic.core.DumpDestination;
 
 /**
- * Class which packages dumps to given directory.
- * 
- * @author ldywicki
+ * Class which packages dumps to the given directory.
  */
 public class DirectoryDumpDestination implements DumpDestination {
 
Index: diagnostic/core/src/main/java/org/apache/karaf/diagnostic/core/common/ClosingEntryOutputStreamWrapper.java
===================================================================
--- diagnostic/core/src/main/java/org/apache/karaf/diagnostic/core/common/ClosingEntryOutputStreamWrapper.java	(revision 1154936)
+++ diagnostic/core/src/main/java/org/apache/karaf/diagnostic/core/common/ClosingEntryOutputStreamWrapper.java	(working copy)
@@ -20,9 +20,7 @@
 import java.util.zip.ZipOutputStream;
 
 /**
- * Output stream which closes entry instead closing whole stream.
- * 
- * @author ldywicki
+ * Output stream which closes an entry instead of the whole stream.
  */
 public class ClosingEntryOutputStreamWrapper extends OutputStream {
 
Index: diagnostic/management/src/main/java/org/apache/karaf/diagnostic/management/internal/DiagnosticDumpMBeanImpl.java
===================================================================
--- diagnostic/management/src/main/java/org/apache/karaf/diagnostic/management/internal/DiagnosticDumpMBeanImpl.java	(revision 1154936)
+++ diagnostic/management/src/main/java/org/apache/karaf/diagnostic/management/internal/DiagnosticDumpMBeanImpl.java	(working copy)
@@ -27,8 +27,6 @@
 
 /**
  * Implementation of diagnostic mbean.
- * 
- * @author ldywicki
  */
 public class DiagnosticDumpMBeanImpl extends StandardMBean implements 
     DiagnosticDumpMBean {
@@ -48,7 +46,7 @@
     }
 
     /**
-     * Creates dump witch given name
+     * Creates dump with the given name
      * 
      * @param name Name of the dump.
      */
Index: diagnostic/management/src/main/java/org/apache/karaf/diagnostic/management/DiagnosticDumpMBean.java
===================================================================
--- diagnostic/management/src/main/java/org/apache/karaf/diagnostic/management/DiagnosticDumpMBean.java	(revision 1154936)
+++ diagnostic/management/src/main/java/org/apache/karaf/diagnostic/management/DiagnosticDumpMBean.java	(working copy)
@@ -16,9 +16,7 @@
 package org.apache.karaf.diagnostic.management;
 
 /**
- * Diagnostic MBean which allows to create dumps over JMX.
- * 
- * @author ldywicki
+ * Diagnostic MBean which allows for creating dumps using JMX.
  */
 public interface DiagnosticDumpMBean {
 
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 1154936)
+++ diagnostic/command/src/main/java/org/apache/karaf/diagnostic/command/DumpCommand.java	(working copy)
@@ -33,8 +33,6 @@
 
 /**
  * Command to create dump from shell.
- * 
- * @author ldywicki
  */
 @Command(scope = "dev", name = "create-dump", description = "Creates zip archive with diagnostic info.")
 public class DumpCommand extends OsgiCommandSupport {
Index: admin/command/src/main/java/org/apache/karaf/admin/command/RenameCommand.java
===================================================================
--- admin/command/src/main/java/org/apache/karaf/admin/command/RenameCommand.java	(revision 1154936)
+++ admin/command/src/main/java/org/apache/karaf/admin/command/RenameCommand.java	(working copy)
@@ -23,8 +23,6 @@
  * <p>
  * Rename an existing Karaf container instance.
  * </p>
- *
- * @author jbonofre
  */
 @Command(scope = "admin", name = "rename", description = "Renames an existing container instance.")
 public class RenameCommand extends AdminCommandSupport {
Index: webconsole/http/src/main/java/org/apache/karaf/webconsole/http/ServletDetails.java
===================================================================
--- webconsole/http/src/main/java/org/apache/karaf/webconsole/http/ServletDetails.java	(revision 1154936)
+++ webconsole/http/src/main/java/org/apache/karaf/webconsole/http/ServletDetails.java	(working copy)
@@ -15,10 +15,6 @@
  */
 package org.apache.karaf.webconsole.http;
 
-/**
- *
- * @author njt
- */
 public class ServletDetails
 {
     private long  id;
Index: webconsole/http/src/main/java/org/apache/karaf/webconsole/http/WebEventHandler.java
===================================================================
--- webconsole/http/src/main/java/org/apache/karaf/webconsole/http/WebEventHandler.java	(revision 1154936)
+++ webconsole/http/src/main/java/org/apache/karaf/webconsole/http/WebEventHandler.java	(working copy)
@@ -23,10 +23,6 @@
 import org.ops4j.pax.web.service.spi.WebEvent;
 import org.ops4j.pax.web.service.spi.WebListener;
 
-/**
- * @author Achim
- *
- */
 public class WebEventHandler implements WebListener {
 
 	private final Map<Long, WebEvent> bundleEvents = new HashMap<Long, WebEvent>();
Index: shell/commands/src/main/java/org/apache/karaf/shell/commands/info/InfoBundleTrackerCustomizer.java
===================================================================
--- shell/commands/src/main/java/org/apache/karaf/shell/commands/info/InfoBundleTrackerCustomizer.java	(revision 1154936)
+++ shell/commands/src/main/java/org/apache/karaf/shell/commands/info/InfoBundleTrackerCustomizer.java	(working copy)
@@ -29,7 +29,6 @@
 import java.util.StringTokenizer;
 
 /**
- * @author splatch
  *         Bundle tracker which check manifest headers for informations.
  */
 public class InfoBundleTrackerCustomizer implements BundleTrackerCustomizer {
Index: shell/commands/src/main/java/org/apache/karaf/shell/commands/info/PojoInfoProvider.java
===================================================================
--- shell/commands/src/main/java/org/apache/karaf/shell/commands/info/PojoInfoProvider.java	(revision 1154936)
+++ shell/commands/src/main/java/org/apache/karaf/shell/commands/info/PojoInfoProvider.java	(working copy)
@@ -2,9 +2,6 @@
 
 import java.util.Properties;
 
-/**
- * @author: splatch
- */
 public class PojoInfoProvider implements InfoProvider {
 	private String name;
 	private Properties properties;
Index: shell/log/src/main/java/org/apache/karaf/shell/log/layout/ISO8601DateFormat.java
===================================================================
--- shell/log/src/main/java/org/apache/karaf/shell/log/layout/ISO8601DateFormat.java	(revision 1154936)
+++ shell/log/src/main/java/org/apache/karaf/shell/log/layout/ISO8601DateFormat.java	(working copy)
@@ -35,9 +35,6 @@
    International Standard Date and Time Notation</a> for more
    information on this format.
 
-   @author Ceki G&uuml;lc&uuml;
-   @author Andrew Vajoczki
-
    @since 0.7.5
 */
 public class ISO8601DateFormat extends AbsoluteTimeDateFormat {
Index: shell/log/src/main/java/org/apache/karaf/shell/log/layout/DateTimeDateFormat.java
===================================================================
--- shell/log/src/main/java/org/apache/karaf/shell/log/layout/DateTimeDateFormat.java	(revision 1154936)
+++ shell/log/src/main/java/org/apache/karaf/shell/log/layout/DateTimeDateFormat.java	(working copy)
@@ -30,7 +30,6 @@
    Formats a {@link Date} in the format "dd MMM yyyy HH:mm:ss,SSS" for example,
    "06 Nov 1994 15:49:37,459".
 
-   @author Ceki G&uuml;lc&uuml;
    @since 0.7.5
 */
 public class DateTimeDateFormat extends AbsoluteTimeDateFormat {
Index: shell/log/src/main/java/org/apache/karaf/shell/log/layout/AbsoluteTimeDateFormat.java
===================================================================
--- shell/log/src/main/java/org/apache/karaf/shell/log/layout/AbsoluteTimeDateFormat.java	(revision 1154936)
+++ shell/log/src/main/java/org/apache/karaf/shell/log/layout/AbsoluteTimeDateFormat.java	(working copy)
@@ -30,9 +30,6 @@
    Formats a {@link Date} in the format "HH:mm:ss,SSS" for example,
    "15:49:37,459".
 
-   @author Ceki G&uuml;lc&uuml;
-   @author Andrew Vajoczki
-
    @since 0.7.5
 */
 public class AbsoluteTimeDateFormat extends DateFormat {
Index: shell/log/src/main/java/org/apache/karaf/shell/log/layout/PatternConverter.java
===================================================================
--- shell/log/src/main/java/org/apache/karaf/shell/log/layout/PatternConverter.java	(revision 1154936)
+++ shell/log/src/main/java/org/apache/karaf/shell/log/layout/PatternConverter.java	(working copy)
@@ -27,9 +27,6 @@
    individual PatternConverters. Each of which is responsible for
    converting a logging event in a converter specific manner.
 
-   @author <a href="mailto:cakalijp@Maritz.com">James P. Cakalic</a>
-   @author Ceki G&uuml;lc&uuml;
-
    @since 0.8.2
  */
 public abstract class PatternConverter {
Index: shell/log/src/main/java/org/apache/karaf/shell/log/layout/FormattingInfo.java
===================================================================
--- shell/log/src/main/java/org/apache/karaf/shell/log/layout/FormattingInfo.java	(revision 1154936)
+++ shell/log/src/main/java/org/apache/karaf/shell/log/layout/FormattingInfo.java	(working copy)
@@ -24,9 +24,6 @@
    FormattingInfo instances contain the information obtained when parsing
    formatting modifiers in conversion modifiers.
 
-   @author <a href=mailto:jim_cakalic@na.biomerieux.com>Jim Cakalic</a>
-   @author Ceki G&uuml;lc&uuml;
-
    @since 0.8.2
  */
 public class FormattingInfo {
Index: shell/log/src/main/java/org/apache/karaf/shell/log/layout/PatternParser.java
===================================================================
--- shell/log/src/main/java/org/apache/karaf/shell/log/layout/PatternParser.java	(revision 1154936)
+++ shell/log/src/main/java/org/apache/karaf/shell/log/layout/PatternParser.java	(working copy)
@@ -36,10 +36,6 @@
    Most of the work of the {@link org.apache.log4j.PatternLayout} class
    is delegated to the PatternParser class.
 
-   @author <a href=mailto:"cakalijp@Maritz.com">James P. Cakalic</a>
-   @author Ceki G&uuml;lc&uuml;
-   @author Anders Kristensen
-
    @since 0.8.2
 */
 public class PatternParser {
Index: shell/console/src/test/java/org/apache/karaf/shell/console/ExampleSubclassMain.java
===================================================================
--- shell/console/src/test/java/org/apache/karaf/shell/console/ExampleSubclassMain.java	(revision 1154936)
+++ shell/console/src/test/java/org/apache/karaf/shell/console/ExampleSubclassMain.java	(working copy)
@@ -25,12 +25,10 @@
 
 /**
  * <p>
- * This class is mostly here so that folks can see an example of how you can extend the Karaf Main shell.  Also
- * lets Karaf developers see how changes the Main class can affect the interface comparability
+ * This class is mostly here so that folks can see an example of how the Karaf main shell can be extended.
+ * This also lets Karaf developers see how changes the Main class can affect interface comparability
  * with sub classes.
  * </p>
- *
- * @author <a href="http://hiramchirino.com">Hiram Chirino</a>
  */
 public class ExampleSubclassMain extends Main  {
 
@@ -50,7 +48,7 @@
         return new Console(commandProcessor, in, out, err, terminal, null) {
 
             /**
-             * If you don't overwrite, then karaf will use the welcome message found in the
+             * If you don't overwrite, then Karaf will use the welcome message found in the
              * following resource files:
              * <ul>
              *   <li>org/apache/karaf/shell/console/branding.properties</li>
Index: shell/console/src/main/java/jline/console/ConsoleReader.java
===================================================================
--- shell/console/src/main/java/jline/console/ConsoleReader.java	(revision 1154936)
+++ shell/console/src/main/java/jline/console/ConsoleReader.java	(working copy)
@@ -56,8 +56,6 @@
  * function properly. See {@link jline.Terminal#init} for convenience
  * methods for issuing platform-specific setup commands.
  *
- * @author <a href="mailto:mwp1@cornell.edu">Marc Prud'hommeaux</a>
- * @author <a href="mailto:jason@planet57.com">Jason Dillon</a>
  */
 public class ConsoleReader {
 
Index: shell/console/src/main/java/org/apache/karaf/shell/console/table/Cell.java
===================================================================
--- shell/console/src/main/java/org/apache/karaf/shell/console/table/Cell.java	(revision 1154936)
+++ shell/console/src/main/java/org/apache/karaf/shell/console/table/Cell.java	(working copy)
@@ -17,8 +17,6 @@
 
 /**
  * Cell information.
- * 
- * @author ldywicki
  */
 public class Cell extends TableElement {
 
Index: shell/console/src/main/java/org/apache/karaf/shell/console/table/Style.java
===================================================================
--- shell/console/src/main/java/org/apache/karaf/shell/console/table/Style.java	(revision 1154936)
+++ shell/console/src/main/java/org/apache/karaf/shell/console/table/Style.java	(working copy)
@@ -22,8 +22,6 @@
 
 /**
  * Class which covers {@link org.fusesource.jansi.Ansi} class with standard fluent-api.
- * 
- * @author ldywicki
  */
 public class Style {
 
Index: shell/console/src/main/java/org/apache/karaf/shell/console/table/DataTable.java
===================================================================
--- shell/console/src/main/java/org/apache/karaf/shell/console/table/DataTable.java	(revision 1154936)
+++ shell/console/src/main/java/org/apache/karaf/shell/console/table/DataTable.java	(working copy)
@@ -25,18 +25,18 @@
 /**
  * Simple data table.
  *
- * This class contains set of formatting code needed to print tabular data in console. There are two ways to construct
- * table.
+ * This class contains a set of formatting codes needed to print tabular data in the console. 
+ * There are two ways to construct a table:
  * 1) Provide output and number of columns
  * 2) Provide output and manually configure columns
- * First way is very fast and takes small amount of code, but you cannot configure column behavior. All columns will be
- * expandable and aligned to left side.
+ * The first way is very fast and takes only a small amount of code, but you cannot configure column behavior. 
+ * All columns will be expandable and aligned to left side.
  * Second way takes more code but allows you to control column format.
  *
  * To avoid performance issues data table flushes output once per 10 rows. If you wish to change this - just set value
  * for flushAfter field.
- * Important notice - last column always don't have borders. It is designed to put mark last column as expandable and
- * put there longer values.
+ * Important notice - last column doesn't always have borders. It is designed to mark the last column as expandable and
+ * put longer values there.
  *
  * Code samples:
  * <code>
@@ -79,9 +79,7 @@
  * [2  ][2    ][2           ][2           ][2    ] 2
  * [3  ][3    ][3           ][3           ][3    ] 3
  * [4  ][4    ][4           ][4           ][4    ] 4
- * </code>
- * 
- * @author ldywicki
+ * </code> 
  */
 public class DataTable extends TableElement {
 
Index: shell/console/src/main/java/org/apache/karaf/shell/console/table/TableElement.java
===================================================================
--- shell/console/src/main/java/org/apache/karaf/shell/console/table/TableElement.java	(revision 1154936)
+++ shell/console/src/main/java/org/apache/karaf/shell/console/table/TableElement.java	(working copy)
@@ -17,8 +17,6 @@
 
 /**
  * Table element.
- * 
- * @author ldywicki
  */
 public class TableElement {
 
Index: shell/console/src/main/java/org/apache/karaf/shell/console/table/HAlign.java
===================================================================
--- shell/console/src/main/java/org/apache/karaf/shell/console/table/HAlign.java	(revision 1154936)
+++ shell/console/src/main/java/org/apache/karaf/shell/console/table/HAlign.java	(working copy)
@@ -19,8 +19,6 @@
 
 /**
  * Enumeration type which contains all possible horizontal alignments.
- * 
- * @author ldywicki
  */
 public enum HAlign {
 
Index: shell/console/src/main/java/org/apache/karaf/shell/console/table/Row.java
===================================================================
--- shell/console/src/main/java/org/apache/karaf/shell/console/table/Row.java	(revision 1154936)
+++ shell/console/src/main/java/org/apache/karaf/shell/console/table/Row.java	(working copy)
@@ -20,8 +20,6 @@
 
 /**
  * Row information.
- * 
- * @author ldywicki
  */
 public class Row extends TableElement {
 
Index: shell/console/src/main/java/org/apache/karaf/shell/console/table/StyleCalculator.java
===================================================================
--- shell/console/src/main/java/org/apache/karaf/shell/console/table/StyleCalculator.java	(revision 1154936)
+++ shell/console/src/main/java/org/apache/karaf/shell/console/table/StyleCalculator.java	(working copy)
@@ -17,8 +17,6 @@
 
 /**
  * Dynamic style calculator.
- * 
- * @author ldywicki
  */
 public interface StyleCalculator {
 
Index: shell/console/src/main/java/org/apache/karaf/shell/console/table/Column.java
===================================================================
--- shell/console/src/main/java/org/apache/karaf/shell/console/table/Column.java	(revision 1154936)
+++ shell/console/src/main/java/org/apache/karaf/shell/console/table/Column.java	(working copy)
@@ -17,8 +17,6 @@
 
 /**
  * Column definition.
- * 
- * @author ldywicki
  */
 public class Column extends TableElement {
 
Index: shell/console/src/main/java/org/apache/karaf/shell/console/completer/ArgumentCompleter.java
===================================================================
--- shell/console/src/main/java/org/apache/karaf/shell/console/completer/ArgumentCompleter.java	(revision 1154936)
+++ shell/console/src/main/java/org/apache/karaf/shell/console/completer/ArgumentCompleter.java	(working copy)
@@ -335,7 +335,6 @@
     /**
      *  The result of a delimited buffer.
      *
-     *  @author  <a href="mailto:mwp1@cornell.edu">Marc Prud'hommeaux</a>
      */
     public static class ArgumentList {
         private String[] arguments;
Index: shell/ssh/src/main/java/org/apache/karaf/shell/ssh/KarafJaasPasswordAuthenticator.java
===================================================================
--- shell/ssh/src/main/java/org/apache/karaf/shell/ssh/KarafJaasPasswordAuthenticator.java	(revision 1154936)
+++ shell/ssh/src/main/java/org/apache/karaf/shell/ssh/KarafJaasPasswordAuthenticator.java	(working copy)
@@ -38,8 +38,6 @@
 
 /**
  * TODO Add javadoc
- *
- * @author <a href="mailto:dev@mina.apache.org">Apache MINA SSHD Project</a>
  */
 public class KarafJaasPasswordAuthenticator implements PasswordAuthenticator {
 
Index: demos/dump/src/main/java/org/apache/karaf/diagnostic/demo/ScreenshotDumpProvider.java
===================================================================
--- demos/dump/src/main/java/org/apache/karaf/diagnostic/demo/ScreenshotDumpProvider.java	(revision 1154936)
+++ demos/dump/src/main/java/org/apache/karaf/diagnostic/demo/ScreenshotDumpProvider.java	(working copy)
@@ -31,8 +31,6 @@
 /**
  * This demo provider creates images in dump destination which
  * contains screenshots from all attached displays.
- * 
- * @author ldywicki
  */
 public class ScreenshotDumpProvider implements DumpProvider {
 
Index: tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/ResolutionListenerImpl.java
===================================================================
--- tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/ResolutionListenerImpl.java	(revision 1154936)
+++ tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/ResolutionListenerImpl.java	(working copy)
@@ -29,8 +29,7 @@
 import org.apache.maven.plugin.logging.Log;
 
 /**
- * @author Edwin Punzalan
- * @version $Revision: 1.1 $
+ * @version $Revision$
  */
 public class ResolutionListenerImpl implements ResolutionListener {
     private Stack parents = new Stack();
Index: tooling/testing/src/main/java/org/apache/karaf/testing/HeaderParser.java
===================================================================
--- tooling/testing/src/main/java/org/apache/karaf/testing/HeaderParser.java	(revision 1154936)
+++ tooling/testing/src/main/java/org/apache/karaf/testing/HeaderParser.java	(working copy)
@@ -31,7 +31,6 @@
 /**
  * Utility class to parse a standard OSGi header with paths.
  *
- * @author <a href="mailto:dev@geronimo.apache.org">Apache Geronimo Project</a>
  * @version $Rev: 786132 $, $Date: 2009-06-18 17:47:58 +0200 (Thu, 18 Jun 2009) $
  */
 public final class HeaderParser  {
Index: management/src/main/java/org/apache/karaf/management/RmiRegistryFactory.java
===================================================================
--- management/src/main/java/org/apache/karaf/management/RmiRegistryFactory.java	(revision 1154936)
+++ management/src/main/java/org/apache/karaf/management/RmiRegistryFactory.java	(working copy)
@@ -21,10 +21,6 @@
 import java.rmi.registry.Registry;
 import java.rmi.server.UnicastRemoteObject;
 
-/**
- * 
- * @author gnodet
- */
 public class RmiRegistryFactory {
 
     private int port = Registry.REGISTRY_PORT;
Index: util/src/main/java/org/apache/karaf/util/DeployerUtils.java
===================================================================
--- util/src/main/java/org/apache/karaf/util/DeployerUtils.java	(revision 1154936)
+++ util/src/main/java/org/apache/karaf/util/DeployerUtils.java	(working copy)
@@ -21,8 +21,6 @@
 
 /**
  * Contain various methods that are useful for deploying artifacts
- *
- * @author gnodet
  */
 public final class DeployerUtils {
 
Index: util/src/main/java/org/apache/karaf/util/StringEscapeUtils.java
===================================================================
--- util/src/main/java/org/apache/karaf/util/StringEscapeUtils.java	(revision 1154936)
+++ util/src/main/java/org/apache/karaf/util/StringEscapeUtils.java	(working copy)
@@ -22,8 +22,6 @@
  * <p>
  * Util class to manipulate String, especially around escape/unescape.
  * </p>
- *
- * @author gnodet, jbonofre
  */
 public class StringEscapeUtils {
 
Index: features/core/src/main/java/org/apache/karaf/features/internal/FeatureValidationUtil.java
===================================================================
--- features/core/src/main/java/org/apache/karaf/features/internal/FeatureValidationUtil.java	(revision 1154936)
+++ features/core/src/main/java/org/apache/karaf/features/internal/FeatureValidationUtil.java	(working copy)
@@ -33,9 +33,7 @@
 import org.w3c.dom.Document;
 
 /**
- * Utility class which fires XML Schema validation.
- * 
- * @author ldywicki
+ * Utility class which activates XML Schema validation.
  */
 public class FeatureValidationUtil {
     private static final Logger log = LoggerFactory.getLogger(FeatureValidationUtil.class);
Index: jaas/jasypt/src/test/java/org/apache/karaf/jaas/jasypt/impl/JasyptEncryptionTest.java
===================================================================
--- jaas/jasypt/src/test/java/org/apache/karaf/jaas/jasypt/impl/JasyptEncryptionTest.java	(revision 1154936)
+++ jaas/jasypt/src/test/java/org/apache/karaf/jaas/jasypt/impl/JasyptEncryptionTest.java	(working copy)
@@ -24,8 +24,6 @@
  * <p>
  * Test <code>JasyptEncryption</code>.
  * </p>
- * 
- * @author jbonofre
  */
 public class JasyptEncryptionTest extends TestCase {
     
Index: jaas/jasypt/src/main/java/org/apache/karaf/jaas/jasypt/impl/JasyptEncryption.java
===================================================================
--- jaas/jasypt/src/main/java/org/apache/karaf/jaas/jasypt/impl/JasyptEncryption.java	(revision 1154936)
+++ jaas/jasypt/src/main/java/org/apache/karaf/jaas/jasypt/impl/JasyptEncryption.java	(working copy)
@@ -42,8 +42,6 @@
  * <p>
  * Jasypt implementation of the Encryption service.
  * </p>
- * 
- * @author jbonofre
  */
 public class JasyptEncryption implements Encryption {