From 232eecd4b9d34cb57aa624bb126aacae5d14cf25 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <vdr@tvdr.de>
Date: Sat, 14 Jan 2006 11:10:24 +0100
Subject: [PATCH] Removed the now obsolete "ca.conf" section from vdr.1

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

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 4db21efa..2e01cfec 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1466,6 +1466,7 @@ Ville Skytt
  in the repacker classes in remux.c
  for adding a missing #include <linux/unistd.h> to thread.c
  for adding missing i18n entry for the "Timer" button
+ for removing the obsolete "ca.conf" section from vdr.1
 
 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 649054cc..25330ad6 100644
--- a/HISTORY
+++ b/HISTORY
@@ -4163,3 +4163,4 @@ Video Disk Recorder Revision History
 - Key macros can now be defined for all non-modeless keys (suggested by Mirko Dölle).
 - Adjusted the "KEY MACROS" section of vdr.5 to the new plugin calling mechanism
   introduced in version 1.3.32.
+- Removed the now obsolete "ca.conf" section from vdr.1 (thanks to Ville Skyttä).
diff --git a/vdr.1 b/vdr.1
index b71e13e3..9bc5b4fb 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 1.21 2006/01/13 16:01:19 kls Exp $
+.\" $Id: vdr.1 1.22 2006/01/14 11:09:08 kls Exp $
 .\"
 .TH vdr 1 "08 Jan 2006" "1.3.38" "Video Disk Recorder"
 .SH NAME
@@ -161,9 +161,6 @@ An non-recoverable error has been detected, \fBvdr\fR has given up.
 .I channels.conf
 Channel configuration.
 .TP
-.I ca.conf
-Conditional access configuration.
-.TP
 .I timers.conf
 Timer configuration.
 .TP