This is an automated email from the git hooks/post-receive script. guillem pushed a commit to branch master in repository dpkg.
commit 19d98528e6dd7dd4d82f3d1d564f443382fd5f99 Author: Guillem Jover <[email protected]> Date: Tue Feb 17 01:34:37 2015 +0100 Use "<enter>" instead of "return" or "enter" in input prompts This should make it more clear we are talking about the key and not something else. --- debian/changelog | 1 + dselect/methods/ftp/setup.pl | 2 +- scripts/dpkg-buildpackage.pl | 2 +- utils/update-alternatives.c | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7b66375..bdd1a69 100644 --- a/debian/changelog +++ b/debian/changelog @@ -86,6 +86,7 @@ dpkg (1.18.0) UNRELEASED; urgency=low - Say “package” instead of “it” in dpkg-name warning message. - Uppercase field names in error messages. - Expand EOF and eof into “end of file” in error messages. + - Use “<enter>” instead of “return” or “enter” in input prompts. [ Raphaël Hertzog ] * Drop myself from Uploaders. diff --git a/dselect/methods/ftp/setup.pl b/dselect/methods/ftp/setup.pl index f9170ef..a527a73 100755 --- a/dselect/methods/ftp/setup.pl +++ b/dselect/methods/ftp/setup.pl @@ -171,7 +171,7 @@ store_config("$methdir/vars"); chmod 0600, "$methdir/vars"; if($exit || $problem) { - print "Press return to continue\n"; + print "Press <enter> to continue\n"; <STDIN>; } diff --git a/scripts/dpkg-buildpackage.pl b/scripts/dpkg-buildpackage.pl index 51b9dd1..dde0bb5 100755 --- a/scripts/dpkg-buildpackage.pl +++ b/scripts/dpkg-buildpackage.pl @@ -601,7 +601,7 @@ if ($check_command) { } if ($signpause && ($signchanges || $signsource)) { - print g_("Press the return key to start signing process\n"); + print g_("Press <enter> to start the signing process.\n"); getc(); } diff --git a/utils/update-alternatives.c b/utils/update-alternatives.c index d5f9af5..1ef2ab4 100644 --- a/utils/update-alternatives.c +++ b/utils/update-alternatives.c @@ -1614,7 +1614,7 @@ alternative_select_choice(struct alternative *a) for (fs = a->choices; fs; fs = fs->next, idx++) alternative_print_choice(a, ALT_ST_MANUAL, fs, idx, len); printf("\n"); - printf(_("Press enter to keep the current choice[*], " + printf(_("Press <enter> to keep the current choice[*], " "or type selection number: ")); ret = fgets(selection, sizeof(selection), stdin); if (ret == NULL || strlen(selection) == 0) { -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/dpkg/dpkg.git -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected]
