From f4bc1ef4a2933e397e3c25827cb8db013c76fa0f Mon Sep 17 00:00:00 2001
From: David Adam <zanchey@ucc.gu.uwa.edu.au>
Date: Wed, 18 Jun 2014 17:29:59 +0800
Subject: [PATCH] docs: clarify fish_greeting function and variable in FAQ

Tidy fish_greeting section in main documentation.

Closes #1506.
---
 doc_src/faq.hdr      | 4 ++--
 doc_src/index.hdr.in | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/doc_src/faq.hdr b/doc_src/faq.hdr
index 3961d1da9..81bac7aea 100644
--- a/doc_src/faq.hdr
+++ b/doc_src/faq.hdr
@@ -226,8 +226,8 @@ fish_title function will not work.
 
 \section faq-greeting How do I change the greeting message?
 
-Change the value of the variable fish_greeting. For example, to remove
-the greeting use:
+Change the value of the variable \c fish_greeting or create a \c fish_greeting
+function. For example, to remove the greeting use:
 
 <pre>
 set fish_greeting
diff --git a/doc_src/index.hdr.in b/doc_src/index.hdr.in
index 9e67724ab..cb24bcf08 100644
--- a/doc_src/index.hdr.in
+++ b/doc_src/index.hdr.in
@@ -1320,9 +1320,9 @@ end
 
 \subsection greeting Configurable greeting
 
-If a function named fish_greeting exists after initialization, it will
-be run when entering interactive mode. Otherwise,if an environment
-variable named fish_greeting exists, it will be printed.
+If a function named \c fish_greeting exists, it will be run when entering
+interactive mode. Otherwise, if an environment variable named \c fish_greeting
+exists, it will be printed.
 
 \subsection event Event handlers