From 6af20a5290602efd6f934cb16e041e03e76e7d7e Mon Sep 17 00:00:00 2001
From: holger krekel <holger@merlinux.eu>
Date: Thu, 7 Jun 2012 19:18:50 +0200
Subject: [PATCH] use doc-versions that can increment separately from the
 pytest version

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

diff --git a/doc/en/conf.py b/doc/en/conf.py
index fd49a2921..0c0e7b89f 100644
--- a/doc/en/conf.py
+++ b/doc/en/conf.py
@@ -49,10 +49,8 @@ copyright = u'2011, holger krekel et alii'
 # built documents.
 #
 # The full version, including alpha/beta/rc tags.
-import pytest
-release = pytest.__version__
 # The short X.Y version.
-version = ".".join(release.split(".")[:2])
+version = "2.2.4.1"
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/doc/ja/Makefile b/doc/ja/Makefile
index 4223b770e..b80b43e23 100644
--- a/doc/ja/Makefile
+++ b/doc/ja/Makefile
@@ -40,7 +40,7 @@ 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/latest-ja
 
 installpdf: latexpdf
 	@scp $(BUILDDIR)/latex/pytest.pdf pytest.org:/www/pytest.org/latest
diff --git a/doc/ja/conf.py b/doc/ja/conf.py
index 1598e136c..e348abf9c 100644
--- a/doc/ja/conf.py
+++ b/doc/ja/conf.py
@@ -49,10 +49,8 @@ copyright = u'2011, holger krekel et alii'
 # built documents.
 #
 # The full version, including alpha/beta/rc tags.
-import pytest
-release = pytest.__version__
 # The short X.Y version.
-version = ".".join(release.split(".")[:2])
+version = "2.2.4.0"
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.