Merge branch 'master' of ssh://db.debian.org/git/userdir-ldap-cgi

* 'master' of ssh://db.debian.org/git/userdir-ldap-cgi:
  Fix typo in update.wml spotted by Sylvain Beucler.
  Actually install new doc.
  updated css from interwebs
  actually install new file

diff --git a/debian/changelog b/debian/changelog
index 9353caf..322a044 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+userdir-ldap-cgi (0.3.31) unstable; urgency=low
+
+  [ Stephen Gran ]
+  * Actually install new doc.
+
+  [ Martin Zobel-Helas ]
+  * Fix typo in update.wml spotted by Sylvain Beucler
+
+ -- Martin Zobel-Helas <zobel@debian.org>  Tue, 01 Jun 2010 22:25:49 +0200
+
 userdir-ldap-cgi (0.3.30) unstable; urgency=low
 
   [ Peter Palfrader ]

diff --git a/debian/rules b/debian/rules
index 9e19f18..49a3846 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -42,6 +42,7 @@ binary-indep: build
        install -m 644 html/doc-general.html $(i)/var/www/userdir-ldap/
        install -m 644 html/doc-hosts.html $(i)/var/www/userdir-ldap/
        install -m 644 html/doc-mail.html $(i)/var/www/userdir-ldap/
+       install -m 644 html/doc-mail-handling.html $(i)/var/www/userdir-ldap/
        install -m 644 html/forward.html $(i)/var/www/userdir-ldap/
        install -m 644 html/hostinfo.html $(i)/var/www/userdir-ldap/
        install -m 644 html/login.html $(i)/var/www/userdir-ldap/

diff --git a/html/debian.css b/html/debian.css
index 3902e14..63bc216 100644 (file)
--- a/html/debian.css
+++ b/html/debian.css
@@ -710,6 +710,7 @@ a:active { color: #FF0000; }
        /* these go to the end as the css validator does not like them
        will be replaced by border-radius with css3 */
        border-radius: 15px;
+       padding-left: 5px;
 }
 
 /* /CD/vendors/ */

diff --git a/html/update.wml b/html/update.wml
index 7feecb4..a61108c 100644 (file)
--- a/html/update.wml
+++ b/html/update.wml
@@ -175,7 +175,7 @@
 
   <tr><td align="right">
     <b>Default Mail Handling:</b><br>
-    <font size="-1">(If this option is set, several default anti-spam setings will
+    <font size="-1">(If this option is set, several default anti-spam settings will
     be applied to the mail handling for your account)</font>
   </td><td>
     <input name="maildefaultoptions" type="checkbox" value="TRUE"~mailgreylisting~>