diff --git a/en_US.ISO8859-1/articles/releng/article.sgml b/en_US.ISO8859-1/articles/releng/article.sgml index 3000fe4dc2..6b99bc650e 100644 --- a/en_US.ISO8859-1/articles/releng/article.sgml +++ b/en_US.ISO8859-1/articles/releng/article.sgml @@ -147,7 +147,7 @@ process begins to ramp up 45 days before the anticipated release date when the release engineer sends an email to the development mailing lists to remind developers that they only have 15 days to - intergrate new changes before the code freeze. During this time, + integrate new changes before the code freeze. During this time, many developers perform what have become know as MFC sweeps. MFC stands for Merge From CURRENT and it describes the process of merging a @@ -157,7 +157,7 @@ Code Review - Thiry days before the anticipated release, the source + Thirty days before the anticipated release, the source repository enters a code slush. During this time, all commits to the -STABLE branch must be approved by the release engineer (re@FreeBSD.org). The kinds of changes that @@ -260,7 +260,6 @@ - @@ -337,11 +336,10 @@ - Sysinstall should be updated to note the number of - available ports and the amount of disk space required for the - Ports Collection. This information is currently kept in - src/release/sysinstall/dist.c. - + Sysinstall should be updated to note + the number of available ports and the amount of disk space required + for the Ports Collection. This information is currently kept in + src/release/sysinstall/dist.c. @@ -404,7 +402,7 @@ make buildworld. The release target requires several variables be set properly to build a - release : + release: @@ -459,7 +457,8 @@ Population of /etc and - /dev in the chrooted environment. + /dev in the chrooted + environment. @@ -615,11 +614,11 @@ contents, and a filename.txt file that provides a manifest for the disc. This manifest can be created with a simple - command : + command: /stage/cdrom&prompt.root; find . -type f | sed -e 's/\^.\///' | sort > filename.txt - The specific requirements of each CD is outlined below. + The specific requirements of each CD are outlined below. Disc 1 @@ -662,7 +661,7 @@ Discs 3 and 4 - The remaining two discs contains additional software + The remaining two discs contain additional software packages for FreeBSD. The packages should be clustered so that a package and all of its dependencies are included on the same disc. @@ -695,7 +694,7 @@ additional kernel modules or userland tools be added to the installation floppies. The quick and dirty way to accomplish this would be to modify the staging directory of - an existing make release build hierarchy : + an existing make release build hierarchy: @@ -705,7 +704,7 @@ rm - ${CHROOTDIR}/usr/obj/usr/src/\release/release.[48] + ${CHROOTDIR}/usr/obj/usr/src/release/release.[48] @@ -726,7 +725,7 @@ New release floppies will be located in - ${CHROOTDIR}/R/ stage/floppies. + ${CHROOTDIR}/R/stage/floppies. Alternatively, the boot.flp make @@ -792,14 +791,14 @@ Parallelism - Certain portions of the - release build are actually embarrasingly + release build are actually embarrassingly parallel. Most of the tasks are very I/O intensive, so multiple high-speed disk drives is actually important that multiple processors in speeding up the make - release process. if multiple disks are used for + release process. If multiple disks are used for different hierarchies in the chroot environment, then the CVS checkout of the ports and doc trees - can be happening simulatneously to the make + can be happening simultaneously to the make world on another disk. Using a RAID solution (hardware and software) can significantly decrease overall build time.