summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgjb <gjb@FreeBSD.org>2013-10-10 18:05:13 +0000
committergjb <gjb@FreeBSD.org>2013-10-10 18:05:13 +0000
commit5cca672bb0892f1c5da630c34a1f98e2de4d7064 (patch)
tree6b296a36d3238a499d1ff3857efe99843d01198a
parent4db35ea7a1527347b86288b7fcc9b3a87d35f7fd (diff)
downloadFreeBSD-src-5cca672bb0892f1c5da630c34a1f98e2de4d7064.zip
FreeBSD-src-5cca672bb0892f1c5da630c34a1f98e2de4d7064.tar.gz
Turn it all the way up to 11:
- Update FreeBSD version in: - UPDATING - sys/conf/newvers.sh - Add 11.0 FreeBSD version for manual pages - Bump __FreeBSD_version to 1100000 Approved by: re (implicit) Sponsored by: The FreeBSD Foundation
-rw-r--r--UPDATING4
-rw-r--r--etc/defaults/periodic.conf2
-rw-r--r--gnu/usr.bin/groff/tmac/mdoc.local3
-rw-r--r--sys/conf/newvers.sh4
-rw-r--r--sys/sys/param.h2
5 files changed, 8 insertions, 7 deletions
diff --git a/UPDATING b/UPDATING
index 0ed94c4..fa004d3 100644
--- a/UPDATING
+++ b/UPDATING
@@ -16,8 +16,8 @@ from older versions of FreeBSD, try WITHOUT_CLANG to bootstrap to the tip of
head, and then rebuild without this option. The bootstrap process from
older version of current is a bit fragile.
-NOTE TO PEOPLE WHO THINK THAT FreeBSD 10.x IS SLOW:
- FreeBSD 10.x has many debugging features turned on, in both the kernel
+NOTE TO PEOPLE WHO THINK THAT FreeBSD 11.x IS SLOW:
+ FreeBSD 11.x has many debugging features turned on, in both the kernel
and userland. These features attempt to detect incorrect use of
system primitives, and encourage loud failure through extra sanity
checking and fail stop semantics. They also substantially impact
diff --git a/etc/defaults/periodic.conf b/etc/defaults/periodic.conf
index 9fb6859..9078577 100644
--- a/etc/defaults/periodic.conf
+++ b/etc/defaults/periodic.conf
@@ -190,7 +190,7 @@ weekly_noid_dirs="/" # Look here
# 400.status-pkg
weekly_status_pkg_enable="NO" # Find out-of-date pkgs
pkg_version=pkg_version # Use this program
-pkg_version_index=/usr/ports/INDEX-10 # Use this index file
+pkg_version_index=/usr/ports/INDEX-11 # Use this index file
# 450.status-security
weekly_status_security_enable="YES" # Security check
diff --git a/gnu/usr.bin/groff/tmac/mdoc.local b/gnu/usr.bin/groff/tmac/mdoc.local
index b11f4b6..180669f 100644
--- a/gnu/usr.bin/groff/tmac/mdoc.local
+++ b/gnu/usr.bin/groff/tmac/mdoc.local
@@ -45,7 +45,7 @@
.ds doc-str-Lb-libstdthreads C11 Threads Library (libstdthreads, \-lstdthreads)
.
.\" Default .Os value
-.ds doc-default-operating-system FreeBSD\~10.0
+.ds doc-default-operating-system FreeBSD\~11.0
.
.\" FreeBSD releases not found in doc-common
.ds doc-operating-system-FreeBSD-7.4 7.4
@@ -54,6 +54,7 @@
.ds doc-operating-system-FreeBSD-9.1 9.1
.ds doc-operating-system-FreeBSD-9.2 9.2
.ds doc-operating-system-FreeBSD-10.0 10.0
+.ds doc-operating-system-FreeBSD-11.0 11.0
.
.\" Definitions not (yet) in doc-syms
.
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index 107cf73..c03aea9 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -31,8 +31,8 @@
# $FreeBSD$
TYPE="FreeBSD"
-REVISION="10.0"
-BRANCH="ALPHA6"
+REVISION="11.0"
+BRANCH="CURRENT"
if [ "X${BRANCH_OVERRIDE}" != "X" ]; then
BRANCH=${BRANCH_OVERRIDE}
fi
diff --git a/sys/sys/param.h b/sys/sys/param.h
index b29ecb3..981680f 100644
--- a/sys/sys/param.h
+++ b/sys/sys/param.h
@@ -58,7 +58,7 @@
* in the range 5 to 9.
*/
#undef __FreeBSD_version
-#define __FreeBSD_version 1000055 /* Master, propagated to newvers */
+#define __FreeBSD_version 1100000 /* Master, propagated to newvers */
/*
* __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,
OpenPOWER on IntegriCloud