Add documentation key in systemd .service files
PATCH 1/3 Add documentation key in systemd .service files
From: Laurent Bigonville <[email protected]>
--- mcstrans/src/mcstrans.service | 1 + restorecond/restorecond.service | 1 + 2 files changed, 2 insertions(+)
mcstrans/src/mcstrans.service +1 -0
@@ -1,5 +1,6 @@ [Unit] Description=Translates SELinux MCS/MLS labels to human readable form +Documentation=man:mcstransd(8) ConditionSecurity=selinux [Service]
restorecond/restorecond.service +1 -0
@@ -1,5 +1,6 @@ [Unit] Description=Restorecon maintaining path file context +Documentation=man:restorecond(8) ConditionPathExists=/etc/selinux/restorecond.conf ConditionSecurity=selinux
Signature · 1 line
2.22.0
PATCH 2/3 mcstrans: Move setrans.conf manpage to section 5
From: Laurent Bigonville <[email protected]>
Move setrans.conf manpage to section 5 as it describes the documentation for "File formats and conventions"
---
mcstrans/man/Makefile | 9 +++++++++
.../man/{man8/setrans.conf.8 => man5/setrans.conf.5} | 2 +-
.../man/ru/{man8/setrans.conf.8 => man5/setrans.conf.5} | 2 +-
3 files changed, 11 insertions(+), 2 deletions(-)
rename mcstrans/man/{man8/setrans.conf.8 => man5/setrans.conf.5} (98%)
rename mcstrans/man/ru/{man8/setrans.conf.8 => man5/setrans.conf.5} (98%)mcstrans/man/Makefile +9 -0
@@ -2,15 +2,23 @@ LINGUAS ?= ru PREFIX ?= /usr MANDIR ?= $(PREFIX)/share/man +MAN5SUBDIR ?= man5 +MAN5DIR ?= $(MANDIR)/$(MAN5SUBDIR) MAN8SUBDIR ?= man8 MAN8DIR ?= $(MANDIR)/$(MAN8SUBDIR) all: install: all + mkdir -p $(DESTDIR)$(MAN5DIR) mkdir -p $(DESTDIR)$(MAN8DIR) + install -m 644 man5/*.5 $(DESTDIR)$(MAN5DIR) install -m 644 man8/*.8 $(DESTDIR)$(MAN8DIR) for lang in $(LINGUAS) ; do \ + if [ -e $${lang}/man5 ] ; then \ + mkdir -p $(DESTDIR)$(MANDIR)/$${lang}/$(MAN5SUBDIR) ; \ + install -m 644 $${lang}/man5/*.5 $(DESTDIR)$(MANDIR)/$${lang}/$(MAN5SUBDIR) ; \ + fi ; \ if [ -e $${lang}/man8 ] ; then \ mkdir -p $(DESTDIR)$(MANDIR)/$${lang}/$(MAN8SUBDIR) ; \ install -m 644 $${lang}/man8/*.8 $(DESTDIR)$(MANDIR)/$${lang}/$(MAN8SUBDIR) ; \
@@ -19,4 +27,5 @@ install: all clean: -rm -f *~ \#* + -rm -f man5/*~ man5/\#* -rm -f man8/*~ man8/\#*
mcstrans/man/man5/setrans.conf.5 renamed from mcstrans/man/man8/setrans.conf.8 +1 -1
@@ -1,4 +1,4 @@ -.TH "setrans.conf" "8" "13 July 2010" "[email protected]" "setrans.conf documentation" +.TH "setrans.conf" "5" "13 July 2010" "[email protected]" "setrans.conf documentation" .SH "NAME" setrans.conf \- translation configuration file for MCS/MLS SELinux systems
mcstrans/man/ru/man5/setrans.conf.5 renamed from mcstrans/man/ru/man8/setrans.conf.8 +1 -1
@@ -1,4 +1,4 @@ -.TH "setrans.conf" "8" "13 июля 2010" "[email protected]" "Документация по setrans.conf" +.TH "setrans.conf" "5" "13 июля 2010" "[email protected]" "Документация по setrans.conf" .SH "ИМЯ" setrans.conf \- файл конфигурации преобразования для систем MCS/MLS SELinux
Signature · 1 line
2.22.0
PATCH 3/3 mcstrans: Add reference to setools.conf man page in the daemon one
In reply to Laurent BigonvilleFrom: Laurent Bigonville <[email protected]>
--- mcstrans/man/man8/mcstransd.8 | 2 +- mcstrans/man/ru/man8/mcstransd.8 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
mcstrans/man/man8/mcstransd.8 +1 -1
@@ -29,4 +29,4 @@ The program was enhanced/rewritten by Joe Nall <[email protected]>. /etc/selinux/{SELINUXTYPE}/setrans.conf .SH "SEE ALSO" -.BR mcs (8), +.BR setrans.conf (5), mcs (8)
mcstrans/man/ru/man8/mcstransd.8 +1 -1
@@ -23,7 +23,7 @@ mcstransd \- внутренняя служба MCS (мультикатегори /etc/selinux/{SELINUXTYPE}/setrans.conf .SH "СМОТРИТЕ ТАКЖЕ" -.BR mcs (8) +.BR setrans.conf (5), mcs (8) .SH "АВТОРЫ" Эта man-страница написана Dan Walsh <[email protected]>.
Signature · 1 line
2.22.0
Re: [PATCH 3/3] mcstrans: Add reference to setools.conf man page in the daemon one
The three in the series LGTM. Ack.
Quoted 35 lines · Laurent Bigonville
From: Laurent Bigonville <[email protected]>
Signed-off-by Laurent Bigonville <[email protected]>--- mcstrans/man/man8/mcstransd.8 | 2 +- mcstrans/man/ru/man8/mcstransd.8 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)mcstrans/man/man8/mcstransd.8 +1
-1@@ -29,4 +29,4 @@ The program was enhanced/rewritten by Joe Nall <[email protected]>. /etc/selinux/{SELINUXTYPE}/setrans.conf .SH "SEE ALSO" -.BR mcs (8), +.BR setrans.conf (5), mcs (8)mcstrans/man/ru/man8/mcstransd.8 +1
-2@@ -23,7 +23,7 @@ mcstransd \- внутренняя служба MCS (мультикатегори /etc/selinux/{SELINUXTYPE}/setrans.conf .SH "СМОТРИТЕ ТАКЖЕ" -.BR mcs (8) +.BR setrans.conf (5), mcs (8) .SH "АВТОРЫ" Эта man-страница написана Dan Walsh <[email protected]>. --2.22.0
Re: [PATCH 3/3] mcstrans: Add reference to setools.conf man page in the daemon one
Staged:
https://github.com/SELinuxProject/selinux/pull/171
Quoted 39 lines · William Roberts
The three in the series LGTM. Ack.
Quoted 35 lines · Laurent Bigonville
From: Laurent Bigonville <[email protected]>
Signed-off-by Laurent Bigonville <[email protected]>--- mcstrans/man/man8/mcstransd.8 | 2 +- mcstrans/man/ru/man8/mcstransd.8 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)mcstrans/man/man8/mcstransd.8 +1
-1@@ -29,4 +29,4 @@ The program was enhanced/rewritten by Joe Nall <[email protected]>. /etc/selinux/{SELINUXTYPE}/setrans.conf .SH "SEE ALSO" -.BR mcs (8), +.BR setrans.conf (5), mcs (8)mcstrans/man/ru/man8/mcstransd.8 +1
-2@@ -23,7 +23,7 @@ mcstransd \- внутренняя служба MCS (мультикатегори /etc/selinux/{SELINUXTYPE}/setrans.conf .SH "СМОТРИТЕ ТАКЖЕ" -.BR mcs (8) +.BR setrans.conf (5), mcs (8) .SH "АВТОРЫ" Эта man-страница написана Dan Walsh <[email protected]>. --2.22.0
Re: [PATCH 3/3] mcstrans: Add reference to setools.conf man page in the daemon one
Quoted 4 lines · William Roberts
Merged:
https://github.com/SELinuxProject/selinux/pull/171
Quoted 41 lines
Quoted 39 lines · William Roberts
The three in the series LGTM. Ack.
Quoted 35 lines · Laurent Bigonville
From: Laurent Bigonville <[email protected]>
Signed-off-by Laurent Bigonville <[email protected]>--- mcstrans/man/man8/mcstransd.8 | 2 +- mcstrans/man/ru/man8/mcstransd.8 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)mcstrans/man/man8/mcstransd.8 +1
-1@@ -29,4 +29,4 @@ The program was enhanced/rewritten by Joe Nall <[email protected]>. /etc/selinux/{SELINUXTYPE}/setrans.conf .SH "SEE ALSO" -.BR mcs (8), +.BR setrans.conf (5), mcs (8)mcstrans/man/ru/man8/mcstransd.8 +1
-2@@ -23,7 +23,7 @@ mcstransd \- внутренняя служба MCS (мультикатегори /etc/selinux/{SELINUXTYPE}/setrans.conf .SH "СМОТРИТЕ ТАКЖЕ" -.BR mcs (8) +.BR setrans.conf (5), mcs (8) .SH "АВТОРЫ" Эта man-страница написана Dan Walsh <[email protected]>. --2.22.0