summaryrefslogtreecommitdiff
path: root/doc/users/jasonblevins.mdwn
diff options
context:
space:
mode:
authorJoey Hess <joey@gnu.kitenet.net>2009-05-19 13:07:47 -0400
committerJoey Hess <joey@gnu.kitenet.net>2009-05-19 13:07:47 -0400
commitef003f48f4a3fe8fb67fda62c70a299b07d75976 (patch)
treecb5972026e6beed91b5eca2fa4962790244062bd /doc/users/jasonblevins.mdwn
parent53b1c6f559c1d09fbdbc28c8e4d5090dd455cd26 (diff)
parent4c5987d150b26f638494638f7861fb7646542a37 (diff)
Merge branch 'master' into po
Conflicts: debian/changelog
Diffstat (limited to 'doc/users/jasonblevins.mdwn')
-rw-r--r--doc/users/jasonblevins.mdwn2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/users/jasonblevins.mdwn b/doc/users/jasonblevins.mdwn
index 61c381d96..0030a30d3 100644
--- a/doc/users/jasonblevins.mdwn
+++ b/doc/users/jasonblevins.mdwn
@@ -47,7 +47,7 @@ welcome.
headers at top of a file (e.g., `title: Page Title` or
`date: November 2, 2008 11:14 EST`).
- * [pandoc][] - Markdown page processing via Pandoc. LaTeX and
+ * [pandoc][] - Markdown page processing via [Pandoc](http://johnmacfarlane.net/pandoc/) (a Haskell library for converting from one markup format to another). LaTeX and
reStructuredText are optional.
* [path][] - Provides path-specific template conditionals such as