r2870 - in branches/1.1: . bin/varnishd bin/varnishhist bin/varnishlog bin/varnishncsa bin/varnishstat bin/varnishtop include/compat lib/libvarnish lib/libvarnishapi lib/libvarnishcompat man

Mon Jun 30 04:45:45 CEST 2008

Author: des
Date: 2008-06-30 04:45:45 +0200 (Mon, 30 Jun 2008)
New Revision: 2870

Modified:
   branches/1.1/
   branches/1.1/bin/varnishd/cache_lru.c
   branches/1.1/bin/varnishd/cache_synthetic.c
   branches/1.1/bin/varnishd/stevedore.c
   branches/1.1/bin/varnishd/varnishd.1
   branches/1.1/bin/varnishhist/varnishhist.1
   branches/1.1/bin/varnishhist/varnishhist.c
   branches/1.1/bin/varnishlog/varnishlog.1
   branches/1.1/bin/varnishncsa/varnishncsa.1
   branches/1.1/bin/varnishstat/varnishstat.1
   branches/1.1/bin/varnishstat/varnishstat.c
   branches/1.1/bin/varnishtop/varnishtop.1
   branches/1.1/bin/varnishtop/varnishtop.c
   branches/1.1/include/compat/asprintf.h
   branches/1.1/include/compat/daemon.h
   branches/1.1/include/compat/setproctitle.h
   branches/1.1/include/compat/srandomdev.h
   branches/1.1/include/compat/strlcat.h
   branches/1.1/include/compat/strlcpy.h
   branches/1.1/include/compat/strndup.h
   branches/1.1/include/compat/vasprintf.h
   branches/1.1/lib/libvarnish/version.c
   branches/1.1/lib/libvarnish/vss.c
   branches/1.1/lib/libvarnishapi/instance.c
   branches/1.1/lib/libvarnishcompat/asprintf.c
   branches/1.1/lib/libvarnishcompat/setproctitle.c
   branches/1.1/lib/libvarnishcompat/srandomdev.c
   branches/1.1/lib/libvarnishcompat/strndup.c
   branches/1.1/lib/libvarnishcompat/vasprintf.c
   branches/1.1/man/vcl.7
Log:
Merged revisions 2861 via svnmerge from 
svn+ssh://projects.linpro.no/svn/varnish/trunk/varnish-cache

........
  r2861 | des | 2008-06-30 03:40:12 +0200 (Mon, 30 Jun 2008) | 2 lines
  
  Change my email address.
........



Property changes on: branches/1.1
___________________________________________________________________
Name: svnmerge-integrated
   - /trunk/varnish-cache:1-1722,1727-1729,1733,1738,1743-1777,1779-1798,1800-1815,1817,1819,1823,1830-1838,1846,1853-1855,1857-1859,1862,1865-1868,1871-1880,1883-1884,1886,1888-1889,1896,1898,1902-1905,1907,1909,1912-1916,1920-1928,1935-1939,1941-1949,1955,1957-1958,1967-1968,1970-1974,1976-1977,1984,1986-1989,1991-1998,2026,2031-2033,2057,2077-2080,2086,2088,2091,2097,2106-2107,2116,2133,2154,2173,2180-2181,2191-2193,2206-2207,2211-2212,2215-2245,2256-2262,2270-2271,2275,2285-2286,2288-2291,2295-2301,2304-2327,2337,2357-2359,2361-2364,2366,2374-2386,2404,2414-2415,2421-2422,2426,2432-2434,2443-2445,2447,2453-2461,2467,2492-2505,2520-2524,2545,2563-2565,2569,2572,2575-2577,2862-2864
   + /trunk/varnish-cache:1-1722,1727-1729,1733,1738,1743-1777,1779-1798,1800-1815,1817,1819,1823,1830-1838,1846,1853-1855,1857-1859,1862,1865-1868,1871-1880,1883-1884,1886,1888-1889,1896,1898,1902-1905,1907,1909,1912-1916,1920-1928,1935-1939,1941-1949,1955,1957-1958,1967-1968,1970-1974,1976-1977,1984,1986-1989,1991-1998,2026,2031-2033,2057,2077-2080,2086,2088,2091,2097,2106-2107,2116,2133,2154,2173,2180-2181,2191-2193,2206-2207,2211-2212,2215-2245,2256-2262,2270-2271,2275,2285-2286,2288-2291,2295-2301,2304-2327,2337,2357-2359,2361-2364,2366,2374-2386,2404,2414-2415,2421-2422,2426,2432-2434,2443-2445,2447,2453-2461,2467,2492-2505,2520-2524,2545,2563-2565,2569,2572,2575-2577,2861-2864

Modified: branches/1.1/bin/varnishd/cache_lru.c
===================================================================

--- branches/1.1/bin/varnishd/cache_lru.c	2008-06-30 02:41:02 UTC (rev 2869)
+++ branches/1.1/bin/varnishd/cache_lru.c	2008-06-30 02:45:45 UTC (rev 2870)
@@ -2,7 +2,7 @@
  * Copyright (c) 2007 Linpro AS
  * All rights reserved.
  *
- * Author: Dag-Erling SmÃ¸rgav <des at linpro.no>
+ * Author: Dag-Erling SmÃ¸rgav <des at des.no>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions

Modified: branches/1.1/bin/varnishd/cache_synthetic.c
===================================================================
--- branches/1.1/bin/varnishd/cache_synthetic.c	2008-06-30 02:41:02 UTC (rev 2869)
+++ branches/1.1/bin/varnishd/cache_synthetic.c	2008-06-30 02:45:45 UTC (rev 2870)
@@ -2,7 +2,7 @@
  * Copyright (c) 2007-2008 Linpro AS
  * All rights reserved.
  *
- * Author: Dag-Erling SmÃ¸rgrav <des at linpro.no>
+ * Author: Dag-Erling SmÃ¸rgrav <des at des.no>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions

Modified: branches/1.1/bin/varnishd/stevedore.c
===================================================================
--- branches/1.1/bin/varnishd/stevedore.c	2008-06-30 02:41:02 UTC (rev 2869)
+++ branches/1.1/bin/varnishd/stevedore.c	2008-06-30 02:45:45 UTC (rev 2870)
@@ -2,7 +2,7 @@
  * Copyright (c) 2007-2008 Linpro AS
  * All rights reserved.
  *
- * Author: Dag-Erling Smørgav <des at linpro.no>
+ * Author: Dag-Erling SmÃ¸rgav <des at des.no>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions

Modified: branches/1.1/bin/varnishd/varnishd.1
===================================================================
--- branches/1.1/bin/varnishd/varnishd.1	2008-06-30 02:41:02 UTC (rev 2869)
+++ branches/1.1/bin/varnishd/varnishd.1	2008-06-30 02:45:45 UTC (rev 2870)
@@ -3,7 +3,7 @@
 .\" Copyright (c) 2006-2008 Linpro AS
 .\" All rights reserved.
 .\"
-.\" Author: Dag-Erling SmÃ¸rgrav <des at linpro.no>
+.\" Author: Dag-Erling SmÃ¸rgrav <des at des.no>
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -541,4 +541,4 @@
 .An Poul-Henning Kamp Aq phk at phk.freebsd.dk
 in cooperation with Verdens Gang AS and Linpro AS.
 This manual page was written by
-.An Dag-Erling Sm\(/orgrav Aq des at linpro.no .
+.An Dag-Erling Sm\(/orgrav Aq des at des.no .

Modified: branches/1.1/bin/varnishhist/varnishhist.1
===================================================================
--- branches/1.1/bin/varnishhist/varnishhist.1	2008-06-30 02:41:02 UTC (rev 2869)
+++ branches/1.1/bin/varnishhist/varnishhist.1	2008-06-30 02:45:45 UTC (rev 2870)
@@ -3,7 +3,7 @@
 .\" Copyright (c) 2006-2008 Linpro AS
 .\" All rights reserved.
 .\"
-.\" Author: Dag-Erling SmÃ¸rgrav <des at linpro.no>
+.\" Author: Dag-Erling SmÃ¸rgrav <des at des.no>
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -148,4 +148,4 @@
 .An Poul-Henning Kamp Aq phk at phk.freebsd.dk
 in cooperation with Verdens Gang AS and Linpro AS.
 This manual page was written by
-.An Dag-Erling Sm\(/orgrav Aq des at linpro.no .
+.An Dag-Erling Sm\(/orgrav Aq des at des.no .

Modified: branches/1.1/bin/varnishhist/varnishhist.c
===================================================================
--- branches/1.1/bin/varnishhist/varnishhist.c	2008-06-30 02:41:02 UTC (rev 2869)
+++ branches/1.1/bin/varnishhist/varnishhist.c	2008-06-30 02:45:45 UTC (rev 2870)
@@ -4,7 +4,7 @@
  * All rights reserved.
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
- * Author: Dag-Erling SmÃ¸rgrav <des at linpro.no>
+ * Author: Dag-Erling SmÃ¸rgrav <des at des.no>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions

Modified: branches/1.1/bin/varnishlog/varnishlog.1
===================================================================
--- branches/1.1/bin/varnishlog/varnishlog.1	2008-06-30 02:41:02 UTC (rev 2869)
+++ branches/1.1/bin/varnishlog/varnishlog.1	2008-06-30 02:45:45 UTC (rev 2870)
@@ -3,7 +3,7 @@
 .\" Copyright (c) 2006-2008 Linpro AS
 .\" All rights reserved.
 .\"
-.\" Author: Dag-Erling SmÃ¸rgrav <des at linpro.no>
+.\" Author: Dag-Erling SmÃ¸rgrav <des at des.no>
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -250,4 +250,4 @@
 .An Poul-Henning Kamp Aq phk at phk.freebsd.dk
 in cooperation with Verdens Gang AS and Linpro AS.
 This manual page was written by
-.An Dag-Erling Sm\(/orgrav Aq des at linpro.no .
+.An Dag-Erling Sm\(/orgrav Aq des at des.no .

Modified: branches/1.1/bin/varnishncsa/varnishncsa.1
===================================================================
--- branches/1.1/bin/varnishncsa/varnishncsa.1	2008-06-30 02:41:02 UTC (rev 2869)
+++ branches/1.1/bin/varnishncsa/varnishncsa.1	2008-06-30 02:45:45 UTC (rev 2870)
@@ -3,7 +3,7 @@
 .\" Copyright (c) 2006-2008 Linpro AS
 .\" All rights reserved.
 .\"
-.\" Author: Dag-Erling SmÃ¸rgrav <des at linpro.no>
+.\" Author: Dag-Erling SmÃ¸rgrav <des at des.no>
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -154,4 +154,4 @@
 .An Poul-Henning Kamp Aq phk at phk.freebsd.dk
 in cooperation with Verdens Gang AS and Linpro AS.
 This manual page was written by
-.An Dag-Erling Sm\(/orgrav Aq des at linpro.no .
+.An Dag-Erling Sm\(/orgrav Aq des at des.no .

Modified: branches/1.1/bin/varnishstat/varnishstat.1
===================================================================
--- branches/1.1/bin/varnishstat/varnishstat.1	2008-06-30 02:41:02 UTC (rev 2869)
+++ branches/1.1/bin/varnishstat/varnishstat.1	2008-06-30 02:45:45 UTC (rev 2870)
@@ -3,7 +3,7 @@
 .\" Copyright (c) 2006-2008 Linpro AS
 .\" All rights reserved.
 .\"
-.\" Author: Dag-Erling SmÃ¸rgrav <des at linpro.no>
+.\" Author: Dag-Erling SmÃ¸rgrav <des at des.no>
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -110,6 +110,6 @@
 .An Poul-Henning Kamp Aq phk at phk.freebsd.dk
 in cooperation with Verdens Gang AS and Linpro AS, and later
 substantially rewritten by
-.An Dag-Erling Sm\(/orgrav Aq des at linpro.no .
+.An Dag-Erling Sm\(/orgrav Aq des at des.no .
 This manual page was written by
-.An Dag-Erling Sm\(/orgrav Aq des at linpro.no .
+.An Dag-Erling Sm\(/orgrav Aq des at des.no .

Modified: branches/1.1/bin/varnishstat/varnishstat.c
===================================================================
--- branches/1.1/bin/varnishstat/varnishstat.c	2008-06-30 02:41:02 UTC (rev 2869)
+++ branches/1.1/bin/varnishstat/varnishstat.c	2008-06-30 02:45:45 UTC (rev 2870)
@@ -4,7 +4,7 @@
  * All rights reserved.
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
- * Author: Dag-Erling SmÃ¸rgrav <des at linpro.no>
+ * Author: Dag-Erling SmÃ¸rgrav <des at des.no>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions

Modified: branches/1.1/bin/varnishtop/varnishtop.1
===================================================================
--- branches/1.1/bin/varnishtop/varnishtop.1	2008-06-30 02:41:02 UTC (rev 2869)
+++ branches/1.1/bin/varnishtop/varnishtop.1	2008-06-30 02:45:45 UTC (rev 2870)
@@ -3,7 +3,7 @@
 .\" Copyright (c) 2006-2008 Linpro AS
 .\" All rights reserved.
 .\"
-.\" Author: Dag-Erling SmÃ¸rgrav <des at linpro.no>
+.\" Author: Dag-Erling SmÃ¸rgrav <des at des.no>
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -162,6 +162,6 @@
 .An Poul-Henning Kamp Aq phk at phk.freebsd.dk
 in cooperation with Verdens Gang AS and Linpro AS, and later
 substantially rewritten by
-.An Dag-Erling Sm\(/orgrav Aq des at linpro.no .
+.An Dag-Erling Sm\(/orgrav Aq des at des.no .
 This manual page was written by
-.An Dag-Erling Sm\(/orgrav Aq des at linpro.no .
+.An Dag-Erling Sm\(/orgrav Aq des at des.no .

Modified: branches/1.1/bin/varnishtop/varnishtop.c
===================================================================
--- branches/1.1/bin/varnishtop/varnishtop.c	2008-06-30 02:41:02 UTC (rev 2869)
+++ branches/1.1/bin/varnishtop/varnishtop.c	2008-06-30 02:45:45 UTC (rev 2870)
@@ -4,7 +4,7 @@
  * All rights reserved.
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
- * Author: Dag-Erling SmÃ¸rgrav <des at linpro.no>
+ * Author: Dag-Erling SmÃ¸rgrav <des at des.no>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions

Modified: branches/1.1/include/compat/asprintf.h
===================================================================
--- branches/1.1/include/compat/asprintf.h	2008-06-30 02:41:02 UTC (rev 2869)
+++ branches/1.1/include/compat/asprintf.h	2008-06-30 02:45:45 UTC (rev 2870)
@@ -3,7 +3,7 @@
  * Copyright (c) 2006-2008 Linpro AS
  * All rights reserved.
  *
- * Author: Dag-Erling SmÃ¸rgrav <des at linpro.no>
+ * Author: Dag-Erling SmÃ¸rgrav <des at des.no>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions

Modified: branches/1.1/include/compat/daemon.h
===================================================================
--- branches/1.1/include/compat/daemon.h	2008-06-30 02:41:02 UTC (rev 2869)
+++ branches/1.1/include/compat/daemon.h	2008-06-30 02:45:45 UTC (rev 2870)
@@ -3,7 +3,7 @@
  * Copyright (c) 2006-2008 Linpro AS
  * All rights reserved.
  *
- * Author: Dag-Erling SmÃ¸rgrav <des at linpro.no>
+ * Author: Dag-Erling SmÃ¸rgrav <des at des.no>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions

Modified: branches/1.1/include/compat/setproctitle.h
===================================================================
--- branches/1.1/include/compat/setproctitle.h	2008-06-30 02:41:02 UTC (rev 2869)
+++ branches/1.1/include/compat/setproctitle.h	2008-06-30 02:45:45 UTC (rev 2870)
@@ -3,7 +3,7 @@
  * Copyright (c) 2006-2008 Linpro AS
  * All rights reserved.
  *
- * Author: Dag-Erling SmÃ¸rgrav <des at linpro.no>
+ * Author: Dag-Erling SmÃ¸rgrav <des at des.no>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions

Modified: branches/1.1/include/compat/srandomdev.h
===================================================================
--- branches/1.1/include/compat/srandomdev.h	2008-06-30 02:41:02 UTC (rev 2869)
+++ branches/1.1/include/compat/srandomdev.h	2008-06-30 02:45:45 UTC (rev 2870)
@@ -3,7 +3,7 @@
  * Copyright (c) 2006-2008 Linpro AS
  * All rights reserved.
  *
- * Author: Dag-Erling SmÃ¸rgrav <des at linpro.no>
+ * Author: Dag-Erling SmÃ¸rgrav <des at des.no>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions

Modified: branches/1.1/include/compat/strlcat.h
===================================================================
--- branches/1.1/include/compat/strlcat.h	2008-06-30 02:41:02 UTC (rev 2869)
+++ branches/1.1/include/compat/strlcat.h	2008-06-30 02:45:45 UTC (rev 2870)
@@ -3,7 +3,7 @@
  * Copyright (c) 2006-2008 Linpro AS
  * All rights reserved.
  *
- * Author: Dag-Erling SmÃ¸rgrav <des at linpro.no>
+ * Author: Dag-Erling SmÃ¸rgrav <des at des.no>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions

Modified: branches/1.1/include/compat/strlcpy.h
===================================================================
--- branches/1.1/include/compat/strlcpy.h	2008-06-30 02:41:02 UTC (rev 2869)
+++ branches/1.1/include/compat/strlcpy.h	2008-06-30 02:45:45 UTC (rev 2870)
@@ -3,7 +3,7 @@
  * Copyright (c) 2006-2008 Linpro AS
  * All rights reserved.
  *
- * Author: Dag-Erling SmÃ¸rgrav <des at linpro.no>
+ * Author: Dag-Erling SmÃ¸rgrav <des at des.no>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions

Modified: branches/1.1/include/compat/strndup.h
===================================================================
--- branches/1.1/include/compat/strndup.h	2008-06-30 02:41:02 UTC (rev 2869)
+++ branches/1.1/include/compat/strndup.h	2008-06-30 02:45:45 UTC (rev 2870)
@@ -3,7 +3,7 @@
  * Copyright (c) 2006-2008 Linpro AS
  * All rights reserved.
  *
- * Author: Dag-Erling SmÃ¸rgrav <des at linpro.no>
+ * Author: Dag-Erling SmÃ¸rgrav <des at des.no>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions

Modified: branches/1.1/include/compat/vasprintf.h
===================================================================
--- branches/1.1/include/compat/vasprintf.h	2008-06-30 02:41:02 UTC (rev 2869)
+++ branches/1.1/include/compat/vasprintf.h	2008-06-30 02:45:45 UTC (rev 2870)
@@ -3,7 +3,7 @@
  * Copyright (c) 2006-2008 Linpro AS
  * All rights reserved.
  *
- * Author: Dag-Erling SmÃ¸rgrav <des at linpro.no>
+ * Author: Dag-Erling SmÃ¸rgrav <des at des.no>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions

Modified: branches/1.1/lib/libvarnish/version.c
===================================================================
--- branches/1.1/lib/libvarnish/version.c	2008-06-30 02:41:02 UTC (rev 2869)
+++ branches/1.1/lib/libvarnish/version.c	2008-06-30 02:45:45 UTC (rev 2870)
@@ -3,7 +3,7 @@
  * Copyright (c) 2006-2008 Linpro AS
  * All rights reserved.
  *
- * Author: Dag-Erling SmÃ¸rgrav <des at linpro.no>
+ * Author: Dag-Erling SmÃ¸rgrav <des at des.no>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions

Modified: branches/1.1/lib/libvarnish/vss.c
===================================================================
--- branches/1.1/lib/libvarnish/vss.c	2008-06-30 02:41:02 UTC (rev 2869)
+++ branches/1.1/lib/libvarnish/vss.c	2008-06-30 02:45:45 UTC (rev 2870)
@@ -3,7 +3,7 @@
  * Copyright (c) 2006-2008 Linpro AS
  * All rights reserved.
  *
- * Author: Dag-Erling SmÃ¸rgrav <des at linpro.no>
+ * Author: Dag-Erling SmÃ¸rgrav <des at des.no>
  * Author: Cecilie Fritzvold <cecilihf at linpro.no>
  *
  * Redistribution and use in source and binary forms, with or without

Modified: branches/1.1/lib/libvarnishapi/instance.c
===================================================================
--- branches/1.1/lib/libvarnishapi/instance.c	2008-06-30 02:41:02 UTC (rev 2869)
+++ branches/1.1/lib/libvarnishapi/instance.c	2008-06-30 02:45:45 UTC (rev 2870)
@@ -2,7 +2,7 @@
  * Copyright (c) 2007-2008 Linpro AS
  * All rights reserved.
  *
- * Author: Dag-Erling SmÃ¸rgrav <des at linpro.no>
+ * Author: Dag-Erling SmÃ¸rgrav <des at des.no>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions

Modified: branches/1.1/lib/libvarnishcompat/asprintf.c
===================================================================
--- branches/1.1/lib/libvarnishcompat/asprintf.c	2008-06-30 02:41:02 UTC (rev 2869)
+++ branches/1.1/lib/libvarnishcompat/asprintf.c	2008-06-30 02:45:45 UTC (rev 2870)
@@ -3,7 +3,7 @@
  * Copyright (c) 2006-2008 Linpro AS
  * All rights reserved.
  *
- * Author: Dag-Erling SmÃ¸rgrav <des at linpro.no>
+ * Author: Dag-Erling SmÃ¸rgrav <des at des.no>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions

Modified: branches/1.1/lib/libvarnishcompat/setproctitle.c
===================================================================
--- branches/1.1/lib/libvarnishcompat/setproctitle.c	2008-06-30 02:41:02 UTC (rev 2869)
+++ branches/1.1/lib/libvarnishcompat/setproctitle.c	2008-06-30 02:45:45 UTC (rev 2870)
@@ -3,7 +3,7 @@
  * Copyright (c) 2006-2008 Linpro AS
  * All rights reserved.
  *
- * Author: Dag-Erling SmÃ¸rgrav <des at linpro.no>
+ * Author: Dag-Erling SmÃ¸rgrav <des at des.no>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions

Modified: branches/1.1/lib/libvarnishcompat/srandomdev.c
===================================================================
--- branches/1.1/lib/libvarnishcompat/srandomdev.c	2008-06-30 02:41:02 UTC (rev 2869)
+++ branches/1.1/lib/libvarnishcompat/srandomdev.c	2008-06-30 02:45:45 UTC (rev 2870)
@@ -3,7 +3,7 @@
  * Copyright (c) 2006-2008 Linpro AS
  * All rights reserved.
  *
- * Author: Dag-Erling SmÃ¸rgrav <des at linpro.no>
+ * Author: Dag-Erling SmÃ¸rgrav <des at des.no>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions

Modified: branches/1.1/lib/libvarnishcompat/strndup.c
===================================================================
--- branches/1.1/lib/libvarnishcompat/strndup.c	2008-06-30 02:41:02 UTC (rev 2869)
+++ branches/1.1/lib/libvarnishcompat/strndup.c	2008-06-30 02:45:45 UTC (rev 2870)
@@ -3,7 +3,7 @@
  * Copyright (c) 2006-2008 Linpro AS
  * All rights reserved.
  *
- * Author: Dag-Erling SmÃ¸rgrav <des at linpro.no>
+ * Author: Dag-Erling SmÃ¸rgrav <des at des.no>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions

Modified: branches/1.1/lib/libvarnishcompat/vasprintf.c
===================================================================
--- branches/1.1/lib/libvarnishcompat/vasprintf.c	2008-06-30 02:41:02 UTC (rev 2869)
+++ branches/1.1/lib/libvarnishcompat/vasprintf.c	2008-06-30 02:45:45 UTC (rev 2870)
@@ -3,7 +3,7 @@
  * Copyright (c) 2006-2008 Linpro AS
  * All rights reserved.
  *
- * Author: Dag-Erling SmÃ¸rgrav <des at linpro.no>
+ * Author: Dag-Erling SmÃ¸rgrav <des at des.no>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions

Modified: branches/1.1/man/vcl.7
===================================================================
--- branches/1.1/man/vcl.7	2008-06-30 02:41:02 UTC (rev 2869)
+++ branches/1.1/man/vcl.7	2008-06-30 02:45:45 UTC (rev 2870)
@@ -3,7 +3,7 @@
 .\" Copyright (c) 2006-2008 Linpro AS
 .\" All rights reserved.
 .\"
-.\" Author: Dag-Erling SmÃ¸rgrav <des at linpro.no>
+.\" Author: Dag-Erling SmÃ¸rgrav <des at des.no>
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -655,4 +655,4 @@
 .An Poul-Henning Kamp Aq phk at phk.freebsd.dk
 in cooperation with Verdens Gang AS and Linpro AS.
 This manual page was written by
-.An Dag-Erling Sm\(/orgrav Aq des at linpro.no .
+.An Dag-Erling Sm\(/orgrav Aq des at des.no .


