From 65f41998cb1d8047ef2945ffccec7eb3924afcf2 Mon Sep 17 00:00:00 2001
From: Roman Tsisyk <roman@tsisyk.com>
Date: Mon, 1 Feb 2016 22:37:58 +0300
Subject: [PATCH] Replace tarantool.org/dist/master with /dist/1.6/
---
doc/sphinx/book/app/d_plugins.rst | 8 +--
.../book/user_guide_getting_started.rst | 4 +-
doc/sphinx/getting_started.rst | 70 ++++++++++---------
doc/www/content/newsite/download.yml.in | 52 +++++++-------
4 files changed, 69 insertions(+), 65 deletions(-)
diff --git a/doc/sphinx/book/app/d_plugins.rst b/doc/sphinx/book/app/d_plugins.rst
index 6b2bd45089..b0763c0b29 100644
--- a/doc/sphinx/book/app/d_plugins.rst
+++ b/doc/sphinx/book/app/d_plugins.rst
@@ -303,8 +303,8 @@ on ~/mysql-5.5. The mysqld server is already running on the local host 127.0.0.1
$ # master repository. The resultant display is normal for Ubuntu
$ # 12.04 precise
$ cat /etc/apt/sources.list.d/tarantool.list
- deb http://tarantool.org/dist/master/ubuntu/ precise main
- deb-src http://tarantool.org/dist/master/ubuntu/ precise main
+ deb http://tarantool.org/dist/1.6/ubuntu/ precise main
+ deb-src http://tarantool.org/dist/1.6/ubuntu/ precise main
$ # Install tarantool-dev. The displayed line should show version = 1.6
$ sudo apt-get -y install tarantool-dev | grep -E "Setting up|already"
@@ -633,8 +633,8 @@ on /usr. The PostgreSQL server is already running on the local host 127.0.0.1.
$ # Ensure that the next "install" will get files from Tarantool master
$ # repository. The resultant display is normal for Ubuntu 12.04 precise
$ cat /etc/apt/sources.list.d/tarantool.list
- deb http://tarantool.org/dist/master/ubuntu/ precise main
- deb-src http://tarantool.org/dist/master/ubuntu/ precise main
+ deb http://tarantool.org/dist/1.6/ubuntu/ precise main
+ deb-src http://tarantool.org/dist/1.6/ubuntu/ precise main
$ # Install tarantool-dev. The displayed line should show version = 1.6
$ sudo apt-get -y install tarantool-dev | grep -E "Setting up|already"
diff --git a/doc/sphinx/book/user_guide_getting_started.rst b/doc/sphinx/book/user_guide_getting_started.rst
index 725683b83d..dc11c8ddbf 100644
--- a/doc/sphinx/book/user_guide_getting_started.rst
+++ b/doc/sphinx/book/user_guide_getting_started.rst
@@ -128,8 +128,8 @@ Now, to prepare for the example in the next section, try this:
tarantool> box.schema.user.grant('guest', 'read,write,execute', 'universe')
-.. _tarantool.org/dist/stable: http://tarantool.org/dist/stable
-.. _tarantool.org/dist/master: http://tarantool.org/dist/master
+.. _tarantool.org/dist/1.6: http://tarantool.org/dist/1.6
+.. _tarantool.org/dist/1.7: http://tarantool.org/dist/1.7
=====================================================================
diff --git a/doc/sphinx/getting_started.rst b/doc/sphinx/getting_started.rst
index a9d0c2be85..0a10d34918 100644
--- a/doc/sphinx/getting_started.rst
+++ b/doc/sphinx/getting_started.rst
@@ -29,14 +29,16 @@ statements. The section about sandbox is “`Starting Tarantool and making your
Downloading and installing a binary package
=====================================================================
-The repositories for the “stable†release are at `tarantool.org/dist/stable`_.
-The repositories for the “master†release are at `tarantool.org/dist/master`_.
-Since this is the manual for the “master†release, all instructions use
-`tarantool.org/dist/master`_.
+The repositories for the “stable†1.6.x release are at
+`tarantool.org/dist/1.6`_.
+The repositories for the “development†1.7.x release are at
+`tarantool.org/dist/1.7`_.
+Since this is the manual for the 1.6.x release, all instructions use
+`tarantool.org/dist/1.6`_.
An automatic build system creates, tests and publishes packages for every
-push into the master branch. Therefore if you looked at
-`tarantool.org/dist/master`_ you would see that there are source files and
+push into the 1.6 branch. Therefore if you looked at
+`tarantool.org/dist/1.6`_ you would see that there are source files and
subdirectories for the packages that will be described in this section.
To download and install the package that's appropriate for your environment,
@@ -50,10 +52,11 @@ More advice for binary downloads is at http://tarantool.org/download.html.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
There is always an up-to-date Debian repository at
-http://tarantool.org/dist/master/debian. The repository contains builds for
-Debian unstable "Sid", stable "Wheezy", forthcoming "Jessie". Add the
-tarantool.org repository to your apt sources list. $release is an environment
-variable which will contain the Debian version code e.g. "Wheezy":
+http://tarantool.org/dist/1.6/debian. The repository contains builds for
+Debian unstable "Sid", testing "Stretch", stable "Jessie" and old stable
+"Wheezy". Add the tarantool.org repository to your apt sources list.
+$release is an environment variable which will contain the Debian version code
+e.g. "Wheezy":
.. code-block:: bash
@@ -61,9 +64,9 @@ variable which will contain the Debian version code e.g. "Wheezy":
sudo apt-key add ./public.key
release=`lsb_release -c -s`
# append two lines to a list of source repositories
- echo "deb http://tarantool.org/dist/master/debian/ $release main" | \
+ echo "deb http://tarantool.org/dist/1.6/debian/ $release main" | \
sudo tee -a /etc/apt/sources.list.d/tarantool.list
- echo "deb-src http://tarantool.org/dist/master/debian/ $release main" | \
+ echo "deb-src http://tarantool.org/dist/1.6/debian/ $release main" | \
sudo tee -a /etc/apt/sources.list.d/tarantool.list
# install
sudo apt-get update
@@ -74,11 +77,12 @@ variable which will contain the Debian version code e.g. "Wheezy":
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
There is always an up-to-date Ubuntu repository at
-http://tarantool.org/dist/master/ubuntu. The repository contains builds for
-Ubuntu 12.04 "precise", 13.10 "saucy", and 14.04 "trusty". Add the tarantool.org
-repository to your apt sources list. $release is an environment variable which
-will contain the Ubuntu version code e.g. "precise". If you want the version
-that comes with Ubuntu, start with the lines that follow the '# install' comment:
+http://tarantool.org/dist/1.6/ubuntu. The repository contains builds for
+forthcoming "Xenial", stable "Wily", LTS "Trusty" and LTS "Precise".
+Add the tarantool.org repository to your apt sources list. $release is an
+environment variable which will contain the Ubuntu version code e.g. "precise".
+If you want the version that comes with Ubuntu, start with the lines that
+follow the '# install' comment:
.. code-block:: bash
@@ -87,9 +91,9 @@ that comes with Ubuntu, start with the lines that follow the '# install' comment
sudo apt-key add ./public.key
release=`lsb_release -c -s`
# append two lines to a list of source repositories
- echo "deb http://tarantool.org/dist/master/ubuntu/ $release main" | \
+ echo "deb http://tarantool.org/dist/1.6/ubuntu/ $release main" | \
sudo tee -a /etc/apt/sources.list.d/tarantool.list
- echo "deb-src http://tarantool.org/dist/master/ubuntu/ $release main" | \
+ echo "deb-src http://tarantool.org/dist/1.6/ubuntu/ $release main" | \
sudo tee -a /etc/apt/sources.list.d/tarantool.list
# install
sudo apt-get update
@@ -104,9 +108,9 @@ These instructions are applicable for CentOS version 6 or 7, and RHEL version
6 or 7. Pick the CentOS repository which fits your CentOS/RHEL version and
your x86 platform:
-* http://tarantool.org/dist/master/centos/6/os/i386 for version 6, x86-32
-* http://tarantool.org/dist/master/centos/6/os/x86_64 for version 6, x86-64
-* http://tarantool.org/dist/master/centos/7/os/x86_64 for version 7, x86-64
+* http://tarantool.org/dist/1.6/centos/6/os/i386 for version 6, x86-32
+* http://tarantool.org/dist/1.6/centos/6/os/x86_64 for version 6, x86-64
+* http://tarantool.org/dist/1.6/centos/7/os/x86_64 for version 7, x86-64
Add the following section to your yum repository list
(``/etc/yum.repos.d/tarantool.repo``) (in these instructions ``$releasever``
@@ -118,7 +122,7 @@ architecture must be either i386 or x86_64):
# [tarantool]
name=CentOS-$releasever - Tarantool
- baseurl=http://tarantool.org/dist/master/centos/*$releasever*/os/*$basearch*/
+ baseurl=http://tarantool.org/dist/1.6/centos/*$releasever*/os/*$basearch*/
enabled=1
gpgcheck=0
@@ -129,7 +133,7 @@ For example, if you have CentOS version 6 and x86-64, you can add the new sectio
echo "[tarantool]" | \
sudo tee /etc/yum.repos.d/tarantool.repo
echo "name=CentOS-6 - Tarantool"| sudo tee -a /etc/yum.repos.d/tarantool.repo
- echo "baseurl=http://tarantool.org/dist/master/centos/6/os/x86_64/" | \
+ echo "baseurl=http://tarantool.org/dist/1.6/centos/6/os/x86_64/" | \
sudo tee -a /etc/yum.repos.d/tarantool.repo
echo "enabled=1" | sudo tee -a /etc/yum.repos.d/tarantool.repo
echo "gpgcheck=0" | sudo tee -a /etc/yum.repos.d/tarantool.repo
@@ -140,9 +144,9 @@ Then install with :code:`sudo yum install tarantool`.
Fedora
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-These instructions are applicable for Fedora 19, 20 or rawhide. Pick the Fedora
-repository, for example http://tarantool.org/dist/master/fedora/20/x86_64 for
-version 20, x86-64. Add the following section to your yum repository list
+These instructions are applicable for Fedora 22, 23 or rawhide. Pick the Fedora
+repository, for example http://tarantool.org/dist/1.6/fedora/23/x86_64 for
+version 23, x86-64. Add the following section to your yum repository list
(``/etc/yum.repos.d/tarantool.repo``) (in these instructions
``$releasever`` i.e. Fedora release version must be 19, 20 or rawhide and
``$basearch`` i.e. base architecture must be x86_64):
@@ -152,18 +156,18 @@ version 20, x86-64. Add the following section to your yum repository list
[tarantool]
name=Fedora-$releasever - Tarantool
- baseurl=http://tarantool.org/dist/master/fedora/*$releasever*/*$basearch*/
+ baseurl=http://tarantool.org/dist/1.6/fedora/*$releasever*/*$basearch*/
enabled=1
gpgcheck=0
-For example, if you have Fedora version 20, you can add the new section thus:
+For example, if you have Fedora version 23, you can add the new section thus:
.. code-block:: bash
echo "[tarantool]" | \
sudo tee /etc/yum.repos.d/tarantool.repo
- echo "name=Fedora-20 - Tarantool"| sudo tee -a /etc/yum.repos.d/tarantool.repo
- echo "baseurl=http://tarantool.org/dist/master/fedora/20/x86_64/" | \
+ echo "name=Fedora-23 - Tarantool"| sudo tee -a /etc/yum.repos.d/tarantool.repo
+ echo "baseurl=http://tarantool.org/dist/1.6/fedora/23/x86_64/" | \
sudo tee -a /etc/yum.repos.d/tarantool.repo
echo "enabled=1" | sudo tee -a /etc/yum.repos.d/tarantool.repo
echo "gpgcheck=0" | sudo tee -a /etc/yum.repos.d/tarantool.repo
@@ -320,8 +324,8 @@ Here is how to create a simple test database after installing.
tarantool> box.schema.user.grant('guest','read,write,execute','universe')
-.. _tarantool.org/dist/stable: http://tarantool.org/dist/stable
-.. _tarantool.org/dist/master: http://tarantool.org/dist/master
+.. _tarantool.org/dist/1.6: http://tarantool.org/dist/1.6
+.. _tarantool.org/dist/1.7: http://tarantool.org/dist/1.7
=====================================================================
Starting another Tarantool instance and connecting remotely
diff --git a/doc/www/content/newsite/download.yml.in b/doc/www/content/newsite/download.yml.in
index ef2474ca79..27d14ce255 100644
--- a/doc/www/content/newsite/download.yml.in
+++ b/doc/www/content/newsite/download.yml.in
@@ -13,16 +13,16 @@ blocks :
parameters and environment, it is recommended that production systems use the
builds provided on this site.
- All published releases are available at `<http://tarantool.org/dist/master>`_
+ All published releases are available at `<http://tarantool.org/dist/1.6>`_
binarylist :
- - "Ubuntu"
- format : rst
content: |
We maintain an always up-to-date Ubuntu package repository at
- `<http://tarantool.org/dist/master/ubuntu>`_.
+ `<http://tarantool.org/dist/1.6/ubuntu>`_.
At the moment the repository contains builds for Ubuntu
- "Precise", "Trusty", "Saucy", "Vivid". It can be added to your
+ "xenial", "wily", "trusty", "precise". It can be added to your
apt sources list with:
.. code-block:: bash
@@ -32,8 +32,8 @@ blocks :
release=`lsb_release -c -s`
cat > /etc/apt/sources.list.d/tarantool.list <<- EOF
- deb http://tarantool.org/dist/master/ubuntu/ $release main
- deb-src http://tarantool.org/dist/master/ubuntu/ $release main
+ deb http://tarantool.org/dist/1.6/ubuntu/ $release main
+ deb-src http://tarantool.org/dist/1.6/ubuntu/ $release main
EOF
sudo apt-get update
@@ -43,10 +43,10 @@ blocks :
content: |
We maintain an always up-to-date Debian GNU/Linux
package repository at
- `<http://tarantool.org/dist/master/debian>`_.
+ `<http://tarantool.org/dist/1.6/debian>`_.
At the moment the repository contains builds for
- Debian "Sid", "Jessie", "Wheezy". It can be added
+ Debian "sid", "stretch", "jessie", "wheezy". It can be added
to your apt sources list with:
.. code-block:: bash
@@ -56,8 +56,8 @@ blocks :
release=`lsb_release -c -s`
cat > /etc/apt/sources.list.d/tarantool.list <<- EOF
- deb http://tarantool.org/dist/master/debian/ $release main
- deb-src http://tarantool.org/dist/master/debian/ $release main
+ deb http://tarantool.org/dist/1.6/debian/ $release main
+ deb-src http://tarantool.org/dist/1.6/debian/ $release main
EOF
sudo apt-get update
@@ -71,27 +71,28 @@ blocks :
$ brew install tarantool
- - - "Fedora 19, 20, 21, 22"
+ - - "Fedora"
- format : rst
content: |
- Fedora repository is available at
- `<http://tarantool.org/dist/master/fedora>`_
+ We maintain an always up-to-date Fedora package repository at
+ `<http://tarantool.org/dist/1.6/fedora>`_
- Add the following section to your yum repository list
- ``/etc/yum.repos.d/tarantool.repo`` to enable it:
+ At the moment the repository contains builds for Fedora
+ 22, 23, "rawhide". Add the following section to your yum
+ repository list ``/etc/yum.repos.d/tarantool.repo`` to enable it:
.. code-block:: ini
[tarantool]
name=Fedora-$releasever - Tarantool
- baseurl=http://tarantool.org/dist/master/fedora/$releasever/$basearch/
+ baseurl=http://tarantool.org/dist/1.6/fedora/$releasever/$basearch/
enabled=1
gpgcheck=0
- - - "CentOS 5-7 and RHEL 5-7"
+ - - "CentOS 6-7 and RHEL 6-7"
- format : rst
content: |
CentOS and RHEL repository is available at
- `<http://tarantool.org/dist/master/centos>`_
+ `<http://tarantool.org/dist/1.6/centos>`_
Add the following section to your yum repository list
``/etc/yum.repos.d/tarantool.repo`` to enable it:
@@ -100,7 +101,7 @@ blocks :
[tarantool]
name=CentOS-$releasever - Tarantool
- baseurl=http://tarantool.org/dist/master/centos/$releasever/os/$basearch/
+ baseurl=http://tarantool.org/dist/1.6/centos/$releasever/os/$basearch/
enabled=1
gpgcheck=0
- - "Gentoo Linux"
@@ -150,18 +151,17 @@ blocks :
- - "Source tarball"
- format : rst
content: |
- The latest source archive is `tarantool-@PACKAGE_VERSION@-src.tar.gz`_.
+ The latest source archive is `tarantool-@PACKAGE_VERSION@.tar.gz`_.
Please consult with README for build instructions on your system.
- .. _tarantool-@PACKAGE_VERSION@-src.tar.gz: http://tarantool.org/dist/master/tarantool-@PACKAGE_VERSION@-src.tar.gz
- - - "Old master branch"
+ .. _tarantool-@PACKAGE_VERSION@.tar.gz: http://tarantool.org/dist/1.6/tarantool-@PACKAGE_VERSION@.tar.gz
+ - - "Development Version"
- format : rst
content: |
- In the same manner as for `the master branch`_, every push into
- `the old master`_ is `available online`_.
+ In the same manner as for `the 1.6 branch`_, every push into
+ `the 1.7 branch`_ is `available online`_.
- .. _the master branch: http://github.com/tarantool/tarantool/tree/master
- .. _the old master: http://github.com/tarantool/tarantool/tree/stable
- .. _available online: http://tarantool.org/dist/stable
+ .. _the 1.7 branch: http://github.com/tarantool/tarantool/tree/1.7
+ .. _available online: http://tarantool.org/dist/1.7
...
# vim: ts=2 expandtab syntax=yaml
--
GitLab