aboutsummaryrefslogtreecommitdiff
path: root/UPDATING
diff options
context:
space:
mode:
authorWarner Losh <imp@FreeBSD.org>2016-10-19 15:13:08 +0000
committerWarner Losh <imp@FreeBSD.org>2016-10-19 15:13:08 +0000
commitfca3dcdf4e91d528b97caf48152590d7405a8124 (patch)
treed7cabb4f47c7bc6c2bef20184119c44269cdbf42 /UPDATING
parent3652bc8e09d2a229bacc913b85ebbc7cbc866545 (diff)
Notes
Diffstat (limited to 'UPDATING')
-rw-r--r--UPDATING19
1 files changed, 10 insertions, 9 deletions
diff --git a/UPDATING b/UPDATING
index 169f7f180dac..20a82940a5c8 100644
--- a/UPDATING
+++ b/UPDATING
@@ -29,21 +29,22 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 12.x IS SLOW:
machines to maximize performance. (To completely disable malloc
debugging, define MALLOC_PRODUCTION in /etc/make.conf, or to merely
disable the most expensive debugging functionality run
- "ln -s 'abort:false,junk:false' /etc/malloc.
+ "ln -s 'abort:false,junk:false' /etc/malloc.conf".)
****************************** SPECIAL WARNING: ******************************
Due to a bug in some versions of clang that's very hard to workaround in
the upgrade process, to upgrade to -current you must first upgrade
- either stable/9 after r286035 or stable/10 after r286033 or current
- after r286007 (including stable/11 and 11.0-RELEASE). These revisions
- post-date 10.3-RELEASE and 9.3-RELEASE, so you'll need to take the
- unusual step of upgrading to the tip of the stable branch before moving
- to 11 or -current via a source upgrade. stable/11 and 11.0-RELEASE
- post-date the fix so you can move from them to -current. This differs
- from the historical situation where one coule upgrade from anywhere on
- the last couple of stable branches, so be careful.
+ either stable/9 after r286035 or stable/10 after r286033 (including
+ 10.3-RELEASE) or current after r286007 (including stable/11 and
+ 11.0-RELEASE). These revisions post-date the 10.2 and 9.3 releases, so
+ you'll need to take the unusual step of upgrading to the tip of the
+ stable branch before moving to 11 or -current via a source upgrade.
+ stable/11 and 11.0-RELEASE post-date the fix so you can move from them
+ to -current. This differs from the historical situation where one could
+ upgrade from anywhere on the last couple of stable branches, so be
+ careful.
****************************** SPECIAL WARNING: ******************************