diff --git a/cdrskin/README b/cdrskin/README index 3325461..4bea16c 100644 --- a/cdrskin/README +++ b/cdrskin/README @@ -325,6 +325,7 @@ If not --no_rc is the first argument then cdrskin attempts on startup to read arguments from the following three files: /etc/default/cdrskin /etc/opt/cdrskin/rc + /etc/cdrskin/cdrskin.conf $HOME/.cdrskinrc The files are read in the sequence given above. Each readable line is treated as one single argument. No extra blanks. diff --git a/cdrskin/cdrskin.c b/cdrskin/cdrskin.c index fefe7b7..31d1c02 100644 --- a/cdrskin/cdrskin.c +++ b/cdrskin/cdrskin.c @@ -2023,7 +2023,8 @@ set_dev:; "Preconfigured arguments are read from the following startup files\n"); printf( "if they exist and are readable. The sequence is as listed here:\n"); - printf(" /etc/default/cdrskin /etc/opt/cdrskin/rc /etc/cdrskin/cdrskin.conf $HOME/.cdrskinrc\n"); + printf(" /etc/default/cdrskin /etc/opt/cdrskin/rc\n"); + printf(" /etc/cdrskin/cdrskin.conf $HOME/.cdrskinrc\n"); printf("Each file line is a single argument. No whitespace.\n"); printf( "By default any argument that does not match grep '^-.' or '=' is\n"); diff --git a/cdrskin/cdrskin_timestamp.h b/cdrskin/cdrskin_timestamp.h index ecd6fe7..6f8c74f 100644 --- a/cdrskin/cdrskin_timestamp.h +++ b/cdrskin/cdrskin_timestamp.h @@ -1 +1 @@ -#define Cdrskin_timestamP "2006.12.11.100021" +#define Cdrskin_timestamP "2006.12.11.101350"