cfg.mk: Replace uses of filesystem with file system

6 files changed, 6 insertions, 7 deletions

diff --git a/cfg.mk b/cfg.mk
index a8eb9016..efe2b212 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -3,7 +3,7 @@ exclude_file_name_regexp--sc_trailing_blank = ^doc/annou.*$$
 exclude_file_name_regexp--sc_bindtextdomain = ^fuzz/.*.c$$
 exclude_file_name_regexp--sc_require_config_h = (fuzz/.*.c|src/decc_ver.c|util/trunc.c)$$
 exclude_file_name_regexp--sc_require_config_h_first = (fuzz/.*.c|src/decc_ver.c|src/vms.c|util/trunc.c)$$
-# exclude_file_name_regexp--sc_po_
+exclude_file_name_regexp--sc_file_system = ^(NEWS|testenv/server/ftp/ftp_server.py)$$
 
 
 export VC_LIST_EXCEPT_DEFAULT=^(lib/.*|m4/.*|md5/.*|build-aux/.*|src/gettext\.h|.*ChangeLog|tests/certs/.*)$$
@@ -12,7 +12,6 @@ config_h_header = "wget\.h"
 local-checks-to-skip = \
     sc_const_long_option \
     sc_error_message_uppercase \
-    sc_file_system \
     sc_two_space_separator_in_usage \
     sc_useless_cpp_parens \
     \
diff --git a/doc/wget.texi b/doc/wget.texi
index 66a33c60..3c24de20 100644
--- a/doc/wget.texi
+++ b/doc/wget.texi
@@ -2144,7 +2144,7 @@ download them recursively, though this feature may be added in the future.
 
 When @samp{--retr-symlinks=no} is specified, the linked-to file is not
 downloaded.  Instead, a matching symbolic link is created on the local
-filesystem.  The pointed-to file will not be retrieved unless this recursive
+file system.  The pointed-to file will not be retrieved unless this recursive
 retrieval would have encountered it separately and downloaded it anyway.  This
 option poses a security risk where a malicious FTP Server may cause Wget to
 write to files outside of the intended directories through a specially crafted
diff --git a/src/init.c b/src/init.c
index fbe09974..69f91ad5 100644
--- a/src/init.c
+++ b/src/init.c
@@ -433,7 +433,7 @@ defaults (void)
   opt.ftp_pasv = true;
   /* 2014-09-07  Darshit Shah  <darnir@gmail.com>
    * opt.retr_symlinks is set to true by default. Creating symbolic links on the
-   * local filesystem pose a security threat by malicious FTP Servers that
+   * local file system pose a security threat by malicious FTP Servers that
    * server a specially crafted .listing file akin to this:
    *
    * lrwxrwxrwx   1 root     root           33 Dec 25  2012 JoCxl6d8rFU -> /
diff --git a/src/vms.c b/src/vms.c
index 3ae33ea2..d5f63c7b 100644
--- a/src/vms.c
+++ b/src/vms.c
@@ -631,7 +631,7 @@ else
    }
 dev_descr.dsc$w_length = strlen( dev_descr.dsc$a_pointer);
 
-/* Get filesystem type code.
+/* Get file system type code.
    (Text results for this item code have been unreliable.)
 */
 sts = lib$getdvi( &((int) DVI$_ACPTYPE),
diff --git a/testenv/README b/testenv/README
index d4fabddd..35d7282b 100644
--- a/testenv/README
+++ b/testenv/README
@@ -144,7 +144,7 @@ Various variables used consistently across all tests are:
     list of files downloaded from Server[2], etc.  They must be relative URLs,
     i.e., not start with "/".
     * Files: This variable defines the files that exist in the Server's
-    filesystem. The Files variable is a list of lists of WgetFile objects.
+    file system. The Files variable is a list of lists of WgetFile objects.
     This means that File[0] is a list of WgetFile objects that lie on Server[0],
     File[1] a list of files on Server[1] and so on.
     * Existing_Files: This is a list of files that already exist in the
diff --git a/testenv/conf/server_files.py b/testenv/conf/server_files.py
index eaa9cd0d..6ab4962d 100644
--- a/testenv/conf/server_files.py
+++ b/testenv/conf/server_files.py
@@ -1,7 +1,7 @@
 from conf import hook
 
 """ Pre-Test Hook: ServerFiles
-This hook is used to define a set of files on the server's virtual filesystem.
+This hook is used to define a set of files on the server's virtual file system.
 server_files is expected to be dictionary that maps filenames to their
 contents. In the future, this can be used to add additional metadata to the
 files using the WgetFile class too.