summaryrefslogtreecommitdiff
path: root/README.md
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-05-29 11:35:10 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-05-29 11:35:10 +0000
commitb1ce97d5a1b3890e4137212547d97f3ab38c3991 (patch)
tree77d5a705e7f638aa63633e1845cb792d80fea19d /README.md
parente0b430ad13b05fc447091cd0226148e370b50685 (diff)
parent321130de7aa2c98eb8298c4e1caf2e2f468cd514 (diff)
downloadgitlab-ce-b1ce97d5a1b3890e4137212547d97f3ab38c3991.tar.gz
Merge branch 'updating-readme' into 'master'
Updating readme
Diffstat (limited to 'README.md')
-rw-r--r--README.md8
1 files changed, 4 insertions, 4 deletions
diff --git a/README.md b/README.md
index ba653940e2c..7bff30b35e8 100644
--- a/README.md
+++ b/README.md
@@ -51,13 +51,13 @@
Please see [the installation page on the GitLab website](https://www.gitlab.com/installation/).
-### New versions and upgrading
+### New versions
-Since 2011 GitLab is released on the 22nd of every month. Every new release includes an [upgrade guide](doc/update) and new features are detailed in the [Changelog](CHANGELOG).
+Since 2011 a minor or major version of GitLab is released on the 22nd of every month. Patch and security releases come out when needed. New features are detailed on the [blog](https://www.gitlab.com/blog/) and in the [changelog](CHANGELOG). For more information about the release process see the release [documentation](https://gitlab.com/gitlab-org/gitlab-ce/tree/master/doc/release). Features that will likely be in the next releases can be found on the [feature request 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).
-It is recommended to follow a monthly upgrade schedule. Security releases come out when needed. For more information about the release process see the documentation for [monthly](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/release/monthly.md) and [security](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/release/security.md) releases.
+### Upgrading
-* Features that will be in the next releases are listed on the [feature request 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).
+For updating the the Omnibus installation please see the [update documentation](https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/doc/update.md). For manual installations there is an [upgrader script](doc/update/upgrader.md) and there are [upgrade guides](doc/update).
### Run in production mode