rename whitelist -> instrumentlist

4 files changed, 18 insertions, 14 deletions

diff --git a/docs/Changelog.md b/docs/Changelog.md
index 1ecea274..6718ecde 100644
--- a/docs/Changelog.md
+++ b/docs/Changelog.md
@@ -10,6 +10,10 @@ sending a mail to <afl-users+subscribe@googlegroups.com>.
 
 
 ### Version ++2.65d (dev)
+  - renamed the main branch on Github to "stable"
+  - renamed master/slave to main/secondary
+  - renamed blacklist/whitelist to ignorelist/instrumentlist ->
+    AFL_LLVM_INSTRUMENT_FILE and AFL_GCC_INSTRUMENT_FILE
   - afl-fuzz:
      - -S secondary nodes now only sync from the main node to increase
        performance, the -M main node still syncs from everyone. Added checks
@@ -40,8 +44,8 @@ sending a mail to <afl-users+subscribe@googlegroups.com>.
     - WHITELIST feature now supports wildcards (thanks to sirmc)
     - small change to cmplog to make it work with current llvm 11-dev
     - added AFL_LLVM_LAF_ALL, sets all laf-intel settings
-    - LTO whitelist functionality rewritten, now main, _init etc functions
-      need not to be whitelisted anymore
+    - LTO instrument_files functionality rewritten, now main, _init etc functions
+      need not to be instrument_filesed anymore
     - fixed crash in compare-transform-pass when strcasecmp/strncasecmp was
       tried to be instrumented with LTO
     - fixed crash in cmplog with LTO
@@ -249,7 +253,7 @@ sending a mail to <afl-users+subscribe@googlegroups.com>.
     the original script is still present as afl-cmin.bash
   - afl-showmap: -i dir option now allows processing multiple inputs using the
      forkserver. This is for enhanced speed in afl-cmin.
-  - added blacklist and whitelisting function check in all modules of llvm_mode
+  - added blacklist and instrument_filesing function check in all modules of llvm_mode
   - added fix from Debian project to compile libdislocator and libtokencap
   - libdislocator: AFL_ALIGNED_ALLOC to force size alignment to max_align_t
 
@@ -304,7 +308,7 @@ sending a mail to <afl-users+subscribe@googlegroups.com>.
     performance loss of ~10%
   - added test/test-performance.sh script
   - (re)added gcc_plugin, fast inline instrumentation is not yet finished,
-    however it includes the whitelisting and persistance feature! by hexcoder-
+    however it includes the instrument_filesing and persistance feature! by hexcoder-
   - gcc_plugin tests added to testing framework
 
 
@@ -392,7 +396,7 @@ sending a mail to <afl-users+subscribe@googlegroups.com>.
   - more cpu power for afl-system-config
   - added forkserver patch to afl-tmin, makes it much faster (originally from
     github.com/nccgroup/TriforceAFL)
-  - added whitelist support for llvm_mode via AFL_LLVM_WHITELIST to allow
+  - added instrument_files support for llvm_mode via AFL_LLVM_WHITELIST to allow
     only to instrument what is actually interesting. Gives more speed and less
     map pollution (originally by choller@mozilla)
   - added Python Module mutator support, python2.7-dev is autodetected.
diff --git a/docs/PATCHES.md b/docs/PATCHES.md
index a6783523..b2cff43a 100644
--- a/docs/PATCHES.md
+++ b/docs/PATCHES.md
@@ -28,7 +28,7 @@ afl-qemu-optimize-map.diff		by mh(at)mh-sec(dot)de
 + AFLfast additions (github.com/mboehme/aflfast) were incorporated.
 + Qemu 3.1 upgrade with enhancement patches (github.com/andreafioraldi/afl)
 + Python mutator modules support (github.com/choller/afl)
-+ Whitelisting in LLVM mode (github.com/choller/afl)
++ Instrument file list in LLVM mode (github.com/choller/afl)
 + forkserver patch for afl-tmin (github.com/nccgroup/TriforceAFL)
 
 
diff --git a/docs/env_variables.md b/docs/env_variables.md
index 867e937e..87344331 100644
--- a/docs/env_variables.md
+++ b/docs/env_variables.md
@@ -204,14 +204,14 @@ Then there are a few specific features that are only available in llvm_mode:
 
     See llvm_mode/README.laf-intel.md for more information.
 
-### WHITELIST
+### INSTRUMENT_FILE
 
     This feature allows selectively instrumentation of the source
 
-    - Setting AFL_LLVM_WHITELIST with a filename will only instrument those
+    - Setting AFL_LLVM_INSTRUMENT_FILE with a filename will only instrument those
       files that match the names listed in this file.
 
-    See llvm_mode/README.whitelist.md for more information.
+    See llvm_mode/README.instrument_file.md for more information.
 
 ### NOT_ZERO
 
@@ -236,14 +236,14 @@ Then there are a few specific features that are only available in llvm_mode:
 
 Then there are a few specific features that are only available in the gcc_plugin:
 
-### WHITELIST
+### INSTRUMENT_FILE
 
     This feature allows selective instrumentation of the source
 
-    - Setting AFL_GCC_WHITELIST with a filename will only instrument those
+    - Setting AFL_GCC_INSTRUMENT_FILE with a filename will only instrument those
       files that match the names listed in this file (one filename per line).
 
-    See gcc_plugin/README.whitelist.md for more information.
+    See gcc_plugin/README.instrument_file.md for more information.
 
 ## 3) Settings for afl-fuzz
 
diff --git a/docs/perf_tips.md b/docs/perf_tips.md
index fcd03db7..7a690b77 100644
--- a/docs/perf_tips.md
+++ b/docs/perf_tips.md
@@ -66,8 +66,8 @@ then using laf-intel (see llvm_mode/README.laf-intel.md) will help `afl-fuzz` a
 to get to the important parts in the code.
 
 If you are only interested in specific parts of the code being fuzzed, you can
-whitelist the files that are actually relevant. This improves the speed and
-accuracy of afl. See llvm_mode/README.whitelist.md
+instrument_files the files that are actually relevant. This improves the speed and
+accuracy of afl. See llvm_mode/README.instrument_file.md
 
 Also use the InsTrim mode on larger binaries, this improves performance and
 coverage a lot.