svn commit: r1802393 - in /subversion/trunk/tools/dist: release.py templates/stable-news.ezt

[da...@apache.org]

Author: danielsh
Date: Wed Jul 19 13:34:18 2017
New Revision: 1802393

URL: http://svn.apache.org/viewvc?rev=1802393&view=rev
Log:
* tools/dist/release.py
  (write_news): Pass IS_RECOMMENDED to the news template.

* tools/dist/templates/stable-news.ezt
    Don't describe a minor line other than RECOMMENDED_RELEASE as the "most
    complete" to date.

Found by: rhuijben

Modified:
    subversion/trunk/tools/dist/release.py
    subversion/trunk/tools/dist/templates/stable-news.ezt

Modified: subversion/trunk/tools/dist/release.py
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/dist/release.py?rev=1802393&r1=1802392&r2=1802393&view=diff
==============================================================================
--- subversion/trunk/tools/dist/release.py (original)
+++ subversion/trunk/tools/dist/release.py Wed Jul 19 13:34:18 2017
@@ -771,6 +771,7 @@ def write_news(args):
              'version' : str(args.version),
              'version_base' : args.version.base,
              'anchor': args.version.get_download_anchor(),
+             'is_recommended': ezt_bool(args.version.is_recommended()),
            }
 
     if args.version.is_prerelease():

Modified: subversion/trunk/tools/dist/templates/stable-news.ezt
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/dist/templates/stable-news.ezt?rev=1802393&r1=1802392&r2=1802393&view=diff
==============================================================================
--- subversion/trunk/tools/dist/templates/stable-news.ezt (original)
+++ subversion/trunk/tools/dist/templates/stable-news.ezt Wed Jul 19 13:34:18 2017
@@ -5,8 +5,14 @@
 </h3> 
  
 <p>We are pleased to announce the release of Apache Subversion [version].
+[if-any is_recommended]
    This is the most complete Subversion release to date, and we encourage
-   users of Subversion to upgrade as soon as reasonable.  Please see the
+   users of Subversion to upgrade as soon as reasonable.
+[else]
+   This is the most complete release of the [major-minor].x line to date,
+   and we encourage all users to upgrade as soon as reasonable.
+[end]
+   Please see the
    <a href=""
    >release announcement</a> and the
    <a href="http://svn.apache.org/repos/asf/subversion/tags/[version]/CHANGES"