Merge release-4-6 into master

[alexxy/gromacs.git] / src / programs / mdrun / mdrun.c

diff --git a/src/programs/mdrun/mdrun.c b/src/programs/mdrun/mdrun.c
index 0f24b8878afad8c850ab0414b749efe2a8f1fbfb..43f9d0112c5ccda13a191df842213a561f784b03 100644 (file)
--- a/src/programs/mdrun/mdrun.c
+++ b/src/programs/mdrun/mdrun.c
@@ -317,7 +317,7 @@ int cmain(int argc,char *argv[])
     "ED (essential dynamics) sampling is switched on by using the [TT]-ei[tt]",
     "flag followed by an [TT].edi[tt] file.",
     "The [TT].edi[tt] file can be produced using options in the essdyn",
-    "menu of the WHAT IF program. [TT]mdrun[tt] produces a [TT].edo[tt] file that",
+    "menu of the WHAT IF program. [TT]mdrun[tt] produces a [TT].xvg[tt] output file that",
     "contains projections of positions, velocities and forces onto selected",
     "eigenvectors.[PAR]",
     "When user-defined potential functions have been selected in the",
@@ -449,7 +449,7 @@ int cmain(int argc,char *argv[])
     { efXVG, "-tpi",    "tpi",      ffOPTWR },
     { efXVG, "-tpid",   "tpidist",  ffOPTWR },
     { efEDI, "-ei",     "sam",      ffOPTRD },
-    { efEDO, "-eo",     "sam",      ffOPTWR },
+    { efXVG, "-eo",     "edsam",    ffOPTWR },
     { efGCT, "-j",      "wham",     ffOPTRD },
     { efGCT, "-jo",     "bam",      ffOPTWR },
     { efXVG, "-ffout",  "gct",      ffOPTWR },