diff --git a/docs/latex/wx/function.tex b/docs/latex/wx/function.tex
index 7ff85d8c51..337fd06c4d 100644
--- a/docs/latex/wx/function.tex
+++ b/docs/latex/wx/function.tex
@@ -1359,7 +1359,7 @@ is valid) if the dialog was cancelled.
 
 \wxheading{Parameters}
 
-\docparam{parent}{The parent window for the colour selection dialog}
+\docparam{parent}{The parent window for the font selection dialog}
 
 \docparam{fontInit}{If given, this will be the font initially selected in the dialog.}
 
diff --git a/include/wx/fontdlg.h b/include/wx/fontdlg.h
index 681c6ab5c1..1396becad1 100644
--- a/include/wx/fontdlg.h
+++ b/include/wx/fontdlg.h
@@ -15,7 +15,8 @@
 #   include "wx/os2/fontdlg.h"
 #endif
 
-// get the colour from user and return it
+// get the font from user and return it, returns wxNullFont if the dialog was
+// cancelled
 wxFont WXDLLEXPORT
 wxGetFontFromUser(wxWindow *parent = (wxWindow *)NULL,
                   const wxFont& fontInit = wxNullFont);