From owner-dev-commits-doc-all@freebsd.org Thu Feb 4 18:23:35 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 48C4B52B74A for ; Thu, 4 Feb 2021 18:23:35 +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 4DWn471byYz4kZd; Thu, 4 Feb 2021 18:23:35 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 29F13109B5; Thu, 4 Feb 2021 18:23:35 +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 114INZEV080599; Thu, 4 Feb 2021 18:23:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 114INZUv080598; Thu, 4 Feb 2021 18:23:35 GMT (envelope-from git) Date: Thu, 4 Feb 2021 18:23:35 GMT Message-Id: <202102041823.114INZUv080598@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Warner Losh Subject: git: 612d995019 - main - More markup fixes MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 612d995019ef809cd91c23e902609260dbf8d182 Auto-Submitted: auto-generated 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: Thu, 04 Feb 2021 18:23:35 -0000 The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/doc/commit/?id=612d995019ef809cd91c23e902609260dbf8d182 commit 612d995019ef809cd91c23e902609260dbf8d182 Author: Warner Losh AuthorDate: 2021-02-04 17:55:56 +0000 Commit: Warner Losh CommitDate: 2021-02-04 18:21:34 +0000 More markup fixes Get the sections rendering correctly in hugo Convert markdown enumerated list convention to asciidoc Remove stray '+' lines Small tweak in wording missed in review for this content's new context --- .../developers-handbook/policies/chapter.adoc | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/documentation/content/en/books/developers-handbook/policies/chapter.adoc b/documentation/content/en/books/developers-handbook/policies/chapter.adoc index 51f914d18a..5fdb150609 100644 --- a/documentation/content/en/books/developers-handbook/policies/chapter.adoc +++ b/documentation/content/en/books/developers-handbook/policies/chapter.adoc @@ -136,6 +136,7 @@ will be rejected. Only annotated tags are allowed to be pushed. The annoated tag gives you a chance to enter a commit message. Enter the version you are importing, along with any salient new features or fixes in that version. + ==== Updating the FreeBSD Copy At this point you can push the import to vendor into our repo. [source,bash] @@ -271,10 +272,11 @@ branch step. % git push --follow-tags freebsd vendor/glorbnitz .... By 'good' we mean: -1. All the right files are present -2. None of the wrong files are present -3. The vendor branch points at something sensible -4. The tag looks good, and is annotated. + +. All the right files are present +. None of the wrong files are present +. The vendor branch points at something sensible +. The tag looks good, and is annotated. ==== Time to finally merge it into the base tree* [source,bash] @@ -285,14 +287,14 @@ By 'good' we mean: % git push freebsd .... Here 'good' means: -1. All the right files, and none of the wrong ones, were merged into contrib/glorbnitz. -2. No other changes are in the tree -3. The commit messages look good. -+ + +. All the right files, and none of the wrong ones, were merged into contrib/glorbnitz. +. No other changes are in the tree +. The commit messages look good. + [NOTE] ==== -This hasn't connected `glorbnitz` to the build yet. How to do -that hasn't changed and is beyond the scope of this article. +This hasn't connected `glorbnitz` to the build yet. How so do that is specific to the software being imported. ==== [[policies-encumbered]] == Encumbered Files