From owner-svn-src-stable@freebsd.org  Mon Jul  3 13:02:22 2017
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@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 C4AB79E655D;
 Mon,  3 Jul 2017 13:02:22 +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 925026F573;
 Mon,  3 Jul 2017 13:02:22 +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 v63D2Lcj002933;
 Mon, 3 Jul 2017 13:02:21 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v63D2LV7002932;
 Mon, 3 Jul 2017 13:02:21 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201707031302.v63D2LV7002932@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:02:21 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r320596 - in stable: 10/sys/sys 11/sys/sys
X-SVN-Group: stable-10
X-SVN-Commit-Author: gjb
X-SVN-Commit-Paths: in stable: 10/sys/sys 11/sys/sys
X-SVN-Commit-Revision: 320596
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable>, 
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 03 Jul 2017 13:02:22 -0000

Author: gjb
Date: Mon Jul  3 13:02:21 2017
New Revision: 320596
URL: https://svnweb.freebsd.org/changeset/base/320596

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

Modified:
  stable/10/sys/sys/param.h
Directory Properties:
  stable/10/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/11/sys/sys/param.h
Directory Properties:
  stable/11/   (props changed)

Modified: stable/10/sys/sys/param.h
==============================================================================
--- stable/10/sys/sys/param.h	Mon Jul  3 10:24:49 2017	(r320595)
+++ stable/10/sys/sys/param.h	Mon Jul  3 13:02:21 2017	(r320596)
@@ -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