@@ -1,33 +1,40 @@
1−Templates for [pandoc](http://github.com/jgm/pandoc).
1+The [pandoc-templates] repository contains default templates for [pandoc].
22
3−If you use custom templates, we recommend forking this repository,
4−so that you can integrate changes to the default templates in future
5−pandoc releases.
3+If you use custom templates, we recommend forking this
4+repository, so that you can integrate changes to the default
5+templates in future pandoc releases.
6+
7+This repository is a subtree of [pandoc]; it will be updated
8+each time there is a new pandoc release. However, changes to
9+templates are made first in [pandoc]; thus, issues and pull
10+requests should be made [pandoc]'s issue tracker rather than
11+here.
12+
13+[pandoc]: https://github.com/jgm/pandoc
14+[pandoc-templates]: https://github.com/jgm/pandoc-templates
615
716All of the templates in this repository are dual licensed, under both
817the GPL (v2 or higher, same as pandoc) and the BSD 3-clause license
918(included below).
1019
11−----
12−
13−Copyright (c) 2014, John MacFarlane
20+Copyright (c) 2014--2017, John MacFarlane
1421
1522All rights reserved.
1623
1724Redistribution and use in source and binary forms, with or without
1825modification, are permitted provided that the following conditions are met:
1926
20− * Redistributions of source code must retain the above copyright
21− notice, this list of conditions and the following disclaimer.
27+* Redistributions of source code must retain the above copyright
28+ notice, this list of conditions and the following disclaimer.
2229
23− * Redistributions in binary form must reproduce the above
24− copyright notice, this list of conditions and the following
25− disclaimer in the documentation and/or other materials provided
26− with the distribution.
30+* Redistributions in binary form must reproduce the above
31+ copyright notice, this list of conditions and the following
32+ disclaimer in the documentation and/or other materials provided
33+ with the distribution.
2734
28− * Neither the name of John MacFarlane nor the names of other
29− contributors may be used to endorse or promote products derived
30− from this software without specific prior written permission.
35+* Neither the name of John MacFarlane nor the names of other
36+ contributors may be used to endorse or promote products derived
37+ from this software without specific prior written permission.
3138
3239THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
3340"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT