From 28c70a2c144827fd912c3b9ec1f3c47f42a6ff80 Mon Sep 17 00:00:00 2001
From: Sebastian Grewe <sebastian@grewe.ca>
Date: Wed, 15 May 2013 00:54:51 +0300
Subject: [PATCH 1/2] Update README.md

* added required pushpool database configuration
---
 README.md | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/README.md b/README.md
index 9328b4c6..255ee168 100644
--- a/README.md
+++ b/README.md
@@ -85,6 +85,25 @@ Please create the `mmcfe-ng/public/include/config/global.inc.php`
 configuration from the supplied template
 `mmcfe-ng/public/include/config/global.inc.dist.php`.
 
+Pushpoold
+---------
+
+Please ensure the passwords are read from the proper table by adding this to your configuration:
+
+  # database settings
+  "database" : {
+    "engine" : "mysql",
+    "port"    : "3306",
+    "name" : "mmcfeng_database_name",
+    "username" : "someuser",
+    "password" : "somepass",
+    "sharelog" : true,
+    "stmt.pwdb":"SELECT `password` FROM `workers` WHERE `username` = ?",
+    "stmt.sharelog":"INSERT INTO shares (rem_host, username, our_result, upstream_result, reason, solution) VALUES (?, ?, ?, ?, ?, ?)"
+  },```
+
+```
+
 Database
 ========
 

From a28c5cf042a6ece5e79ca98779c094b903ccf17c Mon Sep 17 00:00:00 2001
From: Sebastian Grewe <sebastian@grewe.ca>
Date: Tue, 14 May 2013 23:55:12 +0200
Subject: [PATCH 2/2] Update README.md

---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 255ee168..f6f60726 100644
--- a/README.md
+++ b/README.md
@@ -90,6 +90,7 @@ Pushpoold
 
 Please ensure the passwords are read from the proper table by adding this to your configuration:
 
+```
   # database settings
   "database" : {
     "engine" : "mysql",
@@ -100,7 +101,7 @@ Please ensure the passwords are read from the proper table by adding this to you
     "sharelog" : true,
     "stmt.pwdb":"SELECT `password` FROM `workers` WHERE `username` = ?",
     "stmt.sharelog":"INSERT INTO shares (rem_host, username, our_result, upstream_result, reason, solution) VALUES (?, ?, ?, ?, ?, ?)"
-  },```
+  },
 
 ```