Tutorial auto colouring, Man page and Make fixes

Completely fixes #1557 and the underlying Doxygen changes that caused
it. Should make fish docs simpler and more robust, more consistent and
generally prettier.

todo:
- trap unmarked text as arguments in context
- test & fix sed portability - see in particular. (so far tested on BSD
(Mac) and GNU sed).
- test Makefile changes
- last round of aesthetic changes and getting that ascii fish in there…

1 files changed, 3 insertions, 2 deletions

diff --git a/.gitignore b/.gitignore
index 492c5758..2fe2f215 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,14 +30,15 @@ share/man/
 toc.txt
 user_doc/
 xcuserdata
+fish.xccheckout
 tests/*tmp.*
 tests/foo.txt
 FISH-BUILD-VERSION-FILE
 version
 messages.pot
 lexicon.txt
-doc_src/fish_lexicon_filter
-debug-lexicon.log
+lexicon_filter
+lexicon-debug.log
 
 Fish-Shell.sublime-workspace
 Fish-Shell.sublime-project