Merge branch 'master' into content_generation, make changes based on Joerg's review

[dak.git] / dak / dak.py

diff --git a/dak/dak.py b/dak/dak.py
index 15c3e1add0efcdbcccdf187ee5d1b84c1608f39a..14cddd562545f9449d86c62c5a107f3c8db8afe2 100755 (executable)
--- a/dak/dak.py
+++ b/dak/dak.py
@@ -33,8 +33,10 @@ G{importgraph}
 
 ################################################################################
 
-import sys, imp
-import daklib.utils, daklib.extensions
+import sys
+import imp
+import daklib.utils
+import daklib.extensions
 
 ################################################################################
 
@@ -113,7 +115,7 @@ def init():
         ("generate-releases",
          "Generate Release files"),
         ("contents",
-         "Generate contest files"),
+         "Generate content files"),
         ("generate-index-diffs",
          "Generate .diff/Index files"),
         ("clean-suites",