From: Andre Noll <maan@systemlinux.org>
Date: Thu, 25 Dec 2008 10:54:46 +0000 (+0100)
Subject: Merge branch 'master' into bloom
X-Git-Tag: v0.1.0~14^2~3
X-Git-Url: http://git.tuebingen.mpg.de/adu.git/log?a=commitdiff_plain;h=78f42703571424f6d409a709fead7377f7a10616;hp=e975087dd1dcc5c9921be6592a5a2da7554c8b1a;p=adu.git

Merge branch 'master' into bloom
---

diff --git a/adu.ggo b/adu.ggo
index 84187eb..a180f1f 100644
--- a/adu.ggo
+++ b/adu.ggo
@@ -14,18 +14,6 @@ usage patterns of subdirectories and/or files owned by a given user id.
 section "General options"
 #########################
 
-option "config-file" c
-#~~~~~~~~~~~~~~~~~~~~~
-"(default='~/.adurc')"
-string typestr="filename"
-optional
-details="
-	Options may be given at the command line or in the
-	configuration file. As usual, if an option is given both at
-	the command line and in the configuration file, the command
-	line option takes precedence.
-"
-
 option "database-dir" d
 #~~~~~~~~~~~~~~~~~~~~~~
 "directory containing the osl tables"