aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoerg Bornkessel <hd_brummy@gentoo.org>2015-02-06 11:19:26 +0100
committerJoerg Bornkessel <hd_brummy@gentoo.org>2015-02-06 11:19:26 +0100
commit212c05ee2c291c54968813aa2c9a86c40d2d7ee2 (patch)
treeedc84ad66b4adb7585b08ffa88f4d98dd78d86f5
parenttypo conf file (diff)
downloadgentoo-vdr-scripts-212c05ee2c291c54968813aa2c9a86c40d2d7ee2.tar.gz
gentoo-vdr-scripts-212c05ee2c291c54968813aa2c9a86c40d2d7ee2.tar.bz2
gentoo-vdr-scripts-212c05ee2c291c54968813aa2c9a86c40d2d7ee2.zip
documentation
-rw-r--r--README.x11-setup6
-rw-r--r--etc/conf.d/vdr15
2 files changed, 10 insertions, 11 deletions
diff --git a/README.x11-setup b/README.x11-setup
index b587550..d9c3dc2 100644
--- a/README.x11-setup
+++ b/README.x11-setup
@@ -13,11 +13,11 @@ Use-flag xorg is recommended!
It is not part of this README how to get a working X install.
Please refer for this to the depended xorg howto's.
-Is your X server setup finished, it is easy to start your x server with
+Is your X server setup finished, it is easy to start your X server with
our provided init script /etc/init.d/vdr-x11.
-We add by default minimal variables to the initscript to start the x server.
+We add by default minimal variables to the initscript to start the X server.
-To fit your own setup, please refer to the man page xorg.
+To fit your own setup, please refer to 'man xorg'
It is simple to add your own variables by using
/etc/conf.d/vdr --> Variable X11_SERVER=
diff --git a/etc/conf.d/vdr b/etc/conf.d/vdr
index c7a8e8e..4c63f33 100644
--- a/etc/conf.d/vdr
+++ b/etc/conf.d/vdr
@@ -129,15 +129,13 @@ LOG="3"
# Expert X11 Settings #
###########################################################
-# To fit
-# media-plugins/vdr-softhddevice
-# media-plugins/vdr-xineliboutput
-# we need a minimal configured X11 server
-# Please refer for detailed info to media-tv/gentoo-vdr-scripts README.x11-setup
+# X11 Server start
+# Please refer for detailed info to
+# media-tv/gentoo-vdr-scripts README.x11-setup
#
# init-file -> vdr-x11
#
-# X lib startparamter
+# X lib start paramter
# allowed values: see 'man xorg'
# default: ':0 -br -nocursor -nolisten tcp -quiet'
#X11_SERVER=" "
@@ -175,7 +173,7 @@ LOG="3"
#EPGFILE=""
# Activate the (internal to vdr) watchdog timer with
-# a timeout of SEC seconds (recommended by Klaus Schmidinger)
+# a timeout of SEC seconds (recommended by upstream)
# '0' disables the watchdog
# allowed values: 0 1 2 ...
# default: enabled / 60 seconds
@@ -243,7 +241,8 @@ PLUGIN_CHECK_PATCHLEVEL="yes"
# default: no
#
# WILL BE IGNORED IF USING SYSTEMD !!!
-# Please consult README.systemd for further details
+# Please consult media-tv/gentoo-vdr-scripts
+# README.systemd for further details
#
#START_VDR_AS_ROOT="no"