From d8776b3ed2b932baabfeb6ffe7b7e37947c47d15 Mon Sep 17 00:00:00 2001 From: Adrian Sampson Date: Tue, 10 Apr 2012 12:11:23 -0700 Subject: [PATCH] doc fixes (I obviously don't know how to use git-cherry-pick.) --- docs/changelog.rst | 5 +++-- docs/plugins/importfeeds.rst | 4 ++-- docs/plugins/index.rst | 4 ---- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/docs/changelog.rst b/docs/changelog.rst index 5adb97af0..d1cc0dc56 100644 --- a/docs/changelog.rst +++ b/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 diff --git a/docs/plugins/importfeeds.rst b/docs/plugins/importfeeds.rst index 80f5dab85..dcc2cf557 100644 --- a/docs/plugins/importfeeds.rst +++ b/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 \ No newline at end of file + m3u_name: newfiles.m3u diff --git a/docs/plugins/index.rst b/docs/plugins/index.rst index 38b03ffcd..74b4b77d1 100644 --- a/docs/plugins/index.rst +++ b/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 ''''''''''''''''''''''