summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--man/portage.52
-rw-r--r--pym/portage/dep/__init__.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/man/portage.5 b/man/portage.5
index 35dcc2b38..547d99607 100644
--- a/man/portage.5
+++ b/man/portage.5
@@ -122,7 +122,7 @@ More reading:
.B Extended Atom Syntax
.br
-The following atom syntax extensions that are only supported in user
+The following atom syntax extensions are only supported in user
configuration files and command line arguments for programs such as
\fBemerge(1)\fR:
.RS
diff --git a/pym/portage/dep/__init__.py b/pym/portage/dep/__init__.py
index b9020a7a7..5832fd9ec 100644
--- a/pym/portage/dep/__init__.py
+++ b/pym/portage/dep/__init__.py
@@ -1063,7 +1063,7 @@ class Atom(_atom_base):
(_atom_base, type(s)))
if not isinstance(s, _atom_base):
- # Avoid TypeError with from _atom_base.__init__ with PyPy.
+ # Avoid TypeError from _atom_base.__init__ with PyPy.
s = _unicode_decode(s)
_atom_base.__init__(s)