Merge remote-tracking branch 'upstream/master'

CONTROLS.rst

@@ -0,0 +1,64 @@
+========
+Controls
+========
+
+.. image:: http://i.imgur.com/xDUQ03C.png
+
+--------------
+Basic Commands
+--------------
+
+:``j``/``k`` or ``▲``/``▼``: Move the cursor up/down
+:``m``/``n`` or ``PgUp``/``PgDn``: Jump to the previous/next page
+:``1-5``: Toggle post order (*hot*, *top*, *rising*, *new*, *controversial*)
+:``r`` or ``F5``: Refresh page content
+:``u``: Log in or switch accounts
+:``?``: Show the help screen
+:``q``/``Q``: Quit/Force quit
+
+----------------------
+Authenticated Commands
+----------------------
+
+Some actions require that you be logged in to your reddit account.
+You can log in by pressing ``u`` while inside of the program.
+Once you are logged in your username will appear in the top-right corner of the screen.
+
+:``a``/``z``: Upvote/downvote
+:``c``: Compose a new post or comment
+:``e``: Edit an existing post or comment
+:``d``: Delete an existing post or comment
+:``i``: Display new messages prompt
+:``s``: View a list of subscribed subreddits
+:``w``: Save a submission
+
+--------------
+Subreddit Mode
+--------------
+
+In subreddit mode you can browse through the top submissions on either the front page or a specific subreddit.
+
+:``l`` or ``►``: Enter the selected submission
+:``o`` or ``ENTER``:  Open the submission link with your web browser
+:``/``: Open a prompt to switch subreddits
+:``f``: Open a prompt to search the current subreddit
+
+The ``/`` prompt accepts subreddits in the following formats
+
+* ``/r/python``
+* ``/r/python/new``
+* ``/r/python+linux`` supports multireddits
+* ``/r/front`` will redirect to the front page
+* ``/r/me`` will display your submissions
+* ``/r/saved`` will display your saved submission
+
+---------------
+Submission Mode
+---------------
+
+In submission mode you can view the self text for a submission and browse comments.
+
+:``h`` or ``◄``: Return to the subreddit
+:``l`` or ``►``: Open the selected comment in a new window
+:``o`` or ``ENTER``: Open the comment permalink with your web browser
+:``SPACE``: Fold the selected comment, or load additional comments