From 0678ffdaff89882e19629a00be9ff3d3b9b4a3a1 Mon Sep 17 00:00:00 2001
From: Anton Makeev <Anton.Makeev@jetbrains.com>
Date: Sat, 17 Sep 2016 10:31:47 +0200
Subject: [PATCH] IDEA-153233 Default base URL for invoking help from products
 has changed

---
 .../src/idea/IdeaApplicationInfo.xml               |  2 +-
 .../com/intellij/help/impl/HelpManagerImpl.java    | 14 ++------------
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/community-resources/src/idea/IdeaApplicationInfo.xml b/community-resources/src/idea/IdeaApplicationInfo.xml
index 731a5c8e8af0..a402ac9c78b9 100644
--- a/community-resources/src/idea/IdeaApplicationInfo.xml
+++ b/community-resources/src/idea/IdeaApplicationInfo.xml
@@ -16,7 +16,7 @@
                patches="http://download.jetbrains.com/idea/"/>
 
   <help file="ideahelp.jar" root="idea"/>
-  <documentation url="https://www.jetbrains.com/idea/documentation"/>
+  <documentation url="https://www.jetbrains.com/help/idea"/>
   <support url="https://www.jetbrains.com/support/idea/index.html"/>
   <feedback eap-url="https://youtrack.jetbrains.com/newissue?project=IDEA&amp;clearDraft=true&amp;c=Affected+versions+$BUILD&amp;description=$DESCR"
             release-url="https://www.jetbrains.com/feedback/feedback.jsp?product=IDEA&amp;build=$BUILD&amp;timezone=$TIMEZONE&amp;eval=$EVAL"/>
diff --git a/platform/platform-impl/src/com/intellij/help/impl/HelpManagerImpl.java b/platform/platform-impl/src/com/intellij/help/impl/HelpManagerImpl.java
index 3edb1041c4f5..63222252c3cd 100644
--- a/platform/platform-impl/src/com/intellij/help/impl/HelpManagerImpl.java
+++ b/platform/platform-impl/src/com/intellij/help/impl/HelpManagerImpl.java
@@ -66,22 +66,12 @@ public class HelpManagerImpl extends HelpManager {
       String productVersion = info.getMajorVersion() + "." + info.getMinorVersion();
       String productCode = info.getPackageCode();
 
-      String url = info.getWebHelpUrl() + "?";
+      String url = info.getWebHelpUrl() + "/" + productVersion + "/?" + id;
       
       if (PlatformUtils.isJetBrainsProduct()) {
-        url += "utm_source=from_product&utm_medium=help_link&utm_campaign=" + productCode + "&utm_content=" + productVersion + "&";
+        url += "&utm_source=from_product&utm_medium=help_link&utm_campaign=" + productCode + "&utm_content=" + productVersion;
       }
 
-      if (PlatformUtils.isCLion()) {
-        url += "Keyword=" + id;
-        url += "&ProductVersion=" + productVersion;
-        
-        if (info.isEAP()) {
-          url += "&EAP"; 
-        }
-      } else {
-        url += id;
-      }
       BrowserUtil.browse(url);
       return;
     }