aboutsummaryrefslogtreecommitdiff
path: root/usr.sbin
diff options
context:
space:
mode:
authorEd Maste <emaste@FreeBSD.org>2019-02-19 17:38:24 +0000
committerEd Maste <emaste@FreeBSD.org>2019-02-19 17:38:24 +0000
commitdf7e2e0d99a93a2f3678a7e37344f0748ca6ebf4 (patch)
tree5c0ee6c3ce73ed9bda6f68789b770489d80d34ea /usr.sbin
parent72b66398fa7114124f4fecbaa5e04e6c205b2434 (diff)
downloadsrc-df7e2e0d99a93a2f3678a7e37344f0748ca6ebf4.tar.gz
src-df7e2e0d99a93a2f3678a7e37344f0748ca6ebf4.zip
freebsd-update: Clarify help text
Improve help text to include example release numbers for reference and clarify the -F option. PR: 231185, 214619 Submitted by: Gerald Aryeetey <aryeeteygerald_rogers.com> Reviewed by: delphij, rgrimes MFC after: 1 month Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D18944
Notes
Notes: svn path=/head/; revision=344280
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/freebsd-update/freebsd-update.84
-rw-r--r--usr.sbin/freebsd-update/freebsd-update.sh3
2 files changed, 4 insertions, 3 deletions
diff --git a/usr.sbin/freebsd-update/freebsd-update.8 b/usr.sbin/freebsd-update/freebsd-update.8
index 9a3504485be3..45f0dba8b770 100644
--- a/usr.sbin/freebsd-update/freebsd-update.8
+++ b/usr.sbin/freebsd-update/freebsd-update.8
@@ -89,13 +89,13 @@ Read configuration options from
.It Fl F
Force
.Nm Cm fetch
-to proceed where it normally would not, such as an unfinished upgrade
+to proceed in the case of an unfinished upgrade.
.It Fl k Ar KEY
Trust an RSA key with SHA256 of
.Ar KEY .
(default: read value from configuration file.)
.It Fl r Ar newrelease
-Specify the new release to which
+Specify the new release (e.g. 11.2-RELEASE) to which
.Nm
should upgrade (upgrade command only).
.It Fl s Ar server
diff --git a/usr.sbin/freebsd-update/freebsd-update.sh b/usr.sbin/freebsd-update/freebsd-update.sh
index 8349fccb4301..e0313f504887 100644
--- a/usr.sbin/freebsd-update/freebsd-update.sh
+++ b/usr.sbin/freebsd-update/freebsd-update.sh
@@ -45,7 +45,8 @@ Options:
(default: /var/db/freebsd-update/)
-f conffile -- Read configuration options from conffile
(default: /etc/freebsd-update.conf)
- -F -- Force a fetch operation to proceed
+ -F -- Force a fetch operation to proceed in the
+ case of an unfinished upgrade
-k KEY -- Trust an RSA key with SHA256 hash of KEY
-r release -- Target for upgrade (e.g., 11.1-RELEASE)
-s server -- Server from which to fetch updates