aboutsummaryrefslogtreecommitdiffstats
path: root/install
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2019-04-15 20:53:44 -0700
committerzotlabs <mike@macgirvin.com>2019-04-15 20:53:44 -0700
commitdf5a1c59e6d2a0921de177aabacbee674d7385da (patch)
tree659c8b64743ac4cb894820eaa0f3ca47329b13d3 /install
parent0615709a7ab7bba66b2a07d593e84a35ed083edb (diff)
parent71f17a233e29a45304f43ee2329bfff1865c6917 (diff)
downloadvolse-hubzilla-df5a1c59e6d2a0921de177aabacbee674d7385da.tar.gz
volse-hubzilla-df5a1c59e6d2a0921de177aabacbee674d7385da.tar.bz2
volse-hubzilla-df5a1c59e6d2a0921de177aabacbee674d7385da.zip
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
Diffstat (limited to 'install')
-rw-r--r--install/INSTALL.txt2
-rwxr-xr-xinstall/htconfig.sample.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/install/INSTALL.txt b/install/INSTALL.txt
index fe2484d7a..0503ae2cc 100644
--- a/install/INSTALL.txt
+++ b/install/INSTALL.txt
@@ -175,7 +175,7 @@ encounter a database configuration which cannot be expressed on the setup form
(for instance using MySQL with an unusual socket location); you can supply
the PDO connection string as the database hostname. For instance
- mysql:unix_socket=/my/special/socket_path
+ :/path/to/socket.file
You should still fill in all other applicable form values as needed.
diff --git a/install/htconfig.sample.php b/install/htconfig.sample.php
index 07725e3f4..509942530 100755
--- a/install/htconfig.sample.php
+++ b/install/htconfig.sample.php
@@ -12,7 +12,7 @@
// Then set the following for your MySQL installation
-$db_host = 'your.mysqlhost.com'; // Use 'localhost' if you aren't using a remote server
+$db_host = 'your.mysqlhost.com'; // Use 'localhost' or ':/path/to/socket.file' if you aren't using a remote server
$db_port = 0; // leave 0 for default or set your port
$db_user = 'mysqlusername';
$db_pass = 'mysqlpassword';