Merge remote-tracking branch 'remotes/jellyfin/api-migration' into api-audio

# Conflicts:
#	Emby.Server.Implementations/ApplicationHost.cs
#	Jellyfin.Api/Helpers/TranscodingJobHelper.cs

1 files changed, 6 insertions, 4 deletions

diff --git a/MediaBrowser.Model/LiveTv/LiveTvChannelQuery.cs b/MediaBrowser.Model/LiveTv/LiveTvChannelQuery.cs
index d1a94d8b3..2b2377fda 100644
--- a/MediaBrowser.Model/LiveTv/LiveTvChannelQuery.cs
+++ b/MediaBrowser.Model/LiveTv/LiveTvChannelQuery.cs
@@ -54,7 +54,7 @@ namespace MediaBrowser.Model.LiveTv
         public int? StartIndex { get; set; }
 
         /// <summary>
-        /// The maximum number of items to return
+        /// The maximum number of items to return.
         /// </summary>
         /// <value>The limit.</value>
         public int? Limit { get; set; }
@@ -64,16 +64,17 @@ namespace MediaBrowser.Model.LiveTv
         /// </summary>
         /// <value><c>true</c> if [add current program]; otherwise, <c>false</c>.</value>
         public bool AddCurrentProgram { get; set; }
+
         public bool EnableUserData { get; set; }
 
         /// <summary>
-        /// Used to specific whether to return news or not
+        /// Used to specific whether to return news or not.
         /// </summary>
         /// <remarks>If set to null, all programs will be returned</remarks>
         public bool? IsNews { get; set; }
 
         /// <summary>
-        /// Used to specific whether to return movies or not
+        /// Used to specific whether to return movies or not.
         /// </summary>
         /// <remarks>If set to null, all programs will be returned</remarks>
         public bool? IsMovie { get; set; }
@@ -88,12 +89,13 @@ namespace MediaBrowser.Model.LiveTv
         /// </summary>
         /// <value><c>null</c> if [is sports] contains no value, <c>true</c> if [is sports]; otherwise, <c>false</c>.</value>
         public bool? IsSports { get; set; }
+
         public bool? IsSeries { get; set; }
 
         public string[] SortBy { get; set; }
 
         /// <summary>
-        /// The sort order to return results with
+        /// The sort order to return results with.
         /// </summary>
         /// <value>The sort order.</value>
         public SortOrder? SortOrder { get; set; }