Merging upstream version 1:4.15.2.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

11 files changed, 77 insertions, 51 deletions

diff --git a/man/da/Makefile.in b/man/da/Makefile.in
index 3ed052b..c192e7a 100644
--- a/man/da/Makefile.in
+++ b/man/da/Makefile.in
@@ -175,6 +175,8 @@ AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+CMOCKA_CFLAGS = @CMOCKA_CFLAGS@
+CMOCKA_LIBS = @CMOCKA_LIBS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CSCOPE = @CSCOPE@
@@ -193,6 +195,7 @@ EGREP = @EGREP@
 ETAGS = @ETAGS@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
+FILECMD = @FILECMD@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
@@ -208,9 +211,15 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBACL = @LIBACL@
+LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
 LIBATTR = @LIBATTR@
 LIBAUDIT = @LIBAUDIT@
-LIBCRACK = @LIBCRACK@
+LIBBSD = @LIBBSD@
+LIBBSD_CFLAGS = @LIBBSD_CFLAGS@
+LIBBSD_LIBS = @LIBBSD_LIBS@
 LIBCRYPT = @LIBCRYPT@
 LIBECONF = @LIBECONF@
 LIBICONV = @LIBICONV@
@@ -226,6 +235,7 @@ LIBSUBID_ABI = @LIBSUBID_ABI@
 LIBSUBID_ABI_MAJOR = @LIBSUBID_ABI_MAJOR@
 LIBSUBID_ABI_MICRO = @LIBSUBID_ABI_MICRO@
 LIBSUBID_ABI_MINOR = @LIBSUBID_ABI_MINOR@
+LIBSYSTEMD = @LIBSYSTEMD@
 LIBTCB = @LIBTCB@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
@@ -234,6 +244,8 @@ LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
 LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -256,6 +268,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POSUB = @POSUB@
 RANLIB = @RANLIB@
 SED = @SED@
@@ -335,6 +350,8 @@ man_MANS = man1/chfn.1 man8/groupdel.8 man1/groups.1 man5/gshadow.5 \
 man_nopam = 
 EXTRA_DIST = $(man_MANS) man1/id.1 $(am__append_2)
 LANG = $(notdir $(CURDIR))
+@ENABLE_REGENERATE_MAN_TRUE@@HAVE_VENDORDIR_FALSE@VENDORDIR_COND = without_vendordir
+@ENABLE_REGENERATE_MAN_TRUE@@HAVE_VENDORDIR_TRUE@VENDORDIR_COND = with_vendordir
 @ENABLE_REGENERATE_MAN_TRUE@@USE_PAM_FALSE@PAM_COND = no_pam
 @ENABLE_REGENERATE_MAN_TRUE@@USE_PAM_TRUE@PAM_COND = pam
 @ENABLE_REGENERATE_MAN_TRUE@@SHADOWGRP_FALSE@SHADOWGRP_COND = no_gshadow
@@ -343,8 +360,15 @@ LANG = $(notdir $(CURDIR))
 @ENABLE_REGENERATE_MAN_TRUE@@WITH_TCB_TRUE@TCB_COND = tcb
 @ENABLE_REGENERATE_MAN_TRUE@@USE_SHA_CRYPT_FALSE@SHA_CRYPT_COND = no_sha_crypt
 @ENABLE_REGENERATE_MAN_TRUE@@USE_SHA_CRYPT_TRUE@SHA_CRYPT_COND = sha_crypt
+@ENABLE_REGENERATE_MAN_TRUE@@USE_BCRYPT_FALSE@BCRYPT_COND = no_bcrypt
+@ENABLE_REGENERATE_MAN_TRUE@@USE_BCRYPT_TRUE@BCRYPT_COND = bcrypt
+@ENABLE_REGENERATE_MAN_TRUE@@USE_YESCRYPT_FALSE@YESCRYPT_COND = no_yescrypt
+@ENABLE_REGENERATE_MAN_TRUE@@USE_YESCRYPT_TRUE@YESCRYPT_COND = yescrypt
 @ENABLE_REGENERATE_MAN_TRUE@@ENABLE_SUBIDS_FALSE@SUBIDS_COND = no_subids
 @ENABLE_REGENERATE_MAN_TRUE@@ENABLE_SUBIDS_TRUE@SUBIDS_COND = subids
+@ENABLE_LASTLOG_FALSE@@ENABLE_REGENERATE_MAN_TRUE@LASTLOG_COND = no_lastlog
+@ENABLE_LASTLOG_TRUE@@ENABLE_REGENERATE_MAN_TRUE@@USE_PAM_FALSE@LASTLOG_COND = lastlog
+@ENABLE_LASTLOG_TRUE@@ENABLE_REGENERATE_MAN_TRUE@@USE_PAM_TRUE@LASTLOG_COND = no_lastlog
 CLEANFILES = messages.mo login.defs.d $(EXTRA_DIST) $(addsuffix .xml,$(EXTRA_DIST)) config.xml
 all: all-am
 
@@ -684,10 +708,10 @@ uninstall-man: uninstall-man1 uninstall-man5 uninstall-man8
 @ENABLE_REGENERATE_MAN_TRUE@	cp ../config.xml $@
 
 @ENABLE_REGENERATE_MAN_TRUE@messages.mo: ../po/$(LANG).po
-@ENABLE_REGENERATE_MAN_TRUE@	msgfmt ../po/$(LANG).po -o messages.mo
+@ENABLE_REGENERATE_MAN_TRUE@	msgfmt $< -o messages.mo
 
 @ENABLE_REGENERATE_MAN_TRUE@login.defs.d:
-@ENABLE_REGENERATE_MAN_TRUE@	ln -sf ../login.defs.d login.defs.d
+@ENABLE_REGENERATE_MAN_TRUE@	ln -sf $(srcdir)/../login.defs.d login.defs.d
 
 @ENABLE_REGENERATE_MAN_TRUE@%.xml: ../%.xml messages.mo login.defs.d
 @ENABLE_REGENERATE_MAN_TRUE@	if grep -q SHADOW-CONFIG-HERE $< ; then \
@@ -695,7 +719,7 @@ uninstall-man: uninstall-man1 uninstall-man5 uninstall-man8
 @ENABLE_REGENERATE_MAN_TRUE@	else \
 @ENABLE_REGENERATE_MAN_TRUE@	    sed -e 's/^\(<!DOCTYPE .*docbookx.dtd"\)>/\1 [<!ENTITY % config SYSTEM "config.xml">%config;]>/' $< > $@; \
 @ENABLE_REGENERATE_MAN_TRUE@	fi
-@ENABLE_REGENERATE_MAN_TRUE@	itstool -d -l $(LANG) -m messages.mo -o . $@
+@ENABLE_REGENERATE_MAN_TRUE@	itstool -i $(srcdir)/../its.rules -d -l $(LANG) -m messages.mo -o . $@
 @ENABLE_REGENERATE_MAN_TRUE@	sed -i 's:\(^<refentry .*\)>:\1 lang="$(LANG)">:' $@
 
 @ENABLE_REGENERATE_MAN_TRUE@%.xml-config: %.xml
@@ -706,11 +730,13 @@ uninstall-man: uninstall-man1 uninstall-man5 uninstall-man8
 @ENABLE_REGENERATE_MAN_TRUE@	fi
 
 @ENABLE_REGENERATE_MAN_TRUE@man1/% man3/% man5/% man8/%: %.xml-config Makefile config.xml
-@ENABLE_REGENERATE_MAN_TRUE@	$(XSLTPROC) --stringparam profile.condition "$(PAM_COND);$(SHADOWGRP_COND);$(TCB_COND);$(SHA_CRYPT_COND);$(SUBIDS_COND)" \
+@ENABLE_REGENERATE_MAN_TRUE@	$(XSLTPROC) --stringparam profile.condition "$(PAM_COND);$(SHADOWGRP_COND);$(TCB_COND);$(SHA_CRYPT_COND);$(BCRYPT_COND);$(YESCRYPT_COND);$(SUBIDS_COND);$(VENDORDIR_COND);$(LASTLOG_COND)" \
 @ENABLE_REGENERATE_MAN_TRUE@	            --param "man.authors.section.enabled" "0" \
 @ENABLE_REGENERATE_MAN_TRUE@	            --stringparam "man.output.base.dir" "" \
+@ENABLE_REGENERATE_MAN_TRUE@	            --stringparam vendordir "$(VENDORDIR)" \
 @ENABLE_REGENERATE_MAN_TRUE@	            --param "man.output.in.separate.dir" "1" \
-@ENABLE_REGENERATE_MAN_TRUE@	            -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/profile-docbook.xsl $<
+@ENABLE_REGENERATE_MAN_TRUE@	            --path "$(srcdir)/login.defs.d" \
+@ENABLE_REGENERATE_MAN_TRUE@	            -nonet $(top_srcdir)/man/shadow-man.xsl $<
 
 @ENABLE_REGENERATE_MAN_TRUE@clean-local:
 @ENABLE_REGENERATE_MAN_TRUE@	rm -rf man1 man3 man5 man8
diff --git a/man/da/man1/chfn.1 b/man/da/man1/chfn.1
index d8c3a2d..a999af8 100644
--- a/man/da/man1/chfn.1
+++ b/man/da/man1/chfn.1
@@ -2,12 +2,12 @@
 .\"     Title: chfn
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 08/11/2022
+.\"      Date: 21/06/2024
 .\"    Manual: User Commands
-.\"    Source: shadow-utils 4.13
+.\"    Source: shadow-utils 4.15.2
 .\"  Language: Danish
 .\"
-.TH "CHFN" "1" "08/11/2022" "shadow\-utils 4\&.13" "User Commands"
+.TH "CHFN" "1" "21/06/2024" "shadow\-utils 4\&.15\&.2" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -31,7 +31,7 @@
 chfn \- change real user name and information
 .SH "SYNOPSIS"
 .HP \w'\fBchfn\fR\ 'u
-\fBchfn\fR [\fItilvalg\fR] [\fILOGIND\fR]
+\fBchfn\fR [\fIoptions\fR] [\fILOGIN\fR]
 .SH "BESKRIVELSE"
 .PP
 The
diff --git a/man/da/man1/groups.1 b/man/da/man1/groups.1
index 76e3984..81f2be2 100644
--- a/man/da/man1/groups.1
+++ b/man/da/man1/groups.1
@@ -2,12 +2,12 @@
 .\"     Title: groups
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 08/11/2022
+.\"      Date: 21/06/2024
 .\"    Manual: User Commands
-.\"    Source: shadow-utils 4.13
+.\"    Source: shadow-utils 4.15.2
 .\"  Language: Danish
 .\"
-.TH "GROUPS" "1" "08/11/2022" "shadow\-utils 4\&.13" "User Commands"
+.TH "GROUPS" "1" "21/06/2024" "shadow\-utils 4\&.15\&.2" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -31,7 +31,7 @@
 groups \- vis aktuelle gruppenavne
 .SH "SYNOPSIS"
 .HP \w'\fBgroups\fR\ 'u
-\fBgroups\fR [\fIbruger\fR]
+\fBgroups\fR [\fIuser\fR]
 .SH "BESKRIVELSE"
 .PP
 The
diff --git a/man/da/man1/id.1 b/man/da/man1/id.1
index 1cf00d5..6854332 100644
--- a/man/da/man1/id.1
+++ b/man/da/man1/id.1
@@ -2,12 +2,12 @@
 .\"     Title: id
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 08/11/2022
+.\"      Date: 21/06/2024
 .\"    Manual: User Commands
-.\"    Source: shadow-utils 4.13
+.\"    Source: shadow-utils 4.15.2
 .\"  Language: Danish
 .\"
-.TH "ID" "1" "08/11/2022" "shadow\-utils 4\&.13" "User Commands"
+.TH "ID" "1" "21/06/2024" "shadow\-utils 4\&.15\&.2" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/da/man1/newgrp.1 b/man/da/man1/newgrp.1
index d56f969..fed91de 100644
--- a/man/da/man1/newgrp.1
+++ b/man/da/man1/newgrp.1
@@ -2,12 +2,12 @@
 .\"     Title: newgrp
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 08/11/2022
+.\"      Date: 21/06/2024
 .\"    Manual: User Commands
-.\"    Source: shadow-utils 4.13
+.\"    Source: shadow-utils 4.15.2
 .\"  Language: Danish
 .\"
-.TH "NEWGRP" "1" "08/11/2022" "shadow\-utils 4\&.13" "User Commands"
+.TH "NEWGRP" "1" "21/06/2024" "shadow\-utils 4\&.15\&.2" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/da/man1/sg.1 b/man/da/man1/sg.1
index e36d514..cc288b5 100644
--- a/man/da/man1/sg.1
+++ b/man/da/man1/sg.1
@@ -2,12 +2,12 @@
 .\"     Title: sg
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 08/11/2022
+.\"      Date: 21/06/2024
 .\"    Manual: User Commands
-.\"    Source: shadow-utils 4.13
+.\"    Source: shadow-utils 4.15.2
 .\"  Language: Danish
 .\"
-.TH "SG" "1" "08/11/2022" "shadow\-utils 4\&.13" "User Commands"
+.TH "SG" "1" "21/06/2024" "shadow\-utils 4\&.15\&.2" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/da/man5/gshadow.5 b/man/da/man5/gshadow.5
index b885e1c..56a4e55 100644
--- a/man/da/man5/gshadow.5
+++ b/man/da/man5/gshadow.5
@@ -2,12 +2,12 @@
 .\"     Title: gshadow
 .\"    Author: Nicolas Fran\(,cois <nicolas.francois@centraliens.net>
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 08/11/2022
+.\"      Date: 21/06/2024
 .\"    Manual: File Formats and Configuration Files
-.\"    Source: shadow-utils 4.13
+.\"    Source: shadow-utils 4.15.2
 .\"  Language: Danish
 .\"
-.TH "GSHADOW" "5" "08/11/2022" "shadow\-utils 4\&.13" "File Formats and Configuration"
+.TH "GSHADOW" "5" "21/06/2024" "shadow\-utils 4\&.15\&.2" "File Formats and Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -38,7 +38,7 @@ This file must not be readable by regular users if password security is to be ma
 .PP
 Each line of this file contains the following colon\-separated fields:
 .PP
-\fBgruppenavn\fR
+\fBgroup name\fR
 .RS 4
 Det skal v\(aere et gyldigt gruppenavn, som findes p\(oa systemet\&.
 .RE
@@ -63,7 +63,7 @@ This password supersedes any password specified in
 /etc/group\&.
 .RE
 .PP
-\fBadministratorer\fR
+\fBadministrators\fR
 .RS 4
 Det skal v\(aere en kommaadskilt liste af brugernavne\&.
 .sp
@@ -72,7 +72,7 @@ Administratorer kan \(aendre adgangskoden eller medlemmerne af gruppen\&.
 Administratorer har ogs\(oa de samme rettigheder som medlemmerne (se nedenfor)\&.
 .RE
 .PP
-\fBmedlemmer\fR
+\fBmembers\fR
 .RS 4
 Det skal v\(aere en kommaadskilt liste af brugernavne\&.
 .sp
diff --git a/man/da/man8/groupdel.8 b/man/da/man8/groupdel.8
index 87a94b8..e370ffe 100644
--- a/man/da/man8/groupdel.8
+++ b/man/da/man8/groupdel.8
@@ -2,12 +2,12 @@
 .\"     Title: groupdel
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 08/11/2022
-.\"    Manual: Kommandoer for systemh\(oandtering
-.\"    Source: shadow-utils 4.13
+.\"      Date: 21/06/2024
+.\"    Manual: System Management Commands
+.\"    Source: shadow-utils 4.15.2
 .\"  Language: Danish
 .\"
-.TH "GROUPDEL" "8" "08/11/2022" "shadow\-utils 4\&.13" "Kommandoer for systemh\(oandterin"
+.TH "GROUPDEL" "8" "21/06/2024" "shadow\-utils 4\&.15\&.2" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -31,7 +31,7 @@
 groupdel \- slet en gruppe
 .SH "SYNOPSIS"
 .HP \w'\fBgroupdel\fR\ 'u
-\fBgroupdel\fR [\fItilvalg\fR] \fIGRUPPE\fR
+\fBgroupdel\fR [\fIoptions\fR] \fIGROUP\fR
 .SH "BESKRIVELSE"
 .PP
 The
diff --git a/man/da/man8/logoutd.8 b/man/da/man8/logoutd.8
index 8379e28..88b506f 100644
--- a/man/da/man8/logoutd.8
+++ b/man/da/man8/logoutd.8
@@ -2,12 +2,12 @@
 .\"     Title: logoutd
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 08/11/2022
-.\"    Manual: Kommandoer for systemh\(oandtering
-.\"    Source: shadow-utils 4.13
+.\"      Date: 21/06/2024
+.\"    Manual: System Management Commands
+.\"    Source: shadow-utils 4.15.2
 .\"  Language: Danish
 .\"
-.TH "LOGOUTD" "8" "08/11/2022" "shadow\-utils 4\&.13" "Kommandoer for systemh\(oandterin"
+.TH "LOGOUTD" "8" "21/06/2024" "shadow\-utils 4\&.15\&.2" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/da/man8/nologin.8 b/man/da/man8/nologin.8
index c89d06e..c22b77c 100644
--- a/man/da/man8/nologin.8
+++ b/man/da/man8/nologin.8
@@ -2,12 +2,12 @@
 .\"     Title: nologin
 .\"    Author: Nicolas Fran\(,cois <nicolas.francois@centraliens.net>
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 08/11/2022
-.\"    Manual: Kommandoer for systemh\(oandtering
-.\"    Source: shadow-utils 4.13
+.\"      Date: 21/06/2024
+.\"    Manual: System Management Commands
+.\"    Source: shadow-utils 4.15.2
 .\"  Language: Danish
 .\"
-.TH "NOLOGIN" "8" "08/11/2022" "shadow\-utils 4\&.13" "Kommandoer for systemh\(oandterin"
+.TH "NOLOGIN" "8" "21/06/2024" "shadow\-utils 4\&.15\&.2" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/da/man8/vipw.8 b/man/da/man8/vipw.8
index 43ea985..a586d71 100644
--- a/man/da/man8/vipw.8
+++ b/man/da/man8/vipw.8
@@ -2,12 +2,12 @@
 .\"     Title: vipw
 .\"    Author: Marek Micha\(/lkiewicz
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 08/11/2022
-.\"    Manual: Kommandoer for systemh\(oandtering
-.\"    Source: shadow-utils 4.13
+.\"      Date: 21/06/2024
+.\"    Manual: System Management Commands
+.\"    Source: shadow-utils 4.15.2
 .\"  Language: Danish
 .\"
-.TH "VIPW" "8" "08/11/2022" "shadow\-utils 4\&.13" "Kommandoer for systemh\(oandterin"
+.TH "VIPW" "8" "21/06/2024" "shadow\-utils 4\&.15\&.2" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -31,16 +31,16 @@
 vipw, vigr \- rediger adgangskoden, gruppe, shadow\-adgangskode\- eller shadow\-gruppe\-fil
 .SH "SYNOPSIS"
 .HP \w'\fBvipw\fR\ 'u
-\fBvipw\fR [\fItilvalg\fR]
+\fBvipw\fR [\fIoptions\fR]
 .HP \w'\fBvigr\fR\ 'u
-\fBvigr\fR [\fItilvalg\fR]
+\fBvigr\fR [\fIoptions\fR]
 .SH "BESKRIVELSE"
 .PP
 The
 \fBvipw\fR
 and
 \fBvigr\fR
-commands edits the files
+commands edit the files
 /etc/passwd
 and
 /etc/group, respectively\&. With the
@@ -95,12 +95,12 @@ Rediger shadow\- eller gshadow\-database\&.
 .RE
 .SH "MILJ\(/O"
 .PP
-\fBVISUEL\fR
+\fBVISUAL\fR
 .RS 4
 Redigeringsprogram der skal bruges\&.
 .RE
 .PP
-\fBREDIGERINGSPROGRAM\fR
+\fBEDITOR\fR
 .RS 4
 Editor to be used if
 \fBVISUAL\fR