From dfaf1e2317aedfc4801aeeee0930fd24a3b7ba36 Mon Sep 17 00:00:00 2001
From: gholt <z-github@brim.net>
Date: Tue, 27 Mar 2012 02:34:26 +0000
Subject: [PATCH] Updated links in docs to keystone and re: deswauth

Fixes #16
---
 README.md            | 20 +++++++++++---------
 doc/source/index.rst | 11 +++--------
 2 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/README.md b/README.md
index 09f2810..8521d28 100644
--- a/README.md
+++ b/README.md
@@ -2,15 +2,17 @@ Swauth
 ------
 
 An Auth Service for Swift as WSGI Middleware that uses Swift itself as a
-backing store. Sphinx-built docs at: http://gholt.github.com/swauth/
+backing store. Sphinx-built docs at: <http://gholt.github.com/swauth/>
 
-See also https://github.com/khussein/keystone for the future standard OpenStack
+See also <https://github.com/openstack/keystone> for the standard OpenStack
 auth service.
 
-This is currently a work in progress of pulling Swauth out of the Swift repo
-and here into its own project. See
-https://code.launchpad.net/~gholt/swift/deswauth/+merge/62392 for the Swift
-side of things.
+
+NOTE
+----
+
+**Be sure to review the Sphinx-built docs at:
+<http://gholt.github.com/swauth/>**
 
 
 Quick Install
@@ -21,17 +23,17 @@ Quick Install
 
 2) Alter your proxy-server.conf pipeline to have swauth instead of tempauth:
 
-    Was::
+    Was:
 
         [pipeline:main]
         pipeline = catch_errors cache tempauth proxy-server
 
-    Change To::
+    Change To:
 
         [pipeline:main]
         pipeline = catch_errors cache swauth proxy-server
 
-3) Add to your proxy-server.conf the section for the Swauth WSGI filter::
+3) Add to your proxy-server.conf the section for the Swauth WSGI filter:
 
     [filter:swauth]
     use = egg:swauth#swauth
diff --git a/doc/source/index.rst b/doc/source/index.rst
index 650184c..87b22d5 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -6,19 +6,14 @@
 Swauth
 ======
 
-    Copyright (c) 2010-2011 OpenStack, LLC
+    Copyright (c) 2010-2012 OpenStack, LLC
 
     An Auth Service for Swift as WSGI Middleware that uses Swift itself as a
     backing store. Sphinx-built docs at: http://gholt.github.com/swauth/
     Source available at: https://github.com/gholt/swauth
 
-    See also https://github.com/khussein/keystone for the future standard
-    OpenStack auth service.
-
-    This is currently a work in progress of pulling Swauth out of the Swift
-    repo and here into its own project. See
-    https://code.launchpad.net/~gholt/swift/deswauth/+merge/62392 for the Swift
-    side of things.
+    See also https://github.com/openstack/keystone for the standard OpenStack
+    auth service.
 
 Overview
 --------