From 2ae77ed81a53651400d05e9c83844050aacd5d47 Mon Sep 17 00:00:00 2001
From: svetlana maleeva <svetlana.maleeva@onlyoffice.com>
Date: Fri, 26 Jul 2024 13:36:00 +0300
Subject: [PATCH 1/3] Update Changelog.md

---
 Changelog.md | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/Changelog.md b/Changelog.md
index 5283a4082..d73a321f4 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,5 +1,37 @@
 # Changelog
 
+## 1.24.0
+
+### Edited articles for DocSpace 2.6 
+
+*  https://helpcenter.onlyoffice.com/administration/docspace-settings.aspx
+*  https://helpcenter.onlyoffice.com/userguides/docspace-creating-rooms.aspx
+*  https://helpcenter.onlyoffice.com/userguides/docspace-gettingstarted.aspx
+*  https://helpcenter.onlyoffice.com/userguides/docspace-inviting-users-to-rooms.aspx
+*  https://helpcenter.onlyoffice.com/userguides/docspace-managing-rooms.aspx
+*  https://helpcenter.onlyoffice.com/userguides/docspace-room-manager-settings.aspx
+*  https://helpcenter.onlyoffice.com/userguides/docspace-inviting-users.aspx
+*  https://helpcenter.onlyoffice.com/userguides/docspace-managing-documents.aspx
+*  https://helpcenter.onlyoffice.com/installation/docspace-changelog.aspx
+
+### New articles
+
+*  https://helpcenter.onlyoffice.com/administration/docspace-ldap.aspx
+*  https://helpcenter.onlyoffice.com/administration/docspace-workspace-migration.aspx
+*  https://helpcenter.onlyoffice.com/administration/docspace-google-migration.aspx
+*  https://helpcenter.onlyoffice.com/administration/docspace-nextcloud-migration.aspx
+
+### Translations
+
+* Update keyboard shortcuts in languages
+* Update German translations  for Docs v8.1
+
+### Other fixes
+
+* https://helpcenter.onlyoffice.com/installation/docspace-enterprise-https-docker.aspx - fix #72
+* https://helpcenter.onlyoffice.com/installation/docs-community-install-windows.aspx, https://helpcenter.onlyoffice.com/installation/docs-enterprise-install-windows.aspx, https://helpcenter.onlyoffice.com/installation/docs-developer-install-windows.aspx - update articles for v8.1.1
+* Add Google Tag Manager
+
 ## 1.23.0
 
 ### Edited articles for Docs 8.1

From c833e58c625cf2fff9d38205acfb5b1372e677c7 Mon Sep 17 00:00:00 2001
From: svetlana maleeva <svetlana.maleeva@onlyoffice.com>
Date: Tue, 30 Jul 2024 16:30:29 +0300
Subject: [PATCH 2/3] Edit 2 DocSpace articles

---
 Web/Controls/Help/GettingStarted/Docspace/DocSpaceSettings.ascx | 1 +
 .../Help/Server/DocSpace/HTTPSDSDocker/HTTPSDSDocker.ascx       | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Web/Controls/Help/GettingStarted/Docspace/DocSpaceSettings.ascx b/Web/Controls/Help/GettingStarted/Docspace/DocSpaceSettings.ascx
index fde9a41b5..a48e25780 100644
--- a/Web/Controls/Help/GettingStarted/Docspace/DocSpaceSettings.ascx
+++ b/Web/Controls/Help/GettingStarted/Docspace/DocSpaceSettings.ascx
@@ -152,6 +152,7 @@
                 </li>
                 <li>After the request is processed, your custom domain name will be displayed in the <b>DNS settings</b> section.</li>
             </ol>
+            <div class="notehelp nh_important"><span class="important_notice_label">Important</span>In the server version, you need to configure the domain so that notification services like whatsnew provide the correct links.</div>
 
             <div class="inner_delimiter"></div>
 			<h5 id="DocSpacerenaming">DocSpace renaming</h5>
diff --git a/Web/Controls/Help/Server/DocSpace/HTTPSDSDocker/HTTPSDSDocker.ascx b/Web/Controls/Help/Server/DocSpace/HTTPSDSDocker/HTTPSDSDocker.ascx
index 22d46249c..537d6f633 100644
--- a/Web/Controls/Help/Server/DocSpace/HTTPSDSDocker/HTTPSDSDocker.ascx
+++ b/Web/Controls/Help/Server/DocSpace/HTTPSDSDocker/HTTPSDSDocker.ascx
@@ -30,7 +30,7 @@
             <p>Where:</p>
             <ul>
                 <li><code>letsencryptmail</code> is the email used for registration and recovery contact. Use comma to register multiple emails, for example: u1@example.com,u2@example.com.</li>
-                <li><code>letsencryptdomain</code> is the address of the domain where your <b><%= ((BasePage)Page).EditionVersion %></b> portal is installed.</li>
+                <li><code>letsencryptdomain</code> is the address of the domain where your <b><%= ((BasePage)Page).EditionVersion %></b> portal is installed. Use comma to register multiple domains, for example: yourdomain1.com,yourdomain2.com.</li>
             </ul>            
             <p>The script will automatically create and install the <a target="_blank" href="https://letsencrypt.org/">letsencrypt.org</a> CA-signed certificate to your server and restart the NGINX service for the changes to take effect.</p>
             <p>If you want to switch to HTTPS already installed DocSpace, you can launch switching to HTTPS manually from the <code>/app/onlyoffice/config/docspace-ssl-setup</code> file:</p>

From 4d2e2a258428b7abc2f7f855320146281f1c04f3 Mon Sep 17 00:00:00 2001
From: svetlana maleeva <svetlana.maleeva@onlyoffice.com>
Date: Tue, 30 Jul 2024 16:55:56 +0300
Subject: [PATCH 3/3] Remove script

---
 Web/Masters/BaseMaster.master | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/Web/Masters/BaseMaster.master b/Web/Masters/BaseMaster.master
index 4f5b018fc..570f8f80d 100644
--- a/Web/Masters/BaseMaster.master
+++ b/Web/Masters/BaseMaster.master
@@ -126,18 +126,6 @@ j = d.createElement(s), dl = l != 'dataLayer' ? '&l=' + l : ''; j.async = true;
         <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
 
-    <script type="text/javascript">
-        var _gaq = _gaq || [];
-        _gaq.push(['_setAccount', 'UA-12442749-5']);
-        _gaq.push(['_setDomainName', '.onlyoffice.com']);
-        _gaq.push(['_trackPageview']);
-
-        (function() {
-            var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-            ga.src = ('https:' == document.location.protocol ? 'https://' : 'http://') + 'stats.g.doubleclick.net/dc.js';
-            var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-        })();
-    </script>
     <script>
             var path = '<%=VirtualPathUtility.ToAbsolute("~/search.aspx")%>';
     </script>