Index: main/src/main/java/org/apache/karaf/main/Main.java =================================================================== --- main/src/main/java/org/apache/karaf/main/Main.java (revision 1148938) +++ main/src/main/java/org/apache/karaf/main/Main.java (working copy) @@ -136,8 +136,8 @@ private static final String BUNDLE_LOCATIONS = "bundle.locations"; /** - * Config property that indicates we want to convert bundles locations to - * maven style urls + * Config property that indicates we want to convert bundle locations to + * Maven style urls */ private static final String PROPERTY_CONVERT_TO_MAVEN_URL = "karaf.maven.convert"; Index: admin/command/src/main/java/org/apache/karaf/admin/command/CloneCommand.java =================================================================== --- admin/command/src/main/java/org/apache/karaf/admin/command/CloneCommand.java (revision 1148938) +++ admin/command/src/main/java/org/apache/karaf/admin/command/CloneCommand.java (working copy) @@ -38,16 +38,16 @@ @Option(name = "-rs", aliases = {"--rmi-server-port"}, description = "Port number for RMI server connection", required = false, multiValued = false) int rmiServerPort = 0; - @Option(name = "-l", aliases = {"--location"}, description = "Location of the clone container instance in the file system", required = false, multiValued = false) + @Option(name = "-l", aliases = {"--location"}, description = "Location of the cloned container instance in the file system", required = false, multiValued = false) String location; - @Option(name = "-o", aliases = {"--java-opts"}, description = "JVM options to use when launching the clone instance", required = false, multiValued = false) + @Option(name = "-o", aliases = {"--java-opts"}, description = "JVM options to use when launching the cloned instance", required = false, multiValued = false) String javaOpts; @Argument(index = 0, name = "name", description = "The name of the source container instance", required = true, multiValued = false) String name; - @Argument(index = 1, name = "cloneName", description = "The name of the clone container instance", required = true, multiValued = false) + @Argument(index = 1, name = "cloneName", description = "The name of the cloned container instance", required = true, multiValued = false) String cloneName; protected Object doExecute() throws Exception { Index: shell/wrapper/src/main/java/org/apache/karaf/shell/wrapper/InstallCommand.java =================================================================== --- shell/wrapper/src/main/java/org/apache/karaf/shell/wrapper/InstallCommand.java (revision 1148938) +++ shell/wrapper/src/main/java/org/apache/karaf/shell/wrapper/InstallCommand.java (working copy) @@ -139,7 +139,7 @@ createJar(new File(lib, "karaf-wrapper-main.jar"), "org/apache/karaf/shell/wrapper/Main.class"); System.out.println(""); - System.out.println("Setup complete. You may want to tweak the JVM properties in the wrapper configuration file:"); + System.out.println("Setup complete. You may wish to tweak the JVM properties in the wrapper configuration file:"); System.out.println("\t" + wrapperConf.getPath()); System.out.println("before installing and starting the service."); System.out.println(""); @@ -307,7 +307,7 @@ } else { System.out.println(Ansi.ansi() .fg(Ansi.Color.RED).a("File already exists").a(Ansi.Attribute.RESET) - .a(". Move it out of the way if you want it re-created: ").a(outFile.getPath()).toString()); + .a(". Move it out of the way if you wish to re-create it: ").a(outFile.getPath()).toString()); } } @@ -335,7 +335,7 @@ } else { System.out.println(Ansi.ansi() .fg(Ansi.Color.RED).a("File already exists").a(Ansi.Attribute.RESET) - .a(". Move it out of the way if you want it re-created: ").a(outFile.getPath()).toString()); + .a(". Move it out of the way if you wish to recreate it: ").a(outFile.getPath()).toString()); } } Index: shell/commands/src/main/java/org/apache/karaf/shell/commands/CatAction.java =================================================================== --- shell/commands/src/main/java/org/apache/karaf/shell/commands/CatAction.java (revision 1148938) +++ shell/commands/src/main/java/org/apache/karaf/shell/commands/CatAction.java (working copy) @@ -38,10 +38,10 @@ @Command(scope = "shell", name = "cat", description = "Displays the content of a file or URL.") public class CatAction extends AbstractAction { - @Option(name = "-n", aliases = {}, description = "The number the output lines, starting at 1.", required = false, multiValued = false) + @Option(name = "-n", aliases = {}, description = "Number the output lines, starting at 1.", required = false, multiValued = false) private boolean displayLineNumbers; - @Argument(index = 0, name = "paths or urls", description = "A list of file paths or urls to display separated by whitespaces (use - for STDIN)", required = true, multiValued = true) + @Argument(index = 0, name = "paths or urls", description = "A list of file paths or urls to display separated by whitespace (use - for STDIN)", required = true, multiValued = true) private List paths; protected Object doExecute() throws Exception { Index: shell/osgi/src/main/java/org/apache/karaf/shell/osgi/BundleLevel.java =================================================================== --- shell/osgi/src/main/java/org/apache/karaf/shell/osgi/BundleLevel.java (revision 1148938) +++ shell/osgi/src/main/java/org/apache/karaf/shell/osgi/BundleLevel.java (working copy) @@ -25,7 +25,7 @@ @Command(scope = "osgi", name = "bundle-level", description = "Gets or sets the start level of a given bundle.") public class BundleLevel extends BundleCommand { - @Argument(index = 1, name = "startLevel", description = "The bundles new start level", required = false, multiValued = false) + @Argument(index = 1, name = "startLevel", description = "The bundle's new start level", required = false, multiValued = false) Integer level; protected void doExecute(Bundle bundle) throws Exception { @@ -47,7 +47,7 @@ else if ((level < 50) && sl.getBundleStartLevel(bundle) > 50){ for (;;) { StringBuffer sb = new StringBuffer(); - System.err.println("You are about to designate bundle as a system bundle. Do you want to continue (yes/no): "); + System.err.println("You are about to designate bundle as a system bundle. Do you wish to continue (yes/no): "); System.err.flush(); for (;;) { int c = System.in.read(); Index: shell/osgi/src/main/java/org/apache/karaf/shell/osgi/Shutdown.java =================================================================== --- shell/osgi/src/main/java/org/apache/karaf/shell/osgi/Shutdown.java (revision 1148938) +++ shell/osgi/src/main/java/org/apache/karaf/shell/osgi/Shutdown.java (working copy) @@ -78,7 +78,7 @@ for (; ; ) { StringBuffer sb = new StringBuffer(); - System.err.println("Do you really want to shutdown (yes/no): "); + System.err.println("Confirm: shutdown instance (yes/no): "); System.err.flush(); for (; ; ) { int c = session.getKeyboard().read(); Index: shell/osgi/src/main/java/org/apache/karaf/shell/osgi/Util.java =================================================================== --- shell/osgi/src/main/java/org/apache/karaf/shell/osgi/Util.java (revision 1148938) +++ shell/osgi/src/main/java/org/apache/karaf/shell/osgi/Util.java (working copy) @@ -208,7 +208,7 @@ public static boolean accessToSystemBundleIsAllowed(long bundleId, CommandSession session) throws IOException { for (;;) { StringBuffer sb = new StringBuffer(); - System.err.print("You are about to access system bundle " + bundleId + ". Do you want to continue (yes/no): "); + System.err.print("You are about to access system bundle " + bundleId + ". Do you wish to continue (yes/no): "); System.err.flush(); for (;;) { int c = session.getKeyboard().read(); Index: shell/console/src/main/java/jline/console/ConsoleReader.java =================================================================== --- shell/console/src/main/java/jline/console/ConsoleReader.java (revision 1148938) +++ shell/console/src/main/java/jline/console/ConsoleReader.java (working copy) @@ -626,8 +626,9 @@ } /** - * Flush the console output stream. This is important for printout out single characters (like a backspace or - * keyboard) that we want the console to handle immediately. + * Flush the console output stream. This is important for printing out out single characters + * (like the keyboard backspace key) that we want the console to handle immediately. + * */ public void flush() throws IOException { out.flush(); @@ -1818,9 +1819,9 @@ private final Map triggeredActions = new HashMap(); /** - * Adding a triggered Action allows to give another curse of action if a character passed the pre-processing. + * Adding a triggered Action allows for another course of action if a character passed the pre-processing. *

- * Say you want to close the application if the user enter q. + * Say you wish to close the application if the user enters q. * addTriggerAction('q', new ActionListener(){ System.exit(0); }); would do the trick. */ public void addTriggeredAction(final char c, final ActionListener listener) { @@ -1884,7 +1885,7 @@ } } - // NOTE: toString() is important here due to AnsiString being retarded + // NOTE: toString() is important here due to hiccups with AnsiString buff.append(item.toString()); for (int i = 0; i < (maxWidth + 3 - item.length()); i++) { buff.append(' '); @@ -1952,7 +1953,7 @@ * @param buffer * the buffer to be drawn * @param cursorDest - * where you want the cursor set when the line has been drawn. + * where you wish to have the cursor set when the line has been drawn. * -1 for end of line. * */ public void resetPromptLine(String prompt, String buffer, int cursorDest) throws IOException { Index: shell/config/src/main/java/org/apache/karaf/shell/config/UpdateCommand.java =================================================================== --- shell/config/src/main/java/org/apache/karaf/shell/config/UpdateCommand.java (revision 1148938) +++ shell/config/src/main/java/org/apache/karaf/shell/config/UpdateCommand.java (working copy) @@ -48,7 +48,7 @@ protected void doExecute(ConfigurationAdmin admin) throws Exception { Dictionary props = getEditedProps(); if (props == null) { - System.err.println("No configuration is being edited. Run the edit command first"); + System.err.println("No configuration is being edited--run the edit command first."); return; } Index: shell/config/src/main/java/org/apache/karaf/shell/config/PropDelCommand.java =================================================================== --- shell/config/src/main/java/org/apache/karaf/shell/config/PropDelCommand.java (revision 1148938) +++ shell/config/src/main/java/org/apache/karaf/shell/config/PropDelCommand.java (working copy) @@ -22,7 +22,7 @@ import org.apache.felix.gogo.commands.Command; import org.osgi.service.cm.ConfigurationAdmin; -@Command(scope = "config", name = "propdel", description = "Deletes a property from the edited configuration.") +@Command(scope = "config", name = "propdel", description = "Deletes a property from the configuration being edited.") public class PropDelCommand extends ConfigCommandSupport { @Argument(index = 0, name = "property", description = "The name of the property to delete", required = true, multiValued = false) @@ -31,7 +31,7 @@ protected void doExecute(ConfigurationAdmin admin) throws Exception { Dictionary props = getEditedProps(); if (props == null) { - System.err.println("No configuration is being edited. Run the edit command first"); + System.err.println("No configuration is being edited--run the edit command first."); } else { props.remove(prop); } Index: shell/config/src/main/java/org/apache/karaf/shell/config/PropAppendCommand.java =================================================================== --- shell/config/src/main/java/org/apache/karaf/shell/config/PropAppendCommand.java (revision 1148938) +++ shell/config/src/main/java/org/apache/karaf/shell/config/PropAppendCommand.java (working copy) @@ -38,7 +38,7 @@ protected void doExecute(ConfigurationAdmin admin) throws Exception { Dictionary props = getEditedProps(); if (props == null) { - System.err.println("No configuration is being edited. Run the edit command first"); + System.err.println("No configuration is being edited--run the edit command first."); } else { final Object currentValue = props.get(prop); if (currentValue == null) { Index: shell/config/src/main/java/org/apache/karaf/shell/config/PropListCommand.java =================================================================== --- shell/config/src/main/java/org/apache/karaf/shell/config/PropListCommand.java (revision 1148938) +++ shell/config/src/main/java/org/apache/karaf/shell/config/PropListCommand.java (working copy) @@ -28,7 +28,7 @@ protected void doExecute(ConfigurationAdmin admin) throws Exception { Dictionary props = getEditedProps(); if (props == null) { - System.err.println("No configuration is being edited. Run the edit command first"); + System.err.println("No configuration is being edited--run the edit command first."); } else { for (Enumeration e = props.keys(); e.hasMoreElements();) { Object key = e.nextElement();