Skip to content

Commit

Permalink
fixes from languague review
Browse files Browse the repository at this point in the history
  • Loading branch information
@jfaltenbacher
jfaltenbacher committed Jul 23, 2024
1 parent 9da209b commit 5e580ab
Show file tree
Hide file tree
Showing 3 changed files with 312 additions and 157 deletions.
38 changes: 25 additions & 13 deletions concepts/GNOME-desktop.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,14 @@
its:translate="no"/>
<abstract>
<!-- can be changed via merge in the assembly -->
<para> &productname; comes along with <productname>&gnome;
Desktop</productname>, a desktop environment with an easy-to-use graphical
<para>
&productname; comes along with <productname>&gnome;
Desktop</productname>, a desktop environment with an easy-to-use graphical
interface. This article describes the default configuration of
<productname>&gnome; Desktop</productname>. If you or your system
<productname>&gnome; Desktop</productname>. If you or your system
administrator modify the defaults, certain aspects might be different, such
as appearance or key combinations. </para>
as appearance or key combinations.
</para>
</abstract>
</info>
<section xml:id="concept-GNOME-what-is">
Expand All @@ -41,7 +43,7 @@
calendar, file browser, and many more.
</para>
<para>
Certain versions of &productname;; ship with as many as four
Certain versions of &productname; ship with as many as four
different session configurations based on &gnome;. These are:
</para>
<variablelist>
Expand Down Expand Up @@ -103,29 +105,39 @@
</para>
<note>
<title>
<productname>Wayland</productname> and <productname>Xorg</productname>
<productname>Wayland</productname> vs. <productname>Xorg</productname>
</title>
<para>
Both are full featured open source implementation of the
Both are full-featured, open source implementations of the
<productname>X Window System</productname>, which provides the
foundational graphical interface for Unix-like operating systems,
including Linux.
<productname>Xorg</productname> is a mature, highly compatible, but
complex solution. Whereas <productname>Wayland</productname> is newer
using a simpler architecture but not yet offering the wide range
of compatibility and maturity as <productname>Xorg</productname>. Both
protocols have their strengths and weaknesses. The choice between them
depends on specific needs, including hardware compatibility, performance
requirements, and the specific applications being used.
</para>
</note>
</section>
<section xml:id="concept-GNOME-how-it-works">
<title>How does <productname>&gnome; Desktop</productname> work? </title>
<para> In <productname>&gnome; Desktop</productname>, you can find and open
any application in the <guilabel>Activities overview</guilabel>. The settings
of the desktop can be configured in the <guilabel>Application</guilabel> and
<guilabel>System</guilabel> menu. </para>
<para>
In <productname>&gnome; Desktop</productname>, you can find and open
any application in the <guilabel>Activities overview</guilabel>. The
settings of the desktop can be configured in the
<guilabel>Application</guilabel> and <guilabel>System</guilabel> menu.
</para>
</section>
<section xml:id="concept-GNOME-benefits">
<title>Benefits of <productname>&gnome; Desktop</productname>
</title>
<para>
<productname>&gnome; Desktop</productname> is a free, open source, and
<productname>&gnome; Desktop</productname> is a free, open source and
easy-to-use desktop environment offering a variety of applications to help
you organize and complete your daily tasks. </para>
you organize and complete your daily tasks.
</para>
</section>
</topic>
89 changes: 55 additions & 34 deletions tasks/GNOME-settings-customize.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,64 +98,83 @@ in the assembly -->
</listitem>
</itemizedlist>
<note>
<title> Settings made using <command>ibus-setup</command> do not take effect </title>
<para> On &gnome;, settings made using <command>ibus-setup</command> do
<title>Settings made using <command>ibus-setup</command> do not take effect
</title>
<para>
On &gnome;, settings made using <command>ibus-setup</command> do
not take effect. <command>ibus-setup</command> can only be used to configure
IceWM. Instead, always use the <guimenu>Settings</guimenu> application: </para>
IceWM. Instead, always use the <guimenu>Settings</guimenu> application:
</para>
<itemizedlist>
<listitem>
<para> To change input methods, select <guimenu>Keyboard</guimenu> in the
navigation pane of the <guimenu>Settings</guimenu> dialog. </para>
<para>
To change input methods, select <guimenu>Keyboard</guimenu> in the
navigation pane of the <guimenu>Settings</guimenu> dialog.
</para>
</listitem>
<listitem>
<para> To change the key combination that switches between input methods,
use <menuchoice>
<guimenu>Keyboard</guimenu>
<guimenu>Keyboard Shortcuts</guimenu>
</menuchoice>. Then select the category <guimenu>Typing</guimenu> and the
entry <guimenu>Switch to next input source</guimenu>. </para>
<para>
To change the key combination that switches between input methods,
use <menuchoice> <guimenu>Keyboard</guimenu>
<guimenu>Keyboard Shortcuts</guimenu> </menuchoice>. Then select the
category <guimenu>Typing</guimenu> and the entry <guimenu>Switch to next
input source</guimenu>.
</para>
</listitem>
</itemizedlist>
</note>
</section>
<section xml:id="task-GNOME-settings-customize-keyboard">
<title>Configuring the keyboard</title>
<para> Refer to <xref linkend="task-GNOME-assistive-technologies"/> for
<para>
Refer to <xref linkend="task-GNOME-assistive-technologies"/> for
additional settings, such as key auto-repetition and cursor blink rate, and
accessibility features. To configure your keyboard layout, refer to <xref
linkend="task-GNOME-assistive-technologies-keyboard-mouse"/>. </para>
<para> To modify keyboard shortcuts, right-click the desktop and choose
accessibility features. To configure your keyboard layout, refer to
<xref linkend="task-GNOME-assistive-technologies-keyboard-mouse"/>.
</para>
<para>
To modify keyboard shortcuts, right-click the desktop and choose
<guimenu>Settings</guimenu>. Now select <menuchoice>
<guimenu>Keyboard</guimenu>
<guimenu>Keyboard Shortcuts</guimenu>
</menuchoice>. </para>
<para> This dialog shows the keyboard shortcuts that are configured for your
</menuchoice>.
</para>
<para>
This dialog shows the keyboard shortcuts that are configured for your
system. To edit a key combination, click the entry that you want to change.
To set a new key combination, press the respective keys. To disable a
shortcut, press <keycap function="backspace"/> instead. </para>
shortcut, press <keycap function="backspace"/> instead.
</para>
</section>
<section xml:id="task-GNOME-settings-using-xcompose">
<title>Using <productname>XCompose</productname> to type special
characters</title>
<para>&gnome; supports fast input source (keyboard layout) switching
<para>
&gnome; supports fast input source (keyboard layout) switching
(<xref linkend="task-GNOME-settings-customize-language"/>). However, if you
are using <command>xmodmap</command> to create custom keymaps, it may not
work correctly when you switch between multiple input sources. For example,
you have two input sources, English and German. Your
are using <command>xmodmap</command> to create custom keymaps, it may not
work correctly when you switch between multiple input sources. For example,
you have two input sources, English and German. Your
<command>xmodmap</command> commands work fine in the first input source you
select, but when you switch to the second input source. the same
select, but when you switch to the second input source, the same
<command>xmodmap</command> commands produce incorrect output.
<command>xmodmap</command> is an older protocol and does not have a full
view of the keyboard layout, so in more complex situations it causes errors. </para>
<para> An alternative method is to use <command>xcompose</command> to assign
view of the keyboard layout, so in more complex situations it causes errors.
</para>
<para>
An alternative method is to use <command>xcompose</command> to assign
special symbols to sequences of key presses. This should work with any input
source. Install <command>xcompose</command> by installing the
<literal>libX11-devel</literal> package. </para>
<para> Next, assign a compose key with the <guimenu>Tweaks</guimenu> tool in
the <guimenu>Activities</guimenu> overview. Press this key in sequence with
one or two additional keys to print a special character. The keys must be
pressed in the correct sequence, starting with the compose key. </para>
<para> In the <guimenu>Tweaks</guimenu> tool, navigate to <menuchoice>
<literal>libX11-devel</literal> package.
</para>
<para>
Next, assign a compose key with the <guimenu>Tweaks</guimenu> tool in
the <guimenu>Activities</guimenu> overview. Press this key in sequence with
one or two additional keys to print a special character. The keys must be
pressed in the correct sequence, starting with the compose key.
</para>
<para>
In the <guimenu>Tweaks</guimenu> tool, navigate to <menuchoice>
<guimenu>Keyboard &amp; Mouse</guimenu>
<guimenu>Compose Key</guimenu>
</menuchoice> and select your command key (<xref
Expand All @@ -174,9 +193,11 @@ in the assembly -->
</textobject>
</mediaobject>
</figure>
<para> Next, create a <filename>~/.XCompose</filename> file. This is the
default per-user configuration file. Enter your key mappings in this file,
as in this example: </para>
<para>
Next, create a <filename>~/.XCompose</filename> file. This is the
default per-user configuration file. Enter your key mappings in this file,
as in this example:
</para>
<screen>include "%L"

&lt;Multi_key> &lt;a> : "α"
Expand Down
Loading

0 comments on commit 5e580ab

Please sign in to comment.