Git commit 3a44a563f14d15000d4b1ebd608ebc9d5b55f883 by Burkhard Lück. Committed on 14/06/2016 at 06:04. Pushed by lueck into branch 'master'.
update fundamentals to plasma 5.6 bump date + releaseinfo remove entities from header already in kdoctools > 1 year Question: Do we need the Meta entity in en/user.entities? proofread + update new screenshots REVIEW:128117 M +12 -9 doc/fundamentals/config.docbook M +- -- doc/fundamentals/find-find-inline.png M +- -- doc/fundamentals/find-replace-inline.png M +3 -15 doc/fundamentals/index.docbook M +5 -6 doc/fundamentals/install.docbook M +- -- doc/fundamentals/shortcuts-schemes.png M +- -- doc/fundamentals/shortcuts-set.png M +1 -1 doc/fundamentals/tasks.docbook M +91 -87 doc/fundamentals/ui.docbook http://commits.kde.org/khelpcenter/3a44a563f14d15000d4b1ebd608ebc9d5b55f883 diff --git a/doc/fundamentals/config.docbook b/doc/fundamentals/config.docbook index 5de09be..d8bd96f 100644 --- a/doc/fundamentals/config.docbook +++ b/doc/fundamentals/config.docbook @@ -283,8 +283,8 @@ set a shortcut.</phrase></textobject> <sect2 id="shortcuts-reset"> <title>Resetting Shortcuts</title> -<para>There is a button at the bottom of the window, called <guibutton>Reset to -Defaults</guibutton>. Clicking on this button will reset all your custom shortcuts +<para>There is a button at the bottom of the window, called <guibutton>Defaults</guibutton>. +Clicking on this button will reset all your custom shortcuts to their default values.</para> <para>You can also reset an individual shortcut to its default value by selecting @@ -308,9 +308,6 @@ a shortcut.</para> several profiles with different shortcuts and switch between these profiles easily.</para> -<warning><para>This feature is under development. It is not possible to import -schemes using a &GUI; at this time.</para></warning> - <screenshot id="screenshot-shortcuts-schemes"> <screeninfo>Working with Schemes</screeninfo> <mediaobject> @@ -322,7 +319,7 @@ editing tools.</phrase></textobject> </screenshot> <para>To see a menu allowing you to edit schemes, click on the -<guibutton>Details</guibutton> button at the bottom of the form. The following +<guibutton>Manage Schemes</guibutton> button at the bottom of the form. The following options will appear:</para> <variablelist> @@ -350,19 +347,25 @@ a name for your new scheme.</para></listitem> <variablelist> <varlistentry> -<term><guimenuitem>Save as Scheme Defaults</guimenuitem></term> -<listitem><para>Sets the current scheme as the default for all new schemes.</para></listitem> +<term><guimenuitem>Save Shortcuts to scheme</guimenuitem></term> +<listitem><para>Save the current shortcuts to the current scheme.</para></listitem> </varlistentry> <varlistentry> <term><guimenuitem>Export Scheme...</guimenuitem></term> -<listitem><para>Exports the current scheme to a file named <filename><replaceable>applicationname</replaceable><replaceable>schemename</replaceable>shortcuts.rc</filename>.</para> +<listitem><para>Exports the current scheme to a file named WRONG <filename><replaceable>applicationname</replaceable><replaceable>schemename</replaceable>shortcuts.rc</filename>.</para> <para> Move this file to the folder <filename class="directory">$KDEDIR/apps/applicationname/</filename> and the exported scheme will be available in the drop down box labelled <guilabel>Current Scheme</guilabel> </para></listitem> </varlistentry> +<varlistentry> +<term><guimenuitem>Import Scheme...</guimenuitem></term> +<listitem><para>Imports a scheme from a file named ?????? <filename><replaceable>applicationname</replaceable><replaceable>schemename</replaceable>shortcuts.rc</filename>.</para> +</listitem> +</varlistentry> + </variablelist> </listitem> </varlistentry> diff --git a/doc/fundamentals/find-find-inline.png b/doc/fundamentals/find-find-inline.png index a7d7407..6e3b251 100644 Binary files a/doc/fundamentals/find-find-inline.png and b/doc/fundamentals/find-find-inline.png differ diff --git a/doc/fundamentals/find-replace-inline.png b/doc/fundamentals/find-replace-inline.png index f3cfe0a..1b16e08 100644 Binary files a/doc/fundamentals/find-replace-inline.png and b/doc/fundamentals/find-replace-inline.png differ diff --git a/doc/fundamentals/index.docbook b/doc/fundamentals/index.docbook index 1d674f5..7782cad 100644 --- a/doc/fundamentals/index.docbook +++ b/doc/fundamentals/index.docbook @@ -1,21 +1,9 @@ <?xml version="1.0" ?> <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [ - <!ENTITY kappname "&kde-sc;"> <!ENTITY % addindex "IGNORE"> - <!--FIXME: these entities should be added to kdoctools--> - <!ENTITY plasma-workspaces "&i18n-plasma-workspaces;"> - <!ENTITY plasma-desktop "&i18n-plasma-desktop;"> - <!ENTITY plasma-active "&i18n-plasma-active;"> - <!ENTITY gwenview '<application>Gwenview</application>'> - <!ENTITY Meta "&i18n-Meta;"> - <!--/end entities that need to be added to kdoctools--> - <!--make some of the above entities translatable in the interim--> - <!ENTITY i18n-plasma-workspaces "&kde; &plasma; Workspaces"> - <!ENTITY i18n-plasma-desktop "<application>&kde; &plasma; Desktop</application>"> - <!ENTITY i18n-plasma-active "<application>&plasma; Active</application>"> + <!ENTITY Meta "&i18n-Meta;"> <!--FIXME should this be in en/user.entities? --> <!ENTITY i18n-Meta "<keysym>Meta</keysym>"> - <!--/end temporary translatable entities--> <!ENTITY ui-chapter SYSTEM "ui.docbook"> <!ENTITY tasks-chapter SYSTEM "tasks.docbook"> <!ENTITY config-chapter SYSTEM "config.docbook"> @@ -47,8 +35,8 @@ </copyright> <legalnotice>&FDLNotice;</legalnotice> -<date>2015-07-30</date> -<releaseinfo>&plasma; 5.4</releaseinfo> +<date>2016-06-06</date> +<releaseinfo>&plasma; 5.6</releaseinfo> <abstract> <para>This guide provides an introduction to the &kde; workspace and applications and describes many diff --git a/doc/fundamentals/install.docbook b/doc/fundamentals/install.docbook index 80f0a9b..41db4ba 100644 --- a/doc/fundamentals/install.docbook +++ b/doc/fundamentals/install.docbook @@ -82,13 +82,12 @@ documentation.</para> <sect2 id="install-mobile"> <title>Mobile Devices</title> - -<para>&plasma-active; is an exciting initiative to bring a new &kde; +<para><productname>Plasma Mobile</productname> is an exciting initiative to bring a new &kde; experience to mobile devices like smartphones or tablets. Binary releases are provided for several different devices.</para> <para>For more information, visit -<ulink url="http://plasma-active.org/";>&plasma-active;</ulink>.</para> +<ulink url="http://plasma-mobile.org/";><productname>Plasma Mobile</productname></ulink>.</para> </sect2> @@ -108,14 +107,14 @@ of distributions that offer the &kde; workspace and applications on live media</ <title>Building from Source Code</title> <para>For detailed information on how to compile and install &kde; workspace and -applications see <ulink url="http://techbase.kde.org/";>&kde; TechBase</ulink>.</para> +applications see <ulink url="https://community.kde.org/Guidelines_and_HOWTOs/Build_from_source";>Build from source</ulink>.</para> <para>Since &kde; software uses <command>cmake</command> you should have no trouble compiling it. Should you run into problems please report them to the &kde; mailing lists.</para> <para>The recommended tool to build Frameworks and &plasma; Workspace 5 and Applications is -<ulink url="https://quickgit.kde.org/?p=kdesrc-build.git";>kdesrc-build</ulink> +<ulink url="https://commits.kde.org/kdesrc-build";>kdesrc-build</ulink> </para> </sect2> <!--FIXME more info: @@ -126,4 +125,4 @@ have no trouble compiling it. Should you run into problems please report them to </sect1> -</chapter> \ No newline at end of file +</chapter> diff --git a/doc/fundamentals/shortcuts-schemes.png b/doc/fundamentals/shortcuts-schemes.png index 7b55eb7..5b4dfc3 100644 Binary files a/doc/fundamentals/shortcuts-schemes.png and b/doc/fundamentals/shortcuts-schemes.png differ diff --git a/doc/fundamentals/shortcuts-set.png b/doc/fundamentals/shortcuts-set.png index 53ed5e8..3d4644d 100644 Binary files a/doc/fundamentals/shortcuts-set.png and b/doc/fundamentals/shortcuts-set.png differ diff --git a/doc/fundamentals/tasks.docbook b/doc/fundamentals/tasks.docbook index 0b9db66..8a52edf 100644 --- a/doc/fundamentals/tasks.docbook +++ b/doc/fundamentals/tasks.docbook @@ -82,7 +82,7 @@ printed document, or one screen up in other types of documents.</para></listitem <varlistentry id="nav-scroll-page-down"> <term><menuchoice> -<shortcut><keycap>PgDown</keycap></shortcut> +<shortcut><keycap>PgDn</keycap></shortcut> <guimenuitem>Page down</guimenuitem> </menuchoice></term> <listitem><para>Navigate to the next page in a document that represents a diff --git a/doc/fundamentals/ui.docbook b/doc/fundamentals/ui.docbook index dd2f2b8..b27264b 100644 --- a/doc/fundamentals/ui.docbook +++ b/doc/fundamentals/ui.docbook @@ -1127,6 +1127,17 @@ Allows you to show and hide the various toolbars supported by the application. <varlistentry> <term><menuchoice> +<guimenu>Settings</guimenu><guimenuitem>Show +Statusbar</guimenuitem></menuchoice></term> +<listitem> +<para>When checked, this displays a small bar at the bottom of the application +containing information about the status. When unchecked +the status bar is hidden.</para> +</listitem> +</varlistentry> + +<varlistentry> +<term><menuchoice> <guimenu>Settings</guimenu><guimenuitem>Configure Shortcuts...</guimenuitem> </menuchoice></term> <listitem><para> @@ -1332,7 +1343,7 @@ whether it be opening, closing, moving, or switching between them.</para> </row> <row> -<entry><keycombo action="simul">&Alt;<keycap>Space</keycap></keycombo></entry> +<entry><keycombo action="simul">&Alt;<keycap>Space</keycap></keycombo> / <keycombo action="simul">&Alt;<keycap>F2</keycap></keycombo></entry> <entry><ulink url="help:/plasma-desktop/krunner.html">Run Command Interface</ulink></entry> </row> @@ -1365,67 +1376,67 @@ desktops efficiently.</para> <tbody> <row> -<entry><keycombo action="simul">&Ctrl;<keycap>F10</keycap></keycombo></entry> +<entry><keycombo action="simul">&Ctrl;<keycap>F10</keycap></keycombo></entry><!--[kwin][Global Shortcuts] ExposeAll=Ctrl+F10; Launch (C) --> <entry>Present Windows</entry> </row> <row> -<entry><keycombo action="simul">&Ctrl;<keycap>F9</keycap></keycombo></entry> +<entry><keycombo action="simul">&Ctrl;<keycap>F9</keycap></keycombo></entry><!--[kwin][Global Shortcuts] Expose=Ctrl+F9 --> <entry>Present Windows on current desktop</entry> </row> <row> -<entry><keycombo action="simul">&Ctrl;<keycap>F7</keycap></keycombo></entry> +<entry><keycombo action="simul">&Ctrl;<keycap>F7</keycap></keycombo></entry><!--[kwin][Global Shortcuts] ExposeClass=Ctrl+F7 --> <entry>Present Windows of current application only</entry> </row> - +<!--FIXME not in 5.6.4 <row> <entry><keycombo action="simul">&Ctrl;<keycap>F11</keycap></keycombo></entry> <entry>Desktop Cube</entry> </row> - +--> <row> -<entry><keycombo action="simul">&Ctrl;<keycap>F12</keycap></keycombo></entry> -<entry>Show Dashboard</entry> +<entry><keycombo action="simul">&Ctrl;<keycap>F12</keycap></keycombo></entry><!--[plasmashell][Global Shortcuts] show dashboard=Ctrl+F12--> +<entry>Show Desktop</entry> </row> <row> -<entry><keycombo action="simul">&Ctrl;&Alt;<keycap>A</keycap></keycombo></entry> +<entry><keycombo action="simul">&Ctrl;&Alt;<keycap>A</keycap></keycombo></entry><!--[kwin][Global Shortcuts] Activate Window Demanding Attention=Ctrl+Alt+A --> <entry>Activate Window Demanding Attention</entry> </row> <row> -<entry><keycombo action="simul">&Alt;	</keycombo></entry> +<entry><keycombo action="simul">&Alt;	</keycombo></entry><!--[kwin][Global Shortcuts] Walk Through Windows=Alt+Tab--> <entry>Walk through windows</entry> </row> <row> -<entry><keycombo action="simul">&Alt;<keycap>`</keycap></keycombo></entry> -<entry>Walk through windows of the current application</entry> +<entry><keycombo action="simul">&Alt;&Shift;	</keycombo></entry><!--[kwin][Global Shortcuts] Walk Through Windows (Reverse)=Alt+Shift+Backtab--> +<entry>Walk through windows (Reverse)</entry> </row> <row> -<entry><keycombo action="simul">&Alt;<keycap>F3</keycap></keycombo></entry> +<entry><keycombo action="simul">&Alt;<keycap>F3</keycap></keycombo></entry><!--FIXME source ?--> <entry>Open the Window Operations menu</entry> </row> <row> -<entry><keycombo action="simul">&Meta;&Alt;<keysym>Up</keysym></keycombo></entry> +<entry><keycombo action="simul">&Meta;&Alt;<keysym>Up</keysym></keycombo></entry><!--[kwin][Global Shortcuts] Switch Window Up=Meta+Alt+Up--> <entry>Switch to Window Above</entry> </row> <row> -<entry><keycombo action="simul">&Meta;&Alt;<keysym>Down</keysym></keycombo></entry> +<entry><keycombo action="simul">&Meta;&Alt;<keysym>Down</keysym></keycombo></entry><!--[kwin][Global Shortcuts] Switch Window Down=Meta+Alt+Down--> <entry>Switch to Window Below</entry> </row> <row> -<entry><keycombo action="simul">&Meta;&Alt;<keysym>Left</keysym></keycombo></entry> +<entry><keycombo action="simul">&Meta;&Alt;<keysym>Left</keysym></keycombo></entry><!--[kwin][Global Shortcuts] Switch Window Left=Meta+Alt+Left--> <entry>Switch to Window to the Left</entry> </row> <row> -<entry><keycombo action="simul">&Meta;&Alt;<keysym>Right</keysym></keycombo></entry> +<entry><keycombo action="simul">&Meta;&Alt;<keysym>Right</keysym></keycombo></entry><!--[kwin][Global Shortcuts] Switch Window Right=Meta+Alt+Right--> <entry>Switch to Window to the Right</entry> </row> @@ -1435,7 +1446,7 @@ desktops efficiently.</para> </sect3> <sect3 id="kbd-activity-pan-zoom"> -<title>Panning and Zooming</title> +<title>Panning and Zooming</title><!--FIXME nothing works for me--> <para>Need to get a closer look? The &plasma-workspaces; allow you to zoom in and out and move your entire desktop around, so you can zoom in even when the @@ -1461,37 +1472,37 @@ application you are using doesn't support it.</para> --> <row> -<entry><keycombo action="simul">&Meta;<keycap>=</keycap></keycombo></entry> +<entry><keycombo action="simul">&Meta;<keycap>=</keycap></keycombo></entry><!--[kwin][Global Shortcuts] view_zoom_in=Meta+= --> <entry>Zoom In</entry> </row> <row> -<entry><keycombo action="simul">&Meta;<keycap>-</keycap></keycombo></entry> +<entry><keycombo action="simul">&Meta;<keycap>-</keycap></keycombo></entry><!--[kwin][Global Shortcuts] view_zoom_out=Meta+- --> <entry>Zoom Out</entry> </row> <row> -<entry><keycombo action="simul">&Meta;<keycap>0</keycap></keycombo></entry> +<entry><keycombo action="simul">&Meta;<keycap>0</keycap></keycombo></entry><!--[kwin][Global Shortcuts] view_actual_size=Meta+0 --> <entry>Zoom Normal</entry> </row> <row> -<entry><keycombo action="simul">&Meta;<keysym>Up</keysym></keycombo></entry> +<entry><keycombo action="simul">&Meta;<keysym>Up</keysym></keycombo></entry><!--[kwin][Global Shortcuts] MoveZoomUp=Meta+Up --> <entry>Pan Up</entry> </row> <row> -<entry><keycombo action="simul">&Meta;<keysym>Down</keysym></keycombo></entry> +<entry><keycombo action="simul">&Meta;<keysym>Down</keysym></keycombo></entry><!--[kwin][Global Shortcuts] MoveZoomDown=Meta+Down --> <entry>Pan Down</entry> </row> <row> -<entry><keycombo action="simul">&Meta;<keysym>Left</keysym></keycombo></entry> +<entry><keycombo action="simul">&Meta;<keysym>Left</keysym></keycombo></entry><!--[kwin][Global Shortcuts] MoveZoomLeft=Meta+Left --> <entry>Pan left</entry> </row> <row> -<entry><keycombo action="simul">&Meta;<keysym>Right</keysym></keycombo></entry> +<entry><keycombo action="simul">&Meta;<keysym>Right</keysym></keycombo></entry><!--[kwin][Global Shortcuts] MoveZoomRight=Meta+Right --> <entry>Pan Right</entry> </row> @@ -1505,7 +1516,7 @@ application you are using doesn't support it.</para> <title>Working with Activities and Virtual Desktops</title> <para>These shortcuts allow you to switch between and manage -<ulink url="help:/plasma-desktop/zooming-user-interface.html">Activities</ulink> +<ulink url="help:/plasma-desktop/activities.html">Activities</ulink> and <ulink url="help:/kcontrol/desktop/">virtual desktops</ulink>.</para> <informaltable> @@ -1521,53 +1532,39 @@ and <ulink url="help:/kcontrol/desktop/">virtual desktops</ulink>.</para> <tbody> <row> -<entry><keycombo action="simul">&Ctrl;<keycap>Q</keycap></keycombo></entry> -<entry>View all your Activities</entry> +<entry><keycombo action="simul">&Meta;<keycap>Q</keycap></keycombo> /<!-- [plasmashell][Global Shortcuts] manage activities=Meta+Q --> +<keycombo action="simul">&Alt;<keycap>D</keycap></keycombo>,<keycombo action="simul">&Alt;<keycap>A</keycap></keycombo><!--FIXME source ?--> +</entry> +<entry>Manage Activities</entry> </row> <row> -<entry><keycombo action="simul">&Meta;	</keycombo></entry> +<entry><keycombo action="simul">&Meta;	</keycombo></entry><!-- [plasmashell][Global Shortcuts] next activity=Meta+Tab --> <entry>Next Activity</entry> </row> <row> -<entry><keycombo action="simul">&Meta;&Shift;	</keycombo></entry> +<entry><keycombo action="simul">&Meta;&Shift;	</keycombo></entry><!-- [plasmashell][Global Shortcuts] previous activity=Meta+Shift+Tab --> <entry>Previous Activity</entry> </row> <row> -<entry><keycombo action="seq"> - <keycombo action="simul">&Alt;<keycap>D</keycap></keycombo> - <keycap>R</keycap> -</keycombo></entry> -<entry>Remove this Activity</entry> -</row> - -<row> -<entry><keycombo action="seq"> - <keycombo action="simul">&Alt;<keycap>D</keycap></keycombo> - <keycap>S</keycap> -</keycombo></entry> -<entry>Activities Settings</entry> -</row> - -<row> -<entry><keycombo action="simul">&Ctrl;<keycap>F1</keycap></keycombo></entry> +<entry><keycombo action="simul">&Ctrl;<keycap>F1</keycap></keycombo></entry><!--[kwin][Global Shortcuts] Switch to Desktop 1=Ctrl+F1 --> <entry>Switch to Desktop 1</entry> </row> <row> -<entry><keycombo action="simul">&Ctrl;<keycap>F2</keycap></keycombo></entry> +<entry><keycombo action="simul">&Ctrl;<keycap>F2</keycap></keycombo></entry><!--[kwin][Global Shortcuts] Switch to Desktop 2=Ctrl+F2 --> <entry>Switch to Desktop 2</entry> </row> <row> -<entry><keycombo action="simul">&Ctrl;<keycap>F3</keycap></keycombo></entry> +<entry><keycombo action="simul">&Ctrl;<keycap>F3</keycap></keycombo></entry><!--[kwin][Global Shortcuts] Switch to Desktop 2=Ctrl+F3 --> <entry>Switch to Desktop 3</entry> </row> <row> -<entry><keycombo action="simul">&Ctrl;<keycap>F4</keycap></keycombo></entry> +<entry><keycombo action="simul">&Ctrl;<keycap>F4</keycap></keycombo></entry><!--[kwin][Global Shortcuts] Switch to Desktop 2=Ctrl+F4 --> <entry>Switch to Desktop 4</entry> </row> @@ -1596,73 +1593,81 @@ and <ulink url="help:/kcontrol/desktop/">virtual desktops</ulink>.</para> <row> <entry><keycombo action="seq"> - <keycombo action="simul">&Alt;<keycap>D</keycap></keycombo> - <keycap>A</keycap> +<keycombo action="simul">&Alt;<keycap>D</keycap></keycombo><!--plasma-framework/src/plasma/private/containment_p.cpp--> +<keycap>A</keycap> </keycombo></entry> <entry>Add Widgets</entry> </row> <row> <entry><keycombo action="seq"> - <keycombo action="simul">&Alt;<keycap>D</keycap></keycombo> - <keycap>R</keycap> +<keycombo action="simul">&Alt;<keycap>D</keycap></keycombo><!--FIXME source ?--> +<keycap>R</keycap> </keycombo></entry> -<entry>Remove Widgets</entry> +<entry>Remove this <replaceable>Widget</replaceable></entry> </row> <row> <entry><keycombo action="seq"> - <keycombo action="simul">&Alt;<keycap>D</keycap></keycombo> - <keycap>L</keycap> +<keycombo action="simul">&Alt;<keycap>D</keycap></keycombo><!--FIXME source ?--> +<keycap>L</keycap> </keycombo></entry> <entry>Lock/Unlock Widgets</entry> </row> - +<!--FIXME source ? No >Next Widget< nor >Previous Widget< in kde-workspace or frameworks code <row> <entry><keycombo action="seq"> - <keycombo action="simul">&Alt;<keycap>D</keycap></keycombo> - <keycap>N</keycap> +<keycombo action="simul">&Alt;<keycap>D</keycap></keycombo> +<keycap>N</keycap> </keycombo></entry> <entry>Next Widget</entry> </row> <row> <entry><keycombo action="seq"> - <keycombo action="simul">&Alt;<keycap>D</keycap></keycombo> - <keycap>P</keycap> +<keycombo action="simul">&Alt;<keycap>D</keycap></keycombo> +<keycap>P</keycap> </keycombo></entry> <entry>Previous Widget</entry> </row> - +--> <row> <entry><keycombo action="seq"> - <keycombo action="simul">&Alt;<keycap>D</keycap></keycombo> - <keycap>S</keycap> +<keycombo action="simul">&Alt;<keycap>D</keycap></keycombo><!--FIXME source ?--> +<keycap>S</keycap> </keycombo></entry> -<entry>Widget Settings</entry> +<entry><replaceable>Widget</replaceable> Settings</entry> </row> <row> -<entry><keycombo action="simul">&Ctrl;<keycap>F12</keycap></keycombo></entry> -<entry>Show Dashboard</entry> +<entry><keycombo action="simul">&Ctrl;<keycap>F12</keycap></keycombo></entry><!--[plasmashell][Global Shortcuts] show dashboard=Ctrl+F12--> +<entry>Show Desktop</entry> </row> <row> <entry><keycombo action="seq"> - <keycombo action="simul">&Alt;<keycap>D</keycap></keycombo> - <keycap>T</keycap> +<keycombo action="simul">&Alt;<keycap>D</keycap></keycombo> +<keycap>T</keycap> </keycombo></entry> <entry>Run the Associated Application</entry> </row> - +<!--FIXME obsolete? <row> <entry><keycombo action="simul">&Alt;&Shift;<keycap>F12</keycap></keycombo></entry> <entry>Enable/Disable Desktop Effects</entry> </row> +--> + +<row> +<entry><keycombo action="simul">&Alt;<keycap>D</keycap></keycombo>,<keycombo action="simul">&Alt;<keycap>S</keycap></keycombo><!--FIXME source ?--> +</entry> +<entry>Desktop Settings</entry> +</row> </tbody> </tgroup> </informaltable> + </sect2> <sect2 id="kbd-help"> @@ -1904,34 +1909,34 @@ information on how to assign keys for these tasks.</para> </thead> <tbody> - +<!--FIXME obsolete? <row> <entry><keycombo action="simul">&Ctrl;&Alt;<keycap>Insert</keycap></keycombo></entry> <entry>Switch User</entry> </row> - +--> <row> -<entry><keycombo action="simul">&Ctrl;&Alt;<keycap>L</keycap></keycombo></entry> -<entry>Lock Session</entry> +<entry><keycombo action="simul">&Ctrl;&Alt;<keycap>L</keycap></keycombo></entry><!--workspace/kscreenlocker/ksmserver/server.cpp--> +<entry>Lock Screen</entry> </row> <row> -<entry><keycombo action="simul">&Ctrl;&Alt;<keycap>Delete</keycap></keycombo></entry> -<entry>Logout</entry> +<entry><keycombo action="simul">&Ctrl;&Alt;<keycap>Del</keycap></keycombo></entry><!--plasma-workspace/ksmserver/server.cpp--> +<entry>Leave</entry> </row> <row> -<entry><keycombo action="simul">&Ctrl;&Alt;&Shift;<keycap>Delete</keycap></keycombo></entry> +<entry><keycombo action="simul">&Ctrl;&Alt;&Shift;<keycap>Del</keycap></keycombo></entry><!--plasma-workspace/ksmserver/server.cpp--> <entry>Logout without confirmation</entry> </row> <row> -<entry><keycombo action="simul">&Ctrl;&Alt;&Shift;<keycap>Page Down</keycap></keycombo></entry> +<entry><keycombo action="simul">&Ctrl;&Alt;&Shift;<keycap>Page Down</keycap></keycombo></entry><!--plasma-workspace/ksmserver/server.cpp--> <entry>Shut Down without confirmation</entry> </row> <row> -<entry><keycombo action="simul">&Ctrl;&Alt;&Shift;<keycap>Page Up</keycap></keycombo></entry> +<entry><keycombo action="simul">&Ctrl;&Alt;&Shift;<keycap>Page Up</keycap></keycombo></entry><!--plasma-workspace/ksmserver/server.cpp--> <entry>Reboot without confirmation</entry> </row> @@ -1944,18 +1949,17 @@ information on how to assign keys for these tasks.</para> <title>Modifying Shortcuts</title> <para>The shortcuts described in <link linkend="kbd-windows">Working With -Windows</link>, <link linkend="kbd-leaving">Leaving Your Computer</link>, and -<link linkend="kbd-vol-bright">Changing Volume and Brightness</link> are called +Windows</link>, <link linkend="kbd-leaving">Leaving Your Computer</link>, +<link linkend="kbd-vol-bright">Changing Volume and Brightness</link> and +<link linkend="kbd-activities">Working with +Activities and Virtual Desktops</link> are called <emphasis>global shortcuts</emphasis>, since they work regardless of which window you have open on your screen. These can be modified in the <ulink url="help:/kcontrol/keys/">Global Shortcuts panel of &systemsettings;</ulink>, where they are separated by &kde; component.</para> -<para>The shortcuts described in <link linkend="kbd-activities">Working with -Activities and Virtual Desktops</link> and <link linkend="kbd-desktop">Working -with the Desktop</link> can be modified by clicking on the -<ulink url="help:/plasma-desktop/using-kapp.html">Desktop Toolbox</ulink> and -selecting <guimenuitem>Shortcut Settings</guimenuitem>.</para> +<para>The shortcuts described <link linkend="kbd-desktop">Working +with the Desktop</link> are immutable and can be modified.</para> <para>The shortcuts described in <link linkend="kbd-docs">Working with Documents</link> and <link linkend="kbd-help">Getting Help</link> are set by _______________________________________________ kde-doc-english mailing list [email protected] https://mail.kde.org/mailman/listinfo/kde-doc-english
