summaryrefslogtreecommitdiff
path: root/README.md
diff options
context:
space:
mode:
authorSytse Sijbrandij <sytse@dosire.com>2013-08-10 18:56:15 +0200
committerSytse Sijbrandij <sytse@dosire.com>2013-08-10 18:56:15 +0200
commit109af25ed2c18fffb8952a3788b6c970c8103671 (patch)
tree3d3d8428bd8c41cd63e12559a21b925f90e8eb31 /README.md
parentfe059b6c4bfb4cb0f7c7dec8fb7cd3da7634df30 (diff)
downloadgitlab-ce-109af25ed2c18fffb8952a3788b6c970c8103671.tar.gz
Mention gitlab recipes correctly, small updates to update section.
Diffstat (limited to 'README.md')
-rw-r--r--README.md10
1 files changed, 5 insertions, 5 deletions
diff --git a/README.md b/README.md
index af19bba7bfd..d4c7c2740e4 100644
--- a/README.md
+++ b/README.md
@@ -61,11 +61,11 @@ If you want to contribute, please first read our [Contributing Guidelines](https
* [Vagrant virtual machine for development](https://github.com/gitlabhq/gitlab-vagrant-vm)
-#### Unsupported production installation
+#### Unofficial production installations
-* [GitLab recipes](https://github.com/gitlabhq/gitlab-recipes) for setup on different platforms
+* [GitLab recipes](https://github.com/gitlabhq/gitlab-recipes) repository with unofficial guides for using GitLab with different software (operating systems, webservers, etc.) than the official version.
-* [Unofficial installation guides](https://github.com/gitlabhq/gitlab-public-wiki/wiki/Unofficial-Installation-Guides)
+* [Installation guides](https://github.com/gitlabhq/gitlab-public-wiki/wiki/Unofficial-Installation-Guides) public wiki with unofficial guides to install GitLab on different operating systems.
* [BitNami one-click installers](http://bitnami.com/stack/gitlab)
@@ -74,13 +74,13 @@ If you want to contribute, please first read our [Contributing Guidelines](https
### New versions and upgrading
-Each month on the 22nd a new version is released together with an upgrade guide.
+Since 2011 GitLab is released on the 22nd of every month. Every new release includes an upgrade guide.
* [Upgrade guides](doc/update)
* [Changelog](CHANGELOG)
-* Features that will be in the next release are listed on [the feedback and suggestions forum with the status "started"](http://feedback.gitlab.com/forums/176466-general/status/796456).
+* Features that will be in the next releases are listed on [the feedback and suggestions forum](http://feedback.gitlab.com/forums/176466-general) with the status ["started"](http://feedback.gitlab.com/forums/176466-general/status/796456) and [completed](http://feedback.gitlab.com/forums/176466-general/status/796457).
### Run in production mode