diff --git a/pkg/analysis_server/benchmark/integration/operation.dart b/pkg/analysis_server/benchmark/integration/operation.dart
index ff2a6f22c65..1eb2699beab 100644
--- a/pkg/analysis_server/benchmark/integration/operation.dart
+++ b/pkg/analysis_server/benchmark/integration/operation.dart
@@ -15,7 +15,7 @@ abstract class Operation {
   Future<void>? perform(Driver driver);
 }
 
-/// A [RequestOperation] sends a [JSON] request to the server.
+/// A [RequestOperation] sends a JSON request to the server.
 class RequestOperation extends Operation {
   final CommonInputConverter converter;
   final Map<String, dynamic> json;
@@ -62,7 +62,7 @@ class RequestOperation extends Operation {
   }
 }
 
-/// A [ResponseOperation] waits for a [JSON] response from the server.
+/// A [ResponseOperation] waits for a JSON response from the server.
 class ResponseOperation extends Operation {
   static final Duration responseTimeout = Duration(seconds: 60);
   final CommonInputConverter converter;
diff --git a/pkg/analysis_server/lib/plugin/protocol/protocol_dart.dart b/pkg/analysis_server/lib/plugin/protocol/protocol_dart.dart
index e6da22c71b6..4b5a5529b78 100644
--- a/pkg/analysis_server/lib/plugin/protocol/protocol_dart.dart
+++ b/pkg/analysis_server/lib/plugin/protocol/protocol_dart.dart
@@ -71,9 +71,9 @@ Element convertElement2(engine.Element2 element) {
 /// Return a protocol [ElementKind] corresponding to the given
 /// [engine.ElementKind].
 ///
-/// This does not take into account that an instance of [ClassElement] can be an
-/// enum and an instance of [FieldElement] can be an enum constant.
-/// Use [convertElementToElementKind] where possible.
+/// This does not take into account that an instance of [engine.ClassElement]
+/// can be an enum and an instance of [engine.FieldElement] can be an enum
+/// constant. Use [convertElementToElementKind] where possible.
 ElementKind convertElementKind(engine.ElementKind kind) {
   if (kind == engine.ElementKind.CLASS) {
     return ElementKind.CLASS;
diff --git a/pkg/analysis_server/tool/spec/codegen_protocol_constants.dart b/pkg/analysis_server/tool/spec/codegen_protocol_constants.dart
index 6236eeb34db..8236b73cd4e 100644
--- a/pkg/analysis_server/tool/spec/codegen_protocol_constants.dart
+++ b/pkg/analysis_server/tool/spec/codegen_protocol_constants.dart
@@ -38,7 +38,7 @@ String generateConstName(String domainName, String kind, String name) {
 String _fromComponents(List<String> components) =>
     components.map((String component) => component.toUpperCase()).join('_');
 
-/// Return the components of the given [string] that are indicated by an upper
+/// Returns the components of the given String that are indicated by an upper
 /// case letter.
 Iterable<String> _split(String first) {
   var regExp = RegExp('[A-Z]');
diff --git a/pkg/analysis_server/tool/spec/from_html.dart b/pkg/analysis_server/tool/spec/from_html.dart
index 0ffbc512ad4..e6a6efe0db6 100644
--- a/pkg/analysis_server/tool/spec/from_html.dart
+++ b/pkg/analysis_server/tool/spec/from_html.dart
@@ -196,7 +196,7 @@ class ApiReader {
   /// Note that the event name should not include the domain name.
   ///
   /// <params> has the same form as <object>, as described in
-  /// [typeDeclFromHtml].
+  /// [typeObjectFromHtml].
   ///
   /// Child elements can occur in any order.
   Notification notificationFromHtml(dom.Element html, String context) {
@@ -376,7 +376,7 @@ class ApiReader {
   /// </refactoring>
   ///
   /// <feedback> and <options> have the same form as <object>, as described in
-  /// [typeDeclFromHtml].
+  /// [typeObjectFromHtml].
   ///
   /// Child elements can occur in any order.
   Refactoring refactoringFromHtml(dom.Element html) {
@@ -429,7 +429,7 @@ class ApiReader {
   /// Note that the method name should not include the domain name.
   ///
   /// <params> and <result> have the same form as <object>, as described in
-  /// [typeDeclFromHtml].
+  /// [typeObjectFromHtml].
   ///
   /// Child elements can occur in any order.
   Request requestFromHtml(dom.Element html, String context) {
@@ -481,7 +481,7 @@ class ApiReader {
   ///   TYPE
   /// </type>
   ///
-  /// Where TYPE is any HTML that can be parsed by [typeDeclFromHtml].
+  /// Where TYPE is any HTML that can be parsed by [typeObjectFromHtml].
   ///
   /// Child elements can occur in any order.
   TypeDefinition typeDefinitionFromHtml(dom.Element html) {
@@ -555,7 +555,7 @@ class ApiReader {
   ///   TYPE
   /// </field>
   ///
-  /// Where TYPE is any HTML that can be parsed by [typeDeclFromHtml].
+  /// Where TYPE is any HTML that can be parsed by [typeObjectFromHtml].
   ///
   /// In addition, the attribute optional="true" may be used to specify that the
   /// field is optional, and the attribute value="..." may be used to specify