[simon/kf5] doc/simon: Merge remote-tracking branch 'origin/master' into kf5

[Luigi Toscano]

Git commit 3ccafae3a2df90dd3ba91d9736ad264f417c35c1 by Luigi Toscano.
Committed on 26/04/2018 at 23:41.
Pushed by ltoscano into branch 'kf5'.

Merge remote-tracking branch 'origin/master' into kf5

... and fix the modified URL to point to the Qt 5 version of the page.

M  +1    -1    doc/simon/index.docbook

https://commits.kde.org/simon/3ccafae3a2df90dd3ba91d9736ad264f417c35c1

diff --cc doc/simon/index.docbook
index b0f175a9,cd7bc7a2..6ec4455b
--- a/doc/simon/index.docbook
+++ b/doc/simon/index.docbook
@@@ -3996,7 -3996,7 +3996,7 @@@ To adjust your bots personality have a 
        </mediaobject>
      </screenshot>
      </para>
-     <para>QtScript bound values resolve to the result of the entered <ulink url="http://doc.qt.digia.com/qt/ecmascript.html">QtScript</ulink> code.</para>
 -    <para>QtScript bound values resolve to the result of the entered <ulink url="https://doc.qt.io/archives/qt-4.8/ecmascript.html">QtScript</ulink> code.</para>
++    <para>QtScript bound values resolve to the result of the entered <ulink url="https://doc.qt.io/qt-5/ecmascript.html">QtScript</ulink> code.</para>
    </listitem>
    <listitem>
      <para>Command arguments</para>