| Summary: | Typos and oopsies in KDM docs | ||
|---|---|---|---|
| Product: | [Websites] docs.kde.org | Reporter: | Natalie <nat> |
| Component: | general | Assignee: | Documentation Editorial Team <kde-doc-english> |
| Status: | RESOLVED FIXED | ||
| Severity: | normal | ||
| Priority: | NOR | ||
| Version First Reported In: | unspecified | ||
| Target Milestone: | --- | ||
| Platform: | unspecified | ||
| OS: | Linux | ||
| Latest Commit: | Version Fixed In: | ||
| Sentry Crash Report: | |||
|
Description
Natalie
2006-10-29 20:23:53 UTC
SVN commit 607479 by annma:
fixed typos mentioned in 136472
DID NOT FIX outdated sections and did not fix .po typos (hostname versus host name for example) as I am not sure which one to choose. It seems that typos in .po files (hence in strings in code) should be filed against i18n component.
CCBUG=136472
M +14 -17 index.docbook
M +9 -7 kdmrc-ref.docbook
--- branches/KDE/3.5/kdebase/doc/kdm/index.docbook #607478:607479
@@ -142,7 +142,7 @@
<para>As <systemitem class="username">root</systemitem>, type
<userinput><command>kdm</command></userinput> at the prompt.</para>
-<para>You should see a login window, which is described more fully in<xref
+<para>You should see a login window, which is described more fully in <xref
linkend="login" />.</para>
<para>Typing your normal username and password in the fields provided, and
@@ -211,16 +211,12 @@
</listitem>
<listitem>
-<para>(Optionally) A <guibutton>Shutdown</guibutton> button that displays
-the <guibutton>Shutdown</guibutton> dialog box.</para>
-</listitem>
-<listitem>
<para>A <guibutton>Menu</guibutton> button that opens an action menu
with the following items:</para>
<itemizedlist>
<listitem>
-<para>(On local displays) a <guimenuitem>Restart X Server</guimenuitem> item
+<para>(On local displays) A <guimenuitem>Restart X Server</guimenuitem> item
that terminates the currently running &X-Server;, starts a new one and
displays the login dialog again. You can use this if the display content
seems to be broken somehow.</para>
@@ -244,8 +240,8 @@
</listitem>
<listitem>
-<para>(Optionally) A <guibutton>Shutdown...</guibutton> button that displays
-the shutdown dialog box.</para>
+<para>(Optionally) A <guibutton>Shutdown</guibutton> button that displays
+the <guilabel>Shutdown</guilabel> dialog box.</para>
</listitem>
</itemizedlist>
@@ -280,7 +276,7 @@
<term>Console Mode</term>
<listitem>
<para>Stop the &X-Server; and return the system to console mode. This is
-achieved by bringing the system down to run-level 3. Typically, the system
+achieved by bringing the system down to runlevel 3. Typically, the system
manager might need to use this option before upgrading or re-configuring X11
software.</para>
</listitem>
@@ -380,7 +376,7 @@
the window.</para>
<note><para>If you are not currently logged in as a superuser, you
-will need to click the <guibutton>Administrator Mode</guibutton>
+will need to click the <guibutton>Administrator Mode...</guibutton>
Button. You will then be asked for a superuser password. Entering a
correct password will allow you to modify the settings of this
module.</para></note>
@@ -425,7 +421,7 @@
<guilabel>Position:</guilabel> options if you want it to appear
elsewhere on the screen. You can specify the relative position
(percentage of the screen size) for the center of the login window,
-relative to the top left of the display, in the fields labelled
+relative to the top left of the display, in the fields labeled
<guilabel>X:</guilabel> and <guilabel>Y:</guilabel> respectively.
These correspond to the key
<link linkend="option-greeterpos"><option>GreeterPos</option></link>
@@ -454,7 +450,7 @@
<para>You can select three different font styles from the drop down box
(<guilabel>General:</guilabel>, <guilabel>Failures:</guilabel>,
-<guilabel>Greeting</guilabel>). When you click on the
+<guilabel>Greeting:</guilabel>). When you click on the
<guibutton>Choose...</guibutton> button a dialog appears from which you can
select the new characteristics for the font style.</para>
@@ -473,7 +469,7 @@
</listitem>
</itemizedlist>
-<para>You can also check the box labelled <guilabel>Use anti-aliasing for
+<para>You can also check the box labeled <guilabel>Use anti-aliasing for
fonts</guilabel> if you want smoothed fonts in the login dialog.</para>
</sect2>
@@ -620,7 +616,7 @@
<title><guilabel>Shutdown</guilabel></title>
<para><guilabel>Allow Shutdown</guilabel></para>
-<para>Use these drop down box to choose who is allowed to shut down:</para>
+<para>Use this drop down box to choose who is allowed to shut down:</para>
<itemizedlist>
<listitem>
<para><guilabel>Nobody</guilabel>: No one can shutdown the computer using
@@ -643,7 +639,8 @@
define the exact shutdown command.</para> <para>The
<guilabel>Halt:</guilabel> command defaults to <!-- Are these defaults still
correct? they disagree with what's in --> <!-- kdmrc -->
-<command>/sbin/halt</command>. The restart command defaults to
+<command>/sbin/halt</command>. The <guilabel>Restart:</guilabel> command
+defaults to
<command>/sbin/reboot</command>.</para>
<para>When <guilabel>Show boot options</guilabel> is enabled, &kdm;
@@ -738,7 +735,7 @@
the option <guilabel>Enable Auto-login</guilabel>.</para>
<para>You can choose the account to be used for automatic login from
-the list labelled <guilabel>User:</guilabel>.</para>
+the list labeled <guilabel>User:</guilabel>.</para>
</sect3>
@@ -823,7 +820,7 @@
default runlevel will match the runlevel specified for X11.</para>
<para>The runlevel with graphical login (&xdm;) for some common &Linux;
-distributions are:</para>
+distributions is:</para>
<itemizedlist>
<listitem><para>5 for &RedHat; 3.x and later, and for &Mandrake;</para></listitem>
--- branches/KDE/3.5/kdebase/doc/kdm/kdmrc-ref.docbook #607478:607479
@@ -878,7 +878,7 @@
greeter window. This may be used to change the appearance of the screen
around the greeter window or to put up other windows (e.g., you may want
to run <command>xconsole</command> here).
-The conventional name for a file used here is <command>Xsetup</command>.
+The conventional name for a program used here is <command>Xsetup</command>.
See <xref linkend="kdmrc-xsetup"/>.
</para>
<para>Empty by default.</para>
@@ -893,7 +893,7 @@
It specifies a program which is run (as
<systemitem class="username">root</systemitem>) after the user
authentication process succeeds.
-The conventional name for a file used here is <command>Xstartup</command>.
+The conventional name for a program used here is <command>Xstartup</command>.
See <xref linkend="kdmrc-xstartup"/>.
</para>
<para>Empty by default.</para>
@@ -908,7 +908,7 @@
It specifies a program which is run (as
<systemitem class="username">root</systemitem>) after the session
terminates.
-The conventional name for a file used here is <command>Xreset</command>.
+The conventional name for a program used here is <command>Xreset</command>.
See <xref linkend="kdmrc-xreset"/>.
</para>
<para>Empty by default.</para>
@@ -922,7 +922,7 @@
This string is subject to word splitting.
It specifies the session program to be executed (as the user owning
the session).
-The conventional name for a file used here is <command>Xsession</command>.
+The conventional name for a program used here is <command>Xsession</command>.
See <xref linkend="kdmrc-xsession"/>.
</para>
<para>The default is <quote>${<envar>x_bindir</envar>}/xterm -ls -T</quote>.</para>
@@ -1495,7 +1495,7 @@
(<option>UserCompletion</option>).
If it is <literal>Selected</literal>, <option>SelectedUsers</option> contains
the final list of users.
-If it is <literal>NotHidden</literal>, the initial user list are all users
+If it is <literal>NotHidden</literal>, the initial user list contains all users
found on the system. Users contained in <option>HiddenUsers</option> are
removed from the list, just like all users with a UID greater than specified
in <option>MaxShowUID</option> and users with a non-zero UID less than
@@ -1671,11 +1671,13 @@
<variablelist>
<varlistentry>
<term><parameter>OneStar</parameter></term>
-<listitem><para><literal>*</literal> is shown for every typed letter</para></listitem>
+<listitem><para><literal>*</literal> is shown for every typed
+character</para></listitem>
</varlistentry>
<varlistentry>
<term><parameter>ThreeStars</parameter></term>
-<listitem><para><literal>***</literal> is shown for every typed letter</para></listitem>
+<listitem><para><literal>***</literal> is shown for every typed
+character</para></listitem>
</varlistentry>
<varlistentry>
<term><parameter>NoEcho</parameter></term>
SVN commit 607480 by annma:
forward port of 607479
CCBUG=136472
M +15 -18 index.docbook
M +9 -7 kdmrc-ref.docbook
--- trunk/KDE/kdebase/doc/kdm/index.docbook #607479:607480
@@ -142,7 +142,7 @@
<para>As <systemitem class="username">root</systemitem>, type
<userinput><command>kdm</command></userinput> at the prompt.</para>
-<para>You should see a login window, which is described more fully in<xref
+<para>You should see a login window, which is described more fully in <xref
linkend="login" />.</para>
<para>Typing your normal username and password in the fields provided, and
@@ -211,16 +211,12 @@
</listitem>
<listitem>
-<para>(Optionally) A <guibutton>Shutdown</guibutton> button that displays
-the <guibutton>Shutdown</guibutton> dialog box.</para>
-</listitem>
-<listitem>
<para>A <guibutton>Menu</guibutton> button that opens an action menu
with the following items:</para>
<itemizedlist>
<listitem>
-<para>(On local displays) a <guimenuitem>Restart X Server</guimenuitem> item
+<para>(On local displays) A <guimenuitem>Restart X Server</guimenuitem> item
that terminates the currently running &X-Server;, starts a new one and
displays the login dialog again. You can use this if the display content
seems to be broken somehow.</para>
@@ -244,8 +240,8 @@
</listitem>
<listitem>
-<para>(Optionally) A <guibutton>Shutdown...</guibutton> button that displays
-the shutdown dialog box.</para>
+<para>(Optionally) A <guibutton>Shutdown</guibutton> button that displays
+the <guilabel>Shutdown</guilabel> dialog box.</para>
</listitem>
</itemizedlist>
@@ -280,10 +276,10 @@
<term>Console Mode</term>
<listitem>
<para>Stop the &X-Server; and return the system to console mode. This is
-achieved by bringing the system down to run-level 3. Typically, the system
+achieved by bringing the system down to runlevel 3. Typically, the system
manager might need to use this option before upgrading or re-configuring X11
software.</para>
-</listitem>
+</listitem>a
</varlistentry>
</variablelist>
@@ -380,7 +376,7 @@
the window.</para>
<note><para>If you are not currently logged in as a superuser, you
-will need to click the <guibutton>Administrator Mode</guibutton>
+will need to click the <guibutton>Administrator Mode...</guibutton>
Button. You will then be asked for a superuser password. Entering a
correct password will allow you to modify the settings of this
module.</para></note>
@@ -425,7 +421,7 @@
<guilabel>Position:</guilabel> options if you want it to appear
elsewhere on the screen. You can specify the relative position
(percentage of the screen size) for the center of the login window,
-relative to the top left of the display, in the fields labelled
+relative to the top left of the display, in the fields labeled
<guilabel>X:</guilabel> and <guilabel>Y:</guilabel> respectively.
These correspond to the key
<link linkend="option-greeterpos"><option>GreeterPos</option></link>
@@ -454,7 +450,7 @@
<para>You can select three different font styles from the drop down box
(<guilabel>General:</guilabel>, <guilabel>Failures:</guilabel>,
-<guilabel>Greeting</guilabel>). When you click on the
+<guilabel>Greeting:</guilabel>). When you click on the
<guibutton>Choose...</guibutton> button a dialog appears from which you can
select the new characteristics for the font style.</para>
@@ -473,7 +469,7 @@
</listitem>
</itemizedlist>
-<para>You can also check the box labelled <guilabel>Use anti-aliasing for
+<para>You can also check the box labeled <guilabel>Use anti-aliasing for
fonts</guilabel> if you want smoothed fonts in the login dialog.</para>
</sect2>
@@ -622,7 +618,7 @@
<title><guilabel>Shutdown</guilabel></title>
<para><guilabel>Allow Shutdown</guilabel></para>
-<para>Use these drop down box to choose who is allowed to shut down:</para>
+<para>Use this drop down box to choose who is allowed to shut down:</para>
<itemizedlist>
<listitem>
<para><guilabel>Nobody</guilabel>: No one can shutdown the computer using
@@ -645,7 +641,8 @@
define the exact shutdown command.</para> <para>The
<guilabel>Halt:</guilabel> command defaults to <!-- Are these defaults still
correct? they disagree with what's in --> <!-- kdmrc -->
-<command>/sbin/halt</command>. The restart command defaults to
+<command>/sbin/halt</command>. The <guilabel>Restart:</guilabel> command
+defaults to
<command>/sbin/reboot</command>.</para>
<para>When <guilabel>Show boot options</guilabel> is enabled, &kdm;
@@ -740,7 +737,7 @@
the option <guilabel>Enable Auto-login</guilabel>.</para>
<para>You can choose the account to be used for automatic login from
-the list labelled <guilabel>User:</guilabel>.</para>
+the list labeled <guilabel>User:</guilabel>.</para>
</sect3>
@@ -825,7 +822,7 @@
default runlevel will match the runlevel specified for X11.</para>
<para>The runlevel with graphical login (&xdm;) for some common &Linux;
-distributions are:</para>
+distributions is:</para>
<itemizedlist>
<listitem><para>5 for &RedHat; 3.x and later, and for &Mandrake;</para></listitem>
--- trunk/KDE/kdebase/doc/kdm/kdmrc-ref.docbook #607479:607480
@@ -878,7 +878,7 @@
greeter window. This may be used to change the appearance of the screen
around the greeter window or to put up other windows (e.g., you may want
to run <command>xconsole</command> here).
-The conventional name for a file used here is <command>Xsetup</command>.
+The conventional name for a program used here is <command>Xsetup</command>.
See <xref linkend="kdmrc-xsetup"/>.
</para>
<para>Empty by default.</para>
@@ -893,7 +893,7 @@
It specifies a program which is run (as
<systemitem class="username">root</systemitem>) after the user
authentication process succeeds.
-The conventional name for a file used here is <command>Xstartup</command>.
+The conventional name for a program used here is <command>Xstartup</command>.
See <xref linkend="kdmrc-xstartup"/>.
</para>
<para>Empty by default.</para>
@@ -908,7 +908,7 @@
It specifies a program which is run (as
<systemitem class="username">root</systemitem>) after the session
terminates.
-The conventional name for a file used here is <command>Xreset</command>.
+The conventional name for a program used here is <command>Xreset</command>.
See <xref linkend="kdmrc-xreset"/>.
</para>
<para>Empty by default.</para>
@@ -922,7 +922,7 @@
This string is subject to word splitting.
It specifies the session program to be executed (as the user owning
the session).
-The conventional name for a file used here is <command>Xsession</command>.
+The conventional name for a program used here is <command>Xsession</command>.
See <xref linkend="kdmrc-xsession"/>.
</para>
<para>The default is <quote>${<envar>x_bindir</envar>}/xterm -ls -T</quote>.</para>
@@ -1495,7 +1495,7 @@
(<option>UserCompletion</option>).
If it is <literal>Selected</literal>, <option>SelectedUsers</option> contains
the final list of users.
-If it is <literal>NotHidden</literal>, the initial user list are all users
+If it is <literal>NotHidden</literal>, the initial user list contains all users
found on the system. Users contained in <option>HiddenUsers</option> are
removed from the list, just like all users with a UID greater than specified
in <option>MaxShowUID</option> and users with a non-zero UID less than
@@ -1671,11 +1671,13 @@
<variablelist>
<varlistentry>
<term><parameter>OneStar</parameter></term>
-<listitem><para><literal>*</literal> is shown for every typed letter</para></listitem>
+<listitem><para><literal>*</literal> is shown for every typed
+character</para></listitem>
</varlistentry>
<varlistentry>
<term><parameter>ThreeStars</parameter></term>
-<listitem><para><literal>***</literal> is shown for every typed letter</para></listitem>
+<listitem><para><literal>***</literal> is shown for every typed
+character</para></listitem>
</varlistentry>
<varlistentry>
<term><parameter>NoEcho</parameter></term>
Anne-Marie has fixed this so I am going to resolve this bug. |