From 8bb724e9946239dcb12cc927438e23a07ad22cd5 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian.lam@gmail.com>
Date: Mon, 13 May 2013 15:15:59 -0400
Subject: [PATCH] minor tweaks to config default, and text copy update on
 registration page updated readme to mention the upload_path option

---
 README.md                     | 4 ++++
 config.default.js             | 2 +-
 public/templates/register.tpl | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 1553785f39..40485cedae 100644
--- a/README.md
+++ b/README.md
@@ -42,6 +42,10 @@ The server configuration file (located at `/config.js`) contains default options
 		<td><b>base_url</b></td>
 		<td><i>(Default: 'http://localhost')</i> A web-accessible URL to your app, without the port</td>
 	</tr>
+	<tr>
+		<td><b>upload_path</b></td>
+		<td><i>(Default: '/public/uploads')</i> A relative path (relative to the application's web root) to the uploads folder. Please ensure that Node.js can write to this folder</td>
+	</tr>
 	<tr>
 		<td><b>use_port</b></td>
 		<td><i>(Default: true)</i> Whether or not to include the port number when constructing the url for use in NodeBB. If you are serving NodeBB via a proxy (i.e. nginx), switch this off.
diff --git a/config.default.js b/config.default.js
index 3ebaee8e95..e7a662b76b 100644
--- a/config.default.js
+++ b/config.default.js
@@ -6,7 +6,7 @@ var config = {
 	"base_url": "http://localhost",
 	
 	// relative path for uploads
-	"upload_path": "/uploads/",
+	"upload_path": "/public/uploads/",
 	
 	"use_port": true,
 	"port": 4567,
diff --git a/public/templates/register.tpl b/public/templates/register.tpl
index b21f73a333..d1856915d5 100644
--- a/public/templates/register.tpl
+++ b/public/templates/register.tpl
@@ -9,7 +9,7 @@
 		</form>
 	</div>
 	<div class="well span6 {alternate_logins:display}">
-		<h4>Alternative Logins</h4>
+		<h4>Alternative Registration</h4>
 		<ul class="alt-logins">
 			<li data-url="/auth/twitter" class="twitter {twitter:display}"></li>
 			<li data-url="/auth/google" class="google {google:display}"></li>