Merge branch 'master' into fix-fmp4-flac-opus

3 files changed, 57 insertions, 12 deletions

diff --git a/MediaBrowser.Model/Entities/ExtraType.cs b/MediaBrowser.Model/Entities/ExtraType.cs
index aca4bd282..66da80d96 100644
--- a/MediaBrowser.Model/Entities/ExtraType.cs
+++ b/MediaBrowser.Model/Entities/ExtraType.cs
@@ -13,6 +13,8 @@ namespace MediaBrowser.Model.Entities
         Scene = 6,
         Sample = 7,
         ThemeSong = 8,
-        ThemeVideo = 9
+        ThemeVideo = 9,
+        Featurette = 10,
+        Short = 11
     }
 }
diff --git a/MediaBrowser.Model/Entities/MetadataProvider.cs b/MediaBrowser.Model/Entities/MetadataProvider.cs
index 37e3d8864..bd8db9941 100644
--- a/MediaBrowser.Model/Entities/MetadataProvider.cs
+++ b/MediaBrowser.Model/Entities/MetadataProvider.cs
@@ -1,5 +1,3 @@
-#pragma warning disable CS1591
-
 namespace MediaBrowser.Model.Entities
 {
     /// <summary>
@@ -14,38 +12,78 @@ namespace MediaBrowser.Model.Entities
         Custom = 0,
 
         /// <summary>
-        /// The imdb.
+        /// The IMDb provider.
         /// </summary>
         Imdb = 2,
 
         /// <summary>
-        /// The TMDB.
+        /// The TMDb provider.
         /// </summary>
         Tmdb = 3,
 
         /// <summary>
-        /// The TVDB.
+        /// The TVDb provider.
         /// </summary>
         Tvdb = 4,
 
         /// <summary>
-        /// The tvcom.
+        /// The tvcom providerd.
         /// </summary>
         Tvcom = 5,
 
         /// <summary>
-        /// Tmdb Collection Id.
+        /// TMDb collection provider.
         /// </summary>
         TmdbCollection = 7,
+
+        /// <summary>
+        /// The MusicBrainz album provider.
+        /// </summary>
         MusicBrainzAlbum = 8,
+
+        /// <summary>
+        /// The MusicBrainz album artist provider.
+        /// </summary>
         MusicBrainzAlbumArtist = 9,
+
+        /// <summary>
+        /// The MusicBrainz artist provider.
+        /// </summary>
         MusicBrainzArtist = 10,
+
+        /// <summary>
+        /// The MusicBrainz release group provider.
+        /// </summary>
         MusicBrainzReleaseGroup = 11,
+
+        /// <summary>
+        /// The Zap2It provider.
+        /// </summary>
         Zap2It = 12,
+
+        /// <summary>
+        /// The TvRage provider.
+        /// </summary>
         TvRage = 15,
+
+        /// <summary>
+        /// The AudioDb artist provider.
+        /// </summary>
         AudioDbArtist = 16,
+
+        /// <summary>
+        /// The AudioDb collection provider.
+        /// </summary>
         AudioDbAlbum = 17,
+
+        /// <summary>
+        /// The MusicBrainz track provider.
+        /// </summary>
         MusicBrainzTrack = 18,
+
+        /// <summary>
+        /// The TvMaze provider.
+        /// </summary>
         TvMaze = 19
     }
 }
diff --git a/MediaBrowser.Model/Entities/SeriesStatus.cs b/MediaBrowser.Model/Entities/SeriesStatus.cs
index c77c4a8ad..1cff24e2a 100644
--- a/MediaBrowser.Model/Entities/SeriesStatus.cs
+++ b/MediaBrowser.Model/Entities/SeriesStatus.cs
@@ -1,18 +1,23 @@
 namespace MediaBrowser.Model.Entities
 {
     /// <summary>
-    /// Enum SeriesStatus.
+    /// The status of a series.
     /// </summary>
     public enum SeriesStatus
     {
         /// <summary>
-        /// The continuing.
+        /// The continuing status. This indicates that a series is currently releasing.
         /// </summary>
         Continuing,
 
         /// <summary>
-        /// The ended.
+        /// The ended status. This indicates that a series has completed and is no longer being released.
         /// </summary>
-        Ended
+        Ended,
+
+        /// <summary>
+        /// The unreleased status. This indicates that a series has not been released yet.
+        /// </summary>
+        Unreleased
     }
 }