summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPetr Viktorin <pviktori@redhat.com>2012-06-05 09:11:34 -0400
committerRob Crittenden <rcritten@redhat.com>2012-06-25 21:35:11 -0400
commitec5115a15513b40f7ef5d2bcf4f5e66c139f5d87 (patch)
treec4a3519c2bde07a5b9ab30ec70301f9571083ebf
parentf4d2f2a65b799e200c2f98164e1a0ac4e9b07376 (diff)
downloadfreeipa.git-ec5115a15513b40f7ef5d2bcf4f5e66c139f5d87.tar.gz
freeipa.git-ec5115a15513b40f7ef5d2bcf4f5e66c139f5d87.tar.xz
freeipa.git-ec5115a15513b40f7ef5d2bcf4f5e66c139f5d87.zip
Typo fixes
-rw-r--r--Contributors.txt2
-rw-r--r--ipa-client/man/ipa-rmkeytab.12
-rw-r--r--ipalib/output.py4
-rw-r--r--ipaserver/plugins/dogtag.py8
4 files changed, 8 insertions, 8 deletions
diff --git a/Contributors.txt b/Contributors.txt
index 6abd2d68..94cf0472 100644
--- a/Contributors.txt
+++ b/Contributors.txt
@@ -19,7 +19,7 @@ Developers:
Rich Megginson
Martin Nagy
Simo Sorce
- Petr ViktorĂ­n
+ Petr Viktorin
Andrew Wnuk
Adam Young
Jan Zeleny
diff --git a/ipa-client/man/ipa-rmkeytab.1 b/ipa-client/man/ipa-rmkeytab.1
index 11618d1b..4f4fcee2 100644
--- a/ipa-client/man/ipa-rmkeytab.1
+++ b/ipa-client/man/ipa-rmkeytab.1
@@ -37,7 +37,7 @@ contain the name of the service, the hostname of the
server, and the realm name.
ipa\-rmkeytab provides two ways to remove principals.
-A specific principal can be removed or all principals for all
+A specific principal can be removed or all
principals for a given realm can be removed.
All encryption types and versions of a principal are removed.
diff --git a/ipalib/output.py b/ipalib/output.py
index 1202ee19..1f42b4d6 100644
--- a/ipalib/output.py
+++ b/ipalib/output.py
@@ -49,8 +49,8 @@ class Output(ReadOnly):
If you have values that you don't want to be printed then add
``'no_display'`` to flags.
- The difference between ``'no_dipslay`` and ``'no_output'`` is
- that ``'no_output`` will prevent a Param value from being returned
+ The difference between ``'no_display'`` and ``'no_output'`` is
+ that ``'no_output'`` will prevent a Param value from being returned
at all. ``'no_display'`` will cause the API to return a value, it
simply won't be displayed to the user. This is so some things may
be returned that while not interesting to us, but may be to others.
diff --git a/ipaserver/plugins/dogtag.py b/ipaserver/plugins/dogtag.py
index b56e04f4..8accb56d 100644
--- a/ipaserver/plugins/dogtag.py
+++ b/ipaserver/plugins/dogtag.py
@@ -203,7 +203,7 @@ name begins with 'chapter' it's a match. Here is how you can do that.
>>> doc.xpath("//book/*[starts-with(name(), 'chapter')]/section[2]")
-The built-in starts-with() returns true if it's first argument starts with it's
+The built-in starts-with() returns true if its first argument starts with its
second argument. Thus the example above says if the node name of the second
location step begins with 'chapter' consider it a match and the search
proceeds to the next location step, which in this example is any node named
@@ -214,7 +214,7 @@ the test against the node name? In this case we can use the EXSLT regular
expression extension. EXSLT extensions are accessed by using XML
namespaces. The regular expression name space identifier is 're:' In lxml we
need to pass a set of namespaces to XPath object constructor in order to allow
-it to bind to those namespaces during it's evaluation. Then we just use the
+it to bind to those namespaces during its evaluation. Then we just use the
EXSLT regular expression match() function on the node name. Here is how this is
done:
@@ -227,8 +227,8 @@ What is happening here is that etree.XPath() has returned us an evaluator
function which we bind to the name 'find'. We've passed it a set of namespaces
as a dict via the 'namespaces' keyword parameter of etree.XPath(). The predicate
for the second location step uses the 're:' namespace to find the function name
-'match'. The re:match() takes a string to search as it's first argument and a
-regular expression pattern as it's second argument. In this example the string
+'match'. The re:match() takes a string to search as its first argument and a
+regular expression pattern as its second argument. In this example the string
to seach is the node name of the location step because we called the built-in
node() function of XPath. The regular expression pattern we've passed says it's
a match if the string begins with 'chapter' is followed by any number of