diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 266e34762608ac7a54766170de11d85a1ab69ccf..ea00b4b398bd3544d7470b4300b4d140e78e7640 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+2006-04-08  Kazu Hirata  <kazu@codesourcery.com>
+
+	* decl2.c, pt.c, semantics.c: Fix comment typos.
+
 2006-04-06  Roger Sayle  <roger@eyesopen.com>
 
 	* call.c (null_ptr_cst_p): Add explicit TREE_CONSTANT_OVERFLOW check.
diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c
index 88d7e8e95f347b2b3f22527b87791c98f0c9a096..ed26db2fe3414f2975f1f248e7d543604183de8b 100644
--- a/gcc/cp/decl2.c
+++ b/gcc/cp/decl2.c
@@ -787,7 +787,7 @@ finish_static_data_member_decl (tree decl,
   cp_finish_decl (decl, init, init_const_expr_p, asmspec_tree, flags);
 }
 
-/* DECLARATOR and DECLSPECS correspond to a class member.  The othe
+/* DECLARATOR and DECLSPECS correspond to a class member.  The other
    parameters are as for cp_finish_decl.  Return the DECL for the
    class member declared.  */ 
 
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 6cb78657eb340dc74d6a0c868ceb3fbb7d0b054a..adabe7698dce9249129a0adb333dc96581e0f760 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -3984,7 +3984,7 @@ convert_template_argument (tree parm,
    warning messages are issued under control of COMPLAIN.
 
    If REQUIRE_ALL_ARGS is false, argument deduction will be performed
-   for arugments not specified in ARGS.  Otherwise, if
+   for arguments not specified in ARGS.  Otherwise, if
    USE_DEFAULT_ARGS is true, default arguments will be used to fill in
    unspecified arguments.  If REQUIRE_ALL_ARGS is true, but
    USE_DEFAULT_ARGS is false, then all arguments must be specified in
diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c
index 1931dc97f8f70418ef2877ef05d132097ab456a1..114f3d221459e4397b488b4dbd58c4548bfb80d9 100644
--- a/gcc/cp/semantics.c
+++ b/gcc/cp/semantics.c
@@ -3512,7 +3512,7 @@ finish_omp_clauses (tree clauses)
       while (TREE_CODE (inner_type) == ARRAY_TYPE)
 	inner_type = TREE_TYPE (inner_type);
 
-      /* Check for special function availablity by building a call to one.
+      /* Check for special function availability by building a call to one.
 	 Save the results, because later we won't be in the right context
 	 for making these queries.  */
       if (CLASS_TYPE_P (inner_type)
@@ -3658,7 +3658,7 @@ finish_omp_structured_block (tree block)
   return do_poplevel (block);
 }
 
-/* Similarly, except force the retension of the BLOCK.  */
+/* Similarly, except force the retention of the BLOCK.  */
 
 tree
 begin_omp_parallel (void)