--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -2885,7 +2885,7 @@ table = {
           ('d', 'deleted', None, _('show only deleted (but tracked) files')),
           ('c', 'clean', None, _('show only files without changes')),
           ('u', 'unknown', None, _('show only unknown (not tracked) files')),
-          ('i', 'ignored', None, _('show ignored files')),
+          ('i', 'ignored', None, _('show only ignored files')),
           ('n', 'no-status', None, _('hide status prefix')),
           ('C', 'copies', None, _('show source of copied files')),
           ('0', 'print0', None,

--- a/tests/test-help.out
+++ b/tests/test-help.out
@@ -236,7 +236,7 @@ options:
  -d --deleted    show only deleted (but tracked) files
  -c --clean      show only files without changes
  -u --unknown    show only unknown (not tracked) files
- -i --ignored    show ignored files
+ -i --ignored    show only ignored files
  -n --no-status  hide status prefix
  -C --copies     show source of copied files
  -0 --print0     end filenames with NUL, for use with xargs

--- a/tests/test-notify
+++ b/tests/test-notify
@@ -33,7 +33,7 @@ hg --traceback --cwd a commit -Amb -d '1
 
 echo '% pull (minimal config)'
 hg --traceback --cwd b pull ../a 2>&1 | sed -e 's/\(Message-Id:\).*/\1/' \
-  -e 's/changeset \([0-9a-f]* \)*in .*test-notif/changeset \1in test-notif/' \
+  -e 's/changeset \([0-9a-f]* *\)in .*test-notif/changeset \1in test-notif/' \
   -e 's/^details: .*test-notify/details: test-notify/'
 
 cat <<EOF >> $HGRCPATH