doc building now uses astdoc, updated masthead & logo

7 files changed, 179 insertions, 374 deletions

diff --git a/docs/_static/logo.ico b/docs/_static/logo.ico
index 3ac2f26..148fbf7 100644
--- a/docs/_static/logo.ico
+++ b/docs/_static/logo.ico
diff --git a/docs/_static/logo.png b/docs/_static/logo.png
index b859c98..f06fbab 100644
--- a/docs/_static/logo.png
+++ b/docs/_static/logo.png
diff --git a/docs/_static/logo.svg b/docs/_static/logo.svg
index 43be7d1..f1876a1 100644
--- a/docs/_static/logo.svg
+++ b/docs/_static/logo.svg
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
+
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -13,12 +14,12 @@
    height="48"
    id="svg2383"
    sodipodi:version="0.32"
-   inkscape:version="0.46"
+   inkscape:version="0.48.0 r9654"
    sodipodi:docname="logo.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:export-filename="/home/biscuit/dev/libs/bps/trunk/docs/_static/logo.png"
-   inkscape:export-xdpi="135"
-   inkscape:export-ydpi="135"
+   inkscape:export-filename="/home/biscuit/dev/libs/passlib/trunk/docs/_static/logo.png"
+   inkscape:export-xdpi="30"
+   inkscape:export-ydpi="30"
    version="1.0"
    style="display:inline">
   <defs
@@ -185,14 +186,54 @@
        inkscape:collect="always"
        id="filter3252"
        x="-0.15294118"
-       width="1.3058824"
-       y="-0.55714287"
-       height="2.1142857">
+       width="1.3058825"
+       y="-0.55714285"
+       height="2.1142857"
+       color-interpolation-filters="sRGB">
       <feGaussianBlur
          inkscape:collect="always"
          stdDeviation="3.9395948"
          id="feGaussianBlur3254" />
     </filter>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4140"
+       id="linearGradient4152"
+       x1="12.784937"
+       y1="17.261765"
+       x2="42.609146"
+       y2="21.100046"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.9898657,0.5290083,-0.52817535,0.98830712,8.6007275,-14.225263)" />
+    <linearGradient
+       id="linearGradient4140">
+      <stop
+         style="stop-color:#ffe50a;stop-opacity:1;"
+         offset="0"
+         id="stop4142" />
+      <stop
+         id="stop4150"
+         offset="0.49036095"
+         style="stop-color:#fcea5b;stop-opacity:1;" />
+      <stop
+         id="stop4148"
+         offset="0.60424012"
+         style="stop-color:#edd400;stop-opacity:1;" />
+      <stop
+         style="stop-color:#d6c000;stop-opacity:1;"
+         offset="1"
+         id="stop4144" />
+    </linearGradient>
+    <linearGradient
+       y2="21.100046"
+       x2="42.609146"
+       y1="17.261765"
+       x1="12.784937"
+       gradientTransform="matrix(0.95683736,0.86801186,-0.93919227,0.90375082,22.45967,-22.496456)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4350"
+       xlink:href="#linearGradient4140"
+       inkscape:collect="always" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -201,10 +242,10 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="9.8994949"
-     inkscape:cx="15.162291"
+     inkscape:zoom="4.9497475"
+     inkscape:cx="2.4343689"
      inkscape:cy="22.03092"
-     inkscape:current-layer="layer2"
+     inkscape:current-layer="layer9"
      showgrid="true"
      inkscape:grid-bbox="true"
      inkscape:document-units="px"
@@ -212,7 +253,8 @@
      inkscape:window-height="723"
      inkscape:window-x="0"
      inkscape:window-y="25"
-     borderlayer="true" />
+     borderlayer="true"
+     inkscape:window-maximized="0" />
   <metadata
      id="metadata2388">
     <rdf:RDF>
@@ -221,6 +263,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -228,155 +271,27 @@
      inkscape:groupmode="layer"
      id="layer6"
      inkscape:label="shadow"
-     style="display:inline"
-     sodipodi:insensitive="true">
+     style="display:none">
     <path
        sodipodi:type="arc"
-       style="opacity:1;fill:#000000;fill-opacity:0.24878049;stroke:none;stroke-width:0.1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter3252)"
+       style="fill:#000000;fill-opacity:0.24878049;stroke:none;filter:url(#filter3252)"
        id="path3370"
        sodipodi:cx="24.445692"
        sodipodi:cy="38.302536"
        sodipodi:rx="30.910667"
        sodipodi:ry="8.485281"
-       d="M 55.356359,38.302536 A 30.910667,8.485281 0 1 1 -6.4649754,38.302536 A 30.910667,8.485281 0 1 1 55.356359,38.302536 z"
-       transform="matrix(0.7380952,0,0,0.7380952,6.0128136,10.031617)" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer4"
-     inkscape:label="color"
-     sodipodi:insensitive="true">
-    <path
-       style="fill:#5884bf;fill-opacity:1;stroke:none;stroke-width:0.49592856;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
-       d="M 6.4265364,11.283679 L 40.573462,11.283679 L 40.573462,38.430609 C 30.992581,43.227768 15.769467,43.154069 6.4265364,38.430609 L 6.4265364,11.283679 z"
-       id="rect2384"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       style="fill:#e13636;fill-opacity:1;stroke:none;stroke-width:0.49592856;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
-       d="M 6.4630916,13.953569 L 40.610016,13.953569 L 40.610017,23.624859 C 31.029136,28.422018 15.806022,28.348319 6.4630916,23.624859 L 6.4630916,13.953569 z"
-       id="path3200"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       style="fill:#f2db25;fill-opacity:1;stroke:none;stroke-width:0.49592856;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
-       d="M 6.1600462,11.731234 L 40.306972,11.731234 L 40.306972,18.97816 C 30.726091,23.775319 15.502976,23.70162 6.1600461,18.97816 L 6.1600462,11.731234 z"
-       id="path3198"
-       sodipodi:nodetypes="ccccc" />
+       d="m 55.356359,38.302536 a 30.910667,8.485281 0 1 1 -61.8213344,0 30.910667,8.485281 0 1 1 61.8213344,0 z"
+       transform="matrix(0.7380952,0,0,0.54520587,6.0128136,19.056488)" />
   </g>
   <g
      inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="shine"
-     sodipodi:insensitive="true">
-    <path
-       style="fill:url(#linearGradient3180);fill-opacity:1;stroke:#825540;stroke-width:0.49592856;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
-       d="M 6.4979658,11.498535 L 40.644892,11.498535 L 40.644892,38.645465 C 31.064011,43.442624 15.840896,43.368925 6.4979658,38.645465 L 6.4979658,11.498535 z"
-       id="path3171"
-       sodipodi:nodetypes="ccccc" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer5"
-     inkscape:label="text"
-     sodipodi:insensitive="true"
-     style="display:inline">
-    <path
-       style="font-size:40px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:0.1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;font-family:Bitstream Vera Serif;-inkscape-font-specification:Bitstream Vera Serif Bold"
-       d="M 17.060881,32.56056 L 17.060881,31.386704 L 18.914033,31.386704 L 18.914033,19.250394 L 17.060881,19.250394 L 17.060881,18.076537 L 25.647474,18.076537 C 27.413294,18.076552 28.739281,18.374058 29.625443,18.969056 C 30.511579,19.564082 30.954652,20.459833 30.954668,21.656312 C 30.954652,22.516504 30.647411,23.198826 30.032943,23.703285 C 29.424914,24.20776 28.519362,24.524668 27.31628,24.654011 C 28.771623,24.789836 29.887394,25.177888 30.663596,25.818165 C 31.43977,26.458456 31.827865,27.308935 31.82788,28.369604 C 31.827865,29.805397 31.284532,30.862836 30.197883,31.541925 C 29.117674,32.221016 27.422996,32.56056 25.113844,32.56056 L 17.060881,32.56056 M 22.649443,24.12044 L 23.920453,24.12044 C 25.032982,24.120449 25.857682,23.919955 26.394555,23.51896 C 26.931409,23.111516 27.199842,22.490634 27.199852,21.656312 C 27.199842,20.815547 26.937878,20.204366 26.413961,19.82277 C 25.896492,19.441198 25.065322,19.250407 23.920453,19.250394 L 22.649443,19.250394 L 22.649443,24.12044 M 22.649443,31.386704 L 24.036882,31.386704 C 25.272306,31.386705 26.187562,31.14094 26.782651,30.649407 C 27.377717,30.157877 27.675256,29.397943 27.675268,28.369604 C 27.675256,27.334805 27.374484,26.561937 26.772949,26.050996 C 26.171391,25.540069 25.25937,25.284602 24.036882,25.284594 L 22.649443,25.284594 L 22.649443,31.386704"
-       id="text3202" />
-    <text
-       xml:space="preserve"
-       style="font-size:5.7741642px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:#f7f7f7;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.71428576;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans"
-       x="17.585989"
-       y="39.817764"
-       id="text3320"
-       sodipodi:linespacing="125%"><tspan
-         sodipodi:role="line"
-         id="tspan3324"
-         x="17.585989"
-         y="39.817764">+4v</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-size:0.94746196px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
-       x="-38.376022"
-       y="37.053452"
-       id="text3466"
-       sodipodi:linespacing="125%"
-       transform="matrix(0,-1,1,0,0,0)"><tspan
-         sodipodi:role="line"
-         id="tspan2438"
-         x="-38.376022"
-         y="37.053452">This product adheres to all FDA </tspan><tspan
-         sodipodi:role="line"
-         id="tspan2440"
-         x="-38.376022"
-         y="38.237778">  regulations, and contains at least 50% </tspan><tspan
-         sodipodi:role="line"
-         id="tspan2442"
-         x="-38.376022"
-         y="39.422108">    bits by volume.</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-size:0.94746196px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
-       x="-38.067734"
-       y="12.216213"
-       id="text3482"
-       sodipodi:linespacing="125%"
-       transform="matrix(0,-1,1,0,0,0)"><tspan
-         sodipodi:role="line"
-         id="tspan2452"
-         x="-38.067734"
-         y="12.216213">Not a floatation device.</tspan></text>
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="top"
-     sodipodi:insensitive="true"
+     id="layer9"
+     inkscape:label="logo"
      style="display:inline">
     <path
-       sodipodi:type="arc"
-       style="opacity:1;fill:#bf8158;fill-opacity:1;stroke:#825540;stroke-width:0.40979934;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path2387"
-       sodipodi:cx="24.571428"
-       sodipodi:cy="11.071428"
-       sodipodi:rx="14.285714"
-       sodipodi:ry="3.2142856"
-       d="M 38.857142,11.071428 A 14.285714,3.2142856 0 1 1 10.285714,11.071428 A 14.285714,3.2142856 0 1 1 38.857142,11.071428 z"
-       transform="matrix(1.1947106,0,0,1.2876026,-5.7128888,-3.1127432)" />
-    <path
-       sodipodi:type="arc"
-       style="opacity:1;fill:#696a64;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.5320197"
-       id="path3326"
-       sodipodi:cx="24.748737"
-       sodipodi:cy="11.129432"
-       sodipodi:rx="11.818785"
-       sodipodi:ry="2.0203052"
-       d="M 36.567522,11.129432 A 11.818785,2.0203052 0 1 1 12.929953,11.129432 A 11.818785,2.0203052 0 1 1 36.567522,11.129432 z"
-       transform="matrix(1.2606838,0,0,1.5072438,-7.5122541,-5.6599702)" />
-    <path
-       sodipodi:type="arc"
-       style="opacity:1;fill:url(#radialGradient3238);fill-opacity:1;stroke:url(#linearGradient3432);stroke-width:0.58742505;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path3392"
-       sodipodi:cx="23.637569"
-       sodipodi:cy="8.9576044"
-       sodipodi:rx="14.142136"
-       sodipodi:ry="3.6870568"
-       d="M 37.779705,8.9576044 A 14.142136,3.6870568 0 1 1 9.4954338,8.9576044 A 14.142136,3.6870568 0 1 1 37.779705,8.9576044 z"
-       transform="matrix(0.8219163,0,0,0.5641407,4.2071579,5.9245612)" />
-    <path
-       style="fill:url(#linearGradient3349);fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
-       d="M 19.697975,8.1999896 L 27.375135,8.1999896 L 27.47615,11.230448 C 24.760736,12.324973 22.246648,12.010212 19.79899,11.230448 L 19.697975,8.1999896 z"
-       id="rect3340"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       sodipodi:type="arc"
-       style="opacity:1;fill:url(#radialGradient3338);fill-opacity:1;stroke:none;stroke-width:0.08430404;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path3328"
-       sodipodi:cx="23.789093"
-       sodipodi:cy="6.5837455"
-       sodipodi:rx="3.1819806"
-       sodipodi:ry="0.90913731"
-       d="M 26.971074,6.5837455 A 3.1819806,0.90913731 0 1 1 20.607112,6.5837455 A 3.1819806,0.90913731 0 1 1 26.971074,6.5837455 z"
-       transform="matrix(1.2063492,0,0,1.1135745,-5.1613985,1.0871994)" />
+       style="fill:url(#linearGradient4350);fill-opacity:1;stroke:#c4a000;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       d="M 40.832399,4.4308854 C 38.323484,2.1548783 34.510766,2.0174415 32.295855,4.1487698 31.502307,4.9123734 31.013744,5.8819618 30.841601,6.889703 30.745267,5.445573 30.040725,3.968478 28.786265,2.8304745 26.27735,0.55446737 22.465182,0.47239804 20.250273,2.603726 c -2.21491,2.1313293 -1.985405,5.6608648 0.523509,7.936872 1.120654,1.016618 2.512846,1.579068 3.898856,1.726291 l -0.47922,5.436076 -21.5427239,20.729783 c 4.7832202,4.226512 5.1750963,4.574113 9.4177699,8.433754 l 3.140423,-3.021916 -5.8606287,-5.316572 2.2305817,-2.146409 5.860629,5.316573 3.404573,-3.276098 -5.860629,-5.316572 2.377331,-2.28762 5.920431,5.370825 3.404571,-3.276096 -5.920432,-5.370824 6.985243,-6.721647 5.80218,-0.552391 c 0.252583,1.180705 0.87033,2.325822 1.899212,3.259192 2.508917,2.276006 6.350985,2.385199 8.565895,0.253872 2.21491,-2.131327 1.955505,-5.68799 -0.55341,-7.963998 -1.885789,-1.770293 -4.747902,-1.582915 -4.284266,-1.746714 0.67883,-0.253713 1.671198,-1.160948 2.205642,-1.675225 2.21491,-2.131329 1.955506,-5.6879892 -0.553411,-7.9639966 z m -1.878385,1.8075014 c 0.98649,0.8949095 0.971484,2.3631728 0.0032,3.2949293 -0.968297,0.9317559 -2.538666,0.9890459 -3.525155,0.094131 -0.98654,-0.8949043 -1.001431,-2.3902936 -0.03314,-3.3220496 0.968297,-0.9317576 2.568569,-0.9619209 3.555055,-0.067011 z m 2.548947,11.9689742 c 0.986489,0.89491 1.00138,2.390298 0.03308,3.322054 -0.968296,0.931758 -2.568566,0.961921 -3.555054,0.06701 -0.986488,-0.894908 -1.001384,-2.390298 -0.03308,-3.322054 0.968298,-0.931757 2.568567,-0.96192 3.555057,-0.06701 z M 26.584483,4.8932728 c 0.986489,0.894911 0.971481,2.3631726 0.0031,3.2949284 -0.968296,0.9317546 -2.538667,0.9890468 -3.525155,0.094136 -0.986436,-0.8949102 -1.00133,-2.3902976 -0.03303,-3.3220545 0.968297,-0.9317572 2.568567,-0.9619206 3.555055,-0.06701 z"
+       id="rect3942"
+       inkscape:connector-curvature="0" />
   </g>
 </svg>
diff --git a/docs/_static/masthead.png b/docs/_static/masthead.png
index 154b198..2df6796 100644
--- a/docs/_static/masthead.png
+++ b/docs/_static/masthead.png
diff --git a/docs/_static/masthead.svg b/docs/_static/masthead.svg
index 76d9df1..33f9d74 100644
--- a/docs/_static/masthead.svg
+++ b/docs/_static/masthead.svg
@@ -14,10 +14,10 @@
    height="52"
    id="svg2383"
    sodipodi:version="0.32"
-   inkscape:version="0.47pre4 r22446"
+   inkscape:version="0.48.0 r9654"
    sodipodi:docname="masthead.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:export-filename="/home/biscuit/dev/libs/bps/trunk/docs/_static/masthead.png"
+   inkscape:export-filename="/home/biscuit/dev/libs/passlib/trunk/docs/_static/masthead.png"
    inkscape:export-xdpi="90"
    inkscape:export-ydpi="90"
    version="1.0"
@@ -25,6 +25,25 @@
   <defs
      id="defs2385">
     <linearGradient
+       id="linearGradient4140">
+      <stop
+         style="stop-color:#ffe50a;stop-opacity:1;"
+         offset="0"
+         id="stop4142" />
+      <stop
+         id="stop4150"
+         offset="0.49036095"
+         style="stop-color:#fcea5b;stop-opacity:1;" />
+      <stop
+         id="stop4148"
+         offset="0.60424012"
+         style="stop-color:#edd400;stop-opacity:1;" />
+      <stop
+         style="stop-color:#d6c000;stop-opacity:1;"
+         offset="1"
+         id="stop4144" />
+    </linearGradient>
+    <linearGradient
        id="linearGradient3426">
       <stop
          style="stop-color:#cdcdcd;stop-opacity:1;"
@@ -133,57 +152,6 @@
        inkscape:vp_y="0 : 1000 : 0"
        inkscape:vp_x="0 : 526.18109 : 1"
        sodipodi:type="inkscape:persp3d" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3174"
-       id="linearGradient3180"
-       x1="6.2500014"
-       y1="26.857143"
-       x2="39.892857"
-       y2="26.857143"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.230234,0,0,1.230234,1.714269,-5.1906289)" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3330"
-       id="radialGradient3338"
-       cx="24.08217"
-       cy="6.5837455"
-       fx="24.08217"
-       fy="6.5837455"
-       r="3.3319807"
-       gradientTransform="matrix(1,0,0,0.3178702,0,4.490969)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3343"
-       id="linearGradient3349"
-       x1="20.156134"
-       y1="9.6145229"
-       x2="27.476151"
-       y2="9.6145229"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.230234,0,0,1.230234,1.714269,-5.1906289)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3426"
-       id="linearGradient3432"
-       x1="20.619965"
-       y1="4.9160261"
-       x2="23.637569"
-       y2="12.999183"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3361"
-       id="radialGradient3238"
-       cx="23.637569"
-       cy="8.9576044"
-       fx="23.637569"
-       fy="8.9576044"
-       r="14.501575"
-       gradientTransform="matrix(1.0932998,4.0390633e-7,-7.5505546e-8,0.3972952,-2.2053809,5.3987817)"
-       gradientUnits="userSpaceOnUse" />
     <filter
        inkscape:collect="always"
        id="filter3534"
@@ -208,6 +176,52 @@
          stdDeviation="7.1308532"
          id="feGaussianBlur3224" />
     </filter>
+    <filter
+       inkscape:collect="always"
+       id="filter3820"
+       x="-0.19660333"
+       width="1.3932067"
+       y="-0.49988016"
+       height="1.9997603">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="7.6062434"
+         id="feGaussianBlur3822" />
+    </filter>
+    <filter
+       inkscape:collect="always"
+       id="filter3857"
+       x="-0.0944717"
+       width="1.1889434"
+       y="-0.37821828"
+       height="1.7564366">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="2.6032529"
+         id="feGaussianBlur3859" />
+    </filter>
+    <filter
+       inkscape:collect="always"
+       id="filter3981"
+       x="-0.082662738"
+       width="1.1653255"
+       y="-0.330941"
+       height="1.661882">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="2.2778463"
+         id="feGaussianBlur3983" />
+    </filter>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4140"
+       id="linearGradient4152"
+       x1="12.784937"
+       y1="17.261765"
+       x2="42.609146"
+       y2="21.100046"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.9898657,0.5290083,-0.52817535,0.98830712,8.6007275,-14.225263)" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -216,15 +230,15 @@
      borderopacity="1.0"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="2.4748737"
-     inkscape:cx="39.98405"
-     inkscape:cy="11.121273"
-     inkscape:current-layer="layer6"
+     inkscape:zoom="3.5"
+     inkscape:cx="28.119022"
+     inkscape:cy="21.234183"
+     inkscape:current-layer="layer3"
      showgrid="true"
      inkscape:grid-bbox="true"
      inkscape:document-units="px"
-     inkscape:window-width="1920"
-     inkscape:window-height="1005"
+     inkscape:window-width="1600"
+     inkscape:window-height="823"
      inkscape:window-x="0"
      inkscape:window-y="24"
      borderlayer="true"
@@ -244,153 +258,47 @@
   <g
      inkscape:groupmode="layer"
      id="layer6"
-     inkscape:label="shadow"
+     inkscape:label="logo shadow"
      style="display:inline">
     <path
        sodipodi:type="arc"
-       style="opacity:1;fill:#000000;fill-opacity:0.18811882;stroke:none;stroke-width:0.10000000000000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter3534)"
+       style="opacity:0.45;fill:#000000;fill-opacity:0.18811885;stroke:none;filter:url(#filter3534)"
        id="path3370"
        sodipodi:cx="24.445692"
        sodipodi:cy="38.302536"
        sodipodi:rx="30.910667"
        sodipodi:ry="8.485281"
-       d="M 55.356359,38.302536 A 30.910667,8.485281 0 1 1 -6.4649754,38.302536 A 30.910667,8.485281 0 1 1 55.356359,38.302536 z"
-       transform="matrix(0.9080298,0,0,0.9080298,9.111437,7.1506078)" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer4"
-     inkscape:label="color">
-    <path
-       style="fill:#5884bf;fill-opacity:1;stroke:none;stroke-width:0.49592856;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
-       d="M 9.620413,8.6909368 L 51.629123,8.6909368 L 51.629123,42.088015 C 39.842397,47.989643 21.114404,47.898976 9.620413,42.088015 L 9.620413,8.6909368 z"
-       id="rect2384"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       style="fill:#e13636;fill-opacity:1;stroke:none;stroke-width:0.49592856;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
-       d="M 9.665384,11.975527 L 51.674093,11.975527 L 51.674094,23.873477 C 39.887368,29.775105 21.159375,29.684438 9.665384,23.873477 L 9.665384,11.975527 z"
-       id="path3200"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       style="fill:#f2db25;fill-opacity:1;stroke:none;stroke-width:0.49592856;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
-       d="M 9.292567,9.2415348 L 51.301278,9.2415348 L 51.301278,18.15695 C 39.514552,24.058578 20.786558,23.967911 9.292567,18.15695 L 9.292567,9.2415348 z"
-       id="path3198"
-       sodipodi:nodetypes="ccccc" />
+       d="m 55.356359,38.302536 a 30.910667,8.485281 0 1 1 -61.8213344,0 30.910667,8.485281 0 1 1 61.8213344,0 z"
+       transform="matrix(0.43660868,0,0,0.53092582,10.777999,23.937337)" />
   </g>
   <g
      inkscape:groupmode="layer"
      id="layer3"
-     inkscape:label="shine">
+     inkscape:label="logo"
+     style="display:inline">
     <path
-       style="fill:url(#linearGradient3180);fill-opacity:1;stroke:#825540;stroke-width:0.6101082;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
-       d="M 9.708288,8.9552598 L 51.716999,8.9552598 L 51.716999,42.352338 C 39.930273,48.253966 21.202278,48.163299 9.708288,42.352338 L 9.708288,8.9552598 z"
-       id="path3171"
-       sodipodi:nodetypes="ccccc" />
+       style="fill:url(#linearGradient4152);fill-opacity:1;stroke:#c4a000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="M 30.198981,4.7423018 C 27.603462,3.3551933 24.497977,4.0990787 23.252373,6.4298176 22.806104,7.264865 22.657496,8.207834 22.773368,9.1120344 22.331047,7.8938257 21.39055,6.7848017 20.09279,6.0912475 17.497271,4.7041388 14.406213,5.4954406 13.16061,7.8261789 c -1.245603,2.3307391 -0.169335,5.3094541 2.426184,6.6965631 1.159336,0.619577 2.422664,0.787802 3.576144,0.600895 l 0.986978,4.775957 -12.1150241,22.669294 c 4.9198721,2.547763 5.3232811,2.757641 9.7151381,5.11259 l 1.766086,-3.304651 -6.062927,-3.240176 1.254416,-2.347229 6.062928,3.240176 1.914635,-3.582614 -6.062927,-3.240176 1.336944,-2.501653 6.124795,3.27324 1.914635,-3.582613 -6.124795,-3.273239 3.928305,-7.350535 4.533578,-1.785931 c 0.501629,0.956702 1.28838,1.800296 2.352778,2.369136 2.595519,1.387109 5.717509,0.612338 6.963112,-1.7184 1.245603,-2.330738 0.138402,-5.325986 -2.457117,-6.713095 -1.965927,-1.093746 -4.223756,-0.285853 -3.891712,-0.531306 0.482653,-0.371302 1.052777,-1.374623 1.353334,-1.937016 C 33.901701,9.1246576 32.7945,6.1294104 30.198981,4.7423018 z M 29.14263,6.7189161 c 1.020541,0.5454016 1.37928,1.809501 0.834737,2.8284351 C 29.432824,10.566283 28.182513,10.970469 27.161973,10.425067 26.141433,9.8796667 25.751761,8.5990343 26.296303,7.5801015 26.840846,6.5611674 28.12209,6.1735148 29.14263,6.7189161 z m 5.075829,9.7008179 c 1.02054,0.545402 1.410211,1.826033 0.865669,2.844966 -0.544543,1.018933 -1.825786,1.406587 -2.846327,0.861185 -1.020539,-0.545401 -1.410213,-1.826033 -0.86567,-2.844966 0.544543,-1.018934 1.825788,-1.406586 2.846328,-0.861185 z M 18.840451,8.360176 c 1.020541,0.5454016 1.37928,1.809501 0.834737,2.828434 -0.544543,1.018932 -1.794854,1.423118 -2.815394,0.877716 -1.02054,-0.545401 -1.410212,-1.826032 -0.86567,-2.8449654 0.544543,-1.0189336 1.825787,-1.406586 2.846327,-0.8611846 z"
+       id="rect3942"
+       inkscape:connector-curvature="0" />
   </g>
   <g
      inkscape:groupmode="layer"
-     id="layer5"
-     inkscape:label="text"
+     id="layer8"
+     inkscape:label="title shadow"
      style="display:inline">
-    <path
-       style="font-size:40px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:#f9ee98;stroke-width:0.30597168;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;font-family:Bitstream Vera Serif;-inkscape-font-specification:Bitstream Vera Serif Bold"
-       d="m 22.61279,34.855594 0,-1.360485 2.147781,0 0,-14.065843 -2.147781,0 0,-1.360486 9.951762,0 c 2.046563,1.9e-5 3.583367,0.344825 4.610418,1.03442 1.027021,0.689628 1.540539,1.727793 1.540557,3.114498 -1.8e-5,0.996953 -0.356108,1.787757 -1.068268,2.372418 -0.704699,0.584681 -1.754223,0.951973 -3.148581,1.10188 1.686725,0.157419 2.979891,0.607167 3.8795,1.349241 0.899576,0.74209 1.349374,1.727785 1.349391,2.957088 -1.7e-5,1.664068 -0.629734,2.889627 -1.889147,3.676683 -1.251949,0.787058 -3.216062,1.180586 -5.892342,1.180586 l -9.33329,0 m 6.477079,-9.782 1.473085,0 c 1.289408,1.1e-5 2.245226,-0.23236 2.867455,-0.697108 0.622207,-0.472223 0.933318,-1.191818 0.933331,-2.158788 -1.3e-5,-0.974436 -0.303626,-1.682788 -0.91084,-2.125054 -0.59974,-0.442237 -1.563057,-0.663362 -2.889946,-0.663378 l -1.473085,0 0,5.644328 m 0,8.421515 1.608024,0 c 1.431843,0 2.492613,-0.284838 3.182315,-0.854519 0.689674,-0.569678 1.034518,-1.450432 1.034533,-2.642265 -1.5e-5,-1.19932 -0.348606,-2.095065 -1.045778,-2.68724 -0.697198,-0.592158 -1.754219,-0.888242 -3.17107,-0.88825 l -1.608024,0 0,7.072274"
-       id="text3202" />
-    <text
-       xml:space="preserve"
-       style="font-size:7.10357332px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:#f7f7f7;stroke-width:0.12302341;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.71428576;stroke-dasharray:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans"
-       x="23.349152"
-       y="44.400631"
-       id="text3320"
-       sodipodi:linespacing="125%"><tspan
-         sodipodi:role="line"
-         id="tspan3324"
-         x="23.349152"
-         y="44.400631"
-         style="stroke-width:0.12302341">+4v</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-size:1.16559994px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
-       x="-42.020859"
-       y="47.298687"
-       id="text3466"
-       sodipodi:linespacing="125%"
-       transform="matrix(0,-1,1,0,0,0)"><tspan
-         sodipodi:role="line"
-         id="tspan2438"
-         x="-42.020859"
-         y="47.298687">This product adheres to all FDA </tspan><tspan
-         sodipodi:role="line"
-         id="tspan2440"
-         x="-42.020859"
-         y="48.755688">  regulations, and contains at least 50% </tspan><tspan
-         sodipodi:role="line"
-         id="tspan2442"
-         x="-42.020859"
-         y="50.212688">    bits by volume.</tspan></text>
     <text
        xml:space="preserve"
-       style="font-size:1.16559994px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
-       x="-41.64159"
-       y="16.743071"
-       id="text3482"
+       style="font-size:33.91580582px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;opacity:0.28999999;fill:#000000;fill-opacity:1;stroke:none;display:inline;filter:url(#filter3981);font-family:IrisUPC;-inkscape-font-specification:IrisUPC"
+       x="37.256504"
+       y="123.34303"
+       id="text2740-7"
        sodipodi:linespacing="125%"
-       transform="matrix(0,-1,1,0,0,0)"><tspan
+       transform="matrix(1.9496263,0,0,0.58102406,-30.290625,-27.770544)"><tspan
          sodipodi:role="line"
-         id="tspan2452"
-         x="-41.64159"
-         y="16.743071">Not a floatation device.</tspan></text>
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="top"
-     style="display:inline">
-    <path
-       sodipodi:type="arc"
-       style="opacity:1;fill:#bf8158;fill-opacity:1;stroke:#825540;stroke-width:0.40979934;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path2387"
-       sodipodi:cx="24.571428"
-       sodipodi:cy="11.071428"
-       sodipodi:rx="14.285714"
-       sodipodi:ry="3.2142856"
-       d="M 38.857142,11.071428 A 14.285714,3.2142856 0 1 1 10.285714,11.071428 A 14.285714,3.2142856 0 1 1 38.857142,11.071428 z"
-       transform="matrix(1.4697737,0,0,1.5840526,-5.3139214,-9.0200316)" />
-    <path
-       sodipodi:type="arc"
-       style="opacity:1;fill:#696a64;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.5320197"
-       id="path3326"
-       sodipodi:cx="24.748737"
-       sodipodi:cy="11.129432"
-       sodipodi:rx="11.818785"
-       sodipodi:ry="2.0203052"
-       d="M 36.567522,11.129432 A 11.818785,2.0203052 0 1 1 12.929953,11.129432 A 11.818785,2.0203052 0 1 1 36.567522,11.129432 z"
-       transform="matrix(1.5509361,0,0,1.8542626,-7.5275619,-12.153717)" />
-    <path
-       sodipodi:type="arc"
-       style="opacity:1;fill:url(#radialGradient3238);fill-opacity:1;stroke:url(#linearGradient3432);stroke-width:0.58742505;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path3392"
-       sodipodi:cx="23.637569"
-       sodipodi:cy="8.9576044"
-       sodipodi:rx="14.142136"
-       sodipodi:ry="3.6870568"
-       d="M 37.779705,8.9576044 A 14.142136,3.6870568 0 1 1 9.4954338,8.9576044 A 14.142136,3.6870568 0 1 1 37.779705,8.9576044 z"
-       transform="matrix(1.0111494,0,0,0.6940251,6.890058,2.097968)" />
-    <path
-       style="fill:url(#linearGradient3349);fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
-       d="M 25.947388,4.8972774 L 35.392092,4.8972774 L 35.516364,8.6254508 C 32.175769,9.9719728 29.082853,9.5847428 26.07166,8.6254508 L 25.947388,4.8972774 z"
-       id="rect3340"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       sodipodi:type="arc"
-       style="opacity:1;fill:url(#radialGradient3338);fill-opacity:1;stroke:none;stroke-width:0.08430404;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path3328"
-       sodipodi:cx="23.789093"
-       sodipodi:cy="6.5837455"
-       sodipodi:rx="3.1819806"
-       sodipodi:ry="0.90913731"
-       d="M 26.971074,6.5837455 A 3.1819806,0.90913731 0 1 1 20.607112,6.5837455 A 3.1819806,0.90913731 0 1 1 26.971074,6.5837455 z"
-       transform="matrix(1.4840919,0,0,1.3699573,-4.6354593,-3.8531192)" />
+         id="tspan2742-2"
+         x="37.256504"
+         y="123.34303">PassLib</tspan></text>
   </g>
   <g
      inkscape:groupmode="layer"
@@ -398,26 +306,14 @@
      style="display:inline">
     <text
        xml:space="preserve"
-       style="font-size:51.36699295000000376px;font-style:italic;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:0.31353134;stroke:none;display:inline;filter:url(#filter3222);font-family:Constantia;-inkscape-font-specification:Constantia Bold Italic;opacity:1"
-       x="55.297119"
-       y="43.612377"
-       id="text3514"
-       sodipodi:linespacing="125%"
-       transform="matrix(0.9689059,0,0,0.2882374,15.181422,33.203144)"><tspan
-         sodipodi:role="line"
-         id="tspan3516"
-         x="55.297119"
-         y="43.612377">BPS</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-size:49.76978302px;font-style:italic;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Constantia;-inkscape-font-specification:Constantia Bold Italic"
-       x="64.488541"
-       y="41.454266"
+       style="font-size:66.12315369px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:IrisUPC;-inkscape-font-specification:IrisUPC"
+       x="42.002182"
+       y="39.704662"
        id="text2740"
        sodipodi:linespacing="125%"><tspan
          sodipodi:role="line"
          id="tspan2742"
-         x="64.488541"
-         y="41.454266">BPS</tspan></text>
+         x="42.002182"
+         y="39.704662">PassLib</tspan></text>
   </g>
 </svg>
diff --git a/docs/conf.py b/docs/conf.py
index edf7e0a..6bf186e 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -21,11 +21,10 @@ doc_root = os.path.abspath(os.path.join(__file__,os.path.pardir))
 source_root = os.path.abspath(os.path.join(doc_root,os.path.pardir))
 sys.path.insert(0, source_root)
 
-#check for Assurance Technologies' BPS library, to conditionally load in some helpers
-try:
-    import bps
-except ImportError:
-    bps = None
+#building docs requires Assurance Technologies' AstDoc library
+# http://www.assurancetechnologies.com/software/astdoc
+#which contains some sphinx extensions used by passlib
+import astdoc
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
@@ -39,9 +38,10 @@ except ImportError:
 extensions = [
     'sphinx.ext.autodoc',
     'sphinx.ext.todo',
-##    'bps.unstable.bpsdoc.index_styles',
-##    'bps.unstable.bpsdoc.relbar_toc',
-##    'bps.unstable.bpsdoc.nested_sections',
+    
+    'astdoc.ext.index_styles', #adds extra ids & classes to index html, for additional styling
+    'astdoc.ext.relbar_toc', #inserts toc into right hand nav bar (ala old style python docs)
+    'astdoc.ext.nested_sections', #handles ReST markup within function/class docstrings
     ]
 
 # Add any paths that contain templates here, relative to this directory.
@@ -69,8 +69,7 @@ copyright = u'2008-2010, Assurance Technologies, LLC'
 # version: The short X.Y version.
 # release: The full version, including alpha/beta/rc tags.
 from passlib import __version__ as release
-import re
-version = re.match("(\d+\.\d+)", release).group(1)
+version = astdoc.get_version(release)
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -118,21 +117,19 @@ keep_warnings = True
 # The style sheet to use for HTML and HTML Help pages. A file of that name
 # must exist either in Sphinx' static/ path, or in one of the custom paths
 # given in html_static_path.
-##html_style = 'bps.css'
+##html_style = 'xxx.css'
 
 # The theme to use for HTML and HTML Help pages.  Major themes that come with
 # Sphinx are currently 'default' and 'sphinxdoc'.
-##html_theme = 'cloud'
-html_theme = "nature"
+html_theme = 'cloud'
 
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
 # documentation.
-##html_theme_options = { "roottarget": index_doc }
+html_theme_options = { "roottarget": index_doc }
 
 # Add any paths that contain custom themes here, relative to this directory.
-##from bps.unstable.bpsdoc import theme_path
-##html_theme_path = [theme_path]
+html_theme_path = [astdoc.get_theme_dir()]
 
 # The name for this set of Sphinx documents.  If None, it defaults to
 # "<project> v<release> documentation".
diff --git a/docs/make.py b/docs/make.py
index 37b7323..42b85d2 100644
--- a/docs/make.py
+++ b/docs/make.py
@@ -1,8 +1,5 @@
 "Makefile for Sphinx documentation, adapted to python"
-import os, sys
-doc_root = os.path.abspath(os.path.join(__file__,os.path.pardir))
-source_root = os.path.abspath(os.path.join(doc_root,os.path.pardir))
-sys.path.insert(0, source_root)
-
-from bps.unstable.bpsdoc.make_helper import SphinxMaker
-SphinxMaker.execute(root=__file__)
+import os
+from astdoc.make_helper import SphinxMaker
+if __name__ == "__main__":
+    SphinxMaker.execute(root_dir=os.path.join(__file__,os.pardir))