diff --git a/usr.sbin/freebsd-update/freebsd-update.8 b/usr.sbin/freebsd-update/freebsd-update.8 index 0f6398bf769..ec9eb9519e0 100644 --- a/usr.sbin/freebsd-update/freebsd-update.8 +++ b/usr.sbin/freebsd-update/freebsd-update.8 @@ -25,9 +25,9 @@ .\" .\" $FreeBSD$ .\" -.Dd January 18, 2019 +.Dd June 14, 2017 .Dt FREEBSD-UPDATE 8 -.Os +.Os FreeBSD .Sh NAME .Nm freebsd-update .Nd fetch and install binary updates to FreeBSD @@ -41,22 +41,15 @@ .Op Fl r Ar newrelease .Op Fl s Ar server .Op Fl t Ar address -.Op Fl v Ar verbosity -.Op Fl -debug -.Op Fl -no-stats .Op Fl -not-running-from-cron -.Op Fl -currently-running Ar release .Cm command ... .Sh DESCRIPTION The .Nm tool is used to fetch, install, and rollback binary -updates to the -.Fx -base system. +updates to the FreeBSD base system. Note that updates are only available if they are being built for the -.Fx -release and architecture being used; in particular, the +FreeBSD release and architecture being used; in particular, the .Fx Security Team only builds updates for releases shipped in binary form by the @@ -111,26 +104,6 @@ Mail output of command, if any, to .Ar address . (default: root, or as given in the configuration file.) -.It Fl v Ar verbosity -Change the amount of output when performing a -.Nm Cm fetch -or a -.Nm Cm upgrade . -Supported levels include: debug, nostats, stats. -See -.Fl -debug , -and -.Fl -no-stats -for more information. (default: stats) -.It Fl -debug -Alias for -.Fl v Ar debug . -Shows informational and warning messages from used utilities -that are normally hidden. -.It Fl -no-stats -Alias for -.Fl v Ar nostats . -Hides progress when fetching files. .It Fl -not-running-from-cron Force .Nm Cm fetch diff --git a/usr.sbin/freebsd-update/freebsd-update.conf b/usr.sbin/freebsd-update/freebsd-update.conf index 649c79cec9b..7f091705375 100644 --- a/usr.sbin/freebsd-update/freebsd-update.conf +++ b/usr.sbin/freebsd-update/freebsd-update.conf @@ -74,9 +74,3 @@ MergeChanges /etc/ /boot/device.hints # When backing up a kernel also back up debug symbol files? # BackupKernelSymbolFiles no - -# How much information to output during "freebsd-update fetch" -# or "freebsd-update upgrade". Can be either stats, debug or nostats. -# "nostats" hides progress information that is normally shown by "stats" -# "debug" shows informational messages and warnings that are normally hidden. -# VerbosityLevel stat diff --git a/usr.sbin/freebsd-update/freebsd-update.sh b/usr.sbin/freebsd-update/freebsd-update.sh index 215341110bb..83770373191 100644 --- a/usr.sbin/freebsd-update/freebsd-update.sh +++ b/usr.sbin/freebsd-update/freebsd-update.sh @@ -30,6 +30,10 @@ # $FreeBSD$ #### Usage function -- called from command-line handling code. + +# Usage instructions. Options not listed: +# --debug -- don't filter output from utilities +# --no-stats -- don't show progress statistics while fetching files usage () { cat <