os/doc
3
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

More markup fixes

Browse source 
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
This commit is contained in:
Warner Losh 2021-02-04 10:55:56 -07:00
parent 4830802786
commit 612d995019
1 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
documentation/content/en/books/developers-handbook/policies/chapter.adoc
View file

@ -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 annoated tag gives you a chance to enter a commit message. Enter
the version you are importing, along with any salient new features the version you are importing, along with any salient new features
or fixes in that version. or fixes in that version.
==== Updating the FreeBSD Copy ==== Updating the FreeBSD Copy
At this point you can push the import to vendor into our repo. At this point you can push the import to vendor into our repo.
[source,bash] [source,bash]
@ -271,10 +272,11 @@ branch step.
% git push --follow-tags freebsd vendor/glorbnitz % git push --follow-tags freebsd vendor/glorbnitz
.... ....
By 'good' we mean: By 'good' we mean:
1. All the right files are present
2. None of the wrong files are present . All the right files are present
3. The vendor branch points at something sensible . None of the wrong files are present
4. The tag looks good, and is annotated. . The vendor branch points at something sensible
. The tag looks good, and is annotated.
==== Time to finally merge it into the base tree* ==== Time to finally merge it into the base tree*
[source,bash] [source,bash]
@ -285,14 +287,14 @@ By 'good' we mean:
% git push freebsd % git push freebsd
.... ....
Here 'good' means: 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 . All the right files, and none of the wrong ones, were merged into contrib/glorbnitz.
3. The commit messages look good. . No other changes are in the tree
+ . The commit messages look good.
[NOTE] [NOTE]
==== ====
This hasn't connected `glorbnitz` to the build yet. How to do This hasn't connected `glorbnitz` to the build yet. How so do that is specific to the software being imported.
that hasn't changed and is beyond the scope of this article.
==== ====
[[policies-encumbered]] [[policies-encumbered]]
== Encumbered Files == Encumbered Files