From 9d229d2318ab9ab444efaf2abc5d533429a58f73 Mon Sep 17 00:00:00 2001 From: matt335672 <30179339+matt335672@users.noreply.github.com> Date: Wed, 20 Jan 2021 12:40:54 +0000 Subject: [PATCH] Minor manpage fixes --- docs/man/Makefile.am | 4 +++- docs/man/sesman.ini.5.in | 4 +++- docs/man/xrdp-chansrv.8.in | 4 +++- docs/man/xrdp-genkeymap.8.in | 14 ++++++++++---- docs/man/xrdp-sesadmin.8.in | 5 +++++ docs/man/xrdp-sesman.8.in | 6 ++++-- docs/man/xrdp-sesrun.8.in | 6 ++++-- docs/man/xrdp.8.in | 6 ++++-- docs/man/xrdp.ini.5.in | 4 +++- 9 files changed, 39 insertions(+), 14 deletions(-) diff --git a/docs/man/Makefile.am b/docs/man/Makefile.am index f138673d..18574346 100644 --- a/docs/man/Makefile.am +++ b/docs/man/Makefile.am @@ -15,10 +15,12 @@ EXTRA_DIST = $(man_MANS:=.in) SUBST_VARS = sed \ -e 's|@PACKAGE_VERSION[@]|$(PACKAGE_VERSION)|g' \ -e 's|@bindir[@]|$(bindir)|g' \ + -e 's|@sbindir[@]|$(sbindir)|g' \ -e 's|@localstatedir[@]|$(localstatedir)|g' \ -e 's|@sysconfdir[@]|$(sysconfdir)|g' \ -e 's|@socketdir[@]|$(socketdir)|g' \ - -e 's|@xrdpconfdir[@]|$(sysconfdir)/xrdp|g' + -e 's|@xrdpconfdir[@]|$(sysconfdir)/xrdp|g' \ + -e 's|@xrdphomeurl[@]|http://www.xrdp.org/|g' subst_verbose = $(subst_verbose_@AM_V@) subst_verbose_ = $(subst_verbose_@AM_DEFAULT_V@) diff --git a/docs/man/sesman.ini.5.in b/docs/man/sesman.ini.5.in index 2aa3dff5..32c93cb4 100644 --- a/docs/man/sesman.ini.5.in +++ b/docs/man/sesman.ini.5.in @@ -304,4 +304,6 @@ environment variables in the user's session. .BR xrdp (8), .BR xrdp.ini (5) -For more info on \fBxrdp\fR see http://www.xrdp.org/ +For more info on \fBxrdp\fR see +.UR @xrdphomeurl@ +.UE diff --git a/docs/man/xrdp-chansrv.8.in b/docs/man/xrdp-chansrv.8.in index 7721a43f..44d5021c 100644 --- a/docs/man/xrdp-chansrv.8.in +++ b/docs/man/xrdp-chansrv.8.in @@ -57,4 +57,6 @@ description of \fBCHANSRV_LOG_PATH\fP above for the file's location. .BR xrdp\-sesman (8), .BR sesman.ini (5). -for more info on \fBxrdp\fR see http://www.xrdp.org/ +For more info on \fBxrdp\fR see +.UR @xrdphomeurl@ +.UE diff --git a/docs/man/xrdp-genkeymap.8.in b/docs/man/xrdp-genkeymap.8.in index c0261051..eb939979 100644 --- a/docs/man/xrdp-genkeymap.8.in +++ b/docs/man/xrdp-genkeymap.8.in @@ -61,7 +61,13 @@ Simone Fedele .SH "SEE ALSO" .BR xrdp (8), .BR setxkbmap (1), -.BR unicode (7), -.URL "https://github.com/FreeRDP/FreeRDP/wiki/Keyboard" "Description of Keyboard Input mapping" . - -for more info on \fBxrdp\fR see http://www.xrdp.org/ +.BR unicode (7) +.PP +Description of Keyboard Input mapping on the +.UR https://github.com/FreeRDP/FreeRDP/wiki/Keyboard +FreeRDP wiki +.UE +.PP +For more info on \fBxrdp\fR see +.UR @xrdphomeurl@ +.UE diff --git a/docs/man/xrdp-sesadmin.8.in b/docs/man/xrdp-sesadmin.8.in index 81ac4ab9..ab540fca 100644 --- a/docs/man/xrdp-sesadmin.8.in +++ b/docs/man/xrdp-sesadmin.8.in @@ -55,3 +55,8 @@ xrdp\-sesadmin.log .SH SEE ALSO .BR xrdp (8). + +More info on \fBxrdp\fR can be found on the +.UR @xrdphomeurl@ +xrdp homepage +.UE diff --git a/docs/man/xrdp-sesman.8.in b/docs/man/xrdp-sesman.8.in index b6be46af..03ebd47d 100644 --- a/docs/man/xrdp-sesman.8.in +++ b/docs/man/xrdp-sesman.8.in @@ -49,7 +49,7 @@ the system (notably \fBxrdp(8)\fR and \fBxrdp\-chansrv(8)\fR) will want to read it. .RE .SH "FILES" -@bindir@/xrdp\-sesman +@sbindir@/xrdp\-sesman .br @bindir@/xrdp\-sesrun .br @@ -70,4 +70,6 @@ Simone Fedele .BR xrdp (8), .BR xrdp.ini (5) -for more info on \fBxrdp\fR see http://www.xrdp.org/ +for more info on \fBxrdp\fR see +.UR @xrdphomeurl@ +.UE diff --git a/docs/man/xrdp-sesrun.8.in b/docs/man/xrdp-sesrun.8.in index f76705a6..1cbd88dd 100644 --- a/docs/man/xrdp-sesrun.8.in +++ b/docs/man/xrdp-sesrun.8.in @@ -77,7 +77,7 @@ properly. Note you would need to install the \fBxterm\fR utility first. The \fBgnome\-terminal\fR utility probably won't work here. .SH "FILES" -@bindir@/xrdp\-sesman +@sbindir@/xrdp\-sesman .br @bindir@/xrdp\-sesrun .br @@ -94,4 +94,6 @@ Simone Fedele .BR xrdp (8), .BR xrdp.ini (5) -for more info on \fBxrdp\fR see http://www.xrdp.org/ +For more info on \fBxrdp\fR see +.UR @xrdphomeurl@ +.UE diff --git a/docs/man/xrdp.8.in b/docs/man/xrdp.8.in index ce194246..39e4d886 100644 --- a/docs/man/xrdp.8.in +++ b/docs/man/xrdp.8.in @@ -55,7 +55,7 @@ to be used primarily for testing or for unusual configurations. .SH "FILES" -@bindir@/xrdp +@sbindir@/xrdp .br @sysconfdir@/xrdp/xrdp.ini .br @@ -74,4 +74,6 @@ Simone Fedele .BR sesman.ini (5), .BR sesrun (8) -for more info on \fBxrdp\fR see http://www.xrdp.org/ +for more info on \fBxrdp\fR see +.UR @xrdphomeurl@ +.UE diff --git a/docs/man/xrdp.ini.5.in b/docs/man/xrdp.ini.5.in index 6cc160a9..da5b7c06 100644 --- a/docs/man/xrdp.ini.5.in +++ b/docs/man/xrdp.ini.5.in @@ -373,4 +373,6 @@ password={base64}cGFzc3dvcmQhCg== .BR sesrun (8), .BR sesman.ini (5) -for more info on \fBxrdp\fR see http://www.xrdp.org/ +For more info on \fBxrdp\fR see +.UR @xrdphomeurl@ +.UE