diff options
author | Pavel Roskin <plroskin@gmail.com> | 2016-12-23 12:02:55 -0800 |
---|---|---|
committer | Pavel Roskin <plroskin@gmail.com> | 2016-12-24 00:58:15 -0800 |
commit | 6c453ff1be6608380558c2529fd0fef66fc5ba46 (patch) | |
tree | c746c696401f2373d5b873bf53cf69fe1e409a1e | |
parent | a9bfa879e776a3e747f08fa0b58f82ca4e89d0c4 (diff) | |
download | xrdp-proprietary-6c453ff1be6608380558c2529fd0fef66fc5ba46.tar.gz xrdp-proprietary-6c453ff1be6608380558c2529fd0fef66fc5ba46.zip |
Substitute variables in manual pages
-rw-r--r-- | docs/man/.gitignore | 1 | ||||
-rw-r--r-- | docs/man/Makefile.am | 17 | ||||
-rw-r--r-- | docs/man/sesman.ini.5.in (renamed from docs/man/sesman.ini.5) | 2 | ||||
-rw-r--r-- | docs/man/xrdp-chansrv.8.in (renamed from docs/man/xrdp-chansrv.8) | 2 | ||||
-rw-r--r-- | docs/man/xrdp-dis.1.in (renamed from docs/man/xrdp-dis.1) | 2 | ||||
-rw-r--r-- | docs/man/xrdp-genkeymap.8.in (renamed from docs/man/xrdp-genkeymap.8) | 2 | ||||
-rw-r--r-- | docs/man/xrdp-keygen.8.in (renamed from docs/man/xrdp-keygen.8) | 2 | ||||
-rw-r--r-- | docs/man/xrdp-sesadmin.8.in (renamed from docs/man/xrdp-sesadmin.8) | 2 | ||||
-rw-r--r-- | docs/man/xrdp-sesman.8.in (renamed from docs/man/xrdp-sesman.8) | 2 | ||||
-rw-r--r-- | docs/man/xrdp-sesrun.8.in (renamed from docs/man/xrdp-sesrun.8) | 2 | ||||
-rw-r--r-- | docs/man/xrdp-sessvc.8.in (renamed from docs/man/xrdp-sessvc.8) | 2 | ||||
-rw-r--r-- | docs/man/xrdp.8.in (renamed from docs/man/xrdp.8) | 20 | ||||
-rw-r--r-- | docs/man/xrdp.ini.5.in (renamed from docs/man/xrdp.ini.5) | 2 |
13 files changed, 34 insertions, 24 deletions
diff --git a/docs/man/.gitignore b/docs/man/.gitignore new file mode 100644 index 00000000..28924786 --- /dev/null +++ b/docs/man/.gitignore @@ -0,0 +1 @@ +*.[1-8] diff --git a/docs/man/Makefile.am b/docs/man/Makefile.am index 48c26559..90863842 100644 --- a/docs/man/Makefile.am +++ b/docs/man/Makefile.am @@ -1,4 +1,4 @@ -dist_man_MANS = \ +man_MANS = \ xrdp-dis.1 \ sesman.ini.5 \ xrdp.ini.5 \ @@ -11,7 +11,16 @@ dist_man_MANS = \ xrdp-sesrun.8 \ xrdp-sessvc.8 -noinst_man_MANS = \ - xrdp-xcon.8 +EXTRA_DIST = $(man_MANS:=.in) -EXTRA_DIST = $(noinst_man_MANS) +SUBST_VARS = sed \ + -e 's|@PACKAGE_VERSION[@]|$(PACKAGE_VERSION)|g' \ + -e 's|@bindir[@]|$(bindir)|g' \ + -e 's|@localstatedir[@]|$(localstatedir)|g' \ + -e 's|@sysconfdir[@]|$(sysconfdir)|g' + +SUFFIXES = .in +.in: + $(SUBST_VARS) $< > $@ + +CLEANFILES = $(man_MANS) diff --git a/docs/man/sesman.ini.5 b/docs/man/sesman.ini.5.in index b8ced28f..747bd15e 100644 --- a/docs/man/sesman.ini.5 +++ b/docs/man/sesman.ini.5.in @@ -1,5 +1,5 @@ .\" -.TH "sesman.ini" "5" "0.9.1" "xrdp team" "" +.TH "sesman.ini" "5" "@PACKAGE_VERSION@" "xrdp team" "" .SH "NAME" \fBsesman.ini\fR \- Configuration file for \fBxrdp-sesman\fR(8) diff --git a/docs/man/xrdp-chansrv.8 b/docs/man/xrdp-chansrv.8.in index c1deb085..332a1907 100644 --- a/docs/man/xrdp-chansrv.8 +++ b/docs/man/xrdp-chansrv.8.in @@ -1,4 +1,4 @@ -.TH "xrdp\-chansrv" "8" "0.9.1" "xrdp team" "" +.TH "xrdp\-chansrv" "8" "@PACKAGE_VERSION@" "xrdp team" "" .SH "NAME" \fBxrdp\-chansrv\fR \- \fBxrdp\fR channel server diff --git a/docs/man/xrdp-dis.1 b/docs/man/xrdp-dis.1.in index 09de5f10..54ba5db2 100644 --- a/docs/man/xrdp-dis.1 +++ b/docs/man/xrdp-dis.1.in @@ -1,4 +1,4 @@ -.TH "xrdp-dis" "1" "0.9.1" "xrdp team" +.TH "xrdp-dis" "1" "@PACKAGE_VERSION@" "xrdp team" .SH NAME xrdp\-dis \- xrdp disconnect utility diff --git a/docs/man/xrdp-genkeymap.8 b/docs/man/xrdp-genkeymap.8.in index aa9f866c..e69d6606 100644 --- a/docs/man/xrdp-genkeymap.8 +++ b/docs/man/xrdp-genkeymap.8.in @@ -1,4 +1,4 @@ -.TH "xrdp\-genkeymap" "8" "0.9.1" "xrdp team" "" +.TH "xrdp\-genkeymap" "8" "@PACKAGE_VERSION@" "xrdp team" "" .de URL . \\$2 \(laURL: \\$1 \(ra\\$3 .. diff --git a/docs/man/xrdp-keygen.8 b/docs/man/xrdp-keygen.8.in index 84d4eafd..ce33063c 100644 --- a/docs/man/xrdp-keygen.8 +++ b/docs/man/xrdp-keygen.8.in @@ -3,7 +3,7 @@ .\" Copyright © 2007, 2008 Vincent Bernat <bernat@debian.org> .\" License: GPL-2+ .\"- -.TH xrdp\-keygen 8 "0.9.1" "xrdp team" +.TH xrdp\-keygen 8 "@PACKAGE_VERSION@" "xrdp team" .SH NAME xrdp\-keygen \- xrdp RSA key generation utility diff --git a/docs/man/xrdp-sesadmin.8 b/docs/man/xrdp-sesadmin.8.in index 29e14c18..81ac4ab9 100644 --- a/docs/man/xrdp-sesadmin.8 +++ b/docs/man/xrdp-sesadmin.8.in @@ -1,4 +1,4 @@ -.TH "xrdp-sesadmin" "8" "0.9.1" "xrdp team" +.TH "xrdp-sesadmin" "8" "@PACKAGE_VERSION@" "xrdp team" .SH NAME xrdp\-sesadmin \- console XRDP sessions administration tool diff --git a/docs/man/xrdp-sesman.8 b/docs/man/xrdp-sesman.8.in index cca68e3e..3b98cf0e 100644 --- a/docs/man/xrdp-sesman.8 +++ b/docs/man/xrdp-sesman.8.in @@ -1,4 +1,4 @@ -.TH "xrdp\-sesman" "8" "0.9.1" "xrdp team" "" +.TH "xrdp\-sesman" "8" "@PACKAGE_VERSION@" "xrdp team" "" .SH "NAME" xrdp\-sesman \- \fBxrdp\fR(8) session manager diff --git a/docs/man/xrdp-sesrun.8 b/docs/man/xrdp-sesrun.8.in index c66d773c..1102bdda 100644 --- a/docs/man/xrdp-sesrun.8 +++ b/docs/man/xrdp-sesrun.8.in @@ -1,4 +1,4 @@ -.TH "xrdp\-sesrun" "8" "0.9.1" "xrdp team" "" +.TH "xrdp\-sesrun" "8" "@PACKAGE_VERSION@" "xrdp team" "" .SH "NAME" xrdp\-sesrun \- \fBsesman\fR(8) session launcher diff --git a/docs/man/xrdp-sessvc.8 b/docs/man/xrdp-sessvc.8.in index 9a4e8189..92ca7c29 100644 --- a/docs/man/xrdp-sessvc.8 +++ b/docs/man/xrdp-sessvc.8.in @@ -1,4 +1,4 @@ -.TH "xrdp\-sessvc" "8" "0.9.1" "xrdp team" "" +.TH "xrdp\-sessvc" "8" "@PACKAGE_VERSION@" "xrdp team" "" .SH "NAME" xrdp\-sessvc \- \fBxrdp\fR session supervisor diff --git a/docs/man/xrdp.8 b/docs/man/xrdp.8.in index f838c203..4ab795fa 100644 --- a/docs/man/xrdp.8 +++ b/docs/man/xrdp.8.in @@ -1,4 +1,4 @@ -.TH "xrdp" "8" "0.9.1" "xrdp team" "" +.TH "xrdp" "8" "@PACKAGE_VERSION@" "xrdp team" "" .SH "NAME" \fBxrdp\fR \- a Remote Desktop Protocol (RDP) server @@ -7,34 +7,34 @@ xrdp [ \-\-nodaemon | \-\-kill | \-\-help ] .SH "DESCRIPTION" \fBxrdp\fR is a Remote Desktop Protocol (RDP) Server. -.br +.br Unlike Windows NT/2000/2003 server, \fBxrdp\fR will not display a Windows desktop but an X window desktop to the user. It can also be used as a VNC\->RDP bridge. .SH "OPTIONS" -.TP -\fB\-n\fR, \fB\-\-nodaemon\fR +.TP +\fB\-n\fR, \fB\-\-nodaemon\fR Starts \fBxrdp\fR in foreground instead of starting it as a daemon. -.TP +.TP \fB\-k\fR, \fB\-\-kill\fR Kills running \fBxrdp\fR daemon. -.TP +.TP \fB\-h\fR, \fB\-\-help\fR Output help information and exit. .SH "FILES" ${XRDP_BIN_DIR}/xrdp -.br +.br ${XRDP_CFG_DIR}/xrdp.ini -.br +.br ${XRDP_LOG_DIR}/xrdp.log -.br +.br ${XRDP_PID_DIR}/xrdp.pid .SH "AUTHORS" Jay Sorg <jsorg71@users.sourceforge.net> -.br +.br Simone Fedele <ilsimo@users.sourceforge.net> .SH "SEE ALSO" diff --git a/docs/man/xrdp.ini.5 b/docs/man/xrdp.ini.5.in index c202b01a..779633ca 100644 --- a/docs/man/xrdp.ini.5 +++ b/docs/man/xrdp.ini.5.in @@ -1,4 +1,4 @@ -.TH "xrdp.ini" "5" "0.9.1" "xrdp team" "" +.TH "xrdp.ini" "5" "@PACKAGE_VERSION@" "xrdp team" "" .SH "NAME" \fBxrdp.ini\fR \- Configuration file for \fBxrdp\fR(8) |