Fix some familiar typos and use consistent spellings

8 files changed, 25 insertions, 25 deletions

diff --git a/src/distutils2/command/build_ext.py b/src/distutils2/command/build_ext.py
index 29530eb..4fd35d3 100644
--- a/src/distutils2/command/build_ext.py
+++ b/src/distutils2/command/build_ext.py
@@ -101,7 +101,7 @@ class build_ext(Command):
         ('swig-cpp', None,
          "make SWIG create C++ files (default is C)"),
         ('swig-opts=', None,
-         "list of SWIG command line options"),
+         "list of SWIG command-line options"),
         ('swig=', None,
          "path to the SWIG executable"),
         ]
@@ -384,7 +384,7 @@ class build_ext(Command):
             self.compiler_obj.initialize(self.plat_name)
 
         # And make sure that any compile/link-related options (which might
-        # come from the command-line or from the setup script) are set in
+        # come from the command line or from the setup script) are set in
         # that CCompiler object -- that way, they automatically apply to
         # all compiling and linking done here.
         if self.include_dirs is not None:
@@ -471,7 +471,7 @@ class build_ext(Command):
         #     guess it's useful)
         # The environment variable should take precedence, and
         # any sensible compiler will give precedence to later
-        # command line args.  Hence we combine them in order:
+        # command-line args.  Hence we combine them in order:
         extra_args = ext.extra_compile_args or []
 
         macros = ext.define_macros[:]
diff --git a/src/distutils2/command/cmd.py b/src/distutils2/command/cmd.py
index 73ac9e1..a4e4b9b 100644
--- a/src/distutils2/command/cmd.py
+++ b/src/distutils2/command/cmd.py
@@ -97,7 +97,7 @@ class Command(object):
         # just to be safe.
         self.force = None
 
-        # The 'help' flag is just used for command-line parsing, so
+        # The 'help' flag is just used for command line parsing, so
         # none of that complicated bureaucracy is needed.
         self.help = 0
 
@@ -128,7 +128,7 @@ class Command(object):
     #   finalize_options()
     #     decide on the final values for all options; this is called
     #     after all possible intervention from the outside world
-    #     (command-line, option file, etc.) has been processed
+    #     (command line, option file, etc.) has been processed
     #   run()
     #     run the command: do whatever it is we're here to do,
     #     controlled by the command's various option values
@@ -137,7 +137,7 @@ class Command(object):
         """Set default values for all the options that this command
         supports.  Note that these defaults may be overridden by other
         commands, by the setup script, by config files, or by the
-        command-line.  Thus, this is not the place to code dependencies
+        command line.  Thus, this is not the place to code dependencies
         between options; generally, 'initialize_options()' implementations
         are just a bunch of "self.foo = None" assignments.
 
@@ -149,7 +149,7 @@ class Command(object):
     def finalize_options(self):
         """Set final values for all the options that this command supports.
         This is always called as late as possible, ie.  after any option
-        assignments from the command-line or from other commands have been
+        assignments from the command line or from other commands have been
         done.  Thus, this is the place to code option dependencies: if
         'foo' depends on 'bar', then it is safe to set 'foo' from 'bar' as
         long as 'foo' still has the same value it was assigned in
@@ -179,7 +179,7 @@ class Command(object):
         """A command's raison d'etre: carry out the action it exists to
         perform, controlled by the options initialized in
         'initialize_options()', customized by other commands, the setup
-        script, the command-line, and config files, and finalized in
+        script, the command line and config files, and finalized in
         'finalize_options()'.  All terminal output and filesystem
         interaction should be done by 'run()'.
 
diff --git a/src/distutils2/compiler/bcppcompiler.py b/src/distutils2/compiler/bcppcompiler.py
index 7587048..71100df 100644
--- a/src/distutils2/compiler/bcppcompiler.py
+++ b/src/distutils2/compiler/bcppcompiler.py
@@ -249,7 +249,7 @@ class BCPPCompiler(CCompiler) :
             # list of object files
             ld_args.extend(objects)
 
-            # XXX the command-line syntax for Borland C++ is a bit wonky;
+            # XXX the command line syntax for Borland C++ is a bit wonky;
             # certain filenames are jammed together in one big string, but
             # comma-delimited.  This doesn't mesh too well with the
             # Unix-centric attitude (with a DOS/Windows quoting hack) of
diff --git a/src/distutils2/compiler/ccompiler.py b/src/distutils2/compiler/ccompiler.py
index c9bb129..3a8d8dd 100644
--- a/src/distutils2/compiler/ccompiler.py
+++ b/src/distutils2/compiler/ccompiler.py
@@ -191,7 +191,7 @@ class CCompiler(object):
           linker_exe    linker used to create binary executables
           archiver      static library creator
 
-        On platforms with a command-line (Unix, DOS/Windows), each of these
+        On platforms with a command line (Unix, DOS/Windows), each of these
         is a string that will be split into executable name and (optional)
         list of arguments.  (Splitting the string is done similarly to how
         Unix shells operate: words are delimited by spaces, but quotes and
@@ -597,7 +597,7 @@ class CCompiler(object):
         output debug symbols in (or alongside) the object file(s).
 
         'extra_preargs' and 'extra_postargs' are implementation- dependent.
-        On platforms that have the notion of a command-line (e.g. Unix,
+        On platforms that have the notion of a command line (e.g. Unix,
         DOS/Windows), they are most likely lists of strings: extra
         command-line arguments to prepand/append to the compiler command
         line.  On other platforms, consult the implementation class
diff --git a/src/distutils2/core.py b/src/distutils2/core.py
index 0820adb..d84d16f 100644
--- a/src/distutils2/core.py
+++ b/src/distutils2/core.py
@@ -86,7 +86,7 @@ def setup(**attrs):
     and the next command are used to set attributes of the current command
     object.
 
-    When the entire command-line has been successfully parsed, calls the
+    When the entire command line has been successfully parsed, calls the
     'run()' method on each command object in turn.  This method will be
     driven entirely by the Distribution object (which each command object
     has a reference to, thanks to its constructor), and the
@@ -127,7 +127,7 @@ def setup(**attrs):
         return dist
 
     # Parse the command line and override config files; any
-    # command-line errors are the end user's fault, so turn them into
+    # command line errors are the end user's fault, so turn them into
     # SystemExit to suppress tracebacks.
     try:
         ok = dist.parse_command_line()
@@ -159,7 +159,7 @@ def run_setup(script_name, script_args=None, stop_after="run"):
     return the Distribution instance that drives things.  This is useful
     if you need to find out the distribution metadata (passed as
     keyword args from 'script' to 'setup()', or the contents of the
-    config files or command-line.
+    config files or command line.
 
     'script_name' is a file that will be run with 'execfile()';
     'sys.argv[0]' will be replaced with 'script' for the duration of the
@@ -176,8 +176,8 @@ def run_setup(script_name, script_args=None, stop_after="run"):
         stop after config files have been parsed (and their data
         stored in the Distribution instance)
       commandline
-        stop after the command-line ('sys.argv[1:]' or 'script_args')
-        have been parsed (and the data stored in the Distribution)
+        stop after the command line ('sys.argv[1:]' or 'script_args')
+        has been parsed (and the data stored in the Distribution)
       run [default]
         stop after all commands have been run (the same as if 'setup()'
         had been called in the usual way
diff --git a/src/distutils2/dist.py b/src/distutils2/dist.py
index 191b146..bdef843 100644
--- a/src/distutils2/dist.py
+++ b/src/distutils2/dist.py
@@ -162,12 +162,12 @@ Common commands: (see '--help-commands' for more)
 
         # 'script_name' and 'script_args' are usually set to sys.argv[0]
         # and sys.argv[1:], but they can be overridden when the caller is
-        # not necessarily a setup script run from the command-line.
+        # not necessarily a setup script run from the command line.
         self.script_name = None
         self.script_args = None
 
         # 'command_options' is where we store command options between
-        # parsing them (from config files, the command-line, etc.) and when
+        # parsing them (from config files, the command line, etc.) and when
         # they are actually needed -- ie. when the command in question is
         # instantiated.  It is a dictionary of dictionaries of 2-tuples:
         #   command_options = { command_name : { option : (source, value) } }
@@ -422,9 +422,9 @@ Common commands: (see '--help-commands' for more)
         command class -- thus, we have to be able to load command classes
         in order to parse the command line.  Any error in that 'options'
         attribute raises DistutilsGetoptError; any error on the
-        command-line raises DistutilsArgError.  If no Distutils commands
+        command line raises DistutilsArgError.  If no Distutils commands
         were found on the command line, raises DistutilsArgError.  Return
-        true if command-line was successfully parsed and we should carry
+        true if command line was successfully parsed and we should carry
         on with executing commands; false if no errors but we shouldn't
         execute commands (currently, this only happens if user asks for
         help).
@@ -571,7 +571,7 @@ Common commands: (see '--help-commands' for more)
             if help_option_found:
                 return
 
-        # Put the options from the command-line into their official
+        # Put the options from the command line into their official
         # holding pen, the 'command_options' dictionary.
         opt_dict = self.get_option_dict(command)
         for (name, value) in vars(opts).items():
@@ -592,7 +592,7 @@ Common commands: (see '--help-commands' for more)
 
     def _show_help(self, parser, global_options=1, display_options=1,
                    commands=[]):
-        """Show help for the setup script command-line in the form of
+        """Show help for the setup script command line in the form of
         several lists of command-line options.  'parser' should be a
         FancyGetopt instance; do not expect it to be returned in the
         same state, as its option table will be reset to make it
diff --git a/src/distutils2/fancy_getopt.py b/src/distutils2/fancy_getopt.py
index 19cb97b..0eaa42f 100644
--- a/src/distutils2/fancy_getopt.py
+++ b/src/distutils2/fancy_getopt.py
@@ -71,7 +71,7 @@ class FancyGetopt(object):
 
         # These keep track of the information in the option table.  We
         # don't actually populate these structures until we're ready to
-        # parse the command-line, since the 'option_table' passed in here
+        # parse the command line, since the 'option_table' passed in here
         # isn't necessarily the final word.
         self.short_opts = []
         self.long_opts = []
@@ -80,7 +80,7 @@ class FancyGetopt(object):
         self.takes_arg = {}
 
         # And 'option_order' is filled up in 'getopt()'; it records the
-        # original order of options (and their values) on the command-line,
+        # original order of options (and their values) on the command line,
         # but expands short options, converts aliases, etc.
         self.option_order = []
 
diff --git a/src/distutils2/tests/test_dist.py b/src/distutils2/tests/test_dist.py
index 290ce01..125729c 100644
--- a/src/distutils2/tests/test_dist.py
+++ b/src/distutils2/tests/test_dist.py
@@ -245,7 +245,7 @@ class DistributionTestCase(support.TempdirManager,
         self.assertRaises(ValueError, dist.announce, args, kwargs)
 
     def test_find_config_files_disable(self):
-        # Ticket #1180: Allow user to disable their home config file.
+        # Bug #1180: Allow users to disable their own config file.
         temp_home = self.mkdtemp()
         if os.name == 'posix':
             user_filename = os.path.join(temp_home, ".pydistutils.cfg")