From 7caf710ed8ee5205ea136c0f41eef3e951799097 Mon Sep 17 00:00:00 2001 From: eap Date: Tue, 1 Mar 2011 09:19:32 +0000 Subject: [PATCH] Merge fixes from V6_main --- doc/docutils/{conf.py => conf.py.in} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename doc/docutils/{conf.py => conf.py.in} (99%) diff --git a/doc/docutils/conf.py b/doc/docutils/conf.py.in similarity index 99% rename from doc/docutils/conf.py rename to doc/docutils/conf.py.in index 018bd10b0..da8e3e23c 100644 --- a/doc/docutils/conf.py +++ b/doc/docutils/conf.py.in @@ -54,9 +54,9 @@ copyright = '2010 EDF R&D' # built documents. # # The short X.Y version. -version = '5.1.5' +version = '@VERSION@' # The full version, including alpha/beta/rc tags. -release = '5.1.5' +release = '@VERSION@' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. -- 2.39.2