Skip to content

Commit

Permalink
Fix spelling errors
Browse files Browse the repository at this point in the history
Signed-off-by: Christian Heimes <cheimes@redhat.com>
  • Loading branch information
Christian Heimes committed Nov 28, 2017
1 parent 92bd2e7 commit 16e8529
Show file tree
Hide file tree
Showing 20 changed files with 28 additions and 28 deletions.
2 changes: 1 addition & 1 deletion Doc/faq.rst
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Usage
**A0**: Yes, from 3.0 on.

**A1**. For earlier versions, there's `pyldap`_, an independent fork
now merged into pyhon-ldap.
now merged into python-ldap.

.. _pyldap: https://pypi.python.org/pypi/pyldap

Expand Down
2 changes: 1 addition & 1 deletion Doc/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ Contents
Bytes/text management
---------------------

The LDAP protocol states that some fields (distinguised names, relative distinguished names,
The LDAP protocol states that some fields (distinguished names, relative distinguished names,
attribute names, queries) be encoded in UTF-8; some other (mostly attribute *values*) **MAY**
contain any type of data, and thus be treated as bytes.

Expand Down
2 changes: 1 addition & 1 deletion Doc/installing.rst
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ to get up to date information which versions are available.
Windows
-------

Unoficial packages for Windows are available on
Unofficial packages for Windows are available on
`Christoph Gohlke's page <https://www.lfd.uci.edu/~gohlke/pythonlibs/>`_.


Expand Down
10 changes: 5 additions & 5 deletions Doc/reference/ldap.rst
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ This module defines the following functions:
when using multiple URIs you cannot determine to which URI your client
gets connected.

Note that internally the OpenLDAP funtion
Note that internally the OpenLDAP function
`ldap_initialize(3) <https://www.openldap.org/software/man.cgi?query=ldap_init&sektion=3>`_
is called which just initializes the LDAP connection struct in the C API
- nothing else. Therefore the first call to an operation method (bind,
Expand Down Expand Up @@ -141,7 +141,7 @@ following option identifiers are defined as constants:
.. py:data:: OPT_DEREF
Specifies how alias derefencing is done within the underlying LDAP C lib.
Specifies how alias dereferencing is done within the underlying LDAP C lib.

.. py:data:: OPT_ERROR_STRING
Expand Down Expand Up @@ -296,7 +296,7 @@ The module defines the following exceptions:

.. py:exception:: LDAPError
This is the base class of all execeptions raised by the module :py:mod:`ldap`.
This is the base class of all exceptions raised by the module :py:mod:`ldap`.
Unlike the C interface, errors are not returned as result codes, but
are instead turned into exceptions, raised as soon an the error condition
is detected.
Expand Down Expand Up @@ -413,7 +413,7 @@ The module defines the following exceptions:

.. py:exception:: IS_LEAF
The object specified is a leaf of the diretcory tree.
The object specified is a leaf of the directory tree.
Sets the :py:const:`matched` field of the exception dictionary value.

.. py:exception:: LOCAL_ERROR
Expand Down Expand Up @@ -836,7 +836,7 @@ and wait for and return with the server's result, or with
This method is used to wait for and return the result of an operation
previously initiated by one of the LDAP *asynchronous* operations
(eg :py:meth:`search()`, :py:meth:`modify()`, etc.)
(e.g. :py:meth:`search()`, :py:meth:`modify()`, etc.)

The *msgid* parameter is the integer identifier returned by that method.
The identifier is guaranteed to be unique across an LDAP session,
Expand Down
4 changes: 2 additions & 2 deletions Doc/reference/ldapurl.rst
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

This module parses and generates LDAP URLs. It is implemented in pure Python
and does not rely on any non-standard modules. Therefore it can be used stand-
alone without the rest of the python-ldap package. Compability note: This
alone without the rest of the python-ldap package. Compatibility note: This
module has been solely tested on Python 2.x and above.

.. seealso::
Expand Down Expand Up @@ -91,7 +91,7 @@ Example
^^^^^^^

Important security advice:
For security reasons you shouldn't specify passwords in LDAP URLs
For security reasons you should not specify passwords in LDAP URLs
unless you really know what you are doing.

The following example demonstrates how to parse a LDAP URL
Expand Down
2 changes: 1 addition & 1 deletion Lib/ldap/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -94,5 +94,5 @@ def release(self):

# More constants

# For compability of 2.3 and 2.4 OpenLDAP API
# For compatibility of 2.3 and 2.4 OpenLDAP API
OPT_DIAGNOSTIC_MESSAGE = OPT_ERROR_STRING
2 changes: 1 addition & 1 deletion Lib/ldap/async.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ def __str__(self):

class AsyncSearchHandler:
"""
Class for stream-processsing LDAP search results
Class for stream-processing LDAP search results
Arguments:
Expand Down
2 changes: 1 addition & 1 deletion Lib/ldap/constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@ class Str(Constant):
TLSInt('OPT_X_TLS_PEERCERT', optional=True),

# only available if OpenSSL supports it => might cause
# backward compability problems
# backward compatibility problems
TLSInt('OPT_X_TLS_CRLCHECK', optional=True),

TLSInt('OPT_X_TLS_CRLFILE', optional=True),
Expand Down
2 changes: 1 addition & 1 deletion Lib/ldap/controls/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ class attributes
class LDAPControl(RequestControl,ResponseControl):
"""
Base class for combined request/response controls mainly
for backward-compability to python-ldap 2.3.x
for backward-compatibility to python-ldap 2.3.x
"""

def __init__(self,controlType=None,criticality=False,controlValue=None,encodedControlValue=None):
Expand Down
2 changes: 1 addition & 1 deletion Lib/ldap/controls/deref.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
# Request types
#---------------------------------------------------------------------------

# For compability with ASN.1 declaration in I-D
# For compatibility with ASN.1 declaration in I-D
AttributeList = AttributeDescriptionList

class DerefSpec(univ.Sequence):
Expand Down
4 changes: 2 additions & 2 deletions Lib/ldap/controls/psearch.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,13 @@ class PersistentSearchControl(RequestControl):
Implements the request control for persistent search.
changeTypes
List of strings specifiying the types of changes returned by the server.
List of strings specifying the types of changes returned by the server.
Setting to None requests all changes.
changesOnly
Boolean which indicates whether only changes are returned by the server.
returnECs
Boolean which indicates whether the server should return an
Entry Change Notication response control
Entry Change Notification response control
"""

class PersistentSearchControlValue(univ.Sequence):
Expand Down
2 changes: 1 addition & 1 deletion Lib/ldap/controls/sss.py
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ def decodeControlValue(self, encoded):
self.attributeType = attribute_type
else:
self.attributeType = None
# backward compability class attributes
# backward compatibility class attributes
self.result = self.sortResult
self.attribute_type_error = self.attributeType

Expand Down
2 changes: 1 addition & 1 deletion Lib/ldap/controls/vlv.py
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ def decodeControlValue(self,encoded):
self.contextID = str(context_id)
else:
self.contextID = None
# backward compability class attributes
# backward compatibility class attributes
self.target_position = self.targetPosition
self.content_count = self.contentCount
self.result = self.virtualListViewResult
Expand Down
2 changes: 1 addition & 1 deletion Lib/ldap/filter.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
See https://www.python-ldap.org/ for details.
Compability:
Compatibility:
- Tested with Python 2.0+
"""

Expand Down
2 changes: 1 addition & 1 deletion Lib/ldap/ldapobject.py
Original file line number Diff line number Diff line change
Expand Up @@ -647,7 +647,7 @@ def result(self,msgid=ldap.RES_ANY,all=1,timeout=None):
This method is used to wait for and return the result of an
operation previously initiated by one of the LDAP asynchronous
operation routines (eg search(), modify(), etc.) They all
operation routines (e.g. search(), modify(), etc.) They all
returned an invocation identifier (a message id) upon successful
initiation of their operation. This id is guaranteed to be
unique across an LDAP session, and can be used to request the
Expand Down
2 changes: 1 addition & 1 deletion Lib/ldap/sasl.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ def callback(self, cb_id, challenge, prompt, defresult):
The callback method will be called by the sasl_bind_s()
method several times. Each time it will provide the id, which
tells us what kind of information is requested (the CB_*
constants above). The challenge might be a short (english) text
constants above). The challenge might be a short (English) text
or some binary string, from which the return value is calculated.
The prompt argument is always a human-readable description string;
The defresult is a default value provided by the sasl library
Expand Down
2 changes: 1 addition & 1 deletion Lib/ldap/syncrepl.py
Original file line number Diff line number Diff line change
Expand Up @@ -484,7 +484,7 @@ def syncrepl_set_cookie(self, cookie):

def syncrepl_get_cookie(self):
"""
Called by syncrepl_search() to retreive the cookie stored by syncrepl_set_cookie()
Called by syncrepl_search() to retrieve the cookie stored by syncrepl_set_cookie()
"""
pass

Expand Down
6 changes: 3 additions & 3 deletions Lib/ldif.py
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ def unparse(self,dn,record):
def CreateLDIF(dn,record,base64_attrs=None,cols=76):
"""
Create LDIF single formatted record including trailing empty line.
This is a compability function. Use is deprecated!
This is a compatibility function. Use is deprecated!
dn
string-representation of distinguished name
Expand Down Expand Up @@ -449,7 +449,7 @@ def parse_entry_records(self):

def parse(self):
"""
Invokes LDIFParser.parse_entry_records() for backward compability
Invokes LDIFParser.parse_entry_records() for backward compatibility
"""
return self.parse_entry_records() # parse()

Expand Down Expand Up @@ -633,7 +633,7 @@ def handle(self,dn,entry):
def ParseLDIF(f,ignore_attrs=None,maxentries=0):
"""
Parse LDIF records read from file.
This is a compability function. Use is deprecated!
This is a compatibility function. Use is deprecated!
"""
ldif_parser = LDIFRecordList(
f,ignored_attr_types=ignore_attrs,max_entries=maxentries,process_url_schemes=0
Expand Down
2 changes: 1 addition & 1 deletion Lib/slapdtest.py
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ class SlapdObject(object):
This class creates a temporary data store for slapd, runs it
listening on a private Unix domain socket and TCP port,
and initialises it with a top-level entry and the root user.
and initializes it with a top-level entry and the root user.
When a reference to an instance of this class is lost, the slapd
server is shut down.
Expand Down
2 changes: 1 addition & 1 deletion README
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ stuff (e.g. processing LDIF, LDAPURLs, LDAPv3 sub-schema, etc.).

Not included: Direct BER support

See INSTALL for version compability
See INSTALL for version compatibility

See TODO for planned features. Contributors welcome.

Expand Down

0 comments on commit 16e8529

Please sign in to comment.