2 files changed, 10 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 1450b9cb79..2194736204 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Feb 23 09:57:21 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* load.c (rb_f_require):  Add note to require for scope of items in the
+	  loaded file.  [ruby-trunk - #5910]
+
 Thu Feb 23 03:58:08 2012  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
 
 	* lib/ostruct.rb (delete_field): Bug fix so previous value is
diff --git a/load.c b/load.c
index d36285fc38..cddd7255ac 100644
--- a/load.c
+++ b/load.c
@@ -469,6 +469,11 @@ load_unlock(const char *ftptr, int done)
  *
  *    require "my-library.rb"
  *    require "db-driver"
+ *
+ *  Any constants or globals within the loaded source file will be available
+ *  in the calling program's global namespace. However, local variables will
+ *  not be propagated to the loading environment.
+ *
  */
 
 VALUE