From d572bde13b1ae12345b3fa7bd75f478b965d4b2a Mon Sep 17 00:00:00 2001
From: Adrian Sampson <adrian@radbox.org>
Date: Fri, 12 Sep 2014 19:44:17 -0700
Subject: [PATCH] Tiny docs typos

Conflicts:
	docs/plugins/index.rst
---
 beets/ui/__init__.py   | 4 ----
 docs/plugins/index.rst | 3 ++-
 docs/reference/cli.rst | 5 ++---
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/beets/ui/__init__.py b/beets/ui/__init__.py
index fb958c489..ab836f410 100644
--- a/beets/ui/__init__.py
+++ b/beets/ui/__init__.py
@@ -876,7 +876,6 @@ def _setup(options, lib=None):
 def _configure(options):
     """Amend the global configuration object with command line options.
     """
-
     # Add any additional config files specified with --config. This
     # special handling lets specified plugins get loaded before we
     # finish parsing the command line.
@@ -933,7 +932,6 @@ def _raw_main(args, lib=None):
     """A helper function for `main` without top-level exception
     handling.
     """
-
     parser = SubcommandsOptionParser()
     parser.add_option('-l', '--library', dest='library',
                       help='library database file to use')
@@ -949,9 +947,7 @@ def _raw_main(args, lib=None):
                      help=optparse.SUPPRESS_HELP)
 
     options, subargs = parser.parse_global_options(args)
-
     subcommands, plugins, lib = _setup(options, lib)
-
     parser.add_subcommand(*subcommands)
 
     subcommand, suboptions, subargs = parser.parse_subcommand(subargs)
diff --git a/docs/plugins/index.rst b/docs/plugins/index.rst
index cdf802ba0..39c1e5704 100644
--- a/docs/plugins/index.rst
+++ b/docs/plugins/index.rst
@@ -136,7 +136,8 @@ Miscellaneous
 * :doc:`info`: Print music files' tags to the console.
 * :doc:`missing`: List missing tracks.
 * :doc:`duplicates`: List duplicate tracks or albums.
-* :doc:`spotify`: Create Spotify playlists from the Beets library
+* :doc:`spotify`: Create Spotify playlists from the Beets library.
+* :doc:`types`: Declare types for flexible attributes.
 
 .. _MPD: http://www.musicpd.org/
 .. _MPD clients: http://mpd.wikia.com/wiki/Clients
diff --git a/docs/reference/cli.rst b/docs/reference/cli.rst
index 468ef0664..d8dff4c33 100644
--- a/docs/reference/cli.rst
+++ b/docs/reference/cli.rst
@@ -174,9 +174,8 @@ list
 
 Want to search for "Gronlandic Edit" by of Montreal? Try ``beet list
 gronlandic``.  Maybe you want to see everything released in 2009 with
-"vegetables" in the title? Try ``beet list year:2009 title:vegetables``. You 
-can also specify the order used when outputting the results (Read more in 
-:doc:`query`.)
+"vegetables" in the title? Try ``beet list year:2009 title:vegetables``. You
+can also specify the sort order. (Read more in :doc:`query`.)
 
 You can use the ``-a`` switch to search for albums instead of individual items.
 In this case, the queries you use are restricted to album-level fields: for