summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2008-09-30 04:13:28 +0000
committerThierry Vignaud <tv@mandriva.org>2008-09-30 04:13:28 +0000
commit174c1bf4baf78d83bcbfae169af2d934748b3476 (patch)
tree062f329b995537611765c8c5a98b01c6a8f64c0c
parent52d23f43f57b0c0fcf3147ff2542663575b309f5 (diff)
downloaddrakx-174c1bf4baf78d83bcbfae169af2d934748b3476.tar
drakx-174c1bf4baf78d83bcbfae169af2d934748b3476.tar.gz
drakx-174c1bf4baf78d83bcbfae169af2d934748b3476.tar.bz2
drakx-174c1bf4baf78d83bcbfae169af2d934748b3476.tar.xz
drakx-174c1bf4baf78d83bcbfae169af2d934748b3476.zip
fix/adjust some help pages (#42986)
-rw-r--r--perl-install/any.pm4
-rw-r--r--perl-install/diskdrake/hd_gtk.pm2
-rw-r--r--perl-install/install/NEWS2
-rw-r--r--perl-install/install/steps_gtk.pm5
-rw-r--r--perl-install/security/level.pm2
-rw-r--r--perl-install/services.pm6
6 files changed, 14 insertions, 7 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm
index 3564ef8f6..14ac12749 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -1121,7 +1121,7 @@ sub selectCountry {
$in->ask_from_(
{ title => N("Country / Region"),
messages => N("Please choose your country"),
- interactive_help_id => 'selectCountry',
+ interactive_help_id => 'misc-params.html#drakxid-selectCountry',
if_(@best, advanced_messages => N("Here is the full list of available countries")),
advanced_label => @best ? N("Other Countries") : N("Advanced"),
},
@@ -1431,7 +1431,7 @@ sub configure_time_more {
my $tz_prefix = timezone::get_timezone_prefix();
local $ENV{TZ} = ':' . $tz_prefix . '/' . $timezone->{timezone};
- $in->ask_from_({ interactive_help_id => 'configureTimezoneGMT',
+ $in->ask_from_({ interactive_help_id => 'misc-params#drakxid-configureTimezoneGMT',
title => N("Date, Clock & Time Zone Settings"),
}, [
{ label => N("Date, Clock & Time Zone Settings"), title => 1 },
diff --git a/perl-install/diskdrake/hd_gtk.pm b/perl-install/diskdrake/hd_gtk.pm
index a5828783e..a6a904589 100644
--- a/perl-install/diskdrake/hd_gtk.pm
+++ b/perl-install/diskdrake/hd_gtk.pm
@@ -162,7 +162,7 @@ sub add_kind2notebook {
sub interactive_help() {
if ($::isInstall) {
- my $func = $in->interactive_help_sub_display_id('partition_with_diskdrake');
+ my $func = $in->interactive_help_sub_display_id('diskdrake');
$func and $func->();
} else {
require run_program;
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index dd4bd3c87..23858808b 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,5 @@
+- fix/adjust some help pages (#42986)
+
Version 11.58 - 29 September 2008
- ask_deselect_media__copy_on_disk:
diff --git a/perl-install/install/steps_gtk.pm b/perl-install/install/steps_gtk.pm
index 0b211221b..30c900a50 100644
--- a/perl-install/install/steps_gtk.pm
+++ b/perl-install/install/steps_gtk.pm
@@ -479,7 +479,10 @@ sub choosePackagesTree {
return;
},
auto_deps => N("Show automatically selected packages"),
- interactive_help => sub { interactive::gtk::display_help($o, { interactive_help_id => 'choosePackages' }, $w) },
+ interactive_help => sub {
+ interactive::gtk::display_help($o,
+ { interactive_help_id =>
+ 'choosePackages#choosePackagesTree' }, $w) },
ok => N("Install"),
cancel => N("Previous"),
diff --git a/perl-install/security/level.pm b/perl-install/security/level.pm
index 7f7188c86..826617ad3 100644
--- a/perl-install/security/level.pm
+++ b/perl-install/security/level.pm
@@ -53,7 +53,7 @@ connections from many clients. Note: if your machine is only a client on the Int
my @l = 2 .. 5;
$in->ask_from_({ title => $::isInstall ? N("Security") : N("DrakSec Basic Options"),
- interactive_help_id => 'miscellaneous',
+ interactive_help_id => 'misc-params#draxid-miscellaneous',
}, [
{ label => N("Please choose the desired security level"), title => 1 },
{ val => $security, list => \@l,
diff --git a/perl-install/services.pm b/perl-install/services.pm
index f9f0e8727..6fe9aee33 100644
--- a/perl-install/services.pm
+++ b/perl-install/services.pm
@@ -173,8 +173,10 @@ sub ask_ {
scalar(values %services));
},
get_info => sub { formatLines(description($_[0])) },
- interactive_help => sub {
- interactive::gtk::display_help($o, { interactive_help_id => 'misc-params' }, $w) },
+ interactive_help => sub {
+ interactive::gtk::display_help($o,
+ { interactive_help_id =>
+ 'misc-params#drakxid-configureServices' }, $w) },
}) or return $l, $on_services; #- no change on cancel.
[ grep { $services{$_} } @$l ];
}