Author: jdsn Date: Thu Nov 5 17:17:47 2009 New Revision: 59344 URL: http://svn.opensuse.org/viewcvs/yast?rev=59344&view=rev Log: fix XML format for stateless registration API disable help texts for Open-SLX (bnc#544907) 2.18.2 Modified: branches/SuSE-Linux-11_2-Branch/registration/VERSION branches/SuSE-Linux-11_2-Branch/registration/package/yast2-registration.changes branches/SuSE-Linux-11_2-Branch/registration/src/clients/inst_suse_register.ycp Modified: branches/SuSE-Linux-11_2-Branch/registration/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_2-Branch/registr... ============================================================================== --- branches/SuSE-Linux-11_2-Branch/registration/VERSION (original) +++ branches/SuSE-Linux-11_2-Branch/registration/VERSION Thu Nov 5 17:17:47 2009 @@ -1 +1 @@ -2.18.1 +2.18.2 Modified: branches/SuSE-Linux-11_2-Branch/registration/package/yast2-registration.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_2-Branch/registr... ============================================================================== --- branches/SuSE-Linux-11_2-Branch/registration/package/yast2-registration.changes (original) +++ branches/SuSE-Linux-11_2-Branch/registration/package/yast2-registration.changes Thu Nov 5 17:17:47 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Nov 5 16:22:53 CET 2009 - jdsn@suse.de + +- fix XML format for stateless registration API +- disable help texts for Open-SLX (bnc#544907) +- 2.18.2 + +------------------------------------------------------------------- Mon Oct 26 12:13:22 CET 2009 - jdsn@suse.de - enable the webyast API by default Modified: branches/SuSE-Linux-11_2-Branch/registration/src/clients/inst_suse_register.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_2-Branch/registr... ============================================================================== --- branches/SuSE-Linux-11_2-Branch/registration/src/clients/inst_suse_register.ycp (original) +++ branches/SuSE-Linux-11_2-Branch/registration/src/clients/inst_suse_register.ycp Thu Nov 5 17:17:47 2009 @@ -274,8 +274,11 @@ } else { - help = help_title + help_para1_openslx + help_para2_openslx + help_para4_openslx; - if (! Mode::normal()) help = help + help_para6_openslx; + // for now disable Open-SLX help texts (bnc#544907) + // help = help_title + help_para1_openslx + help_para2_openslx + help_para4_openslx; + // if (! Mode::normal()) help = help + help_para6_openslx; + help = help_title + help_para1 + help_para2 + help_para4; + if (! Mode::normal()) help = help + help_para6; } help = help + HELP["localRegistrationChapter1"]:"" + HELP["localRegistrationChapter2"]:""; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org