[Rt-commit] rt branch, 5.0-trunk, updated. rt-5.0.0alpha1-8-g456eab16b

[? sunnavy]

The branch, 5.0-trunk has been updated
       via  456eab16b358d955c54cc557eee97e2647985a28 (commit)
       via  f29217c2dd2ef8f9b8c1c80e6680eb42db25ac1e (commit)
       via  14ea72ae489711f5a89bd44ccc8def3c5ceefea9 (commit)
      from  37e7f02a3ff7aac83797123f9361a9bf5989a48d (commit)

Summary of changes:
 docs/UPGRADING-4.0 | 13 +++++++------
 docs/UPGRADING-5.0 | 26 ++++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 6 deletions(-)

- Log -----------------------------------------------------------------
commit f29217c2dd2ef8f9b8c1c80e6680eb42db25ac1e
Author: Jim Brandt <jbrandt at bestpractical.com>
Date:   Tue Feb 25 09:16:25 2020 -0500

    Clarify notes on when Articles was added to core

diff --git a/docs/UPGRADING-4.0 b/docs/UPGRADING-4.0
index e19bb4f7b..895b6a50a 100644
--- a/docs/UPGRADING-4.0
+++ b/docs/UPGRADING-4.0
@@ -12,7 +12,7 @@ If you are upgrading, you will likely want to specify that your database is
 still named rt3 (or import a backup of your database as rt5 so that you can
 feel more confident making the upgrade).
 
-You really shouldn't install RT5 into your RT3 source tree (/opt/rt3) and
+You really shouldn't install RT 5 into your RT 3 source tree (/opt/rt3) and
 instead should be using make install to set up a clean environment.  This will
 allow you to evaluate your local modifications and configuration changes as
 you migrate to 4.0 or 5.0.
@@ -62,17 +62,18 @@ the new schema.
 
 =head2 Upgrading from installs with RTFM
 
-RT5 now includes an Articles functionality, merged from RTFM.  You should not
-install and enable the RT::FM plugin separately on RT 4.  If you have existing
-data in RTFM, you can use the /opt/rt5/etc/upgrade/upgrade-articles script to upgrade
+Starting with version 4, RT includes Articles functionality, merged from RTFM.
+You should not install and enable the RT::FM plugin separately on RT 4.
+If you have existing data in RTFM, you can use the
+C</opt/rt5/etc/upgrade/upgrade-articles> script to upgrade
 that data.
 
 When running normal upgrade scripts, RT will warn if it finds existing RTFM
 tables that contain data and point you to the upgrade-articles script.
 
 This script should be run from your RT tarball.  It will immediately begin
-populating your new RT5 tables with data from RTFM.  If you have browsed in
-the RT5 UI and created new classes and articles, this script will fail
+populating your new RT 5 tables with data from RTFM.  If you have browsed in
+the RT 5 UI and created new classes and articles, this script will fail
 spectacularly.  Do *not* run this except on a fresh upgrade of RT.
 
 You can run this as

commit 456eab16b358d955c54cc557eee97e2647985a28
Merge: 37e7f02a3 f29217c2d
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Tue Feb 25 22:28:28 2020 +0800

    Merge branch '5.0/recommend-fresh-install' into 5.0-trunk


-----------------------------------------------------------------------