14 files changed, 49 insertions, 14 deletions
diff --git a/doc-src/en/createcats.1.txt b/doc-src/en/createcats.1.txt
index cca13dd..671668e 100644
--- a/doc-src/en/createcats.1.txt
+++ b/doc-src/en/createcats.1.txt
@@ -96,7 +96,7 @@ L<http://www.vdr-developer.org/mailman/listinfo/epgsearch>
 
 =head1 COPYRIGHT and LICENSE
 
-Copyright (C) 2004-2007 Christian Wieninger
+Copyright (C) 2004-2008 Christian Wieninger
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
diff --git a/doc-src/en/epgsearch.1.txt b/doc-src/en/epgsearch.1.txt
index 51e9e58..6278d4b 100644
--- a/doc-src/en/epgsearch.1.txt
+++ b/doc-src/en/epgsearch.1.txt
@@ -1092,7 +1092,7 @@ L<http://www.vdr-developer.org/mailman/listinfo/epgsearch>
 
 =head1 COPYRIGHT and LICENSE
 
-Copyright (C) 2004-2007 Christian Wieninger
+Copyright (C) 2004-2008 Christian Wieninger
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
diff --git a/doc-src/en/epgsearch.4.txt b/doc-src/en/epgsearch.4.txt
index 68eef72..4a13933 100644
--- a/doc-src/en/epgsearch.4.txt
+++ b/doc-src/en/epgsearch.4.txt
@@ -23,6 +23,7 @@ extended README.
  11. Working with the timer conflict menu
  12. User defined variables
  13. Email notifications
+ 14. The conf.d subdirectory
 
 =head1 1. Using variables in the directory entry of a search timer
 
@@ -832,6 +833,40 @@ The following variables can be used in the section <conflictsat>:
 The section <conflicttimer> can use the same variables as the section <timer>
 in an update mail (see above).
 
+=head1 14. The conf.d subdirectory
+
+epgsearch supports a configuration mechanism well-known in linux. The settings of the configuration files
+
+  - epgsearchuservars.conf
+  - epgsearchdirs.conf
+  - epgsearchmenu.conf
+  - epgsearchcats.conf
+
+can also be given in a file with arbitrary name in the subdirectory conf.d in 
+<plugin-configuration-directory>/epgsearch. This allows one to quickly test different setups only
+by exchanging files instead of editing them. The format of these files is
+
+  [<section name>]
+  <settings>
+  ...
+
+  [<section name>]
+  <settings>
+  ...
+
+where <section_name> is one of the following:
+
+  - epgsearchuservars
+  - epgsearchdirs
+  - epgsearchmenu
+  - epgsearchcats
+
+The <settings> format follows the one in the corresponding configuration file.
+Comments beginning with # are allowed, also blank lines.
+At startup epgsearch first reads its 'regular' configuration files and then the conf.d subdirectory. 
+It's allowed to overwrite variables already defined in other files (although this is signaled with a warning in 
+epgsearch's log file.).
+
 
 =head1 SEE ALSO
 
@@ -854,7 +889,7 @@ L<http://www.vdr-developer.org/mailman/listinfo/epgsearch>
 
 =head1 COPYRIGHT and LICENSE
 
-Copyright (C) 2004-2007 Christian Wieninger
+Copyright (C) 2004-2008 Christian Wieninger
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
diff --git a/doc-src/en/epgsearch.conf.5.txt b/doc-src/en/epgsearch.conf.5.txt
index 4299039..cf1ca4f 100644
--- a/doc-src/en/epgsearch.conf.5.txt
+++ b/doc-src/en/epgsearch.conf.5.txt
@@ -120,7 +120,7 @@ L<http://www.vdr-developer.org/mailman/listinfo/epgsearch>
 
 =head1 COPYRIGHT and LICENSE
 
-Copyright (C) 2004-2007 Christian Wieninger
+Copyright (C) 2004-2008 Christian Wieninger
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
diff --git a/doc-src/en/epgsearchblacklists.conf.5.txt b/doc-src/en/epgsearchblacklists.conf.5.txt
index 43a752e..ddaaf96 100644
--- a/doc-src/en/epgsearchblacklists.conf.5.txt
+++ b/doc-src/en/epgsearchblacklists.conf.5.txt
@@ -47,7 +47,7 @@ L<http://www.vdr-developer.org/mailman/listinfo/epgsearch>
 
 =head1 COPYRIGHT and LICENSE
 
-Copyright (C) 2004-2007 Christian Wieninger
+Copyright (C) 2004-2008 Christian Wieninger
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
diff --git a/doc-src/en/epgsearchcats.conf.5.txt b/doc-src/en/epgsearchcats.conf.5.txt
index 08637b4..6830294 100644
--- a/doc-src/en/epgsearchcats.conf.5.txt
+++ b/doc-src/en/epgsearchcats.conf.5.txt
@@ -108,7 +108,7 @@ L<http://www.vdr-developer.org/mailman/listinfo/epgsearch>
 
 =head1 COPYRIGHT and LICENSE
 
-Copyright (C) 2004-2007 Christian Wieninger
+Copyright (C) 2004-2008 Christian Wieninger
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
diff --git a/doc-src/en/epgsearchchangrps.conf.5.txt b/doc-src/en/epgsearchchangrps.conf.5.txt
index bc55c87..1b50d53 100644
--- a/doc-src/en/epgsearchchangrps.conf.5.txt
+++ b/doc-src/en/epgsearchchangrps.conf.5.txt
@@ -41,7 +41,7 @@ L<http://www.vdr-developer.org/mailman/listinfo/epgsearch>
 
 =head1 COPYRIGHT and LICENSE
 
-Copyright (C) 2004-2007 Christian Wieninger
+Copyright (C) 2004-2008 Christian Wieninger
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
diff --git a/doc-src/en/epgsearchcmds.conf.5.txt b/doc-src/en/epgsearchcmds.conf.5.txt
index 2fadf8a..786acce 100644
--- a/doc-src/en/epgsearchcmds.conf.5.txt
+++ b/doc-src/en/epgsearchcmds.conf.5.txt
@@ -48,7 +48,7 @@ L<http://www.vdr-developer.org/mailman/listinfo/epgsearch>
 
 =head1 COPYRIGHT and LICENSE
 
-Copyright (C) 2004-2007 Christian Wieninger
+Copyright (C) 2004-2008 Christian Wieninger
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
diff --git a/doc-src/en/epgsearchdirs.conf.5.txt b/doc-src/en/epgsearchdirs.conf.5.txt
index e9aa7cc..6018792 100644
--- a/doc-src/en/epgsearchdirs.conf.5.txt
+++ b/doc-src/en/epgsearchdirs.conf.5.txt
@@ -79,7 +79,7 @@ L<http://www.vdr-developer.org/mailman/listinfo/epgsearch>
 
 =head1 COPYRIGHT and LICENSE
 
-Copyright (C) 2004-2007 Christian Wieninger
+Copyright (C) 2004-2008 Christian Wieninger
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
diff --git a/doc-src/en/epgsearchmenu.conf.5.txt b/doc-src/en/epgsearchmenu.conf.5.txt
index 0dfde69..4a82294 100644
--- a/doc-src/en/epgsearchmenu.conf.5.txt
+++ b/doc-src/en/epgsearchmenu.conf.5.txt
@@ -119,7 +119,7 @@ L<http://www.vdr-developer.org/mailman/listinfo/epgsearch>
 
 =head1 COPYRIGHT and LICENSE
 
-Copyright (C) 2004-2007 Christian Wieninger
+Copyright (C) 2004-2008 Christian Wieninger
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
diff --git a/doc-src/en/epgsearchswitchtimers.conf.5.txt b/doc-src/en/epgsearchswitchtimers.conf.5.txt
index bb0e615..69d554f 100644
--- a/doc-src/en/epgsearchswitchtimers.conf.5.txt
+++ b/doc-src/en/epgsearchswitchtimers.conf.5.txt
@@ -48,7 +48,7 @@ L<http://www.vdr-developer.org/mailman/listinfo/epgsearch>
 
 =head1 COPYRIGHT and LICENSE
 
-Copyright (C) 2004-2007 Christian Wieninger
+Copyright (C) 2004-2008 Christian Wieninger
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
diff --git a/doc-src/en/epgsearchtemplates.conf.5.txt b/doc-src/en/epgsearchtemplates.conf.5.txt
index 5b19f74..ddbdb72 100644
--- a/doc-src/en/epgsearchtemplates.conf.5.txt
+++ b/doc-src/en/epgsearchtemplates.conf.5.txt
@@ -35,7 +35,7 @@ L<http://www.vdr-developer.org/mailman/listinfo/epgsearch>
 
 =head1 COPYRIGHT and LICENSE
 
-Copyright (C) 2004-2007 Christian Wieninger
+Copyright (C) 2004-2008 Christian Wieninger
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
diff --git a/doc-src/en/epgsearchuservars.conf.5.txt b/doc-src/en/epgsearchuservars.conf.5.txt
index 59ef7a9..91fa34b 100644
--- a/doc-src/en/epgsearchuservars.conf.5.txt
+++ b/doc-src/en/epgsearchuservars.conf.5.txt
@@ -157,7 +157,7 @@ L<http://www.vdr-developer.org/mailman/listinfo/epgsearch>
 
 =head1 COPYRIGHT and LICENSE
 
-Copyright (C) 2004-2007 Christian Wieninger
+Copyright (C) 2004-2008 Christian Wieninger
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
diff --git a/doc-src/en/noannounce.conf.5.txt b/doc-src/en/noannounce.conf.5.txt
index d57475d..2633365 100644
--- a/doc-src/en/noannounce.conf.5.txt
+++ b/doc-src/en/noannounce.conf.5.txt
@@ -46,7 +46,7 @@ L<http://www.vdr-developer.org/mailman/listinfo/epgsearch>
 
 =head1 COPYRIGHT and LICENSE
 
-Copyright (C) 2004-2007 Christian Wieninger
+Copyright (C) 2004-2008 Christian Wieninger
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License