diff --git a/db/compaction/compaction_picker_universal.cc b/db/compaction/compaction_picker_universal.cc
index 1f96f1beacd9f6ad0f536d35b7abf5bec5d62da9..fa3e0f6392672b0e3a301d67b7e7ab2fe1c2fde9 100644
--- a/db/compaction/compaction_picker_universal.cc
+++ b/db/compaction/compaction_picker_universal.cc
@@ -104,7 +104,7 @@ class UniversalCompactionBuilder {
   // because some files are being compacted.
   Compaction* PickPeriodicCompaction();
 
-  // Used in universal compaction when the enabled_trivial_move
+  // Used in universal compaction when the allow_trivial_move
   // option is set. Checks whether there are any overlapping files
   // in the input. Returns true if the input files are non
   // overlapping.
diff --git a/docs/_docs/getting-started.md b/docs/_docs/getting-started.md
index 8b01dfefd45d9d676b9d804cc0bb8bedfa8f4e9a..efd17c0312d76eba010af56a8121d790ed5cc4fc 100644
--- a/docs/_docs/getting-started.md
+++ b/docs/_docs/getting-started.md
@@ -73,6 +73,6 @@ These are just simple examples of how RocksDB is used. The full documentation is
 
 Here are some specific details about the RocksDB implementation:
 
-- [Architecture Guide](https://github.com/facebook/rocksdb/wiki/Rocksdb-Architecture-Guide)
-- [Format of an immutable Table file](https://github.com/facebook/rocksdb/wiki/Rocksdb-Table-Format)
-- [Format of a log file](https://github.com/facebook/rocksdb/wiki/Write-Ahead-Log-File-Format)
+- [RocksDB Overview](https://github.com/facebook/rocksdb/wiki/RocksDB-Overview)
+- [Immutable BlockBased Table file format](https://github.com/facebook/rocksdb/wiki/Rocksdb-BlockBasedTable-Format)
+- [Log file format](https://github.com/facebook/rocksdb/wiki/Write-Ahead-Log-File-Format)
diff --git a/docs/_top-level/support.md b/docs/_top-level/support.md
index 64165751fe2e98b739f8655af0979d5069cd4599..05c39befd2586dbd1d2d3c0f5d7464e8f08ae0fc 100644
--- a/docs/_top-level/support.md
+++ b/docs/_top-level/support.md
@@ -19,4 +19,4 @@ Use the [RocksDB Facebook group](https://www.facebook.com/groups/rocksdb.dev/) f
 
 ### FAQ
 
-Check out a list of [commonly asked questions](/docs/support/faq) about RocksDB.
+Check out a list of [commonly asked questions](https://github.com/facebook/rocksdb/wiki/RocksDB-FAQ) about RocksDB.
diff --git a/include/rocksdb/options.h b/include/rocksdb/options.h
index 968abc57a21cb76a4f89847021dbb7dca8f40632..93a0df7adfec3168460f92ca7160f44db58d5de1 100644
--- a/include/rocksdb/options.h
+++ b/include/rocksdb/options.h
@@ -1516,9 +1516,11 @@ struct ReadOptions {
   // Default: false
   bool background_purge_on_iterator_cleanup;
 
-  // If true, keys deleted using the DeleteRange() API will be visible to
-  // readers until they are naturally deleted during compaction. This improves
-  // read performance in DBs with many range deletions.
+  // If true, range tombstones handling will be skipped in key lookup paths.
+  // For DB instances that don't use DeleteRange() calls, this setting can
+  // be used to optimize the read performance.
+  // Note that, if this assumption (of no previous DeleteRange() calls) is
+  // broken, stale keys could be served in read paths.
   // Default: false
   bool ignore_range_deletions;