Git commit 903247b6fc413a3418e8f6a1e0423191f0637407 by Luigi Toscano. Committed on 21/05/2023 at 20:22. Pushed by ltoscano into branch 'master'.
doc: rename {kf5,qt5}options as {kf6,qt6}options Bump the version numbers and the references but no other updates right now. M +2 -2 autotests/kdoctools+install/test.cmake M +2 -2 docs/CMakeLists.txt D +0 -1 docs/kf5options/CMakeLists.txt A +1 -0 docs/kf6options/CMakeLists.txt R +5 -5 docs/kf6options/man-kf6options.7.docbook [from: docs/kf5options/man-kf5options.7.docbook - 093% similarity] M +1 -1 docs/meinproc6/man-meinproc6.1.docbook D +0 -1 docs/qt5options/CMakeLists.txt A +1 -0 docs/qt6options/CMakeLists.txt R +7 -7 docs/qt6options/man-qt6options.7.docbook [from: docs/qt5options/man-qt5options.7.docbook - 095% similarity] M +2 -2 src/man-template.docbook https://invent.kde.org/frameworks/kdoctools/commit/903247b6fc413a3418e8f6a1e0423191f0637407 diff --git a/autotests/kdoctools+install/test.cmake b/autotests/kdoctools+install/test.cmake index 18cf7111..1a0dc584 100644 --- a/autotests/kdoctools+install/test.cmake +++ b/autotests/kdoctools+install/test.cmake @@ -5,8 +5,8 @@ set(FILES # from kdoctools_install ${MANPATH}/man1/checkXML6.1 ${MANPATH}/man1/meinproc6.1 - ${MANPATH}/man7/kf5options.7 - ${MANPATH}/man7/qt5options.7 + ${MANPATH}/man7/kf6options.7 + ${MANPATH}/man7/qt6options.7 # from add_subdirectory ${MANPATH}/es/man1/kjscmd.1 ${MANPATH}/fr/man1/kjscmd.1 diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt index 85b65578..2259b507 100644 --- a/docs/CMakeLists.txt +++ b/docs/CMakeLists.txt @@ -1,5 +1,5 @@ add_subdirectory(checkXML6) add_subdirectory(meinproc6) -add_subdirectory(kf5options) -add_subdirectory(qt5options) +add_subdirectory(kf6options) +add_subdirectory(qt6options) diff --git a/docs/kf5options/CMakeLists.txt b/docs/kf5options/CMakeLists.txt deleted file mode 100644 index d46a13ad..00000000 --- a/docs/kf5options/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -kdoctools_create_manpage(man-kf5options.7.docbook 7 INSTALL_DESTINATION ${KDE_INSTALL_MANDIR}) diff --git a/docs/kf6options/CMakeLists.txt b/docs/kf6options/CMakeLists.txt new file mode 100644 index 00000000..ed86b142 --- /dev/null +++ b/docs/kf6options/CMakeLists.txt @@ -0,0 +1 @@ +kdoctools_create_manpage(man-kf6options.7.docbook 7 INSTALL_DESTINATION ${KDE_INSTALL_MANDIR}) diff --git a/docs/kf5options/man-kf5options.7.docbook b/docs/kf6options/man-kf6options.7.docbook similarity index 93% rename from docs/kf5options/man-kf5options.7.docbook rename to docs/kf6options/man-kf6options.7.docbook index 2ced6c75..b0f26aa1 100644 --- a/docs/kf5options/man-kf5options.7.docbook +++ b/docs/kf6options/man-kf6options.7.docbook @@ -8,18 +8,18 @@ <title>&frameworks; Command Line Documentation</title> <author>&Lauri.Watts; &Lauri.Watts.mail;</author> <date>2016-05-13</date> -<releaseinfo>Frameworks 5.22</releaseinfo> +<releaseinfo>Frameworks 6.0</releaseinfo> <productname>KDE Frameworks</productname> </refentryinfo> <refmeta> -<refentrytitle>kf5options</refentrytitle> +<refentrytitle>kf6options</refentrytitle> <manvolnum>7</manvolnum> </refmeta> <refnamediv> -<refname>kf5options</refname> -<refpurpose>Common commandline options for all applications based on &kf5-full;</refpurpose> +<refname>kf6options</refname> +<refpurpose>Common commandline options for all applications based on &kf6-full;</refpurpose> </refnamediv> <refsynopsisdiv> @@ -76,7 +76,7 @@ file can put its own name into the exec command. <refsect1> <title>See Also</title> -<para>qt5options(7)</para> +<para>qt6options(7)</para> </refsect1> diff --git a/docs/meinproc6/man-meinproc6.1.docbook b/docs/meinproc6/man-meinproc6.1.docbook index e6888a08..d268089a 100644 --- a/docs/meinproc6/man-meinproc6.1.docbook +++ b/docs/meinproc6/man-meinproc6.1.docbook @@ -211,7 +211,7 @@ file in that directory for more details. <refsect1> <title>See Also</title> -<para><replaceable>kf5options</replaceable>(7), <replaceable>qt5options</replaceable>(7)</para> +<para><replaceable>kf6options</replaceable>(7), <replaceable>qt6options</replaceable>(7)</para> </refsect1> <refsect1> diff --git a/docs/qt5options/CMakeLists.txt b/docs/qt5options/CMakeLists.txt deleted file mode 100644 index 7e31e0f6..00000000 --- a/docs/qt5options/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -kdoctools_create_manpage(man-qt5options.7.docbook 7 INSTALL_DESTINATION ${KDE_INSTALL_MANDIR}) diff --git a/docs/qt6options/CMakeLists.txt b/docs/qt6options/CMakeLists.txt new file mode 100644 index 00000000..ee7ae03b --- /dev/null +++ b/docs/qt6options/CMakeLists.txt @@ -0,0 +1 @@ +kdoctools_create_manpage(man-qt6options.7.docbook 7 INSTALL_DESTINATION ${KDE_INSTALL_MANDIR}) diff --git a/docs/qt5options/man-qt5options.7.docbook b/docs/qt6options/man-qt6options.7.docbook similarity index 95% rename from docs/qt5options/man-qt5options.7.docbook rename to docs/qt6options/man-qt6options.7.docbook index ac86a54a..2b9f4e79 100644 --- a/docs/qt5options/man-qt5options.7.docbook +++ b/docs/qt6options/man-qt6options.7.docbook @@ -9,17 +9,17 @@ <author>&Lauri.Watts; &Lauri.Watts.mail;</author> <author>&Burkhard.Lueck; &Burkhard.Lueck.mail;</author> <date>2016-06-04</date> -<releaseinfo>Qt 5.4</releaseinfo> +<releaseinfo>Qt 6</releaseinfo> <productname>KDE Frameworks</productname> </refentryinfo> <refmeta> -<refentrytitle>qt5options</refentrytitle> +<refentrytitle>qt6options</refentrytitle> <manvolnum>7</manvolnum> </refmeta> <refnamediv> -<refname>qt5options</refname> +<refname>qt6options</refname> <refpurpose>Common commandline options for all applications based on the &Qt; toolkit</refpurpose> </refnamediv> @@ -244,7 +244,7 @@ Display the version string of the application. <refsect1> <title>See Also</title> -<para><replaceable>kf5options</replaceable>(7)</para> +<para><replaceable>kf6options</replaceable>(7)</para> </refsect1> @@ -252,9 +252,9 @@ Display the version string of the application. <title>Authors</title> <para>Man page originally written by &Lauri.Watts; &Lauri.Watts.mail;</para> <para>Updated to &frameworks; 5 by &Burkhard.Lueck; &Burkhard.Lueck.mail;</para> -<para>The infos for this man page are from <ulink url="https://doc.qt.io/qt-5/qapplication.html#QApplication">QApplication documentation</ulink>, -<ulink url="https://doc.qt.io/qt-5/qguiapplication.html#QGuiApplication">QGuiApplication documentation</ulink> -and <ulink url="https://doc.qt.io/qt-5/qcommandlineparser.html">QCommandLineParser documentation</ulink>.</para> +<para>The infos for this man page are from <ulink url="https://doc.qt.io/qt-6/qapplication.html#QApplication">QApplication documentation</ulink>, +<ulink url="https://doc.qt.io/qt-6/qguiapplication.html#QGuiApplication">QGuiApplication documentation</ulink> +and <ulink url="https://doc.qt.io/qt-6/qcommandlineparser.html">QCommandLineParser documentation</ulink>.</para> </refsect1> </refentry> diff --git a/src/man-template.docbook b/src/man-template.docbook index 42424cab..cf5a0b61 100644 --- a/src/man-template.docbook +++ b/src/man-template.docbook @@ -104,8 +104,8 @@ url="help:/ --commandname-- ">help:/<!--command--></ulink> <userinput><command>khelpcenter</command> <parameter>help:/<!--command--></parameter></userinput>).</member> <!--for man pages replace "help:/" with "man:/" in this member--> -<member>kf5options(7)</member> <!-- only for application with a GUI--> -<member>qt5options(7)</member> <!-- only for application with a GUI--> +<member>kf6options(7)</member> <!-- only for application with a GUI--> +<member>qt6options(7)</member> <!-- only for application with a GUI--> <!--<member>foo(1)</member> more man page references if applicable--> <member>There is also further information available at <!--link to website if applicable--></member>