From a9b948d6f9a3c8b110d84096d033f3fbef864bcb Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Thu, 8 Jun 2017 15:00:50 +0200
Subject: [PATCH 1/2] added hints how to specify a port for the database
 connection

---
 INSTALL.txt                 | 11 ++++++++---
 doc/Install.md              |  2 ++
 doc/htconfig.md             |  7 +++++++
 view/templates/htconfig.tpl |  8 +++++---
 4 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/INSTALL.txt b/INSTALL.txt
index 81dfdfd272..c42c089716 100644
--- a/INSTALL.txt
+++ b/INSTALL.txt
@@ -71,9 +71,14 @@ write or create files in your web directory, create an empty file called
 .htconfig.php and make it writable by the web server.
 
 5. Visit your website with a web browser and follow the instructions. Please 
-note any error messages and correct these before continuing. If you are using
-SSL with a known signature authority (recommended), use the https: link to your
-website. If you are using a self-signed cert or no cert, use the http: link. 
+note any error messages and correct these before continuing.
+
+If you are using SSL with a known signature authority (recommended), use the
+https: link to your website. If you are using a self-signed cert or no cert,
+use the http: link.
+
+If you need to specify a port for the connection to the database, you can do
+so in the host name setting for the database.
 
 6. *If* the automated installation fails for any reason, check the following:
 
diff --git a/doc/Install.md b/doc/Install.md
index a8ea2c0503..53df55be06 100644
--- a/doc/Install.md
+++ b/doc/Install.md
@@ -82,6 +82,8 @@ Restart mysql and you should be fine.
 Point your web browser to the new site and follow the instructions.
 Please note any error messages and correct these before continuing.
 
+If you need to specify a port for the connection to the database, you can do so in the host name setting for the database.
+
 *If* the automated installation fails for any reason, check the following:
 
 * Does ".htconfig.php" exist? If not, edit htconfig.php and change the system settings. Rename to .htconfig.php
diff --git a/doc/htconfig.md b/doc/htconfig.md
index 7887184d88..519c655fb2 100644
--- a/doc/htconfig.md
+++ b/doc/htconfig.md
@@ -117,3 +117,10 @@ If more then one account should be able to access the admin panel, seperate the
 If you want to have a more personalized closing line for the notification emails you can set a variable for the admin_name.
 
     $a->config['admin_name'] = "Marvin";
+
+## Database Settings
+
+The configuration variables db_host, db_user, db_pass and db_data are holding your credentials for the database connection.
+If you need to specify a port to access the database, you can do so by appending ":portnumber" to the db_host variable.
+
+		$db_host = 'your.mysqlhost.com:123456';
diff --git a/view/templates/htconfig.tpl b/view/templates/htconfig.tpl
index 02cf67f39d..6a156012a2 100644
--- a/view/templates/htconfig.tpl
+++ b/view/templates/htconfig.tpl
@@ -1,14 +1,16 @@
 <?php
 
 /* ********************************************************************
- *  The following configuration has to be within the .htconfig file
- *  and will not be overruled by decisions made in the admin panel.
+ *  The following configuration has to be within the .htconfig.php
+ *  file and will not be overruled by decisions made in the admin panel.
  *
  *  See below for variables that may be overruled by the admin panel.
  * ********************************************************************/
 
 // Set the following for your MySQL installation
-// Copy or rename this file to .htconfig.php
+//
+// If you need to specify a port for reacing the database, you can do so by
+// adding ":portnumber" after "your.mysqlhost.com" in the $db_host config.
 
 $db_host = '{{$dbhost}}';
 $db_user = '{{$dbuser}}';

From 0489c04a432d87cd8f6c268736102020ff84249e Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Thu, 8 Jun 2017 15:03:04 +0200
Subject: [PATCH 2/2] spacing not tabs

---
 doc/htconfig.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/htconfig.md b/doc/htconfig.md
index 519c655fb2..9c556bb7cd 100644
--- a/doc/htconfig.md
+++ b/doc/htconfig.md
@@ -123,4 +123,4 @@ If you want to have a more personalized closing line for the notification emails
 The configuration variables db_host, db_user, db_pass and db_data are holding your credentials for the database connection.
 If you need to specify a port to access the database, you can do so by appending ":portnumber" to the db_host variable.
 
-		$db_host = 'your.mysqlhost.com:123456';
+    $db_host = 'your.mysqlhost.com:123456';