From: Todd C. Miller Date: Tue, 5 Feb 2013 21:09:26 +0000 (-0500) Subject: Fix some typos. X-Git-Tag: SUDO_1_8_7~1^2~251 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f6e61640d218655f72edc7680bd4658fb96fa114;p=sudo Fix some typos. --- diff --git a/doc/sudoers.ldap.cat b/doc/sudoers.ldap.cat index afdce4268..8c9d40ff2 100644 --- a/doc/sudoers.ldap.cat +++ b/doc/sudoers.ldap.cat @@ -137,7 +137,7 @@ DDEESSCCRRIIPPTTIIOONN inherent order. The sudoOrder attribute is an integer (or floating point value for LDAP servers that support it) that is used to sort the matching entries. This allows LDAP-based sudoers entries to - more closely mimic the behaviour of the sudoers file, where the of + more closely mimic the behavior of the sudoers file, where the of the entries influences the result. If multiple entries match, the entry with the highest sudoOrder attribute is chosen. This corresponds to the ``last match'' behavior of the sudoers file. If @@ -171,7 +171,7 @@ DDEESSCCRRIIPPTTIIOONN user belongs to any of them. If timed entries are enabled with the SSUUDDOOEERRSS__TTIIMMEEDD configuration - directive, the LDAP queries include a subfilter that limits retrieval to + directive, the LDAP queries include a sub-filter that limits retrieval to entries that satisfy the time constraints, if any. DDiiffffeerreenncceess bbeettwweeeenn LLDDAAPP aanndd nnoonn--LLDDAAPP ssuuddooeerrss @@ -249,7 +249,7 @@ DDEESSCCRRIIPPTTIIOONN CCoonnffiigguurriinngg llddaapp..ccoonnff Sudo reads the _/_e_t_c_/_l_d_a_p_._c_o_n_f file for LDAP-specific configuration. - Typically, this file is shared amongst different LDAP-aware clients. As + Typically, this file is shared between different LDAP-aware clients. As such, most of the settings are not ssuuddoo-specific. Note that ssuuddoo parses _/_e_t_c_/_l_d_a_p_._c_o_n_f itself and may support options that differ from those described in the system's ldap.conf(1m) manual. @@ -263,7 +263,7 @@ DDEESSCCRRIIPPTTIIOONN case but are parsed in a case-independent manner. UURRII _l_d_a_p_[_s_]_:_/_/_[_h_o_s_t_n_a_m_e_[_:_p_o_r_t_]_] _._._. - Specifies a whitespace-delimited list of one or more URIs + Specifies a white space-delimited list of one or more URIs describing the LDAP server(s) to connect to. The _p_r_o_t_o_c_o_l may be either _l_d_a_p _l_d_a_p_s, the latter being for servers that support TLS (SSL) encryption. If no _p_o_r_t is specified, the default is port 389 @@ -276,7 +276,7 @@ DDEESSCCRRIIPPTTIIOONN of supporting one or the other. HHOOSSTT _n_a_m_e_[_:_p_o_r_t_] _._._. - If no UURRII is specified, the HHOOSSTT parameter specifies a whitespace- + If no UURRII is specified, the HHOOSSTT parameter specifies a white space- delimited list of LDAP servers to connect to. Each host may include an optional _p_o_r_t separated by a colon (`:'). The HHOOSSTT parameter is deprecated in favor of the UURRII specification and is @@ -533,12 +533,12 @@ DDEESSCCRRIIPPTTIIOONN sudoers = ldap - To treat LDAP as authoratative and only use the local sudoers file if the + To treat LDAP as authoritative and only use the local sudoers file if the user is not present in LDAP, use: sudoers = ldap = auth, files - Note that in the above example, the auth qualfier only affects user + Note that in the above example, the auth qualifier only affects user lookups; both LDAP and _s_u_d_o_e_r_s will be queried for Defaults entries. If the _/_e_t_c_/_n_e_t_s_v_c_._c_o_n_f file is not present or there is no sudoers line, @@ -765,4 +765,4 @@ DDIISSCCLLAAIIMMEERR file distributed with ssuuddoo or http://www.sudo.ws/sudo/license.html for complete details. -Sudo 1.8.6 July 12, 2012 Sudo 1.8.6 +Sudo 1.8.7 February 5, 2013 Sudo 1.8.7 diff --git a/doc/sudoers.ldap.man.in b/doc/sudoers.ldap.man.in index b7e6e4548..011055b1a 100644 --- a/doc/sudoers.ldap.man.in +++ b/doc/sudoers.ldap.man.in @@ -1,7 +1,7 @@ .\" DO NOT EDIT THIS FILE, IT IS NOT THE MASTER! .\" IT IS GENERATED AUTOMATICALLY FROM sudoers.ldap.mdoc.in .\" -.\" Copyright (c) 2003-2012 Todd C. Miller +.\" Copyright (c) 2003-2013 Todd C. Miller .\" .\" Permission to use, copy, modify, and distribute this software for any .\" purpose with or without fee is hereby granted, provided that the above @@ -16,7 +16,7 @@ .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.TH "SUDOERS.LDAP" "8" "July 12, 2012" "Sudo @PACKAGE_VERSION@" "OpenBSD System Manager's Manual" +.TH "SUDOERS.LDAP" "8" "February 5, 2013" "Sudo @PACKAGE_VERSION@" "OpenBSD System Manager's Manual" .nh .if n .ad l .SH "NAME" @@ -274,7 +274,7 @@ The \fRsudoOrder\fR attribute is an integer (or floating point value for LDAP servers that support it) that is used to sort the matching entries. -This allows LDAP-based sudoers entries to more closely mimic the behaviour +This allows LDAP-based sudoers entries to more closely mimic the behavior of the sudoers file, where the of the entries influences the result. If multiple entries match, the entry with the highest \fRsudoOrder\fR @@ -332,7 +332,7 @@ to see if the user belongs to any of them. .PP If timed entries are enabled with the \fBSUDOERS_TIMED\fR -configuration directive, the LDAP queries include a subfilter that +configuration directive, the LDAP queries include a sub-filter that limits retrieval to entries that satisfy the time constraints, if any. .SS "Differences between LDAP and non-LDAP sudoers" There are some subtle differences in the way sudoers is handled @@ -437,7 +437,7 @@ section. Sudo reads the \fI@ldap_conf@\fR file for LDAP-specific configuration. -Typically, this file is shared amongst different LDAP-aware clients. +Typically, this file is shared between different LDAP-aware clients. As such, most of the settings are not \fBsudo\fR-specific. Note that @@ -465,7 +465,7 @@ Configuration options are listed below in upper case but are parsed in a case-independent manner. .TP 6n \fBURI\fR \fIldap[s]://[hostname[:port]] ...\fR -Specifies a whitespace-delimited list of one or more URIs describing +Specifies a white space-delimited list of one or more URIs describing the LDAP server(s) to connect to. The \fIprotocol\fR @@ -503,7 +503,7 @@ If no \fBURI\fR is specified, the \fBHOST\fR -parameter specifies a whitespace-delimited list of LDAP servers to connect to. +parameter specifies a white space-delimited list of LDAP servers to connect to. Each host may include an optional \fIport\fR separated by a colon @@ -940,7 +940,7 @@ sudoers = ldap .RE .fi .PP -To treat LDAP as authoratative and only use the local sudoers file +To treat LDAP as authoritative and only use the local sudoers file if the user is not present in LDAP, use: .nf .sp @@ -951,7 +951,7 @@ sudoers = ldap = auth, files .PP Note that in the above example, the \fRauth\fR -qualfier only affects user lookups; both LDAP and +qualifier only affects user lookups; both LDAP and \fIsudoers\fR will be queried for \fRDefaults\fR diff --git a/doc/sudoers.ldap.mdoc.in b/doc/sudoers.ldap.mdoc.in index bce81f868..c45e766cc 100644 --- a/doc/sudoers.ldap.mdoc.in +++ b/doc/sudoers.ldap.mdoc.in @@ -1,5 +1,5 @@ .\" -.\" Copyright (c) 2003-2012 Todd C. Miller +.\" Copyright (c) 2003-2013 Todd C. Miller .\" .\" Permission to use, copy, modify, and distribute this software for any .\" purpose with or without fee is hereby granted, provided that the above @@ -14,7 +14,7 @@ .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd July 12, 2012 +.Dd February 5, 2013 .Dt SUDOERS.LDAP @mansectsu@ .Os Sudo @PACKAGE_VERSION@ .Sh NAME @@ -259,7 +259,7 @@ The .Li sudoOrder attribute is an integer (or floating point value for LDAP servers that support it) that is used to sort the matching entries. -This allows LDAP-based sudoers entries to more closely mimic the behaviour +This allows LDAP-based sudoers entries to more closely mimic the behavior of the sudoers file, where the of the entries influences the result. If multiple entries match, the entry with the highest .Li sudoOrder @@ -315,7 +315,7 @@ to see if the user belongs to any of them. .Pp If timed entries are enabled with the .Sy SUDOERS_TIMED -configuration directive, the LDAP queries include a subfilter that +configuration directive, the LDAP queries include a sub-filter that limits retrieval to entries that satisfy the time constraints, if any. .Ss Differences between LDAP and non-LDAP sudoers There are some subtle differences in the way sudoers is handled @@ -414,7 +414,7 @@ section. Sudo reads the .Pa @ldap_conf@ file for LDAP-specific configuration. -Typically, this file is shared amongst different LDAP-aware clients. +Typically, this file is shared between different LDAP-aware clients. As such, most of the settings are not .Nm sudo Ns No -specific. Note that @@ -442,7 +442,7 @@ Configuration options are listed below in upper case but are parsed in a case-independent manner. .Bl -tag -width 4n .It Sy URI Ar ldap[s]://[hostname[:port]] ... -Specifies a whitespace-delimited list of one or more URIs describing +Specifies a white space-delimited list of one or more URIs describing the LDAP server(s) to connect to. The .Em protocol @@ -479,7 +479,7 @@ If no .Sy URI is specified, the .Sy HOST -parameter specifies a whitespace-delimited list of LDAP servers to connect to. +parameter specifies a white space-delimited list of LDAP servers to connect to. Each host may include an optional .Em port separated by a colon @@ -855,7 +855,7 @@ file can be ignored completely by using: sudoers = ldap .Ed .Pp -To treat LDAP as authoratative and only use the local sudoers file +To treat LDAP as authoritative and only use the local sudoers file if the user is not present in LDAP, use: .Bd -literal -offset 4n sudoers = ldap = auth, files @@ -863,7 +863,7 @@ sudoers = ldap = auth, files .Pp Note that in the above example, the .Li auth -qualfier only affects user lookups; both LDAP and +qualifier only affects user lookups; both LDAP and .Em sudoers will be queried for .Li Defaults