diff --git a/contrib/btree_gist/btree_gist.h b/contrib/btree_gist/btree_gist.h
index f7db9206e7..299f2d359e 100644
--- a/contrib/btree_gist/btree_gist.h
+++ b/contrib/btree_gist/btree_gist.h
@@ -1,3 +1,6 @@
+#ifndef __BTREE_GIST_H__
+#define __BTREE_GIST_H__
+
 #include "postgres.h"
 #include "access/gist.h"
 #include "access/itup.h"
@@ -37,3 +40,5 @@ enum gbtree_type
 Datum		gbtreekey_in(PG_FUNCTION_ARGS);
 
 Datum		gbtreekey_out(PG_FUNCTION_ARGS);
+
+#endif
diff --git a/contrib/btree_gist/btree_utils_num.h b/contrib/btree_gist/btree_utils_num.h
index 0f59342d96..b2eb5dc869 100644
--- a/contrib/btree_gist/btree_utils_num.h
+++ b/contrib/btree_gist/btree_utils_num.h
@@ -1,3 +1,6 @@
+#ifndef __BTREE_UTILS_NUM_H__
+#define __BTREE_UTILS_NUM_H__
+
 #include "btree_gist.h"
 
 typedef char GBT_NUMKEY;
@@ -101,3 +104,5 @@ extern bool gbt_num_same(const GBT_NUMKEY * a, const GBT_NUMKEY * b,
 
 extern void gbt_num_bin_union(Datum *u, GBT_NUMKEY * e,
 				  const gbtree_ninfo * tinfo);
+
+#endif
diff --git a/contrib/btree_gist/btree_utils_var.h b/contrib/btree_gist/btree_utils_var.h
index cddfadfab1..21a6cbd8e2 100644
--- a/contrib/btree_gist/btree_utils_var.h
+++ b/contrib/btree_gist/btree_utils_var.h
@@ -1,3 +1,6 @@
+#ifndef __BTREE_UTILS_VAR_H__
+#define __BTREE_UTILS_VAR_H__
+
 #include "mb/pg_wchar.h"
 
 #include "btree_gist.h"
@@ -70,3 +73,5 @@ extern GIST_SPLITVEC *gbt_var_picksplit(const GistEntryVector *entryvec, GIST_SP
 				  const gbtree_vinfo * tinfo);
 extern void gbt_var_bin_union(Datum *u, GBT_VARKEY * e,
 				  const gbtree_vinfo * tinfo);
+
+#endif
diff --git a/doc/src/sgml/ref/grant.sgml b/doc/src/sgml/ref/grant.sgml
index cf591aefa6..c3fb5f7a4c 100644
--- a/doc/src/sgml/ref/grant.sgml
+++ b/doc/src/sgml/ref/grant.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/grant.sgml,v 1.55 2006/07/10 16:48:46 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/grant.sgml,v 1.56 2006/07/10 21:03:58 momjian Exp $
 PostgreSQL documentation
 -->
 
@@ -272,9 +272,10 @@ GRANT <replaceable class="PARAMETER">role</replaceable> [, ...]
        of privilege that is applicable to procedural languages.
       </para>
       <para>
-       For schemas, allows the grantee to find objects contained in the
-       specified schema (assuming that the objects' own privilege requirements 
-       are also met).
+       For schemas, allows access to objects contained in the specified
+       schema (assuming that the objects' own privilege requirements are
+       also met).  Essentially this allows the grantee to <quote>look up</>
+       objects within the schema.
       </para>
       <para>
        For sequences, this privilege allows the use of the