Merge remote-tracking branch 'upstream/master' into security-path-traversal-fixes

# Conflicts:
#	Jellyfin.Api/Controllers/HlsSegmentController.cs
#	Jellyfin.Api/Controllers/PluginsController.cs

1 files changed, 14 insertions, 2 deletions

diff --git a/MediaBrowser.Controller/Entities/SourceType.cs b/MediaBrowser.Controller/Entities/SourceType.cs
index be19e1bdae..97aa22dc04 100644
--- a/MediaBrowser.Controller/Entities/SourceType.cs
+++ b/MediaBrowser.Controller/Entities/SourceType.cs
@@ -1,11 +1,23 @@
-#pragma warning disable CS1591
-
 namespace MediaBrowser.Controller.Entities
 {
+    /// <summary>
+    /// The source of an item.
+    /// </summary>
     public enum SourceType
     {
+        /// <summary>
+        /// The item comes from a library.
+        /// </summary>
         Library = 0,
+
+        /// <summary>
+        /// The item comes from a channel.
+        /// </summary>
         Channel = 1,
+
+        /// <summary>
+        /// The item comes from live TV.
+        /// </summary>
         LiveTV = 2
     }
 }