diff --git a/doc/user/tutorial.xml b/doc/user/tutorial.xml index d0dc77d7d2a9dafc42866d7e4b2174f890a68756..445d07c6b1ecc729cb6fc964ebeebe04f83038c5 100644 --- a/doc/user/tutorial.xml +++ b/doc/user/tutorial.xml @@ -46,14 +46,14 @@ targetptr="getting-started-start-stop"><quote>Starting Tarantool and making your <title>Downloading and installing a binary package</title> <para> -The repositories for the <quote>stable</quote> release are at <link xlink:href="http://tarantool.org/dist" xlink:title="tarantool.org/dist">tarantool.org/dist</link>. +The repositories for the <quote>stable</quote> release are at <link xlink:href="http://tarantool.org/dist/stable" xlink:title="tarantool.org/dist/stable">tarantool.org/dist/stable</link>. The repositories for the <quote>master</quote> release are at <link xlink:href="http://tarantool.org/dist/master" xlink:title="tarantool.org/dist/master">tarantool.org/dist/master</link>. -Since this is the manual for the <quote>stable</quote> release, all instructions use <link xlink:href="http://tarantool.org/dist" xlink:title="tarantool.org/dist">tarantool.org/dist</link>. +Since this is the manual for the <quote>stable</quote> release, all instructions use <link xlink:href="http://tarantool.org/dist/stable" xlink:title="tarantool.org/dist/stable">tarantool.org/dist/stable</link>. </para> <para> An automatic build system creates, tests and publishes packages for every push into the stable branch. -Therefore if you looked at <link xlink:href="http://tarantool.org/dist" xlink:title="tarantool.org/dist">tarantool.org/dist</link> you would see many files. +Therefore if you looked at <link xlink:href="http://tarantool.org/dist/stable" xlink:title="tarantool.org/dist/stable">tarantool.org/dist/stable</link> you would see many files. Names of binary packages have the format <computeroutput><filename>tarantool-<replaceable><version></replaceable>-<replaceable><OS></replaceable>-<replaceable><machine></replaceable>.tar.gz</filename></computeroutput>. Here is one example: <programlisting>tarantool-1.5.1-97-g8e8cd06-linux-x86_64.tar.gz 26-Sep-2013 15:55 3664777</programlisting> @@ -71,7 +71,7 @@ start a shell (terminal) and enter one of the following sets of command-line ins <programlisting> # DEBIAN commands for Tarantool stable binary download: # There is always an up-to-date Debian repository at -# <link xlink:href="http://tarantool.org/dist/debian">http://tarantool.org/dist/debian</link> +# <link xlink:href="http://tarantool.org/dist/stable/debian">http://tarantool.org/dist/stable/debian</link> # The repository contains builds for Debian unstable "Sid", stable "Wheezy", # forthcoming "Jessie", ... # add the tarantool.org repository to your apt sources list: @@ -81,9 +81,9 @@ start a shell (terminal) and enter one of the following sets of command-line ins <command>sudo apt-key add</command> <filename>./public.key</filename> release=`lsb_release -c -s` # append two lines to a list of source repositories -<command>echo</command> "deb http://tarantool.org/dist/debian/ $release main" | \ +<command>echo</command> "deb http://tarantool.org/dist/stable/debian/ $release main" | \ <command>sudo tee</command> <option>-a</option> <filename>/etc/apt/sources.list.d/tarantool.list</filename> -<command>echo</command> "deb-src http://tarantool.org/dist/debian/ $release main" | \ +<command>echo</command> "deb-src http://tarantool.org/dist/stable/debian/ $release main" | \ <command>sudo tee</command> <option>-a</option> <filename>/etc/apt/sources.list.d/tarantool.list</filename> # install <command>sudo apt-get update</command> @@ -95,7 +95,7 @@ release=`lsb_release -c -s` <programlisting> # UBUNTU commands for Tarantool stable binary download: # There is always an up-to-date Ubuntu repository at -# <link xlink:href="http://tarantool.org/dist/ubuntu">http://tarantool.org/dist/ubuntu</link> +# <link xlink:href="http://tarantool.org/dist/stable/ubuntu">http://tarantool.org/dist/stable/ubuntu</link> # The repository contains builds for Ubuntu 12.04 "precise", 12.10 "quantal", # 13.04 "raring", 13.10 "saucy", ... # add the tarantool.org repository to your apt sources list: @@ -108,9 +108,9 @@ release=`lsb_release -c -s` <command>sudo apt-key add</command> <filename>./public.key</filename> release=`lsb_release -c -s` # append two lines to a list of source repositories -<command>echo</command> "deb http://tarantool.org/dist/ubuntu/ $release main" | \ +<command>echo</command> "deb http://tarantool.org/dist/stable/ubuntu/ $release main" | \ <command>sudo tee</command> <option>-a</option> <filename>/etc/apt/sources.list.d/tarantool.list</filename> -<command>echo</command> "deb-src http://tarantool.org/dist/ubuntu/ $release main" | \ +<command>echo</command> "deb-src http://tarantool.org/dist/stable/ubuntu/ $release main" | \ <command>sudo tee</command> <option>-a</option> <filename>/etc/apt/sources.list.d/tarantool.list</filename> # install <command>sudo apt-get update</command> @@ -125,10 +125,10 @@ release=`lsb_release -c -s` # and RHEL version 5 or 6 # Pick the CentOS repository which fits your CentOS/RHEL version # and your x86 platform: -# <link xlink:href="http://tarantool.org/dist/centos/5/os/i386">http://tarantool.org/dist/centos/5/os/i386 for version 5, x86-32</link> -# <link xlink:href="http://tarantool.org/dist/centos/5/os/x86_64">http://tarantool.org/dist/centos/5/os/x86_64 for version 5, x86-64</link> -# <link xlink:href="http://tarantool.org/dist/centos/6/os/i386">http://tarantool.org/dist/centos/6/os/i386 for version 6, x86-32</link> -# <link xlink:href="http://tarantool.org/dist/centos/6/os/x86_64">http://tarantool.org/dist/centos/6/os/x86_64 for version 6, x86-64</link> +# <link xlink:href="http://tarantool.org/dist/centos/5/os/i386">http://tarantool.org/dist/stable/centos/5/os/i386 for version 5, x86-32</link> +# <link xlink:href="http://tarantool.org/dist/stable/centos/5/os/x86_64">http://tarantool.org/dist/stable/centos/5/os/x86_64 for version 5, x86-64</link> +# <link xlink:href="http://tarantool.org/dist/stable/centos/6/os/i386">http://tarantool.org/dist/stable/centos/6/os/i386 for version 6, x86-32</link> +# <link xlink:href="http://tarantool.org/dist/stable/centos/6/os/x86_64">http://tarantool.org/dist/stable/centos/6/os/x86_64 for version 6, x86-64</link> # Add the following section to your yum repository list # (<filename>/etc/yum.repos.d/tarantool.repo</filename>): # (in the following instructions, @@ -137,7 +137,7 @@ release=`lsb_release -c -s` # $basearch i.e. base architecture must be either i386 or x86_64) # [tarantool] # name=CentOS-<replaceable>$releasever</replaceable> - Tarantool -# baseurl=http://tarantool.org/dist/centos/<replaceable>$releasever</replaceable>/os/<replaceable>$basearch</replaceable>/ +# baseurl=http://tarantool.org/dist/stable/centos/<replaceable>$releasever</replaceable>/os/<replaceable>$basearch</replaceable>/ # enabled=1 # gpgcheck=0 # For example, if you have CentOS version 6 and x86-64, you can @@ -145,7 +145,7 @@ release=`lsb_release -c -s` <command>echo</command> "[tarantool]" | \ <command>sudo tee</command> <filename>/etc/yum.repos.d/tarantool.repo</filename> <command>echo</command> "name=CentOS-6 - Tarantool"| <command>sudo tee</command> <option>-a</option> <filename>/etc/yum.repos.d/tarantool.repo</filename> -<command>echo</command> "baseurl=http://tarantool.org/dist/centos/6/os/x86_64/" | \ +<command>echo</command> "baseurl=http://tarantool.org/dist/stable/centos/6/os/x86_64/" | \ <command>sudo tee</command> <option>-a</option> <filename>/etc/yum.repos.d/tarantool.repo</filename> <command>echo</command> "enabled=1" | <command>sudo tee</command> <option>-a</option> <filename>/etc/yum.repos.d/tarantool.repo</filename> <command>echo</command> "gpgcheck=0" | <command>sudo tee</command> <option>-a</option> <filename>/etc/yum.repos.d/tarantool.repo</filename> @@ -169,7 +169,7 @@ release=`lsb_release -c -s` # If you have a GNU/Linux distribution which is not one of the above, # or if you want to install on your own subdirectory without affecting # /usr /etc etc., start your browser and go to -# <link xlink:href="http://tarantool.org/download.html">http://tarantool.org/download.html</link> download page. +# <link xlink:href="http://stable.tarantool.org/download.html">http://stable.tarantool.org/download.html</link> download page. # Look for words similar to "Other Linux distributions". You will want the # right binary tarball (<filename>.tar.gz</filename>) file for your release architecture. # Click on either "32-bit" or "64-bit" depending on your release architecture. @@ -203,14 +203,14 @@ release=`lsb_release -c -s` # First upgrade Clang (the C compiler) to version 3.2 or later using # Command Line Tools for Xcode disk image version 4.6+ from # Apple Developer web-site. -<command>brew install</command> --use-clang http://tarantool.org/dist/tarantool.rb +<command>brew install</command> --use-clang http://tarantool.org/dist/stable/tarantool.rb # or -<command>brew install</command> http://tarantool.org/dist/tarantool.rb +<command>brew install</command> http://tarantool.org/dist/stable/tarantool.rb </programlisting> </para> <para> -More advice for binary downloads is at <link xlink:href="http://tarantool.org/download.html">http://tarantool.org/download.html</link>. +More advice for binary downloads is at <link xlink:href="http://stable.tarantool.org/download.html">http://stable.tarantool.org/download.html</link>. </para> </section> @@ -232,7 +232,7 @@ The absolutely necessary ones are: <listitem> <para> A program for downloading source repositories. -In this case the necessary program is <quote><productname>git</productname></quote>. Although tarantool.org/dist +In this case the necessary program is <quote><productname>git</productname></quote>. Although tarantool.org/dist/stable has source tarballs (the files whose names end in <quote>-src.tar.gz</quote>), the latest complete source downloads are on github.com, and from github one gets with git. </para> diff --git a/doc/www-data.in/download.cmake b/doc/www-data.in/download.cmake index 44e84c334eed9c43fb3ded2c40004d930c2bef94..8800ce853636c5f6ff5e950565f834e4388f9313 100644 --- a/doc/www-data.in/download.cmake +++ b/doc/www-data.in/download.cmake @@ -2,7 +2,8 @@ download: main: | # All downloads - All published releases are available at [http://tarantool.org/dist]. + All published releases are available at + [http://tarantool.org/dist/stable]. # How to choose the right version for download @@ -26,7 +27,8 @@ download: The latest source archive is [tarantool-@PACKAGE_VERSION@-src.tar.gz] Please consult with README for build instructions on your system. - [tarantool-@PACKAGE_VERSION@-src.tar.gz]: http://tarantool.org/dist/tarantool-@PACKAGE_VERSION@-src.tar.gz + [tarantool-@PACKAGE_VERSION@-src.tar.gz]: + http://tarantool.org/dist/stable/tarantool-@PACKAGE_VERSION@-src.tar.gz ## Binary downloads @@ -37,7 +39,8 @@ download: ### Debian GNU/Linux and Ubuntu We maintain an always up-to-date Debian GNU/Linux and Ubuntu package - repository at [http://tarantool.org/dist/debian] and [http://tarantool.org/dist/ubuntu] + repository at [http://tarantool.org/dist/stable/debian] and + [http://tarantool.org/dist/stable/ubuntu] respectively. At the moment the repository contains builds for Debian "Sid", "Jessie", @@ -51,14 +54,14 @@ download: # For Debian: cat > /etc/apt/sources.list.d/tarantool.list <<- EOF - deb http://tarantool.org/dist/debian/ $release main - deb-src http://tarantool.org/dist/debian/ $release main + deb http://tarantool.org/dist/stable/debian/ $release main + deb-src http://tarantool.org/dist/stable/debian/ $release main EOF # For Ubuntu: cat > /etc/apt/sources.list.d/tarantool.list <<- EOF - deb http://tarantool.org/dist/ubuntu/ $release main - deb-src http://tarantool.org/dist/ubuntu/ $release main + deb http://tarantool.org/dist/stable/ubuntu/ $release main + deb-src http://tarantool.org/dist/stable/ubuntu/ $release main EOF sudo apt-get update @@ -67,7 +70,7 @@ download: ### CentOS 5-6 and RHEL 5-6 - CentOS repository is available at [http://tarantool.org/dist/centos] + CentOS repository is available at [http://tarantool.org/dist/stable/centos] Add the following section to your yum repository list (/etc/yum.repos.d/tarantool.repo) to enable it: @@ -75,14 +78,14 @@ download: ```ini [tarantool] name=CentOS-$releasever - Tarantool - baseurl=http://tarantool.org/dist/centos/$releasever/os/$basearch/ + baseurl=http://tarantool.org/dist/stable/centos/$releasever/os/$basearch/ enabled=1 gpgcheck=0 ``` ### Fedora - Fedora repository is available at [http://tarantool.org/dist/fedora] + Fedora repository is available at [http://tarantool.org/dist/stable/fedora] Add the following section to your yum repository list (/etc/yum.repos.d/tarantool.repo) to enable it: @@ -90,7 +93,7 @@ download: ```ini [tarantool] name=Fedora-$releasever - Tarantool - baseurl=http://tarantool.org/dist/fedora/$releasever/os/$basearch/ + baseurl=http://tarantool.org/dist/stable/fedora/$releasever/os/$basearch/ enabled=1 gpgcheck=0 ``` @@ -118,8 +121,8 @@ download: </tr> </table> - [32-bit]: http://tarantool.org/dist/tarantool-@PACKAGE_VERSION@-linux-i686.tar.gz - [64-bit]: http://tarantool.org/dist/tarantool-@PACKAGE_VERSION@-linux-x86_64.tar.gz + [32-bit]: http://tarantool.org/dist/stable/tarantool-@PACKAGE_VERSION@-linux-i686.tar.gz + [64-bit]: http://tarantool.org/dist/stable/tarantool-@PACKAGE_VERSION@-linux-x86_64.tar.gz ### FreeBSD @@ -131,7 +134,7 @@ download: You can install Tarantool using homebrew: ``` - $ brew install --use-clang http://tarantool.org/dist/tarantool.rb + $ brew install --use-clang http://tarantool.org/dist/stable/tarantool.rb ``` Please upgrade `clang` to version 3.2 or later using @@ -162,11 +165,11 @@ download: - Erlang driver, [https://github.com/rtsisyk/etarantool] - C connector [is maintained in the server source tree](https://github.com/tarantool/tarantool/blob/master/connector/c) - [http://tarantool.org/dist]: http://tarantool.org/dist - [http://tarantool.org/dist/debian]: http://tarantool.org/dist/debian - [http://tarantool.org/dist/ubuntu]: http://tarantool.org/dist/ubuntu - [http://tarantool.org/dist/centos]: http://tarantool.org/dist/centos - [http://tarantool.org/dist/fedora]: http://tarantool.org/dist/fedora + [http://tarantool.org/dist]: http://tarantool.org/dist/stable + [http://tarantool.org/dist/stable/debian]: http://tarantool.org/dist/stable/debian + [http://tarantool.org/dist/stable/ubuntu]: http://tarantool.org/dist/stable/ubuntu + [http://tarantool.org/dist/stable/centos]: http://tarantool.org/dist/stable/centos + [http://tarantool.org/dist/stable/fedora]: http://tarantool.org/dist/stable/fedora [https://github.com/mailru/tarantool-ruby]: https://github.com/mailru/tarantool-ruby [http://pypi.python.org/pypi/tarantool]: http://pypi.python.org/pypi/tarantool [https://github.com/tarantool/tarantool-php]: https://github.com/tarantool/tarantool-php