From fea3524443141bd9d62d255e0fabfed01856dc7f Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Sat, 13 Sep 2014 00:37:07 +0200
Subject: [PATCH] Remove 'or None' in docs.

---
 doc/help/commands.asciidoc | 10 +++++-----
 qutebrowser/utils/utils.py |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/doc/help/commands.asciidoc b/doc/help/commands.asciidoc
index 682bb85c3..f6de403ee 100644
--- a/doc/help/commands.asciidoc
+++ b/doc/help/commands.asciidoc
@@ -193,7 +193,7 @@ Open a URL in the current/[count]th tab.
 * +*-t*+, +*--tab*+: Open in a new tab.
 
 ==== count
-The tab index to open the URL in, or None.
+The tab index to open the URL in.
 
 [[paste]]
 === paste
@@ -227,7 +227,7 @@ Print the current/[count]th tab.
 * +*-p*+, +*--preview*+: Show preview instead of printing.
 
 ==== count
-The tab index to print, or None.
+The tab index to print.
 
 [[quickmark-add]]
 === quickmark-add
@@ -265,7 +265,7 @@ Quit qutebrowser.
 Reload the current/[count]th tab.
 
 ==== count
-The tab index to reload, or None.
+The tab index to reload.
 
 [[report]]
 === report
@@ -328,14 +328,14 @@ Note the {url} variable which gets replaced by the current URL might be useful h
 Stop loading in the current/[count]th tab.
 
 ==== count
-The tab index to stop, or None.
+The tab index to stop.
 
 [[tab-close]]
 === tab-close
 Close the current/[count]th tab.
 
 ==== count
-The tab index to close, or None
+The tab index to close
 
 [[tab-focus]]
 === tab-focus
diff --git a/qutebrowser/utils/utils.py b/qutebrowser/utils/utils.py
index b5af9e798..fd7e35863 100644
--- a/qutebrowser/utils/utils.py
+++ b/qutebrowser/utils/utils.py
@@ -543,7 +543,7 @@ class DocstringParser:
             if stop:
                 break
         for k, v in self.arg_descs.items():
-            self.arg_descs[k] = ' '.join(v)
+            self.arg_descs[k] = ' '.join(v).replace(', or None', '')
         self.long_desc = ' '.join(self.long_desc)
         self.short_desc = ' '.join(self.short_desc)