Bläddra i källkod

Making ready for version 0.9.0_beta4

Jakob Truelsen 16 år sedan
förälder
incheckning
063f931152
1 ändrade filer med 22 tillägg och 14 borttagningar
  1. 22 14
      README

+ 22 - 14
README

@@ -1,4 +1,4 @@
-=======================> wkhtmltopdf 0.9.0 beta 3 Manual <=======================
+=======================> wkhtmltopdf 0.9.0 beta4 Manual <=======================
 This file documents wkhtmltopdf, a program capable of converting html documents
 into PDF documents.
 
@@ -27,7 +27,7 @@ Currently the list of features only supported with patch QT includes:
  * Disabling the smart shrink feature of webkit.
 
 ==================================> License <===================================
-Copyright (C) 2008,2009 WKHtmlToPdf Authors.
+Copyright (C) 2008,2009 Wkhtmltopdf Authors.
 
 
 
@@ -75,16 +75,16 @@ wkhtmltopdf [OPTIONS]... <input file> [More input files] <output file>
     --readme                          Output program readme
 -d, --dpi <dpi>                       Change the dpi explicitly (this has no
                                       effect on X11 based systems)
-    --page-height <unitread>          Page height (default unit millimeter)
-    --page-width <unitread>           Page width  (default unit millimeter)
+    --page-height <unitreal>          Page height (default unit millimeter)
+    --page-width <unitreal>           Page width  (default unit millimeter)
 -n, --disable-javascript              Do not allow web pages to run javascript
 -g, --grayscale                       PDF will be generated in grayscale
 -l, --lowquality                      Generates lower quality pdf/ps. Useful to
                                       shrink the result document space
--B, --margin-bottom <unitread>        Set the page bottom margin (default 10mm)
--L, --margin-left <unitread>          Set the page left margin (default 10mm)
--R, --margin-right <unitread>         Set the page right margin (default 10mm)
--T, --margin-top <unitread>           Set the page top margin (default 10mm)
+-B, --margin-bottom <unitreal>        Set the page bottom margin (default 10mm)
+-L, --margin-left <unitreal>          Set the page left margin (default 10mm)
+-R, --margin-right <unitreal>         Set the page right margin (default 10mm)
+-T, --margin-top <unitreal>           Set the page top margin (default 10mm)
     --redirect-delay <msec>           Wait some milliseconds for js-redirects
                                       (default 200)
     --enable-plugins                  Enable installed plugins (such as flash
@@ -234,11 +234,11 @@ function subst() {
 </body></html>
 
 
-As can be seen from the example the arguments are send to the header/footer html
-documents in get fashion.
+As can be seen from the example, the arguments are send to the header/footer
+html documents in get fashion.
 
 ==================================> Outlines <==================================
-Wkhtmltodpf with patched qt has support for PDF outlines also known as book
+Wkhtmltopdf with patched qt has support for PDF outlines also known as book
 marks, this can be enabled by specifying the --outline switch. The outlines are
 generated based on the <h?> tags, for a in-depth description of how this is done
 see the "Table Of Contest" section. 
@@ -292,12 +292,13 @@ work on most systems and comes with a build in patched QT.
 
 Unfortunately the static binary is not particularly static, on Linux it depends
 on both glibc and openssl, furthermore you will need to have an xserver
-installed but not necessary running. See 
+installed but not necessary running. You will need to have different fonts
+install including xfonts-scalable (Type1).  See 
 <http://code.google.com/p/wkhtmltopdf/wiki/static> for trouble shouting.
 
 ================================> Compilation <=================================
 It can happen that the static binary does not work for your system for one
-reason or the other, in that case you might need to compile qtwkhtmltopdf
+reason or the other, in that case you might need to compile wkhtmltopdf
 yourself.
 
 *GNU/Linux:*
@@ -305,7 +306,7 @@ yourself.
 Before compilation you will need to install dependencies: X11, gcc, git and
 openssl. On Debian/Ubuntu this can be done as follows:
 
-sudo apt-get build-dep libqt4-gui libqt4-network libqt4-wekbit
+sudo apt-get build-dep libqt4-gui libqt4-network libqt4-webkit
 sudo apt-get install openssl build-essential xorg git-core git-doc
 
 On other systems you must use your own package manager, the packages might be
@@ -315,6 +316,13 @@ You now have 2 options either you can build the latest binary, or make a
 bleeding edge build
 
 ================================> Installation <================================
+There are several ways to install wkhtmltopdf.  You can download a already
+compiled binary, or you can compile wkhtmltopdf your self. On windows the
+easiest way to install wkhtmltopdf is to download the latest installer. On linux
+you can download the latest static binary, however you still need to install
+some other pieces of software, to learn more about this read the static version
+section of the manual.
+
 ==================================> Examples <==================================
 This section presents a number of examples of how to invoke wkhtmltopdf.