From f219d8e4ddd3e3da93540608baa7c35ffbed9c1f Mon Sep 17 00:00:00 2001
From: dan sinclair <dsinclair@google.com>
Date: Tue, 28 Jul 2020 23:40:44 -0400
Subject: [PATCH] Update language in a few places.

This CL clarifies various bits of text.
---
 Doxyfile                                             | 2 +-
 src/amberscript/parser_subgroup_size_control_test.cc | 8 ++++----
 tools/check_code_format.sh                           | 4 ++--
 tools/roll-all                                       | 3 +--
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/Doxyfile b/Doxyfile
index b21641213..4b9ba52b3 100644
--- a/Doxyfile
+++ b/Doxyfile
@@ -1336,7 +1336,7 @@ CHM_FILE               =
 HHC_LOCATION           =
 
 # The GENERATE_CHI flag controls if a separate .chi index file is generated
-# (YES) or that it should be included in the master .chm file (NO).
+# (YES) or that it should be included in the primary .chm file (NO).
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
diff --git a/src/amberscript/parser_subgroup_size_control_test.cc b/src/amberscript/parser_subgroup_size_control_test.cc
index b012fd65b..4358b4bbe 100644
--- a/src/amberscript/parser_subgroup_size_control_test.cc
+++ b/src/amberscript/parser_subgroup_size_control_test.cc
@@ -107,7 +107,7 @@ SHADER compute test_shader GLSL
 END
 PIPELINE compute pipeline
   ATTACH test_shader
-  SUBGROUP dummy
+  SUBGROUP unused
   END
 END)";
 
@@ -167,7 +167,7 @@ END
 PIPELINE compute pipeline
   ATTACH test_shader
   SUBGROUP test_shader
-    REQUIRED_SIZE dummy
+    REQUIRED_SIZE unused
   END
 END)";
 
@@ -256,7 +256,7 @@ END
 PIPELINE compute pipeline
   ATTACH test_shader
   SUBGROUP test_shader
-    FULLY_POPULATED dummy
+    FULLY_POPULATED unused
   END
 END)";
   Parser parser;
@@ -275,7 +275,7 @@ END
 PIPELINE compute pipeline
   ATTACH test_shader
   SUBGROUP test_shader
-    VARYING_SIZE dummy
+    VARYING_SIZE unused
   END
 END)";
   Parser parser;
diff --git a/tools/check_code_format.sh b/tools/check_code_format.sh
index e4818f9c2..72a839838 100755
--- a/tools/check_code_format.sh
+++ b/tools/check_code_format.sh
@@ -18,14 +18,14 @@
 #
 # This script assumes to be invoked at the project root directory.
 
-FILES_TO_CHECK=$(git diff --name-only master | grep -E ".*\.(cpp|cc|c\+\+|cxx|c|h|hpp)$")
+FILES_TO_CHECK=$(git diff --name-only main | grep -E ".*\.(cpp|cc|c\+\+|cxx|c|h|hpp)$")
 
 if [ -z "${FILES_TO_CHECK}" ]; then
   echo "No source code to check for formatting."
   exit 0
 fi
 
-FORMAT_DIFF=$(git diff -U0 master -- ${FILES_TO_CHECK} | python ./tools/clang-format-diff.py -p1 -style=file)
+FORMAT_DIFF=$(git diff -U0 main -- ${FILES_TO_CHECK} | python ./tools/clang-format-diff.py -p1 -style=file)
 
 if [ -z "${FORMAT_DIFF}" ]; then
   echo "All source code in PR properly formatted."
diff --git a/tools/roll-all b/tools/roll-all
index 984c30249..58391b8cc 100755
--- a/tools/roll-all
+++ b/tools/roll-all
@@ -45,8 +45,7 @@ def roll_all_deps(deps_file_path):
 
   list_of_deps = ['roll-dep', '--ignore-dirty-tree']
   for directory in sorted(deps_file['deps']):
-    # cpplint uses gh-pages as the main branch, not master which doesn't work
-    # with roll-dep
+    # cpplint uses gh-pages as the main branch, which doesn't work with roll-dep
     if directory == "third_party/cpplint":
       continue