From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 6285A1391DB for ; Thu, 20 Mar 2014 18:33:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C248CE0B3B; Thu, 20 Mar 2014 18:33:34 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2C4B1E0B3B for ; Thu, 20 Mar 2014 18:33:34 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 330CF33FC9C for ; Thu, 20 Mar 2014 18:33:33 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 0034018875 for ; Thu, 20 Mar 2014 18:33:31 +0000 (UTC) From: "Ulrich Müller" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" Message-ID: <1395340525.66c4b410b6a45c1c3fd4d2acc9edf77b339143ce.ulm@gentoo> Subject: [gentoo-commits] proj/eselect:master commit in: /, doc/ X-VCS-Repository: proj/eselect X-VCS-Files: ChangeLog doc/developer-guide.txt doc/user-guide.txt X-VCS-Directories: / doc/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: 66c4b410b6a45c1c3fd4d2acc9edf77b339143ce X-VCS-Branch: master Date: Thu, 20 Mar 2014 18:33:31 +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: 94f32029-d42f-46b2-8a4a-169dc79fde41 X-Archives-Hash: ca6884f91050174299d9ce448e685c86 commit: 66c4b410b6a45c1c3fd4d2acc9edf77b339143ce Author: Ulrich Müller gentoo org> AuthorDate: Thu Mar 20 18:35:25 2014 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Thu Mar 20 18:35:25 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/eselect.git;a=commit;h=66c4b410 Update list of standard actions in documentation. * doc/user-guide.txt: Mention the "unset" action also here. * doc/developer-guide.txt: Reorder the standard action names to be congruent with the user guide. --- ChangeLog | 4 ++++ doc/developer-guide.txt | 16 ++++++++-------- doc/user-guide.txt | 8 +++++--- 3 files changed, 17 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1f666ec..94f37dc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,11 @@ 2014-03-20 Ulrich Müller + * doc/user-guide.txt: Mention the "unset" action also here. + * doc/developer-guide.txt: Remove duplicate heading, because rst2html --report=info complains about it. + Reorder the standard action names to be congruent with the + user guide. * Makefile.am (%.html): Strip comments from html output, in order to suppress wrong mode information in Emacs local variables. diff --git a/doc/developer-guide.txt b/doc/developer-guide.txt index 03b6846..2191ad5 100644 --- a/doc/developer-guide.txt +++ b/doc/developer-guide.txt @@ -178,27 +178,27 @@ usage Display a usage message. Automatic. version Display the current version. Automatic. -show - Used to display the current provider of a symlink, or the currently - installed module, or the current status. list Used to display all available providers of a symlink, or all available modules. +show + Used to display the current provider of a symlink, or the currently + installed module, or the current status. set Used to set a new provider or a symlink. unset Used to unset the current provider, or to remove a symlink. +update + Used to automatically select a new provider for a symlink (as + opposed to ``set``, which generally takes a parameter manually + selecting the provider) or to gather system information that is + vital to further actions. enable Used to enable an optional feature. disable Used to disable an optional feature. scan Read information off the current filesystem. -update - Used to automatically select a new provider for a symlink (as - opposed to ``set``, which generally takes a parameter manually - selecting the provider) or to gather system information that is - vital to further actions. .. Note:: You can override the ``help``, ``usage`` and ``version`` actions. They are provided by default by ``lib/default.eselect``. diff --git a/doc/user-guide.txt b/doc/user-guide.txt index 0afb954..7784d20 100644 --- a/doc/user-guide.txt +++ b/doc/user-guide.txt @@ -111,13 +111,15 @@ show Print the currently active configuration(s). set Select one of the options offered by ``list``. +unset + Deselect the currently active option. +update + Like ``set``, but automatically selects an option rather than taking + a parameter. enable Enable one of the module specific features. disable Disable one of the module specific features. -update - Like ``set``, but automatically selects an option rather than taking - a parameter. scan Gather information about the system and store it for future usage by the module.