branding/conf/rhn_docs.conf | 1 -
java/code/src/com/redhat/rhn/common/conf/ConfigDefaults.java | 1 -
java/code/src/com/redhat/rhn/frontend/action/help/HelpAction.java | 5 -----
java/code/webapp/WEB-INF/pages/help/helpindex.jsp | 8 --------
4 files changed, 15 deletions(-)
New commits:
commit 20d9cd84073fd7262f75cc276a852fe59acfceb2
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Jun 17 15:55:35 2011 +0200
708957 - remove RHN Satellite Proxy Release Notes link
only an invalid link remained from the old times
diff --git a/branding/conf/rhn_docs.conf b/branding/conf/rhn_docs.conf
index fa12ea1..42878fc 100644
--- a/branding/conf/rhn_docs.conf
+++ b/branding/conf/rhn_docs.conf
@@ -4,4 +4,3 @@
docs.proxy_guide=http://www.redhat.com/docs/manuals/satellite/
docs.client_config_guide=http://www.redhat.com/docs/manuals/satellite/
docs.channel_mgmt_guide=http://www.redhat.com/docs/manuals/satellite/
docs.release_notes=https://fedorahosted.org/spacewalk/wiki/ReleaseNotes
-docs.proxy_release_notes=http://www.redhat.com/docs/manuals/satellite/
diff --git a/java/code/src/com/redhat/rhn/common/conf/ConfigDefaults.java
b/java/code/src/com/redhat/rhn/common/conf/ConfigDefaults.java
index a1885cf..add98da 100644
--- a/java/code/src/com/redhat/rhn/common/conf/ConfigDefaults.java
+++ b/java/code/src/com/redhat/rhn/common/conf/ConfigDefaults.java
@@ -108,7 +108,6 @@ public class ConfigDefaults {
public static final String DOC_CLIENT_CONFIG_GUIDE =
"docs.client_config_guide";
public static final String DOC_CHANNEL_MGMT_GUIDE =
"docs.channel_mgmt_guide";
public static final String DOC_RELEASE_NOTES = "docs.release_notes";
- public static final String DOC_PROXY_RELEASE_NOTES =
"docs.proxy_release_notes";
public static final String WEB_SUBSCRIBE_PROXY_CHANNEL =
"web.subscribe_proxy_channel";
diff --git a/java/code/src/com/redhat/rhn/frontend/action/help/HelpAction.java
b/java/code/src/com/redhat/rhn/frontend/action/help/HelpAction.java
index e3a6644..446cf8a 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/help/HelpAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/help/HelpAction.java
@@ -73,11 +73,6 @@ public class HelpAction extends RhnAction {
request.setAttribute("release_notes", doc);
}
- doc = Config.get().getString(ConfigDefaults.DOC_PROXY_RELEASE_NOTES);
- if (doc != null && doc.trim().length() > 0) {
- request.setAttribute("proxy_release_notes", doc);
- }
-
return mapping.findForward("default");
}
}
diff --git a/java/code/webapp/WEB-INF/pages/help/helpindex.jsp
b/java/code/webapp/WEB-INF/pages/help/helpindex.jsp
index e1897b8..9ec2eb3 100644
--- a/java/code/webapp/WEB-INF/pages/help/helpindex.jsp
+++ b/java/code/webapp/WEB-INF/pages/help/helpindex.jsp
@@ -66,14 +66,6 @@
<br />
</li>
- <li>
- <a style="font-size:12pt"
href=/rhn/help/dispatcher/proxy_release_notes>
- <bean:message key="help.jsp.proxyrelease.title"/>
- </a>
- <strong><bean:message
key="help.jsp.translation"/></strong>
- <br />
- </li>
-
</ul>
</body>