[project @ robey@lag.net-20071110065103-a169t3ijqapq0zlo]

fix some typos.

2 files changed, 4 insertions, 4 deletions

diff --git a/README b/README
index 15623e11..91b1eee3 100644
--- a/README
+++ b/README
@@ -88,7 +88,7 @@ missing encodings, you'll see an error like this::
 
 this means you need to copy string encodings over from a working system.
 (it probably only happens on embedded systems, not normal python
-installls.)  Valeriy Pogrebitskiy says the best place to look is
+installs.)  Valeriy Pogrebitskiy says the best place to look is
 ``.../lib/python*/encodings/__init__.py``.
 
 
diff --git a/paramiko/hostkeys.py b/paramiko/hostkeys.py
index 5ff84b25..0c0ac8c3 100644
--- a/paramiko/hostkeys.py
+++ b/paramiko/hostkeys.py
@@ -42,10 +42,10 @@ class HostKeyEntry:
     def from_line(cls, line):
         """
         Parses the given line of text to find the names for the host,
-        the type of key given on this line in the known_hosts file, and
-        the key data.
+        the type of key, and the key data. The line is expected to be in the
+        format used by the openssh known_hosts file.
 
-        Lines are expected to not have leading or training whitespace.
+        Lines are expected to not have leading or trailing whitespace.
         We don't bother to check for comments or empty lines.  All of
         that should be taken care of before sending the line to us.