selinux.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 1/3] Add documentation key in systemd .service files
@ 2019-07-15 14:45 Laurent Bigonville
  2019-07-15 14:45 ` [PATCH 2/3] mcstrans: Move setrans.conf manpage to section 5 Laurent Bigonville
  2019-07-15 14:45 ` [PATCH 3/3] mcstrans: Add reference to setools.conf man page in the daemon one Laurent Bigonville
  0 siblings, 2 replies; 6+ messages in thread
From: Laurent Bigonville @ 2019-07-15 14:45 UTC (permalink / raw)
  To: selinux

From: Laurent Bigonville <bigon@bigon.be>

Signed-off-by: Laurent Bigonville <bigon@bigon.be>
---
 mcstrans/src/mcstrans.service   | 1 +
 restorecond/restorecond.service | 1 +
 2 files changed, 2 insertions(+)

diff --git a/mcstrans/src/mcstrans.service b/mcstrans/src/mcstrans.service
index 8976b970..09529432 100644
--- a/mcstrans/src/mcstrans.service
+++ b/mcstrans/src/mcstrans.service
@@ -1,5 +1,6 @@
 [Unit]
 Description=Translates SELinux MCS/MLS labels to human readable form
+Documentation=man:mcstransd(8)
 ConditionSecurity=selinux
 
 [Service]
diff --git a/restorecond/restorecond.service b/restorecond/restorecond.service
index 6bce99d3..0e4ea72d 100644
--- a/restorecond/restorecond.service
+++ b/restorecond/restorecond.service
@@ -1,5 +1,6 @@
 [Unit]
 Description=Restorecon maintaining path file context
+Documentation=man:restorecond(8)
 ConditionPathExists=/etc/selinux/restorecond.conf
 ConditionSecurity=selinux
 
-- 
2.22.0


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [PATCH 2/3] mcstrans: Move setrans.conf manpage to section 5
  2019-07-15 14:45 [PATCH 1/3] Add documentation key in systemd .service files Laurent Bigonville
@ 2019-07-15 14:45 ` Laurent Bigonville
  2019-07-15 14:45 ` [PATCH 3/3] mcstrans: Add reference to setools.conf man page in the daemon one Laurent Bigonville
  1 sibling, 0 replies; 6+ messages in thread
From: Laurent Bigonville @ 2019-07-15 14:45 UTC (permalink / raw)
  To: selinux

From: Laurent Bigonville <bigon@bigon.be>

Move setrans.conf manpage to section 5 as it describes the documentation
for "File formats and conventions"

Signed-off-by: Laurent Bigonville <bigon@bigon.be>
---
 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%)

diff --git a/mcstrans/man/Makefile b/mcstrans/man/Makefile
index 0f8d34fd..71713818 100644
--- a/mcstrans/man/Makefile
+++ b/mcstrans/man/Makefile
@@ -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/\#*
diff --git a/mcstrans/man/man8/setrans.conf.8 b/mcstrans/man/man5/setrans.conf.5
similarity index 98%
rename from mcstrans/man/man8/setrans.conf.8
rename to mcstrans/man/man5/setrans.conf.5
index b7609921..4949a502 100644
--- a/mcstrans/man/man8/setrans.conf.8
+++ b/mcstrans/man/man5/setrans.conf.5
@@ -1,4 +1,4 @@
-.TH "setrans.conf" "8" "13 July 2010" "txtoth@gmail.com" "setrans.conf documentation"
+.TH "setrans.conf" "5" "13 July 2010" "txtoth@gmail.com" "setrans.conf documentation"
 .SH "NAME"
 setrans.conf \- translation configuration file for MCS/MLS SELinux systems
 
diff --git a/mcstrans/man/ru/man8/setrans.conf.8 b/mcstrans/man/ru/man5/setrans.conf.5
similarity index 98%
rename from mcstrans/man/ru/man8/setrans.conf.8
rename to mcstrans/man/ru/man5/setrans.conf.5
index 9141defe..724b206b 100644
--- a/mcstrans/man/ru/man8/setrans.conf.8
+++ b/mcstrans/man/ru/man5/setrans.conf.5
@@ -1,4 +1,4 @@
-.TH "setrans.conf" "8" "13 июля 2010" "txtoth@gmail.com" "Документация по setrans.conf"
+.TH "setrans.conf" "5" "13 июля 2010" "txtoth@gmail.com" "Документация по setrans.conf"
 .SH "ИМЯ"
 setrans.conf \- файл конфигурации преобразования для систем MCS/MLS SELinux
 
-- 
2.22.0


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [PATCH 3/3] mcstrans: Add reference to setools.conf man page in the daemon one
  2019-07-15 14:45 [PATCH 1/3] Add documentation key in systemd .service files Laurent Bigonville
  2019-07-15 14:45 ` [PATCH 2/3] mcstrans: Move setrans.conf manpage to section 5 Laurent Bigonville
@ 2019-07-15 14:45 ` Laurent Bigonville
  2019-07-16 15:20   ` William Roberts
  1 sibling, 1 reply; 6+ messages in thread
From: Laurent Bigonville @ 2019-07-15 14:45 UTC (permalink / raw)
  To: selinux

From: Laurent Bigonville <bigon@bigon.be>

Signed-off-by: Laurent Bigonville <bigon@bigon.be>
---
 mcstrans/man/man8/mcstransd.8    | 2 +-
 mcstrans/man/ru/man8/mcstransd.8 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mcstrans/man/man8/mcstransd.8 b/mcstrans/man/man8/mcstransd.8
index 64774a52..9a5922ba 100644
--- a/mcstrans/man/man8/mcstransd.8
+++ b/mcstrans/man/man8/mcstransd.8
@@ -29,4 +29,4 @@ The program was enhanced/rewritten by Joe Nall <joe@nall.com>.
 /etc/selinux/{SELINUXTYPE}/setrans.conf 
 
 .SH "SEE ALSO"
-.BR mcs (8),
+.BR setrans.conf (5), mcs (8)
diff --git a/mcstrans/man/ru/man8/mcstransd.8 b/mcstrans/man/ru/man8/mcstransd.8
index 90247c32..4cd68c17 100644
--- a/mcstrans/man/ru/man8/mcstransd.8
+++ b/mcstrans/man/ru/man8/mcstransd.8
@@ -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 <dwalsh@redhat.com>.
-- 
2.22.0


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* Re: [PATCH 3/3] mcstrans: Add reference to setools.conf man page in the daemon one
  2019-07-15 14:45 ` [PATCH 3/3] mcstrans: Add reference to setools.conf man page in the daemon one Laurent Bigonville
@ 2019-07-16 15:20   ` William Roberts
  2019-07-16 16:28     ` William Roberts
  0 siblings, 1 reply; 6+ messages in thread
From: William Roberts @ 2019-07-16 15:20 UTC (permalink / raw)
  To: Laurent Bigonville; +Cc: selinux

The three in the series LGTM. Ack.

On Mon, Jul 15, 2019 at 9:55 AM Laurent Bigonville <bigon@debian.org> wrote:
>
> From: Laurent Bigonville <bigon@bigon.be>
>
> Signed-off-by: Laurent Bigonville <bigon@bigon.be>
> ---
>  mcstrans/man/man8/mcstransd.8    | 2 +-
>  mcstrans/man/ru/man8/mcstransd.8 | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/mcstrans/man/man8/mcstransd.8 b/mcstrans/man/man8/mcstransd.8
> index 64774a52..9a5922ba 100644
> --- a/mcstrans/man/man8/mcstransd.8
> +++ b/mcstrans/man/man8/mcstransd.8
> @@ -29,4 +29,4 @@ The program was enhanced/rewritten by Joe Nall <joe@nall.com>.
>  /etc/selinux/{SELINUXTYPE}/setrans.conf
>
>  .SH "SEE ALSO"
> -.BR mcs (8),
> +.BR setrans.conf (5), mcs (8)
> diff --git a/mcstrans/man/ru/man8/mcstransd.8 b/mcstrans/man/ru/man8/mcstransd.8
> index 90247c32..4cd68c17 100644
> --- a/mcstrans/man/ru/man8/mcstransd.8
> +++ b/mcstrans/man/ru/man8/mcstransd.8
> @@ -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 <dwalsh@redhat.com>.
> --
> 2.22.0
>

^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: [PATCH 3/3] mcstrans: Add reference to setools.conf man page in the daemon one
  2019-07-16 15:20   ` William Roberts
@ 2019-07-16 16:28     ` William Roberts
  2019-07-18 14:52       ` William Roberts
  0 siblings, 1 reply; 6+ messages in thread
From: William Roberts @ 2019-07-16 16:28 UTC (permalink / raw)
  To: Laurent Bigonville; +Cc: selinux

Staged:
https://github.com/SELinuxProject/selinux/pull/171

On Tue, Jul 16, 2019 at 10:20 AM William Roberts
<bill.c.roberts@gmail.com> wrote:
>
> The three in the series LGTM. Ack.
>
> On Mon, Jul 15, 2019 at 9:55 AM Laurent Bigonville <bigon@debian.org> wrote:
> >
> > From: Laurent Bigonville <bigon@bigon.be>
> >
> > Signed-off-by: Laurent Bigonville <bigon@bigon.be>
> > ---
> >  mcstrans/man/man8/mcstransd.8    | 2 +-
> >  mcstrans/man/ru/man8/mcstransd.8 | 2 +-
> >  2 files changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/mcstrans/man/man8/mcstransd.8 b/mcstrans/man/man8/mcstransd.8
> > index 64774a52..9a5922ba 100644
> > --- a/mcstrans/man/man8/mcstransd.8
> > +++ b/mcstrans/man/man8/mcstransd.8
> > @@ -29,4 +29,4 @@ The program was enhanced/rewritten by Joe Nall <joe@nall.com>.
> >  /etc/selinux/{SELINUXTYPE}/setrans.conf
> >
> >  .SH "SEE ALSO"
> > -.BR mcs (8),
> > +.BR setrans.conf (5), mcs (8)
> > diff --git a/mcstrans/man/ru/man8/mcstransd.8 b/mcstrans/man/ru/man8/mcstransd.8
> > index 90247c32..4cd68c17 100644
> > --- a/mcstrans/man/ru/man8/mcstransd.8
> > +++ b/mcstrans/man/ru/man8/mcstransd.8
> > @@ -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 <dwalsh@redhat.com>.
> > --
> > 2.22.0
> >

^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: [PATCH 3/3] mcstrans: Add reference to setools.conf man page in the daemon one
  2019-07-16 16:28     ` William Roberts
@ 2019-07-18 14:52       ` William Roberts
  0 siblings, 0 replies; 6+ messages in thread
From: William Roberts @ 2019-07-18 14:52 UTC (permalink / raw)
  To: Laurent Bigonville; +Cc: selinux

On Tue, Jul 16, 2019 at 11:28 AM William Roberts
<bill.c.roberts@gmail.com> wrote:
>
> Staged:
> https://github.com/SELinuxProject/selinux/pull/171
>

Merged:
https://github.com/SELinuxProject/selinux/pull/171

> On Tue, Jul 16, 2019 at 10:20 AM William Roberts
> <bill.c.roberts@gmail.com> wrote:
> >
> > The three in the series LGTM. Ack.
> >
> > On Mon, Jul 15, 2019 at 9:55 AM Laurent Bigonville <bigon@debian.org> wrote:
> > >
> > > From: Laurent Bigonville <bigon@bigon.be>
> > >
> > > Signed-off-by: Laurent Bigonville <bigon@bigon.be>
> > > ---
> > >  mcstrans/man/man8/mcstransd.8    | 2 +-
> > >  mcstrans/man/ru/man8/mcstransd.8 | 2 +-
> > >  2 files changed, 2 insertions(+), 2 deletions(-)
> > >
> > > diff --git a/mcstrans/man/man8/mcstransd.8 b/mcstrans/man/man8/mcstransd.8
> > > index 64774a52..9a5922ba 100644
> > > --- a/mcstrans/man/man8/mcstransd.8
> > > +++ b/mcstrans/man/man8/mcstransd.8
> > > @@ -29,4 +29,4 @@ The program was enhanced/rewritten by Joe Nall <joe@nall.com>.
> > >  /etc/selinux/{SELINUXTYPE}/setrans.conf
> > >
> > >  .SH "SEE ALSO"
> > > -.BR mcs (8),
> > > +.BR setrans.conf (5), mcs (8)
> > > diff --git a/mcstrans/man/ru/man8/mcstransd.8 b/mcstrans/man/ru/man8/mcstransd.8
> > > index 90247c32..4cd68c17 100644
> > > --- a/mcstrans/man/ru/man8/mcstransd.8
> > > +++ b/mcstrans/man/ru/man8/mcstransd.8
> > > @@ -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 <dwalsh@redhat.com>.
> > > --
> > > 2.22.0
> > >

^ permalink raw reply	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2019-07-18 14:52 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-07-15 14:45 [PATCH 1/3] Add documentation key in systemd .service files Laurent Bigonville
2019-07-15 14:45 ` [PATCH 2/3] mcstrans: Move setrans.conf manpage to section 5 Laurent Bigonville
2019-07-15 14:45 ` [PATCH 3/3] mcstrans: Add reference to setools.conf man page in the daemon one Laurent Bigonville
2019-07-16 15:20   ` William Roberts
2019-07-16 16:28     ` William Roberts
2019-07-18 14:52       ` William Roberts

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).