From b45746a37c2a571553fec2cae0f07d5e68eacc47 Mon Sep 17 00:00:00 2001 From: stilez Date: Tue, 25 Jul 2017 15:33:24 +0100 Subject: Improve the HELP note about what will/won't work if TLD is set to ".local" For example, some people won't use mDNS and won't know other things might break; also it's not clear that while ".local" is a problem, ".local.lan" isn't. --- src/usr/local/www/system.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/usr/local') diff --git a/src/usr/local/www/system.php b/src/usr/local/www/system.php index 13f32e0..0467d63 100644 --- a/src/usr/local/www/system.php +++ b/src/usr/local/www/system.php @@ -459,9 +459,10 @@ $section->addInput(new Form_Input( 'text', $pconfig['domain'], ['placeholder' => 'mycorp.com, home, office, private, etc.'] -))->setHelp('Do not use \'local\' as a domain name. It will cause local '. - 'hosts running mDNS (avahi, bonjour, etc.) to be unable to resolve '. - 'local hosts not running mDNS.'); +))->setHelp('Do not use \'.local\' as the final part of the domain (TLD), The \'.local\' domain is by mDNS (including Avahi), ' . + 'Apple OS X (Bonjour/Rendezvous/Airprint/Airplay), and some Windows systems and network devices. These will not network ' . + 'correctly if the router uses \'.local\'. Alternatives such as \'.local.lan\' or \'.mylocal\' are safe.'); $form->add($section); -- cgit v1.1 From ef77e40e0c7b861cc268cd1f0e30600f573b807e Mon Sep 17 00:00:00 2001 From: stilez Date: Tue, 25 Jul 2017 15:37:32 +0100 Subject: format %1$s etc in help --- src/usr/local/www/system.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'src/usr/local') diff --git a/src/usr/local/www/system.php b/src/usr/local/www/system.php index 0467d63..15af4ef 100644 --- a/src/usr/local/www/system.php +++ b/src/usr/local/www/system.php @@ -459,10 +459,12 @@ $section->addInput(new Form_Input( 'text', $pconfig['domain'], ['placeholder' => 'mycorp.com, home, office, private, etc.'] -))->setHelp('Do not use \'.local\' as the final part of the domain (TLD), The \'.local\' domain is by mDNS (including Avahi), ' . - 'Apple OS X (Bonjour/Rendezvous/Airprint/Airplay), and some Windows systems and network devices. These will not network ' . - 'correctly if the router uses \'.local\'. Alternatives such as \'.local.lan\' or \'.mylocal\' are safe.'); +))->setHelp('Do not use \'.local\' as the final part of the domain (TLD), The \'.local\' domain is %1$swidely used%2$s by '. + 'mDNS (including Avahi), Apple OS X (Bonjour/Rendezvous/Airprint/Airplay), and some Windows systems and network devices. ' . + 'These will not network correctly if the router uses \'.local\'. Alternatives such as \'.local.lan\' or \'.mylocal\' are safe.', + '', + '' +); $form->add($section); -- cgit v1.1 From 94ef78afa96f1870b453fab670754c01c6161665 Mon Sep 17 00:00:00 2001 From: stilez Date: Tue, 25 Jul 2017 15:48:02 +0100 Subject: grammar fix --- src/usr/local/www/system.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/usr/local') diff --git a/src/usr/local/www/system.php b/src/usr/local/www/system.php index 15af4ef..3082a65 100644 --- a/src/usr/local/www/system.php +++ b/src/usr/local/www/system.php @@ -460,7 +460,7 @@ $section->addInput(new Form_Input( $pconfig['domain'], ['placeholder' => 'mycorp.com, home, office, private, etc.'] ))->setHelp('Do not use \'.local\' as the final part of the domain (TLD), The \'.local\' domain is %1$swidely used%2$s by '. - 'mDNS (including Avahi), Apple OS X (Bonjour/Rendezvous/Airprint/Airplay), and some Windows systems and network devices. ' . + 'mDNS (including Avahi and Apple OS X\'s Bonjour/Rendezvous/Airprint/Airplay), and some Windows systems and network devices. ' . 'These will not network correctly if the router uses \'.local\'. Alternatives such as \'.local.lan\' or \'.mylocal\' are safe.', '', '' -- cgit v1.1 From d751dee379b37da868efa837df55434935efe9b8 Mon Sep 17 00:00:00 2001 From: stilez Date: Tue, 25 Jul 2017 15:49:48 +0100 Subject: typo "Networked" not "network" - "Internet of Things" especially. --- src/usr/local/www/system.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/usr/local') diff --git a/src/usr/local/www/system.php b/src/usr/local/www/system.php index 3082a65..5c20548 100644 --- a/src/usr/local/www/system.php +++ b/src/usr/local/www/system.php @@ -460,7 +460,7 @@ $section->addInput(new Form_Input( $pconfig['domain'], ['placeholder' => 'mycorp.com, home, office, private, etc.'] ))->setHelp('Do not use \'.local\' as the final part of the domain (TLD), The \'.local\' domain is %1$swidely used%2$s by '. - 'mDNS (including Avahi and Apple OS X\'s Bonjour/Rendezvous/Airprint/Airplay), and some Windows systems and network devices. ' . + 'mDNS (including Avahi and Apple OS X\'s Bonjour/Rendezvous/Airprint/Airplay), and some Windows systems and networked devices. ' . 'These will not network correctly if the router uses \'.local\'. Alternatives such as \'.local.lan\' or \'.mylocal\' are safe.', '', '' -- cgit v1.1