From owner-dev-commits-doc-all@freebsd.org Tue Apr 20 13:15:48 2021 Return-Path: Delivered-To: dev-commits-doc-all@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 B02685F59D4 for ; Tue, 20 Apr 2021 13:15:48 +0000 (UTC) (envelope-from fernando.apesteguia@gmail.com) Received: from mail-yb1-xb34.google.com (mail-yb1-xb34.google.com [IPv6:2607:f8b0:4864:20::b34]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FPkhN4QDvz4k6Z; Tue, 20 Apr 2021 13:15:48 +0000 (UTC) (envelope-from fernando.apesteguia@gmail.com) Received: by mail-yb1-xb34.google.com with SMTP id v3so40567034ybi.1; Tue, 20 Apr 2021 06:15:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=LsfZdKrS5aieasB1vnEL+JEND1nPQi6Z9cwYcAFaqWw=; b=pq8BuhHgq/3FoIoEbXhuGFJxnR8yMMqIMlPKQPG0+XyqJknXVjlc7f7jO8fVzQ2368 pU3x+2EEjLs35Y1zfEhtawlfBRC1ahIV7x6AksJab9tTVhGnJj1Yzh4czNS3L5maW9WY WYEXU3nEdTC3Y4mJWVjHbAfZJOcHAixWvPWdg3N71269TqcSYu/d72rU9Uxt8qTTnkUT Cm0wobCrZgzSFIDH4m9rAuwhR2ltzXKGgkV0mUjomD2ObH7s5GYVxWERW9j6jxm2iLyQ Ytt9oRI+rctvXmGGF7sdu0KhF81abE31zjA+g4A7XJMhd1EWgvvM8oX7qvrDJtQai2Nh eAVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=LsfZdKrS5aieasB1vnEL+JEND1nPQi6Z9cwYcAFaqWw=; b=anUVPeOmaMa7LIA40PQB4BMmZ8n8mY14Ergv2rcCIVXpb41T6p/TLCy0HOvZkk2WXV KHX9jD7T/HRMfsuQmnwFl7LjmlDcI07w8w9/35HJ+031bP16IvQPGfToD07fFESuaegX S0okVHHnAbpFlbqG5JXhQaWVhmhFcW/o5f6Ao6wVZdRHyc07BPyH2Ab+5dgaLHxfcg/B 8hEagH7crIPxuHezVNEo9OzD5ecLXievlaCNOskqq+is2jhonG2jJZDLv/DXdTlofgO0 UP2BXuByIkT1MF99xxIkrrKpf4Jkz1xKBMpmzV/M6WbeBun7ff4jnXxGTkPWTSDzfW6y GFTA== X-Gm-Message-State: AOAM532QH+MTZ+CYTG03CVTF8EUjqhPw8+JGVQJqPS0/3JxlF3+iYBNQ QMGvN6zR8ii46vH8U6tewQRMFXRtjbuArDSwufgyXUrQ/JNBcw== X-Google-Smtp-Source: ABdhPJy5RrSYv0iLZjlfmPNJ4Lub6BxGQSAKWW+2rDPviq2R5DHQo/YzHduuBQ35b1PEBewS9SPnDE5REGgGmDEeKe8= X-Received: by 2002:a05:6902:532:: with SMTP id y18mr24316400ybs.377.1618924546519; Tue, 20 Apr 2021 06:15:46 -0700 (PDT) MIME-Version: 1.0 References: <202104201032.13KAWNFn016258@gitrepo.freebsd.org> <20210420122849.rh5v2kohzvkxs4uu@aching.in.mat.cc> <3252cd06-4140-0bc2-e958-983b4a2453c2@FreeBSD.org> In-Reply-To: <3252cd06-4140-0bc2-e958-983b4a2453c2@FreeBSD.org> From: =?UTF-8?Q?Fernando_Apestegu=C3=ADa?= Date: Tue, 20 Apr 2021 15:12:18 +0200 Message-ID: Subject: Re: git: ceee1def00 - main - articles/committers-guide: Document change in MFH policy To: Mateusz Piotrowski <0mp@freebsd.org> Cc: Mathieu Arnold , doc-committers@freebsd.org, dev-commits-doc-all@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 4FPkhN4QDvz4k6Z X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; TAGGED_FROM(0.00)[] X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Apr 2021 13:15:48 -0000 On Tue, Apr 20, 2021 at 2:39 PM Mateusz Piotrowski <0mp@freebsd.org> wrote: > > On 20/04/2021 14:28, Mathieu Arnold wrote: > > On Tue, Apr 20, 2021 at 10:32:23AM +0000, Mateusz Piotrowski wrote: > >> The branch main has been updated by 0mp: > >> > >> URL: https://cgit.FreeBSD.org/doc/commit/?id=ceee1def00ac69f06b9d86b2fb1ff04bb6c84d48 > >> > >> commit ceee1def00ac69f06b9d86b2fb1ff04bb6c84d48 > >> Author: Mateusz Piotrowski <0mp@FreeBSD.org> > >> AuthorDate: 2021-04-20 10:14:58 +0000 > >> Commit: Mateusz Piotrowski <0mp@FreeBSD.org> > >> CommitDate: 2021-04-20 10:14:58 +0000 > >> > >> articles/committers-guide: Document change in MFH policy > >> > >> Merging commits into the quarterly branch no longer requires an explicit > >> approval [1]. Let's remove outdated documentation and leave a note > >> explaining that there is no need for an explicit approval to MFH. > > Note that the MFH line should still be used to note intent. > Hmm, true. It does make sense to leave MFH in the table of metadata fields for this use case. I'll > bring back the MFH entry with an updated definition. The template still says: # MFH: Maybe something like "State your intention to merge this change" would be more appropriate.