From nobody Fri Sep 30 08:26:28 2022 X-Original-To: dev-commits-doc-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Mf3Gs0hYWz4YLYF for ; Fri, 30 Sep 2022 08:26:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Mf3Gs04WHz3DS9; Fri, 30 Sep 2022 08:26:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664526389; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=g70gENu32954Q1K33Dm7ZjKkK8hGW8W2pq69fTuUVBA=; b=mWXfWz+mQHaroTcyyRdHGLy0biy/ZjYU5ep87lMXzA0MC3CYDyqJA+lMQo8SR44fgS9G3W mrk/rzACUCMIBHq1xXCavlQ0tOIkdrtETPvjonmwcFB1yOkGeHMEg1I+vIoDgxDy+9WH3z TpQZidlxl40J+0I8d1DaWZ9R8lkLacN6TFHoCsi/6J7hWYfjUfc3DxJ2vVoK+cAV+xqxHZ pHr/S+bmc+afFCZ5KxcXWmnZE1ZuLAsEHgX1nfgmbfZAtjvP8M9RYX9sCq/P7xEz8gBtWk YssIqv1A8lFXifU9RYP9DCcNTQReJe88EynxWGLvozKUD/V7j/PigU3LMeKOyw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Mf3Gr61C9z16KM; Fri, 30 Sep 2022 08:26:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 28U8QSrJ072410; Fri, 30 Sep 2022 08:26:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28U8QSgp072409; Fri, 30 Sep 2022 08:26:28 GMT (envelope-from git) Date: Fri, 30 Sep 2022 08:26:28 GMT Message-Id: <202209300826.28U8QSgp072409@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: =?utf-8?Q?Fernando=20Apestegu=C3=ADa?= Subject: git: fb40f7a6d8 - main - [doc-en][articles/committers-guide] Fix subsection List-Id: Commit messages for all branches of the doc repository List-Archive: https://lists.freebsd.org/archives/dev-commits-doc-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-doc-all@freebsd.org X-BeenThere: dev-commits-doc-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fernape X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fb40f7a6d80b21aa0da2d2ed43c9e9051b3e3f8b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664526389; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=g70gENu32954Q1K33Dm7ZjKkK8hGW8W2pq69fTuUVBA=; b=GINbq4E/1eeuHbc6WnEXWpMIp2guoRzitH8PwzHDdYKe+BL77OMb0fSbgzlmxvzmWROma9 sJGp9pMv5oe9ycwdLanLzG3YGDtC6BH2Q2Vs5DCGBEZslmGcWltTDIoDiDY+xd6FoAtSji h3uzSrZHjlqlRHB0U1bhN7MucvvbOMjmvOUGZeoJXBCiikcB5BliOfiiEZ4ISPLQJYVVgb bC0YSACwhQ4dRjx31XsuZ2MbTgm+CuzP6ZS5qgDEOYuZhcyNmxTGjh/rcvUNUwbpq20aFj A8PzvFaGbNoCfD/tZx7xHiUvlNcWoHn6KUZKuMwuv6W0Dfp5RsP2u2hn2Ssp3A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664526389; a=rsa-sha256; cv=none; b=XyteAgM7LldR5a+8WDPv18HJGXGXkg3AhloVxCrqDvOFmP72Ke94QO1Gz/XXqcXclJaLGX mM/pYQIg1Hsisry5U7bvu4QNun1H+JcBC0f94HFmEeUbBEiubCaIjHpOU3c1dLCEQ+ILkz Eh26Z2TxyFRN4Jpks2Lisz2q0LPMvxMkEW8a5Z2UILdj9PJZxMvF6zpQHplqpjOIx1skz9 Y+DP7vMiIIbZxrAXVnbULjVAfGop1Kx01u2n5+Y9uhorh1KXwrkj0xYsiZ3ufSDB6pikD9 V2GWEnYwola9Ma7g9nEvof0Bft4cKapIBrmsIFhv2oceHhwK0rtkzlg7NnqD0w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/doc/commit/?id=fb40f7a6d80b21aa0da2d2ed43c9e9051b3e3f8b commit fb40f7a6d80b21aa0da2d2ed43c9e9051b3e3f8b Author: Fernando Apesteguía AuthorDate: 2022-09-30 08:20:48 +0000 Commit: Fernando Apesteguía CommitDate: 2022-09-30 08:20:48 +0000 [doc-en][articles/committers-guide] Fix subsection Add a blank line after "====" subsection. The English version is rendered well anyway, but translations get the wrong string mixing the title and the content of the translation. --- documentation/content/en/articles/committers-guide/_index.adoc | 1 + 1 file changed, 1 insertion(+) diff --git a/documentation/content/en/articles/committers-guide/_index.adoc b/documentation/content/en/articles/committers-guide/_index.adoc index 216afb4458..52aa7d887f 100644 --- a/documentation/content/en/articles/committers-guide/_index.adoc +++ b/documentation/content/en/articles/committers-guide/_index.adoc @@ -769,6 +769,7 @@ Git differs from other version control systems in that you have to tell it expli I have opted to do it on the commit command line, but you can also do it with 'git add' which many of the more in depth tutorials cover. ====== Time to update + When it is time to bring in a new version, it is almost the same as w/o the branches. You would update like you would above, but there is one extra command before you update, and one after. The following assumes you are starting with an unmodified tree.