drop MASTERS and SLAVES terminology

2 files changed, 27 insertions, 27 deletions

diff --git a/debian/impressive-display.default b/debian/impressive-display.default
index a2d69ab..2279526 100644
--- a/debian/impressive-display.default
+++ b/debian/impressive-display.default
@@ -3,17 +3,17 @@
 
 # There can be master terminals and slave terminals.
 # All terminal not listed here are slave terminals...
-MASTER_DISPLAYS="$(hostname -f)"
+PRIMARY_DISPLAYS="$(hostname -f)"
 
 # Login credentials for PDF download URLs
 # Credentials can be put here, but we recommend putting them
 # into $HOME/.impressive-display-secrets.
-#PDF_URL_MASTERS_CREDS="<username>:<password>"
-#PDF_URL_SLAVES_CREDS="<username>:<password>"
+#PDF_URL_PRIMARIES_CREDS="<username>:<password>"
+#PDF_URL_SECONDARIES_CREDS="<username>:<password>"
 
 # these PDF displays can have different download URLs
-#PDF_URL_MASTERS="https://web.server.com/path/to/pdffile.pdf"
-#PDF_URL_SLAVES="https://web.server.com/path/to/otherpdf.pdf"
+#PDF_URL_PRIMARIES="https://web.server.com/path/to/pdffile.pdf"
+#PDF_URL_SECONDARIES="https://web.server.com/path/to/otherpdf.pdf"
 
 # HTTP proxy URL, if needed
 #HTTP_PROXY_URL="http://webcache:3128"
@@ -23,8 +23,8 @@ DOWNLOAD_INTERVAL=600
 
 # or different static PDF documents (downloadable PDFs get preferred by
 # the impressive-display script...)
-PDF_FILE_MASTERS="/usr/share/doc/debian/FAQ/debian-faq.pdf.gz
-PDF_FILE_SLAVES="/usr/share/doc/debian/FAQ/debian-faq.pdf.gz
+PDF_FILE_PRIMARIES="/usr/share/doc/debian/FAQ/debian-faq.pdf.gz
+PDF_FILE_SECONDARIES="/usr/share/doc/debian/FAQ/debian-faq.pdf.gz
 
 # Show each slide for <n> seconds
 SLIDE_DURATION=20
@@ -36,9 +36,9 @@ WITH_PULSEAUDIO="yes"
 HIDE_IDLE_POINTER="yes"
 
 # enforce fixed resolution for displays
-# MASTER_RESOLUTION="1920x1080"
+# PRIMARIES_RESOLUTION="1920x1080"
 # SLAVE_RESOLUTION="1920x1080"
-MASTER_RESOLUTION=
+PRIMARIES_RESOLUTION=
 SLAVE_RESOLUTION=
 
 # screensaver settings, see "man 1 xset" for possible options
diff --git a/impressive-display/bin/impressive-display b/impressive-display/bin/impressive-display
index 3fae9ca..e1b0f66 100755
--- a/impressive-display/bin/impressive-display
+++ b/impressive-display/bin/impressive-display
@@ -40,21 +40,21 @@ HIDE_IDLE_POINTER="yes"
 
 # There can be master terminals and slave display.
 # All terminal not listed here are slave displays...
-MASTER_DISPLAYS="$(hostname -f)"
+PRIMARY_DISPLAYS="$(hostname -f)"
 
 # these terminals can have different startup URLs
-PDF_URL_MASTERS=""
-PDF_URL_SLAVES=""
-PDF_URL_MASTERS_CREDS=""
-PDF_URL_SLAVES_CREDS=""
+PDF_URL_PRIMARIES=""
+PDF_URL_SECONDARIES=""
+PDF_URL_PRIMARIES_CREDS=""
+PDF_URL_SECONDARIES_CREDS=""
 
-PDF_FILE_MASTERS=""
-PDF_FILE_SLAVES=""
+PDF_FILE_PRIMARIES=""
+PDF_FILE_SECONDARIES=""
 
 # enforce fixed resolution for displays
-# MASTER_RESOLUTION="1920x1080"
+# PRIMARIES_RESOLUTION="1920x1080"
 # SLAVE_RESOLUTION="1920x1080"
-MASTER_RESOLUTION=
+PRIMARIES_RESOLUTION=
 SLAVE_RESOLUTION=
 
 # launch pulseaudio daemon if not already running
@@ -126,17 +126,17 @@ if [ "x$HIDE_IDLE_POINTER" = "xyes" ]; then
 	fi
 fi
 
-PDF_URL="$PDF_URL_SLAVES"
-PDF_URL_CREDS="$PDF_URL_SLAVES_CREDS"
-PDF_FILE="$PDF_FILE_SLAVES"
+PDF_URL="$PDF_URL_SECONDARIES"
+PDF_URL_CREDS="$PDF_URL_SECONDARIES_CREDS"
+PDF_FILE="$PDF_FILE_SECONDARIES"
 RESOLUTION="$SLAVE_RESOLUTION"
 
-for master_terminal in $MASTER_TERMINALS; do
-	if [ "x$(hostname -f)" = "x$master_terminal" ]; then
-		PDF_URL="$PDF_URL_MASTERS"
-		PDF_URL_CREDS="$PDF_URL_MASTERS_CREDS"
-		PDF_FILE="$PDF_FILE_MASTERS"
-		RESOLUTION="$MASTER_RESOLUTION"
+for primary_terminal in $PRIMARIES_TERMINALS; do
+	if [ "x$(hostname -f)" = "x$primary_terminal" ]; then
+		PDF_URL="$PDF_URL_PRIMARIES"
+		PDF_URL_CREDS="$PDF_URL_PRIMARIES_CREDS"
+		PDF_FILE="$PDF_FILE_PRIMARIES"
+		RESOLUTION="$PRIMARIES_RESOLUTION"
 		break
 	fi
 done