Received: by 2002:a05:6a10:1d13:0:0:0:0 with SMTP id pp19csp272185pxb; Thu, 2 Sep 2021 03:58:12 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz8EjZ8s8+3h7vpidzJNMKW5BTE2qCVfbYyEjRsvJlJ3Zy16iBXsmORsqSRkiOfVbsHNWwe X-Received: by 2002:a05:6402:10cc:: with SMTP id p12mr2943340edu.328.1630580292780; Thu, 02 Sep 2021 03:58:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1630580292; cv=none; d=google.com; s=arc-20160816; b=mIGv7ysI4EhtReCzZAukodN0B3z0ZkGjNp06sFRZfyRwxyClGVbrYBDJCD7S76/dko 9FQ9hJkkCwWSQCDwAADQ7hTa34C0q4xorzFhiUh6ZH0FSMqcZ7VP1f18wsrcCgoa8wuK j+hOLmaQwzSYCg+6lSE5A/geWvWU+SpPYgSS4ku69uJGqTDr3KJPOJKCfDBCk0DJpk+v syqAT44fBY1cjuWBQhBLcf4OyavPFMVFd5m7Di4HQru+F5O6rlZHJaprm60er/3hx0fK +z2Fm5shEFKrdGMTBlpHL5zgi90nSdk6WsVd9dUAXPdTHCkIX0TQ6HqennJxN+ldFM8v IY+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:from:subject:references:mime-version :message-id:in-reply-to:date:dkim-signature; bh=RieolaYymu0TqLrGWt8ZqwktYw8m2WgVp44tZhA2mJ0=; b=fvYcnH5iCYgPSfggGg7MNMqPJskFkBxyzkxkNSSBo15I3jmD1+RDE3dWXz1XPHjcoT SKIxEQBiu31P/UU3gJglribIYSyUXO50kAl0qW1qz0WmSWn3xq/6R44OJz5AyX7KYL8Y hw/oDz2l6LM/Kc5Pro6md5t5FNeo9AxlLTJbC0CtpobXtKYsqqxH9F0dGcX/s3TXr+NA q07gMP2kEtCwkZroj55orJys8Xiurcz60sjUD4Hw9Ol11BaCoQWwimEb7wxgD08yq8aO +4WIdhdLLgghMFkRICwKY4njm/9ZTp0apYxHPsclnQIAx3CLPjbQpHCKj618b84I/4Yd Tnpw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=Vnrdskhl; spf=pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-bluetooth-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id b5si1586329edv.330.2021.09.02.03.57.49; Thu, 02 Sep 2021 03:58:12 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=Vnrdskhl; spf=pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-bluetooth-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244893AbhIBKwZ (ORCPT + 99 others); Thu, 2 Sep 2021 06:52:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54524 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343591AbhIBKwH (ORCPT ); Thu, 2 Sep 2021 06:52:07 -0400 Received: from mail-qt1-x849.google.com (mail-qt1-x849.google.com [IPv6:2607:f8b0:4864:20::849]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 48879C0612E7 for ; Thu, 2 Sep 2021 03:50:38 -0700 (PDT) Received: by mail-qt1-x849.google.com with SMTP id r5-20020ac85e85000000b0029bd6ee5179so978749qtx.18 for ; Thu, 02 Sep 2021 03:50:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=RieolaYymu0TqLrGWt8ZqwktYw8m2WgVp44tZhA2mJ0=; b=VnrdskhlKE+GpEPuliFGQtuQik4sBStOLJVSkc4l8kL1icxpKpEvgupJd0eGUUVpR6 EqF8HgrjObuZVZugr9uXG845mBcQ8HcyvpfenHl1Pa5zcGSBV7dl3jAgO3dAzjdvf+uk KxPXMl1OvpYYHP+5u8vc3wVHUnZQzZrk1PGEiDRe10JAbzQfYyj87BYSd/p085VL/aDT xtaP2SyHEwmM0PsCL4Op3OWo/UxKc0cu+C5+h0GvjjlG/PE0G5I9FTUAuGKmtUjCOsq8 VeEOI+DHaf4Eo0nfB9EoEEkHiG5gOHfE0+QfadbYbgmi79rJHfynjMrOPd6ynscqo7Bp rpoQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=RieolaYymu0TqLrGWt8ZqwktYw8m2WgVp44tZhA2mJ0=; b=ZQHwjVW6SS3mMsOr3m2+MQ2lA8dhzs2jMpibmMHgerjghJLhOqqabIAdPEosPfW2ZV /NwVeGlgoY/v9Hfm9uE3WLbLsy9rVewwU+/2fX8zgngcMfNCK2sk2L6grftB/38eW0bN 4vfXTKncOZYEvKFCoybe4eXKA7Dqno/DUk6KB+mNPxebOk2NmomHmj+aRY4y0Ispqnx7 EL/VVwJ6GVktWpFxWuS0PGVJ1gXWU8DLd13RpXYSCbzxVhmPEFB2DqybW3tFZa2TiKFk qb3yqCtrE9z2PIOM7KHKHr4/fvhWjDcRhNkpxtCmGYE944gi4x0BsoOfAx1HjWsP7dSt QWdA== X-Gm-Message-State: AOAM5322B6BJ1XNqCn9/yClOMX6ItDoLd6gMfmiTTZIfxalvgNGEeLp5 NEqSk9/bIdMqQfOE3uKtSx+J9D/lA5kXK6UZwa7kzSCqNZBiOJLpYZ2uANKCOlGZe+7L6YB66oE ZFxe3d3gtSDAedJBi2svv+XQ1W3hw0zQXUWKDbAf4iqEW3P1PZoSftiWqZkcIKvg9TdZCZIBPHt Iz X-Received: from apusaka-p920.tpe.corp.google.com ([2401:fa00:1:10:5249:e81c:3ce6:f50c]) (user=apusaka job=sendgmr) by 2002:a05:6214:2385:: with SMTP id fw5mr2288880qvb.56.1630579837450; Thu, 02 Sep 2021 03:50:37 -0700 (PDT) Date: Thu, 2 Sep 2021 18:49:38 +0800 In-Reply-To: <20210902104938.824737-1-apusaka@google.com> Message-Id: <20210902184744.Bluez.v3.12.I4df08516dd5129d4e9d2cf963121074f500201d9@changeid> Mime-Version: 1.0 References: <20210902104938.824737-1-apusaka@google.com> X-Mailer: git-send-email 2.33.0.259.gc128427fd7-goog Subject: [Bluez PATCH v3 12/12] doc: Inclusive language update From: Archie Pusaka To: linux-bluetooth , Luiz Augusto von Dentz Cc: CrosBT Upstreaming , Archie Pusaka Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org From: Archie Pusaka Update the docs to reflect the changes for the other inclusive language updates. --- (no changes since v2) Changes in v2: * Merging several patches from the same directory into one doc/mesh-api.txt | 2 +- doc/mgmt-api.txt | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/mesh-api.txt b/doc/mesh-api.txt index f2c6b9e5c2..ce651c8017 100644 --- a/doc/mesh-api.txt +++ b/doc/mesh-api.txt @@ -585,7 +585,7 @@ Methods: org.bluez.mesh.Error.InvalidArguments void SetKeyPhase(uint16 net_index, uint8 phase) - This method is used to set the master key update phase of the + This method is used to set the flooding key update phase of the given subnet. When finalizing the procedure, it is important to CompleteAppKeyUpdate() on all app keys that have been updated during the procedure prior to setting phase 3. diff --git a/doc/mgmt-api.txt b/doc/mgmt-api.txt index 5355fedb00..97d33e30a1 100644 --- a/doc/mgmt-api.txt +++ b/doc/mgmt-api.txt @@ -855,7 +855,7 @@ Load Long Term Keys Command Address (6 Octets) Address_Type (1 Octet) Key_Type (1 Octet) - Master (1 Octet) + Central (1 Octet) Encryption_Size (1 Octet) Encryption_Diversifier (2 Octets) Random_Number (8 Octets) @@ -4019,7 +4019,7 @@ New Long Term Key Event Address (6 Octets) Address_Type (1 Octet) Key_Type (1 Octet) - Master (1 Octet) + Central (1 Octet) Encryption Size (1 Octet) Enc. Diversifier (2 Octets) Random Number (8 Octets) @@ -4459,7 +4459,7 @@ New Signature Resolving Key Event } This event indicates that a new signature resolving key has been - generated for either the master or slave device. + generated for either the central or peripheral device. The Store_Hint parameter indicates whether the host is expected to store the key persistently or not. -- 2.33.0.259.gc128427fd7-goog