From owner-freebsd-current@freebsd.org Fri Apr 16 16:38:45 2021 Return-Path: Delivered-To: freebsd-current@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B815D5D6EE3 for ; Fri, 16 Apr 2021 16:38:45 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: from mailman.nyi.freebsd.org (unknown [127.0.1.3]) by mx1.freebsd.org (Postfix) with ESMTP id 4FMMNP4n4wz4Zhj for ; Fri, 16 Apr 2021 16:38:45 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: by mailman.nyi.freebsd.org (Postfix) id A1FF85D71D3; Fri, 16 Apr 2021 16:38:45 +0000 (UTC) Delivered-To: current@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id A1C9F5D7383 for ; Fri, 16 Apr 2021 16:38:45 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FMMNP4FRRz4Zws; Fri, 16 Apr 2021 16:38:45 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: from mail-qk1-f176.google.com (mail-qk1-f176.google.com [209.85.222.176]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) (Authenticated sender: kevans) by smtp.freebsd.org (Postfix) with ESMTPSA id 7F3B82F464; Fri, 16 Apr 2021 16:38:45 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: by mail-qk1-f176.google.com with SMTP id s5so20702507qkj.5; Fri, 16 Apr 2021 09:38:45 -0700 (PDT) X-Gm-Message-State: AOAM532hXqu8cfda9Sm+Ho5cwrhhsFHI09wCppnQ3/IXd3+v53+yu3V5 UnFn+t+bnjDd0VqA7oxfE1WcLh8WfWhfbGVhjsg= X-Google-Smtp-Source: ABdhPJz57tO7x1rhKMex0I+Uv3WiSnZ60i2z4ujMiZMiOOXwEP6RfcO7ept1nGxmVUa+QzSFJtxXPx5Xqi/FDZpArn8= X-Received: by 2002:a05:620a:b0a:: with SMTP id t10mr64690qkg.103.1618591125142; Fri, 16 Apr 2021 09:38:45 -0700 (PDT) MIME-Version: 1.0 References: <485d4871-9890-9463-83c8-fe8d79729278@gwdg.de> In-Reply-To: <485d4871-9890-9463-83c8-fe8d79729278@gwdg.de> From: Kyle Evans Date: Fri, 16 Apr 2021 11:38:31 -0500 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: sys/sys/param.h: 'main' instead of 'Master'? To: rhurlin@freebsd.org Cc: current Content-Type: text/plain; charset="UTF-8" X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 16 Apr 2021 16:38:45 -0000 n Fri, Apr 16, 2021 at 11:36 AM Rainer Hurling wrote: > > While viewing sys/sys/param.h I noticed that the comment of the > definition of __FreeBSD_version is probably out of date. > > Since the switch to Git, doesn't it have to be 'main' instead of 'master'? > This isn't based on a branch name, though I guess if one were going to touch it anyways then "Authoritative" would be a better descriptor. > #cd /usr/src > #diff -urN sys/sys/param.h.orig sys/sys/param.h | colordiff > --- sys/sys/param.h.orig 2021-04-09 12:59:25.363286000 +0200 > +++ sys/sys/param.h 2021-04-16 18:28:46.621429000 +0200 > @@ -60,7 +60,7 @@ > * in the range 5 to 9. > */ > #undef __FreeBSD_version > -#define __FreeBSD_version 1400007 /* Master, propagated to newvers */ > +#define __FreeBSD_version 1400007 /* main, propagated to newvers */ > > /* > * __FreeBSD_kernel__ indicates that this system uses the kernel of > FreeBSD, > > _______________________________________________ > freebsd-current@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/freebsd-current > To unsubscribe, send any mail to "freebsd-current-unsubscribe@freebsd.org"