From 02279f6f80a67798c5a9f16b4f5bb9cdad347bce Mon Sep 17 00:00:00 2001 From: Peter Majmesku Date: Thu, 5 Jan 2017 13:46:49 +0100 Subject: [PATCH 1/2] Update deployment.rst --- deployment.rst | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/deployment.rst b/deployment.rst index e20e06c7d44..a772c9c8e9f 100644 --- a/deployment.rst +++ b/deployment.rst @@ -54,7 +54,8 @@ Using Source Control If you're using source control (e.g. Git or SVN), you can simplify by having your live installation also be a copy of your repository. When you're ready to upgrade it is as simple as fetching the latest updates from your source -control system. +control system. A common approach for this in Git is, to tag your release and +check out the Git tag on deployment (see `Git Tagging`_). This makes updating your files *easier*, but you still need to worry about manually taking other steps (see `Common Post-Deployment Tasks`_). @@ -197,6 +198,7 @@ Don't forget that deploying your application also involves updating any dependen (typically via Composer), migrating your database, clearing your cache and other potential things like pushing assets to a CDN (see `Common Post-Deployment Tasks`_). +.. _`Git Tagging`: https://git-scm.com/book/en/v2/Git-Basics-Tagging .. _`Capifony`: http://capifony.org/ .. _`Capistrano`: http://capistranorb.com/ .. _`sf2debpkg`: https://github.com/liip/sf2debpkg From 7eeed05b3fa1e69773767754a777be3562fcde8a Mon Sep 17 00:00:00 2001 From: Javier Eguiluz Date: Thu, 6 Jul 2017 13:24:24 +0200 Subject: [PATCH 2/2] Minor reword --- deployment.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/deployment.rst b/deployment.rst index a772c9c8e9f..06678dacf23 100644 --- a/deployment.rst +++ b/deployment.rst @@ -52,10 +52,10 @@ Using Source Control ~~~~~~~~~~~~~~~~~~~~ If you're using source control (e.g. Git or SVN), you can simplify by having -your live installation also be a copy of your repository. When you're ready -to upgrade it is as simple as fetching the latest updates from your source -control system. A common approach for this in Git is, to tag your release and -check out the Git tag on deployment (see `Git Tagging`_). +your live installation also be a copy of your repository. When you're ready to +upgrade it is as simple as fetching the latest updates from your source control +system. When using Git, a common approach is to create a tag for each release +and check out the appropriate tag on deployment (see `Git Tagging`_). This makes updating your files *easier*, but you still need to worry about manually taking other steps (see `Common Post-Deployment Tasks`_).