diff --git a/core/src/main/java/hudson/FilePath.java b/core/src/main/java/hudson/FilePath.java index 6d863c547c..80a1ffb42f 100644 --- a/core/src/main/java/hudson/FilePath.java +++ b/core/src/main/java/hudson/FilePath.java @@ -147,7 +147,7 @@ public final class FilePath { } /** - * {@link FilePath} constant that can be used if the directory is not importatn. + * {@link FilePath} constant that can be used if the directory is not important. */ public static final FilePath RANDOM = new FilePath(new File(".")); } diff --git a/core/src/main/java/hudson/Launcher.java b/core/src/main/java/hudson/Launcher.java index 2c31475e76..9e1bb47914 100644 --- a/core/src/main/java/hudson/Launcher.java +++ b/core/src/main/java/hudson/Launcher.java @@ -19,7 +19,7 @@ import java.util.Map; *

'env' parameter

*

* To allow important environment variables to be copied over to the remote machine, - * the 'env' parameter shouldn't contain default inherited environment varialbles + * the 'env' parameter shouldn't contain default inherited environment variables * (which often contains machine-specific information, like PATH, TIMEZONE, etc.) * *

diff --git a/core/src/main/java/hudson/PluginManager.java b/core/src/main/java/hudson/PluginManager.java index 5a6fc787a0..8fc669729e 100644 --- a/core/src/main/java/hudson/PluginManager.java +++ b/core/src/main/java/hudson/PluginManager.java @@ -44,7 +44,7 @@ public final class PluginManager { * (and including the classloader that loads Hudson itself.) * */ - // implementation is minmal --- just enough to run XStream + // implementation is minimal --- just enough to run XStream // and load plugin-contributed classes. public final ClassLoader uberClassLoader = new UberClassLoader(); diff --git a/core/src/main/java/hudson/Util.java b/core/src/main/java/hudson/Util.java index fd48e941e4..afe98b2c29 100644 --- a/core/src/main/java/hudson/Util.java +++ b/core/src/main/java/hudson/Util.java @@ -34,7 +34,7 @@ import org.apache.tools.ant.BuildException; public class Util { /** - * Replaces the occurence of '$key' by properties.get('key'). + * Replaces the occurrence of '$key' by properties.get('key'). * *

* This is a rather naive implementation that causes somewhat unexpected @@ -245,7 +245,7 @@ public class Util { } /** - * Combines numer and unit, with a plural suffix if needed. + * Combines number and unit, with a plural suffix if needed. */ public static String combine(long n, String suffix) { String s = Long.toString(n)+' '+suffix; diff --git a/core/src/main/java/hudson/WebAppMain.java b/core/src/main/java/hudson/WebAppMain.java index 362f4a0305..bc9924c3d3 100644 --- a/core/src/main/java/hudson/WebAppMain.java +++ b/core/src/main/java/hudson/WebAppMain.java @@ -45,7 +45,7 @@ public class WebAppMain implements ServletContextListener { ServletContext context = event.getServletContext(); - // make sure that we are using XStream in the "enhenced" (JVM-specific) mode + // make sure that we are using XStream in the "enhanced" (JVM-specific) mode if(new JVM().bestReflectionProvider().getClass()==PureJavaReflectionProvider.class) { // nope context.setAttribute("app",new IncompatibleVMDetected()); @@ -154,7 +154,7 @@ public class WebAppMain implements ServletContextListener { if(root!=null) { File ws = new File(root.trim()); if(ws.exists()) - // Hudson <1.42 used to prefer this betfore ~/.hudson, so + // Hudson <1.42 used to prefer this before ~/.hudson, so // check the existence and if it's there, use it. // otherwise if this is a new installation, prefer ~/.hudson return ws.getAbsoluteFile(); diff --git a/core/src/main/java/hudson/XmlFile.java b/core/src/main/java/hudson/XmlFile.java index 1ec525456f..1591df670a 100644 --- a/core/src/main/java/hudson/XmlFile.java +++ b/core/src/main/java/hudson/XmlFile.java @@ -2,11 +2,13 @@ package hudson; import com.thoughtworks.xstream.XStream; import com.thoughtworks.xstream.converters.ConversionException; +import com.thoughtworks.xstream.converters.Converter; import com.thoughtworks.xstream.io.StreamException; import com.thoughtworks.xstream.io.xml.XppReader; import hudson.util.AtomicFileWriter; import hudson.util.IOException2; import hudson.util.XStream2; +import hudson.model.Descriptor; import java.io.BufferedReader; import java.io.File; @@ -54,13 +56,13 @@ import java.io.Reader; * *

* In some limited cases (specifically when the class is the root object - * to be read from XML, such as {@link Descriptor}), it is posible + * to be read from XML, such as {@link Descriptor}), it is possible * to completely and drastically change the data format. See * {@link Descriptor#load()} for more about this technique. * *

* There's a few other possibilities, such as implementing a custom - * {@link Converter} for XStream, or {@link XStream#alias(String, Class) registering an alias}. + * {@link Converter} for XStream, or {@link XStream#alias(String, Class) registering an alias}. * * @author Kohsuke Kawaguchi */ diff --git a/core/src/main/java/hudson/model/Build.java b/core/src/main/java/hudson/model/Build.java index 2e33561700..34765c4ebe 100644 --- a/core/src/main/java/hudson/model/Build.java +++ b/core/src/main/java/hudson/model/Build.java @@ -183,7 +183,7 @@ public final class Build extends Run implements Runnable { /** * Gets the downstream builds of this build, which are the builds of the - * downstream project sthat use artifacts of this build. + * downstream projects that use artifacts of this build. * * @return * For each project with fingerprinting enabled, returns the range @@ -204,7 +204,7 @@ public final class Build extends Run implements Runnable { * * @return * Build number of the upstream build that feed into this build, - * or -1 if no record is avilable. + * or -1 if no record is available. */ public int getUpstreamRelationship(Project that) { FingerprintAction f = getAction(FingerprintAction.class); diff --git a/core/src/main/java/hudson/model/Descriptor.java b/core/src/main/java/hudson/model/Descriptor.java index b39b53ed68..7e4042c5a1 100644 --- a/core/src/main/java/hudson/model/Descriptor.java +++ b/core/src/main/java/hudson/model/Descriptor.java @@ -19,7 +19,7 @@ import java.util.logging.Logger; *

* {@link Descriptor} is an object that has metadata about a {@link Describable} * object, and also serves as a factory. A {@link Descriptor}/{@link Describable} - * combination is used throghout in Hudson to implement a + * combination is used throughout in Hudson to implement a * configuration/extensibility mechanism. * *

@@ -121,7 +121,7 @@ public abstract class Descriptor> { /** * Invoked when the global configuration page is submitted. * - * Can be overrided to store descriptor-specific information. + * Can be overriden to store descriptor-specific information. * * @return false * to keep the client in the same config page. diff --git a/core/src/main/java/hudson/model/Fingerprint.java b/core/src/main/java/hudson/model/Fingerprint.java index 1ccd6e491c..9477bb2fce 100644 --- a/core/src/main/java/hudson/model/Fingerprint.java +++ b/core/src/main/java/hudson/model/Fingerprint.java @@ -262,7 +262,7 @@ public class Fingerprint implements ModelObject { Range m = lr.combine(rr); rhs++; - // since ranges[lhs] is explanded, it might overlap with others in this.ranges + // since ranges[lhs] is expanded, it might overlap with others in this.ranges while(lhs+1 jobListeners = new Vector(); @@ -643,7 +643,7 @@ public final class Hudson extends JobCollection implements Node { return fingerprintMap; } - // if no fingrer print matches, display "not found page". + // if no finger print matches, display "not found page". public Object getFingerprint( String md5sum ) throws IOException { Fingerprint r = fingerprintMap.get(md5sum); if(r==null) return new NoFingerprintMatch(md5sum); @@ -1133,7 +1133,7 @@ public final class Hudson extends JobCollection implements Node { } /** - * For debugging. Expose URL to perfrom GC. + * For debugging. Expose URL to perform GC. */ public void doGc( StaplerRequest req, StaplerResponse rsp ) throws IOException { System.gc(); @@ -1144,7 +1144,7 @@ public final class Hudson extends JobCollection implements Node { /** * For system diagnostics. - * Run arbitraary Groovy script. + * Run arbitrary Groovy script. */ public void doScript( StaplerRequest req, StaplerResponse rsp ) throws IOException, ServletException { if(!adminCheck(req,rsp)) diff --git a/core/src/main/java/hudson/model/Job.java b/core/src/main/java/hudson/model/Job.java index 8aa4807d0b..25357d142d 100644 --- a/core/src/main/java/hudson/model/Job.java +++ b/core/src/main/java/hudson/model/Job.java @@ -71,7 +71,7 @@ public abstract class Job, RunT extends Run,RunT extends Run,RunT extends Run,RunT extends Run0) - return new Summary(false,combine(trN.getFailCount(),"test faliure")); + return new Summary(false,combine(trN.getFailCount(),"test failure")); else // ??? return new Summary(false,"unstable"); } @@ -783,7 +783,7 @@ public abstract class Run ,RunT extends Run { * with {@link User} that doesn't have any back up data store. * * @return null - * if the implementation choose not to add any proeprty object for such user. + * if the implementation choose not to add any property object for such user. */ public abstract UserProperty newInstance(User user); } diff --git a/core/src/main/java/hudson/scm/CVSSCM.java b/core/src/main/java/hudson/scm/CVSSCM.java index 8ef051282c..dbebde9de5 100644 --- a/core/src/main/java/hudson/scm/CVSSCM.java +++ b/core/src/main/java/hudson/scm/CVSSCM.java @@ -783,7 +783,7 @@ public class CVSSCM extends AbstractCVSFamilySCM { * Runs cvs login command. * * TODO: this apparently doesn't work. Probably related to the fact that - * cvs does some tty magic to disable ecoback or whatever. + * cvs does some tty magic to disable echo back or whatever. */ public void doPostPassword(StaplerRequest req, StaplerResponse rsp) throws IOException { if(!Hudson.adminCheck(req,rsp)) diff --git a/core/src/main/java/hudson/scm/SubversionSCM.java b/core/src/main/java/hudson/scm/SubversionSCM.java index c912500b46..42bdb55b36 100644 --- a/core/src/main/java/hudson/scm/SubversionSCM.java +++ b/core/src/main/java/hudson/scm/SubversionSCM.java @@ -282,7 +282,7 @@ public class SubversionSCM extends AbstractCVSFamilySCM { // failed. to allow user to diagnose the problem, send output to log listener.getLogger().write(baos.toByteArray()); e.printStackTrace(listener.fatalError("Failed to parse Subversion output")); - throw new IOException("Unabled to parse svn info output"); + throw new IOException("Unable to parse svn info output"); } if(!info.isComplete()) diff --git a/core/src/main/java/hudson/tasks/Fingerprinter.java b/core/src/main/java/hudson/tasks/Fingerprinter.java index 7903b638ca..108a3b210a 100644 --- a/core/src/main/java/hudson/tasks/Fingerprinter.java +++ b/core/src/main/java/hudson/tasks/Fingerprinter.java @@ -190,7 +190,7 @@ public class Fingerprinter extends Publisher { } /** - * Map from file names of the fingeprinted file to its fingerprint record. + * Map from file names of the fingerprinted file to its fingerprint record. */ public synchronized Map getFingerprints() { if(ref!=null) { diff --git a/core/src/main/java/hudson/tasks/LogRotator.java b/core/src/main/java/hudson/tasks/LogRotator.java index 6bd61785df..b1b3e378db 100644 --- a/core/src/main/java/hudson/tasks/LogRotator.java +++ b/core/src/main/java/hudson/tasks/LogRotator.java @@ -53,7 +53,7 @@ public class LogRotator implements Describable { if(daysToKeep!=-1) { Calendar cal = new GregorianCalendar(); cal.add(Calendar.DAY_OF_YEAR,-daysToKeep); - // copy it to the array becaues we'll be deleting builds as we go. + // copy it to the array because we'll be deleting builds as we go. for( Run r : job.getBuilds().toArray(new Run[0]) ) { if(r.getTimestamp().before(cal) && !r.isKeepLog() && r!=lsb) r.delete(); diff --git a/core/src/main/java/hudson/tasks/Mailer.java b/core/src/main/java/hudson/tasks/Mailer.java index b1da2adec0..648203d9bc 100644 --- a/core/src/main/java/hudson/tasks/Mailer.java +++ b/core/src/main/java/hudson/tasks/Mailer.java @@ -302,7 +302,7 @@ public class Mailer extends Publisher { /** * The e-mail address that Hudson puts to "From:" field in outgoing e-mails. - * Null if unconfigured. + * Null if not configured. */ private String adminAddress; diff --git a/core/src/main/java/hudson/util/ArgumentListBuilder.java b/core/src/main/java/hudson/util/ArgumentListBuilder.java index c0f993eb15..2b6ac9422e 100644 --- a/core/src/main/java/hudson/util/ArgumentListBuilder.java +++ b/core/src/main/java/hudson/util/ArgumentListBuilder.java @@ -22,7 +22,7 @@ public class ArgumentListBuilder { * This is necessary only in a rare circumstance, * such as when adding argument for ssh and rsh. * - * Normal process invcations don't need it, because each + * Normal process invocations don't need it, because each * argument is treated as its own string and never merged into one. */ public ArgumentListBuilder addQuoted(String a) { diff --git a/core/src/main/java/hudson/util/ColorPalette.java b/core/src/main/java/hudson/util/ColorPalette.java index 6e66f9330d..5d3c4d0e3b 100644 --- a/core/src/main/java/hudson/util/ColorPalette.java +++ b/core/src/main/java/hudson/util/ColorPalette.java @@ -3,7 +3,7 @@ package hudson.util; import java.awt.Color; /** - * Color constants consistend with the Hudson color palette. + * Color constants consistent with the Hudson color palette. * * @author Kohsuke Kawaguchi */ diff --git a/core/src/main/resources/hudson/model/Project/main.jelly b/core/src/main/resources/hudson/model/Project/main.jelly index 2f9608bcde..eb83532a1a 100644 --- a/core/src/main/resources/hudson/model/Project/main.jelly +++ b/core/src/main/resources/hudson/model/Project/main.jelly @@ -15,7 +15,7 @@

- +
diff --git a/core/src/main/resources/hudson/model/Project/svn-password.jelly b/core/src/main/resources/hudson/model/Project/svn-password.jelly index 227ed87043..6b7356e788 100644 --- a/core/src/main/resources/hudson/model/Project/svn-password.jelly +++ b/core/src/main/resources/hudson/model/Project/svn-password.jelly @@ -13,7 +13,7 @@
  • Password will be stored in a clear text in Hudson

    • - A preferrable approach is to do the following steps: + A preferable approach is to do the following steps:

    1. Logon to the server that runs Hudson, by using the same user account Hudson uses
      2. diff --git a/core/src/main/resources/hudson/model/Run/logKeep.jelly b/core/src/main/resources/hudson/model/Run/logKeep.jelly index 243ca91427..afe8b66266 100644 --- a/core/src/main/resources/hudson/model/Run/logKeep.jelly +++ b/core/src/main/resources/hudson/model/Run/logKeep.jelly @@ -1,5 +1,5 @@ diff --git a/core/src/main/resources/lib/form/repeatable.jelly b/core/src/main/resources/lib/form/repeatable.jelly index 5aa8af89a0..c6eadf152d 100644 --- a/core/src/main/resources/lib/form/repeatable.jelly +++ b/core/src/main/resources/lib/form/repeatable.jelly @@ -1,5 +1,5 @@ diff --git a/war/resources/help/_cvs/legacy.html b/war/resources/help/_cvs/legacy.html index b33428ff36..98b976aa4e 100644 --- a/war/resources/help/_cvs/legacy.html +++ b/war/resources/help/_cvs/legacy.html @@ -1,10 +1,10 @@
      - Hudson 1.20 and earlier used to create redudant directories inside the workspace. + Hudson 1.20 and earlier used to create redundant directories inside the workspace. For example, if the CVS module name is "foo/bar", it first created "foo/bar" and then put everything below. With this option checked off, there will be no more such unnecessary intermediate directories.

      - This affects other path specifiers, such as artifact archiverers --- you now specify + This affects other path specifiers, such as artifact archivers --- you now specify "build/foo.jar" instead of "foo/build/foo.jar".

      \ No newline at end of file diff --git a/war/resources/help/project-config/timer.html b/war/resources/help/project-config/timer.html index e8ede11735..093e246cb3 100644 --- a/war/resources/help/project-config/timer.html +++ b/war/resources/help/project-config/timer.html @@ -6,9 +6,9 @@ This feature is primarily for using Hudson as a cron replacement, and it is not ideal for continuously building software project. - When people first start continous integration, they are often so used to + When people first start continuous integration, they are often so used to the idea of regularly scheduled builds like nightly/weekly that they use - this feature. However, the point of continous integration is to start + this feature. However, the point of continuous integration is to start a build as soon as a change is made, to provide a quick feedback to the change. To do that you need to hook up SCM change notification to Hudson.. diff --git a/war/resources/help/system-config/enableSecurity.html b/war/resources/help/system-config/enableSecurity.html index bfe6ccf860..7a88ea9a51 100644 --- a/war/resources/help/system-config/enableSecurity.html +++ b/war/resources/help/system-config/enableSecurity.html @@ -12,5 +12,5 @@

      If you are exposing Hudson to the internet, you must turn this on. Hudson launches - processes, so unsecure Hudson is a sure way of being hacked. + processes, so insecure Hudson is a sure way of being hacked.

    \ No newline at end of file diff --git a/war/resources/help/system-config/master-slave/command.html b/war/resources/help/system-config/master-slave/command.html index 1a0dbc1303..5d4e7b77a9 100644 --- a/war/resources/help/system-config/master-slave/command.html +++ b/war/resources/help/system-config/master-slave/command.html @@ -1,7 +1,7 @@
    Command to be used to execute a program on this slave, such as 'ssh slave1' or 'rsh slave2'. Hudson appends the actual command it wants to run - after this and then execute it locally, and then expects the command you spplied + after this and then execute it locally, and then expects the command you supplied to do the remote job submission.

    diff --git a/war/resources/help/system-config/master-slave/numExecutors.html b/war/resources/help/system-config/master-slave/numExecutors.html index 5141f26ba3..5f378a022b 100644 --- a/war/resources/help/system-config/master-slave/numExecutors.html +++ b/war/resources/help/system-config/master-slave/numExecutors.html @@ -9,6 +9,6 @@ for I/O.

    - Setting this value to 0 is useful to remove a disabled slave from Hudson temporalily without + Setting this value to 0 is useful to remove a disabled slave from Hudson temporarily without losing other configuration information.

    \ No newline at end of file