diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/kdeprint/cups-config.docbook | 8 | ||||
| -rw-r--r-- | doc/konqueror/basics.docbook | 5 | ||||
| -rw-r--r-- | doc/konqueror/commands.docbook | 225 | ||||
| -rw-r--r-- | doc/userguide/kde-for-admins.docbook | 4 |
4 files changed, 7 insertions, 235 deletions
diff --git a/doc/kdeprint/cups-config.docbook b/doc/kdeprint/cups-config.docbook index ff286e632..3196c9af3 100644 --- a/doc/kdeprint/cups-config.docbook +++ b/doc/kdeprint/cups-config.docbook @@ -487,11 +487,11 @@ unprivileged account for the server directive <term><guilabel>Server group</guilabel></term> <listitem> <para>The group the server runs under. Normally this must be -<systemitem class="groupname">sys</systemitem>, however you can +<systemitem class="groupname">lpadmin</systemitem>, however you can configure things for another group as needed.</para> <informalexample> -<para>Enter for example <userinput>sys</userinput>.</para> +<para>Enter for example <userinput>lpadmin</userinput>.</para> </informalexample> </listitem> </varlistentry> @@ -1012,7 +1012,7 @@ format="PNG"/></imageobject> <listitem> <para>The root folder for &HTTP; documents that are served. By default the compiled in folder, <filename -class="directory">/usr/share/cups/doc</filename></para> +class="directory">/usr/share/cups/doc-root</filename></para> </listitem> </varlistentry> @@ -1756,7 +1756,7 @@ over.</para> <para>The group name for <systemitem class="groupname">System</systemitem> or printer administration access. The default varies depending on the operating system, but -will be <systemitem class="groupname">sys</systemitem>, <systemitem +will be <systemitem class="groupname">lpadmin</systemitem>, <systemitem class="groupname">system</systemitem> or <systemitem class="groupname">root</systemitem> (checked for in that order).</para> </listitem> diff --git a/doc/konqueror/basics.docbook b/doc/konqueror/basics.docbook index 8940df621..55c690c03 100644 --- a/doc/konqueror/basics.docbook +++ b/doc/konqueror/basics.docbook @@ -124,10 +124,7 @@ Your Bookmarks</link> section of this document.</para> <para>The <interface>Window</interface> is the main area of &konqueror; and -can show you the contents of a directory, web page, document or image. Using -the <link linkend="menu-window"><guimenu>Window</guimenu></link> menu you can -split &konqueror;'s main window into one or more separate views, useful for -drag and drop operations, or set it to contain two or more tabbed views. +can show you the contents of a directory, web page, document or image. </para> <para>The <interface>Status Bar</interface> runs across the bottom of the diff --git a/doc/konqueror/commands.docbook b/doc/konqueror/commands.docbook index 2b3142ecc..62cff66ad 100644 --- a/doc/konqueror/commands.docbook +++ b/doc/konqueror/commands.docbook @@ -678,108 +678,6 @@ shown in Tree, Detailed List and Text views.</para></listitem> </sect2> -<sect2 id="menu-go"> -<title>The <guimenu>Go</guimenu> Menu</title> - -<variablelist> - -<varlistentry> -<term><menuchoice> -<shortcut> -<keycombo action="simul">&Alt;<keysym>Up Arrow</keysym></keycombo> -</shortcut><guimenu>Go</guimenu> -<guimenuitem>Up</guimenuitem> -</menuchoice></term> -<listitem><para>Go up a level in the folder -hierarchy.</para></listitem> -</varlistentry> - -<varlistentry> -<term><menuchoice> -<shortcut> -<keycombo action="simul">&Alt;<keysym>Left Arrow</keysym></keycombo> -</shortcut><guimenu>Go</guimenu> -<guimenuitem>Back</guimenuitem> -</menuchoice></term> -<listitem><para>Go back to the previous -view.</para></listitem> -</varlistentry> - -<varlistentry> -<term><menuchoice> -<shortcut> -<keycombo action="simul">&Alt;<keysym>Right Arrow</keysym></keycombo> -</shortcut><guimenu>Go</guimenu> -<guimenuitem>Forward</guimenuitem> -</menuchoice></term> -<listitem><para>You can only go forward if you've just gone -back.</para></listitem> -</varlistentry> - -<varlistentry> -<term><menuchoice> -<shortcut> -<keycombo action="simul">&Ctrl;<keycap>Home</keycap></keycombo> -</shortcut><guimenu>Go</guimenu> -<guimenuitem>Home URL</guimenuitem> -</menuchoice></term> -<listitem><para>Go to your home folder.</para></listitem> -</varlistentry> - -<varlistentry> -<term><menuchoice> -<guimenu>Go</guimenu> -<guimenuitem>Applications</guimenuitem> -</menuchoice></term> -<listitem><para>Open the folder holding your -applications.</para></listitem> -</varlistentry> - -<varlistentry> -<term><menuchoice> -<guimenu>Go</guimenu> -<guimenuitem>Trash</guimenuitem> -</menuchoice></term> -<listitem><para>Open your <filename - class="directory">Trash</filename> -folder in a separate window.</para></listitem> -</varlistentry> - -<varlistentry> -<term><menuchoice> -<guimenu>Go</guimenu> -<guimenuitem>Templates</guimenuitem> -</menuchoice></term> -<listitem><para>Open the <filename -class="directory">Templates</filename> folder in a separate -window.</para></listitem> -</varlistentry> - -<varlistentry> -<term><menuchoice> -<guimenu>Go</guimenu> -<guimenuitem>Autostart</guimenuitem> -</menuchoice></term> -<listitem><para>Open your <filename -class="directory">Autostart</filename> folder in a separate -window.</para></listitem> -</varlistentry> - -<varlistentry> -<term><menuchoice> -<guimenu>Go</guimenu> -<guisubmenu>Most Often Visited</guisubmenu> -</menuchoice></term> -<listitem> -<para>Displays a submenu showing the &URL;s you visit most often. Selecting one -of these will make &konqueror; open that &URL;.</para> -</listitem> -</varlistentry> - -</variablelist> - -</sect2> - <sect2 id="menu-bookmarks"> <title>The <guimenu>Bookmarks</guimenu> Menu</title> @@ -1006,129 +904,6 @@ change settings associated with spell checking in &konqueror;.</para> </sect2> -<sect2 id="menu-window"> -<title>The <guimenu>Window</guimenu> Menu</title> - -<variablelist> - -<varlistentry> -<term><menuchoice> -<shortcut> -<keycombo action="simul">&Ctrl;&Shift;<keycap>L</keycap></keycombo></shortcut> -<guimenu>Window</guimenu> -<guimenuitem>Split View Left/Right</guimenuitem> -</menuchoice></term> -<listitem><para>Split View Left/Right.</para></listitem> -</varlistentry> - -<varlistentry> -<term><menuchoice> -<shortcut> -<keycombo -action="simul">&Ctrl;&Shift;<keycap>T</keycap></keycombo></shortcut> -<guimenu>Window</guimenu> -<guimenuitem>Split View Top/Bottom</guimenuitem> -</menuchoice></term> -<listitem><para>Split View Top/Bottom.</para></listitem> -</varlistentry> - -<varlistentry> -<term><menuchoice> -<shortcut> -<keycombo -action="simul">&Ctrl;&Shift;<keycap>R</keycap></keycombo></shortcut> -<guimenu>Window</guimenu> -<guimenuitem>Remove Active View</guimenuitem> -</menuchoice></term> -<listitem><para>Remove Active View.</para></listitem> -</varlistentry> - -<varlistentry> -<term><menuchoice> -<shortcut> -<keycombo action="simul">&Ctrl;&Shift;<keycap>N</keycap></keycombo></shortcut> -<guimenu>Window</guimenu> -<guimenuitem>New Tab</guimenuitem> -</menuchoice></term> -<listitem><para>Open a new, empty, tab page.</para></listitem> -</varlistentry> - -<varlistentry> -<term><menuchoice> -<shortcut> -<keycombo action="simul">&Ctrl;&Shift;<keycap>D</keycap></keycombo></shortcut> -<guimenu>Window</guimenu> -<guimenuitem>Duplicate Current Tab</guimenuitem> -</menuchoice></term> -<listitem><para>Open a duplicate tab page.</para></listitem> -</varlistentry> - -<varlistentry> -<term><menuchoice> -<shortcut> -<keycombo action="simul">&Ctrl;&Shift;<keycap>B</keycap></keycombo></shortcut> -<guimenu>Window</guimenu> -<guimenuitem>Detach Current Tab</guimenuitem> -</menuchoice></term> -<listitem><para>Show the current tab page in a new instance of -&konqueror;.</para></listitem> -</varlistentry> - -<varlistentry> -<term><menuchoice> -<shortcut> -<keycombo action="simul">&Ctrl;<keycap>W</keycap></keycombo></shortcut> -<guimenu>Window</guimenu> -<guimenuitem>Close Current Tab</guimenuitem> -</menuchoice></term> -<listitem><para>Close the current tab page.</para></listitem> -</varlistentry> - -<varlistentry> -<term><menuchoice> -<shortcut> -<keycombo action="simul">&Ctrl;&Shift;<keycap>Left</keycap></keycombo></shortcut> -<guimenu>Window</guimenu> -<guimenuitem>Move Tab Left</guimenuitem> -</menuchoice></term> -<listitem><para>Move the current tab one place left in the list of tabs.</para></listitem> -</varlistentry> - -<varlistentry> -<term><menuchoice> -<shortcut> -<keycombo action="simul">&Ctrl;&Shift;<keycap>Left</keycap></keycombo></shortcut> -<guimenu>Window</guimenu> -<guimenuitem>Move Tab Right</guimenuitem> -</menuchoice></term> -<listitem><para>Move the current tab one place right in the list of tabs.</para></listitem> -</varlistentry> - -<varlistentry> -<term><menuchoice> -<guimenu>Window</guimenu> -<guimenuitem>Show Terminal Emulator</guimenuitem> -</menuchoice></term> -<listitem><para>Open a small text terminal view at the bottom of the - main -window.</para></listitem> -</varlistentry> - -<varlistentry> -<term><menuchoice> -<shortcut> -<keycombo action="simul"><keycap>F9</keycap></keycombo></shortcut> -<guimenu>Window</guimenu> -<guimenuitem>Show Navigation Panel</guimenuitem> -</menuchoice></term> -<listitem><para>Toggles the display of the &konqueror; navigation panel. See -<xref linkend="sidebar"/>.</para></listitem> -</varlistentry> - -</variablelist> - -</sect2> - <sect2 id="menu-help"> <title>The <guimenu>Help</guimenu> Menu</title> diff --git a/doc/userguide/kde-for-admins.docbook b/doc/userguide/kde-for-admins.docbook index f7d5d2ee0..a44055ca3 100644 --- a/doc/userguide/kde-for-admins.docbook +++ b/doc/userguide/kde-for-admins.docbook @@ -1669,7 +1669,7 @@ new menu format: </para> <informalexample> -<para>Example from <filename>applications.menu</filename>: +<para>Example from <filename>kde-applications.menu</filename>: <programlisting> <markup> <Menu> @@ -1743,7 +1743,7 @@ These are controlled by $<envar>XDG_DATA_HOME</envar>. For more information, see <ulink url="http://www.freedesktop.org/Standards/basedir-spec">http://www.freedesktop.org/Standards/basedir-spec</ulink></para> <informalexample> -<para>Example from <filename>applications.menu</filename>: +<para>Example from <filename>kde-applications.menu</filename>: <programlisting> <markup> <Menu> |