Merge pull request #20 from upgrades-migrations/texts

Texts editing

RHEL6_7/backup/UntrackedFiles/module.ini

@@ -1,6 +1,6 @@
 [preupgrade]
 check_script = check
-content_description = The module generates lists of files, such as temporary, application, and user data files, that are not migrated automatically.
+content_description = The module generates lists of files that are not migrated automatically, such as temporary, application, and user data files.
 content_title = File lists for the manual migration
 author = Ondrej Vasik <ovasik@redhat.com>
 binary_req = diff

RHEL6_7/backup/UntrackedFiles/solution.txt

@@ -6,10 +6,10 @@ Some user data, such as user home directories and temporary files, are not track
 
 * The [link:./kickstart/untrackedexpected] file lists the regular files and symlinks created by runtime system operations (for example, handling runlevels, alternatives, and active SELinux modules). Most likely you do not need to care about them, the list is available just for the sake of completeness.
 
-* The [link:./kickstart/untrackedtemporary] file lists all temporary local files on the system that will not be migrated. This is essentially everything in the /cgroup/, /tmp/, and /var/ directories. Most likely you do not need to care about them, the list is available just for the sake of completeness.
+* The [link:./kickstart/untrackedtemporary] file lists all temporary local files on the system that will not be migrated. This is everything in the /cgroup/, /tmp/, and /var/ directories. Most likely you do not need to care about them, the list is available just for the sake of completeness.
 
 It is recommended that you back up all the data before proceeding with the upgrade to Red Hat Enterprise Linux 7. This data might be quite large.
 
 If you are performing an in-place upgrade, this data should remain in their current location after the upgrade. Review the configuration files and other data to determine if any modifications are needed for the use with Red Hat Enterprise Linux 7. Verify that all the data was maintained successfully.
 
-If you are performing a migration upgrade, this data must be backed up to another storage medium. Copy the data you want to have on the new installation back into place after the upgrade is complete. Review the configuration files and other data to determine if any modifications are needed for the use with Red Hat Enterprise Linux 7.
+If you are performing a migration, this data must be backed up to another storage medium. Copy the data that you want to have on the new installation back into place after the upgrade is complete. Review the configuration files and other data to determine if any modifications are needed for the use with Red Hat Enterprise Linux 7.

RHEL6_7/databases/mysql/configuration_changes/check

@@ -142,7 +142,7 @@ EOF
 grep -q "^language$" "$tmp_file" && {
         cat >> $SOLUTION_FILE <<EOF
 
-* MySQL 5.1 used the 'language' variable for specifying the directory which
+* MySQL 5.1 used the 'language' variable for specifying the directory that
 included the error message file. This option is now deprecated and has been
 replaced by the 'lc_messages_dir' and 'lc_messages' options.
 This also applies to the options in the configuration files.
@@ -163,7 +163,7 @@ if [ -f "$OPTION_FIXED_FILE" ] ; then
     echo -e "\n
 To provide at least basic functionality, some options were commented out
 in the files listed below.
-You should replace them with options suitable for your environment that
+Replace them with options suitable for your environment that
 provide the same functionality as you have now:" >> "$SOLUTION_FILE"
     if [ -f "$OPTION_NOT_OK_FILE" ]; then
       # print only files which are not inside $OPTIONS_NOT_OK_FILE
@@ -181,15 +181,15 @@ if [ ! -f "$OPTION_NOT_OK_FILE" ]; then
 else
     echo "\n
 Some options were not commented out in the files listed below and therefore MariaDB 5.5 might fail unexpectedly.
-The listed options should be replaced or commented out manually:" >> "$SOLUTION_FILE"
+Replace the listed options, or comment them out manually:" >> "$SOLUTION_FILE"
     cat "$OPTION_NOT_OK_FILE" | sort | uniq >> "$SOLUTION_FILE"
     result=$RESULT_FAIL
 fi
 
 [ "$result" == "$RESULT_FAIL" ] && echo "
 The files mentioned above are backups of your original configuration files.
-After the upgrade you must manually replace the contents of the default
-MariaDB 5.5 configuration (as is appropriate to your environment) with the
+After the upgrade, manually replace the contents of the default
+MariaDB 5.5 configuration (as is appropriate for your environment) with the
 information provided about the replaced or deprecated options listed in the
 backups. Afterwards, restart MariaDB for these changes to take effect.
 "

RHEL6_7/databases/mysql/data_migration/check

@@ -24,7 +24,7 @@ export errlogfile
 if [ ! -d "${datadir}/mysql" ] ; then
     cat >>$SOLUTION_FILE <<EOF
 No MySQL data stack initialized at $datadir. In case you have MySQL
-initialized in a different place, see [link:https://access.redhat.com/site/articles/723833]
+initialized in a different place, see [link:https://access.redhat.com/site/articles/723833].
 EOF
     exit $RESULT_PASS
 fi
@@ -33,7 +33,7 @@ cat >>$SOLUTION_FILE <<EOF
 Before migrating from MySQL 5.1 to MariaDB 5.5, back up all your data,
 including any MySQL databases. You can upgrade the data in two possible ways:
 
-The first one is to store all your data in an SQL file, so you can restore it after
+The first one is to store all your data in an SQL file, so that you can restore it after
 migrating to MariaDB 5.5. For backing up the data in this way, use the following commands:
   # service mysqld start
   $ mysqldump --all-databases --routines --triggers --events>/your/backup.sql
@@ -48,12 +48,12 @@ a safe location:
 The in-place upgrade method is usually faster. However, there are certain risks
 and known problems. For more information, see the MySQL 5.5 Release Notes:
 [link:http://dev.mysql.com/doc/relnotes/mysql/5.5/en/]
-[link:http://dev.mysql.com/doc/refman/5.5/en/upgrading-from-previous-series.html]
+[link:http://dev.mysql.com/doc/refman/5.5/en/upgrading-from-previous-series.html].
 
 For further information about migrating from MySQL 5.1 to MariaDB 5.5, see the following articles:
 [link:https://access.redhat.com/site/articles/723833]
 [link:https://mariadb.com/kb/en/mariadb-versus-mysql-compatibility]
-[link:https://mariadb.com/kb/en/upgrading-to-mariadb-from-mysql/]
+[link:https://mariadb.com/kb/en/upgrading-to-mariadb-from-mysql/].
 
 EOF
 

RHEL6_7/databases/mysql/general_changes/check

@@ -23,11 +23,11 @@ Web at [link: http://mariadb.org/en/about/].
 
 MariaDB upstream uses the same file names as original MySQL.
 That means that the MariaDB shell is called 'mysql', MariaDB daemon is called
-'mysqld_safe' and the client library is called 'libmysqlclient.so'.
+'mysqld_safe', and the client library is called 'libmysqlclient.so'.
 
 To keep MariaDB packages properly distinguished from the original
-MySQL packages, Red Hat Enterprise Linux 7 uses MariaDB names where not necessary to follow
-upstream. It means the following layout is used in Red Hat Enterprise Linux 7:
+MySQL packages, Red Hat Enterprise Linux 7 uses MariaDB names where it is not necessary to follow
+upstream. It means that the following layout is used in Red Hat Enterprise Linux 7:
  - The MariaDB packages names are called 'mariadb', 'mariadb-libs', 'mariadb-server',
    and so on.
  - Only the mariadb and mariadb-libs packages provide also RPM symbols 'mysql'
@@ -83,12 +83,12 @@ if [ $nonrh_mysql_deps_issues -gt 0 ] ; then
 MariaDB RPM packages do not provide mysql names except 'mariadb',
 'mariadb-libs', and 'mariadb-devel'. Packages requiring other packages
 (mysql-server, mysql-embedded, mysql-embedded-devel, mysql-test, or mysql-bench)
-need to be rebuilt, so that they start reqiuring mariadb-* packages
+need to be rebuilt, so that they start requiring mariadb-* packages
 instead. The following dependency issues have been found within the installed
 packages:
 $(cat $nonrh_mysql_deps_file | uniq)
-If you rebuild those packages, or update to a newer version, it might
-fix this issue.
+If you rebuild those packages, or update to a later version, it might
+solve this problem.
 EOF
 fi
 
@@ -122,14 +122,14 @@ done
 if [ $nonrh_service_deps -gt 0 ] ; then
     cat >>$SOLUTION_FILE <<EOF
 
-The following potential issues have been spotted in the services:
+The following potential problems have been spotted in the services:
 $(cat $nonrh_service_deps_file | uniq)
 Change all services that require mysqld to require mariadb instead.
 EOF
 else
     cat >>$SOLUTION_FILE <<EOF
 
-No issues in the services have been found, but check your services anyway.
+No problems in the services have been found, but check your services anyway.
 In case a service requires mysqld in Red Hat Enterprise Linux 6, or it needs to start before
 mysqld, set Require=mariadb.service and After=mariadb.service in Red Hat Enterprise Linux 7 for
 those services.
@@ -161,7 +161,7 @@ if [ $nonrh_plugins -gt 0 ] ; then
 
 All plug-ins not delivered by Red Hat Enterprise Linux 6 and compiled for MySQL 5.1 need
 to be rebuilt for MariaDB 5.5 after the migration to Red Hat Enterprise Linux 7. The following
-potential issues have been spotted in the plug-in directory:
+potential problems have been spotted in the plug-in directory:
 $(cat $nonrh_plugins_file | uniq)
 Rebuild those plug-ins or update them to the latest release compatible with MariaDB.
 EOF

RHEL6_7/databases/postgresql/check

@@ -171,14 +171,14 @@ check_is_initialized() {
 
     if test ! -f "$PG_VERSION_FILE"; then
         append_to_solution <<EOF
-* Important: It seems that you have installed PostgreSQL server, but you
+* Important: It seems that you have installed a PostgreSQL server, but you
   have not initialized the data directory. It means that either you have never
-  used PostgreSQL server or you are using PostgreSQL server from the
+  used a PostgreSQL server or you are using a PostgreSQL server from the
   postgresql-server package in a different way (which needs a manual
   interaction).
 EOF
         log_error \
-            "The $PG_VERSION_FILE file does not exist, are you using PostgreSQL server?"
+            "The $PG_VERSION_FILE file does not exist, are you using a PostgreSQL server?"
         SKIP_TESTING=yes
         return $RESULT_FAIL
     fi
@@ -232,8 +232,8 @@ EOF
   Still, the full data directory backup ($DATA_DIR) is the  administrator's responsibility. Up to that, backing up the database dump by
   running the "pg_dumpall" tool is strictly encouraged, because if something
   with the in-place upgrade goes wrong on the updated system, you will not be able
-  to go back to the earlier Red hat Enterprise Linux 6 PostgreSQL $PG_OLD_VERSION easily.
-  See the upstream how-to article for pg_dumpall:
+  to go back easily to the earlier Red Hat Enterprise Linux 6 PostgreSQL $PG_OLD_VERSION.
+  See the upstream article for pg_dumpall:
   [link:$UPSTREAM_DOC_PGDUMP]
 EOF
     log_slight_risk "We cannot tell for 100% that the system will be in-place upgradeable."
@@ -286,7 +286,7 @@ check_enabled() {
     log_error "PostgreSQL is not enabled after the system startup."
     append_to_solution <<EOF
 * Note that PostgreSQL is not enabled at the system startup. This is not really
-  risky, but it is at least worth observing. If that is on a server machine, PostgreSQL seems to be unused (if that is true, the sysadmin may uninstall the postgresql-server package).
+  risky, but it is at least worth observing. If that is on a server machine, PostgreSQL seems to be unused. If that is true, the sysadmin may uninstall the postgresql-server package.
 EOF
     return $RESULT_FAIL
 }
@@ -314,8 +314,8 @@ check_permissions() {
         if test $? -ne 0; then
             log_error "Cannot execute \"$cmd\", 'postgres' is not superuser."
             append_to_solution <<EOF
-* The 'postgres' role is not a superuser for PostgreSQL server.  You should
-  execute this SQL statement:
+* The 'postgres' role is not a superuser for PostgreSQL server.
+  Execute this SQL statement:
   ALTER USER postgres WITH SUPERUSER;
   under other PostgreSQL superuser account.
 EOF
@@ -332,7 +332,7 @@ EOF
   To make sure that everything is as expected, fix the "$PG_HBA_CONF_FILE" file
   so that it does not block the 'postgres' user to log in without a password. To achieve that, put the "local all postgres ident" line to be the
   first line of the file.
-  The upgrade process is fully independent on this file though; so if you are
+  The upgrade process is fully independent of this file though; so if you are
   sure that 'postgres' is of superuser role (default configuration), ignore this warning.
 EOF
 
@@ -365,7 +365,7 @@ check_options() {
     if test $? -eq 0; then
         append_to_solution <<EOF
 * The 'unix_socket_directory' option is not supported in Red Hat Enterprise Linux 7. Instead, we
-  use the 'unix_socket_directories' option (which is able to specify multiple
+  use the 'unix_socket_directories' option, which is able to specify multiple
   directories separated by commas. See the documentation of that option at
   [link:http://www.postgresql.org/docs/9.3/static/runtime-config-connection.html]
   Do not remove this option from the configuration file, just be prepared that you will
@@ -514,7 +514,7 @@ fi
 
 append_to_solution <<EOF
 * If you go the in-place upgrade way, you will run the
-  \`postgresql-setup upgrade\` command in Red Hat Enterprise Linux 7. Note that
+  'postgresql-setup upgrade' command in Red Hat Enterprise Linux 7. Note that
   this process does not keep the PostgreSQL configuration files (all configuration files
   will be generated from scratch). The original configuration files will be backed
   up in the $HOME_DIR/data-old/*.conf file and will need manual copying

RHEL6_7/desktop/GNOME/check

@@ -8,7 +8,7 @@
 
 RESULT="$RESULT_PASS"
 if test -f /usr/share/xsessions/gnome.desktop; then
-    log_extreme_risk "You have the GNOME Desktop Environment session as an option in your X11 session manager. GNOME Desktop Environment as a part of the yum group 'Desktop' underwent a serious redesign in its user interface as well as in underlying technologies in Red Hat Enterprise Linux 7."
+    log_extreme_risk "You have the GNOME desktop environment session as an option in your X11 session manager. The GNOME desktop environment as a part of the 'Desktop' yum group underwent a serious redesign in its user interface as well as in underlying technologies in Red Hat Enterprise Linux 7."
     RESULT="$RESULT_FAIL"
 fi
 
@@ -17,18 +17,18 @@ DPKGS=""
 
 for pkg in $PKGS; do
     grep -q "^$pkg[[:space:]]" $VALUE_RPM_QA && is_dist_native $pkg || continue
-    test "$RESULT" = "$RESULT_FAIL" || log_high_risk "You have some of the Desktop group packages installed in your system. GNOME Desktop Environment that was provided by this group of packages underwent a serious redesign in its user interface as well as in underlying technologies in Red Hat Enterprise Linux 7."
+    test "$RESULT" = "$RESULT_FAIL" || log_high_risk "You have some of the Desktop group packages installed on your system. The GNOME desktop environment, which was provided by this group of packages, underwent a serious redesign in its user interface as well as in underlying technologies in Red Hat Enterprise Linux 7."
     DPKGS="$DPKGS $pkg"
     RESULT="$RESULT_FAIL"
 done
 
 rm -f solution.txt
 # Generate solution.txt
 if test "$RESULT" = "$RESULT_FAIL"; then
-    echo "The GNOME Desktop Environment as a part of the yum group 'Desktop' underwent a serious redesign in its user interface as well as in underlying technologies in Red Hat Enterprise Linux 7. The users of the desktop environment need to be educated about these changes before the upgrade. The GNOME Classic user interface is provided in Red Hat Enterprise Linux 7 to minimize the impact of this change but the interface still contains several differences from the earlier version, and the users need to be aware of them. More on the topic at [link:https://access.redhat.com/documentation/en-US/Red_Hat_Enterprise_Linux/7/html/Desktop_Migration_and_Administration_Guide/index.html]" >> solution.txt
+    echo "The GNOME desktop environment as a part of the 'Desktop' yum group underwent a serious redesign in its user interface as well as in underlying technologies in Red Hat Enterprise Linux 7. The users of the desktop environment need to be educated about these changes before the upgrade. The GNOME Classic user interface is provided in Red Hat Enterprise Linux 7 to minimize the impact of this change, but the interface still contains several differences from the earlier version, and the users need to be aware of them. More on the topic at [link:https://access.redhat.com/documentation/en-US/Red_Hat_Enterprise_Linux/7/html/Desktop_Migration_and_Administration_Guide/index.html]." >> solution.txt
 fi
 
 if test -n "$DPKGS"; then
-    echo "The following packages from the yum group 'Desktop', which provides the GNOME Desktop Environment, were detected to be installed on your system:$DPKGS" >> solution.txt
+    echo "The following packages from the 'Desktop' yum group, which provides the GNOME desktop environment, were detected to be installed on your system:$DPKGS" >> solution.txt
 fi
 exit "$RESULT"

RHEL6_7/desktop/KDE/check

@@ -7,7 +7,7 @@
 
 RESULT="$RESULT_PASS"
 if test -f /usr/share/xsessions/kde.desktop; then
-    log_extreme_risk "You have the KDE Desktop Environment session as an option in your X11 session manager. KDE Desktop Environment as a part of the yum group 'KDE Desktop' underwent a redesign in its user interface as well as in underlying technologies in Red Hat Enterprise Linux 7."
+    log_extreme_risk "You have the KDE desktop environment session as an option in your X11 session manager. The KDE desktop environment as a part of the yum group 'KDE Desktop' underwent a redesign in its user interface as well as in underlying technologies in Red Hat Enterprise Linux 7."
     RESULT="$RESULT_FAIL"
 fi
 
@@ -16,18 +16,18 @@ DPKGS=""
 
 for pkg in $PKGS; do
     grep -q "^$pkg[[:space:]]" $VALUE_RPM_QA && is_dist_native $pkg || continue
-    test "$RESULT" = "$RESULT_FAIL" || log_high_risk "You have some of the KDE Desktop yum group packages installed in your system. KDE Desktop Environment that was provided by this group of packages underwent a redesign in its user interface as well as in underlying technologies in Red Hat Enterprise Linux 7."
+    test "$RESULT" = "$RESULT_FAIL" || log_high_risk "You have some of the 'KDE Desktop' yum group packages installed on your system. The KDE desktop environment, which was provided by this group of packages, underwent a redesign in its user interface as well as in underlying technologies in Red Hat Enterprise Linux 7."
     DPKGS="$DPKGS $pkg"
     RESULT="$RESULT_FAIL"
 done
 
 rm -f solution.txt
 # Generate solution.txt
 if test "$RESULT" = "$RESULT_FAIL"; then
-    echo "The KDE Desktop Environment as a part of the yum group 'KDE Desktop' underwent a redesign in its user interface as well as in underlying technologies in Red Hat Enterprise Linux 7. The users of the desktop environment need to be informed about these changes before the upgrade." >> solution.txt
+    echo "The KDE desktop environment as a part of the 'KDE Desktop' yum group underwent a redesign in its user interface as well as in underlying technologies in Red Hat Enterprise Linux 7. The users of the desktop environment need to be informed about these changes before the upgrade." >> solution.txt
 fi
 
 if test -n "$DPKGS"; then
-    echo "The following packages from the yum group 'KDE Desktop', which provides the KDE Desktop Environment, were detected to be installed on your system:$DPKGS" >> solution.txt
+    echo "The following packages from the 'KDE Desktop' yum group, which provides the KDE desktop environment, were detected to be installed on your system:$DPKGS" >> solution.txt
 fi
 exit "$RESULT"

RHEL6_7/desktop/KDE/module.ini

@@ -1,7 +1,7 @@
 [preupgrade]
 check_script = check
-content_description = The module informs about the KDE Desktop Environment design modifications in Red Hat Enterprise Linux 7, and it lists packages needed to be installed.
-content_title = KDE Desktop Environment  
+content_description = The module informs about the KDE desktop environment design modifications in Red Hat Enterprise Linux 7, and it lists packages needed to be installed.
+content_title = KDE desktop environment  
 author = Boris Ranto <branto@redhat.com>
 solution = solution.txt
 applies_to = xorg-x11-server-Xorg