move config file into a directory

git-svn-id: https://linkchecker.svn.sourceforge.net/svnroot/linkchecker/trunk/linkchecker@2232 e7d03fd6-7b0d-0410-9947-9c21f3af8025
This commit is contained in:
calvin 2005-01-28 15:08:07 +00:00
parent 0aabca8444
commit d04523b4fc
5 changed files with 8 additions and 8 deletions

View file

@ -61,7 +61,7 @@ Hilfe! Gebe Gebrauchsanweisung f
.TP
\fB-f\fP\fIKonfigurationsdatei\fP, \fB--config=\fP\fIKonfigurationsdatei\fP
Benutze \fIfile\fP as configuration file. As default LinkChecker first searches
/etc/linkchecker/linkcheckerrc and then ~/.linkcheckerrc.
/etc/linkchecker/linkcheckerrc and then ~/.linkchecker/linkcheckerrc.
.TP
\fB-I\fP, \fB--interactive\fP
Frage nach URLs, falls keine auf der Kommandozeile eingegeben wurde.
@ -308,7 +308,7 @@ Warnungen gefunden wurden und die Option --warnings wurde angegeben oder
ein Programmfehler aufgetreten ist.
.SH DATEIEN
\fB/etc/linkchecker/linkcheckerrc\fP, \fB~/.linkcheckerrc\fP -
\fB/etc/linkchecker/linkcheckerrc\fP, \fB~/.linkchecker/linkcheckerrc\fP -
Standardkonfigurationsdateien
\fB~/.blacklist\fP - Standard Dateiname der blacklist Logger Ausgabe

View file

@ -63,7 +63,7 @@ Help me! Print usage information for this program.
\fB-f\fP\fIconfigfile\fP, \fB--config=\fP\fIconfigfile\fP
Use \fIconfigfile\fP as configuration file. As default LinkChecker first
searches \fB/etc/linkchecker/linkcheckerrc\fP and then
\fB~/.linkcheckerrc\fP.
\fB~/.linkchecker/linkcheckerrc\fP.
.TP
\fB-I\fP, \fB--interactive\fP
Ask for url if none are given on the commandline.
@ -304,7 +304,7 @@ link warnings were found and --warnings option was given
a program error occurred.
.SH FILES
\fB/etc/linkchecker/linkcheckerrc\fP, \fB~/.linkcheckerrc\fP - default
\fB/etc/linkchecker/linkcheckerrc\fP, \fB~/.linkchecker/linkcheckerrc\fP - default
configuration files
\fB~/.blacklist\fP - default blacklist logger output filename

View file

@ -61,7 +61,7 @@ Afficher des informations sur l'utilisation du programme.
.TP
\fB\-f\fP\fIconfigfile\fP, \fB\-\-config=\fP\fIconfigfile\fP
Utiliser \fIconfigfile\fP comme fichier de configuration. LinkChecker recherche d'abord
/etc/linkchecker/linkcheckerrc puis ~/.linkcheckerrc.
/etc/linkchecker/linkcheckerrc puis ~/.linkchecker/linkcheckerrc.
.TP
\fB\-I\fP, \fB\-\-interactive\fP
Demander l'URL si aucune n'a été donnée sur la ligne de commande.
@ -249,7 +249,7 @@ link warnings were found and --warnings option was given
a program error occurred.
.SH "FICHIERS"
\fB/etc/linkchecker/linkcheckerrc\fP, \fB~/.linkcheckerrc\fP \- fichiers de configuration par défaut
\fB/etc/linkchecker/linkcheckerrc\fP, \fB~/.linkchecker/linkcheckerrc\fP \- fichiers de configuration par défaut
\fB~/.blacklist\fP \- fichier par défaut des blacklists pour la journalisation

View file

@ -197,7 +197,7 @@ class Configuration (dict):
config_dir = _linkchecker_configdata.config_dir
cfiles.append(norm(os.path.join(config_dir, "linkcheckerrc")))
# per user config settings
cfiles.append(norm("~/.linkcheckerrc"))
cfiles.append(norm("~/.linkchecker/linkcheckerrc"))
self.read_config(cfiles)
# re-init logger
self['logger'] = self.logger_new('text')

View file

@ -245,7 +245,7 @@ group = optparse.OptionGroup(optparser, _("General options"))
group.add_option("-f", "--config", type="string", dest="configfile",
help=_(
"""Use CONFIGFILE as configuration file. As default LinkChecker first
searches /etc/linkchecker/linkcheckerrc and then ~/.linkcheckerrc
searches /etc/linkchecker/linkcheckerrc and then ~/.linkchecker/linkcheckerrc
(under Windows <path-to-program>\\linkcheckerrc)."""))
group.add_option("-I", "--interactive", action="store_true",
dest="interactive", help=_(