@@ -7,7 +7,7 @@
77 - For PDF output, you'll also need to install LaTeX.
88 We recommend [MiKTeX](http://miktex.org/).
99
10− - If you'd prefer, you can extract the pandoc and pandoc-citeproc
10+ - If you'd prefer, you can extract the `pandoc` and `pandoc-citeproc`
1111 executables from the MSI and copy them directly to any directory,
1212 without running the installer. Here is an example showing how to
1313 extract the executables from the pandoc-1.19.1 installer and copy
@@ -21,6 +21,9 @@
2121
2222## macOS
2323
24+ - You can install pandoc using
25+ [homebrew](http://brew.sh): `brew install pandoc`.
26+
2427 - There is a package installer at pandoc's [download page].
2528 If you later want to uninstall the package, you can do so
2629 by downloading [this script][uninstaller]
@@ -36,9 +39,6 @@
3639 cat pandoc.pkg/Payload | gunzip -dc | cpio -i
3740 # executables are now in ./usr/bin/, man pages in ./usr/share/man
3841
39− - You can also install pandoc using
40− [homebrew](http://brew.sh): `brew install pandoc`.
41−
4242 - For PDF output, you'll also need LaTeX. Because a full [MacTeX]
4343 installation takes more than a gigabyte of disk space, we recommend
4444 installing [BasicTeX](http://www.tug.org/mactex/morepackages.html)
@@ -56,45 +56,36 @@
5656 old.
5757
5858 - We provide a binary package for amd64 architecture on
59− the [download page]. This provides both pandoc and
60− pandoc-citeproc. The executables are statically linked and
61− have no dynamic dependencies. Both a tarball and a deb
62− installer are provided.
59+ the [download page]. This provides both `pandoc` and
60+ `pandoc-citeproc`. The executables are statically linked and
61+ have no dynamic dependencies or dependencies on external
62+ data files. Note: because of the static
63+ linking, the pandoc binary from this package cannot use lua
64+ filters that require external lua modules written in C.
6365
64− sudo dpkg -i $DEB
65−
66− where `$DEB` is the path to the downloaded deb, will
67− install the `pandoc` and `pandoc-citeproc` executables
68− and man pages.
66+ Both a tarball and a deb installer are provided. To install the deb:
6967
70− Note: because it is statically linked, the pandoc
71− binary from this package cannot use lua filters that
72− require external lua modules written in C.
68+ sudo dpkg -i $DEB
7369
74− - If you use an RPM-based distro, you may be
75− able to install the deb from our download page
76− using `alien`. Or try
77−
78− ar p $DEB data.tar.xz | sudo tar xvJ --strip-components 2 -C /usr/local
79−
80− For Pandoc versions before 2.0 try instead
70+ where `$DEB` is the path to the downloaded deb. This will
71+ install the `pandoc` and `pandoc-citeproc` executables and
72+ man pages.
8173
82− ar p $DEB data.tar.gz | sudo tar xvz --strip-components 2 -C /usr/local
74+ If you use an RPM-based distro, you may be able to install
75+ the deb from our download page using `alien`.
8376
84− - If you'd rather install pandoc in your home directory, say
85− in `$HOME/.local`, then you can unzip the tarball or
86− extract the files manually from the deb:
77+ On any distro, you may install from the tarball into `$DEST`
78+ (say, `/usr/local/` or `$HOME/.local`) by doing
8779
88− ar p $DEB data.tar.xz | tar xvJ --strip-components 2 -C $HOME/.local/
80+ tar xvzf $TGZ --strip-components 1 -C $DEST
8981
90− where, again, `$DEB` is the path to the downloaded deb.
91−
92− For Pandoc versions before 2.0 try instead
82+ where `$TGZ` is the path to the downloaded zipped tarball.
83+ For Pandoc versions before 2.0, which don't provide
84+ a tarball, try instead
9385
94− ar p $DEB data.tar.gz | sudo tar xvz --strip-components 2 -C /usr/local
86+ ar p $DEB data.tar.gz | tar xvz --strip-components 2 -C $DEST
9587
96− - If the version in your repository is too old and you cannot
97− use the deb we provide, you can install from source, using the
88+ - You can also install from source, using the
9889 instructions below under [Compiling from source].
9990 Note that most distros have the Haskell platform in their
10091 package repositories. For example, on Debian/Ubuntu,