Git commit a7f6a93315a9f6b1874152721b671a962bf2a087 by Burkhard L?ck. Committed on 24/02/2013 at 11:56. Pushed by lueck into branch 'master'.
remove consecutive duplicate word >with</>can< M +2 -2 doc/index.docbook http://commits.kde.org/cervisia/a7f6a93315a9f6b1874152721b671a962bf2a087 diff --git a/doc/index.docbook b/doc/index.docbook index 2db62aa..5451594 100644 --- a/doc/index.docbook +++ b/doc/index.docbook @@ -1251,7 +1251,7 @@ differing section of 3 total. </para> <para> -Now can can decide section by section which version you want to have in the +Now you can decide section by section which version you want to have in the merged file. By pressing <guibutton>A</guibutton>, you take over the version you edited. By pressing <guibutton>B</guibutton>, you take over the version from the repository. By pressing <guibutton>A+B</guibutton>, both versions will be added, @@ -1638,7 +1638,7 @@ log</command>. You can mark two revisions, called "A" and "B" relevant if you make use of further features provided by the buttons. Revision "A" can be chosen with the left mouse button, revision "B" with the middle one. In the list view, you can also -navigate with with your cursor keys. In order to mark revisions "A" and "B", +navigate with your cursor keys. In order to mark revisions "A" and "B", use the shortcuts <keycombo action="simul">&Ctrl;<keycap>A</keycap></keycombo>, <keycombo action="simul">&Ctrl;<keycap>B</keycap></keycombo>, respectively. Using the <guilabel>CVS Output</guilabel> view, you can click on the
