replace old url with pandoc.org

13 files changed, 14 insertions, 14 deletions

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index ab77c4b3b..7e1e575a8 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -203,8 +203,8 @@ The library is structured as follows:
 
 [pandoc-discuss]: http://groups.google.com/group/pandoc-discuss
 [issue tracker]: https://github.com/jgm/pandoc/issues
-[User's Guide]: http://johnmacfarlane.net/pandoc/README.html
-[FAQs]:  http://johnmacfarlane.net/pandoc/faqs.html
+[User's Guide]: http://pandoc.org/README.html
+[FAQs]:  http://pandoc.org/faqs.html
 [EditorConfig]: http://editorconfig.org/
 [Haskell platform]: http://www.haskell.org/platform/
 [hsb2hs]: http://hackage.haskell.org/package/hsb2hs
diff --git a/COPYRIGHT b/COPYRIGHT
index 834bd5e84..19b532129 100644
--- a/COPYRIGHT
+++ b/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://johnmacfarlane.net/pandoc/
+[Pandoc home page]: http://pandoc.org
 
 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/HCAR-Pandoc.tex b/HCAR-Pandoc.tex
index 5b6a4d56f..a91ca0b25 100644
--- a/HCAR-Pandoc.tex
+++ b/HCAR-Pandoc.tex
@@ -31,5 +31,5 @@ These last two changes bring two of the most powerful features of \LaTeX
 to pandoc.
 
 \FurtherReading
-    \url{http://johnmacfarlane.net/pandoc/}
+    \url{http://pandoc.org}
 \end{hcarentry}
diff --git a/man/man1/pandoc.1.template b/man/man1/pandoc.1.template
index 00e7675e7..adef38bcc 100644
--- a/man/man1/pandoc.1.template
+++ b/man/man1/pandoc.1.template
@@ -13,4 +13,4 @@ see \f[C]pandoc_markdown\f[] (5).
 \f[C]pandoc_markdown\f[] (5).
 .PP
 The Pandoc source code and all documentation may be downloaded
-from <http://johnmacfarlane.net/pandoc/>.
+from <http://pandoc.org>.
diff --git a/pandoc.cabal b/pandoc.cabal
index 2bff50e5e..808afadad 100644
--- a/pandoc.cabal
+++ b/pandoc.cabal
@@ -9,7 +9,7 @@ Author:          John MacFarlane <jgm@berkeley.edu>
 Maintainer:      John MacFarlane <jgm@berkeley.edu>
 Bug-Reports:     https://github.com/jgm/pandoc/issues
 Stability:       alpha
-Homepage:        http://johnmacfarlane.net/pandoc
+Homepage:        http://pandoc.org
 Category:        Text
 Tested-With:     GHC == 7.4.2, GHC == 7.6.3, GHC == 7.8.2
 Synopsis:        Conversion between markup formats
diff --git a/pandoc.hs b/pandoc.hs
index c2841a201..df50d01d0 100644
--- a/pandoc.hs
+++ b/pandoc.hs
@@ -80,7 +80,7 @@ copyrightMessage :: String
 copyrightMessage = intercalate "\n" [
   "",
   "Copyright (C) 2006-2015 John MacFarlane",
-  "Web:  http://johnmacfarlane.net/pandoc",
+  "Web:  http://pandoc.org",
   "This is free software; see the source for copying conditions.",
   "There is no warranty, not even for merchantability or fitness",
   "for a particular purpose." ]
diff --git a/tests/docx/links.native b/tests/docx/links.native
index cd7ab6fb6..a05578100 100644
--- a/tests/docx/links.native
+++ b/tests/docx/links.native
@@ -1,6 +1,6 @@
 [Header 2 ("an-internal-link-and-an-external-link",[],[]) [Str "An",Space,Str "internal",Space,Str "link",Space,Str "and",Space,Str "an",Space,Str "external",Space,Str "link"]
 ,Para [Str "An",Space,Link [Str "external",Space,Str "link"] ("http://google.com",""),Space,Str "to",Space,Str "a",Space,Str "popular",Space,Str "website."]
-,Para [Str "An",Space,Link [Str "external",Space,Str "link"] ("http://johnmacfarlane.net/pandoc/README.html#synopsis",""),Space,Str "to",Space,Str "a",Space,Str "website",Space,Str "with",Space,Str "an",Space,Str "anchor."]
+,Para [Str "An",Space,Link [Str "external",Space,Str "link"] ("http://pandoc.org/README.html#synopsis",""),Space,Str "to",Space,Str "a",Space,Str "website",Space,Str "with",Space,Str "an",Space,Str "anchor."]
 ,Para [Str "An",Space,Link [Str "internal",Space,Str "link"] ("#a-section-for-testing-link-targets",""),Space,Str "to",Space,Str "a",Space,Str "section",Space,Str "header."]
 ,Para [Str "An",Space,Link [Str "internal",Space,Str "link"] ("#my_bookmark",""),Space,Str "to",Space,Str "a",Space,Str "bookmark."]
 ,Header 2 ("a-section-for-testing-link-targets",[],[]) [Str "A",Space,Str "section",Space,Str "for",Space,Str "testing",Space,Str "link",Space,Str "targets"]
diff --git a/tests/docx/links_writer.native b/tests/docx/links_writer.native
index cc00e4326..25f4f90f9 100644
--- a/tests/docx/links_writer.native
+++ b/tests/docx/links_writer.native
@@ -1,6 +1,6 @@
 [Header 2 ("an-internal-link-and-an-external-link",[],[]) [Str "An",Space,Str "internal",Space,Str "link",Space,Str "and",Space,Str "an",Space,Str "external",Space,Str "link"]
 ,Para [Str "An",Space,Link [Str "external",Space,Str "link"] ("http://google.com",""),Space,Str "to",Space,Str "a",Space,Str "popular",Space,Str "website."]
-,Para [Str "An",Space,Link [Str "external",Space,Str "link"] ("http://johnmacfarlane.net/pandoc/README.html#synopsis",""),Space,Str "to",Space,Str "a",Space,Str "website",Space,Str "with",Space,Str "an",Space,Str "anchor."]
+,Para [Str "An",Space,Link [Str "external",Space,Str "link"] ("http://pandoc.org/README.html#synopsis",""),Space,Str "to",Space,Str "a",Space,Str "website",Space,Str "with",Space,Str "an",Space,Str "anchor."]
 ,Para [Str "An",Space,Link [Str "internal",Space,Str "link"] ("#a-section-for-testing-link-targets",""),Space,Str "to",Space,Str "a",Space,Str "section",Space,Str "header."]
 ,Para [Str "An",Space,Link [Str "internal",Space,Str "link"] ("#my_bookmark",""),Space,Str "to",Space,Str "a",Space,Str "bookmark."]
 ,Header 2 ("a-section-for-testing-link-targets",[],[]) [Str "A",Space,Str "section",Space,Str "for",Space,Str "testing",Space,Str "link",Space,Str "targets"]]
diff --git a/tests/mediawiki-reader.native b/tests/mediawiki-reader.native
index 2e97e9484..2f508c32f 100644
--- a/tests/mediawiki-reader.native
+++ b/tests/mediawiki-reader.native
@@ -72,7 +72,7 @@ Pandoc (Meta {unMeta = fromList []})
 ,Para [Str "Nother",Space,Str "paragraph."]
 ,Header 2 ("external-links",[],[]) [Str "external",Space,Str "links"]
 ,Para [Link [Emph [Str "Google"],Space,Str "search",Space,Str "engine"] ("http://google.com","")]
-,Para [Link [Str "http://johnmacfarlane.net/pandoc/"] ("http://johnmacfarlane.net/pandoc/","")]
+,Para [Link [Str "http://pandoc.org"] ("http://pandoc.org","")]
 ,Para [Link [Str "1"] ("http://google.com",""),Space,Link [Str "2"] ("http://yahoo.com","")]
 ,Para [Link [Str "email",Space,Str "me"] ("mailto:info@example.org","")]
 ,Header 2 ("internal-links",[],[]) [Str "internal",Space,Str "links"]
diff --git a/tests/mediawiki-reader.wiki b/tests/mediawiki-reader.wiki
index 6a6bc226d..f30dafa33 100644
--- a/tests/mediawiki-reader.wiki
+++ b/tests/mediawiki-reader.wiki
@@ -141,7 +141,7 @@ Nother paragraph.
 
 [http://google.com ''Google'' search engine]
 
-http://johnmacfarlane.net/pandoc/
+http://pandoc.org
 
 [http://google.com] [http://yahoo.com]
 
diff --git a/tests/twiki-reader.native b/tests/twiki-reader.native
index bde55a378..6e199a1a9 100644
--- a/tests/twiki-reader.native
+++ b/tests/twiki-reader.native
@@ -44,7 +44,7 @@ Pandoc (Meta {unMeta = fromList []})
 ,Para [Str "Nother",Space,Str "paragraph."]
 ,Header 1 ("external-links",[],[]) [Str "external",Space,Str "links"]
 ,Para [Link [Emph [Str "Google"],Space,Str "search",Space,Str "engine"] ("http://google.com","")]
-,Para [Link [Str "http://johnmacfarlane.net/pandoc/"] ("http://johnmacfarlane.net/pandoc/","")]
+,Para [Link [Str "http://pandoc.org"] ("http://pandoc.org","")]
 ,Para [Link [Str "http://google.com"] ("http://google.com",""),Space,Link [Str "http://yahoo.com"] ("http://yahoo.com","")]
 ,Para [Link [Str "email",Space,Str "me"] ("mailto:info@example.org","")]
 ,Para [Str "http://google.com"]
diff --git a/tests/twiki-reader.twiki b/tests/twiki-reader.twiki
index 51828ef80..c2df10573 100644
--- a/tests/twiki-reader.twiki
+++ b/tests/twiki-reader.twiki
@@ -97,7 +97,7 @@ Nother paragraph.
 
 [[http://google.com][<i>Google</i> search engine]]
 
-http://johnmacfarlane.net/pandoc/
+http://pandoc.org
 
 [[http://google.com]] [[http://yahoo.com]]
 
diff --git a/windows/pandoc.wxs b/windows/pandoc.wxs
index 3e94c46fe..083c61d32 100644
--- a/windows/pandoc.wxs
+++ b/windows/pandoc.wxs
@@ -15,7 +15,7 @@
         Minimum='0.0.0.0'  IncludeMinimum='yes'

         Maximum="99.0.0.0" IncludeMaximum="no" />

     </Upgrade>

-    <Property Id="ARPURLINFOABOUT" Value="http://johnmacfarlane.net/pandoc/" />

+    <Property Id="ARPURLINFOABOUT" Value="http://pandoc.org" />

 

     <InstallExecuteSequence>

       <RemoveExistingProducts After="InstallFinalize"/>