--- a/build-aux/mk-opts.pl	Fri Jan 15 15:11:56 2016 -0500
+++ b/build-aux/mk-opts.pl	Sun Jan 17 06:38:08 2016 -0800
@@ -623,7 +623,7 @@
 
 sub emit_print_function
 {
-  ## FIXME -- determine the width of the table automatically.
+  ## FIXME: determine the width of the table automatically.
 
   print qq|static void
 print_$CLASS_NAME (std::ostream& os)

--- a/doc/interpreter/func.txi	Fri Jan 15 15:11:56 2016 -0500
+++ b/doc/interpreter/func.txi	Sun Jan 17 06:38:08 2016 -0800
@@ -751,7 +751,7 @@
 ignore the time stamps for all function files.  Passing
 @qcode{"system"} to this function resets the default behavior.
 
-@c FIXME -- note about time stamps on files in NFS environments?
+@c FIXME: note about time stamps on files in NFS environments?
 
 @DOCSTRING(edit)
 

--- a/doc/interpreter/io.txi	Fri Jan 15 15:11:56 2016 -0500
+++ b/doc/interpreter/io.txi	Sun Jan 17 06:38:08 2016 -0800
@@ -111,8 +111,7 @@
 
 @DOCSTRING(fflush)
 
-@c FIXME -- maybe this would be a good place to describe the
-@c following message:
+@c FIXME: maybe this would be a good place to describe the following message:
 @c
 @c warning: connection to external pager (pid = 9334) lost --
 @c warning: pending computations and output may be lost

--- a/doc/interpreter/linalg.txi	Fri Jan 15 15:11:56 2016 -0500
+++ b/doc/interpreter/linalg.txi	Sun Jan 17 06:38:08 2016 -0800
@@ -183,7 +183,7 @@
 
 @DOCSTRING(svd_driver)
 
-@c FIXME -- should there be a new section here?
+@c FIXME: should there be a new section here?
 
 @DOCSTRING(housh)
 

--- a/libinterp/octave-value/module.mk	Fri Jan 15 15:11:56 2016 -0500
+++ b/libinterp/octave-value/module.mk	Sun Jan 17 06:38:08 2016 -0800
@@ -150,7 +150,7 @@
 
 libinterp_octave_value_liboctave_value_la_SOURCES = $(OCTAVE_VALUE_SRC)
 
-## FIXME -- maybe it would be better to limit the JAVA flags to
+## FIXME: maybe it would be better to limit the JAVA flags to
 ## the compile commands for ov-java.cc?  Does JAVA_LIBS need to be
 ## added to LIBOCTINTERP_LINK_DEPS (see libinterp/link-deps.mk)?
 ## Should we have a separate set of JAVA_LDFLAGS?

--- a/oct-conf-post.in.h	Fri Jan 15 15:11:56 2016 -0500
+++ b/oct-conf-post.in.h	Sun Jan 17 06:38:08 2016 -0800
@@ -72,7 +72,7 @@
 #pragma warning (disable: 4003)
 /* missing implementations in template instantiation */
 #pragma warning (disable: 4996)
-/* deprecated function names (FIXME?) */
+/* deprecated function names (FIXME: ???) */
 #pragma warning (disable: 4661)
 #endif
 

--- a/run-octave.in	Fri Jan 15 15:11:56 2016 -0500
+++ b/run-octave.in	Sun Jan 17 06:38:08 2016 -0800
@@ -25,8 +25,8 @@
 : ${SED=%SED%}
 : ${ADDRESS_SANITIZER_OPTIONS="%ADRESS_SANITIZER_OPTIONS%"}
 
-# FIXME -- is there a better way to handle the possibility of spaces
-# in these names?
+# FIXME: is there a better way to handle the possibility of spaces
+#        in these names?
 
 top_srcdir='%abs_top_srcdir%'
 builddir='%builddir%'

--- a/scripts/@ftp/module.mk	Fri Jan 15 15:11:56 2016 -0500
+++ b/scripts/@ftp/module.mk	Sun Jan 17 06:38:08 2016 -0800
@@ -1,4 +1,5 @@
-## FIXME -- including scripts/@ftp/module.mk fails.
+## FIXME: including scripts/@ftp/module.mk fails.
 ## Is that an automake bug?
+## Would getting the quoting character right fix it?
 ##
 ## What should be in this file is in scripts/module.mk.

--- a/scripts/general/fieldnames.m	Fri Jan 15 15:11:56 2016 -0500
+++ b/scripts/general/fieldnames.m	Sun Jan 17 06:38:08 2016 -0800
@@ -48,7 +48,7 @@
   elseif (isjava (obj) || ischar (obj))
     ## FIXME: Function prototype that excepts java obj exists, but doesn't
     ##        work if obj is java.lang.String.  Convert obj to classname.
-    ## FIXME this is now working for objects whose class is in the dynamic
+    ## FIXME: this is now working for objects whose class is in the dynamic
     ##        classpath but will continue to fail if such classnames are used
     ##        instead (see bug #42710)
     if (isa (obj, "java.lang.String"))

--- a/scripts/io/textread.m	Fri Jan 15 15:11:56 2016 -0500
+++ b/scripts/io/textread.m	Sun Jan 17 06:38:08 2016 -0800
@@ -183,7 +183,7 @@
   else
     ## Determine EOL from file.
     ## Search for EOL candidates in the first BUFLENGTH chars
-    ## FIXME Ignore risk of 2-byte EOL (\r\n) being split at exactly BUFLENGTH
+    ## FIXME: Ignore risk of 2-byte EOL (\r\n) being split at exactly BUFLENGTH
     eol_srch_len = min (length (str), BUFLENGTH);
     ## First try DOS (CRLF)
     if (! isempty (strfind (str(1 : eol_srch_len), "\r\n")))

--- a/scripts/io/textscan.m	Fri Jan 15 15:11:56 2016 -0500
+++ b/scripts/io/textscan.m	Sun Jan 17 06:38:08 2016 -0800
@@ -257,7 +257,7 @@
 
   if (! ischar (fid))
     ## Now that we know what EOL looks like, we can process format_repeat_count.
-    ## FIXME The below isn't ML-compatible: counts lines, not format string uses
+    ## FIXME: below isn't ML-compatible: counts lines, not format string uses
     if (isfinite (nlines) && (nlines >= 0))
       l_eol_char = length (eol_char);
       eoi = findstr (str, eol_char);

--- a/scripts/module.mk	Fri Jan 15 15:11:56 2016 -0500
+++ b/scripts/module.mk	Sun Jan 17 06:38:08 2016 -0800
@@ -4,7 +4,7 @@
 scripts_DISTCLEANFILES =
 scripts_MAINTAINERCLEANFILES =
 
-## FIXME -- including scripts/@ftp/module.mk fails.  Is that an automake bug?
+## FIXME: including scripts/@ftp/module.mk fails.  Is that an automake bug?
 
 FCN_FILE_DIRS += scripts/@ftp
 

--- a/scripts/ode/odeset.m	Fri Jan 15 15:11:56 2016 -0500
+++ b/scripts/ode/odeset.m	Sun Jan 17 06:38:08 2016 -0800
@@ -264,8 +264,8 @@
 
 ## All tests that are needed to check if a valid option has been set are
 ## implemented in ode_struct_value_check.m
-## ## FIXME ## currently fails as there are two extra options to control
-##             fixed step integratio options.
+## FIXME: xtest currently fails as there are two extra options to control
+##        fixed step integration options.
 %!xtest
 %! odeoptA = odeset ();
 %! assert (isstruct (odeoptA));