changeset 9801:8b7d4ab33b2b

merge with hg-stable
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Sun, 08 Nov 2009 18:18:46 +0100
parents b39f98be96de (diff) 0c5714a4920f (current diff)
children 4ce13d7c6b88
files
diffstat 3 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/doc/style.css	Sun Nov 08 10:40:51 2009 -0600
+++ b/doc/style.css	Sun Nov 08 18:18:46 2009 +0100
@@ -47,6 +47,9 @@
 h2.subtitle, h1 { font-size: 200%; }
 h2, .topic-title, .admonition-title { font-size: 140%; }
 
+/* subtitle starts with lowercase in man pages, but not in HTML */
+h2.subtitle:first-letter { text-transform: uppercase; }
+
 /* override first/last margin */
 .first, h1.title, h2.subtitle { margin-top: 0 !important; }
 .last, .with-subtitle { margin-bottom: 0 !important; }
--- a/tests/test-diffstat	Sun Nov 08 10:40:51 2009 -0600
+++ b/tests/test-diffstat	Sun Nov 08 18:18:46 2009 +0100
@@ -2,7 +2,7 @@
 
 hg init repo
 cd repo
-i=0; while [ "$i" -lt 213 ]; do echo a >> a; i=$(($i + 1)); done
+i=0; while [ "$i" -lt 213 ]; do echo a >> a; i=`expr $i + 1`; done
 hg add a
 
 echo '% wide diffstat'
--- a/tests/test-patchbomb	Sun Nov 08 10:40:51 2009 -0600
+++ b/tests/test-patchbomb	Sun Nov 08 18:18:46 2009 +0100
@@ -173,7 +173,8 @@
 
 echo "% test multi-byte domain parsing"
 UUML=`printf '\374'`
-export HGENCODING=iso-8859-1
+HGENCODING=iso-8859-1
+export HGENCODING
 hg email --date '1980-1-1 0:1' -m tmp.mbox -f quux -t "bar@${UUML}nicode.com" \
   -s test -r 0
 cat tmp.mbox | fixheaders