diff --git a/src/docs/configuration/configuration_guide.diviner b/src/docs/configuration/configuration_guide.diviner
index 857eaaadf3..1073caa5be 100644
--- a/src/docs/configuration/configuration_guide.diviner
+++ b/src/docs/configuration/configuration_guide.diviner
@@ -145,6 +145,12 @@ For nginx, use a configuration like this:
     }
   }
 
+= Upgrading Schema =
+
+Now, it's time for you to upgrade the database schema -- see
+@{article:Upgrading Schema}. You'll also need to do this after you update the
+code in the future.
+
 = Setup =
 
 Now, restart your webserver and navigate to whichever subdomain you set up. You
@@ -190,12 +196,6 @@ and override values from either the ##'production'## or ##'development'##
 configurations. You should not edit the builtin configurations directly because
 that will make upgrading Phabricator more difficult in the future.
 
-= Upgrading Schema =
-
-After you have configured Phabricator, you need to upgrade the database
-schema -- see @{article:Upgrading Schema}. You'll also need to do this after you
-update the code in the future.
-
 = Next Steps =
 
 Continue by:
@@ -210,4 +210,4 @@ Continue by:
   - configuring inbound mail with @{article:Configuring Inbound Email}; or
   - importing repositories with @{article:Diffusion User Guide}; or
   - learning about daemons with @{article:Managing Daemons with phd}; or
-  - contributing to Phabricator with @{article:Contributor Introduction}.
\ No newline at end of file
+  - contributing to Phabricator with @{article:Contributor Introduction}.
diff --git a/src/infrastructure/setup/PhabricatorSetup.php b/src/infrastructure/setup/PhabricatorSetup.php
index dd53ef6490..af156acc40 100644
--- a/src/infrastructure/setup/PhabricatorSetup.php
+++ b/src/infrastructure/setup/PhabricatorSetup.php
@@ -461,8 +461,8 @@ final class PhabricatorSetup {
     if ($timeout > 5) {
       self::writeNote(
         "Your MySQL connect timeout is very high ({$timeout} seconds). ".
-        "Consider reducing it by setting 'mysql.connect_timeout' in your ".
-        "php.ini.");
+        "Consider reducing it to 5 or below by setting ".
+        "'mysql.connect_timeout' in your php.ini.");
     }
 
     self::write(" okay  Trying to connect to MySQL database ".