Merge branch 'auth-openid'

diff --combined README.rst
index d1c64917a430cb8576d16a9154da1905f79f27bc,b92804a0b27fe04ec63645f9efe4875a163ddb0f..2ad6ff01f0db60aab3ef5f9e87a5b6892a0ca1e1
--- 1/README.rst
--- 2/README.rst
+++ b/README.rst
@@@ -182,8 -182,6 +182,8 @@@ URL
    Show specific revision of the paste
  ``/[0-9]/delete``
    Delete the paste
 +``/[0-9]/doap``
 +  Show DOAP document for paste
  ``/[0-9]/fork``
    Create a fork of the paste
  ``/search?q=..(&page=[0-9]+)?``
@@@ -192,6 -190,11 +192,11 @@@
    List all pastes, with optional page
  ``/new``
    Shows form for new paste
+ ``/login``
+   Login page for protecting site
+ ``/user``
+   Edit logged-in user information
+ 
  
  Internal directory layout
  =========================
@@@ -216,7 -219,6 +221,7 @@@ If you use nginx, place the following l
      rewrite ^/([0-9]+)$ /display.php?id=$1;
      rewrite ^/([0-9]+)/delete$ /delete.php?id=$1;
      rewrite ^/([0-9]+)/delete/confirm$ /delete.php?id=$1&confirm=1;
 +    rewrite ^/([0-9]+)/doap$ /doap.php?id=$1;
      rewrite ^/([0-9]+)/edit$ /edit.php?id=$1;
      rewrite ^/([0-9]+)/fork$ /fork.php?id=$1;
      rewrite ^/([0-9]+)/raw/(.+)$ /raw.php?id=$1&file=$2;
@@@ -230,4 -232,7 +235,7 @@@
  
      rewrite ^/search$ /search.php;
      rewrite ^/search/([0-9]+)$ /search.php?page=$1;
+ 
+     rewrite ^/login$ /login.php;
+     rewrite ^/user$ /user.php;
    }