Git commit 26e3d09c351f06b8739ee06c8b841d7f029fae0d by Burkhard Lück. Committed on 22/07/2016 at 19:03. Pushed by lueck into branch 'master'.
Adapt KBibTeX docbooks to kf5 index.docbook remove entities already in kdoctools or obsolete/unused &kde; -> &kf5-full; remove appendix installation man docbook "for KDE" -> "by KDE" remove options from kde3 and replace with reference to qt5options and kf5options program.cpp "A BibTeX editor for KDE" -> "A BibTeX editor by KDE" REVIEW:128320 M +11 -17 doc/index.docbook M +13 -64 doc/man-kbibtex.1.docbook M +1 -1 src/program/program.cpp http://commits.kde.org/kbibtex/26e3d09c351f06b8739ee06c8b841d7f029fae0d diff --git a/doc/index.docbook b/doc/index.docbook index d348305..a88c1ce 100644 --- a/doc/index.docbook +++ b/doc/index.docbook @@ -1,6 +1,5 @@ <?xml version="1.0" ?> <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [ - <!ENTITY kile "<application>Kile</application>"> <!ENTITY latex "L<superscript>A</superscript>T<subscript>E</subscript>X"> <!ENTITY pdflatex "PDFL<superscript>A</superscript>T<subscript>E</subscript>X"> <!ENTITY pdf "<acronym>PDF</acronym>"> @@ -9,11 +8,7 @@ <!ENTITY texlive "<application>TeX Live</application>"> <!ENTITY bibtex "BibT<subscript>E</subscript>X"> <!ENTITY biblatex "<application>biblatex</application>"> - <!ENTITY makeindex "makeindex"> - <!ENTITY kbibtex "KBibTeX"> <!ENTITY lyx "<application>LyX</application>"> - <!ENTITY kappname "&kbibtex;"> - <!ENTITY package "extragear-office"> <!ENTITY % addindex "IGNORE"> <!ENTITY % English "INCLUDE"> ]> @@ -54,7 +49,7 @@ <keywordset> <keyword>KDE</keyword> - <keyword>&kbibtex;</keyword> + <keyword>kbibtex</keyword> <keyword>LaTeX</keyword> <keyword>TeX</keyword> <keyword>bibliography</keyword> @@ -72,7 +67,7 @@ <itemizedlist> <listitem> <para> - <ulink url="http://www.kde.org/";>&kde; basic libraries</ulink>. + <ulink url="http://www.kde.org/";>&kf5-full; libraries</ulink>. </para> </listitem> <listitem> @@ -216,6 +211,15 @@ <title> Writing a Bibliography File for Beginners </title> + <!-- 1) No request from kbibtex from Distri user (Kubuntu) nor from kbibtex self compiled as devel user + 2a) Distri user has a mimeapps.list in home, but no kbibtex in it + 2b) Devel user has no mimeapps.list in home + 2c) Systemsettings -> File Associations is the place to edit/chnage this in a kde desktop + update after rebuilding post 2014-01-12 + Now request Dialog, but in File Associations first app for text/x-bibtext is already kbibtex + (why? from installation of distri?) + This dialog even pops up when opening a .bib file with LMB click in file manager + --> <para> After the first run, &kbibtex; will propose to make it the default editor for bibliography formats. We recommend you to do so.<footnote><para>If for some reasons you will decide to reconsider please remove the strings with <literal>kbibtex</literal> substring from <filename>mimeapps.list</filename> file in <filename role="directory">.local/share/applications</filename> folder of your home folder.</para></footnote> </para> @@ -1703,16 +1707,6 @@ latex example</screen> &underGPL; </chapter> -<appendix id="installation"> - <title>Installation</title> - <para> - The default way to install &kbibtex; is to use the package manager and software repositories of your distribution. - </para> - <para> - Please use <ulink url="http://home.gna.org/kbibtex/download.html";>instructions from the official &kbibtex; page</ulink> to download the source code of &kbibtex; and compile it by yourself. - </para> -</appendix> - <bibliography> <biblioentry> <abbrev>Lamport86</abbrev> diff --git a/doc/man-kbibtex.1.docbook b/doc/man-kbibtex.1.docbook index 0abab3c..25892b0 100644 --- a/doc/man-kbibtex.1.docbook +++ b/doc/man-kbibtex.1.docbook @@ -5,12 +5,12 @@ <refentry lang="&language;"> <refentryinfo> -<title>KDE User's Manual</title> +<title>KBibTeX User's Manual</title> <author><firstname>Thomas</firstname><surname>Fischer</surname> <contrib>KBibTeX man page.</contrib> <email>[email protected]</email></author> -<date>2013-12-30</date> -<productname>kbibtex</productname> +<date>2016-06-29</date> +<!--FIXME <releaseinfo>KBibTeX </releaseinfo>--> </refentryinfo> <refmeta> @@ -20,14 +20,12 @@ <refnamediv> <refname><command>kbibtex</command></refname> -<refpurpose>a BibTeX editor for KDE written by Thomas Fischer and released under the GPL version 2 or later.</refpurpose> +<refpurpose>a BibTeX editor by KDE written by Thomas Fischer and released under the GPL version 2 or later.</refpurpose> </refnamediv> <refsynopsisdiv> <cmdsynopsis> <command>kbibtex</command> -<arg choice="opt"><replaceable>Qt-options</replaceable></arg> -<arg choice="opt"><replaceable>KDE-options</replaceable></arg> <arg choice="opt"><replaceable>URL</replaceable></arg> </cmdsynopsis> </refsynopsisdiv> @@ -35,66 +33,13 @@ <refsect1> <title>Description</title> <para> - KBibTeX is a BibTeX editor for KDE written by Thomas Fischer and released under the GPL version 2 or later. + KBibTeX is a BibTeX editor by KDE written by Thomas Fischer and released under the GPL version 2 or later. </para> <para> KBibTeX can be started as a standalone program or embedded as a KPart into virtually every &kde; program (⪚ Konqueror). </para> </refsect1> -<refsect1 id="generic_options"><title>Generic Options</title> -<variablelist> - <varlistentry> - <term><option>--help</option></term> - <listitem> -<para>Show help about options.</para> - </listitem> - </varlistentry> - <varlistentry> - <term><option>--help-qt</option></term> - <listitem> -<para>Show Qt specific options.</para> - </listitem> - </varlistentry> - <varlistentry> - <term><option>--help-kde</option></term> - <listitem> -<para>Show KDE specific options.</para> - </listitem> - </varlistentry> - <varlistentry> - <term><option>--help-all</option></term> - <listitem> -<para>Show all options.</para> - </listitem> - </varlistentry> - <varlistentry> - <term><option>--author</option></term> - <listitem> -<para>Show author information.</para> - </listitem> - </varlistentry> - <varlistentry> - <term><option>-v, --version</option></term> - <listitem> -<para>Show version information.</para> - </listitem> - </varlistentry> - <varlistentry> - <term><option>--license</option></term> - <listitem> -<para>Show license information.</para> - </listitem> - </varlistentry> - <varlistentry> - <term><option>--</option></term> - <listitem> -<para>End of options.</para> - </listitem> - </varlistentry> -</variablelist> -</refsect1> - <refsect1 id="arguments"><title>Arguments</title> <variablelist> <varlistentry> @@ -108,14 +53,18 @@ <refsect1> <title>See Also</title> -<para>More detailed user documentation is available from <ulink +<simplelist> +<member>More detailed user documentation is available from <ulink url="help:/kbibtex">help:/kbibtex</ulink> (either enter this <acronym>URL</acronym> into &konqueror;, or run <userinput><command>khelpcenter</command> -<parameter>help:/kbibtex</parameter></userinput>).</para> +<parameter>help:/kbibtex</parameter></userinput>).</member> +<member>kf5options(7)</member> +<member>qt5options(7)</member> +<member>There is also further information available at the <ulink +url="http://home.gna.org/kbibtex/";>KBibTeX official website</ulink>.</member> +</simplelist> -<para>There is also further information available at the <ulink -url="http://home.gna.org/kbibtex/";>KBibTeX official website</ulink>.</para> </refsect1> <refsect1> diff --git a/src/program/program.cpp b/src/program/program.cpp index f0cd6a0..ab72705 100644 --- a/src/program/program.cpp +++ b/src/program/program.cpp @@ -40,7 +40,7 @@ int main(int argc, char *argv[]) KLocalizedString::setApplicationDomain("kbibtex"); - KAboutData aboutData(QStringLiteral("kbibtex"), i18n("KBibTeX"), QLatin1String(versionNumber), i18n("A BibTeX editor for KDE"), KAboutLicense::GPL_V2, i18n("Copyright 2004-2015 Thomas Fischer"), QString(), QStringLiteral("http://home.gna.org/kbibtex/";)); + KAboutData aboutData(QStringLiteral("kbibtex"), i18n("KBibTeX"), QLatin1String(versionNumber), i18n("A BibTeX editor by KDE"), KAboutLicense::GPL_V2, i18n("Copyright 2004-2015 Thomas Fischer"), QString(), QStringLiteral("http://home.gna.org/kbibtex/";)); aboutData.addAuthor(i18n("Thomas Fischer"), i18n("Maintainer"), QStringLiteral("[email protected]")); _______________________________________________ kde-doc-english mailing list [email protected] https://mail.kde.org/mailman/listinfo/kde-doc-english
