Place watermark automatically for pre-release versions

Make the watermark automatically appear on pre-release versions of the
document so that I don't need to manually remember to turn it on/off.

Signed-off-by: Grant Likely <[email protected]>

Author: glikely

source/conf.py

@@ -60,7 +60,7 @@
 # The short X.Y version.
 version = u'0.1-pre1'
 # The full version, including alpha/beta/rc tags.
-release = u'%s-%s' % (version, time.strftime('%Y%m%d'))
+release = version
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -233,9 +233,8 @@
 }
 
 # Release numbers with a qualifier (ex. '-rc', '-pre') get a watermark.
-if '-' in version:
-    latex_elements['preamble'] = '\\usepackage{draftwatermark}\\SetWatermarkScale{.45}\\SetWatermarkText{DRAFT v%s}' % release
-
+if '-' in release:
+    latex_elements['preamble'] = '\\usepackage{draftwatermark}\\SetWatermarkScale{.45}\\SetWatermarkText{DRAFT v%s %s}' % (release, time.strftime(today_fmt))
 
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title,