diff --git a/Netdisco/lib/App/Netdisco.pm b/Netdisco/lib/App/Netdisco.pm
index f7dabcef..3c272dd6 100644
--- a/Netdisco/lib/App/Netdisco.pm
+++ b/Netdisco/lib/App/Netdisco.pm
@@ -79,6 +79,9 @@ setting('plugins')->{DBIC}->{daemon} = {
     schema_class => 'App::Netdisco::Daemon::DB',
 };
 
+# force skipped DNS resolution, if unset
+setting('dns')->{no} ||= ['fe80::/64','169.254.0.0/16']
+
 =head1 NAME
 
 App::Netdisco - An open source web-based network management tool.
@@ -134,15 +137,15 @@ Notes|App::Netdisco::Manual::ReleaseNotes>.
 
 Netdisco has several Perl library dependencies which will be automatically
 installed. However it's I<strongly> recommended that you first install
-L<DBD::Pg> and L<SNMP> using your operating system packages. The following
-commands will test for the existence of them on your system:
+L<DBD::Pg>, L<SNMP>, and a compiler using your operating system packages.
 
- perl -MDBD::Pg\ 999
- perl -MSNMP\ 999
+On Ubuntu/Debian:
 
-You'll also need a compiler for some of the other Perl dependencies. For
-example on Ubuntu/Debian, install the C<build-essential> package. On
-Fedora/Red-Hat, install C<make>, C<automake>, and C<gcc>.
+ root:~# apt-get install libdbd-pg-perl libsnmp-perl build-essential
+
+On Fedora/Red-Hat:
+
+ root:~# yum install perl-DBD-Pg net-snmp-perl make automake gcc
 
 With those installed, we can proceed...
 
@@ -187,7 +190,8 @@ Link some of the newly installed apps into a handy location:
  ln -s ~/perl5/bin/{localenv,netdisco-*} ~/bin/
 
 Test the installation by running the following command, which should only
-produce a status message (and throw up no errors):
+produce a status message (it's just a test - you'll start the daemon properly,
+later on):
 
  ~/bin/netdisco-daemon status
 
@@ -200,12 +204,13 @@ template from this distribution:
  cp ~/perl5/lib/perl5/auto/share/dist/App-Netdisco/environments/deployment.yml ~/environments
  chmod +w ~/environments/deployment.yml
 
-Edit the file and change the database connection parameters to match those for
-your local system (that is, the C<name>, C<host>, C<user> and C<pass>).
+Edit the file ("C<~/environments/deployment.yml>") and change the database
+connection parameters to match those for your local system (that is, the
+C<name>, C<host>, C<user> and C<pass>).
 
 In the same file uncomment and edit the C<domain_suffix> setting to be
-appropriate for your local site. Optionally, set the C<no_auth> value to true
-if you wish to skip user authentication in the web interface.
+appropriate for your local site. If this is a fresh install, uncomment and set
+the C<no_auth> value to true (temporarily disables user authentication).
 
 =head1 Bootstrap
 
diff --git a/Netdisco/share/config.yml b/Netdisco/share/config.yml
index 7570581f..731e24b3 100644
--- a/Netdisco/share/config.yml
+++ b/Netdisco/share/config.yml
@@ -162,8 +162,8 @@ workers:
   sleep_time: 2
 
 dns:
-  max_outstanding: 250
   no: ['fe80::/64','169.254.0.0/16']
+  max_outstanding: 10
 
 #housekeeping:
 #  discoverall:
diff --git a/Netdisco/share/environments/deployment.yml b/Netdisco/share/environments/deployment.yml
index d360a39f..6bd83fe6 100644
--- a/Netdisco/share/environments/deployment.yml
+++ b/Netdisco/share/environments/deployment.yml
@@ -20,34 +20,36 @@ database:
 
 # will be stripped from fqdn when displayed in the web UI
 # also, do not forget the leading dot.
-#  domain_suffix: '.example.com'
+# ```````````````````````````````````````````````````````
+#domain_suffix: '.example.com'
 
-# uncomment and set to true to disable authentication/login.
-#  no_auth: false
+# uncomment and set to true to disable authentication/login
+# `````````````````````````````````````````````````````````
+#no_auth: false
 
-# community: ['public']
-# community_rw: ['private']
+# SNMP community string(s)
+# ````````````````````````
+#community: ['public']
+#community_rw: ['private']
 
-# when not set, Netdisco loads all MIBs in mibhome directory.
-#  mibdirs:
-#    - cisco
-#    - rfc
-#    - net-snmp
+# daemon will keep netdisco up to date on this schedule
+# `````````````````````````````````````````````````````
+#housekeeping:
+#  discoverall:
+#    when: '5 7 * * *'
+#  macwalk:
+#    when:
+#      min: 20
+#  arpwalk:
+#    when:
+#      min: 50
+#  nbtwalk:
+#    when: '0 8,13,21 * * *'
+#  expiry:
+#    when: '20 23 * * *'
 
-# housekeeping:
-#   discoverall:
-#     when: '5 7 * * *'
-#   macwalk:
-#     when:
-#       min: 20
-#   arpwalk:
-#     when:
-#       min: 50
-#   nbtwalk:
-#     when: '0 8,13,21 * * *'
-#   expiry:
-#     when: '20 23 * * *'
+# increase the performance of parallel DNS resolution for node names
+# (the default is max_outstanding: 10)
+#dns:
+#  max_outstanding: 100
 
-# expire_devices: 60
-# expire_nodes: 90
-# expire_nodes_archive: 60