Fix typos, spell ?metadata? consistently, update one docstring

4 files changed, 10 insertions, 10 deletions

diff --git a/src/distutils2/command/check.py b/src/distutils2/command/check.py
index 844672d..b3175e7 100644
--- a/src/distutils2/command/check.py
+++ b/src/distutils2/command/check.py
@@ -8,13 +8,13 @@ from distutils2.core import Command
 from distutils2.errors import DistutilsSetupError
 
 class check(Command):
-    """This command checks the meta-data of the package.
+    """This command checks the metadata of the package.
     """
     description = ("perform some checks on the package")
-    user_options = [('metadata', 'm', 'Verify meta-data'),
+    user_options = [('metadata', 'm', 'Verify metadata'),
                     ('restructuredtext', 'r',
-                     ('Checks if long string meta-data syntax '
-                      'are reStructuredText-compliant')),
+                     ('Checks if long string metadata syntax '
+                      'is reStructuredText-compliant')),
                     ('strict', 's',
                      'Will exit with an error if a check fails')]
 
@@ -53,7 +53,7 @@ class check(Command):
             raise DistutilsSetupError(msg)
 
     def check_metadata(self):
-        """Ensures that all required elements of meta-data are supplied.
+        """Ensures that all required elements of metadata are supplied.
 
         name, version, URL, (author and author_email) or
         (maintainer and maintainer_email)).
@@ -62,7 +62,7 @@ class check(Command):
         """
         missing, __ = self.distribution.metadata.check()
         if missing != []:
-            self.warn("missing required meta-data: %s"  % ', '.join(missing))
+            self.warn("missing required metadata: %s"  % ', '.join(missing))
 
     def check_restructuredtext(self):
         """Checks if the long string fields are reST-compliant."""
diff --git a/src/distutils2/command/register.py b/src/distutils2/command/register.py
index 40ee4ce..f812ed2 100644
--- a/src/distutils2/command/register.py
+++ b/src/distutils2/command/register.py
@@ -29,7 +29,7 @@ class register(Command):
         ('list-classifiers', None,
          'list the valid Trove classifiers'),
         ('strict', None ,
-         'Will stop the registering if the meta-data are not fully compliant')
+         'Will stop the registering if the metadata is not fully compliant')
         ]
 
     boolean_options = ['show-response', 'verify', 'list-classifiers',
diff --git a/src/distutils2/command/sdist.py b/src/distutils2/command/sdist.py
index 53eca93..8f7d213 100644
--- a/src/distutils2/command/sdist.py
+++ b/src/distutils2/command/sdist.py
@@ -71,7 +71,7 @@ class sdist(Command):
          "directory to put the source distribution archive(s) in "
          "[default: dist]"),
         ('check-metadata', None,
-         "Ensure that all required elements of meta-data "
+         "Ensure that all required elements of metadata "
          "are supplied. Warn if any missing. [default]"),
         ('owner=', 'u',
          "Owner name used when creating a tar file [default: current user]"),
@@ -362,7 +362,7 @@ class sdist(Command):
         'self.keep_temp' is true).  The list of archive files created is
         stored so it can be retrieved later by 'get_archive_files()'.
         """
-        # Don't warn about missing meta-data here -- should be (and is!)
+        # Don't warn about missing metadata here -- should be (and is!)
         # done elsewhere.
         base_dir = self.distribution.get_fullname()
         base_name = os.path.join(self.dist_dir, base_dir)
diff --git a/src/distutils2/command/upload.py b/src/distutils2/command/upload.py
index 7938e6e..8040db4 100644
--- a/src/distutils2/command/upload.py
+++ b/src/distutils2/command/upload.py
@@ -94,7 +94,7 @@ class upload(Command):
             spawn(gpg_args,
                   dry_run=self.dry_run)
 
-        # Fill in the data - send all the meta-data in case we need to
+        # Fill in the data - send all the metadata in case we need to
         # register a new release
         content = open(filename,'rb').read()