diff options
| author | Emmanuel Pescosta <[email protected]> | 2015-01-28 17:13:59 +0100 |
|---|---|---|
| committer | Emmanuel Pescosta <[email protected]> | 2015-01-28 17:13:59 +0100 |
| commit | a06ee3399bece608790e419054f95807a017a020 (patch) | |
| tree | 9caa2fd08b4c83e1ff2bad7cd51dfba6a60d2a7c /docs | |
| parent | 7745a9354776c6043b4f691260e434c29de6ca0c (diff) | |
| parent | cf6bb7bdb8df6f484a39403c7842343bceebf4b7 (diff) | |
Merge branch 'Applications/14.12' into frameworks
Conflicts:
dolphin/src/main.cpp
kdepasswd/kcm/kcm_useraccount.desktop
konqueror/settings/ebrowsing/ebrowsing.desktop
konqueror/settings/kio/cache.desktop
konqueror/settings/kio/cookies.desktop
konqueror/settings/kio/netpref.desktop
konqueror/settings/kio/proxy.desktop
konqueror/settings/kio/smb.desktop
konqueror/settings/kio/uasproviders/firefox30oncurrent.desktop
konqueror/settings/kio/uasproviders/ie90onwinnt71.desktop
konqueror/settings/kio/useragent.desktop
lib/konq/konq_operations.cpp
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/index.docbook | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/docs/index.docbook b/docs/index.docbook index 3c817620f..fe3357c2f 100644 --- a/docs/index.docbook +++ b/docs/index.docbook @@ -74,7 +74,7 @@ <legalnotice>&FDLNotice;</legalnotice> <date>2013-06-28</date> -<releaseinfo>2.3 (&kde; 4.11)</releaseinfo> +<releaseinfo>4.11 (&kde; 4.11)</releaseinfo> <abstract> <para> @@ -747,9 +747,9 @@ in the &dolphin; view. <para> This panel contains a terminal. The terminal will open at the folder currently shown in the &dolphin; view. Changing the folder in the active &dolphin; -view will update the working folder of the terminal. The terminal only -works with local media. Note: Changing folder in the terminal will not -affect the &dolphin; view. +view will update the working folder of the terminal. Changing the directory in +the terminal will update the working folder in the &dolphin; view. The +terminal only works with local media. </para> </sect2> |