Merge remote-tracking branch 'upstream/master' into tmdb-missing-episodes

# Conflicts:
#	Jellyfin.Server.Implementations/Item/BaseItemRepository.QueryBuilding.cs

1 files changed, 10 insertions, 2 deletions

diff --git a/MediaBrowser.Model/Configuration/ImageSavingConvention.cs b/MediaBrowser.Model/Configuration/ImageSavingConvention.cs
index 485a4d2f80..c67f379fde 100644
--- a/MediaBrowser.Model/Configuration/ImageSavingConvention.cs
+++ b/MediaBrowser.Model/Configuration/ImageSavingConvention.cs
@@ -1,10 +1,18 @@
-#pragma warning disable CS1591
-
 namespace MediaBrowser.Model.Configuration
 {
+    /// <summary>
+    /// The convention used for naming saved images.
+    /// </summary>
     public enum ImageSavingConvention
     {
+        /// <summary>
+        /// The legacy naming convention.
+        /// </summary>
         Legacy,
+
+        /// <summary>
+        /// The naming convention compatible with other media servers and metadata managers.
+        /// </summary>
         Compatible
     }
 }