From owner-dev-commits-doc-all@freebsd.org Wed Sep 29 15:44:03 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id BF1DC67662F for ; Wed, 29 Sep 2021 15:44:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4HKLJg54XWz4Qlc; Wed, 29 Sep 2021 15:44:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8E6821AF9B; Wed, 29 Sep 2021 15:44:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 18TFi3uA061993; Wed, 29 Sep 2021 15:44:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 18TFi3To061992; Wed, 29 Sep 2021 15:44:03 GMT (envelope-from git) Date: Wed, 29 Sep 2021 15:44:03 GMT Message-Id: <202109291544.18TFi3To061992@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Mitchell Horne Subject: git: c85cbe1b3f - main - freebsd-src-lsp: fix bear '--append' flag MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c85cbe1b3ff3e1a851fc8554bed888405a03495a Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 29 Sep 2021 15:44:03 -0000 The branch main has been updated by mhorne (src committer): URL: https://cgit.FreeBSD.org/doc/commit/?id=c85cbe1b3ff3e1a851fc8554bed888405a03495a commit c85cbe1b3ff3e1a851fc8554bed888405a03495a Author: Mitchell Horne AuthorDate: 2021-09-28 21:25:25 +0000 Commit: Mitchell Horne CommitDate: 2021-09-29 15:43:29 +0000 freebsd-src-lsp: fix bear '--append' flag The bear utility does not have a -a flag, but rather --append. Reviewed by: debdrup, ygy, khng Approved by: debdrup (docs) Differential Revision: https://reviews.freebsd.org/D32213 --- documentation/content/en/articles/freebsd-src-lsp/_index.adoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/documentation/content/en/articles/freebsd-src-lsp/_index.adoc b/documentation/content/en/articles/freebsd-src-lsp/_index.adoc index 915c06d0e8..ef2127f5f9 100644 --- a/documentation/content/en/articles/freebsd-src-lsp/_index.adoc +++ b/documentation/content/en/articles/freebsd-src-lsp/_index.adoc @@ -234,10 +234,10 @@ In the top-level directory of the FreeBSD src tree, to generate compilation data [source,shell] .... -# bear -a make buildworld buildkernel -j`sysctl -n hw.ncpu` +# bear --append make buildworld buildkernel -j`sysctl -n hw.ncpu` .... -The `-a` flag tells `bear` to read an existing compilation database if it is present, and append the results to the database. +The `--append` flag tells `bear` to read an existing compilation database if it is present, and append the results to the database. Entries with duplicated command key are merged. The generated compilation database by default is saved in the current working directory as [.filename]#compiler_commands.json#.