[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kate] doc: sync with Yuri's fixes for Krusader editor-viewer
From:       Burkhard_Lück <lueck () hube-lueck ! de>
Date:       2012-05-31 19:36:35
Message-ID: 20120531193635.A7C39A60A9 () git ! kde ! org
[Download RAW message or body]

Git commit 1ca86e945f3eb2089445e30ac7a0f23461f33fc8 by Burkhard Lück.
Committed on 31/05/2012 at 21:36.
Pushed by lueck into branch 'master'.

sync with Yuri's fixes for Krusader editor-viewer

M  +4    -3    doc/kate/menus.docbook
M  +4    -4    doc/kate/part.docbook
M  +1    -1    doc/kwrite/index.docbook
M  +16   -10   doc/kwrite/menus.docbook

http://commits.kde.org/kate/1ca86e945f3eb2089445e30ac7a0f23461f33fc8

diff --git a/doc/kate/menus.docbook b/doc/kate/menus.docbook
index c36fc62..ee9dd03 100644
--- a/doc/kate/menus.docbook
+++ b/doc/kate/menus.docbook
@@ -829,7 +829,8 @@ feature requires that you use a true fixed-width font.</para>
 </term>
 <listitem>
 <para>This is a toggle item. Setting it on checked will make the Icon Border
-visible in the left side of the active editor, and vice versa.</para>
+visible in the left side of the active editor, and vice versa. The Icon Border
+indicates the positions of the marked lines in the editor.</para>
 </listitem>
 </varlistentry>
 
@@ -951,13 +952,13 @@ Code Folding</link>.</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term><menuchoice><guimenuitem>Enlarge Font</guimenuitem></menuchoice>
+<term><menuchoice><guimenu>View</guimenu><guimenuitem>Enlarge \
Font</guimenuitem></menuchoice>  </term>
 <listitem><para>This increases the display font size.</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term><menuchoice><guimenuitem>Shrink Font</guimenuitem></menuchoice>
+<term><menuchoice><guimenu>View</guimenu><guimenuitem>Shrink \
Font</guimenuitem></menuchoice>  </term>
 <listitem><para>This decreases the display font size.</para></listitem>
 </varlistentry>
diff --git a/doc/kate/part.docbook b/doc/kate/part.docbook
index da1223e..20b27ea 100644
--- a/doc/kate/part.docbook
+++ b/doc/kate/part.docbook
@@ -373,7 +373,7 @@ with <keycombo action="simul">&Ctrl;<keycap>F</keycap></keycombo> \
or  from the <menuchoice><guimenu>Edit</guimenu>
 <guimenuitem>Find...</guimenuitem></menuchoice> menu item.</para>
 <para>This opens the incremental search bar at the bottom of the editor window.
-On the left side of the bar is an icon to close the bar, followed by a small text
+On the left side of the bar is a button with an icon to close the bar, followed by a \
small text   box for entering the search pattern.</para>
 <para>When you start entering characters of your search pattern, the search starts
 immediately. If there is a match in the text this is highlighted and the background \
color @@ -387,7 +387,7 @@ this highlighting, press the &Esc; key.</para>
 <para>You can choose whether the search should be case sensitive.
 Selecting <guilabel>Match Case</guilabel> will limit finds to entries that match the
 case (upper or lower) of each of the characters in the search  pattern.</para>
-<para>Click on the green arrow icon at the right side of the incremental search bar \
to +<para>Click on the button with a green arrow icon at the right side of the \
incremental search bar to  switch to the power search and replace bar.
 </para>
 <para>
@@ -410,7 +410,7 @@ or
 using the <menuchoice><guimenu>Edit</guimenu>
 <guimenuitem>Replace</guimenuitem></menuchoice> command, or the
 <keycombo action="simul">&Ctrl;<keycap>R</keycap></keycombo> shortcut.</para>
-<para>On the upper left side of the bar is an icon to close the bar, followed by a \
small text +<para>On the upper left side of the bar is a button with an icon to close \
the bar, followed by a small text  box for entering the search pattern.</para>
 <para>You can control the search mode by selecting the options <guilabel>Plain \
Text</guilabel>,  <guilabel>Whole Words</guilabel>, <guilabel>Escape \
Sequences</guilabel> or @@ -429,7 +429,7 @@ the search pattern. <guilabel>Selection \
Only</guilabel> will search and replace  within the current selection only. The \
<guilabel>Find All</guilabel> button highlights  all matches in the document and \
shows the number of found matches in a small popup.  </para>
-<para>Click on the green arrow icon at the right side of the power search and \
replace bar to +<para>Click on the button with a green arrow icon at the right side \
of the power search and replace bar to  switch to the incremental search bar.
 </para>
 <tip>
diff --git a/doc/kwrite/index.docbook b/doc/kwrite/index.docbook
index 7016c2a..097febf 100644
--- a/doc/kwrite/index.docbook
+++ b/doc/kwrite/index.docbook
@@ -54,7 +54,7 @@
 <legalnotice>&FDLNotice;</legalnotice>
 
 <date>2012-02-26</date>
-<releaseinfo>4.8.1</releaseinfo>
+<releaseinfo>4.8.4</releaseinfo>
 
 <abstract>
 <para>&kwrite; is a text editor for &kde; allowing you to edit one file at the time \
                per window.</para>
diff --git a/doc/kwrite/menus.docbook b/doc/kwrite/menus.docbook
index 3597ae0..d2837e3 100644
--- a/doc/kwrite/menus.docbook
+++ b/doc/kwrite/menus.docbook
@@ -337,7 +337,7 @@ action="simul">&Ctrl;<keycap>F</keycap></keycombo></shortcut>
 <guimenu>Edit</guimenu><guimenuitem>Find...</guimenuitem></menuchoice></term>
 <listitem>
 <para>This opens the incremental search bar at the bottom of the editor window.
-On the left side of the bar is an icon to close the bar, followed by a small text
+On the left side of the bar is a button with an icon to close the bar, followed by a \
small text  box for entering the search pattern.</para>
 <para>When you start entering characters of your search pattern, the search starts
 immediately. If there is a match in the text this is highlighted and the background \
color @@ -350,7 +350,7 @@ to jump to the next or previous match in the \
document.</para>  Selecting <guilabel>Match Case</guilabel> will limit finds to \
entries that match the  case (upper or lower) of each of the characters in the search \
pattern.  </para>
-<para>Click on the green arrow icon at the right side of the incremental search bar \
to +<para>Click on the button with a green arrow icon at the right side of the \
incremental search bar to  switch to the power search and replace bar.
 <!--changed in 4.5 ???
 options "Highlight all" + "From cursor" removed only "Match case" left-->
@@ -395,7 +395,7 @@ action="simul">&Ctrl;<keycap>R</keycap></keycombo></shortcut>
 <guimenu>Edit</guimenu><guimenuitem>Replace...</guimenuitem></menuchoice></term>
 <listitem>
 <para>This command opens the power search and replace bar.
-On the upper left side of the bar is an icon to close the bar, followed by a small \
text +On the upper left side of the bar is a button with an icon to close the bar, \
followed by a small text  box for entering the search pattern.</para>
 <para>You can control the search mode by selecting <guilabel>Plain text</guilabel>,
 <guilabel>Whole words</guilabel>, <guilabel>Escape sequences</guilabel> or
@@ -419,8 +419,8 @@ case (upper or lower) of each of the characters in the search  \
pattern.  The <guilabel>Find All</guilabel> button highlights all matches in the \
document and shows the  number of found matches in a small popup.
 </para>
-<para>Click on the green arrow icon at the right side of the power search and \
                replace bar to
-switch to the incremental search bar.
+<para>Click on the button with a green arrow icon at the right side of the power \
search and replace bar to +  itch to the incremental search bar.
 <!--changed in 4.5 ???
 options "Highlight all" + "From cursor" removed only "Match case" left
 -->
@@ -465,7 +465,7 @@ jump to a particular line (specified by number) in the document.  \
The  line number may be entered directly into the text box or graphically by
 clicking on the up or down arrow spin controls at the side of the text
 box. The little up arrow will increase the line number and the down
-arrow decrease it. Close the bar with a click on the icon on the left side of the \
bar. +arrow decrease it. Close the bar with a click on the button with an icon on the \
left side of the bar.  </para>
 </listitem>
 </varlistentry>
@@ -596,7 +596,8 @@ use a fixed pitch font.</para>
 </term>
 <listitem>
 <para>This is a toggle item. Setting it on checked will make the Icon Border
-visible in the left side of the active editor, and vice versa.</para>
+visible in the left side of the active editor, and vice versa. The Icon Border
+indicates the positions of the marked lines in the editor.</para>
 </listitem>
 </varlistentry>
 
@@ -626,7 +627,8 @@ editor, and vice versa.</para>
 </term>
 <listitem>
 <para>If this option is checked, the view will show marks on the vertical
-scrollbar.</para>
+scrollbar. The marks are equivalent to the marks on the <link
+linkend="view-show-icon-border">Icon Border</link>.</para>
 </listitem>
 </varlistentry>
 
@@ -635,6 +637,7 @@ scrollbar.</para>
 <anchor id="view-hide-folding-markers"/>
 <menuchoice>
 <shortcut><keycombo action="simul"><keycap>F9</keycap></keycombo></shortcut>
+<guimenu>View</guimenu>
 <guimenuitem>Show Folding Markers</guimenuitem>
 </menuchoice> (Power user mode)
 </term>
@@ -648,6 +651,7 @@ shown.</para>
 <term>
 <anchor id="view-code-folding"/>
 <menuchoice>
+<guimenu>View</guimenu>
 <guisubmenu>Code Folding</guisubmenu>
 </menuchoice> (Power user mode)
 </term>
@@ -686,13 +690,15 @@ shown.</para>
 </varlistentry>
 
 <varlistentry>
-<term><menuchoice><guimenuitem>Enlarge Font</guimenuitem></menuchoice>
+<term><menuchoice><guimenu>View</guimenu>
+<guimenuitem>Enlarge Font</guimenuitem></menuchoice>
 </term>
 <listitem><para>This increases the display font size.</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term><menuchoice><guimenuitem>Shrink Font</guimenuitem></menuchoice>
+<term><menuchoice><guimenu>View</guimenu>
+<guimenuitem>Shrink Font</guimenuitem></menuchoice>
 </term>
 <listitem><para>This decreases the display font size.</para></listitem>
 </varlistentry>


[prev in list] [next in list] [prev in thread] [next in thread] 

Configure | About | News | Add a list | Sponsored by KoreLogic