From fc2650816b4b95f21750c53c0d45daeff31510d6 Mon Sep 17 00:00:00 2001 From: Darrell Anderson Date: Fri, 24 Feb 2012 22:53:44 -0600 Subject: Update tdebase cmake files with STARTKDE->STARTTDE. Fix tdebase entities, text strings for future maintenance of handbook files. This partially resolves bug report 694. Update konqueror user agent strings. This partially resolves bug report 774. Update TDM help options. This resolves bug report 618. Fix KTips branding issues and obsolete web addresses. This resolves bug report 842. --- doc/konqueror/man-kbookmarkmerger.1.docbook | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'doc/konqueror/man-kbookmarkmerger.1.docbook') diff --git a/doc/konqueror/man-kbookmarkmerger.1.docbook b/doc/konqueror/man-kbookmarkmerger.1.docbook index dab890556..dc041c71d 100644 --- a/doc/konqueror/man-kbookmarkmerger.1.docbook +++ b/doc/konqueror/man-kbookmarkmerger.1.docbook @@ -13,7 +13,7 @@ &Frerich.Raabe.mail; February 1st, 2005 - K Desktop Environment + Trinity Desktop Environment @@ -43,8 +43,8 @@ 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 it. While doing this, &kbookmarkmerger; keeps track of which files were merged in a previous run already, so no bookmark will get installed to the -user's bookmarks more than once. In case &kde; is running while -&kbookmarkmerger; is executed, the &kde; bookmark subsystem will be informed +user's bookmarks more than once. In case &tde; is running while +&kbookmarkmerger; is executed, the &tde; bookmark subsystem will be informed of any changes to the user's bookmarks, so that all applications accessing that information (&ie; &konqueror;) will pick the changes up instantly. -- cgit v1.2.1