--- a/libinterp/corefcn/syscalls.cc
+++ b/libinterp/corefcn/syscalls.cc
@@ -110,7 +110,7 @@
 }
 
 DEFUNX ("dup2", Fdup2, args, ,
- "-*- texinfo -*-\n\
+        "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {[@var{fid}, @var{msg}] =} dup2 (@var{old}, @var{new})\n\
 Duplicate a file descriptor.\n\
 \n\
@@ -162,7 +162,7 @@
 }
 
 DEFUNX ("exec", Fexec, args, ,
- "-*- texinfo -*-\n\
+        "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {[@var{err}, @var{msg}] =} exec (@var{file}, @var{args})\n\
 Replace current process with a new process.  Calling @code{exec} without\n\
 first calling @code{fork} will terminate your current Octave process and\n\
@@ -245,7 +245,7 @@
 }
 
 DEFUNX ("popen2", Fpopen2, args, ,
- "-*- texinfo -*-\n\
+        "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {[@var{in}, @var{out}, @var{pid}] =} popen2 (@var{command}, @var{args})\n\
 Start a subprocess with two-way communication.  The name of the process\n\
 is given by @var{command}, and @var{args} is an array of strings\n\
@@ -339,7 +339,8 @@
                   std::string msg;
                   pid_t pid;
 
-                  pid = octave_syscalls::popen2 (exec_file, arg_list, sync_mode, fildes, msg, interactive);
+                  pid = octave_syscalls::popen2 (exec_file, arg_list, sync_mode,
+                                                 fildes, msg, interactive);
                   if (pid >= 0)
                     {
                       FILE *ifile = fdopen (fildes[1], "r");
@@ -348,10 +349,10 @@
                       std::string nm;
 
                       octave_stream is = octave_stdiostream::create (nm, ifile,
-                          std::ios::in);
+                                                                  std::ios::in);
 
                       octave_stream os = octave_stdiostream::create (nm, ofile,
-                          std::ios::out);
+                                                                 std::ios::out);
 
                       Cell file_ids (1, 2);
 
@@ -359,7 +360,7 @@
                       retval(1) = octave_stream_list::insert (is);
                       retval(0) = octave_stream_list::insert (os);
                     }
-                                  else
+                  else
                     error (msg.c_str ());
                 }
             }
@@ -417,7 +418,7 @@
 */
 
 DEFUNX ("fcntl", Ffcntl, args, ,
- "-*- texinfo -*-\n\
+        "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {[@var{err}, @var{msg}] =} fcntl (@var{fid}, @var{request}, @var{arg})\n\
 Change the properties of the open file @var{fid}.  The following values\n\
 may be passed as @var{request}:\n\
@@ -493,7 +494,7 @@
 
           if (! error_state)
             {
-              // FIXME -- Need better checking here?
+              // FIXME: Need better checking here?
               if (fid < 0)
                 error ("fcntl: invalid file id");
               else
@@ -517,7 +518,7 @@
 }
 
 DEFUNX ("fork", Ffork, args, ,
- "-*- texinfo -*-\n\
+        "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {[@var{pid}, @var{msg}] =} fork ()\n\
 Create a copy of the current process.\n\
 \n\
@@ -562,7 +563,7 @@
 }
 
 DEFUNX ("getpgrp", Fgetpgrp, args, ,
-  "-*- texinfo -*-\n\
+        "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {pgid =} getpgrp ()\n\
 Return the process group id of the current process.\n\
 @end deftypefn")
@@ -588,7 +589,7 @@
 }
 
 DEFUNX ("getpid", Fgetpid, args, ,
-  "-*- texinfo -*-\n\
+        "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {pid =} getpid ()\n\
 Return the process id of the current process.\n\
 @end deftypefn")
@@ -606,7 +607,7 @@
 }
 
 DEFUNX ("getppid", Fgetppid, args, ,
-  "-*- texinfo -*-\n\
+        "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {pid =} getppid ()\n\
 Return the process id of the parent process.\n\
 @end deftypefn")
@@ -624,7 +625,7 @@
 }
 
 DEFUNX ("getegid", Fgetegid, args, ,
-  "-*- texinfo -*-\n\
+        "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {egid =} getegid ()\n\
 Return the effective group id of the current process.\n\
 @end deftypefn")
@@ -642,7 +643,7 @@
 }
 
 DEFUNX ("getgid", Fgetgid, args, ,
-  "-*- texinfo -*-\n\
+        "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {gid =} getgid ()\n\
 Return the real group id of the current process.\n\
 @end deftypefn")
@@ -660,7 +661,7 @@
 }
 
 DEFUNX ("geteuid", Fgeteuid, args, ,
-  "-*- texinfo -*-\n\
+        "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {euid =} geteuid ()\n\
 Return the effective user id of the current process.\n\
 @end deftypefn")
@@ -678,7 +679,7 @@
 }
 
 DEFUNX ("getuid", Fgetuid, args, ,
-  "-*- texinfo -*-\n\
+        "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {uid =} getuid ()\n\
 Return the real user id of the current process.\n\
 @end deftypefn")
@@ -696,7 +697,7 @@
 }
 
 DEFUNX ("kill", Fkill, args, ,
-  "-*- texinfo -*-\n\
+        "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {[@var{err}, @var{msg}] =} kill (@var{pid}, @var{sig})\n\
 Send signal @var{sig} to process @var{pid}.\n\
 \n\
@@ -748,7 +749,7 @@
 }
 
 DEFUNX ("lstat", Flstat, args, ,
-  "-*- texinfo -*-\n\
+        "-*- texinfo -*-\n\
 @deftypefn  {Built-in Function} {@var{info} =} lstat (@var{symlink})\n\
 @deftypefnx {Built-in Function} {[@var{info}, @var{err}, @var{msg}] =} lstat (@var{symlink})\n\
 Return a structure @var{info} containing information about the symbolic link\n\
@@ -778,7 +779,7 @@
 }
 
 DEFUNX ("mkfifo", Fmkfifo, args, ,
-  "-*- texinfo -*-\n\
+        "-*- texinfo -*-\n\
 @deftypefn  {Built-in Function} {} mkfifo (@var{name}, @var{mode})\n\
 @deftypefnx {Built-in Function} {[@var{err}, @var{msg}] =} mkfifo (@var{name}, @var{mode})\n\
 Create a FIFO special file named @var{name} with file mode @var{mode}\n\
@@ -833,7 +834,7 @@
 }
 
 DEFUNX ("pipe", Fpipe, args, ,
-  "-*- texinfo -*-\n\
+        "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {[@var{read_fd}, @var{write_fd}, @var{err}, @var{msg}] =} pipe ()\n\
 Create a pipe and return the reading and writing ends of the pipe\n\
 into @var{read_fd} and @var{write_fd} respectively.\n\
@@ -888,7 +889,7 @@
 }
 
 DEFUNX ("stat", Fstat, args, ,
-  "-*- texinfo -*-\n\
+        "-*- texinfo -*-\n\
 @deftypefn  {Built-in Function} {[@var{info}, @var{err}, @var{msg}] =} stat (@var{file})\n\
 @deftypefnx {Built-in Function} {[@var{info}, @var{err}, @var{msg}] =} stat (@var{fid})\n\
 @deftypefnx {Built-in Function} {[@var{info}, @var{err}, @var{msg}] =} lstat (@var{file})\n\
@@ -1017,7 +1018,7 @@
 }
 
 DEFUNX ("S_ISREG", FS_ISREG, args, ,
-  "-*- texinfo -*-\n\
+        "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {} S_ISREG (@var{mode})\n\
 Return true if @var{mode} corresponds to a regular file.\n\
 \n\
@@ -1043,7 +1044,7 @@
 }
 
 DEFUNX ("S_ISDIR", FS_ISDIR, args, ,
-  "-*- texinfo -*-\n\
+        "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {} S_ISDIR (@var{mode})\n\
 Return true if @var{mode} corresponds to a directory.\n\
 \n\
@@ -1069,7 +1070,7 @@
 }
 
 DEFUNX ("S_ISCHR", FS_ISCHR, args, ,
-  "-*- texinfo -*-\n\
+        "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {} S_ISCHR (@var{mode})\n\
 Return true if @var{mode} corresponds to a character device.\n\
 \n\
@@ -1095,7 +1096,7 @@
 }
 
 DEFUNX ("S_ISBLK", FS_ISBLK, args, ,
-  "-*- texinfo -*-\n\
+        "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {} S_ISBLK (@var{mode})\n\
 Return true if @var{mode} corresponds to a block device.\n\
 \n\
@@ -1121,7 +1122,7 @@
 }
 
 DEFUNX ("S_ISFIFO", FS_ISFIFO, args, ,
-  "-*- texinfo -*-\n\
+        "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {} S_ISFIFO (@var{mode})\n\
 Return true if @var{mode} corresponds to a fifo.\n\
 \n\
@@ -1147,7 +1148,7 @@
 }
 
 DEFUNX ("S_ISLNK", FS_ISLNK, args, ,
-  "-*- texinfo -*-\n\
+        "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {} S_ISLNK (@var{mode})\n\
 Return true if @var{mode} corresponds to a symbolic link.\n\
 \n\
@@ -1173,7 +1174,7 @@
 }
 
 DEFUNX ("S_ISSOCK", FS_ISSOCK, args, ,
-  "-*- texinfo -*-\n\
+        "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {} S_ISSOCK (@var{mode})\n\
 Return true if @var{mode} corresponds to a socket.\n\
 \n\
@@ -1199,7 +1200,7 @@
 }
 
 DEFUN (gethostname, args, ,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {} gethostname ()\n\
 Return the hostname of the system where Octave is running.\n\
 @end deftypefn")
@@ -1215,7 +1216,7 @@
 }
 
 DEFUN (uname, args, ,
-  "-*- texinfo -*-\n\
+       "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {[@var{uts}, @var{err}, @var{msg}] =} uname ()\n\
 Return system information in the structure.  For example:\n\
 \n\
@@ -1262,7 +1263,7 @@
 }
 
 DEFUNX ("unlink", Funlink, args, ,
-  "-*- texinfo -*-\n\
+        "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {[@var{err}, @var{msg}] =} unlink (@var{file})\n\
 Delete the file named @var{file}.\n\
 \n\
@@ -1301,7 +1302,7 @@
 }
 
 DEFUNX ("waitpid", Fwaitpid, args, ,
-  "-*- texinfo -*-\n\
+        "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {[@var{pid}, @var{status}, @var{msg}] =} waitpid (@var{pid}, @var{options})\n\
 Wait for process @var{pid} to terminate.  The @var{pid} argument can be:\n\
 \n\
@@ -1370,7 +1371,8 @@
 
               int status = 0;
 
-              pid_t result = octave_syscalls::waitpid (pid, &status, options, msg);
+              pid_t result = octave_syscalls::waitpid (pid, &status,
+                                                       options, msg);
 
               retval(2) = msg;
               retval(1) = status;
@@ -1389,7 +1391,7 @@
 }
 
 DEFUNX ("WIFEXITED", FWIFEXITED, args, ,
-  "-*- texinfo -*-\n\
+        "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {} WIFEXITED (@var{status})\n\
 Given @var{status} from a call to @code{waitpid}, return true if the\n\
 child terminated normally.\n\
@@ -1412,7 +1414,7 @@
 }
 
 DEFUNX ("WEXITSTATUS", FWEXITSTATUS, args, ,
-  "-*- texinfo -*-\n\
+        "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {} WEXITSTATUS (@var{status})\n\
 Given @var{status} from a call to @code{waitpid}, return the exit\n\
 status of the child.  This function should only be employed if\n\
@@ -1436,7 +1438,7 @@
 }
 
 DEFUNX ("WIFSIGNALED", FWIFSIGNALED, args, ,
-  "-*- texinfo -*-\n\
+        "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {} WIFSIGNALED (@var{status})\n\
 Given @var{status} from a call to @code{waitpid}, return true if the\n\
 child process was terminated by a signal.\n\
@@ -1459,7 +1461,7 @@
 }
 
 DEFUNX ("WTERMSIG", FWTERMSIG, args, ,
-  "-*- texinfo -*-\n\
+        "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {} WTERMSIG (@var{status})\n\
 Given @var{status} from a call to @code{waitpid}, return the number of\n\
 the signal that caused the child process to terminate.  This function\n\
@@ -1483,7 +1485,7 @@
 }
 
 DEFUNX ("WCOREDUMP", FWCOREDUMP, args, ,
-  "-*- texinfo -*-\n\
+        "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {} WCOREDUMP (@var{status})\n\
 Given @var{status} from a call to @code{waitpid}, return true if the\n\
 child produced a core dump.  This function should only be employed if\n\
@@ -1509,7 +1511,7 @@
 }
 
 DEFUNX ("WIFSTOPPED", FWIFSTOPPED, args, ,
-  "-*- texinfo -*-\n\
+        "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {} WIFSTOPPED (@var{status})\n\
 Given @var{status} from a call to @code{waitpid}, return true if the\n\
 child process was stopped by delivery of a signal; this is only\n\
@@ -1534,7 +1536,7 @@
 }
 
 DEFUNX ("WSTOPSIG", FWSTOPSIG, args, ,
-  "-*- texinfo -*-\n\
+        "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {} WSTOPSIG (@var{status})\n\
 Given @var{status} from a call to @code{waitpid}, return the number of\n\
 the signal which caused the child to stop.  This function should only\n\
@@ -1558,7 +1560,7 @@
 }
 
 DEFUNX ("WIFCONTINUED", FWIFCONTINUED, args, ,
-  "-*- texinfo -*-\n\
+        "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {} WIFCONTINUED (@var{status})\n\
 Given @var{status} from a call to @code{waitpid}, return true if the\n\
 child process was resumed by delivery of @code{SIGCONT}.\n\
@@ -1581,7 +1583,7 @@
 }
 
 DEFUNX ("canonicalize_file_name", Fcanonicalize_file_name, args, ,
-  "-*- texinfo -*-\n\
+        "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {[@var{cname}, @var{status}, @var{msg}] =} canonicalize_file_name (@var{fname})\n\
 Return the canonical name of file @var{fname}.  If the file does not exist\n\
 the empty string (\"\") is returned.\n\
@@ -1633,7 +1635,7 @@
 #endif
 
 DEFUNX ("F_DUPFD", FF_DUPFD, args, ,
-  "-*- texinfo -*-\n\
+        "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {} F_DUPFD ()\n\
 Return the numerical value to pass to @code{fcntl} to return a\n\
 duplicate file descriptor.\n\
@@ -1649,7 +1651,7 @@
 }
 
 DEFUNX ("F_GETFD", FF_GETFD, args, ,
-  "-*- texinfo -*-\n\
+        "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {} F_GETFD ()\n\
 Return the numerical value to pass to @code{fcntl} to return the\n\
 file descriptor flags.\n\
@@ -1665,7 +1667,7 @@
 }
 
 DEFUNX ("F_GETFL", FF_GETFL, args, ,
-  "-*- texinfo -*-\n\
+        "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {} F_GETFL ()\n\
 Return the numerical value to pass to @code{fcntl} to return the\n\
 file status flags.\n\
@@ -1681,7 +1683,7 @@
 }
 
 DEFUNX ("F_SETFD", FF_SETFD, args, ,
-  "-*- texinfo -*-\n\
+        "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {} F_SETFD ()\n\
 Return the numerical value to pass to @code{fcntl} to set the file\n\
 descriptor flags.\n\
@@ -1697,7 +1699,7 @@
 }
 
 DEFUNX ("F_SETFL", FF_SETFL, args, ,
-  "-*- texinfo -*-\n\
+        "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {} F_SETFL ()\n\
 Return the numerical value to pass to @code{fcntl} to set the file\n\
 status flags.\n\
@@ -1713,7 +1715,7 @@
 }
 
 DEFUNX ("O_APPEND", FO_APPEND, args, ,
-  "-*- texinfo -*-\n\
+        "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {} O_APPEND ()\n\
 Return the numerical value of the file status flag that may be\n\
 returned by @code{fcntl} to indicate each write operation appends,\n\
@@ -1730,7 +1732,7 @@
 }
 
 DEFUNX ("O_ASYNC", FO_ASYNC, args, ,
-  "-*- texinfo -*-\n\
+        "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {} O_ASYNC ()\n\
 Return the numerical value of the file status flag that may be\n\
 returned by @code{fcntl} to indicate asynchronous I/O.\n\
@@ -1746,7 +1748,7 @@
 }
 
 DEFUNX ("O_CREAT", FO_CREAT, args, ,
-  "-*- texinfo -*-\n\
+        "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {} O_CREAT ()\n\
 Return the numerical value of the file status flag that may be\n\
 returned by @code{fcntl} to indicate that a file should be\n\
@@ -1763,7 +1765,7 @@
 }
 
 DEFUNX ("O_EXCL", FO_EXCL, args, ,
-  "-*- texinfo -*-\n\
+        "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {} O_EXCL ()\n\
 Return the numerical value of the file status flag that may be\n\
 returned by @code{fcntl} to indicate that file locking is used.\n\
@@ -1779,7 +1781,7 @@
 }
 
 DEFUNX ("O_NONBLOCK", FO_NONBLOCK, args, ,
-  "-*- texinfo -*-\n\
+        "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {} O_NONBLOCK ()\n\
 Return the numerical value of the file status flag that may be\n\
 returned by @code{fcntl} to indicate that non-blocking I/O is in use,\n\
@@ -1796,7 +1798,7 @@
 }
 
 DEFUNX ("O_RDONLY", FO_RDONLY, args, ,
-  "-*- texinfo -*-\n\
+        "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {} O_RDONLY ()\n\
 Return the numerical value of the file status flag that may be\n\
 returned by @code{fcntl} to indicate that a file is open for\n\
@@ -1813,7 +1815,7 @@
 }
 
 DEFUNX ("O_RDWR", FO_RDWR, args, ,
-  "-*- texinfo -*-\n\
+        "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {} O_RDWR ()\n\
 Return the numerical value of the file status flag that may be\n\
 returned by @code{fcntl} to indicate that a file is open for both\n\
@@ -1830,7 +1832,7 @@
 }
 
 DEFUNX ("O_SYNC", FO_SYNC, args, ,
-  "-*- texinfo -*-\n\
+        "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {} O_SYNC ()\n\
 Return the numerical value of the file status flag that may be\n\
 returned by @code{fcntl} to indicate that a file is open for\n\
@@ -1847,7 +1849,7 @@
 }
 
 DEFUNX ("O_TRUNC", FO_TRUNC, args, ,
-  "-*- texinfo -*-\n\
+        "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} O_TRUNC ()\n\
 Return the numerical value of the file status flag that may be\n\
 returned by @code{fcntl} to indicate that if file exists, it should\n\
@@ -1864,7 +1866,7 @@
 }
 
 DEFUNX ("O_WRONLY", FO_WRONLY, args, ,
-  "-*- texinfo -*-\n\
+        "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {} O_WRONLY ()\n\
 Return the numerical value of the file status flag that may be\n\
 returned by @code{fcntl} to indicate that a file is open for\n\
@@ -1885,7 +1887,7 @@
 #endif
 
 DEFUNX ("WNOHANG", FWNOHANG, args, ,
-  "-*- texinfo -*-\n\
+        "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {} WNOHANG ()\n\
 Return the numerical value of the option argument that may be\n\
 passed to @code{waitpid} to indicate that it should return its\n\
@@ -1901,7 +1903,7 @@
 #endif
 
 DEFUNX ("WUNTRACED", FWUNTRACED, args, ,
-  "-*- texinfo -*-\n\
+        "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {} WUNTRACED ()\n\
 Return the numerical value of the option argument that may be\n\
 passed to @code{waitpid} to indicate that it should also return\n\
@@ -1918,7 +1920,7 @@
 #endif
 
 DEFUNX ("WCONTINUE", FWCONTINUE, args, ,
-  "-*- texinfo -*-\n\
+        "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {} WCONTINUE ()\n\
 Return the numerical value of the option argument that may be\n\
 passed to @code{waitpid} to indicate that it should also return\n\