diff options
| author | jorton <jorton@fedoraproject.org> | 2007-05-09 10:18:59 +0000 |
|---|---|---|
| committer | jorton <jorton@fedoraproject.org> | 2007-05-09 10:18:59 +0000 |
| commit | a9808100f19876f4a41d215c1d41a210c8522aed (patch) | |
| tree | 9cf45094c2219d66676e68ac5683f8526b597aee | |
| parent | 13698f2bbbe89e264d5c250b22bdaf88dc5b5ad2 (diff) | |
| download | httpd-a9808100f19876f4a41d215c1d41a210c8522aed.tar.gz httpd-a9808100f19876f4a41d215c1d41a210c8522aed.tar.xz httpd-a9808100f19876f4a41d215c1d41a210c8522aed.zip | |
- update welcome page brandinghttpd-2_2_4-4F-7-startF-7-split
| -rw-r--r-- | html.xsl | 27 | ||||
| -rw-r--r-- | httpd.spec | 10 | ||||
| -rw-r--r-- | index.html | 10 |
3 files changed, 11 insertions, 36 deletions
diff --git a/html.xsl b/html.xsl deleted file mode 100644 index ad7cecc..0000000 --- a/html.xsl +++ /dev/null @@ -1,27 +0,0 @@ -<?xml version='1.0'?> - -<!-- This file wraps around the DocBook HTML XSL stylesheet to customise - - some parameters; add the CSS stylesheet, etc. - --> - -<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" - version='1.0' - xmlns="http://www.w3.org/TR/xhtml1/transitional" - exclude-result-prefixes="#default"> - -<xsl:import href="http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl"/> - -<xsl:variable name="html.stylesheet">migration.css</xsl:variable> - -<!-- add class="programlisting" attribute on the <pre>s from - <programlisting>s so that the CSS can style them nicely. --> -<xsl:attribute-set name="shade.verbatim.style"> - <xsl:attribute name="class">programlisting</xsl:attribute> -</xsl:attribute-set> - -<!-- do generate variablelist's as tables --> -<xsl:variable name="variablelist.as.table" select="1"/> - -<xsl:variable name="section.autolabel" select="1"/> - -</xsl:stylesheet> @@ -2,12 +2,11 @@ %define suexec_caller apache %define mmn 20051115 %define vstring Fedora -%define distro Fedora Core Summary: Apache HTTP Server Name: httpd Version: 2.2.4 -Release: 3 +Release: 4 URL: http://httpd.apache.org/ Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz Source1: index.html @@ -125,7 +124,7 @@ if test "x${vmmn}" != "x%{mmn}"; then exit 1 fi -: Building for '%{distro}' with MMN %{mmn} and vendor string '%{vstring}' +: Building with MMN %{mmn} and vendor string '%{vstring}' %build # forcibly prevent use of bundled apr, apr-util, pcre @@ -395,7 +394,7 @@ rm -rf $RPM_BUILD_ROOT %{_sysconfdir}/httpd/logs %{_sysconfdir}/httpd/run %dir %{_sysconfdir}/httpd/conf -%config %{_sysconfdir}/httpd/conf/httpd.conf +%config(noreplace) %{_sysconfdir}/httpd/conf/httpd.conf %config(noreplace) %{_sysconfdir}/httpd/conf.d/welcome.conf %config(noreplace) %{_sysconfdir}/httpd/conf.d/proxy_ajp.conf %config(noreplace) %{_sysconfdir}/httpd/conf/magic @@ -462,6 +461,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/httpd/build/*.sh %changelog +* Wed May 9 2007 Joe Orton <jorton@redhat.com> 2.2.4-4 +- update welcome page branding + * Tue Apr 3 2007 Joe Orton <jorton@redhat.com> 2.2.4-3 - drop old triggers, old Requires, xmlto BR - use Requires(...) correctly @@ -2,7 +2,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> - <title>Test Page for the Apache HTTP Server on Fedora Core</title> + <title>Test Page for the Apache HTTP Server on Fedora</title> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> <style type="text/css"> /*<![CDATA[*/ @@ -85,7 +85,7 @@ </head> <body> - <h1>Fedora Core <strong>Test Page</strong></h1> + <h1>Fedora <strong>Test Page</strong></h1> <div class="content"> <div class="content-middle"> @@ -103,7 +103,7 @@ <p>For example, if you experienced problems while visiting www.example.com, you should send e-mail to "webmaster@example.com".</p> - <p>For information on Fedora Core, please visit the <a href="http://fedora.redhat.com/">Fedora Project website</a>.</p> + <p>For information on Fedora, please visit the <a href="http://fedoraproject.org/">Fedora Project website</a>.</p> <hr /> </div> @@ -113,9 +113,9 @@ <p>You may now add content to the directory <tt>/var/www/html/</tt>. Note that until you do so, people visiting your website will see this page, and not your content. To prevent this page from ever being used, follow the instructions in the file <tt>/etc/httpd/conf.d/welcome.conf</tt>.</p> <div class="logos"> - <p>You are free to use the images below on Apache and Fedora Core powered HTTP servers. Thanks for using Apache and Fedora Core!</p> + <p>You are free to use the images below on Apache and Fedora powered HTTP servers. Thanks for using Apache and Fedora!</p> - <p><a href="http://httpd.apache.org/"><img src="/icons/apache_pb2.gif" alt="[ Powered by Apache ]"/></a> <a href="http://fedora.redhat.com/"><img src="/icons/powered_by_fedora.png" alt="[ Powered by Fedora Core ]" width="88" height="31" /></a></p> + <p><a href="http://httpd.apache.org/"><img src="/icons/apache_pb2.gif" alt="[ Powered by Apache ]"/></a> <a href="http://fedoraproject.org/"><img src="/icons/powered_by_fedora.png" alt="[ Powered by Fedora ]" width="88" height="31" /></a></p> </div> </div> </div> |