[PATCH v3 5/9] doc: src: Replace Master with Main.

[Arowa Suliman]

Hey Daniel, thanks for the review. I really appreciate it.

On Thu, Jul 8, 2021 at 5:58 PM Daniel Golle <daniel at makrotopia.org> wrote:
>
> Hi Arowa,
>
> On Thu, Jul 08, 2021 at 11:23:56AM -0700, Arowa Suliman wrote:
> > Replaced the words Master with the inclusive word Main.
> >
> > Signed-off-by: Arowa Suliman <arowa at 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(-)
> >
> > diff --git a/doc/doxygen.conf b/doc/doxygen.conf
> > index 3f0117393..b283b74ba 100644
> > --- a/doc/doxygen.conf
> > +++ b/doc/doxygen.conf
> > @@ -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
> >
> > diff --git a/src/drivers/driver_hostap.h b/src/drivers/driver_hostap.h
> > index 4c1e6d69f..ab3d92ca5 100644
> > --- a/src/drivers/driver_hostap.h
> > +++ b/src/drivers/driver_hostap.h
> > @@ -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,
>
> I'm not sure this is an appropriate replacement.
> See https://en.wikipedia.org/wiki/Bus_mastering
> Imho "Bus owner" would be a good replacement for "Bus master".
I agree with you, "Bus Owner" is more suitable here.

>
> >       PRISM2_PARAM_HOST_ROAMING = 21,
> >       PRISM2_PARAM_BCRX_STA_KEY = 22,
> >       PRISM2_PARAM_IEEE_802_1X = 23,
> > diff --git a/src/p2p/p2p.h b/src/p2p/p2p.h
> > index f606fbb14..af13b28bd 100644
> > --- a/src/p2p/p2p.h
> > +++ b/src/p2p/p2p.h
> > @@ -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).
>
> In this case I guess the writer was refering to "access point mode"
> which used to be called "master mode" long time ago.
> Translating that as "main" would leave me with a question mark.
With regard to "master responsibilities", I can change it to "leader
responsibilities". WDYT?

>
> >        */
> >       struct p2p_channels cli_channels;
> >
> > diff --git a/src/utils/pcsc_funcs.c b/src/utils/pcsc_funcs.c
> > index 383ed3ddf..ba3924d06 100644
> > --- a/src/utils/pcsc_funcs.c
> > +++ b/src/utils/pcsc_funcs.c
> > @@ -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
> > --
> > 2.32.0.93.g670b81a890-goog
> >
> >
> > _______________________________________________
> > Hostap mailing list
> > Hostap at lists.infradead.org
> > http://lists.infradead.org/mailman/listinfo/hostap