[keditbookmarks] doc/konqueror: - New version which is closer to the template. Need to adjust kde-man.xsl so

Burkhard Lück lueck at hube-lueck.de
Tue Nov 15 12:11:37 UTC 2016 

Git commit bb8f3c98382983bfb5e70399f4ddc201c620103e by Burkhard Lück, on behalf of Frerich Raabe.
Committed on 15/11/2016 at 07:30.
Pushed by lueck into branch 'master'.

- New version which is closer to the template. Need to adjust kde-man.xsl so
  that the email address shows up in the AUTHOR section.

svn path=/trunk/kdebase/doc/konqueror/; revision=384800

M  +39   -103  doc/konqueror/man-kbookmarkmerger.1.docbook

http://commits.kde.org/keditbookmarks/bb8f3c98382983bfb5e70399f4ddc201c620103e

diff --git a/doc/konqueror/man-kbookmarkmerger.1.docbook b/doc/konqueror/man-kbookmarkmerger.1.docbook
index ab5ee9f..9a0d820 100644
--- a/doc/konqueror/man-kbookmarkmerger.1.docbook
+++ b/doc/konqueror/man-kbookmarkmerger.1.docbook
@@ -1,26 +1,22 @@
 <?xml version="1.0" ?>
 <!-- vim:set ts=4 noet syntax=xml: -->
-<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.1-Based Variant V1.0//EN" "dtd/kdex.dtd" [
-  <!ENTITY kappname "kbookmarkmerger">
-  <!ENTITY % English "INCLUDE" >
-  <!ENTITY kbookmarkmerger "<application>KBookmarkMerger</application>">
-  <!ENTITY XBEL "<acronym>XBEL</acronym>">
+<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+<!ENTITY % English "INCLUDE">
+<!ENTITY kbookmarkmerger "<command>kbookmarkmerger</command>">
 ]>
 
-<refentry>
+<refentry lang="&language;">
 <refentryinfo>
 	<title>KDE User's Manual</title>
 	<author>
-		<firstname>Frerich</firstname><surname>Raabe</surname>
-		<affiliation><address><email>raabe at kde.org</email></address></affiliation>
+		&Frerich.Raabe;
+		&Frerich.Raabe.mail;
 	</author>
-	<copyright><year>2005</year><holder>Frerich Raabe</holder></copyright>
-	<date>January 31, 2005</date>
-	<productname>K Desktop Environment</productname>
+	<date>February 1st, 2005</date>
 </refentryinfo>
 
 <refmeta>
-	<refentrytitle>KBOOKMARKMERGER</refentrytitle>
+	<refentrytitle>&kbookmarkmerger;</refentrytitle>
 	<manvolnum>1</manvolnum>
 </refmeta>
 
@@ -31,16 +27,16 @@
 </refnamediv>
 
 <refsynopsisdiv>
-	<cmdsynopsis>
-		<command>kbookmarkmerger</command>
-		<arg choice="opt" rep="repeat">Qt-option</arg>
-		<arg choice="opt" rep="repeat">&kde;-option</arg>
-		<arg choice="req">directory</arg>
-	</cmdsynopsis>
+<cmdsynopsis>
+	&kbookmarkmerger;
+	<arg choice="opt" rep="repeat">KDE Generic Options</arg>
+	<arg choice="opt" rep="repeat">Qt Generic Options</arg>
+	<arg choice="req">directory</arg>
+</cmdsynopsis>
 </refsynopsisdiv>
 
 <refsect1>
-<title>DESCRIPTION</title>
+<title>Description</title>
 <para>&kbookmarkmerger; is a program for merging a given set of bookmarks into
 the user's set of bookmarks; if the user doesn't have any bookmarks created
 yet, a new bookmark list is created and the given bookmarks are inserted into
@@ -69,87 +65,41 @@ installed.</para>
 <para>The only parameter required by &kbookmarkmerger; is the name of a
 directory which shall be scanned for bookmark files. All files in the given
 directory will be considered for being merged into the user's setup. The
-files in the given directory should be valid &XBEL; files.</para>
+files in the given directory should be valid <acronym>XBEL</acronym>
+files.</para>
 </refsect1>
 
 <refsect1>
-<title>OPTIONS</title>
-<para>This program follows the usual GNU command line syntax, with long options
-starting with two dashes (<quote>--</quote>). A summary of the options
-supported by &kbookmarkmerger; follows.</para>
-
-<refsect2 id="generic-options">
-<title>Generic Options</title>
-<variablelist>
-<varlistentry>
-	<term><option>--author</option></term>
-	<listitem><para>Show author information.</para></listitem>
-</varlistentry>
-<varlistentry>
-	<term><option>--help</option></term>
-	<listitem><para>Show help about options specific to &kbookmarkmerger;.</para></listitem>
-</varlistentry>
-<varlistentry>
-	<term><option>--help-qt</option></term>
-	<listitem><para>Show help about Qt specific options.</para></listitem>
-</varlistentry>
-<varlistentry>
-	<term><option>--help-kde</option></term>
-	<listitem><para>Show help about &kde; specific options.</para></listitem>
-</varlistentry>
-<varlistentry>
-	<term><option>--help-all</option></term>
-	<listitem><para>Show help about all options.</para></listitem>
-</varlistentry>
-<varlistentry>
-	<term><option>--license</option></term>
-	<listitem><para>Show information about license terms under which &kbookmarkmerger; is distributed.</para></listitem>
-</varlistentry>
-<varlistentry>
-	<term><option>-v</option></term>
-	<term><option>--version</option></term>
-	<listitem><para>Show version information.</para></listitem>
-</varlistentry>
-</variablelist>
-</refsect2>
-
-<refsect2>
-<title>Qt Options</title>
-<para>None Qt specific options which &kbookmarkmerger; provides have any
-effect since &kbookmarkmerger; is a console application and does not provide
-any &GUI;.</para>
-</refsect2>
-
-<refsect2>
-<title>&kde; Options</title>
-<para>Only the following &kde; specific parameters will show any effect when
-running &kbookmarkmerger;, since it's a console application and hence does
-not provide any &GUI;.</para>
-
+<title>See Also</title>
 <variablelist>
-<varlistentry>
-<term><option>--dcopserver <replaceable>server</replaceable></option></term>
-	<listitem><para>Use the &DCOP; server specified by <replaceable>server</replaceable>.</para></listitem>
-</varlistentry>
-<varlistentry>
-	<term><option>--nocrashhandler</option></term>
-	<listitem><para>Disable crash handler, generate core dumps.</para></listitem>
-</varlistentry>
+<varlistentry><term/><listitem><para>
+	<ulink url="http://docs.kde.org/keditbookmarks/index.html"><application>KEditBookmarks</application> manual</ulink>
+</para></listitem></varlistentry>
+<varlistentry><term/><listitem><para>
+	<ulink url="http://docs.kde.org/konqueror/index.html">&konqueror; manual</ulink>
+</para></listitem></varlistentry>
 </variablelist>
-</refsect2>
 </refsect1>
 
 <refsect1>
-<title>EXAMPLES</title>
+<title>Examples</title>
 <screen>joe at hal9000:~> <command>kbookmarkmerger <filename>/usr/local/extra-bookmarks</filename></command></screen>
-<para>
-Merges all bookmark files stored in
-<filename>/usr/local/extra-bookmarks</filename> into joe's list of bookmark.
-</para>
+<para>Merges all bookmark files stored in
+<filename>/usr/local/extra-bookmarks</filename> into joe's list of
+bookmarks.</para>
 </refsect1>
 
 <refsect1>
-<title>NOTES</title>
+<title>Standards</title>
+<variablelist>
+<varlistentry><term/><listitem><para>
+	<ulink url="http://pyxml.sourceforge.net/topics/xbel/"><acronym>XBEL</acronym> specification</ulink>
+</para></listitem></varlistentry>
+</variablelist>
+</refsect1>
+
+<refsect1>
+<title>Restrictions</title>
 <para>When determining whether a given bookmark file has been merged into the
 user's bookmarks already or not, &kbookmarkmerger; merely looks at the
 filename of the bookmark file - the contents are not checked at all. This means
@@ -159,19 +109,5 @@ will not trigger merging it once again.</para>
 <para>Also note that in case a user modifies a bookmark which was merged into
 his setup, the original bookmark file will be left unmodified.</para>
 </refsect1>
-
-<refsect1>
-<title>SEE ALSO</title>
-<variablelist>
-	<varlistentry><term/><listitem><para>
-	<ulink url="http://pyxml.sourceforge.net/topics/xbel/">&XBEL; specification</ulink>
-	</para></listitem></varlistentry>
-	<varlistentry><term/><listitem><para>
-	<ulink url="http://docs.kde.org/keditbookmarks/index.html"><application>KEditBookmarks</application> manual</ulink>
-	</para></listitem></varlistentry>
-	<varlistentry><term/><listitem><para>
-	<ulink url="http://docs.kde.org/konqueror/index.html">&konqueror; manual</ulink>
-	</para></listitem></varlistentry>
-</variablelist>
-</refsect1>
 </refentry>
+

More information about the kde-doc-english mailing list