From: Archie Pusaka <apusaka@xxxxxxxxxxxx> Hi BlueZ maintainers, This series of patches promotes the usage of the more inclusive terms such as central/peripheral, accept list/reject list, or their equivalent where appropriate. This is also reflected on the changes to Core spec v5.3 and the appropriate language mapping table by Bluetooth SIG https://specificationrefs.bluetooth.com/language-mapping/Appropriate_Language_Mapping_Table.pdf As you suggested, I dropped the Android changes and merge patches which belong to the same directory into one patch. Note that the following terms are not replaced: (1) those involving storage format (i.e. storing LTK) (2) those which belong to the libbluetooth API Thanks, Archie Changes in v4: * Fix line over 80 columns Changes in v3: * Not replacing some terms which belong to libluetooth API Changes in v2: * Merging several patches from the same directory into one Archie Pusaka (12): lib: Inclusive language changes btio: Inclusive language changes monitor: Inclusive language changes emulator: Inclusive language changes tools: Inclusive language changes plugins/sixaxis: Inclusive language changes profiles: Inclusive language changes src: Inclusive language changes client: Inclusive language changes mesh: Inclusive language changes unit/mesh: Inclusive language changes doc: Inclusive language update android/a2dp.c | 2 +- android/bluetooth.c | 4 +- android/handsfree-client.c | 2 +- android/tester-main.c | 2 +- btio/btio.c | 42 ++-- btio/btio.h | 2 +- client/main.c | 6 +- doc/mesh-api.txt | 2 +- doc/mgmt-api.txt | 6 +- emulator/btdev.c | 204 +++++++++--------- emulator/hciemu.c | 21 +- emulator/hciemu.h | 12 +- emulator/le.c | 116 +++++------ emulator/serial.c | 6 +- emulator/smp.c | 8 +- lib/hci.c | 22 +- lib/mgmt.h | 2 +- mesh/net-keys.c | 38 ++-- mesh/net-keys.h | 8 +- mesh/net.h | 4 +- monitor/broadcom.c | 8 +- monitor/bt.h | 150 +++++++------- monitor/control.c | 14 +- monitor/l2cap.c | 10 +- monitor/ll.c | 60 +++--- monitor/lmp.c | 2 +- monitor/packet.c | 411 +++++++++++++++++++------------------ plugins/sixaxis.c | 44 ++-- profiles/audio/a2dp.c | 2 +- profiles/audio/avctp.c | 10 +- profiles/audio/avctp.h | 2 +- profiles/health/mcap.c | 20 +- profiles/health/mcap.h | 2 +- profiles/sap/server.c | 2 +- src/adapter.c | 113 +++++----- src/adapter.h | 4 +- src/device.c | 6 +- src/sdpd-server.c | 8 +- src/sdpd.h | 2 +- src/shared/ad.c | 8 +- src/shared/ad.h | 2 +- src/shared/hfp.c | 4 +- src/shared/hfp.h | 2 +- tools/3dsp.c | 62 +++--- tools/bdaddr.rst | 2 +- tools/btiotest.c | 22 +- tools/btpclientctl.c | 2 +- tools/hci-tester.c | 16 +- tools/hciconfig.c | 148 ++++++++----- tools/hciconfig.rst | 24 +-- tools/hcitool.c | 102 ++++----- tools/hcitool.rst | 30 +-- tools/l2cap-tester.c | 36 ++-- tools/l2test.c | 18 +- tools/mesh-cfgclient.c | 4 +- tools/mesh-gatt/mesh-net.h | 4 +- tools/mesh-gatt/net.c | 60 +++--- tools/mesh/mesh-db.c | 28 ++- tools/mesh/mesh-db.h | 4 +- tools/mesh/remote.c | 53 +++-- tools/mesh/remote.h | 5 +- tools/meshctl.c | 6 +- tools/mgmt-tester.c | 138 +++++++------ tools/oobtest.c | 12 +- tools/parser/avdtp.c | 11 +- tools/parser/csr.c | 17 +- tools/parser/ericsson.c | 2 +- tools/parser/hci.c | 38 ++-- tools/parser/lmp.c | 112 +++++----- tools/parser/parser.h | 2 +- tools/parser/smp.c | 12 +- tools/rctest.c | 19 +- tools/rctest.rst | 4 +- tools/rfcomm-tester.c | 14 +- tools/rfcomm.c | 15 +- tools/rfcomm.rst | 2 +- tools/sco-tester.c | 10 +- tools/smp-tester.c | 16 +- unit/test-mesh-crypto.c | 4 +- 79 files changed, 1256 insertions(+), 1193 deletions(-) -- 2.33.0.153.gba50c8fa24-goog