diff --git a/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml b/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml index b9d92993b3..ddd05c5b35 100644 --- a/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml +++ b/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml @@ -1,7 +1,7 @@ @@ -109,10 +109,10 @@ nasty people who do not like helping people out (we would not even be doing FreeBSD if we were), it is literally because we cannot answer 400 messages a day - and actually work on FreeBSD! I am - sure that, if given the choice between having us answer lots - of questions or continuing to improve FreeBSD, most of you - would vote for us improving it. + and actually work on FreeBSD! Given the + choice between improving FreeBSD and answering lots of + questions, most developers, and users, would probably opt for + the former. @@ -471,7 +471,7 @@ ftp://ftp.FreeBSD.org/pub/FreeBSD/development/CVSup/cvsupit.tgz Take a backup - I cannot stress highly enough how important it is to take a + It cannot be stressed enough how important it is to take a backup of your system before you do this. While remaking the world is (as long as you follow these instructions) an easy task to do, there will inevitably be times @@ -479,8 +479,8 @@ ftp://ftp.FreeBSD.org/pub/FreeBSD/development/CVSup/cvsupit.tgz Make sure you have taken a backup. And have a fix-it floppy to - hand. I have never needed to use them, and, touch wood, I never - will, but it is always better to be safe than sorry. + hand. You will probably never have to use it, but it is better to be + safe than sorry! @@ -795,14 +795,15 @@ Script done, … and installworld installs this tree on the current machine. - This is very useful for 2 reasons. First, it allows you to do - the build safe in the knowledge that no components of your running - system will be affected. The build is self hosted. - Because of this, you can safely run - buildworld on a machine running in - multi-user mode with no fear of ill-effects. I still recommend you - run the installworld part in single user - mode though. + This is very useful for 2 reasons. First, it allows you + to do the build safe in the knowledge that no components of + your running system will be affected. The build is + self hosted. Because of this, you can safely + run buildworld on a machine running + in multi-user mode with no fear of ill-effects. It is still + recommended that you run the + installworld part in single user + mode, though. Secondly, it allows you to use NFS mounts to upgrade multiple machines on your network. If you have three machines, @@ -980,8 +981,8 @@ Script done, … You need to build a dummy set of directories to install the new - /etc and other files into. I generally choose to - put this dummy directory in /var/tmp/root, and + /etc and other files into. + /var/tmp/root is a reasonable choice, and there are a number of subdirectories required under this as well. @@ -1214,16 +1215,14 @@ Script done, … You should now have successfully upgraded your FreeBSD system. Congratulations. - You may notice small problems due to things that you have missed. - For example, I once deleted /etc/magic as part of - the upgrade and merge to /etc, and the - file command stopped working. A moment's thought - meant that + You may notice small problems due to things that you have + missed. For example, if you accidently deleted + /etc/magic as part of the upgrade or merge of + /etc, the &man.file.1; command will stop + working. In this case, the fix would be to run: &prompt.root; cd /usr/src/usr.bin/file &prompt.root; - - was sufficient to fix that one. @@ -1237,9 +1236,8 @@ Script done, … There is no easy answer to this one, as it depends on the - nature of the change. For example, I have just run CVSup, and - it has shown the following files as being updated since I last - ran it; + nature of the change. For example, if you just ran CVSup, and + it has shown the following files as being updated, src/games/cribbage/instr.c src/games/sail/pl_main.c @@ -1247,13 +1245,13 @@ Script done, … src/release/sysinstall/media.c src/share/mk/bsd.port.mk - There is nothing in there that I would re-make the world - for. I would go to the appropriate sub-directories and + it probably is not worth rebuilding the entire world. + You could just go to the appropriate sub-directories and make all install, and that's about it. But if something major changed, for example - src/lib/libc/stdlib then I would either + src/lib/libc/stdlib then you should either re-make the world, or at least those parts of it that are - statically linked (as well as anything else I might have added + statically linked (as well as anything else you might have added that is statically linked). At the end of the day, it is your call. You might be happy @@ -1382,13 +1380,18 @@ Building everything.. can do all the compiling on one machine, and then use the results of that compile to make install on to other machines around the network. - - This is not something I have done, so the suggestions below - are either from other people, or deduced from the - Makefiles. + + + + The following suggestions are not well tested or + officially supported; they were derived either from + posts on a mailing list or from the Makefiles. Use + them at your own risk. + + The precise approach to take depends on your version of - FreeBSD + FreeBSD. You must still upgrade /etc and /dev on the target machines after doing diff --git a/en_US.ISO_8859-1/books/handbook/cutting-edge/chapter.sgml b/en_US.ISO_8859-1/books/handbook/cutting-edge/chapter.sgml index b9d92993b3..ddd05c5b35 100644 --- a/en_US.ISO_8859-1/books/handbook/cutting-edge/chapter.sgml +++ b/en_US.ISO_8859-1/books/handbook/cutting-edge/chapter.sgml @@ -1,7 +1,7 @@ @@ -109,10 +109,10 @@ nasty people who do not like helping people out (we would not even be doing FreeBSD if we were), it is literally because we cannot answer 400 messages a day - and actually work on FreeBSD! I am - sure that, if given the choice between having us answer lots - of questions or continuing to improve FreeBSD, most of you - would vote for us improving it. + and actually work on FreeBSD! Given the + choice between improving FreeBSD and answering lots of + questions, most developers, and users, would probably opt for + the former. @@ -471,7 +471,7 @@ ftp://ftp.FreeBSD.org/pub/FreeBSD/development/CVSup/cvsupit.tgz Take a backup - I cannot stress highly enough how important it is to take a + It cannot be stressed enough how important it is to take a backup of your system before you do this. While remaking the world is (as long as you follow these instructions) an easy task to do, there will inevitably be times @@ -479,8 +479,8 @@ ftp://ftp.FreeBSD.org/pub/FreeBSD/development/CVSup/cvsupit.tgz Make sure you have taken a backup. And have a fix-it floppy to - hand. I have never needed to use them, and, touch wood, I never - will, but it is always better to be safe than sorry. + hand. You will probably never have to use it, but it is better to be + safe than sorry! @@ -795,14 +795,15 @@ Script done, … and installworld installs this tree on the current machine. - This is very useful for 2 reasons. First, it allows you to do - the build safe in the knowledge that no components of your running - system will be affected. The build is self hosted. - Because of this, you can safely run - buildworld on a machine running in - multi-user mode with no fear of ill-effects. I still recommend you - run the installworld part in single user - mode though. + This is very useful for 2 reasons. First, it allows you + to do the build safe in the knowledge that no components of + your running system will be affected. The build is + self hosted. Because of this, you can safely + run buildworld on a machine running + in multi-user mode with no fear of ill-effects. It is still + recommended that you run the + installworld part in single user + mode, though. Secondly, it allows you to use NFS mounts to upgrade multiple machines on your network. If you have three machines, @@ -980,8 +981,8 @@ Script done, … You need to build a dummy set of directories to install the new - /etc and other files into. I generally choose to - put this dummy directory in /var/tmp/root, and + /etc and other files into. + /var/tmp/root is a reasonable choice, and there are a number of subdirectories required under this as well. @@ -1214,16 +1215,14 @@ Script done, … You should now have successfully upgraded your FreeBSD system. Congratulations. - You may notice small problems due to things that you have missed. - For example, I once deleted /etc/magic as part of - the upgrade and merge to /etc, and the - file command stopped working. A moment's thought - meant that + You may notice small problems due to things that you have + missed. For example, if you accidently deleted + /etc/magic as part of the upgrade or merge of + /etc, the &man.file.1; command will stop + working. In this case, the fix would be to run: &prompt.root; cd /usr/src/usr.bin/file &prompt.root; - - was sufficient to fix that one. @@ -1237,9 +1236,8 @@ Script done, … There is no easy answer to this one, as it depends on the - nature of the change. For example, I have just run CVSup, and - it has shown the following files as being updated since I last - ran it; + nature of the change. For example, if you just ran CVSup, and + it has shown the following files as being updated, src/games/cribbage/instr.c src/games/sail/pl_main.c @@ -1247,13 +1245,13 @@ Script done, … src/release/sysinstall/media.c src/share/mk/bsd.port.mk - There is nothing in there that I would re-make the world - for. I would go to the appropriate sub-directories and + it probably is not worth rebuilding the entire world. + You could just go to the appropriate sub-directories and make all install, and that's about it. But if something major changed, for example - src/lib/libc/stdlib then I would either + src/lib/libc/stdlib then you should either re-make the world, or at least those parts of it that are - statically linked (as well as anything else I might have added + statically linked (as well as anything else you might have added that is statically linked). At the end of the day, it is your call. You might be happy @@ -1382,13 +1380,18 @@ Building everything.. can do all the compiling on one machine, and then use the results of that compile to make install on to other machines around the network. - - This is not something I have done, so the suggestions below - are either from other people, or deduced from the - Makefiles. + + + + The following suggestions are not well tested or + officially supported; they were derived either from + posts on a mailing list or from the Makefiles. Use + them at your own risk. + + The precise approach to take depends on your version of - FreeBSD + FreeBSD. You must still upgrade /etc and /dev on the target machines after doing