merge

docs/dev/plugins.rst

@@ -374,7 +374,7 @@ plugin will be used if we issue a command like ``beet ls @something`` or
             return pattern == val
 
     class ExactMatchPlugin(BeetsPlugin):
-        def queries():
+        def queries(self):
             return {
                 '@': ExactMatchQuery
             }

docs/faq.rst

@@ -202,7 +202,7 @@ Why does beets…
 There are a number of possibilities:
 
 -  First, make sure the album is in `the MusicBrainz
-   database <http://musicbrainz.org/>`__ the MusicBrainz database. You
+   database <http://musicbrainz.org/>`__. You
    can search on their site to make sure it's cataloged there. (If not,
    anyone can edit MusicBrainz---so consider adding the data yourself.)
 -  If the album in question is a multi-disc release, see the relevant

docs/plugins/rewrite.rst

@@ -16,7 +16,7 @@ example above::
     rewrite:
         artist The Jimi Hendrix Experience: Jimi Hendrix
 
-This will make ``$artist`` in your path formats expand to "Jimi Henrix" where it
+This will make ``$artist`` in your path formats expand to "Jimi Hendrix" where it
 would otherwise be "The Jimi Hendrix Experience".
 
 The pattern is a case-insensitive regular expression. This means you can use