3 files changed, 21 insertions, 0 deletions
diff --git a/DOCS/man/en/input.rst b/DOCS/man/en/input.rst
index 7938502573..6d1072353f 100644
--- a/DOCS/man/en/input.rst
+++ b/DOCS/man/en/input.rst
@@ -169,6 +169,10 @@ run "<command>"
 quit [<code>]
     Exit the player using the given exit code.
 
+quit_watch_later
+    Exit player, and store current playback position. Playing that file later
+    will seek to the previous position on start.
+
 sub_add "<file>"
     Load the given subtitle file. It's not selected as current subtitle after
     loading.
diff --git a/DOCS/man/en/mpv.rst b/DOCS/man/en/mpv.rst
index 9a62333983..2ebdcab506 100644
--- a/DOCS/man/en/mpv.rst
+++ b/DOCS/man/en/mpv.rst
@@ -90,6 +90,10 @@ p / SPACE
 q / ESC
     Stop playing and quit.
 
+Q
+    Like ``q``, but store the current playback position. Playing the same file
+    later will resume at the old playback position if possible.
+
 U
     Stop playing (and quit if ``--idle`` is not used).
 
diff --git a/DOCS/man/en/options.rst b/DOCS/man/en/options.rst
index 766c3ae562..3a98ca9c93 100644
--- a/DOCS/man/en/options.rst
+++ b/DOCS/man/en/options.rst
@@ -1329,6 +1329,10 @@
     Do not play sound. With some demuxers this may not work. In those cases
     you can try ``--ao=null`` instead.
 
+--no-resume-playback
+    Do not restore playback position from ``~/.mpv/watch_later/``.
+    See ``quit_watch_later`` input command.
+
 --no-sub
     Disables display of internal and external subtitles.
 
@@ -1791,6 +1795,15 @@
     grayscale output with this option. Not supported by all video output
     drivers.
 
+--save-position-on-quit
+    Always save the current playback position on quit. When this file is
+    played again later, the player will seek to the old playback position on
+    start. This affects any form of stopping playback (quitting, going to the
+    next file).
+
+    This behavior is disabled by default, but is always available when quitting
+    the player with Shift+Q.
+
 --sb=<n>
     Seek to byte position. Useful for playback from CD-ROM images or VOB files
     with junk at the beginning. See also ``--start``.