[SCM] morituri/master: doc fixes

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 919076e720e8876fa64e71e36283a7b8f06e352d
Author: Thomas Vander Stichele <thomas (at) apestaart (dot) org>
Date:   Fri Oct 28 17:15:40 2011 +0000

    doc fixes

diff --git a/TODO b/TODO
index 1b55294..73e91c5 100644
--- a/TODO
+++ b/TODO
@@ -46,3 +46,7 @@ TODO:
 - possibly figure out how to name albums with credited artist; look at gorky and spiritualized electric mainline
 - when shortening file name then reripping, it rerips since it doesn't know
   the shortened name; see sufjan stevens
+- if a disc output dir is already there, see if it was properly finished;
+  complain if it was, to not overwrite
+- if multiple releases with different artist match the disc id, stop and
+  let user continue by choosing one
diff --git a/morituri/common/musicbrainzngs.py b/morituri/common/musicbrainzngs.py
index 96aeff3..fc759f6 100644
--- a/morituri/common/musicbrainzngs.py
+++ b/morituri/common/musicbrainzngs.py
@@ -75,7 +75,9 @@ class DiscMetadata(object):
 
 def _getMetadata(release, discid):
     """
-    @type  release: L{musicbrainz2.model.Release}
+    @type  release: C{dict}
+    @param release: a release dict as returned in the value for key release
+                    from get_release_by_id
 
     @rtype: L{DiscMetadata} or None
     """

-- 
morituri packaging