mirror of
https://github.com/freebsd/freebsd-src.git
synced 2024-11-26 20:12:44 +00:00
Correct a couple of typos.
This commit is contained in:
parent
1d28802f0c
commit
44c1484a53
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=327882
10
UPDATING
10
UPDATING
@ -60,8 +60,8 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 12.x IS SLOW:
|
||||
WITHOUT_LLD_BOOTSTRAP=yes
|
||||
|
||||
20180110:
|
||||
On i386, pmtimer has been removed. It's functionality has been folded
|
||||
into apm. It was a nop on ACPI in current for a while now (but was still
|
||||
On i386, pmtimer has been removed. Its functionality has been folded
|
||||
into apm. It was a no-op on ACPI in current for a while now (but was still
|
||||
needed on i386 in FreeBSD 11 and earlier). Users may need to remove it
|
||||
from kernel config files.
|
||||
|
||||
@ -209,7 +209,7 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 12.x IS SLOW:
|
||||
will create the recovery information. If you have a filesystem
|
||||
created prior to this change and wish to have a recovery block
|
||||
created for your filesystem, you can do so by running fsck in
|
||||
forground mode (i.e., do not use the -p or -y options). As it
|
||||
foreground mode (i.e., do not use the -p or -y options). As it
|
||||
starts, fsck will ask ``SAVE DATA TO FIND ALTERNATE SUPERBLOCKS''
|
||||
to which you should answer yes.
|
||||
|
||||
@ -1869,7 +1869,7 @@ COMMON ITEMS:
|
||||
do an upgrade to the new branch. This is the best-tested upgrade path,
|
||||
and has the highest probability of being successful. Please try this
|
||||
approach if you encounter problems with a major version upgrade. Since
|
||||
the stable 4.x branch point, one has generally been able to upgade from
|
||||
the stable 4.x branch point, one has generally been able to upgrade from
|
||||
anywhere in the most recent stable branch to head / current (or even the
|
||||
last couple of stable branches). See the top of this file when there's
|
||||
an exception.
|
||||
@ -2007,7 +2007,7 @@ COMMON ITEMS:
|
||||
for potential gotchas. The -U option is also useful to consider.
|
||||
See mergemaster(8) for more information.
|
||||
|
||||
[5] Usually this step is a noop. However, from time to time
|
||||
[5] Usually this step is a no-op. However, from time to time
|
||||
you may need to do this if you get unknown user in the following
|
||||
step. It never hurts to do it all the time. You may need to
|
||||
install a new mergemaster (cd src/usr.sbin/mergemaster && make
|
||||
|
Loading…
Reference in New Issue
Block a user