git.iko.soy/typeable/pandoc
on master help sign in
replace old url with pandoc.org
c18e93cPablo Rodríguez
CONTRIBUTING.md+2−2
compare with master
unifiedsplit
@@ -203,8 +203,8 @@ The library is structured as follows:
203
203
204[pandoc-discuss]: http://groups.google.com/group/pandoc-discuss
204[pandoc-discuss]: http://groups.google.com/group/pandoc-discuss
205[issue tracker]: https://github.com/jgm/pandoc/issues
205[issue tracker]: https://github.com/jgm/pandoc/issues
206−[User's Guide]: http://johnmacfarlane.net/pandoc/README.html
206+[User's Guide]: http://pandoc.org/README.html
207−[FAQs]: http://johnmacfarlane.net/pandoc/faqs.html
207+[FAQs]: http://pandoc.org/faqs.html
208[EditorConfig]: http://editorconfig.org/
208[EditorConfig]: http://editorconfig.org/
209[Haskell platform]: http://www.haskell.org/platform/
209[Haskell platform]: http://www.haskell.org/platform/
210[hsb2hs]: http://hackage.haskell.org/package/hsb2hs
210[hsb2hs]: http://hackage.haskell.org/package/hsb2hs
COPYRIGHT+1−1
@@ -25,7 +25,7 @@ GPL can be found in `/usr/share/common-licenses/GPL`.
25
25
26Pandoc's complete source code is available from the [Pandoc home page].
26Pandoc's complete source code is available from the [Pandoc home page].
27
27
28−[Pandoc home page]: http://johnmacfarlane.net/pandoc/
28+[Pandoc home page]: http://pandoc.org
29
29
30Pandoc includes some code from other authors. The copyright and license
30Pandoc includes some code from other authors. The copyright and license
31statements for these sources are included below. All are GPL-compatible
31statements for these sources are included below. All are GPL-compatible
HCAR-Pandoc.tex+1−1
@@ -31,5 +31,5 @@ These last two changes bring two of the most powerful features of \LaTeX
31to pandoc.
31to pandoc.
32
32
33\FurtherReading
33\FurtherReading
34− \url{http://johnmacfarlane.net/pandoc/}
34+ \url{http://pandoc.org}
35\end{hcarentry}
35\end{hcarentry}
man/man1/pandoc.1.template+1−1
@@ -13,4 +13,4 @@ see \f[C]pandoc_markdown\f[] (5).
13\f[C]pandoc_markdown\f[] (5).
13\f[C]pandoc_markdown\f[] (5).
14.PP
14.PP
15The Pandoc source code and all documentation may be downloaded
15The Pandoc source code and all documentation may be downloaded
16−from <http://johnmacfarlane.net/pandoc/>.
16+from <http://pandoc.org>.
pandoc.cabal+1−1
@@ -9,7 +9,7 @@ Author: John MacFarlane <jgm@berkeley.edu>
9Maintainer: John MacFarlane <jgm@berkeley.edu>
9Maintainer: John MacFarlane <jgm@berkeley.edu>
10Bug-Reports: https://github.com/jgm/pandoc/issues
10Bug-Reports: https://github.com/jgm/pandoc/issues
11Stability: alpha
11Stability: alpha
12−Homepage: http://johnmacfarlane.net/pandoc
12+Homepage: http://pandoc.org
13Category: Text
13Category: Text
14Tested-With: GHC == 7.4.2, GHC == 7.6.3, GHC == 7.8.2
14Tested-With: GHC == 7.4.2, GHC == 7.6.3, GHC == 7.8.2
15Synopsis: Conversion between markup formats
15Synopsis: Conversion between markup formats
pandoc.hs+1−1
@@ -80,7 +80,7 @@ copyrightMessage :: String
80copyrightMessage = intercalate "\n" [
80copyrightMessage = intercalate "\n" [
81 "",
81 "",
82 "Copyright (C) 2006-2015 John MacFarlane",
82 "Copyright (C) 2006-2015 John MacFarlane",
83− "Web: http://johnmacfarlane.net/pandoc",
83+ "Web: http://pandoc.org",
84 "This is free software; see the source for copying conditions.",
84 "This is free software; see the source for copying conditions.",
85 "There is no warranty, not even for merchantability or fitness",
85 "There is no warranty, not even for merchantability or fitness",
86 "for a particular purpose." ]
86 "for a particular purpose." ]
tests/docx/links.native+1−1
@@ -1,6 +1,6 @@
1[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"]
1[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"]
2,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."]
2,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."]
3−,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."]
3+,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."]
4,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."]
4,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."]
5,Para [Str "An",Space,Link [Str "internal",Space,Str "link"] ("#my_bookmark",""),Space,Str "to",Space,Str "a",Space,Str "bookmark."]
5,Para [Str "An",Space,Link [Str "internal",Space,Str "link"] ("#my_bookmark",""),Space,Str "to",Space,Str "a",Space,Str "bookmark."]
6,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"]
6,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"]
tests/docx/links_writer.native+1−1
@@ -1,6 +1,6 @@
1[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"]
1[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"]
2,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."]
2,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."]
3−,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."]
3+,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."]
4,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."]
4,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."]
5,Para [Str "An",Space,Link [Str "internal",Space,Str "link"] ("#my_bookmark",""),Space,Str "to",Space,Str "a",Space,Str "bookmark."]
5,Para [Str "An",Space,Link [Str "internal",Space,Str "link"] ("#my_bookmark",""),Space,Str "to",Space,Str "a",Space,Str "bookmark."]
6,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"]]
6,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"]]
tests/mediawiki-reader.native+1−1
@@ -72,7 +72,7 @@ Pandoc (Meta {unMeta = fromList []})
72,Para [Str "Nother",Space,Str "paragraph."]
72,Para [Str "Nother",Space,Str "paragraph."]
73,Header 2 ("external-links",[],[]) [Str "external",Space,Str "links"]
73,Header 2 ("external-links",[],[]) [Str "external",Space,Str "links"]
74,Para [Link [Emph [Str "Google"],Space,Str "search",Space,Str "engine"] ("http://google.com","")]
74,Para [Link [Emph [Str "Google"],Space,Str "search",Space,Str "engine"] ("http://google.com","")]
75−,Para [Link [Str "http://johnmacfarlane.net/pandoc/"] ("http://johnmacfarlane.net/pandoc/","")]
75+,Para [Link [Str "http://pandoc.org"] ("http://pandoc.org","")]
76,Para [Link [Str "1"] ("http://google.com",""),Space,Link [Str "2"] ("http://yahoo.com","")]
76,Para [Link [Str "1"] ("http://google.com",""),Space,Link [Str "2"] ("http://yahoo.com","")]
77,Para [Link [Str "email",Space,Str "me"] ("mailto:info@example.org","")]
77,Para [Link [Str "email",Space,Str "me"] ("mailto:info@example.org","")]
78,Header 2 ("internal-links",[],[]) [Str "internal",Space,Str "links"]
78,Header 2 ("internal-links",[],[]) [Str "internal",Space,Str "links"]
tests/mediawiki-reader.wiki+1−1
@@ -141,7 +141,7 @@ Nother paragraph.
141
141
142[http://google.com ''Google'' search engine]
142[http://google.com ''Google'' search engine]
143
143
144−http://johnmacfarlane.net/pandoc/
144+http://pandoc.org
145
145
146[http://google.com] [http://yahoo.com]
146[http://google.com] [http://yahoo.com]
147
147
tests/twiki-reader.native+1−1
@@ -44,7 +44,7 @@ Pandoc (Meta {unMeta = fromList []})
44,Para [Str "Nother",Space,Str "paragraph."]
44,Para [Str "Nother",Space,Str "paragraph."]
45,Header 1 ("external-links",[],[]) [Str "external",Space,Str "links"]
45,Header 1 ("external-links",[],[]) [Str "external",Space,Str "links"]
46,Para [Link [Emph [Str "Google"],Space,Str "search",Space,Str "engine"] ("http://google.com","")]
46,Para [Link [Emph [Str "Google"],Space,Str "search",Space,Str "engine"] ("http://google.com","")]
47−,Para [Link [Str "http://johnmacfarlane.net/pandoc/"] ("http://johnmacfarlane.net/pandoc/","")]
47+,Para [Link [Str "http://pandoc.org"] ("http://pandoc.org","")]
48,Para [Link [Str "http://google.com"] ("http://google.com",""),Space,Link [Str "http://yahoo.com"] ("http://yahoo.com","")]
48,Para [Link [Str "http://google.com"] ("http://google.com",""),Space,Link [Str "http://yahoo.com"] ("http://yahoo.com","")]
49,Para [Link [Str "email",Space,Str "me"] ("mailto:info@example.org","")]
49,Para [Link [Str "email",Space,Str "me"] ("mailto:info@example.org","")]
50,Para [Str "http://google.com"]
50,Para [Str "http://google.com"]
tests/twiki-reader.twiki+1−1
@@ -97,7 +97,7 @@ Nother paragraph.
97
97
98[[http://google.com][<i>Google</i> search engine]]
98[[http://google.com][<i>Google</i> search engine]]
99
99
100−http://johnmacfarlane.net/pandoc/
100+http://pandoc.org
101
101
102[[http://google.com]] [[http://yahoo.com]]
102[[http://google.com]] [[http://yahoo.com]]
103
103
windows/pandoc.wxs+1−1
@@ -15,7 +15,7 @@
15 Minimum='0.0.0.0' IncludeMinimum='yes'
15 Minimum='0.0.0.0' IncludeMinimum='yes'
16 Maximum="99.0.0.0" IncludeMaximum="no" />
16 Maximum="99.0.0.0" IncludeMaximum="no" />
17 </Upgrade>
17 </Upgrade>
18− <Property Id="ARPURLINFOABOUT" Value="http://johnmacfarlane.net/pandoc/" />
18+ <Property Id="ARPURLINFOABOUT" Value="http://pandoc.org" />
19
19
20 <InstallExecuteSequence>
20 <InstallExecuteSequence>
21 <RemoveExistingProducts After="InstallFinalize"/>
21 <RemoveExistingProducts After="InstallFinalize"/>