From 3f3a051690f71d8d4650632d7bc892578afd149d Mon Sep 17 00:00:00 2001 From: Roberto Alsina Date: Tue, 5 May 2015 11:05:51 -0300 Subject: [PATCH] tag 7.4.0 --- CHANGES.txt | 2 +- docs/extending.txt | 2 +- docs/getting-help.txt | 2 +- docs/man/nikola.1.gz | Bin 891 -> 959 bytes docs/manual.txt | 2 +- docs/social_buttons.txt | 2 +- docs/sphinx/conf.py | 4 ++-- docs/theming.txt | 2 +- docs/upgrading-to-v6.txt | 2 +- nikola/__init__.py | 2 +- setup.py | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index 3751249c87..3fe7766502 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,4 @@ -New in master +New in v7.4.0 ============= Features diff --git a/docs/extending.txt b/docs/extending.txt index 51c9f7d2be..635c5b54eb 100644 --- a/docs/extending.txt +++ b/docs/extending.txt @@ -8,7 +8,7 @@ Extending Nikola ================ -:Version: 7.3.1 +:Version: 7.4.0 :Author: Roberto Alsina .. class:: alert alert-info pull-right diff --git a/docs/getting-help.txt b/docs/getting-help.txt index cc0b3a7619..de339bd7e2 100644 --- a/docs/getting-help.txt +++ b/docs/getting-help.txt @@ -3,7 +3,7 @@ .. date: 1970-01-01 15:00:00 .. description: Get help using Nikola, or contact us. -:Version: 7.3.1 +:Version: 7.4.0 .. class:: alert alert-info pull-right diff --git a/docs/man/nikola.1.gz b/docs/man/nikola.1.gz index 3dfaebb6fd65430e4245635e7ec8312abd0f33e2..ba5e8429041bad3c37a6498ccae8e5902a256e6c 100644 GIT binary patch literal 959 zcmV;w13>&AiwFps%t%!L18!++Z){;MF#v5qNR*~%H=rE~q)oCI zYht7EFbptYoFrO0_;jb;i#`AQk#}+{x%ndNP7le4*8-WQ@+J;2la&&Agpm|f3c_9&0= z_RaNsdNpciwS?b_cf}hz{^ilZ7u%6_?PsERCc~S@J2Al4m*9g8ssgV90)e2^wmF5j zE?L~(J%9N&U#{khC-IaGl?MsIT1^kA91_)&rvsMk%zyXh3%Iuqwoz-SZ52B-jI<^p zI_nUW*;?17%M0i=N{_Htufhda%L%vgkCzT5hT-#p}ZWaik>*< z`$;$^DO@xVq~H1Rr>ezjC(;wNGP_)gt`5E5B3y zYoKELSbF?7vX+S9#G~qZ>%yk#b@U=1s6?ySmD;7LeF1#1uI@?pBZI%`YROlreiIuS z=}ej5K$bSL0W+M!6xA~?5DCL}N#z*S>3giyR*^clR@c)pQ-+GJ^)O?@DUS!YfHqTf zX_C%$qm>VWAA>?t(`sAWG#O*0!NaDfcKqN-H^4XF37+{*7S@NUMOv$T4K@os`54<- z*OMxJrp0-jE=CyYR-=rdWyb{aX#${DU|3(0w1h)iD198(x|ck&ZQjxdcAGN&p>#$2 zfM=4sl&43TW*GWOgtSG65odq2nL^t6d_U=q4>bEIqQ~Kt6`r!=&^!fs8NIMcf-IT5 zMh-7d3krPYR3CT>8L_?`VMfM8!}C?|R9>PdSq&e+kjkf2r}LGT+!jeW6`rHu_u1BCn^iwFn|xcXE818!++Z){;MF#v5;ZExE)5dO|zar37RNR+1QHlP>^q)oCI zYhq*ZFboJ_P}JEXOpzL2?E2sDj+8se%@;~KJ$HQWxtHo?2Db}%TCCu4aXY{N2UZXB zXSkn#x%&ZN9^oJZY|)~Z5gVwF(4y(zb<)Ch_5PRYeI=^Z13bZgkT{T0x|XV;N`6K0}%CfA$CJ2AjsE+Ir2wSu4{0)e15ZhIo& zeD=7#d;a|Ae7Tx0p2Sme)Bz+!=L{X7JQCScqyyF*EPRU=D!6wZHpv)hoJt*9Mmn1j zo%0CVZk+G3@dA2-G9c_Vg@HE4{=?PP7Gt4YDc4;Qt7n+q?4>rcHVA4+@B?MITAq@V zDLTOi2UgOUBQzLM#geRQrQKq<0FQOjrpatv&m1z=0QnSXHZb3eWZKn zf=H3ck?_l7Y{`GXz(GgSPALq5d*tYn|L*z*d*hCxJTleq5KhPSD}}_bs8Ylt2OQe0 zJ;g!WpjF3HaVMct*EhA`#~6A0X$+z^q@=SVL^oyn)VRRXbAP8$s+tq0J~?yWQqrkj zzn&M%@Vkx=sfMLIBgaE7LhBCYZS+TPElr3hkDM>O2|L~Y2qbn$b-;fU_YyIjMATjH zd|V%#Z+hzEAc}!x`kPEkHf2dBJ~W1f1;2r;U1A5mbPCfXQ5kv(!$!y%4h6lX=dECLh=Pxy=(!G!Yg}&jG1B5;-IK!qb0iC} zyq@8%d|Kj(XDv`}bq9w);H)0?!_R?vcC0_AH0pw+TJ%@mWP zRS@$QW&1?C5NX&@q=3UKw^Y8HCE&Iz)BnooMp@JPq1DPmE>0T(g7UhL-1dxkxhxo) zK_hSC5!lpwUDnpA>cbDPsjH`4ryZTw$_A;h3eQpS+pxbs7X0u9DV(WYz+C;8OJ1-8 RKF>q}{|APDFkD^-007}lz4-tD diff --git a/docs/manual.txt b/docs/manual.txt index 19112e825e..8177aa3ac1 100644 --- a/docs/manual.txt +++ b/docs/manual.txt @@ -8,7 +8,7 @@ The Nikola Handbook =================== -:Version: 7.3.1 +:Version: 7.4.0 .. class:: alert alert-info pull-right diff --git a/docs/social_buttons.txt b/docs/social_buttons.txt index 63ff897c31..517f6acdab 100644 --- a/docs/social_buttons.txt +++ b/docs/social_buttons.txt @@ -8,7 +8,7 @@ Using Alternative Social Buttons with Nikola ============================================ -:Version: 7.3.1 +:Version: 7.4.0 .. class:: alert alert-info pull-right diff --git a/docs/sphinx/conf.py b/docs/sphinx/conf.py index 0fdfe77805..cefc91ef56 100644 --- a/docs/sphinx/conf.py +++ b/docs/sphinx/conf.py @@ -54,9 +54,9 @@ # built documents. # # The short X.Y version. -version = '7.3.1' +version = '7.4.0' # The full version, including alpha/beta/rc tags. -release = '7.3.1' +release = '7.4.0' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/docs/theming.txt b/docs/theming.txt index 7e5d700ad2..24af099003 100644 --- a/docs/theming.txt +++ b/docs/theming.txt @@ -8,7 +8,7 @@ Theming Nikola ============== -:Version: 7.3.1 +:Version: 7.4.0 :Author: Roberto Alsina .. class:: alert alert-info pull-right diff --git a/docs/upgrading-to-v6.txt b/docs/upgrading-to-v6.txt index b0a9aad78a..6fc1958460 100644 --- a/docs/upgrading-to-v6.txt +++ b/docs/upgrading-to-v6.txt @@ -8,7 +8,7 @@ Upgrading to v6 =============== -:Version: 7.3.1 +:Version: 7.4.0 .. class:: lead diff --git a/nikola/__init__.py b/nikola/__init__.py index 226ed20395..e35fedad67 100644 --- a/nikola/__init__.py +++ b/nikola/__init__.py @@ -27,7 +27,7 @@ from __future__ import absolute_import import os -__version__ = "7.3.1" +__version__ = "7.4.0" DEBUG = bool(os.getenv('NIKOLA_DEBUG')) from .nikola import Nikola # NOQA diff --git a/setup.py b/setup.py index b9a131a9c8..398bf21cf2 100755 --- a/setup.py +++ b/setup.py @@ -112,7 +112,7 @@ def run(self): setup(name='Nikola', - version='7.3.1.1', + version='7.4.0', description='A modular, fast, simple, static website generator', long_description=open('README.rst').read(), author='Roberto Alsina and others',