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

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

1 files changed, 4 insertions, 3 deletions

diff --git a/MediaBrowser.Controller/Channels/IHasCacheKey.cs b/MediaBrowser.Controller/Channels/IHasCacheKey.cs
index 7d5207c34a..4cdda38bd9 100644
--- a/MediaBrowser.Controller/Channels/IHasCacheKey.cs
+++ b/MediaBrowser.Controller/Channels/IHasCacheKey.cs
@@ -1,14 +1,15 @@
-#pragma warning disable CS1591
-
 namespace MediaBrowser.Controller.Channels
 {
+    /// <summary>
+    /// Interface for channels that provide a cache key.
+    /// </summary>
     public interface IHasCacheKey
     {
         /// <summary>
         /// Gets the cache key.
         /// </summary>
         /// <param name="userId">The user identifier.</param>
-        /// <returns>System.String.</returns>
+        /// <returns>The cache key.</returns>
         string? GetCacheKey(string? userId);
     }
 }