diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 000000000..37afb3433 Binary files /dev/null and b/.DS_Store differ diff --git a/docs/configuration.rst b/docs/configuration.rst index e1e68b539..b0c8edf6c 100644 --- a/docs/configuration.rst +++ b/docs/configuration.rst @@ -14,6 +14,7 @@ certain settings have command line options. When defined via multiple methods, the command line options have the highest priority, followed by environment variables, and finally config file options from ``unifyfs.conf``. + The system-wide configuration file is used by default when available. However, users can specify a custom location for the configuration file using the ``-f`` command-line option to ``unifyfsd`` (see below). diff --git a/docs/overview.rst b/docs/overview.rst index df735beb0..6e72f6acc 100644 --- a/docs/overview.rst +++ b/docs/overview.rst @@ -11,6 +11,9 @@ easily as they do the parallel file system. This section will provide a high level design of UnifyFS. It will describe the UnifyFS library and the UnifyFS daemon. +This is a new paragraph. We will see if lines that are created with the GUI +editor will have trailing white space problems. blah. + --------------------------- High Level Design ---------------------------