summaryrefslogtreecommitdiff
path: root/man/pandoc.1
diff options
context:
space:
mode:
authorJohn MacFarlane <jgm@berkeley.edu>2015-07-10 11:55:05 -0700
committerJohn MacFarlane <jgm@berkeley.edu>2015-07-10 11:55:05 -0700
commit0bd5873977e8cb3afaf84e0d3d5192f140ea72e5 (patch)
tree68e6f1c7d14e97337752eccb835125ea241861be /man/pandoc.1
parentf5027d016761f39ca5855e7bdecd737f4afc559f (diff)
Updated man page.
Diffstat (limited to 'man/pandoc.1')
-rw-r--r--man/pandoc.130
1 files changed, 16 insertions, 14 deletions
diff --git a/man/pandoc.1 b/man/pandoc.1
index 5ec346173..76fa62910 100644
--- a/man/pandoc.1
+++ b/man/pandoc.1
@@ -486,8 +486,9 @@ See TEMPLATES below for a description of template syntax.
If no extension is specified, an extension corresponding to the writer
will be added, so that \f[C]\-\-template=special\f[] looks for
\f[C]special.html\f[] for HTML output.
-If the template is not found, pandoc will search for it in the user data
-directory (see \f[C]\-\-data\-dir\f[]).
+If the template is not found, pandoc will search for it in the
+\f[C]templates\f[] subdirectory of the user data directory (see
+\f[C]\-\-data\-dir\f[]).
If this option is not used, a default template appropriate for the
output format will be used (see
\f[C]\-D/\-\-print\-default\-template\f[]).
@@ -4297,9 +4298,9 @@ This software carries no warranty of any kind.
.PP
Contributors include Aaron Wolen, Albert Krewinkel, Alexander
Kondratskiy, Alexander Sulfrian, Alexander V Vershilov, Alfred
-Wechselberger, Andreas Lööw, Antoine Latter, Arlo O\[aq]Keeffe, Artyom
-Kazak, Ben Gamari, Beni Cherniavsky\-Paskin, Bjorn Buckwalter, Bradley
-Kuhn, Brent Yorgey, Bryan O\[aq]Sullivan, B.
+Wechselberger, Andreas Lööw, Andrew Dunning, Antoine Latter, Arlo
+O\[aq]Keeffe, Artyom Kazak, Ben Gamari, Beni Cherniavsky\-Paskin, Bjorn
+Buckwalter, Bradley Kuhn, Brent Yorgey, Bryan O\[aq]Sullivan, B.
Scott Michel, Caleb McDaniel, Calvin Beck, Christoffer Ackelman,
Christoffer Sawicki, Clare Macrae, Clint Adams, Conal Elliott, Craig S.
Bosma, Daniel Bergey, Daniel T.
@@ -4310,8 +4311,8 @@ Barral, Fyodor Sheremetyev, Gabor Pali, Gavin Beatty, Greg Maslov,
Grégory Bataille, Greg Rundlett, gwern, Gwern Branwen, Hans\-Peter
Deifel, Henry de Valence, Ilya V.
Portnov, infinity0x, Jaime Marquínez Ferrándiz, James Aspnes, Jamie F.
-Olson, Jason Ronallo, Jeff Arnold, Jeff Runningen, Jens Petersen, Jérémy
-Bobbio, Jesse Rosenthal, J.
+Olson, Jan Larres, Jason Ronallo, Jeff Arnold, Jeff Runningen, Jens
+Petersen, Jérémy Bobbio, Jesse Rosenthal, J.
Lewis Muir, Joe Hillenbrand, John MacFarlane, Jonas Smedegaard, Jonathan
Daugherty, Josef Svenningsson, Jose Luis Duran, Julien Cretel, Justin
Bogner, Kelsey Hightower, Konstantin Zudov, Lars\-Dominik Braun, Luke
@@ -4320,13 +4321,14 @@ Mathias Schenner, Matthew Pickering, Matthias C.
M.
Troffaes, Max Bolingbroke, Max Rydahl Andersen, mb21, Merijn
Verstraaten, Michael Snoyman, Michael Thompson, MinRK, Nathan Gass, Neil
-Mayhew, Nick Bart, Nicolas Kaiser, Nikolay Yakimov, Paulo Tanimoto, Paul
-Rivier, Peter Wang, Philippe Ombredanne, Phillip Alday, Puneeth
-Chaganti, qerub, Ralf Stephan, Recai Oktaş, rodja.trappe, RyanGlScott,
-Scott Morrison, Sergei Trofimovich, Sergey Astanin, Shahbaz Youssefi,
-Shaun Attfield, shreevatsa.public, Simon Hengel, Sumit Sahrawat,
-takahashim, thsutton, Tim Lin, Timothy Humphries, Todd Sifleet, Tom
-Leese, Uli Köhler, Václav Zeman, Viktor Kronvall, Vincent, and Wikiwide.
+Mayhew, Nick Bart, Nicolas Kaiser, Nikolay Yakimov, nkalvi, Paulo
+Tanimoto, Paul Rivier, Peter Wang, Philippe Ombredanne, Phillip Alday,
+Puneeth Chaganti, qerub, Ralf Stephan, Recai Oktaş, rodja.trappe,
+RyanGlScott, Scott Morrison, Sergei Trofimovich, Sergey Astanin, Shahbaz
+Youssefi, Shaun Attfield, shreevatsa.public, Simon Hengel, Sumit
+Sahrawat, takahashim, thsutton, Tim Lin, Timothy Humphries, Todd
+Sifleet, Tom Leese, Uli Köhler, Václav Zeman, Viktor Kronvall, Vincent,
+Wikiwide, and Xavier Olive.
.PP
The Pandoc source code and all documentation may be downloaded
from <http://pandoc.org>.