doc fixes

(I obviously don't know how to use git-cherry-pick.)

docs/changelog.rst

@@ -27,8 +27,9 @@ Changelog
   Thanks to Philippe Mongeau.
 * The :doc:`/plugins/mbcollection` by Jeffrey Aylesworth was added to the core
   beets distribution.
-* New :doc:`/plugins/m3uupdate`: Catalog imported files in an ``m3u`` playlist
-  file for easy importing to other systems. Thanks to Fabrice Laporte.
+* New :doc:`/plugins/importfeeds`: Catalog imported files in ``m3u`` playlist
+  files or as symlinks for easy importing to other systems. Thanks to Fabrice
+  Laporte.
 * When the autotagger fails to find a match, it now displays the number of
   tracks on the album (to help you guess what might be going wrong).
 * The default filename character substitutions were changed to be more

docs/plugins/importfeeds.rst

@@ -16,9 +16,9 @@ Three different types of outputs coexist, specify the ones you want to use by se
 - ``m3u_multi``: create a new playlist for each import (uniquely named by appending the date and track/album name). 
 - ``link``: create a symlink for each imported item. This is the recommended setting to propagate beets imports to your iTunes library: just drag and drop the ``feeds_dir`` folder on the iTunes dock icon.
 
-An example of ``importfeeds``configuration::
+An example of ``importfeeds`` configuration::
 
     [importfeeds]
     feeds_formats: m3u link
     feeds_dir: ~/imports/
-    m3u_name: newfiles.m3u
+    m3u_name: newfiles.m3u

docs/plugins/index.rst

@@ -46,13 +46,9 @@ disabled by default, but you can turn them on as described above.
    inline
    scrub
    rewrite
-<<<<<<< HEAD
-   m3uupdate
    rdm
    mbcollection
-=======
    importfeeds
->>>>>>> 837b91b... rename 'm3uupdate' plugin to 'importfeeds'. Handles two more output formats: multi m3u files (one per item imported) and symlinks. Update plugin docs.
 
 Autotagger Extensions
 ''''''''''''''''''''''