From 9bd2b9901f1323ecef3ff54663d2c8f1bf639c18 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <vdr@tvdr.de>
Date: Fri, 15 Mar 2013 10:47:35 +0100
Subject: [PATCH] Updated the help and man page entry about the location of the
 epg.data file

---
 CONTRIBUTORS | 1 +
 HISTORY      | 4 +++-
 vdr.1        | 4 ++--
 vdr.c        | 4 ++--
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 421b9fb7..79ef49ea 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -2014,6 +2014,7 @@ Ville Skytt
  for reporting that some special characters are dropped by Doxygen and thus need to
  be escaped
  for changing the template for PLGCFG to $(CONFDIR)/plugins.mk
+ for updating the help and man page entry about the location of the epg.data file
 
 Steffen Beyer <cpunk@reactor.de>
  for fixing setting the colored button help after deleting a recording in case the next
diff --git a/HISTORY b/HISTORY
index 13926c7b..02fb88b2 100644
--- a/HISTORY
+++ b/HISTORY
@@ -7730,7 +7730,7 @@ Video Disk Recorder Revision History
   to avoid problems with SD-FF cards in case the user switches to the "ST:TNG" or
   "Classic" skin.
 
-2013-03-14: Version 1.7.41
+2013-03-15: Version 1.7.41
 
 - Updated the Hungarian OSD texts (thanks to István Füley).
 - Updated the Russian OSD texts (thanks to Oleg Roitburd).
@@ -7752,3 +7752,5 @@ Video Disk Recorder Revision History
   in a future version of VDR.
 - When switching to a less privileged user id, VDR now sets the environment variables
   HOME, USER, LOGNAME and SHELL accordingly (thanks to Manuel Reimer).
+- Updated the help and man page entry about the location of the epg.data file (thanks
+  to Ville Skyttä).
diff --git a/vdr.1 b/vdr.1
index 7d606d03..6c37cc0c 100644
--- a/vdr.1
+++ b/vdr.1
@@ -8,7 +8,7 @@
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.1 2.16 2013/03/12 13:39:47 kls Exp $
+.\" $Id: vdr.1 2.17 2013/03/15 10:44:54 kls Exp $
 .\"
 .TH vdr 1 "31 Mar 2013" "2.0" "Video Disk Recorder"
 .SH NAME
@@ -77,7 +77,7 @@ The program will return immediately after editing the recording.
 .TP
 .BI \-E\  file ,\ \-\-epgfile= file
 Write the EPG data into the given \fIfile\fR
-(default is \fI/video/epg.data\fR).
+(default is \fIepg.data\fR in the cache directory).
 Use \fB\-E\-\fR to disable this.
 If \fIfile\fR is a directory, the file \fIepg.data\fR
 will be created in that directory.
diff --git a/vdr.c b/vdr.c
index 9231e689..c63eecaa 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.tvdr.de
  *
- * $Id: vdr.c 2.56 2013/03/14 09:34:57 kls Exp $
+ * $Id: vdr.c 2.57 2013/03/15 10:44:54 kls Exp $
  */
 
 #include <getopt.h>
@@ -499,7 +499,7 @@ int main(int argc, char *argv[])
                "                           apply\n"
                "            --edit=REC     cut recording REC and exit\n"
                "  -E FILE,  --epgfile=FILE write the EPG data into the given FILE (default is\n"
-               "                           '%s' in the video directory)\n"
+               "                           '%s' in the cache directory)\n"
                "                           '-E-' disables this\n"
                "                           if FILE is a directory, the default EPG file will be\n"
                "                           created in that directory\n"