Better section name

[ikiwiki.git] / docs / developer / Release / index.mdwn

diff --git a/docs/developer/Release/index.mdwn b/docs/developer/Release/index.mdwn
index 74b7576..987870f 100644 (file)
--- a/docs/developer/Release/index.mdwn
+++ b/docs/developer/Release/index.mdwn
@@ -29,7 +29,7 @@ Check out two copies of /usr/src, one with master checked out, one with the new
     cd ..
     cd ../x_y/
     git branch DragonFly_RELEASE_x_y origin/DragonFly_RELEASE_x_y
-    git branch DragonFly_RELEASE_x_y 
+    git checkout DragonFly_RELEASE_x_y 
 
 On the new branch:
 
@@ -41,7 +41,15 @@ Edit \__DragonFly\_version and related comments.  You only need to add a comment
 
 Edit BRANCH, use 'RELEASE', update version.  e.g. RELEASE_2_8
 
-On master
+    vi gnu/usr.bin/groff/tmac/mdoc.local
+
+In the "Default .Os value" section, bump up the version to that of the release (even minor number).
+
+    vi etc/Makefile.usr
+
+Adjust the default src checkout in /usr/src/etc/Makefile.usr to pull this branch.  Otherwise, anyone using the Makefile to download source will get master, and nrelease will build master.
+
+On master:
 
     vi sys/sys/param.h
 
@@ -51,14 +59,27 @@ Edit \__DragonFly\_version and related comments.  Put in commented numbers for t
 
 Edit BRANCH, use 'DEVELOPMENT', update version.
 
+    vi gnu/usr.bin/groff/tmac/mdoc.local
+
+In the "Default .Os value" section, bump up the version to that of the master (odd minor number). Additionally, in the "DragonFly releases not found in doc-common" section, add a new line (a la the previous ones) for the new master.
+
 ##Tagging
 
 Make sure all changes on the master branch **and** on the new branch have been committed and pushed before tagging anything.
 
-    git add sys/sys/param.h sys/conf/newvers.sh
+On release:
+
+    git add sys/sys/param.h sys/conf/newvers.sh gnu/usr.bin/groff/tmac/mdoc.local etc/Makefile.usr
     git commit
     git push
 
+On master:
+
+    git add sys/sys/param.h sys/conf/newvers.sh gnu/usr.bin/groff/tmac/mdoc.local 
+    git commit
+    git push
+
+
 man git-tag for info, the committer needs GPG set up so git tag -s works.  Then you can use your own checkout.  Be sure the checkouts are under your user id and you do the tagging as yourself instead of as root.
 
 ###In master
@@ -68,10 +89,12 @@ man git-tag for info, the committer needs GPG set up so git tag -s works.  Then
 
 ###In the new branch
 
-    git tag -s -m "DragonFly x.y.0" vx.y.0
+    git tag -s -m "DragonFly x.y.0rc" vx.y.0rc
     git push --tags
 
-Do the x.x.0 immediately.  Just before doing the final nrelease build roll a x.x.1 tag for the release branch.  Release as x.x.1.
+Do the x.x.0rc immediately.  Just before doing the final nrelease build roll a x.x.0 tag for the release branch - the same method, just without "rc" for release candidate.  Release as x.x.0.
+
+A new tag may require a commit beforehand to the release branch to make sure it goes to the right branch.
 
 ## Subsequent tag updates
 
@@ -127,11 +150,15 @@ Copy one of the existing release pages.  The general format is :
 #### Minor releases
 
 * Update the release page, the main page, and the general [[Download]] page.
-* Add new MD5 sums.
+* Add new MD5 sums on the release page for the compressed and uncompressed files.
 
 ###File Copy
 
 Place images in /ftp/iso-images on crater.dragonflybsd.org.  They will be rsynced to mirror-master.
 
+The file md5.txt should have the md5 output for all the compressed files.  It should also have the md5 output for the uncompressed images, so don't just 'md5 *bz2 > md5.txt'; get that separately and copy it into the document.
+
+/root/adm/domd5.sh will get the MD5 sums for the compressed and uncompressed images and print them to stdout.
+
 ###announce
-users@, web page
+users@, web page, Hacker News, Slashdot, Reddit