Git commit 0a2757ee2d202e5aa83a021573d405225967a3fd by Burkhard Lück, on behalf of Frerich Raabe. Committed on 15/11/2016 at 07:30. Pushed by lueck into branch 'master'.
- The AUTHORS section is not generated automatically anymore, we have to do it ourselves now. - Change 'Qt Generic Options' and 'KDE Generic Options' to 'Qt Options' and 'KDE Options' - otherwise the synposis line became too bloody long. svn path=/trunk/kdebase/doc/konqueror/; revision=384803 M +7 -2 doc/konqueror/man-kbookmarkmerger.1.docbook http://commits.kde.org/keditbookmarks/0a2757ee2d202e5aa83a021573d405225967a3fd diff --git a/doc/konqueror/man-kbookmarkmerger.1.docbook b/doc/konqueror/man-kbookmarkmerger.1.docbook index 9a0d820..c285b84 100644 --- a/doc/konqueror/man-kbookmarkmerger.1.docbook +++ b/doc/konqueror/man-kbookmarkmerger.1.docbook @@ -29,8 +29,8 @@ <refsynopsisdiv> <cmdsynopsis> &kbookmarkmerger; - <arg choice="opt" rep="repeat">KDE Generic Options</arg> - <arg choice="opt" rep="repeat">Qt Generic Options</arg> + <arg choice="opt" rep="repeat">Qt Options</arg> + <arg choice="opt" rep="repeat">KDE Options</arg> <arg choice="req">directory</arg> </cmdsynopsis> </refsynopsisdiv> @@ -109,5 +109,10 @@ 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>Author</title> +<para>&Frerich.Raabe; &Frerich.Raabe.mail;</para> +</refsect1> </refentry>
