diff --git a/Fltk/optionWindow.cpp b/Fltk/optionWindow.cpp
index 5509b33e224efd0b09c8d02f1d236c64ca868c6e..5c361bb1d690f38375663a1933a6f71153fedc2f 100644
--- a/Fltk/optionWindow.cpp
+++ b/Fltk/optionWindow.cpp
@@ -1347,6 +1347,60 @@ optionWindow::optionWindow(int deltaFontSize)
o->end();
}
+ {
+ Fl_Group *o = new Fl_Group
+ (L + WB, WB + BH, width - 2 * WB, height - 2 * WB - BH, "Advanced");
+
+ general.input[1] = new Fl_Input
+ (L + 2 * WB, 2 * WB + 1 * BH, IW, BH, "Text editor command");
+ general.input[1]->align(FL_ALIGN_RIGHT);
+ general.input[1]->callback(general_options_ok_cb);
+
+ general.input[2] = new Fl_Input
+ (L + 2 * WB, 2 * WB + 2 * BH, IW, BH, "Web browser command");
+ general.input[2]->align(FL_ALIGN_RIGHT);
+ general.input[2]->callback(general_options_ok_cb);
+
+ general.butt[7] = new Fl_Check_Button
+ (L + 2 * WB, 2 * WB + 3 * BH, BW, BH, "Print messages on terminal");
+ general.butt[7]->type(FL_TOGGLE_BUTTON);
+ general.butt[7]->callback(general_options_ok_cb);
+
+ general.butt[8] = new Fl_Check_Button
+ (L + 2 * WB, 2 * WB + 4 * BH, BW, BH, "Save session information on exit");
+ general.butt[8]->type(FL_TOGGLE_BUTTON);
+ general.butt[8]->callback(general_options_ok_cb);
+
+ general.butt[9] = new Fl_Check_Button
+ (L + 2 * WB, 2 * WB + 5 * BH, BW/2-WB, BH, "Save options on exit");
+ general.butt[9]->type(FL_TOGGLE_BUTTON);
+ general.butt[9]->callback(general_options_ok_cb);
+
+ Fl_Button *b0 = new Fl_Button
+ (L + width / 2, 2 * WB + 5 * BH, (int)(1.75*BB), BH, "Restore default options");
+ b0->callback(options_restore_defaults_cb);
+
+ general.butt[14] = new Fl_Check_Button
+ (L + 2 * WB, 2 * WB + 6 * BH, BW, BH,
+ "Ask confirmation before overwriting files");
+ general.butt[14]->type(FL_TOGGLE_BUTTON);
+ general.butt[14]->callback(general_options_ok_cb);
+
+ general.value[5] = new Fl_Value_Input
+ (L + 2 * WB, 2 * WB + 7 * BH, IW, BH, "Message verbosity");
+ general.value[5]->minimum(0);
+ general.value[5]->maximum(10);
+ general.value[5]->step(1);
+ general.value[5]->align(FL_ALIGN_RIGHT);
+ general.value[5]->callback(general_options_ok_cb);
+
+ general.input[0] = new Fl_Input
+ (L + 2 * WB, 2 * WB + 8 * BH, IW, BH, "Default file name");
+ general.input[0]->align(FL_ALIGN_RIGHT);
+ general.input[0]->callback(general_options_ok_cb);
+
+ o->end();
+ }
{
Fl_Group *o = new Fl_Group
(L + WB, WB + BH, width - 2 * WB, height - 2 * WB - BH, "Axes");
@@ -1456,60 +1510,6 @@ optionWindow::optionWindow(int deltaFontSize)
o->end();
}
- {
- Fl_Group *o = new Fl_Group
- (L + WB, WB + BH, width - 2 * WB, height - 2 * WB - BH, "Output");
-
- general.input[1] = new Fl_Input
- (L + 2 * WB, 2 * WB + 1 * BH, IW, BH, "Text editor command");
- general.input[1]->align(FL_ALIGN_RIGHT);
- general.input[1]->callback(general_options_ok_cb);
-
- general.input[2] = new Fl_Input
- (L + 2 * WB, 2 * WB + 2 * BH, IW, BH, "Web browser command");
- general.input[2]->align(FL_ALIGN_RIGHT);
- general.input[2]->callback(general_options_ok_cb);
-
- general.butt[7] = new Fl_Check_Button
- (L + 2 * WB, 2 * WB + 3 * BH, BW, BH, "Print messages on terminal");
- general.butt[7]->type(FL_TOGGLE_BUTTON);
- general.butt[7]->callback(general_options_ok_cb);
-
- general.butt[8] = new Fl_Check_Button
- (L + 2 * WB, 2 * WB + 4 * BH, BW, BH, "Save session information on exit");
- general.butt[8]->type(FL_TOGGLE_BUTTON);
- general.butt[8]->callback(general_options_ok_cb);
-
- general.butt[9] = new Fl_Check_Button
- (L + 2 * WB, 2 * WB + 5 * BH, BW/2-WB, BH, "Save options on exit");
- general.butt[9]->type(FL_TOGGLE_BUTTON);
- general.butt[9]->callback(general_options_ok_cb);
-
- Fl_Button *b0 = new Fl_Button
- (L + width / 2, 2 * WB + 5 * BH, (int)(1.75*BB), BH, "Restore default options");
- b0->callback(options_restore_defaults_cb);
-
- general.butt[14] = new Fl_Check_Button
- (L + 2 * WB, 2 * WB + 6 * BH, BW, BH,
- "Ask confirmation before overwriting files");
- general.butt[14]->type(FL_TOGGLE_BUTTON);
- general.butt[14]->callback(general_options_ok_cb);
-
- general.value[5] = new Fl_Value_Input
- (L + 2 * WB, 2 * WB + 7 * BH, IW, BH, "Message verbosity");
- general.value[5]->minimum(0);
- general.value[5]->maximum(10);
- general.value[5]->step(1);
- general.value[5]->align(FL_ALIGN_RIGHT);
- general.value[5]->callback(general_options_ok_cb);
-
- general.input[0] = new Fl_Input
- (L + 2 * WB, 2 * WB + 8 * BH, IW, BH, "Default file name");
- general.input[0]->align(FL_ALIGN_RIGHT);
- general.input[0]->callback(general_options_ok_cb);
-
- o->end();
- }
{
Fl_Group *o = new Fl_Group
(L + WB, WB + BH, width - 2 * WB, height - 2 * WB - BH, "Aspect");
diff --git a/Mesh/Generator.cpp b/Mesh/Generator.cpp
index 5ff07f954a3cc8eb31680a82c64d1c5c612d7856..0136357145e15b9618b5f0600569f66f112ad44f 100644
--- a/Mesh/Generator.cpp
+++ b/Mesh/Generator.cpp
@@ -331,8 +331,8 @@ static bool CancelDelaunayHybrid(GModel *m)
return !Msg::GetAnswer
("You are trying to generate a mixed structured/unstructured grid using\n"
"the 3D Delaunay algorithm. This algorithm cannot garantee that the\n"
- "final mesh will be conforming. You should probably use the 3D Frontal\n"
- "algorithm instead. Do you really want to continue?\n\n"
+ "final mesh will be conforming. (You should probably use the 3D Frontal\n"
+ "algorithm instead.) Do you really want to continue with the Delaunay?\n\n"
"(To disable this warning in the future, select `Enable expert mode'\n"
"in the option dialog.)", 1, "Cancel", "Continue");
return false;
diff --git a/doc/texinfo/gmsh.texi b/doc/texinfo/gmsh.texi
index 8253dc96c25f9760b9cc5f9946baa784c7047d52..950e0ed27946f71becb35c3b00b91f135263214a 100644
--- a/doc/texinfo/gmsh.texi
+++ b/doc/texinfo/gmsh.texi
@@ -4628,7 +4628,7 @@ option file with `File->Save As', or when saving per-model options with
the lists below).
To reset all options to their default values, use the `Restore default
-options' button in `Tools->Options->General->Output', or erase the
+options' button in `Tools->Options->General->Advanced', or erase the
@code{General.SessionFileName} and @code{General.OptionsFileName} files
by hand.