← Back to branch summary

~ubuntu-branches/ubuntu/trusty/diffuse/trusty

« back to all changes in this revision

Viewing changes to src/usr/share/gnome/help/diffuse/C/diffuse.xml

  • Committer: Bazaar Package Importer
  • Author(s): Philipp Huebner
  • Date: 2011-08-06 15:06:57 UTC
  • mfrom: (1.1.10 upstream)
  • Revision ID: james.westby@ubuntu.com-20110806150657-j30zn60xtm0cq51b
Tags: 0.4.5-1
http://bugs.debian.org/623991
* New upstream release (closes: #623991)
* Removed unnecessary use of python-support
* debian/copyright:
  - bumped up copyright years
  - updated maintainer's email address
* debian/rules:
  - added build-arch and build-indep targets
  - removed unnecessary calls of dh_pysupport, dh_makeshlibs and dh_shlibdeps
* Updated Standards-Version: 3.9.2 (no changes needed)
* Deleted deprecated README.Debian

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/usr/share/gnome/help/diffuse/C/diffuse.xml
2
2
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
3
3
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
4
4
  <!ENTITY app "Diffuse">
5
 
  <!ENTITY app-version "0.4.4">
 
5
  <!ENTITY app-version "0.4.5">
6
6
]>
7
7
<book id="index" lang="en">
8
 
  <title>&app; User's Manual</title>
 
8
  <title><application>&app;</application> User's Manual</title>
9
9
 
10
10
  <bookinfo>
11
11
    <copyright>
12
 
      <year>2009-2010</year>
 
12
      <year>2009-2011</year>
13
13
      <holder>Derrick Moser</holder>
14
14
    </copyright>
15
15
 
21
21
      </author>
22
22
    </authorgroup>
23
23
 
24
 
    <releaseinfo>This manual describes version &app-version; of &app;.</releaseinfo>
 
24
    <releaseinfo>This manual describes version &app-version; of <application>&app;</application>.</releaseinfo>
25
25
  </bookinfo>
26
26
 
27
27
  <chapter id="introduction">
28
28
    <title>Introduction</title>
29
29
 
30
30
    <para>
31
 
      &app; is a graphical tool for merging and comparing text files.  &app;
 
31
      <application>&app;</application> is a graphical tool for merging and comparing text files.  <application>&app;</application>
32
32
      is able to compare an arbitrary number of files side-by-side and gives
33
33
      users the ability to manually adjust line matching and directly edit
34
 
      files.  &app; can also retrieve revisions of files from Bazaar, CVS,
 
34
      files.  <application>&app;</application> can also retrieve revisions of files from Bazaar, CVS,
35
35
      Darcs, Git, Mercurial, Monotone, RCS, Subversion, and SVK repositories
36
36
      for comparison and merging.
37
37
    </para>
39
39
    <sect1 id="introduction-about">
40
40
      <title>About</title>
41
41
      <para>
42
 
        &app; was written by Derrick Moser <email>derrick_moser@yahoo.com</email>.
 
42
        <application>&app;</application> was written by Derrick Moser <email>derrick_moser@yahoo.com</email>.
43
43
      </para>
44
 
      <para>&copy; 2006-2010 Derrick Moser.  All Rights Reserved.</para>
 
44
      <para>&copy; 2006-2011 Derrick Moser.  All Rights Reserved.</para>
45
45
    </sect1>
46
46
 
47
47
    <sect1 id="introduction-licence">
48
48
      <title>Licence</title>
49
49
      <para>
50
 
        &app; is free software; you may redistribute it and/or modify it under
 
50
        <application>&app;</application> is free software; you may redistribute it and/or modify it under
51
51
        the terms of the <citetitle>GNU General Public License</citetitle> as
52
52
        published by the Free Software Foundation; either version 2 of the
53
53
        licence, or (at your option) any later version.
54
54
      </para>
55
55
      <para>
56
 
        &app; is distributed in the hope that it will be useful, but WITHOUT
 
56
        <application>&app;</application> is distributed in the hope that it will be useful, but WITHOUT
57
57
        ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
58
58
        FITNESS FOR A PARTICULAR PURPOSE.  See the <citetitle>GNU General
59
59
        Public License</citetitle> for more details.
60
60
      </para>
61
61
      <para>
62
62
        You should have received a copy of the <citetitle>GNU General Public
63
 
        License</citetitle> along with &app;.  You may also obtain a copy of
 
63
        License</citetitle> along with <application>&app;</application>.  You may also obtain a copy of
64
64
        the <citetitle>GNU General Public License</citetitle> from the Free
65
65
        Software Foundation by visiting
66
66
        <ulink type="http" url="http://www.fsf.org/">their web site</ulink> or
81
81
        <varlistentry>
82
82
          <term><userinput>diffuse [ -h | -? | --help | -v | --version ]</userinput></term>
83
83
          <listitem>
84
 
            <para>Display information about &app;.</para>
 
84
            <para>Display information about <application>&app;</application>.</para>
85
85
          </listitem>
86
86
        </varlistentry>
87
87
 
98
98
 
99
99
        <para>
100
100
          If a help option is specified, it must be the only argument
101
 
          specified on the command line.  &app; will immediately quit after
 
101
          specified on the command line.  <application>&app;</application> will immediately quit after
102
102
          displaying the help information.
103
103
        </para>
104
104
 
183
183
          </varlistentry>
184
184
 
185
185
          <varlistentry>
 
186
            <term><userinput>-L</userinput>, <userinput>--label</userinput> <replaceable>label</replaceable></term>
 
187
            <listitem>
 
188
              <para>
 
189
                Display <replaceable>label</replaceable> instead of the file name.
 
190
              </para>
 
191
            </listitem>
 
192
          </varlistentry>
 
193
 
 
194
          <varlistentry>
186
195
            <term><userinput>-m</userinput>, <userinput>--modified</userinput></term>
187
196
            <listitem>
188
197
              <para>
224
233
          </varlistentry>
225
234
 
226
235
          <varlistentry>
 
236
            <term><userinput>--line <replaceable>line</replaceable></userinput></term>
 
237
            <listitem>
 
238
              <para>
 
239
                Start with line <replaceable>line</replaceable> selected.
 
240
              </para>
 
241
            </listitem>
 
242
          </varlistentry>
 
243
 
 
244
          <varlistentry>
227
245
            <term><userinput>--null-file</userinput></term>
228
246
            <listitem>
229
247
              <para>
301
319
      <menuchoice><guimenu>File</guimenu><guimenuitem>New 3-Way File
302
320
      Merge</guimenuitem></menuchoice> menu items to create additional tabs
303
321
      for comparing text files.  File names and revisions can be specified
304
 
      either in the command line arguments used to invoke &app; or in fields
 
322
      either in the command line arguments used to invoke <application>&app;</application> or in fields
305
323
      on the Open File dialogue.
306
324
    </para>
307
325
 
308
326
    <para>
309
 
      &app; displays files side-by-side inserting gaps to align similar lines
 
327
      <application>&app;</application> displays files side-by-side inserting gaps to align similar lines
310
328
      of text.  Differences are highlighted with a different background
311
329
      colour.
312
330
    </para>
347
365
        text with adjacent files.  To aligning lines of text using the mouse
348
366
        pointer, select a line of text with the left mouse button, right click
349
367
        on a line of text from an adjacent file, and choose
350
 
        <menuchoice><guimenu>Align with Selection</guimenu></menuchoice>.  To
 
368
        <menuchoice><guimenuitem>Align with Selection</guimenuitem></menuchoice>.  To
351
369
        align lines of text using the keyboard, move the selection with the
352
370
        cursor keys, press the space bar to pick the current line of text, move
353
371
        the selection with the cursor keys to a line of text in an adjacent
354
372
        file, and press the space bar to pick the target line of text.
355
 
        Pressing the escape key will cancel the operation.
 
373
        Pressing the <keycap>Escape</keycap> key will cancel the operation.
356
374
      </para>
357
375
 
358
376
      <para>
359
 
        Use the <menuchoice><guimenu>Isolate</guimenu></menuchoice> menu item
 
377
        Use the <menuchoice><guimenuitem>Isolate</guimenuitem></menuchoice> menu item
360
378
        to prevent the selected lines from being matched with any lines from
361
379
        the adjacent files.
362
380
      </para>
366
384
      <title>Editing</title>
367
385
 
368
386
      <para>
369
 
        Press the enter key or double-click on a text area to enter text
 
387
        Press the <keycap>Enter</keycap> key or double-click on a text area to enter text
370
388
        editing mode.  The cursor will change to indicate text editing mode
371
389
        and the status bar at the bottom of the window will display the
372
390
        cursor's column position.
385
403
      <para>
386
404
        Modify text by typing on the keyword.  Modified lines will be
387
405
        highlighted in green.  Use the
388
 
        <menuchoice><guimenu>Undo</guimenu></menuchoice> and
389
 
        <menuchoice><guimenu>Redo</guimenu></menuchoice> menu items to
 
406
        <menuchoice><guimenuitem>Undo</guimenuitem></menuchoice> and
 
407
        <menuchoice><guimenuitem>Redo</guimenuitem></menuchoice> menu items to
390
408
        undo and redo the previously preformed operations.
391
409
      </para>
392
410
 
393
411
      <para>
394
 
        Press the escape key or click on another file's text area using the
 
412
        Press the <keycap>Escape</keycap> key or click on another file's text area using the
395
413
        left mouse button to leave editing mode.
396
414
      </para>
397
415
    </sect1>
401
419
 
402
420
      <para>
403
421
        Use the difference buttons or menu items to navigate between blocks
404
 
        of differences within a file.  When navigating, &app; will move the
 
422
        of differences within a file.  When navigating, <application>&app;</application> will move the
405
423
        selection to the next continuous set of lines with differences or
406
424
        edits.
407
425
      </para>
409
427
      <para>
410
428
        Use the merge buttons or menu items to copy blocks of text into the
411
429
        selected range of lines.  The
412
 
        <menuchoice><guimenu>Undo</guimenu></menuchoice> and
413
 
        <menuchoice><guimenu>Redo</guimenu></menuchoice> menu items can be used
 
430
        <menuchoice><guimenuitem>Undo</guimenuitem></menuchoice> and
 
431
        <menuchoice><guimenuitem>Redo</guimenuitem></menuchoice> menu items can be used
414
432
        to undo and redo the previously preformed operations.  All changes to a
415
433
        set of lines can be reverted using the
416
 
        <menuchoice><guimenu>Clear Edits</guimenu></menuchoice> menu item
 
434
        <menuchoice><guimenuitem>Clear Edits</guimenuitem></menuchoice> menu item
417
435
        regardless of the order the edits were performed.
418
436
      </para>
419
437
    </sect1>
423
441
    <title>Version Control</title>
424
442
 
425
443
    <para>
426
 
      &app; can retrieve file revisions from several version control systems
427
 
      via their command line interface.  The Microsoft Windows build of &app;
 
444
      <application>&app;</application> can retrieve file revisions from several version control systems
 
445
      via their command line interface.  The Microsoft Windows build of <application>&app;</application>
428
446
      is able to use both the Cygwin and native versions of the supported
429
 
      version control systems.  When using &app; with Cygwin, ensure
430
 
      &app;'s Cygwin preferences correctly describe your system.  If the
 
447
      version control systems.  When using <application>&app;</application> with Cygwin, ensure
 
448
      <application>&app;</application>'s Cygwin preferences correctly describe your system.  If the
431
449
      <guilabel>Update paths for Cygwin</guilabel> preference exists for a
432
450
      version control system, it must be enabled to use the Cygwin version.
433
451
    </para>
443
461
      <title>Viewing Uncommitted Modifications</title>
444
462
 
445
463
      <para>
446
 
        The <userinput>-m</userinput> option will cause &app; to open
 
464
        The <userinput>-m</userinput> option will cause <application>&app;</application> to open
447
465
        comparison tabs for each file the version control system indicates has
448
466
        uncommitted modifications.  This is convenient for reviewing all
449
467
        changes before committing or resolving a merge conflict.  If no paths
520
538
      </para>
521
539
 
522
540
      <para>
523
 
        &app; does not limit the number of panes that can be used for
 
541
        <application>&app;</application> does not limit the number of panes that can be used for
524
542
        comparing files.  The inputs to a Git octopus merge could be viewed
525
543
        with a command line like this:
526
544
      </para>
535
553
    <title>Resources</title>
536
554
 
537
555
    <para>
538
 
      Resources can be used to customise several aspects of &app;'s
 
556
      Resources can be used to customise several aspects of <application>&app;</application>'s
539
557
      appearance and behaviour such as changing the colours used in the user
540
558
      interface, customising the keyboard shortcuts, adding or replacing syntax
541
559
      highlighting rules, or changing the mapping from file extensions to
543
561
    </para>
544
562
 
545
563
    <para>
546
 
      When &app; is started, it will read commands from the system wide
 
564
      When <application>&app;</application> is started, it will read commands from the system wide
547
565
      initialisation file <filename>/etc/diffuserc</filename>
548
566
      (<filename>%INSTALL_DIR%\diffuserc</filename> on Microsoft Windows) and
549
567
      then the personal initialisation file
615
633
            <term><userinput>open_file</userinput></term>
616
634
            <listitem>
617
635
              <para><menuchoice><guimenu>File</guimenu><guimenuitem>Open File...</guimenuitem></menuchoice> menu item</para>
618
 
              <para>Default: Ctrl+o</para>
 
636
              <para>Default: <literal>Ctrl+o</literal></para>
619
637
            </listitem>
620
638
          </varlistentry>
621
639
 
623
641
            <term><userinput>open_file_in_new_tab</userinput></term>
624
642
            <listitem>
625
643
              <para><menuchoice><guimenu>File</guimenu><guimenuitem>Open File In New Tab...</guimenuitem></menuchoice> menu item</para>
626
 
              <para>Default: Ctrl+t</para>
 
644
              <para>Default: <literal>Ctrl+t</literal></para>
627
645
            </listitem>
628
646
          </varlistentry>
629
647
 
631
649
            <term><userinput>open_modified_files</userinput></term>
632
650
            <listitem>
633
651
              <para><menuchoice><guimenu>File</guimenu><guimenuitem>Open Modified Files...</guimenuitem></menuchoice> menu item</para>
634
 
              <para>Default: Shift+Ctrl+O</para>
 
652
              <para>Default: <literal>Shift+Ctrl+O</literal></para>
635
653
            </listitem>
636
654
          </varlistentry>
637
655
 
639
657
            <term><userinput>reload_file</userinput></term>
640
658
            <listitem>
641
659
              <para><menuchoice><guimenu>File</guimenu><guimenuitem>Reload File</guimenuitem></menuchoice> menu item</para>
642
 
              <para>Default: Shift+Ctrl+R</para>
 
660
              <para>Default: <literal>Shift+Ctrl+R</literal></para>
643
661
            </listitem>
644
662
          </varlistentry>
645
663
 
647
665
            <term><userinput>save_file</userinput></term>
648
666
            <listitem>
649
667
              <para><menuchoice><guimenu>File</guimenu><guimenuitem>Save File</guimenuitem></menuchoice> menu item</para>
650
 
              <para>Default: Ctrl+s</para>
 
668
              <para>Default: <literal>Ctrl+s</literal></para>
651
669
            </listitem>
652
670
          </varlistentry>
653
671
 
655
673
            <term><userinput>save_file_as</userinput></term>
656
674
            <listitem>
657
675
              <para><menuchoice><guimenu>File</guimenu><guimenuitem>Save File As...</guimenuitem></menuchoice> menu item</para>
658
 
              <para>Default: Shift+Ctrl+A</para>
 
676
              <para>Default: <literal>Shift+Ctrl+A</literal></para>
659
677
            </listitem>
660
678
          </varlistentry>
661
679
 
663
681
            <term><userinput>save_all</userinput></term>
664
682
            <listitem>
665
683
              <para><menuchoice><guimenu>File</guimenu><guimenuitem>Save All</guimenuitem></menuchoice> menu item</para>
666
 
              <para>Default: Shift+Ctrl+S</para>
 
684
              <para>Default: <literal>Shift+Ctrl+S</literal></para>
667
685
            </listitem>
668
686
          </varlistentry>
669
687
 
671
689
            <term><userinput>new_2_way_file_merge</userinput></term>
672
690
            <listitem>
673
691
              <para><menuchoice><guimenu>File</guimenu><guimenuitem>New 2-Way File Merge</guimenuitem></menuchoice> menu item</para>
674
 
              <para>Default: Ctrl+2</para>
 
692
              <para>Default: <literal>Ctrl+2</literal></para>
675
693
            </listitem>
676
694
          </varlistentry>
677
695
 
679
697
            <term><userinput>new_3_way_file_merge</userinput></term>
680
698
            <listitem>
681
699
              <para><menuchoice><guimenu>File</guimenu><guimenuitem>New 3-Way File Merge</guimenuitem></menuchoice> menu item</para>
682
 
              <para>Default: Ctrl+3</para>
 
700
              <para>Default: <literal>Ctrl+3</literal></para>
683
701
            </listitem>
684
702
          </varlistentry>
685
703
 
687
705
            <term><userinput>close_tab</userinput></term>
688
706
            <listitem>
689
707
              <para><menuchoice><guimenu>File</guimenu><guimenuitem>Close Tab</guimenuitem></menuchoice> menu item</para>
690
 
              <para>Default: Ctrl+w</para>
 
708
              <para>Default: <literal>Ctrl+w</literal></para>
691
709
            </listitem>
692
710
          </varlistentry>
693
711
 
695
713
            <term><userinput>undo_close_tab</userinput></term>
696
714
            <listitem>
697
715
              <para><menuchoice><guimenu>File</guimenu><guimenuitem>Undo Close Tab</guimenuitem></menuchoice> menu item</para>
698
 
              <para>Default: Shift+Ctrl+w</para>
 
716
              <para>Default: <literal>Shift+Ctrl+w</literal></para>
699
717
            </listitem>
700
718
          </varlistentry>
701
719
 
703
721
            <term><userinput>quit</userinput></term>
704
722
            <listitem>
705
723
              <para><menuchoice><guimenu>File</guimenu><guimenuitem>Quit</guimenuitem></menuchoice> menu item</para>
706
 
              <para>Default: Ctrl+q</para>
 
724
              <para>Default: <literal>Ctrl+q</literal></para>
707
725
            </listitem>
708
726
          </varlistentry>
709
727
 
711
729
            <term><userinput>undo</userinput></term>
712
730
            <listitem>
713
731
              <para><menuchoice><guimenu>Edit</guimenu><guimenuitem>Undo</guimenuitem></menuchoice> menu item</para>
714
 
              <para>Default: Ctrl+z</para>
 
732
              <para>Default: <literal>Ctrl+z</literal></para>
715
733
            </listitem>
716
734
          </varlistentry>
717
735
 
719
737
            <term><userinput>redo</userinput></term>
720
738
            <listitem>
721
739
              <para><menuchoice><guimenu>Edit</guimenu><guimenuitem>Redo</guimenuitem></menuchoice> menu item</para>
722
 
              <para>Default: Shift+Ctrl+Z</para>
 
740
              <para>Default: <literal>Shift+Ctrl+Z</literal></para>
723
741
            </listitem>
724
742
          </varlistentry>
725
743
 
727
745
            <term><userinput>cut</userinput></term>
728
746
            <listitem>
729
747
              <para><menuchoice><guimenu>Edit</guimenu><guimenuitem>Cut</guimenuitem></menuchoice> menu item</para>
730
 
              <para>Default: Ctrl+x</para>
 
748
              <para>Default: <literal>Ctrl+x</literal></para>
731
749
            </listitem>
732
750
          </varlistentry>
733
751
 
735
753
            <term><userinput>copy</userinput></term>
736
754
            <listitem>
737
755
              <para><menuchoice><guimenu>Edit</guimenu><guimenuitem>Copy</guimenuitem></menuchoice> menu item</para>
738
 
              <para>Default: Ctrl+c</para>
 
756
              <para>Default: <literal>Ctrl+c</literal></para>
739
757
            </listitem>
740
758
          </varlistentry>
741
759
 
743
761
            <term><userinput>paste</userinput></term>
744
762
            <listitem>
745
763
              <para><menuchoice><guimenu>Edit</guimenu><guimenuitem>Paste</guimenuitem></menuchoice> menu item</para>
746
 
              <para>Default: Ctrl+v</para>
 
764
              <para>Default: <literal>Ctrl+v</literal></para>
747
765
            </listitem>
748
766
          </varlistentry>
749
767
 
751
769
            <term><userinput>select_all</userinput></term>
752
770
            <listitem>
753
771
              <para><menuchoice><guimenu>Edit</guimenu><guimenuitem>Select All</guimenuitem></menuchoice> menu item</para>
754
 
              <para>Default: Ctrl+a</para>
 
772
              <para>Default: <literal>Ctrl+a</literal></para>
755
773
            </listitem>
756
774
          </varlistentry>
757
775
 
759
777
            <term><userinput>clear_edits</userinput></term>
760
778
            <listitem>
761
779
              <para><menuchoice><guimenu>Edit</guimenu><guimenuitem>Clear Edits</guimenuitem></menuchoice> menu item</para>
762
 
              <para>Default: Ctrl+r</para>
 
780
              <para>Default: <literal>Ctrl+r</literal></para>
763
781
            </listitem>
764
782
          </varlistentry>
765
783
 
767
785
            <term><userinput>dismiss_all_edits</userinput></term>
768
786
            <listitem>
769
787
              <para><menuchoice><guimenu>Edit</guimenu><guimenuitem>Dismiss All Edits</guimenuitem></menuchoice> menu item</para>
770
 
              <para>Default: Ctrl+d</para>
 
788
              <para>Default: <literal>Ctrl+d</literal></para>
771
789
            </listitem>
772
790
          </varlistentry>
773
791
 
775
793
            <term><userinput>find</userinput></term>
776
794
            <listitem>
777
795
              <para><menuchoice><guimenu>Edit</guimenu><guimenuitem>Find...</guimenuitem></menuchoice> menu item</para>
778
 
              <para>Default: Ctrl+f</para>
 
796
              <para>Default: <literal>Ctrl+f</literal></para>
779
797
            </listitem>
780
798
          </varlistentry>
781
799
 
783
801
            <term><userinput>find_next</userinput></term>
784
802
            <listitem>
785
803
              <para><menuchoice><guimenu>Edit</guimenu><guimenuitem>Find Next</guimenuitem></menuchoice> menu item</para>
786
 
              <para>Default: Ctrl+g</para>
 
804
              <para>Default: <literal>Ctrl+g</literal></para>
787
805
            </listitem>
788
806
          </varlistentry>
789
807
 
791
809
            <term><userinput>find_previous</userinput></term>
792
810
            <listitem>
793
811
              <para><menuchoice><guimenu>Edit</guimenu><guimenuitem>Find Previous</guimenuitem></menuchoice> menu item</para>
794
 
              <para>Default: Shift+Ctrl+G</para>
 
812
              <para>Default: <literal>Shift+Ctrl+G</literal></para>
795
813
            </listitem>
796
814
          </varlistentry>
797
815
 
799
817
            <term><userinput>go_to_line</userinput></term>
800
818
            <listitem>
801
819
              <para><menuchoice><guimenu>Edit</guimenu><guimenuitem>Go To Line...</guimenuitem></menuchoice> menu item</para>
802
 
              <para>Default: Shift+Ctrl+L</para>
 
820
              <para>Default: <literal>Shift+Ctrl+L</literal></para>
803
821
            </listitem>
804
822
          </varlistentry>
805
823
 
814
832
          <varlistentry>
815
833
            <term><userinput>no_syntax_highlighting</userinput></term>
816
834
            <listitem>
817
 
              <para><menuchoice><guimenu>View</guimenu><guimenuitem>Syntax Highlighting</guimenuitem><guimenuitem>None</guimenuitem></menuchoice> menu item</para>
 
835
              <para><menuchoice><guimenu>View</guimenu><guisubmenu>Syntax Highlighting</guisubmenu><guimenuitem>None</guimenuitem></menuchoice> menu item</para>
818
836
              <para>Default: None</para>
819
837
            </listitem>
820
838
          </varlistentry>
822
840
          <varlistentry>
823
841
            <term><userinput>syntax_highlighting_<replaceable>syntax</replaceable></userinput></term>
824
842
            <listitem>
825
 
              <para><menuchoice><guimenu>View</guimenu><guimenuitem>Syntax Highlighting</guimenuitem><guimenuitem><replaceable>syntax</replaceable></guimenuitem></menuchoice> menu item</para>
 
843
              <para><menuchoice><guimenu>View</guimenu><guisubmenu>Syntax Highlighting</guisubmenu><guimenuitem><replaceable>syntax</replaceable></guimenuitem></menuchoice> menu item</para>
826
844
              <para>Default: None</para>
827
845
            </listitem>
828
846
          </varlistentry>
831
849
            <term><userinput>realign_all</userinput></term>
832
850
            <listitem>
833
851
              <para><menuchoice><guimenu>View</guimenu><guimenuitem>Realign All</guimenuitem></menuchoice> menu item</para>
834
 
              <para>Default: Ctrl+l</para>
 
852
              <para>Default: <literal>Ctrl+l</literal></para>
835
853
            </listitem>
836
854
          </varlistentry>
837
855
 
839
857
            <term><userinput>isolate</userinput></term>
840
858
            <listitem>
841
859
              <para><menuchoice><guimenu>View</guimenu><guimenuitem>Isolate</guimenuitem></menuchoice> menu item</para>
842
 
              <para>Default: Ctrl+i</para>
 
860
              <para>Default: <literal>Ctrl+i</literal></para>
843
861
            </listitem>
844
862
          </varlistentry>
845
863
 
847
865
            <term><userinput>first_difference</userinput></term>
848
866
            <listitem>
849
867
              <para><menuchoice><guimenu>View</guimenu><guimenuitem>First Difference</guimenuitem></menuchoice> menu item</para>
850
 
              <para>Default: Shift+Ctrl+Up</para>
 
868
              <para>Default: <literal>Shift+Ctrl+Up</literal></para>
851
869
            </listitem>
852
870
          </varlistentry>
853
871
 
855
873
            <term><userinput>previous_difference</userinput></term>
856
874
            <listitem>
857
875
              <para><menuchoice><guimenu>View</guimenu><guimenuitem>Previous Difference</guimenuitem></menuchoice> menu item</para>
858
 
              <para>Default: Ctrl+Up</para>
 
876
              <para>Default: <literal>Ctrl+Up</literal></para>
859
877
            </listitem>
860
878
          </varlistentry>
861
879
 
863
881
            <term><userinput>next_difference</userinput></term>
864
882
            <listitem>
865
883
              <para><menuchoice><guimenu>View</guimenu><guimenuitem>Next Difference</guimenuitem></menuchoice> menu item</para>
866
 
              <para>Default: Ctrl+Down</para>
 
884
              <para>Default: <literal>Ctrl+Down</literal></para>
867
885
            </listitem>
868
886
          </varlistentry>
869
887
 
871
889
            <term><userinput>last_difference</userinput></term>
872
890
            <listitem>
873
891
              <para><menuchoice><guimenu>View</guimenu><guimenuitem>Last Difference</guimenuitem></menuchoice> menu item</para>
874
 
              <para>Default: Shift+Ctrl+Down</para>
 
892
              <para>Default: <literal>Shift+Ctrl+Down</literal></para>
 
893
            </listitem>
 
894
          </varlistentry>
 
895
 
 
896
          <varlistentry>
 
897
            <term><userinput>first_tab</userinput></term>
 
898
            <listitem>
 
899
              <para><menuchoice><guimenu>View</guimenu><guimenuitem>First Tab</guimenuitem></menuchoice> menu item</para>
 
900
              <para>Default: <literal>Shift+Ctrl+Page_Up</literal></para>
875
901
            </listitem>
876
902
          </varlistentry>
877
903
 
879
905
            <term><userinput>previous_tab</userinput></term>
880
906
            <listitem>
881
907
              <para><menuchoice><guimenu>View</guimenu><guimenuitem>Previous Tab</guimenuitem></menuchoice> menu item</para>
882
 
              <para>Default: Ctrl+Page_Up</para>
 
908
              <para>Default: <literal>Ctrl+Page_Up</literal></para>
883
909
            </listitem>
884
910
          </varlistentry>
885
911
 
887
913
            <term><userinput>next_tab</userinput></term>
888
914
            <listitem>
889
915
              <para><menuchoice><guimenu>View</guimenu><guimenuitem>Next Tab</guimenuitem></menuchoice> menu item</para>
890
 
              <para>Default: Ctrl+Page_Down</para>
 
916
              <para>Default: <literal>Ctrl+Page_Down</literal></para>
 
917
            </listitem>
 
918
          </varlistentry>
 
919
 
 
920
          <varlistentry>
 
921
            <term><userinput>last_tab</userinput></term>
 
922
            <listitem>
 
923
              <para><menuchoice><guimenu>View</guimenu><guimenuitem>Last Tab</guimenuitem></menuchoice> menu item</para>
 
924
              <para>Default: <literal>Shift+Ctrl+Page_Down</literal></para>
891
925
            </listitem>
892
926
          </varlistentry>
893
927
 
895
929
            <term><userinput>shift_pane_right</userinput></term>
896
930
            <listitem>
897
931
              <para><menuchoice><guimenu>View</guimenu><guimenuitem>Shift Pane Right</guimenuitem></menuchoice> menu item</para>
898
 
              <para>Default: Shift+Ctrl+parenleft</para>
 
932
              <para>Default: <literal>Shift+Ctrl+parenleft</literal></para>
899
933
            </listitem>
900
934
          </varlistentry>
901
935
 
903
937
            <term><userinput>shift_pane_left</userinput></term>
904
938
            <listitem>
905
939
              <para><menuchoice><guimenu>View</guimenu><guimenuitem>Shift Pane Left</guimenuitem></menuchoice> menu item</para>
906
 
              <para>Default: Shift+Ctrl+parenright</para>
 
940
              <para>Default: <literal>Shift+Ctrl+parenright</literal></para>
907
941
            </listitem>
908
942
          </varlistentry>
909
943
 
911
945
            <term><userinput>convert_to_upper_case</userinput></term>
912
946
            <listitem>
913
947
              <para><menuchoice><guimenu>Format</guimenu><guimenuitem>Convert To Upper Case</guimenuitem></menuchoice> menu item</para>
914
 
              <para>Default: Ctrl+u</para>
 
948
              <para>Default: <literal>Ctrl+u</literal></para>
915
949
            </listitem>
916
950
          </varlistentry>
917
951
 
919
953
            <term><userinput>convert_to_lower_case</userinput></term>
920
954
            <listitem>
921
955
              <para><menuchoice><guimenu>Format</guimenu><guimenuitem>Convert To Lower Case</guimenuitem></menuchoice> menu item</para>
922
 
              <para>Default: Shift+Ctrl+U</para>
 
956
              <para>Default: <literal>Shift+Ctrl+U</literal></para>
923
957
            </listitem>
924
958
          </varlistentry>
925
959
 
927
961
            <term><userinput>sort_lines_in_ascending_order</userinput></term>
928
962
            <listitem>
929
963
              <para><menuchoice><guimenu>Format</guimenu><guimenuitem>Sort Lines In Ascending Order</guimenuitem></menuchoice> menu item</para>
930
 
              <para>Default: Ctrl+y</para>
 
964
              <para>Default: <literal>Ctrl+y</literal></para>
931
965
            </listitem>
932
966
          </varlistentry>
933
967
 
935
969
            <term><userinput>sort_lines_in_descending_order</userinput></term>
936
970
            <listitem>
937
971
              <para><menuchoice><guimenu>Format</guimenu><guimenuitem>Sort Lines In Descending Order</guimenuitem></menuchoice> menu item</para>
938
 
              <para>Default: Shift+Ctrl+Y</para>
 
972
              <para>Default: <literal>Shift+Ctrl+Y</literal></para>
939
973
            </listitem>
940
974
          </varlistentry>
941
975
 
943
977
            <term><userinput>remove_trailing_white_space</userinput></term>
944
978
            <listitem>
945
979
              <para><menuchoice><guimenu>Format</guimenu><guimenuitem>Remove Trailing White Space</guimenuitem></menuchoice> menu item</para>
946
 
              <para>Default: Ctrl+k</para>
 
980
              <para>Default: <literal>Ctrl+k</literal></para>
947
981
            </listitem>
948
982
          </varlistentry>
949
983
 
951
985
            <term><userinput>convert_tabs_to_spaces</userinput></term>
952
986
            <listitem>
953
987
              <para><menuchoice><guimenu>Format</guimenu><guimenuitem>Convert Tabs To Spaces</guimenuitem></menuchoice> menu item</para>
954
 
              <para>Default: Ctrl+b</para>
 
988
              <para>Default: <literal>Ctrl+b</literal></para>
955
989
            </listitem>
956
990
          </varlistentry>
957
991
 
959
993
            <term><userinput>convert_leading_spaces_to_tabs</userinput></term>
960
994
            <listitem>
961
995
              <para><menuchoice><guimenu>Format</guimenu><guimenuitem>Convert Leading Spaces To Tabs</guimenuitem></menuchoice> menu item</para>
962
 
              <para>Default: Shift+Ctrl+B</para>
 
996
              <para>Default: <literal>Shift+Ctrl+B</literal></para>
963
997
            </listitem>
964
998
          </varlistentry>
965
999
 
967
1001
            <term><userinput>increase_indenting</userinput></term>
968
1002
            <listitem>
969
1003
              <para><menuchoice><guimenu>Format</guimenu><guimenuitem>Increase Indenting</guimenuitem></menuchoice> menu item</para>
970
 
              <para>Default: Shift+Ctrl+&gt;</para>
 
1004
              <para>Default: <literal>Shift+Ctrl+greater</literal></para>
971
1005
            </listitem>
972
1006
          </varlistentry>
973
1007
 
975
1009
            <term><userinput>decrease_indenting</userinput></term>
976
1010
            <listitem>
977
1011
              <para><menuchoice><guimenu>Format</guimenu><guimenuitem>Decrease Indenting</guimenuitem></menuchoice> menu item</para>
978
 
              <para>Default: Shift+Ctrl+&lt;</para>
 
1012
              <para>Default: <literal>Shift+Ctrl+less</literal></para>
979
1013
            </listitem>
980
1014
          </varlistentry>
981
1015
 
983
1017
            <term><userinput>convert_to_dos</userinput></term>
984
1018
            <listitem>
985
1019
              <para><menuchoice><guimenu>Format</guimenu><guimenuitem>Convert To DOS Format</guimenuitem></menuchoice> menu item</para>
986
 
              <para>Default: Shift+Ctrl+E</para>
 
1020
              <para>Default: <literal>Shift+Ctrl+E</literal></para>
987
1021
            </listitem>
988
1022
          </varlistentry>
989
1023
 
991
1025
            <term><userinput>convert_to_mac</userinput></term>
992
1026
            <listitem>
993
1027
              <para><menuchoice><guimenu>Format</guimenu><guimenuitem>Convert To Mac Format</guimenuitem></menuchoice> menu item</para>
994
 
              <para>Default: Shift+Ctrl+C</para>
 
1028
              <para>Default: <literal>Shift+Ctrl+C</literal></para>
995
1029
            </listitem>
996
1030
          </varlistentry>
997
1031
 
999
1033
            <term><userinput>convert_to_unix</userinput></term>
1000
1034
            <listitem>
1001
1035
              <para><menuchoice><guimenu>Format</guimenu><guimenuitem>Convert To Unix Format</guimenuitem></menuchoice> menu item</para>
1002
 
              <para>Default: Ctrl+e</para>
 
1036
              <para>Default: <literal>Ctrl+e</literal></para>
1003
1037
            </listitem>
1004
1038
          </varlistentry>
1005
1039
 
1007
1041
            <term><userinput>copy_selection_right</userinput></term>
1008
1042
            <listitem>
1009
1043
              <para><menuchoice><guimenu>Merge</guimenu><guimenuitem>Copy Selection Right</guimenuitem></menuchoice> menu item</para>
1010
 
              <para>Default: Shift+Ctrl+Right</para>
 
1044
              <para>Default: <literal>Shift+Ctrl+Right</literal></para>
1011
1045
            </listitem>
1012
1046
          </varlistentry>
1013
1047
 
1015
1049
            <term><userinput>copy_selection_left</userinput></term>
1016
1050
            <listitem>
1017
1051
              <para><menuchoice><guimenu>Merge</guimenu><guimenuitem>Copy Selection Left</guimenuitem></menuchoice> menu item</para>
1018
 
              <para>Default: Shift+Ctrl+Left</para>
 
1052
              <para>Default: <literal>Shift+Ctrl+Left</literal></para>
1019
1053
            </listitem>
1020
1054
          </varlistentry>
1021
1055
 
1023
1057
            <term><userinput>copy_left_into_selection</userinput></term>
1024
1058
            <listitem>
1025
1059
              <para><menuchoice><guimenu>Merge</guimenu><guimenuitem>Copy Left Into Selection</guimenuitem></menuchoice> menu item</para>
1026
 
              <para>Default: Ctrl+Right</para>
 
1060
              <para>Default: <literal>Ctrl+Right</literal></para>
1027
1061
            </listitem>
1028
1062
          </varlistentry>
1029
1063
 
1031
1065
            <term><userinput>copy_right_into_selection</userinput></term>
1032
1066
            <listitem>
1033
1067
              <para><menuchoice><guimenu>Merge</guimenu><guimenuitem>Copy Right Into Selection</guimenuitem></menuchoice> menu item</para>
1034
 
              <para>Default: Ctrl+Left</para>
 
1068
              <para>Default: <literal>Ctrl+Left</literal></para>
1035
1069
            </listitem>
1036
1070
          </varlistentry>
1037
1071
 
1039
1073
            <term><userinput>merge_from_left_then_right</userinput></term>
1040
1074
            <listitem>
1041
1075
              <para><menuchoice><guimenu>Merge</guimenu><guimenuitem>Merge From Left Then Right</guimenuitem></menuchoice> menu item</para>
1042
 
              <para>Default: Ctrl+m</para>
 
1076
              <para>Default: <literal>Ctrl+m</literal></para>
1043
1077
            </listitem>
1044
1078
          </varlistentry>
1045
1079
 
1047
1081
            <term><userinput>merge_from_right_then_left</userinput></term>
1048
1082
            <listitem>
1049
1083
              <para><menuchoice><guimenu>Merge</guimenu><guimenuitem>Merge From Right Then Left</guimenuitem></menuchoice> menu item</para>
1050
 
              <para>Default: Shift+Ctrl+M</para>
 
1084
              <para>Default: <literal>Shift+Ctrl+M</literal></para>
1051
1085
            </listitem>
1052
1086
          </varlistentry>
1053
1087
 
1055
1089
            <term><userinput>help_contents</userinput></term>
1056
1090
            <listitem>
1057
1091
              <para><menuchoice><guimenu>Help</guimenu><guimenuitem>Help Contents</guimenuitem></menuchoice> menu item</para>
1058
 
              <para>Default: F1</para>
 
1092
              <para>Default: <literal>F1</literal></para>
1059
1093
            </listitem>
1060
1094
          </varlistentry>
1061
1095
 
1084
1118
            <term><userinput>enter_align_mode</userinput></term>
1085
1119
            <listitem>
1086
1120
              <para>enter alignment editing mode</para>
1087
 
              <para>Default: space</para>
 
1121
              <para>Default: <literal>space</literal></para>
1088
1122
            </listitem>
1089
1123
          </varlistentry>
1090
1124
 
1092
1126
            <term><userinput>enter_character_mode</userinput></term>
1093
1127
            <listitem>
1094
1128
              <para>enter character editing mode</para>
1095
 
              <para>Default: Return, KP_Enter</para>
 
1129
              <para>Defaults: <literal>Return</literal>, <literal>KP_Enter</literal></para>
1096
1130
            </listitem>
1097
1131
          </varlistentry>
1098
1132
 
1100
1134
            <term><userinput>first_line</userinput></term>
1101
1135
            <listitem>
1102
1136
              <para>move cursor to the first line</para>
1103
 
              <para>Defaults: Home, g</para>
 
1137
              <para>Defaults: <literal>Home</literal>, <literal>g</literal></para>
1104
1138
            </listitem>
1105
1139
          </varlistentry>
1106
1140
 
1108
1142
            <term><userinput>extend_first_line</userinput></term>
1109
1143
            <listitem>
1110
1144
              <para>move cursor to the first line, extending the selection</para>
1111
 
              <para>Default: Shift+Home</para>
 
1145
              <para>Default: <literal>Shift+Home</literal></para>
1112
1146
            </listitem>
1113
1147
          </varlistentry>
1114
1148
 
1116
1150
            <term><userinput>last_line</userinput></term>
1117
1151
            <listitem>
1118
1152
              <para>move cursor to the last line</para>
1119
 
              <para>Defaults: End, Shift+G</para>
 
1153
              <para>Defaults: <literal>End</literal>, <literal>Shift+G</literal></para>
1120
1154
            </listitem>
1121
1155
          </varlistentry>
1122
1156
 
1124
1158
            <term><userinput>extend_last_line</userinput></term>
1125
1159
            <listitem>
1126
1160
              <para>move cursor to the last line, extending the selection</para>
1127
 
              <para>Default: Shift+End</para>
 
1161
              <para>Default: <literal>Shift+End</literal></para>
1128
1162
            </listitem>
1129
1163
          </varlistentry>
1130
1164
 
1132
1166
            <term><userinput>up</userinput></term>
1133
1167
            <listitem>
1134
1168
              <para>move cursor up one line</para>
1135
 
              <para>Defaults: Up, k</para>
 
1169
              <para>Defaults: <literal>Up</literal>, <literal>k</literal></para>
1136
1170
            </listitem>
1137
1171
          </varlistentry>
1138
1172
 
1140
1174
            <term><userinput>extend_up</userinput></term>
1141
1175
            <listitem>
1142
1176
              <para>move cursor up one line, extending the selection</para>
1143
 
              <para>Defaults: Shift+Up, Shift+K</para>
 
1177
              <para>Defaults: <literal>Shift+Up</literal>, <literal>Shift+K</literal></para>
1144
1178
            </listitem>
1145
1179
          </varlistentry>
1146
1180
 
1148
1182
            <term><userinput>down</userinput></term>
1149
1183
            <listitem>
1150
1184
              <para>move cursor down one line</para>
1151
 
              <para>Defaults: Down, j</para>
 
1185
              <para>Defaults: <literal>Down</literal>, <literal>j</literal></para>
1152
1186
            </listitem>
1153
1187
          </varlistentry>
1154
1188
 
1156
1190
            <term><userinput>extend_down</userinput></term>
1157
1191
            <listitem>
1158
1192
              <para>move cursor down one line, extending the selection</para>
1159
 
              <para>Defaults: Shift+Down, Shift+J</para>
 
1193
              <para>Defaults: <literal>Shift+Down</literal>, <literal>Shift+J</literal></para>
1160
1194
            </listitem>
1161
1195
          </varlistentry>
1162
1196
 
1164
1198
            <term><userinput>left</userinput></term>
1165
1199
            <listitem>
1166
1200
              <para>move cursor left one file</para>
1167
 
              <para>Defaults: Left, h</para>
 
1201
              <para>Defaults: <literal>Left</literal>, <literal>h</literal></para>
1168
1202
            </listitem>
1169
1203
          </varlistentry>
1170
1204
 
1172
1206
            <term><userinput>extend_left</userinput></term>
1173
1207
            <listitem>
1174
1208
              <para>move cursor left one file, extending the selection</para>
1175
 
              <para>Default: Shift+Left</para>
 
1209
              <para>Default: <literal>Shift+Left</literal></para>
1176
1210
            </listitem>
1177
1211
          </varlistentry>
1178
1212
 
1180
1214
            <term><userinput>right</userinput></term>
1181
1215
            <listitem>
1182
1216
              <para>move cursor right one file</para>
1183
 
              <para>Defaults: Right, l</para>
 
1217
              <para>Defaults: <literal>Right</literal>, <literal>l</literal></para>
1184
1218
            </listitem>
1185
1219
          </varlistentry>
1186
1220
 
1188
1222
            <term><userinput>extend_right</userinput></term>
1189
1223
            <listitem>
1190
1224
              <para>move cursor right one file, extending the selection</para>
1191
 
              <para>Default: Shift+Right</para>
 
1225
              <para>Default: <literal>Shift+Right</literal></para>
1192
1226
            </listitem>
1193
1227
          </varlistentry>
1194
1228
 
1196
1230
            <term><userinput>page_up</userinput></term>
1197
1231
            <listitem>
1198
1232
              <para>move cursor up one page</para>
1199
 
              <para>Defaults: Page_Up, Ctrl+u</para>
 
1233
              <para>Defaults: <literal>Page_Up</literal>, <literal>Ctrl+u</literal></para>
1200
1234
            </listitem>
1201
1235
          </varlistentry>
1202
1236
 
1204
1238
            <term><userinput>extend_page_up</userinput></term>
1205
1239
            <listitem>
1206
1240
              <para>move cursor up one page, extending the selection</para>
1207
 
              <para>Defaults: Shift+Page_Up, Shift+Ctrl+u</para>
 
1241
              <para>Defaults: <literal>Shift+Page_Up</literal>, <literal>Shift+Ctrl+u</literal></para>
1208
1242
            </listitem>
1209
1243
          </varlistentry>
1210
1244
 
1212
1246
            <term><userinput>page_down</userinput></term>
1213
1247
            <listitem>
1214
1248
              <para>move cursor down one page</para>
1215
 
              <para>Defaults: Page_Down, Ctrl+d</para>
 
1249
              <para>Defaults: <literal>Page_Down</literal>, <literal>Ctrl+d</literal></para>
1216
1250
            </listitem>
1217
1251
          </varlistentry>
1218
1252
 
1220
1254
            <term><userinput>extend_page_down</userinput></term>
1221
1255
            <listitem>
1222
1256
              <para>move cursor down one page, extending the selection</para>
1223
 
              <para>Defaults: Shift+Page_Down, Shift+Ctrl+d</para>
 
1257
              <para>Defaults: <literal>Shift+Page_Down</literal>, <literal>Shift+Ctrl+d</literal></para>
1224
1258
            </listitem>
1225
1259
          </varlistentry>
1226
1260
 
1228
1262
            <term><userinput>delete_text</userinput></term>
1229
1263
            <listitem>
1230
1264
              <para>delete the selected text</para>
1231
 
              <para>Defaults: BackSpace, Delete, x</para>
 
1265
              <para>Defaults: <literal>BackSpace</literal>, <literal>Delete</literal>, <literal>x</literal></para>
1232
1266
            </listitem>
1233
1267
          </varlistentry>
1234
1268
 
1236
1270
            <term><userinput>first_difference</userinput></term>
1237
1271
            <listitem>
1238
1272
              <para>select the first difference</para>
1239
 
              <para>Defaults: Ctrl+Home, Shift+P</para>
 
1273
              <para>Defaults: <literal>Ctrl+Home</literal>, <literal>Shift+P</literal></para>
1240
1274
            </listitem>
1241
1275
          </varlistentry>
1242
1276
 
1244
1278
            <term><userinput>previous_difference</userinput></term>
1245
1279
            <listitem>
1246
1280
              <para>select the previous difference</para>
1247
 
              <para>Default: p</para>
 
1281
              <para>Default: <literal>p</literal></para>
1248
1282
            </listitem>
1249
1283
          </varlistentry>
1250
1284
 
1252
1286
            <term><userinput>next_difference</userinput></term>
1253
1287
            <listitem>
1254
1288
              <para>select the next difference</para>
1255
 
              <para>Default: n</para>
 
1289
              <para>Default: <literal>n</literal></para>
1256
1290
            </listitem>
1257
1291
          </varlistentry>
1258
1292
 
1260
1294
            <term><userinput>last_difference</userinput></term>
1261
1295
            <listitem>
1262
1296
              <para>select the last difference</para>
1263
 
              <para>Defaults: Ctrl+End, Shift+N</para>
 
1297
              <para>Defaults: <literal>Ctrl+End</literal>, <literal>Shift+N</literal></para>
1264
1298
            </listitem>
1265
1299
          </varlistentry>
1266
1300
 
1268
1302
            <term><userinput>clear_edits</userinput></term>
1269
1303
            <listitem>
1270
1304
              <para>clear all edits from the selected lines</para>
1271
 
              <para>Default: r</para>
 
1305
              <para>Default: <literal>r</literal></para>
1272
1306
            </listitem>
1273
1307
          </varlistentry>
1274
1308
 
1276
1310
            <term><userinput>copy_left_into_selection</userinput></term>
1277
1311
            <listitem>
1278
1312
              <para>copy lines from the file on the left into the selection</para>
1279
 
              <para>Default: Shift+L</para>
 
1313
              <para>Default: <literal>Shift+L</literal></para>
1280
1314
            </listitem>
1281
1315
          </varlistentry>
1282
1316
 
1284
1318
            <term><userinput>copy_right_into_selection</userinput></term>
1285
1319
            <listitem>
1286
1320
              <para>copy lines from the file on the right into the selection</para>
1287
 
              <para>Default: Shift+H</para>
 
1321
              <para>Default: <literal>Shift+H</literal></para>
1288
1322
            </listitem>
1289
1323
          </varlistentry>
1290
1324
 
1292
1326
            <term><userinput>merge_from_left_then_right</userinput></term>
1293
1327
            <listitem>
1294
1328
              <para>merge lines from file on the left then file on the right</para>
1295
 
              <para>Default: m</para>
 
1329
              <para>Default: <literal>m</literal></para>
1296
1330
            </listitem>
1297
1331
          </varlistentry>
1298
1332
 
1300
1334
            <term><userinput>merge_from_right_then_left</userinput></term>
1301
1335
            <listitem>
1302
1336
              <para>merge lines from file on the right then file on the left</para>
1303
 
              <para>Default: Shift+M</para>
 
1337
              <para>Default: <literal>Shift+M</literal></para>
1304
1338
            </listitem>
1305
1339
          </varlistentry>
1306
1340
 
1308
1342
            <term><userinput>isolate</userinput></term>
1309
1343
            <listitem>
1310
1344
              <para>isolate the selected lines</para>
1311
 
              <para>Default: i</para>
 
1345
              <para>Default: <literal>i</literal></para>
1312
1346
            </listitem>
1313
1347
          </varlistentry>
1314
1348
        </variablelist>
1329
1363
            <term><userinput>enter_line_mode</userinput></term>
1330
1364
            <listitem>
1331
1365
              <para>enter line editing mode</para>
1332
 
              <para>Default: Escape</para>
 
1366
              <para>Default: <literal>Escape</literal></para>
1333
1367
            </listitem>
1334
1368
          </varlistentry>
1335
1369
 
1337
1371
            <term><userinput>enter_character_mode</userinput></term>
1338
1372
            <listitem>
1339
1373
              <para>enter character editing mode</para>
1340
 
              <para>Default: Return, KP_Enter</para>
 
1374
              <para>Defaults: <literal>Return</literal>, <literal>KP_Enter</literal></para>
1341
1375
            </listitem>
1342
1376
          </varlistentry>
1343
1377
 
1345
1379
            <term><userinput>first_line</userinput></term>
1346
1380
            <listitem>
1347
1381
              <para>move cursor to the first line</para>
1348
 
              <para>Default: g</para>
 
1382
              <para>Default: <literal>g</literal></para>
1349
1383
            </listitem>
1350
1384
          </varlistentry>
1351
1385
 
1353
1387
            <term><userinput>last_line</userinput></term>
1354
1388
            <listitem>
1355
1389
              <para>move cursor to the last line</para>
1356
 
              <para>Default: Shift+G</para>
 
1390
              <para>Default: <literal>Shift+G</literal></para>
1357
1391
            </listitem>
1358
1392
          </varlistentry>
1359
1393
 
1361
1395
            <term><userinput>up</userinput></term>
1362
1396
            <listitem>
1363
1397
              <para>move cursor up one line</para>
1364
 
              <para>Defaults: Up, k</para>
 
1398
              <para>Defaults: <literal>Up</literal>, <literal>k</literal></para>
1365
1399
            </listitem>
1366
1400
          </varlistentry>
1367
1401
 
1369
1403
            <term><userinput>down</userinput></term>
1370
1404
            <listitem>
1371
1405
              <para>move cursor down one line</para>
1372
 
              <para>Defaults: Down, j</para>
 
1406
              <para>Defaults: <literal>Down</literal>, <literal>j</literal></para>
1373
1407
            </listitem>
1374
1408
          </varlistentry>
1375
1409
 
1377
1411
            <term><userinput>left</userinput></term>
1378
1412
            <listitem>
1379
1413
              <para>move cursor left one file</para>
1380
 
              <para>Defaults: Left, h</para>
 
1414
              <para>Defaults: <literal>Left</literal>, <literal>h</literal></para>
1381
1415
            </listitem>
1382
1416
          </varlistentry>
1383
1417
 
1385
1419
            <term><userinput>right</userinput></term>
1386
1420
            <listitem>
1387
1421
              <para>move cursor right one file</para>
1388
 
              <para>Defaults: Right, l</para>
 
1422
              <para>Defaults: <literal>Right</literal>, <literal>l</literal></para>
1389
1423
            </listitem>
1390
1424
          </varlistentry>
1391
1425
 
1393
1427
            <term><userinput>page_up</userinput></term>
1394
1428
            <listitem>
1395
1429
              <para>move cursor up one page</para>
1396
 
              <para>Defaults: Page_Up, Ctrl+u</para>
 
1430
              <para>Defaults: <literal>Page_Up</literal>, <literal>Ctrl+u</literal></para>
1397
1431
            </listitem>
1398
1432
          </varlistentry>
1399
1433
 
1401
1435
            <term><userinput>page_down</userinput></term>
1402
1436
            <listitem>
1403
1437
              <para>move cursor down one page</para>
1404
 
              <para>Defaults: Page_Down, Ctrl+d</para>
 
1438
              <para>Defaults: <literal>Page_Down</literal>, <literal>Ctrl+d</literal></para>
1405
1439
            </listitem>
1406
1440
          </varlistentry>
1407
1441
 
1409
1443
            <term><userinput>align</userinput></term>
1410
1444
            <listitem>
1411
1445
              <para>align the selected line to the cursor position</para>
1412
 
              <para>Default: space</para>
 
1446
              <para>Default: <literal>space</literal></para>
1413
1447
            </listitem>
1414
1448
          </varlistentry>
1415
1449
        </variablelist>
1430
1464
            <term><userinput>enter_line_mode</userinput></term>
1431
1465
            <listitem>
1432
1466
              <para>enter line editing mode</para>
1433
 
              <para>Default: Escape</para>
 
1467
              <para>Default: <literal>Escape</literal></para>
1434
1468
            </listitem>
1435
1469
          </varlistentry>
1436
1470
        </variablelist>
1456
1490
      <sect2 id="resources-strings-used">
1457
1491
        <title>Used String Resources</title>
1458
1492
 
1459
 
        <para>The following string resources are used by &app;:</para>
 
1493
        <para>The following string resources are used by <application>&app;</application>:</para>
1460
1494
 
1461
1495
        <variablelist>
1462
1496
          <varlistentry>
1463
1497
            <term><userinput>difference_colours</userinput></term>
1464
1498
            <listitem>
1465
1499
              <para>a list of colour resources used to indicate differences</para>
 
1500
              <para>Default: <literal>difference_1 difference_2 difference_3</literal></para>
1466
1501
            </listitem>
1467
1502
          </varlistentry>
1468
1503
        </variablelist>
1488
1523
      <sect2 id="resources-colours-used">
1489
1524
        <title>Used Colour Resources</title>
1490
1525
 
1491
 
        <para>The following colour resources are used by &app;:</para>
 
1526
        <para>The following colour resources are used by <application>&app;</application>:</para>
1492
1527
 
1493
1528
        <variablelist>
1494
1529
 
1496
1531
            <term><userinput>alignment</userinput></term>
1497
1532
            <listitem>
1498
1533
              <para>colour used to indicate a line picked for manual alignment</para>
 
1534
              <para>Default: <literal>1 1 0</literal></para>
1499
1535
            </listitem>
1500
1536
          </varlistentry>
1501
1537
 
1503
1539
            <term><userinput>character_selection</userinput></term>
1504
1540
            <listitem>
1505
1541
              <para>colour used to indicate selected characters</para>
 
1542
              <para>Default: <literal>0.7 0.7 1</literal></para>
1506
1543
            </listitem>
1507
1544
          </varlistentry>
1508
1545
 
1510
1547
            <term><userinput>cursor</userinput></term>
1511
1548
            <listitem>
1512
1549
              <para>colour used for the cursor</para>
 
1550
              <para>Default: <literal>0 0 0</literal></para>
1513
1551
            </listitem>
1514
1552
          </varlistentry>
1515
1553
 
1517
1555
            <term><userinput>difference_1</userinput></term>
1518
1556
            <listitem>
1519
1557
              <para>colour used to identify differences between the first pair of files</para>
 
1558
              <para>Default: <literal>1 0.625 0.625</literal></para>
1520
1559
            </listitem>
1521
1560
          </varlistentry>
1522
1561
 
1524
1563
            <term><userinput>difference_2</userinput></term>
1525
1564
            <listitem>
1526
1565
              <para>colour used to identify differences between the second pair of files</para>
 
1566
              <para>Default: <literal>0.85 0.625 0.775</literal></para>
1527
1567
            </listitem>
1528
1568
          </varlistentry>
1529
1569
 
1531
1571
            <term><userinput>difference_3</userinput></term>
1532
1572
            <listitem>
1533
1573
              <para>colour used to identify differences between the third pair of files</para>
 
1574
              <para>Default: <literal>0.85 0.775 0.625</literal></para>
1534
1575
            </listitem>
1535
1576
          </varlistentry>
1536
1577
 
1538
1579
            <term><userinput>edited</userinput></term>
1539
1580
            <listitem>
1540
1581
              <para>colour used to indicate edited lines</para>
 
1582
              <para>Default: <literal>0.5 1 0.5</literal></para>
1541
1583
            </listitem>
1542
1584
          </varlistentry>
1543
1585
 
1545
1587
            <term><userinput>hatch</userinput></term>
1546
1588
            <listitem>
1547
1589
              <para>colour used for indicating alignment gaps</para>
 
1590
              <para>Default: <literal>0.8 0.8 0.8</literal></para>
1548
1591
            </listitem>
1549
1592
          </varlistentry>
1550
1593
 
1552
1595
            <term><userinput>line_number</userinput></term>
1553
1596
            <listitem>
1554
1597
              <para>colour used for line numbers</para>
 
1598
              <para>Default: <literal>0 0 0</literal></para>
1555
1599
            </listitem>
1556
1600
          </varlistentry>
1557
1601
 
1559
1603
            <term><userinput>line_number_background</userinput></term>
1560
1604
            <listitem>
1561
1605
              <para>background colour for the line number area</para>
 
1606
              <para>Default: <literal>0.75 0.75 0.75</literal></para>
1562
1607
            </listitem>
1563
1608
          </varlistentry>
1564
1609
 
1566
1611
            <term><userinput>line_selection</userinput></term>
1567
1612
            <listitem>
1568
1613
              <para>colour used to indicate selected lines</para>
 
1614
              <para>Default: <literal>0.7 0.7 1</literal></para>
1569
1615
            </listitem>
1570
1616
          </varlistentry>
1571
1617
 
1573
1619
            <term><userinput>map_background</userinput></term>
1574
1620
            <listitem>
1575
1621
              <para>background colour for the map area</para>
 
1622
              <para>Default: <literal>0.6 0.6 0.6</literal></para>
 
1623
            </listitem>
 
1624
          </varlistentry>
 
1625
 
 
1626
          <varlistentry>
 
1627
            <term><userinput>margin</userinput></term>
 
1628
            <listitem>
 
1629
              <para>colour used to indicate the right margin</para>
 
1630
              <para>Default: <literal>0.8 0.8 0.8</literal></para>
1576
1631
            </listitem>
1577
1632
          </varlistentry>
1578
1633
 
1580
1635
            <term><userinput>preedit</userinput></term>
1581
1636
            <listitem>
1582
1637
              <para>pre-edit text colour</para>
 
1638
              <para>Default: <literal>0 0 0</literal></para>
1583
1639
            </listitem>
1584
1640
          </varlistentry>
1585
1641
 
1587
1643
            <term><userinput>text</userinput></term>
1588
1644
            <listitem>
1589
1645
              <para>regular text colour</para>
 
1646
              <para>Default: <literal>0 0 0</literal></para>
1590
1647
            </listitem>
1591
1648
          </varlistentry>
1592
1649
 
1594
1651
            <term><userinput>text_background</userinput></term>
1595
1652
            <listitem>
1596
1653
              <para>background colour for the text area</para>
 
1654
              <para>Default: <literal>1 1 1</literal></para>
1597
1655
            </listitem>
1598
1656
          </varlistentry>
1599
1657
 
1620
1678
      <sect2 id="resources-floats-used">
1621
1679
        <title>Used Floating Point Resources</title>
1622
1680
 
1623
 
        <para>The following floating point resources are used by &app;:</para>
 
1681
        <para>The following floating point resources are used by <application>&app;</application>:</para>
1624
1682
 
1625
1683
        <variablelist>
1626
1684
 
1628
1686
            <term><userinput>alignment_opacity</userinput></term>
1629
1687
            <listitem>
1630
1688
              <para>opacity used when compositing the manual alignment colour</para>
1631
 
              <para>Defaults: 1</para>
 
1689
              <para>Defaults: <literal>1</literal></para>
1632
1690
            </listitem>
1633
1691
          </varlistentry>
1634
1692
 
1636
1694
            <term><userinput>character_difference_opacity</userinput></term>
1637
1695
            <listitem>
1638
1696
              <para>opacity used when compositing character difference colours</para>
1639
 
              <para>Defaults: 0.4</para>
 
1697
              <para>Defaults: <literal>0.4</literal></para>
1640
1698
            </listitem>
1641
1699
          </varlistentry>
1642
1700
 
1644
1702
            <term><userinput>character_selection_opacity</userinput></term>
1645
1703
            <listitem>
1646
1704
              <para>opacity used when compositing the character selection colour</para>
1647
 
              <para>Defaults: 0.4</para>
 
1705
              <para>Defaults: <literal>0.4</literal></para>
1648
1706
            </listitem>
1649
1707
          </varlistentry>
1650
1708
 
1652
1710
            <term><userinput>edited_opacity</userinput></term>
1653
1711
            <listitem>
1654
1712
              <para>opacity used when compositing the edited line colour</para>
1655
 
              <para>Defaults: 0.4</para>
 
1713
              <para>Defaults: <literal>0.4</literal></para>
1656
1714
            </listitem>
1657
1715
          </varlistentry>
1658
1716
 
1660
1718
            <term><userinput>line_difference_alpha</userinput></term>
1661
1719
            <listitem>
1662
1720
              <para>alpha value used when compositing line difference colours</para>
1663
 
              <para>Defaults: 0.3</para>
 
1721
              <para>Defaults: <literal>0.3</literal></para>
1664
1722
            </listitem>
1665
1723
          </varlistentry>
1666
1724
 
1668
1726
            <term><userinput>line_selection_opacity</userinput></term>
1669
1727
            <listitem>
1670
1728
              <para>opacity used when compositing the line selection colour</para>
1671
 
              <para>Defaults: 0.4</para>
 
1729
              <para>Defaults: <literal>0.4</literal></para>
1672
1730
            </listitem>
1673
1731
          </varlistentry>
1674
1732
 
1752
1810
 
1753
1811
  <chapter id="files">
1754
1812
    <title>Files</title>
1755
 
    <para>The following files are used by &app;:</para>
 
1813
    <para>The following files are used by <application>&app;</application>:</para>
1756
1814
 
1757
1815
    <variablelist>
1758
1816
      <varlistentry>