From c748366850b33d8c93f241964f21b2619f21b73a Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sledru@mozilla.com>
Date: Wed, 23 Dec 2015 20:38:31 +0100
Subject: [PATCH] Bug 1047395 - Add a link to the release notes from the about
 page r=florian

---
 browser/base/content/aboutDialog.css                 | 4 ++++
 browser/base/content/aboutDialog.xul                 | 6 ++++++
 browser/locales/en-US/chrome/browser/aboutDialog.dtd | 2 ++
 3 files changed, 12 insertions(+)

diff --git a/browser/base/content/aboutDialog.css b/browser/base/content/aboutDialog.css
index b3e18f3977a0..91397283d132 100644
--- a/browser/base/content/aboutDialog.css
+++ b/browser/base/content/aboutDialog.css
@@ -37,6 +37,10 @@
   margin-right: 0;
 }
 
+#releasenotes {
+  margin-top: 10px;
+}
+
 #distribution,
 #distributionId {
   display: none;
diff --git a/browser/base/content/aboutDialog.xul b/browser/base/content/aboutDialog.xul
index 378d5872722b..a0403f2ac6ce 100644
--- a/browser/base/content/aboutDialog.xul
+++ b/browser/base/content/aboutDialog.xul
@@ -44,7 +44,13 @@
     <hbox id="clientBox">
       <vbox id="leftBox" flex="1"/>
       <vbox id="rightBox" flex="1">
+        <hbox align="baseline">
 #expand <label id="version">__MOZ_APP_VERSION_DISPLAY__</label>
+#ifndef NIGHTLY_BUILD
+#expand <label id="releasenotes" class="text-link" href="https://www.mozilla.org/firefox/__MOZ_APP_VERSION__/releasenotes/">&releaseNotes.link;</label>
+#endif
+        </hbox>
+
         <label id="distribution" class="text-blurb"/>
         <label id="distributionId" class="text-blurb"/>
 
diff --git a/browser/locales/en-US/chrome/browser/aboutDialog.dtd b/browser/locales/en-US/chrome/browser/aboutDialog.dtd
index 3abded36e3fd..e99506da9bba 100644
--- a/browser/locales/en-US/chrome/browser/aboutDialog.dtd
+++ b/browser/locales/en-US/chrome/browser/aboutDialog.dtd
@@ -46,6 +46,8 @@
 <!ENTITY helpus.getInvolvedLink     "get involved!">
 <!ENTITY helpus.end                 "">
 
+<!ENTITY releaseNotes.link   "What's new">
+
 <!-- LOCALIZATION NOTE (bottomLinks.license): This is a link title that links to about:license. -->
 <!ENTITY bottomLinks.license        "Licensing Information">