Sync with head

4 files changed, 10 insertions, 10 deletions

diff --git a/usr.sbin/crashinfo/crashinfo.8 b/usr.sbin/crashinfo/crashinfo.8
index fbb4ddc6d704..897fc59906d4 100644
--- a/usr.sbin/crashinfo/crashinfo.8
+++ b/usr.sbin/crashinfo/crashinfo.8
@@ -90,18 +90,18 @@ The options are as follows:
 .Bl -tag -width indent
 .It Fl d Ar crashdir
 Specify an alternate core dump directory.
-The default crash dump directory is 
+The default crash dump directory is
 .Pa /var/crash .
 .It Fl n Ar dumpnr
 Use the core dump saved in
 .Pa vmcore. Ns Ar dumpnr
-instead of the latest core in the core dump directory. 
+instead of the latest core in the core dump directory.
 .It Fl k Ar kernel
 Specify an explicit kernel file.
 .El
 .Sh SEE ALSO
-.Xr savecore 8 ,
-.Xr textdump 4
+.Xr textdump 4 ,
+.Xr savecore 8
 .Sh HISTORY
 The
 .Nm
diff --git a/usr.sbin/kbdcontrol/kbdcontrol.c b/usr.sbin/kbdcontrol/kbdcontrol.c
index bbeb75871e0f..5d20b163730e 100644
--- a/usr.sbin/kbdcontrol/kbdcontrol.c
+++ b/usr.sbin/kbdcontrol/kbdcontrol.c
@@ -256,7 +256,7 @@ get_entry(void)
 	case TLET:
 		return (unsigned char)letter;
 	case TNUM:
-		if (number < 0 || number > 255)
+		if (number < 0x000000 || number > 0x10FFFF)
 			return -1;
 		return number;
 	default:
diff --git a/usr.sbin/kbdcontrol/kbdmap.5 b/usr.sbin/kbdcontrol/kbdmap.5
index 2b94b356581f..4c4cd8696982 100644
--- a/usr.sbin/kbdcontrol/kbdmap.5
+++ b/usr.sbin/kbdcontrol/kbdmap.5
@@ -84,7 +84,7 @@ The symbol the key should produce,
 in single quotes.
 .It Ar decnum
 The
-.Tn ASCII
+.Tn Unicode
 value to produce
 as a decimal number
 (see
@@ -92,7 +92,7 @@ as a decimal number
 For example, 32 for space.
 .It 0x Ns Ar hexnum
 The
-.Tn ASCII
+.Tn Unicode
 value to produce
 as a hexadecimal number.
 For example, 0x20 for space.
@@ -274,7 +274,7 @@ This is followed
 by the symbol for the accent,
 given in single quotes or
 as a decimal or hexadecimal
-.Tn ASCII
+.Tn Unicode
 value.
 This symbol will be produced
 if the accent key is pressed and
@@ -290,7 +290,7 @@ Both symbols in a pair can be given
 in either single quotes or
 as decimal or
 hexadecimal
-.Tn ASCII
+.Tn Unicode
 values.
 .Pp
 For example,
diff --git a/usr.sbin/sysinstall/menus.c b/usr.sbin/sysinstall/menus.c
index 9376ed114f9d..8ea7f9876e32 100644
--- a/usr.sbin/sysinstall/menus.c
+++ b/usr.sbin/sysinstall/menus.c
@@ -691,7 +691,7 @@ DMenu MenuMediaFTP = {
       { " Ireland #3",	"ftp3.ie.freebsd.org", NULL, dmenuSetVariable, NULL,
 	VAR_FTP_PATH "=ftp://ftp3.ie.freebsd.org" },
 
-      { "Isreal",	"ftp.il.freebsd.org", NULL, dmenuSetVariable, NULL,
+      { "Israel",	"ftp.il.freebsd.org", NULL, dmenuSetVariable, NULL,
 	VAR_FTP_PATH "=ftp://ftp.il.freebsd.org" },
 
       { "Italy",	"ftp.it.freebsd.org", NULL, dmenuSetVariable, NULL,