Add an example on `**/` pattern to the example of .gitignore file.
Add --word-diff option description
Eliminate "folder" word usage.
Fix a typo on Dia-version of figure 5.15.