Merge branch 'stockholm' of https://github.com/bashrc/freedombone into stockholm

src/freedombone-config

@@ -788,7 +788,7 @@ function select_user {
 	fi
 }
 
-function interactive_configuration {
+function interactive_config {
 	# create a temporary copy of the configuration file
 	# which can be used to pre-populate selections
 	if [ -f $CONFIGURATION_FILE ]; then
@@ -2192,6 +2192,6 @@ function read_configuration {
 }
 
 read_configuration
-interactive_configuration
+interactive_config
 show_result
 exit 0

src/freedombone-remote

@@ -116,7 +116,7 @@ do
 	shift
 done
 
-function interactive_configuration_remote_backups {
+function interactive_config_remote_backups {
 	if [ ! $MY_USERNAME ]; then
 		echo $'Please specify a username with the -u option'
 		exit 7356
@@ -259,6 +259,6 @@ if [ ! $FRIENDS_SERVERS_LIST ]; then
 	FRIENDS_SERVERS_LIST=/home/$MY_USERNAME/backup.list
 fi
 
-interactive_configuration_remote_backups
+interactive_config_remote_backups
 show_result
 exit 0