@@ -883,7 +883,7 @@ HHC_LOCATION =
# If the GENERATE_HTMLHELP tag is set to YES, 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).
+# it should be included in the main .chm file (NO).
GENERATE_CHI = NO
@@ -55,8 +55,8 @@ enum {
PRISM2_PARAM_MONITOR_ALLOW_FCSERR = 16,
PRISM2_PARAM_HOST_ENCRYPT = 17,
PRISM2_PARAM_HOST_DECRYPT = 18,
- PRISM2_PARAM_BUS_MASTER_THRESHOLD_RX = 19,
- PRISM2_PARAM_BUS_MASTER_THRESHOLD_TX = 20,
+ PRISM2_PARAM_BUS_MAIN_THRESHOLD_RX = 19,
+ PRISM2_PARAM_BUS_MAIN_THRESHOLD_TX = 20,
PRISM2_PARAM_HOST_ROAMING = 21,
PRISM2_PARAM_BCRX_STA_KEY = 22,
PRISM2_PARAM_IEEE_802_1X = 23,
@@ -486,7 +486,7 @@ struct p2p_config {
* case for this is to include passive-scan channels on devices that may
* not know their current location and have configured most channels to
* not allow initiation of radition (i.e., another device needs to take
- * master responsibilities).
+ * main responsibilities).
*/
struct p2p_channels cli_channels;
@@ -90,9 +90,9 @@
/* GSM files
* File type in first octet:
- * 3F = Master File
+ * 3F = Main File
* 7F = Dedicated File
- * 2F = Elementary File under the Master File
+ * 2F = Elementary File under the Main File
* 6F = Elementary File under a Dedicated File
*/
#define SCARD_FILE_MF 0x3F00
Replaced the words Master with the inclusive word Main. Signed-off-by: Arowa Suliman <arowa@chromium.org> --- doc/doxygen.conf | 2 +- src/drivers/driver_hostap.h | 4 ++-- src/p2p/p2p.h | 2 +- src/utils/pcsc_funcs.c | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-)