Merge remote-tracking branch 'origin/master'

phpmyadmin · Feb 15, 2013 · f99067d · f99067d
2 parents d96a4d8 + 735af49
commit f99067d
Show file tree

Hide file tree

Showing 106 changed files with 6,271 additions and 6,406 deletions.
diff --git a/docs/ar/conf.py b/docs/ar/conf.py
@@ -49,7 +49,7 @@
 # built documents.
 #
 # The short X.Y version.
-version = '4.0.0-alpha2'
+version = '4.0.0-beta1'
 # The full version, including alpha/beta/rc tags.
 release = version
 

diff --git a/docs/ca/conf.py b/docs/ca/conf.py
@@ -49,7 +49,7 @@
 # built documents.
 #
 # The short X.Y version.
-version = '4.0.0-alpha2'
+version = '4.0.0-beta1'
 # The full version, including alpha/beta/rc tags.
 release = version
 

diff --git a/docs/cs/conf.py b/docs/cs/conf.py
@@ -49,7 +49,7 @@
 # built documents.
 #
 # The short X.Y version.
-version = '4.0.0-alpha2'
+version = '4.0.0-beta1'
 # The full version, including alpha/beta/rc tags.
 release = version
 

diff --git a/docs/da/conf.py b/docs/da/conf.py
@@ -49,7 +49,7 @@
 # built documents.
 #
 # The short X.Y version.
-version = '4.0.0-alpha2'
+version = '4.0.0-beta1'
 # The full version, including alpha/beta/rc tags.
 release = version
 

diff --git a/docs/de/conf.py b/docs/de/conf.py
@@ -49,7 +49,7 @@
 # built documents.
 #
 # The short X.Y version.
-version = '4.0.0-alpha2'
+version = '4.0.0-beta1'
 # The full version, including alpha/beta/rc tags.
 release = version
 

diff --git a/docs/el/conf.py b/docs/el/conf.py
@@ -49,7 +49,7 @@
 # built documents.
 #
 # The short X.Y version.
-version = '4.0.0-alpha2'
+version = '4.0.0-beta1'
 # The full version, including alpha/beta/rc tags.
 release = version
 

diff --git a/docs/en_GB/conf.py b/docs/en_GB/conf.py
@@ -49,7 +49,7 @@
 # built documents.
 #
 # The short X.Y version.
-version = '4.0.0-alpha2'
+version = '4.0.0-beta1'
 # The full version, including alpha/beta/rc tags.
 release = version
 

diff --git a/docs/es/conf.py b/docs/es/conf.py
@@ -49,7 +49,7 @@
 # built documents.
 #
 # The short X.Y version.
-version = '4.0.0-alpha2'
+version = '4.0.0-beta1'
 # The full version, including alpha/beta/rc tags.
 release = version
 

diff --git a/docs/fi/conf.py b/docs/fi/conf.py
@@ -49,7 +49,7 @@
 # built documents.
 #
 # The short X.Y version.
-version = '4.0.0-alpha2'
+version = '4.0.0-beta1'
 # The full version, including alpha/beta/rc tags.
 release = version
 

diff --git a/docs/fr/conf.py b/docs/fr/conf.py
@@ -49,7 +49,7 @@
 # built documents.
 #
 # The short X.Y version.
-version = '4.0.0-alpha2'
+version = '4.0.0-beta1'
 # The full version, including alpha/beta/rc tags.
 release = version
 

diff --git a/docs/gl/conf.py b/docs/gl/conf.py
@@ -49,7 +49,7 @@
 # built documents.
 #
 # The short X.Y version.
-version = '4.0.0-alpha2'
+version = '4.0.0-beta1'
 # The full version, including alpha/beta/rc tags.
 release = version
 

diff --git a/docs/hu/conf.py b/docs/hu/conf.py
@@ -49,7 +49,7 @@
 # built documents.
 #
 # The short X.Y version.
-version = '4.0.0-alpha2'
+version = '4.0.0-beta1'
 # The full version, including alpha/beta/rc tags.
 release = version
 

diff --git a/docs/hy/conf.py b/docs/hy/conf.py
@@ -49,7 +49,7 @@
 # built documents.
 #
 # The short X.Y version.
-version = '4.0.0-alpha2'
+version = '4.0.0-beta1'
 # The full version, including alpha/beta/rc tags.
 release = version
 

diff --git a/docs/it/conf.py b/docs/it/conf.py
@@ -49,7 +49,7 @@
 # built documents.
 #
 # The short X.Y version.
-version = '4.0.0-alpha2'
+version = '4.0.0-beta1'
 # The full version, including alpha/beta/rc tags.
 release = version
 

diff --git a/docs/ja/conf.py b/docs/ja/conf.py
@@ -49,7 +49,7 @@
 # built documents.
 #
 # The short X.Y version.
-version = '4.0.0-alpha2'
+version = '4.0.0-beta1'
 # The full version, including alpha/beta/rc tags.
 release = version
 

diff --git a/docs/ka/conf.py b/docs/ka/conf.py
@@ -49,7 +49,7 @@
 # built documents.
 #
 # The short X.Y version.
-version = '4.0.0-alpha2'
+version = '4.0.0-beta1'
 # The full version, including alpha/beta/rc tags.
 release = version
 

diff --git a/docs/lt/conf.py b/docs/lt/conf.py
@@ -49,7 +49,7 @@
 # built documents.
 #
 # The short X.Y version.
-version = '4.0.0-alpha2'
+version = '4.0.0-beta1'
 # The full version, including alpha/beta/rc tags.
 release = version
 

diff --git a/docs/mn/conf.py b/docs/mn/conf.py
@@ -49,7 +49,7 @@
 # built documents.
 #
 # The short X.Y version.
-version = '4.0.0-alpha2'
+version = '4.0.0-beta1'
 # The full version, including alpha/beta/rc tags.
 release = version
 

diff --git a/docs/nb/conf.py b/docs/nb/conf.py
@@ -49,7 +49,7 @@
 # built documents.
 #
 # The short X.Y version.
-version = '4.0.0-alpha2'
+version = '4.0.0-beta1'
 # The full version, including alpha/beta/rc tags.
 release = version
 

diff --git a/docs/nl/conf.py b/docs/nl/conf.py
@@ -49,7 +49,7 @@
 # built documents.
 #
 # The short X.Y version.
-version = '4.0.0-alpha2'
+version = '4.0.0-beta1'
 # The full version, including alpha/beta/rc tags.
 release = version
 

diff --git a/docs/pl/conf.py b/docs/pl/conf.py
@@ -49,7 +49,7 @@
 # built documents.
 #
 # The short X.Y version.
-version = '4.0.0-alpha2'
+version = '4.0.0-beta1'
 # The full version, including alpha/beta/rc tags.
 release = version
 

diff --git a/docs/pt_BR/conf.py b/docs/pt_BR/conf.py
@@ -49,7 +49,7 @@
 # built documents.
 #
 # The short X.Y version.
-version = '4.0.0-alpha2'
+version = '4.0.0-beta1'
 # The full version, including alpha/beta/rc tags.
 release = version
 

diff --git a/docs/ro/conf.py b/docs/ro/conf.py
@@ -49,7 +49,7 @@
 # built documents.
 #
 # The short X.Y version.
-version = '4.0.0-alpha2'
+version = '4.0.0-beta1'
 # The full version, including alpha/beta/rc tags.
 release = version
 

diff --git a/docs/sk/conf.py b/docs/sk/conf.py
@@ -49,7 +49,7 @@
 # built documents.
 #
 # The short X.Y version.
-version = '4.0.0-alpha2'
+version = '4.0.0-beta1'
 # The full version, including alpha/beta/rc tags.
 release = version
 

diff --git a/docs/sl/conf.py b/docs/sl/conf.py
@@ -49,7 +49,7 @@
 # built documents.
 #
 # The short X.Y version.
-version = '4.0.0-alpha2'
+version = '4.0.0-beta1'
 # The full version, including alpha/beta/rc tags.
 release = version
 

diff --git a/docs/sv/conf.py b/docs/sv/conf.py
@@ -49,7 +49,7 @@
 # built documents.
 #
 # The short X.Y version.
-version = '4.0.0-alpha2'
+version = '4.0.0-beta1'
 # The full version, including alpha/beta/rc tags.
 release = version
 

diff --git a/docs/tr/conf.py b/docs/tr/conf.py
@@ -49,7 +49,7 @@
 # built documents.
 #
 # The short X.Y version.
-version = '4.0.0-alpha2'
+version = '4.0.0-beta1'
 # The full version, including alpha/beta/rc tags.
 release = version
 

diff --git a/docs/zh_CN/conf.py b/docs/zh_CN/conf.py
@@ -49,7 +49,7 @@
 # built documents.
 #
 # The short X.Y version.
-version = '4.0.0-alpha2'
+version = '4.0.0-beta1'
 # The full version, including alpha/beta/rc tags.
 release = version
 

diff --git a/docs/zh_TW/conf.py b/docs/zh_TW/conf.py
@@ -49,7 +49,7 @@
 # built documents.
 #
 # The short X.Y version.
-version = '4.0.0-alpha2'
+version = '4.0.0-beta1'
 # The full version, including alpha/beta/rc tags.
 release = version