modules/enterprise/gui/portal-war/src/main/webapp-filtered/WEB-INF/classes/ApplicationResources.properties | 4 ++-- modules/enterprise/gui/portal-war/src/main/webapp/common/RSSFormat.jsp | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-)
New commits: commit 6c0f0ebe7f448eb3aec0acdf04f581146938f45a Merge: 354dd60... 59776e2... Author: Heiko W. Rupp hwr@redhat.com Date: Tue Feb 23 15:29:43 2010 +0100
Merge branch 'master' into alertPlugin
commit 59776e2009c2e2b17ca45d5c88e6373def9da879 Author: Ian P. Springer <ips@jetengine.(none)> Date: Tue Feb 23 09:23:23 2010 -0500
fix a couple invalid docs URLs
diff --git a/modules/enterprise/gui/portal-war/src/main/webapp-filtered/WEB-INF/classes/ApplicationResources.properties b/modules/enterprise/gui/portal-war/src/main/webapp-filtered/WEB-INF/classes/ApplicationResources.properties index 571cf22..8132311 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp-filtered/WEB-INF/classes/ApplicationResources.properties +++ b/modules/enterprise/gui/portal-war/src/main/webapp-filtered/WEB-INF/classes/ApplicationResources.properties @@ -88,7 +88,7 @@ common.field.value=Value
common.marketing.FeatureDisabled=This feature is unavailable, please contact sales to upgrade
-common.url.help=https://network.jboss.com/confluence/display/DOC/Users+Guide +common.url.help=http://www.rhq-project.org/display/JOPR2
common.error.invalid.oid=OID specified is invalid, please enter OID in form of 1.2.3.4
@@ -2916,7 +2916,7 @@ software.common.InstallPreview.PatchTitle=Title software.common.InstallPreview.StepDescription=Step Description software.common.InstallPreview.ShortDescription=Short Description software.common.InstallPreview.LongDescription=Detailed Description -software.common.InstallPreview.TopMessage=Clicking the [Install] button will begin the execution of the steps listed below. Review each step carefully before proceeding with the update installation.<br/><ul><li>Prior to installing this update, if you have applied any one-off fixes to this instance, please check the update description to see that they are included in the fixes that make up this update. If they are not included then this update may overwrite the one-off fix and leave your instance in an unstable state.</li><li>When updating a JBoss instance that shares a common server configuration, follow the instructions documented in the wiki: <a href="https://network.jboss.com/confluence/display/DOC/Installing+a+Patch" target="_new">Installing a Patch</a>. Please contact support for more information.</li></ul> +software.common.InstallPreview.TopMessage=Clicking the [Install] button will begin the execution of the steps listed below. Review each step carefully before proceeding with the update installation.<br/><ul><li>Prior to installing this update, if you have applied any one-off fixes to this instance, please check the update description to see that they are included in the fixes that make up this update. If they are not included then this update may overwrite the one-off fix and leave your instance in an unstable state.</li><li>When updating a JBoss instance that shares a common server configuration, follow the instructions documented in the wiki: <a href="http://www.rhq-project.org/display/JOPR2/Demos#Demos-ContentSubsystem" target="_new">Installing a Patch</a>. Please contact support for more information.</li></ul> software.common.InstallPreview.NotAllowedToInstall=This user doesn't have the appropriate rights to install an update. Only users that can control a resource may install an update.
software.common.ManualUninstall.TableTitle=Manual Update Uninstallation
commit b3c691dfd0f407658ba9004bbcbdda0c235404ef Author: Ian P. Springer <ips@jetengine.(none)> Date: Tue Feb 23 09:22:03 2010 -0500
fix regression in RSS feed template (https://bugzilla.redhat.com/show_bug.cgi?id=567636)
diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/common/RSSFormat.jsp b/modules/enterprise/gui/portal-war/src/main/webapp/common/RSSFormat.jsp index 59bb5d1..3831ebb 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/common/RSSFormat.jsp +++ b/modules/enterprise/gui/portal-war/src/main/webapp/common/RSSFormat.jsp @@ -1,10 +1,10 @@ -<?xml version="1.0" encoding="utf-8" ?> +<?xml version="1.0" encoding="UTF-8"?> <%@ page language="java" contentType="text/xml" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %> <%@ taglib uri="http://jakarta.apache.org/struts/tags-html-el" prefix="html" %> <rss version="2.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:content="http://purl.org/rss/1.0/modules/content/"> - <repo> + <channel> <title><c:out value="${rssFeed.title}"/></title> <link><c:out value="${rssFeed.baseUrl}"/></link> <description><fmt:message key="dashboard.template.title"/> <c:out value="${rssFeed.title}"/></description> @@ -25,5 +25,6 @@ <guid><![CDATA[<c:out value="${item.guid}"/>]]></guid> </item> </c:forEach> - </repo> + </channel> </rss> +