Rename conf file and bash completion script

Also,
- Add the new manpage to the Makefile.
- Add additional dependencies in README.
- Fix some small formatting mistakes in ctct(1).

1 files changed, 8 insertions, 9 deletions

diff --git a/ctct_config.5.in b/ctct_config.5.in
index a1f6184..4dcf063 100644
--- a/ctct_config.5.in
+++ b/ctct_config.5.in
@@ -27,7 +27,7 @@ ctct_config \- configuration of ctct
 The main configuration file for
 .BR ctct (1)
 is
-.IR @default_confdir@/config\.sh \.
+.IR @sysconfdir_expanded@/ctct_config \.
 The file is a
 .BR bash (1)
 script which is simply sourced by
@@ -35,20 +35,19 @@ script which is simply sourced by
 It must not exit\.
 Any configuration is done by setting shell variables\.
 Configuration may be overriden in per-user configuration scripts, see
-.BR user_config_dir \.
+.BR user_config_file \.
 .P
 The following variables are recognized:
 .\"
 .TP
-.B user_config_dir
-The directory where the per user configuration file
-.I config\.sh
-is searched for\.
+.B user_config_file
+The per user configuration file.
 If set, this variable must contain the prefix
 .I $HOME
 or alternatively any other variable resolving to a directory
 below the respective home directory\.
-.RI "The default value is " @default_user_config_dir@ \.
+The default value is
+.IR $HOME/.config/ctct_config" \.
 .\"
 .TP
 .B datadir
@@ -176,11 +175,11 @@ file are stored by default\.
 .\"
 .SH FILES
 .TP
-.I @default_confdir@/config\.sh
+.I @sysconfdir_expanded@/ctct_config
 System wide configuration file\.
 .\"
 .TP
-.I @default_user_config_dir@/config\.sh
+.I $HOME/.config/config\.sh
 Default location of the user configuration file\.
 .\"
 .TP