diff --git a/src/calibre/debug.py b/src/calibre/debug.py
index 0d38cb4a69..0b17920cd8 100644
--- a/src/calibre/debug.py
+++ b/src/calibre/debug.py
@@ -145,6 +145,10 @@ def debug_device_driver():
             print dev
             print msg
             print
+    if isosx and os.path.exists('/tmp/ioreg.txt'):
+        print
+        print
+        print "Don't forget to send the file /tmp/ioreg.txt as well"
 
 
 def add_simple_plugin(path_to_plugin):
diff --git a/src/calibre/manual/custom.py b/src/calibre/manual/custom.py
index 958c2ec6a4..6e519c9b2b 100644
--- a/src/calibre/manual/custom.py
+++ b/src/calibre/manual/custom.py
@@ -194,6 +194,7 @@ def cli_docs(app):
     for script in entry_points['console_scripts']:
         module = script[script.index('=')+1:script.index(':')].strip()
         cmd = script[:script.index('=')].strip()
+        if cmd in ('calibre-complete', 'calibre-parallel'): continue
         module = __import__(module, fromlist=[module.split('.')[-1]])
         if hasattr(module, 'option_parser'):
             documented_cmds.append((cmd, getattr(module, 'option_parser')()))