Merge branch 'kyle-walker-fdatasync'

diff --cc man/sadc.in
index 2d754b71467d86616f704ffadbcfde158dbe1707,ce8ee2300eb4881cddcbd662619e216d04ab05f1..536a90c9143fefd37bea936a7d63d1310d245e93
--- 1/man/sadc.in
--- 2/man/sadc.in
+++ b/man/sadc.in
@@@ -4,7 -4,7 +4,7 @@@ sadc \- System activity data collector
  .SH SYNOPSIS
  .B @SA_LIB_DIR@/sadc [ -C
  .I comment
- .B ] [ -D ] [ -F ] [ -L ] [ -V ] [ -S { keyword [,...] | ALL | XALL } ] [
 -.B ] [ -D ] [ -F ] [ -L ] [ -V ] [ -f ] [ -S { keyword [,...] | ALL | XALL } ] [
++.B ] [ -D ] [ -F ] [ -f ] [ -L ] [ -V ] [ -S { keyword [,...] | ALL | XALL } ] [
  .I interval
  .B [
  .I count

diff --cc sadc.c
index 826f4aed0c8adc945da9bd58f6c1e83c3b502fdd,139d490a121551d39682bfcfb7ac6aee480c70a6..d76f2dd5775611ed10055f250a7ebb48913b7334
--- 1/sadc.c
--- 2/sadc.c
+++ b/sadc.c
@@@ -92,7 -92,7 +92,7 @@@ void usage(char *progname
                progname);
  
        fprintf(stderr, _("Options are:\n"
-                         "[ -C <comment> ] [ -D ] [ -F ] [ -L ] [ -V ]\n"
 -                        "[ -C <comment> ] [ -D ] [ -F ] [ -L ] [ -V ] [ -f ]\n"
++                        "[ -C <comment> ] [ -D ] [ -F ] [ -f ] [ -L ] [ -V ]\n"
                          "[ -S { INT | DISK | IPV6 | POWER | SNMP | XDISK | ALL | XALL } ]\n"));
        exit(1);
  }