Fixed merge.

2 files changed, 17 insertions, 1 deletions

diff --git a/MediaBrowser.Model/Configuration/PathSubstitution.cs b/MediaBrowser.Model/Configuration/PathSubstitution.cs
index a066886e2..f47eabd1e 100644
--- a/MediaBrowser.Model/Configuration/PathSubstitution.cs
+++ b/MediaBrowser.Model/Configuration/PathSubstitution.cs
@@ -9,11 +9,19 @@ using MediaBrowser.Model.Updates;
 
 namespace MediaBrowser.Model.Configuration
 {
-
+    /// <summary>
+    /// Defines the <see cref="PathSubstitution" />.
+    /// </summary>
     public class PathSubstitution
     {
+        /// <summary>
+        /// Gets or sets the value to substitute.
+        /// </summary>
         public string From { get; set; } = string.Empty;
 
+        /// <summary>
+        /// Gets or sets the value to substitution with.
+        /// </summary>
         public string To { get; set; } = string.Empty;
     }
 }
diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
index 08bda14ba..d3e29d6a4 100644
--- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
@@ -13,8 +13,16 @@ namespace MediaBrowser.Model.Configuration
     /// </summary>
     public class ServerConfiguration : BaseApplicationConfiguration
     {
+        /// <summary>
+        /// The default value for <see cref="HttpServerPortNumber"/>.
+        /// </summary>
         public const int DefaultHttpPort = 8096;
+
+        /// <summary>
+        /// The default value for <see cref="PublicHttpsPort"/> and <see cref="HttpsPortNumber"/>.
+        /// </summary>
         public const int DefaultHttpsPort = 8920;
+
         private string _baseUrl = string.Empty;
 
         /// <summary>