diff --git a/README.md b/README.md
index 61623976c3b..2b2fd22744a 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 
 ![screenshot of gh pr status](https://user-images.githubusercontent.com/98482/84171218-327e7a80-aa40-11ea-8cd1-5177fc2d0e72.png)
 
-GitHub CLI is supported for users on GitHub.com, GitHub Enterprise Cloud, and GitHub Enterprise Server 2.20+ with support for macOS, Windows, and Linux.
+GitHub CLI is supported for users on GitHub.com, GitHub Enterprise Cloud, and [supported GitHub Enterprise Server versions](https://docs.github.com/en/enterprise-server/admin/all-releases), with support for macOS, Windows, and Linux.
 
 ## Documentation
 
diff --git a/acceptance/testdata/discussion/discussion-comment.txtar b/acceptance/testdata/discussion/discussion-comment.txtar
index b918127feb3..3646b5e782e 100644
--- a/acceptance/testdata/discussion/discussion-comment.txtar
+++ b/acceptance/testdata/discussion/discussion-comment.txtar
@@ -24,7 +24,7 @@ exec gh discussion comment $DISCUSSION_URL --body-file $WORK/comment-body.txt
 stdout 'discussioncomment'
 
 # Verify comments appear in view
-exec gh discussion view $DISCUSSION_URL --comments --order oldest --json comments
+exec gh discussion view $DISCUSSION_URL --order oldest --json comments
 stdout2env COMMENTS_JSON
 jq-assert COMMENTS_JSON '.comments.nodes | length' '^2$'
 jq-assert COMMENTS_JSON '.comments.nodes[0].body' 'Comment from flag'
@@ -72,7 +72,7 @@ exec gh discussion comment $SECOND_REPLY_ID --edit --body-file $WORK/edit-reply-
 stdout 'discussioncomment'
 
 # Verify edits appear
-exec gh discussion view $DISCUSSION_URL --comments --order oldest --json comments
+exec gh discussion view $DISCUSSION_URL --order oldest --json comments
 stdout2env EDITED_COMMENTS_JSON
 jq-assert EDITED_COMMENTS_JSON '.comments.nodes[0].body' 'Edited first comment'
 jq-assert EDITED_COMMENTS_JSON '.comments.nodes[0].replies.nodes[0].body' 'Edited first reply'
@@ -91,7 +91,7 @@ exec gh discussion comment $SECOND_COMMENT_ID --delete --yes
 exec gh discussion comment $SECOND_REPLY_ID --delete --yes
 
 # Verify deletion
-exec gh discussion view $DISCUSSION_URL --comments --order oldest --json comments
+exec gh discussion view $DISCUSSION_URL --order oldest --json comments
 stdout2env DELETED_COMMENTS_JSON
 jq-assert DELETED_COMMENTS_JSON '.comments.nodes | length' '^1$'
 jq-assert DELETED_COMMENTS_JSON '.comments.nodes[0].body' 'Edited first comment'
diff --git a/acceptance/testdata/discussion/discussion-list.txtar b/acceptance/testdata/discussion/discussion-list.txtar
index 012553aec1b..fe3bc26dcc9 100644
--- a/acceptance/testdata/discussion/discussion-list.txtar
+++ b/acceptance/testdata/discussion/discussion-list.txtar
@@ -35,7 +35,7 @@ exec gh discussion create --title 'Second Discussion' --body 'Second body' --cat
 exec gh discussion create --title 'QA Discussion' --body 'QA body' --category 'Q&A'
 stdout2env QA_URL
 exec gh discussion comment $QA_URL --body 'This is the answer'
-exec gh discussion view $QA_URL --comments --json comments --jq '.comments.nodes[0].id'
+exec gh discussion view $QA_URL --json comments --jq '.comments.nodes[0].id'
 stdout2env QA_COMMENT_ID
 exec gh api graphql -f query='mutation { markDiscussionCommentAsAnswer(input: {id: "'$QA_COMMENT_ID'"}) { discussion { id } } }'