diff --git a/wiki/Basic-Items.md b/wiki/Basic-Items.md
index db10938e..01c3f53e 100644
--- a/wiki/Basic-Items.md
+++ b/wiki/Basic-Items.md
@@ -302,6 +302,11 @@
 <ContactGroupItem> ::= <ContactGroupID>|<ContactGroupName>
 <CorporaAttribute> ::= alldrives|allteamdrives|domain|onlyteamdrives|user
 <CourseAlias> ::= <String>
+<CourseAnnouncementContent> ::=
+        ((text <String>)|
+         (textfile <FileName> [charset <Charset>])|
+         (gdoc <UserGoogleDoc>)|
+         (gcsdoc <StorageBucketObjectName>))
 <CourseAnnouncementID> ::= <Number>
 <CourseAnnouncementState> ::= draft|published|deleted
 <CourseID> ::= <Number>|d:<CourseAlias>
diff --git a/wiki/Classroom-Courses.md b/wiki/Classroom-Courses.md
index 35e26625..defef373 100644
--- a/wiki/Classroom-Courses.md
+++ b/wiki/Classroom-Courses.md
@@ -56,6 +56,11 @@ gam user user@domain.com check|update serviceaccount
 <CourseAliasEntity> ::=
         <CourseAliasList>|<FileSelector>|<CSVFileSelector>|<CSVkmdSelector>|<CSVDataSelector>
         See: https://github.com/GAM-team/GAM/wiki/Collections-of-Items
+<CourseAnnouncementContent> ::=
+        ((text <String>)|
+         (textfile <FileName> [charset <Charset>])|
+         (gdoc <UserGoogleDoc>)|
+         (gcsdoc <StorageBucketObjectName>))
 <CourseAnnouncementID> ::= <Number>
 <CourseAnnouncementIDList> ::= "<CourseAnnouncementID>(,<CourseAnnouncementID>)*"
 <CourseAnnouncementIDEntity> ::=
@@ -395,18 +400,18 @@ gam courses <CourseEntity> delete alias <CourseAliasEntity>
 These commands can process a single course.
 ```
 gam course <CourseID> add announcement
-        text <String> [scheduledtime <Time>] [state draft|published]
+        <CourseAnnouncementContent> [scheduledtime <Time>] [state draft|published]
 gam course <CourseID> delete announcement <CourseAnnouncementID>
 gam course <CourseID> update announcement <CourseAnnouncementID>
-        [text <String>] [scheduledtime <Time>] [state published]
+        [<CourseAnnouncementContent>] [scheduledtime <Time>] [state published]
 ```
 These commands can process multiple courses.
 ```
 gam courses <CourseEntity> add announcement
-        text <String> [scheduledtime <Time>] [state draft|published]
+        <CourseAnnouncementContent> [scheduledtime <Time>] [state draft|published]
 gam courses <CourseEntity> delete announcement <CourseAnnouncementIDEntity>
 gam courses <CourseEntity> update announcement <CourseAnnouncementIDEntity>
-        [text <String>] [scheduledtime <Time>] [state published]
+        [<CourseAnnouncementContent>] [scheduledtime <Time>] [state published]
 ```
 
 ## Manage course topics
diff --git a/wiki/Users.md b/wiki/Users.md
index 244dee15..04f3a324 100644
--- a/wiki/Users.md
+++ b/wiki/Users.md
@@ -38,7 +38,7 @@
 - [Print user counts by OrgUnit](#print-user-counts-by-orgunit)
 - [Print user list](#print-user-list)
 - [Display user counts](#display-user-counts)
-- [Verify domain membership]($verify-domain-membership)
+- [Verify domain membership](#verify-domain-membership)
 
 ## API documentation
 * [Directory API - Users](https://developers.google.com/admin-sdk/directory/reference/rest/v1/users)