From a2ba00bdc83073c89e5a733482ed88c229f93736 Mon Sep 17 00:00:00 2001
From: Matthew Holt <Matthew.Holt+git@gmail.com>
Date: Tue, 17 Nov 2015 10:19:03 -0700
Subject: [PATCH] Update docs n things

---
 README.md        | 2 +-
 dist/CHANGES.txt | 1 +
 dist/README.txt  | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index e55775df7..1330c1784 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 [![Documentation](https://img.shields.io/badge/godoc-reference-blue.svg?style=flat-square)](https://godoc.org/github.com/mholt/caddy) [![Linux Build Status](https://img.shields.io/travis/mholt/caddy.svg?style=flat-square&label=linux+build)](https://travis-ci.org/mholt/caddy) [![Windows Build Status](https://img.shields.io/appveyor/ci/mholt/caddy.svg?style=flat-square&label=windows+build)](https://ci.appveyor.com/project/mholt/caddy)
 
-Caddy is a lightweight, general-purpose web server for Windows, Mac, Linux, BSD, and [Android](https://github.com/mholt/caddy/wiki/Running-Caddy-on-Android). It is a capable alternative to other popular and easy to use web servers.
+Caddy is a lightweight, general-purpose web server for Windows, Mac, Linux, BSD, and [Android](https://github.com/mholt/caddy/wiki/Running-Caddy-on-Android). It is a capable alternative to other popular and easy to use web servers. ([@caddyserver](https://twitter.com/caddyserver) on Twitter)
 
 The most notable features are HTTP/2, [Let's Encrypt](https://letsencrypt.org) support, Virtual Hosts, TLS + SNI, and easy configuration with a [Caddyfile](https://caddyserver.com/docs/caddyfile). In development, you usually put one Caddyfile with each site. In production, Caddy serves HTTPS by default and manages all cryptographic assets for you.
 
diff --git a/dist/CHANGES.txt b/dist/CHANGES.txt
index 4b9a1ffbc..e98535b58 100644
--- a/dist/CHANGES.txt
+++ b/dist/CHANGES.txt
@@ -16,6 +16,7 @@ CHANGES
 - browse: Render filenames with multiple whitespace properly
 - markdown: Include Last-Modified header in response
 - markdown: Render tables, strikethrough, and fenced code blocks
+- proxy: Ability to exclude/ignore paths from proxying
 - startup, shutdown: Better Windows support
 - templates: Bug fix for .Host when port is absent
 - templates: Include Last-Modified header in response
diff --git a/dist/README.txt b/dist/README.txt
index 3206c19ab..425f7bc45 100644
--- a/dist/README.txt
+++ b/dist/README.txt
@@ -2,6 +2,7 @@ CADDY 0.8 beta 3
 
 Website
 	https://caddyserver.com
+	@caddyserver
 
 Source Code
 	https://github.com/mholt/caddy