From 76db624639a6c290d14a1afb573f0ff1aa9a6364 Mon Sep 17 00:00:00 2001
From: holger krekel <holger@merlinux.eu>
Date: Fri, 19 Oct 2012 15:01:29 +0200
Subject: [PATCH] start new dev cycle

---
 CHANGELOG       | 4 ++++
 doc/en/Makefile | 6 ++++--
 doc/en/conf.py  | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 08d4cbbf5..763ffdbb4 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+Changes between 2.3.0 and 2.3.dev
+-----------------------------------
+
+
 Changes between 2.2.4 and 2.3.0
 -----------------------------------
 
diff --git a/doc/en/Makefile b/doc/en/Makefile
index 4223b770e..c6ffc0ec9 100644
--- a/doc/en/Makefile
+++ b/doc/en/Makefile
@@ -12,6 +12,8 @@ PAPEROPT_a4     = -D latex_paper_size=a4
 PAPEROPT_letter = -D latex_paper_size=letter
 ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
 
+SITETARGET=dev
+
 .PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest
 
 regen:
@@ -40,10 +42,10 @@ clean:
 	-rm -rf $(BUILDDIR)/*
 
 install: html
-	 rsync -avz _build/html/ pytest.org:/www/pytest.org/latest
+	 rsync -avz _build/html/ pytest.org:/www/pytest.org/$(SITETARGET)
 
 installpdf: latexpdf
-	@scp $(BUILDDIR)/latex/pytest.pdf pytest.org:/www/pytest.org/latest
+	@scp $(BUILDDIR)/latex/pytest.pdf pytest.org:/www/pytest.org/$(SITETARGET)
 
 installall: clean install installpdf
 	@echo "done"
diff --git a/doc/en/conf.py b/doc/en/conf.py
index 346100545..6bcf3ceed 100644
--- a/doc/en/conf.py
+++ b/doc/en/conf.py
@@ -17,7 +17,7 @@
 #
 # The full version, including alpha/beta/rc tags.
 # The short X.Y version.
-version = release = "2.3.0"
+version = release = "2.3.0.dev"
 
 import sys, os