Merge remote-tracking branch 'origin/master'

3 files changed, 10 insertions, 9 deletions

diff --git a/documentation/src/development.dox b/documentation/src/development.dox
index b53c3a87e..e2fcefd0c 100644
--- a/documentation/src/development.dox
+++ b/documentation/src/development.dox
@@ -156,7 +156,7 @@ This will appear in the document:
     ", ü, ç, Ç, but not all HTML quoting characters.
 
 For further informations about HTML quoting characters see
-    <br> \b http://www.doxygen.org/htmlcmds.html
+    <br> \b http://www.doxygen.org/manual/htmlcmds.html
 
 Alternatively you can use \b UTF-8 encoding within Doxygen comments.
 
@@ -221,9 +221,9 @@ Links to other documents and external links can be embedded with
     unicode that has been created with a \\page statement.
 
 -   For further informations about quoting see
-    http://www.doxygen.org/htmlcmds.html
+    http://www.doxygen.org/manual/htmlcmds.html
 
--   see <a href="http://www.nedit.org/">Nedit</a> creates
+-   see <a href="https://www.fltk.org/">FLTK Library</a> creates
     a standard HTML link
 
 \endcode
@@ -234,9 +234,9 @@ appears as:
     unicode that has been created with a \\page statement.
 
 -   For further informations about quoting see
-    http://www.doxygen.org/htmlcmds.html
+    http://www.doxygen.org/manual/htmlcmds.html
 
--   see <a href="http://www.nedit.org/">Nedit</a> creates
+-   see <a href="https://www.fltk.org/">FLTK Library</a> creates
     a standard HTML link
 
 
diff --git a/documentation/src/editor.dox b/documentation/src/editor.dox
index 24e13ceb0..2531dfbae 100644
--- a/documentation/src/editor.dox
+++ b/documentation/src/editor.dox
@@ -620,8 +620,8 @@ Fl_Text_Editor widget.
 The Fl_Text_Editor widget supports highlighting
 of text with different fonts, colors, and sizes. The
 implementation is based on the excellent
-<A HREF="http://www.nedit.org/">NEdit</A>
-text editor core, from http://www.nedit.org/, which
+<A HREF="https://sourceforge.net/projects/nedit/">NEdit</A>
+text editor core, from https://sourceforge.net/projects/nedit/, which
 uses a parallel "style" buffer which tracks the font, color, and
 size of the text that is drawn.
 
diff --git a/documentation/src/faq.dox b/documentation/src/faq.dox
index 530f97eef..a407327dd 100644
--- a/documentation/src/faq.dox
+++ b/documentation/src/faq.dox
@@ -125,7 +125,7 @@ because Escape will still close pop-up windows:
 
 \code
 void my_callback(Fl_Widget*, void*) {
-  if (Fl::event()==FL_SHORTCUT && Fl::event_key()==FL_Escape) 
+  if (Fl::event() == FL_SHORTCUT && Fl::event_key() == FL_Escape)
     return; // ignore Escape
   exit(0);
 }
@@ -136,7 +136,8 @@ done with:
 
 \code
 void my_callback(Fl_Widget*, void*) {
-  if (fl_ask("Are you sure you want to quit?"))
+  if (fl_choice("Are you sure you want to quit?",
+                "continue", "quit", NULL))
     exit(0);
 }
 \endcode