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. ........ git-svn-id: http://www.varnish-cache.org/svn/branches/1.1@2870 d4fa192b-c00b-0410-8231-f00ffab90ce4
varnish · Jun 30, 2008 · 93e944c · 93e944c
1 parent 9f6d352
commit 93e944c
Show file tree

Hide file tree

Showing 29 changed files with 38 additions and 38 deletions.
diff --git a/bin/varnishd/cache_lru.c b/bin/varnishd/cache_lru.c
@@ -2,7 +2,7 @@
  * Copyright (c) 2007 Linpro AS
  * All rights reserved.
  *
- * Author: Dag-Erling Smørgav <des@linpro.no>
+ * Author: Dag-Erling Smørgav <des@des.no>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions

diff --git a/bin/varnishd/cache_synthetic.c b/bin/varnishd/cache_synthetic.c
@@ -2,7 +2,7 @@
  * Copyright (c) 2007-2008 Linpro AS
  * All rights reserved.
  *
- * Author: Dag-Erling Smørgrav <des@linpro.no>
+ * Author: Dag-Erling Smørgrav <des@des.no>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions

diff --git a/bin/varnishd/stevedore.c b/bin/varnishd/stevedore.c
@@ -2,7 +2,7 @@
  * Copyright (c) 2007-2008 Linpro AS
  * All rights reserved.
  *
- * Author: Dag-Erling Smørgav <des@linpro.no>
+ * Author: Dag-Erling Smørgav <des@des.no>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions

diff --git a/bin/varnishd/varnishd.1 b/bin/varnishd/varnishd.1
@@ -3,7 +3,7 @@
 .\" Copyright (c) 2006-2008 Linpro AS
 .\" All rights reserved.
 .\"
-.\" Author: Dag-Erling Smørgrav <des@linpro.no>
+.\" Author: Dag-Erling Smørgrav <des@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 @@ daemon was developed by
 .An Poul-Henning Kamp Aq phk@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@linpro.no .
+.An Dag-Erling Sm\(/orgrav Aq des@des.no .
diff --git a/bin/varnishhist/varnishhist.1 b/bin/varnishhist/varnishhist.1
@@ -3,7 +3,7 @@
 .\" Copyright (c) 2006-2008 Linpro AS
 .\" All rights reserved.
 .\"
-.\" Author: Dag-Erling Smørgrav <des@linpro.no>
+.\" Author: Dag-Erling Smørgrav <des@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 @@ utility was developed by
 .An Poul-Henning Kamp Aq phk@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@linpro.no .
+.An Dag-Erling Sm\(/orgrav Aq des@des.no .
diff --git a/bin/varnishhist/varnishhist.c b/bin/varnishhist/varnishhist.c
@@ -4,7 +4,7 @@
  * All rights reserved.
  *
  * Author: Poul-Henning Kamp <phk@phk.freebsd.dk>
- * Author: Dag-Erling Smørgrav <des@linpro.no>
+ * Author: Dag-Erling Smørgrav <des@des.no>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions

diff --git a/bin/varnishlog/varnishlog.1 b/bin/varnishlog/varnishlog.1
@@ -3,7 +3,7 @@
 .\" Copyright (c) 2006-2008 Linpro AS
 .\" All rights reserved.
 .\"
-.\" Author: Dag-Erling Smørgrav <des@linpro.no>
+.\" Author: Dag-Erling Smørgrav <des@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 @@ utility was developed by
 .An Poul-Henning Kamp Aq phk@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@linpro.no .
+.An Dag-Erling Sm\(/orgrav Aq des@des.no .
diff --git a/bin/varnishncsa/varnishncsa.1 b/bin/varnishncsa/varnishncsa.1
@@ -3,7 +3,7 @@
 .\" Copyright (c) 2006-2008 Linpro AS
 .\" All rights reserved.
 .\"
-.\" Author: Dag-Erling Smørgrav <des@linpro.no>
+.\" Author: Dag-Erling Smørgrav <des@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 @@ utility was developed by
 .An Poul-Henning Kamp Aq phk@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@linpro.no .
+.An Dag-Erling Sm\(/orgrav Aq des@des.no .
diff --git a/bin/varnishstat/varnishstat.1 b/bin/varnishstat/varnishstat.1
@@ -3,7 +3,7 @@
 .\" Copyright (c) 2006-2008 Linpro AS
 .\" All rights reserved.
 .\"
-.\" Author: Dag-Erling Smørgrav <des@linpro.no>
+.\" Author: Dag-Erling Smørgrav <des@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 @@ utility was originally developed by
 .An Poul-Henning Kamp Aq phk@phk.freebsd.dk
 in cooperation with Verdens Gang AS and Linpro AS, and later
 substantially rewritten by
-.An Dag-Erling Sm\(/orgrav Aq des@linpro.no .
+.An Dag-Erling Sm\(/orgrav Aq des@des.no .
 This manual page was written by
-.An Dag-Erling Sm\(/orgrav Aq des@linpro.no .
+.An Dag-Erling Sm\(/orgrav Aq des@des.no .
diff --git a/bin/varnishstat/varnishstat.c b/bin/varnishstat/varnishstat.c
@@ -4,7 +4,7 @@
  * All rights reserved.
  *
  * Author: Poul-Henning Kamp <phk@phk.freebsd.dk>
- * Author: Dag-Erling Smørgrav <des@linpro.no>
+ * Author: Dag-Erling Smørgrav <des@des.no>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions

diff --git a/bin/varnishtop/varnishtop.1 b/bin/varnishtop/varnishtop.1
@@ -3,7 +3,7 @@
 .\" Copyright (c) 2006-2008 Linpro AS
 .\" All rights reserved.
 .\"
-.\" Author: Dag-Erling Smørgrav <des@linpro.no>
+.\" Author: Dag-Erling Smørgrav <des@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 @@ utility was originally developed by
 .An Poul-Henning Kamp Aq phk@phk.freebsd.dk
 in cooperation with Verdens Gang AS and Linpro AS, and later
 substantially rewritten by
-.An Dag-Erling Sm\(/orgrav Aq des@linpro.no .
+.An Dag-Erling Sm\(/orgrav Aq des@des.no .
 This manual page was written by
-.An Dag-Erling Sm\(/orgrav Aq des@linpro.no .
+.An Dag-Erling Sm\(/orgrav Aq des@des.no .
diff --git a/bin/varnishtop/varnishtop.c b/bin/varnishtop/varnishtop.c
@@ -4,7 +4,7 @@
  * All rights reserved.
  *
  * Author: Poul-Henning Kamp <phk@phk.freebsd.dk>
- * Author: Dag-Erling Smørgrav <des@linpro.no>
+ * Author: Dag-Erling Smørgrav <des@des.no>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions

diff --git a/include/compat/asprintf.h b/include/compat/asprintf.h
@@ -3,7 +3,7 @@
  * Copyright (c) 2006-2008 Linpro AS
  * All rights reserved.
  *
- * Author: Dag-Erling Smørgrav <des@linpro.no>
+ * Author: Dag-Erling Smørgrav <des@des.no>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions

diff --git a/include/compat/daemon.h b/include/compat/daemon.h
@@ -3,7 +3,7 @@
  * Copyright (c) 2006-2008 Linpro AS
  * All rights reserved.
  *
- * Author: Dag-Erling Smørgrav <des@linpro.no>
+ * Author: Dag-Erling Smørgrav <des@des.no>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions

diff --git a/include/compat/setproctitle.h b/include/compat/setproctitle.h
@@ -3,7 +3,7 @@
  * Copyright (c) 2006-2008 Linpro AS
  * All rights reserved.
  *
- * Author: Dag-Erling Smørgrav <des@linpro.no>
+ * Author: Dag-Erling Smørgrav <des@des.no>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions

diff --git a/include/compat/srandomdev.h b/include/compat/srandomdev.h
@@ -3,7 +3,7 @@
  * Copyright (c) 2006-2008 Linpro AS
  * All rights reserved.
  *
- * Author: Dag-Erling Smørgrav <des@linpro.no>
+ * Author: Dag-Erling Smørgrav <des@des.no>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions

diff --git a/include/compat/strlcat.h b/include/compat/strlcat.h
@@ -3,7 +3,7 @@
  * Copyright (c) 2006-2008 Linpro AS
  * All rights reserved.
  *
- * Author: Dag-Erling Smørgrav <des@linpro.no>
+ * Author: Dag-Erling Smørgrav <des@des.no>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions

diff --git a/include/compat/strlcpy.h b/include/compat/strlcpy.h
@@ -3,7 +3,7 @@
  * Copyright (c) 2006-2008 Linpro AS
  * All rights reserved.
  *
- * Author: Dag-Erling Smørgrav <des@linpro.no>
+ * Author: Dag-Erling Smørgrav <des@des.no>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions

diff --git a/include/compat/strndup.h b/include/compat/strndup.h
@@ -3,7 +3,7 @@
  * Copyright (c) 2006-2008 Linpro AS
  * All rights reserved.
  *
- * Author: Dag-Erling Smørgrav <des@linpro.no>
+ * Author: Dag-Erling Smørgrav <des@des.no>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions

diff --git a/include/compat/vasprintf.h b/include/compat/vasprintf.h
@@ -3,7 +3,7 @@
  * Copyright (c) 2006-2008 Linpro AS
  * All rights reserved.
  *
- * Author: Dag-Erling Smørgrav <des@linpro.no>
+ * Author: Dag-Erling Smørgrav <des@des.no>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions

diff --git a/lib/libvarnish/version.c b/lib/libvarnish/version.c
@@ -3,7 +3,7 @@
  * Copyright (c) 2006-2008 Linpro AS
  * All rights reserved.
  *
- * Author: Dag-Erling Smørgrav <des@linpro.no>
+ * Author: Dag-Erling Smørgrav <des@des.no>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions

diff --git a/lib/libvarnish/vss.c b/lib/libvarnish/vss.c
@@ -3,7 +3,7 @@
  * Copyright (c) 2006-2008 Linpro AS
  * All rights reserved.
  *
- * Author: Dag-Erling Smørgrav <des@linpro.no>
+ * Author: Dag-Erling Smørgrav <des@des.no>
  * Author: Cecilie Fritzvold <cecilihf@linpro.no>
  *
  * Redistribution and use in source and binary forms, with or without

diff --git a/lib/libvarnishapi/instance.c b/lib/libvarnishapi/instance.c
@@ -2,7 +2,7 @@
  * Copyright (c) 2007-2008 Linpro AS
  * All rights reserved.
  *
- * Author: Dag-Erling Smørgrav <des@linpro.no>
+ * Author: Dag-Erling Smørgrav <des@des.no>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions

diff --git a/lib/libvarnishcompat/asprintf.c b/lib/libvarnishcompat/asprintf.c
@@ -3,7 +3,7 @@
  * Copyright (c) 2006-2008 Linpro AS
  * All rights reserved.
  *
- * Author: Dag-Erling Smørgrav <des@linpro.no>
+ * Author: Dag-Erling Smørgrav <des@des.no>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions

diff --git a/lib/libvarnishcompat/setproctitle.c b/lib/libvarnishcompat/setproctitle.c
@@ -3,7 +3,7 @@
  * Copyright (c) 2006-2008 Linpro AS
  * All rights reserved.
  *
- * Author: Dag-Erling Smørgrav <des@linpro.no>
+ * Author: Dag-Erling Smørgrav <des@des.no>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions

diff --git a/lib/libvarnishcompat/srandomdev.c b/lib/libvarnishcompat/srandomdev.c
@@ -3,7 +3,7 @@
  * Copyright (c) 2006-2008 Linpro AS
  * All rights reserved.
  *
- * Author: Dag-Erling Smørgrav <des@linpro.no>
+ * Author: Dag-Erling Smørgrav <des@des.no>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions

diff --git a/lib/libvarnishcompat/strndup.c b/lib/libvarnishcompat/strndup.c
@@ -3,7 +3,7 @@
  * Copyright (c) 2006-2008 Linpro AS
  * All rights reserved.
  *
- * Author: Dag-Erling Smørgrav <des@linpro.no>
+ * Author: Dag-Erling Smørgrav <des@des.no>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions

diff --git a/lib/libvarnishcompat/vasprintf.c b/lib/libvarnishcompat/vasprintf.c
@@ -3,7 +3,7 @@
  * Copyright (c) 2006-2008 Linpro AS
  * All rights reserved.
  *
- * Author: Dag-Erling Smørgrav <des@linpro.no>
+ * Author: Dag-Erling Smørgrav <des@des.no>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions

diff --git a/man/vcl.7 b/man/vcl.7
@@ -3,7 +3,7 @@
 .\" Copyright (c) 2006-2008 Linpro AS
 .\" All rights reserved.
 .\"
-.\" Author: Dag-Erling Smørgrav <des@linpro.no>
+.\" Author: Dag-Erling Smørgrav <des@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 @@ language was developed by
 .An Poul-Henning Kamp Aq phk@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@linpro.no .
+.An Dag-Erling Sm\(/orgrav Aq des@des.no .