nagachika	2013-04-25 00:43:05 +0900 (Thu, 25 Apr 2013)

  New Revision: 40449

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=40449

  Log:
    merge revision(s) 40441:
    
    update doc.

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/file.c
    branches/ruby_2_0_0/version.h

Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 40448)
+++ ruby_2_0_0/version.h	(revision 40449)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1
 #define RUBY_VERSION "2.0.0"
 #define RUBY_RELEASE_DATE "2013-04-25"
-#define RUBY_PATCHLEVEL 168
+#define RUBY_PATCHLEVEL 169
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 4
Index: ruby_2_0_0/file.c
===================================================================
--- ruby_2_0_0/file.c	(revision 40448)
+++ ruby_2_0_0/file.c	(revision 40449)
@@ -2238,7 +2238,7 @@ lchown_internal(const char *path, VALUE https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/file.c#L2238
 
 /*
  *  call-seq:
- *     file.lchown(owner_int, group_int, file_name,..) -> integer
+ *     File.lchown(owner_int, group_int, file_name,..) -> integer
  *
  *  Equivalent to <code>File::chown</code>, but does not follow symbolic
  *  links (so it will change the owner associated with the link, not the
@@ -3772,7 +3772,7 @@ rb_file_s_basename(int argc, VALUE *argv https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/file.c#L3772
 
 /*
  *  call-seq:
- *     File.dirname(file_name )  ->  dir_name
+ *     File.dirname(file_name)  ->  dir_name
  *
  *  Returns all components of the filename given in <i>file_name</i>
  *  except the last one. The filename can be formed using both
@@ -4203,7 +4203,7 @@ rb_thread_flock(void *data) https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/file.c#L4203
 
 /*
  *  call-seq:
- *     file.flock (locking_constant )-> 0 or false
+ *     file.flock(locking_constant) -> 0 or false
  *
  *  Locks or unlocks a file according to <i>locking_constant</i> (a
  *  logical <em>or</em> of the values in the table below).
@@ -4308,14 +4308,14 @@ test_check(int n, int argc, VALUE *argv) https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/file.c#L4308
 
 /*
  *  call-seq:
- *     test(int_cmd, file1 [, file2] ) -> obj
+ *     test(cmd, file1 [, file2] ) -> obj
  *
- *  Uses the integer +int_cmd+ to perform various tests on +file1+ (first
+ *  Uses the integer +cmd+ to perform various tests on +file1+ (first
  *  table below) or on +file1+ and +file2+ (second table).
  *
  *  File tests on a single file:
  *
- *    Test   Returns   Meaning
+ *    Cmd    Returns   Meaning
  *    "A"  | Time    | Last access time for file1
  *    "b"  | boolean | True if file1 is a block device
  *    "c"  | boolean | True if file1 is a character device

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r40441


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/