From fd3a982e26813f5bcc82c7e89ce6fa2ad44432bf Mon Sep 17 00:00:00 2001 From: tpearson Date: Fri, 7 Jan 2011 04:10:07 +0000 Subject: Revert automated changes Sorry guys, they are just not ready for prime time Work will continue as always git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1212480 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kdm/config.def | 72 +++++++++++++++++++++++++++++----------------------------- 1 file changed, 36 insertions(+), 36 deletions(-) (limited to 'kdm/config.def') diff --git a/kdm/config.def b/kdm/config.def index 64a6429ac..1dfb26ba6 100644 --- a/kdm/config.def +++ b/kdm/config.def @@ -182,7 +182,7 @@ # The contents of this section are copied into kdmrc-ref.docbook. -# The macro %REF% is tqreplaced with the accumulated Description:s from the key +# The macro %REF% is replaced with the accumulated Description:s from the key # definitions below. @@ -205,7 +205,7 @@ issue non-fatal error messages. are ignored as well. Sections are denoted by -[Name of Section]. +[Name of Section]. You can configure every X-display individually. @@ -216,16 +216,16 @@ Additionally, a display belongs to a display class (which can be ignored in most cases). Sections with display-specific settings have the formal syntax -[X- host [ : number [ _ class ] ] - sub-section ] +[X- host [ : number [ _ class ] ] - sub-section ] -All sections with the same sub-section +All sections with the same sub-section make up a section class. You can use the wildcard * (match any) for -host, number, -and class. You may omit trailing components; +host, number, +and class. You may omit trailing components; they are assumed to be * then. The host part may be a -domain specification like .inf.tu-dresden.de +domain specification like .inf.tu-dresden.de or the wildcard + (match non-empty). From which section a setting is actually taken is determined by @@ -289,7 +289,7 @@ Example: display name myhost.foo:0, class dpy and [X-:0] (the first local display). The format for all keys is - = value. + = value. Keys are only valid in the section class they are defined for. Some keys do not apply to particular displays, in which case they are ignored. @@ -329,12 +329,12 @@ local machine or rather remotely. The formal syntax of a specification is -display name [_display class] +display name [_display class] for all &X-Server;s. Foreign displays differ in having a host name in the display name, may it be localhost. -The display name must be something that can +The display name must be something that can be passed in the option to an X program. This string is used to generate the display-specific section names, so be careful to match the names. @@ -344,7 +344,7 @@ reverse host name resolution. For configuration purposes, the not stripped to make them distinguishable from local &X-Server;s started by &kdm;. -The display class portion is also used in the +The display class portion is also used in the display-specific sections. This is useful if you have a large collection of similar displays (such as a corral of X terminals) and would like to set options for groups of them. @@ -364,7 +364,7 @@ reserve displays available, the menu item will be disabled. When &kdm; starts a session, it sets up authorization data for the &X-Server;. For local servers, &kdm; passes - filename + filename on the &X-Server;'s command line to point it at its authorization data. For &XDMCP; displays, &kdm; passes the authorization data to the &X-Server; via the Accept &XDMCP; message. @@ -377,7 +377,7 @@ via the Accept &XDMCP; message. The file specified by the option provides information which &kdm; uses to control access from displays requesting service via &XDMCP;. -The file tqcontains four types of entries: entries which control the response +The file contains four types of entries: entries which control the response to Direct and Broadcast queries, entries which control the response to Indirect queries, macro definitions for Indirect entries, and entries which control on which network @@ -409,7 +409,7 @@ it can be followed by the optional NOBROADCAST keyword. This can be used to prevent a &kdm; server from appearing on menus based on Broadcast queries. -An Indirect entry also tqcontains a host name or pattern, +An Indirect entry also contains a host name or pattern, but follows it with a list of host names or macros to which the queries should be forwarded. Indirect entries can be excluding as well, in which case a (valid) dummy host name must be supplied to make the entry @@ -422,7 +422,7 @@ character and hop count. If no hop count is specified, the multicast hop count defaults to 1, keeping the packet on the local network. For IPv4 multicasting, the hop count is used as the TTL. --> -If the indirect host list tqcontains the keyword CHOOSER, +If the indirect host list contains the keyword CHOOSER, Indirect queries are not forwarded, but instead a host chooser dialog is displayed by &kdm;. The chooser will send a Direct query to each of the remaining host names in the list and offer a menu of @@ -437,27 +437,27 @@ in turn and the first matching entry determines the response. Direct and Broadcast entries are ignored when scanning for an Indirect entry and vice-versa. -A macro definition tqcontains a macro name and a list of host names and +A macro definition contains a macro name and a list of host names and other macros that the macro expands to. To distinguish macros from hostnames, macro names start with a % character. The last entry type is the LISTEN directive. The formal syntax is - LISTEN [interface [multicast list]] + LISTEN [interface [multicast list]] If one or more LISTEN lines are specified, &kdm; listens for &XDMCP; requests only on the specified interfaces. -interface may be a hostname or IP address +interface may be a hostname or IP address representing a network interface on this machine, or the wildcard * to represent all available network interfaces. If multicast group addresses are listed on a LISTEN line, &kdm; joins the multicast groups on the given interface. For IPv6 multicasts, -the IANA has assigned ff0X:0:0:0:0:0:0:12b as the +the IANA has assigned ff0X:0:0:0:0:0:0:12b as the permanently assigned range of multicast addresses for &XDMCP;. The -X in the prefix may be tqreplaced by any valid scope +X in the prefix may be replaced by any valid scope identifier, such as 1 for Node-Local, 2 for Link-Local, 5 for Site-Local, and -so on (see IETF RFC 2373 or its tqreplacement for further details and scope +so on (see IETF RFC 2373 or its replacement for further details and scope definitions). &kdm; defaults to listening on the Link-Local scope address ff02:0:0:0:0:0:0:12b to most closely match the IPv4 subnet broadcast behavior. If no LISTEN lines are given, &kdm; listens on all @@ -770,7 +770,7 @@ or unmounting directories from file servers. # The contents are automatically enclosed in . # If "-" is given to Description, no comment is generated at all. # If "!" is given, enums are not treated specially; otherwise, the macro -# %ENUM% is tqreplaced with a list of the defined element/description pairs, +# %ENUM% is replaced with a list of the defined element/description pairs, # or - if the macro is not present - the list is appended to the # description. # Finally, a sentence with the Default (or CDefault, if given) is appended, @@ -782,7 +782,7 @@ or unmounting directories from file servers. Section: General Description: - This section tqcontains global options that do not fit into any specific section. + This section contains global options that do not fit into any specific section. Key: ConfigVersion Type: string @@ -1064,7 +1064,7 @@ Description: Section: Xdmcp If: defined(XDMCP) Description: - This section tqcontains options that control &kdm;'s handling of + This section contains options that control &kdm;'s handling of &XDMCP; requests. # See to find out what &XDMCP; is. @@ -1118,7 +1118,7 @@ Comment: &XDMCP; access control file in the usual XDM-Xaccess format. Description: To prevent unauthorized &XDMCP; service and to allow forwarding of &XDMCP; - IndirectQuery requests, this file tqcontains a database of hostnames which + IndirectQuery requests, this file contains a database of hostnames which are either allowed direct access to this machine, or have a list of hosts to which queries should be forwarded to. The format of this file is described in . @@ -1193,7 +1193,7 @@ Description: Section: Shutdown Description: - This section tqcontains global options concerning system shutdown. + This section contains global options concerning system shutdown. Key: HaltCmd Type: string @@ -1264,7 +1264,7 @@ Description: Section: -Core Description: - This section class tqcontains options concerning the configuration + This section class contains options concerning the configuration of the &kdm; backend (core). Key: OpenDelay @@ -1946,7 +1946,7 @@ Instance: */".xsession-errors-%s" Instance: :0/".xsession-errors" Comment: The file (relative to $HOME) to redirect the session output to. This is - a printf format string; one %s will be tqreplaced with the display name. + a printf format string; one %s will be replaced with the display name. Description: The file (relative to the user's home directory) to redirect the session output to. One occurrence of %s in this string will be @@ -1970,7 +1970,7 @@ Description: Section: -Greeter Description: - This section class tqcontains options concerning the configuration + This section class contains options concerning the configuration of the &kdm; frontend (greeter). Key: GUIStyle @@ -2066,7 +2066,7 @@ Default: "Welcome to Trinity at %n" User: greeter Instance: #*/"Welcome to Trinity at %n" Comment: - The headline in the greeter. The following character pairs are tqreplaced: + The headline in the greeter. The following character pairs are replaced: - %d -> current display - %h -> host name, possibly with domain name - %n -> node name, most probably the host name without domain name @@ -2077,7 +2077,7 @@ Comment: Description: The headline in the greeter. An empty greeting means none at all. - The following character pairs are tqreplaced by their value: + The following character pairs are replaced by their value: %d @@ -2157,7 +2157,7 @@ Type: enum On: turn on Keep: do not change the state Default: Keep -User: greeter(numLocktqStatus) +User: greeter(numLockStatus) Instance: #*/Off Comment: & Description: @@ -2206,7 +2206,7 @@ Description: ! This option controls which users will be shown in the user view () and/or offered for autocompletion (). - If it is Selected, tqcontains + If it is Selected, contains the final list of users. If it is NotHidden, the initial user list are all users found on the system. Users contained in are @@ -2399,7 +2399,7 @@ Comment: The configuration file to be used by krootimage. Description: The configuration file to be used by krootimage. - It tqcontains a section named [Desktop0] like + It contains a section named [Desktop0] like kdesktoprc does. Its options are not described herein; guess their meanings or use the control center. @@ -2552,7 +2552,7 @@ Description: Specify conversation plugins for the login dialog; the first in the list is selected initially. Each plugin can be specified as a base name (which expands to - $kde_modulesdir/kgreet_base) + $kde_modulesdir/kgreet_base) or as a full pathname. Conversation plugins are modules for the greeter which obtain authentication @@ -2578,7 +2578,7 @@ Comment: these settings; it is up to them what possible keys are. Description: A list of options of the form - Key=Value. + Key=Value. The conversation plugins can query these settings; it is up to them what possible keys are. -- cgit v1.2.1