From 3462d2d1b6a056ac786692c524cdcef62724a980 Mon Sep 17 00:00:00 2001 From: fiddlosopher Date: Sun, 26 Aug 2007 15:41:45 +0000 Subject: Changes to website for new installation instructions. Removed OSX package. git-svn-id: https://pandoc.googlecode.com/svn/trunk@904 788f1e2b-df1e-0410-8736-df70ead52e1b --- Makefile | 2 ++ web/index.txt.in | 37 +++++++++---------------------------- 2 files changed, 11 insertions(+), 28 deletions(-) diff --git a/Makefile b/Makefile index 9a1916ebb..1229d1693 100644 --- a/Makefile +++ b/Makefile @@ -404,6 +404,8 @@ $(web_dest) : html $(wildcard $(web_src)/*) $(osx_src)/Welcome changelog \ cp changelog $(web_dest)/ ; \ cp README $(web_dest)/ ; \ cp INSTALL $(web_dest)/ ; \ + cp $(portfile) $(web_dest)/ ; \ + cp ../$(deb_main) $(web_dest)/ ; \ cp $(MANDIR)/man1/pandoc.1.md $(web_dest)/ ; \ cp $(MANDIR)/man1/*.1 $(web_dest)/ ; \ ) || { rm -rf $(web_dest); exit 1; } diff --git a/web/index.txt.in b/web/index.txt.in index 373880494..ec4b4b9f6 100644 --- a/web/index.txt.in +++ b/web/index.txt.in @@ -56,33 +56,14 @@ To see what pandoc can do, see the [demonstration page](examples.html). # Downloads -- [Source tarball]. - To install, unpack the archive and follow the instructions in the - [INSTALL](INSTALL.html) file. You'll need the [GHC] Haskell compiler, - version 6.6 or higher. - -- [MacOS X binary package]. - To install, just double-click the package icon in the disk - image. See the [installation notes](osx-notes.html) for important - information about setting your `PATH`. Note: This package was - compiled on a G4 Mac; it will also work on an Intel Mac via emulation. - -- [Windows binary package]. - The zip file contains the `pandoc.exe` command-line program (which - you should extract from the zip archive and put somewhere in your - PATH). See the included file `README.txt` for instructions - on using the program. Note: If you use [Cygwin], we recommend that - you compile Pandoc from source. This will give you access to the - wrapper scripts `markdown2pdf`, `html2markdown`, and `hsmarkdown`, - which are not included in the Windows binary package. - -- [FreeBSD port]. - -- [Debian linux package] (thanks to Recai Oktaş). This will also work - on Ubuntu and other Debian derivatives. To install, download the file - and type: - - sudo dpkg -i pandoc_@VERSION@_i386.deb +For installation instructions for all architectures, see +[INSTALL](INSTALL.html). + +- [Source tarball] +- [Windows binary package] +- [MacPorts Portfile] +- [FreeBSD port] +- [Debian linux package] (thanks to Recai Oktaş) # Code repository @@ -163,7 +144,7 @@ kind. [Source tarball]: http://code.google.com/p/pandoc/downloads/detail?name=pandoc-@VERSION@.tar.gz "Download source tarball from Pandoc's Google Code site" [MacOS X binary package]: http://code.google.com/p/pandoc/downloads/detail?name=pandoc-@VERSION@.dmg "Download Mac OS X disk image from Pandoc's Google Code site" [Windows binary package]: http://code.google.com/p/pandoc/downloads/detail?name=pandoc-@VERSION@.zip "Download Windows zip file from Pandoc's Google Code site" -[Cygwin]: http://www.cygwin.com/ "Cygwin - a linux-like environment for Windows" +[MacPorts Portfile]: Portfile [Debian linux package]: pandoc_@VERSION@_i386.deb [FreeBSD port]: http://www.freshports.org/textproc/pandoc/ [pandoc-announce]: http://groups.google.com/group/pandoc-announce -- cgit v1.2.3