Make some bugfixes and improve some text in the description of how to update from 4.x to 5.x.
Make some bugfixes and improve some text in the description of how to
update from 4.x to 5.x.

Submitted by:	Frerich Raabe <raabe@kde.org>

jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase