Git commit 4cd54af40b74ac113ec3f2b268e83fc99d293179 by Burkhard Lück. Committed on 02/08/2015 at 18:42. Pushed by lueck into branch 'master'.
Update docbooks in kdelibs4support REVIEW:124552 M +13 -3 docs/kdebugdialog5/index.docbook M +57 -12 docs/kf5-config/man-kf5-config.1.docbook http://commits.kde.org/kdelibs4support/4cd54af40b74ac113ec3f2b268e83fc99d293179 diff --git a/docs/kdebugdialog5/index.docbook b/docs/kdebugdialog5/index.docbook index 7c49614..5ebb6b9 100644 --- a/docs/kdebugdialog5/index.docbook +++ b/docs/kdebugdialog5/index.docbook @@ -17,8 +17,8 @@ <!-- TRANS:ROLES_OF_TRANSLATORS --> </authorgroup> -<date>2011-12-20</date> -<releaseinfo>1.0 &kde; 4.8</releaseinfo> +<date>2015-07-31</date> +<releaseinfo>Frameworks 5.13</releaseinfo> <keywordset> <keyword>KDE</keyword> @@ -33,6 +33,15 @@ It features a simple and a full mode.</para> <para>In order to be able to make changes <guilabel>Disable all debug output</guilabel> has to be unchecked.</para> +<note> +<para>Only for applications using the Frameworks library kdelibs4support.</para> +<para>kDebug() has been deprecated in &kde; Frameworks 5, in favour of &Qt;'s builtin categorized +logging, see<ulink url="http://doc.qt.io/qt-5/qloggingcategory.html";>QLoggingCategory</ulink>. +Use the program <ulink url="https://projects.kde.org/projects/kde/kdeutils/kdebugsettings";>kdebugsettings</ulink> +to enable/disable qCDebug. +</para> +</note> + <variablelist> <varlistentry> <term>Simple mode</term> @@ -115,7 +124,8 @@ message.</para> <para>When you close the dialog by pressing <guibutton>OK</guibutton>, your entries apply immediately and are saved in -<filename>$<envar>KDEHOME</envar>/share/config/kdebugrc</filename>. When you press +<filename>$<envar>XDG_CONFIG_HOME</envar>/kdebugrc</filename> +(~/.config/kdebugrc by default). When you press <guibutton>Cancel</guibutton>, your entries are discarded and the old ones are restored.</para> diff --git a/docs/kf5-config/man-kf5-config.1.docbook b/docs/kf5-config/man-kf5-config.1.docbook index d4a6e1c..ecc84b1 100644 --- a/docs/kf5-config/man-kf5-config.1.docbook +++ b/docs/kf5-config/man-kf5-config.1.docbook @@ -5,14 +5,15 @@ <refentry lang="&language;"> <refentryinfo> -<title>&kde; User's Manual</title> +<title>kf5-config User's Manual</title> <author> <firstname>Stephan</firstname> <surname>Kulow</surname> <affiliation><address><email>[email protected]</email></address></affiliation> </author> -<date>2007-09-28</date> -<productname>K Desktop Environment</productname> +<date>2015-07-31</date> +<releaseinfo>Frameworks 5.13</releaseinfo> +<productname>KDE Frameworks</productname> </refentryinfo> <refmeta> @@ -22,7 +23,7 @@ <refnamediv> <refname><command>kf5-config</command></refname> -<refpurpose>Prints &kde; installation paths</refpurpose> +<refpurpose>Prints &Qt; and Frameworks installation paths</refpurpose> </refnamediv> <refsynopsisdiv> @@ -34,22 +35,31 @@ <arg>--libsuffix</arg> <arg>--localprefix</arg> <arg>--version</arg> +<arg>--kde-version</arg> <arg>--types</arg> <arg>--path <replaceable>type</replaceable></arg> <arg>--userpath <replaceable>type</replaceable></arg> <arg>--install <replaceable>type</replaceable></arg> +<arg>--qt-prefix</arg> +<arg>--qt-binaries</arg> +<arg>--qt-libraries</arg> +<arg>--qt-plugins</arg> + </cmdsynopsis> </refsynopsisdiv> <refsect1> <title>Description</title> <para>kf5-config is a command line program used to retrieve information -about &kde; installation or user paths.</para> +about Frameworks installation or user paths.</para> -<para>Use this program to determine where the various aspects of the &kde; +<para>Use this program to determine where the various aspects of the Frameworks installation reside on your system. </para> +<note><para>kf5-config is mostly a deprecated replacement for kde4-config, while the +recommended tool to use instead is qtpaths (which is shipped with &Qt;). +</para></note> </refsect1> <refsect1> @@ -66,14 +76,14 @@ installation reside on your system. <varlistentry> <term><option>--prefix</option></term> <listitem> -<para>Compiled in prefix for &kde; libraries</para> +<para>Compiled in prefix for Frameworks libraries</para> </listitem> </varlistentry> <varlistentry> <term><option>--exec-prefix</option></term> <listitem> -<para>Compiled in exec_prefix for &kde; libraries</para> +<para>Compiled in exec_prefix for Frameworks libraries</para> </listitem> </varlistentry> @@ -94,7 +104,14 @@ installation reside on your system. <varlistentry> <term><option>--version</option></term> <listitem> -<para>Compiled in version string for &kde; libraries</para> +<para>Version of &Qt; and compiled in version string for Frameworks libraries and kf5-config</para> +</listitem> +</varlistentry> + +<varlistentry> +<term><option>--kde-version</option></term> +<listitem> +<para>Compiled in version string for Frameworks libraries</para> </listitem> </varlistentry> @@ -115,7 +132,7 @@ installation reside on your system. <varlistentry> <term><option>--userpath <replaceable>type</replaceable></option></term> <listitem> -<para>User paths for the types: desktop|autostart|trash|document</para> +<para>User paths for the types: desktop|document</para> </listitem> </varlistentry> @@ -126,13 +143,41 @@ installation reside on your system. </listitem> </varlistentry> +<varlistentry> +<term><option>--qt-prefix</option></term> +<listitem> +<para>Installation prefix for &Qt;</para> +</listitem> +</varlistentry> + +<varlistentry> +<term><option>--qt-binaries</option></term> +<listitem> +<para>Location of installed &Qt; binaries</para> +</listitem> +</varlistentry> + +<varlistentry> +<term><option>--qt-libraries</option></term> +<listitem> +<para>Location of installed &Qt; libraries</para> +</listitem> +</varlistentry> + +<varlistentry> +<term><option>--qt-plugins</option></term> +<listitem> +<para>Location of installed &Qt; plugins</para> +</listitem> +</varlistentry> + </variablelist> </refsect1> <refsect1> <title>Examples</title> -<para>Print the top-level &kde; installation directory:</para> +<para>Print the top-level Frameworks installation directory:</para> <para> <prompt>%</prompt><userinput> <command>kf5-config --prefix</command> </userinput> @@ -156,7 +201,7 @@ installation reside on your system. <refsect1> <title>See Also</title> -<para>kdeoptions(7)</para> +<para>kf5options(7)</para> </refsect1> <refsect1> _______________________________________________ kde-doc-english mailing list [email protected] https://mail.kde.org/mailman/listinfo/kde-doc-english
