diff options
| author | Eli Collins <elic@assurancetechnologies.com> | 2011-09-19 22:44:53 -0400 |
|---|---|---|
| committer | Eli Collins <elic@assurancetechnologies.com> | 2011-09-19 22:44:53 -0400 |
| commit | aac77a0f7b9c23ca401209fed94b2068dfdf9e34 (patch) | |
| tree | 3500b8d82b5cab17e79db59b3025c8234cb5c294 /docs | |
| parent | b4e32fd970aeb81ffa95f8b83b3123e84b0c1532 (diff) | |
| parent | 1211a0f3e32fa6eb16ad0986c99a9c91d88c0426 (diff) | |
| download | passlib-aac77a0f7b9c23ca401209fed94b2068dfdf9e34.tar.gz | |
Merge fixes from release-1.5
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/conf.py | 2 | ||||
| -rw-r--r-- | docs/lib/passlib.utils.rst | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/docs/conf.py b/docs/conf.py index a412f3e..422c558 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -140,7 +140,7 @@ html_theme_path = [cloud_sptheme.get_theme_dir()] html_title = project + " v" + release + " Documentation" # A shorter title for the navigation bar. Default is the same as html_title. -html_short_title = project + " Documentation" +html_short_title = project + " " + version + " Documentation" # The name of an image file (relative to this directory) to place at the top # of the sidebar. diff --git a/docs/lib/passlib.utils.rst b/docs/lib/passlib.utils.rst index 4ce95a6..63de110 100644 --- a/docs/lib/passlib.utils.rst +++ b/docs/lib/passlib.utils.rst @@ -40,9 +40,9 @@ Decorators ========== .. autofunction:: classproperty -String Manipulation -=================== -.. autofunction:: splitcomma +.. + String Manipulation + .. autofunction:: splitcomma Bytes Manipulation ================== |
