From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 490661382C5 for ; Tue, 3 Apr 2018 12:56:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3F33FE0AED; Tue, 3 Apr 2018 12:56:48 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id F07D4E0AE0 for ; Tue, 3 Apr 2018 12:56:47 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 16B62335CD4 for ; Tue, 3 Apr 2018 12:56:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 94668264 for ; Tue, 3 Apr 2018 12:56:44 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1522757735.f24b626027dceb5890b134837c6683f4593f6ce0.grobian@gentoo> Subject: [gentoo-commits] proj/portage-utils:master commit in: man/, man/include/ X-VCS-Repository: proj/portage-utils X-VCS-Files: man/include/qmerge.desc man/qmerge.1 X-VCS-Directories: man/ man/include/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: f24b626027dceb5890b134837c6683f4593f6ce0 X-VCS-Branch: master Date: Tue, 3 Apr 2018 12:56:44 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: a66ff80e-42ac-4030-b359-d848dc4ff35b X-Archives-Hash: 3e982d24b9d7407cd2a9cd381d40f02a commit: f24b626027dceb5890b134837c6683f4593f6ce0 Author: Fabian Groffen gentoo org> AuthorDate: Tue Apr 3 12:15:35 2018 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Tue Apr 3 12:15:35 2018 +0000 URL: https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=f24b6260 qmerge: improve documentation Bug: https://bugs.gentoo.org/645554 man/include/qmerge.desc | 6 ++++++ man/qmerge.1 | 43 +++++++++++++++++++++++++------------------ 2 files changed, 31 insertions(+), 18 deletions(-) diff --git a/man/include/qmerge.desc b/man/include/qmerge.desc new file mode 100644 index 0000000..08589ec --- /dev/null +++ b/man/include/qmerge.desc @@ -0,0 +1,6 @@ +\fIqmerge\fR retrieves and installs Gentoo binary packages. Simple +dependency checking is performed, after which \fIqmerge\fR just unpacks +the binpkg onto the filesystem and registers the package in the VDB. + +Retrieval of packages from a remote binhost is currently performed using +\fBwget\fR(1). More specifically, \fIFETCHCOMMAND\fR is ignored. diff --git a/man/qmerge.1 b/man/qmerge.1 index f3d80db..f66908e 100644 --- a/man/qmerge.1 +++ b/man/qmerge.1 @@ -1,65 +1,72 @@ -.TH qmerge "1" "Mar 2016" "Gentoo Foundation" "qmerge" +.\" generated by mkman.py, please do NOT edit! +.TH qmerge "1" "Apr 2018" "Gentoo Foundation" "qmerge" .SH NAME qmerge \- fetch and merge binary package .SH SYNOPSIS .B qmerge \fI[opts] \fR .SH DESCRIPTION +\fIqmerge\fR retrieves and installs Gentoo binary packages. Simple +dependency checking is performed, after which \fIqmerge\fR just unpacks +the binpkg onto the filesystem and registers the package in the VDB. +Retrieval of packages from a remote binhost is currently performed using +\fBwget\fR(1). More specifically, \fIFETCHCOMMAND\fR is ignored. .SH OPTIONS .TP \fB\-f\fR, \fB\-\-fetch\fR -Fetch package and newest Packages metadata +Fetch package and newest Packages metadata. .TP \fB\-F\fR, \fB\-\-force\fR -Fetch package (skipping Packages) +Fetch package (skipping Packages). .TP \fB\-s\fR, \fB\-\-search\fR -Search available packages +Search available packages. .TP \fB\-K\fR, \fB\-\-install\fR -Install package +Install package. .TP \fB\-U\fR, \fB\-\-unmerge\fR -Uninstall package +Uninstall package. .TP \fB\-p\fR, \fB\-\-pretend\fR -Pretend only +Pretend only. .TP \fB\-u\fR, \fB\-\-update\fR -Update only +Update only. .TP \fB\-y\fR, \fB\-\-yes\fR -Don't prompt before overwriting +Don't prompt before overwriting. .TP \fB\-O\fR, \fB\-\-nodeps\fR -Don't merge dependencies +Don't merge dependencies. .TP \fB\-\-debug\fR -Run shell funcs with `set -x` +Run shell funcs with `set -x`. .TP \fB\-\-root\fR \fI\fR -Set the ROOT env var +Set the ROOT env var. .TP \fB\-v\fR, \fB\-\-verbose\fR -Make a lot of noise +Make a lot of noise. .TP \fB\-q\fR, \fB\-\-quiet\fR -Tighter output; suppress warnings +Tighter output; suppress warnings. .TP \fB\-C\fR, \fB\-\-nocolor\fR -Don't output color +Don't output color. .TP \fB\-h\fR, \fB\-\-help\fR -Print this help and exit +Print this help and exit. .TP \fB\-V\fR, \fB\-\-version\fR -Print version and exit +Print version and exit. .SH "REPORTING BUGS" Please report bugs via http://bugs.gentoo.org/ .br -Product: Portage Development; Component: Tools +Product: Portage Development; Component: Tools, Assignee: +portage-utils@gentoo.org .SH AUTHORS .nf Ned Ludd