git: 612d995019 - main - More markup fixes
Warner Losh
imp at FreeBSD.org
Thu Feb 4 18:23:35 UTC 2021
The branch main has been updated by imp:
URL: https://cgit.FreeBSD.org/doc/commit/?id=612d995019ef809cd91c23e902609260dbf8d182
commit 612d995019ef809cd91c23e902609260dbf8d182
Author: Warner Losh <imp at FreeBSD.org>
AuthorDate: 2021-02-04 17:55:56 +0000
Commit: Warner Losh <imp at FreeBSD.org>
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
More information about the dev-commits-doc-all
mailing list