diff --git a/doc/rg.1 b/doc/rg.1
index d09ad9c6..c0c1df0d 100644
--- a/doc/rg.1
+++ b/doc/rg.1
@@ -29,6 +29,10 @@ time searching.
 Because of this, features like backreferences and arbitrary lookaround
 are not supported.
 .PP
+Note that ripgrep may abort unexpectedly when using default settings if
+it searches a file that is simultaneously truncated.
+This behavior can be avoided by passing the \-\-no\-mmap flag.
+.PP
 Project home page: https://github.com/BurntSushi/ripgrep
 .SH COMMON OPTIONS
 .TP
@@ -45,7 +49,10 @@ Only show count of line matches for each file.
 .B \-\-color \f[I]WHEN\f[]
 Whether to use color in the output.
 Valid values are never, auto, always or ansi.
-[default: auto]
+The default is auto.
+When always is used, coloring is attempted based on your environment.
+When ansi is used, coloring is forcefully done using ANSI escape color
+codes.
 .RS
 .RE
 .TP
@@ -299,6 +306,17 @@ Search hidden directories and files.
 .RS
 .RE
 .TP
+.B \-\-iglob \f[I]GLOB\f[] ...
+Include or exclude files/directories case insensitively.
+This always overrides any other ignore logic if there is a conflict, but
+is otherwise applied in addition to ignore files (e.g., .gitignore or
+\&.ignore).
+Multiple glob flags may be used.
+Globbing rules match .gitignore globs.
+Precede a glob with a \[aq]!\[aq] to exclude it.
+.RS
+.RE
+.TP
 .B \-\-ignore\-file \f[I]FILE\f[] ...
 Specify additional ignore files for filtering file paths.
 Ignore files should be in the gitignore format and are matched relative
diff --git a/doc/rg.1.md b/doc/rg.1.md
index 90e1dac7..56fb5858 100644
--- a/doc/rg.1.md
+++ b/doc/rg.1.md
@@ -25,6 +25,10 @@ ripgrep's regex engine uses finite automata and guarantees linear time
 searching. Because of this, features like backreferences and arbitrary
 lookaround are not supported.
 
+Note that ripgrep may abort unexpectedly when using default settings if it
+searches a file that is simultaneously truncated. This behavior can be avoided
+by passing the --no-mmap flag.
+
 Project home page: https://github.com/BurntSushi/ripgrep
 
 # COMMON OPTIONS
diff --git a/src/app.rs b/src/app.rs
index 43c03015..061f8705 100644
--- a/src/app.rs
+++ b/src/app.rs
@@ -9,6 +9,10 @@ ripgrep's regex engine uses finite automata and guarantees linear time
 searching. Because of this, features like backreferences and arbitrary
 lookaround are not supported.
 
+Note that ripgrep may abort unexpectedly when using default settings if it
+searches a file that is simultaneously truncated. This behavior can be avoided
+by passing the --no-mmap flag.
+
 Project home page: https://github.com/BurntSushi/ripgrep
 
 Use -h for short descriptions and --help for more details.";