Author: jsuchome Date: Thu Mar 29 15:12:28 2012 New Revision: 67773 URL: http://svn.opensuse.org/viewcvs/yast?rev=67773&view=rev Log: - merged proofed texts - confirmed license - 2.22.0 Modified: trunk/http-server/VERSION trunk/http-server/package/yast2-http-server.changes trunk/http-server/src/YaPI/HTTPD.pm trunk/http-server/src/helps.ycp trunk/http-server/yast2-http-server.spec.in Modified: trunk/http-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/http-server/VERSION?rev=67773&r1=67772&r2=67773&view=diff ============================================================================== --- trunk/http-server/VERSION (original) +++ trunk/http-server/VERSION Thu Mar 29 15:12:28 2012 @@ -1 +1 @@ -2.21.0 +2.22.0 Modified: trunk/http-server/package/yast2-http-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/http-server/package/yast2-http-server.changes?rev=67773&r1=67772&r2=67773&view=diff ============================================================================== --- trunk/http-server/package/yast2-http-server.changes (original) +++ trunk/http-server/package/yast2-http-server.changes Thu Mar 29 15:12:28 2012 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Mar 29 15:11:25 CEST 2012 - jsuchome@suse.cz + +- merged proofed texts +- confirmed license +- 2.22.0 + +------------------------------------------------------------------- Thu Sep 29 11:08:59 CEST 2011 - visnov@suse.cz - set dialog title Modified: trunk/http-server/src/YaPI/HTTPD.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/http-server/src/YaPI/HTTPD.pm?rev=67773&r1=67772&r2=67773&view=diff ============================================================================== --- trunk/http-server/src/YaPI/HTTPD.pm (original) +++ trunk/http-server/src/YaPI/HTTPD.pm Thu Mar 29 15:12:28 2012 @@ -676,7 +676,7 @@ } elsif( $hostid ne 'default' and $tmp->{KEY} =~ /ServerTokens|TimeOut|ExtendedStatus/ ) { # illegal keys in vhost - return $self->SetError( summary => sprintf( __("Illegal key in vhost '%s'."),$tmp->{KEY}), + return $self->SetError( summary => sprintf( __("Illegal key in virtual host '%s'."),$tmp->{KEY}), code => "CHECK_PARAM_FAILED" ); } else { push( @tmp, $tmp ); @@ -759,7 +759,7 @@ } if( $key->{KEY} =~ /ServerTokens|TimeOut|ExtendedStatus/ ) { # illegal keys in vhost - return $self->SetError( summary => sprintf(__("Illegal key in vhost '%s'."), $key->{KEY}), + return $self->SetError( summary => sprintf(__("Illegal key in virtual host '%s'."), $key->{KEY}), code => "CHECK_PARAM_FAILED" ); } else { push( @tmp, $key ); Modified: trunk/http-server/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/http-server/src/helps.ycp?rev=67773&r1=67772&r2=67773&view=diff ============================================================================== --- trunk/http-server/src/helps.ycp (original) +++ trunk/http-server/src/helps.ycp Thu Mar 29 15:12:28 2012 @@ -178,12 +178,13 @@ + _("<p><big><b>Server Resolution</b></big><br> Apache2 must be able to determine which virtual host settings it should use to create a response for an HTTP request. -In principle, there are two basic approaches. If using HTTP headers +There are two basic approaches. If using HTTP headers from the incoming request, the server looks up the host name specified by the HTTP request headers. The other possibility is to determine the virtual host by the IP address used by the client when connecting to the server. -If you plan to configure SSL based vhost, use <b>Resolution via IP address</b> -Consult the Apache2 manual for further details.</p>\n"), +If you plan to configure SSL-based vhost, use <b>Resolution via IP address</b> +Consult the Apache2 manual for further details.</p> +"), // advanced new host dialog 1/5 "set_vhost" : _("<p><b><big>Details for New Host</big></b><br> This dialog allows you to specify additional information about a new virtual host.</p>") @@ -191,8 +192,11 @@ +_("<p>Select <b>Enable CGI Support</b> to run CGI scripts in the path in <b>CGI Directory Path</b> using the alias <tt>/cgi-bin/</tt>.</p>") // advanced new host dialog 3/5 - +_("<p>For HTTPS access to this virtual host, select <b>Enable SSL Support</b>.\n -Then enter the path for the certificate file in <b>Certificate File Path</b>.This option is available only for IP based vhosts.</p>") + +_("<p>For HTTPS access to this virtual host, select <b>Enable SSL Support</b>. + +Then enter the path for the certificate file in <b>Certificate File +Path</b>.This option is only available for IP-based vhosts.</p> +") // advanced new host dialog 4/5 +_("<p>In <b>Directory Index</b>, enter a space-separated list of files that Apache should look for and provide when a URL for a directory (one that ends in <tt>/</tt>) is requested. The first matching file found is provided.</p>") // advanced new host dialog 5/5 Modified: trunk/http-server/yast2-http-server.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/http-server/yast2-http-server.spec.in?rev=67773&r1=67772&r2=67773&view=diff ============================================================================== --- trunk/http-server/yast2-http-server.spec.in (original) +++ trunk/http-server/yast2-http-server.spec.in Thu Mar 29 15:12:28 2012 @@ -1,8 +1,8 @@ @HEADER-COMMENT@ @HEADER@ -Group: System/YaST -License: GPL-2.0+ +Group: System/YaST +License: GPL-2.0 BuildRequires: yast2-network docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer popt-devel sgml-skel update-desktop-files yast2 yast2-devtools yast2-packagemanager-devel yast2-perl-bindings yast2-testsuite libzio Requires: yast2-network yast2-perl-bindings libzio # DnsServerApi moved to yast2.rpm (bnc#392606) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org