diff --git a/annotations/yo/stl.yo b/annotations/yo/stl.yo
index dfba674a..61cc606b 100644
--- a/annotations/yo/stl.yo
+++ b/annotations/yo/stl.yo
@@ -205,12 +205,10 @@ includefile(stl/filesystem/intro)
             file_status)
     includefile(stl/filesystem/filestatus)
 
-    subsect(Times associated with file system entries: file_time_type)
-    includefile(stl/filesystem/filetimetype)
-
+COMMENT( TODO
     subsect(Information about the space of a file system entries: space_info)
     includefile(stl/filesystem/spaceinfo)
-
+END)
     lsubsect(FSFUNCTIONS)(Free functions)
     includefile(stl/filesystem/functions)
 
diff --git a/annotations/yo/stl/filesystem/directoryentry.yo b/annotations/yo/stl/filesystem/directoryentry.yo
index 5dfcdf1b..ed40b82b 100644
--- a/annotations/yo/stl/filesystem/directoryentry.yo
+++ b/annotations/yo/stl/filesystem/directoryentry.yo
@@ -13,7 +13,7 @@ assignment operators it defines a constructor expecting a tt(path):
     ithtq(replace_filename)(void replace_filename(path const &dest))
        (the last entry of the current path name (which may be empty if the
         current name ends in a directory separator) is replaced by tt(dest);)
-    ithtq(path)(path const &path() const), hi(operator path const &())
+    itht(path)(path const &path() const), hi(operator path const &())
         tt(operator path const &() const):
        quote(returns the current path name;)
     ithtq(status)(file_status status([error_code &ec]))
diff --git a/annotations/yo/stl/filesystem/functions.yo b/annotations/yo/stl/filesystem/functions.yo
index 5ddba14f..672ee975 100644
--- a/annotations/yo/stl/filesystem/functions.yo
+++ b/annotations/yo/stl/filesystem/functions.yo
@@ -15,7 +15,7 @@ The following functions are available:
     itemization(
     ithtq(absolute)(path absolute(path const &src, path const& base))
        (a copy of tt(src) to which, unless already available in tt(src),
-        tt(absolute(base)'s) root name and root directory are prepended);
+        tt(absolute(base)'s) root name and root directory are prepended;)
 
     ithtq(canonical)(path canonical(path const &src [, path const &base [,
         error_code &ec]]))
@@ -83,13 +83,13 @@ The following functions are available:
        (tt(true) is returned if tt(path1) and tt(path2) refer to the same file
         or directory, and have identical statuses. Both paths must exist;)
 
-    ithtq(exists)(bool exists(path const &dest [, error_code &ec])),
-        tt(exists(file_status status))
-       (tt(true) is returned if tt(dest) exists (actually: if tt(status(dest[,
-        ec])) (see below) returns tt(true)). Note: when iterating over
-        directories, the iterator usually provides the entries' statuses. In
-        those cases calling tt(exists(iterator->status())) is more efficient
-        than calling tt(exists(*iterator));)
+    itht(exists)(bool exists(path const &dest [, error_code &ec])),
+        tt(exists(file_status status)):
+       quote(tt(true) is returned if tt(dest) exists (actually: if
+        tt(status(dest[, ec])) (see below) returns tt(true)). Note: when
+        iterating over directories, the iterator usually provides the entries'
+        statuses. In those cases calling tt(exists(iterator->status())) is
+        more efficient than calling tt(exists(*iterator));)
 
     ithtq(file_size)(std::unintmax_t file_size(path const &dest [, error_code
         &ec]))
@@ -99,8 +99,8 @@ The following functions are available:
         error_code &ec]))
        (returns the number of hard links associated with tt(dest);)
 
-    itht(file_time_type last_write_time(path const &dest [, error_code
-        &ec]))(last_write_time), tt(void last_write_time(path const &dest,
+    itht(last_write_time)(file_time_type last_write_time(path const &dest [,
+        error_code &ec])), tt(void last_write_time(path const &dest,
         file_time_type newTime [, error_code &ec])):
        quote(the former function returns tt(dest's) last modification time;
         the latter function changes tt(dest's) last modification time to
@@ -204,7 +204,7 @@ shown between parentheses). Here is an overview of all its defined symbols:
 
     Options when copying subdirectories:
     itemization(
-    itt(none)​ (0): skip subdirectories (default behavior);
+    itt(none) (0): skip subdirectories (default behavior);
     itt(recursive) (8): recursively copy subdirectories and their content;
     )
 
@@ -218,7 +218,7 @@ shown between parentheses). Here is an overview of all its defined symbols:
 
     Options controlling tt(copy's) behavior itself:
     itemization(
-    itt(non​e) (0): copy file content (default behavior);
+    itt(none) (0): copy file content (default behavior);
     itt(directories_only) (64): copy the directory structure, but do not copy
         any non-directory files;
     itt(create_symlinks) (128): instead of creating copies of files, create