From owner-svn-src-all@freebsd.org  Mon Jul  3 13:47:00 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2E8F59E736B;
 Mon,  3 Jul 2017 13:47:00 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id EFC4771131;
 Mon,  3 Jul 2017 13:46:59 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v63DkxgZ020287;
 Mon, 3 Jul 2017 13:46:59 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v63DkxlR020286;
 Mon, 3 Jul 2017 13:46:59 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201707031346.v63DkxlR020286@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org
 using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Mon, 3 Jul 2017 13:46:59 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-releng@freebsd.org
Subject: svn commit: r320598 - releng/11.1/sys/sys
X-SVN-Group: releng
X-SVN-Commit-Author: gjb
X-SVN-Commit-Paths: releng/11.1/sys/sys
X-SVN-Commit-Revision: 320598
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 03 Jul 2017 13:47:00 -0000

Author: gjb
Date: Mon Jul  3 13:46:58 2017
New Revision: 320598
URL: https://svnweb.freebsd.org/changeset/base/320598

Log:
  MFS11 r320596:
   MFC r320488:
    Correct the branch naming convention in param.h.
    While here, consistently use upper-case 'X' to represent the
    version number.
  
  Approved by:	re (kib, marius)
  Sponsored by:	The FreeBSD Foundation

Modified:
  releng/11.1/sys/sys/param.h
Directory Properties:
  releng/11.1/   (props changed)

Modified: releng/11.1/sys/sys/param.h
==============================================================================
--- releng/11.1/sys/sys/param.h	Mon Jul  3 13:41:05 2017	(r320597)
+++ releng/11.1/sys/sys/param.h	Mon Jul  3 13:46:58 2017	(r320598)
@@ -54,7 +54,7 @@
  *
  * scheme is:  <major><two digit minor>Rxx
  *		'R' is in the range 0 to 4 if this is a release branch or
- *		x.0-CURRENT before RELENG_*_0 is created, otherwise 'R' is
+ *		X.0-CURRENT before releng/X.0 is created, otherwise 'R' is
  *		in the range 5 to 9.
  */
 #undef __FreeBSD_version