diff --git a/src/calibre/ebooks/conversion/cli.py b/src/calibre/ebooks/conversion/cli.py
index 2ddd8b06ef..53eb9582b1 100644
--- a/src/calibre/ebooks/conversion/cli.py
+++ b/src/calibre/ebooks/conversion/cli.py
@@ -39,6 +39,10 @@ options. the available options depend on the input and output file types. \
 To get help on them specify the input and output file and then use the -h \
 option.
 
+You can also get detailed help on all the options any input/output pair \
+of formats supports by specifying the -h flag after the input and output \
+filenames.
+
 For full documentation of the conversion system see
 ''') + 'http://calibre.kovidgoyal.net/user_manual/conversion.html'
 
diff --git a/src/calibre/web/feeds/recipes/recipe_instapaper.py b/src/calibre/web/feeds/recipes/recipe_instapaper.py
index 2082bce759..839c5709d9 100644
--- a/src/calibre/web/feeds/recipes/recipe_instapaper.py
+++ b/src/calibre/web/feeds/recipes/recipe_instapaper.py
@@ -12,25 +12,28 @@ from calibre.web.feeds.news import BasicNewsRecipe
 class Instapaper(BasicNewsRecipe):
     title                 = 'Instapaper.com'
     __author__            = 'Darko Miletic'
-    description           = 'Personalized news feeds. Go to instapaper.com to setup up your news.'    
+    description           = '''Personalized news feeds. Go to instapaper.com to
+                               setup up your news. Fill in your instapaper
+                               username, and leave the password field
+                               below blank.'''
     publisher             = 'Instapaper.com'
-    category              = 'news, custom' 
+    category              = 'news, custom'
     oldest_article        = 7
     max_articles_per_feed = 100
     no_stylesheets        = True
     use_embedded_content  = False
     remove_javascript     = True
-    needs_subscription    = True 
+    needs_subscription    = True
     INDEX                 = u'http://www.instapaper.com'
     LOGIN                 = INDEX + u'/user/login'
-    
+
     html2lrf_options = [
                           '--comment', description
                         , '--category', category
                         , '--publisher', publisher
                         ]
-    
-    html2epub_options = 'publisher="' + publisher + '"\ncomments="' + description + '"\ntags="' + category + '"\noverride_css=" p {text-indent: 0em; margin-top: 0em; margin-bottom: 0.5em} img {margin-top: 0em; margin-bottom: 0.4em}"' 
+
+    html2epub_options = 'publisher="' + publisher + '"\ncomments="' + description + '"\ntags="' + category + '"\noverride_css=" p {text-indent: 0em; margin-top: 0em; margin-bottom: 0.5em} img {margin-top: 0em; margin-bottom: 0.4em}"'
 
     feeds = [
               (u'Unread articles' , INDEX + u'/u'      )
@@ -47,7 +50,7 @@ class Instapaper(BasicNewsRecipe):
                br['password'] = self.password
             br.submit()
         return br
-    
+
     def parse_index(self):
         totalfeeds = []
         lfeeds = self.get_feeds()
@@ -71,4 +74,4 @@ class Instapaper(BasicNewsRecipe):
                                     })
             totalfeeds.append((feedtitle, articles))
         return totalfeeds
-        
+