Texts editing #20

jhornice · 2017-09-21T10:51:16Z

No description provided.

Modified modules: RHEL6_7/backup/UntrackedFiles RHEL6_7/desktop/KDE RHEL6_7/networking/bind/bind-chroot RHEL6_7/networking/dhcp RHEL6_7/networking/iptables RHEL6_7/networking/nfsv2 RHEL6_7/networking/vsftpd RHEL6_7/packages/AddedOptions/dnsmasq RHEL6_7/packages/ObsoletedPackages RHEL6_7/packages/pkgdowngrades RHEL6_7/packages/QemuGuestAgent RHEL6_7/packages/RemovedOptions/coreutils RHEL6_7/packages/RemovedOptions/gawk RHEL6_7/packages/RemovedOptions/nettools RHEL6_7/packages/RemovedOptions/quota RHEL6_7/packages/RemovedTaskjuggler RHEL6_7/services/cvs RHEL6_7/services/freeradius RHEL6_7/services/ipa/pki-ca RHEL6_7/services/openldap RHEL6_7/services/sssd RHEL6_7/storage/cryptsetup-luks RHEL6_7/storage/lvm2-cluster RHEL6_7/storage/lvm2-services RHEL6_7/storage/tgtd RHEL6_7/system/BinariesRebuild RHEL6_7/system/ca-certificates RHEL6_7/system/FHS/ReadOnlyFHS RHEL6_7/system/FHS/Run RHEL6_7/system/grub RHEL6_7/system/grubby RHEL6_7/system/HA-Cluster/ha-cluster RHEL6_7/system/hal RHEL6_7/system/hyperv RHEL6_7/system/initscripts/control RHEL6_7/system/java RHEL6_7/system/kernel-kdump RHEL6_7/system/pam RHEL6_7/system/PartitionMounts RHEL6_7/system/php RHEL6_7/system/python RHEL6_7/system/RemovableMedia RHEL6_7/system/repositories RHEL6_7/system/ruby RHEL6_7/system/scl-collection RHEL6_7/system/subscription-manager RHEL6_7/system/SysconfigCgroupDaemon RHEL6_7/system/uefi RHEL6_7/system/yaboot RHEL6_7/usrmgmt/DangerousRanges RHEL6_7/usrmgmt/ypserv/max_uid_gid

Modified modules: RHEL6_7/databases/mysql/configuration_changes RHEL6_7/databases/mysql/data_migration RHEL6_7/databases/mysql/general_changes RHEL6_7/databases/postgresql RHEL6_7/desktop/GNOME RHEL6_7/desktop/KDE RHEL6_7/drivers/ObsoletedNetworkDrivers RHEL6_7/drivers/ObsoletedStorageDrivers RHEL6_7/drivers/ObsoletePOWER6Processors RHEL6_7/networking/bind/bind-chroot RHEL6_7/networking/bind/configuration RHEL6_7/networking/dnsmasq RHEL6_7/networking/net-snmp RHEL6_7/networking/openldap RHEL6_7/networking/openssh RHEL6_7/networking/postfix RHEL6_7/networking/RHDS RHEL6_7/networking/vsftpd RHEL6_7/others/NoVersionChangeEtc RHEL6_7/others/vcsrepos RHEL6_7/packages/InterVariants RHEL6_7/packages/NonRHSignedPkg RHEL6_7/packages/notbase-channel RHEL6_7/packages/ObsoletedPackages RHEL6_7/packages/pkgdowngrades RHEL6_7/packages/RemovedPackages RHEL6_7/packages/ReplacedPackages RHEL6_7/selinux/CustomPolicy RHEL6_7/selinux/general RHEL6_7/services/cupsbrowsing RHEL6_7/services/httpd RHEL6_7/services/ntp/configuration RHEL6_7/services/ntp/timesync RHEL6_7/services/openldap RHEL6_7/services/quota_nld/new_package RHEL6_7/services/sssd RHEL6_7/services/tomcat RHEL6_7/storage/cryptsetup-luks RHEL6_7/system/AddOns RHEL6_7/system/Architecture RHEL6_7/system/ca-certificates RHEL6_7/system/FHS/ReadOnlyFHS RHEL6_7/system/FHS/Run RHEL6_7/system/FHS/UsrPartition RHEL6_7/system/grub RHEL6_7/system/HA-Cluster/ha-cluster RHEL6_7/system/hal RHEL6_7/system/initscripts/control RHEL6_7/system/initscripts/ifcfg RHEL6_7/system/java RHEL6_7/system/kernel-kdump RHEL6_7/system/pam RHEL6_7/system/PartitionMounts RHEL6_7/system/php RHEL6_7/system/polkit RHEL6_7/system/RemovableMedia RHEL6_7/system/repositories RHEL6_7/system/ruby RHEL6_7/system/SonameBump RHEL6_7/system/SonameRemoval RHEL6_7/system/yaboot RHEL6_7/usrmgmt/DangerousRanges RHEL6_7/usrmgmt/ReservedIDs RHEL6_7/usrmgmt/ypserv/maps_dbm RHEL6_7/usrmgmt/ypserv/max_uid_gid

AloisMahdal

Please, make these changes:

Change 8C manpage reference back to 8,
remove the <<<<<<< HEAD line,
and optionally, move the changes in RHEL6_7/services/openldap/check to different commit.

Rest LGTM.

Hint: you can use find -name check | xargs -L1 file -i | grep shellscript | cut -d: -f1 | xargs -L1 bash -n to retest syntax, although this does not respect shopt -s extglob so it will falsely report line 435 in databases/postgresql; you can ignore that one.

AloisMahdal · 2017-09-22T00:15:20Z

RHEL6_7/services/openldap/check


-For more information about slapcat, see the slapcat(8) man pages.
+For more information about slapcat, see the slapcat(8C) man pages.


The slapcat manpage indeed has 8C in header. However, it looks like that part is just visual; the real section is still 8, not 8C:

# man 8c slapcat No entry for slapcat in section 8c of the manual # find /usr/share/man | grep slapcat /usr/share/man/man8/slapcat.8.gz # man 8 slapcat ...(man page is shown)...

(I wonder why the C is there in the first place; it looks like a bug to me.)

Also, note that alt. manpage sections are spelled with lowercase letters:

# man 1P unlink No entry for unlink in section 1P of the manual # man 1p unlink ...(man page is shown)...

They do appear as uppercase in the header but that's because the whole header field is actually uppercase: UNLINK(1P).

(note that there are more instances of this)

Poor cat, everyone's harsh on her.

AloisMahdal · 2017-09-22T00:26:30Z

RHEL6_7/services/openldap/check

@@ -55,22 +55,22 @@ If you are using the bdb or hdb openldap back ends, it is necessary to update
 the database.

 Back up the data:
-`# slapcat -l backup.ldif`
+# slapcat -l backup.ldif


This line and similar lines below actually change behavior: in previous version, the code between the backticks would be actually executed. It's just due to the fact that all instances of this are prefixed with hash sign, leading to "execution" of comments, ie. not doing anything and just returning empty string.

(Technically, this should have been in different commit.)

Excuse my ignorance, but why would anyone execute a comment?

That's my point; the code was never supposed to be executed. We're just lucky that the code actually happens to be interpreted as comment.

AloisMahdal · 2017-09-22T00:28:53Z

RHEL6_7/services/openldap/check

 EOF

  exit_error
 fi
-log_high_risk "There are crucial changes between Red Hat Enterprise Linux 6 and Red Hat Enterprise Linux 7 openldap configuration. Take the steps recommended in the solution text to ensure the correct functionality."
+<<<<<<< HEAD


Oops, leftover conflict residue ... aaand we have syntax error :-)

bocekm · 2017-09-25T16:42:39Z

RHEL6_7/system/RemovableMedia/solution.txt

@@ -1 +1 @@
-If there are any removable media listed in the /etc/fstab file, it is necessary to add the 'nofail' flag to each one of them. Red Hat Enterprise Linux 7 will fail to boot if the medium is not present and 'nofail' is not specified. It is not possible to verify this automatically with 100% confidence, so check your /etc/fstab file.
+If there are any removable devices listed in the /etc/fstab file, it is necessary to add the 'nofail' flag to each one of them. Red Hat Enterprise Linux 7 will fail to boot if the device is not present and 'nofail' is not specified. It is not possible to verify this automatically with full confidence, so check your /etc/fstab file.


You replace media -> devices here. Shouldn't it be replaced in the module's INI too?

bocekm · 2017-09-25T16:53:21Z

RHEL6_7/system/grubby/module.ini

@@ -1,6 +1,6 @@
 [preupgrade]
 check_script = check
-content_description = A workaround for crashing grubby. The module fills initrd into the /boot/grub/grub.conf file by the postupgrade script.
-content_title = The grubby tool
+content_description = A workaround to prevent crashing of the grubby tool. The module fills initrd into the /boot/grub/grub.conf file by the postupgrade script.


Per documentalists guidelines: tool -> utility

bocekm · 2017-09-25T17:02:30Z

RHEL6_7/system/scl-collection/module.ini

@@ -1,7 +1,7 @@
 [preupgrade]
 content_title: Red Hat Software Collections
 author: Petr Hracek <phracek@redhat.com>
-content_description: The module checks if RHSCL are installed.
+content_description: The module checks if RHSCL is installed.


RHSCL is nothing specific. It's more like a named group of packages, and there are many of these groups available for installation. So I would probably add any -> The module checks if any RHSCL is installed.

bocekm · 2017-09-25T17:04:53Z

RHEL6_7/system/yaboot/solution.txt

@@ -1,4 +1,4 @@
 The module is valid only on the 64-bit PowerPC architecture and it checks if Yaboot is installed.

-Yaboot cannot boot the Red Hat Enterprise Linux 7 system. The Red Hat Upgrade Tool will install GRUB 2 during the upgrade. Create the /etc/default/grub file before running `redhat-upgrade-tool` to ensure the correct GRUB 2 configuration. A misconfiguration might make the system unbootable.
+Yaboot cannot boot the Red Hat Enterprise Linux 7 system. Red Hat Upgrade Tool will install GRUB 2 during the upgrade. Create the /etc/default/grub file before running `redhat-upgrade-tool` to ensure the correct GRUB 2 configuration. A misconfiguration might make the system unbootable.


I'm simply curious. Why not having the here? We commonly use "The Preupgrade Assistant" for example.

Please replace the backticks with single quote marks.

bocekm · 2017-09-25T17:13:33Z

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.


Hm, this file seems to mix and match migration vs. upgrade. @pirat89, isn't this module useful just for migration?

@mbocek: It is informational module used for both modes - upgrade and migration. The path of files in kickstart is used just because it is the only usable directory where these files can be stored and kept inside the tarball. It is related to the upgrades-migrations/preupgrade-assistant#181 RFE for P-A.

bocekm · 2017-09-25T17:20:03Z

RHEL6_7/databases/postgresql/check

@@ -225,15 +225,15 @@ EOF
    append_to_solution <<EOF
 * Even if the postgresql-server is probably configured correctly, we are unable
  to say for 100% that the server is not used in some specific way on your
-  machine, so check that the
+  computer, so check that the


Here you replace machine -> computer however on the other places, you leave the machine. I'm for leaving machine even here. To me, computer evokes something related to hardware. But I suspect that most customers are having virtual machines nowadays. Maybe just system would be even better, but that's probably something I would google first to see what's the commonly used term.

bocekm · 2017-09-25T17:25:27Z

RHEL6_7/drivers/ObsoletePOWER6Processors/check

@@ -12,7 +12,7 @@ ARCH=`arch`
 if [ $ARCH == 'ppc64' ]; then
    grep '^cpu.*POWER6' /proc/cpuinfo
    if [ $? -eq 0 ]; then
-        log_extreme_risk 'POWER6 processors are not supported on the PowerPC and PowerPC64 architectures in Red Hat Enterprise Linux 7.'
+        log_extreme_risk 'POWER6 processors are not supported on the PowerPC and 64-bit PowerPC architectures in Red Hat Enterprise Linux 7.'


I would be a bit confused here. I guess that by PowerPC you mean 32-bit PowerPC. So isn't it easier to write on the the 32-bit and 64-bit PowerPC?

bocekm · 2017-09-25T17:41:48Z

RHEL6_7/storage/cryptsetup-luks/solution.txt

-recommend to rehash the LUKS header using the cryptsetup-reencrypt package added to
-Red Hat Enterprise Linux 6.6 and later.
+recommend to rehash the LUKS header by using the cryptsetup-reencrypt package added to
+Red Hat Enterprise Linux 6.6 and later versions.

 A command for rehashing the LUKS header without changing the master key:
 `# cryptsetup-reencrypt -h sha1 --keep-key <path_to_luks_device>`


Probably leftover backticks here. Check them out also in RHEL6_7/system/ca-certificates/solution.txt and in RHEL6_7/networking/iptables/solution.txt.

Modified modules: RHEL6_7/networking/arptables_jf RHEL6_7/networking/iptables RHEL6_7/packages/AddedOptions/dnsmasq RHEL6_7/packages/pkgdowngrades RHEL6_7/services/cvs RHEL6_7/services/freeradius RHEL6_7/storage/cryptsetup-luks RHEL6_7/storage/warnquota/new_package RHEL6_7/system/aide RHEL6_7/system/ca-certificates RHEL6_7/system/grubby RHEL6_7/system/initscripts/rc-local RHEL6_7/system/RemovableMedia RHEL6_7/system/scl-collection RHEL6_7/system/SonameKept RHEL6_7/system/tuned RHEL6_7/system/uefi RHEL6_7/system/yaboot

Modified modules: RHEL6_7/databases/postgresql RHEL6_7/drivers/ObsoletePOWER6Processors RHEL6_7/services/openldap

AloisMahdal · 2017-09-26T17:04:46Z

qa_ack: just re-run suite for modules. (At least smoke test, which tests syntax errors.)

jhornice added 2 commits September 21, 2017 12:48

jhornice requested review from pirat89 and AloisMahdal September 21, 2017 10:51

jhornice added the needs_verify label Sep 21, 2017

pirat89 added text_reviewed and removed text_reviewed labels Sep 21, 2017

pirat89 assigned jhornice Sep 21, 2017

pirat89 added this to the 0.7.0 milestone Sep 21, 2017

AloisMahdal suggested changes Sep 22, 2017

View reviewed changes

bocekm suggested changes Sep 25, 2017

View reviewed changes

jhornice added 2 commits September 26, 2017 15:08

language check - unsafe

efc3025

Modified modules: RHEL6_7/databases/postgresql RHEL6_7/drivers/ObsoletePOWER6Processors RHEL6_7/services/openldap

bocekm approved these changes Sep 26, 2017

View reviewed changes

AloisMahdal approved these changes Sep 26, 2017

View reviewed changes

pirat89 added the on_qe label Sep 26, 2017

AloisMahdal added the qa_ack label Sep 26, 2017

pirat89 merged commit 0cdd320 into el6toel7 Sep 27, 2017

pirat89 added the qa_verified label Sep 27, 2017

AloisMahdal removed the on_qe label Oct 10, 2017

pirat89 modified the milestones: 0.7.0, RHEL 6.9 -> 7.4 batch 1 Oct 18, 2017

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Texts editing #20

Texts editing #20

jhornice commented Sep 21, 2017

AloisMahdal left a comment

AloisMahdal Sep 22, 2017

AloisMahdal Sep 22, 2017

bocekm Sep 25, 2017

AloisMahdal Sep 22, 2017

bocekm Sep 25, 2017

AloisMahdal Sep 25, 2017

AloisMahdal Sep 22, 2017

bocekm Sep 25, 2017

bocekm Sep 25, 2017

bocekm Sep 25, 2017

bocekm Sep 25, 2017

bocekm Sep 25, 2017

pirat89 Sep 26, 2017 •

edited

bocekm Sep 25, 2017

bocekm Sep 25, 2017

bocekm Sep 25, 2017

AloisMahdal commented Sep 26, 2017


		For more information about slapcat, see the slapcat(8) man pages.
		For more information about slapcat, see the slapcat(8C) man pages.

		@@ -1 +1 @@
		If there are any removable media listed in the /etc/fstab file, it is necessary to add the 'nofail' flag to each one of them. Red Hat Enterprise Linux 7 will fail to boot if the medium is not present and 'nofail' is not specified. It is not possible to verify this automatically with 100% confidence, so check your /etc/fstab file.
		If there are any removable devices listed in the /etc/fstab file, it is necessary to add the 'nofail' flag to each one of them. Red Hat Enterprise Linux 7 will fail to boot if the device is not present and 'nofail' is not specified. It is not possible to verify this automatically with full confidence, so check your /etc/fstab file.

Texts editing #20

Texts editing #20

Conversation

jhornice commented Sep 21, 2017

AloisMahdal left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

pirat89 Sep 26, 2017 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

AloisMahdal commented Sep 26, 2017

pirat89 Sep 26, 2017 •

edited