Просмотр исходного кода

dselect: Say command instead of action

Guillem Jover лет назад: 11
Родитель
Сommit
f602b6017b
3 измененных файлов с 12 добавлено и 11 удалено
  1. 1 0
      debian/changelog
  2. 2 2
      dselect/main.cc
  3. 9 9
      man/dselect.1

+ 1 - 0
debian/changelog

@@ -93,6 +93,7 @@ dpkg (1.18.0) UNRELEASED; urgency=low
     - Add missing preposition in Dpkg::Source::Patch error message.
     - Improve available state sorting order strings in dselect panel.
     - Say “changelog-file” instead of “changelogfile” in --help output.
+    - Say “command“ instead of “action“ for dselect.
   * Change dpkg-maintscript-helper to handle symlinks and pathnames ending in
     slash. For the former error out, for the latter strip it. Closes: #771752
   * Support moving a conffile not being shipped anymore. Closes: #767003

+ 2 - 2
dselect/main.cc

@@ -177,7 +177,7 @@ usage(const struct cmdinfo *ci, const char *value)
   int i;
 
   printf(_(
-"Usage: %s [<option> ...] [<action> ...]\n"
+"Usage: %s [<option>...] [<command>...]\n"
 "\n"), DSELECT);
 
   printf(_(
@@ -194,7 +194,7 @@ usage(const struct cmdinfo *ci, const char *value)
 "  --version                  Show the version.\n"
 "\n"));
 
-  printf(_("Actions:\n"));
+  printf(_("Commands:\n"));
   for (i = 0; menuentries[i].command; i++)
     printf("  %s", menuentries[i].command);
   fputs("\n\n", stdout);

+ 9 - 9
man/dselect.1

@@ -25,7 +25,7 @@ dselect \- Debian package management frontend
 .
 .SH SYNOPSIS
 .B dselect
-.RI [ option "...] [" action ]
+.RI [ option "...] [" command "...]"
 .
 .SH DESCRIPTION
 .B dselect
@@ -49,8 +49,8 @@ The recommended access method is \fIapt\fP, which is provided by the
 package \fBapt\fP.
 .PP
 Normally \fBdselect\fP is invoked without parameters. An interactive
-menu is presented, offering the user a list of actions. If an action
-is given as argument, then that action is started immediately. Several
+menu is presented, offering the user a list of commands. If a command
+is given as argument, then that command is started immediately. Several
 command line parameters are still available to modify the running behaviour
 of \fBdselect\fP or show additional information about the program.
 .
@@ -138,12 +138,12 @@ Print a brief help text and exit successfully.
 .B \-\-version
 Print version information and exit successfully.
 .
-.SH ACTIONS
+.SH COMMANDS
 When
 .B dselect
-is started it can perform the following actions, either directly if it
+is started it can perform the following commands, either directly if it
 was specified on the command line or by prompting the user with a menu
-of available actions if running interactively:
+of available commands if running interactively:
 .SS access
 Choose and configure an access method to access package repositories.
 .sp
@@ -165,7 +165,7 @@ repository as files named \fIPackages\fP or \fIPackages.gz\fP.
 These files can be generated by repository maintainers, using the
 program \fBdpkg\-scanpackages\fP(1).
 .sp
-Details of the update action depend on the access method's implementation.
+Details of the update command depend on the access method's implementation.
 Normally the process is straightforward and requires no user interaction.
 .sp
 .SS select
@@ -204,7 +204,7 @@ Debian bug tracking system. Instructions on how to do this can be found
 at https://bugs.debian.org/ or by reading the documentation
 for \fBbug\fP(1) or \fBreportbug\fP(1), if these are installed.
 .sp
-Details of the install action depend on the access method's implementation.
+Details of the install command depend on the access method's implementation.
 The user's attention and input may be required during installation,
 configuration or removal of packages. This depends on the maintainer
 scripts in the package. Some packages make use of the \fBdebconf\fP(1)
@@ -244,7 +244,7 @@ package.
 .sp
 Unless \fBdselect\fP is run in expert
 or immediate mode, a help screen is first displayed when choosing this
-action from the menu. The user is \fIstrongly\fP advised to study all of
+command from the menu. The user is \fIstrongly\fP advised to study all of
 the information presented in the online help screens, when one pops up.
 The online help screens can at any time be invoked with the \fB'?'\fP key.
 .sp