From owner-dev-commits-src-all@freebsd.org Mon Jun 14 10:31:34 2021 Return-Path: Delivered-To: dev-commits-src-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 19A0C6467A5; Mon, 14 Jun 2021 10:31:34 +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 4G3SRV0H1pz4hHV; Mon, 14 Jun 2021 10:31:34 +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 E616712D5C; Mon, 14 Jun 2021 10:31:33 +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 15EAVXHL072451; Mon, 14 Jun 2021 10:31:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 15EAVXjF072450; Mon, 14 Jun 2021 10:31:33 GMT (envelope-from git) Date: Mon, 14 Jun 2021 10:31:33 GMT Message-Id: <202106141031.15EAVXjF072450@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ceri Davies Subject: git: abb0d7d36693 - main - make.conf: DOC_LANG and PRINTERDEVICE clarifications in man and example MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ceri X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: abb0d7d36693d32631a4631631369e30387c3227 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Jun 2021 10:31:34 -0000 The branch main has been updated by ceri (doc committer): URL: https://cgit.FreeBSD.org/src/commit/?id=abb0d7d36693d32631a4631631369e30387c3227 commit abb0d7d36693d32631a4631631369e30387c3227 Author: Ceri Davies AuthorDate: 2021-06-14 08:53:34 +0000 Commit: Ceri Davies CommitDate: 2021-06-14 08:53:34 +0000 make.conf: DOC_LANG and PRINTERDEVICE clarifications in man and example --- share/examples/etc/make.conf | 8 ++++---- share/man/man5/make.conf.5 | 18 +++++++----------- 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/share/examples/etc/make.conf b/share/examples/etc/make.conf index bd8ca5d2cb4c..c40a35c0f868 100644 --- a/share/examples/etc/make.conf +++ b/share/examples/etc/make.conf @@ -143,8 +143,8 @@ #WITHOUT_MANCOMPRESS=t # # -# Default format for system documentation, depends on your printer. -# Set this to "ascii" for simple printers or screen. +# Default format for system documentation in share/doc, depends on +# your printer. Set this to "ascii" for simple printers or screen. # #PRINTERDEVICE= ps # @@ -196,9 +196,9 @@ # # Documentation # -# The list of languages and encodings to build and install. +# The list of languages to build and install. # -#DOC_LANG= en_US.ISO8859-1 ru_RU.KOI8-R +#DOC_LANG= en ru # # # sendmail diff --git a/share/man/man5/make.conf.5 b/share/man/man5/make.conf.5 index b8bb71ddc165..5885d9476d71 100644 --- a/share/man/man5/make.conf.5 +++ b/share/man/man5/make.conf.5 @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd June 11, 2021 +.Dd June 14, 2021 .Dt MAKE.CONF 5 .Os .Sh NAME @@ -613,20 +613,16 @@ The value assigned is the highest optimization value used. The following list provides a name and short description for variables that are used when building documentation. .Bl -tag -width ".Va PRINTERDEVICE" -.It Va DISTDIR -.Pq Vt str -Where distfiles are kept. -Normally, this is -.Pa distfiles -in -.Va PORTSDIR . .It Va DOC_LANG .Pq Vt str -The list of languages and encodings to build and install. +The list of languages to build and install when building documentation +in +.Pa /usr/doc . .It Va PRINTERDEVICE .Pq Vt str -The default format for system documentation, depends on your -printer. +The default format for system documentation in +.Pa /usr/src/share/doc , +depends on your printer. This can be set to .Dq Li ascii for simple printers, or