diff options
| author | Derek Jones <derek.jones@ellislab.com> | 2011-10-20 19:18:42 +0200 |
|---|---|---|
| committer | Derek Jones <derek.jones@ellislab.com> | 2011-10-20 21:31:17 +0200 |
| commit | f4a4bd8fac188ebc9cda822ffc811c218fd92b45 (patch) | |
| tree | f0b93292111720ee211b4a315a1a7ec3618472bb /user_guide_src/source/conf.py | |
| parent | fbc4c5dae4b5418277a522fb2dc4cd6ca17771ca (diff) | |
adding new license file (OSL 3.0) and updating readme to ReST
added notice of license to all source files.
OSL to all except the few files we ship inside of the application folder, those are AFL.
Updated license in user guide.
incrementing next dev version to 3.0 due to licensing change
Diffstat (limited to 'user_guide_src/source/conf.py')
| -rw-r--r-- | user_guide_src/source/conf.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/user_guide_src/source/conf.py b/user_guide_src/source/conf.py index bd5e65297..bb10d06e4 100644 --- a/user_guide_src/source/conf.py +++ b/user_guide_src/source/conf.py @@ -48,9 +48,9 @@ copyright = u'2011, EllisLab, Inc.' # built documents. # # The short X.Y version. -version = '2.1' +version = '3.0' # The full version, including alpha/beta/rc tags. -release = '2.1.0' +release = '3.0-dev' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. |