summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Bruhin <git@the-compiler.org>2016-07-26 08:36:16 +0200
committerFlorian Bruhin <git@the-compiler.org>2016-07-26 08:36:16 +0200
commitda64db853e16af9e579f8b75c13d30289a296ac5 (patch)
tree17f480b524ad0735c6f9bf498aa030d93c51e364
parentdab17b801e9c28bd994e8c65cb1f29693d9c8d31 (diff)
downloadqutebrowser-da64db853e16af9e579f8b75c13d30289a296ac5.tar.gz
qutebrowser-da64db853e16af9e579f8b75c13d30289a296ac5.zip
Update docs
-rw-r--r--CHANGELOG.asciidoc2
-rw-r--r--README.asciidoc1
-rw-r--r--doc/help/commands.asciidoc11
-rw-r--r--qutebrowser/browser/commands.py4
4 files changed, 12 insertions, 6 deletions
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 6ebc25e6d..f0bd07795 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -44,6 +44,8 @@ Changed
rather than the current page.
- New `taskadd` userscript to add a taskwarrior task annotated with the
current URL.
+- `:bookmark-del` and `:quickmark-del` now delete the current page's URL if none
+ is given.
Fixed
-----
diff --git a/README.asciidoc b/README.asciidoc
index acf7fbc09..422b87db8 100644
--- a/README.asciidoc
+++ b/README.asciidoc
@@ -165,6 +165,7 @@ Contributors, sorted by the number of commits in descending order:
* Kevin Velghe
* Austin Anderson
* Jimmy
+* Marshall Lochbaum
* Alexey "Averrin" Nabrodov
* avk
* ZDarian
diff --git a/doc/help/commands.asciidoc b/doc/help/commands.asciidoc
index 713b75d60..eea3f0d7f 100644
--- a/doc/help/commands.asciidoc
+++ b/doc/help/commands.asciidoc
@@ -128,12 +128,13 @@ If no url and title are provided, then save the current page as a bookmark. If a
[[bookmark-del]]
=== bookmark-del
-Syntax: +:bookmark-del 'url'+
+Syntax: +:bookmark-del ['url']+
Delete a bookmark.
==== positional arguments
-* +'url'+: The URL of the bookmark to delete.
+* +'url'+: The url of the bookmark to delete. If not given, use the current page's url.
+
==== note
* This command does not split arguments after the last argument and handles quotes literally.
@@ -520,12 +521,14 @@ You can view all saved quickmarks on the link:qute://bookmarks[bookmarks page].
[[quickmark-del]]
=== quickmark-del
-Syntax: +:quickmark-del 'name'+
+Syntax: +:quickmark-del ['name']+
Delete a quickmark.
==== positional arguments
-* +'name'+: The name of the quickmark to delete.
+* +'name'+: The name of the quickmark to delete. If not given, delete the quickmark for the current page (choosing one arbitrarily
+ if there are more than one).
+
==== note
* This command does not split arguments after the last argument and handles quotes literally.
diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index dba95fa8f..49eaa5dcb 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -1103,7 +1103,7 @@ class CommandDispatcher:
"""Delete a quickmark.
Args:
- name: The name of the quickmark to delete. If none, delete the
+ name: The name of the quickmark to delete. If not given, delete the
quickmark for the current page (choosing one arbitrarily
if there are more than one).
"""
@@ -1181,7 +1181,7 @@ class CommandDispatcher:
"""Delete a bookmark.
Args:
- url: The url of the bookmark to delete. If None, use the
+ url: The url of the bookmark to delete. If not given, use the
current page's url.
"""
if url is None: