diff options
author | Christian Pointner <equinox@spreadspace.org> | 2016-05-26 00:00:03 +0200 |
---|---|---|
committer | Christian Pointner <equinox@spreadspace.org> | 2016-05-26 00:00:03 +0200 |
commit | 6eb018ecb5009590dc26f44d66c22e1dc044a257 (patch) | |
tree | 07c67914d3f4162b7df9b510b45072dbbe5bbba1 /doc | |
parent | further cleanups, improved options parser based on glib (diff) |
added gstreamer exception to License
further cleanups
Diffstat (limited to 'doc')
-rw-r--r-- | doc/Makefile | 6 | ||||
-rw-r--r-- | doc/gstdvbbackend.8 | 2 | ||||
-rw-r--r-- | doc/gstdvbbackend.8.txt | 22 |
3 files changed, 18 insertions, 12 deletions
diff --git a/doc/Makefile b/doc/Makefile index 3ef92f0..327ad18 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -22,6 +22,12 @@ ## You should have received a copy of the GNU General Public License ## along with gstdvbbackend. If not, see <http://www.gnu.org/licenses/>. ## +## In addition, as a special exception, the copyright holders hereby +## grant permission for non-GPL-compatible GStreamer plugins to be used +## and distributed together with GStreamer and gstdvbbackend. +## This permission goes above and beyond the permissions granted by the +## GPL license sydra is covered by. +## VERSION=$(shell cat ../version) diff --git a/doc/gstdvbbackend.8 b/doc/gstdvbbackend.8 index 34ae925..a61a211 100644 --- a/doc/gstdvbbackend.8 +++ b/doc/gstdvbbackend.8 @@ -123,7 +123,7 @@ to run in debug mode\&. It implicits .RE .SH "BUGS" .sp -Most likely there are some bugs in \fBgstdvbbackend\fR\&. If you find a bug, please let the developers know at equinox@helsinki\&.at\&. Of course, patches are preferred\&. +Most likely there are some bugs in \fBgstdvbbackend\fR\&. If you find a bug, please let the developers know at equinox@spreadspace\&.org\&. Of course, patches are preferred\&. .SH "SEE ALSO" .sp \fBgst\-launch\fR(1) diff --git a/doc/gstdvbbackend.8.txt b/doc/gstdvbbackend.8.txt index 62b5307..03b0469 100644 --- a/doc/gstdvbbackend.8.txt +++ b/doc/gstdvbbackend.8.txt @@ -26,7 +26,7 @@ gstdvbbackend DESCRIPTION ----------- -*gstdvbbackend* gstdvbbackend is small program based on gstreamer. It +*gstdvbbackend* gstdvbbackend is small program based on gstreamer. It captures a given set of dvb channels from one dvb device and provides the streams via minimal http. @@ -40,7 +40,7 @@ The following options can be passed to the *gstdvbbackend* daemon: instead of becoming a daemon which is the default. *-u, --username <username>*:: - run as this user. If no group is specified (*-g*) the default group of + run as this user. If no group is specified (*-g*) the default group of the user is used. The default is to not drop privileges. *-g, --groupname <groupname>*:: @@ -48,20 +48,20 @@ The following options can be passed to the *gstdvbbackend* daemon: The default is to not drop privileges. *-C, --chroot <path>*:: - Instruct *gstdvbbackend* to run in a chroot jail. The default is + Instruct *gstdvbbackend* to run in a chroot jail. The default is to not run in chroot. *-P, --write-pid <filename>*:: - Instruct *gstdvbbackend* to write it's pid to this file. The default is + Instruct *gstdvbbackend* to write it's pid to this file. The default is to not create a pid file. *-L, --log <target>:<level>[,<param1>[,<param2>[..]]]*:: add log target to logging system. This can be invoked several times - in order to log to different targets at the same time. Every target + in order to log to different targets at the same time. Every target has its own log level which is a number between 0 and 5. Where 0 means disabling log and 5 means debug messages are enabled. + The file target can be used more than once with different levels. - If no target is provided at the command line a single target with the + If no target is provided at the command line a single target with the config *syslog:3,gstdvbbackend,daemon* is added. + The following targets are supported: @@ -71,7 +71,7 @@ The following options can be passed to the *gstdvbbackend* daemon: *stderr*;; log to standard error, parameters <level> *-U, --debug*:: - This option instructs *gstdvbbackend* to run in debug mode. It implicits *-D* + This option instructs *gstdvbbackend* to run in debug mode. It implicits *-D* (don't daemonize) and adds a log target with the configuration *stdout:5* (logging with maximum level). In future releases there might be additional output when this option is supplied. @@ -80,7 +80,7 @@ The following options can be passed to the *gstdvbbackend* daemon: BUGS ---- Most likely there are some bugs in *gstdvbbackend*. If you find a bug, please let -the developers know at equinox@helsinki.at. Of course, patches are preferred. +the developers know at equinox@spreadspace.org. Of course, patches are preferred. SEE ALSO @@ -103,7 +103,7 @@ Project Page: http://www.spreadspace.org/gstdvbbackend COPYING ------- -Copyright \(C) 2011-2016 Christian Pointner. This program is free -software: you can redistribute it and/or modify it under the terms -of the GNU General Public License as published by the Free Software +Copyright \(C) 2011-2016 Christian Pointner. This program is free +software: you can redistribute it and/or modify it under the terms +of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or any later version. |