Date: Fri, 23 Jun 2023 14:59:28 +0200 From: Benedict Reuschling <bcr@freebsd.org> To: garyj@gmx.de, Cy Schubert <Cy.Schubert@cschubert.com> Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: [SPAM - SPF violation] Re: git: 764464af4968 - main - Fix spelling of "behavior" to be consistent with the rest of the file Message-ID: <803f2a91-95c3-459b-eb86-a3565c1975be@freebsd.org> In-Reply-To: <20230623135448.7d0d4304@ernst.home> References: <202306230549.35N5nKfP015128@gitrepo.freebsd.org> <20230623111633.0444B244@slippy.cwsent.com> <20230623112808.BCB16391@slippy.cwsent.com> <20230623135448.7d0d4304@ernst.home>
next in thread | previous in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format. --------------bYg6HsiSvcrONc0ZzBlvIVCZ Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Hi, OK, "fix" may sound not right, depending on which version you learned. "Use consistent spelling" may be a better phrase. In section 12.2 Guidelines of the FDP Primer: https://docs.freebsd.org/en/books/fdp-primer/writing-style/#writing-style-guidelines it states that: [...] "Use American English Spelling" We agreed to use American English because of the fact that FreeBSD originated in the US. This applies also to man pages and there are many commits by fellow (doc) committers that follow this. So the policy decision is already there, but may not have been stat Regards, Benedict On 23.06.23 13:54, Gary Jennejohn wrote: > On Fri, 23 Jun 2023 04:28:08 -0700 > Cy Schubert<Cy.Schubert@cschubert.com> wrote: > >> Basically, I'm asking for a policy decision. >> > This is the text which was present prior to this change: > > This behaviour matches GNU m4 1.4.9 and later. > regular expressions mimic Emacs behavior, > > So, what's right? Change behaviour to behavior to match the second entry? > Or change "Emacs behavior" to "Emacs behaviour" to match the first entry? > > Either solution could be contentious. > > So, perhaps a policy decision is needed. > >> In message<20230623111633.0444B244@slippy.cwsent.com>, Cy Schubert writes: >>> In message<202306230549.35N5nKfP015128@gitrepo.freebsd.org>, Benedict >>> Reuschli >>> ng writes: >>>> The branch main has been updated by bcr: >>>> >>>> URL:https://cgit.FreeBSD.org/src/commit/?id=764464af49688e74fd6d803df0404c >>> a4 >>>> 726dd460 >>>> >>>> commit 764464af49688e74fd6d803df0404ca4726dd460 >>>> Author: Benedict Reuschling<bcr@FreeBSD.org> >>>> AuthorDate: 2023-06-23 05:48:01 +0000 >>>> Commit: Benedict Reuschling<bcr@FreeBSD.org> >>>> CommitDate: 2023-06-23 05:48:01 +0000 >>>> >>>> Fix spelling of "behavior" to be consistent with the rest of the file >>> Fix? >>> >>>> --- >>>> usr.bin/m4/m4.1 | 2 +- >>>> 1 file changed, 1 insertion(+), 1 deletion(-) >>>> >>>> diff --git a/usr.bin/m4/m4.1 b/usr.bin/m4/m4.1 >>>> index a4a6e759a258..ffc60af22d30 100644 >>>> --- a/usr.bin/m4/m4.1 >>>> +++ b/usr.bin/m4/m4.1 >>>> @@ -155,7 +155,7 @@ flags are specified, execution will halt upon issuing t >>> he >>>> first warning and >>>> .Nm >>>> will exit with a non-zero exit status. >>>> -This behaviour matches GNU m4 1.4.9 and later. >>> UK and Canadian spelling. >>> >>>> +This behavior matches GNU m4 1.4.9 and later. >>> American spelling. >>> >>>> .It Fl G , Fl -traditional >>>> Disable GNU compatibility mode (see >>>> .Fl g >>>> >>> >>> -- >>> Cheers, >>> Cy Schubert<Cy.Schubert@cschubert.com> >>> FreeBSD UNIX:<cy@FreeBSD.org> Web:https://FreeBSD.org >>> NTP:<cy@nwtime.org> Web:https://nwtime.org >>> >>> e^(i*pi)+1=0 >>> >>> >> >> -- >> Cheers, >> Cy Schubert<Cy.Schubert@cschubert.com> >> FreeBSD UNIX:<cy@FreeBSD.org> Web:https://FreeBSD.org >> NTP:<cy@nwtime.org> Web:https://nwtime.org >> >> e^(i*pi)+1=0 >> >> >> > > -- > Gary Jennejohn > --------------bYg6HsiSvcrONc0ZzBlvIVCZ Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: 8bit <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> </head> <body> <p><font face="monospace">Hi,</font></p> <p><font face="monospace">OK, "fix" may sound not right, depending on which version you learned. "Use consistent spelling" may be a better phrase.<br> <br> In section 12.2 Guidelines of the FDP Primer:<br> <br> <a class="moz-txt-link-freetext" href="https://docs.freebsd.org/en/books/fdp-primer/writing-style/#writing-style-guidelines">https://docs.freebsd.org/en/books/fdp-primer/writing-style/#writing-style-guidelines</a></font></p>; <p><font face="monospace">it states that:<br> </font></p> <p><font face="monospace">[...]<br> "Use American English Spelling"<br> </font></p> <p><font face="monospace">We agreed to use American English because of the fact that FreeBSD originated in the US.</font></p> <p><font face="Helvetica, Arial, sans-serif"><font face="monospace">This applies also to man pages and there are many commits by fellow (doc) committers that follow this.<br> So the policy decision is already there, but may not have been stat<br> <br> Regards,<br> Benedict</font><br> </font></p> <div class="moz-cite-prefix">On 23.06.23 13:54, Gary Jennejohn wrote:<br> </div> <blockquote type="cite" cite="mid:20230623135448.7d0d4304@ernst.home"> <pre class="moz-quote-pre" wrap="">On Fri, 23 Jun 2023 04:28:08 -0700 Cy Schubert <a class="moz-txt-link-rfc2396E" href="mailto:Cy.Schubert@cschubert.com"><Cy.Schubert@cschubert.com></a> wrote: </pre> <blockquote type="cite"> <pre class="moz-quote-pre" wrap="">Basically, I'm asking for a policy decision. </pre> </blockquote> <pre class="moz-quote-pre" wrap=""> This is the text which was present prior to this change: This behaviour matches GNU m4 1.4.9 and later. regular expressions mimic Emacs behavior, So, what's right? Change behaviour to behavior to match the second entry? Or change "Emacs behavior" to "Emacs behaviour" to match the first entry? Either solution could be contentious. So, perhaps a policy decision is needed. </pre> <blockquote type="cite"> <pre class="moz-quote-pre" wrap="">In message <a class="moz-txt-link-rfc2396E" href="mailto:20230623111633.0444B244@slippy.cwsent.com"><20230623111633.0444B244@slippy.cwsent.com></a>, Cy Schubert writes: </pre> <blockquote type="cite"> <pre class="moz-quote-pre" wrap="">In message <a class="moz-txt-link-rfc2396E" href="mailto:202306230549.35N5nKfP015128@gitrepo.freebsd.org"><202306230549.35N5nKfP015128@gitrepo.freebsd.org></a>, Benedict Reuschli ng writes: </pre> <blockquote type="cite"> <pre class="moz-quote-pre" wrap="">The branch main has been updated by bcr: URL: <a class="moz-txt-link-freetext" href="https://cgit.FreeBSD.org/src/commit/?id=764464af49688e74fd6d803df0404c">https://cgit.FreeBSD.org/src/commit/?id=764464af49688e74fd6d803df0404c</a>; </pre> </blockquote> <pre class="moz-quote-pre" wrap="">a4 </pre> <blockquote type="cite"> <pre class="moz-quote-pre" wrap="">726dd460 commit 764464af49688e74fd6d803df0404ca4726dd460 Author: Benedict Reuschling <a class="moz-txt-link-rfc2396E" href="mailto:bcr@FreeBSD.org"><bcr@FreeBSD.org></a> AuthorDate: 2023-06-23 05:48:01 +0000 Commit: Benedict Reuschling <a class="moz-txt-link-rfc2396E" href="mailto:bcr@FreeBSD.org"><bcr@FreeBSD.org></a> CommitDate: 2023-06-23 05:48:01 +0000 Fix spelling of "behavior" to be consistent with the rest of the file </pre> </blockquote> <pre class="moz-quote-pre" wrap=""> Fix? </pre> <blockquote type="cite"> <pre class="moz-quote-pre" wrap="">--- usr.bin/m4/m4.1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.bin/m4/m4.1 b/usr.bin/m4/m4.1 index a4a6e759a258..ffc60af22d30 100644 --- a/usr.bin/m4/m4.1 +++ b/usr.bin/m4/m4.1 @@ -155,7 +155,7 @@ flags are specified, execution will halt upon issuing t </pre> </blockquote> <pre class="moz-quote-pre" wrap="">he </pre> <blockquote type="cite"> <pre class="moz-quote-pre" wrap=""> first warning and .Nm will exit with a non-zero exit status. -This behaviour matches GNU m4 1.4.9 and later. </pre> </blockquote> <pre class="moz-quote-pre" wrap=""> UK and Canadian spelling. </pre> <blockquote type="cite"> <pre class="moz-quote-pre" wrap="">+This behavior matches GNU m4 1.4.9 and later. </pre> </blockquote> <pre class="moz-quote-pre" wrap=""> American spelling. </pre> <blockquote type="cite"> <pre class="moz-quote-pre" wrap=""> .It Fl G , Fl -traditional Disable GNU compatibility mode (see .Fl g </pre> </blockquote> <pre class="moz-quote-pre" wrap=""> -- Cheers, Cy Schubert <a class="moz-txt-link-rfc2396E" href="mailto:Cy.Schubert@cschubert.com"><Cy.Schubert@cschubert.com></a> FreeBSD UNIX: <a class="moz-txt-link-rfc2396E" href="mailto:cy@FreeBSD.org"><cy@FreeBSD.org></a> Web: <a class="moz-txt-link-freetext" href="https://FreeBSD.org">https://FreeBSD.org</a>; NTP: <a class="moz-txt-link-rfc2396E" href="mailto:cy@nwtime.org"><cy@nwtime.org></a> Web: <a class="moz-txt-link-freetext" href="https://nwtime.org">https://nwtime.org</a>; e^(i*pi)+1=0 </pre> </blockquote> <pre class="moz-quote-pre" wrap=""> -- Cheers, Cy Schubert <a class="moz-txt-link-rfc2396E" href="mailto:Cy.Schubert@cschubert.com"><Cy.Schubert@cschubert.com></a> FreeBSD UNIX: <a class="moz-txt-link-rfc2396E" href="mailto:cy@FreeBSD.org"><cy@FreeBSD.org></a> Web: <a class="moz-txt-link-freetext" href="https://FreeBSD.org">https://FreeBSD.org</a>; NTP: <a class="moz-txt-link-rfc2396E" href="mailto:cy@nwtime.org"><cy@nwtime.org></a> Web: <a class="moz-txt-link-freetext" href="https://nwtime.org">https://nwtime.org</a>; e^(i*pi)+1=0 </pre> </blockquote> <pre class="moz-quote-pre" wrap=""> -- Gary Jennejohn </pre> </blockquote> </body> </html> --------------bYg6HsiSvcrONc0ZzBlvIVCZ--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?803f2a91-95c3-459b-eb86-a3565c1975be>