From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-il1-x136.google.com (mail-il1-x136.google.com [IPv6:2607:f8b0:4864:20::136]) by sourceware.org (Postfix) with ESMTPS id 6807A3858002 for ; Tue, 22 Mar 2022 19:54:27 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 6807A3858002 Received: by mail-il1-x136.google.com with SMTP id r11so13174773ila.1 for ; Tue, 22 Mar 2022 12:54:27 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to; bh=1xsyGSIKVyXf/C4QTYlhplUCV7BnRHep4RrQl1tgTbQ=; b=SNKwIvG6SzDpjPkb0NYTv+xpml7XgWiWKeDTULmmzT36nmL0vZ22OeFA+s2VsWNvmq Y9Kzw7etVlXLi6iPFyuhgzbKPvydNnc9rNuzD/581SWr5vf8dcuuLpgMablKTCjHSxEd vRZAuoNFO5+uPEKwCqn6PlfaIhaTe2/gidwLCYo6WA8OpP61SE8+HtTGb4v8lP4gbndN s4lGMYvB48Bf1jHL4HRO8EfxNgvSz4qphgYhI6QJC5r27Jgfp53/SLFcrWCkCakqVxFx psO65Km5kPfzgcUsRQn3tfs/MMfEd+818pC62ehK6VqKDXVTW/Vqsvs50OngW5y8vKW0 3czA== X-Gm-Message-State: AOAM533EZj2MBLv27tJPamI5YsehPYrQuyQLchwH1vanXWWaVCucyuO2 ngW+s3jS35xUI9bR0IY4Ncj5ttPaaoTrTthnNuiVYGPqrCI= X-Google-Smtp-Source: ABdhPJzxhh5qrKRlhtRRsxmLmpLAKIBNZwY5wTrELJlDZ87pS/XSrpNiyI/afkfKokEZ7XpS/QWtxMOLchKZpLJoELU= X-Received: by 2002:a05:6e02:1949:b0:2c2:5b61:80cd with SMTP id x9-20020a056e02194900b002c25b6180cdmr13869662ilu.152.1647978866471; Tue, 22 Mar 2022 12:54:26 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Pokechu22 Date: Tue, 22 Mar 2022 12:54:00 -0700 Message-ID: Subject: [wwwdocs] [PATCH 2/4] codingconventions: Fix various typos To: gcc-patches@gcc.gnu.org Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-8.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Mar 2022 19:54:28 -0000 --- htdocs/codingconventions.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/codingconventions.html b/htdocs/codingconventions.html index e4d30510..86b63b89 100644 --- a/htdocs/codingconventions.html +++ b/htdocs/codingconventions.html @@ -141,7 +141,7 @@ a large batch of changes.

supported formats: a/b/c/ChangeLog, a/b/c/ChangeLog:, a/b/c/ (where ChangeLog file lives in the folder), \ta/b/c/ and a/b/c
  • pr_entry - bug report reference
    example: \tPR component/12345
  • -
  • changelog_file - a modified file mentined in a ChangeLog: +
  • changelog_file - a modified file mentioned in a ChangeLog: supported formats: \t* a/b/c/file.c:, \t* a/b/c/file.c (function):, \t* a/b/c/file1.c, a/b/c/file2.c:
  • changelog_file_comment - line that follows a changelog_file with description of changes in the file; must start with \t
  • @@ -153,7 +153,7 @@ a large batch of changes.

    Format rules

      -
    • git_description - optional; ends right before one of the other compoments is found
    • +
    • git_description - optional; ends right before one of the other components is found
    • committer_timestamp - optional; when found before a changelog_file, then it is added to each changelog entry
    • additional_author - optional
    • @@ -1022,7 +1022,7 @@ intended to last a long time.

      Complex hierarchies are to be avoided. Take special care with multiple inheritance. -On the rare occasion that using mulitple inheritance is indeed useful, +On the rare occasion that using multiple inheritance is indeed useful, prepare design rationales in advance, and take special care to make documentation of the entire hierarchy clear. (In particular, multiple inheritance can be an acceptable way of combining -- 2.25.1