diff --git a/docs/configuration.txt b/docs/configuration.txt
index 6df086247..994f9ac9e 100644
--- a/docs/configuration.txt
+++ b/docs/configuration.txt
@@ -310,6 +310,17 @@ reserved_space = (str, optional)
  "100MB", "100M", "100000000B", "100000000", and "100000kb" all mean the same
  thing. Likewise, "1MiB", "1024KiB", and "1048576B" all mean the same thing.
 
+expire.enabled =
+expire.mode =
+expire.override_lease_duration =
+expire.cutoff_date =
+expire.immutable =
+expire.mutable =
+
+ These settings control garbage-collection, in which the server will delete
+ shares that no longer have an up-to-date lease on them. Please see the
+ neighboring "garbage-collection.txt" document for full details.
+
 
 == Running A Helper ==
 
diff --git a/docs/proposed/garbage-collection.txt b/docs/garbage-collection.txt
similarity index 100%
rename from docs/proposed/garbage-collection.txt
rename to docs/garbage-collection.txt
diff --git a/src/allmydata/scripts/create_node.py b/src/allmydata/scripts/create_node.py
index b1d1c86c6..7a20ded13 100644
--- a/src/allmydata/scripts/create_node.py
+++ b/src/allmydata/scripts/create_node.py
@@ -115,6 +115,8 @@ def create_client(basedir, config, out=sys.stdout, err=sys.stderr):
     c.write("enabled = %s\n" % boolstr[storage_enabled])
     c.write("#readonly =\n")
     c.write("#reserved_space =\n")
+    c.write("#expire.enabled =\n")
+    c.write("#expire.mode =\n")
     c.write("\n")
 
     c.write("[helper]\n")