From 1cc99d02e185669b868c3cfc603ca6fcedef39f6 Mon Sep 17 00:00:00 2001
From: reality <tinmachin3@gmail.com>
Date: Mon, 13 May 2013 18:21:50 +0000
Subject: [PATCH 1/2] ]

---
 modules/reddit/README.md | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 modules/reddit/README.md

diff --git a/modules/reddit/README.md b/modules/reddit/README.md
new file mode 100644
index 0000000..aac11fc
--- /dev/null
+++ b/modules/reddit/README.md
@@ -0,0 +1,29 @@
+## Reddit
+
+Various Reddit functionality
+
+### Description
+
+This module provides Reddit related functionality, which is currently limited to
+reading various links, but will be expanded in future to include stuff like
+monitoring posts and creating its own.
+
+### API
+
+#### getSubredditInfo(name, callback)
+Get information about a subreddit from the Reddit API. Callback takes one
+argument, the data returned from the API.
+
+#### getPostInfo(name, callback)
+Get information about a post from the Reddit API. Callback takes one argument,
+the data returned from the API about the post.
+
+#### getCommentInfo(post, name, callback)
+Get information about a particular comment in a particular post. Callback takes
+one argument, information about the given comment.
+
+### Hooks
+
+#### link
+Posts a summary when either a subreddit, a post or a comment is linked in a
+channel.

From 8f9b44d4f034d6f30a3a015bf86b809f6f6e0648 Mon Sep 17 00:00:00 2001
From: Sam Nicholls <sam.n@studio8media.co.uk>
Date: Tue, 14 May 2013 18:26:21 +0200
Subject: [PATCH 2/2] Prevent link from poll view to poll list 404 [Fix #440]

---
 views/poll/polls.jade | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/poll/polls.jade b/views/poll/polls.jade
index 80e25f6..72f654e 100644
--- a/views/poll/polls.jade
+++ b/views/poll/polls.jade
@@ -2,7 +2,7 @@ extends ../layout
 
 block content
     div#backlink 
-        a(href='/polls/') &laquo; Poll list
+        a(href='/poll/') &laquo; Poll list
     h2 #{description}
     p Voters (#{locals.totalVotes}): 
         -each voter in votees