From ef0b2e1488e74f3675ee0782756c87bef3e4feb3 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Sun, 7 Aug 2016 11:09:16 +0200
Subject: [PATCH] Update docs

---
 CHANGELOG.asciidoc         |  8 ++++++++
 README.asciidoc            |  2 +-
 doc/help/commands.asciidoc | 27 +++++++++++++--------------
 3 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index d83ada63e..d7bda59b5 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -44,6 +44,14 @@ Changed
   (i.e. to open it at the position it would be opened if it was a clicked link)
 - `:download-open` and `:prompt-open-download` now have an optional `cmdline`
   argument to pass a commandline to open the download with.
+- `:yank` now has a position argument to select what to yank instead of using
+  flags.
+
+Removed
+~~~~~~~
+
+- The `:yank-selected` command got merged into `:yank` as `:yank selection`
+  and thus removed.
 
 v0.8.3 (unreleased)
 -------------------
diff --git a/README.asciidoc b/README.asciidoc
index 882301381..6813dc8c8 100644
--- a/README.asciidoc
+++ b/README.asciidoc
@@ -146,10 +146,10 @@ Contributors, sorted by the number of commits in descending order:
 * Lamar Pavel
 * Bruno Oliveira
 * Alexander Cogneau
+* Marshall Lochbaum
 * Felix Van der Jeugt
 * Jakub Klinkovský
 * Martin Tournoij
-* Marshall Lochbaum
 * Raphael Pierzina
 * Joel Torstensson
 * Jan Verbeek
diff --git a/doc/help/commands.asciidoc b/doc/help/commands.asciidoc
index f43be5822..829d5f5fe 100644
--- a/doc/help/commands.asciidoc
+++ b/doc/help/commands.asciidoc
@@ -66,8 +66,7 @@
 |<<undo,undo>>|Re-open a closed tab (optionally skipping [count] closed tabs).
 |<<view-source,view-source>>|Show the source of the current page.
 |<<wq,wq>>|Save open pages and quit.
-|<<yank,yank>>|Yank the current URL/title to the clipboard or primary selection.
-|<<yank-selected,yank-selected>>|Yank the selected text to the clipboard or primary selection.
+|<<yank,yank>>|Yank something to the clipboard or primary selection.
 |<<zoom,zoom>>|Set the zoom level for the current tab.
 |<<zoom-in,zoom-in>>|Increase the zoom level for the current tab.
 |<<zoom-out,zoom-out>>|Decrease the zoom level for the current tab.
@@ -853,25 +852,25 @@ Save open pages and quit.
 
 [[yank]]
 === yank
-Syntax: +:yank [*--title*] [*--sel*] [*--domain*] [*--pretty*]+
+Syntax: +:yank [*--sel*] [*--keep*] ['what']+
 
-Yank the current URL/title to the clipboard or primary selection.
+Yank something to the clipboard or primary selection.
 
-==== optional arguments
-* +*-t*+, +*--title*+: Yank the title instead of the URL.
-* +*-s*+, +*--sel*+: Use the primary selection instead of the clipboard.
-* +*-d*+, +*--domain*+: Yank only the scheme, domain, and port number.
-* +*-p*+, +*--pretty*+: Yank the URL in pretty decoded form.
+==== positional arguments
+* +'what'+: What to yank. 
+
+ - `url`: The current URL.
+ - `pretty-url`: The URL in pretty decoded form.
+ - `title`: The current page's title.
+ - `domain`: The current scheme, domain, and port number.
+ - `selection`: The selection under the cursor.
+ 
 
-[[yank-selected]]
-=== yank-selected
-Syntax: +:yank-selected [*--sel*] [*--keep*]+
 
-Yank the selected text to the clipboard or primary selection.
 
 ==== optional arguments
 * +*-s*+, +*--sel*+: Use the primary selection instead of the clipboard.
-* +*-k*+, +*--keep*+: If given, stay in visual mode after yanking.
+* +*-k*+, +*--keep*+: Stay in visual mode after yanking the selection.
 
 [[zoom]]
 === zoom