Merge branch 'chan-fatfs' into fatfs-integration

# Conflicts:
#	.gitignore
#	fatfs/src/diskio.h
#	fatfs/src/option/ccsbcs.c
#	include/avr/ffconf.h
#	include/integer.h

1 files changed, 2 insertions, 3 deletions

diff --git a/fatfs/doc/en/close.html b/fatfs/doc/en/close.html
index f3423fa..c16dfa6 100644
--- a/fatfs/doc/en/close.html
+++ b/fatfs/doc/en/close.html
@@ -36,7 +36,6 @@ FRESULT f_close (
 <a href="rc.html#ok">FR_OK</a>,

 <a href="rc.html#de">FR_DISK_ERR</a>,

 <a href="rc.html#ie">FR_INT_ERR</a>,

-<a href="rc.html#nr">FR_NOT_READY</a>,

 <a href="rc.html#io">FR_INVALID_OBJECT</a>,

 <a href="rc.html#tm">FR_TIMEOUT</a>

 </p>

@@ -45,8 +44,8 @@ FRESULT f_close (
 

 <div class="para desc">

 <h4>Description</h4>

-<p>The <tt>f_close()</tt> function closes an open file object. If any data has been written to the file, the cached information of the file is written back to the volume. After the function succeeded, the file object is no longer valid and it can be discarded.</p>

-<p>Note that if the file object is in read-only mode and <tt>_FS_LOCK</tt> option is not enabled, the file object can also be discarded without this process. However this is not recommended for future compatibility.</p>

+<p>The <tt>f_close</tt> function closes an open file object. If any data has been written to the file, the cached information of the file is written back to the volume. After the function succeeded, the file object is no longer valid and it can be discarded.</p>

+<p>Note that if the file object is in read-only mode and <tt>_FS_LOCK</tt> is not enabled, the file object can also be discarded without this process. However this is not recommended for future compatibility.</p>

 </div>