diff --git a/doc/man/man5/gres.conf.5 b/doc/man/man5/gres.conf.5
index fddf6ea54a2b0b00ad498046cf4a04d77073e9f8..7143789ae5e32add903e2bc45eaf4a5a4bab2886 100644
--- a/doc/man/man5/gres.conf.5
+++ b/doc/man/man5/gres.conf.5
@@ -1,4 +1,4 @@
-.TH "gres.conf" "5" "Slurm Configuration File" "April 2020" "Slurm Configuration File"
+.TH "gres.conf" "5" "Slurm Configuration File" "August 2020" "Slurm Configuration File"
 
 .SH "NAME"
 gres.conf \- Slurm configuration file for Generic RESource (GRES) management.
@@ -22,6 +22,12 @@ slurm.conf file will be used.
 The gres.conf file may be omitted completely if the configuration information
 in the slurm.conf file fully describes all GRES.
 
+.LP
+If using the \fBgres.conf\fR file to describe the resources available to nodes,
+the first parameter on the line should be \fBNodeName\fR. If configuring
+Generic Resources without specifying nodes, the first parameter on the line
+should be \fBName\fR.
+
 .LP
 Parameter names are case insensitive.
 Any text following a "#" in the configuration file is treated
diff --git a/src/common/gres.c b/src/common/gres.c
index 026dbd8424622ce79d68dcd2a1c52bcbc8c2ee4a..9851a48eda834c41af4f09a529052d262f9806f8 100644
--- a/src/common/gres.c
+++ b/src/common/gres.c
@@ -135,7 +135,7 @@ typedef struct slurm_gres_ops {
 	List            (*get_devices)		( void );
 	void            (*step_hardware_init)	( bitstr_t *, char * );
 	void            (*step_hardware_fini)	( void );
-	gres_epilog_info_t * (*epilog_build_env) ( List job_gres_list );
+	gres_epilog_info_t *(*epilog_build_env)(gres_job_state_t *gres_job_ptr);
 	void            (*epilog_set_env)	( char ***epilog_env_ptr,
 						gres_epilog_info_t *epilog_info,
 						int node_inx );