Changed pandoc home page to http://johnmacfarlane.net/pandoc/.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1014 788f1e2b-df1e-0410-8736-df70ead52e1b

10 files changed, 12 insertions, 12 deletions

diff --git a/debian/control b/debian/control
index 402859536..18f958a52 100644
--- a/debian/control
+++ b/debian/control
@@ -33,7 +33,7 @@ Description: general markup converter
  this native representation into a target format. Thus, adding an input
  or output format requires only adding a reader or writer.
  .
-  Homepage: http://sophos.berkeley.edu/macfarlane/pandoc/
+  Homepage: http://johnmacfarlane.net/pandoc/
 
 Package: libghc6-pandoc-dev
 Section: libdevel
@@ -62,7 +62,7 @@ Description: general markup converter
  .
  This package contains the libraries compiled for GHC 6.
  .
-  Homepage: http://sophos.berkeley.edu/macfarlane/pandoc/
+  Homepage: http://johnmacfarlane.net/pandoc/
 
 Package: pandoc-doc
 Section: doc
@@ -89,4 +89,4 @@ Description: general markup converter
  .
  This package contains the library documentation for Pandoc.
  .
-  Homepage: http://sophos.berkeley.edu/macfarlane/pandoc/
+  Homepage: http://johnmacfarlane.net/pandoc/
diff --git a/debian/copyright b/debian/copyright
index 75cec29d2..d5511ed59 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -25,7 +25,7 @@ GPL can be found in `/usr/share/common-licenses/GPL`.
 
 Pandoc's complete source code is available from the [Pandoc home page].
 
-[Pandoc home page]: http://sophos.berkeley.edu/macfarlane/pandoc/ 
+[Pandoc home page]: http://johnmacfarlane.net/pandoc/
 
 Pandoc includes some code from other authors.  The copyright and license
 statements for these sources are included below.  All are GPL-compatible
diff --git a/freebsd/pkg-descr b/freebsd/pkg-descr
index c81eb4601..1ef530270 100644
--- a/freebsd/pkg-descr
+++ b/freebsd/pkg-descr
@@ -16,4 +16,4 @@ representation of the document, and a set of writers, which convert
 this native representation into a target format. Thus, adding an input
 or output format requires only adding a reader or writer.
 
-WWW: http://sophos.berkeley.edu/macfarlane/pandoc/
+WWW: http://johnmacfarlane.net/pandoc/
diff --git a/macports/Portfile.in b/macports/Portfile.in
index e320e77f2..106380c82 100644
--- a/macports/Portfile.in
+++ b/macports/Portfile.in
@@ -13,7 +13,7 @@ long_description    \
     HTML, and LaTeX, and it can write markdown, reStructuredText, HTML, \
     LaTeX, ConTeXt, DocBook, RTF, groff man pages, and S5 HTML slide shows.
 
-homepage            http://sophos.berkeley.edu/pandoc/
+homepage            http://johnmacfarlane.net/pandoc/
 platforms           darwin
 master_sites        http://pandoc.googlecode.com/files/
 checksums           md5 @TARBALLMD5SUM@
diff --git a/man/man1/hsmarkdown.1.md b/man/man1/hsmarkdown.1.md
index 2b6b7821b..f433cad83 100644
--- a/man/man1/hsmarkdown.1.md
+++ b/man/man1/hsmarkdown.1.md
@@ -39,4 +39,4 @@ will be interpreted as filenames, as they are by `Markdown.pl`.)
 file distributed with Pandoc contains full documentation.
 
 The Pandoc source code and all documentation may be downloaded from
-<http://sophos.berkeley.edu/macfarlane/pandoc/>.
+<http://johnmacfarlane.net/pandoc/>.
diff --git a/man/man1/pandoc.1.md b/man/man1/pandoc.1.md
index f0611fe82..f84082bad 100644
--- a/man/man1/pandoc.1.md
+++ b/man/man1/pandoc.1.md
@@ -176,5 +176,5 @@ to Pandoc.  Or use `html2markdown`(1), a wrapper around `pandoc`.
 The *README* file distributed with Pandoc contains full documentation.
 
 The Pandoc source code and all documentation may be downloaded from
-<http://sophos.berkeley.edu/macfarlane/pandoc/>.
+<http://johnmacfarlane.net/pandoc/>.
 
diff --git a/pandoc.cabal b/pandoc.cabal
index e127e6169..a37d0029c 100644
--- a/pandoc.cabal
+++ b/pandoc.cabal
@@ -6,7 +6,7 @@ Copyright:       (c) 2006-2007 John MacFarlane
 Author:          John MacFarlane <jgm@berkeley.edu>
 Maintainer:      John MacFarlane <jgm@berkeley.edu>
 Stability:       alpha
-Homepage:        http://sophos.berkeley.edu/macfarlane/pandoc
+Homepage:        http://johnmacfarlane.net/pandoc
 Package-URL:     http://pandoc.googlecode.com/files/pandoc-0.4.tar.gz
 Category:        Text
 Tested-With:     GHC
diff --git a/src/Main.hs b/src/Main.hs
index 97acc62c2..6d924847f 100644
--- a/src/Main.hs
+++ b/src/Main.hs
@@ -47,7 +47,7 @@ version = "0.45"
 
 copyrightMessage :: String
 copyrightMessage = "\nCopyright (C) 2006-7 John MacFarlane\n\
-                    \Web:  http://sophos.berkeley.edu/macfarlane/pandoc\n\
+                    \Web:  http://johnmacfarlane.net/pandoc\n\
                     \This is free software; see the source for copying conditions.  There is no\n\
                     \warranty, not even for merchantability or fitness for a particular purpose."
 
diff --git a/web/footer.html b/web/footer.html
index 8798c2562..5cf54329f 100644
--- a/web/footer.html
+++ b/web/footer.html
@@ -1,4 +1,4 @@
 <div id="footer">
-  &copy; 2006-2007 <a href="http://sophos.berkeley.edu/macfarlane/">John MacFarlane</a>
+  &copy; 2006-2007 <a href="http://johnmacfarlane.net/">John MacFarlane</a>
 </div>
 
diff --git a/web/index.txt.in b/web/index.txt.in
index c3150bc26..3f947f4de 100644
--- a/web/index.txt.in
+++ b/web/index.txt.in
@@ -166,7 +166,7 @@ kind.
 [much faster]: http://code.google.com/p/pandoc/wiki/Benchmarks
 [ASCIIMathML]: http://www1.chapman.edu/~jipsen/mathml/asciimath.html
  
-[John MacFarlane]: http://sophos.berkeley.edu/macfarlane/
+[John MacFarlane]: http://johnmacfarlane.net/
 [markdown]: http://daringfireball.net/projects/markdown/
 [reStructuredText]: http://docutils.sourceforge.net/docs/ref/rst/introduction.html
 [S5]: http://meyerweb.com/eric/tools/s5/