diff --git a/grammar/src/lexical.grm b/grammar/src/lexical.grm
index e30bbe626ad..73c9ca04876 100644
--- a/grammar/src/lexical.grm
+++ b/grammar/src/lexical.grm
@@ -58,7 +58,7 @@ LabelName
   : "@" SimpleName;
 
 /**
-<!--See [Nonlocal returns and jumps](returns.html)-->
+See [Returns and jumps](returns.html)
 */
 
 /* Symbols:
diff --git a/grammar/src/toplevel.grm b/grammar/src/toplevel.grm
index c0c35ef12bc..aaedaea7d4a 100644
--- a/grammar/src/toplevel.grm
+++ b/grammar/src/toplevel.grm
@@ -1,7 +1,7 @@
 /**
 # Syntax
 
-<!--Relevant pages: [Namespaces](namespaces.html)-->
+Relevant pages: [Packages](packages.html)
 */
 
 
@@ -28,7 +28,7 @@ import
   ;
 
 /**
-<!--See [Imports](namespaces.html#imports)-->
+See [Imports](packages.html#imports)
 */
 
 toplevelObject
@@ -48,7 +48,7 @@ package
   ;
 
 /**
-<!--See [Namespaces](namespaces.html)-->
+See [Packages](packages.html)
 */
 
 [undocumented]
diff --git a/grammar/src/when.grm b/grammar/src/when.grm
index 0b62990f311..121f458338f 100644
--- a/grammar/src/when.grm
+++ b/grammar/src/when.grm
@@ -1,7 +1,7 @@
 /**
 #### Pattern matching
 
-<!--See [Pattern matching](pattern-matching.html)-->
+See [When-expression](control-flow.html#when-expression)
 */
 
 when