diff options
| author | Darrell Anderson <[email protected]> | 2012-02-24 22:53:44 -0600 |
|---|---|---|
| committer | Darrell Anderson <[email protected]> | 2012-02-24 23:26:11 -0600 |
| commit | fc2650816b4b95f21750c53c0d45daeff31510d6 (patch) | |
| tree | 7227267d1ba5acef3b86db06979667a13bebc7c5 /doc/konqueror/man-kbookmarkmerger.1.docbook | |
| parent | ca1a4375014b6f78a06c74169a1285abbcbcd819 (diff) | |
| download | tdebase-fc2650816b4b95f21750c53c0d45daeff31510d6.tar.gz tdebase-fc2650816b4b95f21750c53c0d45daeff31510d6.zip | |
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.
Diffstat (limited to 'doc/konqueror/man-kbookmarkmerger.1.docbook')
| -rw-r--r-- | doc/konqueror/man-kbookmarkmerger.1.docbook | 6 |
1 files changed, 3 insertions, 3 deletions
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; </author> <date>February 1st, 2005</date> - <productname>K Desktop Environment</productname> + <productname>Trinity Desktop Environment</productname> </refentryinfo> <refmeta> @@ -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.</para> |